From 7a619a1cf401be20656ba1f1a346ee017e0149aa Mon Sep 17 00:00:00 2001 From: "@shi-xiaoxiao-iris" Date: Thu, 14 Jul 2022 18:19:47 +0800 Subject: [PATCH] =?UTF-8?q?IWYU=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: @shi-xiaoxiao-iris --- interfaces/inner_kits/native_cpp/include/device_manager.h | 3 ++- interfaces/inner_kits/native_cpp/include/dm_device_info.h | 1 + .../inner_kits/native_cpp/include/ipc/ipc_client_proxy.h | 1 + .../native_cpp/include/ipc/standard/ipc_client_server_proxy.h | 1 + .../native_cpp/include/ipc/standard/ipc_client_stub.h | 1 + interfaces/inner_kits/native_cpp/src/ipc/ipc_client_proxy.cpp | 1 + .../native_cpp/src/ipc/standard/ipc_client_server_proxy.cpp | 1 + .../inner_kits/native_cpp/src/ipc/standard/ipc_client_stub.cpp | 1 + .../src/dependency/hichain/hichain_connector.cpp | 2 ++ .../implementation/src/dependency/softbus/softbus_session.cpp | 1 + utils/include/dfx/standard/dm_hidumper.h | 1 + utils/include/dfx/standard/dm_hitrace.h | 2 +- utils/include/dm_anonymous.h | 2 +- utils/include/dm_error_message.h | 2 +- utils/include/dm_hash.h | 2 +- utils/include/dm_random.h | 2 +- utils/include/ipc/standard/ipc_cmd_register.h | 1 + utils/src/dfx/standard/dm_hidumper.cpp | 2 ++ utils/src/dfx/standard/dm_hisysevent.cpp | 1 + utils/src/dm_error_message.cpp | 1 + utils/src/dm_hash.cpp | 1 + utils/src/dm_random.cpp | 2 ++ utils/src/fwkload/standard/dm_distributed_hardware_load.cpp | 1 + utils/src/ipc/standard/ipc_cmd_register.cpp | 2 ++ 24 files changed, 29 insertions(+), 6 deletions(-) diff --git a/interfaces/inner_kits/native_cpp/include/device_manager.h b/interfaces/inner_kits/native_cpp/include/device_manager.h index 118f4d12..b6933931 100644 --- a/interfaces/inner_kits/native_cpp/include/device_manager.h +++ b/interfaces/inner_kits/native_cpp/include/device_manager.h @@ -16,9 +16,10 @@ #ifndef OHOS_DEVICE_MANAGER_H #define OHOS_DEVICE_MANAGER_H -#include // for string #include +#include // for string #include + #include "device_manager_callback.h" #include "dm_device_info.h" #include "dm_subscribe_info.h" diff --git a/interfaces/inner_kits/native_cpp/include/dm_device_info.h b/interfaces/inner_kits/native_cpp/include/dm_device_info.h index cc085a7c..6bbdfb22 100644 --- a/interfaces/inner_kits/native_cpp/include/dm_device_info.h +++ b/interfaces/inner_kits/native_cpp/include/dm_device_info.h @@ -18,6 +18,7 @@ #include #include + #include "dm_app_image_info.h" #define DM_MAX_DEVICE_ID_LEN (96) diff --git a/interfaces/inner_kits/native_cpp/include/ipc/ipc_client_proxy.h b/interfaces/inner_kits/native_cpp/include/ipc/ipc_client_proxy.h index 9d829303..80ea7a79 100644 --- a/interfaces/inner_kits/native_cpp/include/ipc/ipc_client_proxy.h +++ b/interfaces/inner_kits/native_cpp/include/ipc/ipc_client_proxy.h @@ -18,6 +18,7 @@ #include #include + #include "ipc_client.h" namespace OHOS::DistributedHardware { class IpcReq; } namespace OHOS::DistributedHardware { class IpcRsp; } diff --git a/interfaces/inner_kits/native_cpp/include/ipc/standard/ipc_client_server_proxy.h b/interfaces/inner_kits/native_cpp/include/ipc/standard/ipc_client_server_proxy.h index f77f7c8a..1fbf3ac7 100644 --- a/interfaces/inner_kits/native_cpp/include/ipc/standard/ipc_client_server_proxy.h +++ b/interfaces/inner_kits/native_cpp/include/ipc/standard/ipc_client_server_proxy.h @@ -18,6 +18,7 @@ #include #include + #include "ipc_remote_broker.h" #include "ipc_req.h" #include "ipc_rsp.h" diff --git a/interfaces/inner_kits/native_cpp/include/ipc/standard/ipc_client_stub.h b/interfaces/inner_kits/native_cpp/include/ipc/standard/ipc_client_stub.h index 18d69902..d11477eb 100644 --- a/interfaces/inner_kits/native_cpp/include/ipc/standard/ipc_client_stub.h +++ b/interfaces/inner_kits/native_cpp/include/ipc/standard/ipc_client_stub.h @@ -18,6 +18,7 @@ #include #include + #include "ipc_remote_broker.h" #include "iremote_stub.h" namespace OHOS { class MessageOption; } diff --git a/interfaces/inner_kits/native_cpp/src/ipc/ipc_client_proxy.cpp b/interfaces/inner_kits/native_cpp/src/ipc/ipc_client_proxy.cpp index 99e0f0aa..d4d8e00e 100644 --- a/interfaces/inner_kits/native_cpp/src/ipc/ipc_client_proxy.cpp +++ b/interfaces/inner_kits/native_cpp/src/ipc/ipc_client_proxy.cpp @@ -14,6 +14,7 @@ */ #include "ipc_client_proxy.h" + #include "dm_constants.h" #include "dm_log.h" namespace OHOS::DistributedHardware { class IpcReq; } diff --git a/interfaces/inner_kits/native_cpp/src/ipc/standard/ipc_client_server_proxy.cpp b/interfaces/inner_kits/native_cpp/src/ipc/standard/ipc_client_server_proxy.cpp index f7c4f418..79c8ec16 100644 --- a/interfaces/inner_kits/native_cpp/src/ipc/standard/ipc_client_server_proxy.cpp +++ b/interfaces/inner_kits/native_cpp/src/ipc/standard/ipc_client_server_proxy.cpp @@ -14,6 +14,7 @@ */ #include "ipc_client_server_proxy.h" + #include "dm_constants.h" #include "dm_log.h" #include "ipc_cmd_register.h" diff --git a/interfaces/inner_kits/native_cpp/src/ipc/standard/ipc_client_stub.cpp b/interfaces/inner_kits/native_cpp/src/ipc/standard/ipc_client_stub.cpp index 18891a35..98c2a026 100644 --- a/interfaces/inner_kits/native_cpp/src/ipc/standard/ipc_client_stub.cpp +++ b/interfaces/inner_kits/native_cpp/src/ipc/standard/ipc_client_stub.cpp @@ -14,6 +14,7 @@ */ #include "ipc_client_stub.h" + #include "dm_constants.h" #include "dm_log.h" #include "ipc_cmd_register.h" diff --git a/services/implementation/src/dependency/hichain/hichain_connector.cpp b/services/implementation/src/dependency/hichain/hichain_connector.cpp index ae19d198..ff977000 100644 --- a/services/implementation/src/dependency/hichain/hichain_connector.cpp +++ b/services/implementation/src/dependency/hichain/hichain_connector.cpp @@ -14,10 +14,12 @@ */ #include "hichain_connector.h" + #include #include #include #include + #include "dm_anonymous.h" #include "dm_constants.h" #include "dm_dfx_constants.h" diff --git a/services/implementation/src/dependency/softbus/softbus_session.cpp b/services/implementation/src/dependency/softbus/softbus_session.cpp index cad66180..ecea188a 100644 --- a/services/implementation/src/dependency/softbus/softbus_session.cpp +++ b/services/implementation/src/dependency/softbus/softbus_session.cpp @@ -14,6 +14,7 @@ */ #include "softbus_session.h" + #include "dm_anonymous.h" #include "dm_constants.h" #include "dm_dfx_constants.h" diff --git a/utils/include/dfx/standard/dm_hidumper.h b/utils/include/dfx/standard/dm_hidumper.h index 2c40d3cb..d895bbe3 100644 --- a/utils/include/dfx/standard/dm_hidumper.h +++ b/utils/include/dfx/standard/dm_hidumper.h @@ -19,6 +19,7 @@ #include #include #include + #include "dm_device_info.h" #include "dm_dfx_constants.h" #include "single_instance.h" diff --git a/utils/include/dfx/standard/dm_hitrace.h b/utils/include/dfx/standard/dm_hitrace.h index 588e8f7f..f7347c39 100644 --- a/utils/include/dfx/standard/dm_hitrace.h +++ b/utils/include/dfx/standard/dm_hitrace.h @@ -16,7 +16,7 @@ #ifndef OHOS_DM_HITRACE_H #define OHOS_DM_HITRACE_H -#include // for string +#include namespace OHOS { namespace DistributedHardware { diff --git a/utils/include/dm_anonymous.h b/utils/include/dm_anonymous.h index 33728920..16d47661 100644 --- a/utils/include/dm_anonymous.h +++ b/utils/include/dm_anonymous.h @@ -16,7 +16,7 @@ #ifndef OHOS_DM_ANONYMOUS_H #define OHOS_DM_ANONYMOUS_H -#include // for string +#include namespace OHOS { namespace DistributedHardware { diff --git a/utils/include/dm_error_message.h b/utils/include/dm_error_message.h index 9d92826e..9f4f1332 100644 --- a/utils/include/dm_error_message.h +++ b/utils/include/dm_error_message.h @@ -16,7 +16,7 @@ #ifndef OHOS_DM_ERROMSG_H #define OHOS_DM_ERROMSG_H -#include // for string +#include namespace OHOS { namespace DistributedHardware { diff --git a/utils/include/dm_hash.h b/utils/include/dm_hash.h index bcc07cd7..831ac84d 100644 --- a/utils/include/dm_hash.h +++ b/utils/include/dm_hash.h @@ -16,7 +16,7 @@ #ifndef OHOS_DM_HASH_H #define OHOS_DM_HASH_H -#include // for int32_t, uint8_t, uint32_t +#include namespace OHOS { namespace DistributedHardware { diff --git a/utils/include/dm_random.h b/utils/include/dm_random.h index d7ec70a8..f1577777 100644 --- a/utils/include/dm_random.h +++ b/utils/include/dm_random.h @@ -16,7 +16,7 @@ #ifndef OHOS_DM_RANDOM_H #define OHOS_DM_RANDOM_H -#include // for int32_t, int64_t, uint32_t, uint8_t +#include namespace OHOS { namespace DistributedHardware { diff --git a/utils/include/ipc/standard/ipc_cmd_register.h b/utils/include/ipc/standard/ipc_cmd_register.h index 3e20c250..baff6b75 100644 --- a/utils/include/ipc/standard/ipc_cmd_register.h +++ b/utils/include/ipc/standard/ipc_cmd_register.h @@ -19,6 +19,7 @@ #include #include #include + #include "ipc_req.h" #include "ipc_rsp.h" #include "single_instance.h" diff --git a/utils/src/dfx/standard/dm_hidumper.cpp b/utils/src/dfx/standard/dm_hidumper.cpp index 9cedbcea..74af394b 100644 --- a/utils/src/dfx/standard/dm_hidumper.cpp +++ b/utils/src/dfx/standard/dm_hidumper.cpp @@ -14,8 +14,10 @@ */ #include "dm_hidumper.h" + #include // for __hash_map_const_iterator, unordered_map #include // for pair + #include "dm_anonymous.h" // for GetAnonyString #include "dm_constants.h" // for DM_OK, ERR_DM_FAILED #include "dm_log.h" // for LOGI, LOGE diff --git a/utils/src/dfx/standard/dm_hisysevent.cpp b/utils/src/dfx/standard/dm_hisysevent.cpp index 0d0cf4f6..b2f20910 100644 --- a/utils/src/dfx/standard/dm_hisysevent.cpp +++ b/utils/src/dfx/standard/dm_hisysevent.cpp @@ -14,6 +14,7 @@ */ #include "dm_hisysevent.h" + #include "dm_constants.h" // for DM_OK #include "dm_log.h" // for LOGE #include "hisysevent.h" // for HiSysEvent, HiSysEvent::Domain, HiSysEvent... diff --git a/utils/src/dm_error_message.cpp b/utils/src/dm_error_message.cpp index 09c49df7..c84daa6f 100644 --- a/utils/src/dm_error_message.cpp +++ b/utils/src/dm_error_message.cpp @@ -14,6 +14,7 @@ */ #include "dm_error_message.h" + #include "dm_constants.h" // for ERR_DM_AUTH_BUSINESS_BUSY, ERR_DM_AUTH_FAILED namespace OHOS { diff --git a/utils/src/dm_hash.cpp b/utils/src/dm_hash.cpp index 81a90e6b..b2955609 100644 --- a/utils/src/dm_hash.cpp +++ b/utils/src/dm_hash.cpp @@ -14,6 +14,7 @@ */ #include "dm_hash.h" + #include "dm_constants.h" #include "dm_log.h" #include "md.h" // for mbedtls_md_free, mbedtls_md_finish, mbedtl... diff --git a/utils/src/dm_random.cpp b/utils/src/dm_random.cpp index 81ff2f1c..862b992f 100644 --- a/utils/src/dm_random.cpp +++ b/utils/src/dm_random.cpp @@ -14,7 +14,9 @@ */ #include "dm_random.h" + #include + #include "dm_constants.h" #include "mbedtls/ctr_drbg.h" #include "mbedtls/entropy.h" diff --git a/utils/src/fwkload/standard/dm_distributed_hardware_load.cpp b/utils/src/fwkload/standard/dm_distributed_hardware_load.cpp index a49d5364..b3a6607c 100644 --- a/utils/src/fwkload/standard/dm_distributed_hardware_load.cpp +++ b/utils/src/fwkload/standard/dm_distributed_hardware_load.cpp @@ -14,6 +14,7 @@ */ #include "dm_distributed_hardware_load.h" + #include "dm_constants.h" #include "dm_log.h" #include "if_system_ability_manager.h" // for ISystemAbilityManager diff --git a/utils/src/ipc/standard/ipc_cmd_register.cpp b/utils/src/ipc/standard/ipc_cmd_register.cpp index efe59c0d..135efda4 100644 --- a/utils/src/ipc/standard/ipc_cmd_register.cpp +++ b/utils/src/ipc/standard/ipc_cmd_register.cpp @@ -14,7 +14,9 @@ */ #include "ipc_cmd_register.h" + #include // for pair + #include "dm_constants.h" #include "dm_log.h" #include "ipc_def.h"