From ec73c54f3e50a0d9b1b2f61f15595213e05ceca9 Mon Sep 17 00:00:00 2001
From: Vasily <vautkin@teknik.io>
Date: Mon, 2 Dec 2019 15:03:03 +0100
Subject: [PATCH] Convert m_fadeDistanceRemembered to new settings API

---
 src/tabcontrollers/ChaperoneTabController.cpp | 22 +++++++------------
 src/tabcontrollers/ChaperoneTabController.h   |  1 -
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/src/tabcontrollers/ChaperoneTabController.cpp b/src/tabcontrollers/ChaperoneTabController.cpp
index 31de65f..98b202f 100644
--- a/src/tabcontrollers/ChaperoneTabController.cpp
+++ b/src/tabcontrollers/ChaperoneTabController.cpp
@@ -9,12 +9,6 @@ namespace advsettings
 {
 void ChaperoneTabController::initStage1()
 {
-    auto settings = OverlayController::appSettings();
-    settings->beginGroup( "chaperoneSettings" );
-    m_fadeDistanceRemembered
-        = settings->value( "fadeDistanceRemembered", 0.5f ).toFloat();
-    settings->endGroup();
-
     if ( disableChaperone() )
     {
         setFadeDistance( 0.0f, true );
@@ -1138,20 +1132,20 @@ void ChaperoneTabController::setDisableChaperone( bool value, bool notify )
     {
         if ( value )
         {
-            m_fadeDistanceRemembered = m_fadeDistance;
+            settings::setSetting(
+                settings::DoubleSetting::CHAPERONE_fadeDistanceRemembered,
+                static_cast<double>( value ) );
+
             setFadeDistance( 0.0f, true );
         }
         else
         {
-            setFadeDistance( m_fadeDistanceRemembered, true );
+            setFadeDistance( static_cast<float>( settings::getSetting(
+                                 settings::DoubleSetting::
+                                     CHAPERONE_fadeDistanceRemembered ) ),
+                             true );
         }
 
-        auto settings = OverlayController::appSettings();
-        settings->beginGroup( "chaperoneSettings" );
-        settings->setValue( "fadeDistanceRemembered",
-                            m_fadeDistanceRemembered );
-        settings->endGroup();
-        settings->sync();
         settings::setSetting( settings::BoolSetting::CHAPERONE_disableChaperone,
                               value );
 
diff --git a/src/tabcontrollers/ChaperoneTabController.h b/src/tabcontrollers/ChaperoneTabController.h
index 7efe52c..81c99db 100644
--- a/src/tabcontrollers/ChaperoneTabController.h
+++ b/src/tabcontrollers/ChaperoneTabController.h
@@ -134,7 +134,6 @@ private:
     bool m_centerMarker = false;
     bool m_playSpaceMarker = false;
     bool m_forceBounds = false;
-    float m_fadeDistanceRemembered = 0.0f;
 
     bool m_chaperoneSwitchToBeginnerActive = false;
     int32_t m_chaperoneSwitchToBeginnerLastStyle = 0;