9 files changed, 45 insertions, 45 deletions

diff --git a/noncore/unsupported/mail2/bend/bend.cpp b/noncore/unsupported/mail2/bend/bend.cpp
index e2ece2a..ab6eb45 100644
--- a/noncore/unsupported/mail2/bend/bend.cpp
+++ b/noncore/unsupported/mail2/bend/bend.cpp
@@ -77,33 +77,33 @@ void BenD::slotCheck()
 
         QValueList<Account> acList = ConfigFile::getAccounts();
         QValueList<Account>::Iterator ot;
         for (ot = acList.begin(); ot != acList.end(); ot++) {
                 if (!((*ot).imapServer().isEmpty() || 
                       (*ot).imapPort().isEmpty() || 
                       (*ot).user().isEmpty() ||
                       (*ot).pass().isEmpty())) {
                         if (!((*ot).imapSsl() && 
                               (*ot).imapSslPort().isEmpty())) {
                                 IMAPHandler *handler = new IMAPHandler(*ot);
                                 handler->iStatus("INBOX", "RECENT");
-                                connect(handler, SIGNAL(gotResponse(IMAPResponse &)), SLOT(slotIMAPStatus(IMAPResponse &)));
+                                connect(handler, SIGNAL(gotResponse(IMAPResponse&)), SLOT(slotIMAPStatus(IMAPResponse&)));
                         }
                 }
         }
 }
 
 void BenD::slotIMAPStatus(IMAPResponse &response)
 {
-        disconnect(response.imapHandler(), SIGNAL(gotResponse(IMAPResponse &)), this, SLOT(slotIMAPStatus(IMAPResponse &)));
+        disconnect(response.imapHandler(), SIGNAL(gotResponse(IMAPResponse&)), this, SLOT(slotIMAPStatus(IMAPResponse&)));
 
         if (response.statusResponse().status() == IMAPResponseEnums::OK) {
                 if (response.STATUS()[0].recent().toInt() > 0) {
                         ODevice *device = ODevice::inst();
                         if (isHidden()) show();
                         if (_config->readBoolEntry("BlinkLed", true)) {
                                 if ( !device-> ledList ( ). isEmpty ( )) {
                                                 OLed led = ( device-> ledList ( ). contains ( Led_Mail )) ? Led_Mail : device-> ledList ( ) [0];
                                 
                                         device->setLedState(led, device-> ledStateList ( led ). contains ( Led_BlinkSlow ) ? Led_BlinkSlow : Led_On );
                                 }
                         }
diff --git a/noncore/unsupported/mail2/composer.cpp b/noncore/unsupported/mail2/composer.cpp
index cb80299..da1aee9 100644
--- a/noncore/unsupported/mail2/composer.cpp
+++ b/noncore/unsupported/mail2/composer.cpp
@@ -149,26 +149,26 @@ void Composer::slotSendMail()
         }
 
         smail.setAttachments(attachments);
 
         QString header, message;
         MailFactory::genMail(header, message, smail, this);
                 if (header.isNull() || message.isNull()) return;// Aborted.
 
         status->setStopEnabled(true);
 
         SmtpHandler *handler = new SmtpHandler(header, message, accountsLoaded[from->currentItem()], to->text());
         connect(handler, SIGNAL(finished()), SLOT(slotSendFinished()));
-        connect(handler, SIGNAL(error(const QString &)), SLOT(slotSendError(const QString &)));
-        connect(handler, SIGNAL(status(const QString &)), status, SLOT(setStatusText(const QString &)));
+        connect(handler, SIGNAL(error(const QString&)), SLOT(slotSendError(const QString&)));
+        connect(handler, SIGNAL(status(const QString&)), status, SLOT(setStatusText(const QString&)));
 }
 
 void Composer::slotSendQueued()
 {
   int effSendCount = 0;
         qDebug("Sending queued messages");
         Config cfg( "mailqueue", Config::User );
         cfg.setGroup( "Settings" );
         _sendCount = 0;
         _sendError = 0;
         _toSend = cfg.readNumEntry( "count", 0 );
         
@@ -238,26 +238,26 @@ void Composer::slotSendQueued()
              qDebug("putting mail together");
 
             QString header, message;
             MailFactory::genMail(header, message, smail, this);
                     if (header.isNull() || message.isNull()) continue;//return;// Aborted.
 
            // abort->setEnabled(true);
 
              qDebug("Sending to %s",toAdr.latin1());
             SmtpHandler *handler = new SmtpHandler(header, message, accnt ,toAdr);
              effSendCount++;
             connect(handler, SIGNAL(finished()), SLOT(slotSendQueuedFinished()));
-            connect(handler, SIGNAL(error(const QString &)), SLOT(slotSendQueuedError(const QString &)));
-            connect(handler, SIGNAL(status(const QString &)), status, SLOT(setStatusText(const QString &)));
+            connect(handler, SIGNAL(error(const QString&)), SLOT(slotSendQueuedError(const QString&)));
+            connect(handler, SIGNAL(status(const QString&)), status, SLOT(setStatusText(const QString&)));
 
            }
          if (effSendCount < _toSend)
   {
            _toSend = effSendCount;
                 QMessageBox::information(this, tr("Error"), tr("<p>There was a problem sending some of the queued mails.</p>"), tr("Ok"));
   }
 }
 
 void Composer::slotQueueMail()
 {
         if (to->text().find(QRegExp(".*\\@.*\\..*")) == -1) {
diff --git a/noncore/unsupported/mail2/folderwidget.cpp b/noncore/unsupported/mail2/folderwidget.cpp
index d27968b..a0520b1 100644
--- a/noncore/unsupported/mail2/folderwidget.cpp
+++ b/noncore/unsupported/mail2/folderwidget.cpp
@@ -51,25 +51,25 @@ FolderWidget::FolderWidget(QWidget *parent, const char *name, WFlags fl)
         menu->insertItem(tr("Delete"), MENU_DELETE);
         menu->insertItem(tr("Move"), MENU_MOVE);
         menu->insertItem(tr("Copy"), MENU_COPY);
         menu->insertSeparator();
         menu->insertItem(tr("Create folder"), MENU_CREATE);
         menu->insertSeparator();
         menu->insertItem(tr("Rescan folder list"), MENU_RESCAN);
         setPopup(menu);
 
         getAccounts();
 
         connect(menu, SIGNAL(activated(int)), SLOT(slotMenuActivated(int)));
-        connect(this, SIGNAL(clicked(QListViewItem *)), SLOT(slotItemClicked(QListViewItem *)));
+        connect(this, SIGNAL(clicked(QListViewItem*)), SLOT(slotItemClicked(QListViewItem*)));
 }
 
 FolderWidget::~FolderWidget()
 {
         // TODO: Save folder tree.
 }
 
 void FolderWidget::update()
 {
         getAccounts();
 }
 
@@ -134,56 +134,56 @@ void FolderWidget::slotMenuActivated(int itemid)
                 QMessageBox::information(this, tr("Error"), tr("<p>Please select an item first.</p>"), tr("Ok"));
                 return;
         }
 
         if (itemid == MENU_RENAME) {
                 if (((FolderWidgetItem *)currentItem())->folder().fullName().isEmpty()) return;
 
                 Folder folder = ((FolderWidgetItem *)currentItem())->folder();
                 QString newName = Rename::rename(folder.fullName(), this); 
                 if (newName.isNull()) return;
 
                 folder.topFolder().handler()->iRename(folder.fullName(), newName);
-                connect(folder.topFolder().handler(), SIGNAL(gotResponse(IMAPResponse &)), SLOT(slotIMAPRename(IMAPResponse &)));
+                connect(folder.topFolder().handler(), SIGNAL(gotResponse(IMAPResponse&)), SLOT(slotIMAPRename(IMAPResponse&)));
         } else if (itemid == MENU_DELETE) {
                 if (((FolderWidgetItem *)currentItem())->folder().fullName().isEmpty()) return;
 
                 Folder folder = ((FolderWidgetItem *)currentItem())->folder();
 
                 int ret = QMessageBox::information(this, tr("Question"), tr("<p>Do you really want to delete <pre>%1</pre>?").arg(folder.fullName()), tr("Yes"), tr("No"));
                 if (ret == 1) return;
 
                 _createFolder = folder;
 
                 folder.topFolder().handler()->iDelete(folder.fullName());
-                connect(folder.topFolder().handler(), SIGNAL(gotResponse(IMAPResponse &)), SLOT(slotIMAPDelete(IMAPResponse &)));
+                connect(folder.topFolder().handler(), SIGNAL(gotResponse(IMAPResponse&)), SLOT(slotIMAPDelete(IMAPResponse&)));
         } else if (itemid == MENU_MOVE) {
 
         } else if (itemid == MENU_COPY) {
 
         } else if (itemid == MENU_CREATE) {
                 Folder folder = (((FolderWidgetItem *)currentItem())->folder());
                 _createFolder = folder;
 
                 QString folderName = Rename::getText(tr("Foldername"), tr("<p>Please enter the name of the new folder.</p>"), this);
                 if (folderName.isNull()) return;
 
                 folder.topFolder().handler()->iCreate(folder.fullName() + folder.separator() + folderName);
-                connect(folder.topFolder().handler(), SIGNAL(gotResponse(IMAPResponse &)), SLOT(slotIMAPCreate(IMAPResponse &)));
+                connect(folder.topFolder().handler(), SIGNAL(gotResponse(IMAPResponse&)), SLOT(slotIMAPCreate(IMAPResponse&)));
         } else if (itemid == MENU_RESCAN) {
                 Folder folder = (((FolderWidgetItem *)currentItem())->folder());
                 _rescanAccount = folder.topFolder().account();
 
                 folder.topFolder().handler()->iList("", "*");
-                connect(folder.topFolder().handler(), SIGNAL(gotResponse(IMAPResponse &)), SLOT(slotIMAPList(IMAPResponse &)));
+                connect(folder.topFolder().handler(), SIGNAL(gotResponse(IMAPResponse&)), SLOT(slotIMAPList(IMAPResponse&)));
         }
 }
 
 void FolderWidget::slotItemClicked(QListViewItem *item)
 {
         if (item == NULL) return;
         Folder folder = ((FolderWidgetItem *)item)->folder();
         if (folder.fullName().isEmpty()) return;
 
         emit folderSelected(folder);
 }
 
