diff options
| author |  jan Iversen <jani@apache.org> | 2018-06-13 08:38:49 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2018-06-15 14:11:57 -0700 |
| commit | 54db1309a0896aa3615956e20a89bb71053a683f (patch) | |
| tree | 7e71334d794f52877e64d79f73ecc9ee821ce37d /core | |
| parent | 4c086a260950a5319792adf141644e5d81ffa531 (diff) | |
| download | subsurface-54db1309a0896aa3615956e20a89bb71053a683f.tar.gz | |
core: make prefs-macros compile safe.
add {} in each macro to secure it works as a single statement,
to avoid problems like
if (1)
GET_TEXT();
Signed-off-by: Jan Iversen <jani@apache.org>
Diffstat (limited to 'core')
| -rw-r--r-- | core/prefs-macros.h | 44 |
1 files changed, 33 insertions, 11 deletions
diff --git a/core/prefs-macros.h b/core/prefs-macros.h index 53361a19f..ca5b1c7d9 100644 --- a/core/prefs-macros.h +++ b/core/prefs-macros.h @@ -8,79 +8,101 @@ #define SB(V, B) s.setValue(V, (int)(B->isChecked() ? 1 : 0)) #define GET_UNIT(name, field, f, t) \ + { \ v = s.value(QString(name)); \ if (v.isValid()) \ prefs.units.field = (v.toInt() == (t)) ? (t) : (f); \ else \ - prefs.units.field = default_prefs.units.field + prefs.units.field = default_prefs.units.field; \ + } #define GET_UNIT3(name, field, f, l, type) \ + { \ v = s.value(QString(name)); \ if (v.isValid() && v.toInt() >= (f) && v.toInt() <= (l)) \ prefs.units.field = (type)v.toInt(); \ else \ - prefs.units.field = default_prefs.units.field + prefs.units.field = default_prefs.units.field; \ + } #define GET_UNIT_BOOL(name, field) \ + { \ v = s.value(QString(name)); \ if (v.isValid()) \ prefs.units.field = v.toBool(); \ else \ - prefs.units.field = default_prefs.units.field + prefs.units.field = default_prefs.units.field; \ + } #define GET_BOOL(name, field) \ + { \ v = s.value(QString(name)); \ if (v.isValid()) \ prefs.field = v.toBool(); \ else \ - prefs.field = default_prefs.field + prefs.field = default_prefs.field; \ + } #define GET_DOUBLE(name, field) \ + { \ v = s.value(QString(name)); \ if (v.isValid()) \ prefs.field = v.toDouble(); \ else \ - prefs.field = default_prefs.field + prefs.field = default_prefs.field; \ + } #define GET_INT(name, field) \ + { \ v = s.value(QString(name)); \ if (v.isValid()) \ prefs.field = v.toInt(); \ else \ - prefs.field = default_prefs.field + prefs.field = default_prefs.field; \ + } #define GET_ENUM(name, type, field) \ + { \ v = s.value(QString(name)); \ if (v.isValid()) \ prefs.field = (enum type)v.toInt(); \ else \ - prefs.field = default_prefs.field + prefs.field = default_prefs.field; \ + } #define GET_INT_DEF(name, field, defval) \ + { \ v = s.value(QString(name)); \ if (v.isValid()) \ prefs.field = v.toInt(); \ else \ - prefs.field = defval + prefs.field = defval; \ + } #define GET_TXT(name, field) \ + { \ v = s.value(QString(name)); \ if (v.isValid()) \ prefs.field = copy_qstring(v.toString()); \ else \ - prefs.field = copy_string(default_prefs.field) + prefs.field = copy_string(default_prefs.field); \ + } #define SAVE_OR_REMOVE_SPECIAL(_setting, _default, _compare, _value) \ + { \ if (_compare != _default) \ s.setValue(_setting, _value); \ else \ - s.remove(_setting) + s.remove(_setting); \ + } #define SAVE_OR_REMOVE(_setting, _default, _value) \ + { \ if (_value != _default) \ s.setValue(_setting, _value); \ else \ - s.remove(_setting) + s.remove(_setting); \ + } #endif // PREFSMACROS_H |