From c8b271ad3e99f7ae1c6bf326a69acb5abe5f807b Mon Sep 17 00:00:00 2001 From: Vasily Date: Sun, 1 Dec 2019 16:48:39 +0100 Subject: [PATCH] Add m_enableDebug to new settings API --- src/overlaycontroller.cpp | 21 +++++---------------- src/overlaycontroller.h | 1 - src/settings/settings.h | 1 + src/settings/settings_controller.h | 4 ++++ 4 files changed, 10 insertions(+), 17 deletions(-) diff --git a/src/overlaycontroller.cpp b/src/overlaycontroller.cpp index d8d282f..1c023b6 100644 --- a/src/overlaycontroller.cpp +++ b/src/overlaycontroller.cpp @@ -298,11 +298,6 @@ OverlayController::OverlayController( bool desktopMode, m_customTickRateMs = value.toInt(); } } - value = appSettings()->value( "enableDebug", m_enableDebug ); - if ( value.isValid() && !value.isNull() ) - { - m_enableDebug = value.toBool(); - } value = appSettings()->value( "disableVersionCheck", m_disableVersionCheck ); if ( value.isValid() && !value.isNull() ) @@ -761,23 +756,17 @@ void OverlayController::setVsyncDisabled( bool value, bool notify ) bool OverlayController::enableDebug() const { - return m_enableDebug; + return settings::getSetting( + settings::BoolSetting::APPLICATION_enableDebug ); } void OverlayController::setEnableDebug( bool value, bool notify ) { - if ( m_enableDebug == value ) - { - return; - } - m_enableDebug = value; - appSettings()->beginGroup( "applicationSettings" ); - appSettings()->setValue( "enableDebug", m_enableDebug ); - appSettings()->endGroup(); - appSettings()->sync(); + settings::setSetting( settings::BoolSetting::APPLICATION_enableDebug, + value ); if ( notify ) { - emit enableDebugChanged( m_enableDebug ); + emit enableDebugChanged( value ); } } diff --git a/src/overlaycontroller.h b/src/overlaycontroller.h index ee2de31..54efa5a 100644 --- a/src/overlaycontroller.h +++ b/src/overlaycontroller.h @@ -121,7 +121,6 @@ private: bool m_desktopMode; bool m_noSound; - bool m_enableDebug = false; bool m_disableVersionCheck = false; bool m_newVersionDetected = false; int m_customTickRateMs = 20; diff --git a/src/settings/settings.h b/src/settings/settings.h index 3f968df..c31b725 100644 --- a/src/settings/settings.h +++ b/src/settings/settings.h @@ -27,6 +27,7 @@ enum class BoolSetting APPLICATION_previousShutdownSafe, APPLICATION_vsyncDisabled, APPLICATION_crashRecoveryDisabled, + APPLICATION_enableDebug, VIDEO_brightnessEnabled, VIDEO_isOverlayMethodActive, diff --git a/src/settings/settings_controller.h b/src/settings/settings_controller.h index 547195e..3909b39 100644 --- a/src/settings/settings_controller.h +++ b/src/settings/settings_controller.h @@ -235,6 +235,10 @@ private: SettingCategory::Application, QtInfo{ "crashRecoveryDisabled" }, false }, + BoolSettingValue{ BoolSetting::APPLICATION_enableDebug, + SettingCategory::Application, + QtInfo{ "enableDebug" }, + false }, BoolSettingValue{ BoolSetting::VIDEO_brightnessEnabled, SettingCategory::Video,