From 1d9c9a6cdb2b83e589eaaedf6767bd472eae9f5c Mon Sep 17 00:00:00 2001
From: Bertrand Songis <bsongis@gmail.com>
Date: Wed, 4 Jan 2017 18:31:10 +0100
Subject: [PATCH] Cosmetics

---
 companion/src/modeledit/setup.cpp    | 2 +-
 companion/src/wizarddata.cpp         | 2 +-
 companion/src/wizarddata.h           | 2 +-
 radio/src/gui/480x272/bitmapbuffer.h | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/companion/src/modeledit/setup.cpp b/companion/src/modeledit/setup.cpp
index 2946e1779..7a8a00747 100644
--- a/companion/src/modeledit/setup.cpp
+++ b/companion/src/modeledit/setup.cpp
@@ -675,7 +675,7 @@ SetupPanel::SetupPanel(QWidget * parent, ModelData & model, GeneralSettings & ge
   // Startup switches warnings
   for (int i=0; i<firmware->getCapability(Switches); i++) {
     Firmware::Switch sw = firmware->getSwitch(i);
-    if (IS_TARANIS(firmware->getBoard())) {
+    if (IS_TARANIS(board) || IS_HORUS(board)) {
       sw.type = Firmware::SwitchType(generalSettings.switchConfig[i]);
     }
     if (sw.type == Firmware::SWITCH_NONE || sw.type == Firmware::SWITCH_TOGGLE) {
diff --git a/companion/src/wizarddata.cpp b/companion/src/wizarddata.cpp
index 965a1b6e2..dc3939ca3 100644
--- a/companion/src/wizarddata.cpp
+++ b/companion/src/wizarddata.cpp
@@ -37,7 +37,7 @@ void Channel::clear()
   weight2 = 0;
 }
 
-WizMix::WizMix(const GeneralSettings & settings, const unsigned int modelId):
+WizMix::WizMix(const GeneralSettings & settings, unsigned int modelId):
   complete(false),
   modelId(modelId),
   settings(settings),
diff --git a/companion/src/wizarddata.h b/companion/src/wizarddata.h
index 142ae6308..795123127 100644
--- a/companion/src/wizarddata.h
+++ b/companion/src/wizarddata.h
@@ -101,7 +101,7 @@ class WizMix
     Channel channel[WIZ_MAX_CHANNELS];
     bool options[WIZ_MAX_OPTIONS];
 
-    WizMix(const GeneralSettings & settings, const unsigned int modelId);
+    WizMix(const GeneralSettings & settings, unsigned int modelId);
     operator ModelData();
 
   private:
diff --git a/radio/src/gui/480x272/bitmapbuffer.h b/radio/src/gui/480x272/bitmapbuffer.h
index 45bb1c1c7..0de857559 100644
--- a/radio/src/gui/480x272/bitmapbuffer.h
+++ b/radio/src/gui/480x272/bitmapbuffer.h
@@ -221,9 +221,9 @@ class BitmapBuffer: public BitmapBufferBase<uint16_t>
     {
       if (!bmp || x >= width || y >= height)
         return;
-
-      int srcw = bmp->getWidth();
-      int srch = bmp->getHeight();
+  
+      coord_t srcw = bmp->getWidth();
+      coord_t srch = bmp->getHeight();
 
       if (w == 0)
         w = srcw;