summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <montel@kde.org>2016-07-28 11:19:35 (GMT)
committerMontel Laurent <montel@kde.org>2016-07-28 11:19:52 (GMT)
commitafdc8961e6e0a663bad66ad07bd1d07b365509d4 (patch)
tree87651dec6864035cebe4d39f9ff6605a3603293d
parentdcaebd1af68a9b5e40195e0b53dbd0f1aa62bb51 (diff)
Remove not necessary private Q_SLOTS
-rw-r--r--resources/dav/resource/davfreebusyhandler.h4
-rw-r--r--resources/dav/resource/davgroupwareresource.h2
-rw-r--r--resources/dav/resource/searchdialog.h3
-rw-r--r--resources/dav/resource/setupwizard.h12
-rw-r--r--resources/dav/resource/urlconfigurationdialog.h4
-rw-r--r--resources/folderarchivesettings/folderarchivesettingpage.h4
-rw-r--r--resources/icaldir/dirsettingsdialog.h4
-rw-r--r--resources/imap/addcollectiontask.h8
-rw-r--r--resources/imap/additemtask.h9
9 files changed, 15 insertions, 35 deletions
diff --git a/resources/dav/resource/davfreebusyhandler.h b/resources/dav/resource/davfreebusyhandler.h
index c839c39..4b5a553 100644
--- a/resources/dav/resource/davfreebusyhandler.h
+++ b/resources/dav/resource/davfreebusyhandler.h
@@ -69,11 +69,9 @@ Q_SIGNALS:
*/
void freeBusyRetrieved(const QString &email, const QString &freeBusy, bool success, const QString &errorText);
-private Q_SLOTS:
+private:
void onPrincipalSearchJobFinished(KJob *job);
void onRetrieveFreeBusyJobFinished(KJob *job);
-
-private:
/**
* Simple struct to track the state of requests
*/
diff --git a/resources/dav/resource/davgroupwareresource.h b/resources/dav/resource/davgroupwareresource.h
index 05e2c10..e18610f 100644
--- a/resources/dav/resource/davgroupwareresource.h
+++ b/resources/dav/resource/davgroupwareresource.h
@@ -69,7 +69,6 @@ private:
ItemUpdateChange
};
-private Q_SLOTS:
void createInitialCache();
void onCreateInitialCacheReady(KJob *);
@@ -103,7 +102,6 @@ private Q_SLOTS:
void onConflictModifyJobFinished(KJob *job);
void onDeletedItemRecreated(KJob *job);
-private:
void doItemChange(const Akonadi::Item &item, const Akonadi::Item::List &dependentItems = Akonadi::Item::List());
void doItemRemoval(const Akonadi::Item &item);
void handleConflict(const Akonadi::Item &localItem,
diff --git a/resources/dav/resource/searchdialog.h b/resources/dav/resource/searchdialog.h
index 581ba4a..789a325 100644
--- a/resources/dav/resource/searchdialog.h
+++ b/resources/dav/resource/searchdialog.h
@@ -44,13 +44,12 @@ public:
QStringList selection() const;
-private Q_SLOTS:
+private:
void checkUserInput();
void search();
void onSearchJobFinished(KJob *job);
void onCollectionsFetchJobFinished(KJob *job);
-private:
Ui::SearchDialog mUi;
QStandardItemModel *mModel;
int mSubJobCount;
diff --git a/resources/dav/resource/setupwizard.h b/resources/dav/resource/setupwizard.h
index af3d533..196a6d0 100644
--- a/resources/dav/resource/setupwizard.h
+++ b/resources/dav/resource/setupwizard.h
@@ -101,10 +101,8 @@ public:
bool validatePage() Q_DECL_OVERRIDE;
-private Q_SLOTS:
- void manualConfigToggled(bool toggled);
-
private:
+ void manualConfigToggled(bool toggled);
QButtonGroup *mServerGroup;
QComboBox *mProvidersCombo;
};
@@ -119,10 +117,8 @@ public:
void initializePage() Q_DECL_OVERRIDE;
void cleanupPage() Q_DECL_OVERRIDE;
-private Q_SLOTS:
- void urlElementChanged();
-
private:
+ void urlElementChanged();
QFormLayout *mLayout;
KLineEdit *mHost;
KLineEdit *mPath;
@@ -143,11 +139,9 @@ class CheckPage : public QWizardPage
public:
explicit CheckPage(QWidget *parent = Q_NULLPTR);
-private Q_SLOTS:
+private:
void checkConnection();
void onFetchDone(KJob *);
-
-private:
QTextBrowser *mStatusLabel;
};
diff --git a/resources/dav/resource/urlconfigurationdialog.h b/resources/dav/resource/urlconfigurationdialog.h
index 7181bdf..47502fa 100644
--- a/resources/dav/resource/urlconfigurationdialog.h
+++ b/resources/dav/resource/urlconfigurationdialog.h
@@ -55,7 +55,7 @@ public:
void setDefaultPassword(const QString &password);
void setPassword(const QString &password);
-private Q_SLOTS:
+private:
void onConfigChanged();
void checkUserInput();
void onFetchButtonClicked();
@@ -63,8 +63,6 @@ private Q_SLOTS:
void onCollectionsFetchDone(KJob *job);
void onModelDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight);
void onChangeDisplayNameFinished(KJob *job);
-
-private:
void initModel();
bool checkUserAuthInput();
void addModelRow(const QString &displayName, const QString &url);
diff --git a/resources/folderarchivesettings/folderarchivesettingpage.h b/resources/folderarchivesettings/folderarchivesettingpage.h
index 8a2d259..ac7e4f6 100644
--- a/resources/folderarchivesettings/folderarchivesettingpage.h
+++ b/resources/folderarchivesettings/folderarchivesettingpage.h
@@ -56,10 +56,8 @@ public:
void loadSettings();
void writeSettings();
-private Q_SLOTS:
- void slotEnableChanged(bool enabled);
-
private:
+ void slotEnableChanged(bool enabled);
QString mInstanceName;
QCheckBox *mEnabled;
FolderArchiveComboBox *mArchiveNamed;
diff --git a/resources/icaldir/dirsettingsdialog.h b/resources/icaldir/dirsettingsdialog.h
index 05353fa..dfcd1fa 100644
--- a/resources/icaldir/dirsettingsdialog.h
+++ b/resources/icaldir/dirsettingsdialog.h
@@ -38,11 +38,9 @@ public:
QString resourceName() const;
-private Q_SLOTS:
+private:
void save();
void validate();
-
-private:
Ui::SettingsDialog ui;
KConfigDialogManager *mManager;
QPushButton *mOkButton;
diff --git a/resources/imap/addcollectiontask.h b/resources/imap/addcollectiontask.h
index 1227288..687a4e8 100644
--- a/resources/imap/addcollectiontask.h
+++ b/resources/imap/addcollectiontask.h
@@ -37,15 +37,13 @@ public:
explicit AddCollectionTask(const ResourceStateInterface::Ptr &resource, QObject *parent = Q_NULLPTR);
virtual ~AddCollectionTask();
-private Q_SLOTS:
- void onCreateDone(KJob *job);
- void onSubscribeDone(KJob *job);
- void onSetMetaDataDone(KJob *job);
-
protected:
void doStart(KIMAP::Session *session) Q_DECL_OVERRIDE;
private:
+ void onCreateDone(KJob *job);
+ void onSubscribeDone(KJob *job);
+ void onSetMetaDataDone(KJob *job);
Akonadi::Collection m_collection;
uint m_pendingJobs;
KIMAP::Session *m_session;
diff --git a/resources/imap/additemtask.h b/resources/imap/additemtask.h
index e1d96da..c9d36aa 100644
--- a/resources/imap/additemtask.h
+++ b/resources/imap/additemtask.h
@@ -32,15 +32,14 @@ public:
explicit AddItemTask(ResourceStateInterface::Ptr resource, QObject *parent = Q_NULLPTR);
virtual ~AddItemTask();
-private Q_SLOTS:
- void onAppendMessageDone(KJob *job);
- void onPreSearchSelectDone(KJob *job);
- void onSearchDone(KJob *job);
-
protected:
+
void doStart(KIMAP::Session *session) Q_DECL_OVERRIDE;
private:
+ void onAppendMessageDone(KJob *job);
+ void onPreSearchSelectDone(KJob *job);
+ void onSearchDone(KJob *job);
void triggerSearchJob(KIMAP::Session *session);
void applyFoundUid(qint64 uid);