Merge lp:~alecu/unity-scope-click/remove-dead-code into lp:unity-scope-click

[Alejandro J. Cura]

Remove code in click::Interface that was not actually being used

[lp:~alecu/unity-scope-click/remove-dead-code]

208. By Alejandro J. Cura on 2014-04-08

Undo typos

[dobey (dobey)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:207
http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/418/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-amd64-ci/319
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-armhf-ci/316
        deb: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-armhf-ci/316/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:208
http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/420/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-amd64-ci/321
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-armhf-ci/318
        deb: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-armhf-ci/318/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

=== modified file 'scope/click/interface.cpp'
--- scope/click/interface.cpp	2014-03-05 13:09:54 +0000
+++ scope/click/interface.cpp	2014-04-08 20:08:49 +0000
@@ -90,9 +90,7 @@
 
 /* find_installed_apps()
  *
- * Find all of the isntalled apps matching @search_query in a timeout.
- * The list of found apps will be emitted in the ::installed_apps_found
- * signal on this object.
+ * Find all of the installed apps matching @search_query in a timeout.
  */
 std::vector<click::Application> Interface::find_installed_apps(const QString& search_query)
 {
@@ -183,60 +181,6 @@
     return icon_id;
 }
 
-/* find_apps_in_dir()
- *
- * Finds all the apps in the specified @dir_path, which also match
- * the @search_query string, and appends them to the @result_list.
- */
-void Interface::find_apps_in_dir(const QString& dir_path,
-                                 const QString& search_query,
-                                 std::vector<Application>& result_list)
-{
-    QDir dir(dir_path, "*.desktop",
-             QDir::Unsorted, QDir::Readable | QDir::Files);
-    QStringList entries = dir.entryList();
-    for (int i = 0; i < entries.size(); ++i) {
-        QString filename = entries.at(i);
-        QString full_path = dir.absoluteFilePath(filename);
-        try {
-
-            unity::util::IniParser keyfile(full_path.toUtf8().data());
-            if (keyfile.has_key(DESKTOP_FILE_GROUP, DESKTOP_FILE_KEY_APP_ID)
-                || Interface::is_non_click_app(filename)) {
-                QString name = keyfile.get_string(DESKTOP_FILE_GROUP,
-                                                  DESKTOP_FILE_KEY_NAME).c_str();
-                if (search_query.isEmpty() ||
-                    (name != NULL && name.contains(search_query,
-                                                   Qt::CaseInsensitive))) {
-                    Application app;
-                    QString app_url = "application:///" + filename;
-                    app.url = app_url.toUtf8().data();
-                    app.title = name.toUtf8().data();
-                    app.icon_url = Interface::add_theme_scheme(
-                                keyfile.get_string(DESKTOP_FILE_GROUP,
-                                                   DESKTOP_FILE_KEY_ICON));
-                    if (keyfile.has_key(DESKTOP_FILE_GROUP, DESKTOP_FILE_UBUNTU_TOUCH)) {
-                        app.description = keyfile.get_string(DESKTOP_FILE_GROUP,
-                                                             DESKTOP_FILE_COMMENT);
-                        app.main_screenshot = keyfile.get_string(DESKTOP_FILE_GROUP,
-                                                                 DESKTOP_FILE_SCREENSHOT);
-                    } else if (keyfile.has_key(DESKTOP_FILE_GROUP, DESKTOP_FILE_KEY_APP_ID)) {
-                        QString app_id = QString::fromStdString(keyfile.get_string(
-                                                                DESKTOP_FILE_GROUP,
-                                                                DESKTOP_FILE_KEY_APP_ID));
-                        QStringList id = app_id.split("_", QString::SkipEmptyParts);
-                        app.name = id[0].toUtf8().data();
-                    }
-                    qDebug() << "Found application:" << filename;
-                    result_list.push_back(app);
-                }
-            }
-        } catch (unity::FileException file_exp) {
-            qCritical() << "Error reading file:" << full_path << "skipping.";
-        }
-    }
-}
-
 std::vector<std::string> FrameworkLocator::list_folder(const std::string& folder, const std::string& pattern)
 {
     std::vector<std::string> result;

=== modified file 'scope/click/interface.h'
--- scope/click/interface.h	2014-03-05 13:09:54 +0000
+++ scope/click/interface.h	2014-04-08 20:08:49 +0000
@@ -75,9 +75,6 @@
     virtual std::vector<Application> find_installed_apps(const QString& search_query);
 
     static bool is_non_click_app(const QString& filename);
-    static void find_apps_in_dir(const QString& dir_path,
-                                 const QString& search_query,
-                                 std::vector<Application>& result_list);
 
     static bool is_icon_identifier(const std::string &icon_id);
     static std::string add_theme_scheme(const std::string &filename);

=== modified file 'scope/tests/test_interface.cpp'
--- scope/tests/test_interface.cpp	2014-04-02 11:56:49 +0000
+++ scope/tests/test_interface.cpp	2014-04-08 20:08:49 +0000
@@ -105,9 +105,15 @@
 
 TEST(ClickInterface, testFindAppsInDirEmpty)
 {
-    std::vector<Application> results;
-
-    Interface::find_apps_in_dir(QDir::currentPath(), "foo", results);
+    QSharedPointer<click::KeyFileLocator> keyFileLocator(
+                new click::KeyFileLocator(
+                    testing::systemApplicationsDirectoryForTesting(),
+                    testing::userApplicationsDirectoryForTesting()));
+
+    click::Interface iface(keyFileLocator);
+
+    auto results = iface.find_installed_apps("foo");
+
     EXPECT_TRUE(results.empty());
 }