Merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/noDoCleanup into lp:ubuntu-ui-toolkit/staging

[Christian Dywan]

Remove "do cleanup" comments

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1551
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1971/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/699
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/701/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/698

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1971/rebuild

review: Needs Fixing (continuous-integration)

[Zsombor Egri (zsombi)]

There is slightly more to do when fixing this: you should make sure the list properties are list<UCAction> not as list<QObject>.

review: Needs Fixing

[lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/noDoCleanup]

1552. By Christian Dywan on 2015-07-09

Move to strict UCAction(Context) type usage

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1552
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1972/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/700/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/702/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/699/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1972/rebuild

review: Needs Fixing (continuous-integration)

[Zsombor Egri (zsombi)]

Small issue, API file ;)

review: Needs Fixing

[lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/noDoCleanup]

1553. By Christian Dywan on 2015-07-10

Update components.api

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1553
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1975/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/703
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/705
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/705/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/702

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1975/rebuild

review: Approve (continuous-integration)

[Zsombor Egri (zsombi)]

Looks good to go now.

review: Approve

=== modified file 'components.api'
--- components.api	2015-07-10 13:05:26 +0000
+++ components.api	2015-07-10 13:53:01 +0000
@@ -34,10 +34,10 @@
     readonly property Action actions
     property int numberOfSlots
 Ubuntu.Components.ActionContext 1.0 0.1: QtObject
-    default readonly property QtObject actions
+    default readonly property Action actions
     property bool active
-    function addAction(QtObject action)
-    function removeAction(QtObject action)
+    function addAction(Action action)
+    function removeAction(Action action)
 Ubuntu.Components.ActionItem 1.0 0.1: StyledItem
     property Action action
     property string iconName
@@ -59,14 +59,14 @@
     readonly property Action actions
     default readonly property Action children
 Ubuntu.Components.ActionManager 1.0 0.1: QtObject
-    default readonly property QtObject actions
+    default readonly property Action actions
     readonly property ActionContext globalContext
-    readonly property QtObject localContexts
+    readonly property ActionContext localContexts
     signal quit()
-    function addAction(QtObject action)
-    function removeAction(QtObject action)
-    function addLocalContext(QtObject context)
-    function removeLocalContext(QtObject context)
+    function addAction(Action action)
+    function removeAction(Action action)
+    function addLocalContext(ActionContext context)
+    function removeLocalContext(ActionContext context)
 Ubuntu.Components.Popups.ActionSelectionPopover 1.0 0.1: Popover
     property var actions
     property Component delegate
@@ -581,7 +581,7 @@
     readonly property bool rotating
     property bool transitionEnabled
 Ubuntu.Components.Page 1.0 0.1: PageTreeNode
-    readonly property QtObject actions
+    readonly property Action actions
     property Flickable flickable
     property string title
     property Item tools

=== modified file 'modules/Ubuntu/Components/plugin/ucactioncontext.cpp'
--- modules/Ubuntu/Components/plugin/ucactioncontext.cpp	2014-09-16 15:54:35 +0000
+++ modules/Ubuntu/Components/plugin/ucactioncontext.cpp	2015-07-10 13:53:01 +0000
@@ -53,40 +53,33 @@
     }
 }
 
-
 /*!
  * \qmlproperty list<Action> ActionContext::actions
  * \default
  * List of Actions in this ActionContext.
  */
-// FIXME: do cleanup https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1369874
-QQmlListProperty<QObject> UCActionContext::actions()
+QQmlListProperty<UCAction> UCActionContext::actions()
 {
-    return QQmlListProperty<QObject>(this, 0, UCActionContext::append, UCActionContext::count, 0, UCActionContext::clear);
+    return QQmlListProperty<UCAction>(this, 0, UCActionContext::append, UCActionContext::count, 0, UCActionContext::clear);
 }
