From: Frederik Gladhorn <frederik.gladhorn@digia.com>
Date: Fri, 23 Nov 2012 15:07:29 +0000 (+0100)
Subject: docs: DBus: Remove ObjectTree
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d44a4755c9689c67e00847f4a5f63cf949d24610;p=profile%2Fivi%2Fqtbase.git

docs: DBus: Remove ObjectTree

In 0696071316b3dacb8d1ca15a269e4f4215642b9d
the ObjectTree class was removed.

Change-Id: I9c7a505a597e7c2ed9243468faee931a481b1b22
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
---

diff --git a/src/dbus/qdbusintrospection.cpp b/src/dbus/qdbusintrospection.cpp
index eafaf15..2f5f012 100644
--- a/src/dbus/qdbusintrospection.cpp
+++ b/src/dbus/qdbusintrospection.cpp
@@ -264,14 +264,14 @@ QT_BEGIN_NAMESPACE
     \variable QDBusIntrospection::Object::service
     The object's service name.
 
-    \sa parseObject(), parseObjectTree()
+    \sa parseObject()
 */
 
 /*!
     \variable QDBusIntrospection::Object::path
     The object's path on the service. This is an absolute path.
 
-    \sa parseObject(), parseObjectTree()
+    \sa parseObject()
 */
 
 /*!
@@ -295,29 +295,6 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \class QDBusIntrospection::ObjectTree
-    \inmodule QtDBus
-    \brief Complete information about one object node and its descendency.
-    
-    This struct contains the same data as QDBusIntrospection::Object, plus the actual data for the
-    interfaces and child (sub) objects that was available in the XML document.
-*/
-
-/*!
-    \variable QDBusIntrospection::ObjectTree::interfaceData
-    A map of interfaces and their names.
-*/
-
-/*!
-    \variable QDBusIntrospection::ObjectTree::childObjectData
-    A map of object paths and their data. The map key contains the relative path to the object.
-
-    Note this map contains only the child notes that do have information about the sub-object's
-    contents. If the XML data did not contain the information, only the object name will be listed
-    in childObjects, but not in childObjectData.
-*/
-
-/*!
     \typedef QDBusIntrospection::Annotations
     Contains a QMap of an annotation pair. The annotation's name is stored in the QMap key and
     must be unique. The annotation's value is stored in the QMap's value and is arbitrary.
@@ -355,8 +332,6 @@ QT_BEGIN_NAMESPACE
 /*!
     \typedef QDBusIntrospection::Objects
     Contains a QMap of objects and their paths relative to their immediate parent.
-
-    \sa parseObjectTree()
 */
 
 /*!
@@ -403,7 +378,7 @@ QDBusIntrospection::parseInterfaces(const QString &xml)
     object node.
 
     This function does not parse the interfaces contained in the node, nor sub-object's contents.
-    It will only list their names. If you need to know their contents, use parseObjectTree.
+    It will only list their names.
 */
 QDBusIntrospection::Object
 QDBusIntrospection::parseObject(const QString &xml, const QString &service, const QString &path)