diff options
| author | Christian Mollekopf <chrigi_1@fastmail.fm> | 2017-07-03 14:02:27 +0200 |
|---|---|---|
| committer | Christian Mollekopf <chrigi_1@fastmail.fm> | 2017-07-03 14:02:27 +0200 |
| commit | 55fe06979ceebe67553135b43aa47e70d931304b (patch) | |
| tree | 16b10a744879cc1872d6c07624b59ae64469ddbf /common/genericresource.h | |
| parent | 56fae95f49a1ca8ca614bd9f89b0ea5f872765e9 (diff) | |
| parent | 288946f1694c2abe1d2c5800c87339d1e8780e4b (diff) | |
| download | sink-55fe06979ceebe67553135b43aa47e70d931304b.tar.gz sink-55fe06979ceebe67553135b43aa47e70d931304b.zip | |
Merge branch 'develop'
Diffstat (limited to 'common/genericresource.h')
| -rw-r--r-- | common/genericresource.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/common/genericresource.h b/common/genericresource.h index 558145c..bffc697 100644 --- a/common/genericresource.h +++ b/common/genericresource.h | |||
| @@ -35,8 +35,6 @@ class CommandProcessor; | |||
| 35 | */ | 35 | */ |
| 36 | class SINK_EXPORT GenericResource : public Resource | 36 | class SINK_EXPORT GenericResource : public Resource |
| 37 | { | 37 | { |
| 38 | protected: | ||
| 39 | SINK_DEBUG_AREA("resource") | ||
| 40 | public: | 38 | public: |
| 41 | GenericResource(const Sink::ResourceContext &context, const QSharedPointer<Pipeline> &pipeline = QSharedPointer<Pipeline>()); | 39 | GenericResource(const Sink::ResourceContext &context, const QSharedPointer<Pipeline> &pipeline = QSharedPointer<Pipeline>()); |
| 42 | virtual ~GenericResource(); | 40 | virtual ~GenericResource(); |