diff options
| author | Alexander Golubev <fatzer2@gmail.com> | 2013-08-26 15:52:27 -0500 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-08-26 15:52:27 -0500 |
| commit | 03fde36cda3b20de7cbc3f54547a140e5d807997 (patch) | |
| tree | fa094808a732691a69dcad118314a58ef13ce42d /tools | |
| parent | 02a32f149311e28150c94a6a0864efe022e23040 (diff) | |
| download | dbus-1-tqt-03fde36cda3b20de7cbc3f54547a140e5d807997.tar.gz dbus-1-tqt-03fde36cda3b20de7cbc3f54547a140e5d807997.zip | |
Fix incorrect generated C++ template code
This resolves Bug 1604
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/dbusxml2qt3/methodgen.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/tools/dbusxml2qt3/methodgen.cpp b/tools/dbusxml2qt3/methodgen.cpp index cf7929c..8fe0741 100644 --- a/tools/dbusxml2qt3/methodgen.cpp +++ b/tools/dbusxml2qt3/methodgen.cpp @@ -148,8 +148,8 @@ static bool parseDBusSignature(const TQString& signature, Argument& argument) if (!value.subAccessor.isEmpty()) { argument.isPrimitive = false; - argument.containerClass = "TQT_DBusDataMap<" + key.signature + ">"; - argument.signature = "TQT_DBusDataMap<" + key.signature + ">"; + argument.containerClass = "TQT_DBusDataMap< " + key.signature + " >"; + argument.signature = "TQT_DBusDataMap< " + key.signature + " >"; argument.accessor = key.accessor + "KeyMap"; argument.forwardDeclarations.append("template <typename K> class TQT_DBusDataMap"); @@ -162,9 +162,9 @@ static bool parseDBusSignature(const TQString& signature, Argument& argument) else { argument.isPrimitive = false; - argument.containerClass = "TQT_DBusDataMap<" + key.signature + ">"; - argument.signature = "TQMap<" + key.signature + - ", " + value.signature + ">"; + argument.containerClass = "TQT_DBusDataMap< " + key.signature + " >"; + argument.signature = "TQMap< " + key.signature + + ", " + value.signature + " >"; argument.accessor = key.accessor + "KeyMap"; argument.subAccessor = value.accessor + "Map"; @@ -190,8 +190,8 @@ static bool parseDBusSignature(const TQString& signature, Argument& argument) else { argument.isPrimitive = false; - argument.containerClass = "TQT_DBusDataMap<" + key.signature + ">"; - argument.signature = "TQT_DBusDataMap<" + key.signature + ">"; + argument.containerClass = "TQT_DBusDataMap< " + key.signature + " >"; + argument.signature = "TQT_DBusDataMap< " + key.signature + " >"; argument.accessor = key.accessor + "KeyMap"; argument.forwardDeclarations.append("template <typename K> class TQT_DBusDataMap"); @@ -207,10 +207,10 @@ static bool parseDBusSignature(const TQString& signature, Argument& argument) TQString itemSignature = signature.mid(1); Argument item; - if (parseDBusSignature(itemSignature, item)) + if (parseDBusSignature(itemSignature, item) && !itemSignature.startsWith("a")) { argument.isPrimitive = false; - argument.signature = "TQValueList<" + item.signature + ">"; + argument.signature = "TQValueList< " + item.signature + " >"; argument.accessor = "List"; argument.subAccessor = item.accessor + "List"; argument.containerClass = "TQT_DBusDataList"; |