diff options
author | Aaron Seigo <aseigo@kde.org> | 2014-12-18 18:41:43 +0100 |
---|---|---|
committer | Aaron Seigo <aseigo@kde.org> | 2014-12-18 18:41:58 +0100 |
commit | d21aa4e35fb96fa3b07888f710cbc3440af8bdd3 (patch) | |
tree | 33580d5d130b6d7e258976884efe8f8dc05c5ba4 | |
parent | 9a86d030aec4d3a54d76f640c7aec31f4f35d166 (diff) | |
download | sink-d21aa4e35fb96fa3b07888f710cbc3440af8bdd3.tar.gz sink-d21aa4e35fb96fa3b07888f710cbc3440af8bdd3.zip |
PipelineFilter -> Preprocessor
-rw-r--r-- | common/pipeline.cpp | 26 | ||||
-rw-r--r-- | common/pipeline.h | 12 |
2 files changed, 19 insertions, 19 deletions
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: | |||
37 | } | 37 | } |
38 | 38 | ||
39 | Storage storage; | 39 | Storage storage; |
40 | QVector<PipelineFilter *> nullPipeline; | 40 | QVector<Preprocessor *> nullPipeline; |
41 | QVector<PipelineFilter *> newPipeline; | 41 | QVector<Preprocessor *> newPipeline; |
42 | QVector<PipelineFilter *> modifiedPipeline; | 42 | QVector<Preprocessor *> modifiedPipeline; |
43 | QVector<PipelineFilter *> deletedPipeline; | 43 | QVector<Preprocessor *> deletedPipeline; |
44 | QVector<PipelineState> activePipelines; | 44 | QVector<PipelineState> activePipelines; |
45 | bool stepScheduled; | 45 | bool stepScheduled; |
46 | }; | 46 | }; |
@@ -132,7 +132,7 @@ void Pipeline::pipelineCompleted(const PipelineState &state) | |||
132 | class PipelineState::Private : public QSharedData | 132 | class PipelineState::Private : public QSharedData |
133 | { | 133 | { |
134 | public: | 134 | public: |
135 | Private(Pipeline *p, Pipeline::Type t, const QByteArray &k, QVector<PipelineFilter *> filters) | 135 | Private(Pipeline *p, Pipeline::Type t, const QByteArray &k, QVector<Preprocessor *> filters) |
136 | : pipeline(p), | 136 | : pipeline(p), |
137 | type(t), | 137 | type(t), |
138 | key(k), | 138 | key(k), |
@@ -142,14 +142,14 @@ public: | |||
142 | 142 | ||
143 | Private() | 143 | Private() |
144 | : pipeline(0), | 144 | : pipeline(0), |
145 | filterIt(QVector<PipelineFilter *>()), | 145 | filterIt(QVector<Preprocessor *>()), |
146 | idle(true) | 146 | idle(true) |
147 | {} | 147 | {} |
148 | 148 | ||
149 | Pipeline *pipeline; | 149 | Pipeline *pipeline; |
150 | Pipeline::Type type; | 150 | Pipeline::Type type; |
151 | QByteArray key; | 151 | QByteArray key; |
152 | QVectorIterator<PipelineFilter *> filterIt; | 152 | QVectorIterator<Preprocessor *> filterIt; |
153 | bool idle; | 153 | bool idle; |
154 | }; | 154 | }; |
155 | 155 | ||
@@ -159,7 +159,7 @@ PipelineState::PipelineState() | |||
159 | 159 | ||
160 | } | 160 | } |
161 | 161 | ||
162 | PipelineState::PipelineState(Pipeline *pipeline, Pipeline::Type type, const QByteArray &key, const QVector<PipelineFilter *> &filters) | 162 | PipelineState::PipelineState(Pipeline *pipeline, Pipeline::Type type, const QByteArray &key, const QVector<Preprocessor *> &filters) |
163 | : d(new Private(pipeline, type, key, filters)) | 163 | : d(new Private(pipeline, type, key, filters)) |
164 | { | 164 | { |
165 | } | 165 | } |
@@ -213,7 +213,7 @@ void PipelineState::step() | |||
213 | } | 213 | } |
214 | } | 214 | } |
215 | 215 | ||
216 | void PipelineState::processingCompleted(PipelineFilter *filter) | 216 | void PipelineState::processingCompleted(Preprocessor *filter) |
217 | { | 217 | { |
218 | if (d->pipeline && filter == d->filterIt.peekPrevious()) { | 218 | if (d->pipeline && filter == d->filterIt.peekPrevious()) { |
219 | d->idle = true; | 219 | d->idle = true; |
@@ -221,21 +221,21 @@ void PipelineState::processingCompleted(PipelineFilter *filter) | |||
221 | } | 221 | } |
222 | } | 222 | } |
223 | 223 | ||
224 | PipelineFilter::PipelineFilter() | 224 | Preprocessor::Preprocessor() |
225 | : d(0) | 225 | : d(0) |
226 | { | 226 | { |
227 | } | 227 | } |
228 | 228 | ||
229 | PipelineFilter::~PipelineFilter() | 229 | Preprocessor::~Preprocessor() |
230 | { | 230 | { |
231 | } | 231 | } |
232 | 232 | ||
233 | void PipelineFilter::process(PipelineState state) | 233 | void Preprocessor::process(PipelineState state) |
234 | { | 234 | { |
235 | processingCompleted(state); | 235 | processingCompleted(state); |
236 | } | 236 | } |
237 | 237 | ||
238 | void PipelineFilter::processingCompleted(PipelineState state) | 238 | void Preprocessor::processingCompleted(PipelineState state) |
239 | { | 239 | { |
240 | state.processingCompleted(this); | 240 | state.processingCompleted(this); |
241 | } | 241 | } |
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 | |||
32 | { | 32 | { |
33 | 33 | ||
34 | class PipelineState; | 34 | class PipelineState; |
35 | class PipelineFilter; | 35 | class Preprocessor; |
36 | 36 | ||
37 | class AKONADI2COMMON_EXPORT Pipeline : public QObject | 37 | class AKONADI2COMMON_EXPORT Pipeline : public QObject |
38 | { | 38 | { |
@@ -74,7 +74,7 @@ class AKONADI2COMMON_EXPORT PipelineState | |||
74 | public: | 74 | public: |
75 | // domain objects? | 75 | // domain objects? |
76 | PipelineState(); | 76 | PipelineState(); |
77 | PipelineState(Pipeline *pipeline, Pipeline::Type type, const QByteArray &key, const QVector<PipelineFilter *> &filters); | 77 | PipelineState(Pipeline *pipeline, Pipeline::Type type, const QByteArray &key, const QVector<Preprocessor *> &filters); |
78 | PipelineState(const PipelineState &other); | 78 | PipelineState(const PipelineState &other); |
79 | ~PipelineState(); | 79 | ~PipelineState(); |
80 | 80 | ||
@@ -86,18 +86,18 @@ public: | |||
86 | Pipeline::Type type() const; | 86 | Pipeline::Type type() const; |
87 | 87 | ||
88 | void step(); | 88 | void step(); |
89 | void processingCompleted(PipelineFilter *filter); | 89 | void processingCompleted(Preprocessor *filter); |
90 | 90 | ||
91 | private: | 91 | private: |
92 | class Private; | 92 | class Private; |
93 | QExplicitlySharedDataPointer<Private> d; | 93 | QExplicitlySharedDataPointer<Private> d; |
94 | }; | 94 | }; |
95 | 95 | ||
96 | class AKONADI2COMMON_EXPORT PipelineFilter | 96 | class AKONADI2COMMON_EXPORT Preprocessor |
97 | { | 97 | { |
98 | public: | 98 | public: |
99 | PipelineFilter(); | 99 | Preprocessor(); |
100 | virtual ~PipelineFilter(); | 100 | virtual ~Preprocessor(); |
101 | 101 | ||
102 | virtual void process(PipelineState state); | 102 | virtual void process(PipelineState state); |
103 | 103 | ||