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, 6 insertions, 4 deletions

diff --git a/qt/qdbusmessage.h b/qt/qdbusmessage.h
index 7c190c62..6af5785c 100644
--- a/qt/qdbusmessage.h
+++ b/qt/qdbusmessage.h
@@ -33,6 +33,7 @@
 
 class QDBusMessagePrivate;
 class QDBusError;
+class QDBusConnection;
 struct DBusMessage;
 
 class QDBUS_EXPORT QDBusMessage: public QList<QVariant>
@@ -52,8 +53,7 @@ public:
     static QDBusMessage signal(const QString &path, const QString &interface,
                                const QString &name);
     static QDBusMessage methodCall(const QString &destination, const QString &path,
-                                   const QString &interface, const QString &method,
-                                   const QString &signature = QString());
+                                   const QString &interface, const QString &method);
     static QDBusMessage methodReply(const QDBusMessage &other);
     static QDBusMessage error(const QDBusMessage &other, const QString &name,
                               const QString &message = QString());
@@ -72,13 +72,15 @@ public:
     void setTimeout(int ms);
 
     bool noReply() const;
-    void setNoReply(bool enable);
 
     QString signature() const;
+    void setSignature(const QString &signature);
+
+    QDBusConnection connection() const;
 
 //protected:
     DBusMessage *toDBusMessage() const;
-    static QDBusMessage fromDBusMessage(DBusMessage *dmsg);
+    static QDBusMessage fromDBusMessage(DBusMessage *dmsg, const QDBusConnection &connection);
     static QDBusMessage fromError(const QDBusError& error);
     int serialNumber() const;
     int replySerialNumber() const;