aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorGravatar jan Iversen <jani@apache.org>2018-07-24 18:25:18 +0200
committerGravatar Dirk Hohndel <dirk@hohndel.org>2018-07-25 08:35:04 -0700
commit98820cf970335523b4cd2a84a025c12b5480e0aa (patch)
tree3f0e8f465bcb47a5fff84b37c843090f30b99564 /core
parent8cfe04815070eaca6ef49d45f68879c0bdf3f2b6 (diff)
downloadsubsurface-98820cf970335523b4cd2a84a025c12b5480e0aa.tar.gz
core: update qPrefDisplay to new consensus
add inline to load/sync remove const from QString getters Signed-off-by: Jan Iversen <jani@apache.org>
Diffstat (limited to 'core')
-rw-r--r--core/settings/qPrefDisplay.h8
1 files changed, 4 insertions, 4 deletions
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);