From 51f9fd97f510a1d98ab2a830f5405cda5dfde1be Mon Sep 17 00:00:00 2001
From: Bertrand Songis <bsongis@gmail.com>
Date: Wed, 23 Oct 2019 17:17:10 +0200
Subject: [PATCH] Merge BUTTON_NOFOCUS and FORM_NOFOCUS into NO_FOCUS

---
 radio/src/gui/colorlcd/keyboard_curve.cpp | 12 ++++++------
 radio/src/gui/colorlcd/page.cpp           |  2 +-
 radio/src/gui/colorlcd/tabsgroup.cpp      |  2 +-
 radio/src/gui/colorlcd/view_main.cpp      |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/radio/src/gui/colorlcd/keyboard_curve.cpp b/radio/src/gui/colorlcd/keyboard_curve.cpp
index 3de0ab700..dffdf1182 100644
--- a/radio/src/gui/colorlcd/keyboard_curve.cpp
+++ b/radio/src/gui/colorlcd/keyboard_curve.cpp
@@ -34,42 +34,42 @@ CurveKeyboard::CurveKeyboard() :
                  [=]() -> uint8_t {
                      putEvent(EVT_VIRTUAL_KEY_UP);
                      return 0;
-                 }, BUTTON_BACKGROUND | BUTTON_NOFOCUS);
+                 }, BUTTON_BACKGROUND | NO_FOCUS);
 
   // down
   new TextButton(this, {LCD_W / 2 - 20, 65, 40, 40}, "\201",
                  [=]() -> uint8_t {
                      putEvent(EVT_VIRTUAL_KEY_DOWN);
                      return 0;
-                 }, BUTTON_BACKGROUND | BUTTON_NOFOCUS);
+                 }, BUTTON_BACKGROUND | NO_FOCUS);
 
   // left
   left = new TextButton(this, {LCD_W / 2 - 70, 35, 40, 40}, "\177",
                         [=]() -> uint8_t {
                             putEvent(EVT_VIRTUAL_KEY_LEFT);
                             return 0;
-                        }, BUTTON_BACKGROUND | BUTTON_NOFOCUS);
+                        }, BUTTON_BACKGROUND | NO_FOCUS);
 
   // right
   right = new TextButton(this, {LCD_W / 2 + 30, 35, 40, 40}, "\176",
                          [=]() -> uint8_t {
                              putEvent(EVT_VIRTUAL_KEY_RIGHT);
                              return 0;
-                         }, BUTTON_BACKGROUND | BUTTON_NOFOCUS);
+                         }, BUTTON_BACKGROUND | NO_FOCUS);
 
   // next
   new TextButton(this, {LCD_W / 2 + 80, 35, 60, 40}, "Next",
                  [=]() -> uint8_t {
                      putEvent(EVT_VIRTUAL_KEY_NEXT);
                      return 0;
-                 }, BUTTON_BACKGROUND | BUTTON_NOFOCUS);
+                 }, BUTTON_BACKGROUND | NO_FOCUS);
 
   // previous
   new TextButton(this, {LCD_W / 2 - 140, 35, 60, 40}, "Prev",
                  [=]() -> uint8_t {
                      putEvent(EVT_VIRTUAL_KEY_PREVIOUS);
                      return 0;
-                 }, BUTTON_BACKGROUND | BUTTON_NOFOCUS);
+                 }, BUTTON_BACKGROUND | NO_FOCUS);
 
 }
 
diff --git a/radio/src/gui/colorlcd/page.cpp b/radio/src/gui/colorlcd/page.cpp
index 77ddbbd40..ba815f932 100644
--- a/radio/src/gui/colorlcd/page.cpp
+++ b/radio/src/gui/colorlcd/page.cpp
@@ -30,7 +30,7 @@ PageHeader::PageHeader(Page * parent, uint8_t icon):
        [=]() -> uint8_t {
          parent->deleteLater();
          return 0;
-       }, BUTTON_NOFOCUS)
+       }, NO_FOCUS)
 #endif
 {
 }
diff --git a/radio/src/gui/colorlcd/tabsgroup.cpp b/radio/src/gui/colorlcd/tabsgroup.cpp
index 46c0a53ba..6c377561a 100644
--- a/radio/src/gui/colorlcd/tabsgroup.cpp
+++ b/radio/src/gui/colorlcd/tabsgroup.cpp
@@ -34,7 +34,7 @@ TabsGroupHeader::TabsGroupHeader(TabsGroup * parent, uint8_t icon):
        [=]() -> uint8_t {
          parent->deleteLater();
          return 1;
-       }, BUTTON_NOFOCUS),
+       }, NO_FOCUS),
 #endif
   icon(icon),
   carousel(this, parent)
diff --git a/radio/src/gui/colorlcd/view_main.cpp b/radio/src/gui/colorlcd/view_main.cpp
index bf7a85c3b..d46a67115 100644
--- a/radio/src/gui/colorlcd/view_main.cpp
+++ b/radio/src/gui/colorlcd/view_main.cpp
@@ -161,7 +161,7 @@ ViewMain::ViewMain(bool icons):
                  [=]() -> uint8_t {
                      openMenu();
                      return 0;
-                 }, BUTTON_NOFOCUS);
+                 }, NO_FOCUS);
 #endif
 }