diff options
| -rw-r--r-- | cocoa/PlatCocoa.mm | 4 | ||||
| -rwxr-xr-x | gtk/PlatGTK.cxx | 6 | ||||
| -rw-r--r-- | qt/ScintillaEditBase/PlatQt.cpp | 12 |
3 files changed, 10 insertions, 12 deletions
diff --git a/cocoa/PlatCocoa.mm b/cocoa/PlatCocoa.mm index af420c47b..7f26f4bb0 100644 --- a/cocoa/PlatCocoa.mm +++ b/cocoa/PlatCocoa.mm @@ -1517,7 +1517,7 @@ std::unique_ptr<Surface> Surface::Allocate(int) { // be either an NSWindow or NSView and the code will check the type // before performing an action. -Window::~Window() { +Window::~Window() noexcept { } // Window::Destroy needs to see definition of ListBoxImpl so is located after ListBoxImpl @@ -2211,7 +2211,7 @@ void ListBoxImpl::SelectionChange() { ListBox::ListBox() noexcept { } -ListBox::~ListBox() { +ListBox::~ListBox() noexcept { } std::unique_ptr<ListBox> ListBox::Allocate() { diff --git a/gtk/PlatGTK.cxx b/gtk/PlatGTK.cxx index b400d4b52..4f06550a2 100755 --- a/gtk/PlatGTK.cxx +++ b/gtk/PlatGTK.cxx @@ -1124,7 +1124,7 @@ std::unique_ptr<Surface> Surface::Allocate(int) { return std::make_unique<SurfaceImpl>(); } -Window::~Window() {} +Window::~Window() noexcept {} void Window::Destroy() noexcept { if (wid) { @@ -1326,7 +1326,7 @@ static void list_image_free(gpointer, gpointer value, gpointer) noexcept { ListBox::ListBox() noexcept { } -ListBox::~ListBox() { +ListBox::~ListBox() noexcept { } enum { @@ -1368,7 +1368,7 @@ public: ListBoxX(ListBoxX&&) = delete; ListBoxX&operator=(const ListBoxX&) = delete; ListBoxX&operator=(ListBoxX&&) = delete; - ~ListBoxX() override { + ~ListBoxX() noexcept override { if (pixhash) { g_hash_table_foreach((GHashTable *) pixhash, list_image_free, nullptr); g_hash_table_destroy((GHashTable *) pixhash); diff --git a/qt/ScintillaEditBase/PlatQt.cpp b/qt/ScintillaEditBase/PlatQt.cpp index b9d6a0351..60145691a 100644 --- a/qt/ScintillaEditBase/PlatQt.cpp +++ b/qt/ScintillaEditBase/PlatQt.cpp @@ -808,7 +808,7 @@ QRect ScreenRectangleForPoint(QPoint posGlobal) } -Window::~Window() {} +Window::~Window() noexcept {} void Window::Destroy() noexcept { @@ -936,8 +936,8 @@ private: class ListBoxImpl : public ListBox { public: - ListBoxImpl(); - ~ListBoxImpl(); + ListBoxImpl() noexcept; + ~ListBoxImpl() noexcept override = default; void SetFont(const Font *font) override; void Create(Window &parent, int ctrlID, Point location, @@ -969,12 +969,10 @@ private: int visibleRows; QMap<int,QPixmap> images; }; -ListBoxImpl::ListBoxImpl() +ListBoxImpl::ListBoxImpl() noexcept : unicodeMode(false), visibleRows(5) {} -ListBoxImpl::~ListBoxImpl() {} - void ListBoxImpl::Create(Window &parent, int /*ctrlID*/, Point location, @@ -1211,7 +1209,7 @@ ListWidget *ListBoxImpl::GetWidget() const noexcept } ListBox::ListBox() noexcept {} -ListBox::~ListBox() {} +ListBox::~ListBox() noexcept {} std::unique_ptr<ListBox> ListBox::Allocate() { |