Merge lp:~marcustomlinson/unity-scopes-shell/rename_child_scopes_methods into lp:unity-scopes-shell

[Marcus Tomlinson]

Rename "child_scopes()" to "find_child_scopes()" and "child_scopes_ordered()" to "child_scopes()" as the ordering constraint has been removed.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:206
http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-ci/325/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-amd64-ci/67/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-armhf-ci/67/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-i386-ci/67/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-shell-ci/325/rebuild

review: Needs Fixing (continuous-integration)

[lp:~marcustomlinson/unity-scopes-shell/rename_child_scopes_methods]

207. By Marcus Tomlinson on 2015-04-01

Updated according to new unity-scopes 0.6.15 changes

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:207
http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-ci/329/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-amd64-ci/71/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-armhf-ci/71/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-i386-ci/71/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-shell-ci/329/rebuild

review: Needs Fixing (continuous-integration)

[Paweł Stołowski (stolowski)]

LGTM.

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-03-09 15:57:49 +0000
+++ CMakeLists.txt	2015-04-01 13:49:23 +0000
@@ -50,7 +50,7 @@
 find_package(Qt5Test)
 find_package(Boost COMPONENTS regex REQUIRED)
 
-pkg_check_modules(SCOPESLIB REQUIRED libunity-scopes>=0.6.12)
+pkg_check_modules(SCOPESLIB REQUIRED libunity-scopes>=0.6.15)
 pkg_check_modules(SCOPES_API REQUIRED unity-shell-scopes=6)
 
 # Standard install paths

=== modified file 'debian/control'
--- debian/control	2015-03-03 10:52:45 +0000
+++ debian/control	2015-04-01 13:49:23 +0000
@@ -7,7 +7,7 @@
                libboost-python-dev,
                libboost-regex-dev,
                libunity-api-dev (>= 7.96),
-               libunity-scopes-dev (>= 0.6.12~),
+               libunity-scopes-dev (>= 0.6.15~),
                libgsettings-qt-dev (>= 0.1),
                libqtdbustest1-dev (>= 0.2),
                libqtdbusmock1-dev (>= 0.2),

=== modified file 'src/Unity/overviewresults.cpp'
--- src/Unity/overviewresults.cpp	2015-02-02 08:05:59 +0000
+++ src/Unity/overviewresults.cpp	2015-04-01 13:49:23 +0000
@@ -25,6 +25,7 @@
 #include "utils.h"
 
 #include <unity/scopes/Result.h>
+#include <unity/scopes/Scope.h>
 #include <QSet>
 
 namespace scopes_ng {
@@ -151,7 +152,7 @@
     {
         ///!===
         /// TODO: This code should be removed as soon as we can remove child_scope_ids() from ScopeMetadata.
-        /// Aggregators should now be implementing the child_scopes() method rather than setting ChildScopes in config.
+        /// Aggregators should now be implementing the find_child_scopes() method rather than setting ChildScopes in config.
         auto const children = scopeMetadata->child_scope_ids();
         if (children.size())
         {
@@ -177,11 +178,11 @@
     unity::scopes::ChildScopeList children;
     try
     {
-        children = scopeMetadata->proxy()->child_scopes_ordered();
+        children = scopeMetadata->proxy()->child_scopes();
     }
     catch (std::exception const& e)
     {
-        qWarning("OverviewResultsModel::updateChildScopes: Exception caught from proxy()->child_scopes_ordered(): %s", e.what());
+        qWarning("OverviewResultsModel::updateChildScopes: Exception caught from proxy()->child_scopes(): %s", e.what());
         return false;
     }
 

=== modified file 'src/Unity/settingsmodel.cpp'
--- src/Unity/settingsmodel.cpp	2015-02-03 08:28:40 +0000
+++ src/Unity/settingsmodel.cpp	2015-04-01 13:49:23 +0000
@@ -199,7 +199,7 @@
     m_scopeProxy = scopes_metadata[m_scopeId]->proxy();
     try
     {
-        m_child_scopes = m_scopeProxy->child_scopes_ordered();
+        m_child_scopes = m_scopeProxy->child_scopes();
     }
     catch (std::exception const& e)
     {
@@ -313,11 +313,11 @@
         {
             try
             {
-                m_scopeProxy->set_child_scopes_ordered(m_child_scopes);
+                m_scopeProxy->set_child_scopes(m_child_scopes);
             }
             catch (std::exception const& e)
             {
-                qWarning("SettingsModel::settings_timeout: Exception caught from m_scopeProxy->set_child_scopes_ordered(): %s", e.what());
+                qWarning("SettingsModel::settings_timeout: Exception caught from m_scopeProxy->set_child_scopes(): %s", e.what());
                 return;
             }
         }

=== modified file 'tests/data/mock-scope-departments/mock-scope-departments.cpp'
--- tests/data/mock-scope-departments/mock-scope-departments.cpp	2015-02-23 12:13:14 +0000
+++ tests/data/mock-scope-departments/mock-scope-departments.cpp	2015-04-01 13:49:23 +0000
@@ -170,11 +170,11 @@
         return nullptr;
     }
 
-    virtual ChildScopeList child_scopes() const
+    virtual ChildScopeList find_child_scopes() const
     {
         ChildScopeList list;
-        list.push_back({"mock-scope-double-nav", true});
-        list.push_back({"mock-scope", true});
+        list.push_back({"mock-scope-double-nav", registry()->get_metadata("mock-scope-double-nav"), true});
+        list.push_back({"mock-scope", registry()->get_metadata("mock-scope"), true});
         return list;
     }
 };