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,2 +1,16 @@
+#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>
 #include <qmessagebox.h>
@@ -8,15 +22,4 @@
 #include <qvaluelist.h>
 
-#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,
     const QString&fsize,int num,const QValueList<int>&path)
@@ -47,5 +50,6 @@ bool AttachItem::isParentof(const QValueList<int>&path)
     /* the parent must have one digit less then a child */
     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;
     }
@@ -56,5 +60,6 @@ AttachItem* ViewMail::searchParent(const QValueList<int>&path)
 {
     QListViewItemIterator it( attachments );
-    for ( ; it.current(); ++it ) {
+    for ( ; it.current(); ++it )
+    {
         AttachItem*ati = (AttachItem*)it.current();
         if (ati->isParentof(path)) return ati;
@@ -69,5 +74,6 @@ AttachItem* ViewMail::lastChild(AttachItem*parent)
     if (!item) return item;
     AttachItem*temp=0;
-    while( (temp=(AttachItem*)item->nextSibling())) {
+    while( (temp=(AttachItem*)item->nextSibling()))
+    {
         item = temp;
     }
@@ -75,5 +81,6 @@ AttachItem* ViewMail::lastChild(AttachItem*parent)
 }
 
-void ViewMail::setBody( RecBody body ) {
+void ViewMail::setBody( RecBody body )
+{
 
 m_body = body;
@@ -81,5 +88,6 @@ m_mail[2] = body.Bodytext();
 attachbutton->setEnabled(body.Parts().count()>0);
 attachments->setEnabled(body.Parts().count()>0);
-if (body.Parts().count()==0) {
+    if (body.Parts().count()==0)
+    {
     return;
 }
@@ -92,5 +100,6 @@ int w;
 w=0;
 
-while (s>1024) {
+    while (s>1024)
+    {
     s/=1024;
     ++w;
@@ -99,5 +108,6 @@ while (s>1024) {
 
 QString q="";
-switch(w) {
+    switch(w)
+    {
 case 1:
     q="k";
@@ -125,10 +135,13 @@ curItem=new AttachItem(attachments,curItem,type,"Mailbody","",fsize,-1,body.Desc
 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();
         }
@@ -136,10 +149,12 @@ for (unsigned int i = 0; i < body.Parts().count();++i) {
     s = body.Parts()[i].Size();
     w = 0;
-    while (s>1024) {
+        while (s>1024)
+        {
         s/=1024;
         ++w;
         if (w>=2) break;
     }
-    switch(w) {
+        switch(w)
+        {
     case 1:
         q="k";
@@ -158,5 +173,6 @@ for (unsigned int i = 0; i < body.Parts().count();++i) {
     desc = body.Parts()[i].Description();
     parentItem = searchParent(body.Parts()[i].Positionlist());
-    if (parentItem) {
+        if (parentItem)
+        {
         AttachItem*temp = lastChild(parentItem);
         if (temp) curItem = temp;
@@ -164,5 +180,7 @@ for (unsigned int i = 0; i < body.Parts().count();++i) {
         attachments->setRootIsDecorated(true);
         curItem = parentItem;
-    } else {
+        }
+        else
+        {
         curItem=new AttachItem(attachments,curItem,type,desc,filename,fsize,i,body.Parts()[i].Positionlist());
     }
@@ -171,14 +189,17 @@ for (unsigned int i = 0; i < body.Parts().count();++i) {
 
 
-void ViewMail::slotShowHtml( bool state ) {
+void ViewMail::slotShowHtml( bool state )
+{
     m_showHtml = state;
     setText();
 }
 
-void ViewMail::slotItemClicked( QListViewItem * item , const QPoint & point, int ) {
+void ViewMail::slotItemClicked( QListViewItem * item , const QPoint & point, int )
+{
     if (!item )
         return;
 
-    if (  ( ( AttachItem* )item )->Partnumber() == -1 ) {
+    if (  ( ( AttachItem* )item )->Partnumber() == -1 )
+    {
         setText();
         return;
@@ -187,5 +208,6 @@ void ViewMail::slotItemClicked( QListViewItem * item , const QPoint & point, int
   int ret=0;
 
-  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 );
   }
@@ -195,14 +217,18 @@ void ViewMail::slotItemClicked( QListViewItem * item , const QPoint & point, int
   ret = menu->exec( point, 0 );
 
-  switch(ret) {
+    switch(ret)
+    {
         case 0:
-             { MimeTypes types;
+        {
+            MimeTypes types;
              types.insert( "all", "*" );
              QString str = Opie::OFileDialog::getSaveFileName( 1,
                   "/", item->text( 2 )  , types, 0 );
 
-             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);
                  output.open(IO_WriteOnly);
@@ -216,8 +242,12 @@ 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() ] ) );
                 }
@@ -229,5 +259,6 @@ void ViewMail::slotItemClicked( QListViewItem * item , const QPoint & point, int
 
 
-void ViewMail::setMail( RecMail mail ) {
+void ViewMail::setMail( RecMail mail )
+{
 
     m_recMail = mail;
@@ -265,5 +296,6 @@ ViewMail::ViewMail( QWidget *parent, const char *name, WFlags fl)
 }
 
-void ViewMail::readConfig() {
+void ViewMail::readConfig()
+{
     Config cfg( "mail" );
     cfg.setGroup( "Settings" );
@@ -279,11 +311,14 @@ void ViewMail::setText()
     QString bccString;
 
-    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);
     }
@@ -301,7 +336,10 @@ void ViewMail::setText()
                  "</td></tr></table><font face=fixed>";
 
-    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>" );
     }
@@ -321,5 +359,6 @@ void ViewMail::hide()
         QWidget::hide();
 
-        if (_inLoop) {
+    if (_inLoop)
+    {
                 _inLoop = false;
                 qApp->exit_loop();
@@ -333,5 +372,6 @@ void ViewMail::exec()
         show();
 
-        if (!_inLoop) {
+    if (!_inLoop)
+    {
                 _inLoop = true;
                 qApp->enter_loop();
@@ -352,5 +392,6 @@ QString ViewMail::deHtml(const QString &string)
 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"));
                 return;
@@ -365,5 +406,6 @@ void ViewMail::slotReply()
         QStringList lines = QStringList::split(QRegExp("\\n"), text);
         QStringList::Iterator it;
-        for (it = lines.begin(); it != lines.end(); it++) {
+    for (it = lines.begin(); it != lines.end(); it++)
+    {
                 rtext += "> " + *it + "\n";
         }
@@ -379,6 +421,6 @@ void ViewMail::slotReply()
         composer.setSubject( "Re: " + m_mail[1] );
         composer.setMessage( rtext );
-        composer.showMaximized();
-    if ( QDialog::Accepted==composer.exec()) {
+    if ( QDialog::Accepted == QPEApplication::execDialog( &composer ) )
+    {
         m_recMail.Wrapper()->answeredMail(m_recMail);
     }
@@ -387,5 +429,6 @@ void ViewMail::slotReply()
 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"));
                 return;
@@ -414,7 +457,6 @@ void ViewMail::slotForward()
         composer.setSubject( "Fwd: " + m_mail[1] );
         composer.setMessage( ftext );
-        composer.showMaximized();
-    if ( QDialog::Accepted==composer.exec()) {
-
+    if ( QDialog::Accepted == QPEApplication::execDialog( &composer ))
+    {
     }
 }
@@ -422,5 +464,6 @@ void ViewMail::slotForward()
 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 );
         hide();