Replace all uses of QMutex/QMutexLocker with std::mutex/std::lock_guard

Change-Id: I5b4518cb241d556f062f85cadd6c8f61887c8ae6
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>

10 files changed, 29 insertions, 21 deletions

diff --git a/src/lib/corelib/api/project.cpp b/src/lib/corelib/api/project.cpp
index b83ea7411..547aa5fa8 100644
--- a/src/lib/corelib/api/project.cpp
+++ b/src/lib/corelib/api/project.cpp
@@ -78,10 +78,11 @@
 #include <tools/qttools.h>
 
 #include <QtCore/qdir.h>
-#include <QtCore/qmutex.h>
 #include <QtCore/qregexp.h>
 #include <QtCore/qshareddata.h>
 
+#include <mutex>
+
 #ifdef QBS_STATIC_LIB
 extern "C" ScannerPlugin *cppScanners[];
 extern "C" ScannerPlugin *qtScanners[];
@@ -91,11 +92,11 @@ namespace qbs {
 namespace Internal {
 
 static bool pluginsLoaded = false;
-static QMutex pluginsLoadedMutex;
+static std::mutex pluginsLoadedMutex;
 
 static void loadPlugins(const QStringList &_pluginPaths, const Logger &logger)
 {
-    QMutexLocker locker(&pluginsLoadedMutex);
+    std::lock_guard<std::mutex> locker(pluginsLoadedMutex);
     if (pluginsLoaded)
         return;
 
diff --git a/src/lib/corelib/language/language.cpp b/src/lib/corelib/language/language.cpp
index b97733450..fba424698 100644
--- a/src/lib/corelib/language/language.cpp
+++ b/src/lib/corelib/language/language.cpp
@@ -64,11 +64,11 @@
 #include <QtCore/qdir.h>
 #include <QtCore/qdiriterator.h>
 #include <QtCore/qmap.h>
-#include <QtCore/qmutex.h>
 
 #include <QtScript/qscriptvalue.h>
 
 #include <algorithm>
+#include <mutex>
 
 namespace qbs {
 namespace Internal {
@@ -826,13 +826,13 @@ bool ResolvedProduct::builtByDefault() const
 
 void ResolvedProduct::cacheExecutablePath(const QString &origFilePath, const QString &fullFilePath)
 {
-    QMutexLocker locker(&m_executablePathCacheLock);
+    std::lock_guard<std::mutex> locker(m_executablePathCacheLock);
     m_executablePathCache.insert(origFilePath, fullFilePath);
 }
 
 QString ResolvedProduct::cachedExecutablePath(const QString &origFilePath) const
 {
-    QMutexLocker locker(&m_executablePathCacheLock);
+    std::lock_guard<std::mutex> locker(m_executablePathCacheLock);
     return m_executablePathCache.value(origFilePath);
 }
 
diff --git a/src/lib/corelib/language/language.h b/src/lib/corelib/language/language.h
index 3ad251ae9..acae13b44 100644
--- a/src/lib/corelib/language/language.h
+++ b/src/lib/corelib/language/language.h
@@ -53,7 +53,6 @@
 
 #include <QtCore/qdatastream.h>
 #include <QtCore/qhash.h>
-#include <QtCore/qmutex.h>
 #include <QtCore/qprocess.h>
 #include <QtCore/qregexp.h>
 #include <QtCore/qscopedpointer.h>
@@ -63,6 +62,8 @@
 
 #include <QtScript/qscriptvalue.h>
 
+#include <mutex>
+
 QT_BEGIN_NAMESPACE
 class QScriptEngine;
 QT_END_NAMESPACE
@@ -452,7 +453,7 @@ private:
     void store(PersistentPool &pool) const;
 
     QHash<QString, QString> m_executablePathCache;
-    mutable QMutex m_executablePathCacheLock;
+    mutable std::mutex m_executablePathCacheLock;
 };
 
 class ResolvedProject : public PersistentObject
diff --git a/src/lib/corelib/logging/ilogsink.cpp b/src/lib/corelib/logging/ilogsink.cpp
index 34abca24e..4623e8ef8 100644
--- a/src/lib/corelib/logging/ilogsink.cpp
+++ b/src/lib/corelib/logging/ilogsink.cpp
@@ -41,7 +41,8 @@
 #include <tools/error.h>
 
 #include <QtCore/qbytearray.h>
-#include <QtCore/qmutex.h>
+
+#include <mutex>
 
 namespace qbs {
 
@@ -78,7 +79,7 @@ class ILogSink::ILogSinkPrivate
 {
 public:
     LoggerLevel logLevel;
-    QMutex mutex;
+    std::mutex mutex;
 };
 
 ILogSink::ILogSink() : d(new ILogSinkPrivate)
diff --git a/src/lib/corelib/logging/logger.cpp b/src/lib/corelib/logging/logger.cpp
index b417a4d85..a11c2181d 100644
--- a/src/lib/corelib/logging/logger.cpp
+++ b/src/lib/corelib/logging/logger.cpp
@@ -45,11 +45,11 @@
 
 #include <QtCore/qbytearray.h>
 #include <QtCore/qelapsedtimer.h>
-#include <QtCore/qmutex.h>
 #include <QtCore/qset.h>
 #include <QtCore/qvariant.h>
 
 #include <cstdarg>
+#include <mutex>
 #include <stdio.h>
 
 namespace qbs {
diff --git a/src/lib/corelib/tools/applecodesignutils.cpp b/src/lib/corelib/tools/applecodesignutils.cpp
index 69c59e6db..f5f8b06fa 100644
--- a/src/lib/corelib/tools/applecodesignutils.cpp
+++ b/src/lib/corelib/tools/applecodesignutils.cpp
@@ -49,6 +49,8 @@
 #include <QtCore/private/qcore_mac_p.h>
 #include <Security/Security.h>
 
+#include <mutex>
+
 namespace qbs {
 namespace Internal {
 
@@ -104,8 +106,8 @@ QVariantMap identitiesProperties()
 {
     // Apple documentation states that the Sec* family of functions are not thread-safe on macOS
     // https://developer.apple.com/library/mac/documentation/Security/Reference/certifkeytrustservices/
-    static QMutex securityMutex;
-    QMutexLocker locker(&securityMutex);
+    static std::mutex securityMutex;
+    std::lock_guard<std::mutex> locker(securityMutex);
     Q_UNUSED(locker);
 
     const void *keys[] = {kSecClass, kSecMatchLimit, kSecAttrCanSign};
diff --git a/src/lib/corelib/tools/launchersocket.cpp b/src/lib/corelib/tools/launchersocket.cpp
index 535be0778..98142aac3 100644
--- a/src/lib/corelib/tools/launchersocket.cpp
+++ b/src/lib/corelib/tools/launchersocket.cpp
@@ -59,7 +59,7 @@ LauncherSocket::LauncherSocket(QObject *parent) : QObject(parent)
 void LauncherSocket::sendData(const QByteArray &data)
 {
     QBS_ASSERT(m_socket, return);
-    QMutexLocker locker(&m_requestsMutex);
+    std::lock_guard<std::mutex> locker(m_requestsMutex);
     m_requests << data;
     if (m_requests.count() == 1)
         QTimer::singleShot(0, this, &LauncherSocket::handleRequests);
@@ -126,7 +126,7 @@ void LauncherSocket::handleError(const QString &error)
 
 void LauncherSocket::handleRequests()
 {
-    QMutexLocker locker(&m_requestsMutex);
+    std::lock_guard<std::mutex> locker(m_requestsMutex);
     for (const QByteArray &request : qAsConst(m_requests))
         m_socket->write(request);
     m_requests.clear();
diff --git a/src/lib/corelib/tools/launchersocket.h b/src/lib/corelib/tools/launchersocket.h
index 130d9f337..200cbf829 100644
--- a/src/lib/corelib/tools/launchersocket.h
+++ b/src/lib/corelib/tools/launchersocket.h
@@ -43,9 +43,10 @@
 #include "launcherpackets.h"
 
 #include <QtCore/qbytearraylist.h>
-#include <QtCore/qmutex.h>
 #include <QtCore/qobject.h>
 
+#include <mutex>
+
 QT_BEGIN_NAMESPACE
 class QLocalSocket;
 QT_END_NAMESPACE
@@ -82,7 +83,7 @@ private:
     QLocalSocket *m_socket = nullptr;
     PacketParser m_packetParser;
     QByteArrayList m_requests;
-    QMutex m_requestsMutex;
+    std::mutex m_requestsMutex;
 };
 
 } // namespace Internal
diff --git a/tests/benchmarker/valgrindrunner.cpp b/tests/benchmarker/valgrindrunner.cpp
index c46493ed4..e148ce8fe 100644
--- a/tests/benchmarker/valgrindrunner.cpp
+++ b/tests/benchmarker/valgrindrunner.cpp
@@ -34,12 +34,13 @@
 #include <QtCore/qdir.h>
 #include <QtCore/qfile.h>
 #include <QtCore/qfuture.h>
-#include <QtCore/qmutex.h>
 #include <QtCore/qstringlist.h>
 #include <QtCore/qxmlstream.h>
 
 #include <QtConcurrent/qtconcurrentrun.h>
 
+#include <mutex>
+
 namespace qbsBenchmarker {
 
 ValgrindRunner::ValgrindRunner(Activities activities, const QString &testProject,
@@ -152,7 +153,7 @@ QStringList ValgrindRunner::valgrindCommandLine(const QString &qbsCommand, const
 
 void ValgrindRunner::addToResults(const ValgrindResult &result)
 {
-    QMutexLocker locker(&m_resultsMutex);
+    std::lock_guard<std::mutex> locker(m_resultsMutex);
     m_results << result;
 }
 
diff --git a/tests/benchmarker/valgrindrunner.h b/tests/benchmarker/valgrindrunner.h
index 04c4ff311..3ec82a6a2 100644
--- a/tests/benchmarker/valgrindrunner.h
+++ b/tests/benchmarker/valgrindrunner.h
@@ -31,9 +31,10 @@
 #include "activities.h"
 
 #include <QtCore/qlist.h>
-#include <QtCore/qmutex.h>
 #include <QtCore/qstring.h>
 
+#include <mutex>
+
 QT_BEGIN_NAMESPACE
 class QStringList;
 QT_END_NAMESPACE
@@ -82,7 +83,7 @@ private:
     const QString m_qbsBinary;
     const QString m_baseOutputDir;
     QList<ValgrindResult> m_results;
-    QMutex m_resultsMutex;
+    std::mutex m_resultsMutex;
 };
 
 } // namespace qbsBenchmarker