From d21aa4e35fb96fa3b07888f710cbc3440af8bdd3 Mon Sep 17 00:00:00 2001 From: Aaron Seigo Date: Thu, 18 Dec 2014 18:41:43 +0100 Subject: PipelineFilter -> Preprocessor --- common/pipeline.cpp | 26 +++++++++++++------------- common/pipeline.h | 12 ++++++------ 2 files changed, 19 insertions(+), 19 deletions(-) (limited to 'common') diff --git a/common/pipeline.cpp b/common/pipeline.cpp index 5606c30..cf508c5 100644 --- a/common/pipeline.cpp +++ b/common/pipeline.cpp @@ -37,10 +37,10 @@ public: } Storage storage; - QVector nullPipeline; - QVector newPipeline; - QVector modifiedPipeline; - QVector deletedPipeline; + QVector nullPipeline; + QVector newPipeline; + QVector modifiedPipeline; + QVector deletedPipeline; QVector activePipelines; bool stepScheduled; }; @@ -132,7 +132,7 @@ void Pipeline::pipelineCompleted(const PipelineState &state) class PipelineState::Private : public QSharedData { public: - Private(Pipeline *p, Pipeline::Type t, const QByteArray &k, QVector filters) + Private(Pipeline *p, Pipeline::Type t, const QByteArray &k, QVector filters) : pipeline(p), type(t), key(k), @@ -142,14 +142,14 @@ public: Private() : pipeline(0), - filterIt(QVector()), + filterIt(QVector()), idle(true) {} Pipeline *pipeline; Pipeline::Type type; QByteArray key; - QVectorIterator filterIt; + QVectorIterator filterIt; bool idle; }; @@ -159,7 +159,7 @@ PipelineState::PipelineState() } -PipelineState::PipelineState(Pipeline *pipeline, Pipeline::Type type, const QByteArray &key, const QVector &filters) +PipelineState::PipelineState(Pipeline *pipeline, Pipeline::Type type, const QByteArray &key, const QVector &filters) : d(new Private(pipeline, type, key, filters)) { } @@ -213,7 +213,7 @@ void PipelineState::step() } } -void PipelineState::processingCompleted(PipelineFilter *filter) +void PipelineState::processingCompleted(Preprocessor *filter) { if (d->pipeline && filter == d->filterIt.peekPrevious()) { d->idle = true; @@ -221,21 +221,21 @@ void PipelineState::processingCompleted(PipelineFilter *filter) } } -PipelineFilter::PipelineFilter() +Preprocessor::Preprocessor() : d(0) { } -PipelineFilter::~PipelineFilter() +Preprocessor::~Preprocessor() { } -void PipelineFilter::process(PipelineState state) +void Preprocessor::process(PipelineState state) { processingCompleted(state); } -void PipelineFilter::processingCompleted(PipelineState state) +void Preprocessor::processingCompleted(PipelineState state) { state.processingCompleted(this); } diff --git a/common/pipeline.h b/common/pipeline.h index 6ad78df..d7048ff 100644 --- a/common/pipeline.h +++ b/common/pipeline.h @@ -32,7 +32,7 @@ namespace Akonadi2 { class PipelineState; -class PipelineFilter; +class Preprocessor; class AKONADI2COMMON_EXPORT Pipeline : public QObject { @@ -74,7 +74,7 @@ class AKONADI2COMMON_EXPORT PipelineState public: // domain objects? PipelineState(); - PipelineState(Pipeline *pipeline, Pipeline::Type type, const QByteArray &key, const QVector &filters); + PipelineState(Pipeline *pipeline, Pipeline::Type type, const QByteArray &key, const QVector &filters); PipelineState(const PipelineState &other); ~PipelineState(); @@ -86,18 +86,18 @@ public: Pipeline::Type type() const; void step(); - void processingCompleted(PipelineFilter *filter); + void processingCompleted(Preprocessor *filter); private: class Private; QExplicitlySharedDataPointer d; }; -class AKONADI2COMMON_EXPORT PipelineFilter +class AKONADI2COMMON_EXPORT Preprocessor { public: - PipelineFilter(); - virtual ~PipelineFilter(); + Preprocessor(); + virtual ~Preprocessor(); virtual void process(PipelineState state); -- cgit v1.2.3