aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorGravatar jan Iversen <jani@apache.org>2018-07-24 18:19:46 +0200
committerGravatar Dirk Hohndel <dirk@hohndel.org>2018-07-25 08:35:04 -0700
commit254ba61fd90900dbb3816ba515d21e9d42f11f94 (patch)
treea6370ea0aaa204a5282f6026fb47e26acfaffc96 /core
parent0002cd2d202c45d520f115280f98ba94c0028815 (diff)
downloadsubsurface-254ba61fd90900dbb3816ba515d21e9d42f11f94.tar.gz
core: make load/sync inline in qPrefAnimations
Signed-off-by: Jan Iversen <jani@apache.org>
Diffstat (limited to 'core')
-rw-r--r--core/settings/qPrefAnimations.h4
-rw-r--r--core/settings/qPrefDiveComputer.h8
2 files changed, 6 insertions, 6 deletions
diff --git a/core/settings/qPrefAnimations.h b/core/settings/qPrefAnimations.h
index 5b0fcaea4..63aa57c24 100644
--- a/core/settings/qPrefAnimations.h
+++ b/core/settings/qPrefAnimations.h
@@ -15,8 +15,8 @@ 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 int animation_speed() { return prefs.animation_speed; };
diff --git a/core/settings/qPrefDiveComputer.h b/core/settings/qPrefDiveComputer.h
index 8a80ee3ca..c270c8155 100644
--- a/core/settings/qPrefDiveComputer.h
+++ b/core/settings/qPrefDiveComputer.h
@@ -23,11 +23,11 @@ public:
void inline sync() {loadSync(true); }
public:
- static inline const QString& device() {return prefs.dive_computer.device; };
- static inline const QString& device_name() {return prefs.dive_computer.device_name; };
+ static inline QString device() {return prefs.dive_computer.device; };
+ static inline QString device_name() {return prefs.dive_computer.device_name; };
static inline int download_mode() {return prefs.dive_computer.download_mode; };
- static inline const QString& product() {return prefs.dive_computer.product; };
- static inline const QString& vendor() {return prefs.dive_computer.vendor; };
+ static inline QString product() {return prefs.dive_computer.product; };
+ static inline QString vendor() {return prefs.dive_computer.vendor; };
public slots:
void set_device(const QString& device);