Merge branch '2.3' of github.com:mixxxdj/mixxx into cleanup-headers

14 files changed, 56 insertions, 35 deletions

diff --git a/src/effects/builtin/builtinbackend.cpp b/src/effects/builtin/builtinbackend.cpp
index be40af5792..b82904f084 100644
--- a/src/effects/builtin/builtinbackend.cpp
+++ b/src/effects/builtin/builtinbackend.cpp
@@ -1,18 +1,20 @@
+#include "effects/builtin/builtinbackend.h"
+
 #include <QtDebug>
 
-#include "effects/builtin/builtinbackend.h"
-#include "effects/builtin/flangereffect.h"
-#include "effects/builtin/bitcrushereffect.h"
 #include "effects/builtin/balanceeffect.h"
-#include "effects/builtin/linkwitzriley8eqeffect.h"
-#include "effects/builtin/bessel8lvmixeqeffect.h"
 #include "effects/builtin/bessel4lvmixeqeffect.h"
-#include "effects/builtin/threebandbiquadeqeffect.h"
+#include "effects/builtin/bessel8lvmixeqeffect.h"
 #include "effects/builtin/biquadfullkilleqeffect.h"
-#include "effects/builtin/graphiceqeffect.h"
-#include "effects/builtin/parametriceqeffect.h"
+#include "effects/builtin/bitcrushereffect.h"
 #include "effects/builtin/filtereffect.h"
+#include "effects/builtin/flangereffect.h"
+#include "effects/builtin/graphiceqeffect.h"
+#include "effects/builtin/linkwitzriley8eqeffect.h"
 #include "effects/builtin/moogladder4filtereffect.h"
+#include "effects/builtin/parametriceqeffect.h"
+#include "effects/builtin/threebandbiquadeqeffect.h"
+#include "moc_builtinbackend.cpp"
 #ifndef __MACAPPSTORE__
 #include "effects/builtin/reverbeffect.h"
 #endif
diff --git a/src/effects/effect.cpp b/src/effects/effect.cpp
index 295565fa7d..7fbe2ab518 100644
--- a/src/effects/effect.cpp
+++ b/src/effects/effect.cpp
@@ -1,11 +1,13 @@
+#include "effects/effect.h"
+
 #include <QtDebug>
 
-#include "effects/effect.h"
 #include "effects/effectprocessor.h"
 #include "effects/effectsmanager.h"
 #include "effects/effectxmlelements.h"
-#include "engine/effects/engineeffectchain.h"
 #include "engine/effects/engineeffect.h"
