Revert "Remove override keyword, if it present with final."

This reverts commit 55480eb4477b2cf85af1bcdcc5e8ec4f4ce6682d.

17 files changed, 64 insertions, 64 deletions

diff --git a/src/resources/atlas/atlasresource.h b/src/resources/atlas/atlasresource.h
index 0e4fffceb..0a9d90f04 100644
--- a/src/resources/atlas/atlasresource.h
+++ b/src/resources/atlas/atlasresource.h
@@ -40,9 +40,9 @@ class AtlasResource final : public Resource
 
         ~AtlasResource();
 
-        void incRef() final;
+        void incRef() override final;
 
-        void decRef() final;
+        void decRef() override final;
 
         std::vector<TextureAtlas*> atlases;
 };
diff --git a/src/resources/inventory/complexinventory.h b/src/resources/inventory/complexinventory.h
index 52cade53c..996212d18 100644
--- a/src/resources/inventory/complexinventory.h
+++ b/src/resources/inventory/complexinventory.h
@@ -47,7 +47,7 @@ class ComplexInventory final : public Inventory
 
         bool addVirtualItem(const Item *const item,
                             int index,
-                            const int amount) final;
+                            const int amount) override final;
 
         void setItem(const int index,
                      const int id,
@@ -59,7 +59,7 @@ class ComplexInventory final : public Inventory
                      const Damaged damaged,
                      const Favorite favorite,
                      const Equipm equipment,
-                     const Equipped equipped) final;
+                     const Equipped equipped) override final;
 };
 
 #endif  // RESOURCES_INVENTORY_COMPLEXINVENTORY_H
diff --git a/src/resources/map/map.h b/src/resources/map/map.h
index 1b87f8288..4a0f71e82 100644
--- a/src/resources/map/map.h
+++ b/src/resources/map/map.h
@@ -283,7 +283,7 @@ class Map final : public Properties, public ConfigListener
                                                 const restrict2 A_WARN_UNUSED;
 
         void optionChanged(const std::string &restrict value)
-                           restrict2 final;
+                           restrict2 override final;
 
         MapItem *findPortalXY(const int x,
                               const int y) const restrict2 A_WARN_UNUSED;
diff --git a/src/resources/map/maplayer.h b/src/resources/map/maplayer.h
index da35c239e..45dcaec02 100644
--- a/src/resources/map/maplayer.h
+++ b/src/resources/map/maplayer.h
@@ -155,7 +155,7 @@ class MapLayer final: public ConfigListener
         { return mHeight; }
 
         void optionChanged(const std::string &restrict value)
-                           restrict final;
+                           restrict override final;
 
         void setDrawLayerFlags(const MapTypeT &restrict n) restrict;
 
diff --git a/src/resources/mobileopenglscreenshothelper.h b/src/resources/mobileopenglscreenshothelper.h
index 855d47717..b9950092a 100644
--- a/src/resources/mobileopenglscreenshothelper.h
+++ b/src/resources/mobileopenglscreenshothelper.h
@@ -40,9 +40,9 @@ class MobileOpenGLScreenshotHelper final : public ScreenshotHelper
 
         ~MobileOpenGLScreenshotHelper();
 
-        void prepare() final;
+        void prepare() override final;
 
-        SDL_Surface *getScreenshot() final;
+        SDL_Surface *getScreenshot() override final;
 
     private:
         FBOInfo mFbo;
diff --git a/src/resources/openglimagehelper.h b/src/resources/openglimagehelper.h
index 0f76a0bac..0c7e49c8f 100644
--- a/src/resources/openglimagehelper.h
+++ b/src/resources/openglimagehelper.h
@@ -78,18 +78,18 @@ class OpenGLImageHelper final : public ImageHelper
          *         otherwise.
          */
         Image *load(SDL_RWops *const rw,
-                    Dye const &dye) final A_WARN_UNUSED;
+                    Dye const &dye) override final A_WARN_UNUSED;
 
         /**
          * Loads an image from an SDL surface.
          */
         Image *load(SDL_Surface *const tmpImage)
-                    final A_WARN_UNUSED;
+                    override final A_WARN_UNUSED;
 
         Image *createTextSurface(SDL_Surface *const tmpImage,
                                  const int width, const int height,
                                  const float alpha)
-                                 final A_WARN_UNUSED;
+                                 override final A_WARN_UNUSED;
 
         // OpenGL only public functions
 
@@ -122,13 +122,13 @@ class OpenGLImageHelper final : public ImageHelper
         static void bindTexture(const GLuint texture);
 
         SDL_Surface *create32BitSurface(int width,
-                                        int height) const final;
+                                        int height) const override final;
 
