QDBusConnectionManager: Move all locking inside the class

Make `mutex` member private and make all former users call
new public member functions that perform locking. Make
old non-locking member functions private.

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

1 files changed, 10 insertions, 5 deletions

diff --git a/src/dbus/qdbusconnectionmanager_p.h b/src/dbus/qdbusconnectionmanager_p.h
index a23a211838..ac67aa38a4 100644
--- a/src/dbus/qdbusconnectionmanager_p.h
+++ b/src/dbus/qdbusconnectionmanager_p.h
@@ -36,17 +36,18 @@ public:
     static QDBusConnectionManager* instance();
 
     QDBusConnectionPrivate *busConnection(QDBusConnection::BusType type);
-    QDBusConnectionPrivate *connection(const QString &name) const;
-    void removeConnection(const QString &name);
-    void setConnection(const QString &name, QDBusConnectionPrivate *c);
+    QDBusConnectionPrivate *existingConnection(const QString &name) const;
+
+    void removeConnections(const QStringList &names);
+    void disconnectFrom(const QString &name, QDBusConnectionPrivate::ConnectionMode mode);
+    void addConnection(const QString &name, QDBusConnectionPrivate *c);
+
     QDBusConnectionPrivate *connectToBus(QDBusConnection::BusType type, const QString &name, bool suspendedDelivery);
     QDBusConnectionPrivate *connectToBus(const QString &address, const QString &name);
     QDBusConnectionPrivate *connectToPeer(const QString &address, const QString &name);
 
     void createServer(const QString &address, QDBusServer *server);
 
-    mutable QMutex mutex;
-
 protected:
     void run() override;
 
@@ -56,7 +57,11 @@ private:
     QDBusConnectionPrivate *doConnectToBus(const QString &address, const QString &name);
     QDBusConnectionPrivate *doConnectToPeer(const QString &address, const QString &name);
 
+    mutable QMutex mutex;
     QHash<QString, QDBusConnectionPrivate *> connectionHash;
+    QDBusConnectionPrivate *connection(const QString &name) const;
+    void removeConnection(const QString &name);
+    void setConnection(const QString &name, QDBusConnectionPrivate *c);
 
     QMutex defaultBusMutex;
     QDBusConnectionPrivate *defaultBuses[2];