summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaurent Montel <[email protected]>2018-01-02 22:19:40 +0100
committerLaurent Montel <[email protected]>2018-01-02 22:19:40 +0100
commit4b622e50bd1a1706b413999092513023c39b4d28 (patch)
tree349289ef44ff7b92dc75e5e59102ef83e2690b2c
parent244213d9c3fe7eba9b7ebc43d947e12cad8ec82a (diff)
Remove SLOTS keyword
-rw-r--r--src/configuredialog/configureappearancepage.h4
-rw-r--r--src/configuredialog/configurecomposerpage.h4
-rw-r--r--src/configuredialog/configuresecuritypage.h4
-rw-r--r--src/foldershortcutactionmanager.h2
-rw-r--r--src/identity/identitydialog.cpp8
-rw-r--r--src/searchdialog/searchwindow.h15
6 files changed, 15 insertions, 22 deletions
diff --git a/src/configuredialog/configureappearancepage.h b/src/configuredialog/configureappearancepage.h
index 37d10be..cfd6b9b 100644
--- a/src/configuredialog/configureappearancepage.h
+++ b/src/configuredialog/configureappearancepage.h
@@ -64,10 +64,8 @@ public:
QString helpAnchor() const;
void save() override;
-private Q_SLOTS:
- void slotFontSelectorChanged(int);
-
private:
+ void slotFontSelectorChanged(int);
void doLoadOther() override;
void updateFontSelector();
void doResetToDefaultsOther() override;
diff --git a/src/configuredialog/configurecomposerpage.h b/src/configuredialog/configurecomposerpage.h
index 5779db6..f69ae12 100644
--- a/src/configuredialog/configurecomposerpage.h
+++ b/src/configuredialog/configurecomposerpage.h
@@ -140,10 +140,8 @@ public:
void save() override;
-private Q_SLOTS:
- void slotVerifyCharset(QString &);
-
private:
+ void slotVerifyCharset(QString &);
void doLoadOther() override;
void doResetToDefaultsOther() override;
diff --git a/src/configuredialog/configuresecuritypage.h b/src/configuredialog/configuresecuritypage.h
index 5f234d2..19be3e5 100644
--- a/src/configuredialog/configuresecuritypage.h
+++ b/src/configuredialog/configuresecuritypage.h
@@ -98,11 +98,9 @@ public:
void save() override;
-private Q_SLOTS:
+private:
void slotReenableAllWarningsClicked();
void slotConfigureGnupg();
-
-private:
void doLoadFromGlobalSettings() override;
void doLoadOther() override;
diff --git a/src/foldershortcutactionmanager.h b/src/foldershortcutactionmanager.h
index a22138a..35a8ce3 100644
--- a/src/foldershortcutactionmanager.h
+++ b/src/foldershortcutactionmanager.h
@@ -72,7 +72,7 @@ public Q_SLOTS:
*/
void shortcutChanged(const Akonadi::Collection &collection);
-private Q_SLOTS:
+private:
/**
* Removes the shortcut actions associated with a folder.
*/
diff --git a/src/identity/identitydialog.cpp b/src/identity/identitydialog.cpp
index 2020d09..9d2330a 100644
--- a/src/identity/identitydialog.cpp
+++ b/src/identity/identitydialog.cpp
@@ -137,10 +137,8 @@ public:
void init() override;
-private Q_SLOTS:
- void onCustomItemSelected(const QVariant &type);
-
private:
+ void onCustomItemSelected(const QVariant &type);
QString mEmail;
QString mName;
KeyType mKeyType;
@@ -158,10 +156,8 @@ public:
void slotCancel() override;
void start();
-private Q_SLOTS:
- void keyGenerated(const GpgME::KeyGenerationResult &result);
-
private:
+ void keyGenerated(const GpgME::KeyGenerationResult &result);
QString mName;
QString mEmail;
QGpgME::Job *mJob = nullptr;
diff --git a/src/searchdialog/searchwindow.h b/src/searchdialog/searchwindow.h
index be23e2e..3be6e41 100644
--- a/src/searchdialog/searchwindow.h
+++ b/src/searchdialog/searchwindow.h
@@ -113,7 +113,7 @@ protected:
void createSearchModel();
-private Q_SLOTS:
+private:
void updateCollectionStatistic(Akonadi::Collection::Id, const Akonadi::CollectionStatistics &);
void slotClose();
@@ -151,6 +151,7 @@ private Q_SLOTS:
void slotSearchCollectionsFetched(KJob *job);
void slotJumpToFolder();
+
private:
void doSearch();
QVector<qint64> checkIncompleteIndex(const Akonadi::Collection::List &searchCols, bool recursive);
@@ -158,16 +159,19 @@ private:
QPointer<PimCommon::SelectMultiCollectionDialog> mSelectMultiCollectionDialog;
QVector<Akonadi::Collection> mCollectionId;
Akonadi::SearchQuery mQuery;
- bool mCloseRequested = false;
- int mSortColumn = 0;
Qt::SortOrder mSortOrder = Qt::AscendingOrder;
Akonadi::Collection mFolder;
- KJob *mSearchJob = nullptr;
- KMSearchMessageModel *mResultModel = nullptr;
Ui_SearchWindow mUi;
KGuiItem mStartSearchGuiItem;
KGuiItem mStopSearchGuiItem;
+ MailCommon::SearchPattern mSearchPattern;
+
+ bool mCloseRequested = false;
+ int mSortColumn = 0;
+
+ KJob *mSearchJob = nullptr;
+ KMSearchMessageModel *mResultModel = nullptr;
QPushButton *mSearchButton = nullptr;
QAction *mReplyAction = nullptr;
@@ -185,7 +189,6 @@ private:
QByteArray mHeaderState;
// not owned by us
KMMainWidget *mKMMainWidget = nullptr;
- MailCommon::SearchPattern mSearchPattern;
SearchPatternWarning *mSearchPatternWidget = nullptr;
Akonadi::StandardMailActionManager *mAkonadiStandardAction = nullptr;