From 00f62e4f3db5aa737b4242a3d691d2ade299fc72 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Thu, 28 Dec 2017 19:29:05 +0300
Subject: Add missing override and final to destructors.

Also remove some empty destructors.
---
 src/resources/action.h                       | 2 +-
 src/resources/ambientlayer.h                 | 2 +-
 src/resources/atlas/atlasresource.h          | 2 +-
 src/resources/image/image.h                  | 2 +-
 src/resources/image/subimage.h               | 2 +-
 src/resources/imageset.h                     | 2 +-
 src/resources/inventory/complexinventory.h   | 2 +-
 src/resources/map/map.h                      | 2 +-
 src/resources/map/mapheights.h               | 2 +-
 src/resources/map/maplayer.h                 | 2 +-
 src/resources/map/objectslayer.h             | 2 +-
 src/resources/map/speciallayer.h             | 2 +-
 src/resources/map/walklayer.h                | 2 +-
 src/resources/mobileopenglscreenshothelper.h | 2 +-
 src/resources/openglimagehelper.h            | 2 +-
 src/resources/openglscreenshothelper.h       | 2 +-
 src/resources/resource.h                     | 2 +-
 src/resources/safeopenglimagehelper.h        | 2 +-
 src/resources/sdl2imagehelper.h              | 3 ---
 src/resources/sdl2softwareimagehelper.h      | 3 ---
 src/resources/sdl2softwarescreenshothelper.h | 2 +-
 src/resources/sdlimagehelper.h               | 3 ---
 src/resources/sdlmusic.h                     | 2 +-
 src/resources/sdlscreenshothelper.h          | 2 +-
 src/resources/soundeffect.h                  | 2 +-
 src/resources/sprite/animatedsprite.h        | 2 +-
 src/resources/sprite/imagesprite.h           | 2 +-
 src/resources/sprite/spritedef.h             | 2 +-
 28 files changed, 25 insertions(+), 34 deletions(-)

(limited to 'src/resources')

diff --git a/src/resources/action.h b/src/resources/action.h
index 4a8527603..4dcbaf47d 100644
--- a/src/resources/action.h
+++ b/src/resources/action.h
@@ -43,7 +43,7 @@ class Action final : public MemoryCounter
 
         A_DELETE_COPY(Action)
 
-        ~Action();
+        ~Action() override final;
 
         void setAnimation(const SpriteDirection::Type direction,
                           Animation *const animation) noexcept2;
diff --git a/src/resources/ambientlayer.h b/src/resources/ambientlayer.h
index 255d62731..211c1e852 100644
--- a/src/resources/ambientlayer.h
+++ b/src/resources/ambientlayer.h
@@ -58,7 +58,7 @@ class AmbientLayer final : public MemoryCounter
 
         A_DELETE_COPY(AmbientLayer)
 
