Merge lp:~aacid/connectivity-api/networking_status_singleton into lp:connectivity-api/14.10

[Albert Astals Cid]

Make NetworkingStatus a singleton

This way it can be used from various places of an app without having to worry creating lots of them or to pass the information down

[lp:~aacid/connectivity-api/networking_status_singleton]

21. By Albert Astals Cid on 2014-08-26

Give it a parent

[Antti Kaijanmäki (kaijanmaki)]

Thanks!
LGTM.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:20
http://jenkins.qa.ubuntu.com/job/connectivity-api-ci/60/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/connectivity-api-utopic-amd64-ci/13
    SUCCESS: http://jenkins.qa.ubuntu.com/job/connectivity-api-utopic-armhf-ci/13
        deb: http://jenkins.qa.ubuntu.com/job/connectivity-api-utopic-armhf-ci/13/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/connectivity-api-utopic-i386-ci/13

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/connectivity-api-ci/60/rebuild

review: Approve (continuous-integration)

=== modified file 'doc/qt/qml/examples/example_networking_status.qml'
--- doc/qt/qml/examples/example_networking_status.qml	2014-08-19 19:31:12 +0000
+++ doc/qt/qml/examples/example_networking_status.qml	2014-08-26 16:11:23 +0000
@@ -30,9 +30,8 @@
     property real margins: units.gu(2)
     property real buttonWidth: units.gu(9)
 
-    // create the NetworkingStatus object
-    NetworkingStatus {
-        id: networkingStatus
+    Connections {
+        target: NetworkingStatus
 
         // full status can be retrieved from the base C++ class
         // status property
@@ -53,12 +52,12 @@
             anchors.centerIn: parent
             Label {
                 // use the online property
-                text: networkingStatus.online ? "Online" : "Not online"
+                text: NetworkingStatus.online ? "Online" : "Not online"
                 fontSize: "large"
             }
             Label {
                 // use the limitedBandwith property
-                text: networkingStatus.limitedBandwith ? "Bandwith limited" : "Bandwith not limited"
+                text: NetworkingStatus.limitedBandwith ? "Bandwith limited" : "Bandwith not limited"
                 fontSize: "large"
             }
         }

=== modified file 'doc/qt/qml/qml-api/NetworkingStatus.qml'
--- doc/qt/qml/qml-api/NetworkingStatus.qml	2014-08-19 19:31:12 +0000
+++ doc/qt/qml/qml-api/NetworkingStatus.qml	2014-08-26 16:11:23 +0000
@@ -30,6 +30,8 @@
  and provides two utility properties online and limitedBandwith for easier
  QML usage.
 
+ This object is exposed as a singleton.
+
  \b{note:}
  Using this component in confined application requires \e{connectivity} policy group.
 

=== modified file 'src/qt/qml/Ubuntu/Connectivity/plugin.cpp'
--- src/qt/qml/Ubuntu/Connectivity/plugin.cpp	2014-08-19 19:31:12 +0000
+++ src/qt/qml/Ubuntu/Connectivity/plugin.cpp	2014-08-26 16:11:23 +0000
@@ -23,11 +23,19 @@
 
 #include "networking-status.h"
 
+static QObject *
+networkingStatusSingletonProvider(QQmlEngine *engine, QJSEngine *scriptEngine)
+{
+    Q_UNUSED(scriptEngine)
+
+    return new NetworkingStatus(engine);
+}
+
 void
 QmlConnectivityNetworkingPlugin::registerTypes(const char *uri)
 {
     // @uri Ubuntu.Connectivity
-    qmlRegisterType<NetworkingStatus> (uri, 1, 0, "NetworkingStatus");
+    qmlRegisterSingletonType<NetworkingStatus>(uri, 1, 0, "NetworkingStatus", networkingStatusSingletonProvider);
 }
 
 void

=== modified file 'tests/integration/qt/qml/tst_api.qml'
--- tests/integration/qt/qml/tst_api.qml	2014-08-19 19:31:12 +0000
+++ tests/integration/qt/qml/tst_api.qml	2014-08-26 16:11:23 +0000
@@ -29,8 +29,8 @@
  */
 Item {
 
-    NetworkingStatus {
-        id: networkingStatus
+    Connections {
+        target: NetworkingStatus
         onStatusChanged: {}
         onLimitationsChanged: {}
         onOnlineChanged: {}
@@ -41,9 +41,9 @@
         name: "API Test"
         id: test_api
 
-        property int status : networkingStatus.status
-        property int online : networkingStatus.online
-        property int limitedBandwith : networkingStatus.limitedBandwith
+        property int status : NetworkingStatus.status
+        property int online : NetworkingStatus.online
+        property int limitedBandwith : NetworkingStatus.limitedBandwith
 
         function test_api() {
             // just make sure this file can be loaded properly by the QmlEngine.