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-25 12:00:28 +0000 |
| commit | fd785c3899d21dd05fd013336bbc63ce818dc2a6 (patch) | |
| tree | 553dd288e83b5f984f04c2c8609ffb8b8eace2b4 /src/corelib/kernel/qcoreapplication_win.cpp | |
| parent | 0d336ab3132c85781fc62b9d92dce690b8ff9d59 (diff) | |
QtCore: port all QMutexLocker users to qt_{scoped,unique}_lock
... except four instances in QCoreApplication that would conflict with
another change.
Replace a locally-defined MutexUnlocker with a call to unlock() +
qScopedGuard'ed lock() to avoid having to spell out the locker type
while we can't depend on C++17 CTAD, yet.
In QSettings, move the new mutex locker into and out of
initDefaultPaths(), such as is idiomatic for std::unique_lock, but
wasn't possible with QMutexLocker (which is not movable).
Change-Id: I23056e13ecaa76159db583c7dccc6e05715e0788
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Diffstat (limited to 'src/corelib/kernel/qcoreapplication_win.cpp')
| -rw-r--r-- | src/corelib/kernel/qcoreapplication_win.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/corelib/kernel/qcoreapplication_win.cpp b/src/corelib/kernel/qcoreapplication_win.cpp index 822b68cf62..961b96710e 100644 --- a/src/corelib/kernel/qcoreapplication_win.cpp +++ b/src/corelib/kernel/qcoreapplication_win.cpp @@ -47,6 +47,7 @@ #ifndef QT_NO_QOBJECT #include "qmutex.h" #include <private/qthread_p.h> +#include <private/qlocking_p.h> #endif #include "qtextstream.h" #include <ctype.h> @@ -919,7 +920,7 @@ void QCoreApplicationPrivate::removePostedTimerEvent(QObject *object, int timerI { QThreadData *data = object->d_func()->threadData; - QMutexLocker locker(&data->postEventList.mutex); + const auto locker = qt_scoped_lock(data->postEventList.mutex); if (data->postEventList.size() == 0) return; for (int i = 0; i < data->postEventList.size(); ++i) { |