core: qPref, remove inline and ; for inline functions

Signed-off-by: Jan Iversen <jani@apache.org>

8 files changed, 58 insertions, 58 deletions

diff --git a/core/settings/qPref.h b/core/settings/qPref.h
index 867c5f439..a64ea2507 100644
--- a/core/settings/qPref.h
+++ b/core/settings/qPref.h
@@ -25,8 +25,8 @@ public:
 
 	// Load/Sync local settings (disk) and struct preference
 	void loadSync(bool doSync);
-	void inline load() { loadSync(false); }
-	void inline sync() { loadSync(true); }
+	void load() { loadSync(false); }
+	void sync() { loadSync(true); }
 
 public:
 	enum cloud_status {
diff --git a/core/settings/qPrefAnimations.h b/core/settings/qPrefAnimations.h
index 63aa57c24..c24a6590e 100644
--- a/core/settings/qPrefAnimations.h
+++ b/core/settings/qPrefAnimations.h
@@ -15,11 +15,11 @@ public:
 
 	// Load/Sync local settings (disk) and struct preference
 	void loadSync(bool doSync);
-	void inline load() { loadSync(false); }
-	void inline sync() { loadSync(true); }
+	void load() { loadSync(false); }
+	void sync() { loadSync(true); }
 
 public:
-	static inline int animation_speed() { return prefs.animation_speed; };
+	static int animation_speed() { return prefs.animation_speed; }
 
 public slots:
 	void set_animation_speed(int value);
diff --git a/core/settings/qPrefCloudStorage.h b/core/settings/qPrefCloudStorage.h
index fe804585f..6f32aef95 100644
--- a/core/settings/qPrefCloudStorage.h
+++ b/core/settings/qPrefCloudStorage.h
@@ -27,23 +27,23 @@ public:
 
 	// Load/Sync local settings (disk) and struct preference
 	void loadSync(bool doSync);
-	void inline load() { loadSync(false); }
-	void inline sync() { loadSync(true); }
+	void load() { loadSync(false); }
+	void sync() { loadSync(true); }
 
 public:
-	static inline QString cloud_base_url() { return prefs.cloud_base_url; }
-	static inline QString cloud_git_url() { return prefs.cloud_git_url; }
-	static inline QString cloud_storage_email() { return prefs.cloud_storage_email; }
-	static inline QString cloud_storage_email_encoded() { return prefs.cloud_storage_email_encoded; }
-	static inline QString cloud_storage_newpassword() { return prefs.cloud_storage_newpassword; }
-	static inline QString cloud_storage_password() { return prefs.cloud_storage_password; }
-	static inline QString cloud_storage_pin() { return prefs.cloud_storage_pin; }
-	static inline int cloud_timeout() { return prefs.cloud_timeout; }
-	static inline int cloud_verification_status() { return prefs.cloud_verification_status; }
-	static inline bool git_local_only() { return prefs.git_local_only; }
-	static inline bool save_password_local() { return prefs.save_password_local; }
-	static inline bool save_userid_local() { return prefs.save_userid_local; }
-	static inline QString userid() { return prefs.userid; }
+	static QString cloud_base_url() { return prefs.cloud_base_url; }
+	static QString cloud_git_url() { return prefs.cloud_git_url; }
+	static QString cloud_storage_email() { return prefs.cloud_storage_email; }
+	static QString cloud_storage_email_encoded() { return prefs.cloud_storage_email_encoded; }
+	static QString cloud_storage_newpassword() { return prefs.cloud_storage_newpassword; }
+	static QString cloud_storage_password() { return prefs.cloud_storage_password; }
+	static QString cloud_storage_pin() { return prefs.cloud_storage_pin; }
+	static int cloud_timeout() { return prefs.cloud_timeout; }
+	static int cloud_verification_status() { return prefs.cloud_verification_status; }
+	static bool git_local_only() { return prefs.git_local_only; }
+	static bool save_password_local() { return prefs.save_password_local; }
+	static bool save_userid_local() { return prefs.save_userid_local; }
+	static QString userid() { return prefs.userid; }
 
 public slots:
 	void set_cloud_base_url(const QString &value);
diff --git a/core/settings/qPrefDisplay.h b/core/settings/qPrefDisplay.h
index 5d077fc2a..804f4a258 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 inline load() { loadSync(false); }
-	void inline sync() { loadSync(true); }
+	void load() { loadSync(false); }
+	void sync() { loadSync(true); }
 
 public:
-	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 QString theme() { return prefs.theme; };
+	static QString divelist_font() { return prefs.divelist_font; }
+	static double font_size() { return prefs.font_size; }
+	static bool display_invalid_dives() { return prefs.display_invalid_dives; }
+	static bool show_developer() { return prefs.show_developer; }
+	static QString theme() { return prefs.theme; }
 
 public slots:
 	void set_divelist_font(const QString &value);
diff --git a/core/settings/qPrefDiveComputer.h b/core/settings/qPrefDiveComputer.h
index 30cc5e1e0..dda0b9500 100644
--- a/core/settings/qPrefDiveComputer.h
+++ b/core/settings/qPrefDiveComputer.h
@@ -19,15 +19,15 @@ public:
 
 	// Load/Sync local settings (disk) and struct preference
 	void loadSync(bool doSync);
-	void inline load() { loadSync(false); }
-	void inline sync() { loadSync(true); }
+	void load() { loadSync(false); }
+	void sync() { loadSync(true); }
 
 public:
-	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 QString product() { return prefs.dive_computer.product; };
-	static inline QString vendor() { return prefs.dive_computer.vendor; };
+	static QString device() { return prefs.dive_computer.device; }
+	static QString device_name() { return prefs.dive_computer.device_name; }
+	static int download_mode() { return prefs.dive_computer.download_mode; }
+	static QString product() { return prefs.dive_computer.product; }
+	static QString vendor() { return prefs.dive_computer.vendor; }
 
 public slots:
 	void set_device(const QString &device);
diff --git a/core/settings/qPrefFacebook.h b/core/settings/qPrefFacebook.h
index dc6efcbdb..60c037583 100644
--- a/core/settings/qPrefFacebook.h
+++ b/core/settings/qPrefFacebook.h
@@ -18,13 +18,13 @@ public:
 
 	// Load/Sync local settings (disk) and struct preference
 	void loadSync(bool doSync);
-	void inline load() {loadSync(false); }
-	void inline sync() {loadSync(true); }
+	void load() {loadSync(false); }
+	void sync() {loadSync(true); }
 
 public:
-	static inline QString access_token() { return prefs.facebook.access_token; }
-	static inline QString album_id() { return prefs.facebook.album_id; }
-	static inline QString user_id() { return prefs.facebook.user_id; }
+	static QString access_token() { return prefs.facebook.access_token; }
+	static QString album_id() { return prefs.facebook.album_id; }
+	static QString user_id() { return prefs.facebook.user_id; }
 
 public slots:
 	void set_access_token(const QString& value);
diff --git a/core/settings/qPrefProxy.h b/core/settings/qPrefProxy.h
index e7cd209fa..abca19c06 100644
--- a/core/settings/qPrefProxy.h
+++ b/core/settings/qPrefProxy.h
@@ -21,16 +21,16 @@ public:
 
 	// Load/Sync local settings (disk) and struct preference
 	void loadSync(bool doSync);
-	void inline load() { loadSync(false); }
-	void inline sync() { loadSync(true); }
+	void load() { loadSync(false); }
+	void sync() { loadSync(true); }
 
 public:
-	static inline bool proxy_auth() { return prefs.proxy_auth; }
-	static inline QString proxy_host() { return prefs.proxy_host; }
-	static inline QString proxy_pass() { return prefs.proxy_pass; }
-	static inline int proxy_port() { return prefs.proxy_port; }
-	static inline int proxy_type() { return prefs.proxy_type; }
-	static inline QString proxy_user() { return prefs.proxy_user; }
+	static bool proxy_auth() { return prefs.proxy_auth; }
+	static QString proxy_host() { return prefs.proxy_host; }
+	static QString proxy_pass() { return prefs.proxy_pass; }
+	static int proxy_port() { return prefs.proxy_port; }
+	static int proxy_type() { return prefs.proxy_type; }
+	static QString proxy_user() { return prefs.proxy_user; }
 
 public slots:
 	void set_proxy_auth(bool value);
diff --git a/core/settings/qPrefUnit.h b/core/settings/qPrefUnit.h
index c1bed4103..70ccadadd 100644
--- a/core/settings/qPrefUnit.h
+++ b/core/settings/qPrefUnit.h
@@ -25,20 +25,20 @@ public:
 
 	// Load/Sync local settings (disk) and struct preference
 	void loadSync(bool doSync);
-	void inline load() { loadSync(false); }
-	void inline sync() { loadSync(true); }
+	void load() { loadSync(false); }
+	void sync() { loadSync(true); }
 
 public:
-	static inline bool coordinates_traditional() { return prefs.coordinates_traditional; }
-	static inline units::DURATION duration_units() { return prefs.units.duration_units; }
-	static inline units::LENGTH length() { return prefs.units.length; }
-	static inline units::PRESSURE pressure() { return prefs.units.pressure; }
-	static inline bool show_units_table() { return prefs.units.show_units_table; }
-	static inline units::TEMPERATURE temperature() { return prefs.units.temperature; }
+	static bool coordinates_traditional() { return prefs.coordinates_traditional; }
+	static units::DURATION duration_units() { return prefs.units.duration_units; }
+	static units::LENGTH length() { return prefs.units.length; }
+	static units::PRESSURE pressure() { return prefs.units.pressure; }
+	static bool show_units_table() { return prefs.units.show_units_table; }
+	static units::TEMPERATURE temperature() { return prefs.units.temperature; }
 	static QString unit_system();
-	static inline units::TIME vertical_speed_time() { return prefs.units.vertical_speed_time; }
-	static inline units::VOLUME volume() { return prefs.units.volume; }
-	static inline units::WEIGHT weight() { return prefs.units.weight; }
+	static units::TIME vertical_speed_time() { return prefs.units.vertical_speed_time; }
+	static units::VOLUME volume() { return prefs.units.volume; }
+	static units::WEIGHT weight() { return prefs.units.weight; }
 
 public slots:
 	void set_coordinates_traditional(bool value);