From b230641600f65ccacfa48bd577bebe8148249f34 Mon Sep 17 00:00:00 2001
From: James Graham <james.h.graham@protonmail.com>
Date: Mon, 7 Apr 2025 20:22:11 +0100
Subject: [PATCH] Move ColorSchemer to settings module

---
 src/CMakeLists.txt                  |  6 ++----
 src/settings/CMakeLists.txt         | 10 ++++++++--
 src/{ => settings}/colorschemer.cpp |  1 +
 src/{ => settings}/colorschemer.h   |  0
 4 files changed, 11 insertions(+), 6 deletions(-)
 rename src/{ => settings}/colorschemer.cpp (95%)
 rename src/{ => settings}/colorschemer.h (100%)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index dcd407327..2d5b5c92c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -87,8 +87,6 @@ add_library(neochat STATIC
     jobs/neochatgetcommonroomsjob.h
     mediasizehelper.cpp
     mediasizehelper.h
-    colorschemer.cpp
-    colorschemer.h
     models/notificationsmodel.cpp
     models/notificationsmodel.h
     proxycontroller.cpp
@@ -319,10 +317,11 @@ else()
 endif()
 
 target_include_directories(neochat PRIVATE ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/models ${CMAKE_CURRENT_SOURCE_DIR}/enums)
-target_link_libraries(neochat PRIVATE settingsplugin Timelineplugin devtoolsplugin loginplugin chatbarplugin)
+target_link_libraries(neochat PRIVATE Settingsplugin Timelineplugin devtoolsplugin loginplugin chatbarplugin)
 target_link_libraries(neochat PUBLIC
     LibNeoChat
     Timeline
+    Settings
     Qt::Core
     Qt::Quick
     Qt::Qml
@@ -338,7 +337,6 @@ target_link_libraries(neochat PUBLIC
     KF6::CoreAddons
     KF6::SonnetCore
     KF6::IconThemes
-    KF6::ColorScheme
     KF6::ItemModels
     QuotientQt6
 )
diff --git a/src/settings/CMakeLists.txt b/src/settings/CMakeLists.txt
index 4314a84ae..289e49659 100644
--- a/src/settings/CMakeLists.txt
+++ b/src/settings/CMakeLists.txt
@@ -1,7 +1,7 @@
 # SPDX-FileCopyrightText: 2024 James Graham <james.h.graham@protonmail.com>
 # SPDX-License-Identifier: BSD-2-Clause
 
-qt_add_library(settings STATIC)
+qt_add_library(Settings STATIC)
 
 set_source_files_properties(
     RoomSettingsView.qml
@@ -10,7 +10,7 @@ set_source_files_properties(
         QT_QML_SINGLETON_TYPE TRUE
 )
 
-ecm_add_qml_module(settings GENERATE_PLUGIN_SOURCE
+ecm_add_qml_module(Settings GENERATE_PLUGIN_SOURCE
     URI org.kde.neochat.settings
     OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/src/org/kde/neochat/settings
     QML_FILES
@@ -44,4 +44,10 @@ ecm_add_qml_module(settings GENERATE_PLUGIN_SOURCE
         ExportKeysDialog.qml
         RoomSortParameterDialog.qml
         RoomProfile.qml
+    SOURCES
+        colorschemer.cpp
+)
+
+target_link_libraries(Settings PRIVATE
+    KF6::ColorScheme
 )
diff --git a/src/colorschemer.cpp b/src/settings/colorschemer.cpp
similarity index 95%
rename from src/colorschemer.cpp
rename to src/settings/colorschemer.cpp
index e0dbeea88..ec9e9b45b 100644
--- a/src/colorschemer.cpp
+++ b/src/settings/colorschemer.cpp
@@ -9,6 +9,7 @@
 ColorSchemer::ColorSchemer(QObject *parent)
     : QObject(parent)
 {
+    KColorSchemeManager::instance();
 }
 
 ColorSchemer::~ColorSchemer()
diff --git a/src/colorschemer.h b/src/settings/colorschemer.h
similarity index 100%
rename from src/colorschemer.h
rename to src/settings/colorschemer.h