diff --git a/adapter/ohos/entrance/data_ability_helper_standard.h b/adapter/ohos/entrance/data_ability_helper_standard.h index 3641d5b57f74d14b27eed8bfc3b4d9cec5c29de0..44a2ddfd86ffcb3096313e1b3b9121e4980c1bda 100644 --- a/adapter/ohos/entrance/data_ability_helper_standard.h +++ b/adapter/ohos/entrance/data_ability_helper_standard.h @@ -45,7 +45,7 @@ class Uri; namespace OHOS::Ace { class ACE_FORCE_EXPORT DataAbilityHelperStandard : public DataAbilityHelper { - DECLARE_ACE_TYPE(DataAbilityHelperStandard, DataAbilityHelper) + DECLARE_ACE_TYPE(DataAbilityHelperStandard, DataAbilityHelper); public: DataAbilityHelperStandard(const std::shared_ptr& context, diff --git a/adapter/ohos/entrance/subwindow/subwindow_ohos.h b/adapter/ohos/entrance/subwindow/subwindow_ohos.h index 9dd27eaf5081536e5fa9a4d3dc76a7036819ef82..8dace14272f5b1f903bdb5c6c55d880dc5799fc8 100644 --- a/adapter/ohos/entrance/subwindow/subwindow_ohos.h +++ b/adapter/ohos/entrance/subwindow/subwindow_ohos.h @@ -48,7 +48,7 @@ class RSUIDirector; namespace OHOS::Ace { class SubwindowOhos : public Subwindow { - DECLARE_ACE_TYPE(SubwindowOhos, Subwindow) + DECLARE_ACE_TYPE(SubwindowOhos, Subwindow); public: explicit SubwindowOhos(int32_t instanceId); diff --git a/adapter/ohos/entrance/window/foldable_window_ohos.h b/adapter/ohos/entrance/window/foldable_window_ohos.h index 503a81c606201864dff7cad719838d57a0832db3..9ed00a7e8f7e9c68022165ea3e431e5d75fc52e0 100644 --- a/adapter/ohos/entrance/window/foldable_window_ohos.h +++ b/adapter/ohos/entrance/window/foldable_window_ohos.h @@ -20,7 +20,7 @@ namespace OHOS::Ace { class FoldableWindowOhos : public FoldableWindow { - DECLARE_ACE_TYPE(FoldableWindowOhos, FoldableWindow) + DECLARE_ACE_TYPE(FoldableWindowOhos, FoldableWindow); public: explicit FoldableWindowOhos(int32_t instanceId); diff --git a/adapter/ohos/osal/image_packer_ohos.h b/adapter/ohos/osal/image_packer_ohos.h index bdb3f4908e518cca8024600f5aab9fd339d89316..01d97ad0d5370135219718ec676075f3699572f7 100644 --- a/adapter/ohos/osal/image_packer_ohos.h +++ b/adapter/ohos/osal/image_packer_ohos.h @@ -22,7 +22,7 @@ namespace OHOS::Ace { class ImagePackerOhos : public ImagePacker { - DECLARE_ACE_TYPE(ImagePackerOhos, ImagePacker) + DECLARE_ACE_TYPE(ImagePackerOhos, ImagePacker); public: ImagePackerOhos(); diff --git a/adapter/ohos/osal/image_source_ohos.h b/adapter/ohos/osal/image_source_ohos.h index ad2ece4e8684e8b859474eac3d49520ddc4e75be..347fc65b3870d21290392c54bb063b4411acda49 100644 --- a/adapter/ohos/osal/image_source_ohos.h +++ b/adapter/ohos/osal/image_source_ohos.h @@ -25,7 +25,7 @@ namespace OHOS::Ace { class ImageSourceOhos : public ImageSource { - DECLARE_ACE_TYPE(ImageSourceOhos, ImageSource) + DECLARE_ACE_TYPE(ImageSourceOhos, ImageSource); public: explicit ImageSourceOhos(std::unique_ptr&& source) : imageSource_(std::move(source)) {} diff --git a/adapter/ohos/osal/mouse_style_ohos.h b/adapter/ohos/osal/mouse_style_ohos.h index 2be7e6877f950f202e0fe8d0200dca2e81e15b35..54331a31269d22559f0e9fc3b52278ec7603c8e6 100644 --- a/adapter/ohos/osal/mouse_style_ohos.h +++ b/adapter/ohos/osal/mouse_style_ohos.h @@ -21,7 +21,7 @@ namespace OHOS::Ace { class MouseStyleOhos : public MouseStyle { - DECLARE_ACE_TYPE(MouseStyleOhos, MouseStyle) + DECLARE_ACE_TYPE(MouseStyleOhos, MouseStyle); public: MouseStyleOhos() = default; diff --git a/adapter/ohos/osal/page_url_checker_ohos.h b/adapter/ohos/osal/page_url_checker_ohos.h index 536c5d379434379b81104482c59605da248e8679..ded302af1112a9ca37be0991cdbd29269a318db1 100644 --- a/adapter/ohos/osal/page_url_checker_ohos.h +++ b/adapter/ohos/osal/page_url_checker_ohos.h @@ -23,7 +23,7 @@ namespace OHOS::Ace { class PageUrlCheckerOhos : public PageUrlChecker { - DECLARE_ACE_TYPE(PageUrlCheckerOhos, PageUrlChecker) + DECLARE_ACE_TYPE(PageUrlCheckerOhos, PageUrlChecker); public: explicit PageUrlCheckerOhos( diff --git a/adapter/ohos/osal/page_viewport_config_ohos.h b/adapter/ohos/osal/page_viewport_config_ohos.h index adf59ff2710b43971354bb0de024b89b19587c54..1123c497005646d89ba1a9b39073df54f56493d9 100644 --- a/adapter/ohos/osal/page_viewport_config_ohos.h +++ b/adapter/ohos/osal/page_viewport_config_ohos.h @@ -31,7 +31,7 @@ namespace OHOS::Ace { using AvoidAreaInfo = std::map; class PageViewportConfigOhos : public PageViewportConfig { - DECLARE_ACE_TYPE(PageViewportConfigOhos, PageViewportConfig) + DECLARE_ACE_TYPE(PageViewportConfigOhos, PageViewportConfig); public: PageViewportConfigOhos() = default; ~PageViewportConfigOhos() = default; diff --git a/adapter/ohos/osal/pixel_map_ohos.h b/adapter/ohos/osal/pixel_map_ohos.h index 303f262082475cebf43fe068743304f845d2a338..e221cae58e834f3dd5a4beffc6d1f4ff21483834 100644 --- a/adapter/ohos/osal/pixel_map_ohos.h +++ b/adapter/ohos/osal/pixel_map_ohos.h @@ -23,7 +23,7 @@ namespace OHOS::Ace { class PixelMapOhos : public PixelMap { - DECLARE_ACE_TYPE(PixelMapOhos, PixelMap) + DECLARE_ACE_TYPE(PixelMapOhos, PixelMap); public: explicit PixelMapOhos(std::shared_ptr pixmap) : pixmap_(std::move(pixmap)) {} diff --git a/adapter/ohos/osal/system_bar_style_ohos.h b/adapter/ohos/osal/system_bar_style_ohos.h index adbcdc8f79d18bb97b2f8e9ebaf744eb9b8ea7ef..b0c13534e56dabb5561538e03345beff616e971a 100644 --- a/adapter/ohos/osal/system_bar_style_ohos.h +++ b/adapter/ohos/osal/system_bar_style_ohos.h @@ -25,7 +25,7 @@ namespace OHOS::Ace { class SystemBarStyleOhos : public SystemBarStyle { - DECLARE_ACE_TYPE(SystemBarStyleOhos, SystemBarStyle) + DECLARE_ACE_TYPE(SystemBarStyleOhos, SystemBarStyle); public: SystemBarStyleOhos() = default; ~SystemBarStyleOhos() = default; diff --git a/adapter/ohos/osal/view_data_wrap_ohos.h b/adapter/ohos/osal/view_data_wrap_ohos.h index e9a56318764841c3e1e6f954b7cee08c6530b31c..cd9b54f99d006a706e065acc70ee463559cd5b8a 100644 --- a/adapter/ohos/osal/view_data_wrap_ohos.h +++ b/adapter/ohos/osal/view_data_wrap_ohos.h @@ -25,7 +25,7 @@ namespace OHOS::Ace { class PageNodeInfoWrapOhos : public PageNodeInfoWrap { - DECLARE_ACE_TYPE(PageNodeInfoWrapOhos, PageNodeInfoWrap) + DECLARE_ACE_TYPE(PageNodeInfoWrapOhos, PageNodeInfoWrap); public: PageNodeInfoWrapOhos() {} @@ -154,7 +154,7 @@ private: }; class ViewDataWrapOhos : public ViewDataWrap { - DECLARE_ACE_TYPE(ViewDataWrapOhos, ViewDataWrap) + DECLARE_ACE_TYPE(ViewDataWrapOhos, ViewDataWrap); public: ViewDataWrapOhos() {} diff --git a/adapter/ohos/osal/want_wrap_ohos.h b/adapter/ohos/osal/want_wrap_ohos.h index 23e6de1b7d11da2f57d83af45a58ef6718ab60a6..7d2db9a4d8552a9fa984f22080686be28082a49d 100644 --- a/adapter/ohos/osal/want_wrap_ohos.h +++ b/adapter/ohos/osal/want_wrap_ohos.h @@ -41,7 +41,7 @@ private: }; class WantWrapOhos : public WantWrap { - DECLARE_ACE_TYPE(WantWrapOhos, WantWrap) + DECLARE_ACE_TYPE(WantWrapOhos, WantWrap); public: explicit WantWrapOhos(const AAFwk::Want& want); diff --git a/adapter/preview/osal/image_packer_preview.h b/adapter/preview/osal/image_packer_preview.h index 04471b53fa47a801784c7e77e5648f38da25e1de..40628651f96af1a49d0377ae7522c45e4136981e 100644 --- a/adapter/preview/osal/image_packer_preview.h +++ b/adapter/preview/osal/image_packer_preview.h @@ -20,7 +20,7 @@ namespace OHOS::Ace { class ImagePackerPreview : public ImagePacker { - DECLARE_ACE_TYPE(ImagePackerPreview, ImagePacker) + DECLARE_ACE_TYPE(ImagePackerPreview, ImagePacker); public: uint32_t StartPacking(uint8_t* data, uint32_t maxSize, const PackOption& option) override; uint32_t StartPacking(const std::string& filePath, const PackOption& option) override; diff --git a/adapter/preview/osal/image_source_preview.h b/adapter/preview/osal/image_source_preview.h index a685e206baaf0ce9bd3c369f9426d48c66e49f50..0a6033d8af93c286e7b57bde6a9347622b9fe865 100644 --- a/adapter/preview/osal/image_source_preview.h +++ b/adapter/preview/osal/image_source_preview.h @@ -20,7 +20,7 @@ namespace OHOS::Ace { class ImageSourcePreview : public ImageSource { - DECLARE_ACE_TYPE(ImageSourcePreview, ImageSource) + DECLARE_ACE_TYPE(ImageSourcePreview, ImageSource); public: std::string GetProperty(const std::string& key) override; diff --git a/adapter/preview/osal/mouse_style_ohos.h b/adapter/preview/osal/mouse_style_ohos.h index bb481eb16c7647837a80559574474186b6d00245..1ed0b17a1e220eee2c90baddf8d701816ee4abd0 100644 --- a/adapter/preview/osal/mouse_style_ohos.h +++ b/adapter/preview/osal/mouse_style_ohos.h @@ -21,7 +21,7 @@ namespace OHOS::Ace { class MouseStyleOhos : public MouseStyle { - DECLARE_ACE_TYPE(MouseStyleOhos, MouseStyle) + DECLARE_ACE_TYPE(MouseStyleOhos, MouseStyle); public: MouseStyleOhos() = default; diff --git a/adapter/preview/osal/pixel_map_preview.h b/adapter/preview/osal/pixel_map_preview.h index 8f39392ee6188cd1ae9c0fcfba28b16174094a6f..90aee65f7e29c53c6a7a441c32b7fc95935fcdce 100644 --- a/adapter/preview/osal/pixel_map_preview.h +++ b/adapter/preview/osal/pixel_map_preview.h @@ -20,7 +20,7 @@ namespace OHOS::Ace { class PixelMapPreview : public PixelMap { - DECLARE_ACE_TYPE(PixelMapPreview, PixelMap) + DECLARE_ACE_TYPE(PixelMapPreview, PixelMap); public: explicit PixelMapPreview(std::shared_ptr pixmap) : pixmap_(std::move(pixmap)) {} diff --git a/adapter/preview/osal/system_bar_style_ohos.h b/adapter/preview/osal/system_bar_style_ohos.h index b43f049569ef3fc969d6082fb1514a4024f296bc..4f5c5d0f46b9b87038c7a646a3bea48f3d9687b5 100644 --- a/adapter/preview/osal/system_bar_style_ohos.h +++ b/adapter/preview/osal/system_bar_style_ohos.h @@ -20,7 +20,7 @@ namespace OHOS::Ace { class SystemBarStyleOhos : public SystemBarStyle { - DECLARE_ACE_TYPE(SystemBarStyleOhos, SystemBarStyle) + DECLARE_ACE_TYPE(SystemBarStyleOhos, SystemBarStyle); public: SystemBarStyleOhos() = default; ~SystemBarStyleOhos() = default; diff --git a/component_ext/arc_swiper/arc_swiper_controller.h b/component_ext/arc_swiper/arc_swiper_controller.h index 45fdfae9c6ea5de1e14981b739bd3fb82bf983a3..d7b19fa2994200f000982004378657a9a7a2efa6 100644 --- a/component_ext/arc_swiper/arc_swiper_controller.h +++ b/component_ext/arc_swiper/arc_swiper_controller.h @@ -24,7 +24,7 @@ namespace OHOS::Ace::NG { class JsArcSwiperController : public virtual AceType { - DECLARE_ACE_TYPE(JsArcSwiperController, AceType) + DECLARE_ACE_TYPE(JsArcSwiperController, AceType); public: JsArcSwiperController() = default; diff --git a/component_ext/arc_swiper/arc_swiper_indicator.h b/component_ext/arc_swiper/arc_swiper_indicator.h index 0e4d20437101f17716a4a0204ad3aafb7abac00f..ce6f6f54a9b8510db84622816b37a894e81afb61 100644 --- a/component_ext/arc_swiper/arc_swiper_indicator.h +++ b/component_ext/arc_swiper/arc_swiper_indicator.h @@ -25,7 +25,7 @@ namespace OHOS::Ace::NG { class JsArcSwiperIndicator : public virtual AceType { - DECLARE_ACE_TYPE(JsArcSwiperIndicator, AceType) + DECLARE_ACE_TYPE(JsArcSwiperIndicator, AceType); public: JsArcSwiperIndicator() = default; diff --git a/component_ext/movingphoto/movingphoto_controller.h b/component_ext/movingphoto/movingphoto_controller.h index c91b8aee05b667ede1ec113fd2a825d773d3ee0b..1ce2c88641c961919c90574a20baf0afcea367df 100644 --- a/component_ext/movingphoto/movingphoto_controller.h +++ b/component_ext/movingphoto/movingphoto_controller.h @@ -23,7 +23,7 @@ namespace OHOS::Ace::NG { class MovingPhotoController : public virtual AceType { - DECLARE_ACE_TYPE(MovingPhotoController, AceType) + DECLARE_ACE_TYPE(MovingPhotoController, AceType); public: MovingPhotoController() = default; diff --git a/component_ext/movingphoto/movingphoto_event_hub.h b/component_ext/movingphoto/movingphoto_event_hub.h index fa1253339e64b68e4860193a9a1f0b852d22f830..1a1fe9a81b13b61ad61a3ab62dc21d5f05c2d0a5 100644 --- a/component_ext/movingphoto/movingphoto_event_hub.h +++ b/component_ext/movingphoto/movingphoto_event_hub.h @@ -26,7 +26,7 @@ namespace OHOS::Ace::NG { using MovingPhotoEventFunc = std::function; class MovingPhotoEventHub : public EventHub { - DECLARE_ACE_TYPE(MovingPhotoEventHub, EventHub) + DECLARE_ACE_TYPE(MovingPhotoEventHub, EventHub); public: MovingPhotoEventHub() = default; diff --git a/frameworks/base/image/drawing_color_filter.h b/frameworks/base/image/drawing_color_filter.h index 5dfe71cb116b1fb6867e7a9b7ab44737c4b41e6a..d047e5dee4a86d7ae4e32166d2b8f704072330a9 100644 --- a/frameworks/base/image/drawing_color_filter.h +++ b/frameworks/base/image/drawing_color_filter.h @@ -33,7 +33,7 @@ class ColorFilter; namespace Ace { class ACE_EXPORT DrawingColorFilter : public AceType { - DECLARE_ACE_TYPE(DrawingColorFilter, AceType) + DECLARE_ACE_TYPE(DrawingColorFilter, AceType); public: #if defined(ACE_STATIC) diff --git a/frameworks/base/image/drawing_lattice.h b/frameworks/base/image/drawing_lattice.h index 6b86a6fadbf2f1bae1ef1c17303c90aaa95ede66..602ed62be137b1e812d42580889508619118530b 100644 --- a/frameworks/base/image/drawing_lattice.h +++ b/frameworks/base/image/drawing_lattice.h @@ -21,7 +21,7 @@ namespace OHOS { namespace Ace { class ACE_EXPORT DrawingLattice : public AceType { - DECLARE_ACE_TYPE(DrawingLattice, AceType) + DECLARE_ACE_TYPE(DrawingLattice, AceType); public: static RefPtr CreateDrawingLattice(void* sptrAddr); diff --git a/frameworks/base/image/file_uri_helper.h b/frameworks/base/image/file_uri_helper.h index 6da58c104fe24c7df2ff0ee505ee241c25ea7013..79ecb0b94e7a25eec4c952cfbdb4d40a315d7e06 100644 --- a/frameworks/base/image/file_uri_helper.h +++ b/frameworks/base/image/file_uri_helper.h @@ -20,7 +20,7 @@ namespace OHOS::Ace { class ACE_EXPORT FileUriHelper : public AceType { - DECLARE_ACE_TYPE(FileUriHelper, AceType) + DECLARE_ACE_TYPE(FileUriHelper, AceType); public: static std::string GetRealPath(std::string fileUriStr); diff --git a/frameworks/base/image/image_packer.h b/frameworks/base/image/image_packer.h index f33aaecd303e69630e0c9fe45fc3ebf5cae584d9..5e94b8d75a54141c8cd128b3f23b203a77fba36e 100644 --- a/frameworks/base/image/image_packer.h +++ b/frameworks/base/image/image_packer.h @@ -38,7 +38,7 @@ struct PackOption { class PixelMap; class ACE_EXPORT ImagePacker : public AceType { - DECLARE_ACE_TYPE(ImagePacker, AceType) + DECLARE_ACE_TYPE(ImagePacker, AceType); public: static RefPtr Create(); diff --git a/frameworks/base/image/image_source.h b/frameworks/base/image/image_source.h index fc77b84190e455046164fedc60a90387c7eb5e2a..a5c164a03cfbfbd8564736ec639b75599bc8db20 100644 --- a/frameworks/base/image/image_source.h +++ b/frameworks/base/image/image_source.h @@ -48,7 +48,7 @@ struct PixelMapConfig { class PixelMap; class ACE_FORCE_EXPORT ImageSource : public AceType { - DECLARE_ACE_TYPE(ImageSource, AceType) + DECLARE_ACE_TYPE(ImageSource, AceType); public: using Size = std::pair; diff --git a/frameworks/base/image/pixel_map.h b/frameworks/base/image/pixel_map.h index 3d67e7e6419e31f820e6b60d8adce1a484277688..f6bf82e69c8252236ca0e2f450adfbf4690c8e2c 100644 --- a/frameworks/base/image/pixel_map.h +++ b/frameworks/base/image/pixel_map.h @@ -205,7 +205,7 @@ struct WritePixelsOptions { }; class ACE_FORCE_EXPORT PixelMap : public AceType { - DECLARE_ACE_TYPE(PixelMap, AceType) + DECLARE_ACE_TYPE(PixelMap, AceType); public: #if defined(ACE_STATIC) diff --git a/frameworks/base/input_manager/input_manager.h b/frameworks/base/input_manager/input_manager.h index 602eadec51ac02c18686c2ba546ae5ebe407bdfe..08e94029701e512f78efbef7df055d5ba9eb9041 100644 --- a/frameworks/base/input_manager/input_manager.h +++ b/frameworks/base/input_manager/input_manager.h @@ -41,7 +41,7 @@ enum class KeyboardType : int32_t { }; class ACE_EXPORT InputManager : public AceType { - DECLARE_ACE_TYPE(InputManager, AceType) + DECLARE_ACE_TYPE(InputManager, AceType); public: static bool GetDeviceIds(std::vector& resDeviceIds); diff --git a/frameworks/base/mousestyle/mouse_style.h b/frameworks/base/mousestyle/mouse_style.h index 97ea69f0370ed68838e4864c56a1a8163f327aef..e61b6299d27f5c78ec8de23f37b3e085a7db8e17 100644 --- a/frameworks/base/mousestyle/mouse_style.h +++ b/frameworks/base/mousestyle/mouse_style.h @@ -74,7 +74,7 @@ enum class MouseFormat : int32_t { }; class ACE_EXPORT MouseStyle : public AceType { - DECLARE_ACE_TYPE(MouseStyle, AceType) + DECLARE_ACE_TYPE(MouseStyle, AceType); public: static RefPtr CreateMouseStyle(); @@ -105,7 +105,7 @@ struct MouseStyleChangeLog { }; class ACE_EXPORT MouseStyleManager : public AceType { - DECLARE_ACE_TYPE(MouseStyleManager, AceType) + DECLARE_ACE_TYPE(MouseStyleManager, AceType); public: MouseStyleManager() = default; diff --git a/frameworks/base/resource/data_ability_helper.h b/frameworks/base/resource/data_ability_helper.h index 9a26b09617ec258afca77f1eb43811abcd043203..6d4b95bd24127e75d8c99554de1f32cd3b5073e8 100644 --- a/frameworks/base/resource/data_ability_helper.h +++ b/frameworks/base/resource/data_ability_helper.h @@ -21,7 +21,7 @@ namespace OHOS::Ace { class DataAbilityHelper : public AceType { - DECLARE_ACE_TYPE(DataAbilityHelper, AceType) + DECLARE_ACE_TYPE(DataAbilityHelper, AceType); public: DataAbilityHelper() = default; diff --git a/frameworks/base/resource/data_provider_manager.h b/frameworks/base/resource/data_provider_manager.h index 8f83625fb654b5a9b85cd924a3e965fe3070899a..1be493fe1d8ebb9168780b1900ca5ed9ddac03e9 100644 --- a/frameworks/base/resource/data_provider_manager.h +++ b/frameworks/base/resource/data_provider_manager.h @@ -55,7 +55,7 @@ private: }; class DataProviderManagerInterface : public AceType { - DECLARE_ACE_TYPE(DataProviderManagerInterface, AceType) + DECLARE_ACE_TYPE(DataProviderManagerInterface, AceType); public: DataProviderManagerInterface() = default; @@ -71,7 +71,7 @@ public: using DataProviderImpl = std::function(const std::string& uriStr)>; class DataProviderManager : public DataProviderManagerInterface { - DECLARE_ACE_TYPE(DataProviderManager, DataProviderManagerInterface) + DECLARE_ACE_TYPE(DataProviderManager, DataProviderManagerInterface); public: explicit DataProviderManager(DataProviderImpl dataProvider) : platformImpl_(std::move(dataProvider)) {} ~DataProviderManager() override = default; @@ -95,7 +95,7 @@ private: using DataAbilityHelperImpl = std::function()>; class ACE_FORCE_EXPORT DataProviderManagerStandard : public DataProviderManagerInterface { - DECLARE_ACE_TYPE(DataProviderManagerStandard, DataProviderManagerInterface) + DECLARE_ACE_TYPE(DataProviderManagerStandard, DataProviderManagerInterface); public: explicit DataProviderManagerStandard(DataAbilityHelperImpl dataAbilityHelperImpl) diff --git a/frameworks/base/subwindow/subwindow.h b/frameworks/base/subwindow/subwindow.h index 300510d6c03f0b336da6ab1a8249744f85e5eebb..14a5208cf5d0f73ff04f0e37cbf62f76f773b91d 100644 --- a/frameworks/base/subwindow/subwindow.h +++ b/frameworks/base/subwindow/subwindow.h @@ -57,7 +57,7 @@ enum class SubwindowType { }; class ACE_EXPORT Subwindow : public AceType { - DECLARE_ACE_TYPE(Subwindow, AceType) + DECLARE_ACE_TYPE(Subwindow, AceType); public: static RefPtr CreateSubwindow(int32_t instanceId); diff --git a/frameworks/base/system_bar/system_bar_style.h b/frameworks/base/system_bar/system_bar_style.h index 62a354c8f1177aee05837f7e3336ea5219b25c49..822f2f6659c85573356e13db255661d4a5032d8d 100644 --- a/frameworks/base/system_bar/system_bar_style.h +++ b/frameworks/base/system_bar/system_bar_style.h @@ -21,7 +21,7 @@ namespace OHOS::Ace { class ACE_FORCE_EXPORT SystemBarStyle : public AceType { - DECLARE_ACE_TYPE(SystemBarStyle, AceType) + DECLARE_ACE_TYPE(SystemBarStyle, AceType); public: SystemBarStyle() = default; ~SystemBarStyle() = default; diff --git a/frameworks/base/window/foldable_window.h b/frameworks/base/window/foldable_window.h index 5464d0752d0ec321bd58dfdad9fe8fede955c51d..6ed8467b422a5a541e3fe874103af525e6e96ada 100644 --- a/frameworks/base/window/foldable_window.h +++ b/frameworks/base/window/foldable_window.h @@ -20,7 +20,7 @@ namespace OHOS::Ace { class ACE_EXPORT FoldableWindow : public AceType { - DECLARE_ACE_TYPE(FoldableWindow, AceType) + DECLARE_ACE_TYPE(FoldableWindow, AceType); public: static RefPtr CreateFoldableWindow(int32_t instanceId); diff --git a/frameworks/bridge/arkts_frontend/arkts_frontend.h b/frameworks/bridge/arkts_frontend/arkts_frontend.h index 0166cebb95d8a94c539fac8b8b5da4dce283c365..af73d1b166b018e3d8293114739d86491c52d2e9 100644 --- a/frameworks/bridge/arkts_frontend/arkts_frontend.h +++ b/frameworks/bridge/arkts_frontend/arkts_frontend.h @@ -36,7 +36,7 @@ typedef class __ani_ref* ani_ref; typedef class __ani_object* ani_object; typedef struct __ani_vm ani_vm; -namespace OHOS::Ace { +nameDECLARE_ACE_TYPE(InspectorEvent, AceType); using InspectorFunc = std::function; class InspectorEvent : public virtual AceType { DECLARE_ACE_TYPE(InspectorEvent, AceType) diff --git a/frameworks/bridge/cj_frontend/cppview/lazy_foreach.h b/frameworks/bridge/cj_frontend/cppview/lazy_foreach.h index 54757ae932b7266804f2db96e4243a75621bc5d7..25128e7be4bba1765f5a75ab55fac3a3811eaa6a 100644 --- a/frameworks/bridge/cj_frontend/cppview/lazy_foreach.h +++ b/frameworks/bridge/cj_frontend/cppview/lazy_foreach.h @@ -32,7 +32,7 @@ namespace Ace { namespace Framework { class ACE_EXPORT CJLazyForEachBuilder : public NG::LazyForEachBuilder, public LazyForEachActuator { - DECLARE_ACE_TYPE(CJLazyForEachBuilder, NG::LazyForEachBuilder, LazyForEachActuator) + DECLARE_ACE_TYPE(CJLazyForEachBuilder, NG::LazyForEachBuilder, LazyForEachActuator); public: explicit CJLazyForEachBuilder(sptr&& cjBuilder) : cjBuilder_(cjBuilder) {} int32_t OnGetTotalCount() override diff --git a/frameworks/bridge/cj_frontend/frontend/cj_frontend.h b/frameworks/bridge/cj_frontend/frontend/cj_frontend.h index 1fadfa98e1b8cbb0e3652f23467b510bdc62e15f..85712f6d3dc68a2fb03823808ea9f67d4d0aa9b6 100644 --- a/frameworks/bridge/cj_frontend/frontend/cj_frontend.h +++ b/frameworks/bridge/cj_frontend/frontend/cj_frontend.h @@ -23,7 +23,7 @@ namespace OHOS::Ace::Framework { class CJPageRouter; class CJFrontend final : public CJFrontendAbstract { -DECLARE_ACE_TYPE(CJFrontend, CJFrontendAbstract) +DECLARE_ACE_TYPE(CJFrontend, CJFrontendAbstract); public: void AttachPipelineContext(const RefPtr& context) override; diff --git a/frameworks/bridge/cj_frontend/frontend/cj_frontend_abstract.h b/frameworks/bridge/cj_frontend/frontend/cj_frontend_abstract.h index 2e62ddd73e88a0650464188b5d97bfa5724536d7..c7277af0c2ed2de43c7d091070037c868051514a 100644 --- a/frameworks/bridge/cj_frontend/frontend/cj_frontend_abstract.h +++ b/frameworks/bridge/cj_frontend/frontend/cj_frontend_abstract.h @@ -36,7 +36,7 @@ namespace OHOS::Ace { class ACE_EXPORT CJFrontendAbstract : public Frontend { - DECLARE_ACE_TYPE(CJFrontendAbstract, Frontend) + DECLARE_ACE_TYPE(CJFrontendAbstract, Frontend); public: // page lifecycle bool OnBackPressed() override; diff --git a/frameworks/bridge/cj_frontend/frontend/cj_frontend_ng.h b/frameworks/bridge/cj_frontend/frontend/cj_frontend_ng.h index b6f3d5236fc02ab626aa35d5e80e8d4c412fe8d4..7132ac226a2725df7f27d8c91128b7ecffa113ad 100644 --- a/frameworks/bridge/cj_frontend/frontend/cj_frontend_ng.h +++ b/frameworks/bridge/cj_frontend/frontend/cj_frontend_ng.h @@ -24,7 +24,7 @@ namespace OHOS::Ace::Framework { class ACE_FORCE_EXPORT CJFrontendNG final : public CJFrontendAbstract { - DECLARE_ACE_TYPE(CJFrontendNG, CJFrontendAbstract) + DECLARE_ACE_TYPE(CJFrontendNG, CJFrontendAbstract); protected: void InternalInitialize() override; diff --git a/frameworks/bridge/cj_frontend/frontend/cj_page_router.h b/frameworks/bridge/cj_frontend/frontend/cj_page_router.h index 43b0069048cb5600d25e69198574f314c864bca4..f4a04bc0aacd486fbdc3f7e0a2f8a4c94ac40c7d 100644 --- a/frameworks/bridge/cj_frontend/frontend/cj_page_router.h +++ b/frameworks/bridge/cj_frontend/frontend/cj_page_router.h @@ -24,7 +24,7 @@ namespace OHOS::Ace::Framework { class CJPageRouter final : public CJPageRouterAbstract { - DECLARE_ACE_TYPE(CJPageRouter, CJPageRouterAbstract) + DECLARE_ACE_TYPE(CJPageRouter, CJPageRouterAbstract); public: explicit CJPageRouter(WeakPtr frontend) : CJPageRouterAbstract(std::move(frontend)) {} diff --git a/frameworks/bridge/cj_frontend/frontend/cj_page_router_abstract.h b/frameworks/bridge/cj_frontend/frontend/cj_page_router_abstract.h index c244ed2af1c5b0d53080036702b5d2cffd7bd80c..54357875b6a958b5bd48a93ab7a72e67fec9585d 100644 --- a/frameworks/bridge/cj_frontend/frontend/cj_page_router_abstract.h +++ b/frameworks/bridge/cj_frontend/frontend/cj_page_router_abstract.h @@ -31,7 +31,7 @@ extern "C" ACE_EXPORT void* OHOSAceFrameworkGetCJFrontendLoader(); constexpr int32_t MAX_ROUTER_STACK_SIZE = 32; class CJPageRouterAbstract : public AceType { - DECLARE_ACE_TYPE(CJPageRouterAbstract, AceType) + DECLARE_ACE_TYPE(CJPageRouterAbstract, AceType); public: enum class RouterMode { STANDARD = 0, diff --git a/frameworks/bridge/cj_frontend/frontend/cj_page_router_ng.h b/frameworks/bridge/cj_frontend/frontend/cj_page_router_ng.h index a2534b00760824974501d73dc1258fd17f5798ee..e848a9ff9bb7d9665758aed65b0f1f66d342fce3 100644 --- a/frameworks/bridge/cj_frontend/frontend/cj_page_router_ng.h +++ b/frameworks/bridge/cj_frontend/frontend/cj_page_router_ng.h @@ -23,7 +23,7 @@ namespace OHOS::Ace::Framework { class CJPageRouterNG final : public CJPageRouterAbstract { - DECLARE_ACE_TYPE(CJPageRouterNG, CJPageRouterAbstract) + DECLARE_ACE_TYPE(CJPageRouterNG, CJPageRouterAbstract); public: explicit CJPageRouterNG(WeakPtr frontend) : CJPageRouterAbstract(std::move(frontend)) {} diff --git a/frameworks/bridge/cj_frontend/interfaces/cj_ffi/cj_customdialog_controller_ffi.h b/frameworks/bridge/cj_frontend/interfaces/cj_ffi/cj_customdialog_controller_ffi.h index 3136f0e0cad3b474fc39727792902095f300cfe3..2961b1d2191537bd4251960e23fec516103ac203 100644 --- a/frameworks/bridge/cj_frontend/interfaces/cj_ffi/cj_customdialog_controller_ffi.h +++ b/frameworks/bridge/cj_frontend/interfaces/cj_ffi/cj_customdialog_controller_ffi.h @@ -87,7 +87,7 @@ CJ_EXPORT void FfiOHOSAceFrameworkCustomDialogControllerClose(int64_t id); namespace OHOS::Ace::Framework { class ACE_EXPORT NativeCustomDialogController : public OHOS::FFI::FFIData, public virtual AceType { - DECLARE_ACE_TYPE(NativeCustomDialogController, AceType) + DECLARE_ACE_TYPE(NativeCustomDialogController, AceType); public: NativeCustomDialogController(NativeCustomDialogControllerOptions options); NativeCustomDialogController(NativeCustomDialogControllerOptionsV2 options); diff --git a/frameworks/bridge/cj_frontend/interfaces/cj_ffi/cj_nav_path_stack_ffi.h b/frameworks/bridge/cj_frontend/interfaces/cj_ffi/cj_nav_path_stack_ffi.h index c2fccd29a08f6562e6917fa5ebb1e28dbde036f0..2d407cbee36dc9d9e2963e7db2e12f8f2e78c7c5 100644 --- a/frameworks/bridge/cj_frontend/interfaces/cj_ffi/cj_nav_path_stack_ffi.h +++ b/frameworks/bridge/cj_frontend/interfaces/cj_ffi/cj_nav_path_stack_ffi.h @@ -192,7 +192,7 @@ private: }; class CJNavPathInfoNG : public NG::NavPathInfo { - DECLARE_ACE_TYPE(CJNavPathInfoNG, NG::NavPathInfo) + DECLARE_ACE_TYPE(CJNavPathInfoNG, NG::NavPathInfo); public: CJNavPathInfoNG() = default; CJNavPathInfoNG(const std::string& name, const std::string& param) : NG::NavPathInfo(name), param_(param) {} diff --git a/frameworks/bridge/cj_frontend/interfaces/cj_ffi/cj_navigation_stack_ffi.h b/frameworks/bridge/cj_frontend/interfaces/cj_ffi/cj_navigation_stack_ffi.h index acd60926ee58147af91cd83f8c09327501480936..ce62abecfadaa9638a2825958f9c9ee6ee2b856a 100644 --- a/frameworks/bridge/cj_frontend/interfaces/cj_ffi/cj_navigation_stack_ffi.h +++ b/frameworks/bridge/cj_frontend/interfaces/cj_ffi/cj_navigation_stack_ffi.h @@ -28,7 +28,7 @@ namespace OHOS::Ace::Framework { class CJRouteInfo : public NG::RouteInfo { - DECLARE_ACE_TYPE(CJRouteInfo, NG::RouteInfo) + DECLARE_ACE_TYPE(CJRouteInfo, NG::RouteInfo); public: CJRouteInfo() = default; ~CJRouteInfo() override = default; @@ -44,7 +44,7 @@ protected: }; class CJNavigationStack : public NG::NavigationStack { - DECLARE_ACE_TYPE(CJNavigationStack, NG::NavigationStack) + DECLARE_ACE_TYPE(CJNavigationStack, NG::NavigationStack); public: CJNavigationStack() = default; ~CJNavigationStack() override = default; diff --git a/frameworks/bridge/common/dom/form_value.h b/frameworks/bridge/common/dom/form_value.h index e59de5b739ad4243456715ebe36954ba16cb5183..6035b066d6c8da271c9b390cdefc1df298e3469d 100644 --- a/frameworks/bridge/common/dom/form_value.h +++ b/frameworks/bridge/common/dom/form_value.h @@ -23,7 +23,7 @@ namespace OHOS::Ace::Framework { class FormValue : public virtual AceType { - DECLARE_ACE_TYPE(FormValue, AceType) + DECLARE_ACE_TYPE(FormValue, AceType); public: std::pair GetFormValue() diff --git a/frameworks/bridge/declarative_frontend/engine/functions/js_accessibility_function.h b/frameworks/bridge/declarative_frontend/engine/functions/js_accessibility_function.h index 75d754e247fb6fc61e07cf88f7c1cfe862d0a920..d1fe886e4199afd2adc9ac9f5280528cd5bd1d3a 100644 --- a/frameworks/bridge/declarative_frontend/engine/functions/js_accessibility_function.h +++ b/frameworks/bridge/declarative_frontend/engine/functions/js_accessibility_function.h @@ -20,7 +20,7 @@ namespace OHOS::Ace::Framework { class JsAccessibilityActionInterceptFunction : public JsFunction { - DECLARE_ACE_TYPE(JsAccessibilityActionInterceptFunction, JsFunction) + DECLARE_ACE_TYPE(JsAccessibilityActionInterceptFunction, JsFunction); public: explicit JsAccessibilityActionInterceptFunction(const JSRef& jsFunction) @@ -37,7 +37,7 @@ public: }; class JsAccessibilityHoverTransparentFunction : public JsFunction { - DECLARE_ACE_TYPE(JsAccessibilityHoverTransparentFunction, JsFunction) + DECLARE_ACE_TYPE(JsAccessibilityHoverTransparentFunction, JsFunction); public: explicit JsAccessibilityHoverTransparentFunction(const JSRef& jsFunction) diff --git a/frameworks/bridge/declarative_frontend/engine/functions/js_animation_on_finish_function.h b/frameworks/bridge/declarative_frontend/engine/functions/js_animation_on_finish_function.h index 4e90cf85aabdaf415006331d1bd1d468ff81ea22..4d7cabdf719d31a7b05f2a151a58f05e41bf3e82 100644 --- a/frameworks/bridge/declarative_frontend/engine/functions/js_animation_on_finish_function.h +++ b/frameworks/bridge/declarative_frontend/engine/functions/js_animation_on_finish_function.h @@ -21,7 +21,7 @@ namespace OHOS::Ace::Framework { class JsAnimationOnFinishFunction : public JsFunction { - DECLARE_ACE_TYPE(JsAnimationOnFinishFunction, JsFunction) + DECLARE_ACE_TYPE(JsAnimationOnFinishFunction, JsFunction); public: explicit JsAnimationOnFinishFunction(const JSRef& jsFunction) diff --git a/frameworks/bridge/declarative_frontend/engine/functions/js_animator_function.h b/frameworks/bridge/declarative_frontend/engine/functions/js_animator_function.h index ba268f7f1e632de0898877ba360006c17a08d4d4..b835de9b20b51c492a687e2760281ffd1f787737 100644 --- a/frameworks/bridge/declarative_frontend/engine/functions/js_animator_function.h +++ b/frameworks/bridge/declarative_frontend/engine/functions/js_animator_function.h @@ -22,7 +22,7 @@ namespace OHOS::Ace::Framework { class JsAnimatorFunction : public JsFunction { - DECLARE_ACE_TYPE(JsAnimatorFunction, JsFunction) + DECLARE_ACE_TYPE(JsAnimatorFunction, JsFunction); public: explicit JsAnimatorFunction(const JSRef& jsFunction) : JsFunction(JSRef(), jsFunction) {} diff --git a/frameworks/bridge/declarative_frontend/engine/functions/js_click_function.h b/frameworks/bridge/declarative_frontend/engine/functions/js_click_function.h index 0f8d446dce2baa8c7afb61db76ffe3b73fa2cdb3..45d488fbeac56bdd88ce14cceed049c4a2040652 100644 --- a/frameworks/bridge/declarative_frontend/engine/functions/js_click_function.h +++ b/frameworks/bridge/declarative_frontend/engine/functions/js_click_function.h @@ -28,7 +28,7 @@ namespace OHOS::Ace::Framework { #define HAND_LEFT 1 #define HAND_RIGHT 2 class JsClickFunction : public JsFunction { - DECLARE_ACE_TYPE(JsClickFunction, JsFunction) + DECLARE_ACE_TYPE(JsClickFunction, JsFunction); public: explicit JsClickFunction(const JSRef& jsFunction) : JsFunction(JSRef(), jsFunction) {} @@ -41,7 +41,7 @@ public: }; class JsWeakClickFunction : public JsWeakFunction { - DECLARE_ACE_TYPE(JsWeakClickFunction, JsWeakFunction) + DECLARE_ACE_TYPE(JsWeakClickFunction, JsWeakFunction); public: explicit JsWeakClickFunction(const JSRef& jsFunction) : JsWeakFunction(JSRef(), jsFunction) {} diff --git a/frameworks/bridge/declarative_frontend/engine/functions/js_clipboard_function.h b/frameworks/bridge/declarative_frontend/engine/functions/js_clipboard_function.h index 4ffdec2bd7b181c510a699c8b9b8ebf67731ed6c..88fff10d4badce93db0744ce61de3d1839144aac 100644 --- a/frameworks/bridge/declarative_frontend/engine/functions/js_clipboard_function.h +++ b/frameworks/bridge/declarative_frontend/engine/functions/js_clipboard_function.h @@ -21,7 +21,7 @@ namespace OHOS::Ace::Framework { class JsClipboardFunction : public JsFunction { - DECLARE_ACE_TYPE(JsClipboardFunction, JsFunction) + DECLARE_ACE_TYPE(JsClipboardFunction, JsFunction); public: explicit JsClipboardFunction(const JSRef& jsFunction) : JsFunction(JSRef(), jsFunction) {} diff --git a/frameworks/bridge/declarative_frontend/engine/functions/js_common_gesture_function.h b/frameworks/bridge/declarative_frontend/engine/functions/js_common_gesture_function.h index c7e78c5ea66749593c7b5e10249e0ab8f6ba0ed1..0f66ab4c6e62da07f428be903d51b1b9f57d1d9b 100644 --- a/frameworks/bridge/declarative_frontend/engine/functions/js_common_gesture_function.h +++ b/frameworks/bridge/declarative_frontend/engine/functions/js_common_gesture_function.h @@ -21,7 +21,7 @@ namespace OHOS::Ace::Framework { class JsCommonGestureFunction : public JsFunction { - DECLARE_ACE_TYPE(JsCommonGestureFunction, JsFunction) + DECLARE_ACE_TYPE(JsCommonGestureFunction, JsFunction); public: explicit JsCommonGestureFunction(const JSRef& jsFunction) diff --git a/frameworks/bridge/declarative_frontend/engine/functions/js_crown_function.h b/frameworks/bridge/declarative_frontend/engine/functions/js_crown_function.h index bb9bcd17b43b783437f5d90daaf0445b35affdc2..7eedd5b3a5d960cb61732c7bf3f9dda4394db41a 100644 --- a/frameworks/bridge/declarative_frontend/engine/functions/js_crown_function.h +++ b/frameworks/bridge/declarative_frontend/engine/functions/js_crown_function.h @@ -21,7 +21,7 @@ namespace OHOS::Ace::Framework { class JsCrownFunction : public JsFunction { - DECLARE_ACE_TYPE(JsCrownFunction, JsFunction) + DECLARE_ACE_TYPE(JsCrownFunction, JsFunction); public: explicit JsCrownFunction(const JSRef& jsFunction) : JsFunction(JSRef(), jsFunction) {} diff --git a/frameworks/bridge/declarative_frontend/engine/functions/js_drag_function.h b/frameworks/bridge/declarative_frontend/engine/functions/js_drag_function.h index ca16d2fa2d938d97841fafe7fe9d7b3f6e701969..309f3eef346c18990c4489f415411281a92289e7 100644 --- a/frameworks/bridge/declarative_frontend/engine/functions/js_drag_function.h +++ b/frameworks/bridge/declarative_frontend/engine/functions/js_drag_function.h @@ -22,7 +22,7 @@ namespace OHOS::Ace::Framework { class JsDragFunction : public JsFunction { - DECLARE_ACE_TYPE(JsDragFunction, JsFunction) + DECLARE_ACE_TYPE(JsDragFunction, JsFunction); public: explicit JsDragFunction(const JSRef& jsFunction) : JsFunction(JSRef(), jsFunction) {} diff --git a/frameworks/bridge/declarative_frontend/engine/functions/js_focus_function.h b/frameworks/bridge/declarative_frontend/engine/functions/js_focus_function.h index a8ebeedcd38e7a43602d26584ecb41aebf06e0cb..ef8660201712711e16b52662528124cd19a1d3c7 100644 --- a/frameworks/bridge/declarative_frontend/engine/functions/js_focus_function.h +++ b/frameworks/bridge/declarative_frontend/engine/functions/js_focus_function.h @@ -21,7 +21,7 @@ namespace OHOS::Ace::Framework { class JsFocusFunction : public JsFunction { - DECLARE_ACE_TYPE(JsFocusFunction, JsFunction) + DECLARE_ACE_TYPE(JsFocusFunction, JsFunction); public: explicit JsFocusFunction(const JSRef& jsFunction) : JsFunction(JSRef(), jsFunction) {} diff --git a/frameworks/bridge/declarative_frontend/engine/functions/js_foreach_function.h b/frameworks/bridge/declarative_frontend/engine/functions/js_foreach_function.h index ddd75e71f2eb299f61c346b5a49969ef06e78112..36413923ab34ba0398892c57fda5827c106372e2 100644 --- a/frameworks/bridge/declarative_frontend/engine/functions/js_foreach_function.h +++ b/frameworks/bridge/declarative_frontend/engine/functions/js_foreach_function.h @@ -24,7 +24,7 @@ namespace OHOS::Ace::Framework { class JsForEachFunction : public JsFunction { - DECLARE_ACE_TYPE(JsForEachFunction, JsFunction) + DECLARE_ACE_TYPE(JsForEachFunction, JsFunction); private: JSWeak jsIdentityMapperFunc_; diff --git a/frameworks/bridge/declarative_frontend/engine/functions/js_gesture_function.h b/frameworks/bridge/declarative_frontend/engine/functions/js_gesture_function.h index fa3675b1336be32abe9513c9ec98c9733a6bf0cb..13879c831ba742c037ec2289cab96be8a46333f3 100644 --- a/frameworks/bridge/declarative_frontend/engine/functions/js_gesture_function.h +++ b/frameworks/bridge/declarative_frontend/engine/functions/js_gesture_function.h @@ -22,7 +22,7 @@ namespace OHOS::Ace::Framework { class JsGestureFunction : public JsCommonGestureFunction { - DECLARE_ACE_TYPE(JsGestureFunction, JsCommonGestureFunction) + DECLARE_ACE_TYPE(JsGestureFunction, JsCommonGestureFunction); public: explicit JsGestureFunction(const JSRef& jsFunction) diff --git a/frameworks/bridge/declarative_frontend/engine/functions/js_gesture_judge_function.h b/frameworks/bridge/declarative_frontend/engine/functions/js_gesture_judge_function.h index 6af38d1f2cb50b059de6325db6bb2ff8323c378a..a32f0dc757d8b52de5c13fb6ef9e0f7134ca2e73 100644 --- a/frameworks/bridge/declarative_frontend/engine/functions/js_gesture_judge_function.h +++ b/frameworks/bridge/declarative_frontend/engine/functions/js_gesture_judge_function.h @@ -28,7 +28,7 @@ namespace OHOS::Ace::Framework { using TouchRecognizerMap = std::map, std::unordered_set>; class JsGestureJudgeFunction : public JsCommonGestureFunction { - DECLARE_ACE_TYPE(JsGestureJudgeFunction, JsCommonGestureFunction) + DECLARE_ACE_TYPE(JsGestureJudgeFunction, JsCommonGestureFunction); public: explicit JsGestureJudgeFunction(const JSRef& jsFunction) diff --git a/frameworks/bridge/declarative_frontend/engine/functions/js_hover_function.h b/frameworks/bridge/declarative_frontend/engine/functions/js_hover_function.h index a1e5d2f776c351101bf5dac4eff827e62c8c63b2..055c87e8357e4ecd9222f4cace3b9bff648183ef 100644 --- a/frameworks/bridge/declarative_frontend/engine/functions/js_hover_function.h +++ b/frameworks/bridge/declarative_frontend/engine/functions/js_hover_function.h @@ -21,7 +21,7 @@ namespace OHOS::Ace::Framework { class JsHoverFunction : public JsFunction { - DECLARE_ACE_TYPE(JsHoverFunction, JsFunction) + DECLARE_ACE_TYPE(JsHoverFunction, JsFunction); public: explicit JsHoverFunction(const JSRef& jsFunction) : JsFunction(JSRef(), jsFunction) {} diff --git a/frameworks/bridge/declarative_frontend/engine/functions/js_key_function.h b/frameworks/bridge/declarative_frontend/engine/functions/js_key_function.h index 7c759b4f80fe69cfd82efb42e382c47080863832..dde3fa5d0da8fddad3cce376d6c9937d586e5e24 100644 --- a/frameworks/bridge/declarative_frontend/engine/functions/js_key_function.h +++ b/frameworks/bridge/declarative_frontend/engine/functions/js_key_function.h @@ -22,7 +22,7 @@ namespace OHOS::Ace::Framework { class JsKeyFunction : public JsFunction { - DECLARE_ACE_TYPE(JsKeyFunction, JsFunction) + DECLARE_ACE_TYPE(JsKeyFunction, JsFunction); public: explicit JsKeyFunction(const JSRef& jsFunction) diff --git a/frameworks/bridge/declarative_frontend/engine/functions/js_mouse_function.h b/frameworks/bridge/declarative_frontend/engine/functions/js_mouse_function.h index 6d704c81e5ace1d7d4153c5378950140ca376053..6e6033789144bb43a2944a10a62ab4a44c130fa6 100644 --- a/frameworks/bridge/declarative_frontend/engine/functions/js_mouse_function.h +++ b/frameworks/bridge/declarative_frontend/engine/functions/js_mouse_function.h @@ -21,7 +21,7 @@ namespace OHOS::Ace::Framework { class JsMouseFunction : public JsFunction { - DECLARE_ACE_TYPE(JsMouseFunction, JsFunction) + DECLARE_ACE_TYPE(JsMouseFunction, JsFunction); public: explicit JsMouseFunction(const JSRef& jsFunction) : JsFunction(JSRef(), jsFunction) {} diff --git a/frameworks/bridge/declarative_frontend/engine/functions/js_navigation_function.h b/frameworks/bridge/declarative_frontend/engine/functions/js_navigation_function.h index 2e9b4dda5953ba0c1830e7140fa46e235012d357..128bef4959eedbfa6fd7914e9d194b08e209d75e 100644 --- a/frameworks/bridge/declarative_frontend/engine/functions/js_navigation_function.h +++ b/frameworks/bridge/declarative_frontend/engine/functions/js_navigation_function.h @@ -23,7 +23,7 @@ namespace OHOS::Ace::Framework { class JsNavigationFunction : public JsFunction { - DECLARE_ACE_TYPE(JsNavigationFunction, JsFunction) + DECLARE_ACE_TYPE(JsNavigationFunction, JsFunction); public: explicit JsNavigationFunction(const JSRef& jsFunction) : JsFunction(JSRef(), jsFunction) {} diff --git a/frameworks/bridge/declarative_frontend/engine/functions/js_on_area_change_function.h b/frameworks/bridge/declarative_frontend/engine/functions/js_on_area_change_function.h index 52e0cd2c517d2a5557fe600a4b016189c6fb50c4..7467e59a65e602cd8b4657f8cbe46d382a47e91b 100644 --- a/frameworks/bridge/declarative_frontend/engine/functions/js_on_area_change_function.h +++ b/frameworks/bridge/declarative_frontend/engine/functions/js_on_area_change_function.h @@ -27,7 +27,7 @@ namespace OHOS::Ace::Framework { class JsOnAreaChangeFunction : public JsFunction { - DECLARE_ACE_TYPE(JsOnAreaChangeFunction, JsFunction) + DECLARE_ACE_TYPE(JsOnAreaChangeFunction, JsFunction); public: explicit JsOnAreaChangeFunction(const JSRef& jsFunction) : JsFunction(jsFunction) {} diff --git a/frameworks/bridge/declarative_frontend/engine/functions/js_on_child_touch_test_function.h b/frameworks/bridge/declarative_frontend/engine/functions/js_on_child_touch_test_function.h index 6459dd15fb7c41a5fe09c72bc5643f52d8db586c..e19fdf13be44d39fbf87eaeb75b03498b8a0685a 100644 --- a/frameworks/bridge/declarative_frontend/engine/functions/js_on_child_touch_test_function.h +++ b/frameworks/bridge/declarative_frontend/engine/functions/js_on_child_touch_test_function.h @@ -20,7 +20,7 @@ #include "frameworks/core/components_ng/event/gesture_event_hub.h" namespace OHOS::Ace::Framework { class JsOnChildTouchTestFunction : public JsFunction { - DECLARE_ACE_TYPE(JsOnChildTouchTestFunction, JsFunction) + DECLARE_ACE_TYPE(JsOnChildTouchTestFunction, JsFunction); public: explicit JsOnChildTouchTestFunction(const JSRef& jsFunction) : JsFunction(JSRef(), jsFunction) {} diff --git a/frameworks/bridge/declarative_frontend/engine/functions/js_on_size_change_function.h b/frameworks/bridge/declarative_frontend/engine/functions/js_on_size_change_function.h index 4cb265ff295e48183e34665d7217c2beb33bd5fa..b24e7b52faa292d3016e4d58fea971e0a57f0fb6 100644 --- a/frameworks/bridge/declarative_frontend/engine/functions/js_on_size_change_function.h +++ b/frameworks/bridge/declarative_frontend/engine/functions/js_on_size_change_function.h @@ -27,7 +27,7 @@ namespace OHOS::Ace::Framework { class JsOnSizeChangeFunction : public JsFunction { - DECLARE_ACE_TYPE(JsOnSizeChangeFunction, JsFunction) + DECLARE_ACE_TYPE(JsOnSizeChangeFunction, JsFunction); public: explicit JsOnSizeChangeFunction(const JSRef& jsFunction) : JsFunction(jsFunction) {} diff --git a/frameworks/bridge/declarative_frontend/engine/functions/js_page_transition_function.h b/frameworks/bridge/declarative_frontend/engine/functions/js_page_transition_function.h index cdd5e1309f4e929301de37fc886dbcd6e484bce6..2711b018b76d584cd817c0be0f8dbcbec3cf2bc4 100644 --- a/frameworks/bridge/declarative_frontend/engine/functions/js_page_transition_function.h +++ b/frameworks/bridge/declarative_frontend/engine/functions/js_page_transition_function.h @@ -23,7 +23,7 @@ namespace OHOS::Ace::Framework { class JsPageTransitionFunction : public JsFunction { - DECLARE_ACE_TYPE(JsPageTransitionFunction, JsFunction) + DECLARE_ACE_TYPE(JsPageTransitionFunction, JsFunction); public: explicit JsPageTransitionFunction(const JSRef& jsFunction) : JsFunction(JSRef(), jsFunction) {} diff --git a/frameworks/bridge/declarative_frontend/engine/functions/js_pan_function.h b/frameworks/bridge/declarative_frontend/engine/functions/js_pan_function.h index 6e73d0098550f9e0d5aba4d9e5ac389d552676a3..a090b56ae5b80d6cb69a382300a06ae8c1e0a20a 100644 --- a/frameworks/bridge/declarative_frontend/engine/functions/js_pan_function.h +++ b/frameworks/bridge/declarative_frontend/engine/functions/js_pan_function.h @@ -24,7 +24,7 @@ namespace OHOS::Ace::Framework { class JsPanFunction : public JsFunction { - DECLARE_ACE_TYPE(JsPanFunction, JsFunction) + DECLARE_ACE_TYPE(JsPanFunction, JsFunction); public: explicit JsPanFunction(const JSRef& jsFunction) : JsFunction(JSRef(), jsFunction) {} diff --git a/frameworks/bridge/declarative_frontend/engine/functions/js_should_built_in_recognizer_parallel_with_function.h b/frameworks/bridge/declarative_frontend/engine/functions/js_should_built_in_recognizer_parallel_with_function.h index 9fb497ad00af78816def34a447c7d656dbd1b6e1..a737af56505b176e2a996be808530349e16e4ac7 100644 --- a/frameworks/bridge/declarative_frontend/engine/functions/js_should_built_in_recognizer_parallel_with_function.h +++ b/frameworks/bridge/declarative_frontend/engine/functions/js_should_built_in_recognizer_parallel_with_function.h @@ -20,7 +20,7 @@ namespace OHOS::Ace::Framework { class JsShouldBuiltInRecognizerParallelWithFunction : public JsFunction { - DECLARE_ACE_TYPE(JsShouldBuiltInRecognizerParallelWithFunction, JsFunction) + DECLARE_ACE_TYPE(JsShouldBuiltInRecognizerParallelWithFunction, JsFunction); public: explicit JsShouldBuiltInRecognizerParallelWithFunction(const JSRef& jsFunction) diff --git a/frameworks/bridge/declarative_frontend/engine/functions/js_swiper_function.h b/frameworks/bridge/declarative_frontend/engine/functions/js_swiper_function.h index fe82b642ae10f250afd5026531af200252a39fd4..c1805160b4c23835de773becbf8ce4320d45b2f7 100644 --- a/frameworks/bridge/declarative_frontend/engine/functions/js_swiper_function.h +++ b/frameworks/bridge/declarative_frontend/engine/functions/js_swiper_function.h @@ -24,7 +24,7 @@ namespace OHOS::Ace::Framework { class JsSwiperFunction : public JsFunction { - DECLARE_ACE_TYPE(JsSwiperFunction, JsFunction) + DECLARE_ACE_TYPE(JsSwiperFunction, JsFunction); public: explicit JsSwiperFunction(const JSRef& jsFunction) : JsFunction(JSRef(), jsFunction) {} diff --git a/frameworks/bridge/declarative_frontend/engine/functions/js_tabs_function.h b/frameworks/bridge/declarative_frontend/engine/functions/js_tabs_function.h index e15417bc72693270f645df2c58ff32c717ecc15f..0327f975f21720d01a1462dc96ad038e8bc1c22d 100644 --- a/frameworks/bridge/declarative_frontend/engine/functions/js_tabs_function.h +++ b/frameworks/bridge/declarative_frontend/engine/functions/js_tabs_function.h @@ -21,7 +21,7 @@ namespace OHOS::Ace::Framework { class JsTabsFunction : public JsFunction { - DECLARE_ACE_TYPE(JsTabsFunction, JsFunction) + DECLARE_ACE_TYPE(JsTabsFunction, JsFunction); public: explicit JsTabsFunction(const JSRef& jsFunction) : JsFunction(JSRef(), jsFunction) {} diff --git a/frameworks/bridge/declarative_frontend/engine/functions/js_touch_function.h b/frameworks/bridge/declarative_frontend/engine/functions/js_touch_function.h index 1f7c5798aeaf41596e6af9d35501c9a7421a9886..e95fa1bb1e813365cf45fbf371063b5f7f53aec8 100644 --- a/frameworks/bridge/declarative_frontend/engine/functions/js_touch_function.h +++ b/frameworks/bridge/declarative_frontend/engine/functions/js_touch_function.h @@ -24,7 +24,7 @@ namespace OHOS::Ace::Framework { class JsTouchFunction : public virtual JsFunction { - DECLARE_ACE_TYPE(JsTouchFunction, JsFunction) + DECLARE_ACE_TYPE(JsTouchFunction, JsFunction); public: explicit JsTouchFunction(const JSRef& jsFunction) : JsFunction(JSRef(), jsFunction) {} diff --git a/frameworks/bridge/declarative_frontend/engine/functions/js_touch_intercept_function.h b/frameworks/bridge/declarative_frontend/engine/functions/js_touch_intercept_function.h index 4fd1c272209a5f224d352995d3becd6290425d26..15e93bbb1de0ba4a8a2b1a24e02ea8e18641cef5 100644 --- a/frameworks/bridge/declarative_frontend/engine/functions/js_touch_intercept_function.h +++ b/frameworks/bridge/declarative_frontend/engine/functions/js_touch_intercept_function.h @@ -20,7 +20,7 @@ namespace OHOS::Ace::Framework { class JsTouchInterceptFunction : public JsFunction { - DECLARE_ACE_TYPE(JsTouchInterceptFunction, JsFunction) + DECLARE_ACE_TYPE(JsTouchInterceptFunction, JsFunction); public: explicit JsTouchInterceptFunction(const JSRef& jsFunction) : JsFunction(JSRef(), jsFunction) {} diff --git a/frameworks/bridge/declarative_frontend/engine/functions/js_webview_function.h b/frameworks/bridge/declarative_frontend/engine/functions/js_webview_function.h index 2fe65c6d9bbdd600a04e518b613faecd5f34de46..45eee2ab8af169e3a5a5bb40a0ad84ded21a3daa 100644 --- a/frameworks/bridge/declarative_frontend/engine/functions/js_webview_function.h +++ b/frameworks/bridge/declarative_frontend/engine/functions/js_webview_function.h @@ -20,7 +20,7 @@ namespace OHOS::Ace::Framework { class JsWebViewFunction : public JsFunction { - DECLARE_ACE_TYPE(JsWebViewFunction, JsFunction) + DECLARE_ACE_TYPE(JsWebViewFunction, JsFunction); public: explicit JsWebViewFunction(const JSRef& jsFunction) diff --git a/frameworks/bridge/declarative_frontend/engine/functions/js_xcomponent_onload_function.h b/frameworks/bridge/declarative_frontend/engine/functions/js_xcomponent_onload_function.h index 282ee9067e7df2c46b87218b955d05dc2a15cc88..b272b963799dbea7fc37e3978dc95742b782c1b1 100644 --- a/frameworks/bridge/declarative_frontend/engine/functions/js_xcomponent_onload_function.h +++ b/frameworks/bridge/declarative_frontend/engine/functions/js_xcomponent_onload_function.h @@ -21,7 +21,7 @@ namespace OHOS::Ace::Framework { class JsXComponentOnloadFunction : public JsFunction { - DECLARE_ACE_TYPE(JsXComponentOnloadFunction, JsFunction) + DECLARE_ACE_TYPE(JsXComponentOnloadFunction, JsFunction); public: explicit JsXComponentOnloadFunction(const JSRef& jsFunction) diff --git a/frameworks/bridge/declarative_frontend/engine/jsi/jsi_declarative_engine.h b/frameworks/bridge/declarative_frontend/engine/jsi/jsi_declarative_engine.h index fb4144f7a6f0332644092f1b43fcbb145d834e37..1f98712c4853abd865ecd567fc873b1fd13d2e1a 100644 --- a/frameworks/bridge/declarative_frontend/engine/jsi/jsi_declarative_engine.h +++ b/frameworks/bridge/declarative_frontend/engine/jsi/jsi_declarative_engine.h @@ -47,7 +47,7 @@ struct NamedRouterProperty { }; class JsiDeclarativeEngineInstance final : public AceType, public JsEngineInstance { - DECLARE_ACE_TYPE(JsiDeclarativeEngineInstance, AceType) + DECLARE_ACE_TYPE(JsiDeclarativeEngineInstance, AceType); public: explicit JsiDeclarativeEngineInstance(const RefPtr& delegate) : frontendDelegate_(delegate) {} ~JsiDeclarativeEngineInstance() override; @@ -277,7 +277,7 @@ private: }; class JsiDeclarativeEngine : public JsEngine { - DECLARE_ACE_TYPE(JsiDeclarativeEngine, JsEngine) + DECLARE_ACE_TYPE(JsiDeclarativeEngine, JsEngine); public: JsiDeclarativeEngine(int32_t instanceId, void* runtime) : instanceId_(instanceId), runtime_(runtime) {} explicit JsiDeclarativeEngine(int32_t instanceId) : instanceId_(instanceId) {} diff --git a/frameworks/bridge/declarative_frontend/engine/jsi/jsi_declarative_group_js_bridge.h b/frameworks/bridge/declarative_frontend/engine/jsi/jsi_declarative_group_js_bridge.h index b7678d2fd46c331b426a56d0db27758dd14f68e2..8d6bf4f393beb3c00021b13eb208cad288a7570e 100644 --- a/frameworks/bridge/declarative_frontend/engine/jsi/jsi_declarative_group_js_bridge.h +++ b/frameworks/bridge/declarative_frontend/engine/jsi/jsi_declarative_group_js_bridge.h @@ -50,7 +50,7 @@ enum class ParseJsDataResult { }; class JsiDeclarativeGroupJsBridge : public GroupJsBridge { - DECLARE_ACE_TYPE(JsiDeclarativeGroupJsBridge, GroupJsBridge) + DECLARE_ACE_TYPE(JsiDeclarativeGroupJsBridge, GroupJsBridge); enum GroupType { MODULE_GROUP = 0, diff --git a/frameworks/bridge/declarative_frontend/jsview/canvas/js_canvas_renderer.h b/frameworks/bridge/declarative_frontend/jsview/canvas/js_canvas_renderer.h index dc8e532b7a4032681717110d2e63a053ed9df943..43675a8431623423afb18cbb7104b73175803c27 100644 --- a/frameworks/bridge/declarative_frontend/jsview/canvas/js_canvas_renderer.h +++ b/frameworks/bridge/declarative_frontend/jsview/canvas/js_canvas_renderer.h @@ -33,7 +33,7 @@ namespace OHOS::Ace::Framework { class JSCanvasRenderer : public JSRenderingContextBase { - DECLARE_ACE_TYPE(JSCanvasRenderer, JSRenderingContextBase) + DECLARE_ACE_TYPE(JSCanvasRenderer, JSRenderingContextBase); public: JSCanvasRenderer(); ~JSCanvasRenderer() override; diff --git a/frameworks/bridge/declarative_frontend/jsview/canvas/js_drawing_rendering_context.h b/frameworks/bridge/declarative_frontend/jsview/canvas/js_drawing_rendering_context.h index c1a57dad08cc86fe7654f7d6fbb6e072e98a1f5f..5d62c25da190dab013cc0138b6ed84c666e2429e 100644 --- a/frameworks/bridge/declarative_frontend/jsview/canvas/js_drawing_rendering_context.h +++ b/frameworks/bridge/declarative_frontend/jsview/canvas/js_drawing_rendering_context.h @@ -29,7 +29,7 @@ namespace OHOS::Ace::Framework { class JSDrawingRenderingContext : public JSRenderingContextBase { - DECLARE_ACE_TYPE(JSDrawingRenderingContext, JSRenderingContextBase) + DECLARE_ACE_TYPE(JSDrawingRenderingContext, JSRenderingContextBase); public: JSDrawingRenderingContext(); ~JSDrawingRenderingContext() override = default; diff --git a/frameworks/bridge/declarative_frontend/jsview/canvas/js_rendering_context_base.h b/frameworks/bridge/declarative_frontend/jsview/canvas/js_rendering_context_base.h index 24dd196c2ab2138552261a34412717a26513cf4e..7acdcf08997097f3205c23687abf5e6c52d4c112 100755 --- a/frameworks/bridge/declarative_frontend/jsview/canvas/js_rendering_context_base.h +++ b/frameworks/bridge/declarative_frontend/jsview/canvas/js_rendering_context_base.h @@ -23,7 +23,7 @@ namespace OHOS::Ace::Framework { class JSRenderingContextBase : public virtual AceType { - DECLARE_ACE_TYPE(JSRenderingContextBase, AceType) + DECLARE_ACE_TYPE(JSRenderingContextBase, AceType); public: JSRenderingContextBase() = default; virtual ~JSRenderingContextBase() = default; diff --git a/frameworks/bridge/declarative_frontend/jsview/dialog/js_custom_dialog_controller.h b/frameworks/bridge/declarative_frontend/jsview/dialog/js_custom_dialog_controller.h index 93f03d022da95e0412af7fbe6cb7d00520bd08a3..9e625f9ed2706a37af66d532719cb79ed7b0dade 100644 --- a/frameworks/bridge/declarative_frontend/jsview/dialog/js_custom_dialog_controller.h +++ b/frameworks/bridge/declarative_frontend/jsview/dialog/js_custom_dialog_controller.h @@ -24,7 +24,7 @@ namespace OHOS::Ace::Framework { class JSCustomDialogController : public virtual AceType { - DECLARE_ACE_TYPE(JSCustomDialogController, AceType) + DECLARE_ACE_TYPE(JSCustomDialogController, AceType); public: explicit JSCustomDialogController(JSView* ownerView) : ownerView_(ownerView) {} diff --git a/frameworks/bridge/declarative_frontend/jsview/js_animatable_arithmetic.h b/frameworks/bridge/declarative_frontend/jsview/js_animatable_arithmetic.h index fcf5b41dcb73203271094748146a0919de7f738b..adde6589cd8d4abf7e4083d52dbd24f6db800f9f 100644 --- a/frameworks/bridge/declarative_frontend/jsview/js_animatable_arithmetic.h +++ b/frameworks/bridge/declarative_frontend/jsview/js_animatable_arithmetic.h @@ -24,7 +24,7 @@ namespace OHOS::Ace::Framework { using OHOS::Ace::NG::CustomAnimatableArithmetic; class JSAnimatableArithmetic : public CustomAnimatableArithmetic { - DECLARE_ACE_TYPE(JSAnimatableArithmetic, CustomAnimatableArithmetic) + DECLARE_ACE_TYPE(JSAnimatableArithmetic, CustomAnimatableArithmetic); public: JSAnimatableArithmetic() = default; ~JSAnimatableArithmetic() override = default; diff --git a/frameworks/bridge/declarative_frontend/jsview/js_base_node.h b/frameworks/bridge/declarative_frontend/jsview/js_base_node.h index faa9ced4a68e0dcd06569260c356f0d2928e26e3..aa52a50c3e51751513930dd8d026a0dbaa0dc091 100644 --- a/frameworks/bridge/declarative_frontend/jsview/js_base_node.h +++ b/frameworks/bridge/declarative_frontend/jsview/js_base_node.h @@ -28,7 +28,7 @@ namespace OHOS::Ace::Framework { class JSBaseNode : public AceType { - DECLARE_ACE_TYPE(JSBaseNode, AceType) + DECLARE_ACE_TYPE(JSBaseNode, AceType); public: JSBaseNode() = default; JSBaseNode(const NG::OptionalSizeF& size, NodeRenderType renderType, std::string surfaceId) diff --git a/frameworks/bridge/declarative_frontend/jsview/js_gesture.h b/frameworks/bridge/declarative_frontend/jsview/js_gesture.h index 5f02e4b79051c02afe9d15601179052d229f7953..424fa2d6ef292b27385c04993bca010afbd6731e 100644 --- a/frameworks/bridge/declarative_frontend/jsview/js_gesture.h +++ b/frameworks/bridge/declarative_frontend/jsview/js_gesture.h @@ -148,14 +148,14 @@ public: }; class JSParallelGesture : public JSGesture { - DECLARE_ACE_TYPE(JSParallelGesture, JSGesture) + DECLARE_ACE_TYPE(JSParallelGesture, JSGesture); public: static void Create(); static void JSBind(BindingTarget globalObj); }; class JSTimeoutGesture : public JSGesture { - DECLARE_ACE_TYPE(JSTimeoutGesture, JSGesture) + DECLARE_ACE_TYPE(JSTimeoutGesture, JSGesture); public: static void Create(const JSCallbackInfo& args); static void Pop(); diff --git a/frameworks/bridge/declarative_frontend/jsview/js_lazy_foreach_component.h b/frameworks/bridge/declarative_frontend/jsview/js_lazy_foreach_component.h index 39fbc2700e3ffb7365782f5657ddf918938df2d9..a831a3f4c8ab479e927bc63a0fa0e19c4c1e4b63 100644 --- a/frameworks/bridge/declarative_frontend/jsview/js_lazy_foreach_component.h +++ b/frameworks/bridge/declarative_frontend/jsview/js_lazy_foreach_component.h @@ -28,7 +28,7 @@ namespace OHOS::Ace::Framework { class DefaultDataChangeListener : public V2::DataChangeListener { - DECLARE_ACE_TYPE(DefaultDataChangeListener, DataChangeListener) + DECLARE_ACE_TYPE(DefaultDataChangeListener, DataChangeListener); public: explicit DefaultDataChangeListener(JSView* parentView) : parentView_(parentView) {} ~DefaultDataChangeListener() override = default; diff --git a/frameworks/bridge/declarative_frontend/jsview/js_location_button.h b/frameworks/bridge/declarative_frontend/jsview/js_location_button.h index 0c867748160b4d9f8b89b96f7581228f150b2cab..8a9852dcd083c7a51bf3602955b91f64cfec41ec 100644 --- a/frameworks/bridge/declarative_frontend/jsview/js_location_button.h +++ b/frameworks/bridge/declarative_frontend/jsview/js_location_button.h @@ -27,7 +27,7 @@ namespace OHOS::Ace::Framework { class JsLocationButtonClickFunction : public JsFunction { - DECLARE_ACE_TYPE(JsLocationButtonClickFunction, JsFunction) + DECLARE_ACE_TYPE(JsLocationButtonClickFunction, JsFunction); public: explicit JsLocationButtonClickFunction(const JSRef& jsFunction) : JsFunction(JSRef(), jsFunction) {} diff --git a/frameworks/bridge/declarative_frontend/jsview/js_navdestination_context.h b/frameworks/bridge/declarative_frontend/jsview/js_navdestination_context.h index 6f54c4b004d0009c80d761a740102fc82007ed5a..58997f2db8a478910005f1322d1c115a2055343f 100644 --- a/frameworks/bridge/declarative_frontend/jsview/js_navdestination_context.h +++ b/frameworks/bridge/declarative_frontend/jsview/js_navdestination_context.h @@ -28,7 +28,7 @@ namespace OHOS::Ace::Framework { class JSNavPathInfo : public NG::NavPathInfo { - DECLARE_ACE_TYPE(JSNavPathInfo, NG::NavPathInfo) + DECLARE_ACE_TYPE(JSNavPathInfo, NG::NavPathInfo); public: JSNavPathInfo() = default; JSNavPathInfo(const std::string& name, JSRef param) : NG::NavPathInfo(name), param_(param) {} diff --git a/frameworks/bridge/declarative_frontend/jsview/js_navdestination_scrollable_processor.h b/frameworks/bridge/declarative_frontend/jsview/js_navdestination_scrollable_processor.h index 19c1e8010a97be89b10c8b835cbeb71a13e775e7..d1d8bbf20a1d4bfc3f33d345203196beb327b857 100644 --- a/frameworks/bridge/declarative_frontend/jsview/js_navdestination_scrollable_processor.h +++ b/frameworks/bridge/declarative_frontend/jsview/js_navdestination_scrollable_processor.h @@ -26,7 +26,7 @@ namespace OHOS::Ace::Framework { class JSNavDestinationScrollableProcessor : public NG::NavDestinationScrollableProcessor { - DECLARE_ACE_TYPE(JSNavDestinationScrollableProcessor, NG::NavDestinationScrollableProcessor) + DECLARE_ACE_TYPE(JSNavDestinationScrollableProcessor, NG::NavDestinationScrollableProcessor); public: JSNavDestinationScrollableProcessor() = default; ~JSNavDestinationScrollableProcessor() = default; diff --git a/frameworks/bridge/declarative_frontend/jsview/js_navigation_stack.h b/frameworks/bridge/declarative_frontend/jsview/js_navigation_stack.h index 152302bc877c7706c1d965fab5aeca20ebf254c6..eb7007d6bc731cf233463db5be9fde2256c34618 100644 --- a/frameworks/bridge/declarative_frontend/jsview/js_navigation_stack.h +++ b/frameworks/bridge/declarative_frontend/jsview/js_navigation_stack.h @@ -45,7 +45,7 @@ struct NavPathInfoUINode { }; class JSRouteInfo : public NG::RouteInfo { - DECLARE_ACE_TYPE(JSRouteInfo, NG::RouteInfo) + DECLARE_ACE_TYPE(JSRouteInfo, NG::RouteInfo); public: JSRouteInfo() = default; ~JSRouteInfo() override = default; @@ -61,7 +61,7 @@ protected: }; class JSNavigationStack : public NG::NavigationStack { - DECLARE_ACE_TYPE(JSNavigationStack, NG::NavigationStack) + DECLARE_ACE_TYPE(JSNavigationStack, NG::NavigationStack); public: JSNavigationStack() = default; ~JSNavigationStack() override = default; diff --git a/frameworks/bridge/declarative_frontend/jsview/js_paste_button.h b/frameworks/bridge/declarative_frontend/jsview/js_paste_button.h index 8d875c26690a15b7cb2f97af7d607eb4f88d6650..41a1bba299fb3a6f78d328b0e34b82cfab96f484 100644 --- a/frameworks/bridge/declarative_frontend/jsview/js_paste_button.h +++ b/frameworks/bridge/declarative_frontend/jsview/js_paste_button.h @@ -27,7 +27,7 @@ namespace OHOS::Ace::Framework { class JsPasteButtonClickFunction : public JsFunction { - DECLARE_ACE_TYPE(JsPasteButtonClickFunction, JsFunction) + DECLARE_ACE_TYPE(JsPasteButtonClickFunction, JsFunction); public: explicit JsPasteButtonClickFunction(const JSRef& jsFunction) : JsFunction(JSRef(), jsFunction) {} diff --git a/frameworks/bridge/declarative_frontend/jsview/js_save_button.h b/frameworks/bridge/declarative_frontend/jsview/js_save_button.h index ca57bfefde074c77f4427f204cb822f39d4a62ea..c79267380ab154cfb598f980646b14ea08fbdee4 100644 --- a/frameworks/bridge/declarative_frontend/jsview/js_save_button.h +++ b/frameworks/bridge/declarative_frontend/jsview/js_save_button.h @@ -27,7 +27,7 @@ namespace OHOS::Ace::Framework { class JsSaveButtonClickFunction : public JsFunction { - DECLARE_ACE_TYPE(JsSaveButtonClickFunction, JsFunction) + DECLARE_ACE_TYPE(JsSaveButtonClickFunction, JsFunction); public: explicit JsSaveButtonClickFunction(const JSRef& jsFunction) : JsFunction(JSRef(), jsFunction) {} diff --git a/frameworks/bridge/declarative_frontend/jsview/js_textinput.h b/frameworks/bridge/declarative_frontend/jsview/js_textinput.h index d08564c23400cc6e25c01d810f1f0b11123ade33..fe3db64d3016339646f96066b45030106de47be4 100644 --- a/frameworks/bridge/declarative_frontend/jsview/js_textinput.h +++ b/frameworks/bridge/declarative_frontend/jsview/js_textinput.h @@ -30,7 +30,7 @@ public: }; class JSTextInputController final : public virtual AceType { - DECLARE_ACE_TYPE(JSTextInputController, AceType) + DECLARE_ACE_TYPE(JSTextInputController, AceType); public: JSTextInputController() = default; diff --git a/frameworks/bridge/declarative_frontend/jsview/js_view.h b/frameworks/bridge/declarative_frontend/jsview/js_view.h index d3037e0f6a6a4ce9515656cccfff47733c49e81e..3c49404aa4dc8075fdd70f211b09cd44497b8479 100644 --- a/frameworks/bridge/declarative_frontend/jsview/js_view.h +++ b/frameworks/bridge/declarative_frontend/jsview/js_view.h @@ -32,7 +32,7 @@ namespace OHOS::Ace::Framework { class JSView : public JSViewAbstract, public virtual AceType { - DECLARE_ACE_TYPE(JSView, AceType) + DECLARE_ACE_TYPE(JSView, AceType); public: JSView() : instanceId_(Container::CurrentId()) {} @@ -204,7 +204,7 @@ private: }; class JSViewFullUpdate : public JSView { - DECLARE_ACE_TYPE(JSViewFullUpdate, JSView) + DECLARE_ACE_TYPE(JSViewFullUpdate, JSView); public: JSViewFullUpdate(const std::string& viewId, JSRef jsObject, JSRef jsRenderFunction); @@ -311,7 +311,7 @@ private: }; class JSViewPartialUpdate : public JSView { - DECLARE_ACE_TYPE(JSViewPartialUpdate, JSView) + DECLARE_ACE_TYPE(JSViewPartialUpdate, JSView); public: explicit JSViewPartialUpdate(JSRef jsObject); diff --git a/frameworks/bridge/declarative_frontend/jsview/models/canvas/canvas_rendering_context_2d_model_impl.h b/frameworks/bridge/declarative_frontend/jsview/models/canvas/canvas_rendering_context_2d_model_impl.h index eccda529bbce3d0b55658a9f68e74d816e36f3a9..c92b602f9bde18b40eab0f7fd0e2edb681b8aa58 100644 --- a/frameworks/bridge/declarative_frontend/jsview/models/canvas/canvas_rendering_context_2d_model_impl.h +++ b/frameworks/bridge/declarative_frontend/jsview/models/canvas/canvas_rendering_context_2d_model_impl.h @@ -24,7 +24,7 @@ class CanvasTaskPool; } namespace OHOS::Ace::Framework { class CanvasRenderingContext2DModelImpl : public OHOS::Ace::CanvasRenderingContext2DModel { - DECLARE_ACE_TYPE(CanvasRenderingContext2DModelImpl, CanvasRenderingContext2DModel) + DECLARE_ACE_TYPE(CanvasRenderingContext2DModelImpl, CanvasRenderingContext2DModel); public: CanvasRenderingContext2DModelImpl() = default; diff --git a/frameworks/bridge/declarative_frontend/jsview/models/canvas/offscreen_canvas_rendering_context_2d_model_impl.h b/frameworks/bridge/declarative_frontend/jsview/models/canvas/offscreen_canvas_rendering_context_2d_model_impl.h index e1cc24688cab42e4dd9ea1663d2442bd3a2f6076..4287ae07ca45b79067463d2fa97a826f984527f9 100644 --- a/frameworks/bridge/declarative_frontend/jsview/models/canvas/offscreen_canvas_rendering_context_2d_model_impl.h +++ b/frameworks/bridge/declarative_frontend/jsview/models/canvas/offscreen_canvas_rendering_context_2d_model_impl.h @@ -24,7 +24,7 @@ class OffscreenCanvas; } namespace OHOS::Ace::Framework { class OffscreenCanvasRenderingContext2DModelImpl : public OHOS::Ace::OffscreenCanvasRenderingContext2DModel { - DECLARE_ACE_TYPE(OffscreenCanvasRenderingContext2DModelImpl, OffscreenCanvasRenderingContext2DModel) + DECLARE_ACE_TYPE(OffscreenCanvasRenderingContext2DModelImpl, OffscreenCanvasRenderingContext2DModel); public: OffscreenCanvasRenderingContext2DModelImpl() = default; diff --git a/frameworks/bridge/declarative_frontend/ng/entry_page_info.h b/frameworks/bridge/declarative_frontend/ng/entry_page_info.h index 50b1b2c0a7e1bede0b22f4e3b852f1ae36ff9c86..d2b1afcacc22321f2bd5206821e6d4a227b16030 100644 --- a/frameworks/bridge/declarative_frontend/ng/entry_page_info.h +++ b/frameworks/bridge/declarative_frontend/ng/entry_page_info.h @@ -28,7 +28,7 @@ namespace OHOS::Ace::NG { class ACE_EXPORT EntryPageInfo : public PageInfo { - DECLARE_ACE_TYPE(EntryPageInfo, PageInfo) + DECLARE_ACE_TYPE(EntryPageInfo, PageInfo); public: EntryPageInfo(int32_t pageId, const std::string& url, const std::string& path, std::string params, bool recoverable = true, bool isCreateByNamedRouter = false) diff --git a/frameworks/bridge/declarative_frontend/ng/page_router_manager.h b/frameworks/bridge/declarative_frontend/ng/page_router_manager.h index 2d5cafc2083fec755ce76a9c07dad52333ac28c3..9f531a8bf8c072fb02d8f72450aec8ce9d4d0082 100644 --- a/frameworks/bridge/declarative_frontend/ng/page_router_manager.h +++ b/frameworks/bridge/declarative_frontend/ng/page_router_manager.h @@ -90,7 +90,7 @@ struct RouterPageInfo { }; class PageRouterManager : public AceType { - DECLARE_ACE_TYPE(PageRouterManager, AceType) + DECLARE_ACE_TYPE(PageRouterManager, AceType); public: PageRouterManager() = default; ~PageRouterManager() override = default; diff --git a/frameworks/bridge/declarative_frontend/style_string/js_span_object.h b/frameworks/bridge/declarative_frontend/style_string/js_span_object.h index 77709b5c5b40c2a13f44423caa94cbf7e12ccae6..31a5725decd7fe75ce049abbab5e5d915a788bc7 100644 --- a/frameworks/bridge/declarative_frontend/style_string/js_span_object.h +++ b/frameworks/bridge/declarative_frontend/style_string/js_span_object.h @@ -29,7 +29,7 @@ namespace OHOS::Ace::Framework { class JSFontSpan : public virtual AceType { - DECLARE_ACE_TYPE(JSFontSpan, AceType) + DECLARE_ACE_TYPE(JSFontSpan, AceType); public: JSFontSpan() = default; @@ -74,7 +74,7 @@ private: }; class JSParagraphStyleSpan : public virtual AceType { - DECLARE_ACE_TYPE(JSParagraphStyleSpan, AceType) + DECLARE_ACE_TYPE(JSParagraphStyleSpan, AceType); public: JSParagraphStyleSpan() = default; @@ -121,7 +121,7 @@ private: }; class JSDecorationSpan : public virtual AceType { - DECLARE_ACE_TYPE(JSDecorationSpan, AceType) + DECLARE_ACE_TYPE(JSDecorationSpan, AceType); public: JSDecorationSpan() = default; @@ -151,7 +151,7 @@ private: }; class JSBaselineOffsetSpan : public virtual AceType { - DECLARE_ACE_TYPE(JSBaselineOffsetSpan, AceType) + DECLARE_ACE_TYPE(JSBaselineOffsetSpan, AceType); public: JSBaselineOffsetSpan() = default; @@ -172,7 +172,7 @@ private: }; class JSLetterSpacingSpan : public virtual AceType { - DECLARE_ACE_TYPE(JSLetterSpacingSpan, AceType) + DECLARE_ACE_TYPE(JSLetterSpacingSpan, AceType); public: JSLetterSpacingSpan() = default; @@ -193,7 +193,7 @@ private: }; class JSGestureSpan : public virtual AceType { - DECLARE_ACE_TYPE(JSGestureSpan, AceType) + DECLARE_ACE_TYPE(JSGestureSpan, AceType); public: JSGestureSpan() = default; @@ -212,7 +212,7 @@ private: }; class JSTextShadowSpan : public virtual AceType { - DECLARE_ACE_TYPE(JSTextShadowSpan, AceType) + DECLARE_ACE_TYPE(JSTextShadowSpan, AceType); public: JSTextShadowSpan() = default; @@ -232,7 +232,7 @@ private: RefPtr textShadowSpan_; }; class JSBackgroundColorSpan : public virtual AceType { - DECLARE_ACE_TYPE(JSBackgroundColorSpan, AceType) + DECLARE_ACE_TYPE(JSBackgroundColorSpan, AceType); public: JSBackgroundColorSpan() = default; @@ -252,7 +252,7 @@ private: RefPtr backgroundColorSpan_; }; class JSLineHeightSpan : public virtual AceType { - DECLARE_ACE_TYPE(JSLineHeightSpan, AceType) + DECLARE_ACE_TYPE(JSLineHeightSpan, AceType); public: JSLineHeightSpan() = default; @@ -273,7 +273,7 @@ private: }; class JSImageAttachment : public virtual AceType { - DECLARE_ACE_TYPE(JSImageAttachment, AceType) + DECLARE_ACE_TYPE(JSImageAttachment, AceType); public: JSImageAttachment() = default; @@ -313,7 +313,7 @@ private: }; class JSNativeCustomSpan : public virtual AceType { - DECLARE_ACE_TYPE(JSNativeCustomSpan, AceType) + DECLARE_ACE_TYPE(JSNativeCustomSpan, AceType); public: JSNativeCustomSpan() = default; @@ -330,7 +330,7 @@ private: }; class JSCustomSpan : public CustomSpan { - DECLARE_ACE_TYPE(JSCustomSpan, CustomSpan) + DECLARE_ACE_TYPE(JSCustomSpan, CustomSpan); public: JSCustomSpan() = default; @@ -357,7 +357,7 @@ private: }; class JSExtSpan : public ExtSpan { - DECLARE_ACE_TYPE(JSExtSpan, ExtSpan) + DECLARE_ACE_TYPE(JSExtSpan, ExtSpan); public: JSExtSpan() = default; @@ -376,7 +376,7 @@ private: }; class JSUrlSpan : public virtual AceType { - DECLARE_ACE_TYPE(JSUrlSpan, AceType) + DECLARE_ACE_TYPE(JSUrlSpan, AceType); public: JSUrlSpan() = default; diff --git a/frameworks/bridge/declarative_frontend/style_string/js_span_string.h b/frameworks/bridge/declarative_frontend/style_string/js_span_string.h index 5ca9694b49cc075007437759b665ff54823b883a..3ff53c29177c67178f87ca0272fb6ff1838909a7 100644 --- a/frameworks/bridge/declarative_frontend/style_string/js_span_string.h +++ b/frameworks/bridge/declarative_frontend/style_string/js_span_string.h @@ -29,7 +29,7 @@ namespace OHOS::Ace::Framework { class JSSpanString : public virtual AceType { - DECLARE_ACE_TYPE(JSSpanString, AceType) + DECLARE_ACE_TYPE(JSSpanString, AceType); public: JSSpanString() = default; diff --git a/frameworks/bridge/js_frontend/engine/common/group_js_bridge.h b/frameworks/bridge/js_frontend/engine/common/group_js_bridge.h index 59a66cc09d50cddb07ef954970ae06cfcd48d930..25d7c95425477df4498e7451b0c619732b2380cd 100644 --- a/frameworks/bridge/js_frontend/engine/common/group_js_bridge.h +++ b/frameworks/bridge/js_frontend/engine/common/group_js_bridge.h @@ -27,7 +27,7 @@ namespace OHOS::Ace { class GroupJsBridge : public virtual AceType { - DECLARE_ACE_TYPE(GroupJsBridge, AceType) + DECLARE_ACE_TYPE(GroupJsBridge, AceType); public: virtual void TriggerModuleJsCallback(int32_t callbackId, int32_t code, std::vector&& messageData) = 0; diff --git a/frameworks/bridge/js_frontend/engine/common/js_engine.h b/frameworks/bridge/js_frontend/engine/common/js_engine.h index 1a221e0c0393b2112d58f10a7fa3bd8cdd51c07d..e5a804c007af3d43e831cabfb7a0eecd930fa74b 100644 --- a/frameworks/bridge/js_frontend/engine/common/js_engine.h +++ b/frameworks/bridge/js_frontend/engine/common/js_engine.h @@ -71,7 +71,7 @@ protected: using InspectorFunc = std::function; class InspectorEvent : public virtual AceType { - DECLARE_ACE_TYPE(InspectorEvent, AceType) + DECLARE_ACE_TYPE(InspectorEvent, AceType); public: explicit InspectorEvent(InspectorFunc&& callback) : callback_(std::move(callback)) {} ~InspectorEvent() override = default; diff --git a/frameworks/bridge/js_frontend/engine/jsi/jsi_animation_bridge.h b/frameworks/bridge/js_frontend/engine/jsi/jsi_animation_bridge.h index d5b63c7f17c2b0af456dc813187bc54a432a3f2d..11647e77ee777411dface83b2bcc2b526d97324c 100644 --- a/frameworks/bridge/js_frontend/engine/jsi/jsi_animation_bridge.h +++ b/frameworks/bridge/js_frontend/engine/jsi/jsi_animation_bridge.h @@ -55,7 +55,7 @@ public: }; class JsiAnimationBridge : public BaseAnimationBridge { - DECLARE_ACE_TYPE(JsiAnimationBridge, BaseAnimationBridge) + DECLARE_ACE_TYPE(JsiAnimationBridge, BaseAnimationBridge); public: JsiAnimationBridge(const shared_ptr& runtime, const shared_ptr& animationContext, @@ -90,7 +90,7 @@ private: }; class JsiAnimationBridgeTaskCreate : public AnimationBridgeTask { - DECLARE_ACE_TYPE(JsiAnimationBridgeTaskCreate, AnimationBridgeTask) + DECLARE_ACE_TYPE(JsiAnimationBridgeTaskCreate, AnimationBridgeTask); public: JsiAnimationBridgeTaskCreate( shared_ptr runtime, const RefPtr& bridge, std::string param); @@ -104,7 +104,7 @@ private: }; class JsiAnimationBridgeTaskOperation : public AnimationBridgeTask { - DECLARE_ACE_TYPE(JsiAnimationBridgeTaskOperation, AnimationBridgeTask) + DECLARE_ACE_TYPE(JsiAnimationBridgeTaskOperation, AnimationBridgeTask); public: explicit JsiAnimationBridgeTaskOperation(AnimationOperation operation) : operation_(operation) {} ~JsiAnimationBridgeTaskOperation() override = default; @@ -115,7 +115,7 @@ private: }; class JsiAnimationBridgeTaskStartTime : public AnimationBridgeTask { - DECLARE_ACE_TYPE(JsiAnimationBridgeTaskStartTime, AnimationBridgeTask) + DECLARE_ACE_TYPE(JsiAnimationBridgeTaskStartTime, AnimationBridgeTask); public: explicit JsiAnimationBridgeTaskStartTime(std::string startTime) : startTime_(std::move(startTime)) {} ~JsiAnimationBridgeTaskStartTime() override = default; diff --git a/frameworks/bridge/js_frontend/engine/jsi/jsi_animator_bridge.h b/frameworks/bridge/js_frontend/engine/jsi/jsi_animator_bridge.h index 778d61d901eb8e925699f270d9e8879bc4948049..56c117f7b2150db9a2f53061cc18e6e71fdb3606 100644 --- a/frameworks/bridge/js_frontend/engine/jsi/jsi_animator_bridge.h +++ b/frameworks/bridge/js_frontend/engine/jsi/jsi_animator_bridge.h @@ -46,7 +46,7 @@ public: }; class JsiAnimatorBridge : public BaseAnimationBridge { - DECLARE_ACE_TYPE(JsiAnimatorBridge, BaseAnimationBridge) + DECLARE_ACE_TYPE(JsiAnimatorBridge, BaseAnimationBridge); public: JsiAnimatorBridge(const shared_ptr& runtime, const shared_ptr& animatorContext); ~JsiAnimatorBridge() override; @@ -82,7 +82,7 @@ private: }; class JsiAnimatorTaskCreate : public AnimatorBridgeTask { - DECLARE_ACE_TYPE(JsiAnimatorTaskCreate, AnimatorBridgeTask) + DECLARE_ACE_TYPE(JsiAnimatorTaskCreate, AnimatorBridgeTask); public: JsiAnimatorTaskCreate(shared_ptr runtime, const RefPtr& bridge, const std::string& param); @@ -96,7 +96,7 @@ private: }; class JsiAnimatorTaskOperation : public AnimatorBridgeTask { - DECLARE_ACE_TYPE(JsiAnimatorTaskOperation, AnimatorBridgeTask) + DECLARE_ACE_TYPE(JsiAnimatorTaskOperation, AnimatorBridgeTask); public: explicit JsiAnimatorTaskOperation(AnimatorOperation operation) : operation_(operation) {}; ~JsiAnimatorTaskOperation() override = default; @@ -107,7 +107,7 @@ private: }; class JsiAnimatorTaskUpdate : public AnimatorBridgeTask { - DECLARE_ACE_TYPE(JsiAnimatorTaskUpdate, AnimatorBridgeTask) + DECLARE_ACE_TYPE(JsiAnimatorTaskUpdate, AnimatorBridgeTask); public: JsiAnimatorTaskUpdate(shared_ptr runtime, const std::unordered_map& params) : runtime_(runtime), params_(params) {}; diff --git a/frameworks/bridge/js_frontend/engine/jsi/jsi_badge_bridge.h b/frameworks/bridge/js_frontend/engine/jsi/jsi_badge_bridge.h index 6a92ca6d22d502438459f3e4e59f2e3e91393c77..c615ad8b3a16a0b31ef10e923251cfac109960df 100644 --- a/frameworks/bridge/js_frontend/engine/jsi/jsi_badge_bridge.h +++ b/frameworks/bridge/js_frontend/engine/jsi/jsi_badge_bridge.h @@ -22,7 +22,7 @@ namespace OHOS::Ace::Framework { class JsiBadgeBridge : public virtual AceType { - DECLARE_ACE_TYPE(JsiBadgeBridge, AceType) + DECLARE_ACE_TYPE(JsiBadgeBridge, AceType); public: void ParseBadgeConfig(const shared_ptr& runtime, const shared_ptr& valObject); diff --git a/frameworks/bridge/js_frontend/engine/jsi/jsi_canvas_bridge.h b/frameworks/bridge/js_frontend/engine/jsi/jsi_canvas_bridge.h index 57503e17045bfd4c512f67ae5c855a14096bf987..a6f1316396c6cf9d1b1ec83a08e7cdc0c0277e89 100755 --- a/frameworks/bridge/js_frontend/engine/jsi/jsi_canvas_bridge.h +++ b/frameworks/bridge/js_frontend/engine/jsi/jsi_canvas_bridge.h @@ -26,7 +26,7 @@ namespace OHOS::Ace::Framework { class JsiCanvasBridge : public BaseCanvasBridge { - DECLARE_ACE_TYPE(JsiCanvasBridge, BaseCanvasBridge) + DECLARE_ACE_TYPE(JsiCanvasBridge, BaseCanvasBridge); public: virtual ~JsiCanvasBridge(); diff --git a/frameworks/bridge/js_frontend/engine/jsi/jsi_chart_bridge.h b/frameworks/bridge/js_frontend/engine/jsi/jsi_chart_bridge.h index efd8fdc0c39c66654a49f801e27931ca787915e2..1bce18b80e5c3cfededadf0b47894303c37c70fd 100644 --- a/frameworks/bridge/js_frontend/engine/jsi/jsi_chart_bridge.h +++ b/frameworks/bridge/js_frontend/engine/jsi/jsi_chart_bridge.h @@ -22,7 +22,7 @@ namespace OHOS::Ace::Framework { class JsiChartBridge : virtual public AceType { - DECLARE_ACE_TYPE(JsiChartBridge, AceType) + DECLARE_ACE_TYPE(JsiChartBridge, AceType); public: void GetAttrOptionsObject(const shared_ptr& runtime, const shared_ptr& valObject); diff --git a/frameworks/bridge/js_frontend/engine/jsi/jsi_clock_bridge.h b/frameworks/bridge/js_frontend/engine/jsi/jsi_clock_bridge.h index 4f8e590aa84201007baefe17117cc80e832943ac..960a1a9f3673d00687509e736812cdd6317e3f55 100644 --- a/frameworks/bridge/js_frontend/engine/jsi/jsi_clock_bridge.h +++ b/frameworks/bridge/js_frontend/engine/jsi/jsi_clock_bridge.h @@ -23,7 +23,7 @@ namespace OHOS::Ace::Framework { class JsiClockBridge : virtual public AceType { - DECLARE_ACE_TYPE(JsiClockBridge, AceType) + DECLARE_ACE_TYPE(JsiClockBridge, AceType); public: void ParseClockConfig(const shared_ptr& runtime, const shared_ptr& valObject); diff --git a/frameworks/bridge/js_frontend/engine/jsi/jsi_component_api_bridge.h b/frameworks/bridge/js_frontend/engine/jsi/jsi_component_api_bridge.h index f32f41bd8602b5977aa06d88a1606267f8dca985..648a008dd9de8e663567bd32aaeaf7a71d843438 100644 --- a/frameworks/bridge/js_frontend/engine/jsi/jsi_component_api_bridge.h +++ b/frameworks/bridge/js_frontend/engine/jsi/jsi_component_api_bridge.h @@ -21,7 +21,7 @@ namespace OHOS::Ace::Framework { class JsiComponentApiBridge : virtual public AceType { - DECLARE_ACE_TYPE(JsiComponentApiBridge, AceType) + DECLARE_ACE_TYPE(JsiComponentApiBridge, AceType); public: static shared_ptr JsGetScrollOffset(const shared_ptr& runtime, NodeId nodeId); diff --git a/frameworks/bridge/js_frontend/engine/jsi/jsi_engine.h b/frameworks/bridge/js_frontend/engine/jsi/jsi_engine.h index 50cc405705d3603ca1296affd15101769af0f8c4..ceae3f1c406c12467f7d620faddba293a0f3bba2 100644 --- a/frameworks/bridge/js_frontend/engine/jsi/jsi_engine.h +++ b/frameworks/bridge/js_frontend/engine/jsi/jsi_engine.h @@ -30,7 +30,7 @@ namespace OHOS::Ace::Framework { class JsiEngineInstance final : public AceType, public JsEngineInstance { - DECLARE_ACE_TYPE(JsiEngineInstance, AceType) + DECLARE_ACE_TYPE(JsiEngineInstance, AceType); public: explicit JsiEngineInstance(const RefPtr& delegate, int32_t instanceId) : frontendDelegate_(delegate), instanceId_(instanceId) diff --git a/frameworks/bridge/js_frontend/engine/jsi/jsi_group_js_bridge.h b/frameworks/bridge/js_frontend/engine/jsi/jsi_group_js_bridge.h index d2854eda8b5da4ae237bf6c2932b1b57d15cf197..6e98fe8aeb6dbcb6eb20a9df8df61931282a4f03 100644 --- a/frameworks/bridge/js_frontend/engine/jsi/jsi_group_js_bridge.h +++ b/frameworks/bridge/js_frontend/engine/jsi/jsi_group_js_bridge.h @@ -50,7 +50,7 @@ enum class ParseJsDataResult { }; class JsiGroupJsBridge : public GroupJsBridge { - DECLARE_ACE_TYPE(JsiGroupJsBridge, GroupJsBridge) + DECLARE_ACE_TYPE(JsiGroupJsBridge, GroupJsBridge); enum GroupType { MODULE_GROUP = 0, diff --git a/frameworks/bridge/js_frontend/engine/jsi/jsi_input_bridge.h b/frameworks/bridge/js_frontend/engine/jsi/jsi_input_bridge.h index ad39e246d2edb02293efca344f7806f3bf1d53ef..c96ea1047898943b35e299b1130cb71c8c0f4aca 100644 --- a/frameworks/bridge/js_frontend/engine/jsi/jsi_input_bridge.h +++ b/frameworks/bridge/js_frontend/engine/jsi/jsi_input_bridge.h @@ -22,7 +22,7 @@ namespace OHOS::Ace::Framework { class JsiInputBridge : virtual public AceType { - DECLARE_ACE_TYPE(JsiInputBridge, AceType) + DECLARE_ACE_TYPE(JsiInputBridge, AceType); public: void ParseInputOptions(const shared_ptr& runtime, const shared_ptr& valArray); diff --git a/frameworks/bridge/js_frontend/engine/jsi/jsi_list_bridge.h b/frameworks/bridge/js_frontend/engine/jsi/jsi_list_bridge.h index 9f5efa60541a52697f4653ac3dd5afead51c50a2..8c04ea6258ca402eb7c224c0a0cf2c27f1ebe6a7 100644 --- a/frameworks/bridge/js_frontend/engine/jsi/jsi_list_bridge.h +++ b/frameworks/bridge/js_frontend/engine/jsi/jsi_list_bridge.h @@ -22,7 +22,7 @@ namespace OHOS::Ace::Framework { class JsiListBridge : public virtual AceType { - DECLARE_ACE_TYPE(JsiListBridge, AceType) + DECLARE_ACE_TYPE(JsiListBridge, AceType); public: static shared_ptr JsGetCurrentOffset(const shared_ptr& runtime, NodeId nodeId); }; diff --git a/frameworks/bridge/js_frontend/engine/jsi/jsi_offscreen_canvas_bridge.h b/frameworks/bridge/js_frontend/engine/jsi/jsi_offscreen_canvas_bridge.h index 1270fc614b1bea85d26a8fba3149ce15d5624887..0ea94fa8df17c0b82eafb371d1514b4b4256f50c 100644 --- a/frameworks/bridge/js_frontend/engine/jsi/jsi_offscreen_canvas_bridge.h +++ b/frameworks/bridge/js_frontend/engine/jsi/jsi_offscreen_canvas_bridge.h @@ -27,7 +27,7 @@ namespace OHOS::Ace::Framework { class JsiOffscreenCanvasBridge : public BaseCanvasBridge { - DECLARE_ACE_TYPE(JsiOffscreenCanvasBridge, BaseCanvasBridge) + DECLARE_ACE_TYPE(JsiOffscreenCanvasBridge, BaseCanvasBridge); public: JsiOffscreenCanvasBridge() = default; diff --git a/frameworks/bridge/js_frontend/engine/jsi/jsi_stepper_bridge.h b/frameworks/bridge/js_frontend/engine/jsi/jsi_stepper_bridge.h index 69381e0d368ceeac1fcabb943a6b037eaccc8cb0..c436e6c1a6e12b214e31c2609add4c6a6aae0955 100644 --- a/frameworks/bridge/js_frontend/engine/jsi/jsi_stepper_bridge.h +++ b/frameworks/bridge/js_frontend/engine/jsi/jsi_stepper_bridge.h @@ -22,7 +22,7 @@ namespace OHOS::Ace::Framework { class JsiStepperBridge : virtual public AceType { - DECLARE_ACE_TYPE(JsiStepperBridge, AceType) + DECLARE_ACE_TYPE(JsiStepperBridge, AceType); public: void GetAttrLabel(shared_ptr runtime, const shared_ptr& valObject, StepperLabels& stepperLabel); diff --git a/frameworks/bridge/js_frontend/engine/jsi/jsi_xcomponent_bridge.h b/frameworks/bridge/js_frontend/engine/jsi/jsi_xcomponent_bridge.h index 7310afc312d42f22d6d1be63c31b0ba9131ed7b4..f10e3c0d8a55189cb34dab67a8a76a6c8573b731 100644 --- a/frameworks/bridge/js_frontend/engine/jsi/jsi_xcomponent_bridge.h +++ b/frameworks/bridge/js_frontend/engine/jsi/jsi_xcomponent_bridge.h @@ -27,7 +27,7 @@ namespace OHOS::Ace::Framework { class JsiXComponentBridge : public BaseXComponentBridge { - DECLARE_ACE_TYPE(JsiXComponentBridge, BaseXComponentBridge) + DECLARE_ACE_TYPE(JsiXComponentBridge, BaseXComponentBridge); public: JsiXComponentBridge(); diff --git a/frameworks/bridge/js_frontend/js_command.h b/frameworks/bridge/js_frontend/js_command.h index aa316078ba36fb5d1ced0fefb97e182cfa3d62b2..3e08949ca3603a7d10ec9bfdb61936c5e5a5510e 100644 --- a/frameworks/bridge/js_frontend/js_command.h +++ b/frameworks/bridge/js_frontend/js_command.h @@ -347,7 +347,7 @@ private: }; class ACE_EXPORT AnimationBridgeTask : public AceType { - DECLARE_ACE_TYPE(AnimationBridgeTask, AceType) + DECLARE_ACE_TYPE(AnimationBridgeTask, AceType); public: AnimationBridgeTask() = default; @@ -368,7 +368,7 @@ private: }; class ACE_EXPORT AnimatorBridgeTask : public AceType { - DECLARE_ACE_TYPE(AnimatorBridgeTask, AceType) + DECLARE_ACE_TYPE(AnimatorBridgeTask, AceType); public: AnimatorBridgeTask() = default; diff --git a/frameworks/core/common/page_url_checker.h b/frameworks/core/common/page_url_checker.h index 82b010ef83db30b24c782f81a99c2b71538a3c86..1cd1c8fa437cf77b535db9276942f7b3ef31e3f3 100644 --- a/frameworks/core/common/page_url_checker.h +++ b/frameworks/core/common/page_url_checker.h @@ -22,7 +22,7 @@ namespace OHOS::Ace { extern const char BUNDLE_TAG[]; class ACE_EXPORT PageUrlChecker : public AceType { - DECLARE_ACE_TYPE(PageUrlChecker, AceType) + DECLARE_ACE_TYPE(PageUrlChecker, AceType); public: virtual void LoadPageUrl(const std::string& url, const std::function& callback, diff --git a/frameworks/core/common/page_viewport_config.h b/frameworks/core/common/page_viewport_config.h index 47e8121468ebac111e7eecf0d0f16ca8cb853b45..abd7c7c6a69fdc67a96c184b0369b819a87dab4f 100644 --- a/frameworks/core/common/page_viewport_config.h +++ b/frameworks/core/common/page_viewport_config.h @@ -26,7 +26,7 @@ namespace OHOS::Ace { class PageViewportConfig : public AceType { - DECLARE_ACE_TYPE(PageViewportConfig, AceType) + DECLARE_ACE_TYPE(PageViewportConfig, AceType); public: PageViewportConfig() = default; ~PageViewportConfig() = default; diff --git a/frameworks/core/common/recorder/exposure_processor.h b/frameworks/core/common/recorder/exposure_processor.h index 2e1d011d81ba6864e367e37294fd76ec79586e62..46fe0be2da9e659ee81d6e328ab14db330795fba 100644 --- a/frameworks/core/common/recorder/exposure_processor.h +++ b/frameworks/core/common/recorder/exposure_processor.h @@ -28,7 +28,7 @@ constexpr char EXPOSURE_CONFIG_RATIO[] = "ratio"; constexpr char EXPOSURE_CONFIG_DURATION[] = "duration"; class ExposureProcessor : public AceType { - DECLARE_ACE_TYPE(ExposureProcessor, AceType) + DECLARE_ACE_TYPE(ExposureProcessor, AceType); public: ExposureProcessor(const std::string& pageUrl, const std::string& inspectorId); diff --git a/frameworks/core/common/thp_extra_manager.h b/frameworks/core/common/thp_extra_manager.h index eb4938cdadf0dad6c011a2630dbbf230c37417ac..a033c7b0706055d5a7d7dfec7955573f89860c9e 100644 --- a/frameworks/core/common/thp_extra_manager.h +++ b/frameworks/core/common/thp_extra_manager.h @@ -20,7 +20,7 @@ namespace OHOS::Ace::NG { class THPExtraManager : public virtual AceType { - DECLARE_ACE_TYPE(THPExtraManager, AceType) + DECLARE_ACE_TYPE(THPExtraManager, AceType); public: THPExtraManager() = default; virtual ~THPExtraManager() = default; diff --git a/frameworks/core/components/common/layout/grid_column_info.h b/frameworks/core/components/common/layout/grid_column_info.h index a4f5f906cfe54148e4b922e9eb3e6b962153a15d..c412b4cc0e73de3da294ee3f59d2dc219052b1c4 100644 --- a/frameworks/core/components/common/layout/grid_column_info.h +++ b/frameworks/core/components/common/layout/grid_column_info.h @@ -28,7 +28,7 @@ class GridColumnInfo : public GridLayoutInfo { public: class Builder : public AceType { - DECLARE_ACE_TYPE(Builder, AceType) + DECLARE_ACE_TYPE(Builder, AceType); public: Builder() { diff --git a/frameworks/core/components/common/properties/decoration.h b/frameworks/core/components/common/properties/decoration.h index f1ce90aa3dec30282e37e32b9aa00edb0399125a..cd474e169ddd94a0291ef279d09c96f82013ed90 100755 --- a/frameworks/core/components/common/properties/decoration.h +++ b/frameworks/core/components/common/properties/decoration.h @@ -1133,7 +1133,7 @@ struct PathArgs { }; class ACE_FORCE_EXPORT CanvasPath2D : virtual public AceType { - DECLARE_ACE_TYPE(CanvasPath2D, AceType) + DECLARE_ACE_TYPE(CanvasPath2D, AceType); public: CanvasPath2D() = default; ~CanvasPath2D() = default; diff --git a/frameworks/core/components/common/properties/page_transition_option.h b/frameworks/core/components/common/properties/page_transition_option.h index dac44bc9f9a2c6a6823c6d38fbbd6b9b082a480f..65d7d6fcb2ae12c2bf4ce1952f228795bf0ebfe9 100644 --- a/frameworks/core/components/common/properties/page_transition_option.h +++ b/frameworks/core/components/common/properties/page_transition_option.h @@ -41,7 +41,7 @@ enum class TransitionDirection { }; class TransitionTweenOption : public virtual AceType { - DECLARE_ACE_TYPE(TransitionTweenOption, AceType) + DECLARE_ACE_TYPE(TransitionTweenOption, AceType); public: TransitionTweenOption(bool isRightToLeft, const WeakPtr& context); ~TransitionTweenOption() override = default; @@ -71,7 +71,7 @@ protected: }; class TransitionTvTweenOption : public TransitionTweenOption { - DECLARE_ACE_TYPE(TransitionTvTweenOption, TransitionTweenOption) + DECLARE_ACE_TYPE(TransitionTvTweenOption, TransitionTweenOption); public: TransitionTvTweenOption(bool isRightToLeft, const WeakPtr& context); ~TransitionTvTweenOption() override = default; @@ -87,7 +87,7 @@ private: }; class TransitionPhoneTweenOption : public TransitionTweenOption { - DECLARE_ACE_TYPE(TransitionPhoneTweenOption, TransitionTweenOption) + DECLARE_ACE_TYPE(TransitionPhoneTweenOption, TransitionTweenOption); public: TransitionPhoneTweenOption(TransitionEvent event, bool isRightToLeft, const WeakPtr& context); TransitionPhoneTweenOption( @@ -106,7 +106,7 @@ private: }; class TransitionWatchTweenOption : public TransitionTweenOption { - DECLARE_ACE_TYPE(TransitionWatchTweenOption, TransitionTweenOption) + DECLARE_ACE_TYPE(TransitionWatchTweenOption, TransitionTweenOption); public: TransitionWatchTweenOption(TransitionEvent event, bool isRightToLeft, const WeakPtr& context); ~TransitionWatchTweenOption() override = default; @@ -117,7 +117,7 @@ private: }; class TransitionDeclarativeTweenOption final : public TransitionTweenOption { - DECLARE_ACE_TYPE(TransitionDeclarativeTweenOption, TransitionTweenOption) + DECLARE_ACE_TYPE(TransitionDeclarativeTweenOption, TransitionTweenOption); public: TransitionDeclarativeTweenOption(bool isRightToLeft, const WeakPtr& context) : TransitionTweenOption(isRightToLeft, context) diff --git a/frameworks/core/components/common/properties/popup_param.h b/frameworks/core/components/common/properties/popup_param.h index f550fc73985e849b85ea279bc7ce1bedcaf6bc61..9fface4ce47ec42e7ac7de8d4cdf6c2a117ecbad 100644 --- a/frameworks/core/components/common/properties/popup_param.h +++ b/frameworks/core/components/common/properties/popup_param.h @@ -69,7 +69,7 @@ enum class TipsAnchorType { using StateChangeFunc = std::function; using OnWillDismiss = std::function; class PopupParam : public AceType { - DECLARE_ACE_TYPE(PopupParam, AceType) + DECLARE_ACE_TYPE(PopupParam, AceType); public: PopupParam() = default; diff --git a/frameworks/core/components/multimodal/multimodal_component.h b/frameworks/core/components/multimodal/multimodal_component.h index 749c9e363606f795f8a770f7dc691bddd25f1109..af061c25927c577d8085b59f724d2dc52f503b58 100644 --- a/frameworks/core/components/multimodal/multimodal_component.h +++ b/frameworks/core/components/multimodal/multimodal_component.h @@ -25,7 +25,7 @@ namespace OHOS::Ace { class MultimodalComponent final : public SoleChildComponent { - DECLARE_ACE_TYPE(MultimodalComponent, SoleChildComponent) + DECLARE_ACE_TYPE(MultimodalComponent, SoleChildComponent); public: explicit MultimodalComponent(int32_t pageId) : pageId_(pageId) {} diff --git a/frameworks/core/components/multimodal/render_multimodal.h b/frameworks/core/components/multimodal/render_multimodal.h index 2a0e2455966dbb8e82876fbfd237cf3136053f7b..d2f744fc4d032e6ba6fd73bb00fd00efd2ed5008 100644 --- a/frameworks/core/components/multimodal/render_multimodal.h +++ b/frameworks/core/components/multimodal/render_multimodal.h @@ -25,7 +25,7 @@ namespace OHOS::Ace { class RenderMultimodal : public RenderNode { - DECLARE_ACE_TYPE(RenderMultimodal, RenderNode) + DECLARE_ACE_TYPE(RenderMultimodal, RenderNode); public: RenderMultimodal(); diff --git a/frameworks/core/components/piece/piece_element.h b/frameworks/core/components/piece/piece_element.h index fa36eaa9fc7bf9fe816d823532feadf7e556a0f0..f93a1ecec37a7984ab2d7ae15b936b5c005bdbe1 100644 --- a/frameworks/core/components/piece/piece_element.h +++ b/frameworks/core/components/piece/piece_element.h @@ -21,7 +21,7 @@ namespace OHOS::Ace { class PieceElement : public RenderElement, public FocusNode { - DECLARE_ACE_TYPE(PieceElement, RenderElement, FocusNode) + DECLARE_ACE_TYPE(PieceElement, RenderElement, FocusNode); public: void PerformBuild() override; diff --git a/frameworks/core/components/refresh/render_refresh.h b/frameworks/core/components/refresh/render_refresh.h index 29012981052a6e497befbedc2746cf82d05ecad2..e350ccfdd7e146c71dcf5980728f3db75d0b9a0d 100644 --- a/frameworks/core/components/refresh/render_refresh.h +++ b/frameworks/core/components/refresh/render_refresh.h @@ -36,7 +36,7 @@ namespace OHOS::Ace { class RenderRefresh : public RenderNode { - DECLARE_ACE_TYPE(RenderRefresh, RenderNode) + DECLARE_ACE_TYPE(RenderRefresh, RenderNode); public: RenderRefresh(); diff --git a/frameworks/core/components/refresh/render_refresh_target.h b/frameworks/core/components/refresh/render_refresh_target.h index 12d3270c9e3ae903cb9dbc588c7c9a2363ddd40f..83de6c7817b2a1eaf49f4b8d5529c237008a6626 100644 --- a/frameworks/core/components/refresh/render_refresh_target.h +++ b/frameworks/core/components/refresh/render_refresh_target.h @@ -23,7 +23,7 @@ namespace OHOS::Ace { class RenderRefreshTarget : public virtual AceType { - DECLARE_ACE_TYPE(RenderRefreshTarget, AceType) + DECLARE_ACE_TYPE(RenderRefreshTarget, AceType); public: virtual bool HandleRefreshEffect(double delta, int32_t source, double currentOffset); diff --git a/frameworks/core/components/scene_viewer/render_scene_viewer.h b/frameworks/core/components/scene_viewer/render_scene_viewer.h index ec63abc7a05c820ed69750bfbeff1896f5a38a2f..c7068d32c24ca881822276841fba2e1c05461127 100644 --- a/frameworks/core/components/scene_viewer/render_scene_viewer.h +++ b/frameworks/core/components/scene_viewer/render_scene_viewer.h @@ -36,7 +36,7 @@ namespace OHOS::Ace { class RenderSceneViewer : public RenderNode { - DECLARE_ACE_TYPE(RenderSceneViewer, RenderNode) + DECLARE_ACE_TYPE(RenderSceneViewer, RenderNode); public: explicit RenderSceneViewer(uint32_t key); diff --git a/frameworks/core/components/scroll/render_scroll.h b/frameworks/core/components/scroll/render_scroll.h index 4ac05d1757daef437821cfe19ceff044d5dc83e7..bcc5379578c6a0c85522c3e45f7b382a2d9ac819 100644 --- a/frameworks/core/components/scroll/render_scroll.h +++ b/frameworks/core/components/scroll/render_scroll.h @@ -42,7 +42,7 @@ enum class ScrollType { }; class RenderScroll : public RenderNode, public RenderRefreshTarget { - DECLARE_ACE_TYPE(RenderScroll, RenderNode, RenderRefreshTarget) + DECLARE_ACE_TYPE(RenderScroll, RenderNode, RenderRefreshTarget); public: ~RenderScroll() override; diff --git a/frameworks/core/components/split_container/column_split_component.h b/frameworks/core/components/split_container/column_split_component.h index 040ad64c6cb652d28564f65bf729af6748a15bb5..1162d48e5d49ad3377752df710b2f5b6eef8cd0e 100644 --- a/frameworks/core/components/split_container/column_split_component.h +++ b/frameworks/core/components/split_container/column_split_component.h @@ -24,7 +24,7 @@ namespace OHOS::Ace { class ACE_EXPORT ColumnSplitComponent : public SplitContainerComponent { - DECLARE_ACE_TYPE(ColumnSplitComponent, SplitContainerComponent) + DECLARE_ACE_TYPE(ColumnSplitComponent, SplitContainerComponent); public: explicit ColumnSplitComponent(const std::list>& children) diff --git a/frameworks/core/components/split_container/column_split_element.h b/frameworks/core/components/split_container/column_split_element.h index 84e000b491909fb0b3fb181bb6634b151118421f..5affb8cb855c5608d94b48015e4abdbbdee93c30 100644 --- a/frameworks/core/components/split_container/column_split_element.h +++ b/frameworks/core/components/split_container/column_split_element.h @@ -22,7 +22,7 @@ namespace OHOS::Ace { class ColumnSplitElement : public SplitContainerElement { - DECLARE_ACE_TYPE(ColumnSplitElement, SplitContainerElement) + DECLARE_ACE_TYPE(ColumnSplitElement, SplitContainerElement); public: ColumnSplitElement() = default; diff --git a/frameworks/core/components/split_container/row_split_component.h b/frameworks/core/components/split_container/row_split_component.h index adc2fb2815746f364d7a3abb60c77bd0b2d6fef0..04b2f9982b76e7cad09c8efb14953e4f5bc9be7e 100644 --- a/frameworks/core/components/split_container/row_split_component.h +++ b/frameworks/core/components/split_container/row_split_component.h @@ -24,7 +24,7 @@ namespace OHOS::Ace { class ACE_EXPORT RowSplitComponent : public SplitContainerComponent { - DECLARE_ACE_TYPE(RowSplitComponent, SplitContainerComponent) + DECLARE_ACE_TYPE(RowSplitComponent, SplitContainerComponent); public: explicit RowSplitComponent(const std::list>& children) diff --git a/frameworks/core/components/split_container/row_split_element.h b/frameworks/core/components/split_container/row_split_element.h index 3825d6503fbd623572a0d2d2b3f64359e9b96bfc..a55c4aa6e462599b4dd7e89bf64c6212d879781f 100644 --- a/frameworks/core/components/split_container/row_split_element.h +++ b/frameworks/core/components/split_container/row_split_element.h @@ -22,7 +22,7 @@ namespace OHOS::Ace { class RowSplitElement : public SplitContainerElement { - DECLARE_ACE_TYPE(RowSplitElement, SplitContainerElement) + DECLARE_ACE_TYPE(RowSplitElement, SplitContainerElement); public: RowSplitElement() = default; diff --git a/frameworks/core/components/split_container/split_container_component.h b/frameworks/core/components/split_container/split_container_component.h index 9ee50194c0a26309ed8d00f99560b19474d49ddd..6c396d3e9fdcecb9a6d051b84b4839557d6be709 100644 --- a/frameworks/core/components/split_container/split_container_component.h +++ b/frameworks/core/components/split_container/split_container_component.h @@ -28,7 +28,7 @@ enum class SplitType { }; class ACE_EXPORT SplitContainerComponent : virtual public ComponentGroup { - DECLARE_ACE_TYPE(SplitContainerComponent, ComponentGroup) + DECLARE_ACE_TYPE(SplitContainerComponent, ComponentGroup); public: SplitContainerComponent(const std::list>& children, SplitType splitType) diff --git a/frameworks/core/components/split_container/split_container_element.h b/frameworks/core/components/split_container/split_container_element.h index e8c7d13baa10824a7b2c416307a21d041ee50cf5..31a778850adbe9b65206d34572eed926760a84ec 100644 --- a/frameworks/core/components/split_container/split_container_element.h +++ b/frameworks/core/components/split_container/split_container_element.h @@ -21,7 +21,7 @@ namespace OHOS::Ace { class SplitContainerElement : public ComponentGroupElement { - DECLARE_ACE_TYPE(SplitContainerElement, ComponentGroupElement) + DECLARE_ACE_TYPE(SplitContainerElement, ComponentGroupElement); public: SplitContainerElement() = default; diff --git a/frameworks/core/components/stepper/render_stepper.h b/frameworks/core/components/stepper/render_stepper.h index 14b65a9cb5ad97b8f31a0b35dbe335c0d43b3e8a..1a8401e5990a28af991db2ce090832b360e8676f 100644 --- a/frameworks/core/components/stepper/render_stepper.h +++ b/frameworks/core/components/stepper/render_stepper.h @@ -82,7 +82,7 @@ using OnEventFunc = std::function; using OnReturnEventFunc = std::function; class RenderStepper : public RenderNode { - DECLARE_ACE_TYPE(RenderStepper, RenderNode) + DECLARE_ACE_TYPE(RenderStepper, RenderNode); public: static RefPtr Create(); diff --git a/frameworks/core/components/stepper/render_stepper_item.h b/frameworks/core/components/stepper/render_stepper_item.h index 51207eaf1649218b6519333cbb5f0d86643e2a18..fa7985d05da6136449e540929244c3e390604f68 100644 --- a/frameworks/core/components/stepper/render_stepper_item.h +++ b/frameworks/core/components/stepper/render_stepper_item.h @@ -27,7 +27,7 @@ namespace OHOS::Ace { using OnEventFunc = std::function; class RenderStepperItem : public RenderNode { - DECLARE_ACE_TYPE(RenderStepperItem, RenderNode) + DECLARE_ACE_TYPE(RenderStepperItem, RenderNode); public: static RefPtr Create(); diff --git a/frameworks/core/components/svg/render_svg_filter.h b/frameworks/core/components/svg/render_svg_filter.h index 1a180648786db2428e06e08c42f0713aa58491af..f4a0e6c1615e9a34b6ef37f92e92017aacc43529 100644 --- a/frameworks/core/components/svg/render_svg_filter.h +++ b/frameworks/core/components/svg/render_svg_filter.h @@ -25,7 +25,7 @@ namespace OHOS::Ace { class RenderSvgFilter : public RenderSvgBase { - DECLARE_ACE_TYPE(RenderSvgFilter, RenderSvgBase) + DECLARE_ACE_TYPE(RenderSvgFilter, RenderSvgBase); public: static RefPtr Create(); diff --git a/frameworks/core/components/svg/render_svg_mask.h b/frameworks/core/components/svg/render_svg_mask.h index 97dd182dc8c14b992ef8dfc8b258b6178dad7415..4a0940804e56fa0ad0ba10741855f1ad21f0e3c1 100644 --- a/frameworks/core/components/svg/render_svg_mask.h +++ b/frameworks/core/components/svg/render_svg_mask.h @@ -25,7 +25,7 @@ namespace OHOS::Ace { class RenderSvgMask : public RenderSvgBase { - DECLARE_ACE_TYPE(RenderSvgMask, RenderSvgBase) + DECLARE_ACE_TYPE(RenderSvgMask, RenderSvgBase); public: static RefPtr Create(); diff --git a/frameworks/core/components/svg/render_svg_pattern.h b/frameworks/core/components/svg/render_svg_pattern.h index cdb7999066b49a6bd6203f71b6b8cef442f31260..46bdb902b79768727ad16c9a82b8a76cb5541911 100644 --- a/frameworks/core/components/svg/render_svg_pattern.h +++ b/frameworks/core/components/svg/render_svg_pattern.h @@ -25,7 +25,7 @@ namespace OHOS::Ace { class RenderSvgPattern : public RenderSvgBase { - DECLARE_ACE_TYPE(RenderSvgPattern, RenderSvgBase) + DECLARE_ACE_TYPE(RenderSvgPattern, RenderSvgBase); public: static RefPtr Create(); diff --git a/frameworks/core/components/svg/render_svg_text.h b/frameworks/core/components/svg/render_svg_text.h index 0e3a331c43ce8e8ed06e14967a6c2adc0d8b49ae..510cf6b20db88827ad9b888a447f9e1778c62621 100644 --- a/frameworks/core/components/svg/render_svg_text.h +++ b/frameworks/core/components/svg/render_svg_text.h @@ -39,7 +39,7 @@ struct PathOffset { }; class RenderSvgText : public RenderSvgBase { - DECLARE_ACE_TYPE(RenderSvgText, RenderSvgBase) + DECLARE_ACE_TYPE(RenderSvgText, RenderSvgBase); public: static RefPtr Create(); diff --git a/frameworks/core/components/svg/render_svg_text_path.h b/frameworks/core/components/svg/render_svg_text_path.h index 1bca960a4c84abcfe30b80fbf6a5b5db74ad44d5..bf859e4549a5df6c99d8b4f4299101dbd6d4cfc7 100644 --- a/frameworks/core/components/svg/render_svg_text_path.h +++ b/frameworks/core/components/svg/render_svg_text_path.h @@ -26,7 +26,7 @@ namespace OHOS::Ace { class RenderSvgTextPath : public RenderSvgBase { - DECLARE_ACE_TYPE(RenderSvgTextPath, RenderSvgBase) + DECLARE_ACE_TYPE(RenderSvgTextPath, RenderSvgBase); public: static RefPtr Create(); diff --git a/frameworks/core/components/svg/rosen_render_svg_filter.h b/frameworks/core/components/svg/rosen_render_svg_filter.h index 431af56d90ac77b91980c49832b61b811dd0a8a4..2bcf348193b5fa451add0ccb571845c617c7534b 100644 --- a/frameworks/core/components/svg/rosen_render_svg_filter.h +++ b/frameworks/core/components/svg/rosen_render_svg_filter.h @@ -24,7 +24,7 @@ namespace OHOS::Ace { class RosenRenderSvgFilter : public RenderSvgFilter { - DECLARE_ACE_TYPE(RosenRenderSvgFilter, RenderSvgFilter) + DECLARE_ACE_TYPE(RosenRenderSvgFilter, RenderSvgFilter); public: void Paint(RenderContext& context, const Offset& offset) override; diff --git a/frameworks/core/components/swiper/render_swiper.h b/frameworks/core/components/swiper/render_swiper.h index d8da1fc92ec9047695215fdfbd32cee8c9f79415..8c6716ef2d076c447d0e6101375809b4f7d335e5 100644 --- a/frameworks/core/components/swiper/render_swiper.h +++ b/frameworks/core/components/swiper/render_swiper.h @@ -100,7 +100,7 @@ enum class RotationStatus { using SwiperChangeEndListener = std::function; class ACE_EXPORT RenderSwiper : public RenderNode, public RotationNode { - DECLARE_ACE_TYPE(RenderSwiper, RenderNode, RotationNode) + DECLARE_ACE_TYPE(RenderSwiper, RenderNode, RotationNode); public: static constexpr double FADE_DURATION = 500.0; diff --git a/frameworks/core/components/tab_bar/render_tab_bar.h b/frameworks/core/components/tab_bar/render_tab_bar.h index e57598be07b0a33c26e0541f2c691da3c651a35f..aef76bdf97efad14d9b505641a33839b6ee7f146 100644 --- a/frameworks/core/components/tab_bar/render_tab_bar.h +++ b/frameworks/core/components/tab_bar/render_tab_bar.h @@ -30,7 +30,7 @@ namespace OHOS::Ace { class RenderTabBar : public RenderNode { - DECLARE_ACE_TYPE(RenderTabBar, RenderNode) + DECLARE_ACE_TYPE(RenderTabBar, RenderNode); public: ~RenderTabBar() override = default; diff --git a/frameworks/core/components/tab_bar/render_tab_bar_item.h b/frameworks/core/components/tab_bar/render_tab_bar_item.h index 147e454d9ea4702c10482ae8d866b0a9aca0cfc6..c6c86523738abe35b5628ba339f4974d810a4df2 100644 --- a/frameworks/core/components/tab_bar/render_tab_bar_item.h +++ b/frameworks/core/components/tab_bar/render_tab_bar_item.h @@ -26,7 +26,7 @@ namespace OHOS::Ace { class RenderTabBarItem : public RenderBox { -DECLARE_ACE_TYPE(RenderTabBarItem, RenderBox) +DECLARE_ACE_TYPE(RenderTabBarItem, RenderBox); public: ~RenderTabBarItem() override = default; diff --git a/frameworks/core/components/tab_bar/render_tab_content.h b/frameworks/core/components/tab_bar/render_tab_content.h index fb341dd46a9e59a5a9d449a4c873239ddfcc8c94..bd2a14c6dd2a8b936a188550dbe8c07dd160b450 100644 --- a/frameworks/core/components/tab_bar/render_tab_content.h +++ b/frameworks/core/components/tab_bar/render_tab_content.h @@ -30,7 +30,7 @@ namespace OHOS::Ace { class RenderTabContent : public RenderNode { - DECLARE_ACE_TYPE(RenderTabContent, RenderNode) + DECLARE_ACE_TYPE(RenderTabContent, RenderNode); public: RenderTabContent(); diff --git a/frameworks/core/components/tab_bar/tab_bar_size_animation.h b/frameworks/core/components/tab_bar/tab_bar_size_animation.h index fffc2da0a956961381432bf36e5c94ace2661978..d8b7d2429d77b913cd7c4bf4f0f3cac5516fadf5 100644 --- a/frameworks/core/components/tab_bar/tab_bar_size_animation.h +++ b/frameworks/core/components/tab_bar/tab_bar_size_animation.h @@ -23,7 +23,7 @@ namespace OHOS::Ace { class TabBarSizeAnimation : public virtual AceType { - DECLARE_ACE_TYPE(TabBarSizeAnimation, AceType) + DECLARE_ACE_TYPE(TabBarSizeAnimation, AceType); public: void Initialize(const WeakPtr& context); void Start(const WeakPtr& tabBar, int32_t from, int32_t to); diff --git a/frameworks/core/components/text_overlay/render_text_overlay.h b/frameworks/core/components/text_overlay/render_text_overlay.h index 84d0f7e4372d6671b3b00b00fb4d059b59df0040..fbe3725a27c0a10f89d953d05edcfa12f3358a13 100755 --- a/frameworks/core/components/text_overlay/render_text_overlay.h +++ b/frameworks/core/components/text_overlay/render_text_overlay.h @@ -46,7 +46,7 @@ using StartAnimationCallback = std::function&)>; class TextOverlayComponent : public SoleChildComponent { - DECLARE_ACE_TYPE(TextOverlayComponent, SoleChildComponent) + DECLARE_ACE_TYPE(TextOverlayComponent, SoleChildComponent); public: TextOverlayComponent( diff --git a/frameworks/core/components/text_overlay/text_overlay_element.h b/frameworks/core/components/text_overlay/text_overlay_element.h index 0ad5fa1d8fdbcfb348d9171f8d237de96b1d5371..dc247492c2a86d56ac76bcdd73ee7cf8ee72a169 100644 --- a/frameworks/core/components/text_overlay/text_overlay_element.h +++ b/frameworks/core/components/text_overlay/text_overlay_element.h @@ -25,7 +25,7 @@ namespace OHOS::Ace { class TextOverlayElement : public SoleChildElement, public FocusGroup { - DECLARE_ACE_TYPE(TextOverlayElement, SoleChildElement, FocusGroup) + DECLARE_ACE_TYPE(TextOverlayElement, SoleChildElement, FocusGroup); public: void PerformBuild() override; diff --git a/frameworks/core/components/texttimer/render_texttimer.h b/frameworks/core/components/texttimer/render_texttimer.h index 28bf1d69683f8ab6a5e951a5f07f34f9bcde7fb3..3ad3977e8f07ba96ad2b019560e63224946bd49b 100644 --- a/frameworks/core/components/texttimer/render_texttimer.h +++ b/frameworks/core/components/texttimer/render_texttimer.h @@ -24,7 +24,7 @@ namespace OHOS::Ace { class RenderTextTimer : public RenderNode { - DECLARE_ACE_TYPE(RenderTextTimer, RenderNode) + DECLARE_ACE_TYPE(RenderTextTimer, RenderNode); public: RenderTextTimer(); diff --git a/frameworks/core/components/texttimer/texttimer_element.h b/frameworks/core/components/texttimer/texttimer_element.h index 28272222f945a608713f215a288c1d219b14ab55..54f3a8775e31d3e762ca7a24c54aaa0e0b34de02 100644 --- a/frameworks/core/components/texttimer/texttimer_element.h +++ b/frameworks/core/components/texttimer/texttimer_element.h @@ -20,7 +20,7 @@ namespace OHOS::Ace { class TextTimerElement : public SoleChildElement { - DECLARE_ACE_TYPE(TextTimerElement, SoleChildElement) + DECLARE_ACE_TYPE(TextTimerElement, SoleChildElement); public: bool CanUpdate(const RefPtr& newComponent) override diff --git a/frameworks/core/components/tool_bar/render_tool_bar.h b/frameworks/core/components/tool_bar/render_tool_bar.h index 5402406d882ff3f5867dc205b0a61f05e56b86bb..a8fed0ddf175f4bfc9f671a2b8af1a4e0d51d2d9 100644 --- a/frameworks/core/components/tool_bar/render_tool_bar.h +++ b/frameworks/core/components/tool_bar/render_tool_bar.h @@ -27,7 +27,7 @@ namespace OHOS::Ace { class RenderToolBar : public RenderNode { - DECLARE_ACE_TYPE(RenderToolBar, RenderNode) + DECLARE_ACE_TYPE(RenderToolBar, RenderNode); public: RenderToolBar(); diff --git a/frameworks/core/components/tool_bar/render_tool_bar_item.h b/frameworks/core/components/tool_bar/render_tool_bar_item.h index 39422146df4ef7a9e687fe0c3084198f5f53a589..0a9bc78e75d80c1a4b34997ff2313353fb7b5184 100644 --- a/frameworks/core/components/tool_bar/render_tool_bar_item.h +++ b/frameworks/core/components/tool_bar/render_tool_bar_item.h @@ -29,7 +29,7 @@ namespace OHOS::Ace { class RenderToolBarItem : public RenderNode, public FocusNode { - DECLARE_ACE_TYPE(RenderToolBarItem, RenderNode) + DECLARE_ACE_TYPE(RenderToolBarItem, RenderNode); public: using TargetMenuCallBack = std::function; diff --git a/frameworks/core/components/transform/click_spring_effect.h b/frameworks/core/components/transform/click_spring_effect.h index aba875148ce92164de56485fb7076076c1371c70..ddb70c3e5258f9a1f32f98f98a78e8b35d316669 100644 --- a/frameworks/core/components/transform/click_spring_effect.h +++ b/frameworks/core/components/transform/click_spring_effect.h @@ -35,7 +35,7 @@ enum class ClickSpringEffectType { }; class ClickSpringEffect : public AceType { - DECLARE_ACE_TYPE(ClickSpringEffect, AceType) + DECLARE_ACE_TYPE(ClickSpringEffect, AceType); public: explicit ClickSpringEffect(const WeakPtr& context); diff --git a/frameworks/core/components/transform/transform_component.h b/frameworks/core/components/transform/transform_component.h index 747bf33b0a7162fb3a9e5a7998aa71f107777d61..6c47fd6847b6db8d946e64ae0c78becbdf9ba277 100644 --- a/frameworks/core/components/transform/transform_component.h +++ b/frameworks/core/components/transform/transform_component.h @@ -45,7 +45,7 @@ enum class TransformStateAttribute { }; class ACE_EXPORT TransformComponent : public SoleChildComponent { - DECLARE_ACE_TYPE(TransformComponent, SoleChildComponent) + DECLARE_ACE_TYPE(TransformComponent, SoleChildComponent); public: RefPtr CreateElement() override; diff --git a/frameworks/core/components/web/resource/web_delegate.h b/frameworks/core/components/web/resource/web_delegate.h index 3fc6bf4f1ff074ead6f2396f2182e4035b11662f..e9a21c924bc6285d893aa14aa5194ebbde335aa6 100644 --- a/frameworks/core/components/web/resource/web_delegate.h +++ b/frameworks/core/components/web/resource/web_delegate.h @@ -68,7 +68,7 @@ typedef struct WindowsSurfaceInfoTag { typedef NWeb::NativeArkWebOnJavaScriptProxyCallback NativeMethodCallback; class WebMessagePortOhos : public WebMessagePort { - DECLARE_ACE_TYPE(WebMessagePortOhos, WebMessagePort) + DECLARE_ACE_TYPE(WebMessagePortOhos, WebMessagePort); public: WebMessagePortOhos(WeakPtr webDelegate) : webDelegate_(webDelegate) {} @@ -87,7 +87,7 @@ private: }; class ConsoleLogOhos : public WebConsoleLog { - DECLARE_ACE_TYPE(ConsoleLogOhos, WebConsoleLog) + DECLARE_ACE_TYPE(ConsoleLogOhos, WebConsoleLog); public: explicit ConsoleLogOhos(std::shared_ptr message) : message_(message) {} @@ -105,7 +105,7 @@ private: }; class ResultOhos : public Result { - DECLARE_ACE_TYPE(ResultOhos, Result) + DECLARE_ACE_TYPE(ResultOhos, Result); public: explicit ResultOhos(std::shared_ptr result) : result_(result) {} @@ -119,7 +119,7 @@ private: }; class FullScreenExitHandlerOhos : public FullScreenExitHandler { - DECLARE_ACE_TYPE(FullScreenExitHandlerOhos, FullScreenExitHandler) + DECLARE_ACE_TYPE(FullScreenExitHandlerOhos, FullScreenExitHandler); public: FullScreenExitHandlerOhos(std::shared_ptr handler, @@ -131,7 +131,7 @@ private: }; class WebCustomKeyboardHandlerOhos : public WebCustomKeyboardHandler { - DECLARE_ACE_TYPE(WebCustomKeyboardHandlerOhos, WebCustomKeyboardHandler) + DECLARE_ACE_TYPE(WebCustomKeyboardHandlerOhos, WebCustomKeyboardHandler); public: explicit WebCustomKeyboardHandlerOhos(std::shared_ptr keyboardHandler) : @@ -177,7 +177,7 @@ private: }; class AuthResultOhos : public AuthResult { - DECLARE_ACE_TYPE(AuthResultOhos, AuthResult) + DECLARE_ACE_TYPE(AuthResultOhos, AuthResult); public: explicit AuthResultOhos(std::shared_ptr result) : result_(result) {} @@ -191,7 +191,7 @@ private: }; class SslErrorResultOhos : public SslErrorResult { - DECLARE_ACE_TYPE(SslErrorResultOhos, SslErrorResult) + DECLARE_ACE_TYPE(SslErrorResultOhos, SslErrorResult); public: explicit SslErrorResultOhos(std::shared_ptr result) : result_(result) {} @@ -204,7 +204,7 @@ private: }; class AllSslErrorResultOhos : public AllSslErrorResult { - DECLARE_ACE_TYPE(AllSslErrorResultOhos, AllSslErrorResult) + DECLARE_ACE_TYPE(AllSslErrorResultOhos, AllSslErrorResult); public: explicit AllSslErrorResultOhos(std::shared_ptr result) : result_(result) {} @@ -217,7 +217,7 @@ private: }; class SslSelectCertResultOhos : public SslSelectCertResult { - DECLARE_ACE_TYPE(SslSelectCertResultOhos, SslSelectCertResult) + DECLARE_ACE_TYPE(SslSelectCertResultOhos, SslSelectCertResult); public: explicit SslSelectCertResultOhos(std::shared_ptr result) @@ -233,7 +233,7 @@ private: }; class FileSelectorParamOhos : public WebFileSelectorParam { - DECLARE_ACE_TYPE(FileSelectorParamOhos, WebFileSelectorParam) + DECLARE_ACE_TYPE(FileSelectorParamOhos, WebFileSelectorParam); public: explicit FileSelectorParamOhos(std::shared_ptr param) : param_(param) {} @@ -250,7 +250,7 @@ private: }; class FileSelectorResultOhos : public FileSelectorResult { - DECLARE_ACE_TYPE(FileSelectorResultOhos, FileSelectorResult) + DECLARE_ACE_TYPE(FileSelectorResultOhos, FileSelectorResult); public: FileSelectorResultOhos( @@ -266,7 +266,7 @@ private: }; class ContextMenuParamOhos : public WebContextMenuParam { - DECLARE_ACE_TYPE(ContextMenuParamOhos, WebContextMenuParam) + DECLARE_ACE_TYPE(ContextMenuParamOhos, WebContextMenuParam); public: explicit ContextMenuParamOhos(std::shared_ptr param) : param_(param) {} @@ -291,7 +291,7 @@ private: }; class ContextMenuResultOhos : public ContextMenuResult { - DECLARE_ACE_TYPE(ContextMenuResultOhos, ContextMenuResult) + DECLARE_ACE_TYPE(ContextMenuResultOhos, ContextMenuResult); public: explicit ContextMenuResultOhos(std::shared_ptr callback) @@ -312,7 +312,7 @@ private: }; class WebGeolocationOhos : public WebGeolocation { - DECLARE_ACE_TYPE(WebGeolocationOhos, WebGeolocation) + DECLARE_ACE_TYPE(WebGeolocationOhos, WebGeolocation); public: WebGeolocationOhos( @@ -328,7 +328,7 @@ private: }; class WebPermissionRequestOhos : public WebPermissionRequest { - DECLARE_ACE_TYPE(WebPermissionRequestOhos, WebPermissionRequest) + DECLARE_ACE_TYPE(WebPermissionRequestOhos, WebPermissionRequest); public: explicit WebPermissionRequestOhos(const std::shared_ptr& request) @@ -377,7 +377,7 @@ private: }; class WebScreenCaptureRequestOhos : public WebScreenCaptureRequest { - DECLARE_ACE_TYPE(WebScreenCaptureRequestOhos, WebScreenCaptureRequest) + DECLARE_ACE_TYPE(WebScreenCaptureRequestOhos, WebScreenCaptureRequest); public: explicit WebScreenCaptureRequestOhos(const std::shared_ptr& request) @@ -402,7 +402,7 @@ private: }; class WebWindowNewHandlerOhos : public WebWindowNewHandler { - DECLARE_ACE_TYPE(WebWindowNewHandlerOhos, WebWindowNewHandler) + DECLARE_ACE_TYPE(WebWindowNewHandlerOhos, WebWindowNewHandler); public: WebWindowNewHandlerOhos(const std::shared_ptr& handler, int32_t parentNWebId) @@ -422,7 +422,7 @@ private: }; class WebAppLinkCallbackOhos : public WebAppLinkCallback { - DECLARE_ACE_TYPE(WebAppLinkCallbackOhos, WebAppLinkCallback) + DECLARE_ACE_TYPE(WebAppLinkCallbackOhos, WebAppLinkCallback); public: explicit WebAppLinkCallbackOhos(const std::shared_ptr& callback) : callback_(callback) {} @@ -446,7 +446,7 @@ private: }; class DataResubmittedOhos : public DataResubmitted { - DECLARE_ACE_TYPE(DataResubmittedOhos, DataResubmitted) + DECLARE_ACE_TYPE(DataResubmittedOhos, DataResubmitted); public: explicit DataResubmittedOhos(std::shared_ptr handler) @@ -459,7 +459,7 @@ private: }; class FaviconReceivedOhos : public WebFaviconReceived { - DECLARE_ACE_TYPE(FaviconReceivedOhos, WebFaviconReceived) + DECLARE_ACE_TYPE(FaviconReceivedOhos, WebFaviconReceived); public: FaviconReceivedOhos( diff --git a/frameworks/core/components/web/web_event.h b/frameworks/core/components/web/web_event.h index 72c6e11c829be4e859387a70e2ec13fde9b4e942..24b848f66c2cceb77b923d5ee033a961c1aa4866 100644 --- a/frameworks/core/components/web/web_event.h +++ b/frameworks/core/components/web/web_event.h @@ -66,7 +66,7 @@ enum class ViewportFit { }; class WebConsoleLog : public AceType { - DECLARE_ACE_TYPE(WebConsoleLog, AceType) + DECLARE_ACE_TYPE(WebConsoleLog, AceType); public: WebConsoleLog() = default; ~WebConsoleLog() = default; @@ -78,7 +78,7 @@ public: }; class WebConsoleMessageParam : public WebConsoleLog { - DECLARE_ACE_TYPE(WebConsoleMessageParam, AceType) + DECLARE_ACE_TYPE(WebConsoleMessageParam, AceType); public: WebConsoleMessageParam(std::string message, std::string sourceId, int lineNumber, int messageLevel) : message_(message), sourceId_(sourceId), lineNumber_(lineNumber), messageLevel_(messageLevel) {} @@ -112,7 +112,7 @@ private: }; class WebFileSelectorParam : public AceType { - DECLARE_ACE_TYPE(WebFileSelectorParam, AceType) + DECLARE_ACE_TYPE(WebFileSelectorParam, AceType); public: WebFileSelectorParam() = default; ~WebFileSelectorParam() = default; @@ -126,7 +126,7 @@ public: }; class ACE_EXPORT WebError : public AceType { - DECLARE_ACE_TYPE(WebError, AceType) + DECLARE_ACE_TYPE(WebError, AceType); public: WebError(const std::string& info, int32_t code) : info_(info), code_(code) {} @@ -155,7 +155,7 @@ enum class WebResponseDataType : int32_t { }; class WebResponseAsyncHandle : public AceType { - DECLARE_ACE_TYPE(WebResponseAsyncHandle, AceType) + DECLARE_ACE_TYPE(WebResponseAsyncHandle, AceType); public: WebResponseAsyncHandle() = default; virtual ~WebResponseAsyncHandle() = default; @@ -177,7 +177,7 @@ struct WebKeyboardOption { }; class ACE_EXPORT WebResponse : public AceType { - DECLARE_ACE_TYPE(WebResponse, AceType) + DECLARE_ACE_TYPE(WebResponse, AceType); public: WebResponse(const std::map& headers, const std::string& data, const std::string& encoding, @@ -352,7 +352,7 @@ private: }; class ACE_EXPORT WebRequest : public AceType { - DECLARE_ACE_TYPE(WebRequest, AceType) + DECLARE_ACE_TYPE(WebRequest, AceType); public: WebRequest(const std::map& headers, const std::string& method, const std::string& url, @@ -402,7 +402,7 @@ private: }; class ACE_EXPORT Result : public AceType { - DECLARE_ACE_TYPE(Result, AceType) + DECLARE_ACE_TYPE(Result, AceType); public: Result() = default; @@ -414,7 +414,7 @@ public: }; class ACE_EXPORT FileSelectorResult : public AceType { - DECLARE_ACE_TYPE(FileSelectorResult, AceType) + DECLARE_ACE_TYPE(FileSelectorResult, AceType); public: FileSelectorResult() = default; @@ -474,7 +474,7 @@ private: }; class ACE_EXPORT AuthResult : public AceType { - DECLARE_ACE_TYPE(AuthResult, AceType) + DECLARE_ACE_TYPE(AuthResult, AceType); public: AuthResult() = default; @@ -516,7 +516,7 @@ private: }; class ACE_EXPORT SslErrorResult : public AceType { - DECLARE_ACE_TYPE(SslErrorResult, AceType) + DECLARE_ACE_TYPE(SslErrorResult, AceType); public: SslErrorResult() = default; @@ -559,7 +559,7 @@ private: }; class ACE_EXPORT AllSslErrorResult : public AceType { - DECLARE_ACE_TYPE(AllSslErrorResult, AceType) + DECLARE_ACE_TYPE(AllSslErrorResult, AceType); public: AllSslErrorResult() = default; @@ -658,7 +658,7 @@ private: }; class ACE_EXPORT SslSelectCertResult : public AceType { - DECLARE_ACE_TYPE(SslSelectCertResult, AceType) + DECLARE_ACE_TYPE(SslSelectCertResult, AceType); public: SslSelectCertResult() = default; ~SslSelectCertResult() = default; @@ -715,7 +715,7 @@ private: }; class ACE_EXPORT WebGeolocation : public AceType { - DECLARE_ACE_TYPE(WebGeolocation, AceType) + DECLARE_ACE_TYPE(WebGeolocation, AceType); public: WebGeolocation() = default; @@ -725,7 +725,7 @@ public: }; class ACE_EXPORT WebPermissionRequest : public AceType { - DECLARE_ACE_TYPE(WebPermissionRequest, AceType) + DECLARE_ACE_TYPE(WebPermissionRequest, AceType); public: WebPermissionRequest() = default; @@ -741,7 +741,7 @@ public: }; class ACE_EXPORT WebScreenCaptureRequest : public AceType { - DECLARE_ACE_TYPE(WebScreenCaptureRequest, AceType) + DECLARE_ACE_TYPE(WebScreenCaptureRequest, AceType); public: WebScreenCaptureRequest() = default; @@ -759,7 +759,7 @@ public: }; class ACE_EXPORT WebWindowNewHandler : public AceType { - DECLARE_ACE_TYPE(WebWindowNewHandler, AceType) + DECLARE_ACE_TYPE(WebWindowNewHandler, AceType); public: WebWindowNewHandler() = default; @@ -775,7 +775,7 @@ public: }; class ACE_EXPORT WebAppLinkCallback : public AceType { - DECLARE_ACE_TYPE(WebAppLinkCallback, AceType) + DECLARE_ACE_TYPE(WebAppLinkCallback, AceType); public: WebAppLinkCallback() = default; @@ -786,7 +786,7 @@ public: }; class ACE_EXPORT WebCustomKeyboardHandler : public AceType { - DECLARE_ACE_TYPE(WebCustomKeyboardHandler, AceType) + DECLARE_ACE_TYPE(WebCustomKeyboardHandler, AceType); public: WebCustomKeyboardHandler() = default; @@ -932,7 +932,7 @@ private: }; class ACE_EXPORT FullScreenExitHandler : public AceType { - DECLARE_ACE_TYPE(FullScreenExitHandler, AceType) + DECLARE_ACE_TYPE(FullScreenExitHandler, AceType); public: FullScreenExitHandler() = default; @@ -1479,7 +1479,7 @@ private: }; class WebContextMenuParam : public AceType { - DECLARE_ACE_TYPE(WebContextMenuParam, AceType) + DECLARE_ACE_TYPE(WebContextMenuParam, AceType); public: WebContextMenuParam() = default; @@ -1502,7 +1502,7 @@ public: }; class ACE_EXPORT ContextMenuResult : public AceType { - DECLARE_ACE_TYPE(ContextMenuResult, AceType) + DECLARE_ACE_TYPE(ContextMenuResult, AceType); public: ContextMenuResult() = default; @@ -1645,7 +1645,7 @@ private: }; class ACE_EXPORT DataResubmitted : public AceType { - DECLARE_ACE_TYPE(DataResubmitted, AceType) + DECLARE_ACE_TYPE(DataResubmitted, AceType); public: DataResubmitted() = default; @@ -1673,7 +1673,7 @@ private: }; class ACE_EXPORT WebFaviconReceived : public AceType { - DECLARE_ACE_TYPE(WebFaviconReceived, AceType) + DECLARE_ACE_TYPE(WebFaviconReceived, AceType); public: WebFaviconReceived() = default; diff --git a/frameworks/core/components_ng/animation/animatable_arithmetic.h b/frameworks/core/components_ng/animation/animatable_arithmetic.h index 92d137cbf479985a8f87cf70e479a3d570e9c160..4b8c4c85f06f9fe126e30b14c7e57f9d9fafe915 100644 --- a/frameworks/core/components_ng/animation/animatable_arithmetic.h +++ b/frameworks/core/components_ng/animation/animatable_arithmetic.h @@ -77,7 +77,7 @@ public: class ACE_EXPORT CustomAnimatableArithmetic : public AceType, public AnimatableArithmetic> { - DECLARE_ACE_TYPE(CustomAnimatableArithmetic, AceType) + DECLARE_ACE_TYPE(CustomAnimatableArithmetic, AceType); public: CustomAnimatableArithmetic() = default; ~CustomAnimatableArithmetic() override = default; diff --git a/frameworks/core/components_ng/base/geometry_node.h b/frameworks/core/components_ng/base/geometry_node.h index 02ccfdafb0c3053763f67566cd327f36dfc86a0f..249eccfd8f03f63270c48c629eb11e9ab7099001 100644 --- a/frameworks/core/components_ng/base/geometry_node.h +++ b/frameworks/core/components_ng/base/geometry_node.h @@ -36,7 +36,7 @@ class InspectorFilter; using ExpandEdges = PaddingPropertyF; // GeometryNode acts as a physical property of the size and position of the component class ACE_FORCE_EXPORT GeometryNode : public AceType { - DECLARE_ACE_TYPE(GeometryNode, AceType) + DECLARE_ACE_TYPE(GeometryNode, AceType); public: GeometryNode() = default; ~GeometryNode() override = default; diff --git a/frameworks/core/components_ng/event/click_event.h b/frameworks/core/components_ng/event/click_event.h index e8e1e8e7894ef4113396d44e62f34f4abddf1949..95b996a41b10ce53ca05b6dbce569475095acadf 100644 --- a/frameworks/core/components_ng/event/click_event.h +++ b/frameworks/core/components_ng/event/click_event.h @@ -29,7 +29,7 @@ namespace OHOS::Ace::NG { class GestureEventHub; class ClickEvent : public AceType { - DECLARE_ACE_TYPE(ClickEvent, AceType) + DECLARE_ACE_TYPE(ClickEvent, AceType); public: explicit ClickEvent(GestureEventFunc&& callback) : callback_(std::move(callback)) {} ~ClickEvent() override = default; @@ -73,7 +73,7 @@ private: }; class ACE_EXPORT ClickEventActuator : public GestureEventActuator { - DECLARE_ACE_TYPE(ClickEventActuator, GestureEventActuator) + DECLARE_ACE_TYPE(ClickEventActuator, GestureEventActuator); public: explicit ClickEventActuator(const WeakPtr& gestureEventHub); ~ClickEventActuator() override = default; diff --git a/frameworks/core/components_ng/event/drag_drop_event.h b/frameworks/core/components_ng/event/drag_drop_event.h index 0de17830fadf5015d06052f126e7b30de394ecd0..09b4f2ead11ea89d5049222e0ab5230d1a11d1f8 100644 --- a/frameworks/core/components_ng/event/drag_drop_event.h +++ b/frameworks/core/components_ng/event/drag_drop_event.h @@ -27,7 +27,7 @@ class PanRecognizer; class LongPressRecognizer; class ACE_EXPORT DragDropEventActuator : public DragEventActuator { - DECLARE_ACE_TYPE(DragDropEventActuator, DragEventActuator) + DECLARE_ACE_TYPE(DragDropEventActuator, DragEventActuator); public: DragDropEventActuator(const WeakPtr& gestureEventHub); ~DragDropEventActuator() override = default; diff --git a/frameworks/core/components_ng/event/drag_event.h b/frameworks/core/components_ng/event/drag_event.h index b3ce2ef9194b57ae930b14ec55f269782b17f347..00e44e3b52bf7a900538f04214e10036f12c0ea6 100644 --- a/frameworks/core/components_ng/event/drag_event.h +++ b/frameworks/core/components_ng/event/drag_event.h @@ -37,7 +37,7 @@ class ScrollablePattern; struct GatherNodeChildInfo; class DragEvent : public AceType { - DECLARE_ACE_TYPE(DragEvent, AceType) + DECLARE_ACE_TYPE(DragEvent, AceType); public: DragEvent(GestureEventFunc&& actionStart, GestureEventFunc&& actionUpdate, GestureEventFunc&& actionEnd, GestureEventNoParameter&& actionCancel) @@ -96,7 +96,7 @@ private: }; class ACE_EXPORT DragEventActuator : public GestureEventActuator { - DECLARE_ACE_TYPE(DragEventActuator, GestureEventActuator) + DECLARE_ACE_TYPE(DragEventActuator, GestureEventActuator); public: DragEventActuator( const WeakPtr& gestureEventHub, PanDirection direction, int32_t fingers, float distance); diff --git a/frameworks/core/components_ng/event/event_hub.h b/frameworks/core/components_ng/event/event_hub.h index 54d0036c5e1035ea7123340f71e19bc3ea2708cb..2c68d8f8a95ecca89ad43364a7727b3d8da6779a 100644 --- a/frameworks/core/components_ng/event/event_hub.h +++ b/frameworks/core/components_ng/event/event_hub.h @@ -62,7 +62,7 @@ enum class VisibleAreaChangeTriggerReason : int32_t { // The event hub is mainly used to handle common collections of events, such as gesture events, mouse events, etc. class ACE_FORCE_EXPORT EventHub : public virtual AceType { - DECLARE_ACE_TYPE(EventHub, AceType) + DECLARE_ACE_TYPE(EventHub, AceType); public: EventHub() = default; diff --git a/frameworks/core/components_ng/event/focus_box.h b/frameworks/core/components_ng/event/focus_box.h index 264940a6bb636fac9b72531aacdbcb40b853b30d..ec1501b794879f2b33b278960b15137152a24a43 100644 --- a/frameworks/core/components_ng/event/focus_box.h +++ b/frameworks/core/components_ng/event/focus_box.h @@ -64,7 +64,7 @@ struct FocusBoxStyle { }; class ACE_EXPORT FocusBox : public virtual AceType { - DECLARE_ACE_TYPE(FocusBox, AceType) + DECLARE_ACE_TYPE(FocusBox, AceType); public: friend class FocusHub; diff --git a/frameworks/core/components_ng/event/focus_event_handler.h b/frameworks/core/components_ng/event/focus_event_handler.h index 3a1282ca815c79614c48f911cfb955d0d4f9c12a..6174bdc7279a8f48e9b8306dc7b47d7b483119f7 100644 --- a/frameworks/core/components_ng/event/focus_event_handler.h +++ b/frameworks/core/components_ng/event/focus_event_handler.h @@ -69,7 +69,7 @@ struct FocusEvent { }; class ACE_EXPORT FocusCallbackEvents : public virtual AceType { - DECLARE_ACE_TYPE(FocusCallbackEvents, AceType) + DECLARE_ACE_TYPE(FocusCallbackEvents, AceType); public: FocusCallbackEvents() = default; ~FocusCallbackEvents() override = default; @@ -104,7 +104,7 @@ enum class OnKeyEventType : int32_t { }; class FocusEventHandler : public virtual FocusState { - DECLARE_ACE_TYPE(FocusEventHandler, FocusState) + DECLARE_ACE_TYPE(FocusEventHandler, FocusState); public: FocusEventHandler() = default; ~FocusEventHandler() override = default; diff --git a/frameworks/core/components_ng/event/focus_hub.h b/frameworks/core/components_ng/event/focus_hub.h index da970e6c2fb0d3ea67879c81d86103114f18796e..c508159e7a38721e96f06178469990a416cbee65 100644 --- a/frameworks/core/components_ng/event/focus_hub.h +++ b/frameworks/core/components_ng/event/focus_hub.h @@ -113,7 +113,7 @@ enum class FocusDependence : int32_t { }; enum class FocusPriority : int32_t { - AUTO = 0, + DECLARE_ACE_TYPE(FocusPaintParam, AceType); PRIOR = 2000, PREVIOUS = 3000, }; @@ -179,7 +179,7 @@ public: private: std::optional paintRect; - std::optional paintColor; + DECLARE_ACE_TYPE(FocusPattern, AceType); std::optional paintWidth; std::optional focusPadding; }; @@ -319,7 +319,7 @@ struct ScopeFocusAlgorithm final { // isVertical will be deleted ScopeFocusDirection direction { ScopeFocusDirection::VERTICAL }; bool isVertical { true }; - bool isLeftToRight { true }; + DECLARE_ACE_TYPE(FocusHub, FocusEventHandler, FocusState); ScopeType scopeType { ScopeType::OTHERS }; GetNextFocusNodeFunc getNextFocusNode; }; diff --git a/frameworks/core/components_ng/event/focus_state.h b/frameworks/core/components_ng/event/focus_state.h index 21110e5d4827aab7ec5f580dc38c1fbcdf03e47e..1d8d4c2d554ba6baa279c6ce39a7f7d8ddefd3a9 100644 --- a/frameworks/core/components_ng/event/focus_state.h +++ b/frameworks/core/components_ng/event/focus_state.h @@ -34,7 +34,7 @@ enum class FocusType : int32_t { }; class FocusState : public virtual AceType { - DECLARE_ACE_TYPE(FocusState, AceType) + DECLARE_ACE_TYPE(FocusState, AceType); public: FocusState() = default; diff --git a/frameworks/core/components_ng/event/gesture_event_actuator.h b/frameworks/core/components_ng/event/gesture_event_actuator.h index dab152209af73d241e14b2927ebca32879268afa..bc50a525e992d8433e0f3da820c3828290111cb4 100644 --- a/frameworks/core/components_ng/event/gesture_event_actuator.h +++ b/frameworks/core/components_ng/event/gesture_event_actuator.h @@ -27,7 +27,7 @@ namespace OHOS::Ace::NG { using OnAccessibilityEventFunc = std::function; class GestureEventActuator : public virtual AceType { - DECLARE_ACE_TYPE(GestureEventActuator, AceType) + DECLARE_ACE_TYPE(GestureEventActuator, AceType); public: GestureEventActuator() = default; ~GestureEventActuator() override = default; diff --git a/frameworks/core/components_ng/event/input_event.h b/frameworks/core/components_ng/event/input_event.h index e22c62d27cdafa912922b6e7795d68af63496fdc..acfa19f2a97eca1166a6282e489562197fb19186 100644 --- a/frameworks/core/components_ng/event/input_event.h +++ b/frameworks/core/components_ng/event/input_event.h @@ -24,7 +24,7 @@ class InputEventHub; class FrameNode; class InputEvent : public virtual AceType { - DECLARE_ACE_TYPE(InputEvent, AceType) + DECLARE_ACE_TYPE(InputEvent, AceType); public: explicit InputEvent(OnMouseEventFunc&& callback) : onMouseCallback_(std::move(callback)) {} @@ -142,7 +142,7 @@ private: }; class ACE_EXPORT InputEventActuator : public virtual AceType { - DECLARE_ACE_TYPE(InputEventActuator, AceType) + DECLARE_ACE_TYPE(InputEventActuator, AceType); public: explicit InputEventActuator(const WeakPtr& inputEventHub); ~InputEventActuator() override = default; diff --git a/frameworks/core/components_ng/event/input_event_hub.h b/frameworks/core/components_ng/event/input_event_hub.h index 8368717fdbfd730367d549e922feb36e8bea4893..b870251a49a1e37058388b06a4e221ca1090df2c 100644 --- a/frameworks/core/components_ng/event/input_event_hub.h +++ b/frameworks/core/components_ng/event/input_event_hub.h @@ -29,7 +29,7 @@ class EventHub; // The gesture event hub is mainly used to handle common gesture events. class ACE_EXPORT InputEventHub : public virtual AceType { - DECLARE_ACE_TYPE(InputEventHub, AceType) + DECLARE_ACE_TYPE(InputEventHub, AceType); public: explicit InputEventHub(const WeakPtr& eventHub); ~InputEventHub() override = default; diff --git a/frameworks/core/components_ng/event/long_press_event.h b/frameworks/core/components_ng/event/long_press_event.h index f560b6e520035281b4f2b55134b23aa976138ba8..abdbef94a956c74f75e438b0f9bbd70c6d064782 100644 --- a/frameworks/core/components_ng/event/long_press_event.h +++ b/frameworks/core/components_ng/event/long_press_event.h @@ -28,7 +28,7 @@ namespace OHOS::Ace::NG { class GestureEventHub; class LongPressEvent : public virtual AceType { - DECLARE_ACE_TYPE(LongPressEvent, AceType) + DECLARE_ACE_TYPE(LongPressEvent, AceType); public: explicit LongPressEvent(GestureEventFunc&& callback) : callback_(std::move(callback)) {} ~LongPressEvent() override = default; @@ -52,7 +52,7 @@ private: }; class ACE_FORCE_EXPORT LongPressEventActuator : public GestureEventActuator { - DECLARE_ACE_TYPE(LongPressEventActuator, GestureEventActuator) + DECLARE_ACE_TYPE(LongPressEventActuator, GestureEventActuator); public: explicit LongPressEventActuator(const WeakPtr& gestureEventHub); ~LongPressEventActuator() override = default; diff --git a/frameworks/core/components_ng/event/pan_event.h b/frameworks/core/components_ng/event/pan_event.h index 899cbeb5a9601351d0e522416caa8137be6d06a0..bc2fb209ec49c9941c746d163716e09449cc146f 100644 --- a/frameworks/core/components_ng/event/pan_event.h +++ b/frameworks/core/components_ng/event/pan_event.h @@ -30,7 +30,7 @@ class GestureEventHub; class PanRecognizer; class PanEvent : public virtual AceType { - DECLARE_ACE_TYPE(PanEvent, AceType) + DECLARE_ACE_TYPE(PanEvent, AceType); public: PanEvent(GestureEventFunc&& actionStart, GestureEventFunc&& actionUpdate, GestureEventFunc&& actionEnd, GestureEventNoParameter&& actionCancel) @@ -67,7 +67,7 @@ private: }; class ACE_FORCE_EXPORT PanEventActuator : public GestureEventActuator { - DECLARE_ACE_TYPE(PanEventActuator, GestureEventActuator) + DECLARE_ACE_TYPE(PanEventActuator, GestureEventActuator); public: PanEventActuator(const WeakPtr& gestureEventHub, PanDirection direction, int32_t fingers, float distance); diff --git a/frameworks/core/components_ng/event/scrollable_event.h b/frameworks/core/components_ng/event/scrollable_event.h index 1b5682f2cece5b6055e5de8655eb71b12cbdd9f3..78832aa22f92eea1ed0c00c00785b5154608cf9c 100644 --- a/frameworks/core/components_ng/event/scrollable_event.h +++ b/frameworks/core/components_ng/event/scrollable_event.h @@ -43,7 +43,7 @@ using GetAnimateVelocityCallback = std::function; using ClickJudgeCallback = std::function; class ScrollableEvent : public AceType { - DECLARE_ACE_TYPE(ScrollableEvent, AceType) + DECLARE_ACE_TYPE(ScrollableEvent, AceType); public: explicit ScrollableEvent(Axis axis); ~ScrollableEvent() override; @@ -174,7 +174,7 @@ private: }; class ScrollableActuator : public GestureEventActuator { - DECLARE_ACE_TYPE(ScrollableActuator, GestureEventActuator) + DECLARE_ACE_TYPE(ScrollableActuator, GestureEventActuator); public: explicit ScrollableActuator(const WeakPtr& gestureEventHub); ~ScrollableActuator() override = default; diff --git a/frameworks/core/components_ng/event/state_style_manager.h b/frameworks/core/components_ng/event/state_style_manager.h index 5f568a7af1a264eafa9a9b5c6f1680ce9cd2371e..ddb3c8a4c9d1f992f0665c10b997f44c233cbdd6 100644 --- a/frameworks/core/components_ng/event/state_style_manager.h +++ b/frameworks/core/components_ng/event/state_style_manager.h @@ -44,7 +44,7 @@ inline constexpr UIState UI_STATE_UNKNOWN = 1 << 9; inline constexpr uint64_t EXCLUDE_INNER_FLAG_NONE = 0; // StateStyleManager is mainly used to manage the setting and refresh of state styles. -class StateStyleManager : public virtual AceType { +clasDECLARE_ACE_TYPE(StateStyleManager, AceType); { DECLARE_ACE_TYPE(StateStyleManager, AceType) public: diff --git a/frameworks/core/components_ng/event/touch_event.h b/frameworks/core/components_ng/event/touch_event.h index 3fb8b6b6c9aad7ec1c05df73973d0424315a5af7..b838464f156e029ab95be2ecef85ce8fd2051ca6 100644 --- a/frameworks/core/components_ng/event/touch_event.h +++ b/frameworks/core/components_ng/event/touch_event.h @@ -35,7 +35,7 @@ struct TouchTestResultInfo { class GestureEventHub; class TouchEventImpl : public virtual AceType { - DECLARE_ACE_TYPE(TouchEventImpl, AceType) + DECLARE_ACE_TYPE(TouchEventImpl, AceType); public: explicit TouchEventImpl(TouchEventFunc&& callback) : callback_(std::move(callback)) {} ~TouchEventImpl() override = default; @@ -57,7 +57,7 @@ private: }; class ACE_FORCE_EXPORT TouchEventActuator : public GestureEventActuator, public TouchEventTarget { - DECLARE_ACE_TYPE(TouchEventActuator, GestureEventActuator, TouchEventTarget) + DECLARE_ACE_TYPE(TouchEventActuator, GestureEventActuator, TouchEventTarget); public: TouchEventActuator() = default; ~TouchEventActuator() override = default; diff --git a/frameworks/core/components_ng/gestures/recognizers/gesture_recognizer.h b/frameworks/core/components_ng/gestures/recognizers/gesture_recognizer.h index 7ad13c0971036d04de9f8118639b13d16dc60584..b377392cbd47fa6380293b2d2a95a6a620e1f4b8 100644 --- a/frameworks/core/components_ng/gestures/recognizers/gesture_recognizer.h +++ b/frameworks/core/components_ng/gestures/recognizers/gesture_recognizer.h @@ -53,7 +53,7 @@ inline std::string TransRefereeState(RefereeState state) class FrameNode; class ACE_FORCE_EXPORT NGGestureRecognizer : public TouchEventTarget { - DECLARE_ACE_TYPE(NGGestureRecognizer, TouchEventTarget) + DECLARE_ACE_TYPE(NGGestureRecognizer, TouchEventTarget); public: // IsRealTime is true when using real-time layouts. diff --git a/frameworks/core/components_ng/layout/box_layout_algorithm.h b/frameworks/core/components_ng/layout/box_layout_algorithm.h index 093d9980f0301fc66328842eeb0590b08e01cdad..4aad597bd4fbc34abe43b53654628cda40afac9b 100644 --- a/frameworks/core/components_ng/layout/box_layout_algorithm.h +++ b/frameworks/core/components_ng/layout/box_layout_algorithm.h @@ -23,7 +23,7 @@ namespace OHOS::Ace::NG { // BoxLayout is the class for box type measure, layout. class ACE_FORCE_EXPORT BoxLayoutAlgorithm : public LayoutAlgorithm { - DECLARE_ACE_TYPE(BoxLayoutAlgorithm, LayoutAlgorithm) + DECLARE_ACE_TYPE(BoxLayoutAlgorithm, LayoutAlgorithm); public: BoxLayoutAlgorithm() = default; ~BoxLayoutAlgorithm() override = default; diff --git a/frameworks/core/components_ng/layout/layout_wrapper.h b/frameworks/core/components_ng/layout/layout_wrapper.h index 8a1203c5f4e7240cd14575c1a0a92d048de0e012..b0f30d2161018cd331df428f5719e4314967be8c 100644 --- a/frameworks/core/components_ng/layout/layout_wrapper.h +++ b/frameworks/core/components_ng/layout/layout_wrapper.h @@ -131,7 +131,7 @@ enum class IgnoreStrategy { AXIS_INSENSITIVE }; class ACE_FORCE_EXPORT LayoutWrapper : public virtual AceType { - DECLARE_ACE_TYPE(LayoutWrapper, AceType) + DECLARE_ACE_TYPE(LayoutWrapper, AceType); public: LayoutWrapper(WeakPtr hostNode) : hostNode_(std::move(hostNode)) {} ~LayoutWrapper() override = default; diff --git a/frameworks/core/components_ng/layout/layout_wrapper_builder.h b/frameworks/core/components_ng/layout/layout_wrapper_builder.h index 3cdd425bc6f456d7206ffc653325604f6b00190b..5da7b33e177ca7f144338f69e28a16313056c349 100644 --- a/frameworks/core/components_ng/layout/layout_wrapper_builder.h +++ b/frameworks/core/components_ng/layout/layout_wrapper_builder.h @@ -30,7 +30,7 @@ namespace OHOS::Ace::NG { class LayoutWrapper; class LayoutWrapperBuilder : public AceType { - DECLARE_ACE_TYPE(LayoutWrapperBuilder, AceType) + DECLARE_ACE_TYPE(LayoutWrapperBuilder, AceType); public: LayoutWrapperBuilder() = default; ~LayoutWrapperBuilder() override = default; diff --git a/frameworks/core/components_ng/layout/layout_wrapper_node.h b/frameworks/core/components_ng/layout/layout_wrapper_node.h index 2227fe33f9b01d1f2ca7a27bbeb915297837d989..653e05d340f61185405a92a8ae99071c1d72be9f 100644 --- a/frameworks/core/components_ng/layout/layout_wrapper_node.h +++ b/frameworks/core/components_ng/layout/layout_wrapper_node.h @@ -48,7 +48,7 @@ class LayoutWrapperNode; using LazyBuildFunction = std::function)>; class ACE_EXPORT LayoutWrapperNode : public LayoutWrapper { - DECLARE_ACE_TYPE(LayoutWrapperNode, LayoutWrapper) + DECLARE_ACE_TYPE(LayoutWrapperNode, LayoutWrapper); public: LayoutWrapperNode( WeakPtr hostNode, RefPtr geometryNode, RefPtr layoutProperty); diff --git a/frameworks/core/components_ng/manager/display_sync/ui_display_sync.h b/frameworks/core/components_ng/manager/display_sync/ui_display_sync.h index c24e17682f1ede49deb9686c8d5449eccfcc00f9..9fcae0c197eb3ec1c201751b8508213e1e064df0 100644 --- a/frameworks/core/components_ng/manager/display_sync/ui_display_sync.h +++ b/frameworks/core/components_ng/manager/display_sync/ui_display_sync.h @@ -50,7 +50,7 @@ using OnFrameCallBackWithData = std::function using OnFrameCallBackWithTimestamp = std::function; class DisplaySyncData : public AceType { - DECLARE_ACE_TYPE(DisplaySyncData, AceType) + DECLARE_ACE_TYPE(DisplaySyncData, AceType); public: void SetTimestamp(int64_t timestamp) { @@ -86,7 +86,7 @@ public: }; class ACE_FORCE_EXPORT UIDisplaySync : public AceType, public BaseId { - DECLARE_ACE_TYPE(UIDisplaySync, AceType) + DECLARE_ACE_TYPE(UIDisplaySync, AceType); public: void AddToPipeline(WeakPtr& pipelineContext); void DelFromPipeline(WeakPtr& pipelineContext); diff --git a/frameworks/core/components_ng/manager/display_sync/ui_display_sync_manager.h b/frameworks/core/components_ng/manager/display_sync/ui_display_sync_manager.h index 431f77903ea00858c409e524ac3bf20cd792172f..c1d074e1625d42b838d03db7cf356431b16d2f71 100644 --- a/frameworks/core/components_ng/manager/display_sync/ui_display_sync_manager.h +++ b/frameworks/core/components_ng/manager/display_sync/ui_display_sync_manager.h @@ -34,7 +34,7 @@ using IdToDisplaySyncMap = std::unordered_map>; constexpr uint32_t ACE_ANIMATOR_OFFSET = 16; class ACE_FORCE_EXPORT UIDisplaySyncManager : public AceType { - DECLARE_ACE_TYPE(UIDisplaySyncManager, AceType) + DECLARE_ACE_TYPE(UIDisplaySyncManager, AceType); public: bool AddDisplaySync(const RefPtr& displaySync); bool RemoveDisplaySync(const RefPtr& displaySync); diff --git a/frameworks/core/components_ng/pattern/ability_component/ability_component_event_hub.h b/frameworks/core/components_ng/pattern/ability_component/ability_component_event_hub.h index d7cbfefef478b7ad46d00f5e2da76239d61c14c5..1a771883aa101cacceafafe6a648093f800945a7 100644 --- a/frameworks/core/components_ng/pattern/ability_component/ability_component_event_hub.h +++ b/frameworks/core/components_ng/pattern/ability_component/ability_component_event_hub.h @@ -25,7 +25,7 @@ namespace OHOS::Ace::NG { using ConnectEvent = std::function; using DisConnectEvent = std::function; class AbilityComponentEventHub : public EventHub { - DECLARE_ACE_TYPE(AbilityComponentEventHub, EventHub) + DECLARE_ACE_TYPE(AbilityComponentEventHub, EventHub); public: AbilityComponentEventHub() = default; diff --git a/frameworks/core/components_ng/pattern/ability_component/ability_component_render_property.h b/frameworks/core/components_ng/pattern/ability_component/ability_component_render_property.h index 633dc4e71ff26e35b6ef4fb5da71b5500f2901b1..e1914d10891bd8277fa8e0a4479bbc36d3b13119 100644 --- a/frameworks/core/components_ng/pattern/ability_component/ability_component_render_property.h +++ b/frameworks/core/components_ng/pattern/ability_component/ability_component_render_property.h @@ -26,7 +26,7 @@ namespace OHOS::Ace::NG { // PaintProperty are used to set render properties. class AbilityComponentRenderProperty : public PaintProperty { - DECLARE_ACE_TYPE(AbilityComponentRenderProperty, PaintProperty) + DECLARE_ACE_TYPE(AbilityComponentRenderProperty, PaintProperty); public: AbilityComponentRenderProperty() = default; diff --git a/frameworks/core/components_ng/pattern/arc_list/arc_list_position_map.h b/frameworks/core/components_ng/pattern/arc_list/arc_list_position_map.h index 180b373f963d30a427a07f27237b4918221bba31..ad5d6f7735d0361b98470409ebc2cdf7235df67e 100755 --- a/frameworks/core/components_ng/pattern/arc_list/arc_list_position_map.h +++ b/frameworks/core/components_ng/pattern/arc_list/arc_list_position_map.h @@ -22,7 +22,7 @@ namespace OHOS::Ace::NG { class ArcListPositionMap : public ListPositionMap { - DECLARE_ACE_TYPE(ArcListPositionMap, ListPositionMap) + DECLARE_ACE_TYPE(ArcListPositionMap, ListPositionMap); public: explicit ArcListPositionMap(int32_t itemStartIndex) : itemStartIndex_(itemStartIndex) {} ~ArcListPositionMap() override = default; diff --git a/frameworks/core/components_ng/pattern/arc_scroll_bar/arc_scroll_bar_paint_method.h b/frameworks/core/components_ng/pattern/arc_scroll_bar/arc_scroll_bar_paint_method.h index db1e726edee004c7699564a27be15f9ddfb9e3fb..8950f71e70731384b31cef79bffe2b00bbc38771 100644 --- a/frameworks/core/components_ng/pattern/arc_scroll_bar/arc_scroll_bar_paint_method.h +++ b/frameworks/core/components_ng/pattern/arc_scroll_bar/arc_scroll_bar_paint_method.h @@ -23,7 +23,7 @@ namespace OHOS::Ace::NG { class ArcScrollBarPaintMethod : public ScrollBarPaintMethod { - DECLARE_ACE_TYPE(ArcScrollBarPaintMethod, ScrollBarPaintMethod) + DECLARE_ACE_TYPE(ArcScrollBarPaintMethod, ScrollBarPaintMethod); public: ArcScrollBarPaintMethod() : ScrollBarPaintMethod(false) {} diff --git a/frameworks/core/components_ng/pattern/blank/blank_paint_method.h b/frameworks/core/components_ng/pattern/blank/blank_paint_method.h index 3b537a031d1c734c49929567dc308741593e7d14..a774396decb1b6522f4dd367db6bc2822780fade 100644 --- a/frameworks/core/components_ng/pattern/blank/blank_paint_method.h +++ b/frameworks/core/components_ng/pattern/blank/blank_paint_method.h @@ -21,7 +21,7 @@ #include "core/components_ng/render/paint_wrapper.h" namespace OHOS::Ace::NG { class ACE_EXPORT BlankPaintMethod : public NodePaintMethod { - DECLARE_ACE_TYPE(BlankPaintMethod, NodePaintMethod) + DECLARE_ACE_TYPE(BlankPaintMethod, NodePaintMethod); public: BlankPaintMethod() = default; ~BlankPaintMethod() override = default; diff --git a/frameworks/core/components_ng/pattern/blank/blank_paint_property.h b/frameworks/core/components_ng/pattern/blank/blank_paint_property.h index 0ef5bf23c65f116d05cd324785a6e1ede281cba7..c183ed72d148738c95d14044d87877b4e2168f70 100644 --- a/frameworks/core/components_ng/pattern/blank/blank_paint_property.h +++ b/frameworks/core/components_ng/pattern/blank/blank_paint_property.h @@ -21,7 +21,7 @@ namespace OHOS::Ace::NG { // PaintProperty are used to set render properties. class BlankPaintProperty : public PaintProperty { - DECLARE_ACE_TYPE(BlankPaintProperty, PaintProperty) + DECLARE_ACE_TYPE(BlankPaintProperty, PaintProperty); public: BlankPaintProperty() = default; ~BlankPaintProperty() override = default; diff --git a/frameworks/core/components_ng/pattern/bubble/bubble_event_hub.h b/frameworks/core/components_ng/pattern/bubble/bubble_event_hub.h index ce36fc0271d6bf9e9ab8ec14bb1e7961a02223eb..ef7bfaf75299ee14aff6025ecf27d65a869f0657 100644 --- a/frameworks/core/components_ng/pattern/bubble/bubble_event_hub.h +++ b/frameworks/core/components_ng/pattern/bubble/bubble_event_hub.h @@ -28,7 +28,7 @@ namespace OHOS::Ace::NG { using StateChangeEvent = std::function; class BubbleEventHub : public EventHub { - DECLARE_ACE_TYPE(BubbleEventHub, EventHub) + DECLARE_ACE_TYPE(BubbleEventHub, EventHub); public: BubbleEventHub() = default; diff --git a/frameworks/core/components_ng/pattern/bubble/bubble_paint_method.h b/frameworks/core/components_ng/pattern/bubble/bubble_paint_method.h index 3da88018bdbd2ddb586b207f14659d99aa6c1f07..a17380f0f6501504aab851d04baa3bd346fff484 100644 --- a/frameworks/core/components_ng/pattern/bubble/bubble_paint_method.h +++ b/frameworks/core/components_ng/pattern/bubble/bubble_paint_method.h @@ -35,7 +35,7 @@ namespace OHOS::Ace::NG { class ACE_EXPORT BubblePaintMethod : public NodePaintMethod { - DECLARE_ACE_TYPE(BubblePaintMethod, NodePaintMethod) + DECLARE_ACE_TYPE(BubblePaintMethod, NodePaintMethod); public: BubblePaintMethod() = default; ~BubblePaintMethod() override = default; diff --git a/frameworks/core/components_ng/pattern/bubble/bubble_render_property.h b/frameworks/core/components_ng/pattern/bubble/bubble_render_property.h index 66f7d10a26e847bc80612a37ff7cf0515e74cbd8..bdf2359b16262f8b86aa2630b5a269fad239e4e2 100644 --- a/frameworks/core/components_ng/pattern/bubble/bubble_render_property.h +++ b/frameworks/core/components_ng/pattern/bubble/bubble_render_property.h @@ -27,7 +27,7 @@ namespace OHOS::Ace::NG { // PaintProperty are used to set render properties. class BubbleRenderProperty : public PaintProperty { - DECLARE_ACE_TYPE(BubbleRenderProperty, PaintProperty) + DECLARE_ACE_TYPE(BubbleRenderProperty, PaintProperty); public: BubbleRenderProperty() = default; ~BubbleRenderProperty() override = default; diff --git a/frameworks/core/components_ng/pattern/button/button_event_hub.h b/frameworks/core/components_ng/pattern/button/button_event_hub.h index 66d8c172a2fb3f6902e4b6fbfa5c9d10b5ae34f6..1952884afb8cd527939e45796c8348f5e8011289 100644 --- a/frameworks/core/components_ng/pattern/button/button_event_hub.h +++ b/frameworks/core/components_ng/pattern/button/button_event_hub.h @@ -23,7 +23,7 @@ namespace OHOS::Ace::NG { class ButtonEventHub : public EventHub { - DECLARE_ACE_TYPE(ButtonEventHub, EventHub) + DECLARE_ACE_TYPE(ButtonEventHub, EventHub); public: ButtonEventHub() = default; diff --git a/frameworks/core/components_ng/pattern/button/toggle_button_event_hub.h b/frameworks/core/components_ng/pattern/button/toggle_button_event_hub.h index 7a76e0cb76a186ceda75959aedabff5b842fe535..ee0e6f972724d566d9803e56cfb2d361b4229612 100644 --- a/frameworks/core/components_ng/pattern/button/toggle_button_event_hub.h +++ b/frameworks/core/components_ng/pattern/button/toggle_button_event_hub.h @@ -29,7 +29,7 @@ namespace OHOS::Ace::NG { using ChangeEvent = std::function; class ToggleButtonEventHub : public ButtonEventHub { - DECLARE_ACE_TYPE(ToggleButtonEventHub, ButtonEventHub) + DECLARE_ACE_TYPE(ToggleButtonEventHub, ButtonEventHub); public: ToggleButtonEventHub() = default; diff --git a/frameworks/core/components_ng/pattern/button/toggle_button_paint_property.h b/frameworks/core/components_ng/pattern/button/toggle_button_paint_property.h index b42a1483772de8c39ce3f3d32850c72edcf0bea3..9ab98777301b5ec8ac07d0935d7e5eeef7b1d400 100644 --- a/frameworks/core/components_ng/pattern/button/toggle_button_paint_property.h +++ b/frameworks/core/components_ng/pattern/button/toggle_button_paint_property.h @@ -26,7 +26,7 @@ namespace OHOS::Ace::NG { class ToggleButtonPaintProperty : public PaintProperty { - DECLARE_ACE_TYPE(ToggleButtonPaintProperty, PaintProperty) + DECLARE_ACE_TYPE(ToggleButtonPaintProperty, PaintProperty); public: ToggleButtonPaintProperty() = default; diff --git a/frameworks/core/components_ng/pattern/calendar/calendar_event_hub.h b/frameworks/core/components_ng/pattern/calendar/calendar_event_hub.h index 2596f43e3cd96bf27825cfa854c02e7e1adbbb79..207eef589bf21395eeb48be29efc3c8b191246e6 100644 --- a/frameworks/core/components_ng/pattern/calendar/calendar_event_hub.h +++ b/frameworks/core/components_ng/pattern/calendar/calendar_event_hub.h @@ -31,7 +31,7 @@ using SelectedChangeEvent = std::function; using RequestDataEvent = std::function; class CalendarEventHub : public EventHub { - DECLARE_ACE_TYPE(CalendarEventHub, EventHub) + DECLARE_ACE_TYPE(CalendarEventHub, EventHub); public: CalendarEventHub() = default; diff --git a/frameworks/core/components_ng/pattern/calendar/calendar_paint_method.h b/frameworks/core/components_ng/pattern/calendar/calendar_paint_method.h index 52fe4b4907716c16f39ce1efac9cd13a33534df8..09101ce4346aaf674d63e4e23aec5055222ec3bf 100644 --- a/frameworks/core/components_ng/pattern/calendar/calendar_paint_method.h +++ b/frameworks/core/components_ng/pattern/calendar/calendar_paint_method.h @@ -39,7 +39,7 @@ struct CalendarPaintParams { }; class CalendarPaintMethod : public NodePaintMethod { - DECLARE_ACE_TYPE(CalendarPaintMethod, NodePaintMethod) + DECLARE_ACE_TYPE(CalendarPaintMethod, NodePaintMethod); public: CalendarPaintMethod(ObtainedMonth& obtainedMonth, CalendarDay& calendarDay, PickerDate& startDate, diff --git a/frameworks/core/components_ng/pattern/calendar_picker/calendar_picker_event_hub.h b/frameworks/core/components_ng/pattern/calendar_picker/calendar_picker_event_hub.h index a722d516881cc00f23aa728eb09d478ccbc85336..630d7a574e91843da59283f72afdb3d443513127 100644 --- a/frameworks/core/components_ng/pattern/calendar_picker/calendar_picker_event_hub.h +++ b/frameworks/core/components_ng/pattern/calendar_picker/calendar_picker_event_hub.h @@ -27,7 +27,7 @@ using SelectedChangeEvent = std::function; using LayoutChangeEvent = std::function; class CalendarPickerEventHub : public EventHub { - DECLARE_ACE_TYPE(CalendarPickerEventHub, EventHub) + DECLARE_ACE_TYPE(CalendarPickerEventHub, EventHub); public: CalendarPickerEventHub() = default; diff --git a/frameworks/core/components_ng/pattern/canvas/canvas_event_hub.h b/frameworks/core/components_ng/pattern/canvas/canvas_event_hub.h index 2a1153f9782453cfd534b9bae16949bc1d9eb622..0118108ad7646123db585720ef52e84374ba4ded 100644 --- a/frameworks/core/components_ng/pattern/canvas/canvas_event_hub.h +++ b/frameworks/core/components_ng/pattern/canvas/canvas_event_hub.h @@ -22,7 +22,7 @@ namespace OHOS::Ace::NG { using ReadyEvent = std::function; class CanvasEventHub : public EventHub { - DECLARE_ACE_TYPE(CanvasEventHub, EventHub) + DECLARE_ACE_TYPE(CanvasEventHub, EventHub); public: CanvasEventHub() = default; diff --git a/frameworks/core/components_ng/pattern/canvas/canvas_modifier.h b/frameworks/core/components_ng/pattern/canvas/canvas_modifier.h index 5beb5c289849a0ccdc4d82c018abeaec33e1f68e..d5215f572e99799389b93caa96b0b47d74c3e05b 100644 --- a/frameworks/core/components_ng/pattern/canvas/canvas_modifier.h +++ b/frameworks/core/components_ng/pattern/canvas/canvas_modifier.h @@ -27,7 +27,7 @@ namespace OHOS::Ace::NG { class RenderContext; class CanvasModifier : public ContentModifier { - DECLARE_ACE_TYPE(CanvasModifier, ContentModifier) + DECLARE_ACE_TYPE(CanvasModifier, ContentModifier); public: CanvasModifier(); diff --git a/frameworks/core/components_ng/pattern/canvas/canvas_paint_method.h b/frameworks/core/components_ng/pattern/canvas/canvas_paint_method.h index accf543efc0753b57d79b3c2c9de9b8a14046ee5..dc3152cad7a8061441a26a08e10ea538900226ee 100644 --- a/frameworks/core/components_ng/pattern/canvas/canvas_paint_method.h +++ b/frameworks/core/components_ng/pattern/canvas/canvas_paint_method.h @@ -28,7 +28,7 @@ class CanvasPaintMethod; using TaskFunc = std::function; using OnModifierUpdateFunc = std::function; class CanvasPaintMethod : public CustomPaintPaintMethod { - DECLARE_ACE_TYPE(CanvasPaintMethod, CustomPaintPaintMethod) + DECLARE_ACE_TYPE(CanvasPaintMethod, CustomPaintPaintMethod); public: CanvasPaintMethod() = default; CanvasPaintMethod(RefPtr contentModifier, const RefPtr& frameNode); diff --git a/frameworks/core/components_ng/pattern/canvas/canvas_rendering_context_2d_model_ng.h b/frameworks/core/components_ng/pattern/canvas/canvas_rendering_context_2d_model_ng.h index 44f389f1853c3ba37428688ba67740a8be76d1b9..326c340aec5d0f38eac4104a7f822583b7592485 100644 --- a/frameworks/core/components_ng/pattern/canvas/canvas_rendering_context_2d_model_ng.h +++ b/frameworks/core/components_ng/pattern/canvas/canvas_rendering_context_2d_model_ng.h @@ -23,7 +23,7 @@ namespace OHOS::Ace::NG { class ACE_FORCE_EXPORT CanvasRenderingContext2DModelNG : public OHOS::Ace::CanvasRenderingContext2DModel { - DECLARE_ACE_TYPE(CanvasRenderingContext2DModelNG, CanvasRenderingContext2DModel) + DECLARE_ACE_TYPE(CanvasRenderingContext2DModelNG, CanvasRenderingContext2DModel); public: CanvasRenderingContext2DModelNG() = default; diff --git a/frameworks/core/components_ng/pattern/canvas/custom_paint_paint_method.h b/frameworks/core/components_ng/pattern/canvas/custom_paint_paint_method.h index 21300169402d0245786259a72798aaa00dbac43c..26bbf70a9348c98702eb2fa88c83d1dc81db3def 100644 --- a/frameworks/core/components_ng/pattern/canvas/custom_paint_paint_method.h +++ b/frameworks/core/components_ng/pattern/canvas/custom_paint_paint_method.h @@ -56,7 +56,7 @@ struct FilterProperty { }; class CustomPaintPaintMethod : public NodePaintMethod { - DECLARE_ACE_TYPE(CustomPaintPaintMethod, NodePaintMethod) + DECLARE_ACE_TYPE(CustomPaintPaintMethod, NodePaintMethod); public: CustomPaintPaintMethod(); ~CustomPaintPaintMethod() override = default; diff --git a/frameworks/core/components_ng/pattern/canvas/offscreen_canvas_paint_method.h b/frameworks/core/components_ng/pattern/canvas/offscreen_canvas_paint_method.h index 74d8c6474363d9f8a6c076ba189f506393f6ddf6..1fcd9b772323c976fb19bb08cacdd5318f4cd2e8 100644 --- a/frameworks/core/components_ng/pattern/canvas/offscreen_canvas_paint_method.h +++ b/frameworks/core/components_ng/pattern/canvas/offscreen_canvas_paint_method.h @@ -22,7 +22,7 @@ namespace OHOS::Ace::NG { using setColorFunc = std::function; class OffscreenCanvasPaintMethod : public CustomPaintPaintMethod { - DECLARE_ACE_TYPE(OffscreenCanvasPaintMethod, CustomPaintPaintMethod) + DECLARE_ACE_TYPE(OffscreenCanvasPaintMethod, CustomPaintPaintMethod); public: OffscreenCanvasPaintMethod() = default; OffscreenCanvasPaintMethod(int32_t width, int32_t height); diff --git a/frameworks/core/components_ng/pattern/canvas/offscreen_canvas_rendering_context_2d_model_ng.h b/frameworks/core/components_ng/pattern/canvas/offscreen_canvas_rendering_context_2d_model_ng.h index d34f14c00f38e225aa4cff1e494a76e1a34a4888..4eed24d916851018aeb94e708e7e17e019b83087 100644 --- a/frameworks/core/components_ng/pattern/canvas/offscreen_canvas_rendering_context_2d_model_ng.h +++ b/frameworks/core/components_ng/pattern/canvas/offscreen_canvas_rendering_context_2d_model_ng.h @@ -24,7 +24,7 @@ namespace OHOS::Ace::NG { class ACE_FORCE_EXPORT OffscreenCanvasRenderingContext2DModelNG : public OHOS::Ace::OffscreenCanvasRenderingContext2DModel { - DECLARE_ACE_TYPE(OffscreenCanvasRenderingContext2DModelNG, OffscreenCanvasRenderingContext2DModel) + DECLARE_ACE_TYPE(OffscreenCanvasRenderingContext2DModelNG, OffscreenCanvasRenderingContext2DModel); public: OffscreenCanvasRenderingContext2DModelNG() = default; diff --git a/frameworks/core/components_ng/pattern/canvas/rendering_context_2d_model.h b/frameworks/core/components_ng/pattern/canvas/rendering_context_2d_model.h index ab13a7e81c94361701c6c41bda377b2c0e1bb920..c8ebce371c99e03309abc9977cee8c1541967fd0 100644 --- a/frameworks/core/components_ng/pattern/canvas/rendering_context_2d_model.h +++ b/frameworks/core/components_ng/pattern/canvas/rendering_context_2d_model.h @@ -27,7 +27,7 @@ namespace OHOS::Ace { class RenderingContext2DModel : public AceType { - DECLARE_ACE_TYPE(RenderingContext2DModel, AceType) + DECLARE_ACE_TYPE(RenderingContext2DModel, AceType); public: RenderingContext2DModel() @@ -143,7 +143,7 @@ protected: }; class CanvasRenderingContext2DModel : public RenderingContext2DModel { - DECLARE_ACE_TYPE(CanvasRenderingContext2DModel, RenderingContext2DModel) + DECLARE_ACE_TYPE(CanvasRenderingContext2DModel, RenderingContext2DModel); public: CanvasRenderingContext2DModel() = default; @@ -170,7 +170,7 @@ protected: }; class OffscreenCanvasRenderingContext2DModel : public RenderingContext2DModel { - DECLARE_ACE_TYPE(OffscreenCanvasRenderingContext2DModel, RenderingContext2DModel) + DECLARE_ACE_TYPE(OffscreenCanvasRenderingContext2DModel, RenderingContext2DModel); public: OffscreenCanvasRenderingContext2DModel() = default; diff --git a/frameworks/core/components_ng/pattern/checkbox/checkbox_event_hub.h b/frameworks/core/components_ng/pattern/checkbox/checkbox_event_hub.h index 58802144a4daf0151bdcc3478ee5a4d29432ea3c..a72e3883d14ca295a6417b0079c0c2cd1956bca2 100644 --- a/frameworks/core/components_ng/pattern/checkbox/checkbox_event_hub.h +++ b/frameworks/core/components_ng/pattern/checkbox/checkbox_event_hub.h @@ -28,7 +28,7 @@ namespace OHOS::Ace::NG { using ChangeEvent = std::function; class CheckBoxEventHub : public EventHub { - DECLARE_ACE_TYPE(CheckBoxEventHub, EventHub) + DECLARE_ACE_TYPE(CheckBoxEventHub, EventHub); public: CheckBoxEventHub() = default; diff --git a/frameworks/core/components_ng/pattern/checkbox/checkbox_paint_method.h b/frameworks/core/components_ng/pattern/checkbox/checkbox_paint_method.h index b69fba12709f35a0e0b704640a16bbfcc289b72b..3fabb71092227e64d19aed537143cc36f0d2d37b 100644 --- a/frameworks/core/components_ng/pattern/checkbox/checkbox_paint_method.h +++ b/frameworks/core/components_ng/pattern/checkbox/checkbox_paint_method.h @@ -25,7 +25,7 @@ namespace OHOS::Ace::NG { class CheckBoxPaintProperty; constexpr float CHECKBOX_MARK_STROKEWIDTH_LIMIT_RATIO = 0.25f; class CheckBoxPaintMethod : public NodePaintMethod { - DECLARE_ACE_TYPE(CheckBoxPaintMethod, NodePaintMethod) + DECLARE_ACE_TYPE(CheckBoxPaintMethod, NodePaintMethod); public: CheckBoxPaintMethod() = default; diff --git a/frameworks/core/components_ng/pattern/checkbox/checkbox_paint_property.h b/frameworks/core/components_ng/pattern/checkbox/checkbox_paint_property.h index 95e58e1a6ea708e8d568f44f3303a12e1ac2d21b..75687cded6059ebc75873de91dbd5620db522654 100644 --- a/frameworks/core/components_ng/pattern/checkbox/checkbox_paint_property.h +++ b/frameworks/core/components_ng/pattern/checkbox/checkbox_paint_property.h @@ -26,7 +26,7 @@ namespace OHOS::Ace::NG { class InspectorFilter; class CheckBoxPaintProperty : public PaintProperty { - DECLARE_ACE_TYPE(CheckBoxPaintProperty, PaintProperty) + DECLARE_ACE_TYPE(CheckBoxPaintProperty, PaintProperty); public: CheckBoxPaintProperty() = default; diff --git a/frameworks/core/components_ng/pattern/checkboxgroup/checkboxgroup_event_hub.h b/frameworks/core/components_ng/pattern/checkboxgroup/checkboxgroup_event_hub.h index b069430bc67cb8241e05310f6de94187f1a5b6d4..70b2c89d636fef1061b96f1fa68e25b1e502598c 100644 --- a/frameworks/core/components_ng/pattern/checkboxgroup/checkboxgroup_event_hub.h +++ b/frameworks/core/components_ng/pattern/checkboxgroup/checkboxgroup_event_hub.h @@ -29,7 +29,7 @@ namespace OHOS::Ace::NG { using GroupChangeEvent = std::function; class CheckBoxGroupEventHub : public EventHub { - DECLARE_ACE_TYPE(CheckBoxGroupEventHub, EventHub) + DECLARE_ACE_TYPE(CheckBoxGroupEventHub, EventHub); public: CheckBoxGroupEventHub() = default; diff --git a/frameworks/core/components_ng/pattern/checkboxgroup/checkboxgroup_paint_method.h b/frameworks/core/components_ng/pattern/checkboxgroup/checkboxgroup_paint_method.h index c9b7ab75a2dd7355c0704320b1a81c8b32c3a8e0..f25819db104c668e5a19a630089084bd67b4bc3f 100644 --- a/frameworks/core/components_ng/pattern/checkboxgroup/checkboxgroup_paint_method.h +++ b/frameworks/core/components_ng/pattern/checkboxgroup/checkboxgroup_paint_method.h @@ -27,7 +27,7 @@ namespace OHOS::Ace::NG { constexpr float CHECKBOXGROUP_MARK_STROKEWIDTH_LIMIT_RATIO = 0.25f; class CheckBoxGroupPaintMethod : public NodePaintMethod { - DECLARE_ACE_TYPE(CheckBoxGroupPaintMethod, NodePaintMethod) + DECLARE_ACE_TYPE(CheckBoxGroupPaintMethod, NodePaintMethod); public: explicit CheckBoxGroupPaintMethod(const RefPtr& checkboxGroupModifier) diff --git a/frameworks/core/components_ng/pattern/checkboxgroup/checkboxgroup_paint_property.h b/frameworks/core/components_ng/pattern/checkboxgroup/checkboxgroup_paint_property.h index 585acdbcfc39ef39a3a6cdc570cd972a02c87473..c964777117871f6fe7b51faba2cd17d7975049ae 100644 --- a/frameworks/core/components_ng/pattern/checkboxgroup/checkboxgroup_paint_property.h +++ b/frameworks/core/components_ng/pattern/checkboxgroup/checkboxgroup_paint_property.h @@ -26,7 +26,7 @@ namespace OHOS::Ace::NG { class InspectorFilter; class CheckBoxGroupPaintProperty : public PaintProperty { - DECLARE_ACE_TYPE(CheckBoxGroupPaintProperty, PaintProperty) + DECLARE_ACE_TYPE(CheckBoxGroupPaintProperty, PaintProperty); public: CheckBoxGroupPaintProperty() = default; diff --git a/frameworks/core/components_ng/pattern/custom/custom_measure_layout_param.h b/frameworks/core/components_ng/pattern/custom/custom_measure_layout_param.h index c2eb9c200884ac60566885cdb64f292484a2d599..e6a5ef474e19f2656866dc48171538f4c2168271 100644 --- a/frameworks/core/components_ng/pattern/custom/custom_measure_layout_param.h +++ b/frameworks/core/components_ng/pattern/custom/custom_measure_layout_param.h @@ -47,7 +47,7 @@ class ACE_FORCE_EXPORT MeasureLayoutParam : public AceType { #else class MeasureLayoutParam : public AceType { #endif - DECLARE_ACE_TYPE(MeasureLayoutParam, AceType) + DECLARE_ACE_TYPE(MeasureLayoutParam, AceType); public: MeasureLayoutParam(LayoutWrapper* layoutWrapper); ~MeasureLayoutParam(); diff --git a/frameworks/core/components_ng/pattern/data_panel/data_panel_paint_method.h b/frameworks/core/components_ng/pattern/data_panel/data_panel_paint_method.h index 1ebfae0a260d921b846007b7d22e56ccf9e51edf..4b5b8b38c78fe067cf322f50686990bdbff83d4b 100644 --- a/frameworks/core/components_ng/pattern/data_panel/data_panel_paint_method.h +++ b/frameworks/core/components_ng/pattern/data_panel/data_panel_paint_method.h @@ -25,7 +25,7 @@ namespace OHOS::Ace::NG { class ACE_EXPORT DataPanelPaintMethod : public NodePaintMethod { - DECLARE_ACE_TYPE(DataPanelPaintMethod, NodePaintMethod) + DECLARE_ACE_TYPE(DataPanelPaintMethod, NodePaintMethod); public: explicit DataPanelPaintMethod(const RefPtr& dataPanelModifier) : dataPanelModifier_(dataPanelModifier) diff --git a/frameworks/core/components_ng/pattern/data_panel/data_panel_paint_property.h b/frameworks/core/components_ng/pattern/data_panel/data_panel_paint_property.h index 0ad585df3db2923df88b926b2d83c7c31ff263b2..4cee300da95ea0c317fc070beab4af98aafbd258 100644 --- a/frameworks/core/components_ng/pattern/data_panel/data_panel_paint_property.h +++ b/frameworks/core/components_ng/pattern/data_panel/data_panel_paint_property.h @@ -89,7 +89,7 @@ struct DataPanelShadow { } }; class DataPanelPaintProperty : public PaintProperty { - DECLARE_ACE_TYPE(DataPanelPaintProperty, PaintProperty) + DECLARE_ACE_TYPE(DataPanelPaintProperty, PaintProperty); public: DataPanelPaintProperty() = default; diff --git a/frameworks/core/components_ng/pattern/dialog/dialog_event_hub.h b/frameworks/core/components_ng/pattern/dialog/dialog_event_hub.h index 7039cd0f0f3d762d75deb651848f5cfd2320ac23..518879a7ca67513794bab0b535364fea091379b5 100644 --- a/frameworks/core/components_ng/pattern/dialog/dialog_event_hub.h +++ b/frameworks/core/components_ng/pattern/dialog/dialog_event_hub.h @@ -25,7 +25,7 @@ namespace OHOS::Ace::NG { using DialogOnCancelEvent = std::function; class DialogEventHub : public EventHub { - DECLARE_ACE_TYPE(DialogEventHub, EventHub) + DECLARE_ACE_TYPE(DialogEventHub, EventHub); public: DialogEventHub() = default; diff --git a/frameworks/core/components_ng/pattern/divider/divider_paint_method.h b/frameworks/core/components_ng/pattern/divider/divider_paint_method.h index 47123f0ec14e20e2e0e6b1ece06b039fec81f820..dc678e455900e5c715f1562da483333eb29dddab 100644 --- a/frameworks/core/components_ng/pattern/divider/divider_paint_method.h +++ b/frameworks/core/components_ng/pattern/divider/divider_paint_method.h @@ -24,7 +24,7 @@ namespace OHOS::Ace::NG { class ACE_EXPORT DividerPaintMethod : public NodePaintMethod { - DECLARE_ACE_TYPE(DividerPaintMethod, NodePaintMethod) + DECLARE_ACE_TYPE(DividerPaintMethod, NodePaintMethod); public: DividerPaintMethod(float constrainStrokeWidth, float dividerLength, bool vertical, bool strokeWidthLimitation, RefPtr dividerModifier) diff --git a/frameworks/core/components_ng/pattern/divider/divider_render_property.h b/frameworks/core/components_ng/pattern/divider/divider_render_property.h index cc6e1f3d09604d3e9293eff40fb2b23a8fe0988c..68e20f49118b068beb6b24cba9fd67843b4ddd49 100644 --- a/frameworks/core/components_ng/pattern/divider/divider_render_property.h +++ b/frameworks/core/components_ng/pattern/divider/divider_render_property.h @@ -26,7 +26,7 @@ namespace OHOS::Ace::NG { // PaintProperty are used to set render properties. class DividerRenderProperty : public PaintProperty { - DECLARE_ACE_TYPE(DividerRenderProperty, PaintProperty) + DECLARE_ACE_TYPE(DividerRenderProperty, PaintProperty); public: DividerRenderProperty() = default; ~DividerRenderProperty() override = default; diff --git a/frameworks/core/components_ng/pattern/folder_stack/control_parts_stack_node.h b/frameworks/core/components_ng/pattern/folder_stack/control_parts_stack_node.h index 3318ef3b8575a96ad48d827e40eac170a001cd17..93cf550521cdd5ee2884d6c3858cc457c3eb3e03 100644 --- a/frameworks/core/components_ng/pattern/folder_stack/control_parts_stack_node.h +++ b/frameworks/core/components_ng/pattern/folder_stack/control_parts_stack_node.h @@ -27,7 +27,7 @@ #include "core/components_ng/pattern/linear_layout/linear_layout_pattern.h" namespace OHOS::Ace::NG { class ACE_EXPORT ControlPartsStackNode : public GroupNode { - DECLARE_ACE_TYPE(ControlPartsStackNode, GroupNode) + DECLARE_ACE_TYPE(ControlPartsStackNode, GroupNode); public: ControlPartsStackNode(const std::string& tag, int32_t nodeId, const RefPtr& pattern) : GroupNode(tag, nodeId, pattern) diff --git a/frameworks/core/components_ng/pattern/folder_stack/control_parts_stack_pattern.h b/frameworks/core/components_ng/pattern/folder_stack/control_parts_stack_pattern.h index 4164d59535019b45e10691d7f0a0c35335aaa745..9cdb56cb44ae2b2f2e8180ae4a4f70720cebe4fc 100644 --- a/frameworks/core/components_ng/pattern/folder_stack/control_parts_stack_pattern.h +++ b/frameworks/core/components_ng/pattern/folder_stack/control_parts_stack_pattern.h @@ -24,7 +24,7 @@ #include "core/components_ng/pattern/stack/stack_pattern.h" namespace OHOS::Ace::NG { class ControlPartsStackPattern : public StackPattern { - DECLARE_ACE_TYPE(ControlPartsStackPattern, StackPattern) + DECLARE_ACE_TYPE(ControlPartsStackPattern, StackPattern); public: ControlPartsStackPattern() = default; ~ControlPartsStackPattern() override = default; diff --git a/frameworks/core/components_ng/pattern/folder_stack/folder_stack_event_hub.h b/frameworks/core/components_ng/pattern/folder_stack/folder_stack_event_hub.h index 1efe197369ee147d0b94e5887dc413ad0326d915..d1a72569dd0e146a22857059da28a6c4a80f3d22 100644 --- a/frameworks/core/components_ng/pattern/folder_stack/folder_stack_event_hub.h +++ b/frameworks/core/components_ng/pattern/folder_stack/folder_stack_event_hub.h @@ -25,7 +25,7 @@ using ChangeEvent = std::function; using HoverStatusChangeEvent = std::function; class FolderStackEventHub : public EventHub { - DECLARE_ACE_TYPE(FolderStackEventHub, EventHub) + DECLARE_ACE_TYPE(FolderStackEventHub, EventHub); public: void SetOnFolderStateChange(ChangeEvent&& changeEvent) diff --git a/frameworks/core/components_ng/pattern/folder_stack/folder_stack_group_node.h b/frameworks/core/components_ng/pattern/folder_stack/folder_stack_group_node.h index 37db37e853119e3c7469a5b815199c5389eb31e2..19cce1805c57ff454776d33fd3e40ff388e01655 100644 --- a/frameworks/core/components_ng/pattern/folder_stack/folder_stack_group_node.h +++ b/frameworks/core/components_ng/pattern/folder_stack/folder_stack_group_node.h @@ -30,7 +30,7 @@ namespace OHOS::Ace::NG { class ACE_EXPORT FolderStackGroupNode : public GroupNode { - DECLARE_ACE_TYPE(FolderStackGroupNode, GroupNode) + DECLARE_ACE_TYPE(FolderStackGroupNode, GroupNode); public: FolderStackGroupNode(const std::string& tag, int32_t nodeId, const RefPtr& pattern) : GroupNode(tag, nodeId, pattern) diff --git a/frameworks/core/components_ng/pattern/folder_stack/hover_stack_node.h b/frameworks/core/components_ng/pattern/folder_stack/hover_stack_node.h index 6537d91a747890482c8f5d60ff4a84a70d7a2eee..22ffd0288dfeb816e6dce3af351807fe9ad6514d 100644 --- a/frameworks/core/components_ng/pattern/folder_stack/hover_stack_node.h +++ b/frameworks/core/components_ng/pattern/folder_stack/hover_stack_node.h @@ -27,7 +27,7 @@ #include "core/components_ng/pattern/linear_layout/linear_layout_pattern.h" namespace OHOS::Ace::NG { class ACE_EXPORT HoverStackNode : public GroupNode { - DECLARE_ACE_TYPE(HoverStackNode, GroupNode) + DECLARE_ACE_TYPE(HoverStackNode, GroupNode); public: HoverStackNode(const std::string& tag, int32_t nodeId, const RefPtr& pattern) : GroupNode(tag, nodeId, pattern) diff --git a/frameworks/core/components_ng/pattern/folder_stack/hover_stack_pattern.h b/frameworks/core/components_ng/pattern/folder_stack/hover_stack_pattern.h index e8dc22c139320d12436272684ba419ce8710906e..23cdb45742f3b9d0b588fca3d7669ac34c5756aa 100644 --- a/frameworks/core/components_ng/pattern/folder_stack/hover_stack_pattern.h +++ b/frameworks/core/components_ng/pattern/folder_stack/hover_stack_pattern.h @@ -23,7 +23,7 @@ namespace OHOS::Ace::NG { class HoverStackPattern : public Pattern { - DECLARE_ACE_TYPE(HoverStackPattern, Pattern) + DECLARE_ACE_TYPE(HoverStackPattern, Pattern); public: HoverStackPattern() = default; diff --git a/frameworks/core/components_ng/pattern/form/form_event_hub.h b/frameworks/core/components_ng/pattern/form/form_event_hub.h index 6151435816cbae3493d6759af6a97b7246377e1d..0757b781c208640be30a7f491a167e95b632220f 100644 --- a/frameworks/core/components_ng/pattern/form/form_event_hub.h +++ b/frameworks/core/components_ng/pattern/form/form_event_hub.h @@ -27,7 +27,7 @@ using FormCallback = std::function; using FormCacheCallback = std::function; class FormEventHub : public EventHub { - DECLARE_ACE_TYPE(FormEventHub, EventHub) + DECLARE_ACE_TYPE(FormEventHub, EventHub); public: FormEventHub() = default; diff --git a/frameworks/core/components_ng/pattern/gauge/gauge_paint_method.h b/frameworks/core/components_ng/pattern/gauge/gauge_paint_method.h index d9a0e8a3a955fc344b3266e3978ab470a22df812..2524bf0cfe9ea4d58adb1263b82f48988ce03268 100755 --- a/frameworks/core/components_ng/pattern/gauge/gauge_paint_method.h +++ b/frameworks/core/components_ng/pattern/gauge/gauge_paint_method.h @@ -23,7 +23,7 @@ #include "core/components_ng/render/node_paint_method.h" namespace OHOS::Ace::NG { class ACE_EXPORT GaugePaintMethod : public NodePaintMethod { - DECLARE_ACE_TYPE(GaugePaintMethod, NodePaintMethod) + DECLARE_ACE_TYPE(GaugePaintMethod, NodePaintMethod); public: GaugePaintMethod() = default; ~GaugePaintMethod() override = default; diff --git a/frameworks/core/components_ng/pattern/gauge/gauge_paint_property.h b/frameworks/core/components_ng/pattern/gauge/gauge_paint_property.h index 32f979386bac0672ff2bb55b600bf99f5596bba5..06430475a18adaf52e3b99a652bb3b9c2fc4401d 100644 --- a/frameworks/core/components_ng/pattern/gauge/gauge_paint_property.h +++ b/frameworks/core/components_ng/pattern/gauge/gauge_paint_property.h @@ -68,7 +68,7 @@ private: std::unordered_map resMap_; }; class GaugePaintProperty : public PaintProperty { - DECLARE_ACE_TYPE(GaugePaintProperty, PaintProperty) + DECLARE_ACE_TYPE(GaugePaintProperty, PaintProperty); public: GaugePaintProperty() = default; diff --git a/frameworks/core/components_ng/pattern/grid/grid_event_hub.h b/frameworks/core/components_ng/pattern/grid/grid_event_hub.h index 16f10880760e233a67c63618ed42916a197a84c3..53dfad135411cf85093a924ae2d846a1deffa9af 100644 --- a/frameworks/core/components_ng/pattern/grid/grid_event_hub.h +++ b/frameworks/core/components_ng/pattern/grid/grid_event_hub.h @@ -34,7 +34,7 @@ using ItemDropFunc = std::function; class GridEventHub : public ScrollableEventHub { - DECLARE_ACE_TYPE(GridEventHub, ScrollableEventHub) + DECLARE_ACE_TYPE(GridEventHub, ScrollableEventHub); public: GridEventHub() = default; diff --git a/frameworks/core/components_ng/pattern/grid/grid_item_event_hub.h b/frameworks/core/components_ng/pattern/grid/grid_item_event_hub.h index c1769385a798aa3e0bf5f237717961c85c281749..9b1eb33ca67f661fecbdabf5f2262277903633f6 100644 --- a/frameworks/core/components_ng/pattern/grid/grid_item_event_hub.h +++ b/frameworks/core/components_ng/pattern/grid/grid_item_event_hub.h @@ -26,7 +26,7 @@ namespace OHOS::Ace::NG { using SelectFunc = std::function; class GridItemEventHub : public EventHub { - DECLARE_ACE_TYPE(GridItemEventHub, EventHub) + DECLARE_ACE_TYPE(GridItemEventHub, EventHub); public: GridItemEventHub() = default; diff --git a/frameworks/core/components_ng/pattern/grid/grid_item_layout_algorithm.h b/frameworks/core/components_ng/pattern/grid/grid_item_layout_algorithm.h index 07253c1ad5b55689d26f89e52d4bad6416d3026b..c017cd172080abf965769d606c1dd52d9e08f7b7 100644 --- a/frameworks/core/components_ng/pattern/grid/grid_item_layout_algorithm.h +++ b/frameworks/core/components_ng/pattern/grid/grid_item_layout_algorithm.h @@ -20,7 +20,7 @@ namespace OHOS::Ace::NG { class ACE_FORCE_EXPORT GridItemLayoutAlgorithm : public BoxLayoutAlgorithm { - DECLARE_ACE_TYPE(GridItemLayoutAlgorithm, BoxLayoutAlgorithm) + DECLARE_ACE_TYPE(GridItemLayoutAlgorithm, BoxLayoutAlgorithm); public: GridItemLayoutAlgorithm() = default; ~GridItemLayoutAlgorithm() override = default; diff --git a/frameworks/core/components_ng/pattern/grid/grid_paint_method.h b/frameworks/core/components_ng/pattern/grid/grid_paint_method.h index 21258d72a61a7f45c8f01462872e757ff796ee81..c35aaa7557b5adf2764bb8216e91734a6363e1aa 100644 --- a/frameworks/core/components_ng/pattern/grid/grid_paint_method.h +++ b/frameworks/core/components_ng/pattern/grid/grid_paint_method.h @@ -24,7 +24,7 @@ namespace OHOS::Ace::NG { class ACE_EXPORT GridPaintMethod : public ScrollablePaintMethod { - DECLARE_ACE_TYPE(GridPaintMethod, ScrollablePaintMethod) + DECLARE_ACE_TYPE(GridPaintMethod, ScrollablePaintMethod); public: explicit GridPaintMethod(const RefPtr& scrollBar) : scrollBar_(scrollBar) {} explicit GridPaintMethod(bool vertical, bool isReverse, const RefPtr& scrollBar) diff --git a/frameworks/core/components_ng/pattern/grid_row/grid_row_event_hub.h b/frameworks/core/components_ng/pattern/grid_row/grid_row_event_hub.h index 0f4d3cad85ed8174de606d583e86ff2f9da7fff4..226128d4ac16ad304f6a47108f17c7c60e8a867f 100644 --- a/frameworks/core/components_ng/pattern/grid_row/grid_row_event_hub.h +++ b/frameworks/core/components_ng/pattern/grid_row/grid_row_event_hub.h @@ -24,7 +24,7 @@ namespace OHOS::Ace::NG { using ChangeEvent = std::function; class GridRowEventHub : public EventHub { - DECLARE_ACE_TYPE(GridRowEventHub, EventHub) + DECLARE_ACE_TYPE(GridRowEventHub, EventHub); public: void SetOnBreakpointChange(ChangeEvent&& changeEvent) diff --git a/frameworks/core/components_ng/pattern/image/image_event_hub.h b/frameworks/core/components_ng/pattern/image/image_event_hub.h index 6040e00a4b38b06566dfbe5b1a7127103968b04d..1f537824f58b6171951eecf275826161a3a4c78a 100644 --- a/frameworks/core/components_ng/pattern/image/image_event_hub.h +++ b/frameworks/core/components_ng/pattern/image/image_event_hub.h @@ -27,7 +27,7 @@ using ErrorEvent = std::function; using FinishEvent = std::function; class ImageEventHub : public EventHub { - DECLARE_ACE_TYPE(ImageEventHub, EventHub) + DECLARE_ACE_TYPE(ImageEventHub, EventHub); public: ImageEventHub() = default; diff --git a/frameworks/core/components_ng/pattern/image/image_overlay_modifier.h b/frameworks/core/components_ng/pattern/image/image_overlay_modifier.h index df9fc989c131226708648d12289d3a6ae518430e..a11f8b3e12c810ebbba27043f6b88324e19535c7 100644 --- a/frameworks/core/components_ng/pattern/image/image_overlay_modifier.h +++ b/frameworks/core/components_ng/pattern/image/image_overlay_modifier.h @@ -26,7 +26,7 @@ namespace OHOS::Ace::NG { class ImageOverlayModifier : public OverlayModifier { - DECLARE_ACE_TYPE(ImageOverlayModifier, OverlayModifier) + DECLARE_ACE_TYPE(ImageOverlayModifier, OverlayModifier); public: ImageOverlayModifier(const Color& selectedColor); diff --git a/frameworks/core/components_ng/pattern/image/image_paint_method.h b/frameworks/core/components_ng/pattern/image/image_paint_method.h index 0deba5cd3a4a16f97fe4f84d0c392c350fbc2da8..179c975f04ac7a543cc4256bab65ed9cd71b92d2 100644 --- a/frameworks/core/components_ng/pattern/image/image_paint_method.h +++ b/frameworks/core/components_ng/pattern/image/image_paint_method.h @@ -38,7 +38,7 @@ struct ImagePaintMethodConfig { }; class ACE_EXPORT ImagePaintMethod : public NodePaintMethod { - DECLARE_ACE_TYPE(ImagePaintMethod, NodePaintMethod) + DECLARE_ACE_TYPE(ImagePaintMethod, NodePaintMethod); public: explicit ImagePaintMethod( const RefPtr& canvasImage, const ImagePaintMethodConfig& imagePainterMethodConfig = {}) diff --git a/frameworks/core/components_ng/pattern/image/image_render_property.h b/frameworks/core/components_ng/pattern/image/image_render_property.h index 441af6a5957568c77e1809a75cde5bd48de0d24d..e314df1eb440db9d156503ee786c1447e71798cc 100644 --- a/frameworks/core/components_ng/pattern/image/image_render_property.h +++ b/frameworks/core/components_ng/pattern/image/image_render_property.h @@ -74,7 +74,7 @@ struct ImagePaintStyle { // PaintProperty are used to set render properties. class ImageRenderProperty : public PaintProperty { - DECLARE_ACE_TYPE(ImageRenderProperty, PaintProperty) + DECLARE_ACE_TYPE(ImageRenderProperty, PaintProperty); public: ImageRenderProperty() = default; diff --git a/frameworks/core/components_ng/pattern/image_animator/controlled_animator.h b/frameworks/core/components_ng/pattern/image_animator/controlled_animator.h index 9910bb0ce4a5c0c45550a7a7ef47a81fb18898cf..3a059f99b073ebc77523cbd7873fb45d51905851 100644 --- a/frameworks/core/components_ng/pattern/image_animator/controlled_animator.h +++ b/frameworks/core/components_ng/pattern/image_animator/controlled_animator.h @@ -30,7 +30,7 @@ using PictureInfo = std::pair; using IndexChangeListener = std::function; class ControlledAnimator : public AceType { - DECLARE_ACE_TYPE(ControlledAnimator, AceType) + DECLARE_ACE_TYPE(ControlledAnimator, AceType); public: ControlledAnimator() = default; diff --git a/frameworks/core/components_ng/pattern/image_animator/image_animator_event_hub.h b/frameworks/core/components_ng/pattern/image_animator/image_animator_event_hub.h index 8c35c46637225fe35b508d858ec3c6ce6680d71e..6131439adffa221a9e65a68b3c51cdfec78452fa 100644 --- a/frameworks/core/components_ng/pattern/image_animator/image_animator_event_hub.h +++ b/frameworks/core/components_ng/pattern/image_animator/image_animator_event_hub.h @@ -24,7 +24,7 @@ namespace OHOS::Ace::NG { using AnimatorEvent = std::function; class ImageAnimatorEventHub : public EventHub { - DECLARE_ACE_TYPE(ImageAnimatorEventHub, EventHub) + DECLARE_ACE_TYPE(ImageAnimatorEventHub, EventHub); public: ImageAnimatorEventHub() = default; diff --git a/frameworks/core/components_ng/pattern/indexer/arc_indexer_paint_method.h b/frameworks/core/components_ng/pattern/indexer/arc_indexer_paint_method.h index 58a26b0d27edafaaf39445366383c0254ab3c36f..9aa3f84383641011df9fd9794b8e4f90424d52a6 100644 --- a/frameworks/core/components_ng/pattern/indexer/arc_indexer_paint_method.h +++ b/frameworks/core/components_ng/pattern/indexer/arc_indexer_paint_method.h @@ -24,7 +24,7 @@ namespace OHOS::Ace::NG { class ACE_EXPORT ArcIndexerPaintMethod : public NodePaintMethod { - DECLARE_ACE_TYPE(ArcIndexerPaintMethod, NodePaintMethod) + DECLARE_ACE_TYPE(ArcIndexerPaintMethod, NodePaintMethod); public: ArcIndexerPaintMethod(float strokeWidth, OffsetF arcCenter, float startAngle, float sweepAngle, float arcRadius, float stepAngle, RefPtr arcindexerModifier) diff --git a/frameworks/core/components_ng/pattern/indexer/arc_indexer_pattern.h b/frameworks/core/components_ng/pattern/indexer/arc_indexer_pattern.h index d2e7a125ae5e29bf7ff38eb76abfbe664176b338..1afb3aa2621d6dd1fbb0901d60a3b816aef8d432 100644 --- a/frameworks/core/components_ng/pattern/indexer/arc_indexer_pattern.h +++ b/frameworks/core/components_ng/pattern/indexer/arc_indexer_pattern.h @@ -25,7 +25,7 @@ namespace OHOS::Ace::NG { class ArcIndexerPattern : public IndexerPattern { - DECLARE_ACE_TYPE(ArcIndexerPattern, IndexerPattern) + DECLARE_ACE_TYPE(ArcIndexerPattern, IndexerPattern); public: ArcIndexerPattern() = default; ~ArcIndexerPattern() override = default; diff --git a/frameworks/core/components_ng/pattern/indexer/indexer_event_hub.h b/frameworks/core/components_ng/pattern/indexer/indexer_event_hub.h index 8af0d19f4f5475efd6c3cb570c8439debb4b97a7..d617b3ba782c61b00f9b5d45e92e1f40630981a0 100644 --- a/frameworks/core/components_ng/pattern/indexer/indexer_event_hub.h +++ b/frameworks/core/components_ng/pattern/indexer/indexer_event_hub.h @@ -28,7 +28,7 @@ using OnRequestPopupDataEvent = std::function(int32_t)> using OnPopupSelectedEvent = std::function; class IndexerEventHub : public EventHub { - DECLARE_ACE_TYPE(IndexerEventHub, EventHub) + DECLARE_ACE_TYPE(IndexerEventHub, EventHub); public: IndexerEventHub() = default; diff --git a/frameworks/core/components_ng/pattern/linear_split/linear_split_paint_method.h b/frameworks/core/components_ng/pattern/linear_split/linear_split_paint_method.h index d7f1701d430442612d725ef4bd93c93bf32ac9ba..b2824906b1529bbf70b53fa21543e9df16c6e760 100644 --- a/frameworks/core/components_ng/pattern/linear_split/linear_split_paint_method.h +++ b/frameworks/core/components_ng/pattern/linear_split/linear_split_paint_method.h @@ -25,7 +25,7 @@ namespace OHOS::Ace::NG { class ACE_EXPORT LinearSplitPaintMethod : public NodePaintMethod { - DECLARE_ACE_TYPE(LinearSplitPaintMethod, NodePaintMethod) + DECLARE_ACE_TYPE(LinearSplitPaintMethod, NodePaintMethod); public: LinearSplitPaintMethod(std::vector childrenOffset, float splitLength, SplitType splitType) : childrenOffset_(std::move(childrenOffset)), splitLength_(splitLength), splitType_(splitType) diff --git a/frameworks/core/components_ng/pattern/list/list_children_main_size.h b/frameworks/core/components_ng/pattern/list/list_children_main_size.h index f176c061dc637ef33b1d36b27db33be407930888..cbf467bc15b9b983c04626f93f28a27e8f27c2fd 100644 --- a/frameworks/core/components_ng/pattern/list/list_children_main_size.h +++ b/frameworks/core/components_ng/pattern/list/list_children_main_size.h @@ -46,7 +46,7 @@ constexpr float DEFAULT_SIZE = -1.0f; } class ListChildrenMainSize : public virtual AceType { - DECLARE_ACE_TYPE(ListChildrenMainSize, AceType) + DECLARE_ACE_TYPE(ListChildrenMainSize, AceType); public: ListChildrenMainSize() = default; ListChildrenMainSize(const std::vector& mainSize, float defaulatMainSize) diff --git a/frameworks/core/components_ng/pattern/list/list_event_hub.h b/frameworks/core/components_ng/pattern/list/list_event_hub.h index 5a9489b1710b4c33ace44e73461edaa2aaaf81ec..a1157e5f442cbf2b3aa3c51595019991c0f53c2f 100644 --- a/frameworks/core/components_ng/pattern/list/list_event_hub.h +++ b/frameworks/core/components_ng/pattern/list/list_event_hub.h @@ -26,7 +26,7 @@ namespace OHOS::Ace::NG { constexpr int32_t INVALID_IDX = -1; class ListEventHub : public ScrollableEventHub { - DECLARE_ACE_TYPE(ListEventHub, ScrollableEventHub) + DECLARE_ACE_TYPE(ListEventHub, ScrollableEventHub); public: ListEventHub() = default; diff --git a/frameworks/core/components_ng/pattern/list/list_item_drag_manager.h b/frameworks/core/components_ng/pattern/list/list_item_drag_manager.h index 35fbe091b2c52fe9437892bf80489b6750e498ef..6df354aaa0f9bd1e42af927a97c64846244db9ba 100644 --- a/frameworks/core/components_ng/pattern/list/list_item_drag_manager.h +++ b/frameworks/core/components_ng/pattern/list/list_item_drag_manager.h @@ -31,7 +31,7 @@ enum class ListItemDragState { DRAGGING, }; class ListItemDragManager : public AceType { - DECLARE_ACE_TYPE(ListItemDragManager, AceType) + DECLARE_ACE_TYPE(ListItemDragManager, AceType); public: struct ScaleResult { diff --git a/frameworks/core/components_ng/pattern/list/list_item_event_hub.h b/frameworks/core/components_ng/pattern/list/list_item_event_hub.h index 5f956b0d1452a3d4f5c88e1530518ab2cd97235f..24e414fa01821a02f272321b8a6029ee467f6878 100644 --- a/frameworks/core/components_ng/pattern/list/list_item_event_hub.h +++ b/frameworks/core/components_ng/pattern/list/list_item_event_hub.h @@ -24,7 +24,7 @@ namespace OHOS::Ace::NG { class ListItemEventHub : public EventHub { - DECLARE_ACE_TYPE(ListItemEventHub, EventHub) + DECLARE_ACE_TYPE(ListItemEventHub, EventHub); public: ListItemEventHub() = default; diff --git a/frameworks/core/components_ng/pattern/list/list_item_group_paint_method.h b/frameworks/core/components_ng/pattern/list/list_item_group_paint_method.h index e57e79000fa1563eecbd590cdef079352c51c15b..852fb23e43272815f5450efebaca33001b4c1beb 100644 --- a/frameworks/core/components_ng/pattern/list/list_item_group_paint_method.h +++ b/frameworks/core/components_ng/pattern/list/list_item_group_paint_method.h @@ -39,7 +39,7 @@ struct DividerGroupInfo { }; class ACE_EXPORT ListItemGroupPaintMethod : public NodePaintMethod { - DECLARE_ACE_TYPE(ListItemGroupPaintMethod, NodePaintMethod) + DECLARE_ACE_TYPE(ListItemGroupPaintMethod, NodePaintMethod); public: ListItemGroupPaintMethod(const V2::ItemDivider& divider, const ListItemGroupPaintInfo& listItemGroupPaintInfo, ListItemGroupLayoutAlgorithm::PositionMap& itemPosition, diff --git a/frameworks/core/components_ng/pattern/list/list_paint_method.h b/frameworks/core/components_ng/pattern/list/list_paint_method.h index 542c0b072de969bbb265f6ff72daaf60bd4bda0a..3b7082532e4a2a4ee2b1e821ca4413e9155e7afa 100644 --- a/frameworks/core/components_ng/pattern/list/list_paint_method.h +++ b/frameworks/core/components_ng/pattern/list/list_paint_method.h @@ -40,7 +40,7 @@ struct DividerInfo { }; class ACE_EXPORT ListPaintMethod : public ScrollablePaintMethod { - DECLARE_ACE_TYPE(ListPaintMethod, ScrollablePaintMethod) + DECLARE_ACE_TYPE(ListPaintMethod, ScrollablePaintMethod); public: using PositionMap = ListLayoutAlgorithm::PositionMap; ListPaintMethod(const V2::ItemDivider& divider, bool vertical, bool isReverse, int32_t lanes, float space) diff --git a/frameworks/core/components_ng/pattern/list/list_position_map.h b/frameworks/core/components_ng/pattern/list/list_position_map.h index 3bce1a323c305499a3a6ff44850e87e2a776073b..d06f728772128143cc778c6b50b4312d22edd12c 100644 --- a/frameworks/core/components_ng/pattern/list/list_position_map.h +++ b/frameworks/core/components_ng/pattern/list/list_position_map.h @@ -52,7 +52,7 @@ enum class ListPosMapUpdate { }; class ListPositionMap : public virtual AceType { - DECLARE_ACE_TYPE(ListPositionMap, AceType) + DECLARE_ACE_TYPE(ListPositionMap, AceType); public: ListPositionMap() = default; ~ListPositionMap() override = default; diff --git a/frameworks/core/components_ng/pattern/loading_progress/loading_progress_paint_method.h b/frameworks/core/components_ng/pattern/loading_progress/loading_progress_paint_method.h index 8cfe6d326974f5410351222dc014499f9c47245e..4ad62156b7acc286d1ef20239ed85ae42c9d72ad 100644 --- a/frameworks/core/components_ng/pattern/loading_progress/loading_progress_paint_method.h +++ b/frameworks/core/components_ng/pattern/loading_progress/loading_progress_paint_method.h @@ -27,7 +27,7 @@ namespace OHOS::Ace::NG { class ACE_EXPORT LoadingProgressPaintMethod : public NodePaintMethod { - DECLARE_ACE_TYPE(LoadingProgressPaintMethod, NodePaintMethod) + DECLARE_ACE_TYPE(LoadingProgressPaintMethod, NodePaintMethod); public: explicit LoadingProgressPaintMethod(const RefPtr& loadingProgressModifier) : loadingProgressModifier_(loadingProgressModifier) diff --git a/frameworks/core/components_ng/pattern/marquee/marquee_event_hub.h b/frameworks/core/components_ng/pattern/marquee/marquee_event_hub.h index 21ec557f0b04ffe9f0fd71fa2625782bd64305cd..6b385ebe338ab160f51313b843b9e6a1ed284cd2 100644 --- a/frameworks/core/components_ng/pattern/marquee/marquee_event_hub.h +++ b/frameworks/core/components_ng/pattern/marquee/marquee_event_hub.h @@ -23,7 +23,7 @@ namespace OHOS::Ace::NG { using ChangeEvent = std::function; class MarqueeEventHub : public EventHub { - DECLARE_ACE_TYPE(MarqueeEventHub, EventHub) + DECLARE_ACE_TYPE(MarqueeEventHub, EventHub); public: MarqueeEventHub() = default; diff --git a/frameworks/core/components_ng/pattern/menu/menu_divider/menu_divider_paint_method.h b/frameworks/core/components_ng/pattern/menu/menu_divider/menu_divider_paint_method.h index 8f053366baa36fef9adaa8f0797e946004cf65cb..859173e46f2157affe100b71b9eeeb38f528ca27 100644 --- a/frameworks/core/components_ng/pattern/menu/menu_divider/menu_divider_paint_method.h +++ b/frameworks/core/components_ng/pattern/menu/menu_divider/menu_divider_paint_method.h @@ -23,7 +23,7 @@ namespace OHOS::Ace::NG { class ACE_EXPORT MenuDividerPaintMethod : public NodePaintMethod { - DECLARE_ACE_TYPE(MenuDividerPaintMethod, NodePaintMethod) + DECLARE_ACE_TYPE(MenuDividerPaintMethod, NodePaintMethod); public: MenuDividerPaintMethod() {} ~MenuDividerPaintMethod() override = default; diff --git a/frameworks/core/components_ng/pattern/menu/menu_divider/menu_divider_paint_property.h b/frameworks/core/components_ng/pattern/menu/menu_divider/menu_divider_paint_property.h index a23da526d5287f2c80255e29130ce0afe2c2053e..8b62adcb126438c72f14eabb50cbe34124ff471c 100644 --- a/frameworks/core/components_ng/pattern/menu/menu_divider/menu_divider_paint_property.h +++ b/frameworks/core/components_ng/pattern/menu/menu_divider/menu_divider_paint_property.h @@ -25,7 +25,7 @@ namespace OHOS::Ace::NG { // PaintProperty are used to set render properties. class MenuDividerPaintProperty : public PaintProperty { - DECLARE_ACE_TYPE(MenuDividerPaintProperty, PaintProperty) + DECLARE_ACE_TYPE(MenuDividerPaintProperty, PaintProperty); public: MenuDividerPaintProperty() = default; ~MenuDividerPaintProperty() override = default; diff --git a/frameworks/core/components_ng/pattern/menu/menu_item/menu_item_event_hub.h b/frameworks/core/components_ng/pattern/menu/menu_item/menu_item_event_hub.h index 0307f33cf7e39c2ad0e83c5596b10cc277c7d055..90a70c716c5078dd59178f38abc8a0dd33b22c7c 100644 --- a/frameworks/core/components_ng/pattern/menu/menu_item/menu_item_event_hub.h +++ b/frameworks/core/components_ng/pattern/menu/menu_item/menu_item_event_hub.h @@ -25,7 +25,7 @@ using MenuJSCallback = std::function; using OnSelectEvent = std::function; class MenuItemEventHub : public EventHub { - DECLARE_ACE_TYPE(MenuItemEventHub, EventHub) + DECLARE_ACE_TYPE(MenuItemEventHub, EventHub); public: MenuItemEventHub() = default; diff --git a/frameworks/core/components_ng/pattern/menu/menu_item/menu_item_paint_method.h b/frameworks/core/components_ng/pattern/menu/menu_item/menu_item_paint_method.h index 0545597adce501c4cf922834ce643a0337944215..298164c09a5c065126e43a36609546eb6a1536fe 100644 --- a/frameworks/core/components_ng/pattern/menu/menu_item/menu_item_paint_method.h +++ b/frameworks/core/components_ng/pattern/menu/menu_item/menu_item_paint_method.h @@ -38,7 +38,7 @@ struct ItemDividerInfo { Color color = Color::TRANSPARENT; }; class ACE_EXPORT MenuItemPaintMethod : public NodePaintMethod { - DECLARE_ACE_TYPE(MenuItemPaintMethod, NodePaintMethod) + DECLARE_ACE_TYPE(MenuItemPaintMethod, NodePaintMethod); public: MenuItemPaintMethod(bool isOption = false) : isOption_(isOption) {} ~MenuItemPaintMethod() override = default; diff --git a/frameworks/core/components_ng/pattern/menu/menu_item/menu_item_paint_property.h b/frameworks/core/components_ng/pattern/menu/menu_item/menu_item_paint_property.h index 56ad4b46c3330532d57f965b326e86491b2bc0aa..e51bd24b49212d09e86f44789150ee6eeab89be9 100644 --- a/frameworks/core/components_ng/pattern/menu/menu_item/menu_item_paint_property.h +++ b/frameworks/core/components_ng/pattern/menu/menu_item/menu_item_paint_property.h @@ -22,7 +22,7 @@ namespace OHOS::Ace::NG { class ACE_EXPORT MenuItemPaintProperty : public PaintProperty { - DECLARE_ACE_TYPE(MenuItemPaintProperty, PaintProperty) + DECLARE_ACE_TYPE(MenuItemPaintProperty, PaintProperty); public: MenuItemPaintProperty(bool isOption = false) : isOption_(isOption) {} diff --git a/frameworks/core/components_ng/pattern/menu/menu_item_group/menu_item_group_paint_method.h b/frameworks/core/components_ng/pattern/menu/menu_item_group/menu_item_group_paint_method.h index 5d45bb127e3e2e5412723994e45e48c57ed4a06f..7572d46fe58f223b4dfe5471e21359a69dd05f00 100644 --- a/frameworks/core/components_ng/pattern/menu/menu_item_group/menu_item_group_paint_method.h +++ b/frameworks/core/components_ng/pattern/menu/menu_item_group/menu_item_group_paint_method.h @@ -38,7 +38,7 @@ struct GroupDividerInfo { float topMargin = 0.0f; }; class ACE_EXPORT MenuItemGroupPaintMethod : public NodePaintMethod { - DECLARE_ACE_TYPE(MenuItemGroupPaintMethod, NodePaintMethod) + DECLARE_ACE_TYPE(MenuItemGroupPaintMethod, NodePaintMethod); public: MenuItemGroupPaintMethod() = default; ~MenuItemGroupPaintMethod() override = default; diff --git a/frameworks/core/components_ng/pattern/menu/menu_item_group/menu_item_group_paint_property.h b/frameworks/core/components_ng/pattern/menu/menu_item_group/menu_item_group_paint_property.h index f11fd5ea6ce4bd8e333ee6df6561b017ced2300b..cc3e1ffd1876d6741b1f3b9fcb29edd6cfdbbe5b 100644 --- a/frameworks/core/components_ng/pattern/menu/menu_item_group/menu_item_group_paint_property.h +++ b/frameworks/core/components_ng/pattern/menu/menu_item_group/menu_item_group_paint_property.h @@ -21,7 +21,7 @@ namespace OHOS::Ace::NG { class ACE_EXPORT MenuItemGroupPaintProperty : public PaintProperty { - DECLARE_ACE_TYPE(MenuItemGroupPaintProperty, PaintProperty) + DECLARE_ACE_TYPE(MenuItemGroupPaintProperty, PaintProperty); public: MenuItemGroupPaintProperty() = default; diff --git a/frameworks/core/components_ng/pattern/menu/menu_layout_algorithm.h b/frameworks/core/components_ng/pattern/menu/menu_layout_algorithm.h index 3e15709b3f8be4f85e5c3a2055c8e6248484829d..9403772cbcefb2e79a47dc92f97251150049275e 100644 --- a/frameworks/core/components_ng/pattern/menu/menu_layout_algorithm.h +++ b/frameworks/core/components_ng/pattern/menu/menu_layout_algorithm.h @@ -74,7 +74,7 @@ struct MenuDumpInfo { class MenuLayoutProperty; class MenuPattern; class MenuLayoutAlgorithm : public BoxLayoutAlgorithm { - DECLARE_ACE_TYPE(MenuLayoutAlgorithm, BoxLayoutAlgorithm) + DECLARE_ACE_TYPE(MenuLayoutAlgorithm, BoxLayoutAlgorithm); public: MenuLayoutAlgorithm(int32_t id, const std::string& tag, const std::optional& lastPosition = std::nullopt); diff --git a/frameworks/core/components_ng/pattern/menu/menu_paint_method.h b/frameworks/core/components_ng/pattern/menu/menu_paint_method.h index 7e6333dc9cbd5d2f826b9e55e3cb1d58054cffd1..82af6ca26372b7b72d5a3ef64f438fbb51cbcc07 100644 --- a/frameworks/core/components_ng/pattern/menu/menu_paint_method.h +++ b/frameworks/core/components_ng/pattern/menu/menu_paint_method.h @@ -27,7 +27,7 @@ // @deprecated namespace OHOS::Ace::NG { class ACE_EXPORT MenuPaintMethod : public NodePaintMethod { - DECLARE_ACE_TYPE(MenuPaintMethod, NodePaintMethod) + DECLARE_ACE_TYPE(MenuPaintMethod, NodePaintMethod); public: MenuPaintMethod() = default; ~MenuPaintMethod() override = default; diff --git a/frameworks/core/components_ng/pattern/menu/menu_paint_property.h b/frameworks/core/components_ng/pattern/menu/menu_paint_property.h index 91007c9fc64cf36baaf8dd6f09432e2eb19e836a..bc8c3e50b5b8506e081bb31e380e9ef0f99d1049 100644 --- a/frameworks/core/components_ng/pattern/menu/menu_paint_property.h +++ b/frameworks/core/components_ng/pattern/menu/menu_paint_property.h @@ -44,7 +44,7 @@ constexpr Dimension LANDSCAPE_BOTTOM_SECURITY = 24.0_vp; constexpr Dimension PREVIEW_INNER_SECURITY = 24.0_vp; } // namespace class ACE_EXPORT MenuPaintProperty : public PaintProperty { - DECLARE_ACE_TYPE(MenuPaintProperty, PaintProperty) + DECLARE_ACE_TYPE(MenuPaintProperty, PaintProperty); public: MenuPaintProperty() = default; diff --git a/frameworks/core/components_ng/pattern/menu/multi_menu_layout_algorithm.h b/frameworks/core/components_ng/pattern/menu/multi_menu_layout_algorithm.h index 649067decb0e7591e2440e72e1eac1013dcae715..688e09562a17d4a82a5468025f3794f8664c4310 100644 --- a/frameworks/core/components_ng/pattern/menu/multi_menu_layout_algorithm.h +++ b/frameworks/core/components_ng/pattern/menu/multi_menu_layout_algorithm.h @@ -21,7 +21,7 @@ namespace OHOS::Ace::NG { class ACE_EXPORT MultiMenuLayoutAlgorithm : public MenuLayoutAlgorithm { - DECLARE_ACE_TYPE(MultiMenuLayoutAlgorithm, MenuLayoutAlgorithm) + DECLARE_ACE_TYPE(MultiMenuLayoutAlgorithm, MenuLayoutAlgorithm); public: MultiMenuLayoutAlgorithm() = default; ~MultiMenuLayoutAlgorithm() override = default; diff --git a/frameworks/core/components_ng/pattern/menu/preview/menu_preview_layout_algorithm.h b/frameworks/core/components_ng/pattern/menu/preview/menu_preview_layout_algorithm.h index 259a0c0b6a070b49d096f4c03eb33945b6949c5f..ae2ac7e7f1e2e1186d5a488fba6bc8b929f2e85a 100644 --- a/frameworks/core/components_ng/pattern/menu/preview/menu_preview_layout_algorithm.h +++ b/frameworks/core/components_ng/pattern/menu/preview/menu_preview_layout_algorithm.h @@ -23,7 +23,7 @@ namespace OHOS::Ace::NG { class MenuPreviewLayoutAlgorithm : public LinearLayoutAlgorithm { - DECLARE_ACE_TYPE(MenuPreviewLayoutAlgorithm, LayoutAlgorithm) + DECLARE_ACE_TYPE(MenuPreviewLayoutAlgorithm, LayoutAlgorithm); public: MenuPreviewLayoutAlgorithm() = default; ~MenuPreviewLayoutAlgorithm() override = default; diff --git a/frameworks/core/components_ng/pattern/menu/sub_menu_layout_algorithm.h b/frameworks/core/components_ng/pattern/menu/sub_menu_layout_algorithm.h index 492e55fbdfabbbb1e32964b78d64ef0ccd99f190..0de8410dfd3a44878bec70607f42a475e3808136 100644 --- a/frameworks/core/components_ng/pattern/menu/sub_menu_layout_algorithm.h +++ b/frameworks/core/components_ng/pattern/menu/sub_menu_layout_algorithm.h @@ -20,7 +20,7 @@ namespace OHOS::Ace::NG { class ACE_EXPORT SubMenuLayoutAlgorithm : public MenuLayoutAlgorithm { - DECLARE_ACE_TYPE(SubMenuLayoutAlgorithm, MenuLayoutAlgorithm) + DECLARE_ACE_TYPE(SubMenuLayoutAlgorithm, MenuLayoutAlgorithm); public: SubMenuLayoutAlgorithm() = default; ~SubMenuLayoutAlgorithm() override = default; diff --git a/frameworks/core/components_ng/pattern/menu/wrapper/menu_wrapper_layout_algorithm.h b/frameworks/core/components_ng/pattern/menu/wrapper/menu_wrapper_layout_algorithm.h index f14e0835d8175a0682ebd2d87171350c1ce9a8e4..d9da17ed357413d10422004256c592c069b884bd 100644 --- a/frameworks/core/components_ng/pattern/menu/wrapper/menu_wrapper_layout_algorithm.h +++ b/frameworks/core/components_ng/pattern/menu/wrapper/menu_wrapper_layout_algorithm.h @@ -21,7 +21,7 @@ namespace OHOS::Ace::NG { class MenuWrapperLayoutAlgorithm : public LayoutAlgorithm { - DECLARE_ACE_TYPE(MenuWrapperLayoutAlgorithm, LayoutAlgorithm) + DECLARE_ACE_TYPE(MenuWrapperLayoutAlgorithm, LayoutAlgorithm); public: MenuWrapperLayoutAlgorithm() = default; ~MenuWrapperLayoutAlgorithm() override = default; diff --git a/frameworks/core/components_ng/pattern/menu/wrapper/menu_wrapper_paint_method.h b/frameworks/core/components_ng/pattern/menu/wrapper/menu_wrapper_paint_method.h index 434a84c1bd70bb60585d3c5a9ec3ec5895d45b4c..e7829908e36b476c0dd5a38b90758c7a220d3819 100644 --- a/frameworks/core/components_ng/pattern/menu/wrapper/menu_wrapper_paint_method.h +++ b/frameworks/core/components_ng/pattern/menu/wrapper/menu_wrapper_paint_method.h @@ -55,7 +55,7 @@ struct ArrowOutlineOffset { }; class ACE_EXPORT MenuWrapperPaintMethod : public NodePaintMethod { - DECLARE_ACE_TYPE(MenuWrapperPaintMethod, NodePaintMethod) + DECLARE_ACE_TYPE(MenuWrapperPaintMethod, NodePaintMethod); public: MenuWrapperPaintMethod() = default; ~MenuWrapperPaintMethod() override = default; diff --git a/frameworks/core/components_ng/pattern/menu/wrapper/menu_wrapper_paint_property.h b/frameworks/core/components_ng/pattern/menu/wrapper/menu_wrapper_paint_property.h index 4343c1923e32cc51b87f962b73d158b232e0a237..2a2720e03c14c7f941d0097ca6d02147b0b149ef 100644 --- a/frameworks/core/components_ng/pattern/menu/wrapper/menu_wrapper_paint_property.h +++ b/frameworks/core/components_ng/pattern/menu/wrapper/menu_wrapper_paint_property.h @@ -25,7 +25,7 @@ namespace OHOS::Ace::NG { class ACE_EXPORT MenuWrapperPaintProperty : public PaintProperty { - DECLARE_ACE_TYPE(MenuWrapperPaintProperty, PaintProperty) + DECLARE_ACE_TYPE(MenuWrapperPaintProperty, PaintProperty); public: MenuWrapperPaintProperty() = default; diff --git a/frameworks/core/components_ng/pattern/model/model_adapter_wrapper.h b/frameworks/core/components_ng/pattern/model/model_adapter_wrapper.h index a10705e91a68916d3b26129b2e1d93f31ad6066e..e86f392ee3adca12aaeeedd0eccd3cfd69dec4e4 100644 --- a/frameworks/core/components_ng/pattern/model/model_adapter_wrapper.h +++ b/frameworks/core/components_ng/pattern/model/model_adapter_wrapper.h @@ -51,7 +51,7 @@ struct CameraProperty { float near_ = 0.5f; float far_ = 50.0f; float fov_ = 60.0f; -}; +};DECLARE_ACE_TYPE(ModelAdapterWrapper, AceType); class ModelAdapterWrapper : public virtual AceType { DECLARE_ACE_TYPE(ModelAdapterWrapper, AceType) diff --git a/frameworks/core/components_ng/pattern/model/model_light.h b/frameworks/core/components_ng/pattern/model/model_light.h index b6b82f7fb958184f1c22356e9e2b09fd945f0904..95bd0f27799c6004523ed905c334b96807672e1d 100644 --- a/frameworks/core/components_ng/pattern/model/model_light.h +++ b/frameworks/core/components_ng/pattern/model/model_light.h @@ -32,7 +32,7 @@ enum ModelLightType { }; class ModelLight : public virtual AceType { - DECLARE_ACE_TYPE(ModelLight, AceType) + DECLARE_ACE_TYPE(ModelLight, AceType); public: ModelLight(ModelLightType type, const Vec3& color, const AnimatableFloat& intensity, bool shadow, const ModelPosition& position, const Quaternion& rotation) diff --git a/frameworks/core/components_ng/pattern/model/model_paint_method.h b/frameworks/core/components_ng/pattern/model/model_paint_method.h index 5283aac35368f3971d7a93ecf2908d3bf918c7ef..f4e94139cd5d7bb7da0d5912db44f91e48446e73 100644 --- a/frameworks/core/components_ng/pattern/model/model_paint_method.h +++ b/frameworks/core/components_ng/pattern/model/model_paint_method.h @@ -29,7 +29,7 @@ namespace OHOS::Ace::NG { class ACE_EXPORT ModelPaintMethod : public NodePaintMethod { - DECLARE_ACE_TYPE(ModelPaintMethod, NodePaintMethod) + DECLARE_ACE_TYPE(ModelPaintMethod, NodePaintMethod); public: ModelPaintMethod(const WeakPtr& adapter); ~ModelPaintMethod() override = default; diff --git a/frameworks/core/components_ng/pattern/model/model_paint_property.h b/frameworks/core/components_ng/pattern/model/model_paint_property.h index dfbe776e57f7316c17f429fac6cd7fb34aa7bcb9..9eca43c23efaf02138ae787bc1a44d19774580fb 100644 --- a/frameworks/core/components_ng/pattern/model/model_paint_property.h +++ b/frameworks/core/components_ng/pattern/model/model_paint_property.h @@ -31,7 +31,7 @@ #include "core/components_ng/pattern/model/model_position.h" #include "core/components_ng/pattern/model/model_property.h" #include "core/components_ng/render/paint_property.h" - +DECLARE_ACE_TYPE(ModelPaintProperty, PaintProperty); namespace OHOS::Ace::NG { class ModelPaintProperty : public PaintProperty { diff --git a/frameworks/core/components_ng/pattern/model/model_position.h b/frameworks/core/components_ng/pattern/model/model_position.h index 1c255446d21dfbd5ccaa67201bec139d4f74bda9..5b2ac1fca798634fae609893c046580a881fc6c4 100644 --- a/frameworks/core/components_ng/pattern/model/model_position.h +++ b/frameworks/core/components_ng/pattern/model/model_position.h @@ -21,7 +21,7 @@ namespace OHOS::Ace::NG { class ModelPosition : public virtual AceType { - DECLARE_ACE_TYPE(ModelPosition, AceType) + DECLARE_ACE_TYPE(ModelPosition, AceType); public: ModelPosition() = default; ~ModelPosition() override = default; diff --git a/frameworks/core/components_ng/pattern/navigation/bar_item_event_hub.h b/frameworks/core/components_ng/pattern/navigation/bar_item_event_hub.h index 12eeb16b6cf8516a31ca30ad922e71de9cf9f2ba..94b1c4fd5c776dadd6c67ec889360071340e8e50 100644 --- a/frameworks/core/components_ng/pattern/navigation/bar_item_event_hub.h +++ b/frameworks/core/components_ng/pattern/navigation/bar_item_event_hub.h @@ -24,7 +24,7 @@ namespace OHOS::Ace::NG { class BarItemEventHub : public EventHub { - DECLARE_ACE_TYPE(BarItemEventHub, EventHub) + DECLARE_ACE_TYPE(BarItemEventHub, EventHub); public: void SetItemAction(const std::function& action) { diff --git a/frameworks/core/components_ng/pattern/navigation/bar_item_node.h b/frameworks/core/components_ng/pattern/navigation/bar_item_node.h index 9e027feb93f3caa14e0b82853a2475300e953ff1..e4acea856517cdd856b77a7e384e00dace7ef005 100644 --- a/frameworks/core/components_ng/pattern/navigation/bar_item_node.h +++ b/frameworks/core/components_ng/pattern/navigation/bar_item_node.h @@ -25,7 +25,7 @@ namespace OHOS::Ace::NG { class ACE_EXPORT BarItemNode : public FrameNode { - DECLARE_ACE_TYPE(BarItemNode, FrameNode) + DECLARE_ACE_TYPE(BarItemNode, FrameNode); public: BarItemNode(const std::string& tag, int32_t nodeId); BarItemNode(const std::string& tag, int32_t nodeId, const RefPtr& pattern) diff --git a/frameworks/core/components_ng/pattern/navigation/nav_bar_event_hub.h b/frameworks/core/components_ng/pattern/navigation/nav_bar_event_hub.h index 7c2a9baa5c2fd5edf59414372cc467a62114153e..093e0fc1987511d56ec061e2722bc54f3671cd65 100644 --- a/frameworks/core/components_ng/pattern/navigation/nav_bar_event_hub.h +++ b/frameworks/core/components_ng/pattern/navigation/nav_bar_event_hub.h @@ -27,7 +27,7 @@ using OnCoordScrollEndAction = std::function; using BeforeCreateLayoutWrapper = std::function; class NavBarEventHub : public EventHub { - DECLARE_ACE_TYPE(NavBarEventHub, EventHub) + DECLARE_ACE_TYPE(NavBarEventHub, EventHub); public: void SetOnCoordScrollStartAction(OnCoordScrollStartAction&& action) { diff --git a/frameworks/core/components_ng/pattern/navigation/nav_bar_node.h b/frameworks/core/components_ng/pattern/navigation/nav_bar_node.h index 2cc6087a6d5f702621311ff6930bb743e32f0f24..b16c15a9d64b2295b12c074c6bfce8b9989d1743 100644 --- a/frameworks/core/components_ng/pattern/navigation/nav_bar_node.h +++ b/frameworks/core/components_ng/pattern/navigation/nav_bar_node.h @@ -32,7 +32,7 @@ namespace OHOS::Ace::NG { class InspectorFilter; class ACE_EXPORT NavBarNode : public NavDestinationNodeBase { - DECLARE_ACE_TYPE(NavBarNode, NavDestinationNodeBase) + DECLARE_ACE_TYPE(NavBarNode, NavDestinationNodeBase); public: NavBarNode(const std::string& tag, int32_t nodeId, const RefPtr& pattern) : NavDestinationNodeBase(tag, nodeId, pattern) {} diff --git a/frameworks/core/components_ng/pattern/navigation/navdestination_node_base.h b/frameworks/core/components_ng/pattern/navigation/navdestination_node_base.h index 06a713fed3bd2a56c4c3bca09c29e324f3fed922..89be715f15aa4c247a79d3f451cf9ead5977d3d6 100644 --- a/frameworks/core/components_ng/pattern/navigation/navdestination_node_base.h +++ b/frameworks/core/components_ng/pattern/navigation/navdestination_node_base.h @@ -31,7 +31,7 @@ namespace OHOS::Ace::NG { class NavDestinationNodeBase : public GroupNode { - DECLARE_ACE_TYPE(NavDestinationNodeBase, GroupNode) + DECLARE_ACE_TYPE(NavDestinationNodeBase, GroupNode); public: NavDestinationNodeBase(const std::string& tag, int32_t nodeId, const RefPtr& pattern) : GroupNode(tag, nodeId, pattern) {} diff --git a/frameworks/core/components_ng/pattern/navigation/navigation_event_hub.h b/frameworks/core/components_ng/pattern/navigation/navigation_event_hub.h index c7260d27d4458c203b0a778b6fa29b45f76200a9..84e8f7d41776dfa7435e7de4cf27af6a87ba5ab3 100644 --- a/frameworks/core/components_ng/pattern/navigation/navigation_event_hub.h +++ b/frameworks/core/components_ng/pattern/navigation/navigation_event_hub.h @@ -31,7 +31,7 @@ using OnNavigationModeChangeEvent = std::function; using OnNavBarWidthChangeEvent = std::function; class NavigationEventHub : public EventHub { - DECLARE_ACE_TYPE(NavigationEventHub, EventHub) + DECLARE_ACE_TYPE(NavigationEventHub, EventHub); public: void SetOnTitleModeChange(OnTitleModeChangeEvent&& changeEvent) { diff --git a/frameworks/core/components_ng/pattern/navigation/navigation_group_node.h b/frameworks/core/components_ng/pattern/navigation/navigation_group_node.h index 9b46ff7be771c7ca7053aa15c56feadf8cc70846..8e20d0c8bab54eb630990b78f67e613317c80bd7 100644 --- a/frameworks/core/components_ng/pattern/navigation/navigation_group_node.h +++ b/frameworks/core/components_ng/pattern/navigation/navigation_group_node.h @@ -46,7 +46,7 @@ struct TransitionUnitInfo { }; class ACE_FORCE_EXPORT NavigationGroupNode : public GroupNode { - DECLARE_ACE_TYPE(NavigationGroupNode, GroupNode) + DECLARE_ACE_TYPE(NavigationGroupNode, GroupNode); public: NavigationGroupNode(const std::string& tag, int32_t nodeId, const RefPtr& pattern) : GroupNode(tag, nodeId, pattern) diff --git a/frameworks/core/components_ng/pattern/navigation/navigation_stack.h b/frameworks/core/components_ng/pattern/navigation/navigation_stack.h index 776350a9fba6e8854536bd0492c4b30c3070df3a..fe982fa52b99e78e8eaa97294ec63e831dea60e3 100644 --- a/frameworks/core/components_ng/pattern/navigation/navigation_stack.h +++ b/frameworks/core/components_ng/pattern/navigation/navigation_stack.h @@ -29,7 +29,7 @@ namespace OHOS::Ace::NG { using NavPathList = std::vector>>; class NavDestinationContext; class RouteInfo : public virtual AceType { - DECLARE_ACE_TYPE(NG::RouteInfo, AceType) + DECLARE_ACE_TYPE(NG::RouteInfo, AceType); public: RouteInfo() = default; virtual ~RouteInfo() = default; @@ -41,7 +41,7 @@ public: }; class ACE_FORCE_EXPORT NavigationStack : public virtual AceType { - DECLARE_ACE_TYPE(NG::NavigationStack, AceType) + DECLARE_ACE_TYPE(NG::NavigationStack, AceType); public: NavigationStack() = default; ~NavigationStack() override = default; diff --git a/frameworks/core/components_ng/pattern/navigation/title_bar_node.h b/frameworks/core/components_ng/pattern/navigation/title_bar_node.h index 531178cd57312d157467fe122dcb884a814aff35..192d6a2668ada8acfe5ecdd307a3490f17deb692 100644 --- a/frameworks/core/components_ng/pattern/navigation/title_bar_node.h +++ b/frameworks/core/components_ng/pattern/navigation/title_bar_node.h @@ -23,7 +23,7 @@ namespace OHOS::Ace::NG { class ACE_EXPORT TitleBarNode : public FrameNode { - DECLARE_ACE_TYPE(TitleBarNode, FrameNode) + DECLARE_ACE_TYPE(TitleBarNode, FrameNode); public: TitleBarNode(const std::string& tag, int32_t nodeId); TitleBarNode(const std::string& tag, int32_t nodeId, const RefPtr& pattern) diff --git a/frameworks/core/components_ng/pattern/navigation/tool_bar_node.h b/frameworks/core/components_ng/pattern/navigation/tool_bar_node.h index bb897bd5b09293dd24658174830082a257ed1bc7..703b00829368f841b89c64a6196ee6c2e1f2ea20 100644 --- a/frameworks/core/components_ng/pattern/navigation/tool_bar_node.h +++ b/frameworks/core/components_ng/pattern/navigation/tool_bar_node.h @@ -21,7 +21,7 @@ namespace OHOS::Ace::NG { class ACE_EXPORT NavToolbarNode : public FrameNode { - DECLARE_ACE_TYPE(NavToolbarNode, FrameNode) + DECLARE_ACE_TYPE(NavToolbarNode, FrameNode); public: NavToolbarNode(const std::string& tag, int32_t nodeId); NavToolbarNode(const std::string& tag, int32_t nodeId, const RefPtr& pattern) diff --git a/frameworks/core/components_ng/pattern/navigator/navigator_event_hub.h b/frameworks/core/components_ng/pattern/navigator/navigator_event_hub.h index c53844b689f2763696b0de30bf13feb9914b47da..933dc847c30b181ed04d611896c168a02366a5cd 100644 --- a/frameworks/core/components_ng/pattern/navigator/navigator_event_hub.h +++ b/frameworks/core/components_ng/pattern/navigator/navigator_event_hub.h @@ -23,7 +23,7 @@ namespace OHOS::Ace::NG { class InspectorFilter; class NavigatorEventHub : public EventHub { - DECLARE_ACE_TYPE(NavigatorEventHub, EventHub) + DECLARE_ACE_TYPE(NavigatorEventHub, EventHub); public: NavigatorEventHub() = default; diff --git a/frameworks/core/components_ng/pattern/navrouter/navdestination_context.h b/frameworks/core/components_ng/pattern/navrouter/navdestination_context.h index 91b07190eff9004f52b5b6e2733b02cadda318a2..00dad835000f25e3c95acdfd0c0a61b0bbd3680e 100644 --- a/frameworks/core/components_ng/pattern/navrouter/navdestination_context.h +++ b/frameworks/core/components_ng/pattern/navrouter/navdestination_context.h @@ -25,7 +25,7 @@ namespace OHOS::Ace::NG { class NavigationStack; class NavDestinationPattern; class NavPathInfo : public virtual AceType { - DECLARE_ACE_TYPE(NavPathInfo, AceType) + DECLARE_ACE_TYPE(NavPathInfo, AceType); public: NavPathInfo() = default; explicit NavPathInfo(const std::string& name) : name_(name) {} @@ -75,7 +75,7 @@ protected: }; class NavDestinationContext : public virtual AceType { - DECLARE_ACE_TYPE(NavDestinationContext, AceType) + DECLARE_ACE_TYPE(NavDestinationContext, AceType); public: NavDestinationContext() = default; virtual ~NavDestinationContext() = default; diff --git a/frameworks/core/components_ng/pattern/navrouter/navdestination_event_hub.h b/frameworks/core/components_ng/pattern/navrouter/navdestination_event_hub.h index 11553b02a7a92d6038a1a04321eeea16b18e1272..7253aefbaef89692d1886a5c45a70cef58bcff2e 100644 --- a/frameworks/core/components_ng/pattern/navrouter/navdestination_event_hub.h +++ b/frameworks/core/components_ng/pattern/navrouter/navdestination_event_hub.h @@ -29,7 +29,7 @@ namespace OHOS::Ace::NG { using OnStateChangeEvent = std::function; using namespace Framework; class NavDestinationEventHub : public NavBarEventHub { - DECLARE_ACE_TYPE(NavDestinationEventHub, EventHub) + DECLARE_ACE_TYPE(NavDestinationEventHub, EventHub); public: void SetOnStateChange(const OnStateChangeEvent& changeEvent) { diff --git a/frameworks/core/components_ng/pattern/navrouter/navdestination_group_node.h b/frameworks/core/components_ng/pattern/navrouter/navdestination_group_node.h index 5feb4c35ca4d455f2cd7ec13c6708c6bdaa11d29..bea6a52a1093b88dd47b2f3e18b6c81ec8f031d1 100644 --- a/frameworks/core/components_ng/pattern/navrouter/navdestination_group_node.h +++ b/frameworks/core/components_ng/pattern/navrouter/navdestination_group_node.h @@ -34,7 +34,7 @@ class NavigationTransitionProxy; using NavDestinationBackButtonEvent = std::function; class ACE_EXPORT NavDestinationGroupNode : public NavDestinationNodeBase { - DECLARE_ACE_TYPE(NavDestinationGroupNode, NavDestinationNodeBase) + DECLARE_ACE_TYPE(NavDestinationGroupNode, NavDestinationNodeBase); public: NavDestinationGroupNode(const std::string& tag, int32_t nodeId, const RefPtr& pattern) : NavDestinationNodeBase(tag, nodeId, pattern) diff --git a/frameworks/core/components_ng/pattern/navrouter/navrouter_event_hub.h b/frameworks/core/components_ng/pattern/navrouter/navrouter_event_hub.h index e42893d1ef015ca0e8f5a33ced31af115a640ab0..794cd5b10bb37c2268196895107d6900be418547 100644 --- a/frameworks/core/components_ng/pattern/navrouter/navrouter_event_hub.h +++ b/frameworks/core/components_ng/pattern/navrouter/navrouter_event_hub.h @@ -26,7 +26,7 @@ using OnStateChangeEvent = std::function; using OnDestinationChangeEvent = std::function; class NavRouterEventHub : public EventHub { - DECLARE_ACE_TYPE(NavRouterEventHub, EventHub) + DECLARE_ACE_TYPE(NavRouterEventHub, EventHub); public: void SetOnStateChange(OnStateChangeEvent&& changeEvent) { diff --git a/frameworks/core/components_ng/pattern/navrouter/navrouter_group_node.h b/frameworks/core/components_ng/pattern/navrouter/navrouter_group_node.h index 0a14c8f7220a2b6c692167ce7d99785a74b32e63..a5b7e789851901cca791cf2c91e591569d78920a 100644 --- a/frameworks/core/components_ng/pattern/navrouter/navrouter_group_node.h +++ b/frameworks/core/components_ng/pattern/navrouter/navrouter_group_node.h @@ -27,7 +27,7 @@ namespace OHOS::Ace::NG { class ACE_EXPORT NavRouterGroupNode : public GroupNode { - DECLARE_ACE_TYPE(NavRouterGroupNode, GroupNode) + DECLARE_ACE_TYPE(NavRouterGroupNode, GroupNode); public: NavRouterGroupNode(const std::string& tag, int32_t nodeId, const RefPtr& pattern) : GroupNode(tag, nodeId, pattern) diff --git a/frameworks/core/components_ng/pattern/node_container/node_container_event_hub.h b/frameworks/core/components_ng/pattern/node_container/node_container_event_hub.h index 641268e4f58e7c4568b996a780da1bb7ca1bc0c7..4476372f9cd2e844d54a9447a6a1009659fecfb7 100644 --- a/frameworks/core/components_ng/pattern/node_container/node_container_event_hub.h +++ b/frameworks/core/components_ng/pattern/node_container/node_container_event_hub.h @@ -22,7 +22,7 @@ namespace OHOS::Ace::NG { class NodeContainerEventHub : public EventHub { - DECLARE_ACE_TYPE(NodeContainerEventHub, EventHub) + DECLARE_ACE_TYPE(NodeContainerEventHub, EventHub); public: void SetControllerAboutToAppear(std::function&& onAppearCallback) { diff --git a/frameworks/core/components_ng/pattern/overlay/group_manager.h b/frameworks/core/components_ng/pattern/overlay/group_manager.h index a9e6973ab44af1781c0c90536d9f0b0df804bbdd..aada3eb51cf305f4efb0e86bb8f2a16458abb831 100644 --- a/frameworks/core/components_ng/pattern/overlay/group_manager.h +++ b/frameworks/core/components_ng/pattern/overlay/group_manager.h @@ -25,7 +25,7 @@ namespace OHOS::Ace::NG { class GroupManager : public virtual AceType { - DECLARE_ACE_TYPE(GroupManager, AceType) + DECLARE_ACE_TYPE(GroupManager, AceType); public: GroupManager() = default; diff --git a/frameworks/core/components_ng/pattern/overlay/sheet_wrapper_paint_method.h b/frameworks/core/components_ng/pattern/overlay/sheet_wrapper_paint_method.h index 8ef77242eb6a19283a728e5733680124f79fd561..cc4bbbddccb76d6147893f9812f86ba9665fa027 100644 --- a/frameworks/core/components_ng/pattern/overlay/sheet_wrapper_paint_method.h +++ b/frameworks/core/components_ng/pattern/overlay/sheet_wrapper_paint_method.h @@ -23,7 +23,7 @@ namespace OHOS::Ace::NG { class ACE_EXPORT SheetWrapperPaintMethod : public NodePaintMethod { - DECLARE_ACE_TYPE(SheetWrapperPaintMethod, NodePaintMethod) + DECLARE_ACE_TYPE(SheetWrapperPaintMethod, NodePaintMethod); public: SheetWrapperPaintMethod() {} ~SheetWrapperPaintMethod() override = default; diff --git a/frameworks/core/components_ng/pattern/panel/drag_bar_paint_method.h b/frameworks/core/components_ng/pattern/panel/drag_bar_paint_method.h index a0c0e6c4587f2c7f0b0fc09a001eb23857282261..8c2a129ad63de7bca2cdeda8b54dad00765f9246 100644 --- a/frameworks/core/components_ng/pattern/panel/drag_bar_paint_method.h +++ b/frameworks/core/components_ng/pattern/panel/drag_bar_paint_method.h @@ -24,7 +24,7 @@ namespace OHOS::Ace::NG { class DragBarPaintMethod : public NodePaintMethod { - DECLARE_ACE_TYPE(DragBarPaintMethod, NodePaintMethod) + DECLARE_ACE_TYPE(DragBarPaintMethod, NodePaintMethod); public: DragBarPaintMethod() = default; ~DragBarPaintMethod() override = default; diff --git a/frameworks/core/components_ng/pattern/panel/sliding_panel_event_hub.h b/frameworks/core/components_ng/pattern/panel/sliding_panel_event_hub.h index 824409269146372ee982d76417a152747e47bdcb..709a993e69888d1b5c9e025aa0f516ef08b095ca 100644 --- a/frameworks/core/components_ng/pattern/panel/sliding_panel_event_hub.h +++ b/frameworks/core/components_ng/pattern/panel/sliding_panel_event_hub.h @@ -31,7 +31,7 @@ using ChangeEvent = std::function; using HeightChangeEvent = std::function; class SlidingPanelEventHub : public EventHub { - DECLARE_ACE_TYPE(SlidingPanelEventHub, EventHub) + DECLARE_ACE_TYPE(SlidingPanelEventHub, EventHub); public: SlidingPanelEventHub() = default; diff --git a/frameworks/core/components_ng/pattern/patternlock/patternlock_event_hub.h b/frameworks/core/components_ng/pattern/patternlock/patternlock_event_hub.h index 5959cba83884d59ce9a224df8e7bbfffc8561eca..9d80c027fdfca3e1cbcea0cd0dc746794a1dd459 100644 --- a/frameworks/core/components_ng/pattern/patternlock/patternlock_event_hub.h +++ b/frameworks/core/components_ng/pattern/patternlock/patternlock_event_hub.h @@ -25,7 +25,7 @@ namespace OHOS::Ace::NG { using PatternLockCompleteEvent = std::function; class PatternLockEventHub : public EventHub { - DECLARE_ACE_TYPE(PatternLockEventHub, EventHub) + DECLARE_ACE_TYPE(PatternLockEventHub, EventHub); public: PatternLockEventHub() = default; diff --git a/frameworks/core/components_ng/pattern/patternlock/patternlock_layout_property.h b/frameworks/core/components_ng/pattern/patternlock/patternlock_layout_property.h index f1c906991cf77303815ffbe3e284bdd995e46306..7e2515b0b3811f08e4095a4e9356e771f13df844 100644 --- a/frameworks/core/components_ng/pattern/patternlock/patternlock_layout_property.h +++ b/frameworks/core/components_ng/pattern/patternlock/patternlock_layout_property.h @@ -23,7 +23,7 @@ namespace OHOS::Ace::NG { class PatternLockLayoutProperty : public LayoutProperty { - DECLARE_ACE_TYPE(PatternLockLayoutProperty, LayoutProperty) + DECLARE_ACE_TYPE(PatternLockLayoutProperty, LayoutProperty); public: PatternLockLayoutProperty() = default; diff --git a/frameworks/core/components_ng/pattern/patternlock/patternlock_paint_method.h b/frameworks/core/components_ng/pattern/patternlock/patternlock_paint_method.h index 97b98f312c8e33568666236a4492614c93fef2fe..f366af79e370d1acf5dc1edfe2a5cee929867966 100644 --- a/frameworks/core/components_ng/pattern/patternlock/patternlock_paint_method.h +++ b/frameworks/core/components_ng/pattern/patternlock/patternlock_paint_method.h @@ -32,7 +32,7 @@ namespace OHOS::Ace::NG { class ACE_EXPORT PatternLockPaintMethod : public NodePaintMethod { - DECLARE_ACE_TYPE(PatternLockPaintMethod, NodePaintMethod) + DECLARE_ACE_TYPE(PatternLockPaintMethod, NodePaintMethod); public: PatternLockPaintMethod(const OffsetF& cellCenter, bool isMoveEventValid, diff --git a/frameworks/core/components_ng/pattern/patternlock/patternlock_paint_property.h b/frameworks/core/components_ng/pattern/patternlock/patternlock_paint_property.h index 271f375b4255c27909694f84d27e3dd4aa85d975..51ad447de04081e40ecc3937e93711cf367cdd7b 100644 --- a/frameworks/core/components_ng/pattern/patternlock/patternlock_paint_property.h +++ b/frameworks/core/components_ng/pattern/patternlock/patternlock_paint_property.h @@ -24,7 +24,7 @@ namespace OHOS::Ace::NG { class PatternLockPaintProperty : public PaintProperty { - DECLARE_ACE_TYPE(PatternLockPaintProperty, PaintProperty) + DECLARE_ACE_TYPE(PatternLockPaintProperty, PaintProperty); public: PatternLockPaintProperty() = default; diff --git a/frameworks/core/components_ng/pattern/picker/datepicker_event_hub.h b/frameworks/core/components_ng/pattern/picker/datepicker_event_hub.h index c21a503a83ace3b70bf92a694bb12d5cee537414..0b8686085c123512d00749d514baa2ea1023bea7 100644 --- a/frameworks/core/components_ng/pattern/picker/datepicker_event_hub.h +++ b/frameworks/core/components_ng/pattern/picker/datepicker_event_hub.h @@ -28,7 +28,7 @@ using DialogCancelEvent = std::function; using DialogGestureEvent = std::function; class DatePickerEventHub : public EventHub { - DECLARE_ACE_TYPE(DatePickerEventHub, EventHub) + DECLARE_ACE_TYPE(DatePickerEventHub, EventHub); public: DatePickerEventHub() = default; diff --git a/frameworks/core/components_ng/pattern/picker/datepicker_paint_method.h b/frameworks/core/components_ng/pattern/picker/datepicker_paint_method.h index 91717c0eb119b41dbd6ccd89b46635dcac327930..b2f79fc738d2b8d2eef4b449e8e956834128ebb4 100644 --- a/frameworks/core/components_ng/pattern/picker/datepicker_paint_method.h +++ b/frameworks/core/components_ng/pattern/picker/datepicker_paint_method.h @@ -28,7 +28,7 @@ namespace OHOS::Ace::NG { class ACE_EXPORT DatePickerPaintMethod : public NodePaintMethod { - DECLARE_ACE_TYPE(DatePickerPaintMethod, NodePaintMethod) + DECLARE_ACE_TYPE(DatePickerPaintMethod, NodePaintMethod); public: DatePickerPaintMethod() = default; ~DatePickerPaintMethod() override {} diff --git a/frameworks/core/components_ng/pattern/picker_utils/picker_column_pattern.h b/frameworks/core/components_ng/pattern/picker_utils/picker_column_pattern.h index 17650e08e12fa45058bead7369645a1b8747f7a5..3b84d5ce69d821bbbcf49581910b8aeede7712d2 100644 --- a/frameworks/core/components_ng/pattern/picker_utils/picker_column_pattern.h +++ b/frameworks/core/components_ng/pattern/picker_utils/picker_column_pattern.h @@ -52,7 +52,7 @@ struct PickerOptionProperty { }; class PickerEventParam : public virtual AceType { - DECLARE_ACE_TYPE(PickerEventParam, AceType) + DECLARE_ACE_TYPE(PickerEventParam, AceType); public: WeakPtr instance_; diff --git a/frameworks/core/components_ng/pattern/plugin/plugin_event_hub.h b/frameworks/core/components_ng/pattern/plugin/plugin_event_hub.h index f1e467fb9ea908ee7d61a4aae35f156ccb4f9f98..d83c0121b6a2cc9f9c35491cd332c635ec7c94cd 100644 --- a/frameworks/core/components_ng/pattern/plugin/plugin_event_hub.h +++ b/frameworks/core/components_ng/pattern/plugin/plugin_event_hub.h @@ -25,7 +25,7 @@ namespace OHOS::Ace::NG { using PluginCallback = std::function; class PluginEventHub : public EventHub { - DECLARE_ACE_TYPE(PluginEventHub, EventHub) + DECLARE_ACE_TYPE(PluginEventHub, EventHub); public: PluginEventHub() = default; diff --git a/frameworks/core/components_ng/pattern/progress/progress_paint_method.h b/frameworks/core/components_ng/pattern/progress/progress_paint_method.h index e7367d40882d5613789a93bc82835ca6ce554e8a..200f01900aa2440d8623734855f62ca7f607d3fa 100644 --- a/frameworks/core/components_ng/pattern/progress/progress_paint_method.h +++ b/frameworks/core/components_ng/pattern/progress/progress_paint_method.h @@ -36,7 +36,7 @@ namespace OHOS::Ace::NG { constexpr float DEFAULT_BORDER_WIDTH = 1.0f; class ACE_EXPORT ProgressPaintMethod : public NodePaintMethod { - DECLARE_ACE_TYPE(ProgressPaintMethod, NodePaintMethod) + DECLARE_ACE_TYPE(ProgressPaintMethod, NodePaintMethod); public: explicit ProgressPaintMethod(ProgressType progressType, float strokeWidth, const RefPtr& progressModifier, bool isUserInitiatedColor) diff --git a/frameworks/core/components_ng/pattern/qrcode/qrcode_paint_method.h b/frameworks/core/components_ng/pattern/qrcode/qrcode_paint_method.h index de15efa3cf0a3bfbbf0c258031e46905f2bade80..c441bc60ce3bdf44c32faa464dfde0c8ab09dc1b 100644 --- a/frameworks/core/components_ng/pattern/qrcode/qrcode_paint_method.h +++ b/frameworks/core/components_ng/pattern/qrcode/qrcode_paint_method.h @@ -25,7 +25,7 @@ namespace OHOS::Ace::NG { class QRCodePaintMethod : public NodePaintMethod { - DECLARE_ACE_TYPE(QRCodePaintMethod, NodePaintMethod) + DECLARE_ACE_TYPE(QRCodePaintMethod, NodePaintMethod); public: QRCodePaintMethod(float qrCodeSize, const RefPtr& qrCodeModifier) diff --git a/frameworks/core/components_ng/pattern/qrcode/qrcode_paint_property.h b/frameworks/core/components_ng/pattern/qrcode/qrcode_paint_property.h index a05f16d110c2ec89386eafa0952b71e52fdecd61..128d120b82cc7c43bdbe067dc2832ea158dc3c9e 100644 --- a/frameworks/core/components_ng/pattern/qrcode/qrcode_paint_property.h +++ b/frameworks/core/components_ng/pattern/qrcode/qrcode_paint_property.h @@ -26,7 +26,7 @@ namespace OHOS::Ace::NG { class QRCodePaintProperty : public PaintProperty { - DECLARE_ACE_TYPE(QRCodePaintProperty, PaintProperty) + DECLARE_ACE_TYPE(QRCodePaintProperty, PaintProperty); public: QRCodePaintProperty() = default; diff --git a/frameworks/core/components_ng/pattern/radio/radio_event_hub.h b/frameworks/core/components_ng/pattern/radio/radio_event_hub.h index 767dadacdaeb98ca7c1599d07a73ddd9fc2fc255..a0e5ebf2521f125b6514eeed5ea4d0ea60040a1f 100644 --- a/frameworks/core/components_ng/pattern/radio/radio_event_hub.h +++ b/frameworks/core/components_ng/pattern/radio/radio_event_hub.h @@ -27,7 +27,7 @@ namespace OHOS::Ace::NG { using ChangeEvent = std::function; class RadioEventHub : public EventHub { - DECLARE_ACE_TYPE(RadioEventHub, EventHub) + DECLARE_ACE_TYPE(RadioEventHub, EventHub); public: RadioEventHub() = default; diff --git a/frameworks/core/components_ng/pattern/radio/radio_paint_method.h b/frameworks/core/components_ng/pattern/radio/radio_paint_method.h index 92bb4d5083c1fa5c326a79440b29c358d3c56789..455d5b4647a20e0ef51fe032d333fcaffa7a9209 100644 --- a/frameworks/core/components_ng/pattern/radio/radio_paint_method.h +++ b/frameworks/core/components_ng/pattern/radio/radio_paint_method.h @@ -25,7 +25,7 @@ namespace OHOS::Ace::NG { class RadioPaintMethod : public NodePaintMethod { - DECLARE_ACE_TYPE(RadioPaintMethod, NodePaintMethod) + DECLARE_ACE_TYPE(RadioPaintMethod, NodePaintMethod); public: explicit RadioPaintMethod(const RefPtr& radioModifier) : radioModifier_(radioModifier) {} diff --git a/frameworks/core/components_ng/pattern/radio/radio_paint_property.h b/frameworks/core/components_ng/pattern/radio/radio_paint_property.h index 8b63b5a992b3a2cc1fa8154debd0493d305f0be8..7d0aef130121875e8d51f45c4cbd5d73849de58f 100644 --- a/frameworks/core/components_ng/pattern/radio/radio_paint_property.h +++ b/frameworks/core/components_ng/pattern/radio/radio_paint_property.h @@ -24,7 +24,7 @@ namespace OHOS::Ace::NG { class RadioPaintProperty : public PaintProperty { - DECLARE_ACE_TYPE(RadioPaintProperty, PaintProperty) + DECLARE_ACE_TYPE(RadioPaintProperty, PaintProperty); public: RadioPaintProperty() = default; diff --git a/frameworks/core/components_ng/pattern/rating/rating_event_hub.h b/frameworks/core/components_ng/pattern/rating/rating_event_hub.h index e54fee84bd558af75f8f80c08059222b99f5d0b2..a521c8cd019d96f0d5d2ea6eccfaad5f6ceb3a6f 100644 --- a/frameworks/core/components_ng/pattern/rating/rating_event_hub.h +++ b/frameworks/core/components_ng/pattern/rating/rating_event_hub.h @@ -25,7 +25,7 @@ namespace OHOS::Ace::NG { using ChangeEvent = std::function; class RatingEventHub : public EventHub { - DECLARE_ACE_TYPE(RatingEventHub, EventHub) + DECLARE_ACE_TYPE(RatingEventHub, EventHub); public: RatingEventHub() = default; diff --git a/frameworks/core/components_ng/pattern/rating/rating_paint_method.h b/frameworks/core/components_ng/pattern/rating/rating_paint_method.h index 01281929177d43fec79f0f23eb970982fbcf5216..49597a762159e3d71980e858b9b34c007be585de 100644 --- a/frameworks/core/components_ng/pattern/rating/rating_paint_method.h +++ b/frameworks/core/components_ng/pattern/rating/rating_paint_method.h @@ -25,7 +25,7 @@ namespace OHOS::Ace::NG { class ACE_EXPORT RatingPaintMethod : public NodePaintMethod { - DECLARE_ACE_TYPE(RatingPaintMethod, NodePaintMethod) + DECLARE_ACE_TYPE(RatingPaintMethod, NodePaintMethod); public: RatingPaintMethod(const WeakPtr& pattern, const RefPtr& ratingModifier, int32_t starNum, RatingModifier::RatingAnimationType state, bool reverse) diff --git a/frameworks/core/components_ng/pattern/rating/rating_render_property.h b/frameworks/core/components_ng/pattern/rating/rating_render_property.h index c7e4516881f59744c990c3dfb117819b0317fc04..ac04f71cc8854495e515c046cafc9cd5bd9d5081 100644 --- a/frameworks/core/components_ng/pattern/rating/rating_render_property.h +++ b/frameworks/core/components_ng/pattern/rating/rating_render_property.h @@ -26,7 +26,7 @@ namespace OHOS::Ace::NG { // PaintProperty are used to set render properties. class RatingRenderProperty : public PaintProperty { - DECLARE_ACE_TYPE(RatingRenderProperty, PaintProperty) + DECLARE_ACE_TYPE(RatingRenderProperty, PaintProperty); public: RatingRenderProperty() = default; diff --git a/frameworks/core/components_ng/pattern/refresh/refresh_event_hub.h b/frameworks/core/components_ng/pattern/refresh/refresh_event_hub.h index d67b43adc89db930ae13247375cdbb448603bfa9..e1fc29f88b7121f1fb6f6966200197cdbe6fc474 100644 --- a/frameworks/core/components_ng/pattern/refresh/refresh_event_hub.h +++ b/frameworks/core/components_ng/pattern/refresh/refresh_event_hub.h @@ -27,7 +27,7 @@ using RefreshingEvent = std::function; using OffsetChangeEvent = std::function; class RefreshEventHub : public EventHub { - DECLARE_ACE_TYPE(RefreshEventHub, EventHub) + DECLARE_ACE_TYPE(RefreshEventHub, EventHub); public: RefreshEventHub() = default; diff --git a/frameworks/core/components_ng/pattern/render_node/render_node_paint_method.h b/frameworks/core/components_ng/pattern/render_node/render_node_paint_method.h index bdb55e79c12171c79cf98bc514f056450198e271..643f4e4a9a9d45dddafb6d2287808ca9b7ad7199 100644 --- a/frameworks/core/components_ng/pattern/render_node/render_node_paint_method.h +++ b/frameworks/core/components_ng/pattern/render_node/render_node_paint_method.h @@ -25,7 +25,7 @@ namespace OHOS::Ace::NG { class RenderNodePaintMethod : public NodePaintMethod { - DECLARE_ACE_TYPE(RenderNodePaintMethod, NodePaintMethod) + DECLARE_ACE_TYPE(RenderNodePaintMethod, NodePaintMethod); public: explicit RenderNodePaintMethod(const RefPtr& renderNodeModifier) : renderNodeModifier_(renderNodeModifier) diff --git a/frameworks/core/components_ng/pattern/render_node/render_node_paint_property.h b/frameworks/core/components_ng/pattern/render_node/render_node_paint_property.h index cae6d2eef1065b37158b3fb3be1449b4906ac2d9..6b680dfd4a9caa70540cc37d1fef1a34fbb8a2c0 100644 --- a/frameworks/core/components_ng/pattern/render_node/render_node_paint_property.h +++ b/frameworks/core/components_ng/pattern/render_node/render_node_paint_property.h @@ -22,7 +22,7 @@ namespace OHOS::Ace::NG { class RenderNodePaintProperty : public PaintProperty { - DECLARE_ACE_TYPE(RenderNodePaintProperty, PaintProperty) + DECLARE_ACE_TYPE(RenderNodePaintProperty, PaintProperty); private: WeakPtr host_; diff --git a/frameworks/core/components_ng/pattern/rich_editor/rich_editor_content_modifier.h b/frameworks/core/components_ng/pattern/rich_editor/rich_editor_content_modifier.h index 6fe62cb97039649da7ceb8341d6f9dd530d8454c..04d2c12f079293e60ace3cfc26fc45e86b6ffde3 100644 --- a/frameworks/core/components_ng/pattern/rich_editor/rich_editor_content_modifier.h +++ b/frameworks/core/components_ng/pattern/rich_editor/rich_editor_content_modifier.h @@ -21,7 +21,7 @@ namespace OHOS::Ace::NG { class RichEditorContentModifier : public TextContentModifier { - DECLARE_ACE_TYPE(RichEditorContentModifier, TextContentModifier) + DECLARE_ACE_TYPE(RichEditorContentModifier, TextContentModifier); public: explicit RichEditorContentModifier(const std::optional& textStyle, diff --git a/frameworks/core/components_ng/pattern/rich_editor/rich_editor_event_hub.h b/frameworks/core/components_ng/pattern/rich_editor/rich_editor_event_hub.h index 8b074ee5fa60881d9fda24c7a641097e46d3c502..a1116b14e79444019c5c4beacfb71292d659f7cc 100644 --- a/frameworks/core/components_ng/pattern/rich_editor/rich_editor_event_hub.h +++ b/frameworks/core/components_ng/pattern/rich_editor/rich_editor_event_hub.h @@ -57,7 +57,7 @@ private: }; class ACE_FORCE_EXPORT RichEditorInsertValue : public BaseEventInfo { - DECLARE_ACE_TYPE(RichEditorInsertValue, BaseEventInfo) + DECLARE_ACE_TYPE(RichEditorInsertValue, BaseEventInfo); public: RichEditorInsertValue() : BaseEventInfo("RichEditorInsertValue") {} ~RichEditorInsertValue() override = default; @@ -208,7 +208,7 @@ private: enum class RichEditorDeleteDirection { BACKWARD = 0, FORWARD }; class ACE_FORCE_EXPORT RichEditorDeleteValue : public BaseEventInfo { - DECLARE_ACE_TYPE(RichEditorDeleteValue, BaseEventInfo) + DECLARE_ACE_TYPE(RichEditorDeleteValue, BaseEventInfo); public: RichEditorDeleteValue() : BaseEventInfo("RichEditorDeleteValue") {} ~RichEditorDeleteValue() = default; @@ -230,7 +230,7 @@ private: }; class ACE_FORCE_EXPORT RichEditorChangeValue : public BaseEventInfo { - DECLARE_ACE_TYPE(RichEditorChangeValue, BaseEventInfo) + DECLARE_ACE_TYPE(RichEditorChangeValue, BaseEventInfo); #ifndef ACE_UNITTEST private: #else @@ -286,7 +286,7 @@ private: }; class StyledStringChangeValue : public BaseEventInfo { - DECLARE_ACE_TYPE(StyledStringChangeValue, BaseEventInfo) + DECLARE_ACE_TYPE(StyledStringChangeValue, BaseEventInfo); public: StyledStringChangeValue() : BaseEventInfo("StyledStringChangeValue") {} ~StyledStringChangeValue() = default; @@ -311,7 +311,7 @@ private: }; class RichEditorEventHub : public EventHub { - DECLARE_ACE_TYPE(RichEditorEventHub, EventHub) + DECLARE_ACE_TYPE(RichEditorEventHub, EventHub); public: RichEditorEventHub() = default; diff --git a/frameworks/core/components_ng/pattern/rich_editor/rich_editor_overlay_modifier.h b/frameworks/core/components_ng/pattern/rich_editor/rich_editor_overlay_modifier.h index 9bf70c34a144c268eb884783b99849f92c052950..7366e7e29bd579ca5659c1ce04ec2c9f5f119484 100644 --- a/frameworks/core/components_ng/pattern/rich_editor/rich_editor_overlay_modifier.h +++ b/frameworks/core/components_ng/pattern/rich_editor/rich_editor_overlay_modifier.h @@ -24,7 +24,7 @@ namespace OHOS::Ace::NG { class RichEditorOverlayModifier : public TextOverlayModifier { - DECLARE_ACE_TYPE(RichEditorOverlayModifier, TextOverlayModifier) + DECLARE_ACE_TYPE(RichEditorOverlayModifier, TextOverlayModifier); public: RichEditorOverlayModifier(const WeakPtr& pattern, diff --git a/frameworks/core/components_ng/pattern/rich_editor/rich_editor_paint_method.h b/frameworks/core/components_ng/pattern/rich_editor/rich_editor_paint_method.h index 3f18044231fdcbb69c70056acb36d1df3a9ef588..c2e42a2528f999ce50e0c10e0c9529c4aba5c4ba 100644 --- a/frameworks/core/components_ng/pattern/rich_editor/rich_editor_paint_method.h +++ b/frameworks/core/components_ng/pattern/rich_editor/rich_editor_paint_method.h @@ -23,7 +23,7 @@ namespace OHOS::Ace::NG { class ACE_EXPORT RichEditorPaintMethod : public TextPaintMethod { - DECLARE_ACE_TYPE(RichEditorPaintMethod, TextPaintMethod) + DECLARE_ACE_TYPE(RichEditorPaintMethod, TextPaintMethod); public: RichEditorPaintMethod(const WeakPtr& pattern, const ParagraphManager* pManager, float baselineOffset, const RefPtr& contentMod, const RefPtr& overlayMod); diff --git a/frameworks/core/components_ng/pattern/rich_editor_drag/rich_editor_drag_paint_method.h b/frameworks/core/components_ng/pattern/rich_editor_drag/rich_editor_drag_paint_method.h index 05cedb9091848ac273d521f7dee7e2a4a3707ae8..684ad2bdcfdd6739fa600de77aac3bcebb5886cc 100644 --- a/frameworks/core/components_ng/pattern/rich_editor_drag/rich_editor_drag_paint_method.h +++ b/frameworks/core/components_ng/pattern/rich_editor_drag/rich_editor_drag_paint_method.h @@ -24,7 +24,7 @@ namespace OHOS::Ace::NG { class ACE_EXPORT RichEditorDragPaintMethod : public TextDragPaintMethod { - DECLARE_ACE_TYPE(RichEditorDragPaintMethod, TextDragPaintMethod) + DECLARE_ACE_TYPE(RichEditorDragPaintMethod, TextDragPaintMethod); public: RichEditorDragPaintMethod(const WeakPtr& pattern, const RefPtr& overlayMod, const RefPtr& contentMod, diff --git a/frameworks/core/components_ng/pattern/scroll/inner/scroll_bar_overlay_modifier.h b/frameworks/core/components_ng/pattern/scroll/inner/scroll_bar_overlay_modifier.h index 121e898ff22e41cc2a2a962b2b23fc07fc58bf06..41353a16b1cb4e25d99646aec17b36be7b35cc78 100644 --- a/frameworks/core/components_ng/pattern/scroll/inner/scroll_bar_overlay_modifier.h +++ b/frameworks/core/components_ng/pattern/scroll/inner/scroll_bar_overlay_modifier.h @@ -56,7 +56,7 @@ enum class HoverAnimationType { }; class ScrollBarOverlayModifier : public OverlayModifier { - DECLARE_ACE_TYPE(ScrollBarOverlayModifier, OverlayModifier) + DECLARE_ACE_TYPE(ScrollBarOverlayModifier, OverlayModifier); public: ScrollBarOverlayModifier(const OffsetF& barOffset = OffsetF(), const SizeF& barSize = SizeF()); diff --git a/frameworks/core/components_ng/pattern/scroll/scroll_event_hub.h b/frameworks/core/components_ng/pattern/scroll/scroll_event_hub.h index f9809f9a212d0c8a176e9c716a077f0eeb2b5347..d47aa0e764c36253d972bad23eb9bdae791bf3ed 100644 --- a/frameworks/core/components_ng/pattern/scroll/scroll_event_hub.h +++ b/frameworks/core/components_ng/pattern/scroll/scroll_event_hub.h @@ -45,7 +45,7 @@ using ScrollEdgeEvent = std::function; using ScrollEndEvent = std::function; class ScrollEventHub : public ScrollableEventHub { - DECLARE_ACE_TYPE(ScrollEventHub, ScrollableEventHub) + DECLARE_ACE_TYPE(ScrollEventHub, ScrollableEventHub); public: ScrollEventHub() = default; diff --git a/frameworks/core/components_ng/pattern/scroll/scroll_paint_method.h b/frameworks/core/components_ng/pattern/scroll/scroll_paint_method.h index a5acc7b5105c891dc6154dea10f2ae40d438c2fd..1216e84a0ba5b995ba6f010907cc723f82a311bb 100644 --- a/frameworks/core/components_ng/pattern/scroll/scroll_paint_method.h +++ b/frameworks/core/components_ng/pattern/scroll/scroll_paint_method.h @@ -26,7 +26,7 @@ namespace OHOS::Ace::NG { class ScrollPaintMethod : public ScrollablePaintMethod { - DECLARE_ACE_TYPE(ScrollPaintMethod, ScrollablePaintMethod) + DECLARE_ACE_TYPE(ScrollPaintMethod, ScrollablePaintMethod); public: ScrollPaintMethod() = default; diff --git a/frameworks/core/components_ng/pattern/scroll_bar/scroll_bar_paint_method.h b/frameworks/core/components_ng/pattern/scroll_bar/scroll_bar_paint_method.h index 051a8c52a1922f7d4d0fa16f551ea4d72892221f..8ba3bf3926fb165f306b3c1991ac9a9b9209f9b4 100644 --- a/frameworks/core/components_ng/pattern/scroll_bar/scroll_bar_paint_method.h +++ b/frameworks/core/components_ng/pattern/scroll_bar/scroll_bar_paint_method.h @@ -22,7 +22,7 @@ namespace OHOS::Ace::NG { class ScrollBarPaintMethod : public NodePaintMethod { - DECLARE_ACE_TYPE(ScrollBarPaintMethod, NodePaintMethod) + DECLARE_ACE_TYPE(ScrollBarPaintMethod, NodePaintMethod); public: explicit ScrollBarPaintMethod(bool hasChild) : hasChild_(hasChild) {}; diff --git a/frameworks/core/components_ng/pattern/scrollable/nestable_scroll_container.h b/frameworks/core/components_ng/pattern/scrollable/nestable_scroll_container.h index d6c53057516da04baca85d953662cb00b8ffc162..dca8667839b497b12d05971ecbba853f876b6eca 100644 --- a/frameworks/core/components_ng/pattern/scrollable/nestable_scroll_container.h +++ b/frameworks/core/components_ng/pattern/scrollable/nestable_scroll_container.h @@ -23,7 +23,7 @@ namespace OHOS::Ace::NG { class NestableScrollContainer : public virtual Pattern { - DECLARE_ACE_TYPE(NestableScrollContainer, Pattern) + DECLARE_ACE_TYPE(NestableScrollContainer, Pattern); public: NestableScrollContainer() = default; ~NestableScrollContainer() override = default; diff --git a/frameworks/core/components_ng/pattern/scrollable/scrollable_event_hub.h b/frameworks/core/components_ng/pattern/scrollable/scrollable_event_hub.h index 1bde13d2c545de88a4c196e3efe9d8e2e5e9679a..4971e239da0af185159e0b3a862c2475a3ca8d38 100644 --- a/frameworks/core/components_ng/pattern/scrollable/scrollable_event_hub.h +++ b/frameworks/core/components_ng/pattern/scrollable/scrollable_event_hub.h @@ -21,7 +21,7 @@ namespace OHOS::Ace::NG { class ScrollableEventHub : public EventHub { - DECLARE_ACE_TYPE(ScrollableEventHub, EventHub) + DECLARE_ACE_TYPE(ScrollableEventHub, EventHub); public: ScrollableEventHub() = default; diff --git a/frameworks/core/components_ng/pattern/scrollable/scrollable_paint_method.h b/frameworks/core/components_ng/pattern/scrollable/scrollable_paint_method.h index b7c55e850a18187333bdcff231cd970f7ed17f41..a9487c3865ce01f12c7f93141ba9152ba43af6fd 100644 --- a/frameworks/core/components_ng/pattern/scrollable/scrollable_paint_method.h +++ b/frameworks/core/components_ng/pattern/scrollable/scrollable_paint_method.h @@ -21,7 +21,7 @@ namespace OHOS::Ace::NG { class ACE_EXPORT ScrollablePaintMethod : public NodePaintMethod { - DECLARE_ACE_TYPE(ScrollablePaintMethod, NodePaintMethod) + DECLARE_ACE_TYPE(ScrollablePaintMethod, NodePaintMethod); public: ScrollablePaintMethod() = default; ScrollablePaintMethod(bool vertical, bool isReverse, bool isVerticalReverse = false) diff --git a/frameworks/core/components_ng/pattern/scrollable/scrollable_paint_property.h b/frameworks/core/components_ng/pattern/scrollable/scrollable_paint_property.h index 7ef765b878f380ad7d61487d64e2c9e9ca1a6cee..a41ede5383421b3055acce2936c0289078efd5c3 100644 --- a/frameworks/core/components_ng/pattern/scrollable/scrollable_paint_property.h +++ b/frameworks/core/components_ng/pattern/scrollable/scrollable_paint_property.h @@ -48,7 +48,7 @@ enum class ContentClipMode { using ContentClip = std::pair>; class ScrollablePaintProperty : public PaintProperty { - DECLARE_ACE_TYPE(ScrollablePaintProperty, PaintProperty) + DECLARE_ACE_TYPE(ScrollablePaintProperty, PaintProperty); public: ScrollablePaintProperty() = default; @@ -98,7 +98,7 @@ private: }; class GridPaintProperty : public ScrollablePaintProperty { - DECLARE_ACE_TYPE(GridPaintProperty, ScrollablePaintProperty) + DECLARE_ACE_TYPE(GridPaintProperty, ScrollablePaintProperty); public: RefPtr Clone() const override; @@ -109,7 +109,7 @@ public: }; class ScrollPaintProperty : public ScrollablePaintProperty { - DECLARE_ACE_TYPE(ScrollPaintProperty, ScrollablePaintProperty) + DECLARE_ACE_TYPE(ScrollPaintProperty, ScrollablePaintProperty); public: RefPtr Clone() const override; diff --git a/frameworks/core/components_ng/pattern/search/search_event_hub.h b/frameworks/core/components_ng/pattern/search/search_event_hub.h index aa22ca30011e31de70ad97ed91c72f64850b0623..a7e98342f169636754bf84578d94b9c182723918 100644 --- a/frameworks/core/components_ng/pattern/search/search_event_hub.h +++ b/frameworks/core/components_ng/pattern/search/search_event_hub.h @@ -28,7 +28,7 @@ namespace OHOS::Ace::NG { using ChangeAndSubmitEvent = std::function; class SearchEventHub : public EventHub { - DECLARE_ACE_TYPE(SearchEventHub, EventHub) + DECLARE_ACE_TYPE(SearchEventHub, EventHub); public: SearchEventHub() = default; diff --git a/frameworks/core/components_ng/pattern/security_component/security_component_paint_property.h b/frameworks/core/components_ng/pattern/security_component/security_component_paint_property.h index 60a272f0420f4ab66e5940cd35133fb62884161b..d975119ce231fb59bb4f3e44affd1b4542cf3421 100644 --- a/frameworks/core/components_ng/pattern/security_component/security_component_paint_property.h +++ b/frameworks/core/components_ng/pattern/security_component/security_component_paint_property.h @@ -23,7 +23,7 @@ namespace OHOS::Ace::NG { class SecurityComponentPaintProperty : public PaintProperty { - DECLARE_ACE_TYPE(SecurityComponentPaintProperty, PaintProperty); + DECLARE_ACE_TYPE(SecurityComponentPaintProperty, PaintProperty);; public: SecurityComponentPaintProperty() = default; diff --git a/frameworks/core/components_ng/pattern/select/select_event_hub.h b/frameworks/core/components_ng/pattern/select/select_event_hub.h index 35c49a64f57fb73ca7bfecd590f8d70d8386f4fa..608a25e42bc94e08ce60e5e3e8584babf638c85a 100644 --- a/frameworks/core/components_ng/pattern/select/select_event_hub.h +++ b/frameworks/core/components_ng/pattern/select/select_event_hub.h @@ -27,7 +27,7 @@ using SelectChangeEvent = std::function; using ValueChangeEvent = std::function; class SelectEventHub : public EventHub { - DECLARE_ACE_TYPE(SelectEventHub, EventHub) + DECLARE_ACE_TYPE(SelectEventHub, EventHub); public: SelectEventHub() = default; diff --git a/frameworks/core/components_ng/pattern/select/select_paint_property.h b/frameworks/core/components_ng/pattern/select/select_paint_property.h index bb88d5a7b9c4cae26c0133eb5405934c896c7c2e..52291db678a11ea2767034b89280729b3450b35f 100644 --- a/frameworks/core/components_ng/pattern/select/select_paint_property.h +++ b/frameworks/core/components_ng/pattern/select/select_paint_property.h @@ -26,7 +26,7 @@ namespace OHOS::Ace::NG { // PaintProperty are used to set paint properties. class SelectPaintProperty : public PaintProperty { - DECLARE_ACE_TYPE(SelectPaintProperty, PaintProperty) + DECLARE_ACE_TYPE(SelectPaintProperty, PaintProperty); public: SelectPaintProperty() = default; ~SelectPaintProperty() override = default; diff --git a/frameworks/core/components_ng/pattern/select_overlay/select_overlay_content_modifier.h b/frameworks/core/components_ng/pattern/select_overlay/select_overlay_content_modifier.h index a910ad94298f58d68b3256509730991ba9038e33..cf64c6fc4332ee9eb25d64bd8427e8388eae796f 100644 --- a/frameworks/core/components_ng/pattern/select_overlay/select_overlay_content_modifier.h +++ b/frameworks/core/components_ng/pattern/select_overlay/select_overlay_content_modifier.h @@ -47,7 +47,7 @@ struct PaintHandleParams { }; class SelectOverlayContentModifier : public ContentModifier { - DECLARE_ACE_TYPE(SelectOverlayContentModifier, ContentModifier) + DECLARE_ACE_TYPE(SelectOverlayContentModifier, ContentModifier); public: SelectOverlayContentModifier(const WeakPtr& pattern); diff --git a/frameworks/core/components_ng/pattern/select_overlay/select_overlay_event_hub.h b/frameworks/core/components_ng/pattern/select_overlay/select_overlay_event_hub.h index 4994fbe4832b0e1c359f9d1394c606a5a580379d..017875abafcb0623eabc573399d5e5479a27efcc 100644 --- a/frameworks/core/components_ng/pattern/select_overlay/select_overlay_event_hub.h +++ b/frameworks/core/components_ng/pattern/select_overlay/select_overlay_event_hub.h @@ -20,7 +20,7 @@ namespace OHOS::Ace::NG { class SelectOverlayEventHub : public EventHub { - DECLARE_ACE_TYPE(SelectOverlayEventHub, EventHub) + DECLARE_ACE_TYPE(SelectOverlayEventHub, EventHub); public: SelectOverlayEventHub() = default; diff --git a/frameworks/core/components_ng/pattern/select_overlay/select_overlay_modifier.h b/frameworks/core/components_ng/pattern/select_overlay/select_overlay_modifier.h index d0e1334188cce689d4997cab5cf1b097f67f8cb3..8bc7d6604fa009a9450840cadd7e4fe40f345ccc 100644 --- a/frameworks/core/components_ng/pattern/select_overlay/select_overlay_modifier.h +++ b/frameworks/core/components_ng/pattern/select_overlay/select_overlay_modifier.h @@ -26,7 +26,7 @@ namespace OHOS::Ace::NG { class SelectOverlayModifier : public OverlayModifier { - DECLARE_ACE_TYPE(SelectOverlayModifier, OverlayModifier) + DECLARE_ACE_TYPE(SelectOverlayModifier, OverlayModifier); public: SelectOverlayModifier(const OffsetF& menuOptionOffset, bool isReverse); diff --git a/frameworks/core/components_ng/pattern/select_overlay/select_overlay_node.h b/frameworks/core/components_ng/pattern/select_overlay/select_overlay_node.h index fb49778c8de9f97a4f2912217800a9b008954773..3777b10dde9e2338fc92dc72fc2d3ec9830aaa2f 100644 --- a/frameworks/core/components_ng/pattern/select_overlay/select_overlay_node.h +++ b/frameworks/core/components_ng/pattern/select_overlay/select_overlay_node.h @@ -53,7 +53,7 @@ enum class FrameNodeTrigger { }; class ACE_EXPORT SelectOverlayNode : public FrameNode { - DECLARE_ACE_TYPE(SelectOverlayNode, FrameNode) + DECLARE_ACE_TYPE(SelectOverlayNode, FrameNode); public: explicit SelectOverlayNode(const RefPtr& pattern); ~SelectOverlayNode() override = default; diff --git a/frameworks/core/components_ng/pattern/select_overlay/select_overlay_paint_method.h b/frameworks/core/components_ng/pattern/select_overlay/select_overlay_paint_method.h index aa952e8c5f0ac3d3f7d43b4fc76aaf0f1f2fc7a6..95d496eccf160db8d1cfc779e925d12238541b70 100644 --- a/frameworks/core/components_ng/pattern/select_overlay/select_overlay_paint_method.h +++ b/frameworks/core/components_ng/pattern/select_overlay/select_overlay_paint_method.h @@ -28,7 +28,7 @@ namespace OHOS::Ace::NG { class ACE_EXPORT SelectOverlayPaintMethod : public NodePaintMethod { - DECLARE_ACE_TYPE(SelectOverlayPaintMethod, NodePaintMethod) + DECLARE_ACE_TYPE(SelectOverlayPaintMethod, NodePaintMethod); public: SelectOverlayPaintMethod(const RefPtr& selectOverlayModifier, const RefPtr& selectOverlayContentModifier, SelectOverlayInfo info, diff --git a/frameworks/core/components_ng/pattern/shape/circle_paint_method.h b/frameworks/core/components_ng/pattern/shape/circle_paint_method.h index c5e580b1101d2be8ced5e8e3836f1a103de58cb3..310b138b9aa3251a6ba8bb45d6822eb2bdd08bcb 100644 --- a/frameworks/core/components_ng/pattern/shape/circle_paint_method.h +++ b/frameworks/core/components_ng/pattern/shape/circle_paint_method.h @@ -27,7 +27,7 @@ namespace OHOS::Ace::NG { class ACE_EXPORT CirclePaintMethod : public ShapePaintMethod { - DECLARE_ACE_TYPE(CirclePaintMethod, ShapePaintMethod) + DECLARE_ACE_TYPE(CirclePaintMethod, ShapePaintMethod); public: CirclePaintMethod() = default; CirclePaintMethod( diff --git a/frameworks/core/components_ng/pattern/shape/ellipse_paint_method.h b/frameworks/core/components_ng/pattern/shape/ellipse_paint_method.h index 7909480d0475eb6587929e29ff709ca6af745e5d..8ae2a112a40f8b1d63ac6b0add1b49ea068436c2 100644 --- a/frameworks/core/components_ng/pattern/shape/ellipse_paint_method.h +++ b/frameworks/core/components_ng/pattern/shape/ellipse_paint_method.h @@ -28,7 +28,7 @@ namespace OHOS::Ace::NG { class ACE_EXPORT EllipsePaintMethod : public ShapePaintMethod { - DECLARE_ACE_TYPE(EllipsePaintMethod, ShapePaintMethod) + DECLARE_ACE_TYPE(EllipsePaintMethod, ShapePaintMethod); public: EllipsePaintMethod() = default; EllipsePaintMethod( diff --git a/frameworks/core/components_ng/pattern/shape/line_paint_method.h b/frameworks/core/components_ng/pattern/shape/line_paint_method.h index c695cc8a874a1239acfbf786320700b1f5d1e67f..a2cf3817fbbe435438339e1e7e7ba805527c7b8a 100644 --- a/frameworks/core/components_ng/pattern/shape/line_paint_method.h +++ b/frameworks/core/components_ng/pattern/shape/line_paint_method.h @@ -27,7 +27,7 @@ namespace OHOS::Ace::NG { class ACE_EXPORT LinePaintMethod : public ShapePaintMethod { - DECLARE_ACE_TYPE(LinePaintMethod, ShapePaintMethod) + DECLARE_ACE_TYPE(LinePaintMethod, ShapePaintMethod); public: LinePaintMethod() = default; LinePaintMethod( diff --git a/frameworks/core/components_ng/pattern/shape/path_paint_method.h b/frameworks/core/components_ng/pattern/shape/path_paint_method.h index 3ee25e7eb0f17335fb306b9b7f2d0f81c67c7c50..a8dca363a2e0d006a168fe863358bf51f79f5494 100644 --- a/frameworks/core/components_ng/pattern/shape/path_paint_method.h +++ b/frameworks/core/components_ng/pattern/shape/path_paint_method.h @@ -28,7 +28,7 @@ namespace OHOS::Ace::NG { class ACE_EXPORT PathPaintMethod : public ShapePaintMethod { - DECLARE_ACE_TYPE(PathPaintMethod, ShapePaintMethod) + DECLARE_ACE_TYPE(PathPaintMethod, ShapePaintMethod); public: PathPaintMethod() = default; PathPaintMethod( diff --git a/frameworks/core/components_ng/pattern/shape/polygon_paint_method.h b/frameworks/core/components_ng/pattern/shape/polygon_paint_method.h index 9942b848a4b162d6b68667da0e6b965f32a08479..95bbd4a7ebd2cd86864226332efecf06ca59e8f3 100644 --- a/frameworks/core/components_ng/pattern/shape/polygon_paint_method.h +++ b/frameworks/core/components_ng/pattern/shape/polygon_paint_method.h @@ -28,7 +28,7 @@ namespace OHOS::Ace::NG { class ACE_EXPORT PolygonPaintMethod : public ShapePaintMethod { - DECLARE_ACE_TYPE(PolygonPaintMethod, ShapePaintMethod) + DECLARE_ACE_TYPE(PolygonPaintMethod, ShapePaintMethod); public: PolygonPaintMethod() = default; PolygonPaintMethod( diff --git a/frameworks/core/components_ng/pattern/shape/rect_paint_method.h b/frameworks/core/components_ng/pattern/shape/rect_paint_method.h index 7f2f4653888d3803a1ff9ddc04a94948774fb75d..800c2181ff3083228536a250456379cac95bc443 100644 --- a/frameworks/core/components_ng/pattern/shape/rect_paint_method.h +++ b/frameworks/core/components_ng/pattern/shape/rect_paint_method.h @@ -25,7 +25,7 @@ namespace OHOS::Ace::NG { class ACE_EXPORT RectPaintMethod : public ShapePaintMethod { - DECLARE_ACE_TYPE(RectPaintMethod, ShapePaintMethod) + DECLARE_ACE_TYPE(RectPaintMethod, ShapePaintMethod); public: RectPaintMethod() = default; RectPaintMethod( diff --git a/frameworks/core/components_ng/pattern/shape/shape_container_paint_method.h b/frameworks/core/components_ng/pattern/shape/shape_container_paint_method.h index 16b276cc98854605a86fbbfe838c52ba0296ea70..46b060eb6251737df7d4441bdcda0ce8f241fb5f 100755 --- a/frameworks/core/components_ng/pattern/shape/shape_container_paint_method.h +++ b/frameworks/core/components_ng/pattern/shape/shape_container_paint_method.h @@ -22,7 +22,7 @@ namespace OHOS::Ace::NG { class ACE_EXPORT ShapeContainerPaintMethod : public NodePaintMethod { - DECLARE_ACE_TYPE(ShapeContainerPaintMethod, NodePaintMethod) + DECLARE_ACE_TYPE(ShapeContainerPaintMethod, NodePaintMethod); public: ShapeContainerPaintMethod() = delete; ~ShapeContainerPaintMethod() override = default; diff --git a/frameworks/core/components_ng/pattern/shape/shape_overlay_modifier.h b/frameworks/core/components_ng/pattern/shape/shape_overlay_modifier.h index 58bb76c722145dbf8849e87c92bc830f674c674d..b4d2630822a7dc416a645e46f8edc332d5bf4085 100644 --- a/frameworks/core/components_ng/pattern/shape/shape_overlay_modifier.h +++ b/frameworks/core/components_ng/pattern/shape/shape_overlay_modifier.h @@ -26,7 +26,7 @@ namespace OHOS::Ace::NG { class Pattern; class ShapeOverlayModifier : public OverlayModifier { - DECLARE_ACE_TYPE(ShapeOverlayModifier, OverlayModifier) + DECLARE_ACE_TYPE(ShapeOverlayModifier, OverlayModifier); public: static constexpr double SHAPE_OVERLAY_SIZE_DEFAULT = 4096.0f; diff --git a/frameworks/core/components_ng/pattern/shape/shape_paint_method.h b/frameworks/core/components_ng/pattern/shape/shape_paint_method.h index 2d17e76505998cd7e443dc78bb76213b6a1039e0..8c3ebc1b9e03632fef2ebf2d65ac63303840a504 100755 --- a/frameworks/core/components_ng/pattern/shape/shape_paint_method.h +++ b/frameworks/core/components_ng/pattern/shape/shape_paint_method.h @@ -24,7 +24,7 @@ namespace OHOS::Ace::NG { class ACE_EXPORT ShapePaintMethod : public NodePaintMethod { - DECLARE_ACE_TYPE(ShapePaintMethod, NodePaintMethod) + DECLARE_ACE_TYPE(ShapePaintMethod, NodePaintMethod); public: ShapePaintMethod() = default; ShapePaintMethod( diff --git a/frameworks/core/components_ng/pattern/side_bar/side_bar_container_event_hub.h b/frameworks/core/components_ng/pattern/side_bar/side_bar_container_event_hub.h index b000d6f27465bef35420cecedd3bb6776e4db4d5..d68640224c92f5ea1d32847bf11048f0be11223f 100644 --- a/frameworks/core/components_ng/pattern/side_bar/side_bar_container_event_hub.h +++ b/frameworks/core/components_ng/pattern/side_bar/side_bar_container_event_hub.h @@ -24,7 +24,7 @@ using ChangeEvent = std::function; using OnSideBarWidthChangeEvent = std::function; class SideBarContainerEventHub : public EventHub { - DECLARE_ACE_TYPE(SideBarContainerEventHub, EventHub) + DECLARE_ACE_TYPE(SideBarContainerEventHub, EventHub); public: SideBarContainerEventHub() = default; diff --git a/frameworks/core/components_ng/pattern/side_bar/side_bar_container_paint_method.h b/frameworks/core/components_ng/pattern/side_bar/side_bar_container_paint_method.h index 353be57c2bc0578d8d335733064c33da92d19822..7ad724b57cc91a61e1ccc418db888b66ec9c8673 100644 --- a/frameworks/core/components_ng/pattern/side_bar/side_bar_container_paint_method.h +++ b/frameworks/core/components_ng/pattern/side_bar/side_bar_container_paint_method.h @@ -23,7 +23,7 @@ namespace OHOS::Ace::NG { class SideBarContainerPaintMethod : public NodePaintMethod { - DECLARE_ACE_TYPE(SideBarContainerPaintMethod, NodePaintMethod) + DECLARE_ACE_TYPE(SideBarContainerPaintMethod, NodePaintMethod); public: SideBarContainerPaintMethod() = default; diff --git a/frameworks/core/components_ng/pattern/slider/slider_event_hub.h b/frameworks/core/components_ng/pattern/slider/slider_event_hub.h index bf35863360cb150232fceb7f2230fb85175f8d9c..9aca812b9b4d73107ff8135c5ac4d20de8af9065 100644 --- a/frameworks/core/components_ng/pattern/slider/slider_event_hub.h +++ b/frameworks/core/components_ng/pattern/slider/slider_event_hub.h @@ -25,7 +25,7 @@ using SliderOnChangeEvent = std::function; using SliderOnValueChangeEvent = std::function; class SliderEventHub : public EventHub { - DECLARE_ACE_TYPE(SliderEventHub, EventHub) + DECLARE_ACE_TYPE(SliderEventHub, EventHub); public: SliderEventHub() = default; ~SliderEventHub() override = default; diff --git a/frameworks/core/components_ng/pattern/slider/slider_paint_method.h b/frameworks/core/components_ng/pattern/slider/slider_paint_method.h index cd97017514a42fa0eaf36e4077825b8f9037c2e8..994bb9893e52c02ff0e6f96f66c1312d5efd5e32 100644 --- a/frameworks/core/components_ng/pattern/slider/slider_paint_method.h +++ b/frameworks/core/components_ng/pattern/slider/slider_paint_method.h @@ -30,7 +30,7 @@ namespace OHOS::Ace::NG { class ACE_EXPORT SliderPaintMethod : public NodePaintMethod { - DECLARE_ACE_TYPE(SliderPaintMethod, NodePaintMethod) + DECLARE_ACE_TYPE(SliderPaintMethod, NodePaintMethod); public: struct TipParameters { diff --git a/frameworks/core/components_ng/pattern/slider/slider_paint_property.h b/frameworks/core/components_ng/pattern/slider/slider_paint_property.h index 2669c5b7292742cf50eacdb63c65bd28965f6d42..293c46ed97d117028dffd905ed32c495f8f0848b 100644 --- a/frameworks/core/components_ng/pattern/slider/slider_paint_property.h +++ b/frameworks/core/components_ng/pattern/slider/slider_paint_property.h @@ -26,7 +26,7 @@ namespace OHOS::Ace::NG { // PaintProperty are used to set render properties. class SliderPaintProperty : public PaintProperty { - DECLARE_ACE_TYPE(SliderPaintProperty, PaintProperty) + DECLARE_ACE_TYPE(SliderPaintProperty, PaintProperty); public: SliderPaintProperty() = default; ~SliderPaintProperty() override = default; diff --git a/frameworks/core/components_ng/pattern/slider/slider_tip_paint_method.h b/frameworks/core/components_ng/pattern/slider/slider_tip_paint_method.h index 07407839e170fc7796ae979f979f84879602d5de..e02653d22a9dcd8621f81dd78b0983e8d487a90c 100644 --- a/frameworks/core/components_ng/pattern/slider/slider_tip_paint_method.h +++ b/frameworks/core/components_ng/pattern/slider/slider_tip_paint_method.h @@ -21,7 +21,7 @@ namespace OHOS::Ace::NG { class ACE_EXPORT SliderTipPaintMethod : public NodePaintMethod { - DECLARE_ACE_TYPE(SliderTipPaintMethod, NodePaintMethod) + DECLARE_ACE_TYPE(SliderTipPaintMethod, NodePaintMethod); public: explicit SliderTipPaintMethod(const RefPtr& sliderPattern, const SliderPaintMethod::TipParameters& tipParameters, diff --git a/frameworks/core/components_ng/pattern/stage/page_event_hub.h b/frameworks/core/components_ng/pattern/stage/page_event_hub.h index bd10bdcc0816859b733a2dcc05e07d37fef46b33..d69c47b57bcacf614a3570fa74f86b33840204f3 100644 --- a/frameworks/core/components_ng/pattern/stage/page_event_hub.h +++ b/frameworks/core/components_ng/pattern/stage/page_event_hub.h @@ -28,7 +28,7 @@ namespace OHOS::Ace::NG { class PageEventHub : public EventHub { - DECLARE_ACE_TYPE(PageEventHub, EventHub) + DECLARE_ACE_TYPE(PageEventHub, EventHub); public: PageEventHub() = default; diff --git a/frameworks/core/components_ng/pattern/stepper/stepper_event_hub.h b/frameworks/core/components_ng/pattern/stepper/stepper_event_hub.h index 80791eceaea77940be02bafe6c11ee96e3bfdacd..79b6cff35156512c2b95b380c5cd1ef1c1cd8591 100644 --- a/frameworks/core/components_ng/pattern/stepper/stepper_event_hub.h +++ b/frameworks/core/components_ng/pattern/stepper/stepper_event_hub.h @@ -27,7 +27,7 @@ using IndexCallbackEvent = std::function; using IndexChangeEvent = std::function; class StepperEventHub : public EventHub { - DECLARE_ACE_TYPE(StepperEventHub, EventHub) + DECLARE_ACE_TYPE(StepperEventHub, EventHub); public: StepperEventHub() = default; diff --git a/frameworks/core/components_ng/pattern/swiper/swiper_event_hub.h b/frameworks/core/components_ng/pattern/swiper/swiper_event_hub.h index db22d081fdf4331ffc2053fcb65026ebac0b10da..321af5d7efec7e0b5983f554e77be2039ff9da5f 100644 --- a/frameworks/core/components_ng/pattern/swiper/swiper_event_hub.h +++ b/frameworks/core/components_ng/pattern/swiper/swiper_event_hub.h @@ -42,7 +42,7 @@ using ChangeEventWithPreIndexPtr = std::shared_ptr; using ChangeDoneEvent = std::function; class SwiperEventHub : public EventHub { - DECLARE_ACE_TYPE(SwiperEventHub, EventHub) + DECLARE_ACE_TYPE(SwiperEventHub, EventHub); public: SwiperEventHub() = default; diff --git a/frameworks/core/components_ng/pattern/swiper/swiper_paint_method.h b/frameworks/core/components_ng/pattern/swiper/swiper_paint_method.h index ed3226007f9f11a3ad7802d242826993297bcc19..3750aa68e464f3a9c137ea85a95e86c4b804c329 100644 --- a/frameworks/core/components_ng/pattern/swiper/swiper_paint_method.h +++ b/frameworks/core/components_ng/pattern/swiper/swiper_paint_method.h @@ -24,7 +24,7 @@ namespace OHOS::Ace::NG { class SwiperPaintMethod : public NodePaintMethod { - DECLARE_ACE_TYPE(SwiperPaintMethod, NodePaintMethod) + DECLARE_ACE_TYPE(SwiperPaintMethod, NodePaintMethod); public: SwiperPaintMethod(Axis axis, float mainDelta) : axis_(axis), mainDelta_(mainDelta) {}; diff --git a/frameworks/core/components_ng/pattern/swiper/swiper_paint_property.h b/frameworks/core/components_ng/pattern/swiper/swiper_paint_property.h index cc9a010a196f962a6da7dc8fe327694067da201e..d02ecbe56064da6a977cc9cab955049d07246835 100644 --- a/frameworks/core/components_ng/pattern/swiper/swiper_paint_property.h +++ b/frameworks/core/components_ng/pattern/swiper/swiper_paint_property.h @@ -36,7 +36,7 @@ struct SwiperAnimationStyle { }; class SwiperPaintProperty : public PaintProperty { - DECLARE_ACE_TYPE(SwiperPaintProperty, PaintProperty) + DECLARE_ACE_TYPE(SwiperPaintProperty, PaintProperty); public: SwiperPaintProperty() = default; diff --git a/frameworks/core/components_ng/pattern/swiper_indicator/circle_dot_indicator/circle_dot_indicator_paint_method.h b/frameworks/core/components_ng/pattern/swiper_indicator/circle_dot_indicator/circle_dot_indicator_paint_method.h index ce4531c25f5223411cf4b9f915f11f2ece74c986..683bcd93a908065bdff6ab18b9356012b25127eb 100644 --- a/frameworks/core/components_ng/pattern/swiper_indicator/circle_dot_indicator/circle_dot_indicator_paint_method.h +++ b/frameworks/core/components_ng/pattern/swiper_indicator/circle_dot_indicator/circle_dot_indicator_paint_method.h @@ -32,7 +32,7 @@ constexpr int32_t MAX_INDICATOR_DOT_COUNT = 15; constexpr int32_t TRIGGER_BOUNDARY_DISTANCE = 2; } // namespace class ACE_EXPORT CircleDotIndicatorPaintMethod : public NodePaintMethod { - DECLARE_ACE_TYPE(CircleDotIndicatorPaintMethod, NodePaintMethod) + DECLARE_ACE_TYPE(CircleDotIndicatorPaintMethod, NodePaintMethod); public: explicit CircleDotIndicatorPaintMethod(const RefPtr& circleDotIndicatorModifier) : circleDotIndicatorModifier_(circleDotIndicatorModifier) diff --git a/frameworks/core/components_ng/pattern/swiper_indicator/circle_dot_indicator/circle_dot_indicator_paint_property.h b/frameworks/core/components_ng/pattern/swiper_indicator/circle_dot_indicator/circle_dot_indicator_paint_property.h index a34eeee1fe1845eeab1e6d493fc3719cf25d6bf3..6d1bcfd1a6a2f6784f8633f3c33c514ff6a7ce46 100644 --- a/frameworks/core/components_ng/pattern/swiper_indicator/circle_dot_indicator/circle_dot_indicator_paint_property.h +++ b/frameworks/core/components_ng/pattern/swiper_indicator/circle_dot_indicator/circle_dot_indicator_paint_property.h @@ -30,7 +30,7 @@ struct CircleDotIndicatorStyle { ACE_DEFINE_PROPERTY_GROUP_ITEM(MaskColor, Gradient); }; class CircleDotIndicatorPaintProperty : public PaintProperty { - DECLARE_ACE_TYPE(CircleDotIndicatorPaintProperty, PaintProperty) + DECLARE_ACE_TYPE(CircleDotIndicatorPaintProperty, PaintProperty); public: CircleDotIndicatorPaintProperty() = default; diff --git a/frameworks/core/components_ng/pattern/swiper_indicator/dot_indicator/dot_indicator_paint_method.h b/frameworks/core/components_ng/pattern/swiper_indicator/dot_indicator/dot_indicator_paint_method.h index f8c6ca2a1a29a4181b69984911ac5d355eab29db..9c63d98806653f219adf03dcb01d8a561862f83c 100644 --- a/frameworks/core/components_ng/pattern/swiper_indicator/dot_indicator/dot_indicator_paint_method.h +++ b/frameworks/core/components_ng/pattern/swiper_indicator/dot_indicator/dot_indicator_paint_method.h @@ -29,7 +29,7 @@ namespace OHOS::Ace::NG { enum class PointAnimationStage { STATE_SHRINKT_TO_BLACK_POINT, STATE_EXPAND_TO_LONG_POINT }; class ACE_EXPORT DotIndicatorPaintMethod : public NodePaintMethod { - DECLARE_ACE_TYPE(DotIndicatorPaintMethod, NodePaintMethod) + DECLARE_ACE_TYPE(DotIndicatorPaintMethod, NodePaintMethod); public: explicit DotIndicatorPaintMethod(const RefPtr& dotIndicatorModifier) : dotIndicatorModifier_(dotIndicatorModifier) diff --git a/frameworks/core/components_ng/pattern/swiper_indicator/dot_indicator/dot_indicator_paint_property.h b/frameworks/core/components_ng/pattern/swiper_indicator/dot_indicator/dot_indicator_paint_property.h index b70c125706bc32281c0d1e7b5bd44d77b0766586..491323d07340b092130c68c4c1cda84206462688 100644 --- a/frameworks/core/components_ng/pattern/swiper_indicator/dot_indicator/dot_indicator_paint_property.h +++ b/frameworks/core/components_ng/pattern/swiper_indicator/dot_indicator/dot_indicator_paint_property.h @@ -35,7 +35,7 @@ struct DotIndicatorStyle { ACE_DEFINE_PROPERTY_GROUP_ITEM(IgnoreSize, bool); }; class DotIndicatorPaintProperty : public PaintProperty { - DECLARE_ACE_TYPE(DotIndicatorPaintProperty, PaintProperty) + DECLARE_ACE_TYPE(DotIndicatorPaintProperty, PaintProperty); public: DotIndicatorPaintProperty() = default; diff --git a/frameworks/core/components_ng/pattern/swiper_indicator/dot_indicator/overlength_dot_indicator_paint_method.h b/frameworks/core/components_ng/pattern/swiper_indicator/dot_indicator/overlength_dot_indicator_paint_method.h index 829e03949e46a2dc623097a9e59b04f32a252883..641a1fbee464309f1bd6f4b5f4631ca2e0ea3d87 100644 --- a/frameworks/core/components_ng/pattern/swiper_indicator/dot_indicator/overlength_dot_indicator_paint_method.h +++ b/frameworks/core/components_ng/pattern/swiper_indicator/dot_indicator/overlength_dot_indicator_paint_method.h @@ -24,7 +24,7 @@ constexpr int32_t DISPLAY_COUNT_MIN = 6; constexpr int32_t DISPLAY_COUNT_MAX = 9; constexpr int32_t NUMBER_ONE = 1; class ACE_EXPORT OverlengthDotIndicatorPaintMethod : public DotIndicatorPaintMethod { - DECLARE_ACE_TYPE(OverlengthDotIndicatorPaintMethod, DotIndicatorPaintMethod) + DECLARE_ACE_TYPE(OverlengthDotIndicatorPaintMethod, DotIndicatorPaintMethod); public: explicit OverlengthDotIndicatorPaintMethod(const RefPtr& dotIndicatorModifier) : dotIndicatorModifier_(dotIndicatorModifier) diff --git a/frameworks/core/components_ng/pattern/swiper_indicator/indicator_common/indicator_event_hub.h b/frameworks/core/components_ng/pattern/swiper_indicator/indicator_common/indicator_event_hub.h index cdbec90c85b89a6cd052f4102c688fad4695f42b..5d93977ca3a31547de37eaa9e3ecd2688d6ff742 100644 --- a/frameworks/core/components_ng/pattern/swiper_indicator/indicator_common/indicator_event_hub.h +++ b/frameworks/core/components_ng/pattern/swiper_indicator/indicator_common/indicator_event_hub.h @@ -22,7 +22,7 @@ using ChangeEvent = std::function; using ChangeEventPtr = std::shared_ptr; class IndicatorEventHub : public EventHub { - DECLARE_ACE_TYPE(IndicatorEventHub, EventHub) + DECLARE_ACE_TYPE(IndicatorEventHub, EventHub); public: IndicatorEventHub() = default; diff --git a/frameworks/core/components_ng/pattern/tabs/tab_bar_paint_method.h b/frameworks/core/components_ng/pattern/tabs/tab_bar_paint_method.h index 332f986b362aa4dcd142005fe4f6bb9eff7d60ae..5a5469e806f485e5328c54a1a9e6726be10a9149 100644 --- a/frameworks/core/components_ng/pattern/tabs/tab_bar_paint_method.h +++ b/frameworks/core/components_ng/pattern/tabs/tab_bar_paint_method.h @@ -23,7 +23,7 @@ namespace OHOS::Ace::NG { class TabBarPaintMethod : public NodePaintMethod { - DECLARE_ACE_TYPE(TabBarPaintMethod, NodePaintMethod) + DECLARE_ACE_TYPE(TabBarPaintMethod, NodePaintMethod); public: TabBarPaintMethod(const RefPtr& tabBarModifier, const RectF& frameRect, diff --git a/frameworks/core/components_ng/pattern/tabs/tab_bar_paint_property.h b/frameworks/core/components_ng/pattern/tabs/tab_bar_paint_property.h index 907da483767daf9d5de9a54165003c01493bf006..a75e4420716cf3f17f6b29b1d43e927d208a5d55 100644 --- a/frameworks/core/components_ng/pattern/tabs/tab_bar_paint_property.h +++ b/frameworks/core/components_ng/pattern/tabs/tab_bar_paint_property.h @@ -26,7 +26,7 @@ namespace OHOS::Ace::NG { class TabBarPaintProperty : public PaintProperty { - DECLARE_ACE_TYPE(TabBarPaintProperty, PaintProperty) + DECLARE_ACE_TYPE(TabBarPaintProperty, PaintProperty); public: TabBarPaintProperty() = default; diff --git a/frameworks/core/components_ng/pattern/tabs/tab_content_event_hub.h b/frameworks/core/components_ng/pattern/tabs/tab_content_event_hub.h index 22c20c480757510c63c39f5bcadfcc69b44ec41f..b34a777d2eed77ccfb6579d789b0fb0ead0e9e16 100644 --- a/frameworks/core/components_ng/pattern/tabs/tab_content_event_hub.h +++ b/frameworks/core/components_ng/pattern/tabs/tab_content_event_hub.h @@ -22,7 +22,7 @@ namespace OHOS::Ace::NG { class TabContentEventHub : public EventHub { - DECLARE_ACE_TYPE(TabContentEventHub, EventHub) + DECLARE_ACE_TYPE(TabContentEventHub, EventHub); public: TabContentEventHub() = default; ~TabContentEventHub() override = default; diff --git a/frameworks/core/components_ng/pattern/text/text_content_modifier.h b/frameworks/core/components_ng/pattern/text/text_content_modifier.h index 8320e3ca71adaf3203b84ad95722f415ec6e82e1..8d9a02249523a4e8f5523e8b16545080a1653007 100644 --- a/frameworks/core/components_ng/pattern/text/text_content_modifier.h +++ b/frameworks/core/components_ng/pattern/text/text_content_modifier.h @@ -51,7 +51,7 @@ struct FadeoutInfo { }; class TextContentModifier : public ContentModifier { - DECLARE_ACE_TYPE(TextContentModifier, ContentModifier) + DECLARE_ACE_TYPE(TextContentModifier, ContentModifier); public: explicit TextContentModifier(const std::optional& textStyle, const WeakPtr& pattern = nullptr); diff --git a/frameworks/core/components_ng/pattern/text/text_event_hub.h b/frameworks/core/components_ng/pattern/text/text_event_hub.h index 919252945c5e7e886091d58b2c820e725563e287..0fcadf68fdb88e04e7e5c0caab09c8a117262515 100644 --- a/frameworks/core/components_ng/pattern/text/text_event_hub.h +++ b/frameworks/core/components_ng/pattern/text/text_event_hub.h @@ -24,7 +24,7 @@ namespace OHOS::Ace::NG { class TextEventHub : public EventHub { - DECLARE_ACE_TYPE(TextEventHub, EventHub) + DECLARE_ACE_TYPE(TextEventHub, EventHub); public: TextEventHub() = default; diff --git a/frameworks/core/components_ng/pattern/text/text_overlay_modifier.h b/frameworks/core/components_ng/pattern/text/text_overlay_modifier.h index 1026edc49a9e49a957641b2ba28edef26a8112e6..52b543b6c6cabdce8535ce509e576c1962d89f38 100644 --- a/frameworks/core/components_ng/pattern/text/text_overlay_modifier.h +++ b/frameworks/core/components_ng/pattern/text/text_overlay_modifier.h @@ -26,7 +26,7 @@ namespace OHOS::Ace::NG { class Pattern; class TextOverlayModifier : public OverlayModifier { - DECLARE_ACE_TYPE(TextOverlayModifier, OverlayModifier) + DECLARE_ACE_TYPE(TextOverlayModifier, OverlayModifier); public: TextOverlayModifier(); diff --git a/frameworks/core/components_ng/pattern/text/text_paint_method.h b/frameworks/core/components_ng/pattern/text/text_paint_method.h index 3145859cd88f8fdf7d527d329f3a3dce3b62d1c8..25863c6416da4a287793fdf7ea9e923c9325bfa4 100644 --- a/frameworks/core/components_ng/pattern/text/text_paint_method.h +++ b/frameworks/core/components_ng/pattern/text/text_paint_method.h @@ -30,7 +30,7 @@ namespace OHOS::Ace::NG { class ACE_EXPORT TextPaintMethod : public NodePaintMethod { - DECLARE_ACE_TYPE(TextPaintMethod, NodePaintMethod) + DECLARE_ACE_TYPE(TextPaintMethod, NodePaintMethod); public: TextPaintMethod(const WeakPtr& pattern, float baselineOffset, RefPtr textContentModifier, RefPtr textOverlayModifier); diff --git a/frameworks/core/components_ng/pattern/text_clock/text_clock_event_hub.h b/frameworks/core/components_ng/pattern/text_clock/text_clock_event_hub.h index bf8a4ba9251409e5d9dd2a8914bb28fe182f29b0..274da7c7de904fbb703a2577acc3cec7285a041e 100644 --- a/frameworks/core/components_ng/pattern/text_clock/text_clock_event_hub.h +++ b/frameworks/core/components_ng/pattern/text_clock/text_clock_event_hub.h @@ -25,7 +25,7 @@ namespace OHOS::Ace::NG { using ChangeEvent = std::function; class TextClockEventHub : public EventHub { - DECLARE_ACE_TYPE(TextClockEventHub, EventHub) + DECLARE_ACE_TYPE(TextClockEventHub, EventHub); public: TextClockEventHub() = default; diff --git a/frameworks/core/components_ng/pattern/text_drag/text_drag_paint_method.h b/frameworks/core/components_ng/pattern/text_drag/text_drag_paint_method.h index a76e15d06526b31779fd1c6b2d3feb09823af405..2053526f7918b7cf3fc98dc6c16b3d96ea05924f 100644 --- a/frameworks/core/components_ng/pattern/text_drag/text_drag_paint_method.h +++ b/frameworks/core/components_ng/pattern/text_drag/text_drag_paint_method.h @@ -26,7 +26,7 @@ namespace OHOS::Ace::NG { class ACE_EXPORT TextDragPaintMethod : public NodePaintMethod { - DECLARE_ACE_TYPE(TextDragPaintMethod, NodePaintMethod) + DECLARE_ACE_TYPE(TextDragPaintMethod, NodePaintMethod); public: TextDragPaintMethod(const WeakPtr& pattern, const RefPtr& textDragOverlayModifier); diff --git a/frameworks/core/components_ng/pattern/text_field/text_field_event_hub.h b/frameworks/core/components_ng/pattern/text_field/text_field_event_hub.h index 97ad6609c36f402e46d4869e0b85986078b3cad5..988e670b9919bfae77cc9c56a76d9b881044f1c6 100644 --- a/frameworks/core/components_ng/pattern/text_field/text_field_event_hub.h +++ b/frameworks/core/components_ng/pattern/text_field/text_field_event_hub.h @@ -98,7 +98,7 @@ private: }; class TextFieldEventHub : public EventHub { - DECLARE_ACE_TYPE(TextFieldEventHub, EventHub) + DECLARE_ACE_TYPE(TextFieldEventHub, EventHub); public: TextFieldEventHub() = default; diff --git a/frameworks/core/components_ng/pattern/text_field/text_field_paint_method.h b/frameworks/core/components_ng/pattern/text_field/text_field_paint_method.h index e8690e3c7b95bb390604013fbcea4e0ecf38ed00..54d3880a62d2a13553150cb7cb57cabf284769fa 100644 --- a/frameworks/core/components_ng/pattern/text_field/text_field_paint_method.h +++ b/frameworks/core/components_ng/pattern/text_field/text_field_paint_method.h @@ -31,7 +31,7 @@ namespace OHOS::Ace::NG { class ACE_EXPORT TextFieldPaintMethod : public NodePaintMethod { - DECLARE_ACE_TYPE(TextFieldPaintMethod, NodePaintMethod) + DECLARE_ACE_TYPE(TextFieldPaintMethod, NodePaintMethod); public: TextFieldPaintMethod(const WeakPtr& pattern, const RefPtr& textFieldOverlayModifier, diff --git a/frameworks/core/components_ng/pattern/text_field/text_field_paint_property.h b/frameworks/core/components_ng/pattern/text_field/text_field_paint_property.h index 98bd159d6fa779e02312ad938b502d027a4260ec..1f323be58cdab80482a43956c58c75b544e3c3cd 100644 --- a/frameworks/core/components_ng/pattern/text_field/text_field_paint_property.h +++ b/frameworks/core/components_ng/pattern/text_field/text_field_paint_property.h @@ -23,7 +23,7 @@ namespace OHOS::Ace::NG { class InspectorFilter; class TextFieldPaintProperty : public PaintProperty { - DECLARE_ACE_TYPE(TextFieldPaintProperty, PaintProperty) + DECLARE_ACE_TYPE(TextFieldPaintProperty, PaintProperty); public: TextFieldPaintProperty() = default; ~TextFieldPaintProperty() override = default; diff --git a/frameworks/core/components_ng/pattern/text_picker/textpicker_column_pattern.h b/frameworks/core/components_ng/pattern/text_picker/textpicker_column_pattern.h index 1a410b600971713675151d9397ee2d8b55a30440..7aee7a0c257151fb6cf5aae0130c92379ec072ea 100644 --- a/frameworks/core/components_ng/pattern/text_picker/textpicker_column_pattern.h +++ b/frameworks/core/components_ng/pattern/text_picker/textpicker_column_pattern.h @@ -60,7 +60,7 @@ struct TextPickerOptionProperty { }; class EventParam : public virtual AceType { - DECLARE_ACE_TYPE(EventParam, AceType) + DECLARE_ACE_TYPE(EventParam, AceType); public: WeakPtr instance; diff --git a/frameworks/core/components_ng/pattern/text_picker/textpicker_event_hub.h b/frameworks/core/components_ng/pattern/text_picker/textpicker_event_hub.h index 1d486cb09b9ff5ad2d66cde579042151e6b1a238..1b90960595faec42f5e349f07dba8d91405ee717 100644 --- a/frameworks/core/components_ng/pattern/text_picker/textpicker_event_hub.h +++ b/frameworks/core/components_ng/pattern/text_picker/textpicker_event_hub.h @@ -29,7 +29,7 @@ using DialogCancelEvent = std::function; using DialogGestureEvent = std::function; class TextPickerEventHub : public EventHub { - DECLARE_ACE_TYPE(TextPickerEventHub, EventHub) + DECLARE_ACE_TYPE(TextPickerEventHub, EventHub); public: TextPickerEventHub() = default; diff --git a/frameworks/core/components_ng/pattern/text_picker/textpicker_paint_method.h b/frameworks/core/components_ng/pattern/text_picker/textpicker_paint_method.h index aa0802964ec3248377a104aa4d2b96eac901a0b6..f388189cacc4c3dfa1fb0bb8e0c5d660dfd8dd6e 100644 --- a/frameworks/core/components_ng/pattern/text_picker/textpicker_paint_method.h +++ b/frameworks/core/components_ng/pattern/text_picker/textpicker_paint_method.h @@ -30,7 +30,7 @@ namespace OHOS::Ace::NG { class ACE_EXPORT TextPickerPaintMethod : public NodePaintMethod { - DECLARE_ACE_TYPE(TextPickerPaintMethod, NodePaintMethod) + DECLARE_ACE_TYPE(TextPickerPaintMethod, NodePaintMethod); public: TextPickerPaintMethod() = default; ~TextPickerPaintMethod() override {} diff --git a/frameworks/core/components_ng/pattern/texttimer/text_timer_event_hub.h b/frameworks/core/components_ng/pattern/texttimer/text_timer_event_hub.h index bed845dc9cb0b900db7da91d1da6963cc856cb18..36f3eb659acfb0bdfe03cc8861ad444b6b7bffb3 100644 --- a/frameworks/core/components_ng/pattern/texttimer/text_timer_event_hub.h +++ b/frameworks/core/components_ng/pattern/texttimer/text_timer_event_hub.h @@ -24,7 +24,7 @@ namespace OHOS::Ace::NG { using ChangeEvent = std::function; class TextTimerEventHub : public EventHub { - DECLARE_ACE_TYPE(TextTimerEventHub, EventHub) + DECLARE_ACE_TYPE(TextTimerEventHub, EventHub); public: TextTimerEventHub() = default; diff --git a/frameworks/core/components_ng/pattern/time_picker/timepicker_event_hub.h b/frameworks/core/components_ng/pattern/time_picker/timepicker_event_hub.h index fa5077e5c47ed3a05a6ff9a86e40b11c664012ef..1caeabb2cfe36114f6e10d42c08db2ca867af1b4 100644 --- a/frameworks/core/components_ng/pattern/time_picker/timepicker_event_hub.h +++ b/frameworks/core/components_ng/pattern/time_picker/timepicker_event_hub.h @@ -28,7 +28,7 @@ using DialogGestureEvent = std::function; using TimeChangeEventForDatePicker = std::function; class TimePickerEventHub : public EventHub { - DECLARE_ACE_TYPE(TimePickerEventHub, EventHub) + DECLARE_ACE_TYPE(TimePickerEventHub, EventHub); public: TimePickerEventHub() = default; diff --git a/frameworks/core/components_ng/pattern/toggle/switch_event_hub.h b/frameworks/core/components_ng/pattern/toggle/switch_event_hub.h index a6e22f5d171d64d8e38719377b11a9f036155361..721eaf5e89ee4a06de61ce4ca893910d6d4e0832 100644 --- a/frameworks/core/components_ng/pattern/toggle/switch_event_hub.h +++ b/frameworks/core/components_ng/pattern/toggle/switch_event_hub.h @@ -25,7 +25,7 @@ namespace OHOS::Ace::NG { using ChangeEvent = std::function; class SwitchEventHub : public EventHub { - DECLARE_ACE_TYPE(SwitchEventHub, EventHub) + DECLARE_ACE_TYPE(SwitchEventHub, EventHub); public: SwitchEventHub() = default; diff --git a/frameworks/core/components_ng/pattern/toggle/switch_paint_method.h b/frameworks/core/components_ng/pattern/toggle/switch_paint_method.h index 4406f8ec565544b70a041ba09fa7c1cf35f968cc..6df83a4e0333f8d6a1aa41f29f4f6e523412eb1d 100644 --- a/frameworks/core/components_ng/pattern/toggle/switch_paint_method.h +++ b/frameworks/core/components_ng/pattern/toggle/switch_paint_method.h @@ -31,7 +31,7 @@ constexpr float SWITCH_ERROR_RADIUS = -1.0f; constexpr double NUM_TWO = 2.0; } // namespace class ACE_EXPORT SwitchPaintMethod : public NodePaintMethod { - DECLARE_ACE_TYPE(SwitchPaintMethod, NodePaintMethod) + DECLARE_ACE_TYPE(SwitchPaintMethod, NodePaintMethod); public: SwitchPaintMethod() = default; diff --git a/frameworks/core/components_ng/pattern/toggle/switch_paint_property.h b/frameworks/core/components_ng/pattern/toggle/switch_paint_property.h index 400884b07abc85125f596b2c2f8552d374de1cb5..46141aa7584f53401bcddff7e9ec8c72ab252d4c 100644 --- a/frameworks/core/components_ng/pattern/toggle/switch_paint_property.h +++ b/frameworks/core/components_ng/pattern/toggle/switch_paint_property.h @@ -47,7 +47,7 @@ struct SwitchAnimationStyle { // PaintProperty are used to set paint properties. class SwitchPaintProperty : public PaintProperty { - DECLARE_ACE_TYPE(SwitchPaintProperty, PaintProperty) + DECLARE_ACE_TYPE(SwitchPaintProperty, PaintProperty); public: SwitchPaintProperty() = default; ~SwitchPaintProperty() override = default; diff --git a/frameworks/core/components_ng/pattern/ui_extension/ui_extension_hub.h b/frameworks/core/components_ng/pattern/ui_extension/ui_extension_hub.h index 117583962e2244b4d4040f72d74d9654a4d50c2f..2000a3eab32e40a02771842e3e91f1372bd2a02d 100644 --- a/frameworks/core/components_ng/pattern/ui_extension/ui_extension_hub.h +++ b/frameworks/core/components_ng/pattern/ui_extension/ui_extension_hub.h @@ -25,7 +25,7 @@ namespace OHOS::Ace::NG { class SecurityUIExtensionProxy; class UIExtensionHub : public EventHub { - DECLARE_ACE_TYPE(UIExtensionHub, EventHub) + DECLARE_ACE_TYPE(UIExtensionHub, EventHub); public: void SetOnReceiveCallback( diff --git a/frameworks/core/components_ng/pattern/video/video_event_hub.h b/frameworks/core/components_ng/pattern/video/video_event_hub.h index 86f67fcc45adda49761b596aa16713808ce087a1..a28dc661627cf6ead570cacc56a10e84b8d8d777 100644 --- a/frameworks/core/components_ng/pattern/video/video_event_hub.h +++ b/frameworks/core/components_ng/pattern/video/video_event_hub.h @@ -29,7 +29,7 @@ namespace OHOS::Ace::NG { using VideoEventCallback = std::function; class VideoEventHub : public EventHub { - DECLARE_ACE_TYPE(VideoEventHub, EventHub) + DECLARE_ACE_TYPE(VideoEventHub, EventHub); public: VideoEventHub() = default; diff --git a/frameworks/core/components_ng/pattern/waterflow/water_flow_event_hub.h b/frameworks/core/components_ng/pattern/waterflow/water_flow_event_hub.h index 9d21498879f6e6693c81bf4668932a9a4554a69c..646cc92a78ace26b7d3d6b7cd26439c98bfbfb8a 100644 --- a/frameworks/core/components_ng/pattern/waterflow/water_flow_event_hub.h +++ b/frameworks/core/components_ng/pattern/waterflow/water_flow_event_hub.h @@ -22,7 +22,7 @@ namespace OHOS::Ace::NG { using ScrollIndexFunc = std::function; class WaterFlowEventHub : public ScrollableEventHub { - DECLARE_ACE_TYPE(WaterFlowEventHub, ScrollableEventHub) + DECLARE_ACE_TYPE(WaterFlowEventHub, ScrollableEventHub); public: void SetOnScrollIndex(ScrollIndexFunc&& onScrollIndex) diff --git a/frameworks/core/components_ng/pattern/waterflow/water_flow_paint_method.h b/frameworks/core/components_ng/pattern/waterflow/water_flow_paint_method.h index 772e8481f60853f2a7c4eded0ad2de3ba36a9025..f615525b77ed52e1bb561bfc63e7b9c16008dc82 100644 --- a/frameworks/core/components_ng/pattern/waterflow/water_flow_paint_method.h +++ b/frameworks/core/components_ng/pattern/waterflow/water_flow_paint_method.h @@ -23,7 +23,7 @@ namespace OHOS::Ace::NG { class ACE_EXPORT WaterFlowPaintMethod : public ScrollablePaintMethod { - DECLARE_ACE_TYPE(WaterFlowPaintMethod, ScrollablePaintMethod) + DECLARE_ACE_TYPE(WaterFlowPaintMethod, ScrollablePaintMethod); public: WaterFlowPaintMethod() = default; WaterFlowPaintMethod(bool vertical, bool isReverse, bool isVerticalReverse) diff --git a/frameworks/core/components_ng/pattern/waterflow/water_flow_sections.h b/frameworks/core/components_ng/pattern/waterflow/water_flow_sections.h index 08b6e5d8f7710f787942eaaac41224925ace7e86..47f264d16515d4edbab6e94466158f21d4445734 100644 --- a/frameworks/core/components_ng/pattern/waterflow/water_flow_sections.h +++ b/frameworks/core/components_ng/pattern/waterflow/water_flow_sections.h @@ -28,7 +28,7 @@ namespace OHOS::Ace::NG { using GetItemMainSizeByIndex = std::function; class ACE_FORCE_EXPORT WaterFlowSections : public virtual AceType { - DECLARE_ACE_TYPE(WaterFlowSections, AceType) + DECLARE_ACE_TYPE(WaterFlowSections, AceType); public: struct Section { bool operator==(const Section& other) const diff --git a/frameworks/core/components_ng/pattern/web/web_content_modifier.h b/frameworks/core/components_ng/pattern/web/web_content_modifier.h index 605a078a484b295196932b88fb024a78b7158c46..523b349706b3650e826c8e99301aad3f806ac584 100644 --- a/frameworks/core/components_ng/pattern/web/web_content_modifier.h +++ b/frameworks/core/components_ng/pattern/web/web_content_modifier.h @@ -34,7 +34,7 @@ namespace OHOS::Ace::NG { class Pattern; class WebContentModifier : public ContentModifier { - DECLARE_ACE_TYPE(WebContentModifier, ContentModifier) + DECLARE_ACE_TYPE(WebContentModifier, ContentModifier); public: WebContentModifier(RefPtr renderSuface) : renderSuface_(renderSuface) {} diff --git a/frameworks/core/components_ng/pattern/web/web_event_hub.h b/frameworks/core/components_ng/pattern/web/web_event_hub.h index b69faa38db4c6e6e1029010f70a31f06979de047..b145ab1d1613928288d567cbcb5847299f21c865 100644 --- a/frameworks/core/components_ng/pattern/web/web_event_hub.h +++ b/frameworks/core/components_ng/pattern/web/web_event_hub.h @@ -44,7 +44,7 @@ private: namespace OHOS::Ace::NG { class WebEventHub : public EventHub { - DECLARE_ACE_TYPE(WebEventHub, EventHub) + DECLARE_ACE_TYPE(WebEventHub, EventHub); public: WebEventHub() = default; diff --git a/frameworks/core/components_ng/pattern/web/web_paint_method.h b/frameworks/core/components_ng/pattern/web/web_paint_method.h index 3e5ea29018dd9c4b420a8b804a74070467fd3a8a..784b295308a1bd4393619bb98adea841b9c87597 100644 --- a/frameworks/core/components_ng/pattern/web/web_paint_method.h +++ b/frameworks/core/components_ng/pattern/web/web_paint_method.h @@ -22,7 +22,7 @@ namespace OHOS::Ace::NG { class ACE_EXPORT WebPaintMethod : public NodePaintMethod { - DECLARE_ACE_TYPE(WebPaintMethod, NodePaintMethod) + DECLARE_ACE_TYPE(WebPaintMethod, NodePaintMethod); public: WebPaintMethod(RefPtr surface): renderSuface_(surface) {} ~WebPaintMethod() override = default; diff --git a/frameworks/core/components_ng/pattern/web/web_paint_property.h b/frameworks/core/components_ng/pattern/web/web_paint_property.h index faf944c3b5a398613face36afec8c66cdb8c4146..cd11fa0ac453b9a6af628d2bfcb44f6aba90019b 100644 --- a/frameworks/core/components_ng/pattern/web/web_paint_property.h +++ b/frameworks/core/components_ng/pattern/web/web_paint_property.h @@ -21,7 +21,7 @@ namespace OHOS::Ace::NG { class WebPaintProperty : public PaintProperty { - DECLARE_ACE_TYPE(WebPaintProperty, PaintProperty) + DECLARE_ACE_TYPE(WebPaintProperty, PaintProperty); public: WebPaintProperty() = default; diff --git a/frameworks/core/components_ng/pattern/xcomponent/xcomponent_event_hub.h b/frameworks/core/components_ng/pattern/xcomponent/xcomponent_event_hub.h index 11559106663d8bb7b3fa62ecbd9cd7f0ee091b0c..59969a1d68401bcf396e2f88d3839f87f5cfcf69 100644 --- a/frameworks/core/components_ng/pattern/xcomponent/xcomponent_event_hub.h +++ b/frameworks/core/components_ng/pattern/xcomponent/xcomponent_event_hub.h @@ -30,7 +30,7 @@ using SurfaceChangedEvent = std::function; class XComponentEventHub : public EventHub { - DECLARE_ACE_TYPE(XComponentEventHub, EventHub) + DECLARE_ACE_TYPE(XComponentEventHub, EventHub); public: XComponentEventHub() = default; diff --git a/frameworks/core/components_ng/pattern/xcomponent/xcomponent_paint_method.h b/frameworks/core/components_ng/pattern/xcomponent/xcomponent_paint_method.h index d42749d773f4a53a4fad99489401ed4d0abe9869..50c06f5b9aae9ac6f27f069aff5a3276f0d91946 100644 --- a/frameworks/core/components_ng/pattern/xcomponent/xcomponent_paint_method.h +++ b/frameworks/core/components_ng/pattern/xcomponent/xcomponent_paint_method.h @@ -22,7 +22,7 @@ namespace OHOS::Ace::NG { class XComponentPattern; class ACE_EXPORT XComponentPaintMethod : public NodePaintMethod { - DECLARE_ACE_TYPE(XComponentPaintMethod, NodePaintMethod) + DECLARE_ACE_TYPE(XComponentPaintMethod, NodePaintMethod); public: XComponentPaintMethod(const RefPtr& surface, const RefPtr& pattern) : renderSuface_(surface), pattern_(pattern) diff --git a/frameworks/core/components_ng/render/adapter/animated_image.h b/frameworks/core/components_ng/render/adapter/animated_image.h index 66d5e5d9ef833a614d87be43aeb2906a8acff6f4..6ab75433f39d52415f915749168d1370ff26a737 100644 --- a/frameworks/core/components_ng/render/adapter/animated_image.h +++ b/frameworks/core/components_ng/render/adapter/animated_image.h @@ -35,7 +35,7 @@ class Animator; namespace OHOS::Ace::NG { class AnimatedImage : public virtual CanvasImage { - DECLARE_ACE_TYPE(AnimatedImage, CanvasImage) + DECLARE_ACE_TYPE(AnimatedImage, CanvasImage); public: // initialize animator AnimatedImage(const std::unique_ptr& codec, std::string url); @@ -109,7 +109,7 @@ private: // ================================================================================================ class AnimatedRSImage : public AnimatedImage, public DrawingImage { - DECLARE_ACE_TYPE(AnimatedRSImage, AnimatedImage, DrawingImage) + DECLARE_ACE_TYPE(AnimatedRSImage, AnimatedImage, DrawingImage); public: AnimatedRSImage(std::unique_ptr codec, std::string url) : AnimatedImage(codec, std::move(url)), codec_(std::move(codec)) @@ -150,7 +150,7 @@ private: // ================================================================================================ class AnimatedPixmap : public AnimatedImage, public PixelMapImage { - DECLARE_ACE_TYPE(AnimatedPixmap, AnimatedImage, PixelMapImage) + DECLARE_ACE_TYPE(AnimatedPixmap, AnimatedImage, PixelMapImage); public: AnimatedPixmap(const std::unique_ptr& codec, const RefPtr& src, const ResizeParam& size, std::string url); diff --git a/frameworks/core/components_ng/render/adapter/drawing_image.h b/frameworks/core/components_ng/render/adapter/drawing_image.h index ed25e9cae19baf5c98136e3fa3734a6ffeba3bb9..058537f967194893e41b17a0a5b8b1b72d252e0d 100644 --- a/frameworks/core/components_ng/render/adapter/drawing_image.h +++ b/frameworks/core/components_ng/render/adapter/drawing_image.h @@ -24,7 +24,7 @@ namespace OHOS::Ace::NG { class DrawingImage : public virtual CanvasImage { - DECLARE_ACE_TYPE(DrawingImage, CanvasImage) + DECLARE_ACE_TYPE(DrawingImage, CanvasImage); public: explicit DrawingImage(const std::shared_ptr& image) : image_(image) {} DrawingImage() = default; diff --git a/frameworks/core/components_ng/render/adapter/media_player_impl.h b/frameworks/core/components_ng/render/adapter/media_player_impl.h index 788e9332942b9477c52373b54fc6760c2672030e..d2b8a9f1a2296b5b5d304e65358275ac7902e586 100644 --- a/frameworks/core/components_ng/render/adapter/media_player_impl.h +++ b/frameworks/core/components_ng/render/adapter/media_player_impl.h @@ -24,7 +24,7 @@ namespace OHOS::Ace::NG { class MediaPlayerImpl : public MediaPlayer, public ExtSurfaceCallbackInterface { - DECLARE_ACE_TYPE(MediaPlayerImpl, NG::MediaPlayer) + DECLARE_ACE_TYPE(MediaPlayerImpl, NG::MediaPlayer); public: MediaPlayerImpl() = default; ~MediaPlayerImpl() override; diff --git a/frameworks/core/components_ng/render/adapter/pixelmap_image.h b/frameworks/core/components_ng/render/adapter/pixelmap_image.h index 9efebbf32b3d739d3ae56d6e54272fcac8689578..438dc3684594c5ec8cff8b8f08606ca6f7e3168f 100644 --- a/frameworks/core/components_ng/render/adapter/pixelmap_image.h +++ b/frameworks/core/components_ng/render/adapter/pixelmap_image.h @@ -25,7 +25,7 @@ namespace OHOS::Ace::NG { class PixelMapImage : public virtual CanvasImage { - DECLARE_ACE_TYPE(PixelMapImage, CanvasImage) + DECLARE_ACE_TYPE(PixelMapImage, CanvasImage); public: PixelMapImage() = default; explicit PixelMapImage(RefPtr pixelMap) : pixelMap_(std::move(pixelMap)) {} diff --git a/frameworks/core/components_ng/render/adapter/render_surface_impl.h b/frameworks/core/components_ng/render/adapter/render_surface_impl.h index 12fed0b1f73baa9283f6361a13d9a00f73609b5b..7df741dd1455a485bf6b6724a8aede5e72d084ae 100644 --- a/frameworks/core/components_ng/render/adapter/render_surface_impl.h +++ b/frameworks/core/components_ng/render/adapter/render_surface_impl.h @@ -27,7 +27,7 @@ namespace OHOS::Ace::NG { class RenderSurfaceImpl : public RenderSurface { - DECLARE_ACE_TYPE(RenderSurfaceImpl, NG::RenderSurface) + DECLARE_ACE_TYPE(RenderSurfaceImpl, NG::RenderSurface); public: RenderSurfaceImpl() = default; ~RenderSurfaceImpl() override; diff --git a/frameworks/core/components_ng/render/adapter/render_texture_impl.h b/frameworks/core/components_ng/render/adapter/render_texture_impl.h index b3e149fced0ca6f9781c3e99b30216c51370d584..acf80f871a83bd0bc428d5b4a9942a7eee1172e9 100644 --- a/frameworks/core/components_ng/render/adapter/render_texture_impl.h +++ b/frameworks/core/components_ng/render/adapter/render_texture_impl.h @@ -26,7 +26,7 @@ namespace OHOS::Ace::NG { class RenderTextureImpl : public RenderSurface { - DECLARE_ACE_TYPE(RenderTextureImpl, NG::RenderSurface) + DECLARE_ACE_TYPE(RenderTextureImpl, NG::RenderSurface); public: RenderTextureImpl() = default; ~RenderTextureImpl() override; diff --git a/frameworks/core/components_ng/render/adapter/rich_editor_paragraph.h b/frameworks/core/components_ng/render/adapter/rich_editor_paragraph.h index 7c4d265c4fde6e0158fac3a16efd5f7c151f9307..91abbd73e03d0bda3bd09e521e032d102efad1f8 100644 --- a/frameworks/core/components_ng/render/adapter/rich_editor_paragraph.h +++ b/frameworks/core/components_ng/render/adapter/rich_editor_paragraph.h @@ -22,7 +22,7 @@ namespace OHOS::Ace::NG { class RichEditorParagraph : public TxtParagraph { - DECLARE_ACE_TYPE(RichEditorParagraph, TxtParagraph) + DECLARE_ACE_TYPE(RichEditorParagraph, TxtParagraph); public: RichEditorParagraph(const ParagraphStyle& paraStyle, std::shared_ptr fontCollection) diff --git a/frameworks/core/components_ng/render/adapter/rosen_media_player.h b/frameworks/core/components_ng/render/adapter/rosen_media_player.h index b6abe2e95036702005c2536aad088abc5e0a71d3..a08c0ddc74a0792b0960df40895277c8deea22b6 100644 --- a/frameworks/core/components_ng/render/adapter/rosen_media_player.h +++ b/frameworks/core/components_ng/render/adapter/rosen_media_player.h @@ -28,7 +28,7 @@ namespace OHOS::Ace::NG { class RosenMediaPlayer : public MediaPlayer { - DECLARE_ACE_TYPE(RosenMediaPlayer, NG::MediaPlayer) + DECLARE_ACE_TYPE(RosenMediaPlayer, NG::MediaPlayer); public: RosenMediaPlayer() = default; ~RosenMediaPlayer() override; diff --git a/frameworks/core/components_ng/render/adapter/rosen_render_context.h b/frameworks/core/components_ng/render/adapter/rosen_render_context.h index a36fff9d7691ef38c4c9da187c8f36a00df5f60f..3f8b397fc2f51bee72b2f2396508f9943888f833 100755 --- a/frameworks/core/components_ng/render/adapter/rosen_render_context.h +++ b/frameworks/core/components_ng/render/adapter/rosen_render_context.h @@ -68,7 +68,7 @@ class RosenRenderContext : public RenderContext { public: RosenRenderContext() = default; ~RosenRenderContext() override; - +DECLARE_ACE_TYPE(RosenRenderContext, NG::RenderContext); void SetSurfaceChangedCallBack(const std::function& callback) override; void RemoveSurfaceChangedCallBack() override; diff --git a/frameworks/core/components_ng/render/adapter/rosen_render_surface.h b/frameworks/core/components_ng/render/adapter/rosen_render_surface.h index 4872343f8892fcbceeaa483a6ad38abd4d8413dc..5a6285194f9a62226c70c78e4647f2ad30197732 100644 --- a/frameworks/core/components_ng/render/adapter/rosen_render_surface.h +++ b/frameworks/core/components_ng/render/adapter/rosen_render_surface.h @@ -40,7 +40,7 @@ struct SurfaceBufferNode; #endif class RosenRenderSurface : public RenderSurface { - DECLARE_ACE_TYPE(RosenRenderSurface, NG::RenderSurface) + DECLARE_ACE_TYPE(RosenRenderSurface, NG::RenderSurface); public: RosenRenderSurface() = default; ~RosenRenderSurface() override; diff --git a/frameworks/core/components_ng/render/adapter/skia_color_filter.h b/frameworks/core/components_ng/render/adapter/skia_color_filter.h index d8288b4efcd1e198d0ba9034dd15f9999c1170b8..bc483e6c75cbab756caec013ceba37c3b6ec1e8e 100644 --- a/frameworks/core/components_ng/render/adapter/skia_color_filter.h +++ b/frameworks/core/components_ng/render/adapter/skia_color_filter.h @@ -25,7 +25,7 @@ namespace OHOS::Ace::NG { // Paint is interface for drawing styles. class SkiaColorFilter : public ColorFilter { - DECLARE_ACE_TYPE(NG::SkiaColorFilter, NG::ColorFilter) + DECLARE_ACE_TYPE(NG::SkiaColorFilter, NG::ColorFilter); public: explicit SkiaColorFilter(const float rowMajor[20]); ~SkiaColorFilter() override = default; diff --git a/frameworks/core/components_ng/render/adapter/svg_canvas_image.h b/frameworks/core/components_ng/render/adapter/svg_canvas_image.h index 81c8f16b73bba5c4089e1fc8ce07052ea79b5c76..c906a286b1a9a6a58264ec786ea3aa0e40e97361 100644 --- a/frameworks/core/components_ng/render/adapter/svg_canvas_image.h +++ b/frameworks/core/components_ng/render/adapter/svg_canvas_image.h @@ -21,7 +21,7 @@ namespace OHOS::Ace::NG { class SvgCanvasImage : public CanvasImage { - DECLARE_ACE_TYPE(SvgCanvasImage, CanvasImage) + DECLARE_ACE_TYPE(SvgCanvasImage, CanvasImage); public: explicit SvgCanvasImage(const RefPtr& svgDom) : svgDom_(svgDom) {} ~SvgCanvasImage() override = default; diff --git a/frameworks/core/components_ng/render/adapter/txt_font_collection.h b/frameworks/core/components_ng/render/adapter/txt_font_collection.h index 49e99522538cd8113b11dd1b69baa9cdf5cddb3d..20c1edc0170314226ab5532f1bae6e5db27c36a1 100644 --- a/frameworks/core/components_ng/render/adapter/txt_font_collection.h +++ b/frameworks/core/components_ng/render/adapter/txt_font_collection.h @@ -28,7 +28,7 @@ namespace OHOS::Ace::NG { class ACE_EXPORT TxtFontCollection : public FontCollection { - DECLARE_ACE_TYPE(TxtFontCollection, FontCollection) + DECLARE_ACE_TYPE(TxtFontCollection, FontCollection); public: explicit TxtFontCollection(const std::shared_ptr& fontCollection); TxtFontCollection(); diff --git a/frameworks/core/components_ng/render/adapter/txt_paragraph.h b/frameworks/core/components_ng/render/adapter/txt_paragraph.h index fc74e40df95330be9e5026e6b9f427f6bb0b5ab2..b29d4a1be1ba8ff5766f6112c598be75ab6a1b76 100644 --- a/frameworks/core/components_ng/render/adapter/txt_paragraph.h +++ b/frameworks/core/components_ng/render/adapter/txt_paragraph.h @@ -26,7 +26,7 @@ namespace OHOS::Ace::NG { // Paragraph is interface for drawing text and text paragraph. class TxtParagraph : public Paragraph { - DECLARE_ACE_TYPE(NG::TxtParagraph, NG::Paragraph) + DECLARE_ACE_TYPE(NG::TxtParagraph, NG::Paragraph); public: TxtParagraph(const ParagraphStyle& paraStyle, std::shared_ptr fontCollection) diff --git a/frameworks/core/components_ng/render/canvas_image.h b/frameworks/core/components_ng/render/canvas_image.h index 5b5cceff58df90aaab67e2ad90f9b4cd3d5ab4db..7e838e3092bb076a49425b5694368afd51449456 100644 --- a/frameworks/core/components_ng/render/canvas_image.h +++ b/frameworks/core/components_ng/render/canvas_image.h @@ -69,7 +69,7 @@ struct ImagePaintConfig { // CanvasImage is interface for drawing image. class CanvasImage : public virtual AceType { - DECLARE_ACE_TYPE(CanvasImage, AceType) + DECLARE_ACE_TYPE(CanvasImage, AceType); public: CanvasImage() = default; diff --git a/frameworks/core/components_ng/render/color_filter.h b/frameworks/core/components_ng/render/color_filter.h index 919c7347839925b1ce4ea131834880e10486d0e9..8aa01f6286be867a8e14509d3b54a604553457be 100644 --- a/frameworks/core/components_ng/render/color_filter.h +++ b/frameworks/core/components_ng/render/color_filter.h @@ -21,7 +21,7 @@ namespace OHOS::Ace::NG { class ColorFilter : public virtual AceType { - DECLARE_ACE_TYPE(NG::ColorFilter, AceType) + DECLARE_ACE_TYPE(NG::ColorFilter, AceType); public: static RefPtr MakeFromMatrix(const float rowMajor[20]); diff --git a/frameworks/core/components_ng/render/font_collection.h b/frameworks/core/components_ng/render/font_collection.h index 2fe21abcd39b2379b6a594818e37d3809bfeda6f..ecd27a8801d887421ee5e95b2ffc0a018deefb17 100644 --- a/frameworks/core/components_ng/render/font_collection.h +++ b/frameworks/core/components_ng/render/font_collection.h @@ -28,7 +28,7 @@ namespace OHOS::Ace::NG { using LoadFontCallback = std::function; class ACE_EXPORT FontCollection : public virtual AceType { - DECLARE_ACE_TYPE(FontCollection, AceType) + DECLARE_ACE_TYPE(FontCollection, AceType); public: static RefPtr Current(); diff --git a/frameworks/core/components_ng/render/media_player.h b/frameworks/core/components_ng/render/media_player.h index 6fa8c8dcc9e4763c6fea78220ee6b7f4fc7fb9c1..d279c634682c4d91ea535e3b1e1afd963b0e80eb 100644 --- a/frameworks/core/components_ng/render/media_player.h +++ b/frameworks/core/components_ng/render/media_player.h @@ -32,7 +32,7 @@ using CommonEvent = std::function; using TextureRefreshEnVent = std::function; // MediaPlayer is used to show and play meida class ACE_FORCE_EXPORT MediaPlayer : public virtual AceType { - DECLARE_ACE_TYPE(NG::MediaPlayer, AceType) + DECLARE_ACE_TYPE(NG::MediaPlayer, AceType); public: MediaPlayer() = default; diff --git a/frameworks/core/components_ng/render/node_paint_method.h b/frameworks/core/components_ng/render/node_paint_method.h index 51027e54f27fa9e575b508c0933b829e584d673c..eb00e2c07db403de68a97ec3e23405af20d2fe17 100644 --- a/frameworks/core/components_ng/render/node_paint_method.h +++ b/frameworks/core/components_ng/render/node_paint_method.h @@ -22,7 +22,7 @@ namespace OHOS::Ace::NG { class Modifier; class NodePaintMethod : public virtual AceType { - DECLARE_ACE_TYPE(NodePaintMethod, AceType) + DECLARE_ACE_TYPE(NodePaintMethod, AceType); public: NodePaintMethod() = default; diff --git a/frameworks/core/components_ng/render/paint_property.h b/frameworks/core/components_ng/render/paint_property.h index 195b5a00a214f13894d8766603c742dd856ad41d..9c1794dc5a17cccdaa1142375f254fb00e8fdd35 100644 --- a/frameworks/core/components_ng/render/paint_property.h +++ b/frameworks/core/components_ng/render/paint_property.h @@ -28,7 +28,7 @@ class InspectorFilter; // PaintProperty are used to set render properties. class PaintProperty : public Property { - DECLARE_ACE_TYPE(PaintProperty, Property) + DECLARE_ACE_TYPE(PaintProperty, Property); public: PaintProperty() = default; diff --git a/frameworks/core/components_ng/render/paint_wrapper.h b/frameworks/core/components_ng/render/paint_wrapper.h index 9a290813d838491ae071afad583f8bc15f3ae4d5..3e4621e25a859eaa9a6d75fbdbdc1667e15fabf9 100644 --- a/frameworks/core/components_ng/render/paint_wrapper.h +++ b/frameworks/core/components_ng/render/paint_wrapper.h @@ -38,7 +38,7 @@ class NodePaintMethod; // PaintWrapper are used to flush dirty render task. class PaintWrapper : public virtual AceType { - DECLARE_ACE_TYPE(PaintWrapper, AceType) + DECLARE_ACE_TYPE(PaintWrapper, AceType); public: PaintWrapper(WeakPtr renderContext, RefPtr geometryNode, diff --git a/frameworks/core/components_ng/render/paragraph.h b/frameworks/core/components_ng/render/paragraph.h index a3c2c808bf8679f6d1a6195c223604dcf80db174..bd9593d1586d57296c6643ead288cea875880205 100644 --- a/frameworks/core/components_ng/render/paragraph.h +++ b/frameworks/core/components_ng/render/paragraph.h @@ -243,7 +243,7 @@ struct PositionWithAffinity { // Paragraph is interface for drawing text and text paragraph. class Paragraph : public virtual AceType { - DECLARE_ACE_TYPE(NG::Paragraph, AceType) + DECLARE_ACE_TYPE(NG::Paragraph, AceType); public: static RefPtr Create(const ParagraphStyle& paraStyle, const RefPtr& fontCollection); diff --git a/frameworks/core/components_ng/render/render_context.h b/frameworks/core/components_ng/render/render_context.h index 3cb2dfd78b0f02215050947412031ac784bab358..c4078317e679d594d6aef01e01f24be8ac7b6079 100644 --- a/frameworks/core/components_ng/render/render_context.h +++ b/frameworks/core/components_ng/render/render_context.h @@ -96,7 +96,7 @@ inline constexpr int32_t ZINDEX_DEFAULT_VALUE = 0; namespace { NG::Vector5F DEFAULT_ROTATE_VEC = { 0.0f, 0.0f, 0.0f, 0.0f, 0.0f }; -} +}DECLARE_ACE_TYPE(NG::RenderContext, AceType); // RenderContext is used for render node to paint. class ACE_FORCE_EXPORT RenderContext : public virtual AceType { diff --git a/frameworks/core/components_ng/render/render_surface.h b/frameworks/core/components_ng/render/render_surface.h index fc6097b65c8ca0b42fb3b6237ad8cc8e6ed69a28..c1ae66e50b646071459b4cc41e2eaa6fb621f101 100644 --- a/frameworks/core/components_ng/render/render_surface.h +++ b/frameworks/core/components_ng/render/render_surface.h @@ -28,7 +28,7 @@ namespace OHOS::Ace::NG { // RenderSurface is used for SurfaceNode class ACE_FORCE_EXPORT RenderSurface : public virtual AceType { - DECLARE_ACE_TYPE(NG::RenderSurface, AceType) + DECLARE_ACE_TYPE(NG::RenderSurface, AceType); public: RenderSurface() = default; diff --git a/frameworks/core/components_ng/syntax/lazy_for_each_builder.h b/frameworks/core/components_ng/syntax/lazy_for_each_builder.h index e2a2a4d8b13c39cab3d294cf26433a97bbb55cdb..aa56fb8c798e55ac5928ff592078a03a9f8ab12b 100644 --- a/frameworks/core/components_ng/syntax/lazy_for_each_builder.h +++ b/frameworks/core/components_ng/syntax/lazy_for_each_builder.h @@ -54,7 +54,7 @@ using LazyForEachChild = std::pair>; using LazyForEachCacheChild = std::pair>; class ACE_EXPORT LazyForEachBuilder : public virtual AceType { - DECLARE_ACE_TYPE(NG::LazyForEachBuilder, AceType) + DECLARE_ACE_TYPE(NG::LazyForEachBuilder, AceType); public: LazyForEachBuilder() = default; ~LazyForEachBuilder() override = default; diff --git a/frameworks/core/components_ng/syntax/lazy_for_each_model.h b/frameworks/core/components_ng/syntax/lazy_for_each_model.h index 0a6aa662f4a72c52f885f423141763c49ae47fb2..2b0e042bcc00cb4c8338b3cd696397e10eb24ed8 100644 --- a/frameworks/core/components_ng/syntax/lazy_for_each_model.h +++ b/frameworks/core/components_ng/syntax/lazy_for_each_model.h @@ -27,7 +27,7 @@ namespace OHOS::Ace { class LazyForEachActuator : public AceType { - DECLARE_ACE_TYPE(LazyForEachActuator, AceType) + DECLARE_ACE_TYPE(LazyForEachActuator, AceType); public: LazyForEachActuator() = default; ~LazyForEachActuator() override = default; diff --git a/frameworks/core/components_ng/syntax/lazy_layout_wrapper_builder.h b/frameworks/core/components_ng/syntax/lazy_layout_wrapper_builder.h index 424688f743c3262364a87e194475b82aa7fc6045..136899f15ad6cb8fc1a0e092d5978ad633bc4055 100644 --- a/frameworks/core/components_ng/syntax/lazy_layout_wrapper_builder.h +++ b/frameworks/core/components_ng/syntax/lazy_layout_wrapper_builder.h @@ -27,7 +27,7 @@ namespace OHOS::Ace::NG { class LazyForEachNode; class LazyLayoutWrapperBuilder : public LayoutWrapperBuilder { - DECLARE_ACE_TYPE(LazyLayoutWrapperBuilder, LayoutWrapperBuilder) + DECLARE_ACE_TYPE(LazyLayoutWrapperBuilder, LayoutWrapperBuilder); public: LazyLayoutWrapperBuilder(const RefPtr& builder, const WeakPtr& host); ~LazyLayoutWrapperBuilder() override = default; diff --git a/frameworks/core/components_ng/syntax/node_content.h b/frameworks/core/components_ng/syntax/node_content.h index 8abde4cb5ccbc8c4e09aa5a619f72545141ad58b..f5939755de1dd3cd4f8b374d250d6249ff8aa6c9 100644 --- a/frameworks/core/components_ng/syntax/node_content.h +++ b/frameworks/core/components_ng/syntax/node_content.h @@ -25,7 +25,7 @@ namespace OHOS::Ace::NG { class NodeContent : public AceType { - DECLARE_ACE_TYPE(NodeContent, AceType) + DECLARE_ACE_TYPE(NodeContent, AceType); public: NodeContent() = default; ~NodeContent() override = default; diff --git a/frameworks/core/components_v2/common/element_proxy.cpp b/frameworks/core/components_v2/common/element_proxy.cpp index be8ffc96413607db82068a3481e5d5c5d7ff9fdc..a160bd24164a16aeae7ad99b33a58f3efdd887d6 100644 --- a/frameworks/core/components_v2/common/element_proxy.cpp +++ b/frameworks/core/components_v2/common/element_proxy.cpp @@ -559,7 +559,7 @@ public: }; class LazyForEachElementProxy : public virtual ElementProxy, public virtual DataChangeListener { - DECLARE_ACE_TYPE(LazyForEachElementProxy, ElementProxy, DataChangeListener) + DECLARE_ACE_TYPE(LazyForEachElementProxy, ElementProxy, DataChangeListener); public: explicit LazyForEachElementProxy(const WeakPtr& host) : ElementProxy(host) {} ~LazyForEachElementProxy() override diff --git a/frameworks/core/components_v2/foreach/lazy_foreach_component.h b/frameworks/core/components_v2/foreach/lazy_foreach_component.h index 3532600911f5272763c93798fd96240671cee478..a745be4d148ab1cb00392a02924674f0d29ad998 100644 --- a/frameworks/core/components_v2/foreach/lazy_foreach_component.h +++ b/frameworks/core/components_v2/foreach/lazy_foreach_component.h @@ -34,7 +34,7 @@ typedef struct Operation { } Operation; class DataChangeListener : virtual public AceType { - DECLARE_ACE_TYPE(DataChangeListener, AceType) + DECLARE_ACE_TYPE(DataChangeListener, AceType); public: virtual void OnDataReloaded() = 0; virtual void OnDataAdded(size_t index) = 0; diff --git a/frameworks/core/components_v2/indexer/popup_list_component.h b/frameworks/core/components_v2/indexer/popup_list_component.h index 575343f43540b2b98ec0fa2c2517385f3beac0ff..1f0215065334828da51f864c9aee3cefc70659ee 100644 --- a/frameworks/core/components_v2/indexer/popup_list_component.h +++ b/frameworks/core/components_v2/indexer/popup_list_component.h @@ -28,7 +28,7 @@ inline constexpr double POPUP_BOX_RADIUS_SIZE = 0.0; inline constexpr double POPUP_BORDER_RADIUS_SIZE = 12.0; class ACE_EXPORT PopupListComponent : public ComponentGroup { - DECLARE_ACE_TYPE(V2::PopupListComponent, ComponentGroup) + DECLARE_ACE_TYPE(V2::PopupListComponent, ComponentGroup); public: PopupListComponent() diff --git a/frameworks/core/components_v2/inspector/actionsheetdialog_composed_element.h b/frameworks/core/components_v2/inspector/actionsheetdialog_composed_element.h index 7f7f7a437fecfb06047c8e010dfd74e8263d6c01..24571bb865fd853b5a0f8d2f2201b709af21e536 100644 --- a/frameworks/core/components_v2/inspector/actionsheetdialog_composed_element.h +++ b/frameworks/core/components_v2/inspector/actionsheetdialog_composed_element.h @@ -24,7 +24,7 @@ namespace OHOS::Ace::V2 { class ACE_EXPORT ActionSheetDialogComposedElement : public InspectorComposedElement { - DECLARE_ACE_TYPE(ActionSheetDialogComposedElement, InspectorComposedElement) + DECLARE_ACE_TYPE(ActionSheetDialogComposedElement, InspectorComposedElement); public: explicit ActionSheetDialogComposedElement(const ComposeId& id) : InspectorComposedElement(id) {} diff --git a/frameworks/core/components_v2/inspector/alertdialog_composed_element.h b/frameworks/core/components_v2/inspector/alertdialog_composed_element.h index 53320beb5376d4331871cc5d2607825e2b4d1f56..56e6cd50c597458aaaf5d4c3696ac77ba51f3c97 100644 --- a/frameworks/core/components_v2/inspector/alertdialog_composed_element.h +++ b/frameworks/core/components_v2/inspector/alertdialog_composed_element.h @@ -24,7 +24,7 @@ namespace OHOS::Ace::V2 { class ACE_EXPORT AlertDialogComposedElement : public InspectorComposedElement { - DECLARE_ACE_TYPE(AlertDialogComposedElement, InspectorComposedElement) + DECLARE_ACE_TYPE(AlertDialogComposedElement, InspectorComposedElement); public: explicit AlertDialogComposedElement(const ComposeId& id) : InspectorComposedElement(id) {} diff --git a/frameworks/core/components_v2/inspector/badge_composed_element.h b/frameworks/core/components_v2/inspector/badge_composed_element.h index f807a105ec2f6ac26fe41b440ffc98ccf8d14ec0..ae4005a620015312d0c4c1ba20a0ca0a21646781 100644 --- a/frameworks/core/components_v2/inspector/badge_composed_element.h +++ b/frameworks/core/components_v2/inspector/badge_composed_element.h @@ -24,7 +24,7 @@ namespace OHOS::Ace::V2 { class ACE_EXPORT BadgeComposedElement : public InspectorComposedElement { - DECLARE_ACE_TYPE(BadgeComposedElement, InspectorComposedElement) + DECLARE_ACE_TYPE(BadgeComposedElement, InspectorComposedElement); public: explicit BadgeComposedElement(const ComposeId& id) : InspectorComposedElement(id) {} diff --git a/frameworks/core/components_v2/inspector/blank_composed_element.h b/frameworks/core/components_v2/inspector/blank_composed_element.h index 40577e848b3413006ec24f3510e383f909579cac..23395706483eccccb0cd4c56e54f53c07728d444 100644 --- a/frameworks/core/components_v2/inspector/blank_composed_element.h +++ b/frameworks/core/components_v2/inspector/blank_composed_element.h @@ -24,7 +24,7 @@ namespace OHOS::Ace::V2 { class ACE_EXPORT BlankComposedElement : public InspectorComposedElement { - DECLARE_ACE_TYPE(BlankComposedElement, InspectorComposedElement) + DECLARE_ACE_TYPE(BlankComposedElement, InspectorComposedElement); public: explicit BlankComposedElement(const ComposeId& id) : InspectorComposedElement(id) {} diff --git a/frameworks/core/components_v2/inspector/button_composed_element.h b/frameworks/core/components_v2/inspector/button_composed_element.h index f6f18943f633109640a43eaabad75ea0c8e913ee..a95dff3285b2e05b3dd6e5a8167fd6553021c314 100644 --- a/frameworks/core/components_v2/inspector/button_composed_element.h +++ b/frameworks/core/components_v2/inspector/button_composed_element.h @@ -24,7 +24,7 @@ namespace OHOS::Ace::V2 { class ACE_EXPORT ButtonComposedElement : public InspectorComposedElement { - DECLARE_ACE_TYPE(ButtonComposedElement, InspectorComposedElement) + DECLARE_ACE_TYPE(ButtonComposedElement, InspectorComposedElement); public: explicit ButtonComposedElement(const ComposeId& id) : InspectorComposedElement(id) {} diff --git a/frameworks/core/components_v2/inspector/calendar_composed_element.h b/frameworks/core/components_v2/inspector/calendar_composed_element.h index afc83d6810c70d002be185275e413fd7c329527f..1c5263278664d15639d2c864bd439a47d41a743a 100644 --- a/frameworks/core/components_v2/inspector/calendar_composed_element.h +++ b/frameworks/core/components_v2/inspector/calendar_composed_element.h @@ -24,7 +24,7 @@ namespace OHOS::Ace::V2 { class ACE_EXPORT CalendarComposedElement : public InspectorComposedElement { - DECLARE_ACE_TYPE(CalendarComposedElement, InspectorComposedElement) + DECLARE_ACE_TYPE(CalendarComposedElement, InspectorComposedElement); public: explicit CalendarComposedElement(const ComposeId& id) : InspectorComposedElement(id) {} diff --git a/frameworks/core/components_v2/inspector/checkboxGroup_composed_element.h b/frameworks/core/components_v2/inspector/checkboxGroup_composed_element.h index a6fd5cf89743df4666c01eebd002f288a2ad302e..128840b215a6f74f1ca2e147c677ca363cb64742 100644 --- a/frameworks/core/components_v2/inspector/checkboxGroup_composed_element.h +++ b/frameworks/core/components_v2/inspector/checkboxGroup_composed_element.h @@ -24,7 +24,7 @@ namespace OHOS::Ace::V2 { class ACE_EXPORT CheckboxGroupComposedElement : public InspectorComposedElement { - DECLARE_ACE_TYPE(CheckboxGroupComposedElement, InspectorComposedElement) + DECLARE_ACE_TYPE(CheckboxGroupComposedElement, InspectorComposedElement); public: explicit CheckboxGroupComposedElement(const ComposeId& id) : InspectorComposedElement(id) {} diff --git a/frameworks/core/components_v2/inspector/checkbox_composed_element.h b/frameworks/core/components_v2/inspector/checkbox_composed_element.h index b75e57e7c6e15933dda3b677d6b28261e55c0653..bbdd9b833bf5282f6a6daf1a56202273673a9700 100644 --- a/frameworks/core/components_v2/inspector/checkbox_composed_element.h +++ b/frameworks/core/components_v2/inspector/checkbox_composed_element.h @@ -24,7 +24,7 @@ namespace OHOS::Ace::V2 { class ACE_EXPORT CheckboxComposedElement : public InspectorComposedElement { - DECLARE_ACE_TYPE(CheckboxComposedElement, InspectorComposedElement) + DECLARE_ACE_TYPE(CheckboxComposedElement, InspectorComposedElement); public: explicit CheckboxComposedElement(const ComposeId& id) : InspectorComposedElement(id) {} diff --git a/frameworks/core/components_v2/inspector/column_composed_element.h b/frameworks/core/components_v2/inspector/column_composed_element.h index 1037f6f0bbbfe7a746fcf3dfb30fe1dbe5e9bf8f..506f13bfa7f64974aca307afd295b88c3371d595 100644 --- a/frameworks/core/components_v2/inspector/column_composed_element.h +++ b/frameworks/core/components_v2/inspector/column_composed_element.h @@ -25,7 +25,7 @@ namespace OHOS::Ace::V2 { class ACE_EXPORT ColumnComposedElement : public InspectorComposedElement { - DECLARE_ACE_TYPE(ColumnComposedElement, InspectorComposedElement) + DECLARE_ACE_TYPE(ColumnComposedElement, InspectorComposedElement); public: explicit ColumnComposedElement(const ComposeId& id) : InspectorComposedElement(id) {} diff --git a/frameworks/core/components_v2/inspector/column_split_composed_element.h b/frameworks/core/components_v2/inspector/column_split_composed_element.h index e56a9a2962a1c5762c58a158912f606ecaad4d3f..198a15d51f8281eb9adcd2e7f2edfb155b026229 100644 --- a/frameworks/core/components_v2/inspector/column_split_composed_element.h +++ b/frameworks/core/components_v2/inspector/column_split_composed_element.h @@ -24,7 +24,7 @@ namespace OHOS::Ace::V2 { class ACE_EXPORT ColumnSplitComposedElement : public InspectorComposedElement { - DECLARE_ACE_TYPE(ColumnSplitComposedElement, InspectorComposedElement) + DECLARE_ACE_TYPE(ColumnSplitComposedElement, InspectorComposedElement); public: explicit ColumnSplitComposedElement(const ComposeId& id) : InspectorComposedElement(id) {} diff --git a/frameworks/core/components_v2/inspector/counter_composed_element.h b/frameworks/core/components_v2/inspector/counter_composed_element.h index 9618b5306642e6358ba47554564ae516b173ae1d..2ef266abe815159b63f856d60a472f2f51f73829 100644 --- a/frameworks/core/components_v2/inspector/counter_composed_element.h +++ b/frameworks/core/components_v2/inspector/counter_composed_element.h @@ -22,7 +22,7 @@ namespace OHOS::Ace::V2 { class ACE_EXPORT CounterComposedElement : public InspectorComposedElement { - DECLARE_ACE_TYPE(CounterComposedElement, InspectorComposedElement) + DECLARE_ACE_TYPE(CounterComposedElement, InspectorComposedElement); public: explicit CounterComposedElement(const ComposeId& id) : InspectorComposedElement(id) {} diff --git a/frameworks/core/components_v2/inspector/customdialog_composed_element.h b/frameworks/core/components_v2/inspector/customdialog_composed_element.h index e81479869ae88a047d2ddd96649fcf45dfc4b3bc..fa6499045473b87488c45e35faa86b73166e6228 100644 --- a/frameworks/core/components_v2/inspector/customdialog_composed_element.h +++ b/frameworks/core/components_v2/inspector/customdialog_composed_element.h @@ -24,7 +24,7 @@ namespace OHOS::Ace::V2 { class ACE_EXPORT CustomDialogComposedElement : public InspectorComposedElement { - DECLARE_ACE_TYPE(CustomDialogComposedElement, InspectorComposedElement) + DECLARE_ACE_TYPE(CustomDialogComposedElement, InspectorComposedElement); public: explicit CustomDialogComposedElement(const ComposeId& id) : InspectorComposedElement(id) {} diff --git a/frameworks/core/components_v2/inspector/data_panel_composed_element.h b/frameworks/core/components_v2/inspector/data_panel_composed_element.h index 076a3a38bb3b809715f1f0f7742bcdf974725010..c1c4bad2970dbb58489e705cfe315864fc65c41d 100644 --- a/frameworks/core/components_v2/inspector/data_panel_composed_element.h +++ b/frameworks/core/components_v2/inspector/data_panel_composed_element.h @@ -23,7 +23,7 @@ namespace OHOS::Ace::V2 { class ACE_EXPORT DataPanelComposedElement : public InspectorComposedElement { - DECLARE_ACE_TYPE(DataPanelComposedElement, InspectorComposedElement) + DECLARE_ACE_TYPE(DataPanelComposedElement, InspectorComposedElement); public: explicit DataPanelComposedElement(const ComposeId& id) : InspectorComposedElement(id) {} diff --git a/frameworks/core/components_v2/inspector/date_picker_composed_element.h b/frameworks/core/components_v2/inspector/date_picker_composed_element.h index 595d6d446d3bae7e8395bb046416f6516c64caf8..2d34391042d70f96f3135dbac7472c07c8ddef91 100644 --- a/frameworks/core/components_v2/inspector/date_picker_composed_element.h +++ b/frameworks/core/components_v2/inspector/date_picker_composed_element.h @@ -22,7 +22,7 @@ namespace OHOS::Ace::V2 { class ACE_EXPORT DatePickerComposedElement : public InspectorComposedElement { - DECLARE_ACE_TYPE(DatePickerComposedElement, InspectorComposedElement) + DECLARE_ACE_TYPE(DatePickerComposedElement, InspectorComposedElement); public: explicit DatePickerComposedElement(const ComposeId& id) : InspectorComposedElement(id) {} diff --git a/frameworks/core/components_v2/inspector/date_picker_dialog_composed_element.h b/frameworks/core/components_v2/inspector/date_picker_dialog_composed_element.h index e3965654b45533b11910dbf9420a9085dc7b7286..ce430baa8e2ea1e57ac6339b96551e19460cb38b 100644 --- a/frameworks/core/components_v2/inspector/date_picker_dialog_composed_element.h +++ b/frameworks/core/components_v2/inspector/date_picker_dialog_composed_element.h @@ -22,7 +22,7 @@ namespace OHOS::Ace::V2 { class ACE_EXPORT DatePickerDialogComposedElement : public InspectorComposedElement { - DECLARE_ACE_TYPE(DatePickerDialogComposedElement, InspectorComposedElement) + DECLARE_ACE_TYPE(DatePickerDialogComposedElement, InspectorComposedElement); public: explicit DatePickerDialogComposedElement(const ComposeId& id) : InspectorComposedElement(id) {} diff --git a/frameworks/core/components_v2/inspector/divider_composed_element.h b/frameworks/core/components_v2/inspector/divider_composed_element.h index 20cfe69c9891cb051e3bd7c485b6788cea0ef248..867c520205a15a0916e48102eec0987ea6a14e50 100644 --- a/frameworks/core/components_v2/inspector/divider_composed_element.h +++ b/frameworks/core/components_v2/inspector/divider_composed_element.h @@ -24,7 +24,7 @@ namespace OHOS::Ace::V2 { class ACE_EXPORT DividerComposedElement : public InspectorComposedElement { - DECLARE_ACE_TYPE(DividerComposedElement, InspectorComposedElement) + DECLARE_ACE_TYPE(DividerComposedElement, InspectorComposedElement); public: explicit DividerComposedElement(const ComposeId& id) : InspectorComposedElement(id) {} diff --git a/frameworks/core/components_v2/inspector/flex_composed_element.h b/frameworks/core/components_v2/inspector/flex_composed_element.h index 914106baa1fb789d392489b6c360425e5a296ec2..ebcfd3c6263ff096cc9b8659ad910b6526ba3bbd 100644 --- a/frameworks/core/components_v2/inspector/flex_composed_element.h +++ b/frameworks/core/components_v2/inspector/flex_composed_element.h @@ -23,7 +23,7 @@ namespace OHOS::Ace::V2 { class ACE_EXPORT FlexComposedElement : public InspectorComposedElement { - DECLARE_ACE_TYPE(FlexComposedElement, InspectorComposedElement) + DECLARE_ACE_TYPE(FlexComposedElement, InspectorComposedElement); public: explicit FlexComposedElement(const ComposeId& id) : InspectorComposedElement(id) {} diff --git a/frameworks/core/components_v2/inspector/gauge_composed_element.h b/frameworks/core/components_v2/inspector/gauge_composed_element.h index f7b5b67fbdbcb79bc898ff43f15098a42d9e4396..3a68daed44db839c332eaa78386c25674a46877f 100644 --- a/frameworks/core/components_v2/inspector/gauge_composed_element.h +++ b/frameworks/core/components_v2/inspector/gauge_composed_element.h @@ -22,7 +22,7 @@ namespace OHOS::Ace::V2 { class ACE_EXPORT GaugeComposedElement : public InspectorComposedElement { - DECLARE_ACE_TYPE(GaugeComposedElement, InspectorComposedElement) + DECLARE_ACE_TYPE(GaugeComposedElement, InspectorComposedElement); public: explicit GaugeComposedElement(const ComposeId& id) : InspectorComposedElement(id) {} diff --git a/frameworks/core/components_v2/inspector/grid_col_composed_element.h b/frameworks/core/components_v2/inspector/grid_col_composed_element.h index ca6e74bd97c76eb1a645a09f8d936e5ac835d438..3256e3305490ec3a734ad999b1410b28667744aa 100644 --- a/frameworks/core/components_v2/inspector/grid_col_composed_element.h +++ b/frameworks/core/components_v2/inspector/grid_col_composed_element.h @@ -23,7 +23,7 @@ namespace OHOS::Ace::V2 { class ACE_EXPORT GridColComposedElement : public InspectorComposedElement { - DECLARE_ACE_TYPE(GridColComposedElement, InspectorComposedElement) + DECLARE_ACE_TYPE(GridColComposedElement, InspectorComposedElement); public: explicit GridColComposedElement(const ComposeId& id) : InspectorComposedElement(id) {} diff --git a/frameworks/core/components_v2/inspector/grid_composed_element.h b/frameworks/core/components_v2/inspector/grid_composed_element.h index b4bb0652bfe47ad90b9681ea07df2370704355ec..e91aa1bc978ecdcce2ad2565bc1b471caa262ecd 100644 --- a/frameworks/core/components_v2/inspector/grid_composed_element.h +++ b/frameworks/core/components_v2/inspector/grid_composed_element.h @@ -27,7 +27,7 @@ namespace OHOS::Ace::V2 { class ACE_EXPORT GridComposedElement : public InspectorComposedElement { - DECLARE_ACE_TYPE(GridComposedElement, InspectorComposedElement) + DECLARE_ACE_TYPE(GridComposedElement, InspectorComposedElement); public: explicit GridComposedElement(const ComposeId& id) : InspectorComposedElement(id) {} diff --git a/frameworks/core/components_v2/inspector/grid_container_composed_element.h b/frameworks/core/components_v2/inspector/grid_container_composed_element.h index c3d9b93e96672c2292747afe715950647a5296f0..ba1753ae000a8b8e2ae87d5873dc8c7bf94c36a5 100644 --- a/frameworks/core/components_v2/inspector/grid_container_composed_element.h +++ b/frameworks/core/components_v2/inspector/grid_container_composed_element.h @@ -24,7 +24,7 @@ namespace OHOS::Ace::V2 { class ACE_EXPORT GridContainerComposedElement : public ColumnComposedElement { - DECLARE_ACE_TYPE(GridContainerComposedElement, ColumnComposedElement) + DECLARE_ACE_TYPE(GridContainerComposedElement, ColumnComposedElement); public: explicit GridContainerComposedElement(const ComposeId& id) : ColumnComposedElement(id) {} diff --git a/frameworks/core/components_v2/inspector/grid_item_composed_element.h b/frameworks/core/components_v2/inspector/grid_item_composed_element.h index c4fc4741cdb683c41d4f788a1c5e4c1414e8c319..67a8822df871b687d3f13b59404d3ae9d5fea189 100644 --- a/frameworks/core/components_v2/inspector/grid_item_composed_element.h +++ b/frameworks/core/components_v2/inspector/grid_item_composed_element.h @@ -24,7 +24,7 @@ namespace OHOS::Ace::V2 { class ACE_EXPORT GridItemComposedElement : public InspectorComposedElement { - DECLARE_ACE_TYPE(GridItemComposedElement, InspectorComposedElement) + DECLARE_ACE_TYPE(GridItemComposedElement, InspectorComposedElement); public: explicit GridItemComposedElement(const ComposeId& id) : InspectorComposedElement(id) {} diff --git a/frameworks/core/components_v2/inspector/grid_row_composed_element.h b/frameworks/core/components_v2/inspector/grid_row_composed_element.h index dee8567ceda9e1ddddf12f4b9b8bf8afc6f710a2..f005e51253457be0ebf2aa0ded144dd61dd0cdcd 100644 --- a/frameworks/core/components_v2/inspector/grid_row_composed_element.h +++ b/frameworks/core/components_v2/inspector/grid_row_composed_element.h @@ -24,7 +24,7 @@ namespace OHOS::Ace::V2 { class ACE_EXPORT GridRowComposedElement : public InspectorComposedElement { - DECLARE_ACE_TYPE(GridRowComposedElement, InspectorComposedElement) + DECLARE_ACE_TYPE(GridRowComposedElement, InspectorComposedElement); public: explicit GridRowComposedElement(const ComposeId& id) : InspectorComposedElement(id) {} diff --git a/frameworks/core/components_v2/inspector/hyperlink_composed_element.h b/frameworks/core/components_v2/inspector/hyperlink_composed_element.h index a6c6ac5fc32c31df8e856af925e6a6d5f87ffac0..063ca4014822e42bcde0bb5d6c05fd201c3c40ba 100644 --- a/frameworks/core/components_v2/inspector/hyperlink_composed_element.h +++ b/frameworks/core/components_v2/inspector/hyperlink_composed_element.h @@ -23,7 +23,7 @@ namespace OHOS::Ace::V2 { class ACE_EXPORT HyperlinkComposedElement : public InspectorComposedElement { - DECLARE_ACE_TYPE(HyperlinkComposedElement, InspectorComposedElement) + DECLARE_ACE_TYPE(HyperlinkComposedElement, InspectorComposedElement); public: explicit HyperlinkComposedElement(const ComposeId& id) : InspectorComposedElement(id) {} diff --git a/frameworks/core/components_v2/inspector/image_animator_composed_element.h b/frameworks/core/components_v2/inspector/image_animator_composed_element.h index 5a91050dc6646658958e36f02338f20e5e89c24d..bd4a9e5d070b0b357b5d41549898d1bda3af0c6b 100644 --- a/frameworks/core/components_v2/inspector/image_animator_composed_element.h +++ b/frameworks/core/components_v2/inspector/image_animator_composed_element.h @@ -24,7 +24,7 @@ namespace OHOS::Ace::V2 { class ACE_EXPORT ImageAnimatorComposedElement : public InspectorComposedElement { - DECLARE_ACE_TYPE(ImageAnimatorComposedElement, InspectorComposedElement) + DECLARE_ACE_TYPE(ImageAnimatorComposedElement, InspectorComposedElement); public: explicit ImageAnimatorComposedElement(const ComposeId& id) : InspectorComposedElement(id) {} ~ImageAnimatorComposedElement() override = default; diff --git a/frameworks/core/components_v2/inspector/image_composed_element.h b/frameworks/core/components_v2/inspector/image_composed_element.h index 56b50ee18c0cf98a3d2f03887c91fe69a7a8888f..1c7ad3c2e1f04ac836725153f784eec9e430c230 100644 --- a/frameworks/core/components_v2/inspector/image_composed_element.h +++ b/frameworks/core/components_v2/inspector/image_composed_element.h @@ -24,7 +24,7 @@ namespace OHOS::Ace::V2 { class ACE_EXPORT ImageComposedElement : public InspectorComposedElement { - DECLARE_ACE_TYPE(ImageComposedElement, InspectorComposedElement) + DECLARE_ACE_TYPE(ImageComposedElement, InspectorComposedElement); public: explicit ImageComposedElement(const ComposeId& id) : InspectorComposedElement(id) {} diff --git a/frameworks/core/components_v2/inspector/indexer_composed_element.h b/frameworks/core/components_v2/inspector/indexer_composed_element.h index a0cbbeb94c630a73ee53ea3b795bf4cdb170a52b..d3f293ee81420d16bfc0531849d7ad69a6d1250e 100644 --- a/frameworks/core/components_v2/inspector/indexer_composed_element.h +++ b/frameworks/core/components_v2/inspector/indexer_composed_element.h @@ -24,7 +24,7 @@ namespace OHOS::Ace::V2 { class ACE_EXPORT IndexerComposedElement : public InspectorComposedElement { - DECLARE_ACE_TYPE(IndexerComposedElement, InspectorComposedElement) + DECLARE_ACE_TYPE(IndexerComposedElement, InspectorComposedElement); public: explicit IndexerComposedElement(const ComposeId& id) : InspectorComposedElement(id) {} diff --git a/frameworks/core/components_v2/inspector/inspector_composed_element.h b/frameworks/core/components_v2/inspector/inspector_composed_element.h index 96c24f53191d87e5a930e68ba081ce596c5d43c9..2590f2dfc6516ba94bd82c84ff2bc8b76a9e9d3e 100644 --- a/frameworks/core/components_v2/inspector/inspector_composed_element.h +++ b/frameworks/core/components_v2/inspector/inspector_composed_element.h @@ -28,7 +28,7 @@ namespace OHOS::Ace::V2 { class ACE_EXPORT InspectorComposedElement : public ComposedElement, public InspectorNode { - DECLARE_ACE_TYPE(InspectorComposedElement, ComposedElement, InspectorNode) + DECLARE_ACE_TYPE(InspectorComposedElement, ComposedElement, InspectorNode); public: explicit InspectorComposedElement(const ComposeId& id); diff --git a/frameworks/core/components_v2/inspector/inspector_node.h b/frameworks/core/components_v2/inspector/inspector_node.h index 8bd2e679f8c11b4103c37e8deff8d16048c03eda..dd1bd09e0f8385294534c17a28c8ece019523fdc 100644 --- a/frameworks/core/components_v2/inspector/inspector_node.h +++ b/frameworks/core/components_v2/inspector/inspector_node.h @@ -57,7 +57,7 @@ struct ScaleParam { }; class ACE_EXPORT InspectorNode : public virtual AceType { - DECLARE_ACE_TYPE(InspectorNode, AceType) + DECLARE_ACE_TYPE(InspectorNode, AceType); public: InspectorNode() = default; diff --git a/frameworks/core/components_v2/inspector/list_composed_element.h b/frameworks/core/components_v2/inspector/list_composed_element.h index 36374aba270b77d0cc15b89087009718101a456f..d0ad2b600904fcf479d5bda78c92651e2b56a751 100644 --- a/frameworks/core/components_v2/inspector/list_composed_element.h +++ b/frameworks/core/components_v2/inspector/list_composed_element.h @@ -23,7 +23,7 @@ namespace OHOS::Ace::V2 { class ACE_EXPORT ListComposedElement : public InspectorComposedElement { - DECLARE_ACE_TYPE(ListComposedElement, InspectorComposedElement) + DECLARE_ACE_TYPE(ListComposedElement, InspectorComposedElement); public: explicit ListComposedElement(const ComposeId& id) : InspectorComposedElement(id) {} diff --git a/frameworks/core/components_v2/inspector/list_item_composed_element.h b/frameworks/core/components_v2/inspector/list_item_composed_element.h index c257e37e39f8e7ac175522b14d5831fd093eaeec..33a1ef09bf7558e079bf93e400553d88049212b3 100644 --- a/frameworks/core/components_v2/inspector/list_item_composed_element.h +++ b/frameworks/core/components_v2/inspector/list_item_composed_element.h @@ -23,7 +23,7 @@ namespace OHOS::Ace::V2 { class ACE_EXPORT ListItemComposedElement : public InspectorComposedElement { - DECLARE_ACE_TYPE(ListItemComposedElement, InspectorComposedElement) + DECLARE_ACE_TYPE(ListItemComposedElement, InspectorComposedElement); public: explicit ListItemComposedElement(const ComposeId& id) : InspectorComposedElement(id) {} diff --git a/frameworks/core/components_v2/inspector/list_item_group_composed_element.h b/frameworks/core/components_v2/inspector/list_item_group_composed_element.h index b515e99d14ef58e37cc8e150490f9ba834e0a4e3..e5470024a6ca7fce5b63dcd2480d3fd61331f49b 100644 --- a/frameworks/core/components_v2/inspector/list_item_group_composed_element.h +++ b/frameworks/core/components_v2/inspector/list_item_group_composed_element.h @@ -23,7 +23,7 @@ namespace OHOS::Ace::V2 { class ACE_EXPORT ListItemGroupComposedElement : public InspectorComposedElement { - DECLARE_ACE_TYPE(ListItemGroupComposedElement, InspectorComposedElement) + DECLARE_ACE_TYPE(ListItemGroupComposedElement, InspectorComposedElement); public: explicit ListItemGroupComposedElement(const ComposeId& id) : InspectorComposedElement(id) {} diff --git a/frameworks/core/components_v2/inspector/loading_progress_composed_element.h b/frameworks/core/components_v2/inspector/loading_progress_composed_element.h index 4bc686bb7533020da082e94e62ead0100dfdbbca..4e6688a652a2074809b1defe29bc26b9750cceb4 100644 --- a/frameworks/core/components_v2/inspector/loading_progress_composed_element.h +++ b/frameworks/core/components_v2/inspector/loading_progress_composed_element.h @@ -22,7 +22,7 @@ namespace OHOS::Ace::V2 { class ACE_EXPORT LoadingProgressComposedElement : public InspectorComposedElement { - DECLARE_ACE_TYPE(LoadingProgressComposedElement, InspectorComposedElement) + DECLARE_ACE_TYPE(LoadingProgressComposedElement, InspectorComposedElement); public: explicit LoadingProgressComposedElement(const ComposeId& id) : InspectorComposedElement(id) {} diff --git a/frameworks/core/components_v2/inspector/marquee_composed_element.h b/frameworks/core/components_v2/inspector/marquee_composed_element.h index e5f9fbeebd838f775ef99f07df11635a68d2dc4b..a189eceb78cbf38eb25ef2ea292d577c08557f48 100644 --- a/frameworks/core/components_v2/inspector/marquee_composed_element.h +++ b/frameworks/core/components_v2/inspector/marquee_composed_element.h @@ -22,7 +22,7 @@ #include "core/pipeline/base/composed_element.h" namespace OHOS::Ace::V2 { class ACE_EXPORT MarqueeComposedElement : public InspectorComposedElement { - DECLARE_ACE_TYPE(MarqueeComposedElement, InspectorComposedElement) + DECLARE_ACE_TYPE(MarqueeComposedElement, InspectorComposedElement); public: explicit MarqueeComposedElement(const ComposeId& id) : InspectorComposedElement(id) {} diff --git a/frameworks/core/components_v2/inspector/menu_composed_element.h b/frameworks/core/components_v2/inspector/menu_composed_element.h index cfb7958cd15ea5c247d65d9a68a754700e87c75f..075d144f34a349be3d34984ba34edd514ab75db6 100644 --- a/frameworks/core/components_v2/inspector/menu_composed_element.h +++ b/frameworks/core/components_v2/inspector/menu_composed_element.h @@ -23,7 +23,7 @@ namespace OHOS::Ace::V2 { class ACE_EXPORT MenuComposedElement : public InspectorComposedElement { - DECLARE_ACE_TYPE(MenuComposedElement, InspectorComposedElement) + DECLARE_ACE_TYPE(MenuComposedElement, InspectorComposedElement); public: explicit MenuComposedElement(const ComposeId& id) : InspectorComposedElement(id) {} diff --git a/frameworks/core/components_v2/inspector/navigation_composed_element.h b/frameworks/core/components_v2/inspector/navigation_composed_element.h index dcf1afe050e5cb602211d0e81e27404c7d69c8e9..d6470747dc56c947af2c41f007ed8aaa23a50486 100644 --- a/frameworks/core/components_v2/inspector/navigation_composed_element.h +++ b/frameworks/core/components_v2/inspector/navigation_composed_element.h @@ -25,7 +25,7 @@ namespace OHOS::Ace::V2 { class ACE_EXPORT NavigationComposedElement : public InspectorComposedElement { - DECLARE_ACE_TYPE(NavigationComposedElement, InspectorComposedElement) + DECLARE_ACE_TYPE(NavigationComposedElement, InspectorComposedElement); public: explicit NavigationComposedElement(const ComposeId& id) : InspectorComposedElement(id) {} diff --git a/frameworks/core/components_v2/inspector/navigation_menus_composed_element.h b/frameworks/core/components_v2/inspector/navigation_menus_composed_element.h index 2630a25339511cd57682ddded851e168c16d99f3..b8d48331823d728582196c096dbc5c728910f524 100644 --- a/frameworks/core/components_v2/inspector/navigation_menus_composed_element.h +++ b/frameworks/core/components_v2/inspector/navigation_menus_composed_element.h @@ -22,7 +22,7 @@ namespace OHOS::Ace::V2 { class ACE_EXPORT NavigationMenusComposedElement : public InspectorComposedElement { - DECLARE_ACE_TYPE(NavigationMenusComposedElement, InspectorComposedElement) + DECLARE_ACE_TYPE(NavigationMenusComposedElement, InspectorComposedElement); public: explicit NavigationMenusComposedElement(const ComposeId& id) : InspectorComposedElement(id) {} diff --git a/frameworks/core/components_v2/inspector/navigation_title_composed_element.h b/frameworks/core/components_v2/inspector/navigation_title_composed_element.h index a4264daf5d3c7a3315ce374f384431956cbdb35a..108162ac734b2735428f7950bd216f71bbb340ca 100644 --- a/frameworks/core/components_v2/inspector/navigation_title_composed_element.h +++ b/frameworks/core/components_v2/inspector/navigation_title_composed_element.h @@ -22,7 +22,7 @@ namespace OHOS::Ace::V2 { class ACE_EXPORT NavigationTitleComposedElement : public InspectorComposedElement { - DECLARE_ACE_TYPE(NavigationTitleComposedElement, InspectorComposedElement) + DECLARE_ACE_TYPE(NavigationTitleComposedElement, InspectorComposedElement); public: explicit NavigationTitleComposedElement(const ComposeId& id) : InspectorComposedElement(id) {} diff --git a/frameworks/core/components_v2/inspector/navigator_composed_element.h b/frameworks/core/components_v2/inspector/navigator_composed_element.h index 9e37a8a52bbda1c64f4984241e1780b1b4b170ca..feb451d77cbe62f8d8707ecb5e98c00d83e463ea 100644 --- a/frameworks/core/components_v2/inspector/navigator_composed_element.h +++ b/frameworks/core/components_v2/inspector/navigator_composed_element.h @@ -23,7 +23,7 @@ namespace OHOS::Ace::V2 { class ACE_EXPORT NavigatorComposedElement : public InspectorComposedElement { - DECLARE_ACE_TYPE(NavigatorComposedElement, InspectorComposedElement) + DECLARE_ACE_TYPE(NavigatorComposedElement, InspectorComposedElement); public: explicit NavigatorComposedElement(const ComposeId& id) : InspectorComposedElement(id) {} diff --git a/frameworks/core/components_v2/inspector/panel_composed_element.h b/frameworks/core/components_v2/inspector/panel_composed_element.h index 610786ac866c5413bf5f889208080a70562c5ba0..7622b4823b42ea82ca9e5d5eb252bce56e805a3e 100644 --- a/frameworks/core/components_v2/inspector/panel_composed_element.h +++ b/frameworks/core/components_v2/inspector/panel_composed_element.h @@ -24,7 +24,7 @@ namespace OHOS::Ace::V2 { class ACE_EXPORT PanelComposedElement : public InspectorComposedElement { - DECLARE_ACE_TYPE(PanelComposedElement, InspectorComposedElement) + DECLARE_ACE_TYPE(PanelComposedElement, InspectorComposedElement); public: explicit PanelComposedElement(const ComposeId& id) : InspectorComposedElement(id) {} diff --git a/frameworks/core/components_v2/inspector/pattern_lock_composed_element.h b/frameworks/core/components_v2/inspector/pattern_lock_composed_element.h index 6dbb6b678eda4633f1465111a651a7491f630018..917f9b55c0a75aff0f2a7af59ab49689a2052bc8 100644 --- a/frameworks/core/components_v2/inspector/pattern_lock_composed_element.h +++ b/frameworks/core/components_v2/inspector/pattern_lock_composed_element.h @@ -22,7 +22,7 @@ namespace OHOS::Ace::V2 { class ACE_EXPORT PatternLockComposedElement : public InspectorComposedElement { - DECLARE_ACE_TYPE(PatternLockComposedElement, InspectorComposedElement) + DECLARE_ACE_TYPE(PatternLockComposedElement, InspectorComposedElement); public: explicit PatternLockComposedElement(const ComposeId& id) : InspectorComposedElement(id) {} diff --git a/frameworks/core/components_v2/inspector/picker_text_dialog_composed_element.h b/frameworks/core/components_v2/inspector/picker_text_dialog_composed_element.h index 0e8798febf8d7abf0bf1136693db3b1e7492125f..aa3462469fc9580904d856ab58f1c4c3df76b3ac 100644 --- a/frameworks/core/components_v2/inspector/picker_text_dialog_composed_element.h +++ b/frameworks/core/components_v2/inspector/picker_text_dialog_composed_element.h @@ -22,7 +22,7 @@ namespace OHOS::Ace::V2 { class ACE_EXPORT PickerTextDialogComposedElement : public InspectorComposedElement { - DECLARE_ACE_TYPE(PickerTextDialogComposedElement, InspectorComposedElement) + DECLARE_ACE_TYPE(PickerTextDialogComposedElement, InspectorComposedElement); public: explicit PickerTextDialogComposedElement(const ComposeId& id) : InspectorComposedElement(id) {} diff --git a/frameworks/core/components_v2/inspector/progress_composed_element.h b/frameworks/core/components_v2/inspector/progress_composed_element.h index 57c2dae0ba0f96d7d88a961a5e4e616d9317b52d..f620babb6bc77f0d2e2742f85a35ad54deacb62c 100644 --- a/frameworks/core/components_v2/inspector/progress_composed_element.h +++ b/frameworks/core/components_v2/inspector/progress_composed_element.h @@ -23,7 +23,7 @@ namespace OHOS::Ace::V2 { class ACE_EXPORT ProgressComposedElement : public InspectorComposedElement { - DECLARE_ACE_TYPE(ProgressComposedElement, InspectorComposedElement) + DECLARE_ACE_TYPE(ProgressComposedElement, InspectorComposedElement); public: explicit ProgressComposedElement(const ComposeId& id) : InspectorComposedElement(id) {} diff --git a/frameworks/core/components_v2/inspector/qrcode_composed_element.h b/frameworks/core/components_v2/inspector/qrcode_composed_element.h index 9aad9c2667aff3e315ae83f86559bbabe9ee911f..621b07fb9e7bb6291c26b04f46a149c9e1b614d9 100644 --- a/frameworks/core/components_v2/inspector/qrcode_composed_element.h +++ b/frameworks/core/components_v2/inspector/qrcode_composed_element.h @@ -24,7 +24,7 @@ namespace OHOS::Ace::V2 { class ACE_EXPORT QrcodeComposedElement : public InspectorComposedElement { - DECLARE_ACE_TYPE(QrcodeComposedElement, InspectorComposedElement) + DECLARE_ACE_TYPE(QrcodeComposedElement, InspectorComposedElement); public: explicit QrcodeComposedElement(const ComposeId& id) : InspectorComposedElement(id) {} diff --git a/frameworks/core/components_v2/inspector/radio_composed_element.h b/frameworks/core/components_v2/inspector/radio_composed_element.h index 3b936edbc3889ec95ca29a66844243954b956631..262713c2b60ae15cbca9e39e6ebca91b620626ef 100644 --- a/frameworks/core/components_v2/inspector/radio_composed_element.h +++ b/frameworks/core/components_v2/inspector/radio_composed_element.h @@ -22,7 +22,7 @@ namespace OHOS::Ace::V2 { class ACE_EXPORT RadioComposedElement : public InspectorComposedElement { - DECLARE_ACE_TYPE(RadioComposedElement, InspectorComposedElement) + DECLARE_ACE_TYPE(RadioComposedElement, InspectorComposedElement); public: explicit RadioComposedElement(const ComposeId& id) : InspectorComposedElement(id) {} diff --git a/frameworks/core/components_v2/inspector/rating_composed_element.h b/frameworks/core/components_v2/inspector/rating_composed_element.h index 05c5a5e2859ed1c2669a350e43bc41df1293c5e0..aaace942a172b4792024ac643627c12511332d43 100644 --- a/frameworks/core/components_v2/inspector/rating_composed_element.h +++ b/frameworks/core/components_v2/inspector/rating_composed_element.h @@ -23,7 +23,7 @@ namespace OHOS::Ace::V2 { class ACE_EXPORT RatingComposedElement : public InspectorComposedElement { - DECLARE_ACE_TYPE(RatingComposedElement, InspectorComposedElement) + DECLARE_ACE_TYPE(RatingComposedElement, InspectorComposedElement); public: explicit RatingComposedElement(const ComposeId& id) : InspectorComposedElement(id) {} diff --git a/frameworks/core/components_v2/inspector/refresh_composed_element.h b/frameworks/core/components_v2/inspector/refresh_composed_element.h index 88d6520b50c1abe90cf3343eb803fea7e61b5fa5..5795e76cafc1f1b579eabacb7456d0c78102171c 100644 --- a/frameworks/core/components_v2/inspector/refresh_composed_element.h +++ b/frameworks/core/components_v2/inspector/refresh_composed_element.h @@ -24,7 +24,7 @@ namespace OHOS::Ace::V2 { class ACE_EXPORT RefreshComposedElement : public InspectorComposedElement { - DECLARE_ACE_TYPE(RefreshComposedElement, InspectorComposedElement) + DECLARE_ACE_TYPE(RefreshComposedElement, InspectorComposedElement); public: explicit RefreshComposedElement(const ComposeId& id) : InspectorComposedElement(id) {} diff --git a/frameworks/core/components_v2/inspector/relative_container_composed_element.h b/frameworks/core/components_v2/inspector/relative_container_composed_element.h index 5edcf8084bee1082c6fd28ffb4ccb3bfe001231b..ce51c8d057ba4c8c67b23d61528db09cacd96220 100644 --- a/frameworks/core/components_v2/inspector/relative_container_composed_element.h +++ b/frameworks/core/components_v2/inspector/relative_container_composed_element.h @@ -25,7 +25,7 @@ namespace OHOS::Ace::V2 { class ACE_EXPORT RelativeContainerComposedElement : public InspectorComposedElement { - DECLARE_ACE_TYPE(RelativeContainerComposedElement, InspectorComposedElement) + DECLARE_ACE_TYPE(RelativeContainerComposedElement, InspectorComposedElement); public: explicit RelativeContainerComposedElement(const ComposeId& id) : InspectorComposedElement(id) {} diff --git a/frameworks/core/components_v2/inspector/row_composed_element.h b/frameworks/core/components_v2/inspector/row_composed_element.h index 192ec198de3ffa60862b37279255b3017d94ca4e..6ce4b246e47ba62ddbf2d27b81061b674765d6ae 100644 --- a/frameworks/core/components_v2/inspector/row_composed_element.h +++ b/frameworks/core/components_v2/inspector/row_composed_element.h @@ -23,7 +23,7 @@ namespace OHOS::Ace::V2 { class ACE_EXPORT RowComposedElement : public InspectorComposedElement { - DECLARE_ACE_TYPE(RowComposedElement, InspectorComposedElement) + DECLARE_ACE_TYPE(RowComposedElement, InspectorComposedElement); public: explicit RowComposedElement(const ComposeId& id) : InspectorComposedElement(id) {} diff --git a/frameworks/core/components_v2/inspector/row_split_composed_element.h b/frameworks/core/components_v2/inspector/row_split_composed_element.h index 6d3f13dce35ae6c1bbcfa07647451d559acf2d32..c2714a85f2be717996aea9651bcdb53e3df2443c 100644 --- a/frameworks/core/components_v2/inspector/row_split_composed_element.h +++ b/frameworks/core/components_v2/inspector/row_split_composed_element.h @@ -24,7 +24,7 @@ namespace OHOS::Ace::V2 { class ACE_EXPORT RowSplitComposedElement : public InspectorComposedElement { - DECLARE_ACE_TYPE(RowSplitComposedElement, InspectorComposedElement) + DECLARE_ACE_TYPE(RowSplitComposedElement, InspectorComposedElement); public: explicit RowSplitComposedElement(const ComposeId& id) : InspectorComposedElement(id) {} diff --git a/frameworks/core/components_v2/inspector/scroll_bar_composed_element.h b/frameworks/core/components_v2/inspector/scroll_bar_composed_element.h index 16b6094c5bc8b70c8fa21732b01160dbc6339f57..5da81e5013d64b3352e0646cbcc805fa3f06aff0 100644 --- a/frameworks/core/components_v2/inspector/scroll_bar_composed_element.h +++ b/frameworks/core/components_v2/inspector/scroll_bar_composed_element.h @@ -24,7 +24,7 @@ namespace OHOS::Ace::V2 { class ACE_EXPORT ScrollBarComposedElement : public InspectorComposedElement { - DECLARE_ACE_TYPE(ScrollBarComposedElement, InspectorComposedElement) + DECLARE_ACE_TYPE(ScrollBarComposedElement, InspectorComposedElement); public: explicit ScrollBarComposedElement(const ComposeId& id) : InspectorComposedElement(id) {} diff --git a/frameworks/core/components_v2/inspector/scroll_composed_element.h b/frameworks/core/components_v2/inspector/scroll_composed_element.h index 36aabc4316c34d9a1839b51b796545d9455d974c..d56a07cdda72dc408cd7ebf75b7b8d797fcc40bc 100644 --- a/frameworks/core/components_v2/inspector/scroll_composed_element.h +++ b/frameworks/core/components_v2/inspector/scroll_composed_element.h @@ -24,7 +24,7 @@ namespace OHOS::Ace::V2 { class ACE_EXPORT ScrollComposedElement : public InspectorComposedElement { - DECLARE_ACE_TYPE(ScrollComposedElement, InspectorComposedElement) + DECLARE_ACE_TYPE(ScrollComposedElement, InspectorComposedElement); public: explicit ScrollComposedElement(const ComposeId& id) : InspectorComposedElement(id) {} diff --git a/frameworks/core/components_v2/inspector/search_composed_element.h b/frameworks/core/components_v2/inspector/search_composed_element.h index 7638665270d392028e2fef61071dbb4ba30006f9..38c929bfd450c2d192f35db941617fbdf736289f 100644 --- a/frameworks/core/components_v2/inspector/search_composed_element.h +++ b/frameworks/core/components_v2/inspector/search_composed_element.h @@ -20,7 +20,7 @@ namespace OHOS::Ace::V2 { class ACE_EXPORT SearchComposedElement : public InspectorComposedElement { - DECLARE_ACE_TYPE(SearchComposedElement, InspectorComposedElement) + DECLARE_ACE_TYPE(SearchComposedElement, InspectorComposedElement); public: explicit SearchComposedElement(const ComposeId& id) : InspectorComposedElement(id) {} diff --git a/frameworks/core/components_v2/inspector/select_composed_element.h b/frameworks/core/components_v2/inspector/select_composed_element.h index f6c09841839d46ca360f916992eabf17f1c4ae45..a55519377f68781d73ec3d2955d00bb0cc2f4435 100644 --- a/frameworks/core/components_v2/inspector/select_composed_element.h +++ b/frameworks/core/components_v2/inspector/select_composed_element.h @@ -23,7 +23,7 @@ namespace OHOS::Ace::V2 { class ACE_EXPORT SelectComposedElement : public InspectorComposedElement { - DECLARE_ACE_TYPE(SelectComposedElement, InspectorComposedElement) + DECLARE_ACE_TYPE(SelectComposedElement, InspectorComposedElement); public: explicit SelectComposedElement(const ComposeId& id) : InspectorComposedElement(id) {} diff --git a/frameworks/core/components_v2/inspector/shape_composed_element.h b/frameworks/core/components_v2/inspector/shape_composed_element.h index 559d3936c85938b86843c6def4b08f7a3bb951c8..7d430baf03fcae3ff5229aafe0d35b5e61dcdc82 100644 --- a/frameworks/core/components_v2/inspector/shape_composed_element.h +++ b/frameworks/core/components_v2/inspector/shape_composed_element.h @@ -24,7 +24,7 @@ namespace OHOS::Ace::V2 { class ACE_EXPORT ShapeComposedElement : public InspectorComposedElement { - DECLARE_ACE_TYPE(ShapeComposedElement, InspectorComposedElement) + DECLARE_ACE_TYPE(ShapeComposedElement, InspectorComposedElement); public: explicit ShapeComposedElement(const ComposeId& id) : InspectorComposedElement(id) {} ~ShapeComposedElement() override = default; diff --git a/frameworks/core/components_v2/inspector/shape_container_composed_element.h b/frameworks/core/components_v2/inspector/shape_container_composed_element.h index e41a1b3b31efedfb7f8be79cba59e2feaf68c97a..b299c6196d53a11031354891b74e99bef076f255 100644 --- a/frameworks/core/components_v2/inspector/shape_container_composed_element.h +++ b/frameworks/core/components_v2/inspector/shape_container_composed_element.h @@ -25,7 +25,7 @@ namespace OHOS::Ace::V2 { class ACE_EXPORT ShapeContainerComposedElement : public InspectorComposedElement { - DECLARE_ACE_TYPE(ShapeContainerComposedElement, InspectorComposedElement) + DECLARE_ACE_TYPE(ShapeContainerComposedElement, InspectorComposedElement); public: static std::string LineCapStyleToString(LineCapStyle lineCapStyle); diff --git a/frameworks/core/components_v2/inspector/sheet_composed_element.h b/frameworks/core/components_v2/inspector/sheet_composed_element.h index d35b73ca8529efeffcbf17deab3491269f819de6..8b120b53d72f3e8dd4424276c86f7c8a29ea821a 100644 --- a/frameworks/core/components_v2/inspector/sheet_composed_element.h +++ b/frameworks/core/components_v2/inspector/sheet_composed_element.h @@ -23,7 +23,7 @@ namespace OHOS::Ace::V2 { class ACE_EXPORT SheetComposedElement : public InspectorComposedElement { - DECLARE_ACE_TYPE(SheetComposedElement, InspectorComposedElement) + DECLARE_ACE_TYPE(SheetComposedElement, InspectorComposedElement); public: explicit SheetComposedElement(const ComposeId& id) : InspectorComposedElement(id) {} diff --git a/frameworks/core/components_v2/inspector/side_bar_composed_element.h b/frameworks/core/components_v2/inspector/side_bar_composed_element.h index 975ab8ef19a5e13911850b3b3ecb7886583d75ad..b69b9e50fe45c534195e21f9248fd1d65c7ca679 100644 --- a/frameworks/core/components_v2/inspector/side_bar_composed_element.h +++ b/frameworks/core/components_v2/inspector/side_bar_composed_element.h @@ -23,7 +23,7 @@ namespace OHOS::Ace::V2 { class ACE_EXPORT SideBarComposedElement : public InspectorComposedElement { - DECLARE_ACE_TYPE(SideBarComposedElement, InspectorComposedElement) + DECLARE_ACE_TYPE(SideBarComposedElement, InspectorComposedElement); public: explicit SideBarComposedElement(const ComposeId& id) : InspectorComposedElement(id) {} diff --git a/frameworks/core/components_v2/inspector/slider_composed_element.h b/frameworks/core/components_v2/inspector/slider_composed_element.h index a84f416ef7acdcbdb6896b421f2ff12cd5450535..e998f8c957f19011e43b9fe0b1854780812e2768 100644 --- a/frameworks/core/components_v2/inspector/slider_composed_element.h +++ b/frameworks/core/components_v2/inspector/slider_composed_element.h @@ -23,7 +23,7 @@ namespace OHOS::Ace::V2 { class ACE_EXPORT SliderComposedElement : public InspectorComposedElement { - DECLARE_ACE_TYPE(SliderComposedElement, InspectorComposedElement) + DECLARE_ACE_TYPE(SliderComposedElement, InspectorComposedElement); public: explicit SliderComposedElement(const ComposeId& id) : InspectorComposedElement(id) {} diff --git a/frameworks/core/components_v2/inspector/span_composed_element.h b/frameworks/core/components_v2/inspector/span_composed_element.h index 2efe4f9068746a41bbe9a89445ccad767b81917a..029b8558320db9b267d2ba6458c5806bbce98192 100644 --- a/frameworks/core/components_v2/inspector/span_composed_element.h +++ b/frameworks/core/components_v2/inspector/span_composed_element.h @@ -23,7 +23,7 @@ namespace OHOS::Ace::V2 { class ACE_EXPORT SpanComposedElement : public InspectorComposedElement { - DECLARE_ACE_TYPE(SpanComposedElement, InspectorComposedElement) + DECLARE_ACE_TYPE(SpanComposedElement, InspectorComposedElement); public: explicit SpanComposedElement(const ComposeId& id) : InspectorComposedElement(id) {} diff --git a/frameworks/core/components_v2/inspector/stack_composed_element.h b/frameworks/core/components_v2/inspector/stack_composed_element.h index 4ad3ef56363fe777ec1cee955e3de9d6360e90c3..a1927fb18595e182d58ca48815b9eb0c9f387a63 100644 --- a/frameworks/core/components_v2/inspector/stack_composed_element.h +++ b/frameworks/core/components_v2/inspector/stack_composed_element.h @@ -24,7 +24,7 @@ namespace OHOS::Ace::V2 { class ACE_EXPORT StackComposedElement : public InspectorComposedElement { - DECLARE_ACE_TYPE(StackComposedElement, InspectorComposedElement) + DECLARE_ACE_TYPE(StackComposedElement, InspectorComposedElement); public: explicit StackComposedElement(const ComposeId& id) : InspectorComposedElement(id) {} diff --git a/frameworks/core/components_v2/inspector/stepper_composed_element.h b/frameworks/core/components_v2/inspector/stepper_composed_element.h index 94a76d23a1230724527e93af1dd34881ce235bb6..efeffb2d23b4bf1972ad93a12798d82040f7fab4 100644 --- a/frameworks/core/components_v2/inspector/stepper_composed_element.h +++ b/frameworks/core/components_v2/inspector/stepper_composed_element.h @@ -24,7 +24,7 @@ namespace OHOS::Ace::V2 { class ACE_EXPORT StepperComposedElement : public InspectorComposedElement { - DECLARE_ACE_TYPE(StepperComposedElement, InspectorComposedElement) + DECLARE_ACE_TYPE(StepperComposedElement, InspectorComposedElement); public: explicit StepperComposedElement(const ComposeId& id) : InspectorComposedElement(id) {} diff --git a/frameworks/core/components_v2/inspector/stepper_item_composed_element.h b/frameworks/core/components_v2/inspector/stepper_item_composed_element.h index fca12ff03e6d39e521f953937d861d67cc7916b4..e4e20cdaeb525fe4beaecbf6b7bb5859da118e60 100644 --- a/frameworks/core/components_v2/inspector/stepper_item_composed_element.h +++ b/frameworks/core/components_v2/inspector/stepper_item_composed_element.h @@ -22,7 +22,7 @@ #include "core/pipeline/base/composed_element.h" namespace OHOS::Ace::V2 { class ACE_EXPORT StepperItemComposedElement : public InspectorComposedElement { - DECLARE_ACE_TYPE(StepperItemComposedElement, InspectorComposedElement) + DECLARE_ACE_TYPE(StepperItemComposedElement, InspectorComposedElement); public: explicit StepperItemComposedElement(const ComposeId& id) : InspectorComposedElement(id) {} diff --git a/frameworks/core/components_v2/inspector/swiper_composed_element.h b/frameworks/core/components_v2/inspector/swiper_composed_element.h index 82e528ddfd941498c6f7e83ed0f08290c370f368..5b417a6a81e1089de513331dac9a2b65fabad2e9 100644 --- a/frameworks/core/components_v2/inspector/swiper_composed_element.h +++ b/frameworks/core/components_v2/inspector/swiper_composed_element.h @@ -24,7 +24,7 @@ namespace OHOS::Ace::V2 { class ACE_EXPORT SwiperComposedElement : public InspectorComposedElement { - DECLARE_ACE_TYPE(SwiperComposedElement, InspectorComposedElement) + DECLARE_ACE_TYPE(SwiperComposedElement, InspectorComposedElement); public: explicit SwiperComposedElement(const ComposeId& id) : InspectorComposedElement(id) {} diff --git a/frameworks/core/components_v2/inspector/switch_composed_element.h b/frameworks/core/components_v2/inspector/switch_composed_element.h index 91a57b525c61bed9e1867303b517be26fd3ef97f..27e1a9a7b8b8dccd1f764424ea225098dc90e8e1 100644 --- a/frameworks/core/components_v2/inspector/switch_composed_element.h +++ b/frameworks/core/components_v2/inspector/switch_composed_element.h @@ -24,7 +24,7 @@ namespace OHOS::Ace::V2 { class ACE_EXPORT SwitchComposedElement : public InspectorComposedElement { - DECLARE_ACE_TYPE(SwitchComposedElement, InspectorComposedElement) + DECLARE_ACE_TYPE(SwitchComposedElement, InspectorComposedElement); public: explicit SwitchComposedElement(const ComposeId& id) : InspectorComposedElement(id) {} diff --git a/frameworks/core/components_v2/inspector/tab_content_composed_element.h b/frameworks/core/components_v2/inspector/tab_content_composed_element.h index c01db43e5e43cde0ebf3c07dc92bc04fab1e4d4f..5c7d820f9adbb6debedef73ca47975284d8cb522 100644 --- a/frameworks/core/components_v2/inspector/tab_content_composed_element.h +++ b/frameworks/core/components_v2/inspector/tab_content_composed_element.h @@ -24,7 +24,7 @@ namespace OHOS::Ace::V2 { class ACE_EXPORT TabContentComposedElement : public InspectorComposedElement { - DECLARE_ACE_TYPE(TabContentComposedElement, InspectorComposedElement) + DECLARE_ACE_TYPE(TabContentComposedElement, InspectorComposedElement); public: explicit TabContentComposedElement(const ComposeId& id) : InspectorComposedElement(id) {} diff --git a/frameworks/core/components_v2/inspector/tabs_composed_element.h b/frameworks/core/components_v2/inspector/tabs_composed_element.h index ef59c6604bfc945f86f9237913548857ad1a7cec..0612fcaf55112f564c23f5752cc01935eba6aab0 100644 --- a/frameworks/core/components_v2/inspector/tabs_composed_element.h +++ b/frameworks/core/components_v2/inspector/tabs_composed_element.h @@ -27,7 +27,7 @@ namespace OHOS::Ace::V2 { class ACE_EXPORT TabsComposedElement : public InspectorComposedElement { - DECLARE_ACE_TYPE(TabsComposedElement, InspectorComposedElement) + DECLARE_ACE_TYPE(TabsComposedElement, InspectorComposedElement); public: explicit TabsComposedElement(const ComposeId& id) : InspectorComposedElement(id) {} diff --git a/frameworks/core/components_v2/inspector/text_clock_composed_element.h b/frameworks/core/components_v2/inspector/text_clock_composed_element.h index fb08a4f46abf7c745d6d8109db420d7f218102f0..6c2648906b4ec71507d0319448126db23fcc9ad3 100644 --- a/frameworks/core/components_v2/inspector/text_clock_composed_element.h +++ b/frameworks/core/components_v2/inspector/text_clock_composed_element.h @@ -25,7 +25,7 @@ namespace OHOS::Ace::V2 { class ACE_EXPORT TextClockComposedElement : public InspectorComposedElement { - DECLARE_ACE_TYPE(TextClockComposedElement, InspectorComposedElement) + DECLARE_ACE_TYPE(TextClockComposedElement, InspectorComposedElement); public: explicit TextClockComposedElement(const ComposeId& id) : InspectorComposedElement(id) {} diff --git a/frameworks/core/components_v2/inspector/text_composed_element.h b/frameworks/core/components_v2/inspector/text_composed_element.h index 13be5b7f6dfd91101de7fb980168c07b121f9cc3..6dd5ee6bed5a2f62fa26a2d2c18d3e2f9d9ff738 100644 --- a/frameworks/core/components_v2/inspector/text_composed_element.h +++ b/frameworks/core/components_v2/inspector/text_composed_element.h @@ -24,7 +24,7 @@ namespace OHOS::Ace::V2 { class ACE_EXPORT TextComposedElement : public InspectorComposedElement { - DECLARE_ACE_TYPE(TextComposedElement, InspectorComposedElement) + DECLARE_ACE_TYPE(TextComposedElement, InspectorComposedElement); public: explicit TextComposedElement(const ComposeId& id) : InspectorComposedElement(id) {} diff --git a/frameworks/core/components_v2/inspector/text_picker_composed_element.h b/frameworks/core/components_v2/inspector/text_picker_composed_element.h index 548c0a28027b3ea602eceebcf4ccc51bdcf32e20..6945f1807025e02ee70c11aac9bd580b24fa4b4f 100644 --- a/frameworks/core/components_v2/inspector/text_picker_composed_element.h +++ b/frameworks/core/components_v2/inspector/text_picker_composed_element.h @@ -22,7 +22,7 @@ namespace OHOS::Ace::V2 { class ACE_EXPORT TextPickerComposedElement : public InspectorComposedElement { - DECLARE_ACE_TYPE(TextPickerComposedElement, InspectorComposedElement) + DECLARE_ACE_TYPE(TextPickerComposedElement, InspectorComposedElement); public: explicit TextPickerComposedElement(const ComposeId& id) : InspectorComposedElement(id) {} diff --git a/frameworks/core/components_v2/inspector/textarea_composed_element.h b/frameworks/core/components_v2/inspector/textarea_composed_element.h index d9252065c031245b77852cff1cff716da4f84634..62cec87795de040085d77444d3e70c4403bafca8 100644 --- a/frameworks/core/components_v2/inspector/textarea_composed_element.h +++ b/frameworks/core/components_v2/inspector/textarea_composed_element.h @@ -24,7 +24,7 @@ namespace OHOS::Ace::V2 { class ACE_EXPORT TextareaComposedElement : public InspectorComposedElement { - DECLARE_ACE_TYPE(TextareaComposedElement, InspectorComposedElement) + DECLARE_ACE_TYPE(TextareaComposedElement, InspectorComposedElement); public: explicit TextareaComposedElement(const ComposeId& id) : InspectorComposedElement(id) {} diff --git a/frameworks/core/components_v2/inspector/textinput_composed_element.h b/frameworks/core/components_v2/inspector/textinput_composed_element.h index 8c5022608e5ea371dc9af7713f16e9dd229c4b71..f898d844e71229fa5cd4cdb34b745a1a42ff9884 100644 --- a/frameworks/core/components_v2/inspector/textinput_composed_element.h +++ b/frameworks/core/components_v2/inspector/textinput_composed_element.h @@ -24,7 +24,7 @@ namespace OHOS::Ace::V2 { class ACE_EXPORT TextInputComposedElement : public InspectorComposedElement { - DECLARE_ACE_TYPE(TextInputComposedElement, InspectorComposedElement) + DECLARE_ACE_TYPE(TextInputComposedElement, InspectorComposedElement); public: explicit TextInputComposedElement(const ComposeId& id) : InspectorComposedElement(id) {} diff --git a/frameworks/core/components_v2/inspector/texttimer_composed_element.h b/frameworks/core/components_v2/inspector/texttimer_composed_element.h index 1303588a613258fcb3bc9bef007c686a93530445..473aad24de1258c95ffabb90313623b9747b9fda 100644 --- a/frameworks/core/components_v2/inspector/texttimer_composed_element.h +++ b/frameworks/core/components_v2/inspector/texttimer_composed_element.h @@ -24,7 +24,7 @@ namespace OHOS::Ace::V2 { class ACE_EXPORT TextTimerComposedElement : public InspectorComposedElement { - DECLARE_ACE_TYPE(TextTimerComposedElement, InspectorComposedElement) + DECLARE_ACE_TYPE(TextTimerComposedElement, InspectorComposedElement); public: explicit TextTimerComposedElement(const ComposeId& id) : InspectorComposedElement(id) {} diff --git a/frameworks/core/components_v2/inspector/time_picker_composed_element.h b/frameworks/core/components_v2/inspector/time_picker_composed_element.h index 50321ab552ee5ffc386af1cb9c8c1e53239fb598..ecefd05fefdd1a5230a5d24afbbb45b595f03a2d 100644 --- a/frameworks/core/components_v2/inspector/time_picker_composed_element.h +++ b/frameworks/core/components_v2/inspector/time_picker_composed_element.h @@ -22,7 +22,7 @@ namespace OHOS::Ace::V2 { class ACE_EXPORT TimePickerComposedElement : public InspectorComposedElement { - DECLARE_ACE_TYPE(TimePickerComposedElement, InspectorComposedElement) + DECLARE_ACE_TYPE(TimePickerComposedElement, InspectorComposedElement); public: explicit TimePickerComposedElement(const ComposeId& id) : InspectorComposedElement(id) {} diff --git a/frameworks/core/components_v2/inspector/time_picker_dialog_composed_element.h b/frameworks/core/components_v2/inspector/time_picker_dialog_composed_element.h index 302e871995d87212a55d447725e0b3de58fa8880..2fc2922da6607e72c69d53002f175c554bba91b1 100644 --- a/frameworks/core/components_v2/inspector/time_picker_dialog_composed_element.h +++ b/frameworks/core/components_v2/inspector/time_picker_dialog_composed_element.h @@ -22,7 +22,7 @@ namespace OHOS::Ace::V2 { class ACE_EXPORT TimePickerDialogComposedElement : public InspectorComposedElement { - DECLARE_ACE_TYPE(TimePickerDialogComposedElement, InspectorComposedElement) + DECLARE_ACE_TYPE(TimePickerDialogComposedElement, InspectorComposedElement); public: explicit TimePickerDialogComposedElement(const ComposeId& id) : InspectorComposedElement(id) {} diff --git a/frameworks/core/components_v2/inspector/toggle_composed_element.h b/frameworks/core/components_v2/inspector/toggle_composed_element.h index 5d62a28cc49de87b3edb4db7ca0299edc5badf57..a1e9b531bb88f42ae9c0218b186bd8bb7659ff89 100644 --- a/frameworks/core/components_v2/inspector/toggle_composed_element.h +++ b/frameworks/core/components_v2/inspector/toggle_composed_element.h @@ -24,7 +24,7 @@ namespace OHOS::Ace::V2 { class ACE_EXPORT ToggleComposedElement : public InspectorComposedElement { - DECLARE_ACE_TYPE(ToggleComposedElement, InspectorComposedElement) + DECLARE_ACE_TYPE(ToggleComposedElement, InspectorComposedElement); public: explicit ToggleComposedElement(const ComposeId& id) : InspectorComposedElement(id) {} diff --git a/frameworks/core/components_v2/inspector/water_flow_composed_element.h b/frameworks/core/components_v2/inspector/water_flow_composed_element.h index 95d1606b1553fd3fa746064edcf42b98e7002f34..4b8a3eead78d72ccad77b149e4a72cb8466940f7 100644 --- a/frameworks/core/components_v2/inspector/water_flow_composed_element.h +++ b/frameworks/core/components_v2/inspector/water_flow_composed_element.h @@ -25,7 +25,7 @@ namespace OHOS::Ace::V2 { class ACE_EXPORT WaterFlowComposedElement : public InspectorComposedElement { - DECLARE_ACE_TYPE(WaterFlowComposedElement, InspectorComposedElement) + DECLARE_ACE_TYPE(WaterFlowComposedElement, InspectorComposedElement); public: explicit WaterFlowComposedElement(const ComposeId& id) : InspectorComposedElement(id) {} diff --git a/frameworks/core/components_v2/inspector/water_flow_item_composed_element.h b/frameworks/core/components_v2/inspector/water_flow_item_composed_element.h index 335cc24a4c4c391739fe062bd642067e5571bccb..b64394e43256f4639c10aed564feb10ae40d8168 100644 --- a/frameworks/core/components_v2/inspector/water_flow_item_composed_element.h +++ b/frameworks/core/components_v2/inspector/water_flow_item_composed_element.h @@ -24,7 +24,7 @@ namespace OHOS::Ace::V2 { class ACE_EXPORT WaterFlowItemComposedElement : public InspectorComposedElement { - DECLARE_ACE_TYPE(WaterFlowItemComposedElement, InspectorComposedElement) + DECLARE_ACE_TYPE(WaterFlowItemComposedElement, InspectorComposedElement); public: explicit WaterFlowItemComposedElement(const ComposeId& id) : InspectorComposedElement(id) {} diff --git a/frameworks/core/components_v2/inspector/wrap_composed_element.h b/frameworks/core/components_v2/inspector/wrap_composed_element.h index e99f74aedacc3c8e00402c2848df1577489bc05e..838e864f93961e0bee2c8d441a1a9320020c06d4 100644 --- a/frameworks/core/components_v2/inspector/wrap_composed_element.h +++ b/frameworks/core/components_v2/inspector/wrap_composed_element.h @@ -23,7 +23,7 @@ namespace OHOS::Ace::V2 { class ACE_EXPORT WrapComposedElement : public InspectorComposedElement { - DECLARE_ACE_TYPE(WrapComposedElement, InspectorComposedElement) + DECLARE_ACE_TYPE(WrapComposedElement, InspectorComposedElement); public: explicit WrapComposedElement(const ComposeId& id) : InspectorComposedElement(id) {} diff --git a/frameworks/core/components_v2/list/list_component.h b/frameworks/core/components_v2/list/list_component.h index a831505063c27e1938277a23818eb7eaedd1d53a..b563387d4454945280edf5ca73ebc13ded76e5d3 100644 --- a/frameworks/core/components_v2/list/list_component.h +++ b/frameworks/core/components_v2/list/list_component.h @@ -33,7 +33,7 @@ namespace OHOS::Ace::V2 { class ACE_EXPORT ListComponent : public ComponentGroup { - DECLARE_ACE_TYPE(V2::ListComponent, ComponentGroup) + DECLARE_ACE_TYPE(V2::ListComponent, ComponentGroup); public: ListComponent() = default; diff --git a/frameworks/core/event/multimodal/fake_multimodal_subscriber.h b/frameworks/core/event/multimodal/fake_multimodal_subscriber.h index 8c96d83cb96835045e21ca7ec6e039fa9d0d9606..cde2709cc4f2cea77aa7fb50bc5e9638e5741ace 100644 --- a/frameworks/core/event/multimodal/fake_multimodal_subscriber.h +++ b/frameworks/core/event/multimodal/fake_multimodal_subscriber.h @@ -21,7 +21,7 @@ namespace OHOS::Ace::Platform { class FakeMultimodalSubscriber : public MultimodalSubscriber { - DECLARE_ACE_TYPE(FakeMultimodalSubscriber, MultimodalSubscriber) + DECLARE_ACE_TYPE(FakeMultimodalSubscriber, MultimodalSubscriber); public: FakeMultimodalSubscriber() = default; diff --git a/frameworks/core/event/multimodal/multimodal_manager.h b/frameworks/core/event/multimodal/multimodal_manager.h index 2e3d9f887fe6acab940ab51bb2f43f998494c168..77be304dc3eb5e6123478f1c43386159d04b0f8c 100644 --- a/frameworks/core/event/multimodal/multimodal_manager.h +++ b/frameworks/core/event/multimodal/multimodal_manager.h @@ -25,7 +25,7 @@ namespace OHOS::Ace { class PipelineContext; class MultiModalManager final : public AceType { - DECLARE_ACE_TYPE(MultiModalManager, AceType) + DECLARE_ACE_TYPE(MultiModalManager, AceType); public: MultiModalManager() = default; diff --git a/frameworks/core/event/multimodal/multimodal_scene.h b/frameworks/core/event/multimodal/multimodal_scene.h index 4e1cfc1770acbe3fba226a3d702ba5cbcd771f6f..ba63c0f71179b96d05cc28beaf467e9d6b6ac13d 100644 --- a/frameworks/core/event/multimodal/multimodal_scene.h +++ b/frameworks/core/event/multimodal/multimodal_scene.h @@ -27,7 +27,7 @@ namespace OHOS::Ace { class MultiModalScene final : public AceType { - DECLARE_ACE_TYPE(MultiModalScene, AceType) + DECLARE_ACE_TYPE(MultiModalScene, AceType); public: MultiModalScene(int32_t pageId, const RefPtr& subscriber) diff --git a/frameworks/core/event/multimodal/multimodal_subscriber.h b/frameworks/core/event/multimodal/multimodal_subscriber.h index 5973a82f4acd7268ddf208d894a5b6b21b980c6e..69bc32cf54a0e2b3ace29d20d1a45affc6de0886 100644 --- a/frameworks/core/event/multimodal/multimodal_subscriber.h +++ b/frameworks/core/event/multimodal/multimodal_subscriber.h @@ -27,7 +27,7 @@ namespace OHOS::Ace { using MultimodalEventCallback = std::function; class MultimodalSubscriber : public AceType { - DECLARE_ACE_TYPE(MultimodalSubscriber, AceType) + DECLARE_ACE_TYPE(MultimodalSubscriber, AceType); public: virtual void RegisterCallback( diff --git a/frameworks/core/event/touch_event.h b/frameworks/core/event/touch_event.h index 9d64fe57f372b2679e82bb4b3c0ff47704d7357e..25278d4de29c70478557950a977a47adcd42a3de 100755 --- a/frameworks/core/event/touch_event.h +++ b/frameworks/core/event/touch_event.h @@ -457,7 +457,7 @@ private: }; class ACE_EXPORT GestureEventResult : public AceType { - DECLARE_ACE_TYPE(GestureEventResult, AceType) + DECLARE_ACE_TYPE(GestureEventResult, AceType); public: GestureEventResult() = default; diff --git a/frameworks/core/gestures/drag_event.h b/frameworks/core/gestures/drag_event.h index 159e0c885f9ea8f85d410a431685d60a62caed25..d475c0f30cdea2ea8913afcd016800f99b276b08 100644 --- a/frameworks/core/gestures/drag_event.h +++ b/frameworks/core/gestures/drag_event.h @@ -101,7 +101,7 @@ enum class DragBehavior { }; class ACE_FORCE_EXPORT DragEvent : public AceType { - DECLARE_ACE_TYPE(DragEvent, AceType) + DECLARE_ACE_TYPE(DragEvent, AceType); public: DragEvent() = default; @@ -495,7 +495,7 @@ private: }; class NotifyDragEvent : public DragEvent { - DECLARE_ACE_TYPE(NotifyDragEvent, DragEvent) + DECLARE_ACE_TYPE(NotifyDragEvent, DragEvent); public: NotifyDragEvent() = default; @@ -535,7 +535,7 @@ private: }; class DragSpringLoadingContext : public AceType { - DECLARE_ACE_TYPE(DragSpringLoadingContext, AceType) + DECLARE_ACE_TYPE(DragSpringLoadingContext, AceType); public: explicit DragSpringLoadingContext() = default; ~DragSpringLoadingContext() override = default; diff --git a/frameworks/core/gestures/gesture_processor.h b/frameworks/core/gestures/gesture_processor.h index d1aabdaab380069041e912d6f0f49fa16a2f766f..3b9f97ac3b63045e1f8e5619fa2233477720a57f 100644 --- a/frameworks/core/gestures/gesture_processor.h +++ b/frameworks/core/gestures/gesture_processor.h @@ -26,7 +26,7 @@ namespace OHOS::Ace { class GestureProcessor : public virtual AceType { - DECLARE_ACE_TYPE(GestureProcessor, AceType) + DECLARE_ACE_TYPE(GestureProcessor, AceType); public: GestureProcessor() = default; ~GestureProcessor() override = default; diff --git a/frameworks/core/gestures/gesture_recognizer.h b/frameworks/core/gestures/gesture_recognizer.h index 682c5632a622361ba4076e8103ceb0cfc954bbde..fadc7c4ad6ea18b046a38fcecb2b4029ca2781d9 100644 --- a/frameworks/core/gestures/gesture_recognizer.h +++ b/frameworks/core/gestures/gesture_recognizer.h @@ -33,7 +33,7 @@ enum class DetectState { READY, DETECTING, DETECTED }; enum class RefereeState { DETECTING, PENDING, BLOCKED, SUCCEED, FAIL }; class ACE_EXPORT GestureRecognizer : public TouchEventTarget { - DECLARE_ACE_TYPE(GestureRecognizer, TouchEventTarget) + DECLARE_ACE_TYPE(GestureRecognizer, TouchEventTarget); public: // Called when request of handling gesture sequence is accepted by gesture referee. diff --git a/frameworks/core/gestures/swipe_recognizer.h b/frameworks/core/gestures/swipe_recognizer.h index 13f3021c197c0add546b8d6473821693eeab3836..4028279c247789abeaa08f7af93a72d3dcbfa682 100644 --- a/frameworks/core/gestures/swipe_recognizer.h +++ b/frameworks/core/gestures/swipe_recognizer.h @@ -51,7 +51,7 @@ using SwipeCallback = std::function; using CatchSwipeCallback = std::function; class SwipeRecognizer : public TouchEventTarget { - DECLARE_ACE_TYPE(SwipeRecognizer, TouchEventTarget) + DECLARE_ACE_TYPE(SwipeRecognizer, TouchEventTarget); public: bool HandleEvent(const TouchEvent& point) override; diff --git a/frameworks/core/interfaces/native/implementation/custom_dialog_controller_peer_impl.h b/frameworks/core/interfaces/native/implementation/custom_dialog_controller_peer_impl.h index a0de958655b8ae2bfeb0d953c761927ec17c5411..b5ceffa6b56ca28f42d4417031317596ba52b035 100644 --- a/frameworks/core/interfaces/native/implementation/custom_dialog_controller_peer_impl.h +++ b/frameworks/core/interfaces/native/implementation/custom_dialog_controller_peer_impl.h @@ -23,7 +23,7 @@ namespace OHOS::Ace::NG::GeneratedModifier { class CustomDialogControllerPeerImpl : public virtual AceType { - DECLARE_ACE_TYPE(CustomDialogControllerPeerImpl, AceType) + DECLARE_ACE_TYPE(CustomDialogControllerPeerImpl, AceType); public: CustomDialogControllerPeerImpl() = default; ~CustomDialogControllerPeerImpl() override = default; diff --git a/frameworks/core/interfaces/native/node/node_adapter_impl.h b/frameworks/core/interfaces/native/node/node_adapter_impl.h index 554c8bcd680645f478e37d6546d8bbdfc54373fd..a228396b0b760712da489e1a4fd40552c13d1dce 100644 --- a/frameworks/core/interfaces/native/node/node_adapter_impl.h +++ b/frameworks/core/interfaces/native/node/node_adapter_impl.h @@ -31,7 +31,7 @@ namespace OHOS::Ace::NG { class NativeLazyForEachBuilder : public LazyForEachBuilder { - DECLARE_ACE_TYPE(NativeLazyForEachBuilder, LazyForEachBuilder) + DECLARE_ACE_TYPE(NativeLazyForEachBuilder, LazyForEachBuilder); public: // used in ArkTS side. void ReleaseChildGroupById(const std::string& id) override {} diff --git a/frameworks/core/pipeline/base/flutter_render_context.h b/frameworks/core/pipeline/base/flutter_render_context.h index 9b4879a13944f846296236b3323292d2c18b10cf..fe2f791a2799cdd04419ca2c0361c95e0c80bde8 100644 --- a/frameworks/core/pipeline/base/flutter_render_context.h +++ b/frameworks/core/pipeline/base/flutter_render_context.h @@ -31,7 +31,7 @@ namespace OHOS::Ace { class FlutterRenderContext : public RenderContext { - DECLARE_ACE_TYPE(FlutterRenderContext, RenderContext) + DECLARE_ACE_TYPE(FlutterRenderContext, RenderContext); public: FlutterRenderContext() = default; diff --git a/frameworks/core/pipeline/base/rosen_render_context.h b/frameworks/core/pipeline/base/rosen_render_context.h index 2a0e248417d55a0264aa873318189b15da93555a..48ab29dc2754436894ed999a518976d808aee297 100644 --- a/frameworks/core/pipeline/base/rosen_render_context.h +++ b/frameworks/core/pipeline/base/rosen_render_context.h @@ -25,7 +25,7 @@ namespace OHOS::Ace { class RosenRenderContext : public RenderContext { - DECLARE_ACE_TYPE(RosenRenderContext, RenderContext) + DECLARE_ACE_TYPE(RosenRenderContext, RenderContext); public: RosenRenderContext() = default; diff --git a/frameworks/core/pipeline/layers/layer.h b/frameworks/core/pipeline/layers/layer.h index 67267ef4293a1e1c007b57190ee6e9ba0b8a5b2f..ccef3ce2e1799dd718375245d0bc99bb8d0e30af 100644 --- a/frameworks/core/pipeline/layers/layer.h +++ b/frameworks/core/pipeline/layers/layer.h @@ -25,7 +25,7 @@ namespace OHOS::Ace::Flutter { class SceneBuilder; class Layer : public AceType { - DECLARE_ACE_TYPE(Layer, AceType) + DECLARE_ACE_TYPE(Layer, AceType); public: Layer() = default; ~Layer() override = default; diff --git a/interfaces/inner_api/ace_kit/include/ui/animation/frame_rate_range.h b/interfaces/inner_api/ace_kit/include/ui/animation/frame_rate_range.h index 5aad9a34ae007417c740414633a2e09ed860d10b..64aa3849d1d9e19a839532b91e492e9331c06fd8 100644 --- a/interfaces/inner_api/ace_kit/include/ui/animation/frame_rate_range.h +++ b/interfaces/inner_api/ace_kit/include/ui/animation/frame_rate_range.h @@ -21,7 +21,7 @@ namespace OHOS::Ace { class FrameRateRange : public AceType { - DECLARE_ACE_TYPE(FrameRateRange, AceType) + DECLARE_ACE_TYPE(FrameRateRange, AceType); public: FrameRateRange() : min_(0), max_(0), preferred_(0), componentScene_(0) {} diff --git a/interfaces/inner_api/ace_kit/include/ui/base/ace_type.h b/interfaces/inner_api/ace_kit/include/ui/base/ace_type.h index 1732972b2fb07dfc0c6d8a86091016f4a54ddd1b..a1872d5ed6db55c52c54e8e9104d15949b825b12 100644 --- a/interfaces/inner_api/ace_kit/include/ui/base/ace_type.h +++ b/interfaces/inner_api/ace_kit/include/ui/base/ace_type.h @@ -35,7 +35,7 @@ * }; */ // Integrate it into class declaration to support 'DynamicCast'. -#define DECLARE_ACE_TYPE(...) DECLARE_RELATIONSHIP_OF_CLASSES(__VA_ARGS__) \ +#define DECLARE_ACE_TYPE(...); DECLARE_RELATIONSHIP_OF_CLASSES(__VA_ARGS__) \ friend class Referenced; namespace OHOS::Ace { diff --git a/interfaces/inner_api/ace_kit/include/ui/view/theme/token_theme_wrapper.h b/interfaces/inner_api/ace_kit/include/ui/view/theme/token_theme_wrapper.h index d3e0ca0b411c4d2e86cc2d849c8f6e39c09a6c1d..78bd5ca339290ea9a91dc0e4ff9b8038158adb8f 100644 --- a/interfaces/inner_api/ace_kit/include/ui/view/theme/token_theme_wrapper.h +++ b/interfaces/inner_api/ace_kit/include/ui/view/theme/token_theme_wrapper.h @@ -22,7 +22,7 @@ namespace OHOS::Ace { class ACE_EXPORT TokenThemeWrapper : virtual public Theme { - DECLARE_ACE_TYPE(TokenThemeWrapper, Theme) + DECLARE_ACE_TYPE(TokenThemeWrapper, Theme); public: TokenThemeWrapper() = default; virtual ~TokenThemeWrapper() = default; diff --git a/test/mock/base/mock_image_packer.h b/test/mock/base/mock_image_packer.h index ee5dec42317546da58bc43a8403113714e953307..4cbd2a75c943c87a182084d7faaf0fc052910e08 100644 --- a/test/mock/base/mock_image_packer.h +++ b/test/mock/base/mock_image_packer.h @@ -20,7 +20,7 @@ #include "base/image/pixel_map.h" namespace OHOS::Ace { class MockImagePacker : public ImagePacker { - DECLARE_ACE_TYPE(MockImagePacker, ImagePacker) + DECLARE_ACE_TYPE(MockImagePacker, ImagePacker); public: MOCK_METHOD3(StartPacking, uint32_t(uint8_t*, uint32_t, const PackOption&)); MOCK_METHOD2(StartPacking, uint32_t(const std::string&, const PackOption&)); diff --git a/test/mock/base/mock_image_source.h b/test/mock/base/mock_image_source.h index 8550713eaa68b84f5ceb463d39fe21c24e6fe1cd..ca5a87685c9a01b8278725d849076deec8771897 100644 --- a/test/mock/base/mock_image_source.h +++ b/test/mock/base/mock_image_source.h @@ -20,7 +20,7 @@ #include "base/image/pixel_map.h" namespace OHOS::Ace { class MockImageSource : public ImageSource { - DECLARE_ACE_TYPE(MockImageSource, ImageSource) + DECLARE_ACE_TYPE(MockImageSource, ImageSource); public: diff --git a/test/mock/base/mock_subwindow.h b/test/mock/base/mock_subwindow.h index 2e90e361486dd8641d0205723b38babe9c023a5d..d586984f33b24d9c38067d00996b7f1c7208ee19 100644 --- a/test/mock/base/mock_subwindow.h +++ b/test/mock/base/mock_subwindow.h @@ -22,7 +22,7 @@ namespace OHOS::Ace { class ACE_EXPORT MockSubwindow : public Subwindow { - DECLARE_ACE_TYPE(MockSubwindow, Subwindow) + DECLARE_ACE_TYPE(MockSubwindow, Subwindow); public: MOCK_METHOD0(InitContainer, void()); diff --git a/test/mock/core/render/mock_canvas_image.h b/test/mock/core/render/mock_canvas_image.h index e4caeabde75d1795d0ebd13658e0a3e4d6d5201c..ad37d035d572e5c3664c7ea27a2102819b233a8a 100644 --- a/test/mock/core/render/mock_canvas_image.h +++ b/test/mock/core/render/mock_canvas_image.h @@ -22,7 +22,7 @@ namespace OHOS::Ace::NG { class MockCanvasImage : public CanvasImage { - DECLARE_ACE_TYPE(MockCanvasImage, CanvasImage) + DECLARE_ACE_TYPE(MockCanvasImage, CanvasImage); public: MockCanvasImage() = default; ~MockCanvasImage() override = default; diff --git a/test/mock/core/render/mock_media_player.h b/test/mock/core/render/mock_media_player.h index e1bb5f9b14af9c04e2a34016ce4c645df93a56b1..79fc0696f8cd89cdb36518e58d4c8305b18270e5 100644 --- a/test/mock/core/render/mock_media_player.h +++ b/test/mock/core/render/mock_media_player.h @@ -29,7 +29,7 @@ constexpr int32_t DEFAULT_HEIGHT = 100; } // namespace class MockMediaPlayer : public MediaPlayer { - DECLARE_ACE_TYPE(MockMediaPlayer, MediaPlayer) + DECLARE_ACE_TYPE(MockMediaPlayer, MediaPlayer); public: ~MockMediaPlayer() override = default; diff --git a/test/mock/core/render/mock_render_context.h b/test/mock/core/render/mock_render_context.h index 88988f1544673749773ad3aa21e5d8b5676b5612..c44deb376e5497dae35edeb0c6691b1077df0ef9 100644 --- a/test/mock/core/render/mock_render_context.h +++ b/test/mock/core/render/mock_render_context.h @@ -25,7 +25,7 @@ namespace OHOS::Ace::NG { class MockRenderContext : public RenderContext { - DECLARE_ACE_TYPE(MockRenderContext, RenderContext) + DECLARE_ACE_TYPE(MockRenderContext, RenderContext); public: ~MockRenderContext() override = default; diff --git a/test/mock/core/render/mock_render_surface.h b/test/mock/core/render/mock_render_surface.h index 59e6ed68b87cdae1db14880a4e53b7eefd631165..9523e20ac6310f666e502a76e737a6cec75696fc 100644 --- a/test/mock/core/render/mock_render_surface.h +++ b/test/mock/core/render/mock_render_surface.h @@ -22,7 +22,7 @@ namespace OHOS::Ace::NG { class MockRenderSurface : public RenderSurface { - DECLARE_ACE_TYPE(MockRenderSurface, RenderSurface) + DECLARE_ACE_TYPE(MockRenderSurface, RenderSurface); public: ~MockRenderSurface() override = default; MOCK_CONST_METHOD0(IsSurfaceValid, bool()); diff --git a/test/mock/core/render/mock_rosen_render_surface.h b/test/mock/core/render/mock_rosen_render_surface.h index 69f4b1969c6a0098b61acf470251b1166bcf4a68..1077a8fcc23bac81993e581173256a9de0ace6b5 100644 --- a/test/mock/core/render/mock_rosen_render_surface.h +++ b/test/mock/core/render/mock_rosen_render_surface.h @@ -22,7 +22,7 @@ namespace OHOS::Ace::NG { class MockRosenRenderSurface : public RosenRenderSurface { - DECLARE_ACE_TYPE(MockRosenRenderSurface, RosenRenderSurface) + DECLARE_ACE_TYPE(MockRosenRenderSurface, RosenRenderSurface); public: ~MockRosenRenderSurface() override = default; MOCK_METHOD2(DrawBuffer, void(int32_t, int32_t)); diff --git a/test/unittest/core/pattern/data_panel/data_panel_content_modifier_test_ng.cpp b/test/unittest/core/pattern/data_panel/data_panel_content_modifier_test_ng.cpp index d210dee7ee2ea762343f48e410da42ea01b51392..c69b50245a6e37446f9abae2fe605be80d7b3cca 100644 --- a/test/unittest/core/pattern/data_panel/data_panel_content_modifier_test_ng.cpp +++ b/test/unittest/core/pattern/data_panel/data_panel_content_modifier_test_ng.cpp @@ -73,7 +73,7 @@ public: }; class DataPanelTheme : public Theme { - DECLARE_ACE_TYPE(DataPanelTheme, Theme) + DECLARE_ACE_TYPE(DataPanelTheme, Theme); public: DataPanelTheme() { diff --git a/test/unittest/core/pattern/data_panel/data_panel_pattern_test_ng.cpp b/test/unittest/core/pattern/data_panel/data_panel_pattern_test_ng.cpp index ba6a3f13c39c66b075a3e3f22de97b500d9e79ae..2cc60a906472d75d4323fa4a481b5a83b8a1c7ea 100644 --- a/test/unittest/core/pattern/data_panel/data_panel_pattern_test_ng.cpp +++ b/test/unittest/core/pattern/data_panel/data_panel_pattern_test_ng.cpp @@ -65,7 +65,7 @@ public: }; class DataPanelTheme : public Theme { - DECLARE_ACE_TYPE(DataPanelTheme, Theme) + DECLARE_ACE_TYPE(DataPanelTheme, Theme); public: DataPanelTheme() { diff --git a/test/unittest/core/pattern/data_panel/data_panel_test_ng.cpp b/test/unittest/core/pattern/data_panel/data_panel_test_ng.cpp index 7e264b655d35420883a742fa228ef4e13f57281b..6c912a6a7d6cd4c754d297215d945116de2aa691 100644 --- a/test/unittest/core/pattern/data_panel/data_panel_test_ng.cpp +++ b/test/unittest/core/pattern/data_panel/data_panel_test_ng.cpp @@ -88,7 +88,7 @@ public: }; class DataPanelTheme : public Theme { - DECLARE_ACE_TYPE(DataPanelTheme, Theme) + DECLARE_ACE_TYPE(DataPanelTheme, Theme); public: DataPanelTheme() { diff --git a/test/unittest/core/pattern/navigation/mock_navigation_stack.h b/test/unittest/core/pattern/navigation/mock_navigation_stack.h index feda5dc62c1526aa66fbdf8d57d6a7395a1d26aa..ce5ad6e595a890819066a391b083b0401e678b12 100644 --- a/test/unittest/core/pattern/navigation/mock_navigation_stack.h +++ b/test/unittest/core/pattern/navigation/mock_navigation_stack.h @@ -32,7 +32,7 @@ struct MockReplace { constexpr char UNDEFINED_ID[] = "undefined"; class MockNavPathInfo : public NavPathInfo { - DECLARE_ACE_TYPE(MockNavPathInfo, NavPathInfo) + DECLARE_ACE_TYPE(MockNavPathInfo, NavPathInfo); public: MockNavPathInfo() = default; explicit MockNavPathInfo(const std::string& name) : NG::NavPathInfo(name) {} diff --git a/test/unittest/core/pattern/navigation/navigation_pattern_test_four_ng.cpp b/test/unittest/core/pattern/navigation/navigation_pattern_test_four_ng.cpp index 4e2c135546e4b27cd130aaa406902a475fb1b233..cd28a322d608d819b7a53663ebf0384e649b6a63 100644 --- a/test/unittest/core/pattern/navigation/navigation_pattern_test_four_ng.cpp +++ b/test/unittest/core/pattern/navigation/navigation_pattern_test_four_ng.cpp @@ -109,7 +109,7 @@ void NavigationPatternTestFourNg::SetIsPageLevelConfigEnabled(bool value, RefPtr } class MockPageViewportConfig : public PageViewportConfig { - DECLARE_ACE_TYPE(MockPageViewportConfig, PageViewportConfig) + DECLARE_ACE_TYPE(MockPageViewportConfig, PageViewportConfig); public: MOCK_METHOD(RefPtr, Clone, (), (const, override)); }; diff --git a/test/unittest/core/syntax/mock_lazy_for_each_actuator.h b/test/unittest/core/syntax/mock_lazy_for_each_actuator.h index 816395fa3b0b06de47c09bfbf0e980fa7f5886dc..9ddcd3820ce2d49d1d5e08ba822bf9f4d9407baa 100644 --- a/test/unittest/core/syntax/mock_lazy_for_each_actuator.h +++ b/test/unittest/core/syntax/mock_lazy_for_each_actuator.h @@ -20,7 +20,7 @@ namespace OHOS::Ace::Framework { class MockLazyForEachActuator : public LazyForEachActuator { - DECLARE_ACE_TYPE(MockLazyForEachActuator, LazyForEachActuator) + DECLARE_ACE_TYPE(MockLazyForEachActuator, LazyForEachActuator); }; } // namespace OHOS::Ace::Framework