Merge lp:~mzanetti/unity-api/launcher-drop-setAlerting into lp:unity-api

[Michael Zanetti]

Drop LauncherModel::setAlerting, that's not needed

Related MPs:

https://code.launchpad.net/~mzanetti/unity8/alerting-pips/+merge/294629

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:236
https://unity8-jenkins.ubuntu.com/job/lp-unity-api-ci/76/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1630/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity-api-ci/76/rebuild

review: Needs Fixing (continuous-integration)

[Marcus Tomlinson (marcustomlinson)]

Don't forget to clean up the setAlerting() overrides in all child classes:

in unity-api:
    1) ./test/qmltest/mocks/plugins/Unity/Launcher/Mocks/MockLauncherModel.h

in unity8:
    1) ./plugins/Greeter/Unity/Launcher/launchermodelas.h

    2) ./plugins/Unity/Launcher/launchermodel.h

    3) ./tests/mocks/Unity/Launcher/MockLauncherModel.h

review: Needs Fixing

[Michael Zanetti (mzanetti)]

> Don't forget to clean up the setAlerting() overrides in all child classes:
>
> in unity-api:
> 1) ./test/qmltest/mocks/plugins/Unity/Launcher/Mocks/MockLauncherModel.h
>
> in unity8:
> 1) ./plugins/Greeter/Unity/Launcher/launchermodelas.h
>
> 2) ./plugins/Unity/Launcher/launchermodel.h
>
> 3) ./tests/mocks/Unity/Launcher/MockLauncherModel.h

done. thanks

[Unity8 CI Bot (unity8-ci-bot)]

PASSED: Continuous integration, rev:238
https://unity8-jenkins.ubuntu.com/job/lp-unity-api-ci/80/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1662
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1613
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1613
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1606
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1606/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1606
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1606/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1606
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1606/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1606
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1606/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1606
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1606/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1606
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1606/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity-api-ci/80/rebuild

review: Approve (continuous-integration)

[Marcus Tomlinson (marcustomlinson)]

Kinda weird that you moved the actual "Drop Launchermodel::setAlerting, it's not needed" commit (rev236) to the prereq branch.

Could you reverse cherry pick this from surfaceCount-property so that each MP's diff is correct.

review: Needs Fixing

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:239
https://unity8-jenkins.ubuntu.com/job/lp-unity-api-ci/81/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1668/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity-api-ci/81/rebuild

review: Needs Fixing (continuous-integration)

[lp:~mzanetti/unity-api/launcher-drop-setAlerting]

236. By Michael Zanetti on 2016-05-18

merge prereq

237. By Michael Zanetti on 2016-05-18

Drop Launchermodel::setAlerting, it's not needed

[Michael Zanetti (mzanetti)]

> Kinda weird that you moved the actual "Drop Launchermodel::setAlerting, it's
> not needed" commit (rev236) to the prereq branch.
>
> Could you reverse cherry pick this from surfaceCount-property so that each
> MP's diff is correct.

No idea how I managed to do that. Thanks a lot for catching. Should be fixed now.

[Marcus Tomlinson (marcustomlinson)]

Yep, looks good now :)

review: Approve

[lp:~mzanetti/unity-api/launcher-drop-setAlerting]

238. By Michael Zanetti on 2016-05-19

merge prereq

239. By Michael Zanetti on 2016-06-03

merge trunk, bump version

240. By Michael Zanetti on 2016-06-03

that wasn't needed

241. By Michael Zanetti on 2016-06-03

bump debian changelog

[Unity8 CI Bot (unity8-ci-bot)]

PASSED: Continuous integration, rev:238
https://unity8-jenkins.ubuntu.com/job/lp-unity-api-ci/85/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/1815
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1841
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1782
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1782
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/1782
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1772
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1772/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1772
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1772/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/1772
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/1772/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1772
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1772/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1772
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1772/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/1772
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/1772/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1772
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1772/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1772
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1772/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/1772
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/1772/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity-api-ci/85/rebuild

review: Approve (continuous-integration)

=== modified file 'debian/changelog'
--- debian/changelog	2016-06-03 11:21:11 +0000
+++ debian/changelog	2016-06-03 11:21:11 +0000
@@ -1,3 +1,9 @@
+unity-api (7.115) UNRELEASED; urgency=medium
+
+  * Drop Launchermodel::setAlerting, it's not needed
+
+ -- Michael Zanetti <[e-mail]>  Mon, 09 May 2016 18:43:38 +0200
+
 unity-api (7.114) UNRELEASED; urgency=medium
 
   * Add ApplicationInfoInterface::surfaceCount property

=== modified file 'include/unity/shell/launcher/CMakeLists.txt'
--- include/unity/shell/launcher/CMakeLists.txt	2016-06-03 11:21:11 +0000
+++ include/unity/shell/launcher/CMakeLists.txt	2016-06-03 11:21:11 +0000
@@ -7,7 +7,7 @@
 
 set(UNITY_API_LIB_HDRS ${UNITY_API_LIB_HDRS} ${headers} ${internal_headers} PARENT_SCOPE)
 
