From 17f0674cc2f5ed8ececae33b0c9e8f229017cb38 Mon Sep 17 00:00:00 2001
From: Vlad Zahorodnii <vlad.zahorodnii@kde.org>
Date: Thu, 8 Feb 2024 17:04:11 +0000
Subject: [PATCH] Adapt to renamed night light d-bus interface

---
 quicksettings/nightcolor/CMakeLists.txt     | 4 ++--
 quicksettings/nightcolor/nightcolorutil.cpp | 9 ++++++---
 quicksettings/nightcolor/nightcolorutil.h   | 4 ++--
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/quicksettings/nightcolor/CMakeLists.txt b/quicksettings/nightcolor/CMakeLists.txt
index 46ad9f4d..690062e5 100644
--- a/quicksettings/nightcolor/CMakeLists.txt
+++ b/quicksettings/nightcolor/CMakeLists.txt
@@ -1,8 +1,8 @@
 # SPDX-FileCopyrightText: 2022 Devin Lin <devin@kde.org>
 # SPDX-License-Identifier: GPL-2.0-or-later
 
-set_source_files_properties(${KWIN_COLORCORRECT_INTERFACE} PROPERTIES NO_NAMESPACE TRUE)
-qt_add_dbus_interfaces(DBUS_SRCS ${KWIN_COLORCORRECT_INTERFACE})
+set_source_files_properties(${KWIN_NIGHTLIGHT_INTERFACE} PROPERTIES NO_NAMESPACE TRUE)
+qt_add_dbus_interfaces(DBUS_SRCS ${KWIN_NIGHTLIGHT_INTERFACE})
 
 set(nightcolorplugin_SRCS
     nightcolorplugin.cpp
diff --git a/quicksettings/nightcolor/nightcolorutil.cpp b/quicksettings/nightcolor/nightcolorutil.cpp
index 84d67e00..2c72ab10 100644
--- a/quicksettings/nightcolor/nightcolorutil.cpp
+++ b/quicksettings/nightcolor/nightcolorutil.cpp
@@ -8,7 +8,10 @@
 
 NightColorUtil::NightColorUtil(QObject *parent)
     : QObject{parent}
-    , m_ccInterface{new OrgKdeKwinColorCorrectInterface(QStringLiteral("org.kde.KWin"), QStringLiteral("/ColorCorrect"), QDBusConnection::sessionBus(), this)}
+    , m_ccInterface{new OrgKdeKWinNightLightInterface(QStringLiteral("org.kde.KWin.NightLight"),
+                                                      QStringLiteral("/org/kde/KWin/NightLight"),
+                                                      QDBusConnection::sessionBus(),
+                                                      this)}
     , m_settings{new NightColorSettings(this)}
 {
     if (!m_ccInterface->isValid()) {
@@ -17,8 +20,8 @@ NightColorUtil::NightColorUtil(QObject *parent)
         m_enabled = m_ccInterface->running();
 
         // subscribe to property updates
-        QDBusConnection::sessionBus().connect(QStringLiteral("org.kde.KWin"),
-                                              QStringLiteral("/ColorCorrect"),
+        QDBusConnection::sessionBus().connect(QStringLiteral("org.kde.KWin.NightLight"),
+                                              QStringLiteral("/org/kde/KWin/NightLight"),
                                               QStringLiteral("org.freedesktop.DBus.Properties"),
                                               QStringLiteral("PropertiesChanged"),
                                               this,
diff --git a/quicksettings/nightcolor/nightcolorutil.h b/quicksettings/nightcolor/nightcolorutil.h
index b1219331..fa98cda9 100644
--- a/quicksettings/nightcolor/nightcolorutil.h
+++ b/quicksettings/nightcolor/nightcolorutil.h
@@ -8,8 +8,8 @@
 
 #include <QObject>
 
-#include "colorcorrectinterface.h"
 #include "nightcolorsettings.h"
+#include "nightlightinterface.h"
 
 class NightColorUtil : public QObject
 {
@@ -30,6 +30,6 @@ public Q_SLOTS:
 
 private:
     bool m_enabled;
-    OrgKdeKwinColorCorrectInterface *m_ccInterface;
+    OrgKdeKWinNightLightInterface *m_ccInterface;
     NightColorSettings *m_settings;
 };