diff options
author | Christian Mollekopf <chrigi_1@fastmail.fm> | 2015-01-19 03:16:29 +0100 |
---|---|---|
committer | Christian Mollekopf <chrigi_1@fastmail.fm> | 2015-01-19 03:16:29 +0100 |
commit | db477b2f35411a55c051d59588b6fabd153e4013 (patch) | |
tree | caf886e7fa8333168208db736da6b2dfcb85ee67 /common/pipeline.h | |
parent | 58385e4a48ff85fa847b4264d3f5216f62af24c1 (diff) | |
download | sink-db477b2f35411a55c051d59588b6fabd153e4013.tar.gz sink-db477b2f35411a55c051d59588b6fabd153e4013.zip |
Fixed pipeline.
Steps are now finally processed as they should be and a job tracks the processing progress.
Diffstat (limited to 'common/pipeline.h')
-rw-r--r-- | common/pipeline.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/common/pipeline.h b/common/pipeline.h index 918d21e..a574d27 100644 --- a/common/pipeline.h +++ b/common/pipeline.h | |||
@@ -66,7 +66,8 @@ private Q_SLOTS: | |||
66 | 66 | ||
67 | private: | 67 | private: |
68 | void pipelineStepped(const PipelineState &state); | 68 | void pipelineStepped(const PipelineState &state); |
69 | void pipelineCompleted(const PipelineState &state); | 69 | //Don't use a reference here (it would invalidate itself) |
70 | void pipelineCompleted(PipelineState state); | ||
70 | void scheduleStep(); | 71 | void scheduleStep(); |
71 | 72 | ||
72 | friend class PipelineState; | 73 | friend class PipelineState; |
@@ -94,6 +95,8 @@ public: | |||
94 | void step(); | 95 | void step(); |
95 | void processingCompleted(Preprocessor *filter); | 96 | void processingCompleted(Preprocessor *filter); |
96 | 97 | ||
98 | void callback(); | ||
99 | |||
97 | private: | 100 | private: |
98 | class Private; | 101 | class Private; |
99 | QExplicitlySharedDataPointer<Private> d; | 102 | QExplicitlySharedDataPointer<Private> d; |
@@ -106,9 +109,9 @@ public: | |||
106 | virtual ~Preprocessor(); | 109 | virtual ~Preprocessor(); |
107 | 110 | ||
108 | //TODO pass actual command as well, for changerecording | 111 | //TODO pass actual command as well, for changerecording |
109 | virtual void process(PipelineState state, const Akonadi2::Entity &); | 112 | virtual void process(const PipelineState &state, const Akonadi2::Entity &); |
110 | //TODO to record progress | 113 | //TODO to record progress |
111 | // virtual QString id(); | 114 | virtual QString id() const; |
112 | 115 | ||
113 | protected: | 116 | protected: |
114 | void processingCompleted(PipelineState state); | 117 | void processingCompleted(PipelineState state); |