Port to new connect api

agents/archivemailagent/archivemailwidget.cpp

@@ -99,15 +99,15 @@ void ArchiveMailWidget::customContextMenuRequested(const QPoint &)
 {
     const QList<QTreeWidgetItem *> listItems = mWidget->treeWidget->selectedItems();
     QMenu menu;
-    menu.addAction(i18n("Add..."), this, SLOT(slotAddItem()));
+    menu.addAction(i18n("Add..."), this, &ArchiveMailWidget::slotAddItem);
     if (!listItems.isEmpty()) {
         if (listItems.count() == 1) {
-            menu.addAction(i18n("Open Containing Folder..."), this, SLOT(slotOpenFolder()));
+            menu.addAction(i18n("Open Containing Folder..."), this, &ArchiveMailWidget::slotOpenFolder);
             menu.addSeparator();
-            menu.addAction(i18n("Archive now"), this, SLOT(slotArchiveNow()));
+            menu.addAction(i18n("Archive now"), this, &ArchiveMailWidget::slotArchiveNow);
         }
         menu.addSeparator();
-        menu.addAction(QIcon::fromTheme(QStringLiteral("edit-delete")), i18n("Delete"), this, SLOT(slotRemoveItem()));
+        menu.addAction(QIcon::fromTheme(QStringLiteral("edit-delete")), i18n("Delete"), this, &ArchiveMailWidget::slotRemoveItem);
     }
     menu.exec(QCursor::pos());
 }

agents/archivemailagent/archivemailwidget.h

@@ -65,7 +65,7 @@ private:
     bool verifyExistingArchive(ArchiveMailInfo *info) const;
     void updateDiffDate(ArchiveMailItem *item, ArchiveMailInfo *info);
 
-private Q_SLOTS:
+private:
     void slotRemoveItem();
     void slotModifyItem();
     void slotAddItem();
@@ -74,8 +74,6 @@ private Q_SLOTS:
     void customContextMenuRequested(const QPoint &);
     void slotArchiveNow();
     void slotItemChanged(QTreeWidgetItem *item, int);
-
-private:
     bool mChanged;
     Ui::ArchiveMailWidget *mWidget;
 };

agents/archivemailagent/job/archivejob.h

@@ -36,10 +36,9 @@ public:
     void execute() Q_DECL_OVERRIDE;
     void kill() Q_DECL_OVERRIDE;
 
-private Q_SLOTS:
+private:
     void slotBackupDone(const QString &info);
     void slotError(const QString &error);
-private:
     QPixmap mPixmap;
     ArchiveMailInfo *mInfo;
     ArchiveMailManager *mManager;

agents/followupreminderagent/followupreminderinfowidget.h

@@ -61,10 +61,8 @@ public:
 
     QList<qint32> listRemoveId() const;
 
-private Q_SLOTS:
-    void customContextMenuRequested(const QPoint &pos);
-
 private:
+    void customContextMenuRequested(const QPoint &pos);
     void createOrUpdateItem(FollowUpReminder::FollowUpReminderInfo *info, FollowUpReminderInfoItem *item = Q_NULLPTR);
     void removeItem(const QList<QTreeWidgetItem *> &mailItem);
     void openShowMessage(Akonadi::Item::Id id);

agents/followupreminderagent/followupremindermanager.h

@@ -40,13 +40,12 @@ public:
     void checkFollowUp(const Akonadi::Item &item, const Akonadi::Collection &col);
 
     QString printDebugInfo();
-private Q_SLOTS:
+private:
     void slotCheckFollowUpFinished(const QString &messageId, Akonadi::Item::Id id);
 
     void slotFinishTaskDone();
     void slotFinishTaskFailed();
     void slotReparseConfiguration();
-private:
     void answerReceived(const QString &from);
     QString infoToStr(FollowUpReminder::FollowUpReminderInfo *info);
 

agents/followupreminderagent/followupremindernoanswerdialog.h

@@ -38,10 +38,8 @@ public:
 Q_SIGNALS:
     void needToReparseConfiguration();
 
-private Q_SLOTS:
-    void slotSave();
-
 private:
+    void slotSave();
     void readConfig();
     void writeConfig();
     FollowUpReminderInfoWidget *mWidget;

agents/followupreminderagent/jobs/followupreminderfinishtaskjob.h

@@ -36,11 +36,9 @@ Q_SIGNALS:
     void finishTaskDone();
     void finishTaskFailed();
 
-private Q_SLOTS:
+private:
     void slotItemFetchJobDone(KJob *job);
     void slotItemModifiedResult(KJob *job);
