From 598d77a0e7e37c060bb829367090f747d16f3a82 Mon Sep 17 00:00:00 2001 From: Vasily Date: Sun, 1 Dec 2019 16:52:42 +0100 Subject: [PATCH] Convert m_disableVersionCheck to new settings API --- src/overlaycontroller.cpp | 26 +++++++------------------- src/overlaycontroller.h | 1 - 2 files changed, 7 insertions(+), 20 deletions(-) diff --git a/src/overlaycontroller.cpp b/src/overlaycontroller.cpp index 1c023b6..733d364 100644 --- a/src/overlaycontroller.cpp +++ b/src/overlaycontroller.cpp @@ -298,12 +298,6 @@ OverlayController::OverlayController( bool desktopMode, m_customTickRateMs = value.toInt(); } } - value - = appSettings()->value( "disableVersionCheck", m_disableVersionCheck ); - if ( value.isValid() && !value.isNull() ) - { - m_disableVersionCheck = value.toBool(); - } value = appSettings()->value( "debugState", m_debugState ); if ( value.isValid() && !value.isNull() ) { @@ -325,7 +319,7 @@ OverlayController::OverlayController( bool desktopMode, this, SLOT( OnNetworkReply( QNetworkReply* ) ) ); - if ( !m_disableVersionCheck ) + if ( !disableVersionCheck() ) { QNetworkRequest netRequest; netRequest.setUrl( QUrl( application_strings::versionCheckUrl ) ); @@ -772,29 +766,23 @@ void OverlayController::setEnableDebug( bool value, bool notify ) bool OverlayController::disableVersionCheck() const { - return m_disableVersionCheck; + return settings::getSetting( + settings::BoolSetting::APPLICATION_disableVersionCheck ); } void OverlayController::setDisableVersionCheck( bool value, bool notify ) { - if ( m_disableVersionCheck == value ) - { - return; - } - m_disableVersionCheck = value; - if ( !m_disableVersionCheck ) + if ( !value ) { QNetworkRequest netRequest; netRequest.setUrl( QUrl( application_strings::versionCheckUrl ) ); netManager->get( netRequest ); } - appSettings()->beginGroup( "applicationSettings" ); - appSettings()->setValue( "disableVersionCheck", m_disableVersionCheck ); - appSettings()->endGroup(); - appSettings()->sync(); + settings::setSetting( + settings::BoolSetting::APPLICATION_disableVersionCheck, value ); if ( notify ) { - emit disableVersionCheckChanged( m_disableVersionCheck ); + emit disableVersionCheckChanged( value ); } } diff --git a/src/overlaycontroller.h b/src/overlaycontroller.h index 54efa5a..3b8a719 100644 --- a/src/overlaycontroller.h +++ b/src/overlaycontroller.h @@ -121,7 +121,6 @@ private: bool m_desktopMode; bool m_noSound; - bool m_disableVersionCheck = false; bool m_newVersionDetected = false; int m_customTickRateMs = 20; int m_debugState = 0;