-set(VERSION 8)
+set(VERSION 9)
 set(PKGCONFIG_NAME "unity-shell-launcher")
 set(PKGCONFIG_DESCRIPTION "Unity shell Launcher APIs")
 set(PKGCONFIG_REQUIRES "Qt5Core")

=== modified file 'include/unity/shell/launcher/LauncherModelInterface.h'
--- include/unity/shell/launcher/LauncherModelInterface.h	2016-06-03 11:21:11 +0000
+++ include/unity/shell/launcher/LauncherModelInterface.h	2016-06-03 11:21:11 +0000
@@ -101,14 +101,6 @@
     virtual ~LauncherModelInterface() {}
 
     /**
-     * @brief Set or unset alert-state on launcher item.
-     *
-     * @param appId The appId of the item to affect.
-     * @param alerting The flag to set/unset launcher item's alert state.
-     */
-    Q_INVOKABLE virtual void setAlerting(const QString& appId, bool alerting) = 0;
-
-    /**
      * @brief Move an item in the model.
      *
      * @param oldIndex The current (old) index of the item to be moved.

=== modified file 'test/qmltest/mocks/plugins/Unity/Launcher/Mocks/MockLauncherItem.cpp'
--- test/qmltest/mocks/plugins/Unity/Launcher/Mocks/MockLauncherItem.cpp	2016-06-03 11:21:11 +0000
+++ test/qmltest/mocks/plugins/Unity/Launcher/Mocks/MockLauncherItem.cpp	2016-06-03 11:21:11 +0000
@@ -164,15 +164,6 @@
     return m_alerting;
 }
 
-void MockLauncherItem::setAlerting(bool alerting)
-{
-    if (m_alerting != alerting)
-    {
-        m_alerting = alerting;
-        Q_EMIT alertingChanged(alerting);
-    }
-}
-
 int MockLauncherItem::surfaceCount() const
 {
     return m_surfaceCount;

=== modified file 'test/qmltest/mocks/plugins/Unity/Launcher/Mocks/MockLauncherItem.h'
--- test/qmltest/mocks/plugins/Unity/Launcher/Mocks/MockLauncherItem.h	2016-06-03 11:21:11 +0000
+++ test/qmltest/mocks/plugins/Unity/Launcher/Mocks/MockLauncherItem.h	2016-06-03 11:21:11 +0000
@@ -57,7 +57,6 @@
     void setFocused(bool focused);
 
     bool alerting() const;
-    void setAlerting(bool alerting);
 
     int surfaceCount() const override;
 

=== modified file 'test/qmltest/mocks/plugins/Unity/Launcher/Mocks/MockLauncherModel.cpp'
--- test/qmltest/mocks/plugins/Unity/Launcher/Mocks/MockLauncherModel.cpp	2016-06-03 11:21:11 +0000
+++ test/qmltest/mocks/plugins/Unity/Launcher/Mocks/MockLauncherModel.cpp	2016-06-03 11:21:11 +0000
@@ -106,11 +106,6 @@
     return m_list.at(index);
 }
 
-void MockLauncherModel::setAlerting(const QString &appId, bool alerting) {
-    Q_UNUSED(appId)
-    Q_UNUSED(alerting)
-}
-
 void MockLauncherModel::move(int oldIndex, int newIndex)
 {
     Q_UNUSED(oldIndex)

=== modified file 'test/qmltest/mocks/plugins/Unity/Launcher/Mocks/MockLauncherModel.h'
--- test/qmltest/mocks/plugins/Unity/Launcher/Mocks/MockLauncherModel.h	2015-06-19 16:13:00 +0000
+++ test/qmltest/mocks/plugins/Unity/Launcher/Mocks/MockLauncherModel.h	2016-06-03 11:21:11 +0000
@@ -39,7 +39,6 @@
 
     QVariant data(const QModelIndex& index, int role) const;
 
-    Q_INVOKABLE void setAlerting(const QString& appId, bool alerting);
     Q_INVOKABLE unity::shell::launcher::LauncherItemInterface *get(int index) const;
     Q_INVOKABLE void move(int oldIndex, int newIndex);
     Q_INVOKABLE void pin(const QString &appId, int index = -1);

=== modified file 'test/qmltest/unity/shell/launcher/tst_Launcher.qml'
--- test/qmltest/unity/shell/launcher/tst_Launcher.qml	2016-06-03 11:21:11 +0000
+++ test/qmltest/unity/shell/launcher/tst_Launcher.qml	2016-06-03 11:21:11 +0000
@@ -105,7 +105,6 @@
 
         function test_model_methods_data() {
             return [
-                { tag: "Model.methods[setAlerting]", method: "setAlerting" },
                 { tag: "Model.methods[get]", method: "get" },
                 { tag: "Model.methods[move]", method: "move" },
                 { tag: "Model.methods[pin]", method: "pin" },