diff options
author | Christian Mollekopf <chrigi_1@fastmail.fm> | 2015-07-30 13:43:31 +0200 |
---|---|---|
committer | Christian Mollekopf <chrigi_1@fastmail.fm> | 2015-07-30 13:43:31 +0200 |
commit | 01adeefb24bf72f1015e93aa5f075f93f56d94da (patch) | |
tree | ee6d204a47f246688202b4a3a9eb0db23b462f7f /common/genericresource.h | |
parent | 07572b25af45c41a82eb8ddfdecf18e58958788b (diff) | |
download | sink-01adeefb24bf72f1015e93aa5f075f93f56d94da.tar.gz sink-01adeefb24bf72f1015e93aa5f075f93f56d94da.zip |
Made the pipeline an implementation detail of the resource.
This removes one dependency from the Listener and will allow us
to test the Listener better.
Diffstat (limited to 'common/genericresource.h')
-rw-r--r-- | common/genericresource.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/common/genericresource.h b/common/genericresource.h index e9d5d59..4a285ea 100644 --- a/common/genericresource.h +++ b/common/genericresource.h | |||
@@ -22,6 +22,7 @@ | |||
22 | #include <akonadi2common_export.h> | 22 | #include <akonadi2common_export.h> |
23 | #include <resource.h> | 23 | #include <resource.h> |
24 | #include <messagequeue.h> | 24 | #include <messagequeue.h> |
25 | #include <flatbuffers/flatbuffers.h> | ||
25 | 26 | ||
26 | class Processor; | 27 | class Processor; |
27 | 28 | ||
@@ -34,14 +35,13 @@ namespace Akonadi2 | |||
34 | class AKONADI2COMMON_EXPORT GenericResource : public Resource | 35 | class AKONADI2COMMON_EXPORT GenericResource : public Resource |
35 | { | 36 | { |
36 | public: | 37 | public: |
37 | GenericResource(const QByteArray &resourceInstanceIdentifier); | 38 | GenericResource(const QByteArray &resourceInstanceIdentifier, const QSharedPointer<Pipeline> &pipeline = QSharedPointer<Pipeline>()); |
38 | virtual ~GenericResource(); | 39 | virtual ~GenericResource(); |
39 | 40 | ||
40 | virtual void processCommand(int commandId, const QByteArray &data, Pipeline *pipeline) Q_DECL_OVERRIDE; | 41 | virtual void processCommand(int commandId, const QByteArray &data) Q_DECL_OVERRIDE; |
41 | virtual KAsync::Job<void> synchronizeWithSource(Pipeline *pipeline) Q_DECL_OVERRIDE = 0; | 42 | virtual KAsync::Job<void> synchronizeWithSource() Q_DECL_OVERRIDE = 0; |
42 | virtual KAsync::Job<void> processAllMessages() Q_DECL_OVERRIDE; | 43 | virtual KAsync::Job<void> processAllMessages() Q_DECL_OVERRIDE; |
43 | 44 | ||
44 | virtual void configurePipeline(Pipeline *pipeline) Q_DECL_OVERRIDE; | ||
45 | int error() const; | 45 | int error() const; |
46 | 46 | ||
47 | protected: | 47 | protected: |
@@ -51,6 +51,7 @@ protected: | |||
51 | MessageQueue mUserQueue; | 51 | MessageQueue mUserQueue; |
52 | MessageQueue mSynchronizerQueue; | 52 | MessageQueue mSynchronizerQueue; |
53 | QByteArray mResourceInstanceIdentifier; | 53 | QByteArray mResourceInstanceIdentifier; |
54 | QSharedPointer<Pipeline> mPipeline; | ||
54 | 55 | ||
55 | private: | 56 | private: |
56 | Processor *mProcessor; | 57 | Processor *mProcessor; |