Add override and final keyword

Author: atupone

include/ArcObstacle.h

@@ -29,7 +29,7 @@
 #include "BzMaterial.h"
 
 
-class ArcObstacle : public Obstacle
+class ArcObstacle final : public Obstacle
 {
 public:
 
@@ -53,39 +53,39 @@ class ArcObstacle : public Obstacle
                 int physics, bool bounce, bool drive, bool shoot, bool ricochet);
     ~ArcObstacle();
 
-    Obstacle* copyWithTransform(const MeshTransform&) const;
+    Obstacle* copyWithTransform(const MeshTransform&) const override;
 
     MeshObstacle* makeMesh();
 
-    const char* getType() const;
+    const char* getType() const override;
     static const char* getClassName(); // const
-    bool isValid() const;
-    bool isFlatTop() const;
+    bool isValid() const override;
+    bool isFlatTop() const override;
 
-    float intersect(const Ray&) const;
-    void getNormal(const float* p, float* n) const;
-    void get3DNormal(const float* p, float* n) const;
+    float intersect(const Ray&) const override;
+    void getNormal(const float* p, float* n) const override;
+    void get3DNormal(const float* p, float* n) const override;
 
-    bool inCylinder(const float* p, float radius, float height) const;
+    bool inCylinder(const float* p, float radius, float height) const override;
     bool inBox(const float* p, float angle,
-               float halfWidth, float halfBreadth, float height) const;
+               float halfWidth, float halfBreadth, float height) const override;
     bool inMovingBox(const float* oldP, float oldAngle,
                      const float *newP, float newAngle,
-                     float halfWidth, float halfBreadth, float height) const;
+                     float halfWidth, float halfBreadth, float height) const override;
     bool isCrossing(const float* p, float angle,
                     float halfWidth, float halfBreadth, float height,
-                    float* plane) const;
+                    float* plane) const override;
 
     bool getHitNormal(const float* pos1, float azimuth1,
                       const float* pos2, float azimuth2,
                       float halfWidth, float halfBreadth,
-                      float height, float* normal) const;
+                      float height, float* normal) const override;
 
-    int packSize() const;
-    void *pack(void*) const;
-    const void *unpack(const void*);
+    int packSize() const override;
+    void *pack(void*) const override;
+    const void *unpack(const void*) override;
 
-    void print(std::ostream& out, const std::string& indent) const;
+    void print(std::ostream& out, const std::string& indent) const override;
 
 private:
     void finalize();

include/BSPSceneDatabase.h

@@ -17,39 +17,38 @@
 #ifndef BZF_BSP_SCENE_DATABASE_H
 #define BZF_BSP_SCENE_DATABASE_H
 
-// common goes first
-#include "common.h"
+// Inherits from
+#include "SceneDatabase.h"
 
 // system headers
 #include <vector>
 
 // common implementation headers
 #include "bzfgl.h"
