From: luozheng <1732036298@qq.com> Date: Tue, 28 May 2024 12:05:07 +0000 (+0800) Subject: set_desktop 文件夹更新 X-Git-Tag: release_V1.2.70_20241020_135402~1096 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=db7abd46459358e1027d5f314058b243915e756c;p=mirrors%2FFD230.git set_desktop 文件夹更新 --- diff --git a/code/sdk/application/wearable/fd230app/nativeui/set_desktop/include/SetDesktopModel.h b/code/sdk/application/wearable/fd230app/nativeui/set_desktop/include/SetDesktopModel.h index 5c5a9261e..2ef2793dc 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/set_desktop/include/SetDesktopModel.h +++ b/code/sdk/application/wearable/fd230app/nativeui/set_desktop/include/SetDesktopModel.h @@ -30,7 +30,6 @@ namespace OHOS { SetDesktopModel(const SetDesktopModel &); SetDesktopModel &operator=(const SetDesktopModel &); virtual ~SetDesktopModel(); - }; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/set_desktop/include/SetDesktopPresenter.h b/code/sdk/application/wearable/fd230app/nativeui/set_desktop/include/SetDesktopPresenter.h index e1fe726a6..165c6d95a 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/set_desktop/include/SetDesktopPresenter.h +++ b/code/sdk/application/wearable/fd230app/nativeui/set_desktop/include/SetDesktopPresenter.h @@ -31,12 +31,12 @@ class SetDesktopPresenter : public Presenter, public UIView::OnDragListener { public: SetDesktopPresenter(); - virtual ~SetDesktopPresenter(); + ~SetDesktopPresenter() override; static SetDesktopPresenter *GetInstance(); - virtual void OnStart() override; - virtual void OnResume() override; - virtual void OnStop() override; + void OnStart() override; + void OnResume() override; + void OnStop() override; bool OnClick(UIView &view, const ClickEvent &event) override; bool OnDrag(UIView& view, const DragEvent& event) override; diff --git a/code/sdk/application/wearable/fd230app/nativeui/set_desktop/include/SetDesktopView.h b/code/sdk/application/wearable/fd230app/nativeui/set_desktop/include/SetDesktopView.h index 4c992747f..d1827c77a 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/set_desktop/include/SetDesktopView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/set_desktop/include/SetDesktopView.h @@ -24,7 +24,7 @@ class SetDesktopPresenter; class SetDesktopView : public View { public: SetDesktopView(); - virtual ~SetDesktopView(); + ~SetDesktopView() override; static SetDesktopView *GetInstance() { @@ -32,10 +32,10 @@ public: return &instance; } - virtual void OnStart() override; - virtual void OnSetUpView() override; - virtual void OnTearDownView() override; - virtual void OnStop() override; + void OnStart() override; + void OnSetUpView() override; + void OnTearDownView() override; + void OnStop() override; void UpdateSelectedStyle(bool hexagonsSelected); private: UILabel titleText; diff --git a/code/sdk/application/wearable/fd230app/nativeui/set_desktop/src/SetDesktopModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/set_desktop/src/SetDesktopModel.cpp index d5f64f315..43c523e4f 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/set_desktop/src/SetDesktopModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/set_desktop/src/SetDesktopModel.cpp @@ -31,7 +31,7 @@ namespace OHOS { } else { style = APPLIST_STYLE; } - return style; + return style; } void SetDesktopModel::SetDesktopStyle(DesktopStyle style)