Merge pull request #11567 from daschuer/moc_include

Manual include #include "moc_*.cpp" to speed up build

83 files changed, 130 insertions, 27 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 60fd7e940b..2af70cbae7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1002,6 +1002,7 @@ add_library(mixxx-lib STATIC EXCLUDE_FROM_ALL
   src/util/logger.cpp
   src/util/logging.cpp
   src/util/mac.cpp
+  src/util/moc_included_test.cpp
   src/util/movinginterquartilemean.cpp
   src/util/performancetimer.cpp
   src/util/rangelist.cpp
@@ -1847,6 +1848,7 @@ add_executable(mixxx-test
   src/test/wbatterytest.cpp
   src/test/wpushbutton_test.cpp
   src/test/wwidgetstack_test.cpp
+  src/util/moc_included_test.cpp
 )
 set_target_properties(mixxx-test PROPERTIES AUTOMOC ON)
 target_link_libraries(mixxx-test PRIVATE mixxx-lib mixxx-gitinfostore gtest gmock)
diff --git a/src/controllers/bulk/bulkenumerator.cpp b/src/controllers/bulk/bulkenumerator.cpp
index d6afabefd2..641eb2ea34 100644
--- a/src/controllers/bulk/bulkenumerator.cpp
+++ b/src/controllers/bulk/bulkenumerator.cpp
@@ -1,8 +1,10 @@
+#include "controllers/bulk/bulkenumerator.h"
+
 #include <libusb.h>
 
 #include "controllers/bulk/bulkcontroller.h"
-#include "controllers/bulk/bulkenumerator.h"
 #include "controllers/bulk/bulksupported.h"
+#include "moc_bulkenumerator.cpp"
 
 BulkEnumerator::BulkEnumerator(UserSettingsPointer pConfig)
         : ControllerEnumerator(),
diff --git a/src/controllers/delegates/midibytedelegate.cpp b/src/controllers/delegates/midibytedelegate.cpp
index 23be28698b..0ee71a8fb7 100644
--- a/src/controllers/delegates/midibytedelegate.cpp
+++ b/src/controllers/delegates/midibytedelegate.cpp
@@ -1,6 +1,8 @@
 #include "controllers/delegates/midibytedelegate.h"
+
 #include "controllers/midi/midimessage.h"
 #include "controllers/midi/midiutils.h"
+#include "moc_midibytedelegate.cpp"
 #include "widget/hexspinbox.h"
 
 MidiByteDelegate::MidiByteDelegate(QObject* pParent)
diff --git a/src/controllers/delegates/midichanneldelegate.cpp b/src/controllers/delegates/midichanneldelegate.cpp
index 9387b45888..cd73af1971 100644
--- a/src/controllers/delegates/midichanneldelegate.cpp
+++ b/src/controllers/delegates/midichanneldelegate.cpp
@@ -1,8 +1,10 @@
+#include "controllers/delegates/midichanneldelegate.h"
+
 #include <QSpinBox>
 
-#include "controllers/delegates/midichanneldelegate.h"
 #include "controllers/midi/midimessage.h"
 #include "controllers/midi/midiutils.h"
+#include "moc_midichanneldelegate.cpp"
 
 MidiChannelDelegate::MidiChannelDelegate(QObject* pParent)
         : QStyledItemDelegate(pParent) {
diff --git a/src/controllers/delegates/midiopcodedelegate.cpp b/src/controllers/delegates/midiopcodedelegate.cpp
index b17721011d..14dfb93d3d 100644
--- a/src/controllers/delegates/midiopcodedelegate.cpp
+++ b/src/controllers/delegates/midiopcodedelegate.cpp
@@ -1,8 +1,10 @@
+#include "controllers/delegates/midiopcodedelegate.h"
+
 #include <QComboBox>
 
-#include "controllers/delegates/midiopcodedelegate.h"
 #include "controllers/midi/midimessage.h"
 #include "controllers/midi/midiutils.h"
+#include "moc_midiopcodedelegate.cpp"
 
 MidiOpCodeDelegate::MidiOpCodeDelegate(QObject* pParent)
         : QStyledItemDelegate(pParent) {
diff --git a/src/controllers/hid/hidenumerator.cpp b/src/controllers/hid/hidenumerator.cpp
index 8040b30977..c4127ae16a 100644
--- a/src/controllers/hid/hidenumerator.cpp
+++ b/src/controllers/hid/hidenumerator.cpp
@@ -5,6 +5,7 @@
 #include "controllers/hid/hidcontroller.h"
 #include "controllers/hid/hiddenylist.h"
 #include "controllers/hid/hiddevice.h"
+#include "moc_hidenumerator.cpp"
 #include "util/cmdlineargs.h"
 
 namespace {
diff --git a/src/dialog/dlgkeywheel.cpp b/src/dialog/dlgkeywheel.cpp
index af1126f021..4a5560935a 100644
--- a/src/dialog/dlgkeywheel.cpp
+++ b/src/dialog/dlgkeywheel.cpp
@@ -7,6 +7,7 @@
 
 #include "control/controlobject.h"
 #include "library/library_prefs.h"
+#include "moc_dlgkeywheel.cpp"
 
 using namespace mixxx::track::io::key;
 
diff --git a/src/dialog/dlgkeywheel.h b/src/dialog/dlgkeywheel.h
index 9d02e74de8..61652213ef 100644
--- a/src/dialog/dlgkeywheel.h
+++ b/src/dialog/dlgkeywheel.h
@@ -27,7 +27,6 @@ class DlgKeywheel : public QDialog, public Ui::DlgKeywheel {
     bool isHiddenNotation(KeyUtils::KeyNotation notation);
     KeyUtils::KeyNotation m_notation;
     QDomDocument m_domDocument;
-    QSvgWidget* m_wheel;
     const UserSettingsPointer m_pConfig;
     bool m_resized{false};
 };
diff --git a/src/effects/chains/equalizereffectchain.cpp b/src/effects/chains/equalizereffectchain.cpp
index 0629f513b3..03b8e49831 100644
--- a/src/effects/chains/equalizereffectchain.cpp
+++ b/src/effects/chains/equalizereffectchain.cpp
@@ -1,6 +1,7 @@
 #include "effects/chains/equalizereffectchain.h"
 
 #include "effects/effectslot.h"
+#include "moc_equalizereffectchain.cpp"
 
 EqualizerEffectChain::EqualizerEffectChain(
         const ChannelHandleAndGroup& handleAndGroup,
diff --git a/src/effects/chains/outputeffectchain.cpp b/src/effects/chains/outputeffectchain.cpp
index 6a47f3ad25..225517b95b 100644
--- a/src/effects/chains/outputeffectchain.cpp
+++ b/src/effects/chains/outputeffectchain.cpp
@@ -1,6 +1,7 @@
 #include "effects/chains/outputeffectchain.h"
 
 #include "effects/effectslot.h"
+#include "moc_outputeffectchain.cpp"
 
 OutputEffectChain::OutputEffectChain(EffectsManager* pEffectsManager,
         EffectsMessengerPointer pEffectsMessenger)
diff --git a/src/effects/chains/pergroupeffectchain.cpp b/src/effects/chains/pergroupeffectchain.cpp
index 745a392079..0c6649843f 100644
--- a/src/effects/chains/pergroupeffectchain.cpp
+++ b/src/effects/chains/pergroupeffectchain.cpp
@@ -1,6 +1,7 @@
 #include "effects/chains/pergroupeffectchain.h"
 
 #include "effects/effectsmanager.h"
+#include "moc_pergroupeffectchain.cpp"
 
 PerGroupEffectChain::PerGroupEffectChain(
         const ChannelHandleAndGroup& handleAndGroup,
diff --git a/src/effects/chains/quickeffectchain.cpp b/src/effects/chains/quickeffectchain.cpp
index 7df93c380b..587300cede 100644
--- a/src/effects/chains/quickeffectchain.cpp
+++ b/src/effects/chains/quickeffectchain.cpp
@@ -2,6 +2,7 @@
 
 #include "effects/effectslot.h"
 #include "effects/presets/effectchainpresetmanager.h"
+#include "moc_quickeffectchain.cpp"
 
 QuickEffectChain::QuickEffectChain(
         const ChannelHandleAndGroup& handleAndGroup,
diff --git a/src/effects/chains/standardeffectchain.cpp b/src/effects/chains/standardeffectchain.cpp
index a2dc01d766..e73d15b767 100644
--- a/src/effects/chains/standardeffectchain.cpp
+++ b/src/effects/chains/standardeffectchain.cpp
@@ -2,6 +2,7 @@
 
 #include "effects/effectsmanager.h"
 #include "mixer/playermanager.h"
+#include "moc_standardeffectchain.cpp"
 
 StandardEffectChain::StandardEffectChain(unsigned int iChainNumber,
         EffectsManager* pEffectsManager,
diff --git a/src/effects/effectknobparameterslot.cpp b/src/effects/effectknobparameterslot.cpp
index e4f58d5114..8b68329737 100644
--- a/src/effects/effectknobparameterslot.cpp
+++ b/src/effects/effectknobparameterslot.cpp
@@ -8,6 +8,7 @@
 #include "controllers/softtakeover.h"
 #include "effects/effectparameter.h"
 #include "effects/effectslot.h"
+#include "moc_effectknobparameterslot.cpp"
 #include "util/xml.h"
 
 EffectKnobParameterSlot::EffectKnobParameterSlot(
diff --git a/src/effects/presets/effectchainpresetmanager.cpp b/src/effects/presets/effectchainpresetmanager.cpp
index 6f132bbeef..bbbbf91d0a 100644
--- a/src/effects/presets/effectchainpresetmanager.cpp
+++ b/src/effects/presets/effectchainpresetmanager.cpp
@@ -9,6 +9,7 @@
 #include "effects/effectchain.h"
 #include "effects/effectsmanager.h"
 #include "effects/presets/effectxmlelements.h"
+#include "moc_effectchainpresetmanager.cpp"
 #include "util/filename.h"
 #include "util/xml.h"
 
diff --git a/src/effects/visibleeffectslist.cpp b/src/effects/visibleeffectslist.cpp
index 4fce3719c9..093924feb9 100644
--- a/src/effects/visibleeffectslist.cpp
+++ b/src/effects/visibleeffectslist.cpp
@@ -4,6 +4,7 @@
 
 #include "effects/backends/effectsbackendmanager.h"
 #include "effects/presets/effectxmlelements.h"
+#include "moc_visibleeffectslist.cpp"
 #include "util/xml.h"
 
 void VisibleEffectsList::setList(const QList<EffectManifestPointer>& newList) {
diff --git a/src/engine/bufferscalers/enginebufferscalelinear.cpp b/src/engine/bufferscalers/enginebufferscalelinear.cpp
index 78aca3ecb4..4f91e3a93e 100644
--- a/src/engine/bufferscalers/enginebufferscalelinear.cpp
+++ b/src/engine/bufferscalers/enginebufferscalelinear.cpp
@@ -2,6 +2,7 @@
 
 #include <QtDebug>
 
+#include "moc_enginebufferscalelinear.cpp"
 #include "track/keyutils.h"
 #include "util/assert.h"
 #include "util/math.h"
diff --git a/src/engine/enginepregain.cpp b/src/engine/enginepregain.cpp
index d8d938560e..f9da9e207a 100644
--- a/src/engine/enginepregain.cpp
+++ b/src/engine/enginepregain.cpp
@@ -6,6 +6,7 @@
 #include "control/controlobject.h"
 #include "control/controlpotmeter.h"
 #include "control/controlpushbutton.h"
+#include "moc_enginepregain.cpp"
 #include "preferences/usersettings.h"
 #include "util/math.h"
 #include "util/sample.h"
diff --git a/src/engine/positionscratchcontroller.cpp b/src/engine/positionscratchcontroller.cpp
index e217a8fb73..dcdfb55554 100644
--- a/src/engine/positionscratchcontroller.cpp
+++ b/src/engine/positionscratchcontroller.cpp
@@ -1,7 +1,9 @@
+#include "engine/positionscratchcontroller.h"
+
 #include <QtDebug>
 
-#include "engine/positionscratchcontroller.h"
 #include "engine/bufferscalers/enginebufferscale.h" // for MIN_SEEK_SPEED
+#include "moc_positionscratchcontroller.cpp"
 #include "util/math.h"
 
 class VelocityController {
diff --git a/src/library/export/coverartcopyworker.cpp b/src/library/export/coverartcopyworker.cpp
index 47071303e5..33cdb4a5ca 100644
--- a/src/library/export/coverartcopyworker.cpp
+++ b/src/library/export/coverartcopyworker.cpp
@@ -4,6 +4,7 @@
 #include <QFileInfo>
 #include <QMessageBox>
 
+#include "moc_coverartcopyworker.cpp"
 #include "util/fileaccess.h"
 #include "util/imagefiledata.h"
 #include "util/safelywritablefile.h"
diff --git a/src/library/export/dlglibraryexport.cpp b/src/library/export/dlglibraryexport.cpp
index 26fbdf73ae..7b241af694 100644
--- a/src/library/export/dlglibraryexport.cpp
+++ b/src/library/export/dlglibraryexport.cpp
@@ -16,6 +16,7 @@
 #include "library/trackcollectionmanager.h"
 #include "library/trackset/crate/crateid.h"
 #include "library/trackset/crate/cratestorage.h"
+#include "moc_dlglibraryexport.cpp"
 
 namespace el = djinterop::enginelibrary;
 
diff --git a/src/library/export/engineprimeexportjob.cpp b/src/library/export/engineprimeexportjob.cpp
index d5db7057d6..9a1cbbe939 100644
--- a/src/library/export/engineprimeexportjob.cpp
+++ b/src/library/export/engineprimeexportjob.cpp
@@ -13,6 +13,7 @@
 
 #include "library/trackcollection.h"
 #include "library/trackset/crate/crate.h"
+#include "moc_engineprimeexportjob.cpp"
 #include "track/track.h"
 #include "util/optional.h"
 #include "util/thread_affinity.h"
diff --git a/src/library/export/libraryexporter.cpp b/src/library/export/libraryexporter.cpp
index 130515d94c..9935a3597d 100644
--- a/src/library/export/libraryexporter.cpp
+++ b/src/library/export/libraryexporter.cpp
@@ -4,6 +4,7 @@
 #include <QThreadPool>
 
 #include "library/export/engineprimeexportjob.h"
+#include "moc_libraryexporter.cpp"
 #include "util/parented_ptr.h"