Merge lp:~larsu/gsettings-qt/support-ass into lp:gsettings-qt

[Lars Karlitski]

qconftypes: support a(ss)

Expose it as a QVariantList of QStringLists, as that should make using it from qml easiest.

qconftypes: support a(ss)

Expose it as a QVariantList of QStringLists, as that should make using it from qml easiest.

[Iain Lane (laney)]

One question which might or might not make sense to fix.

Otherwise, thanks.

review: Approve

[Lars Karlitski (larsu)]

> Does it make sense to check for == 1 and save just the first thing?

I don't think so. Invalid values should always be rejected. For example, we also don't accept an array containing one string for a string-typed key (or the other way around).

Unmerged revisions

74. By Lars Karlitski on 2015-08-25

qconftypes: support a(ss)

Expose it as a QVariantList of QStringLists, as that should make using
it from qml easiest.

=== modified file 'src/qconftypes.cpp'
--- src/qconftypes.cpp	2014-07-30 10:52:28 +0000
+++ src/qconftypes.cpp	2015-08-25 11:29:17 +0000
@@ -54,6 +54,7 @@
  *  string array*      as        QStringList            QVariant::StringList
  *  byte array         ay        QByteArray             QVariant::ByteArray
  *  dictionary         a{ss}     QVariantMap            QVariant::Map
+ *  string tuple array a(ss)     QVariantList           QVariant::List
  *
  * [*] not strictly an array, but called as such for sake of
  *     consistency with the 'a' appearing in the DBus type system
@@ -110,6 +111,9 @@
         else if (g_variant_type_equal(gtype, G_VARIANT_TYPE ("a{ss}")))
             return QVariant::Map;
 
+        else if (g_variant_type_equal(gtype, G_VARIANT_TYPE ("a(ss)")))
+            return QVariant::List;
+
         // fall through
     default:
         return QVariant::Invalid;
@@ -173,6 +177,17 @@
                 map.insert(key, QVariant(val));
 
             return map;
+        } else if (g_variant_is_of_type(value, G_VARIANT_TYPE("a(ss)"))) {
+            GVariantIter iter;
+            QVariantList list;
+            const gchar *first;
+            const gchar *second;
+
+            g_variant_iter_init (&iter, value);
+            while (g_variant_iter_next (&iter, "(&s&s)", &first, &second))
+                list.append (QVariant(QStringList() << first << second));
+
+            return QVariant(list);
         }
 
         // fall through
@@ -246,6 +261,22 @@
             }
             return g_variant_builder_end (&builder);
         }
+        if (g_variant_type_equal(gtype, G_VARIANT_TYPE ("a(ss)"))) {
+            const QVariantList list = v.value<QVariantList>();
+            GVariantBuilder builder;
+
+            g_variant_builder_init(&builder, G_VARIANT_TYPE ("a(ss)"));
+
+            Q_FOREACH (const QVariant &vtuple, list) {
+                QStringList tuple = vtuple.toStringList();
+                if (tuple.size() == 2)
+                    g_variant_builder_add(&builder, "(ss)", tuple[0].toUtf8().constData(), tuple[1].toUtf8().constData());
+                else
+                    g_variant_builder_add(&builder, "(ss)", "", "");
+            }
+
+            return g_variant_builder_end(&builder);
+        }
 
         // fall through
     default:

=== modified file 'tests/com.canonical.gsettings.test.gschema.xml'
--- tests/com.canonical.gsettings.test.gschema.xml	2014-08-01 16:47:07 +0000
+++ tests/com.canonical.gsettings.test.gschema.xml	2015-08-25 11:29:17 +0000
@@ -27,5 +27,8 @@
     <key name="test-map" type="a{ss}">
       <default>{'foo': 'one', 'bar': 'two'}</default>
     </key>
+    <key name="test-ass" type="a(ss)">
+      <default>[('one', 'two'), ('three', 'four')]</default>
+    </key>
   </schema>
 </schemalist>

=== modified file 'tests/tst_GSettings.qml'
--- tests/tst_GSettings.qml	2015-06-02 10:10:03 +0000
+++ tests/tst_GSettings.qml	2015-08-25 11:29:17 +0000
@@ -38,6 +38,7 @@
     compare(settings.testString, 'hello');
     compare(settings.testStringList, ['one', 'two', 'three']);
     compare(settings.testMap, {'foo': 'one', 'bar': 'two'});
+    compare(settings.testAss, [['one', 'two'], ['three', 'four']]);
 
     compare(testCase.bindingTest, 'hello');
   }
@@ -65,6 +66,11 @@
     settings.testMap = {};
     compare(settings.testMap, {});
 
+    settings.testAss = []
+    compare(settings.testAss, [])
+    settings.testAss = [['foo', 'bar']]
+    compare(settings.testAss, [['foo', 'bar']])
+
     settings.testEnum = 'two';
     compare(settings.testEnum, 'two');