Merge lp:~larsu/gsettings-qt/lp1349787 into lp:gsettings-qt

[Lars Karlitski]

qconftypes: support a{ss}

We don't support a{sv} because gsettings is typed more strictly than javascript and qvariant.

qconftypes: support a{ss}

We don't support a{sv} because gsettings is typed more strictly than javascript and qvariant.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:63
http://jenkins.qa.ubuntu.com/job/gsettings-qt-ci/29/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/gsettings-qt-utopic-amd64-ci/6/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/gsettings-qt-utopic-armhf-ci/6/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/gsettings-qt-utopic-i386-ci/6/console

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

review: Needs Fixing (continuous-integration)

[lp:~larsu/gsettings-qt/lp1349787]

64. By Lars Karlitski on 2014-07-30

Remove symbols from libgsettings-qt1.symbols

These functions were never exposed in any headers and not used by anyone.

65. By Lars Karlitski on 2014-07-30

symbols: make detach_helper_grow optional

Unmerged revisions

=== modified file 'debian/libgsettings-qt1.symbols'
--- debian/libgsettings-qt1.symbols	2014-04-10 17:27:58 +0000
+++ debian/libgsettings-qt1.symbols	2014-07-30 12:47:31 +0000
@@ -1,8 +1,6 @@
 libgsettings-qt.so.1 libgsettings-qt1 #MINVER#
  (c++)"qtify_name(char const*)@Base" 0.1+14.04.20140408
  (c++)"unqtify_name(QString const&)@Base" 0.1+14.04.20140408
- (c++)"qconf_types_unpack(_GVariant*, void*)@Base" 0.1+14.04.20140408
- (c++)"qconf_types_collect(_GVariantType const*, void const*)@Base" 0.1+14.04.20140408
  (c++)"qconf_types_convert(_GVariantType const*)@Base" 0.1+14.04.20140408
  (c++)"qconf_types_to_qvariant(_GVariant*)@Base" 0.1+14.04.20140408
  (c++)"qconf_types_collect_from_variant(_GVariantType const*, QVariant const&)@Base" 0.1+14.04.20140408
@@ -22,7 +20,6 @@
  (c++)"QGSettings::~QGSettings()@Base" 0.1+14.04.20140408
  (c++)"QGSettings::~QGSettings()@Base" 0.1+14.04.20140408
  (c++)"QGSettingsPrivate::settingChanged(_GSettings*, char const*, void*)@Base" 0.1+14.04.20140408
- (c++|optional=templinst)"QList<QString>::detach_helper_grow(int, int)@Base" 0.1+14.04.20140408
  (c++|optional=templinst)"QList<QString>::append(QString const&)@Base" 0.1+14.04.20140408
  (c++|optional=templinst)"QList<QString>::QList(QList<QString> const&)@Base" 0.1+14.04.20140408
  (c++|optional=templinst)"QList<QString>::QList(QList<QString> const&)@Base" 0.1+14.04.20140408
@@ -34,6 +31,12 @@
  (c++|optional=templinst)"QList<QVariant>::QList(QList<QVariant> const&)@Base" 0.1+14.04.20140408
  (c++|optional=templinst)"QList<QVariant>::~QList()@Base" 0.1+14.04.20140408
  (c++|optional=templinst)"QList<QVariant>::~QList()@Base" 0.1+14.04.20140408
+ (c++)"QList<QString>::detach_helper_grow(int, int)@Base" 0replaceme
+ (c++)"QMap<QString, QVariant>::detach_helper()@Base" 0replaceme
+ (c++)"QMap<QString, QVariant>::~QMap()@Base" 0replaceme
+ (c++)"QMap<QString, QVariant>::~QMap()@Base" 0replaceme
+ (c++)"QMapNode<QString, QVariant>::destroySubTree()@Base" 0replaceme
+ (c++)"QMapNode<QString, QVariant>::copy(QMapData<QString, QVariant>*) const@Base" 0replaceme
  (c++)"QString::~QString()@Base" 0.1+14.04.20140408
  (c++)"QString::~QString()@Base" 0.1+14.04.20140408
  (c++)"QGSettings::metaObject() const@Base" 0.1+14.04.20140408

=== modified file 'examples/choices.qml'
--- examples/choices.qml	2014-06-23 13:29:16 +0000
+++ examples/choices.qml	2014-07-30 12:47:31 +0000
@@ -1,22 +1,33 @@
 
+import GSettings 1.0
 import QtQuick 2.0
