From e9329745e89913c387f020e7db4b523bbf223cbd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= <mosra@centrum.cz>
Date: Wed, 31 Oct 2012 14:12:23 +0100
Subject: [PATCH] Using `override` keyword in all places I can think of at this
 time.

---
 src/Contexts/AbstractXWindowContext.h |  4 +++-
 src/Contexts/EglContextHandler.h      | 10 ++++++----
 src/Contexts/GlutWindowContext.h      |  4 +++-
 src/Contexts/GlxContextHandler.h      | 12 +++++++-----
 src/Contexts/Sdl2WindowContext.h      |  4 +++-
 src/Physics/AxisAlignedBox.h          |  6 ++++--
 src/Physics/Box.h                     |  6 ++++--
 src/Physics/Capsule.h                 |  8 +++++---
 src/Physics/Line.h                    |  6 ++++--
 src/Physics/LineSegment.h             |  2 +-
 src/Physics/Plane.h                   | 12 +++++++-----
 src/Physics/Point.h                   |  6 ++++--
 src/Physics/ShapeGroup.h              |  8 +++++---
 src/Physics/Sphere.h                  |  8 +++++---
 14 files changed, 61 insertions(+), 35 deletions(-)

diff --git a/src/Contexts/AbstractXWindowContext.h b/src/Contexts/AbstractXWindowContext.h
index 75e8eccd2..dc84d51f5 100644
--- a/src/Contexts/AbstractXWindowContext.h
+++ b/src/Contexts/AbstractXWindowContext.h
@@ -33,6 +33,8 @@
 #include "AbstractWindowContext.h"
 #include "AbstractContextHandler.h"
 
