From 6e065506317e2595a0df19dba147576d392c9506 Mon Sep 17 00:00:00 2001 From: jan Iversen Date: Tue, 7 Jan 2020 14:31:49 +0100 Subject: core/settings:: remove string functions for units Remove string version of unit_system, duration_units, length, pressure, temperature, vertical_speed_time, and volume, including tests and make signals strongly typed in C++ Signed-off-by: jan Iversen Signed-off-by: Dirk Hohndel --- tests/testplannershared.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tests/testplannershared.cpp') diff --git a/tests/testplannershared.cpp b/tests/testplannershared.cpp index a0af6dc37..d9b03c247 100644 --- a/tests/testplannershared.cpp +++ b/tests/testplannershared.cpp @@ -61,7 +61,7 @@ void TestPlannerShared::test_rates() { // Set system to use meters - qPrefUnits::set_unit_system(QStringLiteral("metric")); + qPrefUnits::set_unit_system(METRIC); plannerShared::set_ascratelast6m(16); QCOMPARE(qPrefDivePlanner::ascratelast6m(), 267); @@ -109,7 +109,7 @@ void TestPlannerShared::test_rates() QCOMPARE(plannerShared::descrate(), 10); // Set system to use feet - qPrefUnits::set_unit_system(QStringLiteral("imperial")); + qPrefUnits::set_unit_system(IMPERIAL); plannerShared::set_ascratelast6m(33); QCOMPARE(qPrefDivePlanner::ascratelast6m(), 168); @@ -197,7 +197,7 @@ void TestPlannerShared::test_gas() QCOMPARE(plannerShared::problemsolvingtime(), 6); // Set system to use meters - qPrefUnits::set_unit_system(QStringLiteral("metric")); + qPrefUnits::set_unit_system(METRIC); plannerShared::set_bottomsac(30); QCOMPARE(qPrefDivePlanner::bottomsac(), 30000); @@ -245,7 +245,7 @@ void TestPlannerShared::test_gas() QCOMPARE(plannerShared::bestmixend(), 10); // Set system to use feet - qPrefUnits::set_unit_system(QStringLiteral("imperial")); + qPrefUnits::set_unit_system(IMPERIAL); plannerShared::set_bottomsac(0.9); QCOMPARE(qPrefDivePlanner::bottomsac(), 25485); -- cgit v1.2.3-70-g09d2