1 files changed, 14 insertions, 5 deletions

diff --git a/src/tools/dbusxml2qt3/methodgen.cpp b/src/tools/dbusxml2qt3/methodgen.cpp
index 3ba914e..91ba592 100644
--- a/src/tools/dbusxml2qt3/methodgen.cpp
+++ b/src/tools/dbusxml2qt3/methodgen.cpp
@@ -541,13 +541,13 @@ static void writeNodeIntrospection(const Class& classData,
 
     stream << "    TQDomDocument doc;" << endl;
     stream << "    TQDomElement nodeElement = doc.createElement(\"node\");" << endl;
-    stream << "    if ( !objectPath.isEmpty() && objectPath.compare(\"/\") != 0 )" << endl;
+    stream << "    if (!objectPath.isEmpty() && objectPath.compare(\"/\") != 0)" << endl;
     stream << "    {" << endl;
     stream << "         nodeElement.setAttribute ( \"name\", objectPath );" << endl;
     stream << "    }" << endl;
     stream << "    TQDomElement interfaceElement = doc.createElement(\"interface\");"
            << endl;
-    stream << "    org::freedesktop::DBus::Introspectable"
+    stream << "    org::freedesktop::DBus::IntrospectableInterface"
            << "::buildIntrospectionData(interfaceElement);" << endl;
     stream << "    nodeElement.appendChild(interfaceElement);" << endl;
 
@@ -866,13 +866,22 @@ void MethodGenerator::writeMethodCall(const Class& classData,
     stream << endl;
     stream << "            error = TQT_DBusError::stdFailed(\"";
 
-    nsIt    = classData.namespaces.begin();
+    nsIt = classData.namespaces.begin();
     for (; nsIt != nsEndIt; ++nsIt)
     {
         stream << *nsIt << ".";
     }
 
-    stream << classData.name << "." << method.name << " execution failed\");"
+    TQString interfaceStr("Interface");
+    if (classData.name.endsWith(interfaceStr))
+    {
+      stream << classData.name.left(classData.name.length() - interfaceStr.length());
+    }
+    else
+    {
+      stream << classData.name;
+    }
+    stream << "." << method.name << " execution failed\");"
            << endl;
     stream << "        }" << endl;
     stream << endl;
@@ -1681,7 +1690,7 @@ void MethodGenerator::writeIntrospectionDataMethod(const Class& classData,
 void MethodGenerator::writeNodePrivate(const Class& classData, TQTextStream& stream)
 {
     stream << "class " << classData.name
-           << "::Private : public org::freedesktop::DBus::Introspectable" << endl;
+           << "::Private : public org::freedesktop::DBus::IntrospectableInterface" << endl;
     stream << "{" << endl;
     stream << "public:" << endl;
     stream << "    virtual ~Private();" << endl;