IWYU整改

Signed-off-by: @shi-xiaoxiao-iris <shixiaoxiao2@huawei.com>
This commit is contained in:
@shi-xiaoxiao-iris
2022-07-14 18:19:47 +08:00
parent bf0f164671
commit 7a619a1cf4
24 changed files with 29 additions and 6 deletions
@@ -16,9 +16,10 @@
#ifndef OHOS_DEVICE_MANAGER_H #ifndef OHOS_DEVICE_MANAGER_H
#define OHOS_DEVICE_MANAGER_H #define OHOS_DEVICE_MANAGER_H
#include <string> // for string
#include <memory> #include <memory>
#include <string> // for string
#include <vector> #include <vector>
#include "device_manager_callback.h" #include "device_manager_callback.h"
#include "dm_device_info.h" #include "dm_device_info.h"
#include "dm_subscribe_info.h" #include "dm_subscribe_info.h"
@@ -18,6 +18,7 @@
#include <cstdint> #include <cstdint>
#include <string> #include <string>
#include "dm_app_image_info.h" #include "dm_app_image_info.h"
#define DM_MAX_DEVICE_ID_LEN (96) #define DM_MAX_DEVICE_ID_LEN (96)
@@ -18,6 +18,7 @@
#include <cstdint> #include <cstdint>
#include <memory> #include <memory>
#include "ipc_client.h" #include "ipc_client.h"
namespace OHOS::DistributedHardware { class IpcReq; } namespace OHOS::DistributedHardware { class IpcReq; }
namespace OHOS::DistributedHardware { class IpcRsp; } namespace OHOS::DistributedHardware { class IpcRsp; }
@@ -18,6 +18,7 @@
#include <cstdint> #include <cstdint>
#include <memory> #include <memory>
#include "ipc_remote_broker.h" #include "ipc_remote_broker.h"
#include "ipc_req.h" #include "ipc_req.h"
#include "ipc_rsp.h" #include "ipc_rsp.h"
@@ -18,6 +18,7 @@
#include <cstdint> #include <cstdint>
#include <memory> #include <memory>
#include "ipc_remote_broker.h" #include "ipc_remote_broker.h"
#include "iremote_stub.h" #include "iremote_stub.h"
namespace OHOS { class MessageOption; } namespace OHOS { class MessageOption; }
@@ -14,6 +14,7 @@
*/ */
#include "ipc_client_proxy.h" #include "ipc_client_proxy.h"
#include "dm_constants.h" #include "dm_constants.h"
#include "dm_log.h" #include "dm_log.h"
namespace OHOS::DistributedHardware { class IpcReq; } namespace OHOS::DistributedHardware { class IpcReq; }
@@ -14,6 +14,7 @@
*/ */
#include "ipc_client_server_proxy.h" #include "ipc_client_server_proxy.h"
#include "dm_constants.h" #include "dm_constants.h"
#include "dm_log.h" #include "dm_log.h"
#include "ipc_cmd_register.h" #include "ipc_cmd_register.h"
@@ -14,6 +14,7 @@
*/ */
#include "ipc_client_stub.h" #include "ipc_client_stub.h"
#include "dm_constants.h" #include "dm_constants.h"
#include "dm_log.h" #include "dm_log.h"
#include "ipc_cmd_register.h" #include "ipc_cmd_register.h"
@@ -14,10 +14,12 @@
*/ */
#include "hichain_connector.h" #include "hichain_connector.h"
#include <cstdlib> #include <cstdlib>
#include <ctime> #include <ctime>
#include <functional> #include <functional>
#include <securec.h> #include <securec.h>
#include "dm_anonymous.h" #include "dm_anonymous.h"
#include "dm_constants.h" #include "dm_constants.h"
#include "dm_dfx_constants.h" #include "dm_dfx_constants.h"
@@ -14,6 +14,7 @@
*/ */
#include "softbus_session.h" #include "softbus_session.h"
#include "dm_anonymous.h" #include "dm_anonymous.h"
#include "dm_constants.h" #include "dm_constants.h"
#include "dm_dfx_constants.h" #include "dm_dfx_constants.h"
+1
View File
@@ -19,6 +19,7 @@
#include <cstdint> #include <cstdint>
#include <string> #include <string>
#include <vector> #include <vector>
#include "dm_device_info.h" #include "dm_device_info.h"
#include "dm_dfx_constants.h" #include "dm_dfx_constants.h"
#include "single_instance.h" #include "single_instance.h"
+1 -1
View File
@@ -16,7 +16,7 @@
#ifndef OHOS_DM_HITRACE_H #ifndef OHOS_DM_HITRACE_H
#define OHOS_DM_HITRACE_H #define OHOS_DM_HITRACE_H
#include <string> // for string #include <string>
namespace OHOS { namespace OHOS {
namespace DistributedHardware { namespace DistributedHardware {
+1 -1
View File
@@ -16,7 +16,7 @@
#ifndef OHOS_DM_ANONYMOUS_H #ifndef OHOS_DM_ANONYMOUS_H
#define OHOS_DM_ANONYMOUS_H #define OHOS_DM_ANONYMOUS_H
#include <string> // for string #include <string>
namespace OHOS { namespace OHOS {
namespace DistributedHardware { namespace DistributedHardware {
+1 -1
View File
@@ -16,7 +16,7 @@
#ifndef OHOS_DM_ERROMSG_H #ifndef OHOS_DM_ERROMSG_H
#define OHOS_DM_ERROMSG_H #define OHOS_DM_ERROMSG_H
#include <string> // for string #include <string>
namespace OHOS { namespace OHOS {
namespace DistributedHardware { namespace DistributedHardware {
+1 -1
View File
@@ -16,7 +16,7 @@
#ifndef OHOS_DM_HASH_H #ifndef OHOS_DM_HASH_H
#define OHOS_DM_HASH_H #define OHOS_DM_HASH_H
#include <stdint.h> // for int32_t, uint8_t, uint32_t #include <stdint.h>
namespace OHOS { namespace OHOS {
namespace DistributedHardware { namespace DistributedHardware {
+1 -1
View File
@@ -16,7 +16,7 @@
#ifndef OHOS_DM_RANDOM_H #ifndef OHOS_DM_RANDOM_H
#define OHOS_DM_RANDOM_H #define OHOS_DM_RANDOM_H
#include <stdint.h> // for int32_t, int64_t, uint32_t, uint8_t #include <stdint.h>
namespace OHOS { namespace OHOS {
namespace DistributedHardware { namespace DistributedHardware {
@@ -19,6 +19,7 @@
#include <cstdint> #include <cstdint>
#include <memory> #include <memory>
#include <unordered_map> #include <unordered_map>
#include "ipc_req.h" #include "ipc_req.h"
#include "ipc_rsp.h" #include "ipc_rsp.h"
#include "single_instance.h" #include "single_instance.h"
+2
View File
@@ -14,8 +14,10 @@
*/ */
#include "dm_hidumper.h" #include "dm_hidumper.h"
#include <unordered_map> // for __hash_map_const_iterator, unordered_map #include <unordered_map> // for __hash_map_const_iterator, unordered_map
#include <utility> // for pair #include <utility> // for pair
#include "dm_anonymous.h" // for GetAnonyString #include "dm_anonymous.h" // for GetAnonyString
#include "dm_constants.h" // for DM_OK, ERR_DM_FAILED #include "dm_constants.h" // for DM_OK, ERR_DM_FAILED
#include "dm_log.h" // for LOGI, LOGE #include "dm_log.h" // for LOGI, LOGE
+1
View File
@@ -14,6 +14,7 @@
*/ */
#include "dm_hisysevent.h" #include "dm_hisysevent.h"
#include "dm_constants.h" // for DM_OK #include "dm_constants.h" // for DM_OK
#include "dm_log.h" // for LOGE #include "dm_log.h" // for LOGE
#include "hisysevent.h" // for HiSysEvent, HiSysEvent::Domain, HiSysEvent... #include "hisysevent.h" // for HiSysEvent, HiSysEvent::Domain, HiSysEvent...
+1
View File
@@ -14,6 +14,7 @@
*/ */
#include "dm_error_message.h" #include "dm_error_message.h"
#include "dm_constants.h" // for ERR_DM_AUTH_BUSINESS_BUSY, ERR_DM_AUTH_FAILED #include "dm_constants.h" // for ERR_DM_AUTH_BUSINESS_BUSY, ERR_DM_AUTH_FAILED
namespace OHOS { namespace OHOS {
+1
View File
@@ -14,6 +14,7 @@
*/ */
#include "dm_hash.h" #include "dm_hash.h"
#include "dm_constants.h" #include "dm_constants.h"
#include "dm_log.h" #include "dm_log.h"
#include "md.h" // for mbedtls_md_free, mbedtls_md_finish, mbedtl... #include "md.h" // for mbedtls_md_free, mbedtls_md_finish, mbedtl...
+2
View File
@@ -14,7 +14,9 @@
*/ */
#include "dm_random.h" #include "dm_random.h"
#include <random> #include <random>
#include "dm_constants.h" #include "dm_constants.h"
#include "mbedtls/ctr_drbg.h" #include "mbedtls/ctr_drbg.h"
#include "mbedtls/entropy.h" #include "mbedtls/entropy.h"
@@ -14,6 +14,7 @@
*/ */
#include "dm_distributed_hardware_load.h" #include "dm_distributed_hardware_load.h"
#include "dm_constants.h" #include "dm_constants.h"
#include "dm_log.h" #include "dm_log.h"
#include "if_system_ability_manager.h" // for ISystemAbilityManager #include "if_system_ability_manager.h" // for ISystemAbilityManager
@@ -14,7 +14,9 @@
*/ */
#include "ipc_cmd_register.h" #include "ipc_cmd_register.h"
#include <utility> // for pair #include <utility> // for pair
#include "dm_constants.h" #include "dm_constants.h"
#include "dm_log.h" #include "dm_log.h"
#include "ipc_def.h" #include "ipc_def.h"