summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJF <JF002@users.noreply.github.com>2022-03-14 21:13:56 +0100
committerGitHub <noreply@github.com>2022-03-14 21:13:56 +0100
commit76b7436dfb23791c1a9be505a89ddf80c8b583d7 (patch)
tree7ea5b219cca4a0391780448e090e9169cb75f641
parent21da5869c5e48df666ea9d9c7698f7f69528645e (diff)
parentbebc072e78145af69aacb1c2c9549da8653b7b0c (diff)
Merge pull request #1039 from NeroBurner/datetime_const_and_analog_const_ref
Datetime const and analog const ref
-rw-r--r--src/components/datetime/DateTimeController.cpp4
-rw-r--r--src/components/datetime/DateTimeController.h4
-rw-r--r--src/displayapp/screens/WatchFaceAnalog.h2
3 files changed, 5 insertions, 5 deletions
diff --git a/src/components/datetime/DateTimeController.cpp b/src/components/datetime/DateTimeController.cpp
index e0d12431..3bfbdc7e 100644
--- a/src/components/datetime/DateTimeController.cpp
+++ b/src/components/datetime/DateTimeController.cpp
@@ -108,11 +108,11 @@ void DateTime::UpdateTime(uint32_t systickCounter) {
}
}
-const char* DateTime::MonthShortToString() {
+const char* DateTime::MonthShortToString() const {
return MonthsString[static_cast<uint8_t>(month)];
}
-const char* DateTime::DayOfWeekShortToString() {
+const char* DateTime::DayOfWeekShortToString() const {
return DaysStringShort[static_cast<uint8_t>(dayOfWeek)];
}
diff --git a/src/components/datetime/DateTimeController.h b/src/components/datetime/DateTimeController.h
index 6e5ee3ca..00bbc2ee 100644
--- a/src/components/datetime/DateTimeController.h
+++ b/src/components/datetime/DateTimeController.h
@@ -61,8 +61,8 @@ namespace Pinetime {
return second;
}
- const char* MonthShortToString();
- const char* DayOfWeekShortToString();
+ const char* MonthShortToString() const;
+ const char* DayOfWeekShortToString() const;
static const char* MonthShortToStringLow(Months month);
std::chrono::time_point<std::chrono::system_clock, std::chrono::nanoseconds> CurrentDateTime() const {
diff --git a/src/displayapp/screens/WatchFaceAnalog.h b/src/displayapp/screens/WatchFaceAnalog.h
index a18eb299..3377d39e 100644
--- a/src/displayapp/screens/WatchFaceAnalog.h
+++ b/src/displayapp/screens/WatchFaceAnalog.h
@@ -74,7 +74,7 @@ namespace Pinetime {
lv_obj_t* batteryIcon;
lv_obj_t* notificationIcon;
- Controllers::DateTime& dateTimeController;
+ const Controllers::DateTime& dateTimeController;
Controllers::Battery& batteryController;
Controllers::Ble& bleController;
Controllers::NotificationManager& notificationManager;