-import GSettings 1.0
+import Ubuntu.Components 0.1
+import Ubuntu.Components.ListItems 0.1 as ListItems
 
 Item {
-  width: 200
+  width: 400
   height: 300
 
   GSettings {
     id: settings
-    schema.id: "org.gnome.desktop.interface"
+    schema.id: "com.canonical.Unity.Lenses"
   }
 
-  ListView {
+  Column {
     anchors.fill: parent
-    model: settings.schema.choices('toolbarStyle')
-
-    delegate: Text {
-      text: modelData
+
+    ListItems.Standard {
+      text: 'Dash search'
+      control: Switch {
+        checked: settings.remoteContentSearch == 'all'
+        onClicked: settings.remoteContentSearch = checked ? 'all' : 'none'
+      }
+    }
+
+    ListItems.SingleValue {
+      text: 'Possible values'
+      value: settings.schema.choices('remoteContentSearch').join(', ')
     }
   }
 }
+

=== modified file 'src/qconftypes.cpp'
--- src/qconftypes.cpp	2013-07-23 14:35:38 +0000
+++ src/qconftypes.cpp	2014-07-30 12:47:31 +0000
@@ -53,6 +53,7 @@
  *  string             s         QString                QVariant::String
  *  string array*      as        QStringList            QVariant::StringList
  *  byte array         ay        QByteArray             QVariant::ByteArray
+ *  dictionary         a{ss}     QVariantMap            QVariant::Map
  *
  * [*] not strictly an array, but called as such for sake of
  *     consistency with the 'a' appearing in the DBus type system
@@ -106,142 +107,15 @@
         else if (g_variant_type_equal(gtype, G_VARIANT_TYPE_BYTESTRING))
             return QVariant::ByteArray;
 
+        else if (g_variant_type_equal(gtype, G_VARIANT_TYPE ("a{ss}")))
+            return QVariant::Map;
+
         // fall through
     default:
         return QVariant::Invalid;
     }
 }
 
