diff options
| author |  jan Iversen <jani@apache.org> | 2018-07-22 16:19:22 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2018-07-25 08:35:04 -0700 |
| commit | 3d6848b22c9fb64a99bb3dec535431a6cab09ad9 (patch) | |
| tree | c1a7aedcf02120c9ea0031194b1cef2d15db97fe /desktop-widgets/configuredivecomputerdialog.cpp | |
| parent | 98820cf970335523b4cd2a84a025c12b5480e0aa (diff) | |
| download | subsurface-3d6848b22c9fb64a99bb3dec535431a6cab09ad9.tar.gz | |
core: activate qPrefDiveComputer
remove DiveComputer from SettingsObjectWrapper and reference qPrefDiveComputer
update files using SettingsObjectWrapper/DiveComputer to use qPrefDiveComputer
this activated qPrefDiveComputer and removed the similar class from
SettingsObjectWrapper.
Signed-off-by: Jan Iversen <jani@apache.org>
Diffstat (limited to 'desktop-widgets/configuredivecomputerdialog.cpp')
| -rw-r--r-- | desktop-widgets/configuredivecomputerdialog.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/desktop-widgets/configuredivecomputerdialog.cpp b/desktop-widgets/configuredivecomputerdialog.cpp index 47eced724..9074d29e6 100644 --- a/desktop-widgets/configuredivecomputerdialog.cpp +++ b/desktop-widgets/configuredivecomputerdialog.cpp @@ -133,8 +133,8 @@ ConfigureDiveComputerDialog::ConfigureDiveComputerDialog(QWidget *parent) : QDia memset(&device_data, 0, sizeof(device_data)); fill_computer_list(); auto dc = SettingsObjectWrapper::instance()->dive_computer_settings; - if (!dc->dc_device().isEmpty()) - ui.device->setEditText(dc->dc_device()); + if (!dc->device().isEmpty()) + ui.device->setEditText(dc->device()); ui.DiveComputerList->setCurrentRow(0); on_DiveComputerList_currentRowChanged(0); @@ -912,10 +912,10 @@ void ConfigureDiveComputerDialog::getDeviceData() device_data.deviceid = device_data.diveid = 0; auto dc = SettingsObjectWrapper::instance()->dive_computer_settings; - dc->setDevice(device_data.devname); + dc->set_device(device_data.devname); #ifdef BT_SUPPORT if (ui.bluetoothMode && btDeviceSelectionDialog) - dc->setDeviceName(btDeviceSelectionDialog->getSelectedDeviceName()); + dc->set_device_name(btDeviceSelectionDialog->getSelectedDeviceName()); #endif } |