diff options
author | Dan Vrátil <dvratil@redhat.com> | 2015-05-15 16:22:03 +0200 |
---|---|---|
committer | Dan Vrátil <dvratil@redhat.com> | 2015-05-15 16:22:31 +0200 |
commit | b43c0cf97615957e097daef29ff8febc1ec884c8 (patch) | |
tree | 445479bf66df161e8554844a478d99d03ba43061 /tests/clientapitest.cpp | |
parent | 9270185becb48401bf3b2337d248763df0873107 (diff) | |
download | sink-b43c0cf97615957e097daef29ff8febc1ec884c8.tar.gz sink-b43c0cf97615957e097daef29ff8febc1ec884c8.zip |
Adapt to KAsync namespace change
Diffstat (limited to 'tests/clientapitest.cpp')
-rw-r--r-- | tests/clientapitest.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/tests/clientapitest.cpp b/tests/clientapitest.cpp index 1a5d873..1ff683f 100644 --- a/tests/clientapitest.cpp +++ b/tests/clientapitest.cpp | |||
@@ -24,13 +24,13 @@ class DummyResourceFacade : public Akonadi2::StoreFacade<Akonadi2::ApplicationDo | |||
24 | { | 24 | { |
25 | public: | 25 | public: |
26 | ~DummyResourceFacade(){}; | 26 | ~DummyResourceFacade(){}; |
27 | Async::Job<void> create(const Akonadi2::ApplicationDomain::Event &domainObject) Q_DECL_OVERRIDE { return Async::null<void>(); }; | 27 | KAsync::Job<void> create(const Akonadi2::ApplicationDomain::Event &domainObject) Q_DECL_OVERRIDE { return KAsync::null<void>(); }; |
28 | Async::Job<void> modify(const Akonadi2::ApplicationDomain::Event &domainObject) Q_DECL_OVERRIDE { return Async::null<void>(); }; | 28 | KAsync::Job<void> modify(const Akonadi2::ApplicationDomain::Event &domainObject) Q_DECL_OVERRIDE { return KAsync::null<void>(); }; |
29 | Async::Job<void> remove(const Akonadi2::ApplicationDomain::Event &domainObject) Q_DECL_OVERRIDE { return Async::null<void>(); }; | 29 | KAsync::Job<void> remove(const Akonadi2::ApplicationDomain::Event &domainObject) Q_DECL_OVERRIDE { return KAsync::null<void>(); }; |
30 | 30 | ||
31 | Async::Job<qint64> load(const Akonadi2::Query &query, const std::function<void(const Akonadi2::ApplicationDomain::Event::Ptr &)> &resultCallback) | 31 | KAsync::Job<qint64> load(const Akonadi2::Query &query, const std::function<void(const Akonadi2::ApplicationDomain::Event::Ptr &)> &resultCallback) |
32 | { | 32 | { |
33 | return Async::start<qint64>([this, resultCallback](Async::Future<qint64> &future) { | 33 | return KAsync::start<qint64>([this, resultCallback](KAsync::Future<qint64> &future) { |
34 | qDebug() << "load called"; | 34 | qDebug() << "load called"; |
35 | for(const auto &result : results) { | 35 | for(const auto &result : results) { |
36 | resultCallback(result); | 36 | resultCallback(result); |
@@ -40,16 +40,16 @@ public: | |||
40 | }); | 40 | }); |
41 | } | 41 | } |
42 | 42 | ||
43 | Async::Job<void> load(const Akonadi2::Query &query, const QSharedPointer<Akonadi2::ResultProvider<Akonadi2::ApplicationDomain::Event::Ptr> > &resultProvider) Q_DECL_OVERRIDE | 43 | KAsync::Job<void> load(const Akonadi2::Query &query, const QSharedPointer<Akonadi2::ResultProvider<Akonadi2::ApplicationDomain::Event::Ptr> > &resultProvider) Q_DECL_OVERRIDE |
44 | { | 44 | { |
45 | auto runner = QSharedPointer<QueryRunner>::create(query); | 45 | auto runner = QSharedPointer<QueryRunner>::create(query); |
46 | //The runner only lives as long as the resultProvider | 46 | //The runner only lives as long as the resultProvider |
47 | resultProvider->setQueryRunner(runner); | 47 | resultProvider->setQueryRunner(runner); |
48 | QWeakPointer<Akonadi2::ResultProvider<Akonadi2::ApplicationDomain::Event::Ptr> > weakResultProvider = resultProvider; | 48 | QWeakPointer<Akonadi2::ResultProvider<Akonadi2::ApplicationDomain::Event::Ptr> > weakResultProvider = resultProvider; |
49 | capturedResultProvider = resultProvider; | 49 | capturedResultProvider = resultProvider; |
50 | runner->setQuery([this, weakResultProvider, query](qint64 oldRevision, qint64 newRevision) -> Async::Job<qint64> { | 50 | runner->setQuery([this, weakResultProvider, query](qint64 oldRevision, qint64 newRevision) -> KAsync::Job<qint64> { |
51 | qDebug() << "Creating query for revisions: " << oldRevision << newRevision; | 51 | qDebug() << "Creating query for revisions: " << oldRevision << newRevision; |
52 | return Async::start<qint64>([this, weakResultProvider, query](Async::Future<qint64> &future) { | 52 | return KAsync::start<qint64>([this, weakResultProvider, query](KAsync::Future<qint64> &future) { |
53 | auto resultProvider = weakResultProvider.toStrongRef(); | 53 | auto resultProvider = weakResultProvider.toStrongRef(); |
54 | if (!resultProvider) { | 54 | if (!resultProvider) { |
55 | Warning() << "Tried executing query after result provider is already gone"; | 55 | Warning() << "Tried executing query after result provider is already gone"; |
@@ -81,7 +81,7 @@ public: | |||
81 | }); | 81 | }); |
82 | } | 82 | } |
83 | 83 | ||
84 | return Async::start<void>([runner](Async::Future<void> &future) { | 84 | return KAsync::start<void>([runner](KAsync::Future<void> &future) { |
85 | runner->run().then<void>([&future]() { | 85 | runner->run().then<void>([&future]() { |
86 | //TODO if not live query, destroy runner. | 86 | //TODO if not live query, destroy runner. |
87 | future.setFinished(); | 87 | future.setFinished(); |