Merge pull request #4322 from uklotzde/compatibility-qmutex

Finish migration to QMutex/QMutexLocker compatibility layer
mixxxdj · Sep 23, 2021 · 006fc86 · 006fc86
2 parents 48617bf + 2e67b4c
commit 006fc86
Show file tree

Hide file tree

Showing 30 changed files with 3 additions and 38 deletions.
diff --git a/src/control/controlobject.cpp b/src/control/controlobject.cpp
@@ -1,7 +1,6 @@
 #include "control/controlobject.h"
 
 #include <QHash>
-#include <QMutexLocker>
 #include <QSet>
 #include <QtDebug>
 

diff --git a/src/control/controlobject.h b/src/control/controlobject.h
@@ -2,7 +2,6 @@
 
 #include <QObject>
 #include <QEvent>
-#include <QMutex>
 
 #include "preferences/usersettings.h"
 #include "controllers/midi/midimessage.h"

diff --git a/src/controllers/controllermanager.h b/src/controllers/controllermanager.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <QMutex>
 #include <QSharedPointer>
 #include <QTimer>
 

diff --git a/src/engine/controls/cuecontrol.cpp b/src/engine/controls/cuecontrol.cpp
@@ -1,7 +1,5 @@
 #include "engine/controls/cuecontrol.h"
 
-#include <QMutexLocker>
-
 #include "control/controlindicator.h"
 #include "control/controlobject.h"
 #include "control/controlpushbutton.h"

diff --git a/src/engine/controls/cuecontrol.h b/src/engine/controls/cuecontrol.h
@@ -3,7 +3,6 @@
 #include <QAtomicInt>
 #include <QAtomicPointer>
 #include <QList>
-#include <QMutex>
 
 #include "control/controlproxy.h"
 #include "engine/controls/enginecontrol.h"

diff --git a/src/engine/sidechain/enginesidechain.cpp b/src/engine/sidechain/enginesidechain.cpp
@@ -8,7 +8,6 @@
 
 #include "engine/sidechain/enginesidechain.h"
 
-#include <QMutexLocker>
 #include <QtDebug>
 
 #include "engine/engine.h"

diff --git a/src/errordialoghandler.cpp b/src/errordialoghandler.cpp
@@ -1,7 +1,6 @@
 #include "errordialoghandler.h"
 
 #include <QCoreApplication>
-#include <QMutexLocker>
 #include <QScopedPointer>
 #include <QThread>
 #include <QtDebug>

diff --git a/src/library/export/engineprimeexportjob.h b/src/library/export/engineprimeexportjob.h
@@ -2,7 +2,6 @@
 
 #include <QAtomicInteger>
 #include <QList>
-#include <QMutex>
 #include <QQueue>
 #include <QSet>
 #include <QSharedPointer>

diff --git a/src/library/scanner/scannerglobal.h b/src/library/scanner/scannerglobal.h
@@ -3,7 +3,6 @@
 #include <QDir>
 #include <QHash>
 #include <QMutex>
-#include <QMutexLocker>
 #include <QRegularExpression>
 #include <QSet>
 #include <QSharedPointer>

diff --git a/src/mixer/playerinfo.cpp b/src/mixer/playerinfo.cpp
@@ -1,8 +1,6 @@
 // Helper class to have easy access
 #include "mixer/playerinfo.h"
 
-#include <QMutexLocker>
-
 #include "control/controlobject.h"
 #include "engine/channels/enginechannel.h"
 #include "engine/enginexfader.h"

diff --git a/src/mixer/playermanager.cpp b/src/mixer/playermanager.cpp
@@ -1,7 +1,5 @@
 #include "mixer/playermanager.h"
 
-#include <QMutexLocker>
-
 #include "control/controlobject.h"
 #include "effects/effectrack.h"
 #include "effects/effectsmanager.h"

diff --git a/src/mixer/playermanager.h b/src/mixer/playermanager.h
@@ -2,7 +2,6 @@
 
 #include <QList>
 #include <QMap>
-#include <QMutex>
 #include <QObject>
 
 #include "analyzer/trackanalysisscheduler.h"

diff --git a/src/skin/legacy/legacyskinparser.cpp b/src/skin/legacy/legacyskinparser.cpp
@@ -3,7 +3,6 @@
 #include <QDir>
 #include <QGridLayout>
 #include <QLabel>
-#include <QMutexLocker>
 #include <QSplitter>
 #include <QStackedWidget>
 #include <QVBoxLayout>

diff --git a/src/skin/legacy/legacyskinparser.h b/src/skin/legacy/legacyskinparser.h
@@ -2,7 +2,6 @@
 
 #include <QDomElement>
 #include <QList>
-#include <QMutex>
 #include <QObject>
 #include <QSet>
 #include <QString>

diff --git a/src/soundio/soundmanagerutil.h b/src/soundio/soundmanagerutil.h
@@ -2,7 +2,6 @@
 
 #include <QDomElement>
 #include <QList>
