From 5c6df181a1e392ee51d953ab339fb281bf7c9076 Mon Sep 17 00:00:00 2001 From: zhangguyuan Date: Tue, 16 Mar 2021 22:10:21 +0800 Subject: [PATCH 1/2] fix utils include path Change-Id: I680b84f4b33dc3dac344d9f1d95b0e44757695da --- frameworks/ims/input_event_client_proxy.h | 2 +- frameworks/ims/input_event_listener_proxy.cpp | 2 +- frameworks/wms/lite_proxy_surface.cpp | 2 +- frameworks/wms/lite_proxy_window.cpp | 2 +- frameworks/wms/lite_proxy_windows_manager.cpp | 4 ++-- frameworks/wms/lite_win_requestor.cpp | 2 +- frameworks/wms/lite_win_requestor.h | 2 +- frameworks/wms/lite_wm_requestor.cpp | 6 +++--- frameworks/wms/lite_wm_requestor.h | 2 +- frameworks/wms/lite_wms_client.cpp | 2 +- interfaces/innerkits/input_event_listener_proxy.h | 2 +- interfaces/innerkits/isurface.h | 2 +- interfaces/innerkits/iwindow.h | 2 +- interfaces/innerkits/iwindows_manager.h | 6 +++--- interfaces/innerkits/lite_wm_type.h | 4 ++-- services/ims/input_event_client_proxy.cpp | 2 +- services/ims/input_event_distributer.cpp | 2 +- services/ims/input_event_distributer.h | 2 +- services/ims/input_event_hub.cpp | 2 +- services/ims/input_event_hub.h | 2 +- services/ims/input_manager_service.cpp | 2 +- services/ims/samgr_ims.cpp | 2 +- services/wms/lite_win.cpp | 4 ++-- services/wms/lite_win.h | 4 ++-- services/wms/lite_wm.cpp | 6 +++--- services/wms/lite_wm.h | 4 ++-- services/wms/lite_wms.cpp | 2 +- services/wms/lite_wms.h | 2 +- services/wms/samgr_wms.cpp | 2 +- services/wms/wms.cpp | 2 +- test/sample_ui.cpp | 2 +- test/sample_window.cpp | 2 +- 32 files changed, 43 insertions(+), 43 deletions(-) diff --git a/frameworks/ims/input_event_client_proxy.h b/frameworks/ims/input_event_client_proxy.h index 5f45063..eb3bebd 100755 --- a/frameworks/ims/input_event_client_proxy.h +++ b/frameworks/ims/input_event_client_proxy.h @@ -17,7 +17,7 @@ #define GRAPHIC_LITE_IMS_LISTERNER_PROXY_H #include "input_event_distributer.h" -#include "input_event_info.h" +#include "gfx_utils/input_event_info.h" #include "input_manager_service.h" #include "liteipc_adapter.h" #include "serializer.h" diff --git a/frameworks/ims/input_event_listener_proxy.cpp b/frameworks/ims/input_event_listener_proxy.cpp index 8456f2b..fd6db7b 100755 --- a/frameworks/ims/input_event_listener_proxy.cpp +++ b/frameworks/ims/input_event_listener_proxy.cpp @@ -14,7 +14,7 @@ */ #include "input_event_listener_proxy.h" -#include "graphic_log.h" +#include "gfx_utils/graphic_log.h" #include "samgr_lite.h" namespace OHOS { diff --git a/frameworks/wms/lite_proxy_surface.cpp b/frameworks/wms/lite_proxy_surface.cpp index a4b44fb..7b26da8 100755 --- a/frameworks/wms/lite_proxy_surface.cpp +++ b/frameworks/wms/lite_proxy_surface.cpp @@ -14,7 +14,7 @@ */ #include "lite_proxy_surface.h" -#include "graphic_log.h" +#include "gfx_utils/graphic_log.h" namespace OHOS { LiteProxySurface::LiteProxySurface(Surface* surface) diff --git a/frameworks/wms/lite_proxy_window.cpp b/frameworks/wms/lite_proxy_window.cpp index 1a7d069..98e186e 100755 --- a/frameworks/wms/lite_proxy_window.cpp +++ b/frameworks/wms/lite_proxy_window.cpp @@ -14,7 +14,7 @@ */ #include "lite_proxy_window.h" -#include "graphic_log.h" +#include "gfx_utils/graphic_log.h" #include "surface.h" namespace OHOS { diff --git a/frameworks/wms/lite_proxy_windows_manager.cpp b/frameworks/wms/lite_proxy_windows_manager.cpp index fb02234..7e1fe2e 100755 --- a/frameworks/wms/lite_proxy_windows_manager.cpp +++ b/frameworks/wms/lite_proxy_windows_manager.cpp @@ -15,8 +15,8 @@ #include "lite_proxy_windows_manager.h" -#include "color.h" -#include "graphic_log.h" +#include "gfx_utils/color.h" +#include "gfx_utils/graphic_log.h" #include "lite_wm_requestor.h" #include "lite_wms_client.h" diff --git a/frameworks/wms/lite_win_requestor.cpp b/frameworks/wms/lite_win_requestor.cpp index 1d82305..e5a732f 100755 --- a/frameworks/wms/lite_win_requestor.cpp +++ b/frameworks/wms/lite_win_requestor.cpp @@ -14,7 +14,7 @@ */ #include "lite_win_requestor.h" -#include "graphic_log.h" +#include "gfx_utils/graphic_log.h" #include "lite_wm_type.h" #include "lite_wms_client.h" #include "surface_impl.h" diff --git a/frameworks/wms/lite_win_requestor.h b/frameworks/wms/lite_win_requestor.h index ade1032..2cea134 100755 --- a/frameworks/wms/lite_win_requestor.h +++ b/frameworks/wms/lite_win_requestor.h @@ -16,7 +16,7 @@ #ifndef GRAPHIC_LITE_LITE_WIN_REQUESTOR_H #define GRAPHIC_LITE_LITE_WIN_REQUESTOR_H -#include "geometry2d.h" +#include "gfx_utils/geometry2d.h" #include #include "surface.h" diff --git a/frameworks/wms/lite_wm_requestor.cpp b/frameworks/wms/lite_wm_requestor.cpp index 6d4c810..6ec79ed 100755 --- a/frameworks/wms/lite_wm_requestor.cpp +++ b/frameworks/wms/lite_wm_requestor.cpp @@ -14,10 +14,10 @@ */ #include "lite_wm_requestor.h" -#include "graphic_log.h" -#include "input_event_info.h" +#include "gfx_utils/graphic_log.h" +#include "gfx_utils/input_event_info.h" #include "lite_wms_client.h" -#include "pixel_format_utils.h" +#include "gfx_utils/pixel_format_utils.h" #include "surface_impl.h" namespace OHOS { diff --git a/frameworks/wms/lite_wm_requestor.h b/frameworks/wms/lite_wm_requestor.h index 410c15a..4f88e8c 100755 --- a/frameworks/wms/lite_wm_requestor.h +++ b/frameworks/wms/lite_wm_requestor.h @@ -16,7 +16,7 @@ #ifndef GRAPHIC_LITE_LITE_WM_REQUESTOR_H #define GRAPHIC_LITE_LITE_WM_REQUESTOR_H -#include "geometry2d.h" +#include "gfx_utils/geometry2d.h" #include "iproxy_client.h" #include "iwindows_manager.h" #include "lite_win_requestor.h" diff --git a/frameworks/wms/lite_wms_client.cpp b/frameworks/wms/lite_wms_client.cpp index 38da982..05498d6 100755 --- a/frameworks/wms/lite_wms_client.cpp +++ b/frameworks/wms/lite_wms_client.cpp @@ -14,7 +14,7 @@ */ #include "lite_wms_client.h" -#include "graphic_log.h" +#include "gfx_utils/graphic_log.h" #include "lite_wm_type.h" #include "samgr_lite.h" diff --git a/interfaces/innerkits/input_event_listener_proxy.h b/interfaces/innerkits/input_event_listener_proxy.h index 08d4ac2..3a78e36 100755 --- a/interfaces/innerkits/input_event_listener_proxy.h +++ b/interfaces/innerkits/input_event_listener_proxy.h @@ -18,7 +18,7 @@ #include #include "liteipc_adapter.h" -#include "input_event_info.h" +#include "gfx_utils/input_event_info.h" namespace OHOS { class InputEventListenerProxy { diff --git a/interfaces/innerkits/isurface.h b/interfaces/innerkits/isurface.h index 1f963bd..fff4a8c 100755 --- a/interfaces/innerkits/isurface.h +++ b/interfaces/innerkits/isurface.h @@ -16,7 +16,7 @@ #ifndef GRAPHIC_LITE_ISURFACE_H #define GRAPHIC_LITE_ISURFACE_H -#include "geometry2d.h" +#include "gfx_utils/geometry2d.h" namespace OHOS { /** diff --git a/interfaces/innerkits/iwindow.h b/interfaces/innerkits/iwindow.h index 1202b69..cd51b02 100755 --- a/interfaces/innerkits/iwindow.h +++ b/interfaces/innerkits/iwindow.h @@ -18,7 +18,7 @@ #include "isurface.h" #include "lite_wm_type.h" -#include "geometry2d.h" +#include "gfx_utils/geometry2d.h" namespace OHOS { /** diff --git a/interfaces/innerkits/iwindows_manager.h b/interfaces/innerkits/iwindows_manager.h index 48e8eb5..873fb45 100755 --- a/interfaces/innerkits/iwindows_manager.h +++ b/interfaces/innerkits/iwindows_manager.h @@ -17,9 +17,9 @@ #define GRAPHIC_LITE_IWINDOWS_MANAGER_H #include "iwindow.h" -#include "geometry2d.h" -#include "input_event_info.h" -#include "list.h" +#include "gfx_utils/geometry2d.h" +#include "gfx_utils/input_event_info.h" +#include "gfx_utils/list.h" namespace OHOS { /** diff --git a/interfaces/innerkits/lite_wm_type.h b/interfaces/innerkits/lite_wm_type.h index 3019a47..33bba79 100755 --- a/interfaces/innerkits/lite_wm_type.h +++ b/interfaces/innerkits/lite_wm_type.h @@ -16,8 +16,8 @@ #ifndef GRAPHIC_LITE_LITE_WM_TYPE_H #define GRAPHIC_LITE_LITE_WM_TYPE_H -#include "geometry2d.h" -#include "pixel_format_utils.h" +#include "gfx_utils/geometry2d.h" +#include "gfx_utils/pixel_format_utils.h" namespace OHOS { struct LiteWinConfig { diff --git a/services/ims/input_event_client_proxy.cpp b/services/ims/input_event_client_proxy.cpp index b627579..4678cb4 100755 --- a/services/ims/input_event_client_proxy.cpp +++ b/services/ims/input_event_client_proxy.cpp @@ -14,7 +14,7 @@ */ #include "input_event_client_proxy.h" -#include "graphic_log.h" +#include "gfx_utils/graphic_log.h" #include "samgr_lite.h" namespace OHOS { diff --git a/services/ims/input_event_distributer.cpp b/services/ims/input_event_distributer.cpp index a4e0942..544aaaa 100755 --- a/services/ims/input_event_distributer.cpp +++ b/services/ims/input_event_distributer.cpp @@ -14,7 +14,7 @@ */ #include "input_event_distributer.h" -#include "graphic_log.h" +#include "gfx_utils/graphic_log.h" namespace OHOS { void InputEventDistributer::Distribute(const RawEvent* events, int32_t size) diff --git a/services/ims/input_event_distributer.h b/services/ims/input_event_distributer.h index c642f14..1bb6596 100755 --- a/services/ims/input_event_distributer.h +++ b/services/ims/input_event_distributer.h @@ -17,7 +17,7 @@ #define GRAPHIC_LITE_INPUT_EVENT_DISTRIBUTER_H #include -#include "input_event_info.h" +#include "gfx_utils/input_event_info.h" namespace OHOS { /** diff --git a/services/ims/input_event_hub.cpp b/services/ims/input_event_hub.cpp index e3daed5..9b61747 100755 --- a/services/ims/input_event_hub.cpp +++ b/services/ims/input_event_hub.cpp @@ -14,7 +14,7 @@ */ #include "input_event_hub.h" -#include "graphic_log.h" +#include "gfx_utils/graphic_log.h" namespace OHOS { namespace { diff --git a/services/ims/input_event_hub.h b/services/ims/input_event_hub.h index 364360d..93a20da 100755 --- a/services/ims/input_event_hub.h +++ b/services/ims/input_event_hub.h @@ -18,7 +18,7 @@ #include #include "input-event-codes.h" -#include "input_event_info.h" +#include "gfx_utils/input_event_info.h" #include "input_manager.h" #include "securec.h" diff --git a/services/ims/input_manager_service.cpp b/services/ims/input_manager_service.cpp index 5c8d1e0..f6e4e33 100755 --- a/services/ims/input_manager_service.cpp +++ b/services/ims/input_manager_service.cpp @@ -15,7 +15,7 @@ #include "input_manager_service.h" -#include "graphic_log.h" +#include "gfx_utils/graphic_log.h" namespace OHOS { InputEventHub* InputManagerService::hub_ = nullptr; diff --git a/services/ims/samgr_ims.cpp b/services/ims/samgr_ims.cpp index be0acd0..3995aad 100755 --- a/services/ims/samgr_ims.cpp +++ b/services/ims/samgr_ims.cpp @@ -17,7 +17,7 @@ #include #include "feature.h" -#include "graphic_log.h" +#include "gfx_utils/graphic_log.h" #include "input_event_client_proxy.h" #include "iproxy_client.h" #include "iproxy_server.h" diff --git a/services/wms/lite_win.cpp b/services/wms/lite_win.cpp index 590a865..82cacc1 100644 --- a/services/wms/lite_win.cpp +++ b/services/wms/lite_win.cpp @@ -16,10 +16,10 @@ #include "lite_win.h" #include "graphic_locker.h" -#include "graphic_log.h" +#include "gfx_utils/graphic_log.h" #include "graphic_performance.h" #include "hals/gfx_engines.h" -#include "pixel_format_utils.h" +#include "gfx_utils/pixel_format_utils.h" #include "securec.h" #include "lite_wm.h" diff --git a/services/wms/lite_win.h b/services/wms/lite_win.h index 6cb4851..21486e8 100755 --- a/services/wms/lite_win.h +++ b/services/wms/lite_win.h @@ -19,8 +19,8 @@ #include #include "liteipc_adapter.h" #include "serializer.h" -#include "color.h" -#include "geometry2d.h" +#include "gfx_utils/color.h" +#include "gfx_utils/geometry2d.h" #include "isurface.h" #include "lite_wm_type.h" #include "surface.h" diff --git a/services/wms/lite_wm.cpp b/services/wms/lite_wm.cpp index a7e9f64..977f5b3 100755 --- a/services/wms/lite_wm.cpp +++ b/services/wms/lite_wm.cpp @@ -15,9 +15,9 @@ #include "lite_wm.h" -#include "color.h" -#include "graphic_log.h" -#include "pixel_format_utils.h" +#include "gfx_utils/color.h" +#include "gfx_utils/graphic_log.h" +#include "gfx_utils/pixel_format_utils.h" namespace OHOS { namespace { diff --git a/services/wms/lite_wm.h b/services/wms/lite_wm.h index a850e9f..24d5de3 100755 --- a/services/wms/lite_wm.h +++ b/services/wms/lite_wm.h @@ -20,11 +20,11 @@ #include "surface.h" -#include "geometry2d.h" +#include "gfx_utils/geometry2d.h" #include "graphic_locker.h" #include "hals/hi_fbdev.h" #include "input_manager_service.h" -#include "list.h" +#include "gfx_utils/list.h" #include "lite_win.h" diff --git a/services/wms/lite_wms.cpp b/services/wms/lite_wms.cpp index 25d7856..0feac13 100755 --- a/services/wms/lite_wms.cpp +++ b/services/wms/lite_wms.cpp @@ -14,7 +14,7 @@ */ #include "lite_wms.h" -#include "graphic_log.h" +#include "gfx_utils/graphic_log.h" #include "lite_wm.h" #include "lite_wm_type.h" #include "surface.h" diff --git a/services/wms/lite_wms.h b/services/wms/lite_wms.h index f3e4676..52a4882 100755 --- a/services/wms/lite_wms.h +++ b/services/wms/lite_wms.h @@ -16,7 +16,7 @@ #ifndef GRAPHIC_LITE_LITE_WMS_H #define GRAPHIC_LITE_LITE_WMS_H -#include "geometry2d.h" +#include "gfx_utils/geometry2d.h" #include "lite_wm_type.h" #include "liteipc_adapter.h" #include "serializer.h" diff --git a/services/wms/samgr_wms.cpp b/services/wms/samgr_wms.cpp index bcc54c8..cdbf7f0 100755 --- a/services/wms/samgr_wms.cpp +++ b/services/wms/samgr_wms.cpp @@ -17,7 +17,7 @@ #include #include "feature.h" -#include "graphic_log.h" +#include "gfx_utils/graphic_log.h" #include "iproxy_client.h" #include "iproxy_server.h" #include "iunknown.h" diff --git a/services/wms/wms.cpp b/services/wms/wms.cpp index acb885a..7309cbf 100644 --- a/services/wms/wms.cpp +++ b/services/wms/wms.cpp @@ -14,7 +14,7 @@ */ #include "hals/gfx_engines.h" -#include "graphic_log.h" +#include "gfx_utils/graphic_log.h" #include "graphic_performance.h" #include "hals/hi_fbdev.h" #include "input_manager_service.h" diff --git a/test/sample_ui.cpp b/test/sample_ui.cpp index facc4c4..a6fd859 100755 --- a/test/sample_ui.cpp +++ b/test/sample_ui.cpp @@ -21,7 +21,7 @@ #include "common/task_manager.h" #include "dock/screen_device_proxy.h" #include "graphic_config.h" -#include "graphic_log.h" +#include "gfx_utils/graphic_log.h" #include "window/window.h" extern void RunApp(); diff --git a/test/sample_window.cpp b/test/sample_window.cpp index e1a9ae6..9d36f28 100755 --- a/test/sample_window.cpp +++ b/test/sample_window.cpp @@ -24,7 +24,7 @@ #include "font/ui_font.h" #include "font/ui_font_vector.h" #include "graphic_config.h" -#include "graphic_log.h" +#include "gfx_utils/graphic_log.h" #include "window/window.h" #include -- Gitee From c3d8c22555d5970d7ca24a68315de9b8e0fb393a Mon Sep 17 00:00:00 2001 From: zhangguyuan Date: Thu, 18 Mar 2021 15:09:39 +0800 Subject: [PATCH 2/2] fix utils include path Change-Id: Ia24c415bfe299d234f8c8e7835ede52bfda0c643 --- frameworks/wms/lite_win_requestor.h | 2 +- frameworks/wms/lite_wm_requestor.cpp | 2 +- services/ims/input_event_hub.h | 2 +- services/wms/lite_win.cpp | 4 ++-- services/wms/lite_win.h | 5 +++-- services/wms/lite_wm.h | 2 +- test/sample_ui.cpp | 4 ++-- test/sample_window.cpp | 2 +- 8 files changed, 12 insertions(+), 11 deletions(-) diff --git a/frameworks/wms/lite_win_requestor.h b/frameworks/wms/lite_win_requestor.h index 2cea134..bdbcb83 100755 --- a/frameworks/wms/lite_win_requestor.h +++ b/frameworks/wms/lite_win_requestor.h @@ -16,8 +16,8 @@ #ifndef GRAPHIC_LITE_LITE_WIN_REQUESTOR_H #define GRAPHIC_LITE_LITE_WIN_REQUESTOR_H -#include "gfx_utils/geometry2d.h" #include +#include "gfx_utils/geometry2d.h" #include "surface.h" namespace OHOS { diff --git a/frameworks/wms/lite_wm_requestor.cpp b/frameworks/wms/lite_wm_requestor.cpp index 6ec79ed..66560e1 100755 --- a/frameworks/wms/lite_wm_requestor.cpp +++ b/frameworks/wms/lite_wm_requestor.cpp @@ -16,8 +16,8 @@ #include "lite_wm_requestor.h" #include "gfx_utils/graphic_log.h" #include "gfx_utils/input_event_info.h" -#include "lite_wms_client.h" #include "gfx_utils/pixel_format_utils.h" +#include "lite_wms_client.h" #include "surface_impl.h" namespace OHOS { diff --git a/services/ims/input_event_hub.h b/services/ims/input_event_hub.h index 93a20da..f9c5312 100755 --- a/services/ims/input_event_hub.h +++ b/services/ims/input_event_hub.h @@ -17,8 +17,8 @@ #define GRAPHIC_LITE_INPUT_EVENT_HUB_H #include -#include "input-event-codes.h" #include "gfx_utils/input_event_info.h" +#include "input-event-codes.h" #include "input_manager.h" #include "securec.h" diff --git a/services/wms/lite_win.cpp b/services/wms/lite_win.cpp index 82cacc1..d8b842c 100644 --- a/services/wms/lite_win.cpp +++ b/services/wms/lite_win.cpp @@ -15,11 +15,11 @@ #include "lite_win.h" -#include "graphic_locker.h" #include "gfx_utils/graphic_log.h" +#include "gfx_utils/pixel_format_utils.h" +#include "graphic_locker.h" #include "graphic_performance.h" #include "hals/gfx_engines.h" -#include "gfx_utils/pixel_format_utils.h" #include "securec.h" #include "lite_wm.h" diff --git a/services/wms/lite_win.h b/services/wms/lite_win.h index 21486e8..4cce079 100755 --- a/services/wms/lite_win.h +++ b/services/wms/lite_win.h @@ -17,12 +17,13 @@ #define GRAPHIC_LITE_LITE_WIN_H #include -#include "liteipc_adapter.h" -#include "serializer.h" + #include "gfx_utils/color.h" #include "gfx_utils/geometry2d.h" #include "isurface.h" #include "lite_wm_type.h" +#include "liteipc_adapter.h" +#include "serializer.h" #include "surface.h" namespace OHOS { diff --git a/services/wms/lite_wm.h b/services/wms/lite_wm.h index 24d5de3..a666c8b 100755 --- a/services/wms/lite_wm.h +++ b/services/wms/lite_wm.h @@ -21,10 +21,10 @@ #include "surface.h" #include "gfx_utils/geometry2d.h" +#include "gfx_utils/list.h" #include "graphic_locker.h" #include "hals/hi_fbdev.h" #include "input_manager_service.h" -#include "gfx_utils/list.h" #include "lite_win.h" diff --git a/test/sample_ui.cpp b/test/sample_ui.cpp index a6fd859..8e722b5 100755 --- a/test/sample_ui.cpp +++ b/test/sample_ui.cpp @@ -15,13 +15,13 @@ #include -#include "font/ui_font_vector.h" #include "common/graphic_startup.h" #include "common/screen.h" #include "common/task_manager.h" #include "dock/screen_device_proxy.h" -#include "graphic_config.h" +#include "font/ui_font_vector.h" #include "gfx_utils/graphic_log.h" +#include "graphic_config.h" #include "window/window.h" extern void RunApp(); diff --git a/test/sample_window.cpp b/test/sample_window.cpp index 9d36f28..54bdfef 100755 --- a/test/sample_window.cpp +++ b/test/sample_window.cpp @@ -23,8 +23,8 @@ #include "dock/screen_device_proxy.h" #include "font/ui_font.h" #include "font/ui_font_vector.h" -#include "graphic_config.h" #include "gfx_utils/graphic_log.h" +#include "graphic_config.h" #include "window/window.h" #include -- Gitee