Merge lp:~alecu/unity-scope-click/a-few-renames into lp:unity-scope-click/devel

[Alejandro J. Cura]

Refactorings splitted from the following branch

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:290
http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-ci/110/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-amd64-ci/85
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/84
        deb: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/84/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-i386-ci/84

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-team-unity-scope-click-devel-ci/110/rebuild

review: Approve (continuous-integration)

[dobey (dobey)]

review: Needs Fixing

[lp:~alecu/unity-scope-click/a-few-renames]

291. By Alejandro J. Cura on 2014-06-13

Removing the hashing function for Package

[dobey (dobey)]

review: Approve

=== modified file 'libclickscope/click/index.cpp'
--- libclickscope/click/index.cpp	2014-05-26 14:02:45 +0000
+++ libclickscope/click/index.cpp	2014-06-13 19:58:51 +0000
@@ -110,7 +110,7 @@
     };
 }
 
-click::web::Cancellable Index::search (const std::string& query, std::function<void(click::PackageList)> callback)
+click::web::Cancellable Index::search (const std::string& query, std::function<void(click::Packages)> callback)
 {
     click::web::CallParams params;
     const std::string built_query(build_index_query(query));
@@ -122,7 +122,7 @@
         Json::Reader reader;
         Json::Value root;
 
-        click::PackageList pl;
+        click::Packages pl;
         if (reader.parse(reply.toUtf8().constData(), root)) {
             pl = click::package_list_from_json_node(root);
             qDebug() << "found packages:" << pl.size();
@@ -131,7 +131,7 @@
     });
     QObject::connect(response.data(), &click::web::Response::error, [=](QString /*description*/) {
         qDebug() << "No packages found due to network error";
-        click::PackageList pl;
+        click::Packages pl;
         qDebug() << "calling callback";
         callback(pl);
         qDebug() << "                ...Done!";

=== modified file 'libclickscope/click/index.h'
--- libclickscope/click/index.h	2014-05-26 14:02:45 +0000
+++ libclickscope/click/index.h	2014-06-13 19:58:51 +0000
@@ -71,7 +71,7 @@
     enum class Error {NoError, CredentialsError, NetworkError};
     Index(const QSharedPointer<click::web::Client>& client,
           const QSharedPointer<Configuration> configuration=QSharedPointer<Configuration>(new Configuration()));
-    virtual click::web::Cancellable search (const std::string& query, std::function<void(PackageList)> callback);
+    virtual click::web::Cancellable search (const std::string& query, std::function<void(Packages)> callback);
     virtual click::web::Cancellable get_details(const std::string& package_name, std::function<void(PackageDetails, Error)> callback);
     virtual ~Index();
 

=== modified file 'libclickscope/click/interface.cpp'
--- libclickscope/click/interface.cpp	2014-06-13 15:26:54 +0000
+++ libclickscope/click/interface.cpp	2014-06-13 19:58:51 +0000
@@ -378,26 +378,28 @@
     return manifest;
 }
 
-void Interface::get_manifests(std::function<void(ManifestList, ManifestError)> callback)
+void Interface::get_manifests(std::function<void(ManifestList, InterfaceError)> callback)
 {
     std::string command = "click list --manifest";
     qDebug() << "Running command:" << command.c_str();
-    run_process(command, [callback](int code, const std::string& stdout_data, const std::string&) {
+    run_process(command, [callback](int code, const std::string& stdout_data, const std::string& stderr_data) {
         if (code == 0) {
             try {
                 ManifestList manifests = manifest_list_from_json(stdout_data);
-                callback(manifests, ManifestError::NoError);
+                callback(manifests, InterfaceError::NoError);
             } catch (...) {
-                callback(ManifestList(), ManifestError::ParseError);
+                qWarning() << "Can't parse 'click list --manifest' output: " << QString::fromStdString(stdout_data);
+                callback(ManifestList(), InterfaceError::ParseError);
             }
         } else {
-            callback(ManifestList(), ManifestError::CallError);
+            qWarning() << "Error" << code << "running 'click list --manifest': " << QString::fromStdString(stderr_data);
+            callback(ManifestList(), InterfaceError::CallError);
         }
     });
 }
 
 void Interface::get_manifest_for_app(const std::string &app_id,
-                                     std::function<void(Manifest, ManifestError)> callback)
+                                     std::function<void(Manifest, InterfaceError)> callback)
 {
     std::string command = "click info " + app_id;
     qDebug() << "Running command:" << command.c_str();
@@ -405,23 +407,23 @@
         if (code == 0) {
             try {
                 Manifest manifest = manifest_from_json(stdout_data);
-                callback(manifest, ManifestError::NoError);
+                callback(manifest, InterfaceError::NoError);
             } catch (...) {
-                callback(Manifest(), ManifestError::ParseError);
+                callback(Manifest(), InterfaceError::ParseError);
             }
         } else {
-            callback(Manifest(), ManifestError::CallError);
+            callback(Manifest(), InterfaceError::CallError);
         }
     });
 }
 
 void Interface::get_dotdesktop_filename(const std::string &app_id,
-                                        std::function<void(std::string, ManifestError)> callback)
+                                        std::function<void(std::string, InterfaceError)> callback)
 {
-    get_manifest_for_app(app_id, [app_id, callback] (Manifest manifest, ManifestError error) {
+    get_manifest_for_app(app_id, [app_id, callback] (Manifest manifest, InterfaceError error) {
         qDebug() << "in get_dotdesktop_filename callback";
 
-        if (error != ManifestError::NoError){
+        if (error != InterfaceError::NoError){
             callback(std::string("Internal Error"), error);
             return;
         }
@@ -429,10 +431,10 @@
 
         if (!manifest.name.empty()) {
             std::string ddstr = manifest.name + "_" + manifest.first_app_name + "_" + manifest.version + ".desktop";
-            callback(ddstr, ManifestError::NoError);
+            callback(ddstr, InterfaceError::NoError);
         } else {
             qCritical() << "Warning: no manifest found for " << app_id.c_str();
-            callback(std::string("Not found"), ManifestError::CallError);
+            callback(std::string("Not found"), InterfaceError::CallError);
         }
     });
 }

=== modified file 'libclickscope/click/interface.h'
--- libclickscope/click/interface.h	2014-06-13 15:21:16 +0000
+++ libclickscope/click/interface.h	2014-06-13 19:58:51 +0000
@@ -62,7 +62,7 @@
     bool removable = false;
 };
 
-enum class ManifestError {NoError, CallError, ParseError};
+enum class InterfaceError {NoError, CallError, ParseError};
 typedef std::list<Manifest> ManifestList;
 
 ManifestList manifest_list_from_json(const std::string& json);
@@ -88,10 +88,10 @@
 
     static bool is_icon_identifier(const std::string &icon_id);
     static std::string add_theme_scheme(const std::string &filename);
-    virtual void get_manifests(std::function<void(ManifestList, ManifestError)> callback);
-    virtual void get_manifest_for_app(const std::string &app_id, std::function<void(Manifest, ManifestError)> callback);
+    virtual void get_manifests(std::function<void(ManifestList, InterfaceError)> callback);
+    virtual void get_manifest_for_app(const std::string &app_id, std::function<void(Manifest, InterfaceError)> callback);
     virtual void get_dotdesktop_filename(const std::string &app_id,
-                                        std::function<void(std::string filename, ManifestError)> callback);
+                                        std::function<void(std::string filename, InterfaceError)> callback);
     constexpr static const char* ENV_SHOW_DESKTOP_APPS {"CLICK_SCOPE_SHOW_DESKTOP_APPS"};
     virtual bool is_visible_app(const unity::util::IniParser& keyFile);
     virtual bool show_desktop_apps();

=== modified file 'libclickscope/click/package.cpp'
--- libclickscope/click/package.cpp	2014-05-26 14:02:45 +0000
+++ libclickscope/click/package.cpp	2014-06-13 19:58:51 +0000
@@ -80,9 +80,9 @@
     return p;
 }
 