-#include "SceneDatabase.h"
 
 
-class BSPSceneDatabase : public SceneDatabase
+class BSPSceneDatabase final : public SceneDatabase
 {
 public:
     BSPSceneDatabase();
     ~BSPSceneDatabase();
 
     // returns true if the node would have been deleted
-    bool        addStaticNode(SceneNode*, bool dontFree);
-    void        addDynamicNode(SceneNode*);
-    void        addDynamicSphere(SphereSceneNode*);
-    void        finalizeStatics();
-    void        removeDynamicNodes();
-    void        removeAllNodes();
-    bool        isOrdered();
-
-    void        updateNodeStyles();
-    void        addLights(SceneRenderer& renderer);
-    void        addShadowNodes(SceneRenderer &renderer);
-    void        addRenderNodes(SceneRenderer& renderer);
-    void        renderRadarNodes(const ViewFrustum&);
-
-    void        drawCuller();
+    bool        addStaticNode(SceneNode*, bool dontFree) override;
+    void        addDynamicNode(SceneNode*) override;
+    void        addDynamicSphere(SphereSceneNode*) override;
+    void        finalizeStatics() override;
+    void        removeDynamicNodes() override;
+    void        removeAllNodes() override;
+    bool        isOrdered() override;
+
+    void        updateNodeStyles() override;
+    void        addLights(SceneRenderer& renderer) override;
+    void        addShadowNodes(SceneRenderer &renderer) override;
+    void        addRenderNodes(SceneRenderer& renderer) override;
+    void        renderRadarNodes(const ViewFrustum&) override;
+
+    void        drawCuller() override;
 
 private:
     class Node

include/BZDBLocal.h

@@ -71,14 +71,14 @@ class BZDBLocal
 
 /******************************************************************************/
 
-class BZDBbool : public BZDBLocal
+class BZDBbool final : public BZDBLocal
 {
 public:
     BZDBbool(const std::string& name, bool defVal,  bool saveOnExit = true);
     ~BZDBbool();
 
-    void addCallbacks();
-    void removeCallbacks();
+    void addCallbacks() override;
+    void removeCallbacks() override;
 
     inline operator bool() const
     {
@@ -99,16 +99,16 @@ class BZDBbool : public BZDBLocal
 
 /******************************************************************************/
 
-class BZDBint : public BZDBLocal
+class BZDBint final : public BZDBLocal
 {
 public:
     BZDBint(const std::string& name, int defVal,
             int min = INT_MIN, int max = INT_MAX,
             bool neverZero = false, bool saveOnExit = true);
     ~BZDBint();
 
-    void addCallbacks();
-    void removeCallbacks();
+    void addCallbacks() override;
+    void removeCallbacks() override;
 
     inline operator int() const
     {
@@ -145,16 +145,16 @@ class BZDBint : public BZDBLocal
 
 /******************************************************************************/
 
-class BZDBfloat : public BZDBLocal
+class BZDBfloat final : public BZDBLocal
 {
 public:
     BZDBfloat(const std::string& name, float defVal,
               float min = -MAXFLOAT, float max = +MAXFLOAT,
               bool neverZero = false, bool saveOnExit = true);
     ~BZDBfloat();
 
-    void addCallbacks();
-    void removeCallbacks();
+    void addCallbacks() override;
+    void removeCallbacks() override;
 
     inline operator float() const
     {
@@ -191,16 +191,16 @@ class BZDBfloat : public BZDBLocal
 
 /******************************************************************************/
 
-class BZDBcolor : public BZDBLocal
+class BZDBcolor final : public BZDBLocal
 {
 public:
     BZDBcolor(const std::string& name,
               float r, float g, float b, float a,
               bool neverAlpha = false, bool saveOnExit = true);
     ~BZDBcolor();
 
-    void addCallbacks();
-    void removeCallbacks();
+    void addCallbacks() override;
+    void removeCallbacks() override;
 
     inline operator const float*() const
     {
@@ -227,15 +227,15 @@ class BZDBcolor : public BZDBLocal
 
 /******************************************************************************/
 
-class BZDBstring : public BZDBLocal
+class BZDBstring final : public BZDBLocal
 {
 public:
     BZDBstring(const std::string& name, const std::string& defVal,
                bool neverEmpty = false, bool saveOnExit = true);
     ~BZDBstring();
 
-    void addCallbacks();
-    void removeCallbacks();
+    void addCallbacks() override;
+    void removeCallbacks() override;
 
     inline operator const std::string&() const
     {

include/BaseBuilding.h

@@ -19,7 +19,7 @@
 
 #include "BoxBuilding.h"
 
-class BaseBuilding : public BoxBuilding
+class BaseBuilding final : public BoxBuilding
 {
 
     friend class ObstacleModifier;
@@ -30,27 +30,27 @@ class BaseBuilding : public BoxBuilding
                  const float *size, int _team, bool ricochet);
     ~BaseBuilding();
 
-    Obstacle*   copyWithTransform(const MeshTransform&) const;
+    Obstacle*   copyWithTransform(const MeshTransform&) const override;
 
-    const char*     getType() const;
+    const char*     getType() const override;
     static const char*  getClassName(); // const
 
-    bool        inCylinder(const float* p, float radius, float height) const;
+    bool        inCylinder(const float* p, float radius, float height) const override;
     bool        inMovingBox(const float* oldP, float oldAngle,
                             const float *newP, float newAngle,
-                            float halfWidth, float halfBreadth, float height) const;
+                            float halfWidth, float halfBreadth, float height) const override;
     bool        isCrossing(const float* p, float angle,
                            float halfWidth, float halfBreadth, float height,
-                           float* plane) const;
+                           float* plane) const override;
 
     int         getTeam() const;
 
-    int packSize() const;
-    void *pack(void*) const;
-    const void *unpack(const void*);
+    int packSize() const override;
+    void *pack(void*) const override;
+    const void *unpack(const void*) override;
 
-    void print(std::ostream& out, const std::string& indent) const;
-    void printOBJ(std::ostream& out, const std::string& indent) const;
+    void print(std::ostream& out, const std::string& indent) const override;
+    void printOBJ(std::ostream& out, const std::string& indent) const override;
 
     std::string     userTextures[2];
 

include/BaseSceneNodeGenerator.h

@@ -16,12 +16,12 @@
 #include "ObstacleSceneNodeGenerator.h"
 #include "BaseBuilding.h"
 
-class BaseSceneNodeGenerator : public ObstacleSceneNodeGenerator
+class BaseSceneNodeGenerator final : public ObstacleSceneNodeGenerator
 {
     friend class SceneDatabaseBuilder;
     ~BaseSceneNodeGenerator();
 public:
-    WallSceneNode*  getNextNode(float, float, bool);
+    WallSceneNode*  getNextNode(float, float, bool) override;
 protected:
     BaseSceneNodeGenerator(const BaseBuilding *);
 private:

include/BillboardSceneNode.h

@@ -23,7 +23,7 @@
 // Common headers
 #include "OpenGLLight.h"
 
-class BillboardSceneNode : public SceneNode
+class BillboardSceneNode final : public SceneNode
 {
 public:
     BillboardSceneNode(const GLfloat pos[3]);
@@ -55,13 +55,13 @@ class BillboardSceneNode : public SceneNode
 
     void        move(const GLfloat pos[3]);
     void        setAngle(GLfloat);
-    void        addLight(SceneRenderer&);
+    void        addLight(SceneRenderer&) override;
 
-    void        notifyStyleChange();
-    void        addRenderNodes(SceneRenderer&);
+    void        notifyStyleChange() override;
+    void        addRenderNodes(SceneRenderer&) override;
 
 protected:
-    class BillboardRenderNode : public RenderNode
+    class BillboardRenderNode final : public RenderNode
     {
     public:
         BillboardRenderNode(const BillboardSceneNode*);

include/BoltSceneNode.h

@@ -23,7 +23,7 @@
 // Common headers
 #include "OpenGLLight.h"
 
-class BoltSceneNode : public SceneNode
+class BoltSceneNode final : public SceneNode
 {
 public:
     BoltSceneNode(const GLfloat pos[3], const GLfloat vel[3], bool super);
@@ -59,7 +59,7 @@ class BoltSceneNode : public SceneNode
 protected:
     bool        isSuper;
 
-    class BoltRenderNode : public RenderNode
+    class BoltRenderNode final : public RenderNode
     {
     public:
         BoltRenderNode(const BoltSceneNode*);