Skip to content

Commit 3db4e01

Browse files
authored
Remove unused pointer to DisplayApp member variables (#2125)
In the screens that use `DisplayApp *app` and pass it to a child item, or use the reference just in the constructor. Afterwards the `app` member is not used. So remove it from the private member variables. Completely remove `app` parameter from `SettingDisplay` constructor as it is unused.
1 parent a0cd439 commit 3db4e01

9 files changed

+6
-14
lines changed

src/displayapp/DisplayApp.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -582,7 +582,7 @@ void DisplayApp::LoadScreen(Apps app, DisplayApp::FullRefreshDirections directio
582582
currentScreen = std::make_unique<Screens::SettingWakeUp>(settingsController);
583583
break;
584584
case Apps::SettingDisplay:
585-
currentScreen = std::make_unique<Screens::SettingDisplay>(this, settingsController);
585+
currentScreen = std::make_unique<Screens::SettingDisplay>(settingsController);
586586
break;
587587
case Apps::SettingSteps:
588588
currentScreen = std::make_unique<Screens::SettingSteps>(settingsController);

src/displayapp/screens/SystemInfo.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,7 @@ SystemInfo::SystemInfo(Pinetime::Applications::DisplayApp* app,
4040
Pinetime::Controllers::MotionController& motionController,
4141
const Pinetime::Drivers::Cst816S& touchPanel,
4242
const Pinetime::Drivers::SpiNorFlash& spiNorFlash)
43-
: app {app},
44-
dateTimeController {dateTimeController},
43+
: dateTimeController {dateTimeController},
4544
batteryController {batteryController},
4645
brightnessController {brightnessController},
4746
bleController {bleController},

src/displayapp/screens/SystemInfo.h

-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ namespace Pinetime {
3535
bool OnTouchEvent(TouchEvents event) override;
3636

3737
private:
38-
DisplayApp* app;
3938
Pinetime::Controllers::DateTime& dateTimeController;
4039
const Pinetime::Controllers::Battery& batteryController;
4140
Pinetime::Controllers::BrightnessController& brightnessController;

src/displayapp/screens/settings/SettingDisplay.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@ namespace {
2424

2525
constexpr std::array<uint16_t, 6> SettingDisplay::options;
2626

27-
SettingDisplay::SettingDisplay(Pinetime::Applications::DisplayApp* app, Pinetime::Controllers::Settings& settingsController)
28-
: app {app}, settingsController {settingsController} {
27+
SettingDisplay::SettingDisplay(Pinetime::Controllers::Settings& settingsController) : settingsController {settingsController} {
2928

3029
lv_obj_t* container1 = lv_cont_create(lv_scr_act(), nullptr);
3130

src/displayapp/screens/settings/SettingDisplay.h

+1-2
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,13 @@ namespace Pinetime {
1414

1515
class SettingDisplay : public Screen {
1616
public:
17-
SettingDisplay(DisplayApp* app, Pinetime::Controllers::Settings& settingsController);
17+
SettingDisplay(Pinetime::Controllers::Settings& settingsController);
1818
~SettingDisplay() override;
1919

2020
void UpdateSelected(lv_obj_t* object, lv_event_t event);
2121
void ToggleAlwaysOn();
2222

2323
private:
24-
DisplayApp* app;
2524
static constexpr std::array<uint16_t, 6> options = {5000, 7000, 10000, 15000, 20000, 30000};
2625

2726
Controllers::Settings& settingsController;

src/displayapp/screens/settings/SettingSetDateTime.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@ bool SettingSetDateTime::OnTouchEvent(Pinetime::Applications::TouchEvents event)
1515
SettingSetDateTime::SettingSetDateTime(Pinetime::Applications::DisplayApp* app,
1616
Pinetime::Controllers::DateTime& dateTimeController,
1717
Pinetime::Controllers::Settings& settingsController)
18-
: app {app},
19-
dateTimeController {dateTimeController},
18+
: dateTimeController {dateTimeController},
2019
settingsController {settingsController},
2120
screens {app,
2221
0,

src/displayapp/screens/settings/SettingSetDateTime.h

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ namespace Pinetime {
2020
void Quit();
2121

2222
private:
23-
DisplayApp* app;
2423
Controllers::DateTime& dateTimeController;
2524
Controllers::Settings& settingsController;
2625

src/displayapp/screens/settings/SettingWatchFace.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,7 @@ SettingWatchFace::SettingWatchFace(Pinetime::Applications::DisplayApp* app,
5454
std::array<Screens::SettingWatchFace::Item, UserWatchFaceTypes::Count>&& watchfaceItems,
5555
Pinetime::Controllers::Settings& settingsController,
5656
Pinetime::Controllers::FS& filesystem)
57-
: app {app},
58-
watchfaceItems {std::move(watchfaceItems)},
57+
: watchfaceItems {std::move(watchfaceItems)},
5958
settingsController {settingsController},
6059
filesystem {filesystem},
6160
screens {app, 0, CreateScreenList(), Screens::ScreenListModes::UpDown} {

src/displayapp/screens/settings/SettingWatchFace.h

-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ namespace Pinetime {
3434
bool OnTouchEvent(TouchEvents event) override;
3535

3636
private:
37-
DisplayApp* app;
3837
auto CreateScreenList() const;
3938
std::unique_ptr<Screen> CreateScreen(unsigned int screenNum) const;
4039

0 commit comments

Comments
 (0)