From f0e8bb26e94d4fd7c063c2fe5ead76c165cad5a0 Mon Sep 17 00:00:00 2001 From: Jean-François Milants Date: Tue, 19 Dec 2023 17:53:48 +0100 Subject: Watch face selection with CMake Move displayapp/Apps.h into a header only library (to make the integration easier in InfiniSim. --- src/displayapp/screens/Alarm.h | 2 +- src/displayapp/screens/ApplicationList.h | 2 +- src/displayapp/screens/CheckboxList.h | 2 +- src/displayapp/screens/InfiniPaint.h | 2 +- src/displayapp/screens/List.h | 2 +- src/displayapp/screens/Motion.h | 2 +- src/displayapp/screens/Music.h | 2 +- src/displayapp/screens/Navigation.h | 2 +- src/displayapp/screens/Paddle.h | 2 +- src/displayapp/screens/Steps.h | 2 +- src/displayapp/screens/StopWatch.h | 2 +- src/displayapp/screens/Tile.h | 2 +- src/displayapp/screens/Twos.h | 2 +- src/displayapp/screens/settings/Settings.cpp | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) (limited to 'src/displayapp/screens') diff --git a/src/displayapp/screens/Alarm.h b/src/displayapp/screens/Alarm.h index d8ed9668..993d65d1 100644 --- a/src/displayapp/screens/Alarm.h +++ b/src/displayapp/screens/Alarm.h @@ -17,7 +17,7 @@ */ #pragma once -#include "displayapp/Apps.h" +#include "displayapp/apps/Apps.h" #include "components/settings/Settings.h" #include "displayapp/screens/Screen.h" #include "displayapp/widgets/Counter.h" diff --git a/src/displayapp/screens/ApplicationList.h b/src/displayapp/screens/ApplicationList.h index 978f0287..41a413af 100644 --- a/src/displayapp/screens/ApplicationList.h +++ b/src/displayapp/screens/ApplicationList.h @@ -2,7 +2,7 @@ #include #include -#include "displayapp/Apps.h" +#include "displayapp/apps/Apps.h" #include "Screen.h" #include "ScreenList.h" #include "displayapp/Controllers.h" diff --git a/src/displayapp/screens/CheckboxList.h b/src/displayapp/screens/CheckboxList.h index c208bc48..c6119970 100644 --- a/src/displayapp/screens/CheckboxList.h +++ b/src/displayapp/screens/CheckboxList.h @@ -1,6 +1,6 @@ #pragma once -#include "displayapp/Apps.h" +#include "displayapp/apps/Apps.h" #include "displayapp/screens/Screen.h" #include #include diff --git a/src/displayapp/screens/InfiniPaint.h b/src/displayapp/screens/InfiniPaint.h index f7d6de53..b1f9741a 100644 --- a/src/displayapp/screens/InfiniPaint.h +++ b/src/displayapp/screens/InfiniPaint.h @@ -6,7 +6,7 @@ #include "displayapp/screens/Screen.h" #include "components/motor/MotorController.h" #include "Symbols.h" -#include +#include "displayapp/apps/Apps.h" #include namespace Pinetime { diff --git a/src/displayapp/screens/List.h b/src/displayapp/screens/List.h index 564229e6..17a25f82 100644 --- a/src/displayapp/screens/List.h +++ b/src/displayapp/screens/List.h @@ -5,7 +5,7 @@ #include #include "displayapp/screens/Screen.h" #include "displayapp/widgets/PageIndicator.h" -#include "displayapp/Apps.h" +#include "displayapp/apps/Apps.h" #include "components/settings/Settings.h" #define MAXLISTITEMS 4 diff --git a/src/displayapp/screens/Motion.h b/src/displayapp/screens/Motion.h index 9cd126f4..e13e068c 100644 --- a/src/displayapp/screens/Motion.h +++ b/src/displayapp/screens/Motion.h @@ -7,7 +7,7 @@ #include #include #include "displayapp/Controllers.h" -#include "displayapp/Apps.h" +#include "displayapp/apps/Apps.h" namespace Pinetime { namespace Applications { diff --git a/src/displayapp/screens/Music.h b/src/displayapp/screens/Music.h index 062bd968..52253321 100644 --- a/src/displayapp/screens/Music.h +++ b/src/displayapp/screens/Music.h @@ -21,7 +21,7 @@ #include #include #include "displayapp/screens/Screen.h" -#include "displayapp/Apps.h" +#include "displayapp/apps/Apps.h" #include "displayapp/Controllers.h" #include "Symbols.h" diff --git a/src/displayapp/screens/Navigation.h b/src/displayapp/screens/Navigation.h index e62745b2..5c7a0429 100644 --- a/src/displayapp/screens/Navigation.h +++ b/src/displayapp/screens/Navigation.h @@ -22,7 +22,7 @@ #include #include "displayapp/screens/Screen.h" #include -#include "displayapp/Apps.h" +#include "displayapp/apps/Apps.h" #include "displayapp/Controllers.h" #include "Symbols.h" diff --git a/src/displayapp/screens/Paddle.h b/src/displayapp/screens/Paddle.h index 1ea25158..586cccf4 100644 --- a/src/displayapp/screens/Paddle.h +++ b/src/displayapp/screens/Paddle.h @@ -3,7 +3,7 @@ #include #include #include "displayapp/screens/Screen.h" -#include "displayapp/Apps.h" +#include "displayapp/apps/Apps.h" #include "displayapp/Controllers.h" #include "Symbols.h" diff --git a/src/displayapp/screens/Steps.h b/src/displayapp/screens/Steps.h index 428e4b29..6443582f 100644 --- a/src/displayapp/screens/Steps.h +++ b/src/displayapp/screens/Steps.h @@ -4,7 +4,7 @@ #include #include "displayapp/screens/Screen.h" #include -#include "displayapp/Apps.h" +#include "displayapp/apps/Apps.h" #include "displayapp/Controllers.h" #include "Symbols.h" diff --git a/src/displayapp/screens/StopWatch.h b/src/displayapp/screens/StopWatch.h index b3bbba87..3386d042 100644 --- a/src/displayapp/screens/StopWatch.h +++ b/src/displayapp/screens/StopWatch.h @@ -7,7 +7,7 @@ #include "portmacro_cmsis.h" #include "systemtask/SystemTask.h" -#include "displayapp/Apps.h" +#include "displayapp/apps/Apps.h" #include "displayapp/Controllers.h" #include "Symbols.h" diff --git a/src/displayapp/screens/Tile.h b/src/displayapp/screens/Tile.h index 8c1cd12c..f1b86246 100644 --- a/src/displayapp/screens/Tile.h +++ b/src/displayapp/screens/Tile.h @@ -4,7 +4,7 @@ #include #include #include "displayapp/screens/Screen.h" -#include "displayapp/Apps.h" +#include "displayapp/apps/Apps.h" #include "components/datetime/DateTimeController.h" #include "components/settings/Settings.h" #include "components/battery/BatteryController.h" diff --git a/src/displayapp/screens/Twos.h b/src/displayapp/screens/Twos.h index d983d136..52449fd3 100644 --- a/src/displayapp/screens/Twos.h +++ b/src/displayapp/screens/Twos.h @@ -1,6 +1,6 @@ #pragma once -#include "displayapp/Apps.h" +#include "displayapp/apps/Apps.h" #include "displayapp/screens/Screen.h" #include "displayapp/Controllers.h" diff --git a/src/displayapp/screens/settings/Settings.cpp b/src/displayapp/screens/settings/Settings.cpp index 065417fa..cb5ba413 100644 --- a/src/displayapp/screens/settings/Settings.cpp +++ b/src/displayapp/screens/settings/Settings.cpp @@ -1,7 +1,7 @@ #include "displayapp/screens/settings/Settings.h" #include #include -#include "displayapp/Apps.h" +#include "displayapp/apps/Apps.h" #include "displayapp/DisplayApp.h" using namespace Pinetime::Applications::Screens; -- cgit v1.2.3-70-g09d2