Merge lp:~larsu/gsettings-qt/add-changed-signal into lp:gsettings-qt

[Lars Karlitski]

Add 'changed' signal

There's a 'valueChanged' on QQmlPropertyMap, but that is not emitted when values are inserted via insert().

'changed' is always emitted, except when the values are first read.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:19
http://jenkins.qa.ubuntu.com/job/gsettings-qt-ci/1/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gsettings-qt-saucy-amd64-ci/1

Click here to trigger a rebuild:
http://s-jenkins:8080/job/gsettings-qt-ci/1/rebuild

review: Approve (continuous-integration)

[Iain Lane (laney)]

Cool, thanks, it works great.

Could you write a simple testcase for this?

[Iain Lane (laney)]

Let's get it in - I'll write a testcase for it now.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/gsettings-qt-autolanding/2/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/gsettings-qt-saucy-amd64-autolanding/2/console

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'GSettings/gsettings-qml.cpp'
--- GSettings/gsettings-qml.cpp	2013-06-21 18:28:09 +0000
+++ GSettings/gsettings-qml.cpp	2013-07-12 12:06:26 +0000
@@ -122,7 +122,7 @@
     return g_string_free(str, FALSE);
 }
 
-void GSettingsQml::updateKey(const gchar *gkey)
+void GSettingsQml::updateKey(const gchar *gkey, bool emitChanged)
 {
     QString qkey;
     GVariant *value;
@@ -133,6 +133,9 @@
     qvalue = qconf_types_to_qvariant(value);
     this->insert(qkey, qvalue);
 
+    if (emitChanged)
+        Q_EMIT (changed (qkey, qvalue));
+
     g_variant_unref(value);
 }
 
@@ -144,7 +147,7 @@
 {
     GSettingsQml *self = (GSettingsQml *)user_data;
 
-    self->updateKey(key);
+    self->updateKey(key, true);
 }
 
 void GSettingsQml::componentComplete()
@@ -161,7 +164,7 @@
 
     keys = g_settings_list_keys(priv->settings);
     for (i = 0; keys[i]; i++)
-        this->updateKey(keys[i]);
+        this->updateKey(keys[i], false);
     g_strfreev(keys);
 }
 

=== modified file 'GSettings/gsettings-qml.h'
--- GSettings/gsettings-qml.h	2013-06-21 18:28:09 +0000
+++ GSettings/gsettings-qml.h	2013-07-12 12:06:26 +0000
@@ -36,11 +36,14 @@
     QByteArray path() const;
     void setPath(const QByteArray &path);
 
-    void updateKey(const char *gkey);
+    void updateKey(const char *gkey, bool emitChanged);
 
     void classBegin();
     void componentComplete();
 
+Q_SIGNALS:
+    void changed (const QString &key, const QVariant &value);
+
 private:
     struct GSettingsQmlPrivate *priv;