From e5922e0189a5d87e1239a9f58baa1ccb4ffcc4da Mon Sep 17 00:00:00 2001
From: daili <daili12@huawei.com>
Date: Wed, 13 Jul 2022 17:53:02 +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: Dai Li <daili12@huawei.com>
---
 .../core/frame_aware_collector/include/frame_msg_mgr.h   | 5 ++---
 .../frame_aware_collector/include/frame_window_mgr.h     | 2 --
 .../core/frame_aware_collector/include/rme_core_sched.h  | 4 ----
 .../core/frame_aware_collector/include/rme_scene_sched.h | 5 +----
 .../core/frame_aware_collector/src/frame_msg_mgr.cpp     | 4 ++++
 .../core/frame_aware_collector/src/frame_window_mgr.cpp  | 3 +++
 .../core/frame_aware_collector/src/rme_core_sched.cpp    | 5 +++++
 .../core/frame_aware_collector/src/rme_scene_sched.cpp   | 2 ++
 frameworks/core/frame_aware_policy/include/app_info.h    | 1 +
 .../frame_aware_policy/include/intellisense_server.h     | 6 ++----
 frameworks/core/frame_aware_policy/include/para_config.h | 2 --
 .../core/frame_aware_policy/src/intellisense_server.cpp  | 9 ++++++---
 interfaces/innerkits/frameintf/frame_ui_intf.cpp         | 1 +
 interfaces/innerkits/frameintf/rtg_interface.cpp         | 8 +++-----
 14 files changed, 30 insertions(+), 27 deletions(-)

diff --git a/frameworks/core/frame_aware_collector/include/frame_msg_mgr.h b/frameworks/core/frame_aware_collector/include/frame_msg_mgr.h
index c81be8b..796758a 100644
--- a/frameworks/core/frame_aware_collector/include/frame_msg_mgr.h
+++ b/frameworks/core/frame_aware_collector/include/frame_msg_mgr.h
@@ -16,11 +16,10 @@
 #ifndef FRAME_MSG_MGR_H
 #define FRAME_MSG_MGR_H
 
-#include <hilog/log.h>
 #include <map>
-
-#include "rme_log_domain.h"
 #include "frame_info_const.h"
