From 9fa407e55fbe2697029e552daffeac25dc3c9848 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= Date: Thu, 18 May 2023 20:56:06 +0200 Subject: Manual include #include "moc_*.cpp" to speed up build --- src/controllers/bulk/bulkenumerator.cpp | 4 +++- src/controllers/delegates/midibytedelegate.cpp | 2 ++ src/controllers/delegates/midichanneldelegate.cpp | 4 +++- src/controllers/delegates/midiopcodedelegate.cpp | 4 +++- src/controllers/hid/hidenumerator.cpp | 1 + src/dialog/dlgkeywheel.cpp | 1 + src/effects/chains/equalizereffectchain.cpp | 1 + src/effects/chains/outputeffectchain.cpp | 1 + src/effects/chains/pergroupeffectchain.cpp | 1 + src/effects/chains/quickeffectchain.cpp | 1 + src/effects/chains/standardeffectchain.cpp | 1 + src/effects/effectknobparameterslot.cpp | 1 + src/effects/presets/effectchainpresetmanager.cpp | 1 + src/effects/visibleeffectslist.cpp | 1 + src/engine/bufferscalers/enginebufferscalelinear.cpp | 1 + src/engine/enginepregain.cpp | 1 + src/engine/positionscratchcontroller.cpp | 4 +++- src/library/export/coverartcopyworker.cpp | 1 + src/library/export/dlglibraryexport.cpp | 1 + src/library/export/engineprimeexportjob.cpp | 1 + src/library/export/libraryexporter.cpp | 1 + src/library/itunes/itunesplaylistmodel.cpp | 1 + src/library/proxytrackmodel.cpp | 1 + src/library/serato/seratoplaylistmodel.cpp | 2 ++ src/musicbrainz/web/coverartarchiveimagetask.cpp | 1 + src/musicbrainz/web/coverartarchivelinkstask.cpp | 1 + src/preferences/effectchainpresetlistmodel.cpp | 1 + src/preferences/effectmanifesttablemodel.cpp | 1 + src/skin/skinloader.cpp | 1 + src/test/controller_mapping_validation_test.cpp | 1 + src/test/controller_mapping_validation_test.h | 2 ++ src/test/mock_networkaccessmanager.cpp | 3 +++ src/test/musicbrainzrecordingstasktest.cpp | 1 + src/test/musicbrainzrecordingstasktest.h | 2 ++ src/util/battery/batterylinux.cpp | 2 ++ src/util/screensavermanager.cpp | 1 + src/util/workerthreadscheduler.cpp | 1 + src/vinylcontrol/vinylcontrol.cpp | 4 +++- src/vinylcontrol/vinylcontrolxwax.cpp | 13 ++++++++----- src/widget/findonwebmenuservices/findonwebmenudiscogs.cpp | 1 + src/widget/findonwebmenuservices/findonwebmenulastfm.cpp | 1 + .../findonwebmenuservices/findonwebmenusoundcloud.cpp | 1 + src/widget/wanalysislibrarytableview.cpp | 4 +++- src/widget/weffectbuttonparametername.cpp | 1 + src/widget/weffectchainpresetbutton.cpp | 1 + src/widget/weffectchainpresetselector.cpp | 1 + src/widget/weffectknobparametername.cpp | 1 + src/widget/weffectparameternamebase.cpp | 1 + src/widget/wfindonwebmenu.cpp | 1 + src/widget/woverviewhsv.cpp | 5 +++-- src/widget/woverviewlmh.cpp | 7 ++++--- src/widget/woverviewrgb.cpp | 3 ++- src/widget/wscrollable.cpp | 2 ++ 53 files changed, 86 insertions(+), 17 deletions(-) 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 #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 -#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 -#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/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& 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 +#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 -#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 #include +#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 #include "library/export/engineprimeexportjob.h" +#include "moc_libraryexporter.cpp" #include "util/parented_ptr.h" namespace mixxx { diff --git a/src/library/itunes/itunesplaylistmodel.cpp b/src/library/itunes/itunesplaylistmodel.cpp index 21720566f2..50d5b9ade8 100644 --- a/src/library/itunes/itunesplaylistmodel.cpp +++ b/src/library/itunes/itunesplaylistmodel.cpp @@ -1,6 +1,7 @@ #include "library/itunes/itunesplaylistmodel.h" #include "library/baseexternalplaylistmodel.h" +#include "moc_itunesplaylistmodel.cpp" ITunesPlaylistModel::ITunesPlaylistModel(QObject* parent, TrackCollectionManager* pTrackCollectionManager, diff --git a/src/library/proxytrackmodel.cpp b/src/library/proxytrackmodel.cpp index 9ed90501e5..1161878404 100644 --- a/src/library/proxytrackmodel.cpp +++ b/src/library/proxytrackmodel.cpp @@ -3,6 +3,7 @@ #include #include "library/searchqueryparser.h" +#include "moc_proxytrackmodel.cpp" #include "util/assert.h" ProxyTrackModel::ProxyTrackModel(QAbstractItemModel* pTrackModel, diff --git a/src/library/serato/seratoplaylistmodel.cpp b/src/library/serato/seratoplaylistmodel.cpp index 16ed8803a9..3d012b98b9 100644 --- a/src/library/serato/seratoplaylistmodel.cpp +++ b/src/library/serato/seratoplaylistmodel.cpp @@ -1,5 +1,7 @@ #include "library/serato/seratoplaylistmodel.h" +#include "moc_seratoplaylistmodel.cpp" + SeratoPlaylistModel::SeratoPlaylistModel(QObject* parent, TrackCollectionManager* trackCollectionManager, QSharedPointer trackSource) diff --git a/src/musicbrainz/web/coverartarchiveimagetask.cpp b/src/musicbrainz/web/coverartarchiveimagetask.cpp index 0dec9b4ef9..73f24bba00 100644 --- a/src/musicbrainz/web/coverartarchiveimagetask.cpp +++ b/src/musicbrainz/web/coverartarchiveimagetask.cpp @@ -3,6 +3,7 @@ #include #include "defs_urls.h" +#include "moc_coverartarchiveimagetask.cpp" #include "network/httpstatuscode.h" #include "util/assert.h" #include "util/logger.h" diff --git a/src/musicbrainz/web/coverartarchivelinkstask.cpp b/src/musicbrainz/web/coverartarchivelinkstask.cpp index 571f002999..9833760598 100644 --- a/src/musicbrainz/web/coverartarchivelinkstask.cpp +++ b/src/musicbrainz/web/coverartarchivelinkstask.cpp @@ -5,6 +5,7 @@ #include #include +#include "moc_coverartarchivelinkstask.cpp" #include "network/httpstatuscode.h" #include "util/assert.h" #include "util/logger.h" diff --git a/src/preferences/effectchainpresetlistmodel.cpp b/src/preferences/effectchainpresetlistmodel.cpp index cf5be58eea..a3919cfd79 100644 --- a/src/preferences/effectchainpresetlistmodel.cpp +++ b/src/preferences/effectchainpresetlistmodel.cpp @@ -3,6 +3,7 @@ #include #include "effects/presets/effectchainpresetmanager.h" +#include "moc_effectchainpresetlistmodel.cpp" namespace { constexpr QChar kMimeTextDelimiter('\n'); diff --git a/src/preferences/effectmanifesttablemodel.cpp b/src/preferences/effectmanifesttablemodel.cpp index e671e883d1..5a946bc7bb 100644 --- a/src/preferences/effectmanifesttablemodel.cpp +++ b/src/preferences/effectmanifesttablemodel.cpp @@ -4,6 +4,7 @@ #include "effects/backends/effectsbackend.h" #include "effects/backends/effectsbackendmanager.h" +#include "moc_effectmanifesttablemodel.cpp" namespace { const int kColumnType = 0; diff --git a/src/skin/skinloader.cpp b/src/skin/skinloader.cpp index e54edec248..4676da6282 100644 --- a/src/skin/skinloader.cpp +++ b/src/skin/skinloader.cpp @@ -11,6 +11,7 @@ #include "effects/effectsmanager.h" #include "library/library.h" #include "mixer/playermanager.h" +#include "moc_skinloader.cpp" #include "recording/recordingmanager.h" #include "skin/legacy/launchimage.h" #include "skin/legacy/legacyskin.h" diff --git a/src/test/controller_mapping_validation_test.cpp b/src/test/controller_mapping_validation_test.cpp index 2a91e4715f..015fd174d6 100644 --- a/src/test/controller_mapping_validation_test.cpp +++ b/src/test/controller_mapping_validation_test.cpp @@ -3,6 +3,7 @@ #include #include "controllers/defs_controllers.h" +#include "moc_controller_mapping_validation_test.cpp" FakeControllerJSProxy::FakeControllerJSProxy() : ControllerJSProxy(nullptr) { diff --git a/src/test/controller_mapping_validation_test.h b/src/test/controller_mapping_validation_test.h index a9a539fb32..90e6e32483 100644 --- a/src/test/controller_mapping_validation_test.h +++ b/src/test/controller_mapping_validation_test.h @@ -1,3 +1,5 @@ +#pragma once + #include #include "controllers/controller.h" diff --git a/src/test/mock_networkaccessmanager.cpp b/src/test/mock_networkaccessmanager.cpp index c778f5e95e..e106a85c08 100644 --- a/src/test/mock_networkaccessmanager.cpp +++ b/src/test/mock_networkaccessmanager.cpp @@ -20,6 +20,9 @@ #include #include #include + +#include "moc_mock_networkaccessmanager.cpp" + using std::min; using ::testing::MakeMatcher; diff --git a/src/test/musicbrainzrecordingstasktest.cpp b/src/test/musicbrainzrecordingstasktest.cpp index e507a16004..5e1339f1b1 100644 --- a/src/test/musicbrainzrecordingstasktest.cpp +++ b/src/test/musicbrainzrecordingstasktest.cpp @@ -5,6 +5,7 @@ #include #include +#include "moc_musicbrainzrecordingstasktest.cpp" #include "musicbrainz/web/musicbrainzrecordingstask.h" #include "test/mixxxtest.h" #include "test/mock_networkaccessmanager.h" diff --git a/src/test/musicbrainzrecordingstasktest.h b/src/test/musicbrainzrecordingstasktest.h index fd97b8e1b7..92796ee77c 100644 --- a/src/test/musicbrainzrecordingstasktest.h +++ b/src/test/musicbrainzrecordingstasktest.h @@ -1,3 +1,5 @@ +#pragma once + #include #include "gmock/gmock.h" diff --git a/src/util/battery/batterylinux.cpp b/src/util/battery/batterylinux.cpp index 3beee852f8..5ae4fa897b 100644 --- a/src/util/battery/batterylinux.cpp +++ b/src/util/battery/batterylinux.cpp @@ -6,6 +6,8 @@ #include +#include "moc_batterylinux.cpp" + BatteryLinux::BatteryLinux(QObject* pParent) : Battery(pParent), m_client(up_client_new()) { diff --git a/src/util/screensavermanager.cpp b/src/util/screensavermanager.cpp index baf544e3cc..442818c742 100644 --- a/src/util/screensavermanager.cpp +++ b/src/util/screensavermanager.cpp @@ -1,6 +1,7 @@ #include "util/screensavermanager.h" #include "mixer/playerinfo.h" +#include "moc_screensavermanager.cpp" namespace mixxx { diff --git a/src/util/workerthreadscheduler.cpp b/src/util/workerthreadscheduler.cpp index e93afe4f05..b697a112a7 100644 --- a/src/util/workerthreadscheduler.cpp +++ b/src/util/workerthreadscheduler.cpp @@ -1,5 +1,6 @@ #include "util/workerthreadscheduler.h" +#include "moc_workerthreadscheduler.cpp" #include "util/workerthread.h" diff --git a/src/vinylcontrol/vinylcontrol.cpp b/src/vinylcontrol/vinylcontrol.cpp index 4d24a9b505..8ce44c36e6 100644 --- a/src/vinylcontrol/vinylcontrol.cpp +++ b/src/vinylcontrol/vinylcontrol.cpp @@ -1,6 +1,8 @@ #include "vinylcontrol/vinylcontrol.h" -#include "control/controlproxy.h" + #include "control/controlobject.h" +#include "control/controlproxy.h" +#include "moc_vinylcontrol.cpp" VinylControl::VinylControl(UserSettingsPointer pConfig, const QString& group) : m_pConfig(pConfig), diff --git a/src/vinylcontrol/vinylcontrolxwax.cpp b/src/vinylcontrol/vinylcontrolxwax.cpp index d6463aefd8..80dea92cd0 100644 --- a/src/vinylcontrol/vinylcontrolxwax.cpp +++ b/src/vinylcontrol/vinylcontrolxwax.cpp @@ -1,12 +1,15 @@ -#include +#include "vinylcontrol/vinylcontrolxwax.h" + #include -#include "vinylcontrol/vinylcontrolxwax.h" -#include "util/timer.h" -#include "control/controlproxy.h" +#include + #include "control/controlobject.h" -#include "util/math.h" +#include "control/controlproxy.h" +#include "moc_vinylcontrolxwax.cpp" #include "util/defs.h" +#include "util/math.h" +#include "util/timer.h" /****** TODO ******* Stuff to maybe implement here diff --git a/src/widget/findonwebmenuservices/findonwebmenudiscogs.cpp b/src/widget/findonwebmenuservices/findonwebmenudiscogs.cpp index a8b894a6a2..ee2e00a174 100644 --- a/src/widget/findonwebmenuservices/findonwebmenudiscogs.cpp +++ b/src/widget/findonwebmenuservices/findonwebmenudiscogs.cpp @@ -3,6 +3,7 @@ #include #include +#include "moc_findonwebmenudiscogs.cpp" #include "track/track.h" #include "util/parented_ptr.h" diff --git a/src/widget/findonwebmenuservices/findonwebmenulastfm.cpp b/src/widget/findonwebmenuservices/findonwebmenulastfm.cpp index 45b983c758..46fe777a28 100644 --- a/src/widget/findonwebmenuservices/findonwebmenulastfm.cpp +++ b/src/widget/findonwebmenuservices/findonwebmenulastfm.cpp @@ -3,6 +3,7 @@ #include #include +#include "moc_findonwebmenulastfm.cpp" #include "track/track.h" #include "util/parented_ptr.h" diff --git a/src/widget/findonwebmenuservices/findonwebmenusoundcloud.cpp b/src/widget/findonwebmenuservices/findonwebmenusoundcloud.cpp index 9c5d3318ca..d9ec470c82 100644 --- a/src/widget/findonwebmenuservices/findonwebmenusoundcloud.cpp +++ b/src/widget/findonwebmenuservices/findonwebmenusoundcloud.cpp @@ -3,6 +3,7 @@ #include #include +#include "moc_findonwebmenusoundcloud.cpp" #include "track/track.h" #include "util/parented_ptr.h" diff --git a/src/widget/wanalysislibrarytableview.cpp b/src/widget/wanalysislibrarytableview.cpp index b33a8c7a49..11478e7b14 100644 --- a/src/widget/wanalysislibrarytableview.cpp +++ b/src/widget/wanalysislibrarytableview.cpp @@ -1,6 +1,8 @@ -#include "library/trackcollection.h" #include "widget/wanalysislibrarytableview.h" +#include "library/trackcollection.h" +#include "moc_wanalysislibrarytableview.cpp" + WAnalysisLibraryTableView::WAnalysisLibraryTableView( QWidget* parent, UserSettingsPointer pConfig, diff --git a/src/widget/weffectbuttonparametername.cpp b/src/widget/weffectbuttonparametername.cpp index 37c0bd3103..8ae4a90c38 100644 --- a/src/widget/weffectbuttonparametername.cpp +++ b/src/widget/weffectbuttonparametername.cpp @@ -3,6 +3,7 @@ #include #include "effects/effectsmanager.h" +#include "moc_weffectbuttonparametername.cpp" #include "widget/effectwidgetutils.h" WEffectButtonParameterName::WEffectButtonParameterName( diff --git a/src/widget/weffectchainpresetbutton.cpp b/src/widget/weffectchainpresetbutton.cpp index 5a37b81b4f..e4cb5d3128 100644 --- a/src/widget/weffectchainpresetbutton.cpp +++ b/src/widget/weffectchainpresetbutton.cpp @@ -4,6 +4,7 @@ #include #include "effects/presets/effectpresetmanager.h" +#include "moc_weffectchainpresetbutton.cpp" #include "widget/effectwidgetutils.h" WEffectChainPresetButton::WEffectChainPresetButton(QWidget* parent, EffectsManager* pEffectsManager) diff --git a/src/widget/weffectchainpresetselector.cpp b/src/widget/weffectchainpresetselector.cpp index d12152f644..1fd9f8ff17 100644 --- a/src/widget/weffectchainpresetselector.cpp +++ b/src/widget/weffectchainpresetselector.cpp @@ -9,6 +9,7 @@ #include "effects/chains/quickeffectchain.h" #include "effects/effectsmanager.h" #include "library/library_decl.h" +#include "moc_weffectchainpresetselector.cpp" #include "widget/effectwidgetutils.h" WEffectChainPresetSelector::WEffectChainPresetSelector( diff --git a/src/widget/weffectknobparametername.cpp b/src/widget/weffectknobparametername.cpp index 0804193212..66004391ea 100644 --- a/src/widget/weffectknobparametername.cpp +++ b/src/widget/weffectknobparametername.cpp @@ -3,6 +3,7 @@ #include #include "effects/effectsmanager.h" +#include "moc_weffectknobparametername.cpp" #include "widget/effectwidgetutils.h" WEffectKnobParameterName::WEffectKnobParameterName( diff --git a/src/widget/weffectparameternamebase.cpp b/src/widget/weffectparameternamebase.cpp index 68981ca3ae..ebcac087b4 100644 --- a/src/widget/weffectparameternamebase.cpp +++ b/src/widget/weffectparameternamebase.cpp @@ -6,6 +6,7 @@ #include "effects/effectslot.h" #include "effects/effectsmanager.h" +#include "moc_weffectparameternamebase.cpp" namespace { const QString kMimeTextDelimiter = QStringLiteral("\n"); diff --git a/src/widget/wfindonwebmenu.cpp b/src/widget/wfindonwebmenu.cpp index 252821f112..fed1f44df1 100644 --- a/src/widget/wfindonwebmenu.cpp +++ b/src/widget/wfindonwebmenu.cpp @@ -5,6 +5,7 @@ #include #include +#include "moc_wfindonwebmenu.cpp" #include "track/track.h" #include "util/parented_ptr.h" #include "util/widgethelper.h" diff --git a/src/widget/woverviewhsv.cpp b/src/widget/woverviewhsv.cpp index d082564026..30db30ba8d 100644 --- a/src/widget/woverviewhsv.cpp +++ b/src/widget/woverviewhsv.cpp @@ -1,10 +1,11 @@ #include "widget/woverviewhsv.h" -#include #include +#include -#include "util/timer.h" +#include "moc_woverviewhsv.cpp" #include "util/math.h" +#include "util/timer.h" #include "waveform/waveform.h" WOverviewHSV::WOverviewHSV( diff --git a/src/widget/woverviewlmh.cpp b/src/widget/woverviewlmh.cpp index 3134e9c318..df43cd9469 100644 --- a/src/widget/woverviewlmh.cpp +++ b/src/widget/woverviewlmh.cpp @@ -1,11 +1,12 @@ #include "widget/woverviewlmh.h" -#include -#include #include +#include +#include -#include "util/timer.h" +#include "moc_woverviewlmh.cpp" #include "util/math.h" +#include "util/timer.h" #include "waveform/waveform.h" WOverviewLMH::WOverviewLMH( diff --git a/src/widget/woverviewrgb.cpp b/src/widget/woverviewrgb.cpp index 542405195d..d8d8d75e3e 100644 --- a/src/widget/woverviewrgb.cpp +++ b/src/widget/woverviewrgb.cpp @@ -2,8 +2,9 @@ #include -#include "util/timer.h" +#include "moc_woverviewrgb.cpp" #include "util/math.h" +#include "util/timer.h" #include "waveform/waveform.h" WOverviewRGB::WOverviewRGB( diff --git a/src/widget/wscrollable.cpp b/src/widget/wscrollable.cpp index 1ba056d129..75cda081c8 100644 --- a/src/widget/wscrollable.cpp +++ b/src/widget/wscrollable.cpp @@ -1,5 +1,7 @@ #include "widget/wscrollable.h" +#include "moc_wscrollable.cpp" + WScrollable::WScrollable(QWidget* pParent) : QScrollArea(pParent), WBaseWidget(this) { -- cgit v1.2.3 From 359bf398587137a18b6ff6ebb97529c5355a0d21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= Date: Thu, 18 May 2023 22:56:03 +0200 Subject: Remove unused private member m_wheel --- src/dialog/dlgkeywheel.h | 1 - 1 file changed, 1 deletion(-) 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}; }; -- cgit v1.2.3 From 8b820fce74cb92ec65d2ed61088d62539c78285b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= Date: Fri, 19 May 2023 22:54:31 +0200 Subject: Include moc files into Qt6 classes --- src/qml/asyncimageprovider.cpp | 1 + src/qml/asyncimageprovider.h | 2 ++ src/qml/qmlconfigproxy.cpp | 1 + src/qml/qmldlgpreferencesproxy.cpp | 2 ++ src/qml/qmleffectmanifestparametersmodel.cpp | 1 + src/qml/qmleffectslotproxy.cpp | 2 +- src/qml/qmleffectslotproxy.h | 3 +-- src/qml/qmleffectsmanagerproxy.cpp | 3 +-- src/qml/qmleffectsmanagerproxy.h | 3 +-- src/qml/qmllibraryproxy.cpp | 1 + src/qml/qmllibrarytracklistmodel.cpp | 1 + src/qml/qmlplayermanagerproxy.cpp | 1 + src/qml/qmlplayerproxy.cpp | 1 + src/qml/qmlvisibleeffectsmodel.cpp | 1 + src/qml/qmlwaveformoverview.cpp | 2 +- src/qml/qmlwaveformoverview.h | 2 +- 16 files changed, 18 insertions(+), 9 deletions(-) diff --git a/src/qml/asyncimageprovider.cpp b/src/qml/asyncimageprovider.cpp index c82947901c..9162fdcca7 100644 --- a/src/qml/asyncimageprovider.cpp +++ b/src/qml/asyncimageprovider.cpp @@ -1,6 +1,7 @@ #include "qml/asyncimageprovider.h" #include "library/coverartcache.h" +#include "moc_asyncimageprovider.cpp" #include "track/track.h" namespace { diff --git a/src/qml/asyncimageprovider.h b/src/qml/asyncimageprovider.h index 57b3decc74..cc57b94736 100644 --- a/src/qml/asyncimageprovider.h +++ b/src/qml/asyncimageprovider.h @@ -1,3 +1,5 @@ +#pragma once + #include #include #include diff --git a/src/qml/qmlconfigproxy.cpp b/src/qml/qmlconfigproxy.cpp index 0b93b0a17a..0123c6164e 100644 --- a/src/qml/qmlconfigproxy.cpp +++ b/src/qml/qmlconfigproxy.cpp @@ -1,5 +1,6 @@ #include "qml/qmlconfigproxy.h" +#include "moc_qmlconfigproxy.cpp" #include "preferences/colorpalettesettings.h" namespace { diff --git a/src/qml/qmldlgpreferencesproxy.cpp b/src/qml/qmldlgpreferencesproxy.cpp index d1d5ed2182..9973928bf7 100644 --- a/src/qml/qmldlgpreferencesproxy.cpp +++ b/src/qml/qmldlgpreferencesproxy.cpp @@ -1,5 +1,7 @@ #include "qmldlgpreferencesproxy.h" +#include "moc_qmldlgpreferencesproxy.cpp" + namespace mixxx { namespace qml { diff --git a/src/qml/qmleffectmanifestparametersmodel.cpp b/src/qml/qmleffectmanifestparametersmodel.cpp index 689b07e23d..4f5eac87ad 100644 --- a/src/qml/qmleffectmanifestparametersmodel.cpp +++ b/src/qml/qmleffectmanifestparametersmodel.cpp @@ -3,6 +3,7 @@ #include #include "effects/backends/effectmanifest.h" +#include "moc_qmleffectmanifestparametersmodel.cpp" namespace mixxx { namespace qml { diff --git a/src/qml/qmleffectslotproxy.cpp b/src/qml/qmleffectslotproxy.cpp index ed52085c17..ffd78f3e26 100644 --- a/src/qml/qmleffectslotproxy.cpp +++ b/src/qml/qmleffectslotproxy.cpp @@ -5,7 +5,7 @@ #include "effects/effectchain.h" #include "effects/effectslot.h" -#include "qml/qmleffectmanifestparametersmodel.h" +#include "moc_qmleffectslotproxy.cpp" namespace mixxx { namespace qml { diff --git a/src/qml/qmleffectslotproxy.h b/src/qml/qmleffectslotproxy.h index 5d6785face..2929afa909 100644 --- a/src/qml/qmleffectslotproxy.h +++ b/src/qml/qmleffectslotproxy.h @@ -3,12 +3,11 @@ #include #include "effects/effectsmanager.h" +#include "qml/qmleffectmanifestparametersmodel.h" namespace mixxx { namespace qml { -class QmlEffectManifestParametersModel; - class QmlEffectSlotProxy : public QObject { Q_OBJECT Q_PROPERTY(int chainSlotNumber READ getChainSlotNumber CONSTANT) diff --git a/src/qml/qmleffectsmanagerproxy.cpp b/src/qml/qmleffectsmanagerproxy.cpp index 3211eef07e..edd72ebee1 100644 --- a/src/qml/qmleffectsmanagerproxy.cpp +++ b/src/qml/qmleffectsmanagerproxy.cpp @@ -4,8 +4,7 @@ #include #include "effects/effectchain.h" -#include "qml/qmleffectslotproxy.h" -#include "qml/qmlvisibleeffectsmodel.h" +#include "moc_qmleffectsmanagerproxy.cpp" namespace mixxx { namespace qml { diff --git a/src/qml/qmleffectsmanagerproxy.h b/src/qml/qmleffectsmanagerproxy.h index 841447478e..0f1aed87c3 100644 --- a/src/qml/qmleffectsmanagerproxy.h +++ b/src/qml/qmleffectsmanagerproxy.h @@ -3,13 +3,12 @@ #include #include "effects/effectsmanager.h" +#include "qml/qmleffectslotproxy.h" #include "qml/qmlvisibleeffectsmodel.h" namespace mixxx { namespace qml { -class QmlEffectSlotProxy; - class QmlEffectsManagerProxy : public QObject { Q_OBJECT Q_PROPERTY(mixxx::qml::QmlVisibleEffectsModel* visibleEffectsModel diff --git a/src/qml/qmllibraryproxy.cpp b/src/qml/qmllibraryproxy.cpp index 955dcc3b86..5ada463769 100644 --- a/src/qml/qmllibraryproxy.cpp +++ b/src/qml/qmllibraryproxy.cpp @@ -3,6 +3,7 @@ #include #include "library/library.h" +#include "moc_qmllibraryproxy.cpp" namespace mixxx { namespace qml { diff --git a/src/qml/qmllibrarytracklistmodel.cpp b/src/qml/qmllibrarytracklistmodel.cpp index 9678b5f34a..1d8d77c27b 100644 --- a/src/qml/qmllibrarytracklistmodel.cpp +++ b/src/qml/qmllibrarytracklistmodel.cpp @@ -1,6 +1,7 @@ #include "qml/qmllibrarytracklistmodel.h" #include "library/librarytablemodel.h" +#include "moc_qmllibrarytracklistmodel.cpp" namespace mixxx { namespace qml { diff --git a/src/qml/qmlplayermanagerproxy.cpp b/src/qml/qmlplayermanagerproxy.cpp index 2f30663ba3..9a084d6e79 100644 --- a/src/qml/qmlplayermanagerproxy.cpp +++ b/src/qml/qmlplayermanagerproxy.cpp @@ -3,6 +3,7 @@ #include #include "mixer/playermanager.h" +#include "moc_qmlplayermanagerproxy.cpp" #include "qml/qmlplayerproxy.h" namespace mixxx { diff --git a/src/qml/qmlplayerproxy.cpp b/src/qml/qmlplayerproxy.cpp index 9f5d1e651c..6679126167 100644 --- a/src/qml/qmlplayerproxy.cpp +++ b/src/qml/qmlplayerproxy.cpp @@ -1,6 +1,7 @@ #include "qml/qmlplayerproxy.h" #include "mixer/basetrackplayer.h" +#include "moc_qmlplayerproxy.cpp" #include "qml/asyncimageprovider.h" #define PROPERTY_IMPL_GETTER(TYPE, NAME, GETTER) \ diff --git a/src/qml/qmlvisibleeffectsmodel.cpp b/src/qml/qmlvisibleeffectsmodel.cpp index 40c80717df..458d8dd377 100644 --- a/src/qml/qmlvisibleeffectsmodel.cpp +++ b/src/qml/qmlvisibleeffectsmodel.cpp @@ -6,6 +6,7 @@ #include "effects/defs.h" #include "effects/effectsmanager.h" #include "effects/visibleeffectslist.h" +#include "moc_qmlvisibleeffectsmodel.cpp" namespace mixxx { namespace qml { diff --git a/src/qml/qmlwaveformoverview.cpp b/src/qml/qmlwaveformoverview.cpp index fada7aff48..4edf86639c 100644 --- a/src/qml/qmlwaveformoverview.cpp +++ b/src/qml/qmlwaveformoverview.cpp @@ -1,7 +1,7 @@ #include "qml/qmlwaveformoverview.h" #include "mixer/basetrackplayer.h" -#include "qml/qmlplayerproxy.h" +#include "moc_qmlwaveformoverview.cpp" namespace { constexpr double kDesiredChannelHeight = 255; diff --git a/src/qml/qmlwaveformoverview.h b/src/qml/qmlwaveformoverview.h index c5f1c8944f..5cc1f1cb2f 100644 --- a/src/qml/qmlwaveformoverview.h +++ b/src/qml/qmlwaveformoverview.h @@ -6,12 +6,12 @@ #include #include +#include "qml/qmlplayerproxy.h" #include "track/track.h" namespace mixxx { namespace qml { -class QmlPlayerProxy; class QmlWaveformOverview : public QQuickPaintedItem { Q_OBJECT -- cgit v1.2.3 From bbed2b90bf6f9b0b896c8297bad6628ca46af584 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= Date: Fri, 19 May 2023 23:16:17 +0200 Subject: Added missing moc includes to battery classes --- src/util/battery/batterymac.cpp | 3 ++- src/util/battery/batterywindows.cpp | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/util/battery/batterymac.cpp b/src/util/battery/batterymac.cpp index 5f8f761a34..c49aa31bf5 100644 --- a/src/util/battery/batterymac.cpp +++ b/src/util/battery/batterymac.cpp @@ -1,11 +1,12 @@ #include "util/battery/batterymac.h" #include -#include #include +#include #include +#include "moc_batterymac.cpp" #include "util/mac.h" BatteryMac::BatteryMac(QObject* pParent) diff --git a/src/util/battery/batterywindows.cpp b/src/util/battery/batterywindows.cpp index 437e9072d6..98cb8d0d60 100644 --- a/src/util/battery/batterywindows.cpp +++ b/src/util/battery/batterywindows.cpp @@ -1,9 +1,12 @@ #include "util/battery/batterywindows.h" #include + #include #include +#include "moc_batterywindows.cpp" + BatteryWindows::BatteryWindows(QObject* pParent) : Battery(pParent) { } -- cgit v1.2.3 From 5f74402507ace757bbf37049c53b8851b9e1028e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= Date: Fri, 19 May 2023 17:21:52 +0200 Subject: Fail build if not all moc_*.cpp files are included --- CMakeLists.txt | 2 ++ src/util/moc_included_test.cpp | 7 +++++++ 2 files changed, 9 insertions(+) create mode 100644 src/util/moc_included_test.cpp diff --git a/CMakeLists.txt b/CMakeLists.txt index 62a54710cc..1470049d1a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -996,6 +996,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 @@ -1797,6 +1798,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/util/moc_included_test.cpp b/src/util/moc_included_test.cpp new file mode 100644 index 0000000000..81f9962a1d --- /dev/null +++ b/src/util/moc_included_test.cpp @@ -0,0 +1,7 @@ +#include "../mocs_compilation.cpp" + +// QT_VERSION will be defined by any moc_.cpp file included from mocs_compilation.cpp +// It is empty in case all moc files are included +#ifdef QT_VERSION +#error "Not all moc_.cpp files included from their cpp sources. This is a Mixxx requirement to speed up the build process. See https://cmake.org/cmake/help/latest/prop_tgt/AUTOMOC.html for details." +#endif -- cgit v1.2.3 From 8de0de95d0cb8a3dd451acaba24cb924957335e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= Date: Fri, 2 Jun 2023 08:04:31 +0200 Subject: Add moc files to new opengl classes --- src/waveform/widgets/allshader/waveformwidget.cpp | 1 + src/widget/openglwindow.cpp | 1 + src/widget/tooltipqopengl.cpp | 5 +++-- src/widget/winitialglwidget.cpp | 2 ++ src/widget/wspinny.cpp | 2 ++ src/widget/wspinnybase.cpp | 4 +++- src/widget/wvumeter.cpp | 2 ++ src/widget/wvumeterglsl.cpp | 1 + src/widget/wvumeterlegacy.cpp | 2 +- 9 files changed, 16 insertions(+), 4 deletions(-) diff --git a/src/waveform/widgets/allshader/waveformwidget.cpp b/src/waveform/widgets/allshader/waveformwidget.cpp index b351318b22..37d67addaa 100644 --- a/src/waveform/widgets/allshader/waveformwidget.cpp +++ b/src/waveform/widgets/allshader/waveformwidget.cpp @@ -1,5 +1,6 @@ #include "waveform/widgets/allshader/waveformwidget.h" +#include "moc_waveformwidget.cpp" #include "waveform/renderers/allshader/waveformrendererabstract.h" using namespace allshader; diff --git a/src/widget/openglwindow.cpp b/src/widget/openglwindow.cpp index c2249a9e8e..fea71f557e 100644 --- a/src/widget/openglwindow.cpp +++ b/src/widget/openglwindow.cpp @@ -3,6 +3,7 @@ #include #include +#include "moc_openglwindow.cpp" #include "widget/tooltipqopengl.h" #include "widget/trackdroptarget.h" #include "widget/wglwidget.h" diff --git a/src/widget/tooltipqopengl.cpp b/src/widget/tooltipqopengl.cpp index 12c5aa4a20..d5e3fe5b26 100644 --- a/src/widget/tooltipqopengl.cpp +++ b/src/widget/tooltipqopengl.cpp @@ -1,12 +1,13 @@ #include "widget/tooltipqopengl.h" -#include - #include #include #include #include +#include "moc_tooltipqopengl.cpp" +#include "widget/wglwidget.h" + ToolTipQOpenGL::ToolTipQOpenGL() { m_timer.setSingleShot(true); connect(&m_timer, &QTimer::timeout, this, &ToolTipQOpenGL::onTimeout); diff --git a/src/widget/winitialglwidget.cpp b/src/widget/winitialglwidget.cpp index cc6a443310..6f9c4cb224 100644 --- a/src/widget/winitialglwidget.cpp +++ b/src/widget/winitialglwidget.cpp @@ -2,6 +2,8 @@ #include +#include "moc_winitialglwidget.cpp" + WInitialGLWidget::WInitialGLWidget(QWidget* parent) : WGLWidget(parent) { } diff --git a/src/widget/wspinny.cpp b/src/widget/wspinny.cpp index 6a1407f4b6..efc9e1eb31 100644 --- a/src/widget/wspinny.cpp +++ b/src/widget/wspinny.cpp @@ -1,5 +1,7 @@ #include "widget/wspinny.h" +#include "moc_wspinny.cpp" + WSpinny::WSpinny( QWidget* parent, const QString& group, diff --git a/src/widget/wspinnybase.cpp b/src/widget/wspinnybase.cpp index 0dd7a9b4fd..de4787d99e 100644 --- a/src/widget/wspinnybase.cpp +++ b/src/widget/wspinnybase.cpp @@ -1,3 +1,5 @@ +#include "widget/wspinnybase.h" + #include #include #include @@ -9,6 +11,7 @@ #include "control/controlproxy.h" #include "library/coverartcache.h" #include "library/coverartutils.h" +#include "moc_wspinnybase.cpp" #include "track/track.h" #include "util/dnd.h" #include "util/fpclassify.h" @@ -16,7 +19,6 @@ #include "vinylcontrol/vinylcontrolmanager.h" #include "waveform/visualplayposition.h" #include "waveform/vsyncthread.h" -#include "widget/moc_wspinny.cpp" #include "widget/wspinny.h" #include "wimagestore.h" diff --git a/src/widget/wvumeter.cpp b/src/widget/wvumeter.cpp index abc845f349..5ab2da323a 100644 --- a/src/widget/wvumeter.cpp +++ b/src/widget/wvumeter.cpp @@ -1,4 +1,6 @@ #include "widget/wvumeter.h" + +#include "moc_wvumeter.cpp" #include "util/math.h" WVuMeter::WVuMeter(QWidget* parent) diff --git a/src/widget/wvumeterglsl.cpp b/src/widget/wvumeterglsl.cpp index 8a751b58e6..f70a373970 100644 --- a/src/widget/wvumeterglsl.cpp +++ b/src/widget/wvumeterglsl.cpp @@ -1,5 +1,6 @@ #include "widget/wvumeterglsl.h" +#include "moc_wvumeterglsl.cpp" #include "util/assert.h" #include "util/math.h" #include "util/texture.h" diff --git a/src/widget/wvumeterlegacy.cpp b/src/widget/wvumeterlegacy.cpp index c8c062a63f..f2b8f1bfee 100644 --- a/src/widget/wvumeterlegacy.cpp +++ b/src/widget/wvumeterlegacy.cpp @@ -3,7 +3,7 @@ #include #include -#include "moc_wvumeter.cpp" +#include "moc_wvumeterlegacy.cpp" #include "util/math.h" #include "util/timer.h" #include "widget/wpixmapstore.h" -- cgit v1.2.3 From 582a4092053d494560f181dcddcbedbb06f3b45e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= Date: Mon, 5 Jun 2023 18:54:33 +0200 Subject: Improve error message in moc_included_test.cpp --- src/util/moc_included_test.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/util/moc_included_test.cpp b/src/util/moc_included_test.cpp index 81f9962a1d..f4c98e7c91 100644 --- a/src/util/moc_included_test.cpp +++ b/src/util/moc_included_test.cpp @@ -1,7 +1,8 @@ #include "../mocs_compilation.cpp" // QT_VERSION will be defined by any moc_.cpp file included from mocs_compilation.cpp -// It is empty in case all moc files are included +// It is empty in case all moc files are included, a requirement to speed up incremental builds. +// See https://cmake.org/cmake/help/latest/prop_tgt/AUTOMOC.html for details. #ifdef QT_VERSION -#error "Not all moc_.cpp files included from their cpp sources. This is a Mixxx requirement to speed up the build process. See https://cmake.org/cmake/help/latest/prop_tgt/AUTOMOC.html for details." +#error "mocs_compilation.cpp not empty. Move all #include "moc_.cpp" lines from mocs_compilation.cpp to the cpp files of the related classes." #endif -- cgit v1.2.3 From c01fe261a93bbc29dc068200b98dbae396e16f42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= Date: Mon, 5 Jun 2023 21:52:31 +0200 Subject: Remove quotes from #error Co-authored-by: Swiftb0y <12380386+Swiftb0y@users.noreply.github.com> --- src/util/moc_included_test.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/moc_included_test.cpp b/src/util/moc_included_test.cpp index f4c98e7c91..605693a25e 100644 --- a/src/util/moc_included_test.cpp +++ b/src/util/moc_included_test.cpp @@ -4,5 +4,5 @@ // It is empty in case all moc files are included, a requirement to speed up incremental builds. // See https://cmake.org/cmake/help/latest/prop_tgt/AUTOMOC.html for details. #ifdef QT_VERSION -#error "mocs_compilation.cpp not empty. Move all #include "moc_.cpp" lines from mocs_compilation.cpp to the cpp files of the related classes." +#error mocs_compilation.cpp not empty. Move all #include "moc_.cpp" lines from mocs_compilation.cpp to the cpp files of the related classes. #endif -- cgit v1.2.3