1 files changed, 34 insertions, 20 deletions

diff --git a/noncore/net/mail/addresspicker.cpp b/noncore/net/mail/addresspicker.cpp
index f4f4cea..8cdabde 100644
--- a/noncore/net/mail/addresspicker.cpp
+++ b/noncore/net/mail/addresspicker.cpp
@@ -1,18 +1,22 @@
+
+#include "composemail.h"
+
+/* OPIE */
+#include <opie2/ocontactaccess.h>
+#include <opie2/ocontact.h>
+#include <qpe/resource.h>
+#include <qpe/qpeapplication.h>
+
+/* QT */
 #include <qpushbutton.h>
 #include <qmessagebox.h>
 #include <qtextstream.h>
 #include <qlistbox.h>
 #include <qfile.h>
 
-#include <qpe/resource.h>
-#include <opie2/ocontactaccess.h>
-#include <opie2/ocontact.h>
-
-
+/* STD */
 #include <stdlib.h>
 
-#include "composemail.h"
-
 AddressPicker::AddressPicker( QWidget *parent, const char *name, bool modal, WFlags flags ) 
     : AddressPickerUI( parent, name, modal, flags )
 {
@@ -30,24 +34,31 @@ AddressPicker::AddressPicker( QWidget *parent, const char *name, bool modal, WFl
     QStringList mails;
     QString pre,suf;
     Opie::OContactAccess::List m_list = m_contactdb.sorted( true, 0, 0, 0 );
-    for ( it = m_list.begin(); it != m_list.end(); ++it ) {
-        if ((*it).defaultEmail().length()!=0) {
+    for ( it = m_list.begin(); it != m_list.end(); ++it )
+    {
+        if ((*it).defaultEmail().length()!=0)
+        {
             mails = (*it).emailList();
-            if ((*it).fileAs().length()>0) {
+            if ((*it).fileAs().length()>0)
+            {
                 pre = "\""+(*it).firstName()+" "+(*it).lastName()+"\" <";
                 suf = ">";
-            } else {
+            }
+            else
+            {
                 pre = "";
                 suf = "";
             }
             QStringList::ConstIterator sit = mails.begin();
-            for (;sit!=mails.end();++sit) {
+            for (;sit!=mails.end();++sit)
+            {
                 contactLine=pre+(*sit)+suf;
                 addressList->insertItem(contactLine);
             }            
         }
     }
-        if ( addressList->count() <= 0 ) {
+    if ( addressList->count() <= 0 )
+    {
 #if 0
     // makes this realy sense??
                 addressList->insertItem( 
@@ -55,7 +66,9 @@ AddressPicker::AddressPicker( QWidget *parent, const char *name, bool modal, WFl
 #endif
                 addressList->setEnabled( false );
                 okButton->setEnabled( false );
-        } else {
+    }
+    else
+    {
 //        addressList->sort();
     }
 }
@@ -65,14 +78,16 @@ void AddressPicker::accept()
         QListBoxItem *item = addressList->firstItem();
         QString names;
 
-        while ( item ) {
+    while ( item )
+    {
                 if ( item->selected() )
                         names += item->text() + ", ";
                 item = item->next();
         }
         names.replace( names.length() - 2, 2, "" );
 
-        if ( names.isEmpty() ) {
+    if ( names.isEmpty() )
+    {
                 QMessageBox::information(this, tr("Error"), tr("<p>You have to select"
                         " at least one address entry.</p>"), tr("Ok"));
                 return;
@@ -87,11 +102,10 @@ QString AddressPicker::getNames()
         QString names = 0;
         
         AddressPicker picker(0, 0, true);
-        picker.showMaximized();
-        picker.show();
 
-        int ret = picker.exec();
-        if ( QDialog::Accepted == ret ) {
+    int ret = QPEApplication::execDialog( &picker );
+    if ( QDialog::Accepted == ret )
+    {
                 return picker.selectedNames;
         }