From f91328298bf0d8c5f381f8fdd3c94a840f6fc5ce Mon Sep 17 00:00:00 2001
From: Vasily <vautkin@teknik.io>
Date: Sun, 1 Dec 2019 14:40:07 +0100
Subject: [PATCH] Convert m_settingsRightHandTurnEnabled to new settings API

---
 .../MoveCenterTabController.cpp               | 27 +++++++------------
 src/tabcontrollers/MoveCenterTabController.h  |  1 -
 2 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/src/tabcontrollers/MoveCenterTabController.cpp b/src/tabcontrollers/MoveCenterTabController.cpp
index 737538f..ad16dfd 100644
--- a/src/tabcontrollers/MoveCenterTabController.cpp
+++ b/src/tabcontrollers/MoveCenterTabController.cpp
@@ -39,8 +39,6 @@ namespace advsettings
 {
 void MoveCenterTabController::initStage1()
 {
-    m_settingsRightHandTurnEnabled = settings::getSetting(
-        settings::BoolSetting::PLAYSPACE_turnBindRight );
     m_dragBounds
         = settings::getSetting( settings::BoolSetting::PLAYSPACE_dragBounds );
     m_turnBounds
@@ -219,10 +217,6 @@ void MoveCenterTabController::outputLogSettings()
     {
         LOG( INFO ) << "LOADED SETTINGS: Left Hand Space-Drag Bind Enabled";
     }
-    if ( m_settingsRightHandTurnEnabled )
-    {
-        LOG( INFO ) << "LOADED SETTINGS: Right Hand Space-Turn Bind Enabled";
-    }
     if ( settings::getSetting( settings::BoolSetting::PLAYSPACE_turnBindLeft ) )
     {
         LOG( INFO ) << "LOADED SETTINGS: Left Hand Space-Turn Bind Enabled";
@@ -649,23 +643,18 @@ void MoveCenterTabController::setTurnBindLeft( bool value, bool notify )
 
 bool MoveCenterTabController::turnBindRight() const
 {
-    return m_settingsRightHandTurnEnabled;
+    return settings::getSetting(
+        settings::BoolSetting::PLAYSPACE_turnBindRight );
 }
 
 void MoveCenterTabController::setTurnBindRight( bool value, bool notify )
 {
-    m_settingsRightHandTurnEnabled = value;
-    auto settings = OverlayController::appSettings();
-    settings->beginGroup( "playspaceSettings" );
-    settings->setValue( "turnBindRight", m_settingsRightHandTurnEnabled );
-    settings->endGroup();
-    settings->sync();
+    settings::setSetting( settings::BoolSetting::PLAYSPACE_turnBindRight,
+                          value );
     if ( notify )
     {
-        emit turnBindRightChanged( m_settingsRightHandTurnEnabled );
+        emit turnBindRightChanged( value );
     }
-    LOG( INFO ) << "CHANGED SETTINGS: Right Hand Space-Turn Bind Enable Set: "
-                << m_settingsRightHandTurnEnabled;
 }
 
 bool MoveCenterTabController::dragBounds() const
@@ -1946,7 +1935,8 @@ void MoveCenterTabController::leftHandSpaceTurn( bool leftHandTurnActive )
 
 void MoveCenterTabController::rightHandSpaceTurn( bool rightHandTurnActive )
 {
-    if ( !m_settingsRightHandTurnEnabled )
+    if ( !settings::getSetting(
+             settings::BoolSetting::PLAYSPACE_turnBindRight ) )
     {
         return;
     }
@@ -2033,7 +2023,8 @@ void MoveCenterTabController::optionalOverrideLeftHandSpaceTurn(
 void MoveCenterTabController::optionalOverrideRightHandSpaceTurn(
     bool overrideRightHandTurnActive )
 {
-    if ( !m_settingsRightHandTurnEnabled )
+    if ( !settings::getSetting(
+             settings::BoolSetting::PLAYSPACE_turnBindRight ) )
     {
         return;
     }
diff --git a/src/tabcontrollers/MoveCenterTabController.h b/src/tabcontrollers/MoveCenterTabController.h
index 1ff5135..6a3b074 100644
--- a/src/tabcontrollers/MoveCenterTabController.h
+++ b/src/tabcontrollers/MoveCenterTabController.h
@@ -125,7 +125,6 @@ private:
     bool m_moveShortcutLeftPressed = false;
     vr::TrackedDeviceIndex_t m_activeMoveController;
     float m_lastControllerPosition[3];
-    bool m_settingsRightHandTurnEnabled = false;
     unsigned m_dragComfortFactor = 0;
     unsigned m_turnComfortFactor = 0;
     bool m_dragBounds = false;