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

This reverts commit 55480eb4477b2cf85af1bcdcc5e8ec4f4ce6682d.

6 files changed, 44 insertions, 44 deletions

diff --git a/src/being/actorsprite.h b/src/being/actorsprite.h
index b0d7b52c2..0eac9807d 100644
--- a/src/being/actorsprite.h
+++ b/src/being/actorsprite.h
@@ -121,10 +121,10 @@ class ActorSprite notfinal : public CompoundSprite, public Actor
 
         void setStatusEffectOpiton0(const uint32_t option);
 
-        void setAlpha(const float alpha) final
+        void setAlpha(const float alpha) override final
         { CompoundSprite::setAlpha(alpha); }
 
-        float getAlpha() const final A_WARN_UNUSED
+        float getAlpha() const override final A_WARN_UNUSED
         { return CompoundSprite::getAlpha(); }
 
         int getWidth() const override A_WARN_UNUSED
diff --git a/src/being/being.h b/src/being/being.h
index b0c1c26ea..7010a2918 100644
--- a/src/being/being.h
+++ b/src/being/being.h
@@ -106,7 +106,7 @@ class Being notfinal : public ActorSprite,
 
         virtual ~Being();
 
-        ActorTypeT getType() const restrict2 noexcept final
+        ActorTypeT getType() const restrict2 noexcept override final
                            A_WARN_UNUSED
         { return mType; }
 
@@ -364,7 +364,7 @@ class Being notfinal : public ActorSprite,
         const BeingInfo *getInfo() const restrict2 noexcept A_WARN_UNUSED
         { return mInfo; }
 
-        TargetCursorSizeT getTargetCursorSize() const restrict2 final
+        TargetCursorSizeT getTargetCursorSize() const restrict2 override final
                                               A_WARN_UNUSED;
 
         int getTargetOffsetX() const restrict2 override A_WARN_UNUSED
@@ -484,13 +484,13 @@ class Being notfinal : public ActorSprite,
         /**
          * Returns the horizontal size of the current base sprite of the being.
          */
-        int getWidth() const restrict2 final A_WARN_UNUSED
+        int getWidth() const restrict2 override final A_WARN_UNUSED
         { return std::max(CompoundSprite::getWidth(), DEFAULT_BEING_WIDTH); }
 
         /**
          * Returns the vertical size of the current base sprite of the being.
          */
-        int getHeight() const restrict2 final A_WARN_UNUSED
+        int getHeight() const restrict2 override final A_WARN_UNUSED
         { return std::max(CompoundSprite::getHeight(), DEFAULT_BEING_HEIGHT); }
 
         /**
@@ -529,7 +529,7 @@ class Being notfinal : public ActorSprite,
         void drawSpritesSDL(Graphics *restrict const graphics,
                             const int posX,
                             const int posY) const
-                            restrict2 final A_NONNULL(2);
+                            restrict2 override final A_NONNULL(2);
 
         void drawHpBar(Graphics *restrict const graphics,
                        const int maxHP,
@@ -629,7 +629,7 @@ class Being notfinal : public ActorSprite,
         void draw(Graphics *restrict const graphics,
                   const int offsetX,
                   const int offsetY) const
-                  restrict2 final A_NONNULL(2);
+                  restrict2 override final A_NONNULL(2);
 
         void drawPlayer(Graphics *restrict const graphics,
                         const int offsetX,
@@ -916,14 +916,14 @@ class Being notfinal : public ActorSprite,
         { return mLastAttackY; }
 
 #ifdef EATHENA_SUPPORT
-        void setTrickDead(const bool b) restrict2 final;
+        void setTrickDead(const bool b) restrict2 override final;
 
         void setChat(ChatObject *restrict const obj) restrict2;
 
         ChatObject *getChat() const restrict2 noexcept
         { return mChat; }
 
-        void setRiding(const bool b) restrict2 final;
+        void setRiding(const bool b) restrict2 override final;
 
         void setHorse(const int horseId) restrict2;
 
@@ -944,7 +944,7 @@ class Being notfinal : public ActorSprite,
         unsigned int getSpiritBalls() const restrict2 noexcept A_WARN_UNUSED
         { return mSpiritBalls; }
 
-        void stopCast(const bool b) final;
+        void stopCast(const bool b) override final;
 
         void setCreatorId(const BeingId id)
         { mCreatorId = id; }
diff --git a/src/being/compoundsprite.h b/src/being/compoundsprite.h
index d6a5d67fc..71a77e87e 100644
--- a/src/being/compoundsprite.h
+++ b/src/being/compoundsprite.h
@@ -44,11 +44,11 @@ class CompoundSprite notfinal : public Sprite
 
         virtual ~CompoundSprite();
 
-        bool reset() final;
+        bool reset() override final;
 
-        bool play(const std::string &action) final;
+        bool play(const std::string &action) override final;
 
-        bool update(const int time) final;
+        bool update(const int time) override final;
 
         void drawSimple(Graphics *const graphics,
                         const int posX,
@@ -64,16 +64,16 @@ class CompoundSprite notfinal : public Sprite
          */
         int getHeight() const override A_WARN_UNUSED;
 
