summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <[email protected]>2016-07-07 07:05:42 +0200
committerMontel Laurent <[email protected]>2016-07-07 07:05:42 +0200
commit6e6a096c36d4cf76b9b0664c17e3ef1663ebe085 (patch)
tree51a76b55122c6c57f14a5084e698e0e4cc4f7f96
parentd5ed49f6f19c1853a9252c16c7b4d332004fae83 (diff)
Port to new connect api
-rw-r--r--kmail/agents/sendlateragent/sendlaterjob.h4
-rw-r--r--kmail/agents/sendlateragent/sendlatermanager.h4
-rw-r--r--kmail/agents/sendlateragent/sendlaterremovemessagejob.h4
-rw-r--r--kmail/src/collectionpage/collectionmailinglistpage.h4
-rw-r--r--kmail/src/collectionpage/collectionmaintenancepage.h5
-rw-r--r--kmail/src/collectionpage/collectionshortcutpage.h4
-rw-r--r--kmail/src/collectionpage/collectiontemplatespage.h6
-rw-r--r--kmail/src/configuredialog/colorlistbox.h4
-rw-r--r--kmail/src/configuredialog/configureaccountpage.h4
-rw-r--r--kmail/src/configuredialog/configureagents/configureagentlistdelegate.h6
-rw-r--r--kmail/src/configuredialog/configureagents/configureagentlistview.h6
11 files changed, 14 insertions, 37 deletions
diff --git a/kmail/agents/sendlateragent/sendlaterjob.h b/kmail/agents/sendlateragent/sendlaterjob.h
index e964795..a206c58 100644
--- a/kmail/agents/sendlateragent/sendlaterjob.h
+++ b/kmail/agents/sendlateragent/sendlaterjob.h
@@ -41,14 +41,12 @@ public:
~SendLaterJob();
void start();
-private Q_SLOTS:
+private:
void sendDone();
void sendError(const QString &error, SendLaterManager::ErrorType type);
void slotMessageTransfered(const Akonadi::Item::List &);
void slotJobFinished(KJob *);
void slotDeleteItem(KJob *);
-
-private:
void updateAndCleanMessageBeforeSending(const KMime::Message::Ptr &msg);
Akonadi::ItemFetchScope mFetchScope;
SendLaterManager *mManager;
diff --git a/kmail/agents/sendlateragent/sendlatermanager.h b/kmail/agents/sendlateragent/sendlatermanager.h
index 14bc5b6..75fa948 100644
--- a/kmail/agents/sendlateragent/sendlatermanager.h
+++ b/kmail/agents/sendlateragent/sendlatermanager.h
@@ -72,11 +72,9 @@ Q_SIGNALS:
public Q_SLOTS:
void load(bool forcereload = false);
-private Q_SLOTS:
+private:
void slotCreateJob();
void createSendInfoList();
-
-private:
QString infoToStr(SendLater::SendLaterInfo *info);
void removeLaterInfo(SendLater::SendLaterInfo *info);
SendLater::SendLaterInfo *searchInfo(Akonadi::Item::Id id);
diff --git a/kmail/agents/sendlateragent/sendlaterremovemessagejob.h b/kmail/agents/sendlateragent/sendlaterremovemessagejob.h
index f1267a2..561e40b 100644
--- a/kmail/agents/sendlateragent/sendlaterremovemessagejob.h
+++ b/kmail/agents/sendlateragent/sendlaterremovemessagejob.h
@@ -34,10 +34,8 @@ public:
void start();
-private Q_SLOTS:
- void slotItemDeleteDone(KJob *job);
-
private:
+ void slotItemDeleteDone(KJob *job);
void deleteItem();
QList<Akonadi::Item::Id> mListItems;
int mIndex;
diff --git a/kmail/src/collectionpage/collectionmailinglistpage.h b/kmail/src/collectionpage/collectionmailinglistpage.h
index fc45a58..dead3c7 100644
--- a/kmail/src/collectionpage/collectionmailinglistpage.h
+++ b/kmail/src/collectionpage/collectionmailinglistpage.h
@@ -55,7 +55,7 @@ protected:
protected Q_SLOTS:
void slotFetchDone(KJob *job);
-private Q_SLOTS:
+private:
/*
* Detects mailing-list related stuff
*/
@@ -65,8 +65,6 @@ private Q_SLOTS:
void slotHoldsML(bool holdsML);
void slotAddressChanged(int addr);
void slotConfigChanged();
-
-private:
void fillMLFromWidgets();
void fillEditBox();
diff --git a/kmail/src/collectionpage/collectionmaintenancepage.h b/kmail/src/collectionpage/collectionmaintenancepage.h
index ef8fb76..8ca761b 100644
--- a/kmail/src/collectionpage/collectionmaintenancepage.h
+++ b/kmail/src/collectionpage/collectionmaintenancepage.h
@@ -42,14 +42,11 @@ public:
protected:
void init(const Akonadi::Collection &);
-private Q_SLOTS:
+private:
void updateCollectionStatistic(Akonadi::Collection::Id, const Akonadi::CollectionStatistics &);
void slotReindexCollection();
-private:
void updateLabel(qint64 nbMail, qint64 nbUnreadMail, qint64 size);
-
-private:
Akonadi::Collection mCurrentCollection;
bool mIsNotAVirtualCollection;
QLabel *mFolderSizeLabel;
diff --git a/kmail/src/collectionpage/collectionshortcutpage.h b/kmail/src/collectionpage/collectionshortcutpage.h
index 858e66d..793a20a 100644
--- a/kmail/src/collectionpage/collectionshortcutpage.h
+++ b/kmail/src/collectionpage/collectionshortcutpage.h
@@ -38,10 +38,8 @@ public:
void load(const Akonadi::Collection &col) Q_DECL_OVERRIDE;
void save(Akonadi::Collection &col) Q_DECL_OVERRIDE;
-private Q_SLOTS:
- void slotShortcutChanged();
-
private:
+ void slotShortcutChanged();
void init(const Akonadi::Collection &);
QSharedPointer<MailCommon::FolderCollection> mFolder;
KKeySequenceWidget *mKeySeqWidget;
diff --git a/kmail/src/collectionpage/collectiontemplatespage.h b/kmail/src/collectionpage/collectiontemplatespage.h
index 22d29db..2b7859b 100644
--- a/kmail/src/collectionpage/collectiontemplatespage.h
+++ b/kmail/src/collectionpage/collectiontemplatespage.h
@@ -40,13 +40,9 @@ public:
void save(Akonadi::Collection &col) Q_DECL_OVERRIDE;
bool canHandle(const Akonadi::Collection &collection) const Q_DECL_OVERRIDE;
-private Q_SLOTS:
+private:
void slotCopyGlobal();
-
-private Q_SLOTS:
void slotChanged();
-
-private:
void init();
QCheckBox *mCustom;
TemplateParser::TemplatesConfiguration *mWidget;
diff --git a/kmail/src/configuredialog/colorlistbox.h b/kmail/src/configuredialog/colorlistbox.h
index 0c4300a..45e1376 100644
--- a/kmail/src/configuredialog/colorlistbox.h
+++ b/kmail/src/configuredialog/colorlistbox.h
@@ -51,10 +51,8 @@ protected:
void dragMoveEvent(QDragMoveEvent *e) Q_DECL_OVERRIDE;
void dropEvent(QDropEvent *e) Q_DECL_OVERRIDE;
-private Q_SLOTS:
- void newColor(const QModelIndex &index);
-
private:
+ void newColor(const QModelIndex &index);
QTreeWidgetItem *mCurrentOnDragEnter;
};
diff --git a/kmail/src/configuredialog/configureaccountpage.h b/kmail/src/configuredialog/configureaccountpage.h
index 2409bda..a991488 100644
--- a/kmail/src/configuredialog/configureaccountpage.h
+++ b/kmail/src/configuredialog/configureaccountpage.h
@@ -59,15 +59,13 @@ public:
Q_SIGNALS:
void accountListChanged(const QStringList &);
-private Q_SLOTS:
+private:
void slotEditNotifications();
void slotShowMailCheckMenu(const QString &, const QPoint &);
void slotCustomizeAccountOrder();
void slotIncludeInCheckChanged(bool checked);
void slotOfflineOnShutdownChanged(bool checked);
void slotCheckOnStatupChanged(bool checked);
-
-private:
void doLoadFromGlobalSettings() Q_DECL_OVERRIDE;
struct RetrievalOptions {
diff --git a/kmail/src/configuredialog/configureagents/configureagentlistdelegate.h b/kmail/src/configuredialog/configureagents/configureagentlistdelegate.h
index 7adf75b..b15fd62 100644
--- a/kmail/src/configuredialog/configureagents/configureagentlistdelegate.h
+++ b/kmail/src/configuredialog/configureagents/configureagentlistdelegate.h
@@ -40,12 +40,12 @@ public:
void updateItemWidgets(const QList<QWidget *> widgets,
const QStyleOptionViewItem &option,
const QPersistentModelIndex &index) const Q_DECL_OVERRIDE;
-private Q_SLOTS:
+Q_SIGNALS:
+ void requestConfiguration(const QModelIndex &index);
+private:
void slotCheckboxClicked(bool checked);
void slotConfigure();
-Q_SIGNALS:
- void requestConfiguration(const QModelIndex &index);
};
#endif // CONFIGUREAGENTLISTDELEGATE_H
diff --git a/kmail/src/configuredialog/configureagents/configureagentlistview.h b/kmail/src/configuredialog/configureagents/configureagentlistview.h
index ba9da97..3119ae3 100644
--- a/kmail/src/configuredialog/configureagents/configureagentlistview.h
+++ b/kmail/src/configuredialog/configureagents/configureagentlistview.h
@@ -33,15 +33,13 @@ public:
void save();
void resetToDefault();
-private Q_SLOTS:
- void slotConfigureAgent(const QModelIndex &index);
- void slotAgentClicked(const QModelIndex &index);
-
Q_SIGNALS:
void descriptionChanged(const QString &desc);
void agentChanged();
private:
+ void slotConfigureAgent(const QModelIndex &index);
+ void slotAgentClicked(const QModelIndex &index);
void changeAgentActiveState(const QString &interfaceName, const QString &path, bool enable);
};