-        void postInit() final;
+        void postInit() override final;
 
         void copySurfaceToImage(const Image *const image,
                                 const int x, const int y,
-                                SDL_Surface *surface) const final;
+                                SDL_Surface *surface) const override final;
 
     protected:
         /**
diff --git a/src/resources/openglscreenshothelper.h b/src/resources/openglscreenshothelper.h
index c19c737d1..b6ccd2910 100644
--- a/src/resources/openglscreenshothelper.h
+++ b/src/resources/openglscreenshothelper.h
@@ -40,9 +40,9 @@ class OpenGLScreenshotHelper final : public ScreenshotHelper
 
         ~OpenGLScreenshotHelper();
 
-        void prepare() final;
+        void prepare() override final;
 
-        SDL_Surface *getScreenshot() final;
+        SDL_Surface *getScreenshot() override final;
 
     private:
         FBOInfo mFbo;
diff --git a/src/resources/safeopenglimagehelper.h b/src/resources/safeopenglimagehelper.h
index ab4dcdb13..9b65f5262 100644
--- a/src/resources/safeopenglimagehelper.h
+++ b/src/resources/safeopenglimagehelper.h
@@ -78,18 +78,18 @@ class SafeOpenGLImageHelper final : public ImageHelper
          *         otherwise.
          */
         Image *load(SDL_RWops *const rw,
-                    Dye const &dye) final A_WARN_UNUSED;
+                    Dye const &dye) override final A_WARN_UNUSED;
 
         /**
          * Loads an image from an SDL surface.
          */
         Image *load(SDL_Surface *const tmpImage)
-                    final A_WARN_UNUSED;
+                    override final A_WARN_UNUSED;
 
         Image *createTextSurface(SDL_Surface *const tmpImage,
                                  const int width, const int height,
                                  const float alpha)
-                                 final A_WARN_UNUSED;
+                                 override final A_WARN_UNUSED;
 
         // OpenGL only public functions
 
@@ -122,13 +122,13 @@ class SafeOpenGLImageHelper final : public ImageHelper
         static void bindTexture(const GLuint texture);
 
         SDL_Surface *create32BitSurface(int width,
-                                        int height) const final;
+                                        int height) const override final;
 
-        void postInit() final;
+        void postInit() override final;
 
         void copySurfaceToImage(const Image *const image,
                                 const int x, const int y,
-                                SDL_Surface *surface) const final;
+                                SDL_Surface *surface) const override final;
 
     protected:
         /**
diff --git a/src/resources/sdl2imagehelper.h b/src/resources/sdl2imagehelper.h
index cb955cb6a..c1065e957 100644
--- a/src/resources/sdl2imagehelper.h
+++ b/src/resources/sdl2imagehelper.h
@@ -55,17 +55,17 @@ class SDLImageHelper final : public ImageHelper
          * Loads an image from an SDL surface.
          */
         Image *load(SDL_Surface *const tmpImage)
-                    final A_WARN_UNUSED;
+                    override final A_WARN_UNUSED;
 
         Image *createTextSurface(SDL_Surface *const tmpImage,
                                  const int width, const int height,
                                  const float alpha)
-                                 final A_WARN_UNUSED;
+                                 override final A_WARN_UNUSED;
 
         void copySurfaceToImage(const Image *const image,
                                 const int x, const int y,
                                 SDL_Surface *const surface)
-                                const final;
+                                const override final;
 
         static void SDLSetEnableAlphaCache(const bool n)
         { mEnableAlphaCache = n; }
diff --git a/src/resources/sdl2softwareimagehelper.h b/src/resources/sdl2softwareimagehelper.h
index dac03ba36..d8a9d218e 100644
--- a/src/resources/sdl2softwareimagehelper.h
+++ b/src/resources/sdl2softwareimagehelper.h
@@ -54,12 +54,12 @@ class SDL2SoftwareImageHelper final : public ImageHelper
         /**
          * Loads an image from an SDL surface.
          */
-        Image *load(SDL_Surface *const tmpImage) final A_WARN_UNUSED;
+        Image *load(SDL_Surface *const tmpImage) override final A_WARN_UNUSED;
 
         Image *createTextSurface(SDL_Surface *const tmpImage,
                                  const int width, const int height,
                                  const float alpha)
-                                 final A_WARN_UNUSED;
+                                 override final A_WARN_UNUSED;
 
         static void SDLSetEnableAlphaCache(const bool n)
         { mEnableAlphaCache = n; }
