diff options
| author | Ievgenii Meshcheriakov <ievgenii.meshcheriakov@qt.io> | 2023-08-15 14:58:49 +0200 |
|---|---|---|
| committer | Ievgenii Meshcheriakov <ievgenii.meshcheriakov@qt.io> | 2023-08-22 16:26:02 +0200 |
| commit | 12a0eee1f8e304669fef3836ac2014b287f9babe (patch) | |
| tree | 69d5872a6d997f1d8d690052670e3c016afe07a0 /src/dbus/qdbusserver.cpp | |
| parent | 3c4a092cf7a542530bbccaca133763bde00bd335 (diff) | |
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>
Diffstat (limited to 'src/dbus/qdbusserver.cpp')
| -rw-r--r-- | src/dbus/qdbusserver.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/dbus/qdbusserver.cpp b/src/dbus/qdbusserver.cpp index e298b14bf1..cb3cee3d6b 100644 --- a/src/dbus/qdbusserver.cpp +++ b/src/dbus/qdbusserver.cpp @@ -86,12 +86,9 @@ QDBusServer::~QDBusServer() if (!manager) return; - QMutexLocker locker(&manager->mutex); QWriteLocker writeLocker(&d->lock); - for (const QString &name : std::as_const(d->serverConnectionNames)) - manager->removeConnection(name); + manager->removeConnections(d->serverConnectionNames); d->serverConnectionNames.clear(); - locker.unlock(); d->serverObject = nullptr; d->ref.storeRelaxed(0); |