!11 修改 utils 对外头文件路径

Merge pull request !11 from guyuanzhang/22

cameraApp/cameraApp/src/main/cpp/camera_ability_slice.cpp

@@ -16,10 +16,10 @@
 #include "camera_ability_slice.h"
 #include <algorithm>
 #include <meta_data.h>
-#include <color.h>
 #include <window/window.h>
 
 #include "ability_manager.h"
+#include "gfx_utils/color.h"
 #include "ui_config.h"
 #include "securec.h"
 

gallery/src/gallery_ability_slice.cpp

@@ -18,7 +18,7 @@
 #include "ability_manager.h"
 #include "picture_ability_slice.h"
 
-#include "file.h"
+#include "gfx_utils/file.h"
 #include "securec.h"
 
 namespace OHOS {

gallery/src/picture_ability_slice.cpp

@@ -15,8 +15,8 @@
 
 #include "picture_ability_slice.h"
 #include "ability_env.h"
-#include "file.h"
 #include "gallery_config.h"
+#include "gfx_utils/file.h"
 #include "securec.h"
 
 namespace OHOS {

gallery/src/player_ability_slice.cpp

@@ -20,7 +20,7 @@
 #include "ability_env.h"
 #include "ability_manager.h"
 #include "components/ui_image_view.h"
-#include "file.h"
+#include "gfx_utils/file.h"
 
 using OHOS::Media::Player;
 using OHOS::Media::Source;

launcher/launcher/src/main/cpp/main_ability_slice.h

@@ -24,9 +24,9 @@
 #include <components/ui_label.h>
 #include <components/ui_label_button.h>
 #include <components/ui_swipe_view.h>
-#include <list.h>
 
 #include "event_listener.h"
+#include "gfx_utils/list.h"
 #include "swipe_view.h"
 #include "ui_config.h"
 

launcher/launcher/src/main/cpp/view_group_page.h

@@ -19,7 +19,7 @@
 #include <components/ui_label.h>
 #include <components/ui_label_button.h>
 #include <components/ui_view_group.h>
-#include <list.h>
+#include "gfx_utils/list.h"
 
 #include "ui_config.h"
 #include "app_info.h"

setting/setting/src/main/cpp/app_ability_slice.cpp

@@ -14,7 +14,7 @@
  */
 
 #include "app_ability_slice.h"
-#include "style.h"
+#include "gfx_utils/style.h"
 
 namespace OHOS {
 REGISTER_AS(AppAbilitySlice)

setting/setting/src/main/cpp/app_ability_slice.h

@@ -29,7 +29,7 @@
 #include "components/ui_toggle_button.h"
 #include "element_name.h"
 #include "event_listener.h"
-#include "list.h"
+#include "gfx_utils/list.h"
 #include "module_info.h"
 #include "setting_utils.h"
 #include "want.h"

setting/setting/src/main/cpp/app_info_ability_slice.cpp

@@ -14,7 +14,7 @@
  */
 
 #include "app_info_ability_slice.h"
-#include "style.h"
+#include "gfx_utils/style.h"
 
 namespace OHOS {
 REGISTER_AS(AppInfoAbilitySlice)

setting/setting/src/main/cpp/app_info_ability_slice.h

@@ -29,7 +29,7 @@
 #include "components/ui_toggle_button.h"
 #include "element_name.h"
 #include "event_listener.h"
-#include "list.h"
+#include "gfx_utils/list.h"
 #include "module_info.h"
 #include "setting_utils.h"
 #include "want.h"

setting/setting/src/main/cpp/main_ability_slice.cpp

@@ -23,7 +23,7 @@
 #include "module_info.h"
 #include "element_name.h"
 #include "wpa_work.h"
-#include "style.h"
+#include "gfx_utils/style.h"
 #include <cstdint>
 #include <ctime>
 

setting/setting/src/main/cpp/main_ability_slice.h

@@ -17,27 +17,27 @@
 #define OHOS_MAIN_ABILITY_SLICE_H
 
 #include <cstdio>
+
+#include "ability_info.h"
 #include "ability_loader.h"
-#include "event_listener.h"
-#include "list.h"
+#include "ability_manager.h"
+#include "ability_slice.h"
+#include "bundle_manager.h"
 #include "components/ui_image_view.h"
-#include "components/ui_scroll_view.h"
-#include "components/ui_label_button.h"
 #include "components/ui_label.h"
+#include "components/ui_label_button.h"
 #include "components/ui_list.h"
+#include "components/ui_scroll_view.h"
 #include "components/ui_toggle_button.h"
-#include "bundle_manager.h"
-#include "ability_slice.h"
-#include "module_info.h"
-#include "ability_info.h"
 #include "element_name.h"
-#include "want.h"
-#include "ability_manager.h"
+#include "event_listener.h"
+#include "gfx_utils/list.h"
+#include "module_info.h"
 #include "parameter.h"
+#include "pthread.h"
 #include "setting_utils.h"
+#include "want.h"
 #include "wpa_work.h"
-#include "pthread.h"
-
 
 namespace OHOS {
 class MainAbilitySlice : public AbilitySlice {

setting/setting/src/main/cpp/setting_about_ability_slice.cpp

@@ -14,7 +14,7 @@
  */
 
 #include "setting_about_ability_slice.h"
-#include "style.h"
+#include "gfx_utils/style.h"
 
 namespace OHOS {
 REGISTER_AS(SettingAboutAbilitySlice)

setting/setting/src/main/cpp/setting_about_ability_slice.h

@@ -28,7 +28,7 @@
 #include "components/ui_toggle_button.h"
 #include "element_name.h"
 #include "event_listener.h"
-#include "list.h"
+#include "gfx_utils/list.h"
 #include "module_info.h"
 #include "parameter.h"
 #include "setting_utils.h"

setting/setting/src/main/cpp/setting_display_ability_slice.cpp

@@ -16,7 +16,7 @@
 #include "setting_display_ability_slice.h"
 #include <iostream>
 #include <securec.h>
-#include "style.h"
+#include "gfx_utils/style.h"
 
 namespace OHOS {
 REGISTER_AS(SettingDisplayAbilitySlice)

setting/setting/src/main/cpp/setting_display_ability_slice.h

@@ -21,7 +21,6 @@
 #include <cstring>
 #include <iproxy_client.h>
 
-#include "samgr_lite.h"
 #include "ability_loader.h"
 #include "components/ui_label.h"
 #include "components/ui_label_button.h"
@@ -29,8 +28,9 @@
 #include "components/ui_scroll_view.h"
 #include "components/ui_toggle_button.h"
 #include "event_listener.h"
-#include "list.h"
+#include "gfx_utils/list.h"
 #include "parameter.h"
+#include "samgr_lite.h"
 #include "setting_utils.h"
 
 namespace OHOS {

setting/setting/src/main/cpp/setting_wifi_ability_slice.cpp

@@ -16,7 +16,7 @@
 #include "setting_wifi_ability_slice.h"
 #include <iostream>
 #include <thread>
-#include "style.h"
+#include "gfx_utils/style.h"
 
 namespace OHOS {
 REGISTER_AS(SettingWifiAbilitySlice)

setting/setting/src/main/cpp/setting_wifi_ability_slice.h

@@ -21,18 +21,18 @@
 #include <cstring>
 
 #include "ability_loader.h"
+#include "common/task.h"
 #include "components/ui_label.h"
 #include "components/ui_label_button.h"
 #include "components/ui_list.h"
 #include "components/ui_scroll_view.h"
 #include "components/ui_toggle_button.h"
 #include "event_listener.h"
-#include "list.h"
+#include "gfx_utils/list.h"
 #include "parameter.h"
 #include "pthread.h"
 #include "setting_utils.h"
 #include "wpa_work.h"
-#include "common/task.h"
 
 namespace OHOS {
 class TestBtnOnStateChangeListener : public OHOS::UICheckBox::OnChangeListener, public OHOS::UIView::OnClickListener {

setting/setting/src/main/cpp/setting_wifi_input_password_ability_slice.cpp

@@ -14,7 +14,7 @@
  */
 
 #include <setting_wifi_input_password_ability_slice.h>
-#include "style.h"
+#include "gfx_utils/style.h"
 
 namespace OHOS {
 REGISTER_AS(SettingWifiInputPasswordAbilitySlice)

setting/setting/src/main/cpp/setting_wifi_input_password_ability_slice.h

@@ -15,8 +15,10 @@
 
 #ifndef OHOS_SETTING_WIFI_INPUT_PASSWORD_ABILITY_SLICE_H
 #define OHOS_SETTING_WIFI_INPUT_PASSWORD_ABILITY_SLICE_H
-#include "components/ui_checkbox.h"
+
 #include "ability_loader.h"
+#include "common/task.h"
+#include "components/ui_checkbox.h"
 #include "components/ui_image_view.h"
 #include "components/ui_label.h"
 #include "components/ui_label_button.h"
@@ -26,9 +28,8 @@
 #include "event_listener.h"
 #include "parameter.h"
 #include "setting_utils.h"
-#include "wpa_work.h"
-#include "common/task.h"
 #include "setting_wifi_input_password_ability_slice.h"
+#include "wpa_work.h"
 
 namespace OHOS {
 class SettingWifiInputPasswordAbilitySlice : public AbilitySlice {