move dlgpreferencepage to src/preferences/dialog/

24 files changed, 46 insertions, 44 deletions

diff --git a/src/controllers/dlgprefcontroller.h b/src/controllers/dlgprefcontroller.h
index 8b114d9719..cdadd661d8 100644
--- a/src/controllers/dlgprefcontroller.h
+++ b/src/controllers/dlgprefcontroller.h
@@ -9,8 +9,8 @@
 #include "controllers/controllerpresetinfo.h"
 #include "controllers/dlgcontrollerlearning.h"
 #include "controllers/ui_dlgprefcontrollerdlg.h"
+#include "preferences/dialog/dlgpreferencepage.h"
 #include "preferences/usersettings.h"
-#include "preferences/dlgpreferencepage.h"
 
 // Forward declarations
 class Controller;
diff --git a/src/controllers/dlgprefcontrollers.h b/src/controllers/dlgprefcontrollers.h
index ea5d5c8596..7e30392919 100644
--- a/src/controllers/dlgprefcontrollers.h
+++ b/src/controllers/dlgprefcontrollers.h
@@ -2,9 +2,9 @@
 
 #include <QTreeWidgetItem>
 
-#include "preferences/usersettings.h"
 #include "controllers/ui_dlgprefcontrollersdlg.h"
-#include "preferences/dlgpreferencepage.h"
+#include "preferences/dialog/dlgpreferencepage.h"
+#include "preferences/usersettings.h"
 
 class DlgPreferences;
 class DlgPrefController;
diff --git a/src/preferences/dialog/dlgprefautodj.h b/src/preferences/dialog/dlgprefautodj.h
index 56dc245ad7..f7c324ae05 100644
--- a/src/preferences/dialog/dlgprefautodj.h
+++ b/src/preferences/dialog/dlgprefautodj.h
@@ -2,9 +2,9 @@
 
 #include <QWidget>
 
+#include "preferences/dialog/dlgpreferencepage.h"
 #include "preferences/dialog/ui_dlgprefautodjdlg.h"
 #include "preferences/usersettings.h"
