From 44170cc85cc2ff4298265a58e07ef2d9004a4c3d Mon Sep 17 00:00:00 2001
From: Be <be@mixxx.org>
Date: Fri, 17 Sep 2021 14:06:27 -0500
Subject: use Qt5/6 QMutex & QMutexLocker compatibility macros

---
 src/track/cue.cpp | 41 +++++++++++++++++++++--------------------
 1 file changed, 21 insertions(+), 20 deletions(-)

(limited to 'src/track/cue.cpp')

diff --git a/src/track/cue.cpp b/src/track/cue.cpp
index 74c7e52148..9b50216ec3 100644
--- a/src/track/cue.cpp
+++ b/src/track/cue.cpp
@@ -9,6 +9,7 @@
 #include "util/assert.h"
 #include "util/color/color.h"
 #include "util/color/predefinedcolorpalettes.h"
+#include "util/qtmutex.h"
 
 namespace {
 
@@ -111,7 +112,7 @@ Cue::Cue(
 
 mixxx::CueInfo Cue::getCueInfo(
         mixxx::audio::SampleRate sampleRate) const {
-    QMutexLocker lock(&m_mutex);
+    const auto lock = lockMutex(&m_mutex);
     return mixxx::CueInfo(
             m_type,
             positionFramesToMillis(m_startPosition, sampleRate),
@@ -122,12 +123,12 @@ mixxx::CueInfo Cue::getCueInfo(
 }
 
 DbId Cue::getId() const {
-    QMutexLocker lock(&m_mutex);
+    const auto lock = lockMutex(&m_mutex);
     return m_dbId;
 }
 
 void Cue::setId(DbId cueId) {
-    QMutexLocker lock(&m_mutex);
+    const auto lock = lockMutex(&m_mutex);
     m_dbId = cueId;
     // Neither mark as dirty nor do emit the updated() signal.
     // This function is only called after adding the Cue object
@@ -138,12 +139,12 @@ void Cue::setId(DbId cueId) {
 }
 
 mixxx::CueType Cue::getType() const {
-    QMutexLocker lock(&m_mutex);
+    const auto lock = lockMutex(&m_mutex);
     return m_type;
 }
 
 void Cue::setType(mixxx::CueType type) {
-    QMutexLocker lock(&m_mutex);
+    auto lock = lockMutex(&m_mutex);
     if (m_type == type) {
         return;
     }
@@ -154,12 +155,12 @@ void Cue::setType(mixxx::CueType type) {
 }
 
 mixxx::audio::FramePos Cue::getPosition() const {
-    QMutexLocker lock(&m_mutex);
+    const auto lock = lockMutex(&m_mutex);
     return m_startPosition;
 }
 
 void Cue::setStartPosition(mixxx::audio::FramePos position) {
-    QMutexLocker lock(&m_mutex);
+    auto lock = lockMutex(&m_mutex);
     if (m_startPosition == position) {
         return;
     }
@@ -170,7 +171,7 @@ void Cue::setStartPosition(mixxx::audio::FramePos position) {
 }
 
 void Cue::setEndPosition(mixxx::audio::FramePos position) {
-    QMutexLocker lock(&m_mutex);
+    auto lock = lockMutex(&m_mutex);
     if (m_endPosition == position) {
         return;
     }
@@ -183,7 +184,7 @@ void Cue::setEndPosition(mixxx::audio::FramePos position) {
 void Cue::setStartAndEndPosition(
         mixxx::audio::FramePos startPosition,
         mixxx::audio::FramePos endPosition) {
-    QMutexLocker lock(&m_mutex);
+    auto lock = lockMutex(&m_mutex);
     if (m_startPosition == startPosition &&
             m_endPosition == endPosition) {
         return;
@@ -196,12 +197,12 @@ void Cue::setStartAndEndPosition(
 }
 
 Cue::StartAndEndPositions Cue::getStartAndEndPosition() const {
-    QMutexLocker lock(&m_mutex);
+    const auto lock = lockMutex(&m_mutex);
     return {m_startPosition, m_endPosition};
 }
 
 void Cue::shiftPositionFrames(mixxx::audio::FrameDiff_t frameOffset) {
-    QMutexLocker lock(&m_mutex);
+    auto lock = lockMutex(&m_mutex);
     if (m_startPosition.isValid()) {
         m_startPosition += frameOffset;
     }
@@ -214,7 +215,7 @@ void Cue::shiftPositionFrames(mixxx::audio::FrameDiff_t frameOffset) {
 }
 
 mixxx::audio::FrameDiff_t Cue::getLengthFrames() const {
-    QMutexLocker lock(&m_mutex);
+    const auto lock = lockMutex(&m_mutex);
     if (!m_endPosition.isValid()) {
         return 0;
     }
@@ -225,17 +226,17 @@ mixxx::audio::FrameDiff_t Cue::getLengthFrames() const {
 }
 
 int Cue::getHotCue() const {
-    QMutexLocker lock(&m_mutex);
+    const auto lock = lockMutex(&m_mutex);
     return m_iHotCue;
 }
 
 QString Cue::getLabel() const {
-    QMutexLocker lock(&m_mutex);
+    const auto lock = lockMutex(&m_mutex);
     return m_label;
 }
 
 void Cue::setLabel(const QString& label) {
-    QMutexLocker lock(&m_mutex);
+    auto lock = lockMutex(&m_mutex);
     if (m_label == label) {
         return;
     }
@@ -246,12 +247,12 @@ void Cue::setLabel(const QString& label) {
 }
 
 mixxx::RgbColor Cue::getColor() const {
-    QMutexLocker lock(&m_mutex);
+    const auto lock = lockMutex(&m_mutex);
     return m_color;
 }
 
 void Cue::setColor(mixxx::RgbColor color) {
-    QMutexLocker lock(&m_mutex);
+    auto lock = lockMutex(&m_mutex);
     if (m_color == color) {
         return;
     }
@@ -262,16 +263,16 @@ void Cue::setColor(mixxx::RgbColor color) {
 }
 
 bool Cue::isDirty() const {
-    QMutexLocker lock(&m_mutex);
+    const auto lock = lockMutex(&m_mutex);
     return m_bDirty;
 }
 
 void Cue::setDirty(bool dirty) {
-    QMutexLocker lock(&m_mutex);
+    const auto lock = lockMutex(&m_mutex);
     m_bDirty = dirty;
 }
 
 mixxx::audio::FramePos Cue::getEndPosition() const {
-    QMutexLocker lock(&m_mutex);
+    const auto lock = lockMutex(&m_mutex);
     return m_endPosition;
 }
-- 
cgit v1.2.3