Merge pull request #4303 from uklotzde/qmutex

Move compatibility workarounds for QMutex into new subdirectory

src/controllers/controllermanager.cpp

@@ -8,7 +8,7 @@
 #include "controllers/midi/portmidienumerator.h"
 #include "moc_controllermanager.cpp"
 #include "util/cmdlineargs.h"
-#include "util/qtmutex.h"
+#include "util/compatibility/qmutex.h"
 #include "util/time.h"
 #include "util/trace.h"
 #ifdef __HSS1394__

src/engine/cachingreader/cachingreaderworker.cpp

@@ -9,9 +9,9 @@
 #include "sources/soundsourceproxy.h"
 #include "track/track.h"
 #include "util/compatibility.h"
+#include "util/compatibility/qmutex.h"
 #include "util/event.h"
 #include "util/logger.h"
-#include "util/qtmutex.h"
 
 namespace {
 

src/engine/controls/cuecontrol.h

@@ -11,8 +11,8 @@
 #include "preferences/usersettings.h"
 #include "track/cue.h"
 #include "track/track_decl.h"
+#include "util/compatibility/qmutex.h"
 #include "util/parented_ptr.h"
-#include "util/qtmutex.h"
 
 #define NUM_HOT_CUES 37
 

src/engine/engineworkerscheduler.cpp

@@ -4,8 +4,8 @@
 
 #include "engine/engineworker.h"
 #include "moc_engineworkerscheduler.cpp"
+#include "util/compatibility/qmutex.h"
 #include "util/event.h"
-#include "util/qtmutex.h"
 
 EngineWorkerScheduler::EngineWorkerScheduler(QObject* pParent)
         : m_bWakeScheduler(false),

src/errordialoghandler.cpp

@@ -8,7 +8,7 @@
 
 #include "moc_errordialoghandler.cpp"
 #include "util/assert.h"
-#include "util/qtmutex.h"
+#include "util/compatibility/qmutex.h"
 #include "util/versionstore.h"
 
 ErrorDialogProperties::ErrorDialogProperties()

src/library/scanner/scannerglobal.h

@@ -10,9 +10,9 @@
 #include <QStringList>
 
 #include "util/cache.h"
+#include "util/compatibility/qmutex.h"
 #include "util/fileaccess.h"
 #include "util/performancetimer.h"
-#include "util/qtmutex.h"
 #include "util/task.h"
 
 class ScannerGlobal {

src/mixer/playerinfo.cpp

@@ -9,7 +9,7 @@
 #include "mixer/playermanager.h"
 #include "moc_playerinfo.cpp"
 #include "track/track.h"
-#include "util/qtmutex.h"
+#include "util/compatibility/qmutex.h"
 
 namespace {
 

src/mixer/playermanager.h

@@ -9,9 +9,9 @@
 #include "engine/channelhandle.h"
 #include "preferences/usersettings.h"
 #include "track/track_decl.h"
+#include "util/compatibility/qmutex.h"
 #include "util/parented_ptr.h"
 #include "util/performancetimer.h"
-#include "util/qtmutex.h"
 
 class Auxiliary;
 class BaseTrackPlayer;

src/track/cue.cpp

@@ -9,7 +9,7 @@
 #include "util/assert.h"
 #include "util/color/color.h"
 #include "util/color/predefinedcolorpalettes.h"
-#include "util/qtmutex.h"
+#include "util/compatibility/qmutex.h"
 
 namespace {
 

src/track/keyutils.cpp

@@ -6,8 +6,8 @@
 #include <QRegularExpression>
 #include <QtDebug>
 
+#include "util/compatibility/qmutex.h"
 #include "util/math.h"
-#include "util/qtmutex.h"
 
 #define MUSIC_FLAT_UTF8  "\xe299ad"
 #define MUSIC_SHARP_UTF8 "\xe299af"

src/track/track.h

@@ -11,9 +11,9 @@
 #include "track/cueinfoimporter.h"
 #include "track/track_decl.h"
 #include "track/trackrecord.h"
+#include "util/compatibility/qmutex.h"
 #include "util/fileaccess.h"
 #include "util/memory.h"
-#include "util/qtmutex.h"
 #include "waveform/waveform.h"
 
 class Track : public QObject {

src/util/logging.cpp

@@ -17,7 +17,7 @@
 #include "controllers/controllerdebug.h"
 #include "util/assert.h"
 #include "util/cmdlineargs.h"
-#include "util/qtmutex.h"
+#include "util/compatibility/qmutex.h"
 
 namespace {
 

src/util/mutex.h

@@ -8,7 +8,7 @@
 #include <QMutexLocker>
 #include <QReadWriteLock>
 
-#include "util/qtmutex.h"
+#include "util/compatibility/qmutex.h"
 #include "util/thread_annotations.h"
 
 class CAPABILITY("mutex") MMutex {

src/util/sandbox.h

@@ -8,8 +8,8 @@
 #include <QSharedPointer>
 
 #include "preferences/configobject.h"
+#include "util/compatibility/qmutex.h"
 #include "util/fileinfo.h"
-#include "util/qtmutex.h"
 
 #ifdef Q_OS_MAC
 #include <CoreFoundation/CFURL.h>

src/util/statsmanager.cpp

@@ -9,7 +9,7 @@
 #include "moc_statsmanager.cpp"
 #include "util/cmdlineargs.h"
 #include "util/compatibility.h"
-#include "util/qtmutex.h"
+#include "util/compatibility/qmutex.h"
 
 // In practice we process stats pipes about once a minute @1ms latency.
 const int kStatsPipeSize = 1 << 10;

src/util/tapfilter.cpp

@@ -1,7 +1,7 @@
 #include "util/tapfilter.h"
 
 #include "moc_tapfilter.cpp"
-#include "util/qtmutex.h"
+#include "util/compatibility/qmutex.h"
 
 TapFilter::TapFilter(QObject* pParent, int filterLength, mixxx::Duration maxInterval)
         : QObject(pParent),

src/vinylcontrol/vinylcontrolprocessor.h

@@ -8,8 +8,8 @@
 
 #include "preferences/usersettings.h"
 #include "soundio/soundmanagerutil.h"
+#include "util/compatibility/qmutex.h"
 #include "util/fifo.h"
-#include "util/qtmutex.h"
 #include "vinylcontrol/vinylsignalquality.h"
 
 class VinylControl;

src/waveform/waveform.h

@@ -10,7 +10,7 @@
 
 #include "util/class.h"
 #include "util/compatibility.h"
-#include "util/qtmutex.h"
+#include "util/compatibility/qmutex.h"
 
 enum FilterIndex { Low = 0, Mid = 1, High = 2, FilterCount = 3};
 enum ChannelIndex { Left = 0, Right = 1, ChannelCount = 2};
@@ -32,7 +32,7 @@ class Waveform {
   public:
     enum class SaveState {
         NotSaved = 0,
-        SavePending, 
+        SavePending,
         Saved
     };
 
@@ -84,7 +84,7 @@ class Waveform {
         return m_saveState;
     }
 
-    // AnalysisDAO needs to be able to change the state to savePending when finished 
+    // AnalysisDAO needs to be able to change the state to savePending when finished
     // so we mark this as const and m_saveState mutable.
     void setSaveState(SaveState eState) const {
         m_saveState = eState;

src/widget/wlibrary.h

@@ -8,7 +8,7 @@
 
 #include "library/libraryview.h"
 #include "skin/legacy/skincontext.h"
-#include "util/qtmutex.h"
+#include "util/compatibility/qmutex.h"
 #include "widget/wbasewidget.h"
 
 class KeyboardEventFilter;