+#include "magnumCompatibility.h"
+
 namespace Magnum {
 
 class Context;
@@ -67,7 +69,7 @@ class AbstractXWindowContext: public AbstractWindowContext {
          */
         virtual ~AbstractXWindowContext() = 0;
 
-        int exec();
+        int exec() override;
 
         /** @brief Exit application main loop */
         inline void exit() { flags |= Flag::Exit; }
diff --git a/src/Contexts/EglContextHandler.h b/src/Contexts/EglContextHandler.h
index 824aa0177..7c9eab9c6 100644
--- a/src/Contexts/EglContextHandler.h
+++ b/src/Contexts/EglContextHandler.h
@@ -28,6 +28,8 @@
 
 #include "AbstractContextHandler.h"
 
+#include "magnumCompatibility.h"
+
 namespace Magnum { namespace Contexts {
 
 #ifndef DOXYGEN_GENERATING_OUTPUT
@@ -48,14 +50,14 @@ class EglContextHandler: public AbstractContextHandler<EGLNativeDisplayType, Vis
     public:
         ~EglContextHandler();
 
-        VisualId getVisualId(EGLNativeDisplayType nativeDisplay);
-        void createContext(EGLNativeWindowType nativeWindow);
+        VisualId getVisualId(EGLNativeDisplayType nativeDisplay) override;
+        void createContext(EGLNativeWindowType nativeWindow) override;
 
-        inline void makeCurrent() {
+        inline void makeCurrent() override {
             eglMakeCurrent(display, surface, surface, context);
         }
 
-        inline void swapBuffers() {
+        inline void swapBuffers() override {
             eglSwapBuffers(display, surface);
         }
 
diff --git a/src/Contexts/GlutWindowContext.h b/src/Contexts/GlutWindowContext.h
index 0f33c71fd..8cd016cb7 100644
--- a/src/Contexts/GlutWindowContext.h
+++ b/src/Contexts/GlutWindowContext.h
@@ -28,6 +28,8 @@
 
 #include "AbstractWindowContext.h"
 
+#include "magnumCompatibility.h"
+
 namespace Magnum {
 
 class Context;
@@ -58,7 +60,7 @@ class GlutWindowContext: public AbstractWindowContext {
 
         ~GlutWindowContext();
 
-        inline int exec() {
+        inline int exec() override {
             glutMainLoop();
             return 0;
         }
diff --git a/src/Contexts/GlxContextHandler.h b/src/Contexts/GlxContextHandler.h
index 671a3e11e..32ba4a81f 100644
--- a/src/Contexts/GlxContextHandler.h
+++ b/src/Contexts/GlxContextHandler.h
@@ -27,6 +27,8 @@
 
 #include "AbstractContextHandler.h"
 
+#include "magnumCompatibility.h"
+
 namespace Magnum { namespace Contexts {
 
 /**
@@ -41,19 +43,19 @@ class GlxContextHandler: public AbstractContextHandler<Display*, VisualID, Windo
     public:
         ~GlxContextHandler();
 
-        VisualID getVisualId(Display* nativeDisplay);
-        void createContext(Window nativeWindow);
+        VisualID getVisualId(Display* nativeDisplay) override;
+        void createContext(Window nativeWindow) override;
 
         /* This must be enabled, otherwise (on my NVidia) it crashes when creating VAO. WTF. */
-        inline ExtensionWrangler::ExperimentalFeatures experimentalExtensionWranglerFeatures() const {
+        inline ExtensionWrangler::ExperimentalFeatures experimentalExtensionWranglerFeatures() const override {
             return ExtensionWrangler::ExperimentalFeatures::Enable;
         }
 
-        inline void makeCurrent() {
+        inline void makeCurrent() override {
             glXMakeCurrent(display, window, context);
         }
 
-        inline void swapBuffers() {
+        inline void swapBuffers() override {
             glXSwapBuffers(display, window);
         }
 
diff --git a/src/Contexts/Sdl2WindowContext.h b/src/Contexts/Sdl2WindowContext.h
index 49a392564..1a215a2b7 100644
--- a/src/Contexts/Sdl2WindowContext.h
+++ b/src/Contexts/Sdl2WindowContext.h
@@ -28,6 +28,8 @@
 
 #include "AbstractWindowContext.h"
 
+#include "magnumCompatibility.h"
+
 namespace Magnum {
 
 class Context;
@@ -63,7 +65,7 @@ class Sdl2WindowContext: public AbstractWindowContext {
          */
         ~Sdl2WindowContext();
 
-        int exec();
+        int exec() override;
 
         /** @{ @name Drawing functions */
 
diff --git a/src/Physics/AxisAlignedBox.h b/src/Physics/AxisAlignedBox.h
index bff023255..711491575 100644
--- a/src/Physics/AxisAlignedBox.h
+++ b/src/Physics/AxisAlignedBox.h
@@ -22,6 +22,8 @@
 #include "Math/Vector3.h"
 #include "AbstractShape.h"
 
+#include "magnumCompatibility.h"
+
 namespace Magnum { namespace Physics {
 
 /**
@@ -34,11 +36,11 @@ template<std::uint8_t dimensions> class PHYSICS_EXPORT AxisAlignedBox: public Ab
         /** @brief Constructor */
         inline AxisAlignedBox(const typename DimensionTraits<dimensions, GLfloat>::VectorType& position, const typename DimensionTraits<dimensions, GLfloat>::VectorType& size): _position(position), _transformedPosition(position), _size(size), _transformedSize(size) {}
 
-        inline typename AbstractShape<dimensions>::Type type() const {
+        inline typename AbstractShape<dimensions>::Type type() const override {
             return AbstractShape<dimensions>::Type::AxisAlignedBox;
         }
 
-        void applyTransformation(const typename DimensionTraits<dimensions, GLfloat>::MatrixType& transformation);
+        void applyTransformation(const typename DimensionTraits<dimensions, GLfloat>::MatrixType& transformation) override;
 
         /** @brief Position */
         inline typename DimensionTraits<dimensions, GLfloat>::VectorType position() const {
diff --git a/src/Physics/Box.h b/src/Physics/Box.h
index d70aac3ab..d92ab64ab 100644
--- a/src/Physics/Box.h
+++ b/src/Physics/Box.h
@@ -23,6 +23,8 @@
 #include "Math/Matrix4.h"
 #include "AbstractShape.h"
 
+#include "magnumCompatibility.h"
+
 namespace Magnum { namespace Physics {
 
 /**
@@ -35,11 +37,11 @@ template<std::uint8_t dimensions> class PHYSICS_EXPORT Box: public AbstractShape
         /** @brief Constructor */
         inline Box(const typename DimensionTraits<dimensions, GLfloat>::MatrixType& transformation): _transformation(transformation), _transformedTransformation(transformation) {}
 
-        inline typename AbstractShape<dimensions>::Type type() const {
+        inline typename AbstractShape<dimensions>::Type type() const override {
             return AbstractShape<dimensions>::Type::Box;
         }
 
-        void applyTransformation(const typename DimensionTraits<dimensions, GLfloat>::MatrixType& transformation);
+        void applyTransformation(const typename DimensionTraits<dimensions, GLfloat>::MatrixType& transformation) override;
 
         /** @brief Transformation */
         inline typename DimensionTraits<dimensions, GLfloat>::MatrixType transformation() const {
diff --git a/src/Physics/Capsule.h b/src/Physics/Capsule.h
index 7e20a9814..c493f1db9 100644
--- a/src/Physics/Capsule.h
+++ b/src/Physics/Capsule.h
@@ -22,6 +22,8 @@
 #include "Math/Vector3.h"
 #include "AbstractShape.h"
 
+#include "magnumCompatibility.h"
+
 namespace Magnum { namespace Physics {
 
 template<std::uint8_t> class Point;
@@ -39,13 +41,13 @@ template<std::uint8_t dimensions> class PHYSICS_EXPORT Capsule: public AbstractS
         /** @brief Constructor */
         inline Capsule(const typename DimensionTraits<dimensions, GLfloat>::VectorType& a, const typename DimensionTraits<dimensions, GLfloat>::VectorType& b, float radius): _a(a), _transformedA(a), _b(b), _transformedB(b), _radius(radius), _transformedRadius(radius) {}
 
-        inline typename AbstractShape<dimensions>::Type type() const {
+        inline typename AbstractShape<dimensions>::Type type() const override {
             return AbstractShape<dimensions>::Type::Capsule;
         }
 
-        void applyTransformation(const typename DimensionTraits<dimensions, GLfloat>::MatrixType& transformation);
+        void applyTransformation(const typename DimensionTraits<dimensions, GLfloat>::MatrixType& transformation) override;
 
-        bool collides(const AbstractShape<dimensions>* other) const;
+        bool collides(const AbstractShape<dimensions>* other) const override;
 
         /** @brief Start point */
         inline typename DimensionTraits<dimensions, GLfloat>::VectorType a() const {
diff --git a/src/Physics/Line.h b/src/Physics/Line.h
index 9f16e3d2b..39cb70363 100644
--- a/src/Physics/Line.h
+++ b/src/Physics/Line.h
@@ -22,6 +22,8 @@
 #include "Math/Vector3.h"
 #include "AbstractShape.h"
 
+#include "magnumCompatibility.h"
+
 namespace Magnum { namespace Physics {
 
 /**
@@ -35,11 +37,11 @@ template<std::uint8_t dimensions> class PHYSICS_EXPORT Line: public AbstractShap
         /** @brief Constructor */
         inline Line(const typename DimensionTraits<dimensions, GLfloat>::VectorType& a, const typename DimensionTraits<dimensions, GLfloat>::VectorType& b): _a(a), _transformedA(a), _b(b), _transformedB(b) {}
 
-        inline typename AbstractShape<dimensions>::Type type() const {
+        inline typename AbstractShape<dimensions>::Type type() const override {
             return AbstractShape<dimensions>::Type::Line;
         }
 
-        void applyTransformation(const typename DimensionTraits<dimensions, GLfloat>::MatrixType& transformation);
+        void applyTransformation(const typename DimensionTraits<dimensions, GLfloat>::MatrixType& transformation) override;
 
         /** @brief First point */
         inline typename DimensionTraits<dimensions, GLfloat>::VectorType a() const {
diff --git a/src/Physics/LineSegment.h b/src/Physics/LineSegment.h
index 82fe11861..8c0d00242 100644
--- a/src/Physics/LineSegment.h
+++ b/src/Physics/LineSegment.h
@@ -33,7 +33,7 @@ template<std::uint8_t dimensions> class LineSegment: public Line<dimensions> {
         /** @brief Constructor */
         inline LineSegment(const typename DimensionTraits<dimensions, GLfloat>::VectorType& a, const typename DimensionTraits<dimensions, GLfloat>::VectorType& b): Line<dimensions>(a, b) {}
 
-        inline typename AbstractShape<dimensions>::Type type() const {
+        inline typename AbstractShape<dimensions>::Type type() const override {
             return AbstractShape<dimensions>::Type::LineSegment;
         }
 };
diff --git a/src/Physics/Plane.h b/src/Physics/Plane.h
index 3895b6f6d..c17114b16 100644
--- a/src/Physics/Plane.h
+++ b/src/Physics/Plane.h
@@ -22,6 +22,8 @@
 #include "Math/Vector3.h"
 #include "AbstractShape.h"
 
+#include "magnumCompatibility.h"
+
 namespace Magnum { namespace Physics {
 
 template<std::uint8_t> class Line;
@@ -35,14 +37,14 @@ class PHYSICS_EXPORT Plane: public AbstractShape<3> {
         /** @brief Constructor */
         inline Plane(const Vector3& position, const Vector3& normal): _position(position), _transformedPosition(position), _normal(normal), _transformedNormal(normal) {}
 
-        inline Type type() const { return Type::Plane; }
+        inline Type type() const override { return Type::Plane; }
 
         #ifndef DOXYGEN_GENERATING_OUTPUT
-        void applyTransformation(const Matrix4& transformation);
-        bool collides(const AbstractShape<3>* other) const;
+        void applyTransformation(const Matrix4& transformation) override;
+        bool collides(const AbstractShape<3>* other) const override;
         #else
-        void applyTransformation(const typename DimensionTraits<dimensions, GLfloat>::MatrixType& transformation);
-        bool collides(const AbstractShape* other) const;
+        void applyTransformation(const typename DimensionTraits<dimensions, GLfloat>::MatrixType& transformation) override;
+        bool collides(const AbstractShape* other) const override;
         #endif
 
         /** @brief Position */
diff --git a/src/Physics/Point.h b/src/Physics/Point.h
index 9f867762c..142b315e0 100644
--- a/src/Physics/Point.h
+++ b/src/Physics/Point.h
@@ -22,6 +22,8 @@
 #include "Math/Vector3.h"
 #include "AbstractShape.h"
 
+#include "magnumCompatibility.h"
+
 namespace Magnum { namespace Physics {
 
 /**
@@ -34,11 +36,11 @@ template<std::uint8_t dimensions> class PHYSICS_EXPORT Point: public AbstractSha
         /** @brief Constructor */
         inline Point(const typename DimensionTraits<dimensions, GLfloat>::VectorType& position): _position(position), _transformedPosition(position) {}
 
-        inline typename AbstractShape<dimensions>::Type type() const {
+        inline typename AbstractShape<dimensions>::Type type() const override {
             return AbstractShape<dimensions>::Type::Point;
         }
 
-        void applyTransformation(const typename DimensionTraits<dimensions, GLfloat>::MatrixType& transformation);
+        void applyTransformation(const typename DimensionTraits<dimensions, GLfloat>::MatrixType& transformation) override;
 
         /** @brief Position */
         inline typename DimensionTraits<dimensions, GLfloat>::VectorType position() const {
diff --git a/src/Physics/ShapeGroup.h b/src/Physics/ShapeGroup.h
index de8ab7fd8..8a3533e84 100644
--- a/src/Physics/ShapeGroup.h
+++ b/src/Physics/ShapeGroup.h
@@ -24,6 +24,8 @@
 #include <type_traits>
 #include <utility>
 
+#include "magnumCompatibility.h"
+
 namespace Magnum { namespace Physics {
 
 #ifndef DOXYGEN_GENERATING_OUTPUT
@@ -99,13 +101,13 @@ template<std::uint8_t dimensions> class PHYSICS_EXPORT ShapeGroup: public Abstra
         /** @brief Move assignment */
         ShapeGroup& operator=(ShapeGroup&& other);
 
-        inline typename AbstractShape<dimensions>::Type type() const {
+        inline typename AbstractShape<dimensions>::Type type() const override {
             return AbstractShape<dimensions>::Type::ShapeGroup;
         }
 
-        void applyTransformation(const typename DimensionTraits<dimensions, GLfloat>::MatrixType& transformation);
+        void applyTransformation(const typename DimensionTraits<dimensions, GLfloat>::MatrixType& transformation) override;
 
-        bool collides(const AbstractShape<dimensions>* other) const;
+        bool collides(const AbstractShape<dimensions>* other) const override;
 
         /**
          * @brief First object in the group
diff --git a/src/Physics/Sphere.h b/src/Physics/Sphere.h
index 245ed9a4c..9a91966ca 100644
--- a/src/Physics/Sphere.h
+++ b/src/Physics/Sphere.h
@@ -22,6 +22,8 @@
 #include "Math/Vector3.h"
 #include "AbstractShape.h"
 
+#include "magnumCompatibility.h"
+
 namespace Magnum { namespace Physics {
 
 template<std::uint8_t> class Line;
@@ -40,13 +42,13 @@ template<std::uint8_t dimensions> class PHYSICS_EXPORT Sphere: public AbstractSh
         /** @brief Constructor */
         inline Sphere(const typename DimensionTraits<dimensions, GLfloat>::VectorType& position, float radius): _position(position), _transformedPosition(position), _radius(radius), _transformedRadius(radius) {}
 
-        inline typename AbstractShape<dimensions>::Type type() const {
+        inline typename AbstractShape<dimensions>::Type type() const override {
             return AbstractShape<dimensions>::Type::Sphere;
         }
 
-        void applyTransformation(const typename DimensionTraits<dimensions, GLfloat>::MatrixType& transformation);
+        void applyTransformation(const typename DimensionTraits<dimensions, GLfloat>::MatrixType& transformation) override;
 
-        bool collides(const AbstractShape<dimensions>* other) const;
+        bool collides(const AbstractShape<dimensions>* other) const override;
 
         /** @brief Position */
         inline typename DimensionTraits<dimensions, GLfloat>::VectorType position() const {