From 3128155c4e41e6940052db544117a4d3e140ec60 Mon Sep 17 00:00:00 2001 From: xiaojianfeng Date: Tue, 22 Feb 2022 10:50:47 +0800 Subject: [PATCH] fix accessibility compile bug Signed-off-by: xiaojianfeng Change-Id: I725577ea065a39192b3cdf05f12c34d9651e095b --- dm/src/display.cpp | 4 ++++ interfaces/innerkits/dm/display.h | 6 ++++-- utils/include/display_info.h | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dm/src/display.cpp b/dm/src/display.cpp index 2cc2f511..6051a673 100644 --- a/dm/src/display.cpp +++ b/dm/src/display.cpp @@ -39,6 +39,10 @@ Display::Display(const std::string& name, sptr info) { } +Display::~Display() +{ +} + DisplayId Display::GetId() const { return pImpl_->GetDisplayInfo()->GetDisplayId(); diff --git a/interfaces/innerkits/dm/display.h b/interfaces/innerkits/dm/display.h index 5846b76c..3d9ed5f9 100644 --- a/interfaces/innerkits/dm/display.h +++ b/interfaces/innerkits/dm/display.h @@ -29,7 +29,7 @@ typedef enum DisplayType { class Display : public RefBase { friend class DisplayManagerAdapter; public: - ~Display() = default; + ~Display(); Display(const Display&) = delete; Display(Display&&) = delete; Display& operator=(const Display&) = delete; @@ -40,8 +40,10 @@ public: uint32_t GetFreshRate() const; ScreenId GetScreenId() const; float GetVirtualPixelRatio() const; -private: + +protected: Display(const std::string& name, sptr info); +private: void UpdateDisplayInfo(sptr); class Impl; sptr pImpl_; diff --git a/utils/include/display_info.h b/utils/include/display_info.h index ed542629..f8c3843a 100644 --- a/utils/include/display_info.h +++ b/utils/include/display_info.h @@ -44,7 +44,7 @@ public: DEFINE_VAR_DEFAULT_FUNC_GET(float, XDpi, xDpi, 0.0f); DEFINE_VAR_DEFAULT_FUNC_GET(float, YDpi, yDpi, 0.0f); DEFINE_VAR_DEFAULT_FUNC_GET(Rotation, Rotation, rotation, Rotation::ROTATION_0); -private: +protected: DisplayInfo() = default; }; } // namespace OHOS::Rosen