TDE
/
dbus-1-tqt
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix for issue #7

Browse Source 
Signed-off-by: Emanoil Kotsev <deloptes@gmail.com>
Emanoil Kotsev 5 years ago committed by Slávek Banko
parent 7ecf7d1aea
commit 2272ebde20
Signed by: SlavekB
GPG Key ID: 608F5293A04BE668
1 changed files with 77 additions and 55 deletions
Show Stats Download Patch File Download Diff File

132
src/tools/dbusxml2qt3/methodgen.cpp
Unescape View File

@ -147,68 +147,90 @@ static bool parseDBusSignature(const TQString& signature, Argument& argument)
if (from == -1 || to == -1 || (to - from - 1) < 2) return false;
TQString dictSignature = signature.mid(from + 1, (to - from - 1));
if (dictSignature.startsWith("oa")) {
argument.signature = "TQT_DBusData";
argument.accessor = "ObjectPathKeyMap";
argument.subAccessor = "StringKeyMapMap";
argument.isPrimitive = false;
Argument key;
if (!parseDBusSignature(dictSignature.left(1), key)) return false;
argument.forwardDeclarations.append("class TQT_DBusData");
Argument value;
if (parseDBusSignature(dictSignature.mid(1), value))
{
if (!value.subAccessor.isEmpty())
{
argument.isPrimitive = false;
argument.containerClass = "TQT_DBusDataMap< " + key.signature + " >";
argument.signature = "TQT_DBusDataMap< " + key.signature + " >";
argument.accessor = key.accessor + "KeyMap";
argument.sourceIncludes["tqdbus"].append("<tqdbusdata.h>");
argument.forwardDeclarations.append("template <typename K> class TQT_DBusDataMap");
argument.forwardDeclarations += key.forwardDeclarations;
Argument key;
if (!parseDBusSignature(dictSignature.left(1), key)) return false;
argument.isPrimitive = false;
argument.containerClass = "TQT_DBusDataMap< " + key.signature + " >";
argument.signature = "TQT_DBusDataMap< " + key.signature + " >";
argument.accessor = key.accessor + "KeyMap";
argument.sourceIncludes = key.sourceIncludes;
argument.sourceIncludes["tqdbus"].append("<tqdbusdata.h>");
argument.sourceIncludes["tqdbus"].append("<tqdbusdatamap.h>");
}
else
{
argument.isPrimitive = false;
argument.containerClass = "TQT_DBusDataMap< " + key.signature + " >";
argument.signature = "TQMap< " + key.signature +
", " + value.signature + " >";
argument.accessor = key.accessor + "KeyMap";
argument.subAccessor = value.accessor + "Map";
argument.forwardDeclarations.append("template <typename K, typename V> class TQMap");
argument.forwardDeclarations += key.forwardDeclarations;
argument.forwardDeclarations += value.forwardDeclarations;
argument.sourceIncludes = key.sourceIncludes;
argument.sourceIncludes["TQt"].append("<tqmap.h>");
argument.sourceIncludes["tqdbus"].append("<tqdbusdata.h>");
argument.sourceIncludes["tqdbus"].append("<tqdbusdatamap.h>");
TQMap<TQString, TQStringList>::const_iterator it =
value.sourceIncludes.begin();
TQMap<TQString, TQStringList>::const_iterator endIt =
value.sourceIncludes.end();
for (; it != endIt; ++it)
{
argument.sourceIncludes[it.key()] += it.data();
}
}
argument.forwardDeclarations.append( "template <typename K> class TQT_DBusDataMap");
argument.forwardDeclarations += key.forwardDeclarations;
argument.sourceIncludes = key.sourceIncludes;
argument.sourceIncludes["tqdbus"].append("<tqdbusdata.h>");
argument.sourceIncludes["tqdbus"].append("<tqdbusdatamap.h>");
}
else
{
argument.isPrimitive = false;
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");
argument.forwardDeclarations += key.forwardDeclarations;
argument.sourceIncludes = key.sourceIncludes;
argument.sourceIncludes["tqdbus"].append("<tqdbusdata.h>");
argument.sourceIncludes["tqdbus"].append("<tqdbusdatamap.h>");
Argument key;
if (!parseDBusSignature(dictSignature.left(1), key)) return false;
Argument value;
if (parseDBusSignature(dictSignature.mid(1), value))
{
if (!value.subAccessor.isEmpty())
{
argument.isPrimitive = false;
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");
argument.forwardDeclarations += key.forwardDeclarations;
argument.sourceIncludes = key.sourceIncludes;
argument.sourceIncludes["tqdbus"].append("<tqdbusdata.h>");
argument.sourceIncludes["tqdbus"].append("<tqdbusdatamap.h>");
} else {
argument.isPrimitive = false;
argument.containerClass = "TQT_DBusDataMap< " + key.signature + " >";
argument.signature = "TQMap< " + key.signature +
", " + value.signature + " >";
argument.accessor = key.accessor + "KeyMap";
argument.subAccessor = value.accessor + "Map";
argument.forwardDeclarations.append("template <typename K, typename V> class TQMap");
argument.forwardDeclarations += key.forwardDeclarations;
argument.forwardDeclarations += value.forwardDeclarations;
argument.sourceIncludes = key.sourceIncludes;
argument.sourceIncludes["TQt"].append("<tqmap.h>");
argument.sourceIncludes["tqdbus"].append("<tqdbusdata.h>");
argument.sourceIncludes["tqdbus"].append("<tqdbusdatamap.h>");
TQMap<TQString, TQStringList>::const_iterator it =
value.sourceIncludes.begin();
TQMap<TQString, TQStringList>::const_iterator endIt =
value.sourceIncludes.end();
for (; it != endIt; ++it)
{
argument.sourceIncludes[it.key()] += it.data();
}
}
} else {
argument.isPrimitive = false;
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");
argument.forwardDeclarations += key.forwardDeclarations;
argument.sourceIncludes = key.sourceIncludes;
argument.sourceIncludes["tqdbus"].append("<tqdbusdata.h>");
argument.sourceIncludes["tqdbus"].append("<tqdbusdatamap.h>");
}
}
}
else

Write Preview
Loading…
Cancel
Save