From fa5672dcafa154dff7409eaaf762febe1d76aad7 Mon Sep 17 00:00:00 2001 From: MarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz> Date: Mon, 16 Feb 2026 16:21:11 +0100 Subject: [PATCH] refactor: [gui] Use SettingTo over deprecated SettingToInt This refactor does not change any behavior. Also, remove the now-unused deprecated aliases. --- src/common/args.h | 3 --- src/qt/optionsmodel.cpp | 8 ++++---- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/common/args.h b/src/common/args.h index 477f2cbf6c8..ea4e173bf72 100644 --- a/src/common/args.h +++ b/src/common/args.h @@ -96,9 +96,6 @@ Int SettingTo(const common::SettingsValue&, Int); template std::optional SettingTo(const common::SettingsValue&); -inline int64_t SettingToInt(const common::SettingsValue& value, int64_t nDefault) { return SettingTo(value, nDefault); } -inline std::optional SettingToInt(const common::SettingsValue& value) { return SettingTo(value); } - bool SettingToBool(const common::SettingsValue&, bool); std::optional SettingToBool(const common::SettingsValue&); diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp index 3d876a8f63b..cfbc350f091 100644 --- a/src/qt/optionsmodel.cpp +++ b/src/qt/optionsmodel.cpp @@ -88,14 +88,14 @@ static common::SettingsValue PruneSetting(bool prune_enabled, int prune_size_gb) static bool PruneEnabled(const common::SettingsValue& prune_setting) { // -prune=1 setting is manual pruning mode, so disabled for purposes of the gui - return SettingToInt(prune_setting, 0) > 1; + return SettingTo(prune_setting, 0) > 1; } //! Get pruning size value to show in GUI from bitcoin -prune setting. If //! pruning is not enabled, just show default recommended pruning size (2GB). static int PruneSizeGB(const common::SettingsValue& prune_setting) { - int value = SettingToInt(prune_setting, 0); + int value = SettingTo(prune_setting, 0); return value > 1 ? PruneMiBtoGB(value) : DEFAULT_PRUNE_TARGET_GB; } @@ -469,9 +469,9 @@ QVariant OptionsModel::getOption(OptionID option, const std::string& suffix) con suffix.empty() ? getOption(option, "-prev") : DEFAULT_PRUNE_TARGET_GB; case DatabaseCache: - return qlonglong(SettingToInt(setting(), DEFAULT_DB_CACHE >> 20)); + return qlonglong(SettingTo(setting(), DEFAULT_DB_CACHE >> 20)); case ThreadsScriptVerif: - return qlonglong(SettingToInt(setting(), DEFAULT_SCRIPTCHECK_THREADS)); + return qlonglong(SettingTo(setting(), DEFAULT_SCRIPTCHECK_THREADS)); case Listen: return SettingToBool(setting(), DEFAULT_LISTEN); case Server: