From 19f2cbb9566eddac697c673eed63c0e946f330a6 Mon Sep 17 00:00:00 2001 From: Christian Mollekopf Date: Wed, 17 Feb 2016 13:27:56 +0100 Subject: Use slots/signals instead of Q_SLOTS/Q_SIGNALS for clang-format compatibility --- common/genericresource.cpp | 4 ++-- common/genericresource.h | 2 +- common/listener.h | 6 +++--- common/pipeline.h | 2 +- common/resource.h | 2 +- common/resourceaccess.h | 8 ++++---- 6 files changed, 12 insertions(+), 12 deletions(-) (limited to 'common') diff --git a/common/genericresource.cpp b/common/genericresource.cpp index 2688df0..74a8cfb 100644 --- a/common/genericresource.cpp +++ b/common/genericresource.cpp @@ -70,10 +70,10 @@ public: return (lastReplayedRevision >= topRevision); } -Q_SIGNALS: +signals: void changesReplayed(); -public Q_SLOTS: +public slots: void revisionChanged() { auto mainStoreTransaction = mStorage.createTransaction(Storage::ReadOnly); diff --git a/common/genericresource.h b/common/genericresource.h index ceb6b61..b9bb994 100644 --- a/common/genericresource.h +++ b/common/genericresource.h @@ -56,7 +56,7 @@ public: static void removeFromDisk(const QByteArray &instanceIdentifier); static qint64 diskUsage(const QByteArray &instanceIdentifier); -private Q_SLOTS: +private slots: void updateLowerBoundRevision(); protected: diff --git a/common/listener.h b/common/listener.h index 5bcc93e..49ded1a 100644 --- a/common/listener.h +++ b/common/listener.h @@ -65,13 +65,13 @@ public: Listener(const QByteArray &resourceName, QObject *parent = 0); ~Listener(); -Q_SIGNALS: +signals: void noClients(); -public Q_SLOTS: +public slots: void closeAllConnections(); -private Q_SLOTS: +private slots: void acceptConnection(); void clientDropped(); void checkConnections(); diff --git a/common/pipeline.h b/common/pipeline.h index 096771f..0f989e4 100644 --- a/common/pipeline.h +++ b/common/pipeline.h @@ -69,7 +69,7 @@ public: */ qint64 cleanedUpRevision(); -Q_SIGNALS: +signals: void revisionUpdated(qint64); private: diff --git a/common/resource.h b/common/resource.h index ab30cb9..d0100f6 100644 --- a/common/resource.h +++ b/common/resource.h @@ -60,7 +60,7 @@ public: */ virtual void removeDataFromDisk(); -Q_SIGNALS: +signals: void revisionUpdated(qint64); void notify(Notification); diff --git a/common/resourceaccess.h b/common/resourceaccess.h index 3b03210..ce7e174 100644 --- a/common/resourceaccess.h +++ b/common/resourceaccess.h @@ -53,12 +53,12 @@ public: virtual KAsync::Job sendRevisionReplayedCommand(qint64 revision) {return KAsync::null(); }; virtual KAsync::Job sendInspectionCommand(const QByteArray &inspectionId, const QByteArray &domainType, const QByteArray &entityId, const QByteArray &property, const QVariant &expecedValue) {return KAsync::null(); }; -Q_SIGNALS: +signals: void ready(bool isReady); void revisionChanged(qint64 revision); void notification(Notification revision); -public Q_SLOTS: +public slots: virtual void open() = 0; virtual void close() = 0; }; @@ -88,11 +88,11 @@ public: */ static KAsync::Job > connectToServer(const QByteArray &identifier); -public Q_SLOTS: +public slots: void open() Q_DECL_OVERRIDE; void close() Q_DECL_OVERRIDE; -private Q_SLOTS: +private slots: //TODO: move these to the Private class void disconnected(); void connectionError(QLocalSocket::LocalSocketError error); -- cgit v1.2.3