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

QAtomic*: purge deprecated load() and save() methods

Browse Source 
Deprecated in 5.14 in favor of loadRelaxed() and storeRelaxed().
Caught one surviving use of load() in the ios platform plugin.

Change-Id: I9518064a948e5d26ccb956490cbb0561bed5d8b5
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
This commit is contained in:
Edward Welbourne 2020-07-20 13:59:22 +02:00
parent 9ee554ac1d
commit 94b7a4f9b8
4 changed files with 6 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/corelib/thread/qatomic.cpp
View File

@ -260,19 +260,6 @@
*/
/*!
\fn template <typename T> T QAtomicInteger<T>::load() const
\obsolete
Use loadRelaxed() instead.
Atomically loads the value of this QAtomicInteger using relaxed memory
ordering. The value is not modified in any way, but note that there's no
guarantee that it remains so.
\sa storeRelaxed(), loadAcquire()
*/
/*!
\fn template <typename T> T QAtomicInteger<T>::loadRelaxed() const
\since 5.14
@ -294,18 +281,6 @@
\sa storeRelaxed(), loadRelaxed()
*/
/*!
\fn template <typename T> void QAtomicInteger<T>::store(T newValue)
\obsolete
Use storeRelaxed() instead.
Atomically stores the \a newValue value into this atomic type, using
relaxed memory ordering.
\sa storeRelease(), loadRelaxed()
*/
/*!
\fn template <typename T> void QAtomicInteger<T>::storeRelaxed(T newValue)
\since 5.14
@ -322,7 +297,7 @@
Atomically stores the \a newValue value into this atomic type, using
the "Release" memory ordering.
\sa store(), loadAcquire()
\sa storeRelaxed(), loadAcquire()
*/
/*!
@ -1353,19 +1328,6 @@
this QAtomicPointer.
*/
/*!
\fn template <typename T> T *QAtomicPointer<T>::load() const
\obsolete
Use loadRelaxed() instead.
Atomically loads the value of this QAtomicPointer using relaxed memory
ordering. The value is not modified in any way, but note that there's no
guarantee that it remains so.
\sa storeRelaxed(), loadAcquire()
*/
/*!
\fn template <typename T> T *QAtomicPointer<T>::loadRelaxed() const
\since 5.14
@ -1388,18 +1350,6 @@
\sa storeRelease(), loadRelaxed()
*/
/*!
\fn template <typename T> void QAtomicPointer<T>::store(T *newValue)
\obsolete
Use storeRelaxed() instead.
Atomically stores the \a newValue value into this atomic type, using
relaxed memory ordering.
\sa storeRelease(), loadRelaxed()
*/
/*!
\fn template <typename T> void QAtomicPointer<T>::storeRelaxed(T *newValue)
\since 5.14

4
src/corelib/thread/qatomic.h
View File

@ -84,10 +84,8 @@ public:
}
#ifdef Q_CLANG_QDOC
T load() const;
T loadRelaxed() const;
T loadAcquire() const;
void store(T newValue);
void storeRelaxed(T newValue);
void storeRelease(T newValue);
@ -196,10 +194,8 @@ public:
}
#ifdef Q_QDOC
T *load() const;
T *loadAcquire() const;
T *loadRelaxed() const;
void store(T *newValue);
void storeRelaxed(T *newValue);
void storeRelease(T *newValue);

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

@ -98,12 +98,8 @@ public:
typename Ops::Type _q_value;
// Everything below is either implemented in ../arch/qatomic_XXX.h or (as fallback) in qgenericatomic.h
#if QT_DEPRECATED_SINCE(5, 14)
QT_DEPRECATED_VERSION_X_5_14("Use loadRelaxed") T load() const noexcept { return loadRelaxed(); }
QT_DEPRECATED_VERSION_X_5_14("Use storeRelaxed") void store(T newValue) noexcept { storeRelaxed(newValue); }
#endif
// Everything below is either implemented in ../arch/qatomic_XXX.h or (as
// fallback) in qgenericatomic.h
T loadRelaxed() const noexcept { return Ops::loadRelaxed(_q_value); }
void storeRelaxed(T newValue) noexcept { Ops::storeRelaxed(_q_value, newValue); }
@ -240,11 +236,6 @@ public:
AtomicType _q_value;
#if QT_DEPRECATED_SINCE(5, 14)
QT_DEPRECATED_VERSION_X_5_14("Use loadRelaxed") Type load() const noexcept { return loadRelaxed(); }
QT_DEPRECATED_VERSION_X_5_14("Use storeRelaxed") void store(Type newValue) noexcept { storeRelaxed(newValue); }
#endif
Type loadRelaxed() const noexcept { return Ops::loadRelaxed(_q_value); }
void storeRelaxed(Type newValue) noexcept { Ops::storeRelaxed(_q_value, newValue); }

5
src/plugins/platforms/ios/qioseventdispatcher.mm
View File

@ -1,6 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2016 The Qt Company Ltd.
** Copyright (C) 2020 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the plugins of the Qt Toolkit.
@ -473,7 +473,8 @@ bool QIOSEventDispatcher::processPostedEvents()
return false;
QT_APPLE_SCOPED_LOG_ACTIVITY(lcEventDispatcher().isDebugEnabled(), "sendWindowSystemEvents");
QEventLoop::ProcessEventsFlags flags = QEventLoop::ProcessEventsFlags(m_processEvents.flags.load());
QEventLoop::ProcessEventsFlags flags
= QEventLoop::ProcessEventsFlags(m_processEvents.flags.loadRelaxed());
qCDebug(lcEventDispatcher) << "Sending window system events for" << flags;
QWindowSystemInterface::sendWindowSystemEvents(flags);