summaryrefslogtreecommitdiffstats
path: root/core/settings/qPrefDisplay.h
diff options
context:
space:
mode:
authorGravatar jan Iversen <jani@apache.org>2018-07-04 22:46:59 +0200
committerGravatar jan Iversen <jani@apache.org>2018-07-12 18:44:31 +0200
commit928fc1ee79a4391384f448cb75369ddb5e03ef28 (patch)
treef848c4adc1ad14843e68c088d809fbdbf4ef8636 /core/settings/qPrefDisplay.h
parent9732194bf8e018d93fc3b0244992b23d2cdd2859 (diff)
downloadsubsurface-928fc1ee79a4391384f448cb75369ddb5e03ef28.tar.gz
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 <jani@apache.org>
Diffstat (limited to 'core/settings/qPrefDisplay.h')
-rw-r--r--core/settings/qPrefDisplay.h7
1 files changed, 5 insertions, 2 deletions
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