mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-01-31 22:03:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

core: expand qPref macros to handle sub structure

Browse source 
Expand SET_, DISK_ and HANDLE_ macros with field for substructure

Structure prefs contains e.g. prefs.dive_computer.vendor an extra field
are added to the macros to allow this.

Signed-off-by: Jan Iversen <jani@apache.org>
This commit is contained in:
jan Iversen 2018-07-22 15:30:07 +02:00 • committed by Dirk Hohndel
parent 92ade62260
commit ead05c8e17
1 changed files with 83 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

134
core/settings/qPrefPrivate.h
View file

@ -32,130 +32,162 @@ private:
//******* Macros to generate disk function //******* Macros to generate disk function
#define DISK_LOADSYNC_BOOL_EXT(usegroup, name, field, usestruct) \
void qPref ## usegroup::disk_ ## field(bool doSync) \
{ \
if (doSync) \
qPrefPrivate::instance()->setting.setValue(group + name, prefs.usestruct field); \
else \
prefs.usestruct field = qPrefPrivate::instance()->setting.value(group + name, default_prefs.usestruct field).toBool(); \
}
#define DISK_LOADSYNC_BOOL(usegroup, name, field) \ #define DISK_LOADSYNC_BOOL(usegroup, name, field) \
DISK_LOADSYNC_BOOL_EXT(usegroup, name, field, )
#define DISK_LOADSYNC_DOUBLE_EXT(usegroup, name, field, usestruct) \
void qPref ## usegroup::disk_ ## field(bool doSync) \ void qPref ## usegroup::disk_ ## field(bool doSync) \
{ \ { \
if (doSync) \ if (doSync) \
qPrefPrivate::instance()->setting.setValue(group + name, prefs.field); \ qPrefPrivate::instance()->setting.setValue(group + name, prefs.usestruct field); \
else \ else \
prefs.field = qPrefPrivate::instance()->setting.value(group + name, default_prefs.field).toBool(); \ prefs.usestruct field = qPrefPrivate::instance()->setting.value(group + name, default_prefs.usestruct field).toDouble(); \
} }
#define DISK_LOADSYNC_DOUBLE(usegroup, name, field) \ #define DISK_LOADSYNC_DOUBLE(usegroup, name, field) \
DISK_LOADSYNC_DOUBLE_EXT(usegroup, name, field, )
#define DISK_LOADSYNC_ENUM_EXT(usegroup, name, type, field, usestruct) \
void qPref ## usegroup::disk_ ## field(bool doSync) \ void qPref ## usegroup::disk_ ## field(bool doSync) \
{ \ { \
if (doSync) \ if (doSync) \
qPrefPrivate::instance()->setting.setValue(group + name, prefs.field); \ qPrefPrivate::instance()->setting.setValue(group + name, prefs.usestruct field); \
else \ else \
prefs.field = qPrefPrivate::instance()->setting.value(group + name, default_prefs.field).toDouble(); \ prefs.usestruct field = (enum type)qPrefPrivate::instance()->setting.value(group + name, default_prefs.usestruct field).toInt(); \
} }
#define DISK_LOADSYNC_ENUM(usegroup, name, type, field) \ #define DISK_LOADSYNC_ENUM(usegroup, name, type, field) \
void qPref ## usegroup::disk_ ## field(bool doSync) \ DISK_LOADSYNC_ENUM_EXT(usegroup, name, type, field, )
{ \
if (doSync) \
qPrefPrivate::instance()->setting.setValue(group + name, prefs.field); \
else \
prefs.field = (enum type)qPrefPrivate::instance()->setting.value(group + name, default_prefs.field).toInt(); \
}
#define DISK_LOADSYNC_INT(usegroup, name, field) \ #define DISK_LOADSYNC_INT_EXT(usegroup, name, field, usestruct) \
void qPref ## usegroup::disk_ ## field(bool doSync) \ void qPref ## usegroup::disk_ ## field(bool doSync) \
{ \ { \
if (doSync) \ if (doSync) \
qPrefPrivate::instance()->setting.setValue(group + name, prefs.field); \ qPrefPrivate::instance()->setting.setValue(group + name, prefs.usestruct field); \
else \ else \
prefs.field = qPrefPrivate::instance()->setting.value(group + name, default_prefs.field).toInt(); \ prefs.usestruct field = qPrefPrivate::instance()->setting.value(group + name, default_prefs.usestruct field).toInt(); \
} }
#define DISK_LOADSYNC_INT(usegroup, name, field) \
DISK_LOADSYNC_INT(usegroup, name, field, )
#define DISK_LOADSYNC_INT_DEF_EXT(usegroup, name, field, defval, usestruct) \
void qPref ## usegroup::disk_ ## field(bool doSync) \
{ \
if (doSync) \
qPrefPrivate::instance()->setting.setValue(group + name, prefs.usestruct field); \
else \
prefs.usestruct field = qPrefPrivate::instance()->setting.value(group + name, defval).toInt(); \
}
#define DISK_LOADSYNC_INT_DEF(usegroup, name, field, defval) \ #define DISK_LOADSYNC_INT_DEF(usegroup, name, field, defval) \
void qPref ## usegroup::disk_ ## field(bool doSync) \ DISK_LOADSYNC_INT_DEF_EXT(usegroup, name, field, defval, )
{ \
if (doSync) \
qPrefPrivate::instance()->setting.setValue(group + name, prefs.field); \
else \
prefs.field = qPrefPrivate::instance()->setting.value(group + name, defval).toInt(); \
}
#define DISK_LOADSYNC_TXT(usegroup, name, field) \ #define DISK_LOADSYNC_TXT_EXT(usegroup, name, field, usestruct) \
void qPref ## usegroup::disk_ ## field(bool doSync) \ void qPref ## usegroup::disk_ ## field(bool doSync) \
{ \ { \
if (doSync) \ if (doSync) \
qPrefPrivate::instance()->setting.setValue(group + name, prefs.field); \ qPrefPrivate::instance()->setting.setValue(group + name, prefs.usestruct field); \
else \ else \
prefs.field = copy_qstring(qPrefPrivate::instance()->setting.value(group + name, default_prefs.field).toString()); \ prefs.usestruct field = copy_qstring(qPrefPrivate::instance()->setting.value(group + name, default_prefs.usestruct field).toString()); \
} }
#define DISK_LOADSYNC_TXT(usegroup, name, field) \
DISK_LOADSYNC_TXT_EXT(usegroup, name, field, )
//******* Macros to generate set function //******* Macros to generate set function
#define SET_PREFERENCE_BOOL(usegroup, field) \ #define SET_PREFERENCE_BOOL_EXT(usegroup, field, usestruct) \
void qPref ## usegroup::set_ ## field (bool value) \ void qPref ## usegroup::set_ ## field (bool value) \
{ \ { \
if (value != prefs.field) { \ if (value != prefs.usestruct field) { \
prefs.field = value; \ prefs.usestruct field = value; \
disk_ ## field(true); \ disk_ ## field(true); \
emit field ## _changed(value); \ emit field ## _changed(value); \
} \ } \
} }
#define SET_PREFERENCE_BOOL(usegroup, field) \
SET_PREFERENCE_BOOL_EXT(usegroup, field, ) \
#define SET_PREFERENCE_DOUBLE(usegroup, field) \ #define SET_PREFERENCE_DOUBLE_EXT(usegroup, field, usestruct) \
void qPref ## usegroup::set_ ## field (double value) \ void qPref ## usegroup::set_ ## field (double value) \
{ \ { \
if (value != prefs.field) { \ if (value != prefs.usestruct field) { \
prefs.field = value; \ prefs.usestruct field = value; \
disk_ ## field(true); \ disk_ ## field(true); \
emit field ## _changed(value); \ emit field ## _changed(value); \
} \ } \
} }
#define SET_PREFERENCE_DOUBLE(usegroup, field) \
SET_PREFERENCE_DOUBLE_EXT(usegroup, field, ) \
#define SET_PREFERENCE_ENUM(usegroup, type, field) \ #define SET_PREFERENCE_ENUM_EXT(usegroup, type, field, usestruct) \
void qPref ## usegroup::set_ ## field (type value) \ void qPref ## usegroup::set_ ## field (type value) \
{ \ { \
if (value != prefs.field) { \ if (value != prefs.usestruct field) { \
prefs.field = value; \ prefs.usestruct field = value; \
disk_ ## field(true); \ disk_ ## field(true); \
emit field ## _changed(value); \ emit field ## _changed(value); \
} \ } \
} }
#define SET_PREFERENCE_ENUM(usegroup, type, field) \
SET_PREFERENCE_ENUM_EXT(usegroup, type, field, )
#define SET_PREFERENCE_INT(usegroup, field) \ #define SET_PREFERENCE_INT_EXT(usegroup, field, usestruct) \
void qPref ## usegroup::set_ ## field (int value) \ void qPref ## usegroup::set_ ## field (int value) \
{ \ { \
if (value != prefs.field) { \ if (value != prefs.usestruct field) { \
prefs.field = value; \ prefs.usestruct field = value; \
disk_ ## field(true); \ disk_ ## field(true); \
emit field ## _changed(value); \ emit field ## _changed(value); \
} \ } \
} }
#define SET_PREFERENCE_INT(usegroup, field) \
SET_PREFERENCE_INT_EXT(usegroup, field, ) \
#define SET_PREFERENCE_TXT(usegroup, field) \ #define SET_PREFERENCE_TXT_EXT(usegroup, field, usestruct) \
void qPref ## usegroup::set_ ## field (const QString& value) \ void qPref ## usegroup::set_ ## field (const QString& value) \
{ \ { \
if (value != prefs.field) { \ if (value != prefs.usestruct field) { \
qPrefPrivate::instance()->copy_txt(&prefs.field, value); \ qPrefPrivate::instance()->copy_txt(&prefs.usestruct field, value); \
disk_ ## field(true); \ disk_ ## field(true); \
emit field ## _changed(value); \ emit field ## _changed(value); \
} \ } \
} }
#define SET_PREFERENCE_TXT(usegroup, field) \
SET_PREFERENCE_TXT_EXT(usegroup, field, ) \
//******* Macros to generate set/set/loadsync combined //******* Macros to generate set/set/loadsync combined
#define HANDLE_PREFERENCE_BOOL_EXT(usegroup, name, field, usestruct) \
SET_PREFERENCE_BOOL_EXT(usegroup, field, usestruct); \
DISK_LOADSYNC_BOOL_EXT(usegroup, name, field, usestruct);
#define HANDLE_PREFERENCE_BOOL(usegroup, name, field) \ #define HANDLE_PREFERENCE_BOOL(usegroup, name, field) \
SET_PREFERENCE_BOOL(usegroup, field); \ HANDLE_PREFERENCE_BOOL_EXT(usegroup, name, field, )
DISK_LOADSYNC_BOOL(usegroup, name, field);
#define HANDLE_PREFERENCE_DOUBLE_EXT(usegroup, name, field, usestruct) \
SET_PREFERENCE_DOUBLE_EXT(usegroup, field, usestruct); \
DISK_LOADSYNC_DOUBLE_EXT(usegroup, name, field, usestruct);
#define HANDLE_PREFERENCE_DOUBLE(usegroup, name, field) \ #define HANDLE_PREFERENCE_DOUBLE(usegroup, name, field) \
SET_PREFERENCE_DOUBLE(usegroup, field); \ HANDLE_PREFERENCE_DOUBLE_EXT(usegroup, name, field, )
DISK_LOADSYNC_DOUBLE(usegroup, name, field);
#define HANDLE_PREFERENCE_ENUM_EXT(usegroup, type, name, field, usestruct) \
SET_PREFERENCE_ENUM_EXT(usegroup, type, field, usestruct); \
DISK_LOADSYNC_ENUM_EXT(usegroup, name, type, field, usestruct);
#define HANDLE_PREFERENCE_ENUM(usegroup, type, name, field) \ #define HANDLE_PREFERENCE_ENUM(usegroup, type, name, field) \
SET_PREFERENCE_ENUM(usegroup, type, field); \ HANDLE_PREFERENCE_ENUM_EXT(usegroup, type, name, field, )
DISK_LOADSYNC_ENUM(usegroup, name, type, field);
#define HANDLE_PREFERENCE_INT_EXT(usegroup, name, field, usestruct) \
SET_PREFERENCE_INT_EXT(usegroup, field, usestruct); \
DISK_LOADSYNC_INT_EXT(usegroup, name, field, usestruct);
#define HANDLE_PREFERENCE_INT(usegroup, name, field) \ #define HANDLE_PREFERENCE_INT(usegroup, name, field) \
SET_PREFERENCE_INT(usegroup, field); \ HANDLE_PREFERENCE_INT_EXT(usegroup, name, field, )
DISK_LOADSYNC_INT(usegroup, name, field);
#define HANDLE_PREFERENCE_TXT_EXT(usegroup, name, field, usestruct) \
SET_PREFERENCE_TXT_EXT(usegroup, field, usestruct); \
DISK_LOADSYNC_TXT_EXT(usegroup, name, field, usestruct);
#define HANDLE_PREFERENCE_TXT(usegroup, name, field) \ #define HANDLE_PREFERENCE_TXT(usegroup, name, field) \
SET_PREFERENCE_TXT(usegroup, field); \ HANDLE_PREFERENCE_TXT_EXT(usegroup, name, field, )
DISK_LOADSYNC_TXT(usegroup, name, field);
#endif #endif