Merge lp:~renatofilho/indicators-client/fix-1186373 into lp:indicators-client

[Renato Araujo Oliveira Filho]

Avoid variable name conflicts, using the full path variable name.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:210
http://jenkins.qa.ubuntu.com/job/indicators-client-ci/19/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicators-client-saucy-amd64-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicators-client-saucy-armhf-ci/2

Click here to trigger a rebuild:
http://s-jenkins:8080/job/indicators-client-ci/19/rebuild

review: Approve (continuous-integration)

[Sergio Schvezov (sergiusens)]

Works like a charm. but like mentioned, we need to come up with some sort of _virtual_ namespacing.

review: Approve

=== modified file 'chewieui/Ubuntu/ChewieUI/ButtonMenu.qml'
--- chewieui/Ubuntu/ChewieUI/ButtonMenu.qml	2013-01-18 15:00:11 +0000
+++ chewieui/Ubuntu/ChewieUI/ButtonMenu.qml	2013-05-31 22:16:25 +0000
@@ -21,6 +21,7 @@
 import Ubuntu.Components 0.1
 
 BasicMenu {
+    id: _buttonMenu
     property variant action: menu && actionGroup ? actionGroup.action(menu.action) : undefined
 
     color: "#221e1b"
@@ -35,8 +36,8 @@
         color: "#1b1817"
 
         onClicked: {
-            if (action && action.valid) {
-                action.activate()
+            if (_buttonMenu.action && _buttonMenu.action.valid) {
+                _buttonMenu.action.activate()
             }
         }
     }

=== modified file 'plugins/messagingplugin/qml/ActionButton.qml'
--- plugins/messagingplugin/qml/ActionButton.qml	2013-01-11 15:05:30 +0000
+++ plugins/messagingplugin/qml/ActionButton.qml	2013-05-31 22:16:25 +0000
@@ -22,12 +22,12 @@
 import Ubuntu.Components 0.1
 
 Button {
-    property variant action: null
+    property variant _action: null
     property variant actionParameter: null
 
     onClicked: {
-        if (action && action.valid) {
-            action.activate(actionParameter)
+        if (_action && _action.valid) {
+            _action.activate(actionParameter)
         }
     }
 }

=== modified file 'plugins/messagingplugin/qml/ActionTextField.qml'
--- plugins/messagingplugin/qml/ActionTextField.qml	2013-01-11 15:05:30 +0000
+++ plugins/messagingplugin/qml/ActionTextField.qml	2013-05-31 22:16:25 +0000
@@ -22,7 +22,7 @@
 import Ubuntu.Components 0.1
 
 Item {
-    property alias action: __sendButton.action
+    property alias _action: __sendButton._action
     property alias text: __replyField.text
     property alias buttonText: __sendButton.text
 

=== modified file 'plugins/messagingplugin/qml/GroupedMessage.qml'
--- plugins/messagingplugin/qml/GroupedMessage.qml	2013-01-11 15:05:30 +0000
+++ plugins/messagingplugin/qml/GroupedMessage.qml	2013-05-31 22:16:25 +0000
@@ -23,7 +23,8 @@
 import Ubuntu.ChewieUI 0.1 as ChewieUI
 
 ChewieUI.RemovableMenu {
-    property variant action: menu && actionGroup ? actionGroup.action(menu.action) : undefined
+    id: _removableMenu
+    property variant _action: menu && actionGroup ? actionGroup.action(menu.action) : undefined
     property alias count: label.text
 
     color: "#221e1b"
@@ -61,7 +62,7 @@
             color: "#e8e1d0"
             font.weight: Font.DemiBold
             fontSize: "medium"
-            text: action && action.valid && action.state ? action.state[0] : "0"
+            text: _removableMenu._action && _removableMenu._action.valid && _removableMenu._action.state ? _removableMenu._action.state[0] : "0"
         }
     }
 
@@ -78,15 +79,15 @@
     MouseArea {
         anchors.fill: parent
         onClicked: {
-            if (action && action.valid) {
-                action.activate(true)
+            if (_removableMenu._action && _removableMenu._action.valid) {
+                _removableMenu._action.activate(true)
             }
         }
     }
 
     onItemRemoved: {
-        if (action && action.valid) {
-            action.activate(false)
+        if (_removableMenu._action && _removableMenu._action.valid) {
+            _removableMenu._action.activate(false)
         }
     }
 }

=== modified file 'plugins/messagingplugin/qml/HeroMessage.qml'
--- plugins/messagingplugin/qml/HeroMessage.qml	2013-04-03 20:50:27 +0000
+++ plugins/messagingplugin/qml/HeroMessage.qml	2013-05-31 22:16:25 +0000
@@ -26,7 +26,7 @@
     id: __heroMessage
 
     property variant actionsDescription: null
-    property variant action: menu && actionGroup ? actionGroup.action(menu.action) : undefined
+    property variant _action: menu && actionGroup ? actionGroup.action(menu.action) : undefined
     property alias heroMessageHeader: __heroMessageHeader
     property real collapsedHeight: heroMessageHeader.y + heroMessageHeader.bodyBottom + units.gu(2)
     property real expandedHeight: collapsedHeight
@@ -50,9 +50,9 @@
         state: __heroMessage.state
 
         onAppIconClicked:  {
-            if (action && action.valid) {
+            if (__heroMessage.action && __heroMessage.action.valid) {
                 listViewSelectItem(-1)
-                action.activate(true)
+                __heroMessage.action.activate(true)
             }
         }
     }
@@ -108,8 +108,8 @@
     }
 
     onItemRemoved: {
-        if (action && action.valid) {
-            action.activate(false)
+        if (__heroMessage._action && __heroMessage._action.valid) {
+            __heroMessage._action.activate(false)
         }
     }
 }

=== modified file 'plugins/messagingplugin/qml/QuickReply.qml'
--- plugins/messagingplugin/qml/QuickReply.qml	2013-03-08 19:17:07 +0000
+++ plugins/messagingplugin/qml/QuickReply.qml	2013-05-31 22:16:25 +0000
@@ -23,7 +23,9 @@
 import Ubuntu.ChewieUI 0.1 as ChewieUI
 
 Item {
-    property alias action: __actionTextField.action
+    id: _quickReply
+
+    property alias _action: __actionTextField._action
     property alias buttonText: __actionTextField.buttonText
     property real expandedHeight: childrenRect.height
     property alias messages : __messagelistRepeater.model
@@ -110,7 +112,7 @@
                     anchors.fill: parent
                     onClicked: {
                         __actionTextField.text = modelData
-                    }                    
+                    }
                 }
 
                 Rectangle {

=== modified file 'plugins/messagingplugin/qml/SnapDecision.qml'
--- plugins/messagingplugin/qml/SnapDecision.qml	2013-01-11 15:05:30 +0000
+++ plugins/messagingplugin/qml/SnapDecision.qml	2013-05-31 22:16:25 +0000
@@ -62,7 +62,7 @@
         }
 
         ActionButton {
-            action: menu && actionGroup && actionsDescription ? actionGroup.action(actionsDescription[0].name) : undefined
+            _action: menu && actionGroup && actionsDescription ? actionGroup.action(actionsDescription[0].name) : undefined
             text: actionsDescription ?  actionsDescription[0].label : "Call back"
             color: "#c94212"
             anchors.right: parent.right
@@ -94,7 +94,7 @@
 
         messages: actionsDescription ? actionsDescription[1]["parameter-hint"] : ""
         buttonText: actionsDescription ? actionsDescription[1].label : "send"
-        action:  menu && actionGroup && actionsDescription ? actionGroup.action(actionsDescription[1].name) : undefined
+        _action:  menu && actionGroup && actionsDescription ? actionGroup.action(actionsDescription[1].name) : undefined
         anchors.top: __buttons.bottom
         anchors.topMargin: units.gu(2)
         anchors.left: parent.left

=== modified file 'plugins/messagingplugin/qml/TextMessage.qml'
--- plugins/messagingplugin/qml/TextMessage.qml	2013-01-11 15:05:30 +0000
+++ plugins/messagingplugin/qml/TextMessage.qml	2013-05-31 22:16:25 +0000
@@ -26,7 +26,7 @@
 
     footer: ActionTextField {
         anchors.fill:  parent
-        action: menu && actionGroup && actionsDescription ? actionGroup.action(actionsDescription[0].name) : undefined
+        _action: menu && actionGroup && actionsDescription ? actionGroup.action(actionsDescription[0].name) : undefined
         buttonText: actionsDescription ? actionsDescription[0].label : "Send"
     }
 }