diff options
author | Harald Fernengel <harald.fernengel@nokia.com> | 2012-01-18 21:28:31 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-22 22:10:02 +0100 |
commit | 0696071316b3dacb8d1ca15a269e4f4215642b9d (patch) | |
tree | 26f4dbad16ec36a1243a8676d929269ace74b7f1 /src/dbus/qdbusintrospection_p.h | |
parent | 7c247d3e70788fd601cdc4d45649d2c7ca1004f3 (diff) |
Remove dependency of QtDBus onto QtXml
Replace the QDom based code in qdbusxmlparser
with code using QXmlStreamReader.
Task-number: QTBUG-20856
Change-Id: I294e3ebd6faa813c20806be3ae225ac00befb622
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/dbus/qdbusintrospection_p.h')
-rw-r--r-- | src/dbus/qdbusintrospection_p.h | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/src/dbus/qdbusintrospection_p.h b/src/dbus/qdbusintrospection_p.h index 025cf63fe3..780e706498 100644 --- a/src/dbus/qdbusintrospection_p.h +++ b/src/dbus/qdbusintrospection_p.h @@ -59,7 +59,7 @@ #include <QtCore/qmap.h> #include <QtCore/qpair.h> #include <QtCore/qshareddata.h> -#include <qdbusmacros.h> +#include "qdbusmacros.h" QT_BEGIN_NAMESPACE @@ -150,26 +150,16 @@ public: { QString service; QString path; - QString introspection; QStringList interfaces; QStringList childObjects; }; - struct ObjectTree: public Object - { - Interfaces interfaceData; - Objects childObjectData; - }; - public: static Interface parseInterface(const QString &xml); static Interfaces parseInterfaces(const QString &xml); static Object parseObject(const QString &xml, const QString &service = QString(), const QString &path = QString()); - static ObjectTree parseObjectTree(const QString &xml, - const QString &service, - const QString &path); private: QDBusIntrospection(); |