diff --git a/src/resources/sdl2softwarescreenshothelper.h b/src/resources/sdl2softwarescreenshothelper.h
index 31144897f..f3b95e245 100644
--- a/src/resources/sdl2softwarescreenshothelper.h
+++ b/src/resources/sdl2softwarescreenshothelper.h
@@ -38,9 +38,9 @@ class Sdl2SoftwareScreenshotHelper final : public ScreenshotHelper
 
         ~Sdl2SoftwareScreenshotHelper();
 
-        void prepare() final;
+        void prepare() override final;
 
-        SDL_Surface *getScreenshot() final;
+        SDL_Surface *getScreenshot() override final;
 };
 
 #endif  // USE_SDL2
diff --git a/src/resources/sdlimagehelper.h b/src/resources/sdlimagehelper.h
index b9cffccfd..731e1a14e 100644
--- a/src/resources/sdlimagehelper.h
+++ b/src/resources/sdlimagehelper.h
@@ -62,22 +62,22 @@ class SDLImageHelper final : public ImageHelper
          *         otherwise.
          */
         Image *load(SDL_RWops *const rw,
-                    Dye const &dye) final A_WARN_UNUSED;
+                    Dye const &dye) override final A_WARN_UNUSED;
 
         /**
          * Loads an image from an SDL surface.
          */
-        Image *load(SDL_Surface *const tmpImage) final A_WARN_UNUSED;
+        Image *load(SDL_Surface *const tmpImage) override final A_WARN_UNUSED;
 
         Image *createTextSurface(SDL_Surface *const tmpImage,
                                  const int width, const int height,
                                  const float alpha)
-                                 final A_WARN_UNUSED;
+                                 override final A_WARN_UNUSED;
 
         void copySurfaceToImage(const Image *const image,
                                 const int x, const int y,
                                 SDL_Surface *const surface)
-                                const final;
+                                const override final;
 
         static void SDLSetEnableAlphaCache(const bool n)
         { mEnableAlphaCache = n; }
diff --git a/src/resources/sdlscreenshothelper.h b/src/resources/sdlscreenshothelper.h
index 1ee7096be..2b8acdbe5 100644
--- a/src/resources/sdlscreenshothelper.h
+++ b/src/resources/sdlscreenshothelper.h
@@ -36,9 +36,9 @@ class SdlScreenshotHelper final : public ScreenshotHelper
 
         ~SdlScreenshotHelper();
 
-        void prepare() final A_CONST;
+        void prepare() override final A_CONST;
 
-        SDL_Surface *getScreenshot() final;
+        SDL_Surface *getScreenshot() override final;
 };
 
 #endif  // RESOURCES_SDLSCREENSHOTHELPER_H
diff --git a/src/resources/sprite/animatedsprite.h b/src/resources/sprite/animatedsprite.h
index cdf5680eb..dcf8045fb 100644
--- a/src/resources/sprite/animatedsprite.h
+++ b/src/resources/sprite/animatedsprite.h
@@ -63,47 +63,47 @@ class AnimatedSprite final : public Sprite
 
         ~AnimatedSprite();
 
-        bool reset() restrict2 final;
+        bool reset() restrict2 override final;
 
-        bool play(const std::string &restrict action) restrict2 final;
+        bool play(const std::string &restrict action) restrict2 override final;
 
-        bool update(const int time) restrict2 final;
+        bool update(const int time) restrict2 override final;
 
         void draw(Graphics *restrict const graphics,
                   const int posX,
-                  const int posY) const restrict2 final A_NONNULL(2);
+                  const int posY) const restrict2 override final A_NONNULL(2);
 
         void drawRaw(Graphics *restrict const graphics,
                      const int posX,
                      const int posY) const restrict2 A_NONNULL(2);
 
-        int getWidth() const restrict2 final A_WARN_UNUSED;
+        int getWidth() const restrict2 override final A_WARN_UNUSED;
 
-        int getHeight() const restrict2 final A_WARN_UNUSED;
+        int getHeight() const restrict2 override final A_WARN_UNUSED;
 
-        const Image* getImage() const restrict2 noexcept final
+        const Image* getImage() const restrict2 noexcept override final
                               A_WARN_UNUSED;
 
         bool setSpriteDirection(const SpriteDirection::Type direction)
-                                restrict2 final;
+                                restrict2 override final;
 
         int getNumberOfLayers() const restrict2 noexcept A_WARN_UNUSED
         { return 1; }
 
         std::string getIdPath() const restrict2 A_WARN_UNUSED;
 
-        unsigned int getCurrentFrame() const restrict2 noexcept final
+        unsigned int getCurrentFrame() const restrict2 noexcept override final
                                      A_WARN_UNUSED
         { return mFrameIndex; }
 
         unsigned int getFrameCount() const
-                                   restrict2 final A_WARN_UNUSED;
+                                   restrict2 override final A_WARN_UNUSED;
 
