diff --git a/src/corelib/thread/qfutureinterface.cpp b/src/corelib/thread/qfutureinterface.cpp index 6430f38a3b2..1303be10b1e 100644 --- a/src/corelib/thread/qfutureinterface.cpp +++ b/src/corelib/thread/qfutureinterface.cpp @@ -424,12 +424,7 @@ void QFutureInterfaceBase::setProgressValueAndText(int progressValue, } } -QMutex *QFutureInterfaceBase::mutex() const -{ - return &d->m_mutex; -} - -QMutex &QFutureInterfaceBase::mutex(int) const +QMutex &QFutureInterfaceBase::mutex() const { return d->m_mutex; } diff --git a/src/corelib/thread/qfutureinterface.h b/src/corelib/thread/qfutureinterface.h index bcdae24833e..43dfd6bac42 100644 --- a/src/corelib/thread/qfutureinterface.h +++ b/src/corelib/thread/qfutureinterface.h @@ -119,8 +119,7 @@ public: void waitForResult(int resultIndex); void waitForResume(); - QMutex *mutex() const; - QMutex &mutex(int) const; + QMutex &mutex() const; QtPrivate::ExceptionStore &exceptionStore(); QtPrivate::ResultStoreBase &resultStoreBase(); const QtPrivate::ResultStoreBase &resultStoreBase() const; @@ -191,7 +190,7 @@ public: template inline void QFutureInterface::reportResult(const T *result, int index) { - std::lock_guard locker(mutex(0)); + std::lock_guard locker{mutex()}; if (this->queryState(Canceled) || this->queryState(Finished)) { return; } @@ -217,7 +216,7 @@ inline void QFutureInterface::reportResult(const T &result, int index) template inline void QFutureInterface::reportResults(const QVector &_results, int beginIndex, int count) { - std::lock_guard locker(mutex(0)); + std::lock_guard locker{mutex()}; if (this->queryState(Canceled) || this->queryState(Finished)) { return; } @@ -245,14 +244,14 @@ inline void QFutureInterface::reportFinished(const T *result) template inline const T &QFutureInterface::resultReference(int index) const { - std::lock_guard locker(mutex(0)); + std::lock_guard locker{mutex()}; return resultStoreBase().resultAt(index).template value(); } template inline const T *QFutureInterface::resultPointer(int index) const { - std::lock_guard locker(mutex(0)); + std::lock_guard locker{mutex()}; return resultStoreBase().resultAt(index).template pointer(); } @@ -266,7 +265,7 @@ inline QList QFutureInterface::results() QFutureInterfaceBase::waitForResult(-1); QList res; - std::lock_guard locker(mutex(0)); + std::lock_guard locker{mutex()}; QtPrivate::ResultIteratorBase it = resultStoreBase().begin(); while (it != resultStoreBase().end()) {