From 18fe18317a80a5ba5df040721397f17d8a247d4c Mon Sep 17 00:00:00 2001 From: David Faure 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 Change-Id: I035436d48ec45da3ccad7dabe01e9cccec17b730 Reviewed-by: Thiago Macieira --- src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/tools/qdbusxml2cpp') 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; -- cgit v1.2.3