From 18fe18317a80a5ba5df040721397f17d8a247d4c Mon Sep 17 00:00:00 2001
From: David Faure <faure@kde.org>
Date: Sat, 4 May 2013 11:05:10 +0200
Subject: Let qdbusxml2cpp generate code that compiles: no '-' in variable
 names.

org.freedesktop.Application.xml has
  <arg type='a{sv}' name='platform-data' direction='in'/>

Change-Id: I035436d48ec45da3ccad7dabe01e9cccec17b730
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
 src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp                               | 4 ++++
 .../auto/dbus/qdbusabstractinterface/org.qtproject.QtDBus.Pinger.xml  | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp b/src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp
index e6d77643de..f2b9441ea4 100644
--- a/src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp
+++ b/src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp
@@ -401,6 +401,8 @@ static QStringList makeArgNames(const QDBusIntrospection::Arguments &inputArgs,
         QString name = arg.name;
         if (name.isEmpty())
             name = QString( QLatin1String("in%1") ).arg(i);
+        else
+            name.replace(QLatin1Char('-'), QLatin1Char('_'));
         while (retval.contains(name))
             name += QLatin1String("_");
         retval << name;
@@ -410,6 +412,8 @@ static QStringList makeArgNames(const QDBusIntrospection::Arguments &inputArgs,
         QString name = arg.name;
         if (name.isEmpty())
             name = QString( QLatin1String("out%1") ).arg(i);
+        else
+            name.replace(QLatin1Char('-'), QLatin1Char('_'));
         while (retval.contains(name))
             name += QLatin1String("_");
         retval << name;
diff --git a/tests/auto/dbus/qdbusabstractinterface/org.qtproject.QtDBus.Pinger.xml b/tests/auto/dbus/qdbusabstractinterface/org.qtproject.QtDBus.Pinger.xml
index d5f5c6cebd..ad61351cb2 100644
--- a/tests/auto/dbus/qdbusabstractinterface/org.qtproject.QtDBus.Pinger.xml
+++ b/tests/auto/dbus/qdbusabstractinterface/org.qtproject.QtDBus.Pinger.xml
@@ -8,7 +8,7 @@
     </property>
     <signal name="voidSignal"/>
     <signal name="stringSignal">
-       <arg type="s"/>
+       <arg type="s" name="string-data"/>
     </signal>
     <signal name="complexSignal">
        <arg name="" type="(s)"/>
-- 
cgit v1.2.3