From 66be3901dcec0209d0b0b7b8c9f61c39341213af Mon Sep 17 00:00:00 2001
From: Be <be@mixxx.org>
Date: Mon, 27 Sep 2021 14:29:05 -0500
Subject: move mixxx::skin::qml namespace to mixxx::qml

---
 src/main.cpp                                 | 2 +-
 src/qml/asyncimageprovider.cpp               | 2 --
 src/qml/asyncimageprovider.h                 | 2 --
 src/qml/qmlconfigproxy.cpp                   | 2 --
 src/qml/qmlconfigproxy.h                     | 2 --
 src/qml/qmlcontrolproxy.cpp                  | 2 --
 src/qml/qmlcontrolproxy.h                    | 2 --
 src/qml/qmleffectmanifestparametersmodel.cpp | 2 --
 src/qml/qmleffectmanifestparametersmodel.h   | 2 --
 src/qml/qmleffectslotproxy.cpp               | 2 --
 src/qml/qmleffectslotproxy.h                 | 4 +---
 src/qml/qmleffectsmanagerproxy.cpp           | 2 --
 src/qml/qmleffectsmanagerproxy.h             | 6 ++----
 src/qml/qmllibraryproxy.cpp                  | 2 --
 src/qml/qmllibraryproxy.h                    | 4 +---
 src/qml/qmllibrarytracklistmodel.cpp         | 2 --
 src/qml/qmllibrarytracklistmodel.h           | 4 +---
 src/qml/qmlplayermanagerproxy.cpp            | 2 --
 src/qml/qmlplayermanagerproxy.h              | 2 --
 src/qml/qmlplayerproxy.cpp                   | 2 --
 src/qml/qmlplayerproxy.h                     | 2 --
 src/qml/qmlvisibleeffectsmodel.cpp           | 2 --
 src/qml/qmlvisibleeffectsmodel.h             | 2 --
 src/qml/qmlwaveformoverview.cpp              | 2 --
 src/qml/qmlwaveformoverview.h                | 8 +++-----
 src/qmlapplication.cpp                       | 2 --
 src/qmlapplication.h                         | 2 --
 27 files changed, 9 insertions(+), 61 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 7d7f51cd36..8be1ab2fe5 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -36,7 +36,7 @@ int runMixxx(MixxxApplication* pApp, const CmdlineArgs& args) {
     int exitCode;
 
     if (args.getQml()) {
-        mixxx::skin::qml::QmlApplication qmlApplication(pApp, pCoreServices);
+        mixxx::qml::QmlApplication qmlApplication(pApp, pCoreServices);
         exitCode = pApp->exec();
     } else {
         // This scope ensures that `MixxxMainWindow` is destroyed *before*
diff --git a/src/qml/asyncimageprovider.cpp b/src/qml/asyncimageprovider.cpp
index fdcf405941..f0cec41612 100644
--- a/src/qml/asyncimageprovider.cpp
+++ b/src/qml/asyncimageprovider.cpp
@@ -7,7 +7,6 @@ const QString kCoverArtPrefix = QStringLiteral("coverart/");
 }
 
 namespace mixxx {
-namespace skin {
 namespace qml {
 
 AsyncImageResponse::AsyncImageResponse(const QString& id, const QSize& requestedSize)
@@ -75,5 +74,4 @@ QString AsyncImageProvider::coverArtUrlIdToTrackLocation(const QString& coverArt
 }
 
 } // namespace qml
-} // namespace skin
 } // namespace mixxx
diff --git a/src/qml/asyncimageprovider.h b/src/qml/asyncimageprovider.h
index 8b4fcd0fc1..8544a42e69 100644
--- a/src/qml/asyncimageprovider.h
+++ b/src/qml/asyncimageprovider.h
@@ -8,7 +8,6 @@
 #include "library/coverart.h"
 
 namespace mixxx {
-namespace skin {
 namespace qml {
 
 class AsyncImageResponse : public QQuickImageResponse, public QRunnable {
@@ -36,5 +35,4 @@ class AsyncImageProvider : public QQuickAsyncImageProvider {
 };
 
 } // namespace qml
-} // namespace skin
 } // namespace mixxx
diff --git a/src/qml/qmlconfigproxy.cpp b/src/qml/qmlconfigproxy.cpp
index 9e0bec8224..c0bf69792b 100644
--- a/src/qml/qmlconfigproxy.cpp
+++ b/src/qml/qmlconfigproxy.cpp
@@ -13,7 +13,6 @@ QVariantList paletteToQColorList(const ColorPalette& palette) {
 } // namespace
 
 namespace mixxx {
-namespace skin {
 namespace qml {
 
 QmlConfigProxy::QmlConfigProxy(
@@ -32,5 +31,4 @@ QVariantList QmlConfigProxy::getTrackColorPalette() {
 }
 
 } // namespace qml
-} // namespace skin
 } // namespace mixxx
diff --git a/src/qml/qmlconfigproxy.h b/src/qml/qmlconfigproxy.h
index aaa2c9fce6..37c7bc4cc8 100644
--- a/src/qml/qmlconfigproxy.h
+++ b/src/qml/qmlconfigproxy.h
@@ -6,7 +6,6 @@
 #include "preferences/usersettings.h"
 
 namespace mixxx {
-namespace skin {
 namespace qml {
 
 class QmlConfigProxy : public QObject {
@@ -24,5 +23,4 @@ class QmlConfigProxy : public QObject {
 };
 
 } // namespace qml
-} // namespace skin
 } // namespace mixxx
diff --git a/src/qml/qmlcontrolproxy.cpp b/src/qml/qmlcontrolproxy.cpp
index f9728d716d..0a046cf343 100644
--- a/src/qml/qmlcontrolproxy.cpp
+++ b/src/qml/qmlcontrolproxy.cpp
@@ -3,7 +3,6 @@
 #include "moc_qmlcontrolproxy.cpp"
 
 namespace mixxx {
-namespace skin {
 namespace qml {
 
 namespace {
@@ -180,5 +179,4 @@ void QmlControlProxy::slotControlProxyValueChanged(double newValue) {
 }
 
 } // namespace qml
-} // namespace skin
 } // namespace mixxx
diff --git a/src/qml/qmlcontrolproxy.h b/src/qml/qmlcontrolproxy.h
index 5b2493714a..3bbf3435cb 100644
--- a/src/qml/qmlcontrolproxy.h
+++ b/src/qml/qmlcontrolproxy.h
@@ -8,7 +8,6 @@
 #include "control/controlproxy.h"
 
 namespace mixxx {
-namespace skin {
 namespace qml {
 
 class QmlControlProxy : public QObject, public QQmlParserStatus {
@@ -86,5 +85,4 @@ class QmlControlProxy : public QObject, public QQmlParserStatus {
 };
 
 } // namespace qml
-} // namespace skin
 } // namespace mixxx
diff --git a/src/qml/qmleffectmanifestparametersmodel.cpp b/src/qml/qmleffectmanifestparametersmodel.cpp
index 2c92f7b348..4bcfb6ba5a 100644
--- a/src/qml/qmleffectmanifestparametersmodel.cpp
+++ b/src/qml/qmleffectmanifestparametersmodel.cpp
@@ -5,7 +5,6 @@
 #include "effects/effectmanifest.h"
 
 namespace mixxx {
-namespace skin {
 namespace qml {
 namespace {
 const QHash<int, QByteArray> kRoleNames = {
@@ -122,5 +121,4 @@ QVariant QmlEffectManifestParametersModel::get(int row) const {
 }
 
 } // namespace qml
-} // namespace skin
 } // namespace mixxx
diff --git a/src/qml/qmleffectmanifestparametersmodel.h b/src/qml/qmleffectmanifestparametersmodel.h
index bd913fb221..1238f242f5 100644
--- a/src/qml/qmleffectmanifestparametersmodel.h
+++ b/src/qml/qmleffectmanifestparametersmodel.h
@@ -5,7 +5,6 @@
 #include "effects/effectsmanager.h"
 
 namespace mixxx {
-namespace skin {
 namespace qml {
 
 class QmlEffectManifestParametersModel : public QAbstractListModel {
@@ -35,5 +34,4 @@ class QmlEffectManifestParametersModel : public QAbstractListModel {
 };
 
 } // namespace qml
-} // namespace skin
 } // namespace mixxx
diff --git a/src/qml/qmleffectslotproxy.cpp b/src/qml/qmleffectslotproxy.cpp
index 075697f330..0e403f9887 100644
--- a/src/qml/qmleffectslotproxy.cpp
+++ b/src/qml/qmleffectslotproxy.cpp
@@ -8,7 +8,6 @@
 #include "qml/qmleffectmanifestparametersmodel.h"
 
 namespace mixxx {
-namespace skin {
 namespace qml {
 
 QmlEffectSlotProxy::QmlEffectSlotProxy(EffectRackPointer pRack,
@@ -90,5 +89,4 @@ QmlEffectManifestParametersModel* QmlEffectSlotProxy::getParametersModel() const
 }
 
 } // namespace qml
-} // namespace skin
 } // namespace mixxx
diff --git a/src/qml/qmleffectslotproxy.h b/src/qml/qmleffectslotproxy.h
index 29044657e1..b5c25675f0 100644
--- a/src/qml/qmleffectslotproxy.h
+++ b/src/qml/qmleffectslotproxy.h
@@ -4,7 +4,6 @@
 #include "effects/effectsmanager.h"
 
 namespace mixxx {
-namespace skin {
 namespace qml {
 
 class QmlEffectManifestParametersModel;
@@ -18,7 +17,7 @@ class QmlEffectSlotProxy : public QObject {
     Q_PROPERTY(int number READ getNumber CONSTANT)
     Q_PROPERTY(QString group READ getGroup CONSTANT)
     Q_PROPERTY(QString effectId READ getEffectId WRITE setEffectId NOTIFY effectIdChanged)
-    Q_PROPERTY(mixxx::skin::qml::QmlEffectManifestParametersModel* parametersModel
+    Q_PROPERTY(mixxx::qml::QmlEffectManifestParametersModel* parametersModel
                     READ getParametersModel NOTIFY parametersModelChanged)
 
   public:
@@ -50,5 +49,4 @@ class QmlEffectSlotProxy : public QObject {
 };
 
 } // namespace qml
-} // namespace skin
 } // namespace mixxx
diff --git a/src/qml/qmleffectsmanagerproxy.cpp b/src/qml/qmleffectsmanagerproxy.cpp
index 8ea0624a07..d2011a5e23 100644
--- a/src/qml/qmleffectsmanagerproxy.cpp
+++ b/src/qml/qmleffectsmanagerproxy.cpp
@@ -9,7 +9,6 @@
 #include "qml/qmlvisibleeffectsmodel.h"
 
 namespace mixxx {
-namespace skin {
 namespace qml {
 
 QmlEffectsManagerProxy::QmlEffectsManagerProxy(
@@ -56,5 +55,4 @@ QmlEffectSlotProxy* QmlEffectsManagerProxy::getEffectSlot(
 }
 
 } // namespace qml
-} // namespace skin
 } // namespace mixxx
diff --git a/src/qml/qmleffectsmanagerproxy.h b/src/qml/qmleffectsmanagerproxy.h
index 81bccbbe9d..1517760118 100644
--- a/src/qml/qmleffectsmanagerproxy.h
+++ b/src/qml/qmleffectsmanagerproxy.h
@@ -5,14 +5,13 @@
 #include "qml/qmlvisibleeffectsmodel.h"
 
 namespace mixxx {
-namespace skin {
 namespace qml {
 
 class QmlEffectSlotProxy;
 
 class QmlEffectsManagerProxy : public QObject {
     Q_OBJECT
-    Q_PROPERTY(mixxx::skin::qml::QmlVisibleEffectsModel* visibleEffectsModel
+    Q_PROPERTY(mixxx::qml::QmlVisibleEffectsModel* visibleEffectsModel
                     MEMBER m_pVisibleEffectsModel CONSTANT);
 
   public:
@@ -20,7 +19,7 @@ class QmlEffectsManagerProxy : public QObject {
             std::shared_ptr<EffectsManager> pEffectsManager,
             QObject* parent = nullptr);
 
-    Q_INVOKABLE mixxx::skin::qml::QmlEffectSlotProxy* getEffectSlot(
+    Q_INVOKABLE mixxx::qml::QmlEffectSlotProxy* getEffectSlot(
             int rackNumber, int unitNumber, int effectNumber) const;
 
   private:
@@ -29,5 +28,4 @@ class QmlEffectsManagerProxy : public QObject {
 };
 
 } // namespace qml
-} // namespace skin
 } // namespace mixxx
diff --git a/src/qml/qmllibraryproxy.cpp b/src/qml/qmllibraryproxy.cpp
index 4583c1e34d..28453a48a7 100644
--- a/src/qml/qmllibraryproxy.cpp
+++ b/src/qml/qmllibraryproxy.cpp
@@ -6,7 +6,6 @@
 #include "library/sidebarmodel.h"
 
 namespace mixxx {
-namespace skin {
 namespace qml {
 
 QmlLibraryProxy::QmlLibraryProxy(std::shared_ptr<Library> pLibrary, QObject* parent)
@@ -20,5 +19,4 @@ QAbstractItemModel* QmlLibraryProxy::getSidebarModel() {
 }
 
 } // namespace qml
-} // namespace skin
 } // namespace mixxx
diff --git a/src/qml/qmllibraryproxy.h b/src/qml/qmllibraryproxy.h
index e7d64c1770..f27d8d3205 100644
--- a/src/qml/qmllibraryproxy.h
+++ b/src/qml/qmllibraryproxy.h
@@ -11,14 +11,13 @@ class SidebarModel;
 QT_FORWARD_DECLARE_CLASS(QAbstractItemModel);
 
 namespace mixxx {
-namespace skin {
 namespace qml {
 
 class QmlLibraryTrackListModel;
 
 class QmlLibraryProxy : public QObject {
     Q_OBJECT
-    Q_PROPERTY(mixxx::skin::qml::QmlLibraryTrackListModel* model MEMBER m_pModel CONSTANT)
+    Q_PROPERTY(mixxx::qml::QmlLibraryTrackListModel* model MEMBER m_pModel CONSTANT)
 
   public:
     explicit QmlLibraryProxy(std::shared_ptr<Library> pLibrary, QObject* parent = nullptr);
@@ -31,5 +30,4 @@ class QmlLibraryProxy : public QObject {
 };
 
 } // namespace qml
-} // namespace skin
 } // namespace mixxx
diff --git a/src/qml/qmllibrarytracklistmodel.cpp b/src/qml/qmllibrarytracklistmodel.cpp
index 3d68743389..2dfda07a9f 100644
--- a/src/qml/qmllibrarytracklistmodel.cpp
+++ b/src/qml/qmllibrarytracklistmodel.cpp
@@ -3,7 +3,6 @@
 #include "library/librarytablemodel.h"
 
 namespace mixxx {
-namespace skin {
 namespace qml {
 namespace {
 const QHash<int, QByteArray> kRoleNames = {
@@ -89,5 +88,4 @@ QHash<int, QByteArray> QmlLibraryTrackListModel::roleNames() const {
 }
 
 } // namespace qml
-} // namespace skin
 } // namespace mixxx
diff --git a/src/qml/qmllibrarytracklistmodel.h b/src/qml/qmllibrarytracklistmodel.h
index 9bf4870fa1..62b696041f 100644
--- a/src/qml/qmllibrarytracklistmodel.h
+++ b/src/qml/qmllibrarytracklistmodel.h
@@ -4,7 +4,6 @@
 class LibraryTableModel;
 
 namespace mixxx {
-namespace skin {
 namespace qml {
 
 class QmlLibraryTrackListModel : public QIdentityProxyModel {
@@ -27,7 +26,6 @@ class QmlLibraryTrackListModel : public QIdentityProxyModel {
 };
 
 } // namespace qml
-} // namespace skin
 } // namespace mixxx
 
-Q_DECLARE_METATYPE(mixxx::skin::qml::QmlLibraryTrackListModel*)
+Q_DECLARE_METATYPE(mixxx::qml::QmlLibraryTrackListModel*)
diff --git a/src/qml/qmlplayermanagerproxy.cpp b/src/qml/qmlplayermanagerproxy.cpp
index b64053ce71..8379320f0a 100644
--- a/src/qml/qmlplayermanagerproxy.cpp
+++ b/src/qml/qmlplayermanagerproxy.cpp
@@ -6,7 +6,6 @@
 #include "qml/qmlplayerproxy.h"
 
 namespace mixxx {
-namespace skin {
 namespace qml {
 
 QmlPlayerManagerProxy::QmlPlayerManagerProxy(
@@ -45,5 +44,4 @@ QObject* QmlPlayerManagerProxy::getPlayer(const QString& group) {
 }
 
 } // namespace qml
-} // namespace skin
 } // namespace mixxx
diff --git a/src/qml/qmlplayermanagerproxy.h b/src/qml/qmlplayermanagerproxy.h
index ba892c906f..a1c6216e14 100644
--- a/src/qml/qmlplayermanagerproxy.h
+++ b/src/qml/qmlplayermanagerproxy.h
@@ -5,7 +5,6 @@
 #include "mixer/playermanager.h"
 
 namespace mixxx {
-namespace skin {
 namespace qml {
 
 class QmlPlayerManagerProxy : public QObject {
@@ -25,5 +24,4 @@ class QmlPlayerManagerProxy : public QObject {
 };
 
 } // namespace qml
-} // namespace skin
 } // namespace mixxx
diff --git a/src/qml/qmlplayerproxy.cpp b/src/qml/qmlplayerproxy.cpp
index f5f7925411..15226b188d 100644
--- a/src/qml/qmlplayerproxy.cpp
+++ b/src/qml/qmlplayerproxy.cpp
@@ -22,7 +22,6 @@
     }
 
 namespace mixxx {
-namespace skin {
 namespace qml {
 
 QmlPlayerProxy::QmlPlayerProxy(BaseTrackPlayer* pTrackPlayer, QObject* parent)
@@ -193,5 +192,4 @@ QUrl QmlPlayerProxy::getTrackLocationUrl() const {
 }
 
 } // namespace qml
-} // namespace skin
 } // namespace mixxx
diff --git a/src/qml/qmlplayerproxy.h b/src/qml/qmlplayerproxy.h
index 13f72485eb..89509bcdbc 100644
--- a/src/qml/qmlplayerproxy.h
+++ b/src/qml/qmlplayerproxy.h
@@ -8,7 +8,6 @@
 #include "track/track.h"
 
 namespace mixxx {
-namespace skin {
 namespace qml {
 
 class QmlPlayerProxy : public QObject {
@@ -108,5 +107,4 @@ class QmlPlayerProxy : public QObject {
 };
 
 } // namespace qml
-} // namespace skin
 } // namespace mixxx
diff --git a/src/qml/qmlvisibleeffectsmodel.cpp b/src/qml/qmlvisibleeffectsmodel.cpp
index 0f678a0ae1..dcecd92159 100644
--- a/src/qml/qmlvisibleeffectsmodel.cpp
+++ b/src/qml/qmlvisibleeffectsmodel.cpp
@@ -6,7 +6,6 @@
 #include "effects/effectsmanager.h"
 
 namespace mixxx {
-namespace skin {
 namespace qml {
 namespace {
 const QHash<int, QByteArray> kRoleNames = {
@@ -85,5 +84,4 @@ QVariant QmlVisibleEffectsModel::get(int row) const {
 }
 
 } // namespace qml
-} // namespace skin
 } // namespace mixxx
diff --git a/src/qml/qmlvisibleeffectsmodel.h b/src/qml/qmlvisibleeffectsmodel.h
index b061471a35..e54bfe2ea9 100644
--- a/src/qml/qmlvisibleeffectsmodel.h
+++ b/src/qml/qmlvisibleeffectsmodel.h
@@ -5,7 +5,6 @@
 #include "effects/effectsmanager.h"
 
 namespace mixxx {
-namespace skin {
 namespace qml {
 
 class QmlVisibleEffectsModel : public QAbstractListModel {
@@ -34,5 +33,4 @@ class QmlVisibleEffectsModel : public QAbstractListModel {
 };
 
 } // namespace qml
-} // namespace skin
 } // namespace mixxx
diff --git a/src/qml/qmlwaveformoverview.cpp b/src/qml/qmlwaveformoverview.cpp
index 23d799224f..6d9e151a64 100644
--- a/src/qml/qmlwaveformoverview.cpp
+++ b/src/qml/qmlwaveformoverview.cpp
@@ -8,7 +8,6 @@ constexpr double kDesiredChannelHeight = 255;
 } // namespace
 
 namespace mixxx {
-namespace skin {
 namespace qml {
 
 QmlWaveformOverview::QmlWaveformOverview(QQuickItem* parent)
@@ -263,5 +262,4 @@ QColor QmlWaveformOverview::getRgbPenColor(ConstWaveformPointer pWaveform, int c
 }
 
 } // namespace qml
-} // namespace skin
 } // namespace mixxx
diff --git a/src/qml/qmlwaveformoverview.h b/src/qml/qmlwaveformoverview.h
index 07f5602914..057847f721 100644
--- a/src/qml/qmlwaveformoverview.h
+++ b/src/qml/qmlwaveformoverview.h
@@ -9,7 +9,6 @@
 #include "track/track.h"
 
 namespace mixxx {
-namespace skin {
 namespace qml {
 
 class QmlPlayerProxy;
@@ -17,7 +16,7 @@ class QmlPlayerProxy;
 class QmlWaveformOverview : public QQuickPaintedItem {
     Q_OBJECT
     Q_FLAGS(Channels)
-    Q_PROPERTY(mixxx::skin::qml::QmlPlayerProxy* player READ getPlayer
+    Q_PROPERTY(mixxx::qml::QmlPlayerProxy* player READ getPlayer
                     WRITE setPlayer NOTIFY playerChanged)
     Q_PROPERTY(Channels channels READ getChannels WRITE setChannels NOTIFY channelsChanged)
     Q_PROPERTY(Renderer renderer MEMBER m_renderer NOTIFY rendererChanged)
@@ -55,8 +54,8 @@ class QmlWaveformOverview : public QQuickPaintedItem {
 
   signals:
     void playerChanged();
-    void channelsChanged(mixxx::skin::qml::QmlWaveformOverview::Channels channels);
-    void rendererChanged(mixxx::skin::qml::QmlWaveformOverview::Renderer renderer);
+    void channelsChanged(mixxx::qml::QmlWaveformOverview::Channels channels);
+    void rendererChanged(mixxx::qml::QmlWaveformOverview::Renderer renderer);
     void colorHighChanged(const QColor& color);
     void colorMidChanged(const QColor& color);
     void colorLowChanged(const QColor& color);
@@ -83,5 +82,4 @@ class QmlWaveformOverview : public QQuickPaintedItem {
 };
 
 } // namespace qml
-} // namespace skin
 } // namespace mixxx
diff --git a/src/qmlapplication.cpp b/src/qmlapplication.cpp
index 26b0bd7810..b3897281f9 100644
--- a/src/qmlapplication.cpp
+++ b/src/qmlapplication.cpp
@@ -30,7 +30,6 @@ auto lambda_to_singleton_type_factory_ptr(F&& f) {
 } // namespace
 
 namespace mixxx {
-namespace skin {
 namespace qml {
 
 QmlApplication::QmlApplication(
@@ -180,5 +179,4 @@ void QmlApplication::loadQml(const QString& path) {
 }
 
 } // namespace qml
-} // namespace skin
 } // namespace mixxx
diff --git a/src/qmlapplication.h b/src/qmlapplication.h
index 09f6e9a34a..866645100d 100644
--- a/src/qmlapplication.h
+++ b/src/qmlapplication.h
@@ -7,7 +7,6 @@
 #include <QQmlApplicationEngine>
 
 namespace mixxx {
-namespace skin {
 namespace qml {
 
 class QmlApplication : public QObject {
@@ -31,5 +30,4 @@ class QmlApplication : public QObject {
 };
 
 } // namespace qml
-} // namespace skin
 } // namespace mixxx
-- 
cgit v1.2.3