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

61 files changed, 204 insertions, 84 deletions

diff --git a/src/widget/controlwidgetconnection.cpp b/src/widget/controlwidgetconnection.cpp
index c198c45e0b..2822cb7f3d 100644
--- a/src/widget/controlwidgetconnection.cpp
+++ b/src/widget/controlwidgetconnection.cpp
@@ -1,11 +1,13 @@
-#include <QStyle>
 #include "widget/controlwidgetconnection.h"
 
-#include "widget/wbasewidget.h"
+#include <QStyle>
+
 #include "control/controlproxy.h"
+#include "moc_controlwidgetconnection.cpp"
+#include "util/assert.h"
 #include "util/debug.h"
 #include "util/valuetransformer.h"
-#include "util/assert.h"
+#include "widget/wbasewidget.h"
 
 ControlWidgetConnection::ControlWidgetConnection(
         WBaseWidget* pBaseWidget,
diff --git a/src/widget/hexspinbox.cpp b/src/widget/hexspinbox.cpp
index ab0c04d697..c58ef0fe88 100644
--- a/src/widget/hexspinbox.cpp
+++ b/src/widget/hexspinbox.cpp
@@ -1,5 +1,7 @@
 #include "widget/hexspinbox.h"
 
+#include "moc_hexspinbox.cpp"
+
 HexSpinBox::HexSpinBox(QWidget* pParent)
         : QSpinBox(pParent) {
     setRange(0, 255);
diff --git a/src/widget/wbattery.cpp b/src/widget/wbattery.cpp
index e5b2506dcf..d6d4fabdc4 100644
--- a/src/widget/wbattery.cpp
+++ b/src/widget/wbattery.cpp
@@ -1,7 +1,9 @@
+#include "widget/wbattery.h"
+
 #include <QStyleOption>
 #include <QStylePainter>
 
-#include "widget/wbattery.h"
+#include "moc_wbattery.cpp"
 #include "util/battery/battery.h"
 #include "util/math.h"
 
diff --git a/src/widget/wbeatspinbox.cpp b/src/widget/wbeatspinbox.cpp
index e775182592..7876b2fd1d 100644
--- a/src/widget/wbeatspinbox.cpp
+++ b/src/widget/wbeatspinbox.cpp
@@ -1,9 +1,10 @@
-#include <QLineEdit>
-
 #include "widget/wbeatspinbox.h"
 
+#include <QLineEdit>
+
 #include "control/controlobject.h"
 #include "control/controlproxy.h"
+#include "moc_wbeatspinbox.cpp"
 #include "util/math.h"
 
 QRegExp WBeatSpinBox::s_regexpBlacklist("[^0-9.,/ ]");
diff --git a/src/widget/wcolorpicker.cpp b/src/widget/wcolorpicker.cpp
index d9a4d12ed7..3db8b60ffa 100644
--- a/src/widget/wcolorpicker.cpp
+++ b/src/widget/wcolorpicker.cpp
@@ -5,6 +5,7 @@
 #include <QPushButton>
 #include <QStyle>
 
+#include "moc_wcolorpicker.cpp"
 #include "util/color/color.h"
 #include "util/parented_ptr.h"
 
diff --git a/src/widget/wcolorpickeraction.cpp b/src/widget/wcolorpickeraction.cpp
index 085f1fe001..439b6c2bd3 100644
--- a/src/widget/wcolorpickeraction.cpp
+++ b/src/widget/wcolorpickeraction.cpp
@@ -1,5 +1,7 @@
 #include "widget/wcolorpickeraction.h"
 
+#include "moc_wcolorpickeraction.cpp"
+
 WColorPickerAction::WColorPickerAction(WColorPicker::Options options, const ColorPalette& palette, QWidget* parent)
         : QWidgetAction(parent),
           m_pColorPicker(make_parented<WColorPicker>(options, palette)) {
diff --git a/src/widget/wcombobox.cpp b/src/widget/wcombobox.cpp
index 9e682c2be7..7fc5222046 100644
--- a/src/widget/wcombobox.cpp
+++ b/src/widget/wcombobox.cpp
@@ -1,7 +1,9 @@
-#include <QtDebug>
+#include "widget/wcombobox.h"
+
 #include <QIcon>
+#include <QtDebug>
 
-#include "widget/wcombobox.h"
+#include "moc_wcombobox.cpp"
 
 WComboBox::WComboBox(QWidget* pParent)
         : QComboBox(pParent),
diff --git a/src/widget/wcoverart.cpp b/src/widget/wcoverart.cpp
index 7e25b28665..9d6cda09da 100644
--- a/src/widget/wcoverart.cpp
+++ b/src/widget/wcoverart.cpp
@@ -12,6 +12,7 @@
 #include "library/coverartcache.h"
 #include "library/coverartutils.h"
 #include "library/dlgcoverartfullsize.h"
+#include "moc_wcoverart.cpp"
 #include "track/track.h"
 #include "util/compatibility.h"
 #include "util/dnd.h"
diff --git a/src/widget/wcoverartlabel.cpp b/src/widget/wcoverartlabel.cpp
index 2d76d4be50..88c10e9bc7 100644
--- a/src/widget/wcoverartlabel.cpp
+++ b/src/widget/wcoverartlabel.cpp
@@ -4,6 +4,7 @@
 
 #include "library/coverartutils.h"
 #include "library/dlgcoverartfullsize.h"
+#include "moc_wcoverartlabel.cpp"
 #include "track/track.h"
 #include "util/compatibility.h"
 #include "widget/wcoverartmenu.h"
diff --git a/src/widget/wcoverartmenu.cpp b/src/widget/wcoverartmenu.cpp
index d76ab639a1..080cb10185 100644
--- a/src/widget/wcoverartmenu.cpp
+++ b/src/widget/wcoverartmenu.cpp
@@ -1,8 +1,10 @@
+#include "widget/wcoverartmenu.h"
+
 #include <QFileDialog>
 #include <QFileInfo>
 
-#include "widget/wcoverartmenu.h"
 #include "library/coverartutils.h"
+#include "moc_wcoverartmenu.cpp"
 #include "util/sandbox.h"
 
 WCoverArtMenu::WCoverArtMenu(QWidget *parent)
diff --git a/src/widget/wcuemenupopup.cpp b/src/widget/wcuemenupopup.cpp
index ea92cb56c0..631808a67f 100644
--- a/src/widget/wcuemenupopup.cpp
+++ b/src/widget/wcuemenupopup.cpp
@@ -5,6 +5,7 @@
 #include <QVBoxLayout>
 
 #include "engine/engine.h"
+#include "moc_wcuemenupopup.cpp"
 #include "track/track.h"
 #include "util/color/color.h"
 
diff --git a/src/widget/wdisplay.cpp b/src/widget/wdisplay.cpp
index 72cec0680e..d3a78e1206 100644
--- a/src/widget/wdisplay.cpp
+++ b/src/widget/wdisplay.cpp
@@ -1,11 +1,12 @@
 #include "widget/wdisplay.h"
 
-#include <QStylePainter>
-#include <QStyleOption>
 #include <QPaintEvent>
-#include <QtDebug>
 #include <QPixmap>
+#include <QStyleOption>
+#include <QStylePainter>
+#include <QtDebug>
 
+#include "moc_wdisplay.cpp"
 #include "widget/wpixmapstore.h"
 
 WDisplay::WDisplay(QWidget * parent)
diff --git a/src/widget/weffect.cpp b/src/widget/weffect.cpp
index e62fd529d9..f9141d3a52 100644
--- a/src/widget/weffect.cpp
+++ b/src/widget/weffect.cpp
@@ -1,8 +1,9 @@
-#include <QtDebug>
-
 #include "widget/weffect.h"
 
+#include <QtDebug>
+
 #include "effects/effectsmanager.h"
+#include "moc_weffect.cpp"
 #include "widget/effectwidgetutils.h"
 
 WEffect::WEffect(QWidget* pParent, EffectsManager* pEffectsManager)
diff --git a/src/widget/weffectbuttonparameter.cpp b/src/widget/weffectbuttonparameter.cpp
index c784744764..01ba1503ce 100644
--- a/src/widget/weffectbuttonparameter.cpp
+++ b/src/widget/weffectbuttonparameter.cpp
@@ -1,7 +1,9 @@
+#include "widget/weffectbuttonparameter.h"
+
 #include <QtDebug>
 
-#include "widget/weffectbuttonparameter.h"
 #include "effects/effectsmanager.h"
+#include "moc_weffectbuttonparameter.cpp"
 #include "widget/effectwidgetutils.h"
 
 WEffectButtonParameter::WEffectButtonParameter(QWidget* pParent, EffectsManager* pEffectsManager)
diff --git a/src/widget/weffectchain.cpp b/src/widget/weffectchain.cpp
index 9d2121ff24..66211e1368 100644
--- a/src/widget/weffectchain.cpp
+++ b/src/widget/weffectchain.cpp
@@ -1,7 +1,9 @@
+#include "widget/weffectchain.h"
+
 #include <QtDebug>
 
-#include "widget/weffectchain.h"
 #include "effects/effectsmanager.h"
+#include "moc_weffectchain.cpp"
 #include "widget/effectwidgetutils.h"
 
 WEffectChain::WEffectChain(QWidget* pParent, EffectsManager* pEffectsManager)
diff --git a/src/widget/weffectparameter.cpp b/src/widget/weffectparameter.cpp
index 4d4a22faf3..202a68f2f7 100644
--- a/src/widget/weffectparameter.cpp
+++ b/src/widget/weffectparameter.cpp
@@ -1,7 +1,9 @@
+#include "widget/weffectparameter.h"
+
 #include <QtDebug>
 
-#include "widget/weffectparameter.h"
 #include "effects/effectsmanager.h"
+#include "moc_weffectparameter.cpp"
 #include "widget/effectwidgetutils.h"
 
 WEffectParameter::WEffectParameter(QWidget* pParent, EffectsManager* pEffectsManager)
diff --git a/src/widget/weffectparameterbase.cpp b/src/widget/weffectparameterbase.cpp
index 8fa10e93ad..22191ee58b 100644
--- a/src/widget/weffectparameterbase.cpp
+++ b/src/widget/weffectparameterbase.cpp
@@ -1,7 +1,9 @@
+#include "widget/weffectparameterbase.h"
+
 #include <QtDebug>
 
-#include "widget/weffectparameterbase.h"
 #include "effects/effectsmanager.h"
+#include "moc_weffectparameterbase.cpp"
 
 WEffectParameterBase::WEffectParameterBase(QWidget* pParent, EffectsManager* pEffectsManager)
         : WLabel(pParent),
diff --git a/src/widget/weffectparameterknob.cpp b/src/widget/weffectparameterknob.cpp
index 6b07483b61..4d68641b64 100644
--- a/src/widget/weffectparameterknob.cpp
+++ b/src/widget/weffectparameterknob.cpp
@@ -1,6 +1,8 @@
-#include "widget/effectwidgetutils.h"
 #include "widget/weffectparameterknob.h"
 
+#include "moc_weffectparameterknob.cpp"
+#include "widget/effectwidgetutils.h"
+
 void WEffectParameterKnob::setupEffectParameterSlot(const ConfigKey& configKey) {
     EffectParameterSlotPointer pParameterSlot =
             m_pEffectsManager->getEffectParameterSlot(configKey);
diff --git a/src/widget/weffectparameterknobcomposed.cpp b/src/widget/weffectparameterknobcomposed.cpp
index df10fc7544..6627cd5784 100644
--- a/src/widget/weffectparameterknobcomposed.cpp
+++ b/src/widget/weffectparameterknobcomposed.cpp
@@ -1,6 +1,9 @@
-#include "widget/effectwidgetutils.h"
 #include "widget/weffectparameterknobcomposed.h"
 
+#include "moc_effectwidgetutils.cpp"
+#include "moc_weffectparameterknobcomposed.cpp"
+#include "widget/effectwidgetutils.h"
+
 namespace {
 const QString effectGroupSeparator = "_";
 const QString groupClose = "]";
diff --git a/src/widget/weffectpushbutton.cpp b/src/widget/weffectpushbutton.cpp
index 1e21fd34ce..3dfc096e2c 100644
--- a/src/widget/weffectpushbutton.cpp
+++ b/src/widget/weffectpushbutton.cpp
@@ -2,6 +2,7 @@
 
 #include <QtDebug>
 
+#include "moc_weffectpushbutton.cpp"
 #include "widget/effectwidgetutils.h"
 
 WEffectPushButton::WEffectPushButton(QWidget* pParent, EffectsManager* pEffectsManager)
diff --git a/src/widget/weffectselector.cpp b/src/widget/weffectselector.cpp
index 467f77531b..02c9c3f230 100644
--- a/src/widget/weffectselector.cpp
+++ b/src/widget/weffectselector.cpp
@@ -1,8 +1,9 @@
-#include <QtDebug>
-
 #include "widget/weffectselector.h"
 
+#include <QtDebug>
+
 #include "effects/effectsmanager.h"
+#include "moc_weffectselector.cpp"
 #include "widget/effectwidgetutils.h"
 
 WEffectSelector::WEffectSelector(QWidget* pParent, EffectsManager* pEffectsManager)
diff --git a/src/widget/whotcuebutton.cpp b/src/widget/whotcuebutton.cpp
index c78b131c6c..550b797b05 100644
--- a/src/widget/whotcuebutton.cpp
+++ b/src/widget/whotcuebutton.cpp
@@ -5,6 +5,7 @@
 #include <QtDebug>
 
 #include "mixer/playerinfo.h"
+#include "moc_whotcuebutton.cpp"
 #include "track/track.h"
 
 namespace {
diff --git a/src/widget/wkey.cpp b/src/widget/wkey.cpp
index 59a6fcbdaf..9955f99e87 100644
--- a/src/widget/wkey.cpp
+++ b/src/widget/wkey.cpp
@@ -1,4 +1,6 @@
 #include "widget/wkey.h"
+
+#include "moc_wkey.cpp"
 #include "track/keys.h"
 #include "track/keyutils.h"
 
diff --git a/src/widget/wknob.cpp b/src/widget/wknob.cpp
index ecb9ab3aa9..83fae02dca 100644
--- a/src/widget/wknob.cpp
+++ b/src/widget/wknob.cpp
@@ -1,9 +1,11 @@
-#include <QtDebug>
+#include "widget/wknob.h"
+
 #include <QMouseEvent>
 #include <QWheelEvent>
+#include <QtDebug>
 
+#include "moc_wknob.cpp"
 #include "util/duration.h"
-#include "widget/wknob.h"
 
 WKnob::WKnob(QWidget* pParent)
         : WDisplay(pParent),
diff --git a/src/widget/wknobcomposed.cpp b/src/widget/wknobcomposed.cpp
index e2fbb98c1f..e9cba3290c 100644
--- a/src/widget/wknobcomposed.cpp
+++ b/src/widget/wknobcomposed.cpp
@@ -1,9 +1,11 @@
-#include <QStylePainter>
+#include "widget/wknobcomposed.h"
+
 #include <QStyleOption>
+#include <QStylePainter>
 #include <QTransform>
 
+#include "moc_wknobcomposed.cpp"
 #include "util/duration.h"
-#include "widget/wknobcomposed.h"
 #include "widget/wskincolor.h"
 
 WKnobComposed::WKnobComposed(QWidget* pParent)
diff --git a/src/widget/wlabel.cpp b/src/widget/wlabel.cpp
index 5186d182d5..a732eab87b 100644
--- a/src/widget/wlabel.cpp
+++ b/src/widget/wlabel.cpp
@@ -2,6 +2,7 @@
 
 #include <QFont>
 
+#include "moc_wlabel.cpp"
 #include "widget/wskincolor.h"
 
 WLabel::WLabel(QWidget* pParent)
diff --git a/src/widget/wlibrary.cpp b/src/widget/wlibrary.cpp
index d39e848f65..1d0b3d9b32 100644
--- a/src/widget/wlibrary.cpp
+++ b/src/widget/wlibrary.cpp
@@ -1,11 +1,13 @@
-#include <QtDebug>
+#include "widget/wlibrary.h"
+
 #include <QMutexLocker>
+#include <QtDebug>
 
-#include "widget/wlibrary.h"
-#include "library/libraryview.h"
 #include "controllers/keyboard/keyboardeventfilter.h"
-#include "widget/wtracktableview.h"
+#include "library/libraryview.h"
+#include "moc_wlibrary.cpp"
 #include "util/math.h"
+#include "widget/wtracktableview.h"
 
 WLibrary::WLibrary(QWidget* parent)
         : QStackedWidget(parent),
diff --git a/src/widget/wlibrarysidebar.cpp b/src/widget/wlibrarysidebar.cpp
index 93fe776e23..81547d00d1 100644
--- a/src/widget/wlibrarysidebar.cpp
+++ b/src/widget/wlibrarysidebar.cpp
@@ -2,11 +2,12 @@
 
 #include <QFileInfo>
 #include <QHeaderView>
+#include <QMimeData>
 #include <QUrl>
 #include <QtDebug>
-#include <QMimeData>
 
 #include "library/sidebarmodel.h"
+#include "moc_wlibrarysidebar.cpp"
 #include "util/dnd.h"
 
 const int expand_time = 250;
diff --git a/src/widget/wlibrarytableview.cpp b/src/widget/wlibrarytableview.cpp
index ff650d0afe..6c63faf993 100644
--- a/src/widget/wlibrarytableview.cpp
+++ b/src/widget/wlibrarytableview.cpp
@@ -7,6 +7,7 @@
 #include <QScrollBar>
 
 #include "library/trackmodel.h"
+#include "moc_wlibrarytableview.cpp"
 #include "util/math.h"
 #include "widget/wskincolor.h"
 #include "widget/wwidget.h"
diff --git a/src/widget/wlibrarytextbrowser.cpp b/src/widget/wlibrarytextbrowser.cpp
index ae554068fd..64b7139ef8 100644
--- a/src/widget/wlibrarytextbrowser.cpp
+++ b/src/widget/wlibrarytextbrowser.cpp
@@ -1,5 +1,7 @@
 #include "widget/wlibrarytextbrowser.h"
 
+#include "moc_wlibrarytextbrowser.cpp"
+
 WLibraryTextBrowser::WLibraryTextBrowser(QWidget* parent)
         : QTextBrowser(parent) {
 }
diff --git a/src/widget/wmainmenubar.cpp b/src/widget/wmainmenubar.cpp
index 4b70daa011..7e409d0a55 100644
--- a/src/widget/wmainmenubar.cpp
+++ b/src/widget/wmainmenubar.cpp
@@ -6,6 +6,7 @@
 #include "control/controlproxy.h"
 #include "defs_urls.h"
 #include "mixer/playermanager.h"
+#include "moc_wmainmenubar.cpp"
 #include "util/cmdlineargs.h"
 #include "util/experiment.h"
 #include "vinylcontrol/defs_vinylcontrol.h"
diff --git a/src/widget/wnumber.cpp b/src/widget/wnumber.cpp
index 81ddb7d0aa..b0f8a9134a 100644
--- a/src/widget/wnumber.cpp
+++ b/src/widget/wnumber.cpp
@@ -1,5 +1,7 @@
 #include "widget/wnumber.h"
 
+#include "moc_wnumber.cpp"
+
 WNumber::WNumber(QWidget* pParent)
         : WLabel(pParent),
           m_iNoDigits(2) {
diff --git a/src/widget/wnumberdb.cpp b/src/widget/wnumberdb.cpp
index 660787f039..8a1371cb67 100644
--- a/src/widget/wnumberdb.cpp
+++ b/src/widget/wnumberdb.cpp
@@ -1,8 +1,9 @@
 #include "widget/wnumberdb.h"
 
-#include "util/math.h"
 #include <QVBoxLayout>
 
+#include "moc_wnumberdb.cpp"
+#include "util/math.h"
 #include "widget/wskincolor.h"
 
 WNumberDb::WNumberDb(QWidget* pParent)
diff --git a/src/widget/wnumberpos.cpp b/src/widget/wnumberpos.cpp
index 485380e47d..9a6e65dfef 100644
--- a/src/widget/wnumberpos.cpp
+++ b/src/widget/wnumberpos.cpp
@@ -1,7 +1,10 @@
 #include "widget/wnumberpos.h"
+
 #include "control/controlobject.h"
 #