summaryrefslogtreecommitdiffstats
path: root/src/dbus/qdbusmessage.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/dbus/qdbusmessage.cpp')
-rw-r--r--src/dbus/qdbusmessage.cpp51
1 files changed, 2 insertions, 49 deletions
diff --git a/src/dbus/qdbusmessage.cpp b/src/dbus/qdbusmessage.cpp
index 078442f3f1..32b7787514 100644
--- a/src/dbus/qdbusmessage.cpp
+++ b/src/dbus/qdbusmessage.cpp
@@ -188,12 +188,7 @@ DBusMessage *QDBusMessagePrivate::toDBusMessage(const QDBusMessage &message, QDB
// check if everything is ok
if (marshaller.ok)
- {
- QDBusMessage *m = (QDBusMessage*)&message;
- q_dbus_message_ref(msg);
- m->d_ptr->msg = msg;
return msg;
- }
// not ok;
q_dbus_message_unref(msg);
@@ -322,16 +317,6 @@ QDBusMessage QDBusMessagePrivate::makeLocalReply(const QDBusConnectionPrivate &c
return QDBusMessage(); // failed
}
-uint QDBusMessagePrivate::serial()
-{
- return msg ? q_dbus_message_get_serial(msg) : reply ? q_dbus_message_get_serial(reply) : 0;
-}
-
-uint QDBusMessagePrivate::replySerial()
-{
- return msg ? q_dbus_message_get_reply_serial(msg) : reply ? q_dbus_message_get_reply_serial(reply) : 0;
-}
-
/*!
\class QDBusMessage
\inmodule QtDBus
@@ -648,32 +633,6 @@ QString QDBusMessage::signature() const
}
/*!
- Returns the serial of the message or 0 if undefined.
-
- The serial number is a unique identifier of a message coming from a
- given connection.
-
- The serial is set to a non zero value after the message has been sent
- over a D-Bus connection.
-*/
-uint QDBusMessage::serial() const
-{
- return d_ptr->serial();
-}
-
-/*!
- Returns the serial of the message this is a reply to or 0 if undefined.
-
- The serial number is a unique identifier of a message coming from a
- given connection and D-Bus messages of 'method return' or 'error' type
- use them to match the reply to the method call message.
-*/
-uint QDBusMessage::replySerial() const
-{
- return d_ptr->replySerial();
-}
-
-/*!
Returns the flag that indicates if this message should see a reply
or not. This is only meaningful for \l {MethodCallMessage}{method
call messages}: any other kind of message cannot have replies and
@@ -861,16 +820,10 @@ QDebug operator<<(QDebug dbg, const QDBusMessage &msg)
msg.type() == QDBusMessage::SignalMessage)
dbg.nospace() << ", path=" << msg.path()
<< ", interface=" << msg.interface()
- << ", member=" << msg.member()
- << ", serial=" << msg.serial();
+ << ", member=" << msg.member();
if (msg.type() == QDBusMessage::ErrorMessage)
dbg.nospace() << ", error name=" << msg.errorName()
- << ", error message=" << msg.errorMessage()
- << ", serial=" << msg.serial()
- << ", reply serial=" << msg.replySerial();
- else if (msg.type() == QDBusMessage::ReplyMessage)
- dbg.nospace() << ", serial=" << msg.serial()
- << ", reply serial=" << msg.replySerial();
+ << ", error message=" << msg.errorMessage();
dbg.nospace() << ", signature=" << msg.signature()
<< ", contents=(";
debugVariantList(dbg, msg.arguments());