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/qdbusxmlparser_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/qdbusxmlparser_p.h')
| -rw-r--r-- | src/dbus/qdbusxmlparser_p.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/dbus/qdbusxmlparser_p.h b/src/dbus/qdbusxmlparser_p.h index f7677e0ae4..bd063e759b 100644 --- a/src/dbus/qdbusxmlparser_p.h +++ b/src/dbus/qdbusxmlparser_p.h @@ -54,7 +54,6 @@ // #include <QtCore/qmap.h> -#include <QtXml/qdom.h> #include <qdbusmacros.h> #include "qdbusintrospection_p.h" @@ -69,17 +68,15 @@ class QDBusXmlParser { QString m_service; QString m_path; - QDomElement m_node; + QSharedDataPointer<QDBusIntrospection::Object> m_object; + QDBusIntrospection::Interfaces m_interfaces; public: QDBusXmlParser(const QString& service, const QString& path, const QString& xmlData); - QDBusXmlParser(const QString& service, const QString& path, - const QDomElement& node); - QDBusIntrospection::Interfaces interfaces() const; - QSharedDataPointer<QDBusIntrospection::Object> object() const; - QSharedDataPointer<QDBusIntrospection::ObjectTree> objectTree() const; + inline QDBusIntrospection::Interfaces interfaces() const { return m_interfaces; } + inline QSharedDataPointer<QDBusIntrospection::Object> object() const { return m_object; } }; QT_END_NAMESPACE |