From 415cca8630022e155ce159696ece272a6661ddc5 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Tue, 30 Apr 2019 01:04:39 +0900 Subject: Fixed previous commit. The name of the included moc file needs to be taken from the specified basename when available. The location of the function call was also wrong. Signed-off-by: Michele Calgaro --- src/tools/dbusxml2qt3/classgen.cpp | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'src/tools/dbusxml2qt3/classgen.cpp') diff --git a/src/tools/dbusxml2qt3/classgen.cpp b/src/tools/dbusxml2qt3/classgen.cpp index 910989a..7ca39a1 100644 --- a/src/tools/dbusxml2qt3/classgen.cpp +++ b/src/tools/dbusxml2qt3/classgen.cpp @@ -102,12 +102,6 @@ static void closeNamespaces(const TQStringList& namespaces, TQTextStream& stream } } -static void writeIncludeMoc(const TQString& className, TQTextStream& stream) -{ - stream << "#include \"" << className.lower() << "Proxy.moc\"" << endl; - stream << endl; -} - static void writeIncludes(const TQString& description, const TQStringList& includes, TQTextStream& stream) { @@ -1062,8 +1056,6 @@ bool ClassGenerator::generateProxy(const Class& classData, closeNamespaces(classDataCopy.namespaces, sourceStream); - writeIncludeMoc(classData.name, sourceStream); - return true; } @@ -1098,4 +1090,11 @@ bool ClassGenerator::generateNode(const Class& classData, return true; } +bool ClassGenerator::generateIncludeMoc(const TQString& baseName, TQTextStream& stream) +{ + stream << "#include \"" << baseName << ".moc\"" << endl; + stream << endl; + return true; +} + // End of File -- cgit v1.2.1