From 8daee549ba7722d2886e824d0b2e155d9193a63d Mon Sep 17 00:00:00 2001
From: Daniel Agar <daniel@agar.ca>
Date: Sat, 5 Sep 2015 00:13:00 -0400
Subject: [PATCH] travis-ci add CONFIG+=WarningsAsErrorsOn

---
 .travis.yml                                          | 2 +-
 src/AutoPilotPlugins/PX4/RadioComponentController.cc | 6 +++---
 src/VehicleSetup/FirmwareUpgradeController.cc        | 2 +-
 src/VehicleSetup/JoystickConfigController.cc         | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b3b21d347..9b6acfa58 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -50,7 +50,7 @@ install:
     fi
 
 
-before_script: qmake -r qgroundcontrol.pro CONFIG+=${CONFIG} -spec ${SPEC}
+before_script: qmake -r qgroundcontrol.pro CONFIG+=${CONFIG} CONFIG+=WarningsAsErrorsOn -spec ${SPEC}
 script:
   - echo 'Building QGroundControl' && echo -en 'travis_fold:start:script.1\\r'
   - make -j4
diff --git a/src/AutoPilotPlugins/PX4/RadioComponentController.cc b/src/AutoPilotPlugins/PX4/RadioComponentController.cc
index f18f2055a..e251c2532 100644
--- a/src/AutoPilotPlugins/PX4/RadioComponentController.cc
+++ b/src/AutoPilotPlugins/PX4/RadioComponentController.cc
@@ -624,7 +624,7 @@ void RadioComponentController::_inputFlapsDetect(enum rcCalFunctions function, i
 void RadioComponentController::_resetInternalCalibrationValues(void)
 {
     // Set all raw channels to not reversed and center point values
-    for (size_t i=0; i<_chanMax; i++) {
+    for (int i=0; i<_chanMax; i++) {
         struct ChannelInfo* info = &_rgChannelInfo[i];
         info->function = rcCalFunctionMax;
         info->reversed = false;
@@ -673,7 +673,7 @@ void RadioComponentController::_setInternalCalibrationValuesFromParameters(void)
 {
     // Initialize all function mappings to not set
     
-    for (size_t i=0; i<_chanMax; i++) {
+    for (int i=0; i<_chanMax; i++) {
         struct ChannelInfo* info = &_rgChannelInfo[i];
         info->function = rcCalFunctionMax;
     }
@@ -865,7 +865,7 @@ void RadioComponentController::_stopCalibration(void)
 void RadioComponentController::_rcCalSaveCurrentValues(void)
 {
 	qCDebug(RadioComponentControllerLog) << "_rcCalSaveCurrentValues";
-    for (unsigned i = 0; i < _chanMax; i++) {
+    for (int i = 0; i < _chanMax; i++) {
         _rcValueSave[i] = _rcRawValue[i];
     }
 }
diff --git a/src/VehicleSetup/FirmwareUpgradeController.cc b/src/VehicleSetup/FirmwareUpgradeController.cc
index 66992cdc3..852c99763 100644
--- a/src/VehicleSetup/FirmwareUpgradeController.cc
+++ b/src/VehicleSetup/FirmwareUpgradeController.cc
@@ -206,7 +206,7 @@ void FirmwareUpgradeController::_getFirmwareFile(FirmwareType_t firmwareType)
     // Select the firmware set based on board type
     
     const DownloadLocationByFirmwareType_t* prgFirmware;
-    size_t crgFirmware;
+    size_t crgFirmware = 0;
     
     switch (_bootloaderBoardID) {
         case Bootloader::boardIDPX4FMUV1:
diff --git a/src/VehicleSetup/JoystickConfigController.cc b/src/VehicleSetup/JoystickConfigController.cc
index 66942d2ed..41dc552dd 100644
--- a/src/VehicleSetup/JoystickConfigController.cc
+++ b/src/VehicleSetup/JoystickConfigController.cc
@@ -411,7 +411,7 @@ void JoystickConfigController::_inputCenterWait(Joystick::AxisFunction_t functio
 void JoystickConfigController::_resetInternalCalibrationValues(void)
 {
     // Set all raw axiss to not reversed and center point values
-    for (size_t i=0; i<_axisMax; i++) {
+    for (int i=0; i<_axisMax; i++) {
         struct AxisInfo* info = &_rgAxisInfo[i];
         info->function = Joystick::maxFunction;
         info->reversed = false;
@@ -435,7 +435,7 @@ void JoystickConfigController::_setInternalCalibrationValuesFromSettings(void)
     
     // Initialize all function mappings to not set
     
-    for (size_t i=0; i<_axisMax; i++) {
+    for (int i=0; i<_axisMax; i++) {
         struct AxisInfo* info = &_rgAxisInfo[i];
         info->function = Joystick::maxFunction;
     }
@@ -580,7 +580,7 @@ void JoystickConfigController::_stopCalibration(void)
 void JoystickConfigController::_calSaveCurrentValues(void)
 {
 	qCDebug(JoystickConfigControllerLog) << "_calSaveCurrentValues";
-    for (unsigned i = 0; i < _axisMax; i++) {
+    for (int i = 0; i < _axisMax; i++) {
         _axisValueSave[i] = _axisRawValue[i];
     }
 }
-- 
2.22.0