diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2019-08-22 10:17:12 +0200 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@kdab.com> | 2019-08-23 08:44:03 +0200 |
| commit | e913b690b9c87a24e69085f707886ee066d1b616 (patch) | |
| tree | 180118ea412f49614453469c94090af606ca1e48 /src/dbus/qdbusserver.cpp | |
| parent | d603ee689f0e3fdcfa3230b3d75cdce6c5af05c1 (diff) | |
QtDBus: port all QMutexLocker users to qt_{scoped,unique}_lock
Change-Id: Ibba27351a81b0b132ce702c1dfd49d56f23bd8c1
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/dbus/qdbusserver.cpp')
| -rw-r--r-- | src/dbus/qdbusserver.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/dbus/qdbusserver.cpp b/src/dbus/qdbusserver.cpp index 2899fb7bea..f2607e3e8d 100644 --- a/src/dbus/qdbusserver.cpp +++ b/src/dbus/qdbusserver.cpp @@ -43,6 +43,8 @@ #include "qdbusconnectionmanager_p.h" #include "qdbusutil_p.h" +#include <QtCore/private/qlocking_p.h> + #ifndef QT_NO_DBUS QT_BEGIN_NAMESPACE @@ -111,7 +113,7 @@ QDBusServer::~QDBusServer() { QWriteLocker locker(&d->lock); if (QDBusConnectionManager::instance()) { - QMutexLocker locker(&QDBusConnectionManager::instance()->mutex); + const auto locker = qt_scoped_lock(QDBusConnectionManager::instance()->mutex); for (const QString &name : qAsConst(d->serverConnectionNames)) QDBusConnectionManager::instance()->removeConnection(name); d->serverConnectionNames.clear(); |