-#include "preferences/dlgpreferencepage.h"
 
 class DlgPrefAutoDJ : public DlgPreferencePage, public Ui::DlgPrefAutoDJDlg {
     Q_OBJECT
diff --git a/src/preferences/dialog/dlgprefbeats.h b/src/preferences/dialog/dlgprefbeats.h
index 69a6bf2db2..fea83f484e 100644
--- a/src/preferences/dialog/dlgprefbeats.h
+++ b/src/preferences/dialog/dlgprefbeats.h
@@ -1,14 +1,14 @@
 #pragma once
 
-#include <QWidget>
-#include <QString>
 #include <QList>
+#include <QString>
+#include <QWidget>
 
 #include "analyzer/plugins/analyzerplugin.h"
 #include "preferences/beatdetectionsettings.h"
-#include "preferences/usersettings.h"
-#include "preferences/dlgpreferencepage.h"
+#include "preferences/dialog/dlgpreferencepage.h"
 #include "preferences/dialog/ui_dlgprefbeatsdlg.h"
+#include "preferences/usersettings.h"
 
 class DlgPrefBeats : public DlgPreferencePage, public Ui::DlgBeatsDlg {
     Q_OBJECT
diff --git a/src/preferences/dialog/dlgprefbroadcast.h b/src/preferences/dialog/dlgprefbroadcast.h
index f8e78c1862..a8a1b301a0 100644
--- a/src/preferences/dialog/dlgprefbroadcast.h
+++ b/src/preferences/dialog/dlgprefbroadcast.h
@@ -3,13 +3,13 @@
 #include <QModelIndex>
 #include <QWidget>
 
-#include "preferences/dialog/ui_dlgprefbroadcastdlg.h"
-#include "control/controlobject.h"
-#include "preferences/usersettings.h"
 #include "broadcast/defs_broadcast.h"
-#include "preferences/dlgpreferencepage.h"
+#include "control/controlobject.h"
 #include "preferences/broadcastsettings.h"
 #include "preferences/broadcastsettingsmodel.h"
+#include "preferences/dialog/dlgpreferencepage.h"
+#include "preferences/dialog/ui_dlgprefbroadcastdlg.h"
+#include "preferences/usersettings.h"
 
 class ControlProxy;
 
diff --git a/src/preferences/dialog/dlgprefcolors.h b/src/preferences/dialog/dlgprefcolors.h
index ee6fada302..eec7fd3e1c 100644
--- a/src/preferences/dialog/dlgprefcolors.h
+++ b/src/preferences/dialog/dlgprefcolors.h
@@ -5,8 +5,8 @@
 #include "control/controlproxy.h"
 #include "preferences/colorpaletteeditor.h"
 #include "preferences/colorpalettesettings.h"
+#include "preferences/dialog/dlgpreferencepage.h"
 #include "preferences/dialog/ui_dlgprefcolorsdlg.h"
-#include "preferences/dlgpreferencepage.h"
 #include "preferences/usersettings.h"
 #include "util/parented_ptr.h"
 
diff --git a/src/preferences/dialog/dlgprefcrossfader.h b/src/preferences/dialog/dlgprefcrossfader.h
index a6b1a3290d..ccf2e92646 100644
--- a/src/preferences/dialog/dlgprefcrossfader.h
+++ b/src/preferences/dialog/dlgprefcrossfader.h
@@ -2,11 +2,10 @@
 
 #include <QWidget>
 
+#include "control/controlproxy.h"
+#include "preferences/dialog/dlgpreferencepage.h"
 #include "preferences/dialog/ui_dlgprefcrossfaderdlg.h"
 #include "preferences/usersettings.h"
-#include "control/controlproxy.h"
-#include "preferences/dlgpreferencepage.h"
-
 
 class DlgPrefCrossfader : public DlgPreferencePage, public Ui::DlgPrefCrossfaderDlg  {
     Q_OBJECT
diff --git a/src/preferences/dialog/dlgprefdeck.h b/src/preferences/dialog/dlgprefdeck.h
index 7a97c668f8..ac885b5c98 100644
--- a/src/preferences/dialog/dlgprefdeck.h
+++ b/src/preferences/dialog/dlgprefdeck.h
@@ -6,8 +6,8 @@
 #include "engine/controls/cuecontrol.h"
 #include "engine/controls/ratecontrol.h"
 #include "preferences/constants.h"
+#include "preferences/dialog/dlgpreferencepage.h"
 #include "preferences/dialog/ui_dlgprefdeckdlg.h"
-#include "preferences/dlgpreferencepage.h"
 #include "preferences/usersettings.h"
 #include "util/parented_ptr.h"
 
diff --git a/src/preferences/dialog/dlgprefeffects.h b/src/preferences/dialog/dlgprefeffects.h
index c787804bc1..8d254a3496 100644
--- a/src/preferences/dialog/dlgprefeffects.h
+++ b/src/preferences/dialog/dlgprefeffects.h
@@ -2,8 +2,8 @@
 
 #include <QButtonGroup>
 
+#include "preferences/dialog/dlgpreferencepage.h"
 #include "preferences/dialog/ui_dlgprefeffectsdlg.h"
-#include "preferences/dlgpreferencepage.h"
 #include "preferences/effectsettingsmodel.h"
 #include "preferences/usersettings.h"
 
diff --git a/src/preferences/dialog/dlgprefeq.h b/src/preferences/dialog/dlgprefeq.h
index f6c10c9629..3beb233b58 100644
--- a/src/preferences/dialog/dlgprefeq.h
+++ b/src/preferences/dialog/dlgprefeq.h
@@ -1,14 +1,14 @@
 #pragma once
 
-#include <QWidget>
 #include <QComboBox>
+#include <QWidget>
 
-#include "preferences/dialog/ui_dlgprefeqdlg.h"
-#include "preferences/usersettings.h"
 #include "control/controlproxy.h"
-#include "preferences/dlgpreferencepage.h"
-#include "effects/effectsmanager.h"
 #include "effects/effectrack.h"
+#include "effects/effectsmanager.h"
+#include "preferences/dialog/dlgpreferencepage.h"
+#include "preferences/dialog/ui_dlgprefeqdlg.h"
+#include "preferences/usersettings.h"
 
 class DlgPrefEQ : public DlgPreferencePage, public Ui::DlgPrefEQDlg  {
     Q_OBJECT
diff --git a/src/preferences/dlgpreferencepage.cpp b/src/preferences/dialog/dlgpreferencepage.cpp
index 61b912b441..fc4b3eddd6 100644
--- a/src/preferences/dlgpreferencepage.cpp
+++ b/src/preferences/dialog/dlgpreferencepage.cpp
@@ -1,4 +1,4 @@
-#include "preferences/dlgpreferencepage.h"
+#include "preferences/dialog/dlgpreferencepage.h"
 
 #include "defs_urls.h"
 #include "moc_dlgpreferencepage.cpp"
diff --git a/src/preferences/dlgpreferencepage.h b/src/preferences/dialog/dlgpreferencepage.h
index 114cb043e4..638aaa8cb1 100644
--- a/src/preferences/dlgpreferencepage.h
+++ b/src/preferences/dialog/dlgpreferencepage.h
@@ -39,8 +39,10 @@ class DlgPreferencePage : public QWidget {
 
     /// Called when the preferences dialog is shown to the user (not necessarily
     /// when this PreferencePage is shown to the user).
-    virtual void slotShow() {}
+    virtual void slotShow() {
+    }
 
     /// Called when the preferences dialog is hidden from the user.
-    virtual void slotHide() {}
+    virtual void slotHide() {
+    }
 };
diff --git a/src/preferences/dialog/dlgpreferences.h b/src/preferences/dialog/dlgpreferences.h
index 39291d8fe2..ab99bec10c 100644
--- a/src/preferences/dialog/dlgpreferences.h
+++ b/src/preferences/dialog/dlgpreferences.h
@@ -6,11 +6,11 @@
 #include <QRect>
 #include <QStringList>
 
-#include "preferences/dialog/ui_dlgpreferencesdlg.h"
-#include "preferences/usersettings.h"
 #include "control/controlpushbutton.h"
-#include "preferences/dlgpreferencepage.h"
+#include "preferences/dialog/dlgpreferencepage.h"
+#include "preferences/dialog/ui_dlgpreferencesdlg.h"
 #include "preferences/settingsmanager.h"
+#include "preferences/usersettings.h"
 
 class MixxxMainWindow;
 class SoundManager;
diff --git a/src/preferences/dialog/dlgprefinterface.h b/src/preferences/dialog/dlgprefinterface.h
index 1dfe7aaf6e..0b635abc92 100644
--- a/src/preferences/dialog/dlgprefinterface.h
+++ b/src/preferences/dialog/dlgprefinterface.h
@@ -3,9 +3,9 @@
 #include <QWidget>
 
 #include "preferences/constants.h"
+#include "preferences/dialog/dlgpreferencepage.h"
 #include "preferences/dialog/ui_dlgprefinterfacedlg.h"
 #include "preferences/usersettings.h"
-#include "preferences/dlgpreferencepage.h"
 
 class ControlProxy;
 class ControlPotmeter;
diff --git a/src/preferences/dialog/dlgprefkey.h b/src/preferences/dialog/dlgprefkey.h
index f76a02babc..fa541a6533 100644
--- a/src/preferences/dialog/dlgprefkey.h
+++ b/src/preferences/dialog/dlgprefkey.h
@@ -7,8 +7,8 @@
 #include "analyzer/plugins/analyzerplugin.h"
 #include "control/controlproxy.h"
 #include "defs_urls.h"
+#include "preferences/dialog/dlgpreferencepage.h"
 #include "preferences/dialog/ui_dlgprefkeydlg.h"
-#include "preferences/dlgpreferencepage.h"
 #include "preferences/keydetectionsettings.h"
 #include "preferences/usersettings.h"
 #include "track/keyutils.h"
diff --git a/src/preferences/dialog/dlgpreflibrary.h b/src/preferences/dialog/dlgpreflibrary.h
index 09bbd9a336..341b7e61f1 100644
--- a/src/preferences/dialog/dlgpreflibrary.h
+++ b/src/preferences/dialog/dlgpreflibrary.h
@@ -7,8 +7,8 @@
 #include "defs_urls.h"
 #include "library/library.h"
 #include "library/library_preferences.h"
+#include "preferences/dialog/dlgpreferencepage.h"
 #include "preferences/dialog/ui_dlgpreflibrarydlg.h"
-#include "preferences/dlgpreferencepage.h"
 #include "preferences/usersettings.h"
 
 class DlgPrefLibrary : public DlgPreferencePage, public Ui::DlgPrefLibraryDlg  {
diff --git a/src/preferences/dialog/dlgpreflv2.h b/src/preferences/dialog/dlgpreflv2.h
index b3c9318d6c..fe37ca05f5 100644
--- a/src/preferences/dialog/dlgpreflv2.h
+++ b/src/preferences/dialog/dlgpreflv2.h
@@ -1,12 +1,12 @@
 #pragma once
 
-#include <QWidget>
 #include <QCheckBox>
+#include <QWidget>
 
+#include "effects/lv2/lv2backend.h"
+#include "preferences/dialog/dlgpreferencepage.h"
 #include "preferences/dialog/ui_dlgpreflv2dlg.h"
 #include "preferences/usersettings.h"
-#include "preferences/dlgpreferencepage.h"
-#include "effects/lv2/lv2backend.h"
 
 class EffectsManager;
 
diff --git a/src/preferences/dialog/dlgprefmodplug.h b/src/preferences/dialog/dlgprefmodplug.h
index 1e59f528f6..34855047d7 100644
--- a/src/preferences/dialog/dlgprefmodplug.h
+++ b/src/preferences/dialog/dlgprefmodplug.h
@@ -3,8 +3,9 @@
 #pragma once
 
 #include <QDialog>
+
+#include "preferences/dialog/dlgpreferencepage.h"
 #include "preferences/usersettings.h"
-#include "preferences/dlgpreferencepage.h"
 
 namespace Ui {
 class DlgPrefModplug;
diff --git a/src/preferences/dialog/dlgprefnovinyl.h b/src/preferences/dialog/dlgprefnovinyl.h
index b03d9237b8..e6987fa972 100644
--- a/src/preferences/dialog/dlgprefnovinyl.h
+++ b/src/preferences/dialog/dlgprefnovinyl.h
@@ -2,9 +2,9 @@
 
 #include <QWidget>
 
+#include "preferences/dialog/dlgpreferencepage.h"
 #include "preferences/dialog/ui_dlgprefnovinyldlg.h"
 #include "preferences/usersettings.h"
-#include "preferences/dlgpreferencepage.h"
 
 class SoundManager;
 
diff --git a/src/preferences/dialog/dlgprefrecord.h b/src/preferences/dialog/dlgprefrecord.h
index c6ff03eb25..1f2df3f647 100644
--- a/src/preferences/dialog/dlgprefrecord.h
+++ b/src/preferences/dialog/dlgprefrecord.h
@@ -4,10 +4,10 @@
 #include <QRadioButton>
 #include <QWidget>
 
+#include "encoder/encoder.h"
+#include "preferences/dialog/dlgpreferencepage.h"
 #include "preferences/dialog/ui_dlgprefrecorddlg.h"
 #include "preferences/usersettings.h"
-#include "preferences/dlgpreferencepage.h"
-#include "encoder/encoder.h"
 
 class ControlObject;
 class ControlProxy;
diff --git a/src/preferences/dialog/dlgprefreplaygain.h b/src/preferences/dialog/dlgprefreplaygain.h
index 6153a51f2a..5266f413ea 100644
--- a/src/preferences/dialog/dlgprefreplaygain.h
+++ b/src/preferences/dialog/dlgprefreplaygain.h
@@ -3,10 +3,10 @@
 #include <QButtonGroup>
 #include <QWidget>
 
+#include "control/controlproxy.h"
+#include "preferences/dialog/dlgpreferencepage.h"
 #include "preferences/dialog/ui_dlgprefreplaygaindlg.h"
 #include "preferences/replaygainsettings.h"
-#include "control/controlproxy.h"
-#include "preferences/dlgpreferencepage.h"
 
 class DlgPrefReplayGain: public DlgPreferencePage,
                          public Ui::DlgPrefReplayGainDlg {
diff --git a/src/preferences/dialog/dlgprefsound.h b/src/preferences/dialog/dlgprefsound.h
index 8eea151afe..63cdfa12e3 100644
--- a/src/preferences/dialog/dlgprefsound.h
+++ b/src/preferences/dialog/dlgprefsound.h
@@ -1,8 +1,8 @@
 #pragma once
 
 #include "defs_urls.h"
+#include "preferences/dialog/dlgpreferencepage.h"
 #include "preferences/dialog/ui_dlgprefsounddlg.h"
-#include "preferences/dlgpreferencepage.h"
 #include "preferences/usersettings.h"
 #include "soundio/sounddevice.h"
 #include "soundio/sounddeviceerror.h"
diff --git a/src/preferences/dialog/dlgprefvinyl.h b/src/preferences/dialog/dlgprefvinyl.h
index 16f6fd20c1..5c388c6ea0 100644
--- a/src/preferences/dialog/dlgprefvinyl.h
+++ b/src/preferences/dialog/dlgprefvinyl.h
@@ -3,8 +3,8 @@
 #include <QSpinBox>
 #include <QWidget>
 
+#include "preferences/dialog/dlgpreferencepage.h"
 #include "preferences/dialog/ui_dlgprefvinyldlg.h"
-#include "preferences/dlgpreferencepage.h"
 #include "preferences/usersettings.h"
 #include "vinylcontrol/vinylcontrolsignalwidget.h"
 
diff --git a/src/preferences/dialog/dlgprefwaveform.h b/src/preferences/dialog/dlgprefwaveform.h
index e3325cf1ec..a400e0b929 100644
--- a/src/preferences/dialog/dlgprefwaveform.h
+++ b/src/preferences/dialog/dlgprefwaveform.h
@@ -2,9 +2,9 @@
 
 #include <QWidget>
 
+#include "preferences/dialog/dlgpreferencepage.h"
 #include "preferences/dialog/ui_dlgprefwaveformdlg.h"
 #include "preferences/usersettings.h"
-#include "preferences/dlgpreferencepage.h"
 
 class MixxxMainWindow;
 class Library;