diff options
author | Christian Mollekopf <chrigi_1@fastmail.fm> | 2016-07-11 11:55:29 +0200 |
---|---|---|
committer | Christian Mollekopf <chrigi_1@fastmail.fm> | 2016-07-11 11:55:29 +0200 |
commit | 3a3118e768e1447dc7524328e84b8d7faef81fe1 (patch) | |
tree | af5582170ed6164fffc9365f34b17bf449c0db40 /common/genericresource.h | |
parent | f9379318d801df204cc50385c5eca1f28e91755e (diff) | |
parent | ce2fd2666f084eebe443598f6f3740a02913091e (diff) | |
download | sink-3a3118e768e1447dc7524328e84b8d7faef81fe1.tar.gz sink-3a3118e768e1447dc7524328e84b8d7faef81fe1.zip |
Merge branch 'feature/notifications' into develop
Diffstat (limited to 'common/genericresource.h')
-rw-r--r-- | common/genericresource.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/common/genericresource.h b/common/genericresource.h index 0878968..25892ca 100644 --- a/common/genericresource.h +++ b/common/genericresource.h | |||
@@ -40,6 +40,9 @@ class Synchronizer; | |||
40 | */ | 40 | */ |
41 | class SINK_EXPORT GenericResource : public Resource | 41 | class SINK_EXPORT GenericResource : public Resource |
42 | { | 42 | { |
43 | protected: | ||
44 | SINK_DEBUG_AREA("resource") | ||
45 | SINK_DEBUG_COMPONENT(mResourceInstanceIdentifier) | ||
43 | public: | 46 | public: |
44 | GenericResource(const QByteArray &resourceType, const QByteArray &resourceInstanceIdentifier, const QSharedPointer<Pipeline> &pipeline); | 47 | GenericResource(const QByteArray &resourceType, const QByteArray &resourceInstanceIdentifier, const QSharedPointer<Pipeline> &pipeline); |
45 | virtual ~GenericResource(); | 48 | virtual ~GenericResource(); |
@@ -77,7 +80,7 @@ protected: | |||
77 | QSharedPointer<Pipeline> mPipeline; | 80 | QSharedPointer<Pipeline> mPipeline; |
78 | 81 | ||
79 | private: | 82 | private: |
80 | CommandProcessor *mProcessor; | 83 | std::unique_ptr<CommandProcessor> mProcessor; |
81 | QSharedPointer<ChangeReplay> mChangeReplay; | 84 | QSharedPointer<ChangeReplay> mChangeReplay; |
82 | QSharedPointer<Synchronizer> mSynchronizer; | 85 | QSharedPointer<Synchronizer> mSynchronizer; |
83 | int mError; | 86 | int mError; |