Merge lp:~savilerow-team/savilerow/unity-scope-selfservicebill-newapi into lp:~savilerow-team/savilerow/unity-scope-selfservicebill

[Chris Wayne]

New api

[Scott Sweeny (ssweeny)]

tested locally, and B/I/R for me.

review: Approve

[lp:~savilerow-team/savilerow/unity-scope-selfservicebill-newapi]

13. By Chris Wayne on 2014-03-27

releasing package unity-scope-selfservicebill version 0.3

14. By Chris Wayne on 2014-03-27

Fix install location

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-02-22 04:36:06 +0000
+++ CMakeLists.txt	2014-03-27 03:42:46 +0000
@@ -26,9 +26,9 @@
 SET(GETTEXT_PACKAGE unity-scope-selfservicebill)
 SET(LOCALE_DIR "${CMAKE_INSTALL_DATADIR}/locale")
 
-SET(CUSTOM_INSTALL_LIBDIR /custom/usr/lib/arm-linux-gnueabihf)
+SET(CUSTOM_INSTALL_LIBDIR /custom/lib/arm-linux-gnueabihf)
 SET(CUSTOM_INSTALL_DATADIR /custom/xdg/data/)
-SET(SCOPE_INSTALL_DIR ${CUSTOM_INSTALL_LIBDIR}/unity/scopes/scope-selfservicebill/)
+SET(SCOPE_INSTALL_DIR ${CUSTOM_INSTALL_LIBDIR}/unity-scopes/scope-selfservicebill/)
 
 CONFIGURE_FILE(
         "${CMAKE_CURRENT_SOURCE_DIR}/src/config.h.in"

=== modified file 'debian/changelog'
--- debian/changelog	2014-02-03 19:38:06 +0000
+++ debian/changelog	2014-03-27 03:42:46 +0000
@@ -1,3 +1,9 @@
+unity-scope-selfservicebill (0.3) trusty; urgency=medium
+
+  * Update to new api
+
+ -- Chris Wayne <[e-mail]>  Wed, 26 Mar 2014 22:26:30 -0400
+
 unity-scope-selfservicebill (0.2) UNRELEASED; urgency=low
 
   * Update renderer.json with karni's fixes 

=== modified file 'src/SelfServiceBillQuery.cpp'
--- src/SelfServiceBillQuery.cpp	2014-02-22 04:36:06 +0000
+++ src/SelfServiceBillQuery.cpp	2014-03-27 03:42:46 +0000
@@ -33,8 +33,8 @@
 using namespace std;
 using namespace unity::scopes;
 
-SelfServiceBillQuery::SelfServiceBillQuery(Query const& query, QStringList const& scopes, QString const& locale)
-    : SearchQuery(),
+SelfServiceBillQuery::SelfServiceBillQuery(CannedQuery const& query, QStringList const& scopes, QString const& locale)
+    : SearchQueryBase(),
     query_(query),
     scopes_(scopes)
 {

=== modified file 'src/SelfServiceBillQuery.h'
--- src/SelfServiceBillQuery.h	2014-02-12 02:13:42 +0000
+++ src/SelfServiceBillQuery.h	2014-03-27 03:42:46 +0000
@@ -20,21 +20,21 @@
 #define SELFSERVICEBILLQUERY_H
 
 #include <unity/scopes/ScopeBase.h>
-#include <unity/scopes/Query.h>
+#include <unity/scopes/SearchQueryBase.h>
 #include <QStringList>
 #include <string>
 #include <memory>
 
-class SelfServiceBillQuery: public unity::scopes::SearchQuery
+class SelfServiceBillQuery: public unity::scopes::SearchQueryBase
 {
 public:
-    SelfServiceBillQuery(unity::scopes::Query const& query, QStringList const& scopes, QString const& locale);
+    SelfServiceBillQuery(unity::scopes::CannedQuery const& query, QStringList const& scopes, QString const& locale);
     
     virtual void run(unity::scopes::SearchReplyProxy const& reply) override;
     virtual void cancelled() override;
 
 private:
-    unity::scopes::Query query_;
+    unity::scopes::CannedQuery query_;
     QStringList scopes_;
 };
 

=== modified file 'src/SelfServiceBillScope.cpp'
--- src/SelfServiceBillScope.cpp	2014-02-19 03:31:56 +0000
+++ src/SelfServiceBillScope.cpp	2014-03-27 03:42:46 +0000
@@ -72,17 +72,17 @@
     return VERSION;
 }
 
-QueryBase::UPtr SelfServiceBillScope::create_query(Query const& query, SearchMetadata const&)
+SearchQueryBase::UPtr SelfServiceBillScope::search(const CannedQuery &query, SearchMetadata const&)
 {
     QStringList scopes;
-    QueryBase::UPtr q(new SelfServiceBillQuery(query, scopes, m_locale));
+    SearchQueryBase::UPtr q(new SelfServiceBillQuery(query, scopes, m_locale));
     return q;
 }
 
-QueryBase::UPtr SelfServiceBillScope::preview(Result const& result,
+PreviewQueryBase::UPtr SelfServiceBillScope::preview(Result const& result,
                                               ActionMetadata const& hints)
 {
-    QueryBase::UPtr previewer(new SelfServiceBillPreview(*this, result));
+    PreviewQueryBase::UPtr previewer(new SelfServiceBillPreview(*this, result));
     return previewer;
 }
 
@@ -112,10 +112,10 @@
     reply->register_layout({layout});
 
     PreviewWidget header("header", "header");
-    header.add_attribute("title", Variant("Your next phone bill is:"));
+    header.add_attribute_value("title", Variant("Your next phone bill is:"));
 
     PreviewWidget description("description", "text");
-    description.add_component("text", "title");
+    description.add_attribute_mapping("text", "title");
 
     PreviewWidget actions("actions", "actions");
     {
@@ -124,7 +124,7 @@
             {"id", Variant("open")},
             {"label", Variant("Pay bill")}
         });
-        actions.add_attribute("actions", builder.end());
+        actions.add_attribute_value("actions", builder.end());
     }
 
     reply->push({header, description, actions});

