IWYU整改 修改

Signed-off-by: zhouyaoying <zhouyaoying@huawei.com>
Change-Id: Ie0f7a7adb4441776b9099e8a2964002f746a51f6

dm/include/zidl/display_manager_agent_stub.h

@@ -16,12 +16,12 @@
 #ifndef OHOS_ROSEN_DISPLAY_MANAGER_AGENT_STUB_H
 #define OHOS_ROSEN_DISPLAY_MANAGER_AGENT_STUB_H
 
-#include <iremote_stub.h>
+
 #include <cstdint>
+#include <iremote_stub.h>
+#include <message_option.h>
+#include <message_parcel.h>
 #include "display_manager_agent_interface.h"
-#include "message_option.h"
-#include "message_parcel.h"
-#include "refbase.h"
 
 namespace OHOS::Rosen {
 class DisplayManagerAgentStub : public IRemoteStub<IDisplayManagerAgent> {

dm/src/display.cpp

@@ -15,16 +15,12 @@
 #include "display.h"
 
 #include <cstdint>
-#include <string>
+#include <new>
+#include <refbase.h>
 
 #include "class_var_definition.h"
 #include "display_info.h"
 #include "display_manager_adapter.h"
-#include "dm_common.h"
-#include "iosfwd"
-#include "new"
-#include "refbase.h"
-#include "screen_manager/screen_types.h"
 #include "singleton_container.h"
 #include "window_manager_hilog.h"
 

dm/src/screen.cpp

@@ -16,17 +16,12 @@
 #include "screen.h"
 
 #include <cstdint>
-#include <string>
-#include <vector>
+#include <new>
+#include <refbase.h>
 
 #include "class_var_definition.h"
 #include "display_manager_adapter.h"
-#include "dm_common.h"
-#include "iosfwd"
-#include "new"
-#include "refbase.h"
 #include "screen_info.h"
-#include "screen_manager/screen_types.h"
 #include "singleton_container.h"
 #include "window_manager_hilog.h"
 

dm/src/screen_group.cpp

@@ -15,14 +15,10 @@
 
 #include "screen_group.h"
 
-#include <vector>
+#include <new>
 
 #include "class_var_definition.h"
 #include "display_manager_adapter.h"
-#include "dm_common.h"
-#include "new"
-#include "refbase.h"
-#include "screen.h"
 #include "screen_group_info.h"
 #include "screen_info.h"
 #include "singleton_container.h"

dm/src/zidl/display_manager_agent_stub.cpp

@@ -14,16 +14,13 @@
  */
 #include "zidl/display_manager_agent_stub.h"
 
-#include <string>
 #include <vector>
 
 #include "display_info.h"
 #include "dm_common.h"
 #include "marshalling_helper.h"
 #include "screen_info.h"
-#include "screen_manager/screen_types.h"
 #include "window_manager_hilog.h"
-#include "zidl/display_manager_agent_interface.h"
 
 namespace OHOS::Rosen {
 namespace {

dm/test/unittest/screen_manager_utils.h

@@ -17,15 +17,14 @@
 #define FRAMEWORKS_DM_TEST_UT_SCREEN_MANAGER_UTILS_H
 
 #include <cstdint>
+#include <refbase.h>
+#include <string>
+#include <surface.h>
 
 #include "display.h"
 #include "display_manager.h"
-#include "iosfwd"
-#include "refbase.h"
 #include "screen.h"
 #include "screen_manager.h"
-#include "string"
-#include "surface.h"
 
 namespace OHOS::Rosen {
 class ScreenManagerUtils {

dm/test/unittest/snapshot_utils_test.cpp

@@ -14,6 +14,8 @@
  */
 
 #include "snapshot_utils_test.h"
+
+#include "display_manager.h"
 #include "mock_display_manager_adapter.h"
 #include "singleton_mocker.h"
 #include "snapshot_utils.h"

dm/test/unittest/snapshot_utils_test.h

@@ -18,7 +18,6 @@
 
 #include <gtest/gtest.h>
 #include "display.h"
-#include "display_manager.h"
 
 namespace OHOS {
 namespace Rosen {

dm/test/utils/test_utils.cpp

@@ -14,9 +14,9 @@
  */
 #include "test_utils.h"
 
+#include <access_token.h>
 #include <accesstoken_kit.h>
 #include <token_setproc.h>
-#include "access_token.h"
 
 namespace OHOS::Rosen {
 void TestUtils::InjectTokenInfoByHapName(int userID, const std::string& bundleName, int instIndex)

dm/test/utils/test_utils.h

@@ -16,7 +16,7 @@
 #ifndef TEST_UTILS_H
 #define TEST_UTILS_H
 
-#include "iosfwd"
+#include <string>
 
 namespace OHOS::Rosen {
 class TestUtils {

dmserver/include/display_manager_config.h

@@ -17,9 +17,10 @@
 #define OHOS_ROSEN_DISPLAY_MANAGER_CONFIG_H
 
 #include <map>
-#include <vector>
 #include <refbase.h>
-#include "iosfwd"
+#include <string>
+#include <vector>
+
 #include "libxml/parser.h"
 
 namespace OHOS::Rosen {

dmserver/src/display_manager_config.cpp

@@ -14,19 +14,17 @@
  */
 #include "display_manager_config.h"
 
+#include <climits>
 #include <cstdint>
-#include <functional>
+#include <cstdlib>
+#include <libxml/globals.h>
+#include <libxml/xmlstring.h>
 #include <map>
 #include <string>
+#include <utility>
 #include <vector>
 
 #include "config_policy_utils.h"
-#include "libxml/globals.h"
-#include "libxml/parser.h"
-#include "libxml/xmlstring.h"
-#include "climits"
-#include "cstdlib"
-#include "utility"
 #include "window_manager_hilog.h"
 
 

interfaces/innerkits/dm/screen.h

@@ -16,11 +16,10 @@
 #ifndef FOUNDATION_DM_SCREEN_H
 #define FOUNDATION_DM_SCREEN_H
 
-#include <string>
-#include <vector>
-
-#include <surface.h>
 #include <screen_manager/screen_types.h>
+#include <string>
+#include <surface.h>
+#include <vector>
 
 #include "dm_common.h"
 #include "noncopyable.h"

interfaces/kits/napi/common/wm_napi_common.h

@@ -17,14 +17,13 @@
 #define INTERFACES_KITS_NAPI_GRAPHIC_COMMON_COMMON_H
 
 #include <cstdint>
+#include <node_api.h>
+#include <node_api_types.h>
 #include <memory>
 #include <string>
 
-#include "iosfwd"
 #include "js_native_api.h"
 #include "js_native_api_types.h"
-#include "node_api.h"
-#include "node_api_types.h"
 #include "window_manager_hilog.h"
 #include "wm_common.h"
 

interfaces/kits/napi/screenshot/native_screenshot_module.cpp

@@ -14,23 +14,22 @@
  */
 #include "native_screenshot_module.h"
 
+#include <cinttypes>
 #include <cstddef>
 #include <cstdint>
+#include <image_type.h>
+#include <iosfwd>
+#include <js_native_api.h>
+#include <js_native_api_types.h>
 #include <memory>
+#include <napi/native_api.h>
+#include <napi/native_common.h>
 #include <string>
+#include <type_traits>
 
 #include "display_manager.h"
-#include "image_type.h"
-#include "cinttypes"
-#include "iosfwd"
-#include "js_native_api.h"
-#include "js_native_api_types.h"
-#include "napi/native_api.h"
-#include "napi/native_common.h"
-#include "new"
 #include "pixel_map.h"
 #include "pixel_map_napi.h"
-#include "type_traits"
 #include "window_manager_hilog.h"
 #include "wm_common.h"
 #include "wm_napi_common.h"

snapshot/snapshot_display.cpp

@@ -14,18 +14,14 @@
  */
 
 #include <cstdio>
-#include <string>
+#include <image_type.h>
+#include <iosfwd>
+#include <iostream>
+#include <memory>
+#include <ostream>
+#include <refbase.h>
 
-#include "display.h"
 #include "display_manager.h"
-#include "dm_common.h"
-#include "image_type.h"
-#include "iosfwd"
-#include "iostream"
-#include "memory"
-#include "ostream"
-#include "pixel_map.h"
-#include "refbase.h"
 #include "snapshot_utils.h"
 
 using namespace OHOS;

snapshot/snapshot_utils.cpp

@@ -16,24 +16,23 @@
 #include "snapshot_utils.h"
 
 #include <cerrno>
+#include <climits>
 #include <cstdio>
+#include <cstdlib>
 #include <ctime>
 #include <getopt.h>
 #include <hitrace_meter.h>
+#include <image_type.h>
+#include <iostream>
+#include <ostream>
+#include <pixel_map.h>
 #include <png.h>
 #include <securec.h>
 #include <string>
 #include <sys/time.h>
-#include <vector>
 
 #include "display_manager.h"
-#include "image_type.h"
-#include "iostream"
-#include "climits"
-#include "ostream"
-#include "pixel_map.h"
-#include "cstdio"
-#include "cstdlib"
+
 
 using namespace OHOS::Media;
 using namespace OHOS::Rosen;

snapshot/snapshot_utils.h

@@ -21,7 +21,6 @@
 #include <string>
 
 #include "dm_common.h"
-#include "iosfwd"
 
 namespace OHOS {
 struct WriteToPngParam {

utils/include/surface_reader_handler_impl.h

@@ -17,8 +17,8 @@
 #define SURFACE_READER_HANDLER_IMPL_H
 
 #include <mutex>
-#include "pixel_map.h"
-#include "refbase.h"
+#include <pixel_map.h>
+#include <refbase.h>
 #include "surface_reader_handler.h"
 
 namespace OHOS::Rosen {

utils/src/display_info.cpp

@@ -14,8 +14,10 @@
  */
 
 #include "display_info.h"
-#include "new"
-#include "parcel.h"
+
+#include <new>
+#include <parcel.h>
+
 
 namespace OHOS::Rosen {
 bool DisplayInfo::Marshalling(Parcel &parcel) const

utils/src/wm_math.cpp

@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 #include "wm_math.h"
-#include "cstdlib"
+#include <cstdlib>
 
 namespace OHOS::Rosen {
 namespace TransformHelper {