From b5b476e9cdc1477ea799e8e83167177cf7e71721 Mon Sep 17 00:00:00 2001 From: lixiangpeng5 Date: Thu, 13 Oct 2022 09:36:50 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=84=E6=95=B4{}=E5=89=8D=E5=90=8E=E7=9A=84?= =?UTF-8?q?=E7=A9=BA=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: lixiangpeng5 Change-Id: I2fba74129c60c0cf4b403e55d0df2e17252dce29 --- frameworks/napi/input_monitor/src/js_input_monitor_manager.cpp | 2 +- frameworks/proxy/event_handler/src/client_msg_handler.cpp | 2 +- .../proxy/event_handler/src/input_device_cooperate_impl.cpp | 2 +- frameworks/proxy/event_handler/src/input_device_impl.cpp | 2 +- frameworks/proxy/event_handler/src/multimodal_event_handler.cpp | 2 +- frameworks/proxy/events/src/input_event.cpp | 2 +- frameworks/proxy/events/src/key_event.cpp | 2 +- frameworks/proxy/events/src/key_option.cpp | 2 +- frameworks/proxy/events/test/pointer_event_test.cpp | 2 +- .../connect_manager/src/multimodal_input_connect_manager.cpp | 2 +- .../connect_manager/src/multimodal_input_connect_remoter.cpp | 2 +- service/device_manager/src/input_device_manager.cpp | 2 +- service/hdf_adapter/src/hdf_event_manager.cpp | 2 +- service/input_device_cooperate/src/cooperate_event_manager.cpp | 2 +- .../input_device_cooperate/src/distributed_input_adapter.cpp | 2 +- .../src/i_input_device_cooperate_state.cpp | 2 +- .../input_device_cooperate/src/input_device_cooperate_sm.cpp | 2 +- .../src/input_device_cooperate_state_free.cpp | 2 +- .../src/input_device_cooperate_state_in.cpp | 2 +- .../src/input_device_cooperate_state_out.cpp | 2 +- service/module_loader/src/uds_server.cpp | 2 +- service/mouse_event_normalize/src/mouse_device_state.cpp | 2 +- service/mouse_event_normalize/src/mouse_event_normalize.cpp | 2 +- service/permission_helper/src/permission_helper.cpp | 2 +- service/subscriber/src/key_subscriber_handler.cpp | 2 +- service/window_manager/src/input_windows_manager.cpp | 2 +- tools/event_inject/src/manage_inject_device.cpp | 2 +- tools/event_inject/src/processing_joystick_device.cpp | 2 +- tools/event_inject/src/processing_mouse_device.cpp | 2 +- tools/inject_event/src/input_manager_command.cpp | 2 +- uinput/hdf_device_event_dispatch.cpp | 2 +- uinput/hdf_device_event_manager.cpp | 2 +- uinput/keyboard_inject.cpp | 2 +- uinput/virtual_device.cpp | 2 +- util/common/src/util.cpp | 2 +- util/network/include/circle_stream_buffer.h | 2 +- util/network/include/stream_buffer.h | 2 +- 37 files changed, 37 insertions(+), 37 deletions(-) diff --git a/frameworks/napi/input_monitor/src/js_input_monitor_manager.cpp b/frameworks/napi/input_monitor/src/js_input_monitor_manager.cpp index e015922786..a477f468c9 100644 --- a/frameworks/napi/input_monitor/src/js_input_monitor_manager.cpp +++ b/frameworks/napi/input_monitor/src/js_input_monitor_manager.cpp @@ -24,7 +24,7 @@ namespace OHOS { namespace MMI { namespace { -constexpr OHOS::HiviewDFX::HiLogLabel LABEL = {LOG_CORE, MMI_LOG_DOMAIN, "JsInputMonitorManager" }; +constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "JsInputMonitorManager" }; const std::string REFERENCE_UNREF = "napi_reference_unref"; constexpr int32_t MONITOR_REGISTER_EXCEED_MAX { 4100001 }; diff --git a/frameworks/proxy/event_handler/src/client_msg_handler.cpp b/frameworks/proxy/event_handler/src/client_msg_handler.cpp index 6625570063..066182e56b 100644 --- a/frameworks/proxy/event_handler/src/client_msg_handler.cpp +++ b/frameworks/proxy/event_handler/src/client_msg_handler.cpp @@ -44,7 +44,7 @@ namespace OHOS { namespace MMI { namespace { -constexpr OHOS::HiviewDFX::HiLogLabel LABEL = {LOG_CORE, MMI_LOG_DOMAIN, "ClientMsgHandler"}; +constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "ClientMsgHandler" }; } // namespace ClientMsgHandler::~ClientMsgHandler() diff --git a/frameworks/proxy/event_handler/src/input_device_cooperate_impl.cpp b/frameworks/proxy/event_handler/src/input_device_cooperate_impl.cpp index 083cd8f571..475c1fd872 100755 --- a/frameworks/proxy/event_handler/src/input_device_cooperate_impl.cpp +++ b/frameworks/proxy/event_handler/src/input_device_cooperate_impl.cpp @@ -22,7 +22,7 @@ namespace OHOS { namespace MMI { namespace { -constexpr OHOS::HiviewDFX::HiLogLabel LABEL = {LOG_CORE, MMI_LOG_DOMAIN, "InputDeviceCooperateImpl"}; +constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "InputDeviceCooperateImpl" }; } // namespace InputDeviceCooperateImpl &InputDeviceCooperateImpl::GetInstance() diff --git a/frameworks/proxy/event_handler/src/input_device_impl.cpp b/frameworks/proxy/event_handler/src/input_device_impl.cpp index d22fb0636d..6387a11db3 100755 --- a/frameworks/proxy/event_handler/src/input_device_impl.cpp +++ b/frameworks/proxy/event_handler/src/input_device_impl.cpp @@ -24,7 +24,7 @@ namespace OHOS { namespace MMI { namespace { -constexpr OHOS::HiviewDFX::HiLogLabel LABEL = {LOG_CORE, MMI_LOG_DOMAIN, "InputDeviceImpl"}; +constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "InputDeviceImpl" }; } // namespace InputDeviceImpl& InputDeviceImpl::GetInstance() diff --git a/frameworks/proxy/event_handler/src/multimodal_event_handler.cpp b/frameworks/proxy/event_handler/src/multimodal_event_handler.cpp index f815b9e9e6..a03f1a3b1d 100755 --- a/frameworks/proxy/event_handler/src/multimodal_event_handler.cpp +++ b/frameworks/proxy/event_handler/src/multimodal_event_handler.cpp @@ -28,7 +28,7 @@ namespace OHOS { namespace MMI { namespace { -constexpr OHOS::HiviewDFX::HiLogLabel LABEL = {LOG_CORE, MMI_LOG_DOMAIN, "MultimodalEventHandler"}; +constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "MultimodalEventHandler" }; } // namespace void OnConnected(const IfMMIClient& client) diff --git a/frameworks/proxy/events/src/input_event.cpp b/frameworks/proxy/events/src/input_event.cpp index 13055a4671..8f9ea6cb80 100644 --- a/frameworks/proxy/events/src/input_event.cpp +++ b/frameworks/proxy/events/src/input_event.cpp @@ -24,7 +24,7 @@ namespace OHOS { namespace MMI { namespace { int64_t g_nextEventId = 1; -constexpr OHOS::HiviewDFX::HiLogLabel LABEL = {LOG_CORE, MMI_LOG_DOMAIN, "InputEvent"}; +constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "InputEvent" }; } // namespace InputEvent::InputEvent(int32_t eventType) : eventType_(eventType) diff --git a/frameworks/proxy/events/src/key_event.cpp b/frameworks/proxy/events/src/key_event.cpp index 2f402a91e1..4369a45b7e 100644 --- a/frameworks/proxy/events/src/key_event.cpp +++ b/frameworks/proxy/events/src/key_event.cpp @@ -22,7 +22,7 @@ using namespace OHOS::HiviewDFX; namespace OHOS { namespace MMI { namespace { -constexpr OHOS::HiviewDFX::HiLogLabel LABEL = {LOG_CORE, MMI_LOG_DOMAIN, "KeyEvent"}; +constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "KeyEvent" }; } // namespace const int32_t KeyEvent::UNKOWN_FUNCTION_KEY = -1; const int32_t KeyEvent::NUM_LOCK_FUNCTION_KEY = 0; diff --git a/frameworks/proxy/events/src/key_option.cpp b/frameworks/proxy/events/src/key_option.cpp index 1461a3102c..90093be922 100644 --- a/frameworks/proxy/events/src/key_option.cpp +++ b/frameworks/proxy/events/src/key_option.cpp @@ -20,7 +20,7 @@ namespace OHOS { namespace MMI { namespace { -constexpr OHOS::HiviewDFX::HiLogLabel LABEL = {LOG_CORE, MMI_LOG_DOMAIN, "KeyOption"}; +constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "KeyOption" }; constexpr int32_t PRE_KEYS_MAX_SIZE = 3; } std::set KeyOption::GetPreKeys() const diff --git a/frameworks/proxy/events/test/pointer_event_test.cpp b/frameworks/proxy/events/test/pointer_event_test.cpp index dc59ab8915..a022dcd898 100755 --- a/frameworks/proxy/events/test/pointer_event_test.cpp +++ b/frameworks/proxy/events/test/pointer_event_test.cpp @@ -22,7 +22,7 @@ namespace OHOS { namespace MMI { namespace { #ifdef OHOS_BUILD_ENABLE_POINTER -constexpr OHOS::HiviewDFX::HiLogLabel LABEL = {LOG_CORE, MMI_LOG_DOMAIN, "PointerEventTest"}; +constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "PointerEventTest" }; #endif // OHOS_BUILD_ENABLE_POINTER using namespace testing::ext; } // namespace diff --git a/service/connect_manager/src/multimodal_input_connect_manager.cpp b/service/connect_manager/src/multimodal_input_connect_manager.cpp index 38be4017e2..9893ab9b6c 100644 --- a/service/connect_manager/src/multimodal_input_connect_manager.cpp +++ b/service/connect_manager/src/multimodal_input_connect_manager.cpp @@ -30,7 +30,7 @@ namespace OHOS { namespace MMI { namespace { std::shared_ptr g_instance = nullptr; -constexpr OHOS::HiviewDFX::HiLogLabel LABEL = {LOG_CORE, MMI_LOG_DOMAIN, "MultimodalInputConnectManager"}; +constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "MultimodalInputConnectManager" }; } // namespace std::shared_ptr MultimodalInputConnectManager::GetInstance() diff --git a/service/connect_manager/src/multimodal_input_connect_remoter.cpp b/service/connect_manager/src/multimodal_input_connect_remoter.cpp index 9f959b0905..ca3555f33b 100755 --- a/service/connect_manager/src/multimodal_input_connect_remoter.cpp +++ b/service/connect_manager/src/multimodal_input_connect_remoter.cpp @@ -30,7 +30,7 @@ namespace OHOS { namespace MMI { namespace { std::shared_ptr g_instance = nullptr; -constexpr OHOS::HiviewDFX::HiLogLabel LABEL = {LOG_CORE, MMI_LOG_DOMAIN, "MultimodalInputConnectRemoter"}; +constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "MultimodalInputConnectRemoter" }; } // namespace std::shared_ptr MultimodalInputConnectRemoter::GetInstance() diff --git a/service/device_manager/src/input_device_manager.cpp b/service/device_manager/src/input_device_manager.cpp index 1f744c7e50..8c022aa18b 100644 --- a/service/device_manager/src/input_device_manager.cpp +++ b/service/device_manager/src/input_device_manager.cpp @@ -39,7 +39,7 @@ namespace OHOS { namespace MMI { namespace { -constexpr OHOS::HiviewDFX::HiLogLabel LABEL = {LOG_CORE, MMI_LOG_DOMAIN, "InputDeviceManager"}; +constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "InputDeviceManager" }; constexpr int32_t INVALID_DEVICE_ID = -1; constexpr int32_t SUPPORT_KEY = 1; diff --git a/service/hdf_adapter/src/hdf_event_manager.cpp b/service/hdf_adapter/src/hdf_event_manager.cpp index ae80e9029e..1a61ecafb0 100644 --- a/service/hdf_adapter/src/hdf_event_manager.cpp +++ b/service/hdf_adapter/src/hdf_event_manager.cpp @@ -31,7 +31,7 @@ namespace OHOS { namespace MMI { namespace { -constexpr OHOS::HiviewDFX::HiLogLabel LABEL = {LOG_CORE, MMI_LOG_DOMAIN, "HdfEventManager"}; +constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "HdfEventManager" }; } // namespace HdfEventManager *HdfEventManager::m_globleThis; diff --git a/service/input_device_cooperate/src/cooperate_event_manager.cpp b/service/input_device_cooperate/src/cooperate_event_manager.cpp index 8e3618fa74..9e20c28bbc 100755 --- a/service/input_device_cooperate/src/cooperate_event_manager.cpp +++ b/service/input_device_cooperate/src/cooperate_event_manager.cpp @@ -20,7 +20,7 @@ namespace OHOS { namespace MMI { namespace { -constexpr OHOS::HiviewDFX::HiLogLabel LABEL = {LOG_CORE, MMI_LOG_DOMAIN, "CooperateEventManager"}; +constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "CooperateEventManager" }; } // namespace CooperateEventManager::CooperateEventManager() {} diff --git a/service/input_device_cooperate/src/distributed_input_adapter.cpp b/service/input_device_cooperate/src/distributed_input_adapter.cpp index 798393c47f..aa0951120d 100755 --- a/service/input_device_cooperate/src/distributed_input_adapter.cpp +++ b/service/input_device_cooperate/src/distributed_input_adapter.cpp @@ -26,7 +26,7 @@ namespace OHOS { namespace MMI { using namespace DistributedHardware::DistributedInput; namespace { -constexpr OHOS::HiviewDFX::HiLogLabel LABEL = {LOG_CORE, MMI_LOG_DOMAIN, "DistributedInputAdapter"}; +constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "DistributedInputAdapter" }; constexpr int32_t DEFAULT_DELAY_TIME = 4000; constexpr int32_t RETRY_TIME = 2; } // namespace diff --git a/service/input_device_cooperate/src/i_input_device_cooperate_state.cpp b/service/input_device_cooperate/src/i_input_device_cooperate_state.cpp index 1f2a9cbbff..f7530881ea 100755 --- a/service/input_device_cooperate/src/i_input_device_cooperate_state.cpp +++ b/service/input_device_cooperate/src/i_input_device_cooperate_state.cpp @@ -24,7 +24,7 @@ namespace OHOS { namespace MMI { namespace { -constexpr OHOS::HiviewDFX::HiLogLabel LABEL = {LOG_CORE, MMI_LOG_DOMAIN, "IInputDeviceCooperateState"}; +constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "IInputDeviceCooperateState" }; } // namespace IInputDeviceCooperateState::IInputDeviceCooperateState() diff --git a/service/input_device_cooperate/src/input_device_cooperate_sm.cpp b/service/input_device_cooperate/src/input_device_cooperate_sm.cpp index de4e98643f..1dfe1adc2f 100755 --- a/service/input_device_cooperate/src/input_device_cooperate_sm.cpp +++ b/service/input_device_cooperate/src/input_device_cooperate_sm.cpp @@ -37,7 +37,7 @@ namespace OHOS { namespace MMI { namespace { -constexpr OHOS::HiviewDFX::HiLogLabel LABEL = {LOG_CORE, MMI_LOG_DOMAIN, "InputDeviceCooperateSM"}; +constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "InputDeviceCooperateSM" }; const std::string BUNDLE_NAME = "ohos.multimodalinput.input"; constexpr int32_t INTERVAL_MS = 2000; constexpr int32_t MOUSE_ABS_LOCATION = 100; diff --git a/service/input_device_cooperate/src/input_device_cooperate_state_free.cpp b/service/input_device_cooperate/src/input_device_cooperate_state_free.cpp index 302f2d85a9..c4733803a5 100755 --- a/service/input_device_cooperate/src/input_device_cooperate_state_free.cpp +++ b/service/input_device_cooperate/src/input_device_cooperate_state_free.cpp @@ -23,7 +23,7 @@ namespace OHOS { namespace MMI { namespace { -constexpr OHOS::HiviewDFX::HiLogLabel LABEL = {LOG_CORE, MMI_LOG_DOMAIN, "InputDeviceCooperateStateFree"}; +constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "InputDeviceCooperateStateFree" }; } // namespace int32_t InputDeviceCooperateStateFree::StartInputDeviceCooperate( diff --git a/service/input_device_cooperate/src/input_device_cooperate_state_in.cpp b/service/input_device_cooperate/src/input_device_cooperate_state_in.cpp index 1fa453f27a..800f63af7d 100755 --- a/service/input_device_cooperate/src/input_device_cooperate_state_in.cpp +++ b/service/input_device_cooperate/src/input_device_cooperate_state_in.cpp @@ -25,7 +25,7 @@ namespace OHOS { namespace MMI { namespace { -constexpr OHOS::HiviewDFX::HiLogLabel LABEL = {LOG_CORE, MMI_LOG_DOMAIN, "InputDeviceCooperateStateIn"}; +constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "InputDeviceCooperateStateIn" }; } // namespace InputDeviceCooperateStateIn::InputDeviceCooperateStateIn(const std::string &startDhid) : startDhid_(startDhid) {} diff --git a/service/input_device_cooperate/src/input_device_cooperate_state_out.cpp b/service/input_device_cooperate/src/input_device_cooperate_state_out.cpp index c60ca0aa8a..4beb74f300 100755 --- a/service/input_device_cooperate/src/input_device_cooperate_state_out.cpp +++ b/service/input_device_cooperate/src/input_device_cooperate_state_out.cpp @@ -25,7 +25,7 @@ namespace OHOS { namespace MMI { namespace { -constexpr OHOS::HiviewDFX::HiLogLabel LABEL = {LOG_CORE, MMI_LOG_DOMAIN, "InputDeviceCooperateStateOut"}; +constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "InputDeviceCooperateStateOut" }; } // namespace InputDeviceCooperateStateOut::InputDeviceCooperateStateOut(const std::string& startDhid) diff --git a/service/module_loader/src/uds_server.cpp b/service/module_loader/src/uds_server.cpp index 1677e4a3d6..383f73f790 100755 --- a/service/module_loader/src/uds_server.cpp +++ b/service/module_loader/src/uds_server.cpp @@ -29,7 +29,7 @@ namespace OHOS { namespace MMI { namespace { -constexpr OHOS::HiviewDFX::HiLogLabel LABEL = {LOG_CORE, MMI_LOG_DOMAIN, "UDSServer"}; +constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "UDSServer" }; } // namespace UDSServer::UDSServer() {} diff --git a/service/mouse_event_normalize/src/mouse_device_state.cpp b/service/mouse_event_normalize/src/mouse_device_state.cpp index af64b2917c..75f1bd6a41 100644 --- a/service/mouse_event_normalize/src/mouse_device_state.cpp +++ b/service/mouse_event_normalize/src/mouse_device_state.cpp @@ -20,7 +20,7 @@ namespace OHOS { namespace MMI { namespace { -constexpr OHOS::HiviewDFX::HiLogLabel LABEL = {LOG_CORE, MMI_LOG_DOMAIN, "MouseDeviceState"}; +constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "MouseDeviceState" }; } // namespace MouseDeviceState::MouseDeviceState() diff --git a/service/mouse_event_normalize/src/mouse_event_normalize.cpp b/service/mouse_event_normalize/src/mouse_event_normalize.cpp index dc20140767..ebb7bac827 100644 --- a/service/mouse_event_normalize/src/mouse_event_normalize.cpp +++ b/service/mouse_event_normalize/src/mouse_event_normalize.cpp @@ -46,7 +46,7 @@ const std::vector ACCELERATE_CURVES { { { 8, 32, 128 }, { 1.04, 3.30, 6.16 }, { 0.0, -18.08, -109.60 } }, { { 8, 32, 128 }, { 1.10, 3.75, 7.00 }, { 0.0, -21.20, -125.20 } }, { { 8, 32, 128 }, { 1.16, 4.20, 7.84 }, { 0.0, -24.32, -140.80 } } - }; +}; constexpr double DOUBLE_ZERO = 1e-6; constexpr int32_t MIN_SPEED = 1; constexpr int32_t MAX_SPEED = 11; diff --git a/service/permission_helper/src/permission_helper.cpp b/service/permission_helper/src/permission_helper.cpp index f7ed467540..1a0917396a 100644 --- a/service/permission_helper/src/permission_helper.cpp +++ b/service/permission_helper/src/permission_helper.cpp @@ -21,7 +21,7 @@ namespace OHOS { namespace MMI { namespace { -constexpr OHOS::HiviewDFX::HiLogLabel LABEL = {LOG_CORE, MMI_LOG_DOMAIN, "PermissionHelper"}; +constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "PermissionHelper" }; } // namespace PermissionHelper::PermissionHelper() {} diff --git a/service/subscriber/src/key_subscriber_handler.cpp b/service/subscriber/src/key_subscriber_handler.cpp index 86f4283f73..bfda86501c 100644 --- a/service/subscriber/src/key_subscriber_handler.cpp +++ b/service/subscriber/src/key_subscriber_handler.cpp @@ -28,7 +28,7 @@ namespace OHOS { namespace MMI { namespace { -constexpr OHOS::HiviewDFX::HiLogLabel LABEL = {LOG_CORE, MMI_LOG_DOMAIN, "KeySubscriberHandler"}; +constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "KeySubscriberHandler" }; constexpr uint32_t MAX_PRE_KEY_COUNT = 4; } // namespace diff --git a/service/window_manager/src/input_windows_manager.cpp b/service/window_manager/src/input_windows_manager.cpp index 782decd89d..cf7e7c4b64 100644 --- a/service/window_manager/src/input_windows_manager.cpp +++ b/service/window_manager/src/input_windows_manager.cpp @@ -30,7 +30,7 @@ namespace OHOS { namespace MMI { namespace { -constexpr OHOS::HiviewDFX::HiLogLabel LABEL = {LOG_CORE, MMI_LOG_DOMAIN, "InputWindowsManager"}; +constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "InputWindowsManager" }; #ifdef OHOS_BUILD_ENABLE_POINTER constexpr int32_t DEFAULT_POINTER_STYLE = 0; constexpr size_t MAX_WINDOW_COUNT = 20; diff --git a/tools/event_inject/src/manage_inject_device.cpp b/tools/event_inject/src/manage_inject_device.cpp index 464a16b927..b9b1724dab 100644 --- a/tools/event_inject/src/manage_inject_device.cpp +++ b/tools/event_inject/src/manage_inject_device.cpp @@ -21,7 +21,7 @@ using namespace OHOS::MMI; namespace { -constexpr OHOS::HiviewDFX::HiLogLabel LABEL = {LOG_CORE, MMI_LOG_DOMAIN, "ManageInjectDevice" }; +constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "ManageInjectDevice" }; constexpr int64_t INJECT_SLEEP_TIMES = 10; } // namespace diff --git a/tools/event_inject/src/processing_joystick_device.cpp b/tools/event_inject/src/processing_joystick_device.cpp index 2df47d752a..012343f6d1 100644 --- a/tools/event_inject/src/processing_joystick_device.cpp +++ b/tools/event_inject/src/processing_joystick_device.cpp @@ -18,7 +18,7 @@ using namespace OHOS::MMI; namespace { -constexpr OHOS::HiviewDFX::HiLogLabel LABEL = {LOG_CORE, MMI_LOG_DOMAIN, "ProcessingJoystickDevice" }; +constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "ProcessingJoystickDevice" }; constexpr int32_t DEFAULT_ABSX_VALUE = 8188; constexpr int32_t DEFAULT_ABSY_VALUE = 8192; constexpr int32_t DEFAULT_ABSZ_VALUE = 125; diff --git a/tools/event_inject/src/processing_mouse_device.cpp b/tools/event_inject/src/processing_mouse_device.cpp index 119f34cc4a..36ce84884b 100644 --- a/tools/event_inject/src/processing_mouse_device.cpp +++ b/tools/event_inject/src/processing_mouse_device.cpp @@ -18,7 +18,7 @@ using namespace OHOS::MMI; namespace { -constexpr OHOS::HiviewDFX::HiLogLabel LABEL = {LOG_CORE, MMI_LOG_DOMAIN, "ProcessingMouseDevice" }; +constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "ProcessingMouseDevice" }; } // namespace int32_t ProcessingMouseDevice::TransformJsonDataToInputData(const DeviceItem& fingerEventArrays, diff --git a/tools/inject_event/src/input_manager_command.cpp b/tools/inject_event/src/input_manager_command.cpp index 23f32e37ca..efcd22af2b 100755 --- a/tools/inject_event/src/input_manager_command.cpp +++ b/tools/inject_event/src/input_manager_command.cpp @@ -50,7 +50,7 @@ private: namespace OHOS { namespace MMI { namespace { -constexpr OHOS::HiviewDFX::HiLogLabel LABEL = {LOG_CORE, MMI_LOG_DOMAIN, "InputManagerCommand"}; +constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "InputManagerCommand" }; constexpr int32_t SLEEPTIME = 20; constexpr int32_t MOUSE_ID = 7; constexpr int32_t TWO_MORE_COMMAND = 2; diff --git a/uinput/hdf_device_event_dispatch.cpp b/uinput/hdf_device_event_dispatch.cpp index e00c356f01..db847f0386 100644 --- a/uinput/hdf_device_event_dispatch.cpp +++ b/uinput/hdf_device_event_dispatch.cpp @@ -24,7 +24,7 @@ using namespace OHOS::HiviewDFX; namespace OHOS { namespace MMI { namespace { -constexpr OHOS::HiviewDFX::HiLogLabel LABEL = {LOG_CORE, MMI_LOG_DOMAIN, "HdfDeviceEventDispatch"}; +constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "HdfDeviceEventDispatch" }; } // namespace std::unique_ptr g_pTouchScreen = nullptr; InjectThread HdfDeviceEventDispatch::injectThread_; diff --git a/uinput/hdf_device_event_manager.cpp b/uinput/hdf_device_event_manager.cpp index 18f68e7799..699e21d0fb 100644 --- a/uinput/hdf_device_event_manager.cpp +++ b/uinput/hdf_device_event_manager.cpp @@ -24,7 +24,7 @@ using namespace OHOS::HiviewDFX; namespace OHOS { namespace MMI { namespace { -constexpr OHOS::HiviewDFX::HiLogLabel LABEL = {LOG_CORE, MMI_LOG_DOMAIN, "HdfDeviceEventManager"}; +constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "HdfDeviceEventManager" }; } // namespace HdfDeviceEventManager::HdfDeviceEventManager() {} diff --git a/uinput/keyboard_inject.cpp b/uinput/keyboard_inject.cpp index 5d2546e94d..144b058021 100644 --- a/uinput/keyboard_inject.cpp +++ b/uinput/keyboard_inject.cpp @@ -23,7 +23,7 @@ namespace OHOS { namespace MMI { namespace { std::shared_ptr g_instance = nullptr; -constexpr OHOS::HiviewDFX::HiLogLabel LABEL = {LOG_CORE, MMI_LOG_DOMAIN, "keyBoardInject"}; +constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "keyBoardInject" }; constexpr int32_t INPUT_KEY_BACK = 2; constexpr int32_t LINUX_KEY_BACK = 158; } // namespace diff --git a/uinput/virtual_device.cpp b/uinput/virtual_device.cpp index 8e52abd6d0..03e4e5026e 100644 --- a/uinput/virtual_device.cpp +++ b/uinput/virtual_device.cpp @@ -25,7 +25,7 @@ namespace OHOS { namespace MMI { namespace { using namespace OHOS::HiviewDFX; -constexpr HiLogLabel LABEL = {LOG_CORE, MMI_LOG_DOMAIN, "VirtualDevice"}; +constexpr HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "VirtualDevice" }; constexpr uint32_t MAX_NAME_LENGTH = 80; bool DoIoctl(int32_t fd, int32_t request, const uint32_t value) diff --git a/util/common/src/util.cpp b/util/common/src/util.cpp index 96b271453d..2165c915ed 100644 --- a/util/common/src/util.cpp +++ b/util/common/src/util.cpp @@ -40,7 +40,7 @@ namespace OHOS { namespace MMI { namespace { -constexpr OHOS::HiviewDFX::HiLogLabel LABEL = {LOG_CORE, MMI_LOG_DOMAIN, "Util"}; +constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "Util" }; constexpr int32_t FILE_SIZE_MAX = 0x5000; constexpr int32_t MAX_PRO_FILE_SIZE = 128000; constexpr int32_t KEY_ELEMENT_COUNT = 4; diff --git a/util/network/include/circle_stream_buffer.h b/util/network/include/circle_stream_buffer.h index b5427aa5b0..b055cdf080 100644 --- a/util/network/include/circle_stream_buffer.h +++ b/util/network/include/circle_stream_buffer.h @@ -19,7 +19,7 @@ namespace OHOS { namespace MMI { class CircleStreamBuffer : public StreamBuffer { - static constexpr OHOS::HiviewDFX::HiLogLabel LABEL = {LOG_CORE, MMI_LOG_DOMAIN, "CircleStreamBuffer"}; + static constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "CircleStreamBuffer" }; public: CircleStreamBuffer() = default; virtual ~CircleStreamBuffer() = default; diff --git a/util/network/include/stream_buffer.h b/util/network/include/stream_buffer.h index 861d6e8c08..f1bcacc426 100644 --- a/util/network/include/stream_buffer.h +++ b/util/network/include/stream_buffer.h @@ -30,7 +30,7 @@ namespace OHOS { namespace MMI { class StreamBuffer { - static constexpr OHOS::HiviewDFX::HiLogLabel LABEL = {LOG_CORE, MMI_LOG_DOMAIN, "StreamBuffer"}; + static constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "StreamBuffer" }; public: StreamBuffer() = default; DISALLOW_MOVE(StreamBuffer); -- Gitee