=== modified file 'src/SelfServiceBillScope.h'
--- src/SelfServiceBillScope.h	2014-02-19 03:31:56 +0000
+++ src/SelfServiceBillScope.h	2014-03-27 03:42:46 +0000
@@ -24,7 +24,7 @@
 #include <unity/scopes/PreviewReply.h>
 #include <unity/scopes/PreviewWidget.h>
 #include <unity/scopes/VariantBuilder.h>
-#include <unity/scopes/Query.h>
+#include <unity/scopes/SearchQueryBase.h>
 #include <string>
 #include <QString>
 #include <QStringList>
@@ -41,8 +41,8 @@
     virtual int start(std::string const&, unity::scopes::RegistryProxy const&) override;
     virtual void stop() override {}
     virtual void run() override {}
-    virtual unity::scopes::QueryBase::UPtr create_query(unity::scopes::Query const& query, unity::scopes::SearchMetadata const&) override;
-    virtual unity::scopes::QueryBase::UPtr preview(unity::scopes::Result const&, unity::scopes::ActionMetadata const&) override;
+    virtual unity::scopes::SearchQueryBase::UPtr search(unity::scopes::CannedQuery const& query, unity::scopes::SearchMetadata const&) override;
+    virtual unity::scopes::PreviewQueryBase::UPtr preview(unity::scopes::Result const&, unity::scopes::ActionMetadata const&) override;
 
 private:
     void appendIfEnabled(QStringList &scopeToQuery, const QString &scopeId) const;
@@ -56,7 +56,7 @@
     //gulong m_disabledScopesSig;
 };
 
-class SelfServiceBillPreview : public unity::scopes::PreviewQuery
+class SelfServiceBillPreview : public unity::scopes::PreviewQueryBase
 {
 public:
     SelfServiceBillPreview(SelfServiceBillScope &scope, unity::scopes::Result const& result);