applied the patch generated by the optimize_connect script from

TT.

1 files changed, 16 insertions, 16 deletions

diff --git a/noncore/unsupported/mailit/emailclient.cpp b/noncore/unsupported/mailit/emailclient.cpp
index 8359acf..86c7987 100644
--- a/noncore/unsupported/mailit/emailclient.cpp
+++ b/noncore/unsupported/mailit/emailclient.cpp
@@ -14,128 +14,128 @@
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 #include <qapplication.h>
 #include <qmessagebox.h>
 #include <qvbox.h>
 #include <qfile.h>
 #include <qcheckbox.h>
 #include <qmenubar.h>
 #include <qaction.h>
 #include <qwhatsthis.h>
 #include <qpe/resource.h>
 #include "emailclient.h"
 #include "writemail.h"
 
 QCollection::Item AccountList::newItem(QCollection::Item d)
 {
   return dupl( (MailAccount *) d);
 }
 
 MailAccount* AccountList::dupl(MailAccount *in)
 {
   ac = new MailAccount(*in);
   return ac;
 }
 
 EmailClient::EmailClient( QWidget* parent,  const char* name, WFlags fl )
   : QMainWindow( parent, name, fl )
 {
   emailHandler = new EmailHandler();
   addressList = new AddressList();
 
   sending = FALSE;
   receiving = FALSE;
   previewingMail = FALSE;
   mailIdCount = 1;
   accountIdCount = 1;
   allAccounts = FALSE;
 
   init();
 
 
 
   connect(emailHandler, SIGNAL(mailSent()), this, SLOT(mailSent()) );
 
-  connect(emailHandler, SIGNAL(smtpError(int,const QString &)), this,
-      SLOT(smtpError(int,const QString &)) );
-  connect(emailHandler, SIGNAL(popError(int,const QString &)), this,
-      SLOT(popError(int,const QString &)) );
+  connect(emailHandler, SIGNAL(smtpError(int,const QString&)), this,
+      SLOT(smtpError(int,const QString&)) );
+  connect(emailHandler, SIGNAL(popError(int,const QString&)), this,
+      SLOT(popError(int,const QString&)) );
 
-  connect(inboxView, SIGNAL(doubleClicked(QListViewItem *)), this, SLOT(inboxItemSelected()) );
-  connect(outboxView, SIGNAL(doubleClicked(QListViewItem *)), this, SLOT(outboxItemSelected()) );
+  connect(inboxView, SIGNAL(doubleClicked(QListViewItem*)), this, SLOT(inboxItemSelected()) );
+  connect(outboxView, SIGNAL(doubleClicked(QListViewItem*)), this, SLOT(outboxItemSelected()) );
 
-  connect(inboxView, SIGNAL(pressed(QListViewItem *)), this, SLOT(inboxItemPressed()) );
-  connect(inboxView, SIGNAL(clicked(QListViewItem *)), this, SLOT(inboxItemReleased()) );
+  connect(inboxView, SIGNAL(pressed(QListViewItem*)), this, SLOT(inboxItemPressed()) );
+  connect(inboxView, SIGNAL(clicked(QListViewItem*)), this, SLOT(inboxItemReleased()) );
 
-  connect(emailHandler, SIGNAL(mailArrived(const Email &, bool)), this,
-      SLOT(mailArrived(const Email &, bool)) );
+  connect(emailHandler, SIGNAL(mailArrived(const Email&,bool)), this,
+      SLOT(mailArrived(const Email&,bool)) );
   connect(emailHandler, SIGNAL(mailTransfered(int)), this,
       SLOT(allMailArrived(int)) );
 
   mailconf = new Config("mailit");
   //In case Synchronize is not defined in settings.txt
 
   readSettings();
 
   updateAccounts();
 
   lineShift = "\n";
   readMail();
   lineShift = "\r\n";
 
   mailboxView->setCurrentTab(0);  //ensure that inbox has focus
 
   /*channel = new QCopChannel( "QPE/Application/mailit", this );
-  connect( channel, SIGNAL(received(const QCString&, const QByteArray&)),
-        this, SLOT(receive(const QCString&, const QByteArray&)) );*/
+  connect( channel, SIGNAL(received(const QCString&,const QByteArray&)),
+        this, SLOT(receive(const QCString&,const QByteArray&)) );*/
 
 }
 
 
 EmailClient::~EmailClient()
 {
   //needs to be moved from destructor to closewindow event
   saveMail(getPath(FALSE) + "inbox.txt", inboxView);
   //does not currently work.  Defining outbox in the same
   //format as inbox is not a good solution as they have
   //different properties
   saveMail(getPath(FALSE) + "outbox.txt", outboxView);
   saveSettings();
 
   mailconf->write();
   delete mailconf;
 
 }
 
 void EmailClient::init()
 {
   initStatusBar(this);
 
   setToolBarsMovable(FALSE);
 
   bar = new QToolBar(this);
   QWhatsThis::add(bar,tr("Main operation toolbar"));
   bar->setHorizontalStretchable( TRUE );
 
   mb = new QMenuBar( bar );
 
   QPopupMenu *mail = new QPopupMenu(mb);
   mb->insertItem( tr( "&Mail" ), mail);
 
   QPopupMenu *configure = new QPopupMenu(mb);
   mb->insertItem( tr( "Accounts" ), configure);
 
   selectAccountMenu = new QPopupMenu(mb);
   editAccountMenu = new QPopupMenu(mb);
   deleteAccountMenu = new QPopupMenu(mb);
 
   mail->insertItem(tr("Get Mail in"), selectAccountMenu);
   configure->insertItem(tr("Edit account"), editAccountMenu);
   configure->insertItem(tr("Delete account"), deleteAccountMenu);
 
   bar = new QToolBar(this);
 
   getMailButton = new QToolButton(Resource::loadPixmap("mailit/getmail"),tr("getMail"),tr("select account"), this,SLOT(getAllNewMail()),bar);
@@ -172,100 +172,100 @@ void EmailClient::init()
 
   QWidget* widget = new QWidget( mailboxView, "widget" );
   grid_2 = new QGridLayout( widget );
 //  grid_2->setSpacing(6);
 //  grid_2->setMargin( 11 );
 
   inboxView = new QListView( widget, "inboxView" );
   inboxView->addColumn( tr( "From" ) );
   inboxView->addColumn( tr( "Subject" ) );
   inboxView->addColumn( tr( "Date" ) );
   inboxView->setMinimumSize( QSize( 0, 0 ) );
   inboxView->setAllColumnsShowFocus(TRUE);
   QWhatsThis::add(inboxView,QWidget::tr("This is the inbox view.\n"
   "It keeps the fetched mail which can be \n"
   "viewed by double clicking the entry.\n"
   "blue attachment icon shows whether this \n"
   "mailhas attachments.\n"));
 
   grid_2->addWidget( inboxView, 2, 0 );
   mailboxView->addTab( widget, "mailit/inbox", tr( "Inbox" ) );
 
   QWidget* widget_2 = new QWidget( mailboxView, "widget_2" );
   grid_3 = new QGridLayout( widget_2 );
 //  grid_3->setSpacing(6);
 //  grid_3->setMargin( 11 );
 
   outboxView = new QListView( widget_2, "outboxView" );
   outboxView->addColumn( tr( "To" ) );
   outboxView->addColumn( tr( "Subject" ) );
   outboxView->setAllColumnsShowFocus(TRUE);
 
   QWhatsThis::add(outboxView,QWidget::tr("This is the outbox view.\n"
   "It keeps the queued mails to send which can be \n"
   "reviewed by double clicking the entry."));
   grid_3->addWidget( outboxView, 0, 0 );
   mailboxView->addTab( widget_2,"mailit/outbox", tr( "Outbox" ) );
 
   setCentralWidget(mailboxView);
 
 }
 
 void EmailClient::initStatusBar(QWidget* parent)
 {
   statusBar = new QStatusBar(parent);
   statusBar->setSizeGripEnabled(FALSE);
 
   status1Label = new QLabel( tr("Idle"), statusBar);
   status2Label = new QLabel("", statusBar);
-  connect(emailHandler, SIGNAL(updatePopStatus(const QString &)),
-    status2Label, SLOT(setText(const QString &)) );
-  connect(emailHandler, SIGNAL(updateSmtpStatus(const QString &)),
-    status2Label, SLOT(setText(const QString &)) );
+  connect(emailHandler, SIGNAL(updatePopStatus(const QString&)),
+    status2Label, SLOT(setText(const QString&)) );
+  connect(emailHandler, SIGNAL(updateSmtpStatus(const QString&)),
+    status2Label, SLOT(setText(const QString&)) );
 
   progressBar = new QProgressBar(statusBar);
 
   connect(emailHandler, SIGNAL(mailboxSize(int)),
     this, SLOT(setTotalSize(int)) );
   connect(emailHandler, SIGNAL(currentMailSize(int)),
     this, SLOT(setMailSize(int)) );
   connect(emailHandler, SIGNAL(downloadedSize(int)),
     this, SLOT(setDownloadedSize(int)) );
 
   statusBar->addWidget(status1Label);
   statusBar->addWidget(progressBar);
   statusBar->addWidget(status2Label);
 
 }
 
 void EmailClient::compose()
 {
   emit composeRequested();
 }
 
 void EmailClient::cancel()
 {
   emailHandler->cancel();
 }
 
 AddressList* EmailClient::getAdrListRef()
 {
   return addressList;
 }
 
 //this needs to be rewritten to syncronize with outboxView
 void EmailClient::enqueMail(const Email &mail)
 {
  if (accountList.count() == 0) {
     QMessageBox::warning(qApp->activeWindow(),
       tr("No account selected"), tr("You must create an account"), "OK\n");
     return;
   }
 
   if (accountList.count() > 0) {
     currentAccount = accountList.first();
     qWarning("using account " + currentAccount->name);
   }
 
   Email addMail = mail;
   addMail.from = currentAccount->name;
   addMail.fromMail = currentAccount->emailAddress;