Retire atomicLoadAcquire()

src/controllers/bulk/bulkcontroller.cpp

@@ -28,7 +28,7 @@ void BulkReader::run() {
     m_stop = 0;
     unsigned char data[255];
 
-    while (atomicLoadAcquire(m_stop) == 0) {
+    while (m_stop.loadAcquire() == 0) {
         // Blocked polling: The only problem with this is that we can't close
         // the device until the block is released, which means the controller
         // has to send more data

src/engine/cachingreader/cachingreader.cpp

@@ -234,7 +234,7 @@ void CachingReader::process() {
                     update.status == CHUNK_READ_EOF ||
                     update.status == CHUNK_READ_INVALID ||
                     update.status == CHUNK_READ_DISCARDED);
-            if (atomicLoadAcquire(m_state) == STATE_TRACK_LOADING) {
+            if (m_state.loadAcquire() == STATE_TRACK_LOADING) {
                 // Discard all results from pending read requests for the
                 // previous track before the next track has been loaded.
                 freeChunk(pChunk);

src/engine/cachingreader/cachingreaderworker.cpp

@@ -90,7 +90,7 @@ void CachingReaderWorker::run() {
     QThread::currentThread()->setObjectName(QString("CachingReaderWorker %1").arg(++id));
 
     Event::start(m_tag);
-    while (!atomicLoadAcquire(m_stop)) {
+    while (!m_stop.loadAcquire()) {
         // Request is initialized by reading from FIFO
         CachingReaderChunkReadRequest request;
         if (m_newTrackAvailable) {

src/library/export/trackexportworker.cpp

@@ -81,7 +81,7 @@ void TrackExportWorker::run() {
         // on the bar, which looks really nice.
         emit progress(it->fileName(), i, copy_list.size());
         copyFile((*it).asFileInfo(), it.key());
-        if (atomicLoadAcquire(m_bStop)) {
+        if (m_bStop.loadAcquire()) {
             emit canceled();
             return;
         }
@@ -162,7 +162,7 @@ TrackExportWorker::OverwriteAnswer TrackExportWorker::makeOverwriteRequest(
 
     // We can be either canceled from the other thread, or as a return value
     // from this call.  First check for a call from the other thread.
-    if (atomicLoadAcquire(m_bStop)) {
+    if (m_bStop.loadAcquire()) {
         return OverwriteAnswer::CANCEL;
     }
 

src/util/compatibility.h

@@ -128,34 +128,6 @@ inline QScreen* getPrimaryScreen() {
     return nullptr;
 }
 
-template <typename T>
-inline T atomicLoadAcquire(const QAtomicInteger<T>& atomicInt) {
-    // TODO: QBasicAtomicInteger<T>::load() is deprecated and should be
-    // replaced with QBasicAtomicInteger<T>::loadRelaxed() However, the
-    // proposed alternative has just been introduced in Qt 5.14. Until the
-    // minimum required Qt version of Mixxx is increased, we need a version
-    // check here
-#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
-    return atomicInt.loadAcquire();
-#else
-    return atomicInt.load();
-#endif
-}
-
-template <typename T>
-inline T* atomicLoadAcquire(const QAtomicPointer<T>& atomicPtr) {
-    // TODO: QBasicAtomicPointer<T>::load() is deprecated and should be
-    // replaced with QBasicAtomicPointer<T>::loadRelaxed() However, the
-    // proposed alternative has just been introduced in Qt 5.14. Until the
-    // minimum required Qt version of Mixxx is increased, we need a version
-    // check here
-#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
-    return atomicPtr.loadAcquire();
-#else
-    return atomicPtr.load();
-#endif
-}
-
 template <typename T>
 inline T atomicLoadRelaxed(const QAtomicInteger<T>& atomicInt) {
     // TODO: QBasicAtomicInteger<T>::load() is deprecated and should be

src/util/statsmanager.cpp

@@ -248,15 +248,15 @@ void StatsManager::run() {
         processIncomingStatReports();
         m_statsPipeLock.unlock();
 
-        if (atomicLoadAcquire(m_emitAllStats) == 1) {
+        if (m_emitAllStats.loadAcquire() == 1) {
             for (auto it = m_stats.constBegin();
                  it != m_stats.constEnd(); ++it) {
                 emit statUpdated(it.value());
             }
             m_emitAllStats = 0;
         }
 
-        if (atomicLoadAcquire(m_quit) == 1) {
+        if (m_quit.loadAcquire() == 1) {
             qDebug() << "StatsManager thread shutting down.";
             break;
         }

src/waveform/waveform.h

@@ -99,7 +99,7 @@ class Waveform {
     // Atomically lookup the completion of the waveform. Represents the number
     // of data elements that have been processed out of dataSize.
     int getCompletion() const {
-        return atomicLoadAcquire(m_completion);
+        return m_completion.loadAcquire();
     }
     void setCompletion(int completion) {
         m_completion = completion;