diff --git a/frameworks/components/ui_dialog.cpp b/frameworks/components/ui_dialog.cpp index d493ad8f9979d409c06fd41c5da5ec975fba7de7..9dea59bb92c2ba43135f42e6f54a00e7e536ac26 100644 --- a/frameworks/components/ui_dialog.cpp +++ b/frameworks/components/ui_dialog.cpp @@ -37,7 +37,7 @@ public: { bool ret = true; if (dialog_ != nullptr) { - dialog_->DestoryWindow(); + dialog_->DestroyWindow(); dialog_->isShowing_ = false; } if (onClickListener_ != nullptr) { @@ -62,7 +62,7 @@ public: if ((dialog_ != nullptr) && (dialog_->dialogLayer_ != nullptr) && !dialog_->dialogLayer_->GetRect().IsContains(event.GetCurrentPos())) { if (dialog_->enableAutoCancel_) { - dialog_->DestoryWindow(); + dialog_->DestroyWindow(); dialog_->isShowing_ = false; } if (dialog_->onCancelListener_ != nullptr) { @@ -141,7 +141,7 @@ UIDialog::~UIDialog() delete line2_; line2_ = nullptr; } - if ((windowRootView_ != nullptr) && !RootView::DestoryWindowRootView(windowRootView_)) { + if ((windowRootView_ != nullptr) && !RootView::DestroyWindowRootView(windowRootView_)) { windowRootView_ = nullptr; } if (dialogClickListener_ != nullptr) { @@ -617,10 +617,10 @@ void UIDialog::EnableAutoCancel(bool enable) enableAutoCancel_ = enable; } -void UIDialog::DestoryWindow() +void UIDialog::DestroyWindow() { if (window_ != nullptr) { - Window::DestoryWindow(window_); + Window::DestroyWindow(window_); window_ = nullptr; } } diff --git a/frameworks/window/window.cpp b/frameworks/window/window.cpp index b68feaa181bd7c86ea4618a2e7066f77c6f4045a..1235604dc874fbd1b6bf9512355425eea993ca03 100644 --- a/frameworks/window/window.cpp +++ b/frameworks/window/window.cpp @@ -31,7 +31,7 @@ Window* Window::CreateWindow(const WindowConfig& config) return window; } -void Window::DestoryWindow(Window* window) +void Window::DestroyWindow(Window* window) { if (window != nullptr) { WindowImpl* windowImpl = reinterpret_cast(window); diff --git a/interfaces/kits/components/root_view.h b/interfaces/kits/components/root_view.h index 6aea35d592b9574ba48b25c2f14b2be07625ebab..21dbc5837631316f1a553456581d54b715a22d12 100644 --- a/interfaces/kits/components/root_view.h +++ b/interfaces/kits/components/root_view.h @@ -97,7 +97,7 @@ public: * @since 1.0 * @version 1.0 */ - static bool DestoryWindowRootView(RootView* rootView) + static bool DestroyWindowRootView(RootView* rootView) { if (rootView == RootView::GetInstance()) { return false; diff --git a/interfaces/kits/components/ui_dialog.h b/interfaces/kits/components/ui_dialog.h index b4fc8a53f7e30f17efa8e8550593a927186e503a..e45c40caf5c607d0cb7f64e9e9e3696774e649e1 100644 --- a/interfaces/kits/components/ui_dialog.h +++ b/interfaces/kits/components/ui_dialog.h @@ -215,7 +215,7 @@ private: void Layout(); void LayoutButton(); void CreateDialogWindow(); - void DestoryWindow(); + void DestroyWindow(); bool isShowing_; bool enableAutoCancel_; diff --git a/interfaces/kits/window/window.h b/interfaces/kits/window/window.h index 8baaf1ec8fee259a40bb0e8dcae23b33782c74a4..7e23c4d18a2ebccdd25fb46e4c7fc2a1f7c2984f 100644 --- a/interfaces/kits/window/window.h +++ b/interfaces/kits/window/window.h @@ -122,7 +122,7 @@ public: * @since 1.0 * @version 1.0 */ - static void DestoryWindow(Window* window); + static void DestroyWindow(Window* window); /** * @brief Binds the RootView to this window. diff --git a/test/unittest/common/hardware_acceleration_unit_test.cpp b/test/unittest/common/hardware_acceleration_unit_test.cpp index 9f582cdd7cf0fb47ee158601af5df9c3e6dcc5df..5ea268295b92123ff67373f38e85faa777c00d7b 100644 --- a/test/unittest/common/hardware_acceleration_unit_test.cpp +++ b/test/unittest/common/hardware_acceleration_unit_test.cpp @@ -142,7 +142,7 @@ HWTEST_F(HardwareAccelerationTest, HardwareFill_001, TestSize.Level1) TaskManager::GetInstance()->TaskHandler(); EXPECT_EQ(g_testDevice->fillIn_, true); - Window::DestoryWindow(rootView->GetBoundWindow()); + Window::DestroyWindow(rootView->GetBoundWindow()); } #endif @@ -173,7 +173,7 @@ HWTEST_F(HardwareAccelerationTest, HardwareBlend_001, TestSize.Level0) TaskManager::GetInstance()->TaskHandler(); EXPECT_EQ(g_testDevice->blendIn_, true); - Window::DestoryWindow(rootView->GetBoundWindow()); + Window::DestroyWindow(rootView->GetBoundWindow()); } #endif @@ -206,7 +206,7 @@ HWTEST_F(HardwareAccelerationTest, HardwareBlend_002, TestSize.Level1) TaskManager::GetInstance()->TaskHandler(); EXPECT_EQ(g_testDevice->blendIn_, true); - Window::DestoryWindow(rootView->GetBoundWindow()); + Window::DestroyWindow(rootView->GetBoundWindow()); } #endif @@ -243,7 +243,7 @@ HWTEST_F(HardwareAccelerationTest, HardwareTransform_001, TestSize.Level0) TaskManager::GetInstance()->TaskHandler(); EXPECT_EQ(g_testDevice->transformIn_, true); - Window::DestoryWindow(rootView->GetBoundWindow()); + Window::DestroyWindow(rootView->GetBoundWindow()); } #endif @@ -285,7 +285,7 @@ HWTEST_F(HardwareAccelerationTest, HardwareTransform_002, TestSize.Level1) EXPECT_EQ(g_testDevice->fillIn_, false); EXPECT_EQ(g_testDevice->blendIn_, false); EXPECT_EQ(g_testDevice->transformIn_, false); - Window::DestoryWindow(rootView->GetBoundWindow()); + Window::DestroyWindow(rootView->GetBoundWindow()); } #endif } // namespace OHOS diff --git a/test/unittest/dfx/event_injector_unit_test.cpp b/test/unittest/dfx/event_injector_unit_test.cpp index 5e7165a2cb2a080f45d31ce9209ddd720e439078..b785cbc1744c9238ad3d089de6c84a8dd93b771f 100644 --- a/test/unittest/dfx/event_injector_unit_test.cpp +++ b/test/unittest/dfx/event_injector_unit_test.cpp @@ -204,7 +204,7 @@ void EventInjectorTest::TearDownTestCase(void) { isRepeat_ = false; pthread_join(mainTaskThread_, nullptr); - Window::DestoryWindow(window_); + Window::DestroyWindow(window_); DeleteChildren(layout_); layout_ = nullptr; diff --git a/test/unittest/dfx/view_bounds_unit_test.cpp b/test/unittest/dfx/view_bounds_unit_test.cpp index d1167f45fe62474d4fe783db61e9c11f153b5cb3..88963161abab52108cb43fb20739c8c281abf755 100644 --- a/test/unittest/dfx/view_bounds_unit_test.cpp +++ b/test/unittest/dfx/view_bounds_unit_test.cpp @@ -55,9 +55,9 @@ public: } } - static void DestoryWindow(RootView* rootView) + static void DestroyWindow(RootView* rootView) { - Window::DestoryWindow(rootView->GetBoundWindow()); + Window::DestroyWindow(rootView->GetBoundWindow()); } #endif // ENABLE_WINDOW }; @@ -179,8 +179,8 @@ HWTEST_F(ViewBoundsTest, ViewBoundsOnPostDraw001, TestSize.Level0) rootView->RemoveAll(); delete view1; delete vg1; - ViewBoundsTest::DestoryWindow(rootView); - RootView::DestoryWindowRootView(rootView); + ViewBoundsTest::DestroyWindow(rootView); + RootView::DestroyWindowRootView(rootView); } /** @@ -230,13 +230,13 @@ HWTEST_F(ViewBoundsTest, ViewBoundsOnPostDraw002, TestSize.Level0) rootView1->RemoveAll(); delete view1; delete vg1; - ViewBoundsTest::DestoryWindow(rootView1); - RootView::DestoryWindowRootView(rootView1); + ViewBoundsTest::DestroyWindow(rootView1); + RootView::DestroyWindowRootView(rootView1); rootView2->RemoveAll(); delete view2; delete vg2; - ViewBoundsTest::DestoryWindow(rootView2); - RootView::DestoryWindowRootView(rootView2); + ViewBoundsTest::DestroyWindow(rootView2); + RootView::DestroyWindowRootView(rootView2); } #endif // ENABLE_WINDOW } // namespace OHOS diff --git a/test/unittest/render/render_uni_test.cpp b/test/unittest/render/render_uni_test.cpp index b78d64fb416c974b1f9ce4ddc6535d1ffd057c60..b605056ff66f70d6f4db176936bd2ce2c6a1d382 100644 --- a/test/unittest/render/render_uni_test.cpp +++ b/test/unittest/render/render_uni_test.cpp @@ -48,9 +48,9 @@ public: } } - static void DestoryWindow(RootView* rootView) + static void DestroyWindow(RootView* rootView) { - Window::DestoryWindow(rootView->GetBoundWindow()); + Window::DestroyWindow(rootView->GetBoundWindow()); } }; @@ -103,8 +103,8 @@ HWTEST_F(RenderTest, Graphic_RenderTest_Test_Measuer_001, TestSize.Level0) rootView->RemoveAll(); delete view1; delete vg1; - RenderTest::DestoryWindow(rootView); - RootView::DestoryWindowRootView(rootView); + RenderTest::DestroyWindow(rootView); + RootView::DestroyWindowRootView(rootView); } /** @@ -136,7 +136,7 @@ HWTEST_F(RenderTest, Graphic_RenderTest_Test_Measuer_02, TestSize.Level0) rootView->RemoveAll(); delete view1; delete vg1; - RenderTest::DestoryWindow(rootView); - RootView::DestoryWindowRootView(rootView); + RenderTest::DestroyWindow(rootView); + RootView::DestroyWindowRootView(rootView); } } // namespace OHOS