1 files changed, 97 insertions, 54 deletions

diff --git a/noncore/net/mail/viewmail.cpp b/noncore/net/mail/viewmail.cpp
index 99965d4..f015228 100644
--- a/noncore/net/mail/viewmail.cpp
+++ b/noncore/net/mail/viewmail.cpp
@@ -1 +1,15 @@
+#include "composemail.h"
+#include "viewmail.h"
+#include "accountview.h"
+
+/* OPIE */
+#include <libmailwrapper/settings.h>
+#include <libmailwrapper/abstractmail.h>
+#include <libmailwrapper/mailtypes.h>
+
+#include <opie2/ofiledialog.h>
+#include <qpe/config.h>
+#include <qpe/qpeapplication.h>
+
+/* QT */
 #include <qtextbrowser.h>
@@ -9,13 +23,2 @@
 
-#include <qpe/config.h>
-
-#include <opie2/ofiledialog.h>
-
-#include <libmailwrapper/settings.h>
-#include "composemail.h"
-#include "viewmail.h"
-#include <libmailwrapper/abstractmail.h>
-#include "accountview.h"
-#include <libmailwrapper/mailtypes.h>
-
 AttachItem::AttachItem(QListView * parent,QListViewItem *after, const QString&mime,const QString&desc,const QString&file,
@@ -48,3 +51,4 @@ bool AttachItem::isParentof(const QValueList<int>&path)
     if (path.count()!=_path.count()+1) return false;
-    for (unsigned int i=0; i < _path.count();++i) {
+    for (unsigned int i=0; i < _path.count();++i)
+    {
         if (_path[i]!=path[i]) return false;
@@ -57,3 +61,4 @@ AttachItem* ViewMail::searchParent(const QValueList<int>&path)
     QListViewItemIterator it( attachments );
-    for ( ; it.current(); ++it ) {
+    for ( ; it.current(); ++it )
+    {
         AttachItem*ati = (AttachItem*)it.current();
@@ -70,3 +75,4 @@ AttachItem* ViewMail::lastChild(AttachItem*parent)
     AttachItem*temp=0;
-    while( (temp=(AttachItem*)item->nextSibling())) {
+    while( (temp=(AttachItem*)item->nextSibling()))
+    {
         item = temp;
@@ -76,3 +82,4 @@ AttachItem* ViewMail::lastChild(AttachItem*parent)
 
-void ViewMail::setBody( RecBody body ) {
+void ViewMail::setBody( RecBody body )
+{
 
@@ -82,3 +89,4 @@ attachbutton->setEnabled(body.Parts().count()>0);
 attachments->setEnabled(body.Parts().count()>0);
-if (body.Parts().count()==0) {
+    if (body.Parts().count()==0)
+    {
     return;
@@ -93,3 +101,4 @@ w=0;
 
-while (s>1024) {
+    while (s>1024)
+    {
     s/=1024;
@@ -100,3 +109,4 @@ while (s>1024) {
 QString q="";
-switch(w) {
+    switch(w)
+    {
 case 1:
@@ -126,8 +136,11 @@ QString filename = "";
 
-for (unsigned int i = 0; i < body.Parts().count();++i) {
+    for (unsigned int i = 0; i < body.Parts().count();++i)
+    {
     type = body.Parts()[i].Type()+"/"+body.Parts()[i].Subtype();
     part_plist_t::ConstIterator it = body.Parts()[i].Parameters().begin();
-    for (;it!=body.Parts()[i].Parameters().end();++it) {
+        for (;it!=body.Parts()[i].Parameters().end();++it)
+        {
         qDebug(it.key());
-        if (it.key().lower()=="name") {
+            if (it.key().lower()=="name")
+            {
             filename=it.data();
@@ -137,3 +150,4 @@ for (unsigned int i = 0; i < body.Parts().count();++i) {
     w = 0;
-    while (s>1024) {
+        while (s>1024)
+        {
         s/=1024;
@@ -142,3 +156,4 @@ for (unsigned int i = 0; i < body.Parts().count();++i) {
     }
-    switch(w) {
+        switch(w)
+        {
     case 1:
@@ -159,3 +174,4 @@ for (unsigned int i = 0; i < body.Parts().count();++i) {
     parentItem = searchParent(body.Parts()[i].Positionlist());
-    if (parentItem) {
+        if (parentItem)
+        {
         AttachItem*temp = lastChild(parentItem);
@@ -165,3 +181,5 @@ for (unsigned int i = 0; i < body.Parts().count();++i) {
         curItem = parentItem;
-    } else {
+        }
+        else
+        {
         curItem=new AttachItem(attachments,curItem,type,desc,filename,fsize,i,body.Parts()[i].Positionlist());
@@ -172,3 +190,4 @@ for (unsigned int i = 0; i < body.Parts().count();++i) {
 
-void ViewMail::slotShowHtml( bool state ) {
+void ViewMail::slotShowHtml( bool state )
+{
     m_showHtml = state;
@@ -177,3 +196,4 @@ void ViewMail::slotShowHtml( bool state ) {
 
-void ViewMail::slotItemClicked( QListViewItem * item , const QPoint & point, int ) {
+void ViewMail::slotItemClicked( QListViewItem * item , const QPoint & point, int )
+{
     if (!item )
@@ -181,3 +201,4 @@ void ViewMail::slotItemClicked( QListViewItem * item , const QPoint & point, int
 
-    if (  ( ( AttachItem* )item )->Partnumber() == -1 ) {
+    if (  ( ( AttachItem* )item )->Partnumber() == -1 )
+    {
         setText();
@@ -188,3 +209,4 @@ void ViewMail::slotItemClicked( QListViewItem * item , const QPoint & point, int
 
-  if ( item->text( 0 ).left( 5 ) == "text/" || item->text(0)=="message/rfc822" )  {
+    if ( item->text( 0 ).left( 5 ) == "text/" || item->text(0)=="message/rfc822" )
+    {
      menu->insertItem( tr( "Show Text" ), 1 );
@@ -196,5 +218,7 @@ void ViewMail::slotItemClicked( QListViewItem * item , const QPoint & point, int
 
-  switch(ret) {
+    switch(ret)
+    {
         case 0:
-             { MimeTypes types;
+        {
+            MimeTypes types;
              types.insert( "all", "*" );
@@ -203,5 +227,7 @@ void ViewMail::slotItemClicked( QListViewItem * item , const QPoint & point, int
 
-             if( !str.isEmpty() ) {
+            if( !str.isEmpty() )
+            {
                encodedString*content = m_recMail.Wrapper()->fetchDecodedPart( m_recMail, m_body.Parts()[ ( ( AttachItem* )item )->Partnumber() ] );
-               if (content) {
+                if (content)
+                {
                  QFile output(str);
@@ -217,6 +243,10 @@ void ViewMail::slotItemClicked( QListViewItem * item , const QPoint & point, int
         case 1:
-             if (  ( ( AttachItem* )item )->Partnumber() == -1 ) {
+        if (  ( ( AttachItem* )item )->Partnumber() == -1 )
+        {
                 setText();
-             } else {
-                if (  m_recMail.Wrapper() != 0l )  { // make sure that there is a wrapper , even after delete or simular actions
+        }
+        else
+        {
+            if (  m_recMail.Wrapper() != 0l )
+            { // make sure that there is a wrapper , even after delete or simular actions
                 browser->setText( m_recMail.Wrapper()->fetchTextPart( m_recMail, m_body.Parts()[ ( ( AttachItem* )item )->Partnumber() ] ) );
@@ -230,3 +260,4 @@ void ViewMail::slotItemClicked( QListViewItem * item , const QPoint & point, int
 
-void ViewMail::setMail( RecMail mail ) {
+void ViewMail::setMail( RecMail mail )
+{
 
@@ -266,3 +297,4 @@ ViewMail::ViewMail( QWidget *parent, const char *name, WFlags fl)
 
-void ViewMail::readConfig() {
+void ViewMail::readConfig()
+{
     Config cfg( "mail" );
@@ -280,9 +312,12 @@ void ViewMail::setText()
 
-    for ( QStringList::Iterator it = ( m_mail2[0] ).begin(); it != ( m_mail2[0] ).end(); ++it ) {
+    for ( QStringList::Iterator it = ( m_mail2[0] ).begin(); it != ( m_mail2[0] ).end(); ++it )
+    {
         toString += (*it);
     }
-    for ( QStringList::Iterator it = ( m_mail2[1] ).begin(); it != ( m_mail2[1] ).end(); ++it ) {
+    for ( QStringList::Iterator it = ( m_mail2[1] ).begin(); it != ( m_mail2[1] ).end(); ++it )
+    {
         ccString += (*it);
     }
-    for ( QStringList::Iterator it = ( m_mail2[2] ).begin(); it != ( m_mail2[2] ).end(); ++it ) {
+    for ( QStringList::Iterator it = ( m_mail2[2] ).begin(); it != ( m_mail2[2] ).end(); ++it )
+    {
         bccString += (*it);
@@ -302,5 +337,8 @@ void ViewMail::setText()
 
-    if ( !m_showHtml ) {
+    if ( !m_showHtml )
+    {
         browser->setText( QString( m_mailHtml) + deHtml( m_mail[2] ) + "</font></html>" );
-    } else {
+    }
+    else
+    {
                browser->setText( QString( m_mailHtml) + m_mail[2] + "</font></html>" );
@@ -322,3 +360,4 @@ void ViewMail::hide()
 
-        if (_inLoop) {
+    if (_inLoop)
+    {
                 _inLoop = false;
@@ -334,3 +373,4 @@ void ViewMail::exec()
 
-        if (!_inLoop) {
+    if (!_inLoop)
+    {
                 _inLoop = true;
@@ -353,3 +393,4 @@ void ViewMail::slotReply()
 {
-        if (!m_gotBody) {
+    if (!m_gotBody)
+    {
                 QMessageBox::information(this, tr("Error"), tr("<p>The mail body is not yet downloaded, so you cannot reply yet."), tr("Ok"));
@@ -366,3 +407,4 @@ void ViewMail::slotReply()
         QStringList::Iterator it;
-        for (it = lines.begin(); it != lines.end(); it++) {
+    for (it = lines.begin(); it != lines.end(); it++)
+    {
                 rtext += "> " + *it + "\n";
@@ -380,4 +422,4 @@ void ViewMail::slotReply()
         composer.setMessage( rtext );
-        composer.showMaximized();
-    if ( QDialog::Accepted==composer.exec()) {
+    if ( QDialog::Accepted == QPEApplication::execDialog( &composer ) )
+    {
         m_recMail.Wrapper()->answeredMail(m_recMail);
@@ -388,3 +430,4 @@ void ViewMail::slotForward()
 {
-        if (!m_gotBody) {
+    if (!m_gotBody)
+    {
                 QMessageBox::information(this, tr("Error"), tr("<p>The mail body is not yet downloaded, so you cannot forward yet."), tr("Ok"));
@@ -415,5 +458,4 @@ void ViewMail::slotForward()
         composer.setMessage( ftext );
-        composer.showMaximized();
-    if ( QDialog::Accepted==composer.exec()) {
-
+    if ( QDialog::Accepted == QPEApplication::execDialog( &composer ))
+    {
     }
@@ -423,3 +465,4 @@ void ViewMail::slotDeleteMail( )
 {
-    if ( QMessageBox::warning(this, tr("Delete Mail"), QString( tr("<p>Do you really want to delete this mail? <br><br>" ) + m_mail[0] + " - " + m_mail[1] ) , QMessageBox::Yes, QMessageBox::No ) == QMessageBox::Yes ) {
+    if ( QMessageBox::warning(this, tr("Delete Mail"), QString( tr("<p>Do you really want to delete this mail? <br><br>" ) + m_mail[0] + " - " + m_mail[1] ) , QMessageBox::Yes, QMessageBox::No ) == QMessageBox::Yes )
+    {
         m_recMail.Wrapper()->deleteMail( m_recMail );