-PackageList package_list_from_json_node(const Json::Value& root)
+Packages package_list_from_json_node(const Json::Value& root)
 {
-    PackageList pl;
+    Packages pl;
     if (root.isObject() && root.isMember(Package::JsonKeys::embedded))
     {
         auto const emb = root[Package::JsonKeys::embedded];
@@ -114,7 +114,7 @@
     return pl;
 }
 
-PackageList package_list_from_json(const std::string& json)
+Packages package_list_from_json(const std::string& json)
 {
     std::istringstream is(json);
 

=== modified file 'libclickscope/click/package.h'
--- libclickscope/click/package.h	2014-05-26 14:02:45 +0000
+++ libclickscope/click/package.h	2014-06-13 19:58:51 +0000
@@ -30,8 +30,10 @@
 #ifndef CLICK_PACKAGE_H
 #define CLICK_PACKAGE_H
 
+#include <list>
 #include <string>
-#include <list>
+#include <unordered_set>
+#include <vector>
 
 #include <json/json.h>
 
@@ -76,6 +78,11 @@
         version(version)
     {
     }
+    Package(std::string name, std::string version) :
+        name(name),
+        version(version)
+    {
+    }
     virtual ~Package() = default;
 
     std::string name; // formerly app_id
@@ -87,11 +94,11 @@
     void matches (std::string query, std::function<bool> callback);
 };
 
-typedef std::list<Package> PackageList;
+typedef std::vector<Package> Packages;
 
 Package package_from_json_node(const Json::Value& item);
-PackageList package_list_from_json(const std::string& json);
-PackageList package_list_from_json_node(const Json::Value& root);
+Packages package_list_from_json(const std::string& json);
+Packages package_list_from_json_node(const Json::Value& root);
 
 struct PackageDetails
 {

=== modified file 'libclickscope/click/preview.cpp'
--- libclickscope/click/preview.cpp	2014-06-03 16:36:44 +0000
+++ libclickscope/click/preview.cpp	2014-06-13 19:58:51 +0000
@@ -431,29 +431,28 @@
         // Do nothing as we are not submitting a review.
     }
 
-    // Get the removable flag from the click manifest.
-    bool removable = false;
-    std::promise<bool> manifest_promise;
-    std::future<bool> manifest_future = manifest_promise.get_future();
+    // Get the click manifest.
+    Manifest manifest;
+    std::promise<Manifest> manifest_promise;
+    std::future<Manifest> manifest_future = manifest_promise.get_future();
     std::string app_name = result["name"].get_string();
     if (!app_name.empty()) {
         qt::core::world::enter_with_task([&]() {
             click::Interface().get_manifest_for_app(app_name,
-                [&](Manifest manifest, ManifestError error) {
+                [&](Manifest found_manifest, InterfaceError error) {
                     qDebug() << "Got manifest for:" << app_name.c_str();
-                    removable = manifest.removable;
 
                     // Fill in required data about the package being reviewed.
-                    review.package_name = manifest.name;
-                    review.package_version = manifest.version;
+                    review.package_name = found_manifest.name;
+                    review.package_version = found_manifest.version;
 
-                    if (error != click::ManifestError::NoError) {
+                    if (error != click::InterfaceError::NoError) {
                         qDebug() << "There was an error getting the manifest for:" << app_name.c_str();
                     }
-                    manifest_promise.set_value(true);
+                    manifest_promise.set_value(found_manifest);
             });
         });
-        manifest_future.get();
+        manifest = manifest_future.get();
         if (review.rating > 0) {
             std::promise<bool> submit_promise;
             std::future<bool> submit_future = submit_promise.get_future();
@@ -469,13 +468,13 @@
             submit_future.get();
         }
     }
-    getApplicationUri([this, reply, removable, app_name, &review](const std::string& uri) {
-            populateDetails([this, reply, uri, removable, app_name, &review](const PackageDetails &details){
+    getApplicationUri(manifest, [this, reply, manifest, app_name, &review](const std::string& uri) {
+            populateDetails([this, reply, uri, manifest, app_name, &review](const PackageDetails &details){
                 reply->push(headerWidgets(details));
-                reply->push(createButtons(uri, removable));
+                reply->push(createButtons(uri, manifest));
                 reply->push(descriptionWidgets(details));
 
-                if (review.rating == 0 && removable) {
+                if (review.rating == 0 && manifest.removable) {
                     scopes::PreviewWidgetList review_input;
                     scopes::PreviewWidget rating("rating", "rating-input");
                     rating.add_attribute_value("required", scopes::Variant("rating"));
@@ -496,7 +495,7 @@
 }
 
 scopes::PreviewWidgetList InstalledPreview::createButtons(const std::string& uri,
-                                                          bool removable)
+                                                          const Manifest& manifest)
 {
     scopes::PreviewWidgetList widgets;
     scopes::PreviewWidget buttons("buttons", "actions");
@@ -510,21 +509,21 @@
             {"uri", scopes::Variant(uri)}
         });
     }
-    if (removable)
+    if (manifest.removable)
     {
         builder.add_tuple({
             {"id", scopes::Variant(click::Preview::Actions::UNINSTALL_CLICK)},
             {"label", scopes::Variant(_("Uninstall"))}
         });
     }
-    if (!uri.empty() || removable) {
+    if (!uri.empty() || manifest.removable) {
         buttons.add_attribute_value("actions", builder.end());
         widgets.push_back(buttons);
     }
     return widgets;
 }
 
-void InstalledPreview::getApplicationUri(std::function<void(const std::string&)> callback)
+void InstalledPreview::getApplicationUri(const Manifest& /*manifest*/, std::function<void(const std::string&)> callback)
 {
     std::string uri;
     QString app_url = QString::fromStdString(result.uri());
@@ -533,12 +532,12 @@
     // this can happen if the app was just installed and we have its http uri from the Result.
     if (!app_url.startsWith("application:///")) {
         const std::string name = result["name"].get_string();
-        auto ft = qt::core::world::enter_with_task([this, name, callback] ()
+        qt::core::world::enter_with_task([this, name, callback] ()
         {
             click::Interface().get_dotdesktop_filename(name,
-                                          [callback] (std::string val, click::ManifestError error) {
+                                          [callback] (std::string val, click::InterfaceError error) {
                                           std::string uri;
-                                          if (error == click::ManifestError::NoError) {
+                                          if (error == click::InterfaceError::NoError) {
                                               uri = "application:///" + val;
                                           }
                                           callback(uri);

=== modified file 'libclickscope/click/preview.h'
--- libclickscope/click/preview.h	2014-06-03 16:21:22 +0000
+++ libclickscope/click/preview.h	2014-06-13 19:58:51 +0000
@@ -47,6 +47,7 @@
 
 namespace click {
 
+class Manifest;
 class PreviewStrategy;
 
 class Preview : public unity::scopes::PreviewQueryBase
@@ -164,11 +165,11 @@
     void run(unity::scopes::PreviewReplyProxy const& reply) override;
 
 protected:
-    void getApplicationUri(std::function<void(const std::string&)> callback);
+    void getApplicationUri(const Manifest& manifest, std::function<void(const std::string&)> callback);
 
 private:
     static scopes::PreviewWidgetList createButtons(const std::string& uri,
-                                                   bool removable);
+                                                   const click::Manifest& manifest);
     scopes::ActionMetadata metadata;
 };
 

=== modified file 'libclickscope/tests/test_index.cpp'
--- libclickscope/tests/test_index.cpp	2014-05-26 14:27:31 +0000
+++ libclickscope/tests/test_index.cpp	2014-06-13 19:58:51 +0000
@@ -79,7 +79,7 @@
         DefaultValue<std::map<std::string, std::string>>::Set(std::map<std::string, std::string>());
     }
 public:
-    MOCK_METHOD1(search_callback, void(click::PackageList));
+    MOCK_METHOD1(search_callback, void(click::Packages));
     MOCK_METHOD2(details_callback, void(click::PackageDetails, click::Index::Error));
 };
 
@@ -100,7 +100,7 @@
             .Times(1)
             .WillOnce(Return(response));
 
-    indexPtr->search("", [](click::PackageList) {});
+    indexPtr->search("", [](click::Packages) {});
 }
 
 TEST_F(IndexTest, testSearchSendsBuiltQueryAsParam)
@@ -120,7 +120,7 @@
             .Times(1)
             .WillOnce(Return(FAKE_BUILT_QUERY));
 
-    indexPtr->search(FAKE_QUERY, [](click::PackageList) {});
+    indexPtr->search(FAKE_QUERY, [](click::Packages) {});
 }
 
 TEST_F(IndexTest, testSearchSendsRightPath)
@@ -133,7 +133,7 @@
             .Times(1)
             .WillOnce(Return(response));
 
-    indexPtr->search("", [](click::PackageList) {});
+    indexPtr->search("", [](click::Packages) {});
 }
 
 TEST_F(IndexTest, testSearchCallbackIsCalled)
@@ -150,7 +150,7 @@
             .WillOnce(Return(response));
     EXPECT_CALL(*this, search_callback(_)).Times(1);
 
-    indexPtr->search("", [this](click::PackageList packages){
+    indexPtr->search("", [this](click::Packages packages){
         search_callback(packages);
     });
     response->replyFinished();
@@ -168,10 +168,10 @@
     EXPECT_CALL(*clientPtr, callImpl(_, _, _, _, _, _))
             .Times(1)
             .WillOnce(Return(response));
-    click::PackageList empty_package_list;
+    click::Packages empty_package_list;
     EXPECT_CALL(*this, search_callback(empty_package_list)).Times(1);
 
-    indexPtr->search("", [this](click::PackageList packages){
+    indexPtr->search("", [this](click::Packages packages){
         search_callback(packages);
     });
     response->replyFinished();
@@ -189,7 +189,7 @@
     EXPECT_CALL(*clientPtr, callImpl(_, _, _, _, _, _))
             .Times(1)
             .WillOnce(Return(response));
-    click::PackageList single_package_list =
+    click::Packages single_package_list =
     {
         click::Package
         {
@@ -200,7 +200,7 @@
     };
     EXPECT_CALL(*this, search_callback(single_package_list)).Times(1);
 
-    indexPtr->search("", [this](click::PackageList packages){
+    indexPtr->search("", [this](click::Packages packages){
         search_callback(packages);
     });
     response->replyFinished();
@@ -215,7 +215,7 @@
             .Times(1)
             .WillOnce(Return(response));
 
-    auto search_operation = indexPtr->search("", [](click::PackageList) {});
+    auto search_operation = indexPtr->search("", [](click::Packages) {});
     EXPECT_CALL(reply.instance, abort()).Times(1);
     search_operation.cancel();
 }
@@ -234,11 +234,11 @@
             .Times(1)
             .WillOnce(Return(response));
     EXPECT_CALL(reply.instance, errorString()).Times(1).WillOnce(Return("fake error"));
-    indexPtr->search("", [this](click::PackageList packages){
+    indexPtr->search("", [this](click::Packages packages){
         search_callback(packages);
     });
 
-    click::PackageList empty_package_list;
+    click::Packages empty_package_list;
     EXPECT_CALL(*this, search_callback(empty_package_list)).Times(1);
 
     emit reply.instance.error(QNetworkReply::UnknownNetworkError);

=== modified file 'libclickscope/tests/test_interface.cpp'
--- libclickscope/tests/test_interface.cpp	2014-06-13 16:50:15 +0000
+++ libclickscope/tests/test_interface.cpp	2014-06-13 19:58:51 +0000
@@ -117,8 +117,8 @@
 
 class ClickInterfaceTest : public ::testing::Test {
 public:
-    MOCK_METHOD2(manifest_callback, void(Manifest, ManifestError));
-    MOCK_METHOD2(manifests_callback, void(ManifestList, ManifestError));
+    MOCK_METHOD2(manifest_callback, void(Manifest, InterfaceError));
+    MOCK_METHOD2(manifests_callback, void(ManifestList, InterfaceError));
 };
 
 }
@@ -453,7 +453,7 @@
     std::string command = "click info " + FAKE_PACKAGENAME;
     EXPECT_CALL(iface, run_process(command, _)).
         Times(1);
-    iface.get_manifest_for_app(FAKE_PACKAGENAME, [](Manifest, ManifestError){});
+    iface.get_manifest_for_app(FAKE_PACKAGENAME, [](Manifest, InterfaceError){});
 }
 
 TEST_F(ClickInterfaceTest, testGetManifestForAppParseError)
@@ -466,9 +466,9 @@
                                                const std::string&)> callback){
                             callback(0, "INVALID JSON", "");
                         }));
-    EXPECT_CALL(*this, manifest_callback(_, ManifestError::ParseError));
+    EXPECT_CALL(*this, manifest_callback(_, InterfaceError::ParseError));
     iface.get_manifest_for_app(FAKE_PACKAGENAME, [this](Manifest manifest,
-                                                        ManifestError error){
+                                                        InterfaceError error){
                                    manifest_callback(manifest, error);
                                });
 }
@@ -483,9 +483,9 @@
                                                const std::string&)> callback){
                             callback(-1, "", "CRITICAL: FAIL");
                         }));
-    EXPECT_CALL(*this, manifest_callback(_, ManifestError::CallError));
+    EXPECT_CALL(*this, manifest_callback(_, InterfaceError::CallError));
     iface.get_manifest_for_app(FAKE_PACKAGENAME, [this](Manifest manifest,
-                                                        ManifestError error){
+                                                        InterfaceError error){
                                    manifest_callback(manifest, error);
                                });
 }
@@ -501,8 +501,8 @@
                             callback(0, FAKE_JSON_MANIFEST_REMOVABLE, "");
                         }));
     iface.get_manifest_for_app(FAKE_PACKAGENAME, [](Manifest manifest,
-                                                    ManifestError error){
-                                   ASSERT_TRUE(error == ManifestError::NoError);
+                                                    InterfaceError error){
+                                   ASSERT_TRUE(error == InterfaceError::NoError);
                                    ASSERT_TRUE(manifest.removable);
                                });
 }
@@ -518,8 +518,8 @@
                             callback(0, FAKE_JSON_MANIFEST_NONREMOVABLE, "");
                         }));
     iface.get_manifest_for_app(FAKE_PACKAGENAME, [](Manifest manifest,
-                                                    ManifestError error){
-                                   ASSERT_TRUE(error == ManifestError::NoError);
+                                                    InterfaceError error){
+                                   ASSERT_TRUE(error == InterfaceError::NoError);
                                    ASSERT_FALSE(manifest.removable);
                                });
 }
