diff options
author | JF002 <JF002@users.noreply.github.com> | 2020-10-08 20:56:19 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-10-08 20:56:19 +0200 |
commit | 9d43eff43a5984dfb368445d3428560dae9269da (patch) | |
tree | 2101336e75db14023daba541c156841a7e46b640 /src/displayapp/screens | |
parent | e4f0a95af8ce6cfb71602c5f5e437ab68dd582ec (diff) | |
parent | aba3d65e3aaed2dc728d64e7e73983d35da3903b (diff) |
Merge pull request #81 from Avamander/patch-4
Fixed a typo in SystemTask
Diffstat (limited to 'src/displayapp/screens')
-rw-r--r-- | src/displayapp/screens/Screen.h | 2 | ||||
-rw-r--r-- | src/displayapp/screens/Tab.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/displayapp/screens/Screen.h b/src/displayapp/screens/Screen.h index dbf81a44..0a17b4da 100644 --- a/src/displayapp/screens/Screen.h +++ b/src/displayapp/screens/Screen.h @@ -9,7 +9,7 @@ namespace Pinetime { namespace Screens { class Screen { public: - Screen(DisplayApp* app) : app{app} {} + explicit Screen(DisplayApp* app) : app{app} {} virtual ~Screen() = default; // Return false if the app can be closed, true if it must continue to run diff --git a/src/displayapp/screens/Tab.cpp b/src/displayapp/screens/Tab.cpp index adc32578..44b806c0 100644 --- a/src/displayapp/screens/Tab.cpp +++ b/src/displayapp/screens/Tab.cpp @@ -1,13 +1,13 @@ #include <cstdio> #include <libs/date/includes/date/date.h> -#include <Components/DateTime/DateTimeController.h> +#include "components/datetime/DateTimeController.h" #include <Version.h> #include <libs/lvgl/src/lv_core/lv_obj.h> #include <libs/lvgl/src/lv_font/lv_font.h> #include <libs/lvgl/lvgl.h> #include <libraries/log/nrf_log.h> #include "Tab.h" -#include <DisplayApp/DisplayApp.h> +#include "displayapp/DisplayApp.h" using namespace Pinetime::Applications::Screens; |