From 98820cf970335523b4cd2a84a025c12b5480e0aa Mon Sep 17 00:00:00 2001 From: jan Iversen Date: Tue, 24 Jul 2018 18:25:18 +0200 Subject: core: update qPrefDisplay to new consensus add inline to load/sync remove const from QString getters Signed-off-by: Jan Iversen --- core/settings/qPrefDisplay.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'core') diff --git a/core/settings/qPrefDisplay.h b/core/settings/qPrefDisplay.h index 2d41c4e0d..57cf15ba0 100644 --- a/core/settings/qPrefDisplay.h +++ b/core/settings/qPrefDisplay.h @@ -19,15 +19,15 @@ public: // Load/Sync local settings (disk) and struct preference void loadSync(bool doSync); - void load() { loadSync(false); } - void sync() { loadSync(true); } + void inline load() { loadSync(false); } + void inline sync() { loadSync(true); } public: - static inline const QString divelist_font() {return QString(prefs.divelist_font); }; + static inline QString divelist_font() {return prefs.divelist_font; }; static inline double font_size() {return prefs.font_size; }; static inline bool display_invalid_dives() {return prefs.display_invalid_dives; }; static inline bool show_developer() {return prefs.show_developer; }; - static inline const QString theme() {return QString(prefs.theme); }; + static inline QString theme() {return prefs.theme; }; public slots: void set_divelist_font(const QString& value); -- cgit v1.2.3-70-g09d2