Skip to content

Commit 314a8eb

Browse files
authored
Changed the namespace of SystemInfo::sortById to avoid a name conflict (#360)
1 parent d4f4ed0 commit 314a8eb

3 files changed

Lines changed: 4 additions & 3 deletions

File tree

src/displayapp/DisplayApp.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -331,8 +331,6 @@ void DisplayApp::LoadApp(Apps app, DisplayApp::FullRefreshDirections direction)
331331
std::make_unique<Screens::SystemInfo>(this, dateTimeController, batteryController, brightnessController, bleController, watchdog);
332332
ReturnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown);
333333
break;
334-
//
335-
336334
case Apps::FlashLight:
337335
currentScreen = std::make_unique<Screens::FlashLight>(this, *systemTask, brightnessController);
338336
ReturnApp(Apps::Clock, FullRefreshDirections::Down, TouchEvents::None);

src/displayapp/screens/SystemInfo.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ std::unique_ptr<Screen> SystemInfo::CreateScreen3() {
198198
return std::make_unique<Screens::Label>(2, 5, app, label);
199199
}
200200

201-
bool sortById(const TaskStatus_t& lhs, const TaskStatus_t& rhs) {
201+
bool SystemInfo::sortById(const TaskStatus_t& lhs, const TaskStatus_t& rhs) {
202202
return lhs.xTaskNumber < rhs.xTaskNumber;
203203
}
204204

src/displayapp/screens/SystemInfo.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,9 @@ namespace Pinetime {
4343
Pinetime::Drivers::WatchdogView& watchdog;
4444

4545
ScreenList<5> screens;
46+
47+
static bool sortById(const TaskStatus_t& lhs, const TaskStatus_t& rhs);
48+
4649
std::unique_ptr<Screen> CreateScreen1();
4750
std::unique_ptr<Screen> CreateScreen2();
4851
std::unique_ptr<Screen> CreateScreen3();

0 commit comments

Comments
 (0)