From 8355323c285584940d81157f2596855f99996977 Mon Sep 17 00:00:00 2001 From: Christian Mollekopf Date: Tue, 29 Dec 2015 10:02:58 +0100 Subject: Renamed Processor to CommandProcessor --- common/genericresource.cpp | 10 +++++----- common/genericresource.h | 4 ++-- 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: /** * Drives the pipeline using the output from all command queues */ -class Processor : public QObject +class CommandProcessor : public QObject { Q_OBJECT public: - Processor(Akonadi2::Pipeline *pipeline, QList commandQueues) + CommandProcessor(Akonadi2::Pipeline *pipeline, QList commandQueues) : QObject(), mPipeline(pipeline), mCommandQueues(commandQueues), @@ -120,7 +120,7 @@ public: mPipeline->commit(); for (auto queue : mCommandQueues) { - const bool ret = connect(queue, &MessageQueue::messageReady, this, &Processor::process); + const bool ret = connect(queue, &MessageQueue::messageReady, this, &CommandProcessor::process); Q_UNUSED(ret); } } @@ -273,8 +273,8 @@ GenericResource::GenericResource(const QByteArray &resourceInstanceIdentifier, c mError(0), mClientLowerBoundRevision(std::numeric_limits::max()) { - mProcessor = new Processor(mPipeline.data(), QList() << &mUserQueue << &mSynchronizerQueue); - QObject::connect(mProcessor, &Processor::error, [this](int errorCode, const QString &msg) { onProcessorError(errorCode, msg); }); + mProcessor = new CommandProcessor(mPipeline.data(), QList() << &mUserQueue << &mSynchronizerQueue); + QObject::connect(mProcessor, &CommandProcessor::error, [this](int errorCode, const QString &msg) { onProcessorError(errorCode, msg); }); QObject::connect(mPipeline.data(), &Pipeline::revisionUpdated, this, &Resource::revisionUpdated); mSourceChangeReplay = new ChangeReplay(resourceInstanceIdentifier, [this](const QByteArray &type, const QByteArray &key, const QByteArray &value) { 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 @@ #include #include -class Processor; +class CommandProcessor; class ChangeReplay; namespace Akonadi2 @@ -67,7 +67,7 @@ protected: QSharedPointer mPipeline; private: - Processor *mProcessor; + CommandProcessor *mProcessor; ChangeReplay *mSourceChangeReplay; int mError; QTimer mCommitQueueTimer; -- cgit v1.2.3