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

This reverts commit 55480eb4477b2cf85af1bcdcc5e8ec4f4ce6682d.

5 files changed, 12 insertions, 11 deletions

diff --git a/src/particle/imageparticle.h b/src/particle/imageparticle.h
index 04395d870..42e01266d 100644
--- a/src/particle/imageparticle.h
+++ b/src/particle/imageparticle.h
@@ -50,9 +50,10 @@ class ImageParticle notfinal : public Particle
          */
         void draw(Graphics *restrict const graphics,
                   const int offsetX,
-                  const int offsetY) const restrict2 final A_NONNULL(2);
+                  const int offsetY) const
+                  restrict2 override final A_NONNULL(2);
 
-        void setAlpha(const float alpha) restrict2 final
+        void setAlpha(const float alpha) restrict2 override final
         { mAlpha = alpha; }
 
         static StringIntMap imageParticleCountByName;
diff --git a/src/particle/particle.h b/src/particle/particle.h
index fe268a088..0cce98180 100644
--- a/src/particle/particle.h
+++ b/src/particle/particle.h
@@ -224,10 +224,10 @@ class Particle notfinal : public Actor
         { mAutoDelete = false; }
 
         /** We consider particles (at least for now) to be one layer-sprites */
-        int getNumberOfLayers() const restrict2 final
+        int getNumberOfLayers() const restrict2 override final
         { return 1; }
 
-        float getAlpha() const restrict2 final
+        float getAlpha() const restrict2 override final
         { return 1.0F; }
 
         void setAlpha(const float alpha A_UNUSED) restrict2 override
diff --git a/src/particle/particlelist.h b/src/particle/particlelist.h
index 7c03a77d1..3da542b37 100644
--- a/src/particle/particlelist.h
+++ b/src/particle/particlelist.h
@@ -54,9 +54,9 @@ class ParticleList final : public ParticleContainer
          */
         void removeLocally(const Particle *const particle);
 
-        void clearLocally() final;
+        void clearLocally() override final;
 
-        void moveTo(const float x, const float y) final;
+        void moveTo(const float x, const float y) override final;
 
     protected:
         std::list<Particle *> mElements;    /**< Contained particle effects */
diff --git a/src/particle/particlevector.h b/src/particle/particlevector.h
index b04980773..8804991be 100644
--- a/src/particle/particlevector.h
+++ b/src/particle/particlevector.h
@@ -55,9 +55,9 @@ class ParticleVector final : public ParticleContainer
          */
         void delLocally(const int index);
 
-        void clearLocally() final;
+        void clearLocally() override final;
 
-        void moveTo(const float x, const float y) final;
+        void moveTo(const float x, const float y) override final;
 
     protected:
         std::vector<Particle *> mIndexedElements;
diff --git a/src/particle/textparticle.h b/src/particle/textparticle.h
index e95b57583..e13b2e13c 100644
--- a/src/particle/textparticle.h
+++ b/src/particle/textparticle.h
@@ -44,14 +44,14 @@ class TextParticle final : public Particle
         void draw(Graphics *restrict const graphics,
                   const int offsetX,
                   const int offsetY) const
-                  restrict2 final A_NONNULL(2);
+                  restrict2 override final A_NONNULL(2);
 
         // hack to improve text visibility
-        int getPixelY() const restrict2 final A_WARN_UNUSED
+        int getPixelY() const restrict2 override final A_WARN_UNUSED
         { return CAST_S32(mPos.y + mPos.z); }
 
         // hack to improve text visibility (for sorting only)
-        int getSortPixelY() const restrict2 final A_WARN_UNUSED
+        int getSortPixelY() const restrict2 override final A_WARN_UNUSED
         { return CAST_S32(mPos.y + mPos.z); }
 
     private: