summaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
Diffstat (limited to 'common')
-rw-r--r--common/genericresource.cpp10
-rw-r--r--common/genericresource.h4
2 files changed, 7 insertions, 7 deletions
diff --git a/common/genericresource.cpp b/common/genericresource.cpp
index a6213d7..1af9226 100644
--- a/common/genericresource.cpp
+++ b/common/genericresource.cpp
@@ -104,11 +104,11 @@ private:
104/** 104/**
105 * Drives the pipeline using the output from all command queues 105 * Drives the pipeline using the output from all command queues
106 */ 106 */
107class Processor : public QObject 107class CommandProcessor : public QObject
108{ 108{
109 Q_OBJECT 109 Q_OBJECT
110public: 110public:
111 Processor(Akonadi2::Pipeline *pipeline, QList<MessageQueue*> commandQueues) 111 CommandProcessor(Akonadi2::Pipeline *pipeline, QList<MessageQueue*> commandQueues)
112 : QObject(), 112 : QObject(),
113 mPipeline(pipeline), 113 mPipeline(pipeline),
114 mCommandQueues(commandQueues), 114 mCommandQueues(commandQueues),
@@ -120,7 +120,7 @@ public:
120 mPipeline->commit(); 120 mPipeline->commit();
121 121
122 for (auto queue : mCommandQueues) { 122 for (auto queue : mCommandQueues) {
123 const bool ret = connect(queue, &MessageQueue::messageReady, this, &Processor::process); 123 const bool ret = connect(queue, &MessageQueue::messageReady, this, &CommandProcessor::process);
124 Q_UNUSED(ret); 124 Q_UNUSED(ret);
125 } 125 }
126 } 126 }
@@ -273,8 +273,8 @@ GenericResource::GenericResource(const QByteArray &resourceInstanceIdentifier, c
273 mError(0), 273 mError(0),
274 mClientLowerBoundRevision(std::numeric_limits<qint64>::max()) 274 mClientLowerBoundRevision(std::numeric_limits<qint64>::max())
275{ 275{
276 mProcessor = new Processor(mPipeline.data(), QList<MessageQueue*>() << &mUserQueue << &mSynchronizerQueue); 276 mProcessor = new CommandProcessor(mPipeline.data(), QList<MessageQueue*>() << &mUserQueue << &mSynchronizerQueue);
277 QObject::connect(mProcessor, &Processor::error, [this](int errorCode, const QString &msg) { onProcessorError(errorCode, msg); }); 277 QObject::connect(mProcessor, &CommandProcessor::error, [this](int errorCode, const QString &msg) { onProcessorError(errorCode, msg); });
278 QObject::connect(mPipeline.data(), &Pipeline::revisionUpdated, this, &Resource::revisionUpdated); 278 QObject::connect(mPipeline.data(), &Pipeline::revisionUpdated, this, &Resource::revisionUpdated);
279 mSourceChangeReplay = new ChangeReplay(resourceInstanceIdentifier, [this](const QByteArray &type, const QByteArray &key, const QByteArray &value) { 279 mSourceChangeReplay = new ChangeReplay(resourceInstanceIdentifier, [this](const QByteArray &type, const QByteArray &key, const QByteArray &value) {
280 return this->replay(type, key, value); 280 return this->replay(type, key, value);
diff --git a/common/genericresource.h b/common/genericresource.h
index a58a7c3..9c8b977 100644
--- a/common/genericresource.h
+++ b/common/genericresource.h
@@ -26,7 +26,7 @@
26#include <domainadaptor.h> 26#include <domainadaptor.h>
27#include <QTimer> 27#include <QTimer>
28 28
29class Processor; 29class CommandProcessor;
30class ChangeReplay; 30class ChangeReplay;
31 31
32namespace Akonadi2 32namespace Akonadi2
@@ -67,7 +67,7 @@ protected:
67 QSharedPointer<Pipeline> mPipeline; 67 QSharedPointer<Pipeline> mPipeline;
68 68
69private: 69private:
70 Processor *mProcessor; 70 CommandProcessor *mProcessor;
71 ChangeReplay *mSourceChangeReplay; 71 ChangeReplay *mSourceChangeReplay;
72 int mError; 72 int mError;
73 QTimer mCommitQueueTimer; 73 QTimer mCommitQueueTimer;