* qt/*:

	* dbus/qdbus.h: Sync with KDE Subversion revision
	523647. Hopefully, this will be the last of the
	source-incompatible changes. Documentation has been improved;
	support for QList<basic-types> has been added; QDBusObject is
	gone; QDBus(Abstract)Interface is now a QObject with
	auto-generated meta-object; QDBusIntrospection is marked
	private, since QMetaObject can be used now; lots of bugfixes.

1 files changed, 6 insertions, 12 deletions

diff --git a/qt/qdbusxmlparser_p.h b/qt/qdbusxmlparser_p.h
index c4c45be1..8f4f69b1 100644
--- a/qt/qdbusxmlparser_p.h
+++ b/qt/qdbusxmlparser_p.h
@@ -28,32 +28,26 @@
 #include <QtCore/qmap.h>
 #include <QtXml/qdom.h>
 #include "qdbusmacros.h"
-#include "qdbusintrospection.h"
+#include "qdbusintrospection_p.h"
 
-class QDBusConnectionPrivate;
-class QDBusObjectPrivate;
-
-/**
- * @internal
- */
+/*!
+    \internal
+*/
 class QDBusXmlParser
 {
     QString m_service;
     QString m_path;
     QDomElement m_node;
-    QDBusConnectionPrivate* m_store;
 
 public:
     QDBusXmlParser(const QString& service, const QString& path,
-                   const QString& xmlData, QDBusConnectionPrivate* store = 0);
+                   const QString& xmlData);
     QDBusXmlParser(const QString& service, const QString& path,
-                   const QDomElement& node, QDBusConnectionPrivate* store = 0);
+                   const QDomElement& node);
 
     QDBusIntrospection::Interfaces interfaces() const;
     QSharedDataPointer<QDBusIntrospection::Object> object() const;
     QSharedDataPointer<QDBusIntrospection::ObjectTree> objectTree() const;
-
-    static void parse(const QDBusObjectPrivate* d, const QString &xml);
 };
 
 #endif