From c78211952efa07bf2f7b648493e5cbd90331672d Mon Sep 17 00:00:00 2001 From: Riku Isokoski Date: Wed, 22 Feb 2023 22:18:15 +0200 Subject: screens: Remove explicit Screen constructors This constructor didn't do anything since DisplayApp reference was removed from the Screen base class. --- src/displayapp/screens/settings/SettingChimes.cpp | 3 +-- src/displayapp/screens/settings/SettingSetDate.cpp | 2 +- src/displayapp/screens/settings/SettingSetTime.cpp | 2 +- src/displayapp/screens/settings/SettingShakeThreshold.cpp | 2 +- src/displayapp/screens/settings/SettingSteps.cpp | 2 +- src/displayapp/screens/settings/SettingTimeFormat.cpp | 3 +-- src/displayapp/screens/settings/SettingWakeUp.cpp | 2 +- 7 files changed, 7 insertions(+), 9 deletions(-) (limited to 'src/displayapp/screens/settings') diff --git a/src/displayapp/screens/settings/SettingChimes.cpp b/src/displayapp/screens/settings/SettingChimes.cpp index 6e12fb88..c9617139 100644 --- a/src/displayapp/screens/settings/SettingChimes.cpp +++ b/src/displayapp/screens/settings/SettingChimes.cpp @@ -45,8 +45,7 @@ namespace { } SettingChimes::SettingChimes(Pinetime::Applications::DisplayApp* app, Pinetime::Controllers::Settings& settingsController) - : Screen(app), - checkboxList( + : checkboxList( 0, 1, app, diff --git a/src/displayapp/screens/settings/SettingSetDate.cpp b/src/displayapp/screens/settings/SettingSetDate.cpp index c58f6fca..17f452ca 100644 --- a/src/displayapp/screens/settings/SettingSetDate.cpp +++ b/src/displayapp/screens/settings/SettingSetDate.cpp @@ -48,7 +48,7 @@ namespace { SettingSetDate::SettingSetDate(Pinetime::Applications::DisplayApp* app, Pinetime::Controllers::DateTime& dateTimeController, Pinetime::Applications::Screens::SettingSetDateTime& settingSetDateTime) - : Screen(app), dateTimeController {dateTimeController}, settingSetDateTime {settingSetDateTime} { + : dateTimeController {dateTimeController}, settingSetDateTime {settingSetDateTime} { lv_obj_t* title = lv_label_create(lv_scr_act(), nullptr); lv_label_set_text_static(title, "Set current date"); diff --git a/src/displayapp/screens/settings/SettingSetTime.cpp b/src/displayapp/screens/settings/SettingSetTime.cpp index 67ea7afa..4dbd86ed 100644 --- a/src/displayapp/screens/settings/SettingSetTime.cpp +++ b/src/displayapp/screens/settings/SettingSetTime.cpp @@ -29,7 +29,7 @@ SettingSetTime::SettingSetTime(Pinetime::Applications::DisplayApp* app, Pinetime::Controllers::DateTime& dateTimeController, Pinetime::Controllers::Settings& settingsController, Pinetime::Applications::Screens::SettingSetDateTime& settingSetDateTime) - : Screen(app), dateTimeController {dateTimeController}, settingsController {settingsController}, settingSetDateTime {settingSetDateTime} { + : dateTimeController {dateTimeController}, settingsController {settingsController}, settingSetDateTime {settingSetDateTime} { lv_obj_t* title = lv_label_create(lv_scr_act(), nullptr); lv_label_set_text_static(title, "Set current time"); diff --git a/src/displayapp/screens/settings/SettingShakeThreshold.cpp b/src/displayapp/screens/settings/SettingShakeThreshold.cpp index e7edee9a..ecb1adac 100644 --- a/src/displayapp/screens/settings/SettingShakeThreshold.cpp +++ b/src/displayapp/screens/settings/SettingShakeThreshold.cpp @@ -18,7 +18,7 @@ SettingShakeThreshold::SettingShakeThreshold(DisplayApp* app, Controllers::Settings& settingsController, Controllers::MotionController& motionController, System::SystemTask& systemTask) - : Screen(app), settingsController {settingsController}, motionController {motionController}, systemTask {systemTask} { + : settingsController {settingsController}, motionController {motionController}, systemTask {systemTask} { lv_obj_t* title = lv_label_create(lv_scr_act(), nullptr); lv_label_set_text_static(title, "Wake Sensitivity"); diff --git a/src/displayapp/screens/settings/SettingSteps.cpp b/src/displayapp/screens/settings/SettingSteps.cpp index 2e61c4d6..b022074f 100644 --- a/src/displayapp/screens/settings/SettingSteps.cpp +++ b/src/displayapp/screens/settings/SettingSteps.cpp @@ -14,7 +14,7 @@ namespace { } SettingSteps::SettingSteps(Pinetime::Applications::DisplayApp* app, Pinetime::Controllers::Settings& settingsController) - : Screen(app), settingsController {settingsController} { + : settingsController {settingsController} { lv_obj_t* container1 = lv_cont_create(lv_scr_act(), nullptr); diff --git a/src/displayapp/screens/settings/SettingTimeFormat.cpp b/src/displayapp/screens/settings/SettingTimeFormat.cpp index 824a10b2..f7c2515b 100644 --- a/src/displayapp/screens/settings/SettingTimeFormat.cpp +++ b/src/displayapp/screens/settings/SettingTimeFormat.cpp @@ -43,8 +43,7 @@ namespace { } SettingTimeFormat::SettingTimeFormat(Pinetime::Applications::DisplayApp* app, Pinetime::Controllers::Settings& settingsController) - : Screen(app), - checkboxList( + : checkboxList( 0, 1, app, diff --git a/src/displayapp/screens/settings/SettingWakeUp.cpp b/src/displayapp/screens/settings/SettingWakeUp.cpp index 620fe6e8..b587abdf 100644 --- a/src/displayapp/screens/settings/SettingWakeUp.cpp +++ b/src/displayapp/screens/settings/SettingWakeUp.cpp @@ -20,7 +20,7 @@ namespace { } SettingWakeUp::SettingWakeUp(Pinetime::Applications::DisplayApp* app, Pinetime::Controllers::Settings& settingsController) - : Screen(app), settingsController {settingsController} { + : settingsController {settingsController} { lv_obj_t* container1 = lv_cont_create(lv_scr_act(), nullptr); lv_obj_set_style_local_bg_opa(container1, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, LV_OPA_TRANSP); -- cgit v1.2.3-70-g09d2