Clean up QMutex/QMutexLocker includes

29 files changed, 1 insertions, 32 deletions

diff --git a/src/control/controlobject.cpp b/src/control/controlobject.cpp
index d03932ee96..ebce489cad 100644
--- 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
index cfd2dd39d5..0f511183be 100644
--- 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
index 7cb776afb5..b2571d00f2 100644
--- 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
index a41068631b..e89bd41864 100644
--- 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
index 4af00fb3a1..8a6f392e4e 100644
--- 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
index 447908b991..40e2af7a7e 100644
--- 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
index 8f6b4961d1..6317ba1d15 100644
--- 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
index 1ce96a83ec..69bf0a35be 100644
--- 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
index b19186b15f..e1f4c64203 100644
--- 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
index 3f4a1dc7bd..e1729476fa 100644
--- 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
index 192a976576..a260721f09 100644
--- 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
index b48a02882d..82b9d042d5 100644
--- 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
index 21eb8e159f..e0a0cfa73f 100644
--- 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
index 69fc139365..6aa0f78a11 100644
--- 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
index c5e1a555b4..cd6b8402e9 100644
--- 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
index e65707ddd5..8bf7bb95ba 100644
--- 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/keys.cpp b/src/track/keys.cpp
index 2d6e5c6b0e..2d9b9ef77f 100644
--- 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
index 62637f6682..1fa24a5a74 100644
--- 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
index 1109596bbc..0dcdd38757 100644
--- 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
index c9c314d167..1eec933a2d 100644
--- 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
index abb04e9d68..a14a4f9a34 100644
--- 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
index dbf9598bd5..5ce95f3b70 100644
--- 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
index 895e0ceee9..f355927006 100644
--- 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
index a44309ca4a..dd6d140377 100644
--- 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
index 32854caa8b..984d30e1c3 100644
--- 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
index 9d9059d1a8..5529a27f90 100644
--- 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
index 89b92ddb6a..15608e3ac5 100644
--- 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
index 0b2c1399bf..7290acb6ad 100644
--- 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
index f2cfcb7781..418af99c6e 100644
--- 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"