[PATCH 1/5] Rename Suunto config field to be consistent

Anton Lundin glance at acc.umu.se
Thu Sep 24 15:59:02 PDT 2015


All the conflicting fields for suunto vyper configs are named _1, so
rename this one to be in the same style.

Signed-off-by: Anton Lundin <glance at acc.umu.se>
---
 qt-ui/configuredivecomputerdialog.cpp | 2 +-
 qt-ui/configuredivecomputerdialog.ui  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/qt-ui/configuredivecomputerdialog.cpp b/qt-ui/configuredivecomputerdialog.cpp
index acebcfa..a6017e9 100644
--- a/qt-ui/configuredivecomputerdialog.cpp
+++ b/qt-ui/configuredivecomputerdialog.cpp
@@ -1049,7 +1049,7 @@ void ConfigureDiveComputerDialog::reloadValuesSuuntoVyper()
 	ui.maxDepthDoubleSpinBox->setSuffix(depth_unit);
 	ui.totalTimeSpinBox->setValue(deviceDetails->totalTime);
 	ui.numberOfDivesSpinBox->setValue(deviceDetails->numberOfDives);
-	ui.modelLineEdit->setText(deviceDetails->model);
+	ui.modelLineEdit_1->setText(deviceDetails->model);
 	ui.firmwareVersionLineEdit_1->setText(deviceDetails->firmwareVersion);
 	ui.serialNoLineEdit_1->setText(deviceDetails->serialNo);
 	ui.customTextLlineEdit_1->setText(deviceDetails->customText);
diff --git a/qt-ui/configuredivecomputerdialog.ui b/qt-ui/configuredivecomputerdialog.ui
index c6bd647..f7820f7 100644
--- a/qt-ui/configuredivecomputerdialog.ui
+++ b/qt-ui/configuredivecomputerdialog.ui
@@ -1645,7 +1645,7 @@
              </widget>
             </item>
             <item row="2" column="4">
-             <widget class="QLineEdit" name="modelLineEdit">
+             <widget class="QLineEdit" name="modelLineEdit_1">
               <property name="readOnly">
                <bool>true</bool>
               </property>
-- 
2.1.4



More information about the subsurface mailing list