From b733532387ba418f291efa46640d607c37b2e984 Mon Sep 17 00:00:00 2001 From: liqiang Date: Mon, 22 Mar 2021 15:34:38 +0800 Subject: [PATCH] move screen_device_proxy.cpp from common to dock dir Change-Id: I7c977b929939e6dbc2a26e94c1ddc4995a6dba91 --- BUILD.gn | 2 +- frameworks/{common => dock}/screen_device_proxy.cpp | 0 interfaces/kits/dfx/ui_screenshot.h | 1 - tools/qt/simulator/libui/libui.pro | 2 +- ui.gni | 2 +- 5 files changed, 3 insertions(+), 4 deletions(-) rename frameworks/{common => dock}/screen_device_proxy.cpp (100%) mode change 100755 => 100644 tools/qt/simulator/libui/libui.pro diff --git a/BUILD.gn b/BUILD.gn index 219a92c..7aa989d 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -60,7 +60,6 @@ shared_library("ui") { "frameworks/common/image.cpp", "frameworks/common/input_device_manager.cpp", "frameworks/common/screen.cpp", - "frameworks/common/screen_device_proxy.cpp", "frameworks/common/task.cpp", "frameworks/common/text.cpp", "frameworks/common/typed_text.cpp", @@ -114,6 +113,7 @@ shared_library("ui") { "frameworks/dock/ohos/ohos_input_device.cpp", "frameworks/dock/pointer_input_device.cpp", "frameworks/dock/rotate_input_device.cpp", + "frameworks/dock/screen_device_proxy.cpp", "frameworks/dock/virtual_input_device.cpp", "frameworks/draw/draw_arc.cpp", "frameworks/draw/draw_curve.cpp", diff --git a/frameworks/common/screen_device_proxy.cpp b/frameworks/dock/screen_device_proxy.cpp similarity index 100% rename from frameworks/common/screen_device_proxy.cpp rename to frameworks/dock/screen_device_proxy.cpp diff --git a/interfaces/kits/dfx/ui_screenshot.h b/interfaces/kits/dfx/ui_screenshot.h index a800bf2..084a61d 100755 --- a/interfaces/kits/dfx/ui_screenshot.h +++ b/interfaces/kits/dfx/ui_screenshot.h @@ -79,7 +79,6 @@ public: * @version 1.0 */ bool ScreenshotToFile(const char* path); - private: UIScreenshotListener* screenshotListener_; diff --git a/tools/qt/simulator/libui/libui.pro b/tools/qt/simulator/libui/libui.pro old mode 100755 new mode 100644 index afa785c..16429fd --- a/tools/qt/simulator/libui/libui.pro +++ b/tools/qt/simulator/libui/libui.pro @@ -28,7 +28,6 @@ SOURCES += \ ../../../../frameworks/common/image.cpp \ ../../../../frameworks/common/input_device_manager.cpp \ ../../../../frameworks/common/screen.cpp \ - ../../../../frameworks/common/screen_device_proxy.cpp \ ../../../../frameworks/common/task.cpp \ ../../../../frameworks/common/text.cpp \ ../../../../frameworks/common/typed_text.cpp \ @@ -78,6 +77,7 @@ SOURCES += \ ../../../../frameworks/dock/key_input_device.cpp \ ../../../../frameworks/dock/pointer_input_device.cpp \ ../../../../frameworks/dock/rotate_input_device.cpp \ + ../../../../frameworks/dock/screen_device_proxy.cpp \ ../../../../frameworks/dock/virtual_input_device.cpp \ ../../../../frameworks/draw/draw_arc.cpp \ ../../../../frameworks/draw/draw_curve.cpp \ diff --git a/ui.gni b/ui.gni index baf26af..b2f2087 100644 --- a/ui.gni +++ b/ui.gni @@ -24,7 +24,6 @@ graphic_ui_sources = [ "$GRAPHIC_UI_PATH/frameworks/common/image.cpp", "$GRAPHIC_UI_PATH/frameworks/common/input_device_manager.cpp", "$GRAPHIC_UI_PATH/frameworks/common/screen.cpp", - "$GRAPHIC_UI_PATH/frameworks/common/screen_device_proxy.cpp", "$GRAPHIC_UI_PATH/frameworks/common/task.cpp", "$GRAPHIC_UI_PATH/frameworks/common/text.cpp", "$GRAPHIC_UI_PATH/frameworks/common/typed_text.cpp", @@ -72,6 +71,7 @@ graphic_ui_sources = [ "$GRAPHIC_UI_PATH/frameworks/dock/input_device.cpp", "$GRAPHIC_UI_PATH/frameworks/dock/key_input_device.cpp", "$GRAPHIC_UI_PATH/frameworks/dock/pointer_input_device.cpp", + "$GRAPHIC_UI_PATH/frameworks/dock/screen_device_proxy.cpp", "$GRAPHIC_UI_PATH/frameworks/dock/virtual_input_device.cpp", "$GRAPHIC_UI_PATH/frameworks/draw/draw_arc.cpp", "$GRAPHIC_UI_PATH/frameworks/draw/draw_curve.cpp", -- GitLab