+#include "single_instance.h"
+#include "frame_scene_sched.h"
 #include "rme_scene_sched.h"
 
 namespace OHOS {
diff --git a/frameworks/core/frame_aware_collector/include/frame_window_mgr.h b/frameworks/core/frame_aware_collector/include/frame_window_mgr.h
index 56860fc..02f0728 100644
--- a/frameworks/core/frame_aware_collector/include/frame_window_mgr.h
+++ b/frameworks/core/frame_aware_collector/include/frame_window_mgr.h
@@ -16,9 +16,7 @@
 #ifndef FRAME_WINDOW_MGR_H
 #define FRAME_WINDOW_MGR_H
 
-#include <string>
 #include "single_instance.h"
-#include "rme_log_domain.h"
 
 namespace OHOS {
 namespace RME {
diff --git a/frameworks/core/frame_aware_collector/include/rme_core_sched.h b/frameworks/core/frame_aware_collector/include/rme_core_sched.h
index f8e52c1..3eb3563 100644
--- a/frameworks/core/frame_aware_collector/include/rme_core_sched.h
+++ b/frameworks/core/frame_aware_collector/include/rme_core_sched.h
@@ -16,10 +16,6 @@
 #ifndef RME_CORE_SCHED_H
 #define RME_CORE_SCHED_H
 
-#include <unistd.h>
-#include "rme_log_domain.h"
-#include "rme_scoped_trace.h"
-
 namespace OHOS {
 namespace RME {
 class RmeCoreSched {
diff --git a/frameworks/core/frame_aware_collector/include/rme_scene_sched.h b/frameworks/core/frame_aware_collector/include/rme_scene_sched.h
index 72012ba..6b5486a 100644
--- a/frameworks/core/frame_aware_collector/include/rme_scene_sched.h
+++ b/frameworks/core/frame_aware_collector/include/rme_scene_sched.h
@@ -16,11 +16,8 @@
 #ifndef RME_SCENE_SCHED_H
 #define RME_SCENE_SCHED_H
 
-#include "frame_scene_sched.h"
-#include "frame_window_mgr.h"
 #include "rme_core_sched.h"
-
-#include <string>
+#include "frame_scene_sched.h"
 
 namespace OHOS {
 namespace RME {
diff --git a/frameworks/core/frame_aware_collector/src/frame_msg_mgr.cpp b/frameworks/core/frame_aware_collector/src/frame_msg_mgr.cpp
index 36bcc2c..c8d816d 100644
--- a/frameworks/core/frame_aware_collector/src/frame_msg_mgr.cpp
+++ b/frameworks/core/frame_aware_collector/src/frame_msg_mgr.cpp
@@ -14,6 +14,10 @@
  */
 
 #include "frame_msg_mgr.h"
+#include <map>
+#include <new>
+#include <utility>
+#include "rme_log_domain.h"
 
 namespace OHOS {
 namespace RME {
diff --git a/frameworks/core/frame_aware_collector/src/frame_window_mgr.cpp b/frameworks/core/frame_aware_collector/src/frame_window_mgr.cpp
index 5505f0a..06e5abf 100644
--- a/frameworks/core/frame_aware_collector/src/frame_window_mgr.cpp
+++ b/frameworks/core/frame_aware_collector/src/frame_window_mgr.cpp
@@ -14,6 +14,9 @@
  */
 
 #include "frame_window_mgr.h"
+#include <iosfwd>
+#include <string>
+#include "rme_log_domain.h"
 
 namespace OHOS {
 namespace RME {
diff --git a/frameworks/core/frame_aware_collector/src/rme_core_sched.cpp b/frameworks/core/frame_aware_collector/src/rme_core_sched.cpp
index a1d7af1..8257dc4 100644
--- a/frameworks/core/frame_aware_collector/src/rme_core_sched.cpp
+++ b/frameworks/core/frame_aware_collector/src/rme_core_sched.cpp
@@ -14,7 +14,12 @@
  */
 
 #include "rme_core_sched.h"
+#include <memory>
+#include <string>
+#include <unistd.h>
 #include "rtg_interface.h"
+#include "rme_log_domain.h"
+#include "rme_scoped_trace.h"
 
 namespace OHOS {
 namespace RME {
diff --git a/frameworks/core/frame_aware_collector/src/rme_scene_sched.cpp b/frameworks/core/frame_aware_collector/src/rme_scene_sched.cpp
index 6473a64..8f6da7a 100644
--- a/frameworks/core/frame_aware_collector/src/rme_scene_sched.cpp
+++ b/frameworks/core/frame_aware_collector/src/rme_scene_sched.cpp
@@ -14,6 +14,8 @@
  */
 
 #include "rme_scene_sched.h"
+#include "frame_window_mgr.h"
+#include "rme_scoped_trace.h"
 
 namespace OHOS {
 namespace RME {
diff --git a/frameworks/core/frame_aware_policy/include/app_info.h b/frameworks/core/frame_aware_policy/include/app_info.h
index ea5b620..ba2d5d8 100644
--- a/frameworks/core/frame_aware_policy/include/app_info.h
+++ b/frameworks/core/frame_aware_policy/include/app_info.h
@@ -17,6 +17,7 @@
 #define APP_INFO_H
 
 #include <string>
+#include <iosfwd>
 
 namespace OHOS {
 namespace RME {
diff --git a/frameworks/core/frame_aware_policy/include/intellisense_server.h b/frameworks/core/frame_aware_policy/include/intellisense_server.h
index 37b1403..f4cccf6 100644
--- a/frameworks/core/frame_aware_policy/include/intellisense_server.h
+++ b/frameworks/core/frame_aware_policy/include/intellisense_server.h
@@ -21,12 +21,10 @@
 #include <string>
 #include <vector>
 #include <set>
-#include <mutex>
-#include <thread>
-
+#include <cstdint>
+#include <iosfwd>
 #include "rme_constants.h"
 #include "single_instance.h"
-#include "event_handler.h"
 #include "app_info.h"
 
 namespace OHOS {
diff --git a/frameworks/core/frame_aware_policy/include/para_config.h b/frameworks/core/frame_aware_policy/include/para_config.h
index a3f8472..5fa0f6c 100644
--- a/frameworks/core/frame_aware_policy/include/para_config.h
+++ b/frameworks/core/frame_aware_policy/include/para_config.h
@@ -20,9 +20,7 @@
 #include <map>
 #include <vector>
 #include <memory>
-
 #include <cstdlib>
-
 #include "third_party/libxml2/include/libxml/parser.h"
 #include "third_party/libxml2/include/libxml/tree.h"
 #include "third_party/libxml2/include/libxml/xpath.h"
diff --git a/frameworks/core/frame_aware_policy/src/intellisense_server.cpp b/frameworks/core/frame_aware_policy/src/intellisense_server.cpp
index 23b329d..616d906 100644
--- a/frameworks/core/frame_aware_policy/src/intellisense_server.cpp
+++ b/frameworks/core/frame_aware_policy/src/intellisense_server.cpp
@@ -14,9 +14,12 @@
  */
 
 #include "intellisense_server.h"
-
-#include <hilog/log.h>
-
+#include <list>
+#include <map>
+#include <new>
+#include <set>
+#include <string>
+#include <vector>
 #include "para_config.h"
 #include "rtg_interface.h"
 #include "rme_log_domain.h"
diff --git a/interfaces/innerkits/frameintf/frame_ui_intf.cpp b/interfaces/innerkits/frameintf/frame_ui_intf.cpp
index 6e8f638..89b6e21 100644
--- a/interfaces/innerkits/frameintf/frame_ui_intf.cpp
+++ b/interfaces/innerkits/frameintf/frame_ui_intf.cpp
@@ -18,6 +18,7 @@
 #include "frame_info_const.h"
 #include "rme_constants.h"
 #include "frame_msg_mgr.h"
+#include "rme_log_domain.h"
 
 namespace OHOS {
 namespace RME {
diff --git a/interfaces/innerkits/frameintf/rtg_interface.cpp b/interfaces/innerkits/frameintf/rtg_interface.cpp
index bbe88bd..21e0a1a 100644
--- a/interfaces/innerkits/frameintf/rtg_interface.cpp
+++ b/interfaces/innerkits/frameintf/rtg_interface.cpp
@@ -18,13 +18,11 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <securec.h>
-#include <cstdlib>
 #include <cstdio>
-#include <cerrno>
 #include <string>
-#include <iostream>
-#include <linux/types.h>
-
+#include <vector>
+#include <cerrno>
+#include "bits/ioctl.h"
 #include "rme_log_domain.h"
 
 namespace OHOS {
-- 
Gitee