From 3375ee4b1a6ae775e323257c9ccfc79674e7a70e Mon Sep 17 00:00:00 2001
From: Vasily <vautkin@teknik.io>
Date: Sun, 1 Dec 2019 18:00:33 +0100
Subject: [PATCH] Convert m_vrcDebug to new settings API

---
 src/settings/settings.h                       |  1 +
 src/settings/settings_controller.h            |  4 ++++
 src/tabcontrollers/UtilitiesTabController.cpp | 18 ++++--------------
 src/tabcontrollers/UtilitiesTabController.h   |  1 -
 4 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/src/settings/settings.h b/src/settings/settings.h
index 10f47b5..2f68b61 100644
--- a/src/settings/settings.h
+++ b/src/settings/settings.h
@@ -34,6 +34,7 @@ enum class BoolSetting
 
     UTILITY_alarmEnabled,
     UTILITY_alarmIsModal,
+    UTILITY_vrcDebug,
 
     VIDEO_brightnessEnabled,
     VIDEO_isOverlayMethodActive,
diff --git a/src/settings/settings_controller.h b/src/settings/settings_controller.h
index 810989c..cf5b38e 100644
--- a/src/settings/settings_controller.h
+++ b/src/settings/settings_controller.h
@@ -257,6 +257,10 @@ private:
                           SettingCategory::Utility,
                           QtInfo{ "alarmIsModal" },
                           true },
+        BoolSettingValue{ BoolSetting::UTILITY_vrcDebug,
+                          SettingCategory::Utility,
+                          QtInfo{ "vrcDebug" },
+                          false },
 
         BoolSettingValue{ BoolSetting::VIDEO_brightnessEnabled,
                           SettingCategory::Video,
diff --git a/src/tabcontrollers/UtilitiesTabController.cpp b/src/tabcontrollers/UtilitiesTabController.cpp
index f2ed24d..ffe3048 100644
--- a/src/tabcontrollers/UtilitiesTabController.cpp
+++ b/src/tabcontrollers/UtilitiesTabController.cpp
@@ -14,11 +14,9 @@ void UtilitiesTabController::initStage1()
 {
     auto settings = OverlayController::appSettings();
     settings->beginGroup( "utilitiesSettings" );
-    auto qVrcDebug = settings->value( "vrcDebug", m_vrcDebug );
     auto qAlarmHour = settings->value( "alarmHour", 0 );
     auto qAlarmMinute = settings->value( "alarmMinute", 0 );
     settings->endGroup();
-    m_vrcDebug = qVrcDebug.toBool();
     m_alarmTime = QTime( qAlarmHour.toInt(), qAlarmMinute.toInt() );
 
     m_k_utilitiesSettingsUpdateCounter
@@ -228,7 +226,7 @@ bool UtilitiesTabController::alarmIsModal() const
 
 bool UtilitiesTabController::vrcDebug() const
 {
-    return m_vrcDebug;
+    return settings::getSetting( settings::BoolSetting::UTILITY_vrcDebug );
 }
 
 int UtilitiesTabController::alarmTimeHour() const
@@ -265,18 +263,10 @@ void UtilitiesTabController::setAlarmIsModal( bool modal, bool notify )
 
 void UtilitiesTabController::setVrcDebug( bool value, bool notify )
 {
-    if ( m_vrcDebug != value )
+    settings::setSetting( settings::BoolSetting::UTILITY_vrcDebug, value );
+    if ( notify )
     {
-        m_vrcDebug = value;
-        auto settings = OverlayController::appSettings();
-        settings->beginGroup( "utilitiesSettings" );
-        settings->setValue( "vrcDebug", m_vrcDebug );
-        settings->endGroup();
-        settings->sync();
-        if ( notify )
-        {
-            emit vrcDebugChanged( m_vrcDebug );
-        }
+        emit vrcDebugChanged( value );
     }
 }
 
diff --git a/src/tabcontrollers/UtilitiesTabController.h b/src/tabcontrollers/UtilitiesTabController.h
index 8c09b24..e2d92f9 100644
--- a/src/tabcontrollers/UtilitiesTabController.h
+++ b/src/tabcontrollers/UtilitiesTabController.h
@@ -35,7 +35,6 @@ private:
 
     unsigned settingsUpdateCounter = 0;
 
-    bool m_vrcDebug = false;
     QTime m_alarmTime;
     QTime m_alarmLastCheckTime;