-#include <QMutex>
 #include <QString>
 #include <QtDebug>
 

diff --git a/src/track/cue.cpp b/src/track/cue.cpp
@@ -1,6 +1,5 @@
 #include "track/cue.h"
 
-#include <QMutexLocker>
 #include <QtDebug>
 
 #include "audio/frame.h"

diff --git a/src/track/globaltrackcache.h b/src/track/globaltrackcache.h
@@ -1,11 +1,11 @@
 #pragma once
 
-
 #include <map>
 #include <unordered_map>
 
 #include "track/track_decl.h"
 #include "track/trackref.h"
+#include "util/compatibility/qmutex.h"
 #include "util/fileaccess.h"
 #include "util/sandbox.h"
 
@@ -276,11 +276,7 @@ class GlobalTrackCache : public QObject {
     void saveEvictedTrack(Track* pEvictedTrack) const;
 
     // Managed by GlobalTrackCacheLocker
-#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
-    mutable QRecursiveMutex m_mutex;
-#else
-    mutable QMutex m_mutex;
-#endif
+    mutable QT_RECURSIVE_MUTEX m_mutex;
 
     GlobalTrackCacheSaver* m_pSaver;
 

diff --git a/src/track/keys.cpp b/src/track/keys.cpp
@@ -1,4 +1,3 @@
-#include <QMutexLocker>
 #include <QtDebug>
 
 #include "track/keys.h"

diff --git a/src/track/keyutils.cpp b/src/track/keyutils.cpp
@@ -1,7 +1,6 @@
 #include "track/keyutils.h"
 
 #include <QMap>
-#include <QMutexLocker>
 #include <QPair>
 #include <QRegularExpression>
 #include <QtDebug>

diff --git a/src/util/logging.cpp b/src/util/logging.cpp
@@ -9,7 +9,6 @@
 #include <QIODevice>
 #include <QLoggingCategory>
 #include <QMutex>
-#include <QMutexLocker>
 #include <QString>
 #include <QTextStream>
 #include <QThread>

diff --git a/src/util/mutex.h b/src/util/mutex.h
@@ -5,7 +5,6 @@
 // See: http://clang.llvm.org/docs/ThreadSafetyAnalysis.html
 
 #include <QMutex>
-#include <QMutexLocker>
 #include <QReadWriteLock>
 
 #include "util/compatibility/qmutex.h"

diff --git a/src/util/sandbox.cpp b/src/util/sandbox.cpp
@@ -2,7 +2,6 @@
 
 #include <QFileDialog>
 #include <QFileInfo>
-#include <QMutexLocker>
 #include <QObject>
 #include <QtDebug>
 

diff --git a/src/util/sandbox.h b/src/util/sandbox.h
@@ -4,7 +4,6 @@
 #include <QFile>
 #include <QFileInfo>
 #include <QHash>
-#include <QMutex>
 #include <QSharedPointer>
 
 #include "preferences/configobject.h"

diff --git a/src/util/statsmanager.cpp b/src/util/statsmanager.cpp
@@ -2,7 +2,6 @@
 
 #include <QFile>
 #include <QMetaType>
-#include <QMutexLocker>
 #include <QTextStream>
 #include <QtDebug>
 

diff --git a/src/vinylcontrol/vinylcontrolprocessor.cpp b/src/vinylcontrol/vinylcontrolprocessor.cpp
@@ -1,7 +1,5 @@
 #include "vinylcontrol/vinylcontrolprocessor.h"
 
-#include <QMutexLocker>
-
 #include "control/controlpushbutton.h"
 #include "moc_vinylcontrolprocessor.cpp"
 #include "util/defs.h"

diff --git a/src/waveform/visualplayposition.h b/src/waveform/visualplayposition.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <QMutex>
 #include <QTime>
 #include <QMap>
 #include <QAtomicPointer>

diff --git a/src/waveform/waveform.h b/src/waveform/waveform.h
@@ -3,7 +3,6 @@
 #include <QAtomicInt>
 #include <QByteArray>
 #include <QMutex>
-#include <QMutexLocker>
 #include <QSharedPointer>
 #include <QString>
 #include <vector>

diff --git a/src/widget/wlibrary.cpp b/src/widget/wlibrary.cpp
@@ -1,6 +1,5 @@
 #include "widget/wlibrary.h"
 
-#include <QMutexLocker>
 #include <QtDebug>
 
 #include "controllers/keyboard/keyboardeventfilter.h"

diff --git a/src/widget/wlibrary.h b/src/widget/wlibrary.h
@@ -2,7 +2,6 @@
 
 #include <QEvent>
 #include <QMap>
-#include <QMutex>
 #include <QStackedWidget>
 #include <QString>
 

diff --git a/src/widget/wwaveformviewer.h b/src/widget/wwaveformviewer.h
@@ -5,7 +5,6 @@
 #include <QDropEvent>
 #include <QEvent>
 #include <QList>
-#include <QMutex>
 
 #include "skin/legacy/skincontext.h"
 #include "track/track_decl.h"