Merge two more QDBusConnectionPrivate members into a union

QDBusConnectionPrivate can only be a client or a server, not both, so
the DBusServer and DBusConnection pointers can be shared, like the
QDBusConnectionInterface and QDBusServer pointers in the other anonymous
union.

Change-Id: I9a75ad8521ae4e5cbbe5ffff13d1baa8ab83c42f
Reviewed-by: Albert Astals Cid <aacid@kde.org>
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>

1 files changed, 4 insertions, 2 deletions

diff --git a/src/dbus/qdbusconnection_p.h b/src/dbus/qdbusconnection_p.h
index e12b77837e..49c7564566 100644
--- a/src/dbus/qdbusconnection_p.h
+++ b/src/dbus/qdbusconnection_p.h
@@ -303,8 +303,10 @@ public:
     // the dispatch lock protects everything related to the DBusConnection or DBusServer
     // including the timeouts and watches
     QMutex dispatchLock;
-    DBusConnection *connection;
-    DBusServer *server;
+    union {
+        DBusConnection *connection;
+        DBusServer *server;
+    };
     WatcherHash watchers;
     TimeoutHash timeouts;
     PendingTimeoutList timeoutsPendingAdd;