From e913b690b9c87a24e69085f707886ee066d1b616 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Thu, 22 Aug 2019 10:17:12 +0200 Subject: QtDBus: port all QMutexLocker users to qt_{scoped,unique}_lock Change-Id: Ibba27351a81b0b132ce702c1dfd49d56f23bd8c1 Reviewed-by: Thiago Macieira --- src/dbus/qdbusintegrator.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/dbus/qdbusintegrator.cpp') diff --git a/src/dbus/qdbusintegrator.cpp b/src/dbus/qdbusintegrator.cpp index 9306498f89..4c27a93382 100644 --- a/src/dbus/qdbusintegrator.cpp +++ b/src/dbus/qdbusintegrator.cpp @@ -49,6 +49,7 @@ #include #include #include +#include #include "qdbusargument.h" #include "qdbusconnection_p.h" @@ -304,7 +305,7 @@ static void qDBusNewConnection(DBusServer *server, DBusConnection *connection, v q_dbus_connection_set_allow_anonymous(connection, true); QDBusConnectionPrivate *newConnection = new QDBusConnectionPrivate(serverConnection->parent()); - QMutexLocker locker(&QDBusConnectionManager::instance()->mutex); + const auto locker = qt_scoped_lock(QDBusConnectionManager::instance()->mutex); QDBusConnectionManager::instance()->setConnection(QLatin1String("QDBusServer-") + QString::number(reinterpret_cast(newConnection), 16), newConnection); serverConnection->serverConnectionNames << newConnection->name; @@ -1862,7 +1863,7 @@ void QDBusConnectionPrivate::processFinishedCall(QDBusPendingCallPrivate *call) { QDBusConnectionPrivate *connection = const_cast(call->connection); - QMutexLocker locker(&call->mutex); + auto locker = qt_unique_lock(call->mutex); connection->pendingCalls.removeOne(call); @@ -1979,7 +1980,7 @@ public: #endif static bool initializedAmounts = false; static QBasicMutex initializeMutex; - QMutexLocker locker(&initializeMutex); + auto locker = qt_unique_lock(initializeMutex); if (!initializedAmounts) { int tmp = 0; -- cgit v1.2.3