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

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>

3 files changed, 3 insertions, 66 deletions

diff --git a/src/corelib/thread/qatomic.cpp b/src/corelib/thread/qatomic.cpp
index d302da72eb..43f1a4e0d5 100644
--- a/src/corelib/thread/qatomic.cpp
+++ b/src/corelib/thread/qatomic.cpp
@@ -261,19 +261,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
 
@@ -295,18 +282,6 @@
 */
 
 /*!
-    \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()
 */
 
 /*!
@@ -1354,19 +1329,6 @@
 */
 
 /*!
-    \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
 
@@ -1389,18 +1351,6 @@
 */
 
 /*!
-    \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
 
diff --git a/src/corelib/thread/qatomic.h b/src/corelib/thread/qatomic.h
index aa57ddc610..26000ba7df 100644
--- a/src/corelib/thread/qatomic.h
+++ b/src/corelib/thread/qatomic.h
@@ -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);
 
diff --git a/src/corelib/thread/qbasicatomic.h b/src/corelib/thread/qbasicatomic.h
index 18da268270..c02403d766 100644
--- a/src/corelib/thread/qbasicatomic.h
+++ b/src/corelib/thread/qbasicatomic.h
@@ -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); }