do not output forward declaration from qdbusxml2cpp

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>

diff --git a/src/tools/qdbus/qdbusxml2cpp.cpp b/src/tools/qdbus/qdbusxml2cpp.cpp
index b755ecc..2b0995d 100644 (file)
--- a/src/tools/qdbus/qdbusxml2cpp.cpp
+++ b/src/tools/qdbus/qdbusxml2cpp.cpp
@@ -114,14 +114,6 @@ static const char includeList[] =
     "#include <QtCore/QStringList>\n"
     "#include <QtCore/QVariant>\n";
 
-static const char forwardDeclarations[] =
-    "class QByteArray;\n"
-    "template<class T> class QList;\n"
-    "template<class Key, class Value> class QMap;\n"
-    "class QString;\n"
-    "class QStringList;\n"
-    "class QVariant;\n";
-
 static void showHelp()
 {
     printf("%s", help);
@@ -887,15 +879,10 @@ static void writeAdaptor(const QString &filename, const QDBusIntrospection::Inte
         if (!headerName.isEmpty() && headerName != QLatin1String("-"))
             cs << "#include \"" << headerName << "\"" << endl;
 
-        cs << "#include <QtCore/QMetaObject>" << endl
-           << includeList
-           << endl;
-        hs << forwardDeclarations;
-    } else {
-        hs << includeList;
+        cs << "#include <QtCore/QMetaObject>" << endl;
     }
 
-    hs << endl;
+    hs << includeList << endl;
 
     QString parent = parentClassName;
     if (parentClassName.isEmpty())