diff options
| author | Kieran Cawthray <kieranc@gmail.com> | 2021-12-05 19:32:29 (GMT) |
|---|---|---|
| committer | Kieran Cawthray <kieranc@gmail.com> | 2021-12-05 19:32:29 (GMT) |
| commit | c00ad4af352b8573f1bba6b691bc4d74a0d1aa77 (patch) | |
| tree | 4dcf1509cf0cda12660d386005c203203f522e69 /src/displayapp/screens/Clock.cpp | |
| parent | 1b2a8a5a044d01978854b54fd30ed3737a041e9b (diff) | |
| parent | 85a25302bfac215f9ec7b993f6a2c21a20ee223b (diff) | |
Merge remote-tracking branch 'upstream/develop' into pts-settings
Diffstat (limited to 'src/displayapp/screens/Clock.cpp')
| -rw-r--r-- | src/displayapp/screens/Clock.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/displayapp/screens/Clock.cpp b/src/displayapp/screens/Clock.cpp index d112241..1415e8e 100644 --- a/src/displayapp/screens/Clock.cpp +++ b/src/displayapp/screens/Clock.cpp @@ -1,4 +1,4 @@ -#include "Clock.h" +#include "displayapp/screens/Clock.h" #include <date/date.h> #include <lvgl/lvgl.h> @@ -6,10 +6,11 @@ #include "components/motion/MotionController.h" #include "components/ble/BleController.h" #include "components/ble/NotificationManager.h" -#include "../DisplayApp.h" -#include "WatchFaceDigital.h" -#include "WatchFaceAnalog.h" -#include "PineTimeStyle.h" +#include "components/settings/Settings.h" +#include "displayapp/DisplayApp.h" +#include "displayapp/screens/WatchFaceDigital.h" +#include "displayapp/screens/WatchFaceAnalog.h" +#include "displayapp/screens/PineTimeStyle.h" using namespace Pinetime::Applications::Screens; |