From 928fc1ee79a4391384f448cb75369ddb5e03ef28 Mon Sep 17 00:00:00 2001 From: jan Iversen Date: Wed, 4 Jul 2018 22:46:59 +0200 Subject: core: move load of display variables to qPrefDisplay from SettingsObjectWrapper ensure SettingsObjectWrapper load() loads all display variables. Copy font setting code from SettingsObjectWrapper to qPrefDisplay Signed-off-by: Jan Iversen --- core/settings/qPrefDisplay.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'core/settings/qPrefDisplay.h') diff --git a/core/settings/qPrefDisplay.h b/core/settings/qPrefDisplay.h index 67930ae63..4a1c0ada5 100644 --- a/core/settings/qPrefDisplay.h +++ b/core/settings/qPrefDisplay.h @@ -19,8 +19,8 @@ public: // Load/Sync local settings (disk) and struct preference void loadSync(bool doSync); - void load() { loadSync(false); }; - void sync() { loadSync(true); }; + void load() { loadSync(false); } + void sync() { loadSync(true); } public: const QString divelist_font() const; @@ -53,5 +53,8 @@ private: void disk_display_invalid_dives(bool doSync); void disk_show_developer(bool doSync); void disk_theme(bool doSync); + + // font helper function + void setCorrectFont(); }; #endif -- cgit v1.2.3-70-g09d2