skin: Move legacy skin classes to skin/legacy/

CMakeLists.txt

@@ -717,17 +717,17 @@ add_library(mixxx-lib STATIC EXCLUDE_FROM_ALL
   src/preferences/settingsmanager.cpp
   src/preferences/upgrade.cpp
   src/recording/recordingmanager.cpp
-  src/skin/colorschemeparser.cpp
-  src/skin/imgcolor.cpp
-  src/skin/imginvert.cpp
-  src/skin/imgloader.cpp
-  src/skin/launchimage.cpp
-  src/skin/legacyskinparser.cpp
-  src/skin/pixmapsource.cpp
-  src/skin/skincontext.cpp
+  src/skin/legacy/colorschemeparser.cpp
+  src/skin/legacy/imgcolor.cpp
+  src/skin/legacy/imginvert.cpp
+  src/skin/legacy/imgloader.cpp
+  src/skin/legacy/launchimage.cpp
+  src/skin/legacy/legacyskinparser.cpp
+  src/skin/legacy/pixmapsource.cpp
+  src/skin/legacy/skincontext.cpp
+  src/skin/legacy/svgparser.cpp
+  src/skin/legacy/tooltips.cpp
   src/skin/skinloader.cpp
-  src/skin/svgparser.cpp
-  src/skin/tooltips.cpp
   src/soundio/sounddevice.cpp
   src/soundio/sounddevicenetwork.cpp
   src/soundio/sounddeviceportaudio.cpp

src/mixxx.cpp

@@ -57,8 +57,8 @@
 #include "mixer/playermanager.h"
 #include "preferences/settingsmanager.h"
 #include "recording/recordingmanager.h"
-#include "skin/launchimage.h"
-#include "skin/legacyskinparser.h"
+#include "skin/legacy/launchimage.h"
+#include "skin/legacy/legacyskinparser.h"
 #include "skin/skinloader.h"
 #include "soundio/soundmanager.h"
 #include "sources/soundsourceproxy.h"

src/preferences/dialog/dlgprefinterface.cpp

@@ -14,7 +14,7 @@
 #include "mixxx.h"
 #include "moc_dlgprefinterface.cpp"
 #include "preferences/usersettings.h"
-#include "skin/legacyskinparser.h"
+#include "skin/legacy/legacyskinparser.h"
 #include "skin/skinloader.h"
 #include "util/screensaver.h"
 #include "util/widgethelper.h"

src/skin/colorschemeparser.cpp → src/skin/legacy/colorschemeparser.cpp

@@ -1,16 +1,16 @@
-#include "skin/colorschemeparser.h"
+#include "skin/legacy/colorschemeparser.h"
 
 #include "widget/wpixmapstore.h"
 #include "widget/wimagestore.h"
 #include "widget/wskincolor.h"
 #include "widget/wwidget.h"
 #include "util/xml.h"
-#include "skin/imgsource.h"
-#include "skin/imgloader.h"
-#include "skin/imgcolor.h"
-#include "skin/imginvert.h"
-#include "skin/legacyskinparser.h"
-#include "skin/skincontext.h"
+#include "skin/legacy/imgsource.h"
+#include "skin/legacy/imgloader.h"
+#include "skin/legacy/imgcolor.h"
+#include "skin/legacy/imginvert.h"
+#include "skin/legacy/legacyskinparser.h"
+#include "skin/legacy/skincontext.h"
 
 void ColorSchemeParser::setupLegacyColorSchemes(const QDomElement& docElem,
         UserSettingsPointer pConfig,

src/skin/colorschemeparser.h → src/skin/legacy/colorschemeparser.h

@@ -1,8 +1,8 @@
 #pragma once
 
 #include "preferences/usersettings.h"
-#include "skin/legacyskinparser.h"
-#include "skin/skincontext.h"
+#include "skin/legacy/legacyskinparser.h"
+#include "skin/legacy/skincontext.h"
 
 class ImgSource;
 

src/skin/launchimage.cpp → src/skin/legacy/launchimage.cpp

@@ -1,4 +1,4 @@
-#include "skin/launchimage.h"
+#include "skin/legacy/launchimage.h"
 
 #include <QHBoxLayout>
 #include <QLabel>

src/skin/legacyskinparser.cpp → src/skin/legacy/legacyskinparser.cpp

@@ -1,4 +1,4 @@
-#include "skin/legacyskinparser.h"
+#include "skin/legacy/legacyskinparser.h"
 
 #include <QDir>
 #include <QGridLayout>
@@ -21,9 +21,9 @@
 #include "mixer/playermanager.h"
 #include "moc_legacyskinparser.cpp"
 #include "recording/recordingmanager.h"
-#include "skin/colorschemeparser.h"
-#include "skin/launchimage.h"
-#include "skin/skincontext.h"
+#include "skin/legacy/colorschemeparser.h"
+#include "skin/legacy/launchimage.h"
+#include "skin/legacy/skincontext.h"
 #include "util/cmdlineargs.h"
 #include "util/timer.h"
 #include "util/valuetransformer.h"

src/skin/legacyskinparser.h → src/skin/legacy/legacyskinparser.h

@@ -9,8 +9,8 @@
 
 #include "preferences/usersettings.h"
 #include "proto/skin.pb.h"
-#include "skin/skinparser.h"
-#include "skin/tooltips.h"
+#include "skin/legacy/skinparser.h"
+#include "skin/legacy/tooltips.h"
 #include "util/memory.h"
 #include "vinylcontrol/vinylcontrolmanager.h"
 

src/skin/pixmapsource.cpp → src/skin/legacy/pixmapsource.cpp

@@ -1,7 +1,7 @@
 #include <QtDebug>
 #include <QCryptographicHash>
 
-#include "skin/pixmapsource.h"
+#include "skin/legacy/pixmapsource.h"
 #include "util/assert.h"
 
 PixmapSource::PixmapSource()

src/skin/skincontext.cpp → src/skin/legacy/skincontext.cpp

@@ -4,8 +4,8 @@
 #include <QAction>
 #include <QScriptValueIterator>
 
-#include "skin/skincontext.h"
-#include "skin/svgparser.h"
+#include "skin/legacy/skincontext.h"
+#include "skin/legacy/svgparser.h"
 #include "util/cmdlineargs.h"
 #include "util/math.h"
 

src/skin/skincontext.h → src/skin/legacy/skincontext.h

@@ -13,7 +13,7 @@
 #include <QRegExp>
 
 #include "preferences/usersettings.h"
-#include "skin/pixmapsource.h"
+#include "skin/legacy/pixmapsource.h"
 #include "util/color/color.h"
 #include "widget/wsingletoncontainer.h"
 #include "widget/wpixmapstore.h"

src/skin/svgparser.cpp → src/skin/legacy/svgparser.cpp

@@ -2,7 +2,7 @@
 #include <QStringList>
 #include <QScriptValue>
 
-#include "skin/svgparser.h"
+#include "skin/legacy/svgparser.h"
 
 SvgParser::SvgParser(const SkinContext* pParentContext)
         : m_pParentContext(pParentContext),

src/skin/svgparser.h → src/skin/legacy/svgparser.h

@@ -4,7 +4,7 @@
 #include <QDomNode>
 #include <QDomElement>
 
-#include "skin/skincontext.h"
+#include "skin/legacy/skincontext.h"
 
 
 // A class for managing the svg files

src/skin/tooltips.cpp → src/skin/legacy/tooltips.cpp

@@ -1,4 +1,4 @@
-#include "skin/tooltips.h"
+#include "skin/legacy/tooltips.h"
 
 #include "moc_tooltips.cpp"
 

src/skin/skinloader.cpp

@@ -6,13 +6,13 @@
 #include <QtDebug>
 
 #include "vinylcontrol/vinylcontrolmanager.h"
-#include "skin/legacyskinparser.h"
+#include "skin/legacy/legacyskinparser.h"
 #include "controllers/controllermanager.h"
 #include "library/library.h"
 #include "effects/effectsmanager.h"
 #include "mixer/playermanager.h"
 #include "util/debug.h"
-#include "skin/launchimage.h"
+#include "skin/legacy/launchimage.h"
 #include "util/timer.h"
 #include "recording/recordingmanager.h"
 

src/test/skincontext_test.cpp

@@ -1,7 +1,7 @@
 #include <QDomDocument>
 
 #include "test/mixxxtest.h"
-#include "skin/skincontext.h"
+#include "skin/legacy/skincontext.h"
 
 class SkinContextTest : public MixxxTest {
   public:

src/util/valuetransformer.h

@@ -3,7 +3,7 @@
 #include <QList>
 #include <QDomElement>
 
-#include "skin/skincontext.h"
+#include "skin/legacy/skincontext.h"
 
 class TransformNode {
   public:

src/waveform/renderers/waveformmark.cpp

@@ -1,6 +1,6 @@
 #include <QtDebug>
 
-#include "skin/skincontext.h"
+#include "skin/legacy/skincontext.h"
 #include "waveform/renderers/waveformsignalcolors.h"
 #include "widget/wskincolor.h"
 

src/waveform/renderers/waveformmarkrange.cpp

@@ -3,7 +3,7 @@
 #include <QPainter>
 #include <QtDebug>
 
-#include "skin/skincontext.h"
+#include "skin/legacy/skincontext.h"
 #include "waveformsignalcolors.h"
 #include "widget/wskincolor.h"
 

src/waveform/renderers/waveformmarkset.h

@@ -3,7 +3,7 @@
 #include <QList>
 
 #include "waveformmark.h"
-#include "skin/skincontext.h"
+#include "skin/legacy/skincontext.h"
 #include "util/memory.h"
 
 class WaveformWidgetRenderer;

src/waveform/renderers/waveformrenderbackground.h

@@ -5,7 +5,7 @@
 #include <QPaintEvent>
 #include <QPainter>
 
-#include "skin/skincontext.h"
+#include "skin/legacy/skincontext.h"
 #include "util/class.h"
 #include "waveformrendererabstract.h"
 

src/waveform/renderers/waveformrenderbeat.h

@@ -2,7 +2,7 @@
 
 #include <QColor>
 
-#include "skin/skincontext.h"
+#include "skin/legacy/skincontext.h"
 #include "util/class.h"
 #include "waveform/renderers/waveformrendererabstract.h"
 

src/waveform/renderers/waveformrendererendoftrack.h

@@ -4,7 +4,7 @@
 #include <QTime>
 //#include <QLinearGradient>
 
-#include "skin/skincontext.h"
+#include "skin/legacy/skincontext.h"
 #include "util/class.h"
 #include "waveform/renderers/waveformrendererabstract.h"
 #include "waveform/waveformwidgetfactory.h"

src/waveform/renderers/waveformrendererpreroll.h

@@ -2,7 +2,7 @@
 
 #include <QColor>
 
-#include "skin/skincontext.h"
+#include "skin/legacy/skincontext.h"
 #include "util/class.h"
 #include "waveform/renderers/waveformrendererabstract.h"
 

src/waveform/renderers/waveformrenderersignalbase.h

@@ -2,7 +2,7 @@
 
 #include "waveformrendererabstract.h"
 #include "waveformsignalcolors.h"
-#include "skin/skincontext.h"
+#include "skin/legacy/skincontext.h"
 
 class ControlObject;
 class ControlProxy;

src/waveform/renderers/waveformrendermark.h

@@ -2,7 +2,7 @@
 
 #include <QObject>
 
-#include "skin/skincontext.h"
+#include "skin/legacy/skincontext.h"
 #include "util/class.h"
 #include "util/color/color.h"
 #include "waveform/renderers/waveformmarkset.h"

src/waveform/renderers/waveformrendermarkrange.h

@@ -9,7 +9,7 @@
 #include <vector>
 
 #include "preferences/usersettings.h"
-#include "skin/skincontext.h"
+#include "skin/legacy/skincontext.h"
 #include "waveform/renderers/waveformmarkrange.h"
 #include "waveform/renderers/waveformrendererabstract.h"
 

src/waveform/renderers/waveformsignalcolors.h

@@ -3,7 +3,7 @@
 #include <QColor>
 #include <QDomNode>
 
-#include "skin/skincontext.h"
+#include "skin/legacy/skincontext.h"
 
 class WaveformSignalColors {
   public:

src/waveform/waveformwidgetfactory.h

@@ -5,7 +5,7 @@
 #include <vector>
 
 #include "preferences/usersettings.h"
-#include "skin/skincontext.h"
+#include "skin/legacy/skincontext.h"
 #include "util/performancetimer.h"
 #include "util/singleton.h"
 #include "waveform/waveform.h"

src/widget/effectwidgetutils.h

@@ -6,7 +6,7 @@
 #include "effects/defs.h"
 #include "effects/effectrack.h"
 #include "effects/effectslot.h"
-#include "skin/skincontext.h"
+#include "skin/legacy/skincontext.h"
 
 class EffectWidgetUtils {
   public:

src/widget/paintable.cpp

@@ -4,7 +4,7 @@
 #include <QString>
 #include <QtDebug>
 
-#include "skin/imgloader.h"
+#include "skin/legacy/imgloader.h"
 
 #include "util/math.h"
 #include "util/memory.h"

src/widget/paintable.h

@@ -10,8 +10,8 @@
 #include <QRectF>
 #include <QString>
 
-#include "skin/imgsource.h"
-#include "skin/pixmapsource.h"
+#include "skin/legacy/imgsource.h"
+#include "skin/legacy/pixmapsource.h"
 
 // Wrapper around QImage and QSvgRenderer to support rendering SVG images in
 // high fidelity.

src/widget/wbattery.h

@@ -5,7 +5,7 @@
 #include <QScopedPointer>
 #include <QVector>
 
-#include "skin/skincontext.h"
+#include "skin/legacy/skincontext.h"
 #include "widget/wlabel.h"
 #include "widget/wpixmapstore.h"
 #include "widget/wwidget.h"

src/widget/wbeatspinbox.h

@@ -3,7 +3,7 @@
 #include "control/controlobject.h"
 #include "control/controlproxy.h"
 #include "widget/wbasewidget.h"
-#include "skin/skincontext.h"
+#include "skin/legacy/skincontext.h"
 #include <QDoubleSpinBox>
 #include <QLineEdit>
 

src/widget/wcombobox.h

@@ -5,7 +5,7 @@
 #include <QEvent>
 
 #include "widget/wbasewidget.h"
-#include "skin/skincontext.h"
+#include "skin/legacy/skincontext.h"
 
 class WComboBox : public QComboBox, public WBaseWidget {
     Q_OBJECT

src/widget/wcoverart.h

@@ -9,7 +9,7 @@
 #include "mixer/basetrackplayer.h"
 #include "preferences/usersettings.h"
 #include "library/coverartcache.h"
-#include "skin/skincontext.h"
+#include "skin/legacy/skincontext.h"
 #include "widget/trackdroptarget.h"
 #include "widget/wbasewidget.h"
 #include "widget/wcoverartmenu.h"

src/widget/wdisplay.h

@@ -7,7 +7,7 @@
 
 #include "widget/wwidget.h"
 #include "widget/wpixmapstore.h"
-#include "skin/skincontext.h"
+#include "skin/legacy/skincontext.h"
 
 class WDisplay : public WWidget {
    Q_OBJECT

src/widget/weffect.h

@@ -4,7 +4,7 @@
 
 #include "widget/wlabel.h"
 #include "effects/effectslot.h"
-#include "skin/skincontext.h"
+#include "skin/legacy/skincontext.h"
 
 class EffectsManager;