Merge lp:~dandrader/unity-api/removeApplicationStage into lp:unity-api

[Daniel d'Andrada]

Remove ApplicationInfoInterface.stage property

And remove "stage" role from ApplicationManagerInterface accordingly

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

FAILED: Continuous integration, rev:236
https://unity8-jenkins.ubuntu.com/job/lp-unity-api-ci/89/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/2009/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/2037
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1954
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1954
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/1954
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1945/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1945/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/1945/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1945/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1945/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/1945/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1945/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1945/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/1945/console

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

review: Needs Fixing (continuous-integration)

[Michael Zanetti (mzanetti)]

+1 in general, but:

* There's a "Stage" enum in ApplicationInfoInterface.h. Can that go away too?

* You forgot to update test/qmltest/unity/shell/application/tst_Application.qml

review: Needs Fixing

[Daniel d'Andrada (dandrader)]

On 20/06/2016 08:43, Michael Zanetti wrote:
> * There's a "Stage" enum in ApplicationInfoInterface.h. Can that go away too?

That enum is still used in the code. We could move it to Mir.h...

[Michael Zanetti (mzanetti)]

> On 20/06/2016 08:43, Michael Zanetti wrote:
> > * There's a "Stage" enum in ApplicationInfoInterface.h. Can that go away
> too?
>
> That enum is still used in the code. We could move it to Mir.h...

ok then. I don't require you to do that in this merge. Just clean up the failing tests and we're good.

[lp:~dandrader/unity-api/removeApplicationStage]

239. By CI Train Bot Account on 2016-06-20

MirSurfaceInterface: add inputBounds property

240. By CI Train Bot Account on 2016-06-20

Releasing 7.116+16.10.20160620-0ubuntu1

[Daniel d'Andrada (dandrader)]

On 20/06/2016 08:43, Michael Zanetti wrote:
> * You forgot to update test/qmltest/unity/shell/application/tst_Application.qml

Done.

[Daniel d'Andrada (dandrader)]

On 20/06/2016 11:12, Michael Zanetti wrote:
>> On 20/06/2016 08:43, Michael Zanetti wrote:
>>> * There's a "Stage" enum in ApplicationInfoInterface.h. Can that go away
>> too?
>>
>> That enum is still used in the code. We could move it to Mir.h...
> ok then. I don't require you to do that in this merge. Just clean up the failing tests and we're good.

Actually it doesn't belong to Mir.h as "stage" is a unity8 concept.

Tried removing it but in unity8 there's both qml and cpp code refering
to it. Also from multiple qml files. So having it in
ApplicationInfoInterface.h is quite handy. To remove it from there I
would have to add it to another header file in unity8. Or maybe turn it
into a "bool sideStage" property. Yeah, that sideStage boolean would
solve it. But then it would be an API change in unity8, making it a more
complex branch tha also modifies code instead of simply removing unused
stuff.

Fixed the qml test.

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

PASSED: Continuous integration, rev:239
https://unity8-jenkins.ubuntu.com/job/lp-unity-api-ci/91/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/2090
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/2118
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2029
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2029
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2029
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2020
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2020/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2020
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2020/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2020
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2020/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2020
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2020/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2020
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2020/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2020
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2020/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2020
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2020/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2020
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2020/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2020
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2020/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Michael Zanetti (mzanetti)]

yip yip

review: Approve

[lp:~dandrader/unity-api/removeApplicationStage]

241. By Daniel d'Andrada on 2016-07-25

Remove ApplicationInfoInterface.stage property

And remove "stage" role from ApplicationManagerInterface accordingly

242. By Daniel d'Andrada on 2016-07-25

Update tests

=== modified file 'debian/changelog'
--- debian/changelog	2016-06-20 14:39:15 +0000
+++ debian/changelog	2016-07-25 18:44:12 +0000
@@ -1,3 +1,10 @@
+unity-api (7.117) UNRELEASED; urgency=medium
+
+  * ApplicationInfoInterface: remove "stage" property
+  * ApplicationManagerInterface: remove "stage" role
+
+ -- Daniel d'Andrada <[e-mail]>  Mon, 25 Jul 2016 10:55:56 -0300
+
 unity-api (7.116+16.10.20160620-0ubuntu1) yakkety; urgency=medium
 
   * MirSurfaceInterface: add inputBounds property

=== modified file 'include/unity/shell/application/ApplicationInfoInterface.h'
--- include/unity/shell/application/ApplicationInfoInterface.h	2016-05-19 10:17:07 +0000
+++ include/unity/shell/application/ApplicationInfoInterface.h	2016-07-25 18:44:12 +0000
@@ -79,13 +79,6 @@
     Q_PROPERTY(QUrl icon READ icon NOTIFY iconChanged)
 
     /**
-     * @brief The application's stage.
-     *
-     * Holds the stage where this application is currently located.
-     */
-    Q_PROPERTY(Stage stage READ stage WRITE setStage NOTIFY stageChanged)
-
-    /**
      * @brief The application's state.
      *
      * Holds the current application state.
@@ -296,8 +289,6 @@
     virtual QString name() const = 0;
     virtual QString comment() const = 0;
     virtual QUrl icon() const = 0;
-    virtual Stage stage() const = 0;
-    virtual void setStage(Stage) = 0;
     virtual State state() const = 0;
     virtual RequestedState requestedState() const = 0;
     virtual void setRequestedState(RequestedState) = 0;
@@ -325,7 +316,6 @@
     void nameChanged(const QString &name);
     void commentChanged(const QString &comment);
     void iconChanged(const QUrl &icon);
-    void stageChanged(Stage stage);
     void stateChanged(State state);
     void requestedStateChanged(RequestedState value);
     void focusedChanged(bool focused);

=== modified file 'include/unity/shell/application/ApplicationManagerInterface.h'
--- include/unity/shell/application/ApplicationManagerInterface.h	2016-05-13 09:35:14 +0000
+++ include/unity/shell/application/ApplicationManagerInterface.h	2016-07-25 18:44:12 +0000
@@ -67,7 +67,6 @@
         m_roleNames.insert(RoleName, "name");
         m_roleNames.insert(RoleComment, "comment");
         m_roleNames.insert(RoleIcon, "icon");
-        m_roleNames.insert(RoleStage, "stage");
         m_roleNames.insert(RoleState, "state");
         m_roleNames.insert(RoleFocused, "focused");
         m_roleNames.insert(RoleIsTouchApp, "isTouchApp");
@@ -92,7 +91,6 @@
         RoleName,
         RoleComment,
         RoleIcon,
-        RoleStage,
         RoleState,
         RoleFocused,
         RoleIsTouchApp,

=== modified file 'include/unity/shell/application/CMakeLists.txt'
--- include/unity/shell/application/CMakeLists.txt	2016-06-20 14:06:02 +0000
+++ include/unity/shell/application/CMakeLists.txt	2016-07-25 18:44:12 +0000
@@ -7,7 +7,7 @@
 
 set(UNITY_API_LIB_HDRS ${UNITY_API_LIB_HDRS} ${headers} ${internal_headers} PARENT_SCOPE)
 
-set(VERSION 19)
+set(VERSION 20)
 set(PKGCONFIG_NAME "unity-shell-application")
 set(PKGCONFIG_DESCRIPTION "Unity shell Application APIs")
 set(PKGCONFIG_REQUIRES "Qt5Core")

=== modified file 'test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationInfo.cpp'
--- test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationInfo.cpp	2016-05-18 13:35:36 +0000
+++ test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationInfo.cpp	2016-07-25 18:44:12 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2013,2016 Canonical Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -27,7 +27,6 @@
     m_name(name),
     m_comment(comment),
     m_icon(icon),
-    m_stage(MainStage),
     m_state(Running),
     m_focused(false),
     m_exemptFromLifecycle(false)
@@ -55,20 +54,6 @@
     return m_icon;
 }
 
-ApplicationInfoInterface::Stage MockApplicationInfo::stage() const
-{
-    return m_stage;
-}
-
-void MockApplicationInfo::setStage(ApplicationInfoInterface::Stage stage)
-{
-    if (m_stage != stage)
-    {
-        m_stage = stage;
-        Q_EMIT stageChanged(m_stage);
-    }
-}
-
 ApplicationInfoInterface::State MockApplicationInfo::state() const
 {
     return m_state;

=== modified file 'test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationInfo.h'
--- test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationInfo.h	2016-05-19 10:17:07 +0000
+++ test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationInfo.h	2016-07-25 18:44:12 +0000
@@ -34,9 +34,6 @@
     QString comment() const;
     QUrl icon() const;
 
-    ApplicationInfoInterface::Stage stage() const;
-    void setStage(ApplicationInfoInterface::Stage stage);
-
     ApplicationInfoInterface::State state() const;
     void setState(ApplicationInfoInterface::State state);
 
@@ -71,7 +68,6 @@
     QString m_name;
     QString m_comment;
     QUrl m_icon;
-    ApplicationInfoInterface::Stage m_stage;
     ApplicationInfoInterface::State m_state;
     bool m_focused;
     bool m_exemptFromLifecycle;

=== modified file 'test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationManager.cpp'
--- test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationManager.cpp	2015-12-03 17:07:15 +0000
+++ test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationManager.cpp	2016-07-25 18:44:12 +0000
@@ -60,8 +60,6 @@
         return item->comment();
     case RoleIcon:
         return item->icon();
-    case RoleStage:
-        return item->stage();
     case RoleState:
         return item->state();
     case RoleFocused:

=== modified file 'test/qmltest/unity/shell/application/tst_Application.qml'
--- test/qmltest/unity/shell/application/tst_Application.qml	2015-12-03 17:07:15 +0000
+++ test/qmltest/unity/shell/application/tst_Application.qml	2016-07-25 18:44:12 +0000
@@ -66,7 +66,6 @@
                         { enum: "RoleName" },
                         { enum: "RoleComment" },
                         { enum: "RoleIcon" },
-                        { enum: "RoleStage" },
                         { enum: "RoleState" },
                         { enum: "RoleFocused" },
                         { enum: "RoleIsTouchApp" },
@@ -87,7 +86,6 @@
                         { tag: "ApplicationManager.roles[name]", role: "name", type: "string" },
                         { tag: "ApplicationManager.roles[comment]", role: "comment", type: "string" },
                         { tag: "ApplicationManager.roles[icon]", role: "icon", type: "object" },
-                        { tag: "ApplicationManager.roles[stage]", role: "stage", type: "number" },
                         { tag: "ApplicationManager.roles[state]", role: "state", type: "number" },
                         { tag: "ApplicationManager.roles[focused]", role: "focused", type: "boolean" },
                         { tag: "ApplicationManager.roles[isTouchApp]", role: "isTouchApp", type: "boolean" },
@@ -143,7 +141,6 @@
                 { tag: "ApplicationInfo.properties[name]", property: "name", type: "string" },
                 { tag: "ApplicationInfo.properties[comment]", property: "comment", type: "string" },
                 { tag: "ApplicationInfo.properties[icon]", property: "icon", type: "object" },
-                { tag: "ApplicationInfo.properties[stage]", property: "stage", type: "number" },
                 { tag: "ApplicationInfo.properties[state]", property: "state", type: "number" },
                 { tag: "ApplicationInfo.properties[requestedState]", property: "requestedState", type: "number" },
                 { tag: "ApplicationInfo.properties[focused]", property: "focused", type: "boolean" },