From 87bf59fd31515bc78f55f9747574412559c91393 Mon Sep 17 00:00:00 2001 From: Vasily Date: Sun, 1 Dec 2019 16:56:31 +0100 Subject: [PATCH] Add m_debugState to new settings API --- src/overlaycontroller.cpp | 20 ++++---------------- src/overlaycontroller.h | 1 - src/settings/settings.h | 2 ++ src/settings/settings_controller.h | 5 +++++ 4 files changed, 11 insertions(+), 17 deletions(-) diff --git a/src/overlaycontroller.cpp b/src/overlaycontroller.cpp index 733d364..9ff5464 100644 --- a/src/overlaycontroller.cpp +++ b/src/overlaycontroller.cpp @@ -298,11 +298,6 @@ OverlayController::OverlayController( bool desktopMode, m_customTickRateMs = value.toInt(); } } - value = appSettings()->value( "debugState", m_debugState ); - if ( value.isValid() && !value.isNull() ) - { - m_debugState = value.toInt(); - } appSettings()->endGroup(); // Grab local version number @@ -821,23 +816,16 @@ void OverlayController::setVersionCheckText( QString value, bool notify ) int OverlayController::debugState() const { - return m_debugState; + return settings::getSetting( settings::IntSetting::APPLICATION_debugState ); } void OverlayController::setDebugState( int value, bool notify ) { - if ( m_debugState == value ) - { - return; - } - m_debugState = value; - appSettings()->beginGroup( "applicationSettings" ); - appSettings()->setValue( "debugState", m_debugState ); - appSettings()->endGroup(); - appSettings()->sync(); + settings::setSetting( settings::IntSetting::APPLICATION_debugState, value ); + if ( notify ) { - emit debugStateChanged( m_debugState ); + emit debugStateChanged( value ); } } diff --git a/src/overlaycontroller.h b/src/overlaycontroller.h index 3b8a719..37b6ee4 100644 --- a/src/overlaycontroller.h +++ b/src/overlaycontroller.h @@ -123,7 +123,6 @@ private: bool m_noSound; bool m_newVersionDetected = false; int m_customTickRateMs = 20; - int m_debugState = 0; int m_remoteVersionMajor = -1; int m_remoteVersionMinor = -1; int m_remoteVersionPatch = -1; diff --git a/src/settings/settings.h b/src/settings/settings.h index c31b725..695db34 100644 --- a/src/settings/settings.h +++ b/src/settings/settings.h @@ -81,6 +81,8 @@ enum class IntSetting PLAYSPACE_dragComfortFactor, PLAYSPACE_turnComfortFactor, + APPLICATION_debugState, + UTILITY_alarmHour, UTILITY_alarmMinute, // LAST_ENUMERATOR must always be set to the last value diff --git a/src/settings/settings_controller.h b/src/settings/settings_controller.h index 3909b39..c5236d0 100644 --- a/src/settings/settings_controller.h +++ b/src/settings/settings_controller.h @@ -376,6 +376,11 @@ private: QtInfo{ "turnComfortFactor" }, 0 }, + IntSettingValue{ IntSetting::APPLICATION_debugState, + SettingCategory::Application, + QtInfo{ "debugState" }, + 0 }, + IntSettingValue{ IntSetting::UTILITY_alarmHour, SettingCategory::Utility, QtInfo{ "alarmHour" },