-
-private:
     void closeTodo();
     Akonadi::Item::Id mTodoId;
 };

agents/followupreminderagent/jobs/followupreminderjob.h

@@ -38,10 +38,8 @@ public:
 Q_SIGNALS:
     void finished(const QString &messageId, Akonadi::Item::Id id);
 
-private Q_SLOTS:
-    void slotItemFetchJobDone(KJob *job);
-
 private:
+    void slotItemFetchJobDone(KJob *job);
     Akonadi::Item mItem;
 };
 

agents/sendlateragent/sendlateragent.cpp

@@ -67,7 +67,7 @@ SendLaterAgent::SendLaterAgent(const QString &id)
 
     if (SendLaterAgentSettings::enabled()) {
 #ifdef DEBUG_SENDLATERAGENT
-        QTimer::singleShot(1000, this, SLOT(slotStartAgent()));
+        QTimer::singleShot(1000, this, &SendLaterAgent::slotStartAgent);
 #else
         QTimer::singleShot(1000 * 60 * 4, this, &SendLaterAgent::slotStartAgent);
 #endif
@@ -75,7 +75,7 @@ SendLaterAgent::SendLaterAgent(const QString &id)
     // For extra safety, check list every hour, in case we didn't properly get
     // notified about the network going up or down.
     QTimer *reloadListTimer = new QTimer(this);
-    connect(reloadListTimer, SIGNAL(timeout()), this, SLOT(reload()));
+    connect(reloadListTimer, &QTimer::timeout, this, &SendLaterAgent::reload);
     reloadListTimer->start(1000 * 60 * 60); //1 hour
 }
 

agents/sendlateragent/sendlateragent.h

@@ -46,16 +46,14 @@ public Q_SLOTS:
     void reload();
     void configure(WId windowId) Q_DECL_OVERRIDE;
 
-private Q_SLOTS:
-    void slotSendNow(Akonadi::Item::Id id);
-
-    void slotStartAgent();
 protected:
     void itemsRemoved(const Akonadi::Item::List &item) Q_DECL_OVERRIDE;
     void itemsMoved(const Akonadi::Item::List &items, const Akonadi::Collection &sourceCollection, const Akonadi::Collection &destinationCollection) Q_DECL_OVERRIDE;
     void doSetOnline(bool online) Q_DECL_OVERRIDE;
 
 private:
+    void slotSendNow(Akonadi::Item::Id id);
+    void slotStartAgent();
     bool mAgentInitialized;
     SendLaterManager *mManager;
 };

agents/sendlateragent/sendlaterconfiguredialog.h

@@ -35,13 +35,11 @@ public:
 public Q_SLOTS:
     void slotNeedToReloadConfig();
 
-private Q_SLOTS:
-    void slotSave();
-
 Q_SIGNALS:
     void sendNow(Akonadi::Item::Id);
 
 private:
+    void slotSave();
     void readConfig();
     void writeConfig();
     SendLaterWidget *mWidget;

agents/sendlateragent/sendlaterconfigurewidget.cpp

@@ -107,10 +107,10 @@ void SendLaterWidget::customContextMenuRequested(const QPoint &)
     if (!listItems.isEmpty()) {
         QMenu menu;
         if (listItems.count() == 1) {
-            menu.addAction(i18n("Send now"), this, SLOT(slotSendNow()));
+            menu.addAction(i18n("Send now"), this, &SendLaterWidget::slotSendNow);
         }
         menu.addSeparator();
-        menu.addAction(QIcon::fromTheme(QStringLiteral("edit-delete")), i18n("Delete"), this, SLOT(slotRemoveItem()));
+        menu.addAction(QIcon::fromTheme(QStringLiteral("edit-delete")), i18n("Delete"), this, &SendLaterWidget::slotRemoveItem);
         menu.exec(QCursor::pos());
     }
 }

agents/sendlateragent/sendlaterconfigurewidget.h

@@ -65,17 +65,15 @@ public:
     void needToReload();
     QList<Akonadi::Item::Id> messagesToRemove() const;
 
-private Q_SLOTS:
+Q_SIGNALS:
+    void sendNow(Akonadi::Item::Id);
+
+private:
     void slotRemoveItem();
     void slotModifyItem();
     void updateButtons();
     void customContextMenuRequested(const QPoint &);
     void slotSendNow();
-
-Q_SIGNALS:
-    void sendNow(Akonadi::Item::Id);
-
-private:
     void createOrUpdateItem(SendLater::SendLaterInfo *info, SendLaterItem *item = Q_NULLPTR);
     void load();
     QList<Akonadi::Item::Id> mListMessagesToRemove;