summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Vrátil <dvratil@kde.org>2016-07-28 18:49:49 (GMT)
committerDaniel Vrátil <dvratil@kde.org>2016-07-28 18:49:49 (GMT)
commit9d76d64bfe91fd7a1cd03e45c52a8dd516f4dd2d (patch)
treedbc81196ad1bda0b74c768dec2a7764832647983
parent92dd2b545a969668d89ccd672d40a59ef6ea160c (diff)
Revert "Not necessary to use private Q_SLOTS here"
This breaks invocation via QMetaObject::invokeMethod() or other methods. CCMAIL: montel@kde.org This reverts commit 92dd2b545a969668d89ccd672d40a59ef6ea160c.
-rw-r--r--src/server/notificationsource.h4
-rw-r--r--src/server/preprocessorinstance.h3
-rw-r--r--src/server/search/agentsearchinstance.h4
-rw-r--r--src/server/search/searchmanager.h2
-rw-r--r--src/server/storage/itemretrievaljob.h4
-rw-r--r--src/shared/akapplication.h4
-rw-r--r--src/widgets/tagwidget.h4
7 files changed, 17 insertions, 8 deletions
diff --git a/src/server/notificationsource.h b/src/server/notificationsource.h
index e9c551a..72acc98 100644
--- a/src/server/notificationsource.h
+++ b/src/server/notificationsource.h
@@ -120,8 +120,10 @@ Q_SIGNALS:
Q_SCRIPTABLE void ignoredSessionsChanged();
Q_SCRIPTABLE void monitoredTypesChanged();
-private:
+private Q_SLOTS:
void serviceUnregistered(const QString &serviceName);
+
+private:
bool isCollectionMonitored(Entity::Id id) const;
bool isMimeTypeMonitored(const QString &mimeType) const;
bool isMoveDestinationResourceMonitored(const Protocol::ChangeNotification &msg) const;
diff --git a/src/server/preprocessorinstance.h b/src/server/preprocessorinstance.h
index d40951a..669a335 100644
--- a/src/server/preprocessorinstance.h
+++ b/src/server/preprocessorinstance.h
@@ -183,8 +183,7 @@ private:
*/
void processHeadItem();
-private:
-
+private Q_SLOTS:
/**
* This is invoked to signal that the processing of the current (head)
diff --git a/src/server/search/agentsearchinstance.h b/src/server/search/agentsearchinstance.h
index ab2add5..95b2be7 100644
--- a/src/server/search/agentsearchinstance.h
+++ b/src/server/search/agentsearchinstance.h
@@ -42,8 +42,10 @@ public:
OrgFreedesktopAkonadiAgentSearchInterface *interface() const;
-private:
+private Q_SLOTS:
void serviceOwnerChanged(const QString &service, const QString &oldName, const QString &newName);
+
+private:
QString mId;
OrgFreedesktopAkonadiAgentSearchInterface *mInterface;
QDBusServiceWatcher *mServiceWatcher;
diff --git a/src/server/search/searchmanager.h b/src/server/search/searchmanager.h
index a41f762..d8a2ae3 100644
--- a/src/server/search/searchmanager.h
+++ b/src/server/search/searchmanager.h
@@ -92,7 +92,7 @@ public Q_SLOTS:
*/
virtual void unregisterInstance(const QString &id);
-private:
+private Q_SLOTS:
void searchUpdateTimeout();
void searchUpdateResultsAvailable(const QSet<qint64> &results);
diff --git a/src/server/storage/itemretrievaljob.h b/src/server/storage/itemretrievaljob.h
index ca7444a..1909899 100644
--- a/src/server/storage/itemretrievaljob.h
+++ b/src/server/storage/itemretrievaljob.h
@@ -50,8 +50,10 @@ public:
Q_SIGNALS:
void requestCompleted(ItemRetrievalRequest *req, const QString &errorMsg);
-private:
+private Q_SLOTS:
void callFinished(QDBusPendingCallWatcher *watcher);
+
+private:
ItemRetrievalRequest *m_request;
bool m_active;
OrgFreedesktopAkonadiResourceInterface *m_interface;
diff --git a/src/shared/akapplication.h b/src/shared/akapplication.h
index 91416fb..dbd4936 100644
--- a/src/shared/akapplication.h
+++ b/src/shared/akapplication.h
@@ -59,8 +59,10 @@ protected:
void init();
QScopedPointer<QCoreApplication> mApp;
-private:
+private Q_SLOTS:
void pollSessionBus() const;
+
+private:
int mArgc;
char **mArgv;
QString mInstanceId;
diff --git a/src/widgets/tagwidget.h b/src/widgets/tagwidget.h
index 4d9ab1f..a16d5f4 100644
--- a/src/widgets/tagwidget.h
+++ b/src/widgets/tagwidget.h
@@ -63,9 +63,11 @@ public:
Q_SIGNALS:
void selectionChanged(const Akonadi::Tag::List &tags);
-private:
+private Q_SLOTS:
void editTags();
void updateView();
+
+private:
class Private;
QSharedPointer<Private> d;
};