diff --git a/include/SFML/Audio/SoundFileReader.hpp b/include/SFML/Audio/SoundFileReader.hpp index 2882aaa43..58e48be19 100644 --- a/include/SFML/Audio/SoundFileReader.hpp +++ b/include/SFML/Audio/SoundFileReader.hpp @@ -59,9 +59,7 @@ public: /// \brief Virtual destructor /// //////////////////////////////////////////////////////////// - virtual ~SoundFileReader() - { - } + virtual ~SoundFileReader() = default; //////////////////////////////////////////////////////////// /// \brief Open a sound file for reading diff --git a/include/SFML/Audio/SoundFileWriter.hpp b/include/SFML/Audio/SoundFileWriter.hpp index ff2ae0fa4..91e86ad13 100644 --- a/include/SFML/Audio/SoundFileWriter.hpp +++ b/include/SFML/Audio/SoundFileWriter.hpp @@ -47,9 +47,7 @@ public: /// \brief Virtual destructor /// //////////////////////////////////////////////////////////// - virtual ~SoundFileWriter() - { - } + virtual ~SoundFileWriter() = default; //////////////////////////////////////////////////////////// /// \brief Open a sound file for writing diff --git a/include/SFML/Graphics/Drawable.hpp b/include/SFML/Graphics/Drawable.hpp index 1b6afc3b2..415f78021 100644 --- a/include/SFML/Graphics/Drawable.hpp +++ b/include/SFML/Graphics/Drawable.hpp @@ -48,9 +48,7 @@ public: /// \brief Virtual destructor /// //////////////////////////////////////////////////////////// - virtual ~Drawable() - { - } + virtual ~Drawable() = default; protected: friend class RenderTarget; diff --git a/include/SFML/System/InputStream.hpp b/include/SFML/System/InputStream.hpp index a2d8e0764..fb3aa0e12 100644 --- a/include/SFML/System/InputStream.hpp +++ b/include/SFML/System/InputStream.hpp @@ -48,9 +48,7 @@ public: /// \brief Virtual destructor /// //////////////////////////////////////////////////////////// - virtual ~InputStream() - { - } + virtual ~InputStream() = default; //////////////////////////////////////////////////////////// /// \brief Read data from the stream diff --git a/src/SFML/Graphics/CMakeLists.txt b/src/SFML/Graphics/CMakeLists.txt index 28ee7a7d8..e595331aa 100644 --- a/src/SFML/Graphics/CMakeLists.txt +++ b/src/SFML/Graphics/CMakeLists.txt @@ -76,7 +76,6 @@ source_group("drawables" FILES ${DRAWABLES_SRC}) # render-texture sources set(RENDER_TEXTURE_SRC - ${SRCROOT}/RenderTextureImpl.cpp ${SRCROOT}/RenderTextureImpl.hpp ${SRCROOT}/RenderTextureImplFBO.cpp ${SRCROOT}/RenderTextureImplFBO.hpp diff --git a/src/SFML/Graphics/RenderTextureImpl.cpp b/src/SFML/Graphics/RenderTextureImpl.cpp deleted file mode 100644 index b3087eee2..000000000 --- a/src/SFML/Graphics/RenderTextureImpl.cpp +++ /dev/null @@ -1,40 +0,0 @@ -//////////////////////////////////////////////////////////// -// -// SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2022 Laurent Gomila (laurent@sfml-dev.org) -// -// This software is provided 'as-is', without any express or implied warranty. -// In no event will the authors be held liable for any damages arising from the use of this software. -// -// Permission is granted to anyone to use this software for any purpose, -// including commercial applications, and to alter it and redistribute it freely, -// subject to the following restrictions: -// -// 1. The origin of this software must not be misrepresented; -// you must not claim that you wrote the original software. -// If you use this software in a product, an acknowledgment -// in the product documentation would be appreciated but is not required. -// -// 2. Altered source versions must be plainly marked as such, -// and must not be misrepresented as being the original software. -// -// 3. This notice may not be removed or altered from any source distribution. -// -//////////////////////////////////////////////////////////// - -//////////////////////////////////////////////////////////// -// Headers -//////////////////////////////////////////////////////////// -#include - - -namespace sf -{ -namespace priv -{ -//////////////////////////////////////////////////////////// -RenderTextureImpl::~RenderTextureImpl() = default; - -} // namespace priv - -} // namespace sf diff --git a/src/SFML/Graphics/RenderTextureImpl.hpp b/src/SFML/Graphics/RenderTextureImpl.hpp index b37bce607..9f0bfe901 100644 --- a/src/SFML/Graphics/RenderTextureImpl.hpp +++ b/src/SFML/Graphics/RenderTextureImpl.hpp @@ -55,7 +55,7 @@ public: /// \brief Destructor /// //////////////////////////////////////////////////////////// - virtual ~RenderTextureImpl(); + virtual ~RenderTextureImpl() = default; //////////////////////////////////////////////////////////// /// \brief Deleted copy constructor diff --git a/src/SFML/Window/iOS/WindowImplUIKit.hpp b/src/SFML/Window/iOS/WindowImplUIKit.hpp index b10802f25..8e28ac491 100644 --- a/src/SFML/Window/iOS/WindowImplUIKit.hpp +++ b/src/SFML/Window/iOS/WindowImplUIKit.hpp @@ -72,7 +72,7 @@ public: /// \brief Destructor /// //////////////////////////////////////////////////////////// - ~WindowImplUIKit(); + ~WindowImplUIKit() = default; //////////////////////////////////////////////////////////// /// \brief Get the OS-specific handle of the window diff --git a/src/SFML/Window/iOS/WindowImplUIKit.mm b/src/SFML/Window/iOS/WindowImplUIKit.mm index 6c283c46c..26b1842af 100644 --- a/src/SFML/Window/iOS/WindowImplUIKit.mm +++ b/src/SFML/Window/iOS/WindowImplUIKit.mm @@ -86,12 +86,6 @@ WindowImplUIKit::WindowImplUIKit(VideoMode mode, const String& /* title */, unsi } -//////////////////////////////////////////////////////////// -WindowImplUIKit::~WindowImplUIKit() -{ -} - - //////////////////////////////////////////////////////////// void WindowImplUIKit::processEvents() {