From 8b54cfff829490cf2e3e34051c3c1ccb02cc093a Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@intel.com>
Date: Wed, 29 Jan 2014 12:37:02 -0800
Subject: [PATCH] Make D-Bus types without a matching Qt one prettier in qdbus

Print "QMap<QString,QString>" for "a{ss}" and print a nicer expansion of
other types.

Change-Id: I0a7a2ecf8f0a62bd97931f3c129cd4cb4f471ef1
Reviewed-by: Lorn Potter <lorn.potter@jollamobile.com>
---
 src/dbus/qdbusmetaobject.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/dbus/qdbusmetaobject.cpp b/src/dbus/qdbusmetaobject.cpp
index 392eac60810..8337a84614a 100644
--- a/src/dbus/qdbusmetaobject.cpp
+++ b/src/dbus/qdbusmetaobject.cpp
@@ -220,8 +220,11 @@ QDBusMetaObjectGenerator::findType(const QByteArray &signature,
         } else if (signature == "a{sv}") {
             result.name = "QVariantMap";
             type = QVariant::Map;
+        } else if (signature == "a{ss}") {
+            result.name = "QMap<QString,QString>";
+            type = qMetaTypeId<QMap<QString, QString> >();
         } else {
-            result.name = "QDBusRawType::" + signature;
+            result.name = "{D-Bus type \"" + signature + "\"}";
             type = registerComplexDBusType(result.name);
         }
     } else {