diff --git a/src/SFML/Graphics/Font.cpp b/src/SFML/Graphics/Font.cpp index 5defd9212..ffb640c8c 100644 --- a/src/SFML/Graphics/Font.cpp +++ b/src/SFML/Graphics/Font.cpp @@ -130,10 +130,7 @@ m_pixelBuffer(copy.m_pixelBuffer) //////////////////////////////////////////////////////////// -Font::~Font() -{ - cleanup(); -} +Font::~Font() = default; //////////////////////////////////////////////////////////// diff --git a/src/SFML/Graphics/ImageLoader.cpp b/src/SFML/Graphics/ImageLoader.cpp index 428ebe9cb..b6630c93c 100644 --- a/src/SFML/Graphics/ImageLoader.cpp +++ b/src/SFML/Graphics/ImageLoader.cpp @@ -90,13 +90,6 @@ ImageLoader::ImageLoader() } -//////////////////////////////////////////////////////////// -ImageLoader::~ImageLoader() -{ - // Nothing to do -} - - //////////////////////////////////////////////////////////// bool ImageLoader::loadImageFromFile(const std::filesystem::path& filename, std::vector& pixels, Vector2u& size) { diff --git a/src/SFML/Graphics/ImageLoader.hpp b/src/SFML/Graphics/ImageLoader.hpp index 2d66d821a..1e8b26172 100644 --- a/src/SFML/Graphics/ImageLoader.hpp +++ b/src/SFML/Graphics/ImageLoader.hpp @@ -127,12 +127,6 @@ private: //////////////////////////////////////////////////////////// ImageLoader(); - //////////////////////////////////////////////////////////// - /// \brief Destructor - /// - //////////////////////////////////////////////////////////// - ~ImageLoader(); - //////////////////////////////////////////////////////////// /// \brief Deleted copy constructor /// diff --git a/src/SFML/Window/Android/CursorImpl.cpp b/src/SFML/Window/Android/CursorImpl.cpp index 5999fb562..f09b269d0 100644 --- a/src/SFML/Window/Android/CursorImpl.cpp +++ b/src/SFML/Window/Android/CursorImpl.cpp @@ -39,13 +39,6 @@ CursorImpl::CursorImpl() } -//////////////////////////////////////////////////////////// -CursorImpl::~CursorImpl() -{ - // Nothing. -} - - //////////////////////////////////////////////////////////// bool CursorImpl::loadFromPixels(const Uint8* /* pixels */, Vector2u /* size */, Vector2u /* hotspot */) { diff --git a/src/SFML/Window/Android/CursorImpl.hpp b/src/SFML/Window/Android/CursorImpl.hpp index 822442f05..bb4b14709 100644 --- a/src/SFML/Window/Android/CursorImpl.hpp +++ b/src/SFML/Window/Android/CursorImpl.hpp @@ -55,14 +55,6 @@ public: //////////////////////////////////////////////////////////// CursorImpl(); - //////////////////////////////////////////////////////////// - /// \brief Destructor - /// - /// Refer to sf::Cursor::~Cursor(). - /// - //////////////////////////////////////////////////////////// - ~CursorImpl(); - //////////////////////////////////////////////////////////// /// \brief Deleted copy constructor /// diff --git a/src/SFML/Window/DRM/CursorImpl.cpp b/src/SFML/Window/DRM/CursorImpl.cpp index dbe73dcb5..e1e602313 100644 --- a/src/SFML/Window/DRM/CursorImpl.cpp +++ b/src/SFML/Window/DRM/CursorImpl.cpp @@ -39,12 +39,6 @@ CursorImpl::CursorImpl() } -//////////////////////////////////////////////////////////// -CursorImpl::~CursorImpl() -{ -} - - //////////////////////////////////////////////////////////// bool CursorImpl::loadFromPixels(const Uint8* /*pixels*/, Vector2u /*size*/, Vector2u /*hotspot*/) { diff --git a/src/SFML/Window/DRM/CursorImpl.hpp b/src/SFML/Window/DRM/CursorImpl.hpp index c78d918c5..5d24c324d 100644 --- a/src/SFML/Window/DRM/CursorImpl.hpp +++ b/src/SFML/Window/DRM/CursorImpl.hpp @@ -53,14 +53,6 @@ public: //////////////////////////////////////////////////////////// CursorImpl(); - //////////////////////////////////////////////////////////// - /// \brief Destructor - /// - /// Refer to sf::Cursor::~Cursor(). - /// - //////////////////////////////////////////////////////////// - ~CursorImpl(); - //////////////////////////////////////////////////////////// /// \brief Deleted copy constructor /// diff --git a/src/SFML/Window/iOS/CursorImpl.cpp b/src/SFML/Window/iOS/CursorImpl.cpp index f5648adbc..a93bfed8f 100644 --- a/src/SFML/Window/iOS/CursorImpl.cpp +++ b/src/SFML/Window/iOS/CursorImpl.cpp @@ -39,13 +39,6 @@ CursorImpl::CursorImpl() } -//////////////////////////////////////////////////////////// -CursorImpl::~CursorImpl() -{ - // Nothing. -} - - //////////////////////////////////////////////////////////// bool CursorImpl::loadFromPixels(const Uint8* /* pixels */, Vector2u /* size */, Vector2u /* hotspot */) { diff --git a/src/SFML/Window/iOS/CursorImpl.hpp b/src/SFML/Window/iOS/CursorImpl.hpp index 5c7588ec4..db4849afc 100644 --- a/src/SFML/Window/iOS/CursorImpl.hpp +++ b/src/SFML/Window/iOS/CursorImpl.hpp @@ -55,14 +55,6 @@ public: //////////////////////////////////////////////////////////// CursorImpl(); - //////////////////////////////////////////////////////////// - /// \brief Destructor - /// - /// Refer to sf::Cursor::~Cursor(). - /// - //////////////////////////////////////////////////////////// - ~CursorImpl(); - //////////////////////////////////////////////////////////// /// \brief Deleted copy constructor ///