From 3b1e68b04cabce1429a4622464816dd13a553813 Mon Sep 17 00:00:00 2001
From: Emmanuel Lepage <emmanuel.lepage@savoirfairelinux.com>
Date: Wed, 14 Sep 2011 11:50:46 -0400
Subject: [PATCH] Update daemon dbus XML and port KDE config backend from dbus
to local
---
src/dbus/configurationmanager-introspec.xml | 4 ++--
src/dbus/metatypes.h | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/dbus/configurationmanager-introspec.xml b/src/dbus/configurationmanager-introspec.xml
index c2d8241a..8ae56bf3 100644
--- a/src/dbus/configurationmanager-introspec.xml
+++ b/src/dbus/configurationmanager-introspec.xml
@@ -283,8 +283,8 @@
<method name="getAudioCodecList" tp:name-for-bindings="getAudioCodecList">
<tp:docstring>
</tp:docstring>
- <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorString"/>
- <arg type="as" name="list" direction="out">
+ <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorInt"/>
+ <arg type="ai" name="list" direction="out">
<tp:docstring>
</tp:docstring>
</arg>
diff --git a/src/dbus/metatypes.h b/src/dbus/metatypes.h
index 8a17f72c..4de1d494 100644
--- a/src/dbus/metatypes.h
+++ b/src/dbus/metatypes.h
@@ -9,17 +9,20 @@
typedef QMap<QString, QString> MapStringString;
typedef QMap<QString, int> MapStringInt;
+typedef QVector<int> VectorInt;
typedef QVector< QMap<QString, QString> > VectorMapStringString;
Q_DECLARE_METATYPE(MapStringString)
Q_DECLARE_METATYPE(MapStringInt)
Q_DECLARE_METATYPE(VectorMapStringString)
+Q_DECLARE_METATYPE(VectorInt);
inline void registerCommTypes() {
qDBusRegisterMetaType<MapStringString>();
qDBusRegisterMetaType<MapStringInt>();
qDBusRegisterMetaType<VectorMapStringString>();
+ qDBusRegisterMetaType<VectorInt>();
}
#endif
\ No newline at end of file
--
GitLab