-        const Image *getImage() const final A_WARN_UNUSED;
+        const Image *getImage() const override final A_WARN_UNUSED;
 
         bool setSpriteDirection(const SpriteDirection::Type direction)
-                                final;
+                                override final;
 
         int getNumberOfLayers() const A_WARN_UNUSED;
 
-        unsigned int getCurrentFrame() const final A_WARN_UNUSED;
+        unsigned int getCurrentFrame() const override final A_WARN_UNUSED;
 
-        unsigned int getFrameCount() const final A_WARN_UNUSED;
+        unsigned int getFrameCount() const override final A_WARN_UNUSED;
 
         void addSprite(Sprite *const sprite);
 
@@ -95,7 +95,7 @@ class CompoundSprite notfinal : public Sprite
 
         void setAlpha(float alpha) override;
 
-        bool updateNumber(const unsigned num) final;
+        bool updateNumber(const unsigned num) override final;
 
         static void setEnableDelay(bool b)
         { mEnableDelay = b; }
diff --git a/src/being/flooritem.h b/src/being/flooritem.h
index b62d00e7b..1b5b87d3e 100644
--- a/src/being/flooritem.h
+++ b/src/being/flooritem.h
@@ -68,12 +68,12 @@ class FloorItem final : public ActorSprite
 
         void postInit(Map *const map, int subX, int subY);
 
-        ActorTypeT getType() const noexcept final A_WARN_UNUSED
+        ActorTypeT getType() const noexcept override final A_WARN_UNUSED
         { return ActorType::FloorItem; }
 
         void draw(Graphics *const graphics,
                   const int offsetX, const int offsetY)
-                  const final A_NONNULL(2);
+                  const override final A_NONNULL(2);
 
         /**
          * Returns the item ID.
@@ -89,10 +89,10 @@ class FloorItem final : public ActorSprite
 
         std::string getName() const A_WARN_UNUSED;
 
-        int getTileX() const final A_WARN_UNUSED
+        int getTileX() const override final A_WARN_UNUSED
         { return mX; }
 
-        int getTileY() const final A_WARN_UNUSED
+        int getTileY() const override final A_WARN_UNUSED
         { return mY; }
 
         void incrementPickup()
diff --git a/src/being/localplayer.h b/src/being/localplayer.h
index efab5ff3c..ccecb18fb 100644
--- a/src/being/localplayer.h
+++ b/src/being/localplayer.h
@@ -66,12 +66,12 @@ class LocalPlayer final : public Being,
          */
         ~LocalPlayer();
 
-        void logic() final;
+        void logic() override final;
 
         void slowLogic();
 
         void setAction(const BeingActionT &action,
-                       const int attackType = 0) final;
+                       const int attackType = 0) override final;
 
         /**
          * Compute the next pathnode location when walking using keyboard.
@@ -86,7 +86,7 @@ class LocalPlayer final : public Being,
          * Also, when specified, it picks up an item at the end of a path
          * or attack target.
          */
-        void nextTile() final
+        void nextTile() override final
         { nextTile(0); }
 
         void nextTile(unsigned char dir);
@@ -98,7 +98,7 @@ class LocalPlayer final : public Being,
          * @param actorSprite the ActorSprite being destroyed.
          */
         void actorSpriteDestroyed(const ActorSprite &actorSprite)
-                                  final;
+                                  override final;
 
         /**
          * Gets the attack range.
@@ -184,7 +184,7 @@ class LocalPlayer final : public Being,
                       const BeingId floorItemId,
                       const PickupT fail);
 
-        int getLevel() const final A_WARN_UNUSED;
+        int getLevel() const override final A_WARN_UNUSED;
 
         /** Tells that the path has been set by mouse. */
         void pathSetByMouse()
