From 5dd0981961f367054e38b164804548e7d9b16bfa Mon Sep 17 00:00:00 2001 From: jan Iversen Date: Sun, 19 Aug 2018 14:00:39 +0200 Subject: 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 --- core/prefs-macros.h | 108 ------------------------------------ packaging/ios/Subsurface-mobile.pro | 1 - tests/testgitstorage.cpp | 21 ++----- 3 files changed, 6 insertions(+), 124 deletions(-) delete mode 100644 core/prefs-macros.h 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 - diff --git a/packaging/ios/Subsurface-mobile.pro b/packaging/ios/Subsurface-mobile.pro index 7637480cb..352d3afa1 100644 --- a/packaging/ios/Subsurface-mobile.pro +++ b/packaging/ios/Subsurface-mobile.pro @@ -182,7 +182,6 @@ HEADERS += \ ../../core/membuffer.h \ ../../core/metrics.h \ ../../core/pluginmanager.h \ - ../../core/prefs-macros.h \ ../../core/qt-gui.h \ ../../core/sha1.h \ ../../core/strndup.h \ diff --git a/tests/testgitstorage.cpp b/tests/testgitstorage.cpp index 43c5ed03a..5184aeb2a 100644 --- a/tests/testgitstorage.cpp +++ b/tests/testgitstorage.cpp @@ -5,13 +5,14 @@ #include "core/dive.h" #include "core/divelist.h" #include "core/file.h" -#include "core/prefs-macros.h" +#include "core/qthelper.h" #include "core/subsurfacestartup.h" +#include "core/settings/qPrefProxy.h" +#include "core/settings/qPrefCloudStorage.h" #include #include #include -#include #include #include @@ -28,23 +29,13 @@ void TestGitStorage::initTestCase() QCoreApplication::setOrganizationName("Subsurface"); QCoreApplication::setOrganizationDomain("subsurface.hohndel.org"); QCoreApplication::setApplicationName("Subsurface"); - QSettings s; - QVariant v; - s.beginGroup("Network"); - GET_INT_DEF("proxy_type", proxy_type, QNetworkProxy::DefaultProxy); - GET_TXT("proxy_host", proxy_host); - GET_INT("proxy_port", proxy_port); - GET_BOOL("proxy_auth", proxy_auth); - GET_TXT("proxy_user", proxy_user); - GET_TXT("proxy_pass", proxy_pass); - s.endGroup(); - s.beginGroup("CloudStorage"); - GET_TXT("cloud_base_url", cloud_base_url); + qPrefProxy::load(); + qPrefCloudStorage::load(); + QString gitUrl(prefs.cloud_base_url); if (gitUrl.right(1) != "/") gitUrl += "/"; prefs.cloud_git_url = copy_qstring(gitUrl + "git"); - s.endGroup(); prefs.cloud_storage_email_encoded = strdup("ssrftest@hohndel.org"); prefs.cloud_storage_password = strdup("geheim"); QNetworkProxy proxy; -- cgit v1.2.3-70-g09d2