From d1423af0d1208fbbb501b1c0ca552239b148711b Mon Sep 17 00:00:00 2001
From: Neil Horne <15316949+elecpower@users.noreply.github.com>
Date: Thu, 19 Dec 2024 11:28:38 +1100
Subject: [PATCH] chore(cpn): remove compiler warnings (#5719)

---
 companion/src/firmwares/boardjson.cpp | 18 +++++++++---------
 companion/src/firmwares/modeldata.cpp |  6 +++---
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/companion/src/firmwares/boardjson.cpp b/companion/src/firmwares/boardjson.cpp
index f75ef048652..e74d20eae8f 100644
--- a/companion/src/firmwares/boardjson.cpp
+++ b/companion/src/firmwares/boardjson.cpp
@@ -629,7 +629,7 @@ const QString BoardJson::getTrimYamlName(int index, YamlLookupType ylt) const
 
 const bool BoardJson::isInputAvailable(int index) const
 {
-  return (index >=0 && index < m_inputs->size()) ? isInputAvailable(m_inputs->at(index)) : false;
+  return (index >=0 && index < (int)m_inputs->size()) ? isInputAvailable(m_inputs->at(index)) : false;
 }
 
 // static
@@ -641,7 +641,7 @@ bool BoardJson::isInputAvailable(const InputDefn & defn)
 
 const bool BoardJson::isInputCalibrated(int index) const
 {
-  return (index >=0 && index < m_inputs->size()) ? isInputCalibrated(m_inputs->at(index)) : false;
+  return (index >=0 && index < (int)m_inputs->size()) ? isInputCalibrated(m_inputs->at(index)) : false;
 }
 
 // static
@@ -652,7 +652,7 @@ bool BoardJson::isInputCalibrated(const InputDefn & defn)
 
 const bool BoardJson::isInputConfigurable(int index) const
 {
-  return (index >=0 && index < m_inputs->size()) ? isInputConfigurable(m_inputs->at(index)) : false;
+  return (index >=0 && index < (int)m_inputs->size()) ? isInputConfigurable(m_inputs->at(index)) : false;
 }
 
 // static
@@ -663,7 +663,7 @@ bool BoardJson::isInputConfigurable(const InputDefn & defn)
 
 const bool BoardJson::isInputIgnored(int index) const
 {
-  return (index >=0 && index < m_inputs->size()) ? isInputIgnored(m_inputs->at(index)) : true;
+  return (index >=0 && index < (int)m_inputs->size()) ? isInputIgnored(m_inputs->at(index)) : true;
 }
 
 // static
@@ -698,7 +698,7 @@ bool BoardJson::isInputFlexJoystickAxis(const InputDefn & defn)
 
 const bool BoardJson::isInputFlexPot(int index) const
 {
-  return (index >=0 && index < m_inputs->size()) ? isInputFlexPot(m_inputs->at(index)) : false;
+  return (index >=0 && index < (int)m_inputs->size()) ? isInputFlexPot(m_inputs->at(index)) : false;
 }
 
 // static
@@ -741,7 +741,7 @@ bool BoardJson::isInputRTCBat(const InputDefn & defn)
 
 const bool BoardJson::isInputStick(int index) const
 {
-  return (index >=0 && index < m_inputs->size()) ? isInputStick(m_inputs->at(index)) : false;
+  return (index >=0 && index < (int)m_inputs->size()) ? isInputStick(m_inputs->at(index)) : false;
 }
 
 // static
@@ -752,7 +752,7 @@ bool BoardJson::isInputStick(const InputDefn & defn)
 
 const bool BoardJson::isInputSwitch(int index) const
 {
-  return (index >=0 && index < m_inputs->size()) ? isInputSwitch(m_inputs->at(index)) : false;
+  return (index >=0 && index < (int)m_inputs->size()) ? isInputSwitch(m_inputs->at(index)) : false;
 }
 
 // static
@@ -792,7 +792,7 @@ bool BoardJson::isSwitchStd(const SwitchDefn & defn)
 
 const bool BoardJson::isSwitchFlex(int index) const
 {
-  return (index >=0 && index < m_switches->size()) ? isSwitchFlex(m_switches->at(index)) : false;
+  return (index >=0 && index < (int)m_switches->size()) ? isSwitchFlex(m_switches->at(index)) : false;
 }
 
 // static
@@ -806,7 +806,7 @@ bool BoardJson::isSwitchFlex(const SwitchDefn & defn)
 
 const bool BoardJson::isSwitchFunc(int index) const
 {
-  return (index >=0 && index < m_switches->size()) ? isSwitchFunc(m_switches->at(index)) : false;
+  return (index >=0 && index < (int)m_switches->size()) ? isSwitchFunc(m_switches->at(index)) : false;
 }
 
 // static
diff --git a/companion/src/firmwares/modeldata.cpp b/companion/src/firmwares/modeldata.cpp
index 644295bc0f2..dd922fda608 100644
--- a/companion/src/firmwares/modeldata.cpp
+++ b/companion/src/firmwares/modeldata.cpp
@@ -1748,7 +1748,7 @@ AbstractStaticItemModel * ModelData::funcSwitchGroupStartSwitchModel(int switchc
   mdl->setName(AIM_MODELDATA_FUNCSWITCHGROUPSTARTSWITCH);
 
   mdl->appendToItemList(tr("Restore"), 0);
-  for (unsigned int i = 1; i <= switchcnt; i += 1) {
+  for (int i = 1; i <= switchcnt; i += 1) {
     mdl->appendToItemList(tr("SW") + QString::number(i), i);
   }
   mdl->appendToItemList(tr("Off"), switchcnt + 1);
@@ -1857,7 +1857,7 @@ void ModelData::setFuncGroupSwitchStart(unsigned int group, unsigned int value,
     if (getFuncSwitchGroup(i) == group)
       setFuncSwitchStart(i, value ? ModelData::FUNC_SWITCH_START_OFF : ModelData::FUNC_SWITCH_START_PREVIOUS);
   }
-  if (value > 0 && value <= switchcnt) {
+  if (value > 0 && value <= (unsigned int)switchcnt) {
     setFuncSwitchStart(value - 1, ModelData::FUNC_SWITCH_START_ON);
   }
 }
@@ -1873,7 +1873,7 @@ void ModelData::setGroupSwitchState(uint8_t group, int switchcnt)
         setFuncSwitchConfig(j, FUNC_SWITCH_CONFIG_2POS); // Toggle not valid
       }
     }
-    if (getFuncGroupSwitchStart(group, switchcnt) == switchcnt + 1) {
+    if (getFuncGroupSwitchStart(group, switchcnt) == (unsigned int)switchcnt + 1) {
       // Start state for all switches is off - set all to 'last'
       for (int j = 0; j < switchcnt; j += 1)
         if (getFuncSwitchGroup(j) == group)