Merge lp:~saviq/unity8/mock-customizations into lp:unity8

[Michał Sawicz]

Adapt scope mock to new api and quiet unused variable warnings.

 * Are there any related MPs required for this MP to build/function as expected? Please list.
No.

 * Did you perform an exploratory manual test run of your code change and any related functionality?
Yes. Builds!

 * Did you make sure that your branch does not contain spurious tags?
Yes.

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A

 * If you changed the UI, has there been a design review?
N/A

[Michal Hruby (mhr3)]

+1, actually compiles now ;)

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:990
http://jenkins.qa.ubuntu.com/job/unity8-ci/3242/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1277
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/246
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/336
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/336
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/336/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/336
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1592
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2174
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2174/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/8923

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/3242/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'debian/control'
--- debian/control	2014-06-19 11:17:28 +0000
+++ debian/control	2014-06-27 08:28:30 +0000
@@ -17,7 +17,7 @@
                libpulse-dev,
                libqmenumodel-dev (>= 0.2.7),
                libqt5xmlpatterns5-dev,
-               libunity-api-dev (>= 7.82),
+               libunity-api-dev (>= 7.83),
                libunity-mir-dev,
                libusermetricsoutput1-dev,
                libxcb1-dev,

=== modified file 'tests/mocks/Unity/fake_categories.cpp'
--- tests/mocks/Unity/fake_categories.cpp	2014-05-27 07:46:14 +0000
+++ tests/mocks/Unity/fake_categories.cpp	2014-06-27 08:28:30 +0000
@@ -50,7 +50,7 @@
     }
 }
 
-bool Categories::overrideCategoryJson(QString const& categoryId, QString const& json)
+bool Categories::overrideCategoryJson(QString const& /* categoryId */, QString const& /* json */)
 {
     qFatal("Using un-implemented Categories::overrideCategoryJson");
 }

=== modified file 'tests/mocks/Unity/fake_scope.cpp'
--- tests/mocks/Unity/fake_scope.cpp	2014-05-29 10:25:21 +0000
+++ tests/mocks/Unity/fake_scope.cpp	2014-06-27 08:28:30 +0000
@@ -155,6 +155,11 @@
     return true;
 }
 
+QVariantMap Scope::customizations() const
+{
+    return QVariantMap();
+}
+
 unity::shell::scopes::DepartmentInterface* Scope::getDepartment(const QString& id)
 {
     if (id.isEmpty())

=== modified file 'tests/mocks/Unity/fake_scope.h'
--- tests/mocks/Unity/fake_scope.h	2014-05-29 10:25:21 +0000
+++ tests/mocks/Unity/fake_scope.h	2014-06-27 08:28:30 +0000
@@ -64,6 +64,8 @@
     Q_INVOKABLE unity::shell::scopes::DepartmentInterface* getDepartment(const QString& id) override;
     Q_INVOKABLE void loadDepartment(const QString& id) override;
 
+    QVariantMap customizations() const override;
+
 protected:
 
     QString m_id;