@@ -530,7 +530,7 @@
     std::string command = "click list --manifest";
     EXPECT_CALL(iface, run_process(command, _)).
         Times(1);
-    iface.get_manifests([](ManifestList, ManifestError){});
+    iface.get_manifests([](ManifestList, InterfaceError){});
 }
 
 TEST_F(ClickInterfaceTest, testGetManifestsParseError)
@@ -543,8 +543,8 @@
                                                const std::string&)> callback){
                             callback(0, "INVALID JSON", "");
                         }));
-    EXPECT_CALL(*this, manifests_callback(_, ManifestError::ParseError));
-    iface.get_manifests([this](ManifestList manifests, ManifestError error){
+    EXPECT_CALL(*this, manifests_callback(_, InterfaceError::ParseError));
+    iface.get_manifests([this](ManifestList manifests, InterfaceError error){
             manifests_callback(manifests, error);
         });
 }
@@ -559,8 +559,8 @@
                                                const std::string&)> callback){
                             callback(-1, "", "CRITICAL: FAIL");
                         }));
-    EXPECT_CALL(*this, manifests_callback(_, ManifestError::CallError));
-    iface.get_manifests([this](ManifestList manifests, ManifestError error){
+    EXPECT_CALL(*this, manifests_callback(_, InterfaceError::CallError));
+    iface.get_manifests([this](ManifestList manifests, InterfaceError error){
             manifests_callback(manifests, error);
         });
 }
@@ -579,8 +579,8 @@
                                                const std::string&)> callback){
                             callback(0, expected_str, "");
                         }));
