Add a 'capabilities' flag to the marshaller and demarshaller

The marshaller and demarshaller need to know the features negotiated
with the peer so as to determine what's permitted. This is especially
important to the marshaller: the libdbus-1 API may "throw a fit" if we
try to pass a type that isn't allowed or the server may disconnect us.

The use of the capabilities in the demarshaller are for symmetry and
for us to toggle the feature in unit tests.

Task-number: QTBUG-17478

1 files changed, 4 insertions, 2 deletions

diff --git a/src/dbus/qdbusmessage_p.h b/src/dbus/qdbusmessage_p.h
index 6747976..52d4d25 100644
--- a/src/dbus/qdbusmessage_p.h
+++ b/src/dbus/qdbusmessage_p.h
@@ -56,6 +56,7 @@
 #include <qatomic.h>
 #include <qstring.h>
 #include <qdbusmessage.h>
+#include <qdbusconnection.h>
 
 struct DBusMessage;
 
@@ -92,8 +93,9 @@ public:
     static void setParametersValidated(QDBusMessage &msg, bool enable)
     { msg.d_ptr->parametersValidated = enable; }
 
-    static DBusMessage *toDBusMessage(const QDBusMessage &message, QDBusError *error);
-    static QDBusMessage fromDBusMessage(DBusMessage *dmsg);
+    static DBusMessage *toDBusMessage(const QDBusMessage &message, QDBusConnection::ConnectionCapabilities capabilities,
+                                      QDBusError *error);
+    static QDBusMessage fromDBusMessage(DBusMessage *dmsg, QDBusConnection::ConnectionCapabilities capabilities);
 
     static bool isLocal(const QDBusMessage &msg);
     static QDBusMessage makeLocal(const QDBusConnectionPrivate &conn,