Fix #25 dbusxml2qt3 root node with no name

Signed-off-by: Emanoil Kotsev <deloptes@gmail.com>
pull/28/head
Emanoil Kotsev 4 years ago committed by TDE Gitea
parent 593d22f771
commit aaca9aafc8

@ -350,16 +350,15 @@ int main(int argc, char** argv)
if (nodeClassName.isEmpty())
{
nodeClassName = rootElement.attribute("name");
if (nodeClassName.startsWith("/")) nodeClassName = nodeClassName.mid(1);
if (nodeClassName.isEmpty())
if (nodeClassName.startsWith("/"))
{
std::cerr << "dbusxml2qt3: cannot generate node without class name."
<< std::endl;
exit(3);
nodeClassName = nodeClassName.mid(1);
}
}
if (!nodeClassName.isEmpty())
{
nodeClassName.replace('/', "::");
}
TQStringList nameParts = TQStringList::split("::", nodeClassName);
@ -380,7 +379,8 @@ int main(int argc, char** argv)
TQTextStream sourceStream;
TQString baseName = options["node"];
if (baseName.isEmpty()) {
if (baseName.isEmpty())
{
baseName = classData.name.lower() + "Node";
}
if (!checkForOption(options, "classname"))
@ -392,8 +392,7 @@ int main(int argc, char** argv)
{
std::cerr << "dbusxml2qt3: interface files, using base name '"
<< baseName.local8Bit().data()
<< "', could not be opened for writing"
<< std::endl;
<< "', could not be opened for writing" << std::endl;
exit(4);
}
@ -403,7 +402,8 @@ int main(int argc, char** argv)
ClassGenerator::finishStreams(baseName, headerStream, sourceStream);
// create dummy node to handle the path hierarchy
if ( nameParts.size() > 1 ) {
if (nameParts.size() > 1)
{
TQTextStream headerStreamDBusBaseNode;
TQTextStream sourceStreamDBusBaseNode;
@ -430,6 +430,7 @@ int main(int argc, char** argv)
ClassGenerator::finishStreams(baseNameDBusBaseNode, headerStreamDBusBaseNode, sourceStreamDBusBaseNode);
}
}
}
return 0;
}

Loading…
Cancel
Save