1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QFutureInterface: clean up mutex() method for Qt 6

Browse Source 
Ditch the QMutex *mutex() method that we had to keep around for binary
compatibility and drop the disambiguation argument of QMutex
&mutex(int) now that we don't need it anymore.

The lock_guard lines now look dangerously close to C++'s Most Vexing
Parse, so use braced initialization to make sure it's parsed as a
definition, not a declaration.

Change-Id: Ie3d70f58c9878ab6d7da8f8bd72a4cb4aff83bb7
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
This commit is contained in:
Marc Mutz 2019-08-22 13:15:29 +02:00
parent 82c6911d7d
commit d9919f1852
2 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/corelib/thread/qfutureinterface.cpp
View File

@ -424,12 +424,7 @@ void QFutureInterfaceBase::setProgressValueAndText(int progressValue,
} }
} }
QMutex *QFutureInterfaceBase::mutex() const QMutex &QFutureInterfaceBase::mutex() const
{
return &d->m_mutex;
}
QMutex &QFutureInterfaceBase::mutex(int) const
{ {
return d->m_mutex; return d->m_mutex;
} }

13
src/corelib/thread/qfutureinterface.h
View File

@ -119,8 +119,7 @@ public:
void waitForResult(int resultIndex); void waitForResult(int resultIndex);
void waitForResume(); void waitForResume();
QMutex *mutex() const; QMutex &mutex() const;
QMutex &mutex(int) const;
QtPrivate::ExceptionStore &exceptionStore(); QtPrivate::ExceptionStore &exceptionStore();
QtPrivate::ResultStoreBase &resultStoreBase(); QtPrivate::ResultStoreBase &resultStoreBase();
const QtPrivate::ResultStoreBase &resultStoreBase() const; const QtPrivate::ResultStoreBase &resultStoreBase() const;
@ -191,7 +190,7 @@ public:
template <typename T> template <typename T>
inline void QFutureInterface<T>::reportResult(const T *result, int index) inline void QFutureInterface<T>::reportResult(const T *result, int index)
{ {
std::lock_guard<QMutex> locker(mutex(0)); std::lock_guard<QMutex> locker{mutex()};
if (this->queryState(Canceled) || this->queryState(Finished)) { if (this->queryState(Canceled) || this->queryState(Finished)) {
return; return;
} }
@ -217,7 +216,7 @@ inline void QFutureInterface<T>::reportResult(const T &result, int index)
template <typename T> template <typename T>
inline void QFutureInterface<T>::reportResults(const QVector<T> &_results, int beginIndex, int count) inline void QFutureInterface<T>::reportResults(const QVector<T> &_results, int beginIndex, int count)
{ {
std::lock_guard<QMutex> locker(mutex(0)); std::lock_guard<QMutex> locker{mutex()};
if (this->queryState(Canceled) || this->queryState(Finished)) { if (this->queryState(Canceled) || this->queryState(Finished)) {
return; return;
} }
@ -245,14 +244,14 @@ inline void QFutureInterface<T>::reportFinished(const T *result)
template <typename T> template <typename T>
inline const T &QFutureInterface<T>::resultReference(int index) const inline const T &QFutureInterface<T>::resultReference(int index) const
{ {
std::lock_guard<QMutex> locker(mutex(0)); std::lock_guard<QMutex> locker{mutex()};
return resultStoreBase().resultAt(index).template value<T>(); return resultStoreBase().resultAt(index).template value<T>();
} }
template <typename T> template <typename T>
inline const T *QFutureInterface<T>::resultPointer(int index) const inline const T *QFutureInterface<T>::resultPointer(int index) const
{ {
std::lock_guard<QMutex> locker(mutex(0)); std::lock_guard<QMutex> locker{mutex()};
return resultStoreBase().resultAt(index).template pointer<T>(); return resultStoreBase().resultAt(index).template pointer<T>();
} }
@ -266,7 +265,7 @@ inline QList<T> QFutureInterface<T>::results()
QFutureInterfaceBase::waitForResult(-1); QFutureInterfaceBase::waitForResult(-1);
QList<T> res; QList<T> res;
std::lock_guard<QMutex> locker(mutex(0)); std::lock_guard<QMutex> locker{mutex()};
QtPrivate::ResultIteratorBase it = resultStoreBase().begin(); QtPrivate::ResultIteratorBase it = resultStoreBase().begin();
while (it != resultStoreBase().end()) { while (it != resultStoreBase().end()) {