From 364437ea1ef6db86dd0d8c752f253fedb51ae0c7 Mon Sep 17 00:00:00 2001 From: cff-gite Date: Mon, 26 Aug 2024 15:11:52 +0800 Subject: [PATCH] modification framework namespace Signed-off-by: cff-gite Change-Id: I63e66205e827ba6318c140fd628165e77029c338 --- frameworks/js/napi/vibrator/src/vibrator_js.cpp | 2 +- frameworks/js/napi/vibrator/src/vibrator_napi_utils.cpp | 2 +- frameworks/js/napi/vibrator/src/vibrator_pattern_js.cpp | 4 ++-- frameworks/native/light/include/light_client.h | 6 +++--- frameworks/native/light/src/light_client.cpp | 6 +++--- frameworks/native/vibrator/include/i_vibrator_client.h | 4 ++-- frameworks/native/vibrator/include/vibrator_client_stub.h | 4 ++-- .../native/vibrator/include/vibrator_service_client.h | 6 +++--- frameworks/native/vibrator/src/vibrator_client_stub.cpp | 4 ++-- frameworks/native/vibrator/src/vibrator_service_client.cpp | 6 +++--- frameworks/native/vibrator/vibrator_agent.cpp | 4 ++-- 11 files changed, 24 insertions(+), 24 deletions(-) diff --git a/frameworks/js/napi/vibrator/src/vibrator_js.cpp b/frameworks/js/napi/vibrator/src/vibrator_js.cpp index 1eb03af..7524282 100644 --- a/frameworks/js/napi/vibrator/src/vibrator_js.cpp +++ b/frameworks/js/napi/vibrator/src/vibrator_js.cpp @@ -54,7 +54,7 @@ constexpr int32_t CURVE_FREQUENCY_MIN = -100; constexpr int32_t CURVE_FREQUENCY_MAX = 100; constexpr int32_t CONTINUOUS_DURATION_MAX = 5000; constexpr int32_t EVENT_INDEX_MAX = 2; -} // namespace +} // namespace static std::map g_usageType = { {"unknown", USAGE_UNKNOWN}, diff --git a/frameworks/js/napi/vibrator/src/vibrator_napi_utils.cpp b/frameworks/js/napi/vibrator/src/vibrator_napi_utils.cpp index 873802d..6e3c122 100644 --- a/frameworks/js/napi/vibrator/src/vibrator_napi_utils.cpp +++ b/frameworks/js/napi/vibrator/src/vibrator_napi_utils.cpp @@ -29,7 +29,7 @@ namespace OHOS { namespace Sensors { namespace { constexpr int32_t RESULT_LENGTH = 2; -} // namespace +} // namespace AsyncCallbackInfo::~AsyncCallbackInfo() { CALL_LOG_ENTER; diff --git a/frameworks/js/napi/vibrator/src/vibrator_pattern_js.cpp b/frameworks/js/napi/vibrator/src/vibrator_pattern_js.cpp index 1bcd30f..a2e6610 100644 --- a/frameworks/js/napi/vibrator/src/vibrator_pattern_js.cpp +++ b/frameworks/js/napi/vibrator/src/vibrator_pattern_js.cpp @@ -409,5 +409,5 @@ napi_value VibratorPatternBuilder::Build(napi_env env, napi_callback_info info) } return result; } -} // namespace Sensors -} // namespace OHOS \ No newline at end of file +} // namespace Sensors +} // namespace OHOS \ No newline at end of file diff --git a/frameworks/native/light/include/light_client.h b/frameworks/native/light/include/light_client.h index 7d17ac3..ba86858 100644 --- a/frameworks/native/light/include/light_client.h +++ b/frameworks/native/light/include/light_client.h @@ -47,6 +47,6 @@ private: std::vector lightInfoList_; std::mutex clientMutex_; }; -} // namespace Sensors -} // namespace OHOS -#endif // LIGHT_CLIENT_H +} // namespace Sensors +} // namespace OHOS +#endif // LIGHT_CLIENT_H diff --git a/frameworks/native/light/src/light_client.cpp b/frameworks/native/light/src/light_client.cpp index de77025..760999e 100644 --- a/frameworks/native/light/src/light_client.cpp +++ b/frameworks/native/light/src/light_client.cpp @@ -34,7 +34,7 @@ namespace { constexpr int32_t GET_SERVICE_MAX_COUNT = 30; constexpr uint32_t MAX_LIGHT_LIST_SIZE = 0X00ff; constexpr uint32_t WAIT_MS = 200; -} // namespace +} // namespace LightClient::~LightClient() { @@ -212,5 +212,5 @@ int32_t LightClient::ConvertLightInfos() lightInfoCount_ = static_cast(count); return SUCCESS; } -} // namespace Sensors -} // namespace OHOS +} // namespace Sensors +} // namespace OHOS diff --git a/frameworks/native/vibrator/include/i_vibrator_client.h b/frameworks/native/vibrator/include/i_vibrator_client.h index 57dbe0b..8c83ed0 100644 --- a/frameworks/native/vibrator/include/i_vibrator_client.h +++ b/frameworks/native/vibrator/include/i_vibrator_client.h @@ -26,6 +26,6 @@ public: virtual ~IVibratorClient() = default; DECLARE_INTERFACE_DESCRIPTOR(u"IVibratorClient"); }; -} // namespace Sensors -} // namespace OHOS +} // namespace Sensors +} // namespace OHOS #endif // I_VIBRATOR_CLIENT_H diff --git a/frameworks/native/vibrator/include/vibrator_client_stub.h b/frameworks/native/vibrator/include/vibrator_client_stub.h index 34bda5e..1f55bbd 100644 --- a/frameworks/native/vibrator/include/vibrator_client_stub.h +++ b/frameworks/native/vibrator/include/vibrator_client_stub.h @@ -29,6 +29,6 @@ public: virtual int32_t OnRemoteRequest(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) override; }; -} // namespace Sensors -} // namespace OHOS +} // namespace Sensors +} // namespace OHOS #endif // VIBRATOR_CLIENT_STUB_H diff --git a/frameworks/native/vibrator/include/vibrator_service_client.h b/frameworks/native/vibrator/include/vibrator_service_client.h index d599bce..b0c686e 100644 --- a/frameworks/native/vibrator/include/vibrator_service_client.h +++ b/frameworks/native/vibrator/include/vibrator_service_client.h @@ -88,6 +88,6 @@ private: std::mutex clientMutex_; std::mutex decodeMutex_; }; -} // namespace Sensors -} // namespace OHOS -#endif // VIBRATOR_SERVICE_CLIENT_H +} // namespace Sensors +} // namespace OHOS +#endif // VIBRATOR_SERVICE_CLIENT_H diff --git a/frameworks/native/vibrator/src/vibrator_client_stub.cpp b/frameworks/native/vibrator/src/vibrator_client_stub.cpp index 8dd5653..f6dc8c4 100644 --- a/frameworks/native/vibrator/src/vibrator_client_stub.cpp +++ b/frameworks/native/vibrator/src/vibrator_client_stub.cpp @@ -36,5 +36,5 @@ int32_t VibratorClientStub::OnRemoteRequest(uint32_t code, MessageParcel &data, MISC_HILOGD("Begin, cmd:%{public}u", code); return NO_ERROR; } -} // namespace Sensors -} // namespace OHOS \ No newline at end of file +} // namespace Sensors +} // namespace OHOS \ No newline at end of file diff --git a/frameworks/native/vibrator/src/vibrator_service_client.cpp b/frameworks/native/vibrator/src/vibrator_service_client.cpp index dc0e8d7..497c198 100644 --- a/frameworks/native/vibrator/src/vibrator_service_client.cpp +++ b/frameworks/native/vibrator/src/vibrator_service_client.cpp @@ -42,7 +42,7 @@ constexpr uint32_t WAIT_MS = 200; #else static const std::string DECODER_LIBRARY_PATH = "/system/lib/platformsdk/libvibrator_decoder.z.so"; #endif -} // namespace +} // namespace VibratorServiceClient::~VibratorServiceClient() { @@ -506,5 +506,5 @@ bool VibratorServiceClient::IsSupportVibratorCustom() } return (capacity_.isSupportHdHaptic || capacity_.isSupportPresetMapping || capacity_.isSupportTimeDelay); } -} // namespace Sensors -} // namespace OHOS +} // namespace Sensors +} // namespace OHOS diff --git a/frameworks/native/vibrator/vibrator_agent.cpp b/frameworks/native/vibrator/vibrator_agent.cpp index 8f0f17f..0da0715 100644 --- a/frameworks/native/vibrator/vibrator_agent.cpp +++ b/frameworks/native/vibrator/vibrator_agent.cpp @@ -269,5 +269,5 @@ int32_t PlayPrimitiveEffect(const char *effectId, int32_t intensity) } return SUCCESS; } -} // namespace Sensors -} // namespace OHOS \ No newline at end of file +} // namespace Sensors +} // namespace OHOS \ No newline at end of file -- Gitee