unity-scope-click

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

  1. remove-dead-code
  2. Merge into trunk
Proposed by Alejandro J. Cura
Status: Merged
Approved by: dobey
Approved revision: 208
Merged at revision: 210
Proposed branch: lp:~alecu/unity-scope-click/remove-dead-code
Merge into: lp:unity-scope-click
Diff against target: 111 lines (+10/-63)
3 files modified
scope/click/interface.cpp (+1/-57)
scope/click/interface.h (+0/-3)
scope/tests/test_interface.cpp (+9/-3)
To merge this branch: bzr merge lp:~alecu/unity-scope-click/remove-dead-code
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
dobey (community) Approve
Review via email: mp+214831@code.launchpad.net

Commit message

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

To post a comment you must log in.
lp:~alecu/unity-scope-click/remove-dead-code updated
208. By Alejandro J. Cura

Undo typos

Revision history for this message
dobey (dobey) :
review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
9090
91/* find_installed_apps()91/* find_installed_apps()
92 *92 *
93 * Find all of the isntalled apps matching @search_query in a timeout.93 * Find all of the installed apps matching @search_query in a timeout.
94 * The list of found apps will be emitted in the ::installed_apps_found
95 * signal on this object.
96 */94 */
97std::vector<click::Application> Interface::find_installed_apps(const QString& search_query)95std::vector<click::Application> Interface::find_installed_apps(const QString& search_query)
98{96{
@@ -183,60 +181,6 @@
183 return icon_id;181 return icon_id;
184}182}
185183
186/* find_apps_in_dir()
187 *
188 * Finds all the apps in the specified @dir_path, which also match
189 * the @search_query string, and appends them to the @result_list.
190 */
191void Interface::find_apps_in_dir(const QString& dir_path,
192 const QString& search_query,
193 std::vector<Application>& result_list)
194{
195 QDir dir(dir_path, "*.desktop",
196 QDir::Unsorted, QDir::Readable | QDir::Files);
197 QStringList entries = dir.entryList();
198 for (int i = 0; i < entries.size(); ++i) {
199 QString filename = entries.at(i);
200 QString full_path = dir.absoluteFilePath(filename);
201 try {
202
203 unity::util::IniParser keyfile(full_path.toUtf8().data());
204 if (keyfile.has_key(DESKTOP_FILE_GROUP, DESKTOP_FILE_KEY_APP_ID)
205 || Interface::is_non_click_app(filename)) {
206 QString name = keyfile.get_string(DESKTOP_FILE_GROUP,
207 DESKTOP_FILE_KEY_NAME).c_str();
208 if (search_query.isEmpty() ||
209 (name != NULL && name.contains(search_query,
210 Qt::CaseInsensitive))) {
211 Application app;
212 QString app_url = "application:///" + filename;
213 app.url = app_url.toUtf8().data();
214 app.title = name.toUtf8().data();
215 app.icon_url = Interface::add_theme_scheme(
216 keyfile.get_string(DESKTOP_FILE_GROUP,
217 DESKTOP_FILE_KEY_ICON));
218 if (keyfile.has_key(DESKTOP_FILE_GROUP, DESKTOP_FILE_UBUNTU_TOUCH)) {
219 app.description = keyfile.get_string(DESKTOP_FILE_GROUP,
220 DESKTOP_FILE_COMMENT);
221 app.main_screenshot = keyfile.get_string(DESKTOP_FILE_GROUP,
222 DESKTOP_FILE_SCREENSHOT);
223 } else if (keyfile.has_key(DESKTOP_FILE_GROUP, DESKTOP_FILE_KEY_APP_ID)) {
224 QString app_id = QString::fromStdString(keyfile.get_string(
225 DESKTOP_FILE_GROUP,
226 DESKTOP_FILE_KEY_APP_ID));
227 QStringList id = app_id.split("_", QString::SkipEmptyParts);
228 app.name = id[0].toUtf8().data();
229 }
230 qDebug() << "Found application:" << filename;
231 result_list.push_back(app);
232 }
233 }
234 } catch (unity::FileException file_exp) {
235 qCritical() << "Error reading file:" << full_path << "skipping.";
236 }
237 }
238}
239
240std::vector<std::string> FrameworkLocator::list_folder(const std::string& folder, const std::string& pattern)184std::vector<std::string> FrameworkLocator::list_folder(const std::string& folder, const std::string& pattern)
241{185{
242 std::vector<std::string> result;186 std::vector<std::string> result;
243187
=== 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 @@
75 virtual std::vector<Application> find_installed_apps(const QString& search_query);75 virtual std::vector<Application> find_installed_apps(const QString& search_query);
7676
77 static bool is_non_click_app(const QString& filename);77 static bool is_non_click_app(const QString& filename);
78 static void find_apps_in_dir(const QString& dir_path,
79 const QString& search_query,
80 std::vector<Application>& result_list);
8178
82 static bool is_icon_identifier(const std::string &icon_id);79 static bool is_icon_identifier(const std::string &icon_id);
83 static std::string add_theme_scheme(const std::string &filename);80 static std::string add_theme_scheme(const std::string &filename);
8481
=== 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 @@
105105
106TEST(ClickInterface, testFindAppsInDirEmpty)106TEST(ClickInterface, testFindAppsInDirEmpty)
107{107{
108 std::vector<Application> results;108 QSharedPointer<click::KeyFileLocator> keyFileLocator(
109109 new click::KeyFileLocator(
110 Interface::find_apps_in_dir(QDir::currentPath(), "foo", results);110 testing::systemApplicationsDirectoryForTesting(),
111 testing::userApplicationsDirectoryForTesting()));
112
113 click::Interface iface(keyFileLocator);
114
115 auto results = iface.find_installed_apps("foo");
116
111 EXPECT_TRUE(results.empty());117 EXPECT_TRUE(results.empty());
112}118}
113119

Subscribers

People subscribed via source and target branches