diff options
| author | Jake Petroules <jake.petroules@qt.io> | 2017-03-14 20:30:04 -0700 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@qt.io> | 2017-03-22 00:57:30 +0000 |
| commit | c411f577f9febc42d5a26827257526700b771ede (patch) | |
| tree | 41c8b1797d0329534f8b1b4de0e7959bcb3d07d4 /src/lib/corelib/logging | |
| parent | 0d1d1fc00cc6ce7864243b8b7997158b0fa42f10 (diff) | |
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>
Diffstat (limited to 'src/lib/corelib/logging')
| -rw-r--r-- | src/lib/corelib/logging/ilogsink.cpp | 5 | ||||
| -rw-r--r-- | src/lib/corelib/logging/logger.cpp | 2 |
2 files changed, 4 insertions, 3 deletions
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 { |