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, 0 insertions, 36 deletions

diff --git a/core/settings/qPrefPrivate.h b/core/settings/qPrefPrivate.h
index 062b30277..681627d4f 100644
--- a/core/settings/qPrefPrivate.h
+++ b/core/settings/qPrefPrivate.h
@@ -115,37 +115,6 @@ void qPref ## usegroup::disk_ ## field(bool doSync) \
 	LOADSYNC_TXT(name, field); \
 }
 
-//******* Macros to generate get function
-#define GET_PREFERENCE_BOOL(usegroup, field) \
-bool qPref ## usegroup::field () const \
-{ \
-	return prefs.field; \
-}
-
-#define GET_PREFERENCE_DOUBLE(usegroup, field) \
-double  qPref ## usegroup::field () const \
-{ \
-	return prefs.field; \
-}
-
-#define GET_PREFERENCE_ENUM(usegroup, type, field) \
-struct type  qPref ## usegroup:: ## field () const \
-{ \
-	return prefs.field; \
-}
-
-#define GET_PREFERENCE_INT(usegroup, field) \
-int qPref ## usegroup::field () const \
-{ \
-	return prefs.field; \
-}
-
-#define GET_PREFERENCE_TXT(usegroup, field) \
-const QString qPref ## usegroup::field () const \
-{ \
-	return prefs.field; \
-}
-
 //******* Macros to generate set function
 #define SET_PREFERENCE_BOOL(usegroup, field) \
 void qPref ## usegroup::set_ ## field (bool value) \
@@ -199,27 +168,22 @@ void qPref ## usegroup::set_ ## field (const QString& value) \
 
 //******* Macros to generate set/set/loadsync combined
 #define HANDLE_PREFERENCE_BOOL(usegroup, name, field) \
-GET_PREFERENCE_BOOL(usegroup, field); \
 SET_PREFERENCE_BOOL(usegroup, field); \
 DISK_LOADSYNC_BOOL(usegroup, name, field);
 
 #define HANDLE_PREFERENCE_DOUBLE(usegroup, name, field) \
-GET_PREFERENCE_DOUBLE(usegroup, field); \
 SET_PREFERENCE_DOUBLE(usegroup, field); \
 DISK_LOADSYNC_DOUBLE(usegroup, name, field);
 
 #define HANDLE_PREFERENCE_ENUM(usegroup, type, name, field) \
-GET_PREFERENCE_ENUM(usegroup, type, field); \
 SET_PREFERENCE_ENUM(usegroup, type, field); \
 DISK_LOADSYNC_ENUM(usegroup, name, type, field);
 
 #define HANDLE_PREFERENCE_INT(usegroup, name, field) \
-GET_PREFERENCE_INT(usegroup, field); \
 SET_PREFERENCE_INT(usegroup, field); \
 DISK_LOADSYNC_INT(usegroup, name, field);
 
 #define HANDLE_PREFERENCE_TXT(usegroup, name, field) \
-GET_PREFERENCE_TXT(usegroup, field); \
 SET_PREFERENCE_TXT(usegroup, field); \
 DISK_LOADSYNC_TXT(usegroup, name, field);