move src/skin/qml to src/qml

26 files changed, 44 insertions, 44 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 052539f389..7dce40d0c5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -806,18 +806,18 @@ add_library(mixxx-lib STATIC EXCLUDE_FROM_ALL
   src/preferences/upgrade.cpp
   src/qmlapplication.cpp
   src/recording/recordingmanager.cpp
-  src/skin/qml/asyncimageprovider.cpp
-  src/skin/qml/qmlcontrolproxy.cpp
-  src/skin/qml/qmlconfigproxy.cpp
-  src/skin/qml/qmleffectmanifestparametersmodel.cpp
-  src/skin/qml/qmleffectsmanagerproxy.cpp
-  src/skin/qml/qmleffectslotproxy.cpp
-  src/skin/qml/qmllibraryproxy.cpp
-  src/skin/qml/qmllibrarytracklistmodel.cpp
-  src/skin/qml/qmlplayermanagerproxy.cpp
-  src/skin/qml/qmlplayerproxy.cpp
-  src/skin/qml/qmlvisibleeffectsmodel.cpp
-  src/skin/qml/qmlwaveformoverview.cpp
+  src/qml/asyncimageprovider.cpp
+  src/qml/qmlcontrolproxy.cpp
+  src/qml/qmlconfigproxy.cpp
+  src/qml/qmleffectmanifestparametersmodel.cpp
+  src/qml/qmleffectsmanagerproxy.cpp
+  src/qml/qmleffectslotproxy.cpp
+  src/qml/qmllibraryproxy.cpp
+  src/qml/qmllibrarytracklistmodel.cpp
+  src/qml/qmlplayermanagerproxy.cpp
+  src/qml/qmlplayerproxy.cpp
+  src/qml/qmlvisibleeffectsmodel.cpp
+  src/qml/qmlwaveformoverview.cpp
   src/skin/legacy/skincontext.cpp
   src/skin/legacy/tooltips.cpp
   src/skin/skinloader.cpp
diff --git a/src/skin/qml/asyncimageprovider.cpp b/src/qml/asyncimageprovider.cpp
index 373df93c0e..fdcf405941 100644
--- a/src/skin/qml/asyncimageprovider.cpp
+++ b/src/qml/asyncimageprovider.cpp
@@ -1,4 +1,4 @@
-#include "skin/qml/asyncimageprovider.h"
+#include "qml/asyncimageprovider.h"
 
 #include "library/coverartcache.h"
 
diff --git a/src/skin/qml/asyncimageprovider.h b/src/qml/asyncimageprovider.h
index 8b4fcd0fc1..8b4fcd0fc1 100644
--- a/src/skin/qml/asyncimageprovider.h
+++ b/src/qml/asyncimageprovider.h
diff --git a/src/skin/qml/qmlconfigproxy.cpp b/src/qml/qmlconfigproxy.cpp
index 250a910686..9e0bec8224 100644
--- a/src/skin/qml/qmlconfigproxy.cpp
+++ b/src/qml/qmlconfigproxy.cpp
@@ -1,4 +1,4 @@
-#include "skin/qml/qmlconfigproxy.h"
+#include "qml/qmlconfigproxy.h"
 
 #include "preferences/colorpalettesettings.h"
 
diff --git a/src/skin/qml/qmlconfigproxy.h b/src/qml/qmlconfigproxy.h
index aaa2c9fce6..aaa2c9fce6 100644
--- a/src/skin/qml/qmlconfigproxy.h
+++ b/src/qml/qmlconfigproxy.h
diff --git a/src/skin/qml/qmlcontrolproxy.cpp b/src/qml/qmlcontrolproxy.cpp
index 5cb7f2cdc5..f9728d716d 100644
--- a/src/skin/qml/qmlcontrolproxy.cpp
+++ b/src/qml/qmlcontrolproxy.cpp
@@ -1,4 +1,4 @@
-#include "skin/qml/qmlcontrolproxy.h"
+#include "qml/qmlcontrolproxy.h"
 
 #include "moc_qmlcontrolproxy.cpp"
 
diff --git a/src/skin/qml/qmlcontrolproxy.h b/src/qml/qmlcontrolproxy.h
index 5b2493714a..5b2493714a 100644
--- a/src/skin/qml/qmlcontrolproxy.h
+++ b/src/qml/qmlcontrolproxy.h
diff --git a/src/skin/qml/qmleffectmanifestparametersmodel.cpp b/src/qml/qmleffectmanifestparametersmodel.cpp
index 69980ccc7b..2c92f7b348 100644
--- a/src/skin/qml/qmleffectmanifestparametersmodel.cpp
+++ b/src/qml/qmleffectmanifestparametersmodel.cpp
@@ -1,4 +1,4 @@
-#include "skin/qml/qmleffectmanifestparametersmodel.h"
+#include "qml/qmleffectmanifestparametersmodel.h"
 
 #include <QModelIndex>
 
diff --git a/src/skin/qml/qmleffectmanifestparametersmodel.h b/src/qml/qmleffectmanifestparametersmodel.h
index bd913fb221..bd913fb221 100644
--- a/src/skin/qml/qmleffectmanifestparametersmodel.h
+++ b/src/qml/qmleffectmanifestparametersmodel.h
diff --git a/src/skin/qml/qmleffectslotproxy.cpp b/src/qml/qmleffectslotproxy.cpp
index ef1880ff6c..075697f330 100644
--- a/src/skin/qml/qmleffectslotproxy.cpp
+++ b/src/qml/qmleffectslotproxy.cpp
@@ -1,11 +1,11 @@
-#include "skin/qml/qmleffectslotproxy.h"
+#include "qml/qmleffectslotproxy.h"
 
 #include <QObject>
 #include <QQmlEngine>
 
 #include "effects/effectrack.h"
 #include "effects/effectslot.h"
-#include "skin/qml/qmleffectmanifestparametersmodel.h"
+#include "qml/qmleffectmanifestparametersmodel.h"
 
 namespace mixxx {
 namespace skin {
diff --git a/src/skin/qml/qmleffectslotproxy.h b/src/qml/qmleffectslotproxy.h
index 29044657e1..29044657e1 100644
--- a/src/skin/qml/qmleffectslotproxy.h
+++ b/src/qml/qmleffectslotproxy.h
diff --git a/src/skin/qml/qmleffectsmanagerproxy.cpp b/src/qml/qmleffectsmanagerproxy.cpp
index 17d91b39ec..8ea0624a07 100644
--- a/src/skin/qml/qmleffectsmanagerproxy.cpp
+++ b/src/qml/qmleffectsmanagerproxy.cpp
@@ -1,12 +1,12 @@
-#include "skin/qml/qmleffectsmanagerproxy.h"
+#include "qml/qmleffectsmanagerproxy.h"
 
 #include <QQmlEngine>
 #include <memory>
 
 #include "effects/effectchainslot.h"
 #include "effects/effectrack.h"
-#include "skin/qml/qmleffectslotproxy.h"
-#include "skin/qml/qmlvisibleeffectsmodel.h"
+#include "qml/qmleffectslotproxy.h"
+#include "qml/qmlvisibleeffectsmodel.h"
 
 namespace mixxx {
 namespace skin {
diff --git a/src/skin/qml/qmleffectsmanagerproxy.h b/src/qml/qmleffectsmanagerproxy.h
index 79f67c3c4f..81bccbbe9d 100644
--- a/src/skin/qml/qmleffectsmanagerproxy.h
+++ b/src/qml/qmleffectsmanagerproxy.h
@@ -2,7 +2,7 @@
 #include <QObject>
 
 #include "effects/effectsmanager.h"
-#include "skin/qml/qmlvisibleeffectsmodel.h"
+#include "qml/qmlvisibleeffectsmodel.h"
 
 namespace mixxx {
 namespace skin {
diff --git a/src/skin/qml/qmllibraryproxy.cpp b/src/qml/qmllibraryproxy.cpp
index ba090be363..4583c1e34d 100644
--- a/src/skin/qml/qmllibraryproxy.cpp
+++ b/src/qml/qmllibraryproxy.cpp
@@ -1,4 +1,4 @@
-#include "skin/qml/qmllibraryproxy.h"
+#include "qml/qmllibraryproxy.h"
 
 #include <QAbstractItemModel>
 
diff --git a/src/skin/qml/qmllibraryproxy.h b/src/qml/qmllibraryproxy.h
index cf921ba1e4..e7d64c1770 100644
--- a/src/skin/qml/qmllibraryproxy.h
+++ b/src/qml/qmllibraryproxy.h
@@ -2,7 +2,7 @@
 #include <QObject>
 #include <memory>
 
-#include "skin/qml/qmllibrarytracklistmodel.h"
+#include "qml/qmllibrarytracklistmodel.h"
 #include "util/parented_ptr.h"
 
 class Library;
diff --git a/src/skin/qml/qmllibrarytracklistmodel.cpp b/src/qml/qmllibrarytracklistmodel.cpp
index cb2bf36f5b..3d68743389 100644
--- a/src/skin/qml/qmllibrarytracklistmodel.cpp
+++ b/src/qml/qmllibrarytracklistmodel.cpp
@@ -1,4 +1,4 @@
-#include "skin/qml/qmllibrarytracklistmodel.h"
+#include "qml/qmllibrarytracklistmodel.h"
 
 #include "library/librarytablemodel.h"
 
diff --git a/src/skin/qml/qmllibrarytracklistmodel.h b/src/qml/qmllibrarytracklistmodel.h
index 9bf4870fa1..9bf4870fa1 100644
--- a/src/skin/qml/qmllibrarytracklistmodel.h
+++ b/src/qml/qmllibrarytracklistmodel.h
diff --git a/src/skin/qml/qmlplayermanagerproxy.cpp b/src/qml/qmlplayermanagerproxy.cpp
index 4230ecd0c4..b64053ce71 100644
--- a/src/skin/qml/qmlplayermanagerproxy.cpp
+++ b/src/qml/qmlplayermanagerproxy.cpp
@@ -1,9 +1,9 @@
-#include "skin/qml/qmlplayermanagerproxy.h"
+#include "qml/qmlplayermanagerproxy.h"
 
 #include <QQmlEngine>
 
 #include "mixer/playermanager.h"
-#include "skin/qml/qmlplayerproxy.h"
+#include "qml/qmlplayerproxy.h"
 
 namespace mixxx {
 namespace skin {
diff --git a/src/skin/qml/qmlplayermanagerproxy.h b/src/qml/qmlplayermanagerproxy.h
index ba892c906f..ba892c906f 100644
--- a/src/skin/qml/qmlplayermanagerproxy.h
+++ b/src/qml/qmlplayermanagerproxy.h
diff --git a/src/skin/qml/qmlplayerproxy.cpp b/src/qml/qmlplayerproxy.cpp
index e8c83aca97..f5f7925411 100644
--- a/src/skin/qml/qmlplayerproxy.cpp
+++ b/src/qml/qmlplayerproxy.cpp
@@ -1,7 +1,7 @@
-#include "skin/qml/qmlplayerproxy.h"
+#include "qml/qmlplayerproxy.h"
 
 #include "mixer/basetrackplayer.h"
-#include "skin/qml/asyncimageprovider.h"
+#include "qml/asyncimageprovider.h"
 
 #define PROPERTY_IMPL_GETTER(TYPE, NAME, GETTER)     \
     TYPE QmlPlayerProxy::GETTER() const {            \
diff --git a/src/skin/qml/qmlplayerproxy.h b/src/qml/qmlplayerproxy.h
index 13f72485eb..13f72485eb 100644
--- a/src/skin/qml/qmlplayerproxy.h
+++ b/src/qml/qmlplayerproxy.h
diff --git a/src/skin/qml/qmlvisibleeffectsmodel.cpp b/src/qml/qmlvisibleeffectsmodel.cpp
index ca49643a5e..0f678a0ae1 100644
--- a/src/skin/qml/qmlvisibleeffectsmodel.cpp
+++ b/src/qml/qmlvisibleeffectsmodel.cpp
@@ -1,4 +1,4 @@
-#include "skin/qml/qmlvisibleeffectsmodel.h"
+#include "qml/qmlvisibleeffectsmodel.h"
 
 #include <QModelIndex>
 
diff --git a/src/skin/qml/qmlvisibleeffectsmodel.h b/src/qml/qmlvisibleeffectsmodel.h
index b061471a35..b061471a35 100644
--- a/src/skin/qml/qmlvisibleeffectsmodel.h
+++ b/src/qml/qmlvisibleeffectsmodel.h
diff --git a/src/skin/qml/qmlwaveformoverview.cpp b/src/qml/qmlwaveformoverview.cpp
index f7a4fb843d..23d799224f 100644
--- a/src/skin/qml/qmlwaveformoverview.cpp
+++ b/src/qml/qmlwaveformoverview.cpp
@@ -1,7 +1,7 @@
-#include "skin/qml/qmlwaveformoverview.h"
+#include "qml/qmlwaveformoverview.h"
 
 #include "mixer/basetrackplayer.h"
-#include "skin/qml/qmlplayerproxy.h"
+#include "qml/qmlplayerproxy.h"
 
 namespace {
 constexpr double kDesiredChannelHeight = 255;
diff --git a/src/skin/qml/qmlwaveformoverview.h b/src/qml/qmlwaveformoverview.h
index 07f5602914..07f5602914 100644
--- a/src/skin/qml/qmlwaveformoverview.h
+++ b/src/qml/qmlwaveformoverview.h
diff --git a/src/qmlapplication.cpp b/src/qmlapplication.cpp
index bd72621744..26b0bd7810 100644
--- a/src/qmlapplication.cpp
+++ b/src/qmlapplication.cpp
@@ -1,18 +1,18 @@
 #include "qmlapplication.h"
 
 #include "moc_qmlapplication.cpp"
-#include "skin/qml/asyncimageprovider.h"
-#include "skin/qml/qmlconfigproxy.h"
-#include "skin/qml/qmlcontrolproxy.h"
-#include "skin/qml/qmleffectmanifestparametersmodel.h"
-#include "skin/qml/qmleffectslotproxy.h"
-#include "skin/qml/qmleffectsmanagerproxy.h"
-#include "skin/qml/qmllibraryproxy.h"
-#include "skin/qml/qmllibrarytracklistmodel.h"
-#include "skin/qml/qmlplayermanagerproxy.h"
-#include "skin/qml/qmlplayerproxy.h"
-#include "skin/qml/qmlvisibleeffectsmodel.h"
-#include "skin/qml/qmlwaveformoverview.h"
+#include "qml/asyncimageprovider.h"
+#include "qml/qmlconfigproxy.h"
+#include "qml/qmlcontrolproxy.h"
+#include "qml/qmleffectmanifestparametersmodel.h"
+#include "qml/qmleffectslotproxy.h"
+#include "qml/qmleffectsmanagerproxy.h"
+#include "qml/qmllibraryproxy.h"
+#include "qml/qmllibrarytracklistmodel.h"
+#include "qml/qmlplayermanagerproxy.h"
+#include "qml/qmlplayerproxy.h"
+#include "qml/qmlvisibleeffectsmodel.h"
+#include "qml/qmlwaveformoverview.h"
 #include "soundio/soundmanager.h"
 
 namespace {