Revert "dbus: Add method serial() and replySerial() to class DBusMessage."

This reverts commit 618e2cc081e09d9222418bd933876224675a7530. The
original commit has a section of code that I failed to review properly
and is of questionable functionality.

Change-Id: I61c53d7b8b2aa7c3312292b017a18aba7da11bc5
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>

4 files changed, 0 insertions, 47 deletions

diff --git a/src/dbus/qdbus_symbols_p.h b/src/dbus/qdbus_symbols_p.h
index 67680f6b82..1991a462e9 100644
--- a/src/dbus/qdbus_symbols_p.h
+++ b/src/dbus/qdbus_symbols_p.h
@@ -286,8 +286,6 @@ DEFINEFUNC(const char*   , dbus_message_get_sender, (DBusMessage   *message),
            (message), return)
 DEFINEFUNC(dbus_uint32_t , dbus_message_get_serial, (DBusMessage   *message),
            (message), return)
-DEFINEFUNC(dbus_uint32_t , dbus_message_get_reply_serial, (DBusMessage   *message),
-           (message), return)
 DEFINEFUNC(const char*   , dbus_message_get_signature, (DBusMessage   *message),
            (message), return)
 DEFINEFUNC(int           , dbus_message_get_type, (DBusMessage   *message),
diff --git a/src/dbus/qdbusmessage.cpp b/src/dbus/qdbusmessage.cpp
index 078442f3f1..43a562e92e 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
diff --git a/src/dbus/qdbusmessage.h b/src/dbus/qdbusmessage.h
index f6538bd2cf..e85d600080 100644
--- a/src/dbus/qdbusmessage.h
+++ b/src/dbus/qdbusmessage.h
@@ -104,8 +104,6 @@ public:
     QString errorMessage() const;
     MessageType type() const;
     QString signature() const;
-    uint serial() const;
-    uint replySerial() const;
 
     bool isReplyRequired() const;
 
diff --git a/src/dbus/qdbusmessage_p.h b/src/dbus/qdbusmessage_p.h
index 0ad9924cac..5abd490502 100644
--- a/src/dbus/qdbusmessage_p.h
+++ b/src/dbus/qdbusmessage_p.h
@@ -93,8 +93,6 @@ public:
                                   const QDBusMessage &asSent);
     static QDBusMessage makeLocalReply(const QDBusConnectionPrivate &conn,
                                        const QDBusMessage &asSent);
-    uint serial();
-    uint replySerial();
 };
 
 QT_END_NAMESPACE