~ubuntu-branches/ubuntu/trusty/unity-scopes-api/trusty-proposed

« back to all changes in this revision

Viewing changes to include/unity/scopes/internal/smartscopes/SSScopeObject.h

  • Committer: Package Import Robot
  • Author(s): Ubuntu daily release, Pawel Stolowski
  • Date: 2014-02-11 17:55:05 UTC
  • mfrom: (1.1.8)
  • Revision ID: package-import@ubuntu.com-20140211175505-av3z0612p7o8w54b
Tags: 0.3.1+14.04.20140211.2-0ubuntu1
[ Pawel Stolowski ]
* [ Pawel Stolowski ]
* Added preliminary API for filters and departments.
* Changes to preview action activation API: support for widget id.
* Changes to Annotation API.
* Return ScopeProxy from Result::target_scope_proxy (replaces activation_scope_name).

Show diffs side-by-side

added added

removed removed

Lines of Context:
34
34
namespace scopes
35
35
{
36
36
 
 
37
class ActionMetadata;
 
38
 
37
39
namespace internal
38
40
{
39
41
 
51
53
    virtual ~SSScopeObject() noexcept;
52
54
 
53
55
    // Remote operation implementations
54
 
    MWQueryCtrlProxy create_query(std::string const& q,
55
 
                                  VariantMap const& hints,
 
56
    MWQueryCtrlProxy create_query(Query const& q,
 
57
                                  SearchMetadata const& hints,
56
58
                                  MWReplyProxy const& reply,
57
59
                                  InvokeInfo const& info) override;
58
60
 
59
61
    MWQueryCtrlProxy activate(Result const& result,
60
 
                              VariantMap const& hints,
 
62
                              ActionMetadata const& hints,
61
63
                              MWReplyProxy const& reply,
62
64
                              InvokeInfo const& info) override;
63
65
 
64
 
    MWQueryCtrlProxy activate_preview_action(Result const& result,
65
 
                                             VariantMap const& hints,
66
 
                                             std::string const& action_id,
67
 
                                             MWReplyProxy const& reply,
68
 
                                             InvokeInfo const& info) override;
 
66
    MWQueryCtrlProxy perform_action(Result const& result,
 
67
                                    ActionMetadata const& hints,
 
68
                                    std::string const& widget_id,
 
69
                                    std::string const& action_id,
 
70
                                    MWReplyProxy const& reply,
 
71
                                    InvokeInfo const& info) override;
69
72
 
70
73
    MWQueryCtrlProxy preview(Result const& result,
71
 
                             VariantMap const& hints,
 
74
                             ActionMetadata const& hints,
72
75
                             MWReplyProxy const& reply,
73
76
                             InvokeInfo const& info) override;
74
77
 
75
78
private:
76
79
    MWQueryCtrlProxy query(InvokeInfo const& info,
77
80
                           MWReplyProxy const& reply,
78
 
                           std::function<QueryBase::SPtr(void)> const& query_factory_fun);
 
81
                           std::function<QueryBase::SPtr(void)> const& query_factory_fun,
 
82
                           std::function<void(QueryBase::SPtr)> const& query_object_fun);
79
83
 
80
84
private:
81
85
    std::string ss_scope_id_;