Skip to content

Commit

Permalink
Force include lib/ files with full path (#9387)
Browse files Browse the repository at this point in the history
* Force include lib/ files with full path

This is auto generated by using following commands:
  for i in support core asn1 mdns shell; do git sed "#include \"$i/\\(.*\\)\"\$" "#include <lib/$i/\\1>" ; done
  for i in support core asn1 mdns shell; do git sed "#include <$i/\\(.*\\)>\$" "#include <lib/$i/\\1>" ; done

Note: git-sed is in the git-extras package

* Restyle

* Manual fixes
  • Loading branch information
kghost authored Sep 2, 2021
1 parent 0764c29 commit 53dd583
Show file tree
Hide file tree
Showing 876 changed files with 2,064 additions and 2,093 deletions.
2 changes: 1 addition & 1 deletion examples/all-clusters-app/esp32/main/Button.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
#include "esp_system.h"

#include "Button.h"
#include <lib/support/CodeUtils.h>
#include <platform/CHIPDeviceLayer.h>
#include <support/CodeUtils.h>

extern const char * TAG;

Expand Down
6 changes: 3 additions & 3 deletions examples/all-clusters-app/esp32/main/CHIPDeviceManager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@

#include "CHIPDeviceManager.h"
#include <app/util/basic-types.h>
#include <lib/support/CHIPMem.h>
#include <lib/support/CodeUtils.h>
#include <lib/support/ErrorStr.h>
#include <setup_payload/SetupPayload.h>
#include <support/CHIPMem.h>
#include <support/CodeUtils.h>
#include <support/ErrorStr.h>

using namespace ::chip;

Expand Down
2 changes: 1 addition & 1 deletion examples/all-clusters-app/esp32/main/DeviceCallbacks.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
#include <app/util/basic-types.h>
#include <app/util/util.h>
#include <lib/mdns/Advertiser.h>
#include <support/CodeUtils.h>
#include <lib/support/CodeUtils.h>

static const char * TAG = "app-devicecallbacks";

Expand Down
2 changes: 1 addition & 1 deletion examples/all-clusters-app/esp32/main/QRCodeScreen.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@

#include "qrcodegen.h"

#include <lib/support/CodeUtils.h>
#include <platform/CHIPDeviceLayer.h>
#include <setup_payload/QRCodeSetupPayloadGenerator.h>
#include <support/CodeUtils.h>

// TODO need sensible library tag when put in library
extern const char * TAG;
Expand Down
2 changes: 1 addition & 1 deletion examples/all-clusters-app/esp32/main/Rpc.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#include "pw_log/log.h"
#include "pw_rpc/server.h"
#include "pw_sys_io/sys_io.h"
#include <support/logging/CHIPLogging.h>
#include <lib/support/logging/CHIPLogging.h>

#include "ScreenManager.h"
#include "esp_event.h"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@

#pragma once

#include <core/CHIPCore.h>
#include <core/CHIPError.h>
#include <lib/core/CHIPCore.h>
#include <lib/core/CHIPError.h>
#include <platform/CHIPDeviceLayer.h>

#include <support/DLLUtil.h>
#include <lib/support/DLLUtil.h>

#include <stdarg.h>
#include <stdlib.h>
Expand Down
4 changes: 2 additions & 2 deletions examples/all-clusters-app/esp32/main/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,11 @@
#include <credentials/DeviceAttestationCredsProvider.h>
#include <credentials/examples/DeviceAttestationCredsExample.h>
#include <lib/shell/Engine.h>
#include <lib/support/CHIPMem.h>
#include <lib/support/ErrorStr.h>
#include <platform/CHIPDeviceLayer.h>
#include <setup_payload/ManualSetupPayloadGenerator.h>
#include <setup_payload/QRCodeSetupPayloadGenerator.h>
#include <support/CHIPMem.h>
#include <support/ErrorStr.h>

#include <app/clusters/door-lock-server/door-lock-server.h>
#include <app/clusters/on-off-server/on-off-server.h>
Expand Down
6 changes: 3 additions & 3 deletions examples/all-clusters-app/linux/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@
#include <app/util/af.h>
#include <app/util/attribute-storage.h>
#include <app/util/util.h>
#include <core/CHIPError.h>
#include <support/CHIPMem.h>
#include <support/RandUtils.h>
#include <lib/core/CHIPError.h>
#include <lib/support/CHIPMem.h>
#include <lib/support/RandUtils.h>

#include "AppMain.h"

Expand Down
6 changes: 3 additions & 3 deletions examples/bridge-app/esp32/main/CHIPDeviceManager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@

#include "CHIPDeviceManager.h"
#include <app/util/basic-types.h>
#include <lib/support/CHIPMem.h>
#include <lib/support/CodeUtils.h>
#include <lib/support/ErrorStr.h>
#include <setup_payload/SetupPayload.h>
#include <support/CHIPMem.h>
#include <support/CodeUtils.h>
#include <support/ErrorStr.h>

using namespace ::chip;

Expand Down
2 changes: 1 addition & 1 deletion examples/bridge-app/esp32/main/Device.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
#include "Device.h"

#include <cstdio>
#include <lib/support/CHIPMemString.h>
#include <platform/CHIPDeviceLayer.h>
#include <support/CHIPMemString.h>

using namespace ::chip::Platform;

Expand Down
2 changes: 1 addition & 1 deletion examples/bridge-app/esp32/main/DeviceCallbacks.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#include <app-common/zap-generated/attribute-id.h>
#include <app-common/zap-generated/cluster-id.h>
#include <app/server/Mdns.h>
#include <support/CodeUtils.h>
#include <lib/support/CodeUtils.h>

static const char * TAG = "bridge-devicecallbacks";

Expand Down
6 changes: 3 additions & 3 deletions examples/bridge-app/esp32/main/include/CHIPDeviceManager.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@
* activities within the CHIP stack. This is a singleton object.
*/

#include <core/CHIPCore.h>
#include <core/CHIPError.h>
#include <lib/core/CHIPCore.h>
#include <lib/core/CHIPError.h>
#include <platform/CHIPDeviceLayer.h>

#include <support/DLLUtil.h>
#include <lib/support/DLLUtil.h>

#include <stdarg.h>
#include <stdlib.h>
Expand Down
6 changes: 3 additions & 3 deletions examples/bridge-app/esp32/main/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@
#include <app/reporting/reporting.h>
#include <app/server/Server.h>
#include <app/util/attribute-storage.h>
#include <core/CHIPError.h>
#include <credentials/DeviceAttestationCredsProvider.h>
#include <credentials/examples/DeviceAttestationCredsExample.h>
#include <support/CHIPMemString.h>
#include <support/ErrorStr.h>
#include <lib/core/CHIPError.h>
#include <lib/support/CHIPMemString.h>
#include <lib/support/ErrorStr.h>

#include <app/server/Server.h>

Expand Down
4 changes: 2 additions & 2 deletions examples/bridge-app/linux/Options.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@

#include "Options.h"

#include <core/CHIPError.h>
#include <support/CHIPArgParser.hpp>
#include <lib/core/CHIPError.h>
#include <lib/support/CHIPArgParser.hpp>

using namespace chip;
using namespace chip::ArgParser;
Expand Down
2 changes: 1 addition & 1 deletion examples/bridge-app/linux/include/Options.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

#include <cstdint>

#include <core/CHIPError.h>
#include <lib/core/CHIPError.h>
#include <setup_payload/SetupPayload.h>

struct LinuxDeviceOptions
Expand Down
6 changes: 3 additions & 3 deletions examples/bridge-app/linux/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,14 @@
#include <app/util/af.h>
#include <app/util/attribute-storage.h>
#include <app/util/util.h>
#include <core/CHIPError.h>
#include <credentials/DeviceAttestationCredsProvider.h>
#include <credentials/examples/DeviceAttestationCredsExample.h>
#include <lib/core/CHIPError.h>
#include <lib/support/CHIPMem.h>
#include <lib/support/RandUtils.h>
#include <lib/support/ZclString.h>
#include <setup_payload/QRCodeSetupPayloadGenerator.h>
#include <setup_payload/SetupPayload.h>
#include <support/CHIPMem.h>
#include <support/RandUtils.h>

#include "Device.h"
#include "Options.h"
Expand Down
2 changes: 1 addition & 1 deletion examples/chip-tool/commands/clusters/ModelCommand.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#include "../common/Command.h"
#include <app/chip-zcl-zpro-codec.h>
#include <controller/ExampleOperationalCredentialsIssuer.h>
#include <core/CHIPEncoding.h>
#include <lib/core/CHIPEncoding.h>

// Limits on endpoint values.
#define CHIP_ZCL_ENDPOINT_MIN 0x00
Expand Down
12 changes: 6 additions & 6 deletions examples/chip-tool/commands/common/Command.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@
#include <sys/types.h>

#include <lib/core/CHIPSafeCasts.h>
#include <support/BytesToHex.h>
#include <support/CHIPMem.h>
#include <support/CodeUtils.h>
#include <support/SafeInt.h>
#include <support/ScopedBuffer.h>
#include <support/logging/CHIPLogging.h>
#include <lib/support/BytesToHex.h>
#include <lib/support/CHIPMem.h>
#include <lib/support/CodeUtils.h>
#include <lib/support/SafeInt.h>
#include <lib/support/ScopedBuffer.h>
#include <lib/support/logging/CHIPLogging.h>

bool Command::InitArguments(int argc, char ** argv)
{
Expand Down
4 changes: 2 additions & 2 deletions examples/chip-tool/commands/common/Command.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
#include "controller/ExampleOperationalCredentialsIssuer.h"
#include <controller/CHIPDeviceController.h>
#include <inet/InetInterface.h>
#include <support/Span.h>
#include <support/logging/CHIPLogging.h>
#include <lib/support/Span.h>
#include <lib/support/logging/CHIPLogging.h>

#include <atomic>
#include <condition_variable>
Expand Down
6 changes: 3 additions & 3 deletions examples/chip-tool/commands/common/Commands.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@
#include <platform/CHIPDeviceLayer.h>
#endif

#include <support/CHIPMem.h>
#include <support/CodeUtils.h>
#include <support/ScopedBuffer.h>
#include <lib/support/CHIPMem.h>
#include <lib/support/CodeUtils.h>
#include <lib/support/ScopedBuffer.h>

void Commands::Register(const char * clusterName, commands_list commandsList)
{
Expand Down
2 changes: 1 addition & 1 deletion examples/chip-tool/commands/discover/Commands.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#include "DiscoverCommissionablesCommand.h"
#include "DiscoverCommissionersCommand.h"
#include <controller/DeviceAddressUpdateDelegate.h>
#include <mdns/Resolver.h>
#include <lib/mdns/Resolver.h>

constexpr uint16_t kMdnsPort = 5353;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
*/

#include "DiscoverCommissionablesCommand.h"
#include <support/BytesToHex.h>
#include <lib/support/BytesToHex.h>

using namespace ::chip;

Expand Down
2 changes: 1 addition & 1 deletion examples/chip-tool/commands/pairing/PairingCommand.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
#include <controller/ExampleOperationalCredentialsIssuer.h>
#include <crypto/CHIPCryptoPAL.h>
#include <lib/core/CHIPSafeCasts.h>
#include <lib/support/logging/CHIPLogging.h>
#include <protocols/secure_channel/PASESession.h>
#include <support/logging/CHIPLogging.h>

#include <setup_payload/ManualSetupPayloadParser.h>
#include <setup_payload/QRCodeSetupPayloadParser.h>
Expand Down
2 changes: 1 addition & 1 deletion examples/chip-tool/commands/pairing/PairingCommand.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@
#include <zap-generated/CHIPClusters.h>

#include <controller/ExampleOperationalCredentialsIssuer.h>
#include <lib/support/Span.h>
#include <lib/support/ThreadOperationalDataset.h>
#include <setup_payload/SetupPayload.h>
#include <support/Span.h>

enum class PairingMode
{
Expand Down
2 changes: 1 addition & 1 deletion examples/chip-tool/config/PersistentStorage.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
#include "PersistentStorage.h"

#include <lib/core/CHIPEncoding.h>
#include <lib/support/Base64.h>
#include <protocols/secure_channel/PASESession.h>
#include <support/Base64.h>

#include <fstream>
#include <memory>
Expand Down
2 changes: 1 addition & 1 deletion examples/chip-tool/config/PersistentStorage.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#include <app/util/basic-types.h>
#include <controller/CHIPDeviceController.h>
#include <inipp/inipp.h>
#include <support/logging/CHIPLogging.h>
#include <lib/support/logging/CHIPLogging.h>

class PersistentStorage : public chip::PersistentStorageDelegate
{
Expand Down
4 changes: 2 additions & 2 deletions examples/chip-tool/templates/commands.zapt
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
#include <cstdint>

#include <commands/clusters/ModelCommand.h>
#include <lib/core/CHIPSafeCasts.h>
#include <lib/support/BytesToHex.h>
#include <zap-generated/CHIPClientCallbacks.h>
#include <zap-generated/CHIPClusters.h>
#include <lib/core/CHIPSafeCasts.h>
#include <support/BytesToHex.h>

static void OnDefaultSuccessResponse(void * context)
{
Expand Down
2 changes: 1 addition & 1 deletion examples/common/pigweed/RpcService.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
#include "pw_stream/sys_io_stream.h"
#include "pw_sys_io/sys_io.h"

#include "support/logging/CHIPLogging.h"
#include <lib/support/logging/CHIPLogging.h>

#include <array>

Expand Down
2 changes: 1 addition & 1 deletion examples/common/screen-framework/ScreenManager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

#if CONFIG_HAVE_DISPLAY

#include <support/CHIPMem.h>
#include <lib/support/CHIPMem.h>

#include <cassert>
#include <vector>
Expand Down
2 changes: 1 addition & 1 deletion examples/common/screen-framework/include/ListScreen.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

#if CONFIG_HAVE_DISPLAY

#include <support/CHIPMem.h>
#include <lib/support/CHIPMem.h>

#include <functional>
#include <string>
Expand Down
2 changes: 1 addition & 1 deletion examples/lighting-app/efr32/include/AppConfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,6 @@ void appError(int err);
#ifdef __cplusplus
}

#include <core/CHIPError.h>
#include <lib/core/CHIPError.h>
void appError(CHIP_ERROR error);
#endif
2 changes: 1 addition & 1 deletion examples/lighting-app/efr32/include/LightingManager.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
#include "FreeRTOS.h"
#include "timers.h" // provides FreeRTOS timer support

#include <core/CHIPError.h>
#include <lib/core/CHIPError.h>

class LightingManager
{
Expand Down
2 changes: 1 addition & 1 deletion examples/lighting-app/efr32/src/ZclCallbacks.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
*/

#include "AppConfig.h"
#include <support/logging/CHIPLogging.h>
#include <lib/support/logging/CHIPLogging.h>

#include "LightingManager.h"

Expand Down
4 changes: 2 additions & 2 deletions examples/lighting-app/efr32/src/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@
#include <FreeRTOS.h>
#include <mbedtls/threading.h>

#include <lib/support/CHIPMem.h>
#include <lib/support/CHIPPlatformMemory.h>
#include <platform/CHIPDeviceLayer.h>
#include <platform/KeyValueStoreManager.h>
#include <support/CHIPMem.h>
#include <support/CHIPPlatformMemory.h>

#include <AppTask.h>

Expand Down
Loading

0 comments on commit 53dd583

Please sign in to comment.