diff options
author | Christian Mollekopf <chrigi_1@fastmail.fm> | 2016-01-31 11:21:48 +0100 |
---|---|---|
committer | Christian Mollekopf <chrigi_1@fastmail.fm> | 2016-01-31 11:21:48 +0100 |
commit | cf8c6dfe32580d2d93cb67f496f50fa14c572f5c (patch) | |
tree | f06e531c8316810f6fed688f3d7c16fa6582c4ac /common/resultprovider.h | |
parent | 7c52358e3fc9798715895a57e6eee3274a2b84f3 (diff) | |
download | sink-cf8c6dfe32580d2d93cb67f496f50fa14c572f5c.tar.gz sink-cf8c6dfe32580d2d93cb67f496f50fa14c572f5c.zip |
Enabled and fixed a bunch of warnings
Diffstat (limited to 'common/resultprovider.h')
-rw-r--r-- | common/resultprovider.h | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/common/resultprovider.h b/common/resultprovider.h index 6958dbf..2d6efbe 100644 --- a/common/resultprovider.h +++ b/common/resultprovider.h | |||
@@ -27,8 +27,6 @@ | |||
27 | #include "resultset.h" | 27 | #include "resultset.h" |
28 | #include "log.h" | 28 | #include "log.h" |
29 | 29 | ||
30 | using namespace async; | ||
31 | |||
32 | namespace Sink { | 30 | namespace Sink { |
33 | 31 | ||
34 | /** | 32 | /** |
@@ -47,6 +45,11 @@ public: | |||
47 | 45 | ||
48 | } | 46 | } |
49 | 47 | ||
48 | virtual ~ResultProviderInterface() | ||
49 | { | ||
50 | |||
51 | } | ||
52 | |||
50 | virtual void add(const T &value) = 0; | 53 | virtual void add(const T &value) = 0; |
51 | virtual void modify(const T &value) = 0; | 54 | virtual void modify(const T &value) = 0; |
52 | virtual void remove(const T &value) = 0; | 55 | virtual void remove(const T &value) = 0; |
@@ -183,7 +186,7 @@ public: | |||
183 | 186 | ||
184 | void onDone(const std::function<void()> &callback) | 187 | void onDone(const std::function<void()> &callback) |
185 | { | 188 | { |
186 | mThreadBoundary = QSharedPointer<ThreadBoundary>::create(); | 189 | mThreadBoundary = QSharedPointer<async::ThreadBoundary>::create(); |
187 | mOnDoneCallback = callback; | 190 | mOnDoneCallback = callback; |
188 | } | 191 | } |
189 | 192 | ||
@@ -212,7 +215,7 @@ private: | |||
212 | 215 | ||
213 | QWeakPointer<ResultEmitter<T> > mResultEmitter; | 216 | QWeakPointer<ResultEmitter<T> > mResultEmitter; |
214 | std::function<void()> mOnDoneCallback; | 217 | std::function<void()> mOnDoneCallback; |
215 | QSharedPointer<ThreadBoundary> mThreadBoundary; | 218 | QSharedPointer<async::ThreadBoundary> mThreadBoundary; |
216 | std::function<void(const T &parent)> mFetcher; | 219 | std::function<void(const T &parent)> mFetcher; |
217 | }; | 220 | }; |
218 | 221 | ||
@@ -327,7 +330,7 @@ private: | |||
327 | std::function<void(void)> clearHandler; | 330 | std::function<void(void)> clearHandler; |
328 | 331 | ||
329 | std::function<void(const DomainType &parent)> mFetcher; | 332 | std::function<void(const DomainType &parent)> mFetcher; |
330 | ThreadBoundary mThreadBoundary; | 333 | async::ThreadBoundary mThreadBoundary; |
331 | }; | 334 | }; |
332 | 335 | ||
333 | template<class DomainType> | 336 | template<class DomainType> |