From 866280084fd383eb2e7f1a8ed55faf91f87bb2bd Mon Sep 17 00:00:00 2001
From: Alessio Morale <alessiomorale@gmail.com>
Date: Thu, 2 Feb 2017 00:32:19 +0100
Subject: [PATCH] LP-446 - Fixes from review

---
 .../src/plugins/config/configinputwidget.cpp   | 18 +++++++++---------
 .../gcs/src/plugins/config/configinputwidget.h |  1 -
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/ground/gcs/src/plugins/config/configinputwidget.cpp b/ground/gcs/src/plugins/config/configinputwidget.cpp
index 714b5a4ed..75806f78d 100644
--- a/ground/gcs/src/plugins/config/configinputwidget.cpp
+++ b/ground/gcs/src/plugins/config/configinputwidget.cpp
@@ -1792,7 +1792,7 @@ void ConfigInputWidget::updatePositionSlider()
 {
     ManualControlSettings::DataFields manualSettingsDataPriv = manualSettingsObj->getData();
 
-    QWidget *fmodes[] = {
+    QWidget *fmsModes[] = {
         ui->fmsModePos1,
         ui->fmsModePos2,
         ui->fmsModePos3,
@@ -1800,7 +1800,7 @@ void ConfigInputWidget::updatePositionSlider()
         ui->fmsModePos5,
         ui->fmsModePos6
     };
-    QWidget *pidbanks[] = {
+    QWidget *pidBanks[] = {
         ui->pidBankSs1_0,
         ui->pidBankSs1_1,
         ui->pidBankSs1_2,
@@ -1808,7 +1808,7 @@ void ConfigInputWidget::updatePositionSlider()
         ui->pidBankSs1_4,
         ui->pidBankSs1_5
     };
-    QWidget *assisstecontrols[] = {
+    QWidget *assistControls[] = {
         ui->assistControlPos1,
         ui->assistControlPos2,
         ui->assistControlPos3,
@@ -1820,9 +1820,9 @@ void ConfigInputWidget::updatePositionSlider()
     for (quint32 i = 0; i < FlightModeSettings::FLIGHTMODEPOSITION_NUMELEM; i++) {
         bool enabled = i < manualSettingsDataPriv.FlightModeNumber;
 
-        fmodes[i]->setEnabled(enabled);
-        pidbanks[i]->setEnabled(enabled);
-        assisstecontrols[i]->setEnabled(enabled);
+        fmsModes[i]->setEnabled(enabled);
+        pidBanks[i]->setEnabled(enabled);
+        assistControls[i]->setEnabled(enabled);
         setComboBoxItemEnabled(ui->failsafeFlightMode, i, enabled);
         setComboBoxItemEnabled(ui->failsafeBatteryCriticalFlightMode, i, enabled);
         setComboBoxItemEnabled(ui->failsafeBatteryWarningFlightMode, i, enabled);
@@ -2135,7 +2135,7 @@ void ConfigInputWidget::updateReceiverActivityStatus()
 
 void ConfigInputWidget::failsafeBatteryWarningFlightModeChanged(int index)
 {
-    hwSettingsData = hwSettingsObj->getData();
+    HwSettings::DataFields hwSettingsData = hwSettingsObj->getData();
     bool batteryModuleEnabled = (hwSettingsData.OptionalModules[HwSettings::OPTIONALMODULES_BATTERY] == HwSettings::OPTIONALMODULES_ENABLED);
 
     ui->failsafeBatteryWarningFlightMode->setEnabled(batteryModuleEnabled && index != -1);
@@ -2144,7 +2144,7 @@ void ConfigInputWidget::failsafeBatteryWarningFlightModeChanged(int index)
 
 void ConfigInputWidget::failsafeBatteryCriticalFlightModeChanged(int index)
 {
-    hwSettingsData = hwSettingsObj->getData();
+    HwSettings::DataFields hwSettingsData = hwSettingsObj->getData();
     bool batteryModuleEnabled = (hwSettingsData.OptionalModules[HwSettings::OPTIONALMODULES_BATTERY] == HwSettings::OPTIONALMODULES_ENABLED);
 
     ui->failsafeBatteryCriticalFlightMode->setEnabled(batteryModuleEnabled && index != -1);
@@ -2176,7 +2176,7 @@ void ConfigInputWidget::enableControlsChanged(bool enabled)
 {
     ui->failsafeFlightMode->setEnabled(enabled && ui->failsafeFlightMode->currentIndex() != -1);
 
-    hwSettingsData = hwSettingsObj->getData();
+    HwSettings::DataFields hwSettingsData = hwSettingsObj->getData();
     bool batteryModuleEnabled = (hwSettingsData.OptionalModules[HwSettings::OPTIONALMODULES_BATTERY] == HwSettings::OPTIONALMODULES_ENABLED);
     ui->failsafeBatteryWarningFlightMode->setEnabled(batteryModuleEnabled && enabled && ui->failsafeBatteryWarningFlightMode->currentIndex() != -1);
     ui->failsafeBatteryCriticalFlightMode->setEnabled(batteryModuleEnabled && enabled && ui->failsafeBatteryCriticalFlightMode->currentIndex() != -1);
diff --git a/ground/gcs/src/plugins/config/configinputwidget.h b/ground/gcs/src/plugins/config/configinputwidget.h
index 59030d460..5f98ec3db 100644
--- a/ground/gcs/src/plugins/config/configinputwidget.h
+++ b/ground/gcs/src/plugins/config/configinputwidget.h
@@ -146,7 +146,6 @@ private:
     SystemSettings::DataFields systemSettingsData;
 
     HwSettings *hwSettingsObj;
-    HwSettings::DataFields hwSettingsData;
 
     typedef struct {
         ManualControlSettings::DataFields manualSettingsData;