@@ -277,7 +277,7 @@ class LocalPlayer final : public Being,
         /**
          * Sets the map the being is on
          */
-        void setMap(Map *const map) final;
+        void setMap(Map *const map) override final;
 
         void addMessageToQueue(const std::string &message,
                                const UserColorIdT color
@@ -286,9 +286,9 @@ class LocalPlayer final : public Being,
         /**
          * Called when a option (set with config.addListener()) is changed
          */
-        void optionChanged(const std::string &value) final;
+        void optionChanged(const std::string &value) override final;
 
-        void playerDeath() final;
+        void playerDeath() override final;
 
         /**
          * set a following player.
@@ -365,7 +365,7 @@ class LocalPlayer final : public Being,
 
         void checkNewName(Being *const being);
 
-        unsigned char getBlockWalkMask() const final
+        unsigned char getBlockWalkMask() const override final
                                        A_CONST A_WARN_UNUSED;
 
         void saveHomes();
@@ -390,19 +390,19 @@ class LocalPlayer final : public Being,
         void setTestParticle(const std::string &fileName,
                              const bool updateHash = true);
 
-        int getLastAttackX() const final
+        int getLastAttackX() const override final
         { return mTarget ? mTarget->mX : mLastAttackX; }
 
-        int getLastAttackY() const final
+        int getLastAttackY() const override final
         { return mTarget ? mTarget->mY : mLastAttackY; }
 
         void attributeChanged(const AttributesT id,
                               const int oldVal,
-                              const int newVal) final;
+                              const int newVal) override final;
 
         void statChanged(const AttributesT id,
                          const int oldVal1,
-                         const int oldVal2) final;
+                         const int oldVal2) override final;
 
         void updateMusic() const;
 
@@ -424,10 +424,10 @@ class LocalPlayer final : public Being,
         bool canMove() const;
 
     protected:
-        void updateCoords() final;
+        void updateCoords() override final;
 
         void handleStatusEffect(const StatusEffect *const effect,
-                                const int32_t effectId) final;
+                                const int32_t effectId) override final;
 
         void startWalking(const unsigned char dir);
 
diff --git a/src/being/playerrelations.cpp b/src/being/playerrelations.cpp
index 69b410d3c..d996b03e3 100644
--- a/src/being/playerrelations.cpp
+++ b/src/being/playerrelations.cpp
@@ -80,7 +80,7 @@ namespace
         public:
             ConfigurationObject *writeConfigItem(
                 const std::pair<std::string, PlayerRelation *> &value,
-                ConfigurationObject *const cobj) const final
+                ConfigurationObject *const cobj) const override final
             {
                 if (!cobj || !value.second)
                     return nullptr;
@@ -94,7 +94,7 @@ namespace
             std::map<std::string, PlayerRelation *> *
             readConfigItem(const ConfigurationObject *const cobj,
                            std::map<std::string, PlayerRelation *>
-                           *const container) const final
+                           *const container) const override final
             {
                 if (!cobj || !container)
                     return container;
@@ -473,7 +473,7 @@ class PIS_nothing final : public PlayerIgnoreStrategy
         }
 
         void ignore(Being *const being A_UNUSED,
-                    const unsigned int flags A_UNUSED) const final
+                    const unsigned int flags A_UNUSED) const override final
         {
         }
 };
@@ -490,7 +490,7 @@ class PIS_dotdotdot final : public PlayerIgnoreStrategy
         }
 
         void ignore(Being *const being,
-                    const unsigned int flags A_UNUSED) const final
+                    const unsigned int flags A_UNUSED) const override final
         {
             if (!being)
                 return;
@@ -513,7 +513,7 @@ class PIS_blinkname final : public PlayerIgnoreStrategy
         }
 
         void ignore(Being *const being,
-                    const unsigned int flags A_UNUSED) const final
+                    const unsigned int flags A_UNUSED) const override final
         {
             if (!being)
                 return;
@@ -536,7 +536,7 @@ class PIS_emote final : public PlayerIgnoreStrategy
         }
 
         void ignore(Being *const being,
-                    const unsigned int flags A_UNUSED) const final
+                    const unsigned int flags A_UNUSED) const override final
         {
             if (!being)
                 return;