core: make qPrefAnimations/CloudStorage getters static and inline

Add static and inline to getter in all qPref header files
Remove call to GET_PREFERENCE_* in qPrefDisplay.cpp
Remove GET_PREFERENCE_* from qPrefPrivate.h

static inline is slightly faster than a function call, but it saves
a lot of coding lines (no lines in qPref*.cpp). Getters are a direct
reference to struct preferences, so they will normally only be used
from QML.

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

1 files changed, 14 insertions, 13 deletions

diff --git a/core/settings/qPrefCloudStorage.h b/core/settings/qPrefCloudStorage.h
index 529dd00f2..bfcdfe76e 100644
--- a/core/settings/qPrefCloudStorage.h
+++ b/core/settings/qPrefCloudStorage.h
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0
 #ifndef QPREFCLOUDSTORAGE_H
 #define QPREFCLOUDSTORAGE_H
+#include "core/pref.h"
 
 #include <QObject>
 
@@ -30,19 +31,19 @@ public:
 	void sync() { loadSync(true); }
 
 public:
-	const QString cloud_base_url() const;
-	const QString cloud_git_url() const;
-	const QString cloud_storage_email() const;
-	const QString cloud_storage_email_encoded() const;
-	const QString cloud_storage_newpassword() const;
-	const QString cloud_storage_password() const;
-	const QString cloud_storage_pin() const;
-	int   cloud_timeout() const;
-	int   cloud_verification_status() const;
-	bool  git_local_only() const;
-	bool  save_password_local() const;
-	bool  save_userid_local() const;
-	const QString userid() const;
+	static inline const QString cloud_base_url() { return prefs.cloud_base_url; }
+	static inline const QString cloud_git_url() { return prefs.cloud_git_url; }
+	static inline const QString cloud_storage_email() { return prefs.cloud_storage_email; }
+	static inline const QString cloud_storage_email_encoded() { return prefs.cloud_storage_email_encoded; }
+	static inline const QString cloud_storage_newpassword() { return prefs.cloud_storage_newpassword; }
+	static inline const QString cloud_storage_password() { return prefs.cloud_storage_password; }
+	static inline const 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 const QString userid() { return prefs.userid; }
 
 public slots:
 	void set_cloud_base_url(const QString& value);