-GVariant *qconf_types_collect(const GVariantType *gtype, const void *argument)
-{
-  switch (g_variant_type_peek_string(gtype)[0]) {
-    case G_VARIANT_CLASS_BOOLEAN:
-        return g_variant_new_boolean(*(const bool *) argument);
-
-    case G_VARIANT_CLASS_BYTE:
-        return g_variant_new_byte(*(const char *) argument);
-
-    case G_VARIANT_CLASS_INT16:
-        return g_variant_new_int16(*(const int *) argument);
-
-    case G_VARIANT_CLASS_UINT16:
-        return g_variant_new_uint16(*(const unsigned int *) argument);
-
-    case G_VARIANT_CLASS_INT32:
-        return g_variant_new_int32(*(const int *) argument);
-
-    case G_VARIANT_CLASS_UINT32:
-        return g_variant_new_uint32(*(const unsigned int *) argument);
-
-    case G_VARIANT_CLASS_INT64:
-        return g_variant_new_int64(*(const long long *) argument);
-
-    case G_VARIANT_CLASS_UINT64:
-        return g_variant_new_int64(*(const unsigned long long *) argument);
-
-    case G_VARIANT_CLASS_DOUBLE:
-        return g_variant_new_double(*(const double *) argument);
-
-    case G_VARIANT_CLASS_STRING:
-        {
-            const QString& string = *(const QString *) argument;
-            return g_variant_new_string(string.toUtf8());
-        }
-
-    case G_VARIANT_CLASS_ARRAY:
-        if (g_variant_type_equal(gtype, G_VARIANT_TYPE_STRING_ARRAY)) {
-            const QStringList& list = *(const QStringList *) argument;
-            GVariantBuilder builder;
-
-            g_variant_builder_init(&builder, G_VARIANT_TYPE_ARRAY);
-
-            Q_FOREACH (const QString& string, list)
-              g_variant_builder_add(&builder, "s", string.toUtf8().constData());
-
-            return g_variant_builder_end(&builder);
-        } else if (g_variant_type_equal(gtype, G_VARIANT_TYPE_BYTESTRING)) {
-            const QByteArray& array = *(const QByteArray *) argument;
-            gsize size = array.size();
-            gpointer data;
-
-            data = g_memdup(array.data(), size);
-
-            return g_variant_new_from_data(G_VARIANT_TYPE_BYTESTRING,
-                                           data, size, TRUE, g_free, data);
-        }
-
-        // fall through
-    default:
-        g_assert_not_reached();
-  }
-}
-
-void qconf_types_unpack(GVariant *value, void *argument)
-{
-  switch (g_variant_classify(value)) {
-    case G_VARIANT_CLASS_BOOLEAN:
-        *(bool *) argument = g_variant_get_boolean(value);
-        break;
-
-    case G_VARIANT_CLASS_BYTE:
-        *(char *) argument = g_variant_get_byte(value);
-        break;
-
-    case G_VARIANT_CLASS_INT16:
-        *(int *) argument = g_variant_get_int16(value);
-        break;
-
-    case G_VARIANT_CLASS_UINT16:
-        *(unsigned int *) argument = g_variant_get_uint16(value);
-        break;
-
-    case G_VARIANT_CLASS_INT32:
-        *(int *) argument = g_variant_get_int32(value);
-        break;
-
-    case G_VARIANT_CLASS_UINT32:
-        *(unsigned int *) argument = g_variant_get_uint32(value);
-        break;
-
-    case G_VARIANT_CLASS_INT64:
-        *(long long *) argument = g_variant_get_int64(value);
-        break;
-
-    case G_VARIANT_CLASS_UINT64:
-        *(unsigned long long *) argument = g_variant_get_uint64(value);
-        break;
-
-    case G_VARIANT_CLASS_DOUBLE:
-        *(double *) argument = g_variant_get_double(value);
-        break;
-
-    case G_VARIANT_CLASS_STRING:
-        *(QString *) argument = QString(g_variant_get_string(value, NULL));
-        break;
-
-    case G_VARIANT_CLASS_ARRAY:
-        if (g_variant_is_of_type(value, G_VARIANT_TYPE_STRING_ARRAY)) {
-            GVariantIter iter;
-            QStringList list;
-            const gchar *str;
-
-            g_variant_iter_init (&iter, value);
-            while (g_variant_iter_next (&iter, "&s", &str))
-                list.append (str);
-
-            *(QStringList *) argument = list;
-            break;
-        } else if (g_variant_is_of_type(value, G_VARIANT_TYPE_BYTESTRING)) {
-            *(QByteArray *) argument = QByteArray(g_variant_get_bytestring(value));
-            break;
-        }
-
-        // fall through
-    default:
-        g_assert_not_reached();
-  }
-}
-
 QVariant qconf_types_to_qvariant(GVariant *value)
 {
     switch (g_variant_classify(value)) {
@@ -288,6 +162,17 @@
             return QVariant(list);
         } else if (g_variant_is_of_type(value, G_VARIANT_TYPE_BYTESTRING)) {
             return QVariant(QByteArray(g_variant_get_bytestring(value)));
+        } else if (g_variant_is_of_type(value, G_VARIANT_TYPE("a{ss}"))) {
+            GVariantIter iter;
+            QMap<QString, QVariant> map;
+            const gchar *key; 
+            const gchar *val;
+
+            g_variant_iter_init (&iter, value);
+            while (g_variant_iter_next (&iter, "{&s&s}", &key, &val))
+                map.insert(key, QVariant(val));
+
+            return map;
         }
 
         // fall through
@@ -349,6 +234,17 @@
 
             return g_variant_new_from_data(G_VARIANT_TYPE_BYTESTRING,
                                            data, size, TRUE, g_free, data);
+        } else if (g_variant_type_equal(gtype, G_VARIANT_TYPE("a{ss}"))) {
+            GVariantBuilder builder;
+            g_variant_builder_init(&builder, G_VARIANT_TYPE ("a{ss}"));
+            QMapIterator<QString, QVariant> it(v.toMap());
+            while (it.hasNext()) {
+                it.next();
+                QByteArray key = it.key().toUtf8();
+                QByteArray val = it.value().toByteArray();
+                g_variant_builder_add (&builder, "{ss}", key.constData(), val.constData());
+            }
+            return g_variant_builder_end (&builder);
         }
 
         // fall through

=== added file 'tests/manual'
--- tests/manual	1970-01-01 00:00:00 +0000
+++ tests/manual	2014-07-30 12:47:31 +0000
@@ -0,0 +1,15 @@
+
+Test-case gsettings-qt/unity8-check-setting
+<dl>
+  <dt>Open system settings with the security panel </dt>
+    <dd>Ensure "Dash search" is set to "Phone and Internet"</dd>
+  <dt>Change "Dash search" to "Phone only"</dt>
+    <dd>Ensure that the music and video lenses don't show online content</dd>
+</dl>
+
+Test-case gsettings-qt/run-example
+<dl>
+  <dt>Download the <a href="http://bazaar.launchpad.net/~system-settings-touch/gsettings-qt/trunk/view/head:/examples/choices.qml">choices example</a> and run it with qmlscene</dt>
+    <dd>Ensure that the switch is synchronized with the "Dash Search" setting in the security panel of system settings</dd>
+    <dd>Ensure that the "Possible values" list item has a value of "all, none"</dd>
+</dl>