From 94a86df9a325b8598b8fb94938cba06c036b0f72 Mon Sep 17 00:00:00 2001
From: Anton Lundin <glance@acc.umu.se>
Date: Fri, 25 Sep 2015 00:59:02 +0200
Subject: Rename Suunto config field to be consistent

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@acc.umu.se>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
---
 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 acebcfa33..a6017e92a 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 c6bd647ec..f7820f7bd 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>
-- 
cgit v1.2.3-70-g09d2