From c51ad4a4327cfc01d08beba4b00c27757890e5d8 Mon Sep 17 00:00:00 2001 From: Leon Styhre Date: Mon, 27 Sep 2021 21:16:05 +0200 Subject: [PATCH] Removed some noexcept operators. --- es-app/src/views/gamelist/VideoGameListView.h | 3 +-- es-core/src/GuiComponent.h | 2 +- es-core/src/components/BadgesComponent.cpp | 2 +- es-core/src/components/BadgesComponent.h | 2 +- es-core/src/components/ImageComponent.h | 3 +-- es-core/src/resources/TextureResource.h | 2 +- 6 files changed, 6 insertions(+), 8 deletions(-) diff --git a/es-app/src/views/gamelist/VideoGameListView.h b/es-app/src/views/gamelist/VideoGameListView.h index 0cd36f4e7..3516d8477 100644 --- a/es-app/src/views/gamelist/VideoGameListView.h +++ b/es-app/src/views/gamelist/VideoGameListView.h @@ -21,8 +21,7 @@ class VideoGameListView : public BasicGameListView { public: VideoGameListView(Window* window, FileData* root); - - virtual ~VideoGameListView() noexcept; + virtual ~VideoGameListView(); virtual void onShow() override; virtual void onThemeChanged(const std::shared_ptr& theme) override; diff --git a/es-core/src/GuiComponent.h b/es-core/src/GuiComponent.h index 7bb184c14..eea4bad10 100644 --- a/es-core/src/GuiComponent.h +++ b/es-core/src/GuiComponent.h @@ -39,7 +39,7 @@ class GuiComponent public: GuiComponent(Window* window); - virtual ~GuiComponent() noexcept; + virtual ~GuiComponent(); virtual void textInput(const std::string& text); diff --git a/es-core/src/components/BadgesComponent.cpp b/es-core/src/components/BadgesComponent.cpp index e60471bb7..7ef09ec25 100644 --- a/es-core/src/components/BadgesComponent.cpp +++ b/es-core/src/components/BadgesComponent.cpp @@ -46,7 +46,7 @@ BadgesComponent::BadgesComponent(Window* window) mImageComponents.insert({SLOT_ALTERNATIVE_EMULATOR, mImageAltEmu}); } -BadgesComponent::~BadgesComponent() noexcept +BadgesComponent::~BadgesComponent() { for (GuiComponent* c : mChildren) c->clearChildren(); diff --git a/es-core/src/components/BadgesComponent.h b/es-core/src/components/BadgesComponent.h index 27a642738..f4584ecf4 100644 --- a/es-core/src/components/BadgesComponent.h +++ b/es-core/src/components/BadgesComponent.h @@ -28,7 +28,7 @@ class BadgesComponent : public FlexboxComponent { public: BadgesComponent(Window* window); - ~BadgesComponent() noexcept; + ~BadgesComponent(); std::string getValue() const override; // Should be a list of strings. diff --git a/es-core/src/components/ImageComponent.h b/es-core/src/components/ImageComponent.h index 474f46a1e..9e84bc84a 100644 --- a/es-core/src/components/ImageComponent.h +++ b/es-core/src/components/ImageComponent.h @@ -18,8 +18,7 @@ class ImageComponent : public GuiComponent { public: ImageComponent(Window* window, bool forceLoad = false, bool dynamic = true); - - virtual ~ImageComponent() noexcept {}; + virtual ~ImageComponent() {}; void setDefaultImage(std::string path) { mDefaultPath = path; } diff --git a/es-core/src/resources/TextureResource.h b/es-core/src/resources/TextureResource.h index 61abe0f55..39d096d6d 100644 --- a/es-core/src/resources/TextureResource.h +++ b/es-core/src/resources/TextureResource.h @@ -49,7 +49,7 @@ public: void rasterizeAt(size_t width, size_t height); glm::vec2 getSourceImageSize() const { return mSourceSize; } - virtual ~TextureResource() noexcept; + virtual ~TextureResource(); bool isInitialized() const { return true; } bool isTiled() const;