mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

core: qPref, remove inline and ; for inline functions

Browse source 
Signed-off-by: Jan Iversen <jani@apache.org>
This commit is contained in:
jan Iversen 2018-08-02 18:32:51 +02:00 • committed by Dirk Hohndel
parent d6983391c6
commit 264aa883b2
8 changed files with 58 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/settings/qPref.h
View file

@ -25,8 +25,8 @@ public:
// Load/Sync local settings (disk) and struct preference // Load/Sync local settings (disk) and struct preference
void loadSync(bool doSync); void loadSync(bool doSync);
void inline load() { loadSync(false); } void load() { loadSync(false); }
void inline sync() { loadSync(true); } void sync() { loadSync(true); }
public: public:
enum cloud_status { enum cloud_status {

6
core/settings/qPrefAnimations.h
View file

@ -15,11 +15,11 @@ public:
// Load/Sync local settings (disk) and struct preference // Load/Sync local settings (disk) and struct preference
void loadSync(bool doSync); void loadSync(bool doSync);
void inline load() { loadSync(false); } void load() { loadSync(false); }
void inline sync() { loadSync(true); } void sync() { loadSync(true); }
public: public:
static inline int animation_speed() { return prefs.animation_speed; }; static int animation_speed() { return prefs.animation_speed; }
public slots: public slots:
void set_animation_speed(int value); void set_animation_speed(int value);

30
core/settings/qPrefCloudStorage.h
View file

@ -27,23 +27,23 @@ public:
// Load/Sync local settings (disk) and struct preference // Load/Sync local settings (disk) and struct preference
void loadSync(bool doSync); void loadSync(bool doSync);
void inline load() { loadSync(false); } void load() { loadSync(false); }
void inline sync() { loadSync(true); } void sync() { loadSync(true); }
public: public:
static inline QString cloud_base_url() { return prefs.cloud_base_url; } static QString cloud_base_url() { return prefs.cloud_base_url; }
static inline QString cloud_git_url() { return prefs.cloud_git_url; } static QString cloud_git_url() { return prefs.cloud_git_url; }
static inline QString cloud_storage_email() { return prefs.cloud_storage_email; } static QString cloud_storage_email() { return prefs.cloud_storage_email; }
static inline QString cloud_storage_email_encoded() { return prefs.cloud_storage_email_encoded; } static QString cloud_storage_email_encoded() { return prefs.cloud_storage_email_encoded; }
static inline QString cloud_storage_newpassword() { return prefs.cloud_storage_newpassword; } static QString cloud_storage_newpassword() { return prefs.cloud_storage_newpassword; }
static inline QString cloud_storage_password() { return prefs.cloud_storage_password; } static QString cloud_storage_password() { return prefs.cloud_storage_password; }
static inline QString cloud_storage_pin() { return prefs.cloud_storage_pin; } static QString cloud_storage_pin() { return prefs.cloud_storage_pin; }
static inline int cloud_timeout() { return prefs.cloud_timeout; } static int cloud_timeout() { return prefs.cloud_timeout; }
static inline int cloud_verification_status() { return prefs.cloud_verification_status; } static int cloud_verification_status() { return prefs.cloud_verification_status; }
static inline bool git_local_only() { return prefs.git_local_only; } static bool git_local_only() { return prefs.git_local_only; }
static inline bool save_password_local() { return prefs.save_password_local; } static bool save_password_local() { return prefs.save_password_local; }
static inline bool save_userid_local() { return prefs.save_userid_local; } static bool save_userid_local() { return prefs.save_userid_local; }
static inline QString userid() { return prefs.userid; } static QString userid() { return prefs.userid; }
public slots: public slots:
void set_cloud_base_url(const QString &value); void set_cloud_base_url(const QString &value);

14
core/settings/qPrefDisplay.h
View file

@ -19,15 +19,15 @@ public:
// Load/Sync local settings (disk) and struct preference // Load/Sync local settings (disk) and struct preference
void loadSync(bool doSync); void loadSync(bool doSync);
void inline load() { loadSync(false); } void load() { loadSync(false); }
void inline sync() { loadSync(true); } void sync() { loadSync(true); }
public: public:
static inline QString divelist_font() { return prefs.divelist_font; }; static QString divelist_font() { return prefs.divelist_font; }
static inline double font_size() { return prefs.font_size; }; static double font_size() { return prefs.font_size; }
static inline bool display_invalid_dives() { return prefs.display_invalid_dives; }; static bool display_invalid_dives() { return prefs.display_invalid_dives; }
static inline bool show_developer() { return prefs.show_developer; }; static bool show_developer() { return prefs.show_developer; }
static inline QString theme() { return prefs.theme; }; static QString theme() { return prefs.theme; }
public slots: public slots:
void set_divelist_font(const QString &value); void set_divelist_font(const QString &value);

14
core/settings/qPrefDiveComputer.h
View file

@ -19,15 +19,15 @@ public:
// Load/Sync local settings (disk) and struct preference // Load/Sync local settings (disk) and struct preference
void loadSync(bool doSync); void loadSync(bool doSync);
void inline load() { loadSync(false); } void load() { loadSync(false); }
void inline sync() { loadSync(true); } void sync() { loadSync(true); }
public: public:
static inline QString device() { return prefs.dive_computer.device; }; static QString device() { return prefs.dive_computer.device; }
static inline QString device_name() { return prefs.dive_computer.device_name; }; static QString device_name() { return prefs.dive_computer.device_name; }
static inline int download_mode() { return prefs.dive_computer.download_mode; }; static int download_mode() { return prefs.dive_computer.download_mode; }
static inline QString product() { return prefs.dive_computer.product; }; static QString product() { return prefs.dive_computer.product; }
static inline QString vendor() { return prefs.dive_computer.vendor; }; static QString vendor() { return prefs.dive_computer.vendor; }
public slots: public slots:
void set_device(const QString &device); void set_device(const QString &device);

10
core/settings/qPrefFacebook.h
View file

@ -18,13 +18,13 @@ public:
// Load/Sync local settings (disk) and struct preference // Load/Sync local settings (disk) and struct preference
void loadSync(bool doSync); void loadSync(bool doSync);
void inline load() {loadSync(false); } void load() {loadSync(false); }
void inline sync() {loadSync(true); } void sync() {loadSync(true); }
public: public:
static inline QString access_token() { return prefs.facebook.access_token; } static QString access_token() { return prefs.facebook.access_token; }
static inline QString album_id() { return prefs.facebook.album_id; } static QString album_id() { return prefs.facebook.album_id; }
static inline QString user_id() { return prefs.facebook.user_id; } static QString user_id() { return prefs.facebook.user_id; }
public slots: public slots:
void set_access_token(const QString& value); void set_access_token(const QString& value);

16
core/settings/qPrefProxy.h
View file

@ -21,16 +21,16 @@ public:
// Load/Sync local settings (disk) and struct preference // Load/Sync local settings (disk) and struct preference
void loadSync(bool doSync); void loadSync(bool doSync);
void inline load() { loadSync(false); } void load() { loadSync(false); }
void inline sync() { loadSync(true); } void sync() { loadSync(true); }
public: public:
static inline bool proxy_auth() { return prefs.proxy_auth; } static bool proxy_auth() { return prefs.proxy_auth; }
static inline QString proxy_host() { return prefs.proxy_host; } static QString proxy_host() { return prefs.proxy_host; }
static inline QString proxy_pass() { return prefs.proxy_pass; } static QString proxy_pass() { return prefs.proxy_pass; }
static inline int proxy_port() { return prefs.proxy_port; } static int proxy_port() { return prefs.proxy_port; }
static inline int proxy_type() { return prefs.proxy_type; } static int proxy_type() { return prefs.proxy_type; }
static inline QString proxy_user() { return prefs.proxy_user; } static QString proxy_user() { return prefs.proxy_user; }
public slots: public slots:
void set_proxy_auth(bool value); void set_proxy_auth(bool value);

22
core/settings/qPrefUnit.h
View file

@ -25,20 +25,20 @@ public:
// Load/Sync local settings (disk) and struct preference // Load/Sync local settings (disk) and struct preference
void loadSync(bool doSync); void loadSync(bool doSync);
void inline load() { loadSync(false); } void load() { loadSync(false); }
void inline sync() { loadSync(true); } void sync() { loadSync(true); }
public: public:
static inline bool coordinates_traditional() { return prefs.coordinates_traditional; } static bool coordinates_traditional() { return prefs.coordinates_traditional; }
static inline units::DURATION duration_units() { return prefs.units.duration_units; } static units::DURATION duration_units() { return prefs.units.duration_units; }
static inline units::LENGTH length() { return prefs.units.length; } static units::LENGTH length() { return prefs.units.length; }
static inline units::PRESSURE pressure() { return prefs.units.pressure; } static units::PRESSURE pressure() { return prefs.units.pressure; }
static inline bool show_units_table() { return prefs.units.show_units_table; } static bool show_units_table() { return prefs.units.show_units_table; }
static inline units::TEMPERATURE temperature() { return prefs.units.temperature; } static units::TEMPERATURE temperature() { return prefs.units.temperature; }
static QString unit_system(); static QString unit_system();
static inline units::TIME vertical_speed_time() { return prefs.units.vertical_speed_time; } static units::TIME vertical_speed_time() { return prefs.units.vertical_speed_time; }
static inline units::VOLUME volume() { return prefs.units.volume; } static units::VOLUME volume() { return prefs.units.volume; }
static inline units::WEIGHT weight() { return prefs.units.weight; } static units::WEIGHT weight() { return prefs.units.weight; }
public slots: public slots:
void set_coordinates_traditional(bool value); void set_coordinates_traditional(bool value);