The Savilerow project

Merge lp:~ssweeny/savilerow/unity-scope-worldcuphighlights-api050 into lp:~savilerow-team/savilerow/unity-scope-worldcuphighlights

  1. unity-scope-worldcuphighlights-api050
  2. Merge into unity-scope-worldcuphighli...
Proposed by Scott Sweeny
Status: Merged
Merged at revision: 15
Proposed branch: lp:~ssweeny/savilerow/unity-scope-worldcuphighlights-api050
Merge into: lp:~savilerow-team/savilerow/unity-scope-worldcuphighlights
Diff against target: 170 lines (+23/-31)
7 files modified
CMakeLists.txt (+3/-3)
debian/changelog (+6/-0)
debian/control (+1/-1)
src/WorldCupHighlightsQuery.cpp (+3/-4)
src/WorldCupHighlightsQuery.h (+1/-2)
src/WorldCupHighlightsScope.cpp (+6/-14)
src/WorldCupHighlightsScope.h (+3/-7)
To merge this branch: bzr merge lp:~ssweeny/savilerow/unity-scope-worldcuphighlights-api050
Reviewer Review Type Date Requested Status
Chris Wayne (community) Approve
Review via email: mp+224831@code.launchpad.net

Description of the change

Updates to align with scopes API 0.5.0. No functional changes.

Tested on a Nexus 4 running the latest devel-proposed image.

