From 4011674b0f7e2731e29e44d0d817f7d853145428 Mon Sep 17 00:00:00 2001
From: Vasily <vautkin@teknik.io>
Date: Mon, 2 Dec 2019 14:02:46 +0100
Subject: [PATCH] Convert m_enableChaperoneHapticFeedback to new settings API

---
 src/settings/settings.h                       |  1 +
 src/settings/settings_controller.h            |  4 +++
 src/tabcontrollers/ChaperoneTabController.cpp | 26 ++++++++-----------
 src/tabcontrollers/ChaperoneTabController.h   |  1 -
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/settings/settings.h b/src/settings/settings.h
index 8081383..5f0eaa0 100644
--- a/src/settings/settings.h
+++ b/src/settings/settings.h
@@ -41,6 +41,7 @@ enum class BoolSetting
     VIDEO_colorOverlayEnabled,
 
     CHAPERONE_chaperoneSwitchToBeginnerEnabled,
+    CHAPERONE_chaperoneHapticFeedbackEnabled,
     CHAPERONE_disableChaperone,
     // LAST_ENUMERATOR must always be set to the last value
     LAST_ENUMERATOR = CHAPERONE_disableChaperone,
diff --git a/src/settings/settings_controller.h b/src/settings/settings_controller.h
index ebbb6c1..ed0984b 100644
--- a/src/settings/settings_controller.h
+++ b/src/settings/settings_controller.h
@@ -280,6 +280,10 @@ private:
             SettingCategory::Chaperone,
             QtInfo{ "chaperoneSwitchToBeginnerEnabled" },
             false },
+        BoolSettingValue{ BoolSetting::CHAPERONE_chaperoneHapticFeedbackEnabled,
+                          SettingCategory::Chaperone,
+                          QtInfo{ "chaperoneHapticFeedbackEnabled" },
+                          false },
         BoolSettingValue{ BoolSetting::CHAPERONE_disableChaperone,
                           SettingCategory::Chaperone,
                           QtInfo{ "disableChaperone" },
diff --git a/src/tabcontrollers/ChaperoneTabController.cpp b/src/tabcontrollers/ChaperoneTabController.cpp
index 650a9a4..68fc306 100644
--- a/src/tabcontrollers/ChaperoneTabController.cpp
+++ b/src/tabcontrollers/ChaperoneTabController.cpp
@@ -14,8 +14,6 @@ void ChaperoneTabController::initStage1()
     m_chaperoneSwitchToBeginnerDistance
         = settings->value( "chaperoneSwitchToBeginnerDistance", 0.5f )
               .toFloat();
-    m_enableChaperoneHapticFeedback
-        = settings->value( "chaperoneHapticFeedbackEnabled", false ).toBool();
     m_chaperoneHapticFeedbackDistance
         = settings->value( "chaperoneHapticFeedbackDistance", 0.5f ).toFloat();
     m_enableChaperoneAlarmSound
@@ -429,7 +427,7 @@ void ChaperoneTabController::handleChaperoneWarnings( float distance )
 
     // Haptic Feedback
 
-    if ( m_enableChaperoneHapticFeedback )
+    if ( isChaperoneHapticFeedbackEnabled() )
     {
         float activationDistance = m_chaperoneHapticFeedbackDistance;
 
@@ -854,7 +852,8 @@ float ChaperoneTabController::chaperoneSwitchToBeginnerDistance() const
 
 bool ChaperoneTabController::isChaperoneHapticFeedbackEnabled() const
 {
-    return m_enableChaperoneHapticFeedback;
+    return settings::getSetting(
+        settings::BoolSetting::CHAPERONE_chaperoneHapticFeedbackEnabled );
 }
 
 float ChaperoneTabController::chaperoneHapticFeedbackDistance() const
@@ -991,24 +990,21 @@ void ChaperoneTabController::setChaperoneSwitchToBeginnerDistance( float value,
 void ChaperoneTabController::setChaperoneHapticFeedbackEnabled( bool value,
                                                                 bool notify )
 {
-    if ( m_enableChaperoneHapticFeedback != value )
+    if ( isChaperoneHapticFeedbackEnabled() != value )
     {
         m_chaperoneHapticFeedbackActive = false;
         if ( m_chaperoneHapticFeedbackThread.joinable() )
         {
             m_chaperoneHapticFeedbackThread.join();
         }
-        m_enableChaperoneHapticFeedback = value;
-        auto settings = OverlayController::appSettings();
-        settings->beginGroup( "chaperoneSettings" );
-        settings->setValue( "chaperoneHapticFeedbackEnabled",
-                            m_enableChaperoneHapticFeedback );
-        settings->endGroup();
-        settings->sync();
+
+        settings::setSetting(
+            settings::BoolSetting::CHAPERONE_chaperoneHapticFeedbackEnabled,
+            value );
+
         if ( notify )
         {
-            emit chaperoneHapticFeedbackEnabledChanged(
-                m_enableChaperoneHapticFeedback );
+            emit chaperoneHapticFeedbackEnabledChanged( value );
         }
     }
 }
@@ -1374,7 +1370,7 @@ void ChaperoneTabController::addChaperoneProfile(
         profile->chaperoneSwitchToBeginnerDistance
             = m_chaperoneSwitchToBeginnerDistance;
         profile->enableChaperoneHapticFeedback
-            = m_enableChaperoneHapticFeedback;
+            = isChaperoneHapticFeedbackEnabled();
         profile->chaperoneHapticFeedbackDistance
             = m_chaperoneHapticFeedbackDistance;
         profile->enableChaperoneAlarmSound = m_enableChaperoneAlarmSound;
diff --git a/src/tabcontrollers/ChaperoneTabController.h b/src/tabcontrollers/ChaperoneTabController.h
index 3a5b19b..2703661 100644
--- a/src/tabcontrollers/ChaperoneTabController.h
+++ b/src/tabcontrollers/ChaperoneTabController.h
@@ -141,7 +141,6 @@ private:
     bool m_chaperoneSwitchToBeginnerActive = false;
     int32_t m_chaperoneSwitchToBeginnerLastStyle = 0;
 
-    bool m_enableChaperoneHapticFeedback = true;
     float m_chaperoneHapticFeedbackDistance = 0.5f;
     bool m_chaperoneHapticFeedbackActive = false;
     std::thread m_chaperoneHapticFeedbackThread;