From 570ccb2bfaf39aaae745d794a000e64c24f07783 Mon Sep 17 00:00:00 2001 From: omigamedev Date: Fri, 12 Jun 2026 18:04:07 +0200 Subject: [PATCH] Hide generic preference helpers --- docs/modernization/debt.md | 3 + src/legacy_preference_storage.cpp | 97 +++++++------------------------ src/legacy_preference_storage.h | 15 ----- 3 files changed, 23 insertions(+), 92 deletions(-) diff --git a/docs/modernization/debt.md b/docs/modernization/debt.md index b10fe3f..eb528b2 100644 --- a/docs/modernization/debt.md +++ b/docs/modernization/debt.md @@ -295,6 +295,9 @@ agent or engineer to remove them without reconstructing context from chat. VR-controller, auto-timelapse, startup run-counter, viewport-density, and cursor-mode write keys now use named `src/legacy_preference_storage.*` helpers instead of generic key/value calls in legacy service bridges. +- 2026-06-12: DEBT-0045/0046/0052/0058 were narrowed again. The retained + preference storage header now exposes only named snapshots/operations; generic + key/value helpers are local to `src/legacy_preference_storage.cpp`. - 2026-06-05: DEBT-0056 was narrowed. `src/asset.h` no longer exposes Android SDK types or forward declarations; retained Android asset-manager and asset handles are stored as opaque pointers and cast only inside `src/asset.cpp`, diff --git a/src/legacy_preference_storage.cpp b/src/legacy_preference_storage.cpp index 84eef0b..6a4b57f 100644 --- a/src/legacy_preference_storage.cpp +++ b/src/legacy_preference_storage.cpp @@ -6,6 +6,26 @@ #include "settings.h" namespace pp::panopainter { +namespace { + +void set_legacy_boolean_preference(const char* key, bool value) +{ + Settings::set(key, Serializer::Boolean(value)); +} + +void save_legacy_boolean_preference(const char* key, bool value) +{ + set_legacy_boolean_preference(key, value); + Settings::save(); +} + +void save_legacy_float_preference(const char* key, float value) +{ + Settings::set(key, Serializer::Float(value)); + Settings::save(); +} + +} // namespace bool load_legacy_preferences() { @@ -53,71 +73,6 @@ LegacyWindowPreferenceSnapshot read_legacy_window_preferences(int default_show_c return snapshot; } -bool has_legacy_preference(const char* key) -{ - return Settings::has(key); -} - -int legacy_integer_preference(const char* key) -{ - return Settings::value(key); -} - -int legacy_integer_preference_or(const char* key, int default_value) -{ - return Settings::value_or(key, default_value); -} - -float legacy_float_preference(const char* key) -{ - return Settings::value(key); -} - -float legacy_float_preference_or(const char* key, float default_value) -{ - return Settings::value_or(key, default_value); -} - -bool legacy_boolean_preference_or(const char* key, bool default_value) -{ - return Settings::value_or(key, default_value); -} - -glm::ivec4 legacy_ivec4_preference(const char* key) -{ - return Settings::value(key); -} - -std::shared_ptr get_legacy_descriptor_preference(const char* key) -{ - return Settings::get(key); -} - -void set_legacy_integer_preference(const char* key, int value) -{ - Settings::set(key, Serializer::Integer(value)); -} - -void set_legacy_ivec4_preference(const char* key, const glm::ivec4& value) -{ - Settings::set(key, Serializer::IVec4(value)); -} - -void set_legacy_boolean_preference(const char* key, bool value) -{ - Settings::set(key, Serializer::Boolean(value)); -} - -void set_legacy_descriptor_preference(const char* key, const Serializer::Descriptor& value) -{ - Settings::set(key, value); -} - -void unset_legacy_preference(const char* key) -{ - Settings::unset(key); -} - void save_legacy_ui_scale_preference(float scale) { Settings::set("ui-scale", Serializer::Float(scale)); @@ -177,18 +132,6 @@ void save_legacy_canvas_cursor_mode(int mode) Settings::save(); } -void save_legacy_boolean_preference(const char* key, bool value) -{ - set_legacy_boolean_preference(key, value); - Settings::save(); -} - -void save_legacy_float_preference(const char* key, float value) -{ - Settings::set(key, Serializer::Float(value)); - Settings::save(); -} - bool save_legacy_preferences() { return Settings::save(); diff --git a/src/legacy_preference_storage.h b/src/legacy_preference_storage.h index 038a9dc..e79f448 100644 --- a/src/legacy_preference_storage.h +++ b/src/legacy_preference_storage.h @@ -34,19 +34,6 @@ LegacyStartupPreferenceSnapshot read_legacy_startup_preferences(bool default_vr_ LegacyCanvasPreferenceSnapshot read_legacy_canvas_preferences(); LegacyUiPreferenceSnapshot read_legacy_ui_preferences(); LegacyWindowPreferenceSnapshot read_legacy_window_preferences(int default_show_command); -bool has_legacy_preference(const char* key); -int legacy_integer_preference(const char* key); -int legacy_integer_preference_or(const char* key, int default_value); -float legacy_float_preference(const char* key); -float legacy_float_preference_or(const char* key, float default_value); -bool legacy_boolean_preference_or(const char* key, bool default_value); -glm::ivec4 legacy_ivec4_preference(const char* key); -std::shared_ptr get_legacy_descriptor_preference(const char* key); -void set_legacy_integer_preference(const char* key, int value); -void set_legacy_ivec4_preference(const char* key, const glm::ivec4& value); -void set_legacy_boolean_preference(const char* key, bool value); -void set_legacy_descriptor_preference(const char* key, const Serializer::Descriptor& value); -void unset_legacy_preference(const char* key); void save_legacy_ui_scale_preference(float scale); void set_legacy_ui_state_preferences(const Serializer::Descriptor& state, bool right_to_left); void set_legacy_window_preferences(int show_command, const glm::ivec4& window_rect); @@ -58,8 +45,6 @@ void save_legacy_vr_controllers_enabled(bool enabled); void save_legacy_auto_timelapse_enabled(bool enabled); void save_legacy_canvas_viewport_density(float density); void save_legacy_canvas_cursor_mode(int mode); -void save_legacy_boolean_preference(const char* key, bool value); -void save_legacy_float_preference(const char* key, float value); bool save_legacy_preferences(); } // namespace pp::panopainter