diff options
author | jan Iversen <jani@apache.org> | 2018-08-19 14:00:39 +0200 |
---|---|---|
committer | Dirk Hohndel <dirk@hohndel.org> | 2018-08-25 11:49:47 -0700 |
commit | 5dd0981961f367054e38b164804548e7d9b16bfa (patch) | |
tree | 99fbf9f894cd74e656c306d6daa2fe5da01cd987 /core | |
parent | 2393dca38ed6f97e15958471cd04c01600af4dfc (diff) | |
download | subsurface-5dd0981961f367054e38b164804548e7d9b16bfa.tar.gz |
core/tests: remove QSettings from testgitstorage
update testgitstorage.cpp to use qPrefProxy and qPrefCloudStorage
remove core/prefs-macros.h since it is unused
Signed-off-by: Jan Iversen <jani@apache.org>
Diffstat (limited to 'core')
-rw-r--r-- | core/prefs-macros.h | 108 |
1 files changed, 0 insertions, 108 deletions
diff --git a/core/prefs-macros.h b/core/prefs-macros.h deleted file mode 100644 index ca5b1c7d9..000000000 --- a/core/prefs-macros.h +++ /dev/null @@ -1,108 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -#ifndef PREFSMACROS_H -#define PREFSMACROS_H - -#include "core/qthelper.h" -#include "subsurface-string.h" - -#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; \ - } - -#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; \ - } - -#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; \ - } - -#define GET_BOOL(name, field) \ - { \ - v = s.value(QString(name)); \ - if (v.isValid()) \ - prefs.field = v.toBool(); \ - else \ - 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; \ - } - -#define GET_INT(name, field) \ - { \ - v = s.value(QString(name)); \ - if (v.isValid()) \ - prefs.field = v.toInt(); \ - else \ - 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; \ - } - -#define GET_INT_DEF(name, field, defval) \ - { \ - v = s.value(QString(name)); \ - if (v.isValid()) \ - prefs.field = v.toInt(); \ - else \ - 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); \ - } - -#define SAVE_OR_REMOVE_SPECIAL(_setting, _default, _compare, _value) \ - { \ - if (_compare != _default) \ - s.setValue(_setting, _value); \ - else \ - s.remove(_setting); \ - } - -#define SAVE_OR_REMOVE(_setting, _default, _value) \ - { \ - if (_value != _default) \ - s.setValue(_setting, _value); \ - else \ - s.remove(_setting); \ - } - -#endif // PREFSMACROS_H - |