@@ -218,79 +218,79 @@ void FolderWidget::slotIMAPError(int error)
                 QMessageBox::warning(this, tr("Error"), tr("<p>An unknown error was encountered.</p>"), tr("Ok"));
         }
 }
 
 void FolderWidget::slotIMAPDisconnected()
 {
         emit status(tr("Disconnected."));
         emit disconnected();
 }
 
 void FolderWidget::slotIMAPLogin(IMAPResponse &response)
 {
-        disconnect(response.imapHandler(), SIGNAL(gotResponse(IMAPResponse &)), this, SLOT(slotIMAPLogin(IMAPResponse &)));
+        disconnect(response.imapHandler(), SIGNAL(gotResponse(IMAPResponse&)), this, SLOT(slotIMAPLogin(IMAPResponse&)));
 
         if (response.statusResponse().status() == IMAPResponseEnums::OK) {
                 emit status(tr("Login successful!"));
         } else {
                 QMessageBox::warning(this, tr("Error"), tr("<p>Login failed. Go away.</p>"), tr("Ok"));
         }
 }
 
 void FolderWidget::slotIMAPRename(IMAPResponse &response)
 {
-        disconnect(response.imapHandler(), SIGNAL(gotResponse(IMAPResponse &)), this, SLOT(slotIMAPRename(IMAPResponse &)));
+        disconnect(response.imapHandler(), SIGNAL(gotResponse(IMAPResponse&)), this, SLOT(slotIMAPRename(IMAPResponse&)));
 
         if (response.statusResponse().status() == IMAPResponseEnums::OK) {
                 emit status(tr("Renaming successful!"));
         } else {
                 QMessageBox::warning(this, tr("Error"), tr("<p>Renaming failed. (Server said: %1)</p>").arg(response.statusResponse().comment()), tr("Ok"));
         }
 }
 
 void FolderWidget::slotIMAPDelete(IMAPResponse &response)
 {
-        disconnect(response.imapHandler(), SIGNAL(gotResponse(IMAPResponse &)), this, SLOT(slotIMAPDelete(IMAPResponse &)));
+        disconnect(response.imapHandler(), SIGNAL(gotResponse(IMAPResponse&)), this, SLOT(slotIMAPDelete(IMAPResponse&)));
 
         if (response.statusResponse().status() == IMAPResponseEnums::OK) {
                 emit status(tr("Deletion successful!"));
 
                 _rescanAccount = _createFolder.topFolder().account();
 
                 _createFolder.topFolder().handler()->iList(".", "*");
-                connect(_createFolder.topFolder().handler(), SIGNAL(gotResponse(IMAPResponse &)), SLOT(slotIMAPList(IMAPResponse &)));
+                connect(_createFolder.topFolder().handler(), SIGNAL(gotResponse(IMAPResponse&)), SLOT(slotIMAPList(IMAPResponse&)));
         } else {
                 QMessageBox::warning(this, tr("Error"), tr("<p>Delete failed. (Server said: %1)</p>").arg(response.statusResponse().comment()), tr("Ok"));
         }
 }
 
 void FolderWidget::slotIMAPCreate(IMAPResponse &response)
 {
-        disconnect(response.imapHandler(), SIGNAL(gotResponse(IMAPResponse &)), this, SLOT(slotIMAPCreate(IMAPResponse &)));
+        disconnect(response.imapHandler(), SIGNAL(gotResponse(IMAPResponse&)), this, SLOT(slotIMAPCreate(IMAPResponse&)));
 
         if (response.statusResponse().status() == IMAPResponseEnums::OK) {
                 emit status(tr("Folder created. Rescanning..."));
 
                 _rescanAccount = _createFolder.topFolder().account();
 
                 _createFolder.topFolder().handler()->iList(".", "*");
-                connect(_createFolder.topFolder().handler(), SIGNAL(gotResponse(IMAPResponse &)), SLOT(slotIMAPList(IMAPResponse &)));
+                connect(_createFolder.topFolder().handler(), SIGNAL(gotResponse(IMAPResponse&)), SLOT(slotIMAPList(IMAPResponse&)));
         } else {
                 QMessageBox::warning(this, tr("Error"), tr("<p>The folder could not be created. (Server said: %1)</p>").arg(response.statusResponse().comment()), tr("Ok"));
         }
 }
 
 void FolderWidget::slotIMAPList(IMAPResponse &response)
 {
-        disconnect(response.imapHandler(), SIGNAL(gotResponse(IMAPResponse &)), this, SLOT(slotIMAPList(IMAPResponse &)));
+        disconnect(response.imapHandler(), SIGNAL(gotResponse(IMAPResponse&)), this, SLOT(slotIMAPList(IMAPResponse&)));
 
         if (response.statusResponse().status() == IMAPResponseEnums::OK) {
                 QDir d((QString) getenv("HOME") + "/Applications/mail/foldercache");
                 if (!d.exists()) {
                         system("mkdir -p $HOME/Applications/mail/foldercache");
                         qWarning("Created $HOME/Applications/mail/foldercache.");
                 }
                 QFile f((QString) getenv("HOME") + "/Applications/mail/foldercache/foldercache-" + _rescanAccount.accountName());
                 if (!f.open(IO_WriteOnly)) {
                         QMessageBox::critical(this, tr("Error"), tr("<p>Couldn't open folder cache file for writing!</p>"), tr("Ok"));
                         return;
                 } 
diff --git a/noncore/unsupported/mail2/libmail/imaphandler.cpp b/noncore/unsupported/mail2/libmail/imaphandler.cpp
index dc97b28..8da0acd 100644
--- a/noncore/unsupported/mail2/libmail/imaphandler.cpp
+++ b/noncore/unsupported/mail2/libmail/imaphandler.cpp
@@ -2,25 +2,25 @@
 #include "imaphandler.h"
 #include "imapbase.h"
 
 IMAPHandler::IMAPHandler(const Account &account)
         : QObject(), _account(account)
 {
         _ready = false;
         _loggingin = false;
         _loggedin = false;
         _tag = 0;
         _ibase = new IMAPBase(account);
 
-        connect(_ibase, SIGNAL(dataReceived(const QString &)), SLOT(slotDataReceived(const QString &)));
+        connect(_ibase, SIGNAL(dataReceived(const QString&)), SLOT(slotDataReceived(const QString&)));
         connect(_ibase, SIGNAL(lookingUpHost()), SLOT(slotLookingUpHost()));
         connect(_ibase, SIGNAL(hostFound()), SLOT(slotHostFound()));
         connect(_ibase, SIGNAL(connected()), SLOT(slotConnected()));
         connect(_ibase, SIGNAL(disconnected()), SLOT(slotDisconnected()));
         connect(_ibase, SIGNAL(error(int)), SLOT(slotError(int)));
 }
 
 void IMAPHandler::doLogin()
 {
         if (_loggedin) return;
         if (_loggingin) return;
 
@@ -290,28 +290,28 @@ QString IMAPHandler::tag(bool count)
 
 void IMAPHandler::slotDataReceived(const QString &data)
 {
         if (!_ready) {
                 // The first data is always the greeting string.
                 // We can ignore it.
                 _ready = true;
                 return;
         }
 
 
         IMAPResponseParser parser;
-        //connect ( &parser, SIGNAL( needMoreData ( QString & )), _ibase, SLOT( tryRead ( QString & )));
+        //connect ( &parser, SIGNAL( needMoreData(QString&)), _ibase, SLOT( tryRead(QString&)));
         parser. parse ( data );
         IMAPResponse response = parser.response();
-        //disconnect ( &parser, SIGNAL( needMoreData ( QString & )), _ibase, SLOT( tryRead ( QString & )));
+        //disconnect ( &parser, SIGNAL( needMoreData(QString&)), _ibase, SLOT( tryRead(QString&)));
         response.setImapHandler(this);
 
         if (!_loggingin) { qDebug("Emitting gotResponse!\n" ); emit gotResponse(response); }
         else {
                 if (response.statusResponse().status() == IMAPResponseEnums::OK) {
                         _loggingin = false;
                         _loggedin = true;
                         qWarning("OK. Logged in. Leaving loggingin state.");
                 } else {
                         _loggingin = false;
                         emit IMAPError(IMAPBase::IMAPErrLoginFailed);
                 }
diff --git a/noncore/unsupported/mail2/listviewplus.cpp b/noncore/unsupported/mail2/listviewplus.cpp
index ce5f35f..722b347 100644
--- a/noncore/unsupported/mail2/listviewplus.cpp
+++ b/noncore/unsupported/mail2/listviewplus.cpp
@@ -19,26 +19,26 @@ void ListViewPlus::keyPressEvent(QKeyEvent *event)
                         break;
                 default: break;
         }
 
         QListView::keyPressEvent(event);
 }
 
 void ListViewPlus::setPopup(QPopupMenu *popup, int delay)
 {
         _popup = popup;
         _delay = delay;
 
-        connect(this, SIGNAL(pressed(QListViewItem *, const QPoint &, int)), SLOT(_initPopup(QListViewItem *, const QPoint &, int)));
-        connect(this, SIGNAL(clicked(QListViewItem *, const QPoint &, int)), SLOT(_cancelPopup(QListViewItem *, const QPoint &, int)));
+        connect(this, SIGNAL(pressed(QListViewItem*,const QPoint&,int)), SLOT(_initPopup(QListViewItem*,const QPoint&,int)));
+        connect(this, SIGNAL(clicked(QListViewItem*,const QPoint&,int)), SLOT(_cancelPopup(QListViewItem*,const QPoint&,int)));
 }
 
 void ListViewPlus::_initPopup(QListViewItem *, const QPoint &point, int)
 {
         _point = point;
 
         _timer = new QTimer();
         _timer->start(_delay, true);
 
         connect(_timer, SIGNAL(timeout()), this, SLOT(_showPopup()));
 }
 
diff --git a/noncore/unsupported/mail2/mailtable.cpp b/noncore/unsupported/mail2/mailtable.cpp
index fd179f0..56feab0 100644
--- a/noncore/unsupported/mail2/mailtable.cpp
+++ b/noncore/unsupported/mail2/mailtable.cpp
@@ -65,98 +65,98 @@ MailTable::MailTable(QWidget *parent, const char *name, WFlags fl)
         QPopupMenu *markMenu = new QPopupMenu(this);
         markMenu->insertItem(tr("Seen"), MENU_MARK_READ);
         markMenu->insertItem(tr("Unseen"), MENU_MARK_UNREAD);
         markMenu->insertSeparator();
         markMenu->insertItem(tr("Marked"), MENU_MARK_MARKED);
         markMenu->insertItem(tr("Unmarked"), MENU_MARK_UNMARKED);
 
         menu->insertItem(tr("Mark as..."), markMenu, MENU_MARK);
         menu->insertSeparator();
         menu->insertItem(tr("Delete Mail"), MENU_DELETE);
         setPopup(menu);
 
-        connect(this, SIGNAL(clicked(QListViewItem *)), SLOT(itemClicked(QListViewItem *)));
+        connect(this, SIGNAL(clicked(QListViewItem*)), SLOT(itemClicked(QListViewItem*)));
 }
 
 void MailTable::setFolder(Folder folder)
 {
         folder.topFolder().handler()->iSelect(folder.fullName());
         _handler = folder.topFolder().handler();
-        connect(folder.topFolder().handler(), SIGNAL(gotResponse(IMAPResponse &)), SLOT(slotIMAPSelect(IMAPResponse &)));
+        connect(folder.topFolder().handler(), SIGNAL(gotResponse(IMAPResponse&)), SLOT(slotIMAPSelect(IMAPResponse&)));
 }
 
 void MailTable::setHeaders(QValueList<IMAPResponseFETCH> response)
 {
         clear();
         QValueList<IMAPResponseFETCH>::Iterator it;
         for (it = response.begin(); it != response.end(); it++) {
                 (void) new MailTableItem(this, *it);
         }
 }
 
 void MailTable::slotIMAPSelect(IMAPResponse &response)
 {
-        disconnect(response.imapHandler(), SIGNAL(gotResponse(IMAPResponse &)), this, SLOT(slotIMAPSelect(IMAPResponse &)));
+        disconnect(response.imapHandler(), SIGNAL(gotResponse(IMAPResponse&)), this, SLOT(slotIMAPSelect(IMAPResponse&)));
 
         if (response.statusResponse().status() == IMAPResponseEnums::OK) {
                 clear();
                 QString mails = response.EXISTS()[0].mails();
                 if (mails.toInt() == 0) {
                         emit status(tr("Mailbox contained no mails."));
                         return;
                 }
                 int a = mails.toInt() / 5;
                 int b = mails.toInt() % 5;
 
                 _downloadSteps = a;
                 if (b > 0) _downloadSteps++;
                 _lastStep = b;
                 _currentProgress = 0;
 
                 emit totalSteps(_downloadSteps);
                 emit progress(_currentProgress);
                 emit stopEnabled(true);
 
                 response.imapHandler()->iFetch(QString("1:%1").arg((a == 0) ? b : 5), "ENVELOPE FLAGS UID");
                 emit status(tr("Getting mail headers..."));
-                connect(response.imapHandler(), SIGNAL(gotResponse(IMAPResponse &)), SLOT(slotIMAPFetch(IMAPResponse &)));
+                connect(response.imapHandler(), SIGNAL(gotResponse(IMAPResponse&)), SLOT(slotIMAPFetch(IMAPResponse&)));
         } else {
                 QMessageBox::warning(this, tr("Error"), tr("<p>An error occoured during the selection of the mailbox. (Server said: %1)</p>").arg(response.statusResponse().comment()), tr("Ok"));
         }
 }
 
 void MailTable::slotIMAPFetch(IMAPResponse &response)
 {
-        disconnect(response.imapHandler(), SIGNAL(gotResponse(IMAPResponse &)), this, SLOT(slotIMAPFetch(IMAPResponse &)));
+        disconnect(response.imapHandler(), SIGNAL(gotResponse(IMAPResponse&)), this, SLOT(slotIMAPFetch(IMAPResponse&)));
 
         if (response.statusResponse().status() == IMAPResponseEnums::OK) {
                 QValueList<IMAPResponseFETCH>::Iterator it;
                 QValueList<IMAPResponseFETCH> fetch = response.FETCH();
                 for (it = fetch.begin(); it != fetch.end(); it++) {
                         (void) new MailTableItem(this, *it);
                 }
                 emit progress(++_currentProgress);
 
                 if (_currentProgress != _downloadSteps) {
                         if (_stopped) {
                                 _currentProgress = 0;
                                 _downloadSteps = 0;
                                 _lastStep = 0;
                                 _stopped = false;
                                 emit status(tr("Stopped"));
                                 emit resetProgress();
                                 emit stopEnabled(false);
                         } else {
                                 response.imapHandler()->iFetch(QString("%1:%2").arg(_currentProgress * 5 + 1).arg((_currentProgress + 1 == _downloadSteps) ? _currentProgress * 5 + _lastStep : _currentProgress * 5 + 5), "ENVELOPE FLAGS UID");
-                                connect(response.imapHandler(), SIGNAL(gotResponse(IMAPResponse &)), SLOT(slotIMAPFetch(IMAPResponse &)));
+                                connect(response.imapHandler(), SIGNAL(gotResponse(IMAPResponse&)), SLOT(slotIMAPFetch(IMAPResponse&)));
                         }
                 } else {
                         _currentProgress = 0;
                         _downloadSteps = 0;
                         _lastStep = 0;
                         emit status(tr("Got all mail headers."));
                         emit resetProgress();
                         emit stopEnabled(false);
                 }
         } else {
                 emit status(tr("<font color=#ff0000>Couldn't fetch mail."));
         }
diff --git a/noncore/unsupported/mail2/mainwindow.cpp b/noncore/unsupported/mail2/mainwindow.cpp
index 0d09ec8..ce80391 100644
--- a/noncore/unsupported/mail2/mainwindow.cpp
+++ b/noncore/unsupported/mail2/mainwindow.cpp
@@ -11,48 +11,48 @@
 #include "configfile.h"
 #include "searchdiag.h"
 #include "mailtable.h"
 #include "composer.h"
 #include "viewmail.h"
 #include "mailfactory.h"
 
 MainWindow::MainWindow(QWidget *parent, const char *name, WFlags fl)
         : MainWindowBase(parent, name, fl)
 {
         status->setStopEnabled(false);
 
-        connect(folderView, SIGNAL(status(const QString &)), status, SLOT(setStatusText(const QString &)));
+        connect(folderView, SIGNAL(status(const QString&)), status, SLOT(setStatusText(const QString&)));
         connect(folderView, SIGNAL(folderSelected(Folder)), mailView, SLOT(setFolder(Folder)));
 
-        connect(mailView, SIGNAL(mailClicked(IMAPResponseFETCH, IMAPHandler *)), SLOT(mailClicked(IMAPResponseFETCH, IMAPHandler *)));
-        connect(mailView, SIGNAL(status(const QString &)), status, SLOT(setStatusText(const QString &)));
+        connect(mailView, SIGNAL(mailClicked(IMAPResponseFETCH,IMAPHandler*)), SLOT(mailClicked(IMAPResponseFETCH,IMAPHandler*)));
+        connect(mailView, SIGNAL(status(const QString&)), status, SLOT(setStatusText(const QString&)));
         connect(mailView, SIGNAL(totalSteps(int)), status, SLOT(setProgressTotalSteps(int)));
         connect(mailView, SIGNAL(progress(int)), status, SLOT(setProgress(int)));
         connect(mailView, SIGNAL(resetProgress()), status, SLOT(resetProgress()));
         connect(mailView, SIGNAL(stopEnabled(bool)), status, SLOT(setStopEnabled(bool)));
 
         connect(status, SIGNAL(stop()), mailView, SLOT(stop()));
 
         connect(compose, SIGNAL(activated()), SLOT(slotComposeNoParams()));
         connect(sendQueue, SIGNAL(activated()), SLOT(slotSendQueued()));
         connect(findmails, SIGNAL(activated()), SLOT(slotSearch()));
         connect(configure, SIGNAL(activated()), SLOT(slotConfigure()));
 
         // Added by Stefan Eilers to allow starting by addressbook..
 #if !defined(QT_NO_COP) 
         // QCopChannel *addressChannel = new QCopChannel("QPE/Application/mail" , this );
-        // connect (addressChannel, SIGNAL( received(const QCString &, const QByteArray &)),
-        //       this, SLOT ( appMessage(const QCString &, const QByteArray &) ) );
-        connect( qApp, SIGNAL( appMessage( const QCString&, const QByteArray& ) ),
-                 this, SLOT( appMessage( const QCString&, const QByteArray& ) ) );
+        // connect (addressChannel, SIGNAL( received(const QCString&,const QByteArray&)),
+        //       this, SLOT ( appMessage(const QCString&,const QByteArray&) ) );
+        connect( qApp, SIGNAL( appMessage(const QCString&,const QByteArray&) ),
+                 this, SLOT( appMessage(const QCString&,const QByteArray&) ) );
 #endif
 }
 
 // Added by Stefan Eilers to allow starting by addressbook..
 void MainWindow::appMessage(const QCString &msg, const QByteArray &data)
 {
         if (msg == "writeMail(QString,QString)") {
                 QDataStream stream(data,IO_ReadOnly);
                 QString name, email;
                 stream >> name >> email;
 
                 qWarning("opie-mail:: Should send mail to %s with address %s", name.latin1(), email.latin1() );
diff --git a/noncore/unsupported/mail2/searchdiag.cpp b/noncore/unsupported/mail2/searchdiag.cpp
index 907f6ff..6fb4e4d 100644
--- a/noncore/unsupported/mail2/searchdiag.cpp
+++ b/noncore/unsupported/mail2/searchdiag.cpp
@@ -19,98 +19,98 @@ SearchDiag::SearchDiag(QWidget *parent, const char *name, WFlags fl)
         : SearchDiagBase(parent, name,  fl)
         {
         _selected = false;
 
         in->insertItem(tr("Body"), INMENU_BODY);
         in->insertItem(tr("Header Field"), INMENU_HEADERF);
         in->insertItem(tr("Subject"), INMENU_SUBJECT);
         in->insertItem(tr("From"), INMENU_FROM);
         in->insertItem(tr("To"), INMENU_TO);
 
         connect(folderView, SIGNAL(folderSelected(Folder)), SLOT(folderSelected(Folder)));
         connect(in, SIGNAL(activated(int)), SLOT(slotInItemActivated(int)));
-        connect(mailTable, SIGNAL(mailClicked(IMAPResponseFETCH, IMAPHandler *)), SLOT(slotMailClicked(IMAPResponseFETCH, IMAPHandler *)));
+        connect(mailTable, SIGNAL(mailClicked(IMAPResponseFETCH,IMAPHandler*)), SLOT(slotMailClicked(IMAPResponseFETCH,IMAPHandler*)));
 }
 
 void SearchDiag::accept()
 {
         if (searchFor->text().isEmpty()) {
                 QMessageBox::information(this, tr("Error"), tr("<p>Please enter what to search for.</p>"), tr("Ok"));
                 return;
         }
 
         if (!_selected) {
                 QMessageBox::information(this, tr("Error"), tr("<p>Please select a folder.</p>"), tr("Ok"));
                 return;
         }
 
         if (in->currentItem() == INMENU_HEADERF && other->currentText().isEmpty()) {
                 QMessageBox::information(this, tr("Error"), tr("<p>Please enter a header field to search in.</p>"), tr("Ok"));
                 return;
         }
 
         _folder.topFolder().handler()->iSelect(_folder.fullName());
-        connect(_folder.topFolder().handler(), SIGNAL(gotResponse(IMAPResponse &)), SLOT(slotIMAPSelect(IMAPResponse &)));
+        connect(_folder.topFolder().handler(), SIGNAL(gotResponse(IMAPResponse&)), SLOT(slotIMAPSelect(IMAPResponse&)));
 }
 
 void SearchDiag::folderSelected(Folder folder)
 {
         _selected = true;
         _folder = folder;
 }
 
 void SearchDiag::slotIMAPSelect(IMAPResponse &response)
 {
-        disconnect(response.imapHandler(), SIGNAL(gotResponse(IMAPResponse &)), this, SLOT(slotIMAPSelect(IMAPResponse &)));
+        disconnect(response.imapHandler(), SIGNAL(gotResponse(IMAPResponse&)), this, SLOT(slotIMAPSelect(IMAPResponse&)));
 
         if (response.statusResponse().status() == IMAPResponseEnums::OK) {
                 if (in->currentItem() == INMENU_BODY) {
                         response.imapHandler()->iSearch("BODY \"" + searchFor->text() + "\"");
                 } else if (in->currentItem() == INMENU_HEADERF) {
                         response.imapHandler()->iSearch("HEADER \""+ other->currentText() + "\" \"" + searchFor->text() + "\"");
                 } else if (in->currentItem() == INMENU_SUBJECT) {
                         response.imapHandler()->iSearch("SUBJECT \"" + searchFor->text() + "\"");
                 } else if (in->currentItem() == INMENU_FROM) {
                         response.imapHandler()->iSearch("FROM \"" + searchFor->text() + "\"");
                 } else if (in->currentItem() == INMENU_TO) {
                         response.imapHandler()->iSearch("TO \"" + searchFor->text() + "\"");
                 } else return;
 
-                connect(response.imapHandler(), SIGNAL(gotResponse(IMAPResponse &)), SLOT(slotIMAPSearch(IMAPResponse &)));
+                connect(response.imapHandler(), SIGNAL(gotResponse(IMAPResponse&)), SLOT(slotIMAPSearch(IMAPResponse&)));
         } else {
                 QMessageBox::warning(this, tr("Error"), tr("<p>Could not select the folder. Aborting. (Server said: %1)").arg(response.statusResponse().comment()), tr("Ok"));
         }
 }
 
 void SearchDiag::slotIMAPSearch(IMAPResponse &response)
 {
-        disconnect(response.imapHandler(), SIGNAL(gotResponse(IMAPResponse &)), this, SLOT(slotIMAPSearch(IMAPResponse &)));
+        disconnect(response.imapHandler(), SIGNAL(gotResponse(IMAPResponse&)), this, SLOT(slotIMAPSearch(IMAPResponse&)));
 
         if (response.statusResponse().status() == IMAPResponseEnums::OK) {
                 IMAPResponseSEARCH results = response.SEARCH()[0];
                 if (results.mails().count() == 0) {
                         QMessageBox::information(this, tr("Results"), tr("<p>No mails match your criteria.</p>"), tr("Ok"));
                         return;
                 }
 
                 response.imapHandler()->iFetch(results.mails().join(","), "ENVELOPE FLAGS UID");
-                connect(response.imapHandler(), SIGNAL(gotResponse(IMAPResponse &)), SLOT(slotIMAPFetch(IMAPResponse &)));
+                connect(response.imapHandler(), SIGNAL(gotResponse(IMAPResponse&)), SLOT(slotIMAPFetch(IMAPResponse&)));
         } else {
                 QMessageBox::warning(this, tr("Error"), tr("<p>Search failed. (Server said: %1)").arg(response.statusResponse().comment()), tr("Ok"));
         }
 }
 
 void SearchDiag::slotIMAPFetch(IMAPResponse &response)
 {
-        disconnect(response.imapHandler(), SIGNAL(gotResponse(IMAPResponse &)), this, SLOT(slotIMAPSearch(IMAPResponse &)));
+        disconnect(response.imapHandler(), SIGNAL(gotResponse(IMAPResponse&)), this, SLOT(slotIMAPSearch(IMAPResponse&)));
 
         if (response.statusResponse().status() == IMAPResponseEnums::OK) {
                 mailTable->setHeaders(response.FETCH());
         } else {
                 QMessageBox::warning(this, tr("Error"), tr("<p>Couldn't fetch the mail headers. (Server said: %1)").arg(response.statusResponse().comment()));
         }
 }
 
 void SearchDiag::slotMailClicked(IMAPResponseFETCH fetch, IMAPHandler *)
 {
         ViewMail viewMail(fetch, _folder.topFolder().handler(), this, 0, true);
         viewMail.showMaximized();
diff --git a/noncore/unsupported/mail2/viewmail.cpp b/noncore/unsupported/mail2/viewmail.cpp
index da6924d..0cfb6e5 100644
--- a/noncore/unsupported/mail2/viewmail.cpp
+++ b/noncore/unsupported/mail2/viewmail.cpp
@@ -50,25 +50,25 @@ ViewMail::ViewMail(IMAPResponseFETCH &mail, IMAPHandler *handler, QWidget *paren
                         : tr("<b>Bcc:</b> %1<br>").arg(deHtml(mail.envelope().bcc().toString())))
                 .arg(mail.envelope().mailDate().isNull() ? tr("(no date)") 
                         : mail.envelope().mailDate())
                 .arg("%1");
 
         connect(reply, SIGNAL(activated()), SLOT(slotReply()));
         connect(forward, SIGNAL(activated()), SLOT(slotForward()));
 
         attachments->setEnabled(_gotBody);
         browser->setText(QString(_mailHtml).arg(tr("Getting mail body from server. Please wait...")));
 
         _handler->iUid("FETCH", QString("%1 (BODY[1])").arg(mail.uid()));
-        connect(_handler, SIGNAL(gotResponse(IMAPResponse &)), SLOT(slotIMAPUid(IMAPResponse &)));
+        connect(_handler, SIGNAL(gotResponse(IMAPResponse&)), SLOT(slotIMAPUid(IMAPResponse&)));
 }
 
 ViewMail::~ViewMail()
 {
         hide();
 }
 
 void ViewMail::hide()
 {
         QWidget::hide();
 
         if (_inLoop) {
@@ -170,25 +170,25 @@ void ViewMail::slotForward()
         SendMail sendMail;
         sendMail.setSubject("Fwd: " + _mail.envelope().subject());
         sendMail.setMessage(ftext);
 
         Composer composer(this, 0, true);
         composer.setSendMail(sendMail);
         composer.showMaximized();
         composer.exec();
 }
 
 void ViewMail::slotIMAPUid(IMAPResponse &response)
 {
-        disconnect(_handler, SIGNAL(gotResponse(IMAPResponse &)), this, SLOT(slotIMAPUid(IMAPResponse &)));
+        disconnect(_handler, SIGNAL(gotResponse(IMAPResponse&)), this, SLOT(slotIMAPUid(IMAPResponse&)));
 
         if (response.statusResponse().status() == IMAPResponseEnums::OK) {
                 QValueList<IMAPResponseBodyPart> bodyParts;
                 bodyParts.append(response.FETCH()[0].bodyPart(0));
                 _mail.setBodyParts(bodyParts);
 
                 browser->setText(QString(_mailHtml).arg(deHtml(response.FETCH()[0].bodyPart(0).data())));
 
         //      fillList(response.FETCH()[0].bodyStructure());
 
                 _gotBody = true;
         } else {