← Back to branch summary

~mardy/unity-scopes-api/clientid-1554040

« back to all changes in this revision

Viewing changes to demo/scopes/scope-B/scope-B.cpp

  • Committer: CI bot
  • Author(s): Tarmac
  • Date: 2014-03-12 16:58:32 UTC
  • mfrom: (163.45.63 devel)
  • Revision ID: ps-jenkins@lists.canonical.com-20140312165832-ngmnoud825y533pk
Sync with devel branch - updated scopes API to 0.4.0. See RELEASE_NOTES for list of all changes. 

Show diffs side-by-side

added added

removed removed

Lines of Context:
demo/scopes/scope-B/scope-B.cpp
20
20
// In this demo we include individual headers. You may also,
21
21
// if you prefer, include just the unity-scopes.h convenience
22
22
// header.
23
 
#include <unity/scopes/Registry.h>
24
 
#include <unity/scopes/SearchReply.h>
25
23
#include <unity/scopes/CategorisedResult.h>
26
24
#include <unity/scopes/CategoryRenderer.h>
 
25
#include <unity/scopes/SearchReply.h>
 
26
#include <unity/scopes/Registry.h>
27
27
#include <unity/scopes/ScopeBase.h>
28
28
#include <unity/scopes/ScopeExceptions.h>
29
 
#include <unity/scopes/SearchQuery.h>
 
29
#include <unity/scopes/SearchQueryBase.h>
30
30
#include <unity/UnityExceptions.h>
31
31
 
 
32
#include <cassert>
32
33
#include <iostream>
33
 
#include <cassert>
34
34
 
35
35
#define EXPORT __attribute__ ((visibility ("default")))
36
36
 
42
42
// A Receiver instance remembers the query string and the reply object that was passed
43
43
// from upstream. Results from the child scopes are sent to that upstream reply object.
44
44
 
45
 
class Receiver: public SearchListener
 
45
class Receiver: public SearchListenerBase
46
46
{
47
47
public:
48
48
    virtual void push(Category::SCPtr category) override
85
85
    SearchReplyProxy upstream_;
86
86
};
87
87
 
88
 
class MyQuery : public SearchQuery
 
88
class MyQuery : public SearchQueryBase
89
89
{
90
90
public:
91
91
    MyQuery(string const& scope_name,
92
 
            Query const& query,
 
92
            CannedQuery const& query,
93
93
            ScopeProxy const& scope_c,
94
94
            ScopeProxy const& scope_d) :
95
95
        scope_name_(scope_name),
118
118
            assert(0);
119
119
        }
120
120
 
121
 
        SearchListener::SPtr reply(new Receiver(scope_name_, upstream_reply));
122
 
        create_subquery(scope_c_, query_.query_string(), reply);
123
 
        create_subquery(scope_d_, query_.query_string(), reply);
 
121
        SearchListenerBase::SPtr reply(new Receiver(scope_name_, upstream_reply));
 
122
        subsearch(scope_c_, query_.query_string(), reply);
 
123
        subsearch(scope_d_, query_.query_string(), reply);
124
124
    }
125
125
 
126
126
private:
127
127
    string scope_name_;
128
 
    Query query_;
 
128
    CannedQuery query_;
129
129
    ScopeProxy scope_c_;
130
130
    ScopeProxy scope_d_;
131
131
};
154
154
 
155
155
    virtual void stop() override {}
156
156
 
157
 
    virtual QueryBase::UPtr create_query(Query const& q, SearchMetadata const&) override
 
157
    virtual SearchQueryBase::UPtr search(CannedQuery const& q, SearchMetadata const&) override
158
158
    {
159
 
        QueryBase::UPtr query(new MyQuery(scope_name_, q, scope_c_, scope_d_));
 
159
        SearchQueryBase::UPtr query(new MyQuery(scope_name_, q, scope_c_, scope_d_));
160
160
        cout << "scope-B: created query: \"" << q.query_string() << "\"" << endl;
161
161
        return query;
162
162
    }
163
163
 
164
 
    virtual QueryBase::UPtr preview(Result const& result, ActionMetadata const&) override
 
164
    virtual PreviewQueryBase::UPtr preview(Result const& result, ActionMetadata const&) override
165
165
    {
166
166
        cout << "scope-B: preview: \"" << result.uri() << "\"" << endl;
167
167
        return nullptr;