mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

desktop-widgets/preferences: reemove SettingsObjectWrapper

Browse source 
remove use of SettingsObjectWrapper::
remove include of SettingsObjectWrapper.h
use qPrefFoo:: for setters and getters
replace prefs.foo with qPrefXYZ::foo() where feasible
(this expands to the same code, but gives us more control
over the variable).

Signed-off-by: Jan Iversen <jani@apache.org>
This commit is contained in:
jan Iversen 2018-08-15 11:50:53 +02:00 • committed by Dirk Hohndel
parent 3b84dbe554
commit 6aee600aa7
6 changed files with 71 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

23
desktop-widgets/preferences/preferences_units.cpp
View file

@ -2,7 +2,7 @@
#include "preferences_units.h"
#include "ui_preferences_units.h"
#include "core/qthelper.h"
#include "core/subsurface-qt/SettingsObjectWrapper.h"
#include "core/settings/qPrefUnit.h"
PreferencesUnits::PreferencesUnits(): AbstractPreferencesWidget(tr("Units"),QIcon(":units-icon"),1), ui(new Ui::PreferencesUnits())
{
@ -47,18 +47,17 @@ void PreferencesUnits::refreshSettings()
void PreferencesUnits::syncSettings()
{
auto units = SettingsObjectWrapper::instance()->unit_settings;
QString unitSystem[] = {"metric", "imperial", "personal"};
short unitValue = ui->metric->isChecked() ? METRIC : (ui->imperial->isChecked() ? IMPERIAL : PERSONALIZE);
units->set_unit_system(unitSystem[unitValue]);
units->set_temperature(ui->fahrenheit->isChecked() ? units::FAHRENHEIT : units::CELSIUS);
units->set_length(ui->feet->isChecked() ? units::FEET : units::METERS);
units->set_pressure(ui->psi->isChecked() ? units::PSI : units::BAR);
units->set_volume(ui->cuft->isChecked() ? units::CUFT : units::LITER);
units->set_weight(ui->lbs->isChecked() ? units::LBS : units::KG);
units->set_vertical_speed_time(ui->vertical_speed_minutes->isChecked() ? units::MINUTES : units::SECONDS);
units->set_coordinates_traditional(ui->gpsTraditional->isChecked());
units->set_duration_units(ui->duration_mixed->isChecked() ? units::MIXED : (ui->duration_no_hours->isChecked() ? units::MINUTES_ONLY : units::ALWAYS_HOURS));
units->set_show_units_table(ui->show_units_table->isChecked());
qPrefUnits::set_unit_system(unitSystem[unitValue]);
qPrefUnits::set_temperature(ui->fahrenheit->isChecked() ? units::FAHRENHEIT : units::CELSIUS);
qPrefUnits::set_length(ui->feet->isChecked() ? units::FEET : units::METERS);
qPrefUnits::set_pressure(ui->psi->isChecked() ? units::PSI : units::BAR);
qPrefUnits::set_volume(ui->cuft->isChecked() ? units::CUFT : units::LITER);
qPrefUnits::set_weight(ui->lbs->isChecked() ? units::LBS : units::KG);
qPrefUnits::set_vertical_speed_time(ui->vertical_speed_minutes->isChecked() ? units::MINUTES : units::SECONDS);
qPrefUnits::set_coordinates_traditional(ui->gpsTraditional->isChecked());
qPrefUnits::set_duration_units(ui->duration_mixed->isChecked() ? units::MIXED : (ui->duration_no_hours->isChecked() ? units::MINUTES_ONLY : units::ALWAYS_HOURS));
qPrefUnits::set_show_units_table(ui->show_units_table->isChecked());
}