From 286a865d306740d1ec1975ba0fd164fc87c9fd87 Mon Sep 17 00:00:00 2001
From: Bertrand Songis <bsongis@gmail.com>
Date: Wed, 17 Feb 2016 20:27:26 +0100
Subject: [PATCH] [Horus] Cosmetics

---
 radio/src/gui/horus/menu_model_flightmodes.cpp      | 2 +-
 radio/src/gui/horus/menu_model_logical_switches.cpp | 2 +-
 radio/src/gui/horus/menu_model_setup.cpp            | 4 ++--
 radio/src/gui/horus/menus.h                         | 3 +--
 radio/src/gui/horus/navigation.cpp                  | 2 +-
 5 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/radio/src/gui/horus/menu_model_flightmodes.cpp b/radio/src/gui/horus/menu_model_flightmodes.cpp
index f256f4cfc..08a592978 100644
--- a/radio/src/gui/horus/menu_model_flightmodes.cpp
+++ b/radio/src/gui/horus/menu_model_flightmodes.cpp
@@ -82,7 +82,7 @@ bool menuModelFlightModesAll(evt_t event)
 
   int sub = menuVerticalPosition;
 
-  horzpos_t posHorz = menuHorizontalPosition;
+  int posHorz = menuHorizontalPosition;
   if (sub==0 && posHorz == 1) {
     REPEAT_LAST_CURSOR_MOVE(0);
     posHorz = menuHorizontalPosition;
diff --git a/radio/src/gui/horus/menu_model_logical_switches.cpp b/radio/src/gui/horus/menu_model_logical_switches.cpp
index 6a79aaa2b..b514e2d2c 100644
--- a/radio/src/gui/horus/menu_model_logical_switches.cpp
+++ b/radio/src/gui/horus/menu_model_logical_switches.cpp
@@ -84,7 +84,7 @@ bool menuModelLogicalSwitches(evt_t event)
 
   int k = 0;
   int sub = menuVerticalPosition;
-  horzpos_t horz = menuHorizontalPosition;
+  int horz = menuHorizontalPosition;
 
   if (sub>= 0 && horz>=0) {
     drawColumnHeader(STR_CSW_HEADERS, horz);
diff --git a/radio/src/gui/horus/menu_model_setup.cpp b/radio/src/gui/horus/menu_model_setup.cpp
index 759a0b21c..06d726d86 100644
--- a/radio/src/gui/horus/menu_model_setup.cpp
+++ b/radio/src/gui/horus/menu_model_setup.cpp
@@ -178,7 +178,7 @@ int getSwitchWarningsCount()
 
 bool menuModelSetup(evt_t event)
 {
-  horzpos_t l_posHorz = menuHorizontalPosition;
+  int l_posHorz = menuHorizontalPosition;
   bool CURSOR_ON_CELL = (menuHorizontalPosition >= 0);
 
   MENU(STR_MENUSETUP, LBM_MODEL_ICONS, menuTabModel, e_ModelSetup, ITEM_MODEL_SETUP_MAX,
@@ -633,7 +633,7 @@ bool menuModelSetup(evt_t event)
           }
         }
         else {
-          horzpos_t l_posHorz = menuHorizontalPosition;
+          int l_posHorz = menuHorizontalPosition;
           coord_t xOffsetBind = MODEL_SETUP_BIND_OFS;
           if (IS_MODULE_XJT(moduleIdx) && IS_D8_RX(moduleIdx)) {
             xOffsetBind = 0;
diff --git a/radio/src/gui/horus/menus.h b/radio/src/gui/horus/menus.h
index 43e2746e8..73c85bf94 100644
--- a/radio/src/gui/horus/menus.h
+++ b/radio/src/gui/horus/menus.h
@@ -35,13 +35,12 @@
 #define COLUMN_HEADER_X        150
 
 typedef evt_t & check_event_t;
-#define horzpos_t int8_t
 
 extern uint8_t menuPageIndex;
 extern uint8_t menuPageCount;
 extern uint16_t linesCount;
 extern int menuVerticalPosition;
-extern horzpos_t menuHorizontalPosition;
+extern int menuHorizontalPosition;
 extern int menuVerticalOffset;
 extern uint8_t calibrationState;
 
diff --git a/radio/src/gui/horus/navigation.cpp b/radio/src/gui/horus/navigation.cpp
index 79448eec2..da012040a 100644
--- a/radio/src/gui/horus/navigation.cpp
+++ b/radio/src/gui/horus/navigation.cpp
@@ -22,7 +22,7 @@
 
 int menuVerticalOffset;
 int menuVerticalPosition;
-horzpos_t menuHorizontalPosition;
+int menuHorizontalPosition;
 int8_t s_editMode;
 uint8_t noHighlightCounter;
 uint8_t calibrationState; // TODO rename this variable