From c411f577f9febc42d5a26827257526700b771ede Mon Sep 17 00:00:00 2001
From: Jake Petroules <jake.petroules@qt.io>
Date: Tue, 14 Mar 2017 20:30:04 -0700
Subject: 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>
---
 tests/benchmarker/valgrindrunner.cpp | 5 +++--
 tests/benchmarker/valgrindrunner.h   | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'tests/benchmarker')

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
-- 
cgit v1.2.3