From 99fed942305bf484e9df979adb6d785d3a6dd001 Mon Sep 17 00:00:00 2001
From: Antoine C <mixxx@acolombier.dev>
Date: Thu, 17 Oct 2024 01:31:23 +0100
Subject: [PATCH] fixup! feat: improve screen rendering framework

---
 CMakeLists.txt                                                | 4 ++--
 .../scripting/legacy/controllerscriptenginelegacy.cpp         | 2 +-
 .../{qmlmixxxcontroller.cpp => qmlmixxxcontrollerscreen.cpp}  | 4 ++--
 src/qml/{qmlmixxxcontroller.h => qmlmixxxcontrollerscreen.h}  | 0
 src/test/controllerscriptenginelegacy_test.cpp                | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)
 rename src/qml/{qmlmixxxcontroller.cpp => qmlmixxxcontrollerscreen.cpp} (89%)
 rename src/qml/{qmlmixxxcontroller.h => qmlmixxxcontrollerscreen.h} (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c6819fc7620..f3cb0b13164 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2789,7 +2789,7 @@ if(QML)
     src/qml/qmlvisibleeffectsmodel.cpp
     src/qml/qmlchainpresetmodel.cpp
     src/qml/qmlwaveformoverview.cpp
-    src/qml/qmlmixxxcontroller.cpp
+    src/qml/qmlmixxxcontrollerscreen.cpp
     # The following sources need to be in this target to get QML_ELEMENT properly interpreted
     src/control/controlmodel.cpp
     src/control/controlsortfiltermodel.cpp
@@ -2801,7 +2801,7 @@ if(QML)
   # and :/mixxx.org/imports/Mixxx/Controls are placed into beginning of the binary
   qt_finalize_target(mixxx)
 
-  # Required for src/qml/qmlmixxxcontroller.h, used in controllerscriptenginelegacy_test.cpp
+  # Required for src/qml/qmlmixxxcontrollerscreen.h, used in controllerscriptenginelegacy_test.cpp
   target_link_libraries(mixxx-test PRIVATE Qt6::Quick)
 
   install(
diff --git a/src/controllers/scripting/legacy/controllerscriptenginelegacy.cpp b/src/controllers/scripting/legacy/controllerscriptenginelegacy.cpp
index 1c9cef3aa26..88c030d005b 100644
--- a/src/controllers/scripting/legacy/controllerscriptenginelegacy.cpp
+++ b/src/controllers/scripting/legacy/controllerscriptenginelegacy.cpp
@@ -17,7 +17,7 @@
 #include "mixer/playermanager.h"
 #include "moc_controllerscriptenginelegacy.cpp"
 #ifdef MIXXX_USE_QML
-#include "qml/qmlmixxxcontroller.h"
+#include "qml/qmlmixxxcontrollerscreen.h"
 #include "util/assert.h"
 #include "util/cmdlineargs.h"
 
diff --git a/src/qml/qmlmixxxcontroller.cpp b/src/qml/qmlmixxxcontrollerscreen.cpp
similarity index 89%
rename from src/qml/qmlmixxxcontroller.cpp
rename to src/qml/qmlmixxxcontrollerscreen.cpp
index 80a65ab4193..1c54af998fc 100644
--- a/src/qml/qmlmixxxcontroller.cpp
+++ b/src/qml/qmlmixxxcontrollerscreen.cpp
@@ -1,9 +1,9 @@
-#include "qml/qmlmixxxcontroller.h"
+#include "qml/qmlmixxxcontrollerscreen.h"
 
 #include <QSGNode>
 #include <QSGSimpleRectNode>
 
-#include "moc_qmlmixxxcontroller.cpp"
+#include "moc_qmlmixxxcontrollerscreen.cpp"
 
 namespace mixxx {
 namespace qml {
diff --git a/src/qml/qmlmixxxcontroller.h b/src/qml/qmlmixxxcontrollerscreen.h
similarity index 100%
rename from src/qml/qmlmixxxcontroller.h
rename to src/qml/qmlmixxxcontrollerscreen.h
diff --git a/src/test/controllerscriptenginelegacy_test.cpp b/src/test/controllerscriptenginelegacy_test.cpp
index 48f3b074ed4..cd968497ee4 100644
--- a/src/test/controllerscriptenginelegacy_test.cpp
+++ b/src/test/controllerscriptenginelegacy_test.cpp
@@ -21,7 +21,7 @@
 #include "controllers/softtakeover.h"
 #include "helpers/log_test.h"
 #include "preferences/usersettings.h"
-#include "qml/qmlmixxxcontroller.h"
+#include "qml/qmlmixxxcontrollerscreen.h"
 #include "test/mixxxtest.h"
 #include "util/color/colorpalette.h"
 #include "util/time.h"