!661 IWYU整改

Merge pull request !661 from 史晓晓/master

interfaces/inner_kits/native_cpp/include/dm_device_info.h

@@ -17,6 +17,7 @@
 #define OHOS_DM_DEVICE_INFO_H
 
 #include <cstdint>
+#include <string>
 
 #include "dm_app_image_info.h"
 

interfaces/inner_kits/native_cpp/include/ipc/ipc_client_proxy.h

@@ -20,8 +20,8 @@
 #include <memory>
 
 #include "ipc_client.h"
-#include "ipc_req.h"
-#include "ipc_rsp.h"
+namespace OHOS::DistributedHardware { class IpcReq; }
+namespace OHOS::DistributedHardware { class IpcRsp; }
 
 namespace OHOS {
 namespace DistributedHardware {

interfaces/inner_kits/native_cpp/include/ipc/standard/ipc_client_stub.h

@@ -20,10 +20,11 @@
 #include <memory>
 
 #include "ipc_remote_broker.h"
-#include "ipc_req.h"
-#include "ipc_rsp.h"
-#include "iremote_broker.h"
 #include "iremote_stub.h"
+namespace OHOS { class MessageOption; }
+namespace OHOS { class MessageParcel; }
+namespace OHOS::DistributedHardware { class IpcReq; }
+namespace OHOS::DistributedHardware { class IpcRsp; }
 
 namespace OHOS {
 namespace DistributedHardware {

interfaces/inner_kits/native_cpp/src/ipc/ipc_client_proxy.cpp

@@ -17,6 +17,8 @@
 
 #include "dm_constants.h"
 #include "dm_log.h"
+namespace OHOS::DistributedHardware { class IpcReq; }
+namespace OHOS::DistributedHardware { class IpcRsp; }
 
 namespace OHOS {
 namespace DistributedHardware {

interfaces/inner_kits/native_cpp/src/ipc/standard/ipc_client_server_proxy.cpp

@@ -18,7 +18,6 @@
 #include "dm_constants.h"
 #include "dm_log.h"
 #include "ipc_cmd_register.h"
-#include "ipc_types.h"
 
 namespace OHOS {
 namespace DistributedHardware {

interfaces/inner_kits/native_cpp/src/ipc/standard/ipc_client_stub.cpp

@@ -18,8 +18,11 @@
 #include "dm_constants.h"
 #include "dm_log.h"
 #include "ipc_cmd_register.h"
-#include "ipc_skeleton.h"
-#include "ipc_types.h"
+#include "ipc_object_stub.h"   // for IPCObjectStub
+#include "message_option.h"    // for MessageOption
+#include "message_parcel.h"    // for MessageParcel
+namespace OHOS::DistributedHardware { class IpcReq; }
+namespace OHOS::DistributedHardware { class IpcRsp; }
 
 namespace OHOS {
 namespace DistributedHardware {

interfaces/inner_kits/native_cpp/src/ipc/standard/ipc_cmd_parser.cpp

@@ -26,6 +26,7 @@
 #include "ipc_get_local_device_info_rsp.h"
 #include "ipc_get_trustdevice_req.h"
 #include "ipc_get_trustdevice_rsp.h"
+#include "ipc_register_dev_state_callback_req.h"
 #include "ipc_register_listener_req.h"
 #include "ipc_req.h"
 #include "ipc_rsp.h"
@@ -36,8 +37,8 @@
 #include "ipc_stop_discovery_req.h"
 #include "ipc_unauthenticate_device_req.h"
 #include "ipc_verify_authenticate_req.h"
-#include "ipc_register_dev_state_callback_req.h"
 #include "securec.h"
+namespace OHOS { class IRemoteObject; }
 
 namespace OHOS {
 namespace DistributedHardware {

services/implementation/src/dependency/hichain/hichain_connector.cpp

@@ -15,14 +15,14 @@
 
 #include "hichain_connector.h"
 
-#include <securec.h>
-
 #include <cstdlib>
 #include <ctime>
 #include <functional>
+#include <securec.h>
 
 #include "dm_anonymous.h"
 #include "dm_constants.h"
+#include "dm_dfx_constants.h"
 #include "dm_hisysevent.h"
 #include "dm_log.h"
 #include "dm_random.h"
@@ -30,6 +30,7 @@
 #include "multiple_user_connector.h"
 #include "nlohmann/json.hpp"
 #include "parameter.h"
+#include "unistd.h"
 
 namespace OHOS {
 namespace DistributedHardware {

services/implementation/src/dependency/softbus/softbus_session.cpp

@@ -17,6 +17,7 @@
 
 #include "dm_anonymous.h"
 #include "dm_constants.h"
+#include "dm_dfx_constants.h"
 #include "dm_hitrace.h"
 #include "dm_log.h"
 #include "nlohmann/json.hpp"

utils/include/dfx/standard/dm_hidumper.h

@@ -17,15 +17,12 @@
 #define OHOS_DM_HIDUMPER_H
 
 #include <cstdint>
-#include <set>
 #include <string>
 #include <vector>
 
-#include "dm_constants.h"
+#include "dm_device_info.h"
 #include "dm_dfx_constants.h"
 #include "single_instance.h"
-#include "dm_log.h"
-#include "dm_device_info.h"
 
 namespace OHOS {
 namespace DistributedHardware {

utils/include/dfx/standard/dm_hisysevent.h

@@ -16,15 +16,7 @@
 #ifndef OHOS_DISTRIBUTED_DM_HISYSEVENT_H
 #define OHOS_DISTRIBUTED_DM_HISYSEVENT_H
 
-#include "dm_anonymous.h"
-#include "dm_log.h"
-#include "dm_constants.h"
-#include "dm_dfx_constants.h"
-#include "hisysevent.h"
-#include "single_instance.h"
-
-#include <cstring>
-#include <unistd.h>
+#include <string>
 
 namespace OHOS {
 namespace DistributedHardware {

utils/include/dfx/standard/dm_hitrace.h

@@ -18,11 +18,6 @@
 
 #include <string>
 
-#include "hitrace_meter.h"
-
-#include "dm_constants.h"
-#include "dm_dfx_constants.h"
-
 namespace OHOS {
 namespace DistributedHardware {
 void DmTraceStart(const std::string &msg);

utils/include/dm_error_message.h

@@ -16,9 +16,6 @@
 #ifndef OHOS_DM_ERROMSG_H
 #define OHOS_DM_ERROMSG_H
 
-#include "dm_log.h"
-#include "dm_constants.h"
-
 #include <string>
 
 namespace OHOS {

utils/include/dm_hash.h

@@ -16,13 +16,7 @@
 #ifndef OHOS_DM_HASH_H
 #define OHOS_DM_HASH_H
 
-#include <iostream>
-#include "base64.h"
-#include "ctr_drbg.h"
-#include "entropy.h"
-#include "gcm.h"
-#include "md.h"
-#include "platform.h"
+#include <stdint.h>
 
 namespace OHOS {
 namespace DistributedHardware {

utils/include/dm_random.h

@@ -16,7 +16,7 @@
 #ifndef OHOS_DM_RANDOM_H
 #define OHOS_DM_RANDOM_H
 
-#include <string>
+#include <stdint.h>
 
 namespace OHOS {
 namespace DistributedHardware {

utils/include/fwkload/standard/dm_distributed_hardware_load.h

@@ -15,11 +15,10 @@
 
 #ifndef OHOS_DM_DISTRIBUTEED_HARDWARE_LOAD_H
 #define OHOS_DM_DISTRIBUTEED_HARDWARE_LOAD_H
-#include "if_system_ability_manager.h"
-#include "iservice_registry.h"
+
 #include "single_instance.h"
-#include "system_ability_definition.h"
 #include "system_ability_load_callback_stub.h"
+namespace OHOS { class IRemoteObject; }
 
 namespace OHOS {
 namespace DistributedHardware {

utils/include/ipc/standard/ipc_cmd_register.h

@@ -22,9 +22,8 @@
 
 #include "ipc_req.h"
 #include "ipc_rsp.h"
-#include "ipc_types.h"
-#include "iremote_broker.h"
 #include "single_instance.h"
+namespace OHOS { class MessageParcel; }
 
 namespace OHOS {
 namespace DistributedHardware {

utils/src/dfx/standard/dm_hidumper.cpp

@@ -13,13 +13,15 @@
  * limitations under the License.
  */
 
-#include <string>
-
-#include "dm_anonymous.h"
-#include "dm_dfx_constants.h"
-#include "dm_device_info.h"
 #include "dm_hidumper.h"
 
+#include <unordered_map>       // for __hash_map_const_iterator, unordered_map
+#include <utility>             // 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
+
 namespace OHOS {
 namespace DistributedHardware {
 IMPLEMENT_SINGLE_INSTANCE(HiDumpHelper);

utils/src/dfx/standard/dm_hisysevent.cpp

@@ -15,6 +15,11 @@
 
 #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...
+#include "unistd.h"        // for getpid, getuid
+
 namespace OHOS {
 namespace DistributedHardware {
 void SysEventWrite(const std::string &status, int32_t eventType, const std::string &msg)

utils/src/dm_error_message.cpp

@@ -15,6 +15,8 @@
 
 #include "dm_error_message.h"
 
+#include "dm_constants.h"  // for ERR_DM_AUTH_BUSINESS_BUSY, ERR_DM_AUTH_FAILED
+
 namespace OHOS {
 namespace DistributedHardware {
 typedef struct ERROR_INFO {

utils/src/dm_hash.cpp

@@ -13,10 +13,12 @@
  * limitations under the License.
  */
 
-#include "dm_log.h"
-#include "dm_constants.h"
 #include "dm_hash.h"
 
+#include "dm_constants.h"
+#include "dm_log.h"
+#include "md.h"            // for mbedtls_md_free, mbedtls_md_finish, mbedtl...
+
 namespace OHOS {
 namespace DistributedHardware {
 int32_t GetUdidHash(uint8_t *udid, int32_t udidDataLen, uint8_t outudidData[32])

utils/src/dm_random.cpp

@@ -18,11 +18,8 @@
 #include <random>
 
 #include "dm_constants.h"
-#include "mbedtls/base64.h"
 #include "mbedtls/ctr_drbg.h"
 #include "mbedtls/entropy.h"
-#include "mbedtls/gcm.h"
-#include "mbedtls/md.h"
 
 #if defined(__LITEOS_M__)
 #include <time.h>

utils/src/fwkload/standard/dm_distributed_hardware_load.cpp

@@ -13,9 +13,13 @@
  * limitations under the License.
  */
 
+#include "dm_distributed_hardware_load.h"
+
 #include "dm_constants.h"
 #include "dm_log.h"
-#include "dm_distributed_hardware_load.h"
+#include "if_system_ability_manager.h"      // for ISystemAbilityManager
+#include "iservice_registry.h"              // for SystemAbilityManagerClient
+#include "system_ability_definition.h"      // for DISTRIBUTED_HARDWARE_SA_ID
 
 namespace OHOS {
 namespace DistributedHardware {

utils/src/ipc/standard/ipc_cmd_register.cpp

@@ -15,9 +15,12 @@
 
 #include "ipc_cmd_register.h"
 
+#include <utility>         // for pair
+
 #include "dm_constants.h"
 #include "dm_log.h"
 #include "ipc_def.h"
+namespace OHOS { class MessageParcel; }
 
 namespace OHOS {
 namespace DistributedHardware {