-        void setAlpha(float alpha) restrict2 final;
+        void setAlpha(float alpha) restrict2 override final;
 
-        const void *getHash() const restrict2 final A_WARN_UNUSED;
+        const void *getHash() const restrict2 override final A_WARN_UNUSED;
 
-        bool updateNumber(const unsigned num) restrict2 final;
+        bool updateNumber(const unsigned num) restrict2 override final;
 
         void clearDelayLoad() restrict2 noexcept
         { mDelayLoad = nullptr; }
diff --git a/src/resources/sprite/imagesprite.h b/src/resources/sprite/imagesprite.h
index 21ff03d90..c3fa39fae 100644
--- a/src/resources/sprite/imagesprite.h
+++ b/src/resources/sprite/imagesprite.h
@@ -37,42 +37,42 @@ class ImageSprite final : public Sprite
 
         ~ImageSprite();
 
-        bool reset() final
+        bool reset() override final
         { return false; }
 
-        bool play(const std::string &action A_UNUSED) final
+        bool play(const std::string &action A_UNUSED) override final
         { return false; }
 
-        bool update(const int time A_UNUSED) final
+        bool update(const int time A_UNUSED) override final
         { return false; }
 
         void draw(Graphics *const graphics,
                   const int posX, const int posY)
-                  const final A_NONNULL(2);
+                  const override final A_NONNULL(2);
 
-        int getWidth() const final A_WARN_UNUSED
+        int getWidth() const override final A_WARN_UNUSED
         { return mImage ? mImage->getWidth() : 0; }
 
-        int getHeight() const final A_WARN_UNUSED
+        int getHeight() const override final A_WARN_UNUSED
         { return mImage ? mImage->getHeight() : 0; }
 
-        const Image* getImage() const final A_WARN_UNUSED
+        const Image* getImage() const override final A_WARN_UNUSED
         { return mImage; }
 
         bool setSpriteDirection(const SpriteDirection::Type
-                                direction A_UNUSED) final
+                                direction A_UNUSED) override final
         { return false; }
 
         int getNumberOfLayers() const A_WARN_UNUSED
         { return 1; }
 
-        unsigned int getCurrentFrame() const final A_WARN_UNUSED
+        unsigned int getCurrentFrame() const override final A_WARN_UNUSED
         { return 0; }
 
-        unsigned int getFrameCount() const final A_WARN_UNUSED
+        unsigned int getFrameCount() const override final A_WARN_UNUSED
         { return 1; }
 
-        bool updateNumber(const unsigned num A_UNUSED) final
+        bool updateNumber(const unsigned num A_UNUSED) override final
         { return false; }
 
     private:
diff --git a/src/resources/subimage.h b/src/resources/subimage.h
index 14d50e044..e7184574d 100644
--- a/src/resources/subimage.h
+++ b/src/resources/subimage.h
@@ -76,10 +76,10 @@ class SubImage final : public Image
          */
         Image *getSubImage(const int x, const int y,
                            const int width,
-                           const int height) final A_WARN_UNUSED;
+                           const int height) override final A_WARN_UNUSED;
 
 #ifdef USE_OPENGL
-        void decRef() final;
+        void decRef() override final;
 #endif
 
         SDL_Rect mInternalBounds;
diff --git a/src/resources/surfaceimagehelper.h b/src/resources/surfaceimagehelper.h
index 3dc8dde89..c028748e7 100644
--- a/src/resources/surfaceimagehelper.h
+++ b/src/resources/surfaceimagehelper.h
@@ -57,12 +57,12 @@ class SurfaceImageHelper final : public ImageHelper
          * Loads an image from an SDL surface.
          */
         Image *load(SDL_Surface *const tmpImage)
-                    final A_WARN_UNUSED;
+                    override final A_WARN_UNUSED;
 
         Image *createTextSurface(SDL_Surface *const tmpImage,
                                  const int width, const int height,
                                  const float alpha)
-                                 final A_WARN_UNUSED;
+                                 override final A_WARN_UNUSED;
 
         static void SDLSetEnableAlphaCache(const bool n)
         { mEnableAlphaCache = n; }
@@ -74,7 +74,7 @@ class SurfaceImageHelper final : public ImageHelper
          * Tells if the image was loaded using OpenGL or SDL
          * @return true if OpenGL, false if SDL.
          */
-        RenderType useOpenGL() const final A_WARN_UNUSED;
+        RenderType useOpenGL() const override final A_WARN_UNUSED;
 
         static SDL_Surface* SDLDuplicateSurface(SDL_Surface *const tmpImage)
                                                 A_WARN_UNUSED;