From 419de3fbe7a0e9f0aac1a48b4f4f1e41bb9a4685 Mon Sep 17 00:00:00 2001
From: Devin Lin <espidev@gmail.com>
Date: Sat, 10 Sep 2022 14:22:39 -0400
Subject: [PATCH] quicksettings/nightcolor: Fix functionality, update to new
 changes to config

---
 .../nightcolor/nightcolorsettings.kcfg        | 19 +++++--------------
 quicksettings/nightcolor/nightcolorutil.cpp   |  2 --
 quicksettings/nightcolor/nightcolorutil.h     |  2 +-
 3 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/quicksettings/nightcolor/nightcolorsettings.kcfg b/quicksettings/nightcolor/nightcolorsettings.kcfg
index 313a9bd1..7528dcb2 100644
--- a/quicksettings/nightcolor/nightcolorsettings.kcfg
+++ b/quicksettings/nightcolor/nightcolorsettings.kcfg
@@ -9,17 +9,11 @@
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
                           http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
-    <kcfgfile name="kwinrc"/>
+    <kcfgfile name="kwinrc" />
     <group name="NightColor">
-        <entry name="ActiveEnabled" type="Bool">
-            <default>true</default>
-        </entry>
         <entry name="Active" type="Bool">
             <default>false</default>
         </entry>
-        <entry name="ModeEnabled" type="Bool">
-            <default>true</default>
-        </entry>
         <entry name="Mode" type="Enum">
             <choices name="ColorCorrect::NightColorMode">
                 <choice name="Automatic"/>
@@ -29,13 +23,11 @@
             </choices>
             <default>Automatic</default>
         </entry>
-        <entry name="NightTemperatureEnabled" type="Bool">
-            <default>true</default>
+        <entry name="DayTemperature" type="Int">
+            <default>6500</default>
         </entry>
         <entry name="NightTemperature" type="Int">
             <default>4500</default>
-            <min>1000</min>
-            <max>6500</max>
         </entry>
         <entry name="LatitudeAuto" type="Double">
             <default>0.</default>
@@ -43,9 +35,6 @@
         <entry name="LongitudeAuto" type="Double">
             <default>0.</default>
         </entry>
-        <entry name="LocationEnabled" type="Bool">
-            <default>true</default>
-        </entry>
         <entry name="LatitudeFixed" type="Double">
             <default>0.</default>
         </entry>
@@ -63,3 +52,5 @@
         </entry>
     </group>
 </kcfg>
+
+
diff --git a/quicksettings/nightcolor/nightcolorutil.cpp b/quicksettings/nightcolor/nightcolorutil.cpp
index 1e54f67d..84d67e00 100644
--- a/quicksettings/nightcolor/nightcolorutil.cpp
+++ b/quicksettings/nightcolor/nightcolorutil.cpp
@@ -33,9 +33,7 @@ bool NightColorUtil::enabled()
 
 void NightColorUtil::setEnabled(bool enabled)
 {
-    m_settings->setModeEnabled(true);
     m_settings->setMode(ColorCorrect::NightColorMode::Constant);
-    m_settings->setActiveEnabled(true);
     m_settings->setActive(enabled);
     m_settings->save();
 }
diff --git a/quicksettings/nightcolor/nightcolorutil.h b/quicksettings/nightcolor/nightcolorutil.h
index 2da9b3bc..b1219331 100644
--- a/quicksettings/nightcolor/nightcolorutil.h
+++ b/quicksettings/nightcolor/nightcolorutil.h
@@ -31,5 +31,5 @@ public Q_SLOTS:
 private:
     bool m_enabled;
     OrgKdeKwinColorCorrectInterface *m_ccInterface;
-    NightColorSettings *const m_settings;
+    NightColorSettings *m_settings;
 };