Skip to content

Commit ac7b2da

Browse files
committed
Update includes to to be relative to src directory
Don't use relative imports like `../foo.h` as those depend on the relative position of both files. Rather than that use imports relative to the `src` directory, which explicitly is part of the include directories.
1 parent 624429b commit ac7b2da

140 files changed

Lines changed: 243 additions & 243 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

src/components/alarm/AlarmController.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
You should have received a copy of the GNU General Public License
1616
along with this program. If not, see <https://www.gnu.org/licenses/>.
1717
*/
18-
#include "AlarmController.h"
18+
#include "components/alarm/AlarmController.h"
1919
#include "systemtask/SystemTask.h"
2020
#include "app_timer.h"
2121
#include "task.h"

src/components/battery/BatteryController.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include "BatteryController.h"
1+
#include "components/battery/BatteryController.h"
22
#include "drivers/PinMap.h"
33
#include <hal/nrf_gpio.h>
44
#include <nrfx_saadc.h>

src/components/ble/AlertNotificationClient.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#include "AlertNotificationClient.h"
1+
#include "components/ble/AlertNotificationClient.h"
22
#include <algorithm>
3-
#include "NotificationManager.h"
3+
#include "components/ble/NotificationManager.h"
44
#include "systemtask/SystemTask.h"
55

66
using namespace Pinetime::Controllers;

src/components/ble/AlertNotificationClient.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#include <host/ble_gap.h>
88
#undef max
99
#undef min
10-
#include "BleClient.h"
10+
#include "components/ble/BleClient.h"
1111

1212
namespace Pinetime {
1313

src/components/ble/AlertNotificationService.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
#include "AlertNotificationService.h"
1+
#include "components/ble/AlertNotificationService.h"
22
#include <hal/nrf_rtc.h>
33
#include <cstring>
44
#include <algorithm>
5-
#include "NotificationManager.h"
5+
#include "components/ble/NotificationManager.h"
66
#include "systemtask/SystemTask.h"
77

88
using namespace Pinetime::Controllers;

src/components/ble/BatteryInformationService.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#include <nrf_log.h>
2-
#include "BatteryInformationService.h"
2+
#include "components/ble/BatteryInformationService.h"
33
#include "components/battery/BatteryController.h"
44

55
using namespace Pinetime::Controllers;

src/components/ble/BleController.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include "BleController.h"
1+
#include "components/ble/BleController.h"
22

33
using namespace Pinetime::Controllers;
44

src/components/ble/CurrentTimeClient.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include "CurrentTimeClient.h"
1+
#include "components/ble/CurrentTimeClient.h"
22
#include <hal/nrf_rtc.h>
33
#include <nrf_log.h>
44
#include "components/datetime/DateTimeController.h"

src/components/ble/CurrentTimeClient.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#undef max
66
#undef min
77
#include <cstdint>
8-
#include "BleClient.h"
8+
#include "components/ble/BleClient.h"
99

1010
namespace Pinetime {
1111
namespace Controllers {

src/components/ble/CurrentTimeService.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include "CurrentTimeService.h"
1+
#include "components/ble/CurrentTimeService.h"
22
#include <hal/nrf_rtc.h>
33
#include <nrf_log.h>
44

0 commit comments

Comments
 (0)