-    iface.get_manifests([expected](ManifestList manifests, ManifestError error){
-            ASSERT_TRUE(error == ManifestError::NoError);
+    iface.get_manifests([expected](ManifestList manifests, InterfaceError error){
+            ASSERT_TRUE(error == InterfaceError::NoError);
             ASSERT_TRUE(manifests.size() == expected.size());
         });
 }

=== modified file 'scope/clickstore/store-query.cpp'
--- scope/clickstore/store-query.cpp	2014-05-27 09:37:28 +0000
+++ scope/clickstore/store-query.cpp	2014-06-13 19:58:51 +0000
@@ -28,9 +28,9 @@
  */
 
 #include <click/application.h>
+#include <click/interface.h>
 #include "store-query.h"
 #include <click/qtbridge.h>
-#include <click/interface.h>
 
 #include <click/key_file_locator.h>
 
@@ -166,7 +166,7 @@
 
     run_under_qt([=]()
     {
-            auto search_cb = [this, searchReply, category, locallyInstalledApps](PackageList packages) {
+            auto search_cb = [this, searchReply, category, locallyInstalledApps](click::Packages packages) {
                 qDebug("search callback");
 
                 // handle packages data

=== modified file 'scope/tests/click_interface_tool/click_interface_tool.cpp'
--- scope/tests/click_interface_tool/click_interface_tool.cpp	2014-05-13 19:32:29 +0000
+++ scope/tests/click_interface_tool/click_interface_tool.cpp	2014-06-13 19:58:51 +0000
@@ -51,8 +51,8 @@
 
     QObject::connect(&timer, &QTimer::timeout, [&]() {
             ci.get_dotdesktop_filename(std::string(argv[1]),
-                                       [&a] (std::string val, click::ManifestError error){
-                                           if (error == click::ManifestError::NoError) {
+                                       [&a] (std::string val, click::InterfaceError error){
+                                           if (error == click::InterfaceError::NoError) {
                                                std::cout << " Success, got dotdesktop:" << val << std::endl;
                                            } else {
                                                std::cout << " Error:" << val << std::endl;

=== modified file 'scope/tests/integration/webclient_integration.cpp'
--- scope/tests/integration/webclient_integration.cpp	2014-04-29 03:17:38 +0000
+++ scope/tests/integration/webclient_integration.cpp	2014-06-13 19:58:51 +0000
@@ -101,8 +101,8 @@
     QSharedPointer<click::web::Client> clientPtr(
                 new click::web::Client(namPtr));
     click::Index index(clientPtr);
-    click::PackageList packages;
-    index.search("qr,architecture:armhf", [&, this](click::PackageList found_packages){
+    click::Packages packages;
+    index.search("qr,architecture:armhf", [&, this](click::Packages found_packages){
         packages = found_packages;
         Quit();
     });

=== modified file 'scope/tests/test_query.cpp'
--- scope/tests/test_query.cpp	2014-06-09 16:49:10 +0000
+++ scope/tests/test_query.cpp	2014-06-13 19:58:51 +0000
@@ -55,16 +55,16 @@
 
 
 class MockIndex : public click::Index {
-    click::PackageList packages;
+    click::Packages packages;
 public:
-    MockIndex(click::PackageList packages = click::PackageList())
+    MockIndex(click::Packages packages = click::Packages())
         : Index(QSharedPointer<click::web::Client>()),
           packages(packages)
     {
 
     }
 
-    click::web::Cancellable search(const std::string &query, std::function<void (click::PackageList)> callback) override
+    click::web::Cancellable search(const std::string &query, std::function<void (click::Packages)> callback) override
     {
         do_search(query, callback);
         callback(packages);
@@ -73,7 +73,7 @@
 
     MOCK_METHOD2(do_search,
                  void(const std::string&,
-                      std::function<void(click::PackageList)>));
+                      std::function<void(click::Packages)>));
 };
 
 class MockQueryBase : public click::Query {
@@ -158,7 +158,7 @@
 
 TEST(QueryTest, testAddAvailableAppsPushesResults)
 {
-    click::PackageList packages {
+    click::Packages packages {
         {"name", "title", 0.0, "icon", "uri"}
     };
     MockIndex mock_index(packages);
@@ -180,7 +180,7 @@
 
 TEST(QueryTest, testAddAvailableAppsCallsFinished)
 {
-    click::PackageList packages {
+    click::Packages packages {
         {"name", "title", 0.0, "icon", "uri"}
     };
     MockIndex mock_index(packages);
@@ -201,7 +201,7 @@
 
 TEST(QueryTest, testQueryRunCallsAddAvailableApps)
 {
-    click::PackageList packages {
+    click::Packages packages {
         {"name", "title", 0.0, "icon", "uri"}
     };
     MockIndex mock_index(packages);
@@ -218,7 +218,7 @@
 
 TEST(QueryTest, testDuplicatesFilteredOnPackageName)
 {
-    click::PackageList packages {
+    click::Packages packages {
         {"org.example.app1", "app title1", 0.0, "icon", "uri"},
         {"org.example.app2", "app title2", 0.0, "icon", "uri"}
     };