-// FIXME: do cleanup https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1369874
-void UCActionContext::append(QQmlListProperty<QObject> *list, QObject *action)
+
+void UCActionContext::append(QQmlListProperty<UCAction> *list, UCAction *action)
 {
     UCActionContext *context = qobject_cast<UCActionContext*>(list->object);
     if (context) {
-        UCAction *toolkitAction = qobject_cast<UCAction*>(action);
-        if (toolkitAction) {
-            context->m_actions.insert(toolkitAction);
-        } else {
-            qmlInfo(action) << "Invalid Action. Please use Action from Ubuntu.Components.";
-        }
+        context->m_actions.insert(action);
     }
 }
-// FIXME: do cleanup https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1369874
-void UCActionContext::clear(QQmlListProperty<QObject> *list)
+
+void UCActionContext::clear(QQmlListProperty<UCAction> *list)
 {
     UCActionContext *context = qobject_cast<UCActionContext*>(list->object);
     if (context) {
         context->m_actions.clear();
     }
 }
-// FIXME: do cleanup https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1369874
-int UCActionContext::count(QQmlListProperty<QObject> *list)
+
+int UCActionContext::count(QQmlListProperty<UCAction> *list)
 {
     UCActionContext *context = qobject_cast<UCActionContext*>(list->object);
     if (context) {
@@ -129,18 +122,12 @@
  * \deprecated
  * Adds an Action to the context programatically.
  */
-// FIXME: do cleanup https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1369874
-void UCActionContext::addAction(QObject *action)
+void UCActionContext::addAction(UCAction *action)
 {
-    UCAction *toolkitAction = qobject_cast<UCAction*>(action);
-    if (!toolkitAction) {
-        qmlInfo(action) << "Unity.Action deprecated. Please use Action from Ubuntu.Components.";
-        return;
-    }
-    if (m_actions.contains(toolkitAction)) {
-        return;
-    }
-    m_actions.insert(toolkitAction);
+    if (m_actions.contains(action)) {
+        return;
+    }
+    m_actions.insert(action);
 }
 
 /*!
@@ -148,16 +135,10 @@
  * \deprecated
  * Removes an action from the context programatically.
  */
-// FIXME: do cleanup https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1369874
-void UCActionContext::removeAction(QObject *action)
+void UCActionContext::removeAction(UCAction *action)
 {
     if (!action) {
         return;
     }
-    UCAction *toolkitAction = qobject_cast<UCAction*>(action);
-    if (!toolkitAction) {
-        qmlInfo(action) << "Unity.Action deprecated. Please use Action from Ubuntu.Components.";
-        return;
-    }
-    m_actions.remove(toolkitAction);
+    m_actions.remove(action);
 }

=== modified file 'modules/Ubuntu/Components/plugin/ucactioncontext.h'
--- modules/Ubuntu/Components/plugin/ucactioncontext.h	2014-10-08 19:08:08 +0000
+++ modules/Ubuntu/Components/plugin/ucactioncontext.h	2015-07-10 13:53:01 +0000
@@ -28,7 +28,7 @@
 {
     Q_OBJECT
     Q_INTERFACES(QQmlParserStatus)
-    Q_PROPERTY(QQmlListProperty<QObject> actions READ actions)
+    Q_PROPERTY(QQmlListProperty<UCAction> actions READ actions)
     Q_PROPERTY(bool active MEMBER m_active WRITE setActive NOTIFY activeChanged)
     Q_CLASSINFO("DefaultProperty", "actions")
 public:
@@ -39,7 +39,7 @@
     void componentComplete();
     void markActionsPublished(bool mark);
 
-    QQmlListProperty<QObject> actions();
+    QQmlListProperty<UCAction> actions();
 
     void setActive(bool active);
 
@@ -47,17 +47,17 @@
     void activeChanged(bool);
 
 public Q_SLOTS:
-    void addAction(QObject *action);
-    void removeAction(QObject *action);
+    void addAction(UCAction *action);
+    void removeAction(UCAction *action);
 
 private:
     bool m_active;
     QSet<UCAction*> m_actions;
     friend class UCActionManager;
 
-    static void append(QQmlListProperty<QObject> *list, QObject *action);
-    static void clear(QQmlListProperty<QObject> *list);
-    static int count(QQmlListProperty<QObject> *list);
+    static void append(QQmlListProperty<UCAction> *list, UCAction *action);
+    static void clear(QQmlListProperty<UCAction> *list);
+    static int count(QQmlListProperty<UCAction> *list);
 };
 
 QML_DECLARE_TYPE(UCActionContext)

=== modified file 'modules/Ubuntu/Components/plugin/ucactionmanager.cpp'
--- modules/Ubuntu/Components/plugin/ucactionmanager.cpp	2014-09-16 15:54:35 +0000
+++ modules/Ubuntu/Components/plugin/ucactionmanager.cpp	2015-07-10 13:53:01 +0000
@@ -50,33 +50,25 @@
  * \default
  * A list of actions in the global context.
  */
-// FIXME: do cleanup https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1369874
-QQmlListProperty<QObject> UCActionManager::actions()
+QQmlListProperty<UCAction> UCActionManager::actions()
 {
-    return QQmlListProperty<QObject>(this, 0, actionAppend, actionCount, 0, actionClear);
+    return QQmlListProperty<UCAction>(this, 0, actionAppend, actionCount, 0, actionClear);
 }
-// FIXME: do cleanup https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1369874
-void UCActionManager::actionAppend(QQmlListProperty<QObject> *list, QObject *action)
+
+void UCActionManager::actionAppend(QQmlListProperty<UCAction> *list, UCAction *action)
 {
     Q_UNUSED(list);
-    UCAction *toolkitAction = qobject_cast<UCAction*>(action);
-    if (!toolkitAction) {
-        qmlInfo(action) << "Unity.Action deprecated. Please use Action from Ubuntu.Components.";
-        return;
-    }
-    ActionProxy::instance().globalContext->m_actions.insert(toolkitAction);
+    ActionProxy::instance().globalContext->m_actions.insert(action);
 }
 
-// FIXME: do cleanup https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1369874
-void UCActionManager::actionClear(QQmlListProperty<QObject> *list)
+void UCActionManager::actionClear(QQmlListProperty<UCAction> *list)
 {
     Q_UNUSED(list);
     UCActionContext *context = ActionProxy::instance().globalContext;
     context->m_actions.clear();
 }
 
-// FIXME: do cleanup https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1369874
-int UCActionManager::actionCount(QQmlListProperty<QObject> *list)
+int UCActionManager::actionCount(QQmlListProperty<UCAction> *list)
 {
     Q_UNUSED(list);
     return ActionProxy::instance().globalContext->m_actions.count();
@@ -86,32 +78,26 @@
  * \qmlproperty list<ActionContext> ActionManager::localContexts
  * List of local contexts.
  */
-// FIXME: do cleanup https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1369874
-QQmlListProperty<QObject> UCActionManager::localContexts()
+QQmlListProperty<UCActionContext> UCActionManager::localContexts()
 {
-    return QQmlListProperty<QObject>(this, 0, contextAppend, contextCount, 0, contextClear);
+    return QQmlListProperty<UCActionContext>(this, 0, contextAppend, contextCount, 0, contextClear);
 }
-// FIXME: do cleanup https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1369874
-void UCActionManager::contextAppend(QQmlListProperty<QObject> *list, QObject *context)
+
+void UCActionManager::contextAppend(QQmlListProperty<UCActionContext> *list, UCActionContext *context)
 {
     Q_UNUSED(list);
-    UCActionContext *toolkitContext = qobject_cast<UCActionContext*>(context);
-    if (!toolkitContext) {
-        qmlInfo(context) << "Unity.Action deprecatedContext. Please use ActionContext from Ubuntu.Components.";
-        return;
-    }
-    ActionProxy::addContext(toolkitContext);
+    ActionProxy::addContext(context);
 }
-// FIXME: do cleanup https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1369874
-void UCActionManager::contextClear(QQmlListProperty<QObject> *list)
+
+void UCActionManager::contextClear(QQmlListProperty<UCActionContext> *list)
 {
     Q_UNUSED(list);
     Q_FOREACH(UCActionContext *context, ActionProxy::instance().localContexts().toList()) {
         ActionProxy::removeContext(context);
     }
 }
-// FIXME: do cleanup https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1369874
-int UCActionManager::contextCount(QQmlListProperty<QObject> *list)
+
+int UCActionManager::contextCount(QQmlListProperty<UCActionContext> *list)
 {
     Q_UNUSED(list);
     return ActionProxy::instance().localContexts().count();
@@ -132,16 +118,11 @@
  * \deprecated
  * This is a shorthand for \c ActionManager.globalContext.addAction(action) call.
  */
-// FIXME: do cleanup https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1369874
-void UCActionManager::addAction(QObject *action)
+void UCActionManager::addAction(UCAction *action)
 {
     if (!action) {
         return;
     }
-    if (!qobject_cast<UCAction*>(action)) {
-        qmlInfo(action) << "Unity.Action deprecated. Please use Action from Ubuntu.Components.";
-        return;
-    }
     ActionProxy::instance().globalContext->addAction(action);
 }
 
@@ -150,18 +131,12 @@
  * \deprecated
  * This is a shorthand for \c ActionManager.globalContext.removeAction(action) call.
  */
-// FIXME: do cleanup https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1369874
-void UCActionManager::removeAction(QObject *action)
+void UCActionManager::removeAction(UCAction *action)
 {
     if (!action) {
         return;
     }
-    UCAction *toolkitAction = qobject_cast<UCAction*>(action);
-    if (!toolkitAction) {
-        qmlInfo(action) << "Unity.Action deprecated. Please use Action from Ubuntu.Components.";
-        return;
-    }
-    ActionProxy::instance().globalContext->removeAction(toolkitAction);
+    ActionProxy::instance().globalContext->removeAction(action);
 }
 
 /*!
@@ -172,18 +147,12 @@
  * This is deprecated. ActionContext instances are added autimatically to the
  * action management stystem when declared and removed when destroyed.
  */
-// FIXME: do cleanup https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1369874
-void UCActionManager::addLocalContext(QObject *context)
+void UCActionManager::addLocalContext(UCActionContext *context)
 {
     if (!context) {
         return;
     }
-    UCActionContext *toolkitContext = qobject_cast<UCActionContext*>(context);
-    if (!toolkitContext) {
-        qmlInfo(context) << "Unity.ActionContext deprecated. Please use ActionContext from Ubuntu.Components.";
-        return;
-    }
-    ActionProxy::addContext(toolkitContext);
+    ActionProxy::addContext(context);
 }
 
 /*!
@@ -194,16 +163,10 @@
  * This is deprecated. ActionContext instances are added autimatically to the
  * action management stystem when declared and removed when destroyed.
  */
-// FIXME: do cleanup https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1369874
-void UCActionManager::removeLocalContext(QObject *context)
+void UCActionManager::removeLocalContext(UCActionContext *context)
 {
     if (!context) {
         return;
     }
-    UCActionContext *toolkitContext = qobject_cast<UCActionContext*>(context);
-    if (!toolkitContext) {
-        qmlInfo(context) << "Unity.ActionContext deprecated. Please use ActionContext from Ubuntu.Components.";
-        return;
-    }
-    ActionProxy::removeContext(toolkitContext);
+    ActionProxy::removeContext(context);
 }

=== modified file 'modules/Ubuntu/Components/plugin/ucactionmanager.h'
--- modules/Ubuntu/Components/plugin/ucactionmanager.h	2014-10-08 19:08:08 +0000
+++ modules/Ubuntu/Components/plugin/ucactionmanager.h	2015-07-10 13:53:01 +0000
@@ -27,8 +27,8 @@
 {
     Q_OBJECT
     Q_INTERFACES(QQmlParserStatus)
-    Q_PROPERTY(QQmlListProperty<QObject> actions READ actions)
-    Q_PROPERTY(QQmlListProperty<QObject> localContexts READ localContexts)
+    Q_PROPERTY(QQmlListProperty<UCAction> actions READ actions)
+    Q_PROPERTY(QQmlListProperty<UCActionContext> localContexts READ localContexts)
     Q_PROPERTY(UCActionContext *globalContext READ globalContext CONSTANT)
     Q_CLASSINFO("DefaultProperty", "actions")
 public:
@@ -37,27 +37,27 @@
     void classBegin() {}
     void componentComplete();
 
-    QQmlListProperty<QObject> actions();
-    QQmlListProperty<QObject> localContexts();
+    QQmlListProperty<UCAction> actions();
+    QQmlListProperty<UCActionContext> localContexts();
     UCActionContext *globalContext() const;
 
 Q_SIGNALS:
     void quit();
 
 public Q_SLOTS:
-    void addAction(QObject *action);
-    void removeAction(QObject *action);
-    void addLocalContext(QObject *context);
-    void removeLocalContext(QObject *context);
+    void addAction(UCAction *action);
+    void removeAction(UCAction *action);
+    void addLocalContext(UCActionContext *context);
+    void removeLocalContext(UCActionContext *context);
 
 private:
-    static void contextAppend(QQmlListProperty<QObject> *list, QObject *context);
-    static void contextClear(QQmlListProperty<QObject> *list);
-    static int contextCount(QQmlListProperty<QObject> *list);
+    static void contextAppend(QQmlListProperty<UCActionContext> *list, UCActionContext *context);
+    static void contextClear(QQmlListProperty<UCActionContext> *list);
+    static int contextCount(QQmlListProperty<UCActionContext> *list);
 
-    static void actionAppend(QQmlListProperty<QObject> *list, QObject *action);
-    static void actionClear(QQmlListProperty<QObject> *list);
-    static int actionCount(QQmlListProperty<QObject> *list);
+    static void actionAppend(QQmlListProperty<UCAction> *list, UCAction *action);
+    static void actionClear(QQmlListProperty<UCAction> *list);
+    static int actionCount(QQmlListProperty<UCAction> *list);
 };
 
 #endif // UCACTIONMANAGER_H

=== modified file 'tests/unit/tst_components/tst_action.qml'
--- tests/unit/tst_components/tst_action.qml	2015-03-03 13:20:06 +0000
+++ tests/unit/tst_components/tst_action.qml	2015-07-10 13:53:01 +0000
@@ -17,8 +17,6 @@
 import QtQuick 2.0
 import QtTest 1.0
 import Ubuntu.Components 1.1
-// FIXME: do cleanup https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1369874
-import Ubuntu.Unity.Action 1.1 as Unity
 
 TestCase {
      name: "ActionAPI"
@@ -121,27 +119,6 @@
          ignoreWarning(util.callerFile() + message);
      }
 
-     function test_add_unity_actioncontext_failure() {
-         ignoreQMLWarning(':217:6: QML ActionContext: Unity.ActionContext deprecated. Please use ActionContext from Ubuntu.Components.');
-         manager.addLocalContext(unityContext);
-         verify(!contains(manager.localContexts, unityContext), "Unity ActionContext cannot be added");
-     }
-
-     function test_unity_action_not_in_context() {
-         verify(!contains(manager.globalContext.actions, unityAction, "Unity Action cannot be registered"));
-     }
-
-     function test_0_cannot_add_unity_action_to_global_context() {
-         ignoreQMLWarning(':166:6: QML Action: Unity.Action deprecated. Please use Action from Ubuntu.Components.');
-         manager.globalContext.addAction(stockUnityAction);
-         verify(!contains(manager.globalContext.actions, stockUnityAction, "Unity Action cannot be registered"));
-     }
-
-     function test_1_cannot_add_unity_action_to_local_context() {
-         ignoreQMLWarning(':166:6: QML Action: Unity.Action deprecated. Please use Action from Ubuntu.Components.');
-         context1.addAction(stockUnityAction);
-         verify(!contains(context1.actions, stockUnityAction, "Unity Action cannot be registered"));
-     }
      function test_activate_contexts_data() {
          return [
              {tag: "Activate context1", active: context1, inactive: context2},
@@ -163,9 +140,6 @@
          property var parameter
          onTriggered: parameter = value
      }
-     Unity.Action {
-         id: stockUnityAction
-     }
 
      QtObject {
          id: object
@@ -202,9 +176,6 @@
          }
          Action {
          }
-         Unity.Action {
-             id: unityAction
-         }
      }
 
      ActionContext {
@@ -214,7 +185,4 @@
          id: context2
      }
 
-     Unity.ActionContext {
-         id: unityContext
-     }
 }