2006-03-06 Thiago Macieira <thiago.macieira@trolltech.com>

	* qt/*:
	* dbus/qdbus.h: Sync with KDE Subversion revision 516237. This
	represents the first feature-complete version of the Qt4
	bindings since I took ove maintainership.

1 files changed, 2 insertions, 61 deletions

diff --git a/qt/qdbusobject.h b/qt/qdbusobject.h
index ffb41add..584f3b28 100644
--- a/qt/qdbusobject.h
+++ b/qt/qdbusobject.h
@@ -43,102 +43,43 @@ template<class Interface>
 inline const Interface qdbus_cast(const QDBusObject& obj, Interface * = 0);
 
 class QDBusObjectPrivate;
-/**
- * QDBusObject
- * Base object for DBUS objects imported and exported.
- */
 class QDBUS_EXPORT QDBusObject
 {
     friend class QDBusConnection;
 public:
     // public constructors
-    /**
-     * Construct a QDBusObject referencing the remote object given.
-     */
-    QDBusObject(const QDBusConnection& conn, const QString& service, const QString& path);    
-
-    /**
-     * Copy constructor.
-     */
     QDBusObject(const QDBusObject& other);
-
-    /**
-     * Construct from an interface.
-     */
     QDBusObject(const QDBusInterface& iface);
 
     // public destructors
-    /**
-     * Destructor.
-     */
     ~QDBusObject();
 
 public:
     // public functions
-
-    /**
-     * Assignment operator
-     */
     QDBusObject& operator=(const QDBusObject&);
 
-    /**
-     * Returns the connection this object is bound to.
-     */
     QDBusConnection connection() const;
-
-    /**
-     * Returns the service this object is associated to.
-     */
     QString service() const;
-
-    /**
-     * Returns the path on the service this object is on.
-     */
     QString path() const;
 
-    /**
-     * Returns the introspection XML data of this object node.
-     */
     QString introspect() const;
-
-    /**
-     * Returns the introspection data for this object node.
-     */
     QSharedDataPointer<QDBusIntrospection::Object> introspectionData() const;
 
-    /**
-     * Returns all the interfaces in this object.
-     */
     QStringList interfaces() const;
-
-    /**
-     * Returns all the children object in this object.
-     */
     QMap<QString, QDBusObject> children() const;
 
-    /**
-     * Returns true if the object being referenced exists.
-     */
     //bool exists() const;
-
-    /**
-     * Returns true if we're referencing a valid object.
-     */
     bool isValid() const;
 
-    /**
-     * Cast this object to an interface, if possible.
-     */
+#ifndef QT_NO_MEMBER_TEMPLATES
     template<typename Interface>
         inline operator Interface()
     { return qdbus_cast<Interface>(*this); }
 
-    /**
-     * Cast this object to an interface, if possible.
-     */
     template<typename Interface>
         inline operator const Interface() const
     { return qdbus_cast<Interface>(*this); }
+#endif
     
 private:
     QDBusObject(QDBusObjectPrivate*, const QDBusConnection& conn);