Cleanup: Naming

sieren · Feb 7, 2021 · 0e53cd8 · 0e53cd8
1 parent 46e2784
commit 0e53cd8
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/main/AppScreen.hpp b/main/AppScreen.hpp
@@ -25,7 +25,7 @@ class AppScreen : public UIWidget
     void setupData();
 
     template<class N = NavigationDriver>
-    void draw(typename std::enable_if<std::is_same<N, gfx::TouchDriver<typename N::MyDriver>>::value, N >::type* = 0);
+    void draw(typename std::enable_if<std::is_same<N, gfx::TouchDriver<typename N::InnerDriver>>::value, N >::type* = 0);
     template<class N = NavigationDriver>
     void draw(typename std::enable_if<std::is_same<N, gfx::ButtonDriver>::value, N >::type* = 0);
 

diff --git a/main/AppScreen.ipp b/main/AppScreen.ipp
@@ -157,7 +157,7 @@ namespace gfx
   // Touch Driver Specialization
   template<class ScreenDriver, class NavigationDriver>
   template<class N>
-  void AppScreen<ScreenDriver, NavigationDriver>::draw(typename std::enable_if<std::is_same<N, gfx::TouchDriver<typename N::MyDriver>>::value, N >::type*)
+  void AppScreen<ScreenDriver, NavigationDriver>::draw(typename std::enable_if<std::is_same<N, gfx::TouchDriver<typename N::InnerDriver>>::value, N >::type*)
   {
     std::lock_guard<std::mutex> guard(viewMutex);
     auto tapEvent = mNavigation.tapEvent();

diff --git a/main/touch/TouchDriver.h b/main/touch/TouchDriver.h
@@ -12,7 +12,7 @@ namespace gfx
   class TouchDriver
   {
     public:
-      using MyDriver = Driver;
+      using InnerDriver = Driver;
       TouchDriver(Driver* tftDriver);
       void updateHardwareConfig(config::HardwareConfig& hwConfig);
       void begin();

diff --git a/main/ui/ScreenNavigator.hpp b/main/ui/ScreenNavigator.hpp
@@ -228,7 +228,7 @@ namespace gfx
       bool mIsPresenting{false};
       // Check if we're using a TouchDriver at compile-time
       // to determine whether we need on-screen page buttons
-      static constexpr bool isTouchDriver = std::is_same<NavigationDriver, gfx::TouchDriver<typename NavigationDriver::MyDriver>>::value;
+      static constexpr bool isTouchDriver = std::is_same<NavigationDriver, gfx::TouchDriver<typename NavigationDriver::InnerDriver>>::value;
       int mCurrentButtonSelected = 0;