summaryrefslogtreecommitdiff
path: root/src/displayapp/screens
diff options
context:
space:
mode:
authorAvamander <avamander@gmail.com>2021-06-12 12:18:19 +0300
committerGitHub <noreply@github.com>2021-06-12 11:18:19 +0200
commit314a8ebba070bd935c795cea2955d494f002797f (patch)
treed14d30d29f22f7eb15edd6494ae59afa21084883 /src/displayapp/screens
parentd4f4ed014cecb600a5fb8541cff1f01bf2c46d54 (diff)
Changed the namespace of SystemInfo::sortById to avoid a name conflict (#360)
Diffstat (limited to 'src/displayapp/screens')
-rw-r--r--src/displayapp/screens/SystemInfo.cpp2
-rw-r--r--src/displayapp/screens/SystemInfo.h3
2 files changed, 4 insertions, 1 deletions
diff --git a/src/displayapp/screens/SystemInfo.cpp b/src/displayapp/screens/SystemInfo.cpp
index a0b626e9..9ff28288 100644
--- a/src/displayapp/screens/SystemInfo.cpp
+++ b/src/displayapp/screens/SystemInfo.cpp
@@ -198,7 +198,7 @@ std::unique_ptr<Screen> SystemInfo::CreateScreen3() {
return std::make_unique<Screens::Label>(2, 5, app, label);
}
-bool sortById(const TaskStatus_t& lhs, const TaskStatus_t& rhs) {
+bool SystemInfo::sortById(const TaskStatus_t& lhs, const TaskStatus_t& rhs) {
return lhs.xTaskNumber < rhs.xTaskNumber;
}
diff --git a/src/displayapp/screens/SystemInfo.h b/src/displayapp/screens/SystemInfo.h
index c0c65554..c61a07a2 100644
--- a/src/displayapp/screens/SystemInfo.h
+++ b/src/displayapp/screens/SystemInfo.h
@@ -43,6 +43,9 @@ namespace Pinetime {
Pinetime::Drivers::WatchdogView& watchdog;
ScreenList<5> screens;
+
+ static bool sortById(const TaskStatus_t& lhs, const TaskStatus_t& rhs);
+
std::unique_ptr<Screen> CreateScreen1();
std::unique_ptr<Screen> CreateScreen2();
std::unique_ptr<Screen> CreateScreen3();