From 76f07de64b397bab011f2a4a2b44fd741beee458 Mon Sep 17 00:00:00 2001 From: Riku Isokoski Date: Thu, 23 Feb 2023 22:20:22 +0200 Subject: [PATCH] displayapp: Make Cst816S references const --- src/displayapp/DisplayApp.cpp | 2 +- src/displayapp/DisplayApp.h | 4 ++-- src/displayapp/DisplayAppRecovery.cpp | 2 +- src/displayapp/DisplayAppRecovery.h | 2 +- src/displayapp/screens/SystemInfo.cpp | 2 +- src/displayapp/screens/SystemInfo.h | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/displayapp/DisplayApp.cpp b/src/displayapp/DisplayApp.cpp index d19f4d68..1fcc7464 100644 --- a/src/displayapp/DisplayApp.cpp +++ b/src/displayapp/DisplayApp.cpp @@ -61,7 +61,7 @@ namespace { DisplayApp::DisplayApp(Drivers::St7789& lcd, Components::LittleVgl& lvgl, - Drivers::Cst816S& touchPanel, + const Drivers::Cst816S& touchPanel, const Controllers::Battery& batteryController, Controllers::Ble& bleController, Controllers::DateTime& dateTimeController, diff --git a/src/displayapp/DisplayApp.h b/src/displayapp/DisplayApp.h index bad21f92..080fa110 100644 --- a/src/displayapp/DisplayApp.h +++ b/src/displayapp/DisplayApp.h @@ -53,7 +53,7 @@ namespace Pinetime { DisplayApp(Drivers::St7789& lcd, Components::LittleVgl& lvgl, - Drivers::Cst816S&, + const Drivers::Cst816S&, const Controllers::Battery& batteryController, Controllers::Ble& bleController, Controllers::DateTime& dateTimeController, @@ -80,7 +80,7 @@ namespace Pinetime { private: Pinetime::Drivers::St7789& lcd; Pinetime::Components::LittleVgl& lvgl; - Pinetime::Drivers::Cst816S& touchPanel; + const Pinetime::Drivers::Cst816S& touchPanel; const Pinetime::Controllers::Battery& batteryController; Pinetime::Controllers::Ble& bleController; Pinetime::Controllers::DateTime& dateTimeController; diff --git a/src/displayapp/DisplayAppRecovery.cpp b/src/displayapp/DisplayAppRecovery.cpp index 062ba5dd..12d00fe6 100644 --- a/src/displayapp/DisplayAppRecovery.cpp +++ b/src/displayapp/DisplayAppRecovery.cpp @@ -12,7 +12,7 @@ using namespace Pinetime::Applications; DisplayApp::DisplayApp(Drivers::St7789& lcd, Components::LittleVgl& /*lvgl*/, - Drivers::Cst816S& /*touchPanel*/, + const Drivers::Cst816S& /*touchPanel*/, const Controllers::Battery& /*batteryController*/, Controllers::Ble& bleController, Controllers::DateTime& /*dateTimeController*/, diff --git a/src/displayapp/DisplayAppRecovery.h b/src/displayapp/DisplayAppRecovery.h index 625feac4..8c62b1c0 100644 --- a/src/displayapp/DisplayAppRecovery.h +++ b/src/displayapp/DisplayAppRecovery.h @@ -48,7 +48,7 @@ namespace Pinetime { public: DisplayApp(Drivers::St7789& lcd, Components::LittleVgl& lvgl, - Drivers::Cst816S&, + const Drivers::Cst816S&, const Controllers::Battery& batteryController, Controllers::Ble& bleController, Controllers::DateTime& dateTimeController, diff --git a/src/displayapp/screens/SystemInfo.cpp b/src/displayapp/screens/SystemInfo.cpp index 84fec66d..22504fa0 100644 --- a/src/displayapp/screens/SystemInfo.cpp +++ b/src/displayapp/screens/SystemInfo.cpp @@ -37,7 +37,7 @@ SystemInfo::SystemInfo(Pinetime::Applications::DisplayApp* app, Pinetime::Controllers::Ble& bleController, Pinetime::Drivers::WatchdogView& watchdog, Pinetime::Controllers::MotionController& motionController, - Pinetime::Drivers::Cst816S& touchPanel) + const Pinetime::Drivers::Cst816S& touchPanel) : Screen(app), dateTimeController {dateTimeController}, batteryController {batteryController}, diff --git a/src/displayapp/screens/SystemInfo.h b/src/displayapp/screens/SystemInfo.h index 09b0fc46..d6629f01 100644 --- a/src/displayapp/screens/SystemInfo.h +++ b/src/displayapp/screens/SystemInfo.h @@ -29,7 +29,7 @@ namespace Pinetime { Pinetime::Controllers::Ble& bleController, Pinetime::Drivers::WatchdogView& watchdog, Pinetime::Controllers::MotionController& motionController, - Pinetime::Drivers::Cst816S& touchPanel); + const Pinetime::Drivers::Cst816S& touchPanel); ~SystemInfo() override; bool OnTouchEvent(TouchEvents event) override; @@ -40,7 +40,7 @@ namespace Pinetime { Pinetime::Controllers::Ble& bleController; Pinetime::Drivers::WatchdogView& watchdog; Pinetime::Controllers::MotionController& motionController; - Pinetime::Drivers::Cst816S& touchPanel; + const Pinetime::Drivers::Cst816S& touchPanel; ScreenList<5> screens;