To post a comment you must log in.
Revision history for this message
Chris Wayne (cwayne) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2014-02-22 05:48:51 +0000
3+++ CMakeLists.txt 2014-06-27 14:00:29 +0000
4@@ -12,7 +12,7 @@
5 FIND_PACKAGE(Qt5Test REQUIRED)
6 FIND_PACKAGE(PkgConfig REQUIRED)
7 PKG_CHECK_MODULES(UUID REQUIRED uuid>=2.20.0)
8-PKG_CHECK_MODULES(SCOPESLIB REQUIRED libunity-scopes>=0.3.0)
9+PKG_CHECK_MODULES(SCOPESLIB REQUIRED libunity-scopes>=0.5.0)
10
11 IF(${INTLTOOL_MERGE} MATCHES "INTLTOOL_MERGE-NOTFOUND")
12 MESSAGE(FATAL_ERROR "xxx")
13@@ -26,9 +26,9 @@
14 SET(GETTEXT_PACKAGE unity-scope-worldcuphighlights)
15 SET(LOCALE_DIR "${CMAKE_INSTALL_DATADIR}/locale")
16
17-SET(CUSTOM_INSTALL_LIBDIR /custom/usr/lib/arm-linux-gnueabihf)
18+SET(CUSTOM_INSTALL_LIBDIR /custom/lib/arm-linux-gnueabihf)
19 SET(CUSTOM_INSTALL_DATADIR /custom/xdg/data/)
20-SET(SCOPE_INSTALL_DIR ${CUSTOM_INSTALL_LIBDIR}/unity/scopes/scope-worldcuphighlights/)
21+SET(SCOPE_INSTALL_DIR ${CUSTOM_INSTALL_LIBDIR}/unity-scopes/scope-worldcuphighlights/)
22
23 CONFIGURE_FILE(
24 "${CMAKE_CURRENT_SOURCE_DIR}/src/config.h.in"
25
26=== modified file 'debian/changelog'
27--- debian/changelog 2014-03-26 19:03:11 +0000
28+++ debian/changelog 2014-06-27 14:00:29 +0000
29@@ -1,3 +1,9 @@
30+unity-scope-worldcuphighlights (0.5) UNRELEASED; urgency=medium
31+
32+ * Update for Scopes API version 0.5.0
33+
34+ -- Scott Sweeny <scott.sweeny@canonical.com> Tue, 24 Jun 2014 19:29:17 -0400
35+
36 unity-scope-worldcuphighlights (0.4) trusty; urgency=low
37
38 * Update for unity-scopes-api version 0.4.0
39
40=== modified file 'debian/control'
41--- debian/control 2014-01-21 17:35:58 +0000
42+++ debian/control 2014-06-27 14:00:29 +0000
43@@ -4,7 +4,7 @@
44 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
45 Build-Depends: cmake,
46 debhelper (>= 9),
47- libunity-scopes-dev (>= 0.2.0~),
48+ libunity-scopes-dev (>= 0.5.0~),
49 uuid-dev,
50 gettext,
51 intltool,
52
53=== modified file 'src/WorldCupHighlightsQuery.cpp'
54--- src/WorldCupHighlightsQuery.cpp 2014-03-26 19:03:11 +0000
55+++ src/WorldCupHighlightsQuery.cpp 2014-06-27 14:00:29 +0000
56@@ -33,10 +33,9 @@
57 using namespace std;
58 using namespace unity::scopes;
59
60-WorldCupHighlightsQuery::WorldCupHighlightsQuery(CannedQuery const& query, QStringList const& scopes, QString const& locale)
61- : SearchQueryBase(),
62- query_(query),
63- scopes_(scopes)
64+WorldCupHighlightsQuery::WorldCupHighlightsQuery(CannedQuery const& query, SearchMetadata const& metadata)
65+ : SearchQueryBase(query, metadata),
66+ query_(query)
67 {
68 }
69
70
71=== modified file 'src/WorldCupHighlightsQuery.h'
72--- src/WorldCupHighlightsQuery.h 2014-03-26 19:03:11 +0000
73+++ src/WorldCupHighlightsQuery.h 2014-06-27 14:00:29 +0000
74@@ -28,14 +28,13 @@
75 class WorldCupHighlightsQuery: public unity::scopes::SearchQueryBase
76 {
77 public:
78- WorldCupHighlightsQuery(unity::scopes::CannedQuery const& query, QStringList const& scopes, QString const& locale);
79+ WorldCupHighlightsQuery(unity::scopes::CannedQuery const& query, unity::scopes::SearchMetadata const& metadata);
80
81 virtual void run(unity::scopes::SearchReplyProxy const& reply) override;
82 virtual void cancelled() override;
83
84 private:
85 unity::scopes::CannedQuery query_;
86- QStringList scopes_;
87 };
88
89 #endif
90
91=== modified file 'src/WorldCupHighlightsScope.cpp'
92--- src/WorldCupHighlightsScope.cpp 2014-03-26 19:03:11 +0000
93+++ src/WorldCupHighlightsScope.cpp 2014-06-27 14:00:29 +0000
94@@ -67,33 +67,25 @@
95 delete m_app;
96 }
97
98-int WorldCupHighlightsScope::start(string const&, unity::scopes::RegistryProxy const&)
99+void WorldCupHighlightsScope::start(string const&, unity::scopes::RegistryProxy const&)
100 {
101- return VERSION;
102 }
103
104-SearchQueryBase::UPtr WorldCupHighlightsScope::search(CannedQuery const& query, SearchMetadata const&)
105+SearchQueryBase::UPtr WorldCupHighlightsScope::search(CannedQuery const& query, SearchMetadata const& metadata)
106 {
107- QStringList scopes;
108- SearchQueryBase::UPtr q(new WorldCupHighlightsQuery(query, scopes, m_locale));
109+ SearchQueryBase::UPtr q(new WorldCupHighlightsQuery(query, metadata));
110 return q;
111 }
112
113 PreviewQueryBase::UPtr WorldCupHighlightsScope::preview(Result const& result,
114 ActionMetadata const& hints)
115 {
116- PreviewQueryBase::UPtr previewer(new WorldCupHighlightsPreview(*this, result));
117+ PreviewQueryBase::UPtr previewer(new WorldCupHighlightsPreview(result, hints));
118 return previewer;
119 }
120
121-void WorldCupHighlightsScope::appendIfEnabled(QStringList &scopeToQuery, const QString &scopeId) const
122-{
123- if (!m_disabledScopes.contains(scopeId)) {
124- scopeToQuery << scopeId;
125- }
126-}
127-WorldCupHighlightsPreview::WorldCupHighlightsPreview(WorldCupHighlightsScope &scope, Result const &result)
128- : scope(scope),
129+WorldCupHighlightsPreview::WorldCupHighlightsPreview(Result const& result, ActionMetadata const& metadata)
130+ : PreviewQueryBase(result, metadata),
131 result(result)
132 {
133 }
134
135=== modified file 'src/WorldCupHighlightsScope.h'
136--- src/WorldCupHighlightsScope.h 2014-03-26 19:03:11 +0000
137+++ src/WorldCupHighlightsScope.h 2014-06-27 14:00:29 +0000
138@@ -37,30 +37,26 @@
139 WorldCupHighlightsScope();
140 ~WorldCupHighlightsScope();
141
142- virtual int start(std::string const&, unity::scopes::RegistryProxy const&) override;
143+ virtual void start(std::string const&, unity::scopes::RegistryProxy const&) override;
144 virtual void stop() override {}
145 virtual void run() override {}
146 virtual unity::scopes::SearchQueryBase::UPtr search(unity::scopes::CannedQuery const& query, unity::scopes::SearchMetadata const&) override;
147 virtual unity::scopes::PreviewQueryBase::UPtr preview(unity::scopes::Result const&, unity::scopes::ActionMetadata const&) override;
148
149 private:
150- void appendIfEnabled(QStringList &scopeToQuery, const QString &scopeId) const;
151- void updateDisabledScopes();
152-
153 QCoreApplication *m_app;
154 QString m_locale;
155- QSet<QString> m_disabledScopes;
156 };
157
158 class WorldCupHighlightsPreview : public unity::scopes::PreviewQueryBase
159 {
160 public:
161- WorldCupHighlightsPreview(WorldCupHighlightsScope &scope, unity::scopes::Result const& result);
162+ WorldCupHighlightsPreview(unity::scopes::Result const& result,
163+ unity::scopes::ActionMetadata const& metadata);
164 virtual void cancelled() override;
165 virtual void run(unity::scopes::PreviewReplyProxy const& reply) override;
166
167 private:
168- const WorldCupHighlightsScope &scope;
169 const unity::scopes::Result result;
170 };
171

Subscribers

People subscribed via source and target branches