+#include "engine/effects/engineeffectchain.h"
+#include "moc_effect.cpp"
 #include "util/xml.h"
 
 Effect::Effect(EffectsManager* pEffectsManager,
diff --git a/src/effects/effectbuttonparameterslot.cpp b/src/effects/effectbuttonparameterslot.cpp
index bd74ca82e9..8b43148663 100644
--- a/src/effects/effectbuttonparameterslot.cpp
+++ b/src/effects/effectbuttonparameterslot.cpp
@@ -1,10 +1,12 @@
+#include "effects/effectbuttonparameterslot.h"
+
 #include <QtDebug>
 
 #include "control/controleffectknob.h"
-#include "effects/effectbuttonparameterslot.h"
-#include "effects/effectxmlelements.h"
 #include "control/controlobject.h"
 #include "control/controlpushbutton.h"
+#include "effects/effectxmlelements.h"
+#include "moc_effectbuttonparameterslot.cpp"
 #include "util/math.h"
 #include "util/xml.h"
 
diff --git a/src/effects/effectchain.cpp b/src/effects/effectchain.cpp
index c24442a90f..c87cbb050b 100644
--- a/src/effects/effectchain.cpp
+++ b/src/effects/effectchain.cpp
@@ -1,13 +1,14 @@
 #include "effects/effectchain.h"
 
-#include "engine/engine.h"
 #include "effects/effectchainmanager.h"
-#include "effects/effectsmanager.h"
 #include "effects/effectprocessor.h"
+#include "effects/effectsmanager.h"
 #include "effects/effectxmlelements.h"
 #include "engine/effects/engineeffectchain.h"
 #include "engine/effects/engineeffectrack.h"
 #include "engine/effects/message.h"
+#include "engine/engine.h"
+#include "moc_effectchain.cpp"
 #include "util/defs.h"
 #include "util/sample.h"
 #include "util/xml.h"
diff --git a/src/effects/effectchainmanager.cpp b/src/effects/effectchainmanager.cpp
index 13eeef9d88..e4c7114a70 100644
--- a/src/effects/effectchainmanager.cpp
+++ b/src/effects/effectchainmanager.cpp
@@ -1,11 +1,13 @@
 #include "effects/effectchainmanager.h"
-#include "effects/effectsmanager.h"
-#include "effects/effectxmlelements.h"
 
-#include <QtDebug>
+#include <QDir>
 #include <QDomDocument>
 #include <QFile>
-#include <QDir>
+#include <QtDebug>
+
+#include "effects/effectsmanager.h"
+#include "effects/effectxmlelements.h"
+#include "moc_effectchainmanager.cpp"
 
 EffectChainManager::EffectChainManager(UserSettingsPointer pConfig,
                                        EffectsManager* pEffectsManager)
diff --git a/src/effects/effectchainslot.cpp b/src/effects/effectchainslot.cpp
index 277e63eaed..e0b82a1d31 100644
--- a/src/effects/effectchainslot.cpp
+++ b/src/effects/effectchainslot.cpp
@@ -1,12 +1,13 @@
 #include "effects/effectchainslot.h"
 
-#include "effects/effectrack.h"
-#include "effects/effectxmlelements.h"
-#include "effects/effectslot.h"
+#include "control/controlencoder.h"
 #include "control/controlpotmeter.h"
 #include "control/controlpushbutton.h"
-#include "control/controlencoder.h"
+#include "effects/effectrack.h"
+#include "effects/effectslot.h"
+#include "effects/effectxmlelements.h"
 #include "mixer/playermanager.h"
+#include "moc_effectchainslot.cpp"
 #include "util/math.h"
 #include "util/xml.h"
 
diff --git a/src/effects/effectparameter.cpp b/src/effects/effectparameter.cpp
index f0bd3c9837..38855618b5 100644
--- a/src/effects/effectparameter.cpp
+++ b/src/effects/effectparameter.cpp
@@ -1,8 +1,10 @@
+#include "effects/effectparameter.h"
+
 #include <QtDebug>
 
-#include "effects/effectparameter.h"
-#include "effects/effectsmanager.h"
 #include "effects/effect.h"
+#include "effects/effectsmanager.h"
+#include "moc_effectparameter.cpp"
 #include "util/assert.h"
 
 EffectParameter::EffectParameter(Effect* pEffect, EffectsManager* pEffectsManager,
diff --git a/src/effects/effectparameterslot.cpp b/src/effects/effectparameterslot.cpp
index 706416aa04..653f691364 100644
--- a/src/effects/effectparameterslot.cpp
+++ b/src/effects/effectparameterslot.cpp
@@ -1,11 +1,13 @@
+#include "effects/effectparameterslot.h"
+
 #include <QtDebug>
 
 #include "control/controleffectknob.h"
-#include "effects/effectparameterslot.h"
-#include "effects/effectxmlelements.h"
 #include "control/controlobject.h"
 #include "control/controlpushbutton.h"
 #include "controllers/softtakeover.h"
+#include "effects/effectxmlelements.h"
+#include "moc_effectparameterslot.cpp"
 #include "util/xml.h"
 
 EffectParameterSlot::EffectParameterSlot(const QString& group, const unsigned int iParameterSlotNumber)
diff --git a/src/effects/effectparameterslotbase.cpp b/src/effects/effectparameterslotbase.cpp
index 4f1b320490..3767462191 100644
--- a/src/effects/effectparameterslotbase.cpp
+++ b/src/effects/effectparameterslotbase.cpp
@@ -1,9 +1,11 @@
+#include "effects/effectparameterslotbase.h"
+
 #include <QtDebug>
 
 #include "control/controleffectknob.h"
-#include "effects/effectparameterslotbase.h"
 #include "control/controlobject.h"
 #include "control/controlpushbutton.h"
+#include "moc_effectparameterslotbase.cpp"
 
 EffectParameterSlotBase::EffectParameterSlotBase(const QString& group,
                                                  const unsigned int iParameterSlotNumber)
diff --git a/src/effects/effectrack.cpp b/src/effects/effectrack.cpp
index 7995d796e8..888abd5d42 100644
--- a/src/effects/effectrack.cpp
+++ b/src/effects/effectrack.cpp
@@ -1,10 +1,10 @@
 #include "effects/effectrack.h"
 
-#include "effects/effectsmanager.h"
 #include "effects/effectchainmanager.h"
 #include "effects/effectslot.h"
+#include "effects/effectsmanager.h"
 #include "engine/effects/engineeffectrack.h"
-
+#include "moc_effectrack.cpp"
 #include "util/assert.h"
 
 EffectRack::EffectRack(EffectsManager* pEffectsManager,
diff --git a/src/effects/effectsbackend.cpp b/src/effects/effectsbackend.cpp
index e6a3674d38..aedc07eab6 100644
--- a/src/effects/effectsbackend.cpp
+++ b/src/effects/effectsbackend.cpp
@@ -1,7 +1,9 @@
+#include "effects/effectsbackend.h"
+
 #include <QtDebug>
 
-#include "effects/effectsbackend.h"
 #include "effects/effectsmanager.h"
+#include "moc_effectsbackend.cpp"
 
 EffectsBackend::EffectsBackend(QObject* pParent,
                                EffectBackendType type)
diff --git a/src/effects/effectslot.cpp b/src/effects/effectslot.cpp
index a93e09baf0..fe7cc5e13c 100644
--- a/src/effects/effectslot.cpp
+++ b/src/effects/effectslot.cpp
@@ -1,11 +1,12 @@
 #include "effects/effectslot.h"
-#include "effects/effectxmlelements.h"
 
 #include <QDebug>
 
-#include "control/controlpushbutton.h"
 #include "control/controlencoder.h"
 #include "control/controlproxy.h"
+#include "control/controlpushbutton.h"
+#include "effects/effectxmlelements.h"
+#include "moc_effectslot.cpp"
 #include "util/math.h"
 #include "util/xml.h"
 
diff --git a/src/effects/effectsmanager.cpp b/src/effects/effectsmanager.cpp
index 5bd859d39c..925fced754 100644
--- a/src/effects/effectsmanager.cpp
+++ b/src/effects/effectsmanager.cpp
@@ -1,16 +1,16 @@
 #include "effects/effectsmanager.h"
 
 #include <QMetaType>
-
 #include <algorithm>
 
-#include "engine/effects/engineeffectsmanager.h"
 #include "effects/effectchainmanager.h"
 #include "effects/effectsbackend.h"
 #include "effects/effectslot.h"
 #include "engine/effects/engineeffect.h"
-#include "engine/effects/engineeffectrack.h"
 #include "engine/effects/engineeffectchain.h"
+#include "engine/effects/engineeffectrack.h"
+#include "engine/effects/engineeffectsmanager.h"
+#include "moc_effectsmanager.cpp"
 #include "util/assert.h"
 
 namespace {
diff --git a/src/effects/lv2/lv2backend.cpp b/src/effects/lv2/lv2backend.cpp
index 2a5090805c..0bf4d973cb 100644
--- a/src/effects/lv2/lv2backend.cpp
+++ b/src/effects/lv2/lv2backend.cpp
@@ -1,5 +1,7 @@
 #include "effects/lv2/lv2backend.h"
+
 #include "effects/lv2/lv2manifest.h"
+#include "moc_lv2backend.cpp"
 
 LV2Backend::LV2Backend(QObject* pParent)
         : EffectsBackend(pParent, EffectBackendType::LV2) {