-        ~AmbientLayer();
+        ~AmbientLayer() override final;
 
         void update(const int timePassed,
                     const float dx,
diff --git a/src/resources/atlas/atlasresource.h b/src/resources/atlas/atlasresource.h
index 60be25c1d..e73cf6000 100644
--- a/src/resources/atlas/atlasresource.h
+++ b/src/resources/atlas/atlasresource.h
@@ -38,7 +38,7 @@ class AtlasResource final : public Resource
 
         A_DELETE_COPY(AtlasResource)
 
-        ~AtlasResource();
+        ~AtlasResource() override final;
 
         void incRef() override final;
 
diff --git a/src/resources/image/image.h b/src/resources/image/image.h
index d3a6d5aac..ee15f33bd 100644
--- a/src/resources/image/image.h
+++ b/src/resources/image/image.h
@@ -97,7 +97,7 @@ class Image notfinal : public Resource
         /**
          * Destructor.
          */
-        virtual ~Image();
+        ~Image() override;
 
         /**
          * Frees the resources created by SDL.
diff --git a/src/resources/image/subimage.h b/src/resources/image/subimage.h
index 6f0b2e11b..6994fc8f5 100644
--- a/src/resources/image/subimage.h
+++ b/src/resources/image/subimage.h
@@ -54,7 +54,7 @@ class SubImage final : public Image
         /**
          * Destructor.
          */
-        ~SubImage();
+        ~SubImage() override final;
 
         /**
          * Creates a new image with the desired clipping rectangle.
diff --git a/src/resources/imageset.h b/src/resources/imageset.h
index e31317731..d94cb3f7c 100644
--- a/src/resources/imageset.h
+++ b/src/resources/imageset.h
@@ -51,7 +51,7 @@ class ImageSet notfinal : public Resource
         /**
          * Destructor.
          */
-        virtual ~ImageSet();
+        ~ImageSet() override;
 
         /**
          * Returns the width of the images in the image set.
diff --git a/src/resources/inventory/complexinventory.h b/src/resources/inventory/complexinventory.h
index cc5611b19..8af1de6d3 100644
--- a/src/resources/inventory/complexinventory.h
+++ b/src/resources/inventory/complexinventory.h
@@ -43,7 +43,7 @@ class ComplexInventory final : public Inventory
         /**
          * Destructor.
          */
-        ~ComplexInventory();
+        ~ComplexInventory() override final;
 
         bool addVirtualItem(const Item *const item,
                             int index,
diff --git a/src/resources/map/map.h b/src/resources/map/map.h
index 39e4e651e..4a3dc9f48 100644
--- a/src/resources/map/map.h
+++ b/src/resources/map/map.h
@@ -84,7 +84,7 @@ class Map final : public Properties,
         /**
          * Destructor.
          */
-        ~Map();
+        ~Map() override final;
 
         /**
          * Initialize ambient layers. Has to be called after all the properties
diff --git a/src/resources/map/mapheights.h b/src/resources/map/mapheights.h
index ef8c4151b..d4bf90632 100644
--- a/src/resources/map/mapheights.h
+++ b/src/resources/map/mapheights.h
@@ -36,7 +36,7 @@ class MapHeights final : public MemoryCounter
 
         A_DELETE_COPY(MapHeights)
 
-        ~MapHeights();
+        ~MapHeights() override final;
 
         void setHeight(const int x, const int y, const uint8_t height);
 
diff --git a/src/resources/map/maplayer.h b/src/resources/map/maplayer.h
index c21ac33bc..87ddb96ec 100644
--- a/src/resources/map/maplayer.h
+++ b/src/resources/map/maplayer.h
@@ -69,7 +69,7 @@ class MapLayer final: public MemoryCounter, public ConfigListener
         /**
          * Destructor.
          */
-        ~MapLayer();
+        ~MapLayer() override final;
 
         /**
          * Set tile image, with x and y in layer coordinates.
diff --git a/src/resources/map/objectslayer.h b/src/resources/map/objectslayer.h
index 3deed3d36..4894b3469 100644
--- a/src/resources/map/objectslayer.h
+++ b/src/resources/map/objectslayer.h
@@ -34,7 +34,7 @@ class ObjectsLayer final : public MemoryCounter
 
         A_DELETE_COPY(ObjectsLayer)
 
-        ~ObjectsLayer();
+        ~ObjectsLayer() override final;
 
         void addObject(const std::string &name, const int type,
                        const unsigned x, const unsigned y,
diff --git a/src/resources/map/speciallayer.h b/src/resources/map/speciallayer.h
index 8f6f914d3..20ade5f73 100644
--- a/src/resources/map/speciallayer.h
+++ b/src/resources/map/speciallayer.h
@@ -42,7 +42,7 @@ class SpecialLayer final : public MemoryCounter
 
         A_DELETE_COPY(SpecialLayer)
 
-        ~SpecialLayer();
+        ~SpecialLayer() override final;
 
         void draw(Graphics *const graphics,
                   int startX, int startY,
diff --git a/src/resources/map/walklayer.h b/src/resources/map/walklayer.h
index 4e5cc9c65..33cbc2bb4 100644
--- a/src/resources/map/walklayer.h
+++ b/src/resources/map/walklayer.h
@@ -32,7 +32,7 @@ class WalkLayer final : public Resource
 
         A_DELETE_COPY(WalkLayer)
 
-        ~WalkLayer();
+        ~WalkLayer() override final;
 
         int *getData()
         { return mTiles; }
diff --git a/src/resources/mobileopenglscreenshothelper.h b/src/resources/mobileopenglscreenshothelper.h
index 05aeb4e77..bbaf354e1 100644
--- a/src/resources/mobileopenglscreenshothelper.h
+++ b/src/resources/mobileopenglscreenshothelper.h
@@ -38,7 +38,7 @@ class MobileOpenGLScreenshotHelper final : public ScreenshotHelper
 
         A_DELETE_COPY(MobileOpenGLScreenshotHelper)
 
-        ~MobileOpenGLScreenshotHelper();
+        ~MobileOpenGLScreenshotHelper() override final;
 
         void prepare() override final;
 
diff --git a/src/resources/openglimagehelper.h b/src/resources/openglimagehelper.h
index 24662686d..c27232db0 100644
--- a/src/resources/openglimagehelper.h
+++ b/src/resources/openglimagehelper.h
@@ -68,7 +68,7 @@ class OpenGLImageHelper final : public ImageHelper
 
         A_DELETE_COPY(OpenGLImageHelper)
 
-        ~OpenGLImageHelper();
+        ~OpenGLImageHelper() override final;
 
         /**
          * Loads an image from an SDL_RWops structure and recolors it.
diff --git a/src/resources/openglscreenshothelper.h b/src/resources/openglscreenshothelper.h
index d2aa16b4a..356081cd7 100644
--- a/src/resources/openglscreenshothelper.h
+++ b/src/resources/openglscreenshothelper.h
@@ -38,7 +38,7 @@ class OpenGLScreenshotHelper final : public ScreenshotHelper
 
         A_DELETE_COPY(OpenGLScreenshotHelper)
 
-        ~OpenGLScreenshotHelper();
+        ~OpenGLScreenshotHelper() override final;
 
         void prepare() override final;
 
diff --git a/src/resources/resource.h b/src/resources/resource.h
index a434606a0..30e69f16e 100644
--- a/src/resources/resource.h
+++ b/src/resources/resource.h
@@ -57,7 +57,7 @@ class Resource notfinal : public MemoryCounter
         /**
          * Destructor.
          */
-        virtual ~Resource();
+        ~Resource() override;
 
         /**
          * Increments the internal reference count.
diff --git a/src/resources/safeopenglimagehelper.h b/src/resources/safeopenglimagehelper.h
index 7d551cc36..306892ca7 100644
--- a/src/resources/safeopenglimagehelper.h
+++ b/src/resources/safeopenglimagehelper.h
@@ -68,7 +68,7 @@ class SafeOpenGLImageHelper final : public ImageHelper
 
         A_DELETE_COPY(SafeOpenGLImageHelper)
 
-        ~SafeOpenGLImageHelper();
+        ~SafeOpenGLImageHelper() override final;
 
         /**
          * Loads an image from an SDL_RWops structure and recolors it.
diff --git a/src/resources/sdl2imagehelper.h b/src/resources/sdl2imagehelper.h
index dab36e038..be17ec446 100644
--- a/src/resources/sdl2imagehelper.h
+++ b/src/resources/sdl2imagehelper.h
@@ -51,9 +51,6 @@ class SDLImageHelper final : public ImageHelper
 
         A_DELETE_COPY(SDLImageHelper)
 
-        ~SDLImageHelper()
-        { }
-
         /**
          * Loads an image from an SDL surface.
          */
diff --git a/src/resources/sdl2softwareimagehelper.h b/src/resources/sdl2softwareimagehelper.h
index e2795f0a4..7d7ac5a10 100644
--- a/src/resources/sdl2softwareimagehelper.h
+++ b/src/resources/sdl2softwareimagehelper.h
@@ -46,9 +46,6 @@ class SDL2SoftwareImageHelper final : public ImageHelper
 
         A_DELETE_COPY(SDL2SoftwareImageHelper)
 
-        ~SDL2SoftwareImageHelper()
-        { }
-
         /**
          * Loads an image from an SDL surface.
          */
diff --git a/src/resources/sdl2softwarescreenshothelper.h b/src/resources/sdl2softwarescreenshothelper.h
index 872676729..8be00bd46 100644
--- a/src/resources/sdl2softwarescreenshothelper.h
+++ b/src/resources/sdl2softwarescreenshothelper.h
@@ -36,7 +36,7 @@ class Sdl2SoftwareScreenshotHelper final : public ScreenshotHelper
 
         A_DELETE_COPY(Sdl2SoftwareScreenshotHelper)
 
-        ~Sdl2SoftwareScreenshotHelper();
+        ~Sdl2SoftwareScreenshotHelper() override final;
 
         void prepare() override final;
 
diff --git a/src/resources/sdlimagehelper.h b/src/resources/sdlimagehelper.h
index e528492d5..c758aa8f7 100644
--- a/src/resources/sdlimagehelper.h
+++ b/src/resources/sdlimagehelper.h
@@ -50,9 +50,6 @@ class SDLImageHelper final : public ImageHelper
 
         A_DELETE_COPY(SDLImageHelper)
 
-        ~SDLImageHelper()
-        { }
-
         /**
          * Loads an image from an SDL_RWops structure and recolors it.
          *
diff --git a/src/resources/sdlmusic.h b/src/resources/sdlmusic.h
index 40e7be7ee..4b6aec705 100644
--- a/src/resources/sdlmusic.h
+++ b/src/resources/sdlmusic.h
@@ -54,7 +54,7 @@ class SDLMusic final : public Resource
         /**
          * Destructor.
          */
-        ~SDLMusic();
+        ~SDLMusic() override final;
 
         /**
          * Plays the music.
diff --git a/src/resources/sdlscreenshothelper.h b/src/resources/sdlscreenshothelper.h
index fad0a61d5..a79228735 100644
--- a/src/resources/sdlscreenshothelper.h
+++ b/src/resources/sdlscreenshothelper.h
@@ -34,7 +34,7 @@ class SdlScreenshotHelper final : public ScreenshotHelper
 
         A_DELETE_COPY(SdlScreenshotHelper)
 
-        ~SdlScreenshotHelper();
+        ~SdlScreenshotHelper() override final;
 
         void prepare() override final A_CONST;
 
diff --git a/src/resources/soundeffect.h b/src/resources/soundeffect.h
index 71f5f5f03..c06371f4c 100644
--- a/src/resources/soundeffect.h
+++ b/src/resources/soundeffect.h
@@ -53,7 +53,7 @@ class SoundEffect final : public Resource
         /**
          * Destructor.
          */
-        ~SoundEffect();
+        ~SoundEffect() override final;
 
         /**
          * Plays the sample.
diff --git a/src/resources/sprite/animatedsprite.h b/src/resources/sprite/animatedsprite.h
index e45ffd34e..d5cf8317b 100644
--- a/src/resources/sprite/animatedsprite.h
+++ b/src/resources/sprite/animatedsprite.h
@@ -60,7 +60,7 @@ class AnimatedSprite final : public Sprite
         static AnimatedSprite *clone(const AnimatedSprite *restrict const
                                      anim);
 
-        ~AnimatedSprite();
+        ~AnimatedSprite() override final;
 
         bool reset() restrict2 override final;
 
diff --git a/src/resources/sprite/imagesprite.h b/src/resources/sprite/imagesprite.h
index 9576933d1..1e224ee6c 100644
--- a/src/resources/sprite/imagesprite.h
+++ b/src/resources/sprite/imagesprite.h
@@ -35,7 +35,7 @@ class ImageSprite final : public Sprite
 
         A_DELETE_COPY(ImageSprite)
 
-        ~ImageSprite();
+        ~ImageSprite() override final;
 
         bool reset() override final
         { return false; }
diff --git a/src/resources/sprite/spritedef.h b/src/resources/sprite/spritedef.h
index b2fceb2be..3e72691a6 100644
--- a/src/resources/sprite/spritedef.h
+++ b/src/resources/sprite/spritedef.h
@@ -95,7 +95,7 @@ class SpriteDef final : public Resource
         /**
          * Destructor.
          */
-        ~SpriteDef();
+        ~SpriteDef() override final;
 
         /**
          * Loads a sprite element.
-- 
cgit v1.2.3-60-g2f50