From 00527a74c676076cad767397a2867a4aa4454a19 Mon Sep 17 00:00:00 2001 From: Neil Date: Mon, 5 Apr 2021 20:04:18 +1000 Subject: Mark more destructors as noexcept. Delete unwanted LisboxX standard methods. --- src/Platform.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/Platform.h b/src/Platform.h index d46f050d6..b77fe3243 100644 --- a/src/Platform.h +++ b/src/Platform.h @@ -129,13 +129,13 @@ struct FontParameters { class Font { public: - Font() noexcept=default; + Font() noexcept = default; // Deleted so Font objects can not be copied Font(const Font &) = delete; Font(Font &&) = delete; Font &operator=(const Font &) = delete; Font &operator=(Font &&) = delete; - virtual ~Font()=default; + virtual ~Font() noexcept = default; static std::shared_ptr Allocate(const FontParameters &fp); }; @@ -156,7 +156,7 @@ public: class IScreenLineLayout { public: - virtual ~IScreenLineLayout() = default; + virtual ~IScreenLineLayout() noexcept = default; virtual size_t PositionFromX(XYPOSITION xDistance, bool charPosition) = 0; virtual XYPOSITION XFromPosition(size_t caretPosition) = 0; virtual std::vector FindRangeIntervals(size_t start, size_t end) = 0; @@ -183,7 +183,7 @@ public: Surface(Surface &&) = delete; Surface &operator=(const Surface &) = delete; Surface &operator=(Surface &&) = delete; - virtual ~Surface() {} + virtual ~Surface() noexcept = default; static std::unique_ptr Allocate(int technology); virtual void Init(WindowID wid)=0; @@ -268,7 +268,7 @@ public: } Window &operator=(const Window &) = delete; Window &operator=(Window &&) = delete; - virtual ~Window(); + virtual ~Window() noexcept; WindowID GetID() const noexcept { return wid; } bool Created() const noexcept { return wid != nullptr; } void Destroy() noexcept; @@ -313,7 +313,7 @@ struct ListOptions { class ListBox : public Window { public: ListBox() noexcept; - ~ListBox() override; + virtual ~ListBox() noexcept override; static std::unique_ptr Allocate(); virtual void SetFont(const Font *font)=0; -- cgit v1.2.3