From 698949da21391f0256a4e6dc60fb3e925530d173 Mon Sep 17 00:00:00 2001
From: reionwong <reionwong@gmail.com>
Date: Thu, 3 Sep 2026 23:19:11 -0400
Subject: [PATCH] refactor(screen): flatten Qt6 sources

---
 screen/CMakeLists.txt            | 12 ++++++------
 screen/{qt5 => }/output.cpp      |  0
 screen/{qt5 => }/output.h        |  0
 screen/{qt5 => }/outputmodel.cpp |  0
 screen/{qt5 => }/outputmodel.h   |  0
 screen/{qt5 => }/plugin.cpp      |  0
 screen/{qt5 => }/screen.cpp      |  0
 screen/{qt5 => }/screen.h        |  0
 8 files changed, 6 insertions(+), 6 deletions(-)
 rename screen/{qt5 => }/output.cpp (100%)
 rename screen/{qt5 => }/output.h (100%)
 rename screen/{qt5 => }/outputmodel.cpp (100%)
 rename screen/{qt5 => }/outputmodel.h (100%)
 rename screen/{qt5 => }/plugin.cpp (100%)
 rename screen/{qt5 => }/screen.cpp (100%)
 rename screen/{qt5 => }/screen.h (100%)

diff --git a/screen/CMakeLists.txt b/screen/CMakeLists.txt
index 79ec174..1ad4a79 100644
--- a/screen/CMakeLists.txt
+++ b/screen/CMakeLists.txt
@@ -1,14 +1,14 @@
-set(SCREEN_SRCS
-    qt5/output.cpp
-    qt5/outputmodel.cpp
-    qt5/plugin.cpp
-    qt5/screen.cpp
+set(CUTEFISH_SCREEN_SOURCES
+    output.cpp
+    outputmodel.cpp
+    plugin.cpp
+    screen.cpp
 )
 
 find_package(Qt6 REQUIRED COMPONENTS Core Gui Quick)
 find_package(KF6Screen REQUIRED)
 
-add_library(cutefish-framework-screen SHARED ${SCREEN_SRCS})
+add_library(cutefish-framework-screen SHARED ${CUTEFISH_SCREEN_SOURCES})
 
 qt_add_qml_module(cutefish-framework-screen
     URI Cutefish.Screen
diff --git a/screen/qt5/output.cpp b/screen/output.cpp
similarity index 100%
rename from screen/qt5/output.cpp
rename to screen/output.cpp
diff --git a/screen/qt5/output.h b/screen/output.h
similarity index 100%
rename from screen/qt5/output.h
rename to screen/output.h
diff --git a/screen/qt5/outputmodel.cpp b/screen/outputmodel.cpp
similarity index 100%
rename from screen/qt5/outputmodel.cpp
rename to screen/outputmodel.cpp
diff --git a/screen/qt5/outputmodel.h b/screen/outputmodel.h
similarity index 100%
rename from screen/qt5/outputmodel.h
rename to screen/outputmodel.h
diff --git a/screen/qt5/plugin.cpp b/screen/plugin.cpp
similarity index 100%
rename from screen/qt5/plugin.cpp
rename to screen/plugin.cpp
diff --git a/screen/qt5/screen.cpp b/screen/screen.cpp
similarity index 100%
rename from screen/qt5/screen.cpp
rename to screen/screen.cpp
diff --git a/screen/qt5/screen.h b/screen/screen.h
similarity index 100%
rename from screen/qt5/screen.h
rename to screen/screen.h