Clang-Tidy - modernize-use-override.

Source/Samples/01_HelloWorld/HelloWorld.h

@@ -38,11 +38,11 @@ public:
     HelloWorld(Context* context);
 
     /// Setup after engine initialization and before running the main loop.
-    virtual void Start() override;
+    void Start() override;
 
 protected:
     /// Return XML patch instructions for screen joystick layout for a specific sample app, if any.
-    virtual String GetScreenJoystickPatchString() const override { return
+    String GetScreenJoystickPatchString() const override { return
         "<patch>"
         "    <add sel=\"/element/element[./attribute[@name='Name' and @value='Hat0']]\">"
         "        <attribute name=\"Is Visible\" value=\"false\" />"

Source/Samples/02_HelloGUI/HelloGUI.h

@@ -49,11 +49,11 @@ public:
     HelloGUI(Context* context);
 
     /// Setup after engine initialization and before running the main loop.
-    virtual void Start() override;
+    void Start() override;
 
 protected:
     /// Return XML patch instructions for screen joystick layout for a specific sample app, if any.
-    virtual String GetScreenJoystickPatchString() const override { return
+    String GetScreenJoystickPatchString() const override { return
         "<patch>"
         "    <add sel=\"/element/element[./attribute[@name='Name' and @value='Hat0']]\">"
         "        <attribute name=\"Is Visible\" value=\"false\" />"

Source/Samples/03_Sprites/Sprites.h

@@ -39,11 +39,11 @@ public:
     Sprites(Context* context);
 
     /// Setup after engine initialization and before running the main loop.
-    virtual void Start() override;
+    void Start() override;
 
 protected:
     /// Return XML patch instructions for screen joystick layout for a specific sample app, if any.
-    virtual String GetScreenJoystickPatchString() const override { return
+    String GetScreenJoystickPatchString() const override { return
         "<patch>"
         "    <add sel=\"/element/element[./attribute[@name='Name' and @value='Hat0']]\">"
         "        <attribute name=\"Is Visible\" value=\"false\" />"

Source/Samples/04_StaticScene/StaticScene.h

@@ -46,7 +46,7 @@ public:
     StaticScene(Context* context);
 
     /// Setup after engine initialization and before running the main loop.
-    virtual void Start() override;
+    void Start() override;
 
 private:
     /// Construct the scene content.

Source/Samples/05_AnimatingScene/AnimatingScene.h

@@ -46,7 +46,7 @@ public:
     AnimatingScene(Context* context);
 
     /// Setup after engine initialization and before running the main loop.
-    virtual void Start() override;
+    void Start() override;
 
 private:
     /// Construct the scene content.

Source/Samples/05_AnimatingScene/Rotator.h

@@ -31,19 +31,19 @@ using namespace Urho3D;
 class Rotator : public LogicComponent
 {
     URHO3D_OBJECT(Rotator, LogicComponent);
-    
+
 public:
     /// Construct.
     Rotator(Context* context);
-    
+
     /// Set rotation speed about the Euler axes. Will be scaled with scene update time step.
     void SetRotationSpeed(const Vector3& speed);
     /// Handle scene update. Called by LogicComponent base class.
-    virtual void Update(float timeStep) override;
-    
+    void Update(float timeStep) override;
+
     /// Return rotation speed.
     const Vector3& GetRotationSpeed() const { return rotationSpeed_; }
-    
+
 private:
     /// Rotation speed.
     Vector3 rotationSpeed_;

Source/Samples/06_SkeletalAnimation/Mover.h

@@ -30,23 +30,23 @@ using namespace Urho3D;
 class Mover : public LogicComponent
 {
     URHO3D_OBJECT(Mover, LogicComponent);
-    
+
 public:
     /// Construct.
     Mover(Context* context);
-    
+
     /// Set motion parameters: forward movement speed, rotation speed, and movement boundaries.
     void SetParameters(float moveSpeed, float rotateSpeed, const BoundingBox& bounds);
     /// Handle scene update. Called by LogicComponent base class.
-    virtual void Update(float timeStep) override;
-    
+    void Update(float timeStep) override;
+
     /// Return forward movement speed.
     float GetMoveSpeed() const { return moveSpeed_; }
     /// Return rotation speed.
     float GetRotationSpeed() const { return rotationSpeed_; }
     /// Return movement boundaries.
     const BoundingBox& GetBounds() const { return bounds_; }
-    
+
 private:
     /// Forward movement speed.
     float moveSpeed_;

Source/Samples/06_SkeletalAnimation/SkeletalAnimation.h

@@ -48,11 +48,11 @@ public:
     SkeletalAnimation(Context* context);
 
     /// Setup after engine initialization and before running the main loop.
-    virtual void Start() override;
+    void Start() override;
 
 protected:
     /// Return XML patch instructions for screen joystick layout for a specific sample app, if any.
-    virtual String GetScreenJoystickPatchString() const override { return
+    String GetScreenJoystickPatchString() const override { return
         "<patch>"
         "    <remove sel=\"/element/element[./attribute[@name='Name' and @value='Button1']]/attribute[@name='Is Visible']\" />"
         "    <replace sel=\"/element/element[./attribute[@name='Name' and @value='Button1']]/element[./attribute[@name='Name' and @value='Label']]/attribute[@name='Text']/@value\">Debug</replace>"
@@ -80,7 +80,7 @@ private:
     void HandleUpdate(StringHash eventType, VariantMap& eventData);
     /// Handle the post-render update event.
     void HandlePostRenderUpdate(StringHash eventType, VariantMap& eventData);
-    
+
     /// Flag for drawing debug geometry.
     bool drawDebug_;
 };

Source/Samples/07_Billboards/Billboards.h

@@ -46,11 +46,11 @@ public:
     Billboards(Context* context);
 
     /// Setup after engine initialization and before running the main loop.
-    virtual void Start() override;
+    void Start() override;
 
 protected:
     /// Return XML patch instructions for screen joystick layout for a specific sample app, if any.
-    virtual String GetScreenJoystickPatchString() const override { return
+    String GetScreenJoystickPatchString() const override { return
         "<patch>"
         "    <remove sel=\"/element/element[./attribute[@name='Name' and @value='Button1']]/attribute[@name='Is Visible']\" />"
         "    <replace sel=\"/element/element[./attribute[@name='Name' and @value='Button1']]/element[./attribute[@name='Name' and @value='Label']]/attribute[@name='Text']/@value\">Debug</replace>"
@@ -80,7 +80,7 @@ private:
     void HandleUpdate(StringHash eventType, VariantMap& eventData);
     /// Handle the post-render update event.
     void HandlePostRenderUpdate(StringHash eventType, VariantMap& eventData);
-    
+
     /// Flag for drawing debug geometry.
     bool drawDebug_;
 };

Source/Samples/08_Decals/Decals.h

@@ -48,11 +48,11 @@ public:
     Decals(Context* context);
 
     /// Setup after engine initialization and before running the main loop.
-    virtual void Start() override;
+    void Start() override;
 
 protected:
     /// Return XML patch instructions for screen joystick layout for a specific sample app, if any.
-    virtual String GetScreenJoystickPatchString() const override { return
+    String GetScreenJoystickPatchString() const override { return
         "<patch>"
         "    <remove sel=\"/element/element[./attribute[@name='Name' and @value='Button0']]/attribute[@name='Is Visible']\" />"
         "    <replace sel=\"/element/element[./attribute[@name='Name' and @value='Button0']]/element[./attribute[@name='Name' and @value='Label']]/attribute[@name='Text']/@value\">Paint</replace>"
@@ -92,7 +92,7 @@ private:
     void HandleUpdate(StringHash eventType, VariantMap& eventData);
     /// Handle the post-render update event.
     void HandlePostRenderUpdate(StringHash eventType, VariantMap& eventData);
-    
+
     /// Flag for drawing debug geometry.
     bool drawDebug_;
 };

Source/Samples/09_MultipleViewports/MultipleViewports.h

@@ -45,11 +45,11 @@ public:
     MultipleViewports(Context* context);
 
     /// Setup after engine initialization and before running the main loop.
-    virtual void Start() override;
+    void Start() override;
 
 protected:
     /// Return XML patch instructions for screen joystick layout for a specific sample app, if any.
-    virtual String GetScreenJoystickPatchString() const override { return
+    String GetScreenJoystickPatchString() const override { return
         "<patch>"
         "    <add sel=\"/element\">"
         "        <element type=\"Button\">"

Source/Samples/10_RenderToTexture/RenderToTexture.h

@@ -45,7 +45,7 @@ public:
     RenderToTexture(Context* context);
 
     /// Setup after engine initialization and before running the main loop.
-    virtual void Start() override;
+    void Start() override;
 
 private:
     /// Construct the scene content.

Source/Samples/10_RenderToTexture/Rotator.h

@@ -31,19 +31,19 @@ using namespace Urho3D;
 class Rotator : public LogicComponent
 {
     URHO3D_OBJECT(Rotator, LogicComponent);
-    
+
 public:
     /// Construct.
     Rotator(Context* context);
-    
+
     /// Set rotation speed about the Euler axes. Will be scaled with scene update time step.
     void SetRotationSpeed(const Vector3& speed);
     /// Handle scene update. Called by LogicComponent base class.
-    virtual void Update(float timeStep) override;
-    
+    void Update(float timeStep) override;
+
     /// Return rotation speed.
     const Vector3& GetRotationSpeed() const { return rotationSpeed_; }
-    
+
 private:
     /// Rotation speed.
     Vector3 rotationSpeed_;

Source/Samples/11_Physics/Physics.h

@@ -47,11 +47,11 @@ public:
     Physics(Context* context);
 
     /// Setup after engine initialization and before running the main loop.
-    virtual void Start() override;
+    void Start() override;
 
 protected:
     /// Return XML patch instructions for screen joystick layout for a specific sample app, if any.
-    virtual String GetScreenJoystickPatchString() const override { return
+    String GetScreenJoystickPatchString() const override { return
         "<patch>"
         "    <remove sel=\"/element/element[./attribute[@name='Name' and @value='Button0']]/attribute[@name='Is Visible']\" />"
         "    <replace sel=\"/element/element[./attribute[@name='Name' and @value='Button0']]/element[./attribute[@name='Name' and @value='Label']]/attribute[@name='Text']/@value\">Spawn</replace>"

Source/Samples/12_PhysicsStressTest/PhysicsStressTest.h

@@ -46,11 +46,11 @@ public:
     PhysicsStressTest(Context* context);
 
     /// Setup after engine initialization and before running the main loop.
-    virtual void Start() override;
+    void Start() override;
 
 protected:
     /// Return XML patch instructions for screen joystick layout for a specific sample app, if any.
-    virtual String GetScreenJoystickPatchString() const override { return
+    String GetScreenJoystickPatchString() const override { return
         "<patch>"
         "    <remove sel=\"/element/element[./attribute[@name='Name' and @value='Button0']]/attribute[@name='Is Visible']\" />"
         "    <replace sel=\"/element/element[./attribute[@name='Name' and @value='Button0']]/element[./attribute[@name='Name' and @value='Label']]/attribute[@name='Text']/@value\">Spawn</replace>"

Source/Samples/13_Ragdolls/CreateRagdoll.h

@@ -31,15 +31,15 @@ using namespace Urho3D;
 class CreateRagdoll : public Component
 {
     URHO3D_OBJECT(CreateRagdoll, Component);
-    
+
 public:
     /// Construct.
     CreateRagdoll(Context* context);
-    
+
 protected:
     /// Handle node being assigned.
-    virtual void OnNodeSet(Node* node) override;
-    
+    void OnNodeSet(Node* node) override;
+
 private:
     /// Handle scene node's physics collision.
     void HandleNodeCollision(StringHash eventType, VariantMap& eventData);

Source/Samples/13_Ragdolls/Ragdolls.h

@@ -46,11 +46,11 @@ public:
     Ragdolls(Context* context);
 
     /// Setup after engine initialization and before running the main loop.
-    virtual void Start() override;
+    void Start() override;
 
 protected:
     /// Return XML patch instructions for screen joystick layout for a specific sample app, if any.
-    virtual String GetScreenJoystickPatchString() const override { return
+    String GetScreenJoystickPatchString() const override { return
         "<patch>"
         "    <remove sel=\"/element/element[./attribute[@name='Name' and @value='Button0']]/attribute[@name='Is Visible']\" />"
         "    <replace sel=\"/element/element[./attribute[@name='Name' and @value='Button0']]/element[./attribute[@name='Name' and @value='Label']]/attribute[@name='Text']/@value\">Spawn</replace>"

Source/Samples/14_SoundEffects/SoundEffects.h

@@ -46,16 +46,16 @@ public:
     SoundEffects(Context* context);
 
     /// Setup before engine initialization. Modifies the engine parameters.
-    virtual void Setup() override;
+    void Setup() override;
     /// Setup after engine initialization and before running the main loop.
-    virtual void Start() override;
+    void Start() override;
 
 protected:
 
     SoundSource* musicSource_;
 
     /// Return XML patch instructions for screen joystick layout for a specific sample app, if any.
-    virtual String GetScreenJoystickPatchString() const override { return
+    String GetScreenJoystickPatchString() const override { return
         "<patch>"
         "    <add sel=\"/element/element[./attribute[@name='Name' and @value='Button2']]\">"
         "        <attribute name=\"Is Visible\" value=\"false\" />"

Source/Samples/15_Navigation/Navigation.h

@@ -50,11 +50,11 @@ public:
     Navigation(Context* context);
 
     /// Setup after engine initialization and before running the main loop.
-    virtual void Start() override;
+    void Start() override;
 
 protected:
     /// Return XML patch instructions for screen joystick layout for a specific sample app, if any.
-    virtual String GetScreenJoystickPatchString() const override { return
+    String GetScreenJoystickPatchString() const override { return
         "<patch>"
         "    <add sel=\"/element\">"
         "        <element type=\"Button\">"

Source/Samples/16_Chat/Chat.h

@@ -47,11 +47,11 @@ public:
     Chat(Context* context);
 
     /// Setup after engine initialization and before running the main loop.
-    virtual void Start() override;
+    void Start() override;
 
 protected:
     /// Return XML patch instructions for screen joystick layout for a specific sample app, if any.
-    virtual String GetScreenJoystickPatchString() const override { return
+    String GetScreenJoystickPatchString() const override { return
         "<patch>"
         "    <add sel=\"/element/element[./attribute[@name='Name' and @value='Button2']]\">"
         "        <attribute name=\"Is Visible\" value=\"false\" />"

Source/Samples/17_SceneReplication/SceneReplication.h

@@ -50,11 +50,11 @@ public:
     SceneReplication(Context* context);
 
     /// Setup after engine initialization and before running the main loop.
-    virtual void Start() override;
+    void Start() override;
 
 protected:
     /// Return XML patch instructions for screen joystick layout for a specific sample app, if any.
-    virtual String GetScreenJoystickPatchString() const override { return
+    String GetScreenJoystickPatchString() const override { return
         "<patch>"
         "    <add sel=\"/element/element[./attribute[@name='Name' and @value='Hat0']]\">"
         "        <attribute name=\"Is Visible\" value=\"false\" />"

Source/Samples/18_CharacterDemo/Character.h

@@ -48,22 +48,22 @@ class Character : public LogicComponent
 public:
     /// Construct.
     Character(Context* context);
-    
+
     /// Register object factory and attributes.
     static void RegisterObject(Context* context);
-    
+
     /// Handle startup. Called by LogicComponent base class.
-    virtual void Start() override;
+    void Start() override;
     /// Handle physics world update. Called by LogicComponent base class.
-    virtual void FixedUpdate(float timeStep) override;
-    
+    void FixedUpdate(float timeStep) override;
+
     /// Movement controls. Assigned by the main program each frame.
     Controls controls_;
-    
+
 private:
     /// Handle physics collision event.
     void HandleNodeCollision(StringHash eventType, VariantMap& eventData);
-    
+
     /// Grounded flag for movement.
     bool onGround_;
     /// Jump flag.

Source/Samples/18_CharacterDemo/CharacterDemo.h

@@ -51,14 +51,14 @@ public:
     /// Construct.
     CharacterDemo(Context* context);
     /// Destruct.
-    virtual ~CharacterDemo() override;
+    ~CharacterDemo() override;
 
     /// Setup after engine initialization and before running the main loop.
-    virtual void Start() override;
+    void Start() override;
 
 protected:
     /// Return XML patch instructions for screen joystick layout for a specific sample app, if any.
-    virtual String GetScreenJoystickPatchString() const override { return
+    String GetScreenJoystickPatchString() const override { return
         "<patch>"
         "    <add sel=\"/element\">"
         "        <element type=\"Button\">"

Source/Samples/18_CharacterDemo/Touch.h

@@ -52,7 +52,7 @@ public:
     /// Construct.
     Touch(Context* context, float touchSensitivity);
     /// Destruct.
-    ~Touch();
+    ~Touch() override;
 
     /// Update touch controls for the current frame.
     void UpdateTouches(Controls& controls);

Source/Samples/19_VehicleDemo/Vehicle.h

@@ -54,51 +54,51 @@ class Vehicle : public LogicComponent
 public:
     /// Construct.
     Vehicle(Context* context);
-    
+
     /// Register object factory and attributes.
     static void RegisterObject(Context* context);
-    
+
     /// Perform post-load after deserialization. Acquire the components from the scene nodes.
-    virtual void ApplyAttributes() override;
+    void ApplyAttributes() override;
     /// Handle physics world update. Called by LogicComponent base class.
-    virtual void FixedUpdate(float timeStep) override;
-    
+    void FixedUpdate(float timeStep) override;
+
     /// Initialize the vehicle. Create rendering and physics components. Called by the application.
     void Init();
-    
+
     /// Movement controls.
     Controls controls_;
-    
+
 private:
     /// Initialize a wheel and remember its scene node and ID.
     void InitWheel(const String& name, const Vector3& offset, WeakPtr<Node>& wheelNode, unsigned& wheelNodeID);
     /// Acquire wheel components from wheel scene nodes.
     void GetWheelComponents();
 
-    
+
     // Wheel scene nodes.
     WeakPtr<Node> frontLeft_;
     WeakPtr<Node> frontRight_;
     WeakPtr<Node> rearLeft_;
     WeakPtr<Node> rearRight_;
-    
+
     // Steering axle constraints.
     WeakPtr<Constraint> frontLeftAxis_;
     WeakPtr<Constraint> frontRightAxis_;
-    
+
     // Hull and wheel rigid bodies.
     WeakPtr<RigidBody> hullBody_;
     WeakPtr<RigidBody> frontLeftBody_;
     WeakPtr<RigidBody> frontRightBody_;
     WeakPtr<RigidBody> rearLeftBody_;
     WeakPtr<RigidBody> rearRightBody_;
-    
+
     // IDs of the wheel scene nodes for serialization.
     unsigned frontLeftID_;
     unsigned frontRightID_;
     unsigned rearLeftID_;
     unsigned rearRightID_;
-    
+
     /// Current left/right steering amount (-1 to 1.)
     float steering_;
 };

Source/Samples/19_VehicleDemo/VehicleDemo.h

@@ -46,10 +46,10 @@ class VehicleDemo : public Sample
 public:
     /// Construct.
     VehicleDemo(Context* context);
-    
+
     /// Setup after engine initialization and before running the main loop.
-    virtual void Start() override;
-    
+    void Start() override;
+
 private:
     /// Create static scene content.
     void CreateScene();
@@ -63,7 +63,7 @@ private:
     void HandleUpdate(StringHash eventType, VariantMap& eventData);
     /// Handle application post-update. Update camera position after vehicle has moved.
     void HandlePostUpdate(StringHash eventType, VariantMap& eventData);
-    
+
     /// The controllable vehicle component.
     WeakPtr<Vehicle> vehicle_;
 };

Source/Samples/20_HugeObjectCount/HugeObjectCount.h

@@ -48,11 +48,11 @@ public:
     HugeObjectCount(Context* context);
 
     /// Setup after engine initialization and before running the main loop.
-    virtual void Start() override;
+    void Start() override;
 
 protected:
     /// Return XML patch instructions for screen joystick layout for a specific sample app, if any.
-    virtual String GetScreenJoystickPatchString() const override { return
+    String GetScreenJoystickPatchString() const override { return
         "<patch>"
         "    <remove sel=\"/element/element[./attribute[@name='Name' and @value='Button0']]/attribute[@name='Is Visible']\" />"
         "    <replace sel=\"/element/element[./attribute[@name='Name' and @value='Button0']]/element[./attribute[@name='Name' and @value='Label']]/attribute[@name='Text']/@value\">Group</replace>"

Source/Samples/21_AngelScriptIntegration/AngelScriptIntegration.h

@@ -45,7 +45,7 @@ public:
     AngelScriptIntegration(Context* context);
 
     /// Setup after engine initialization and before running the main loop.
-    virtual void Start() override;
+    void Start() override;
 
 private:
     /// Construct the scene content.

Source/Samples/22_LuaIntegration/LuaIntegration.h

@@ -45,7 +45,7 @@ public:
     LuaIntegration(Context* context);
 
     /// Setup after engine initialization and before running the main loop.
-    virtual void Start() override;
+    void Start() override;
 
 private:
     /// Construct the scene content.

Source/Samples/23_Water/Water.h

@@ -47,7 +47,7 @@ public:
     Water(Context* context);
 
     /// Setup after engine initialization and before running the main loop.
-    virtual void Start() override;
+    void Start() override;
 
 private:
     /// Construct the scene content.

Source/Samples/24_Urho2DSprite/Urho2DSprite.h

@@ -44,11 +44,11 @@ public:
     Urho2DSprite(Context* context);
 
     /// Setup after engine initialization and before running the main loop.
-    virtual void Start() override;
+    void Start() override;
 
 protected:
     /// Return XML patch instructions for screen joystick layout for a specific sample app, if any.
-    virtual String GetScreenJoystickPatchString() const override { return
+    String GetScreenJoystickPatchString() const override { return
         "<patch>"
         "    <remove sel=\"/element/element[./attribute[@name='Name' and @value='Button0']]/attribute[@name='Is Visible']\" />"
         "    <replace sel=\"/element/element[./attribute[@name='Name' and @value='Button0']]/element[./attribute[@name='Name' and @value='Label']]/attribute[@name='Text']/@value\">Zoom In</replace>"

Source/Samples/25_Urho2DParticle/Urho2DParticle.h

@@ -44,11 +44,11 @@ public:
     Urho2DParticle(Context* context);
 
     /// Setup after engine initialization and before running the main loop.
-    virtual void Start() override;
+    void Start() override;
 
 protected:
     /// Return XML patch instructions for screen joystick layout for a specific sample app, if any.
-    virtual String GetScreenJoystickPatchString() const override { return
+    String GetScreenJoystickPatchString() const override { return
         "<patch>"
         "    <add sel=\"/element/element[./attribute[@name='Name' and @value='Hat0']]\">"
         "        <attribute name=\"Is Visible\" value=\"false\" />"

Source/Samples/26_ConsoleInput/ConsoleInput.h

@@ -38,11 +38,11 @@ public:
     ConsoleInput(Context* context);
 
     /// Setup after engine initialization and before running the main loop.
-    virtual void Start() override;
+    void Start() override;
 
 protected:
     /// Return XML patch instructions for screen joystick layout for a specific sample app, if any.
-    virtual String GetScreenJoystickPatchString() const override { return
+    String GetScreenJoystickPatchString() const override { return
         "<patch>"
         "    <add sel=\"/element/element[./attribute[@name='Name' and @value='Button2']]\">"
         "        <attribute name=\"Is Visible\" value=\"false\" />"

Source/Samples/27_Urho2DPhysics/Urho2DPhysics.h

@@ -43,11 +43,11 @@ public:
     Urho2DPhysics(Context* context);
 
     /// Setup after engine initialization and before running the main loop.
-    virtual void Start() override;
+    void Start() override;
 
 protected:
     /// Return XML patch instructions for screen joystick layout for a specific sample app, if any.
-    virtual String GetScreenJoystickPatchString() const override { return
+    String GetScreenJoystickPatchString() const override { return
         "<patch>"
         "    <remove sel=\"/element/element[./attribute[@name='Name' and @value='Button0']]/attribute[@name='Is Visible']\" />"
         "    <replace sel=\"/element/element[./attribute[@name='Name' and @value='Button0']]/element[./attribute[@name='Name' and @value='Label']]/attribute[@name='Text']/@value\">Zoom In</replace>"

Source/Samples/28_Urho2DPhysicsRope/Urho2DPhysicsRope.h

@@ -45,11 +45,11 @@ public:
     Urho2DPhysicsRope(Context* context);
 
     /// Setup after engine initialization and before running the main loop.
-    virtual void Start() override;
+    void Start() override;
 
 protected:
     /// Return XML patch instructions for screen joystick layout for a specific sample app, if any.
-    virtual String GetScreenJoystickPatchString() const override { return
+    String GetScreenJoystickPatchString() const override { return
         "<patch>"
         "    <remove sel=\"/element/element[./attribute[@name='Name' and @value='Button0']]/attribute[@name='Is Visible']\" />"
         "    <replace sel=\"/element/element[./attribute[@name='Name' and @value='Button0']]/element[./attribute[@name='Name' and @value='Label']]/attribute[@name='Text']/@value\">Zoom In</replace>"

Source/Samples/29_SoundSynthesis/SoundSynthesis.h

@@ -44,13 +44,13 @@ public:
     SoundSynthesis(Context* context);
 
     /// Setup before engine initialization. Modifies the engine parameters.
-    virtual void Setup() override;
+    void Setup() override;
     /// Setup after engine initialization and before running the main loop.
-    virtual void Start() override;
+    void Start() override;
 
 protected:
     /// Return XML patch instructions for screen joystick layout for a specific sample app, if any.
-    virtual String GetScreenJoystickPatchString() const override { return
+    String GetScreenJoystickPatchString() const override { return
         "<patch>"
         "    <add sel=\"/element/element[./attribute[@name='Name' and @value='Button2']]\">"
         "        <attribute name=\"Is Visible\" value=\"false\" />"

Source/Samples/30_LightAnimation/LightAnimation.h

@@ -44,7 +44,7 @@ public:
     LightAnimation(Context* context);
 
     /// Setup after engine initialization and before running the main loop.
-    virtual void Start() override;
+    void Start() override;
 
 private:
     /// Construct the scene content.

Source/Samples/31_MaterialAnimation/MaterialAnimation.h

@@ -44,7 +44,7 @@ public:
     MaterialAnimation(Context* context);
 
     /// Setup after engine initialization and before running the main loop.
-    virtual void Start() override;
+    void Start() override;
 
 private:
     /// Construct the scene content.

Source/Samples/32_Urho2DConstraints/Urho2DConstraints.h

@@ -59,11 +59,11 @@ public:
     Urho2DConstraints(Context* context);
 
     /// Setup after engine initialization and before running the main loop.
-    virtual void Start() override;
+    void Start() override;
 
 protected:
     /// Return XML patch instructions for screen joystick layout for a specific sample app, if any.
-    virtual String GetScreenJoystickPatchString() const override { return
+    String GetScreenJoystickPatchString() const override { return
         "<patch>"
         "    <remove sel=\"/element/element[./attribute[@name='Name' and @value='Button0']]/attribute[@name='Is Visible']\" />"
         "    <replace sel=\"/element/element[./attribute[@name='Name' and @value='Button0']]/element[./attribute[@name='Name' and @value='Label']]/attribute[@name='Text']/@value\">Zoom In</replace>"

Source/Samples/33_Urho2DSpriterAnimation/Urho2DSpriterAnimation.h

@@ -44,11 +44,11 @@ public:
     Urho2DSpriterAnimation(Context* context);
 
     /// Setup after engine initialization and before running the main loop.
-    virtual void Start() override;
+    void Start() override;
 
 protected:
     /// Return XML patch instructions for screen joystick layout for a specific sample app, if any.
-    virtual String GetScreenJoystickPatchString() const override { return
+    String GetScreenJoystickPatchString() const override { return
         "<patch>"
         "    <remove sel=\"/element/element[./attribute[@name='Name' and @value='Button0']]/attribute[@name='Is Visible']\" />"
         "    <replace sel=\"/element/element[./attribute[@name='Name' and @value='Button0']]/element[./attribute[@name='Name' and @value='Label']]/attribute[@name='Text']/@value\">Zoom In</replace>"
@@ -84,7 +84,7 @@ private:
     void HandleUpdate(StringHash eventType, VariantMap& eventData);
     /// Handle mouse button down event.
     void HandleMouseButtonDown(StringHash eventType, VariantMap& eventData);
-    
+
     /// Spriter nodes.
     SharedPtr<Node> spriterNode_;
     /// Spriter animation index.

Source/Samples/34_DynamicGeometry/DynamicGeometry.h

@@ -46,11 +46,11 @@ public:
     DynamicGeometry(Context* context);
 
     /// Setup after engine initialization and before running the main loop.
-    virtual void Start() override;
+    void Start() override;
 
 protected:
     /// Return XML patch instructions for screen joystick layout for a specific sample app, if any.
-    virtual String GetScreenJoystickPatchString() const override { return
+    String GetScreenJoystickPatchString() const override { return
         "<patch>"
         "    <remove sel=\"/element/element[./attribute[@name='Name' and @value='Button0']]/attribute[@name='Is Visible']\" />"
         "    <replace sel=\"/element/element[./attribute[@name='Name' and @value='Button0']]/element[./attribute[@name='Name' and @value='Label']]/attribute[@name='Text']/@value\">Animation</replace>"

Source/Samples/35_SignedDistanceFieldText/SignedDistanceFieldText.h

@@ -47,7 +47,7 @@ public:
     SignedDistanceFieldText(Context* context);
 
     /// Setup after engine initialization and before running the main loop.
-    virtual void Start() override;
+    void Start() override;
 
 private:
     /// Construct the scene content.

Source/Samples/36_Urho2DTileMap/Urho2DTileMap.h

@@ -39,11 +39,11 @@ public:
     Urho2DTileMap(Context* context);
 
     /// Setup after engine initialization and before running the main loop.
-    virtual void Start() override;
+    void Start() override;
 
 protected:
     /// Return XML patch instructions for screen joystick layout for a specific sample app, if any.
-    virtual String GetScreenJoystickPatchString() const override { return
+    String GetScreenJoystickPatchString() const override { return
         "<patch>"
         "    <remove sel=\"/element/element[./attribute[@name='Name' and @value='Button0']]/attribute[@name='Is Visible']\" />"
         "    <replace sel=\"/element/element[./attribute[@name='Name' and @value='Button0']]/element[./attribute[@name='Name' and @value='Label']]/attribute[@name='Text']/@value\">Zoom In</replace>"

Source/Samples/37_UIDrag/UIDrag.h

@@ -45,11 +45,11 @@ public:
     UIDrag(Context* context);
 
     /// Setup after engine initialization and before running the main loop.
-    virtual void Start() override;
+    void Start() override;
 
 protected:
     /// Return XML patch instructions for screen joystick layout for a specific sample app, if any.
-    virtual String GetScreenJoystickPatchString() const override { return
+    String GetScreenJoystickPatchString() const override { return
         "<patch>"
         "    <add sel=\"/element/element[./attribute[@name='Name' and @value='Hat0']]\">"
         "        <attribute name=\"Is Visible\" value=\"false\" />"

Source/Samples/38_SceneAndUILoad/SceneAndUILoad.h

@@ -47,7 +47,7 @@ public:
     SceneAndUILoad(Context* context);
 
     /// Setup after engine initialization and before running the main loop.
-    virtual void Start() override;
+    void Start() override;
 
 private:
     /// Construct the scene content.

Source/Samples/39_CrowdNavigation/CrowdNavigation.h

@@ -52,11 +52,11 @@ public:
     CrowdNavigation(Context* context);
 
     /// Setup after engine initialization and before running the main loop.
-    virtual void Start() override;
+    void Start() override;
 
 protected:
     /// Return XML patch instructions for screen joystick layout for a specific sample app, if any.
-    virtual String GetScreenJoystickPatchString() const override { return
+    String GetScreenJoystickPatchString() const override { return
         "<patch>"
         "    <add sel=\"/element\">"
         "        <element type=\"Button\">"

Source/Samples/40_Localization/L10n.h

@@ -38,7 +38,7 @@ public:
     L10n(Context* context);
 
     /// Setup after engine initialization and before running the main loop.
-    virtual void Start() override;
+    void Start() override;
 
 private:
     // Load strings from JSON files and subscribe to the change language event

Source/Samples/41_DatabaseDemo/DatabaseDemo.h

@@ -33,14 +33,14 @@ public:
     /// Construct.
     DatabaseDemo(Context* context);
     /// Destruct.
-    virtual ~DatabaseDemo() override;
+    ~DatabaseDemo() override;
 
     /// Setup after engine initialization and before running the main loop.
-    virtual void Start() override;
+    void Start() override;
 
 protected:
     /// Return XML patch instructions for screen joystick layout for a specific sample app, if any.
-    virtual String GetScreenJoystickPatchString() const override { return
+    String GetScreenJoystickPatchString() const override { return
         "<patch>"
         "    <add sel=\"/element/element[./attribute[@name='Name' and @value='Button2']]\">"
         "        <attribute name=\"Is Visible\" value=\"false\" />"

Source/Samples/42_PBRMaterials/PBRMaterials.h

@@ -49,7 +49,7 @@ public:
     PBRMaterials(Context* context);
 
     /// Setup after engine initialization and before running the main loop.
-    virtual void Start() override;
+    void Start() override;
 
 private:
     /// Construct the scene content.
@@ -72,7 +72,7 @@ private:
     void HandleMetallicSliderChanged(StringHash eventType, VariantMap& eventData);
     /// Handle the ambient HDR scale slider drag event.
     void HandleAmbientSliderChanged(StringHash eventType, VariantMap& eventData);
-    
+
     /// Dynamic material.
     Material* dynamicMaterial_;
     /// Roughness label.

Source/Samples/43_HttpRequestDemo/HttpRequestDemo.h

@@ -42,11 +42,11 @@ public:
     HttpRequestDemo(Context* context);
 
     /// Setup after engine initialization and before running the main loop.
-    virtual void Start() override;
+    void Start() override;
 
 protected:
     /// Return XML patch instructions for screen joystick layout for a specific sample app, if any.
-    virtual String GetScreenJoystickPatchString() const override { return
+    String GetScreenJoystickPatchString() const override { return
         "<patch>"
         "    <add sel=\"/element/element[./attribute[@name='Name' and @value='Hat0']]\">"
         "        <attribute name=\"Is Visible\" value=\"false\" />"
@@ -61,7 +61,7 @@ private:
     void SubscribeToEvents();
     /// Handle the logic update event.
     void HandleUpdate(StringHash eventType, VariantMap& eventData);
-    
+
     String message_;
     SharedPtr<Text> text_;
     SharedPtr<HttpRequest> httpRequest_;

Source/Samples/44_RibbonTrailDemo/RibbonTrailDemo.h

@@ -44,7 +44,7 @@ public:
     RibbonTrailDemo(Context* context);
 
     /// Setup after engine initialization and before running the main loop.
-    virtual void Start() override;
+    void Start() override;
 
 protected:
     /// Trail that emitted from sword.

Source/Samples/45_InverseKinematics/InverseKinematics.h

@@ -44,7 +44,7 @@ public:
     InverseKinematics(Context* context);
 
     /// Setup after engine initialization and before running the main loop.
-    virtual void Start() override;
+    void Start() override;
 
 protected:
     /// Animation controller of Jack.

Source/Samples/46_RaycastVehicle/RaycastVehicleDemo.h

@@ -48,7 +48,7 @@ public:
     RaycastVehicleDemo(Context* context);
 
     /// Setup after engine initialization and before running the main loop.
-    virtual void Start() override;
+    void Start() override;
 
 private:
     /// Create static scene content.

Source/Samples/46_RaycastVehicle/Vehicle.h

@@ -54,21 +54,21 @@ public :
     /// Construct.
     Vehicle(Context* context);
     /// Destruct.
-    virtual ~Vehicle() override;
+    ~Vehicle() override;
 
     /// Register object factory and attributes.
     static void RegisterObject(Context* context);
 
     /// Perform post-load after deserialization. Acquire the components from the scene nodes.
-    virtual void ApplyAttributes() override;
+    void ApplyAttributes() override;
 
     /// Initialize the vehicle. Create rendering and physics components. Called by the application.
     void Init();
 
     /// Handle physics world update. Called by LogicComponent base class.
-    virtual void FixedUpdate(float timeStep) override;
+    void FixedUpdate(float timeStep) override;
     /// Updating wheel effects here.
-    virtual void PostUpdate(float timeStep) override;
+    void PostUpdate(float timeStep) override;
 
     /// Movement controls.
     Controls controls_;

Source/Samples/47_Typography/Typography.h

@@ -35,11 +35,11 @@ public:
     Typography(Context* context);
 
     /// Setup after engine initialization and before running the main loop.
-    virtual void Start() override;
+    void Start() override;
 
 protected:
     /// Return XML patch instructions for screen joystick layout for a specific sample app, if any.
-    virtual String GetScreenJoystickPatchString() const override { return
+    String GetScreenJoystickPatchString() const override { return
         "<patch>"
         "    <add sel=\"/element/element[./attribute[@name='Name' and @value='Hat0']]\">"
         "        <attribute name=\"Is Visible\" value=\"false\" />"

Source/Samples/48_Hello3DUI/Hello3DUI.h

@@ -42,11 +42,11 @@ public:
     Hello3DUI(Context* context);
 
     /// Setup after engine initialization and before running the main loop.
-    virtual void Start() override;
+    void Start() override;
 
 protected:
     /// Return XML patch instructions for screen joystick layout for a specific sample app, if any.
-    virtual String GetScreenJoystickPatchString() const override { return
+    String GetScreenJoystickPatchString() const override { return
         "<patch>"
         "    <add sel=\"/element/element[./attribute[@name='Name' and @value='Hat0']]\">"
         "        <attribute name=\"Is Visible\" value=\"false\" />"

Source/Samples/49_Urho2DIsometricDemo/Character2D.h

@@ -43,14 +43,14 @@ public:
     static void RegisterObject(Context* context);
 
     /// Handle update. Called by LogicComponent base class.
-    virtual void Update(float timeStep) override;
+    void Update(float timeStep) override;
 
     /// Handle player state/behavior when wounded.
     void HandleWoundedState(float timeStep);
-    
+
     /// Handle death of the player.
     void HandleDeath();
-    
+
     /// Flag when player is wounded.
     bool wounded_;
     /// Flag when player is dead.

Source/Samples/49_Urho2DIsometricDemo/Urho2DIsometricDemo.h

@@ -45,10 +45,10 @@ public:
     Urho2DIsometricDemo(Context* context);
 
     /// Setup after engine initialization and before running the main loop.
-    virtual void Start();
+    void Start() override;
     /// Setup before engine initialization. Modifies the engine parameters.
-    virtual void Setup();
-    
+    void Setup() override;
+
 private:
     /// Construct the scene content.
     void CreateScene();

Source/Samples/50_Urho2DPlatformer/Character2D.h

@@ -43,7 +43,7 @@ public:
     static void RegisterObject(Context* context);
 
     /// Handle update. Called by LogicComponent base class.
-    virtual void Update(float timeStep) override;
+    void Update(float timeStep) override;
     /// Handle player state/behavior when wounded.
     void HandleWoundedState(float timeStep);
     /// Handle death of the player.

Source/Samples/50_Urho2DPlatformer/Urho2DPlatformer.h

@@ -47,10 +47,10 @@ public:
     Urho2DPlatformer(Context* context);
 
     /// Setup after engine initialization and before running the main loop.
-    virtual void Start();
+    void Start() override;
     /// Setup before engine initialization. Modifies the engine parameters.
-    virtual void Setup();
-    
+    void Setup() override;
+
 private:
     /// Construct the scene content.
     void CreateScene();

Source/Samples/Sample.h

@@ -59,11 +59,11 @@ public:
     Sample(Context* context);
 
     /// Setup before engine initialization. Modifies the engine parameters.
-    virtual void Setup() override;
+    void Setup() override;
     /// Setup after engine initialization. Creates the logo, console & debug HUD.
-    virtual void Start() override;
+    void Start() override;
     /// Cleanup after the main loop. Called by Application.
-    virtual void Stop() override;
+    void Stop() override;
 
 protected:
     /// Return XML patch instructions for screen joystick layout for a specific sample app, if any.

Source/Samples/Utilities2D/Mover.h

@@ -43,7 +43,7 @@ public:
     static void RegisterObject(Context* context);
 
     /// Handle scene update. Called by LogicComponent base class.
-    virtual void Update(float timeStep);
+    void Update(float timeStep) override;
     /// Return path attribute.
     PODVector<unsigned char> GetPathAttr() const;
     /// Set path attribute.

Source/Samples/Utilities2D/Sample2D.h

@@ -60,7 +60,7 @@ public:
     /// Construct.
     Sample2D(Context* context);
     /// Destruct.
-    ~Sample2D();
+    ~Sample2D() override;
 
     /// Generate physics collision shapes from the tmx file's objects located in tileMapLayer.
     void CreateCollisionShapesFromTMXObjects(Node* tileMapNode, TileMapLayer2D* tileMapLayer, TileMapInfo2D info);

Source/Tools/SpritePacker/SpritePacker.cpp

@@ -79,7 +79,7 @@ public:
     {
     }
 
-    virtual ~PackerInfo() override {}
+    ~PackerInfo() override {}
 };
 
 void Help()

Source/Tools/Urho3DPlayer/Urho3DPlayer.h

@@ -36,11 +36,11 @@ public:
     Urho3DPlayer(Context* context);
 
     /// Setup before engine initialization. Verify that a script file has been specified.
-    virtual void Setup() override;
+    void Setup() override;
     /// Setup after engine initialization. Load the script and execute its start function.
-    virtual void Start() override;
+    void Start() override;
     /// Cleanup after the main loop. Run the script's stop function if it exists.
-    virtual void Stop() override;
+    void Stop() override;
 
 private:
     /// Handle reload start of the script file.
@@ -56,7 +56,7 @@ private:
     String scriptFileName_;
     /// Flag whether CommandLine.txt was already successfully read.
     bool commandLineRead_;
-    
+
 #ifdef URHO3D_ANGELSCRIPT
     /// Script file.
     SharedPtr<ScriptFile> scriptFile_;

Source/Urho3D/AngelScript/Script.cpp

@@ -50,7 +50,7 @@ class ScriptResourceRouter : public ResourceRouter
     }
 
     /// Check if request is for an AngelScript file and reroute to compiled version if necessary (.as file not available)
-    virtual void Route(String& name, ResourceRequest requestType) override
+    void Route(String& name, ResourceRequest requestType) override
     {
         String extension = GetExtension(name);
         if (extension == ".as")

Source/Urho3D/AngelScript/Script.h

@@ -61,7 +61,7 @@ public:
     /// Construct.
     Script(Context* context);
     /// Destruct. Release the AngelScript engine.
-    virtual ~Script() override;
+    ~Script() override;
 
     /// Compile and execute a line of script in immediate mode.
     bool Execute(const String& line);

Source/Urho3D/AngelScript/ScriptFile.cpp

@@ -51,13 +51,13 @@ public:
     }
 
     /// Read from stream (no-op).
-    virtual void Read(void* ptr, asUINT size) override
+    void Read(void* ptr, asUINT size) override
     {
         // No-op, can not read from a Serializer
     }
 
     /// Write to stream.
-    virtual void Write(const void* ptr, asUINT size) override
+    void Write(const void* ptr, asUINT size) override
     {
         dest_.Write(ptr, size);
     }
@@ -78,13 +78,13 @@ public:
     }
 
     /// Read from stream.
-    virtual void Read(void* ptr, asUINT size) override
+    void Read(void* ptr, asUINT size) override
     {
         source_.Read(ptr, size);
     }
 
     /// Write to stream (no-op).
-    virtual void Write(const void* ptr, asUINT size) override
+    void Write(const void* ptr, asUINT size) override
     {
     }
 

Source/Urho3D/AngelScript/ScriptFile.h

@@ -51,33 +51,33 @@ public:
     /// Construct.
     ScriptFile(Context* context);
     /// Destruct.
-    virtual ~ScriptFile() override;
+    ~ScriptFile() override;
     /// Register object factory.
     static void RegisterObject(Context* context);
 
     /// Load resource from stream. May be called from a worker thread. Return true if successful.
-    virtual bool BeginLoad(Deserializer& source) override;
+    bool BeginLoad(Deserializer& source) override;
     /// Finish resource loading. Always called from the main thread. Return true if successful.
-    virtual bool EndLoad() override;
+    bool EndLoad() override;
 
     /// Add a scripted event handler.
-    virtual void AddEventHandler(StringHash eventType, const String& handlerName) override;
+    void AddEventHandler(StringHash eventType, const String& handlerName) override;
     /// Add a scripted event handler for a specific sender.
-    virtual void AddEventHandler(Object* sender, StringHash eventType, const String& handlerName) override;
+    void AddEventHandler(Object* sender, StringHash eventType, const String& handlerName) override;
     /// Remove a scripted event handler.
-    virtual void RemoveEventHandler(StringHash eventType) override;
+    void RemoveEventHandler(StringHash eventType) override;
     /// Remove a scripted event handler for a specific sender.
-    virtual void RemoveEventHandler(Object* sender, StringHash eventType) override;
+    void RemoveEventHandler(Object* sender, StringHash eventType) override;
     /// Remove all scripted event handlers for a specific sender.
-    virtual void RemoveEventHandlers(Object* sender) override;
+    void RemoveEventHandlers(Object* sender) override;
     /// Remove all scripted event handlers.
-    virtual void RemoveEventHandlers() override;
+    void RemoveEventHandlers() override;
     /// Remove all scripted event handlers, except those listed.
-    virtual void RemoveEventHandlersExcept(const PODVector<StringHash>& exceptions) override;
+    void RemoveEventHandlersExcept(const PODVector<StringHash>& exceptions) override;
     /// Return whether has subscribed to an event.
-    virtual bool HasEventHandler(StringHash eventType) const override;
+    bool HasEventHandler(StringHash eventType) const override;
     /// Return whether has subscribed to a specific sender's event.
-    virtual bool HasEventHandler(Object* sender, StringHash eventType) const override;
+    bool HasEventHandler(Object* sender, StringHash eventType) const override;
 
     /// Query for a function by declaration and execute if found.
     bool Execute(const String& declaration, const VariantVector& parameters = Variant::emptyVariantVector, bool unprepare = true);
@@ -160,7 +160,7 @@ public:
     /// Constructor, will create the asILockableSharedBool if a ScriptObject is passed in.
     ScriptEventInvoker(ScriptFile* file, asIScriptObject* object = nullptr);
     /// Destructor, release the ref it we still hold it.
-    virtual ~ScriptEventInvoker() override;
+    ~ScriptEventInvoker() override;
 
     /// Get the asIScriptObject to call the method on, can be null.
     asIScriptObject* GetObject() const { return object_; }

Source/Urho3D/AngelScript/ScriptInstance.h

@@ -63,41 +63,41 @@ public:
     /// Construct.
     ScriptInstance(Context* context);
     /// Destruct.
-    virtual ~ScriptInstance() override;
+    ~ScriptInstance() override;
     /// Register object factory.
     static void RegisterObject(Context* context);
 
     /// Handle attribute write access.
-    virtual void OnSetAttribute(const AttributeInfo& attr, const Variant& src) override;
+    void OnSetAttribute(const AttributeInfo& attr, const Variant& src) override;
     /// Handle attribute read access.
-    virtual void OnGetAttribute(const AttributeInfo& attr, Variant& dest) const override;
+    void OnGetAttribute(const AttributeInfo& attr, Variant& dest) const override;
 
     /// Return attribute descriptions, or null if none defined.
-    virtual const Vector<AttributeInfo>* GetAttributes() const override { return &attributeInfos_; }
+    const Vector<AttributeInfo>* GetAttributes() const override { return &attributeInfos_; }
 
     /// Apply attribute changes that can not be applied immediately. Called after scene load or a network update.
-    virtual void ApplyAttributes() override;
+    void ApplyAttributes() override;
     /// Handle enabled/disabled state change.
-    virtual void OnSetEnabled() override;
+    void OnSetEnabled() override;
 
     /// Add a scripted event handler.
-    virtual void AddEventHandler(StringHash eventType, const String& handlerName) override;
+    void AddEventHandler(StringHash eventType, const String& handlerName) override;
     /// Add a scripted event handler for a specific sender.
-    virtual void AddEventHandler(Object* sender, StringHash eventType, const String& handlerName) override;
+    void AddEventHandler(Object* sender, StringHash eventType, const String& handlerName) override;
     /// Remove a scripted event handler.
-    virtual void RemoveEventHandler(StringHash eventType) override;
+    void RemoveEventHandler(StringHash eventType) override;
     /// Remove a scripted event handler for a specific sender.
-    virtual void RemoveEventHandler(Object* sender, StringHash eventType) override;
+    void RemoveEventHandler(Object* sender, StringHash eventType) override;
     /// Remove all scripted event handlers for a specific sender.
-    virtual void RemoveEventHandlers(Object* sender) override;
+    void RemoveEventHandlers(Object* sender) override;
     /// Remove all scripted event handlers.
-    virtual void RemoveEventHandlers() override;
+    void RemoveEventHandlers() override;
     /// Remove all scripted event handlers, except those listed.
-    virtual void RemoveEventHandlersExcept(const PODVector<StringHash>& exceptions) override;
+    void RemoveEventHandlersExcept(const PODVector<StringHash>& exceptions) override;
     /// Return whether has subscribed to an event.
-    virtual bool HasEventHandler(StringHash eventType) const override;
+    bool HasEventHandler(StringHash eventType) const override;
     /// Return whether has subscribed to a specific sender's event.
-    virtual bool HasEventHandler(Object* sender, StringHash eventType) const override;
+    bool HasEventHandler(Object* sender, StringHash eventType) const override;
 
     /// Create object of certain class from the script file. Return true if successful.
     bool CreateObject(ScriptFile* scriptFile, const String& className);
@@ -148,9 +148,9 @@ public:
 
 protected:
     /// Handle scene being assigned.
-    virtual void OnSceneSet(Scene* scene) override;
+    void OnSceneSet(Scene* scene) override;
     /// Handle node transform being dirtied.
-    virtual void OnMarkedDirty(Node* node) override;
+    void OnMarkedDirty(Node* node) override;
 
 private:
     /// (Re)create the script object and check for supported methods if successfully created.

Source/Urho3D/Audio/Audio.h

@@ -45,7 +45,7 @@ public:
     /// Construct.
     Audio(Context* context);
     /// Destruct. Terminate the audio thread and free the audio buffer.
-    virtual ~Audio() override;
+    ~Audio() override;
 
     /// Initialize sound output with specified buffer length and output mode.
     bool SetMode(int bufferLengthMSec, int mixRate, bool stereo, bool interpolation = true);

Source/Urho3D/Audio/BufferedSoundStream.h

@@ -38,10 +38,10 @@ public:
     /// Construct.
     BufferedSoundStream();
     /// Destruct.
-    virtual ~BufferedSoundStream() override;
+    ~BufferedSoundStream() override;
 
     /// Produce sound data into destination. Return number of bytes produced. Called by SoundSource from the mixing thread.
-    virtual unsigned GetData(signed char* dest, unsigned numBytes) override;
+    unsigned GetData(signed char* dest, unsigned numBytes) override;
 
     /// Buffer sound data. Makes a copy of it.
     void AddData(void* data, unsigned numBytes);

Source/Urho3D/Audio/OggVorbisSoundStream.h

@@ -37,13 +37,13 @@ public:
     /// Construct from an Ogg Vorbis compressed sound.
     OggVorbisSoundStream(const Sound* sound);
     /// Destruct.
-    virtual ~OggVorbisSoundStream() override;
+    ~OggVorbisSoundStream() override;
 
     /// Seek to sample number. Return true on success.
-    virtual bool Seek(unsigned sample_number) override;
+    bool Seek(unsigned sample_number) override;
 
     /// Produce sound data into destination. Return number of bytes produced. Called by SoundSource from the mixing thread.
-    virtual unsigned GetData(signed char* dest, unsigned numBytes) override;
+    unsigned GetData(signed char* dest, unsigned numBytes) override;
 
 protected:
     /// Decoder state.

Source/Urho3D/Audio/Sound.h

@@ -39,12 +39,12 @@ public:
     /// Construct.
     Sound(Context* context);
     /// Destruct and free sound data.
-    virtual ~Sound() override;
+    ~Sound() override;
     /// Register object factory.
     static void RegisterObject(Context* context);
 
     /// Load resource from stream. May be called from a worker thread. Return true if successful.
-    virtual bool BeginLoad(Deserializer& source) override;
+    bool BeginLoad(Deserializer& source) override;
 
     /// Load raw sound data.
     bool LoadRaw(Deserializer& source);

Source/Urho3D/Audio/SoundListener.h

@@ -36,7 +36,7 @@ public:
     /// Construct.
     SoundListener(Context* context);
     /// Destruct.
-    virtual ~SoundListener() override;
+    ~SoundListener() override;
     /// Register object factory.
     static void RegisterObject(Context* context);
 };

Source/Urho3D/Audio/SoundSource.h

@@ -44,7 +44,7 @@ public:
     /// Construct.
     SoundSource(Context* context);
     /// Destruct. Remove self from the audio subsystem
-    virtual ~SoundSource() override;
+    ~SoundSource() override;
     /// Register object factory.
     static void RegisterObject(Context* context);
 

Source/Urho3D/Audio/SoundSource3D.h

@@ -41,9 +41,9 @@ public:
     static void RegisterObject(Context* context);
 
     /// Visualize the component as debug geometry.
-    virtual void DrawDebugGeometry(DebugRenderer* debug, bool depthTest) override;
+    void DrawDebugGeometry(DebugRenderer* debug, bool depthTest) override;
     /// Update sound source.
-    virtual void Update(float timeStep) override;
+    void Update(float timeStep) override;
 
     /// Set attenuation parameters.
     void SetDistanceAttenuation(float nearDistance, float farDistance, float rolloffFactor);

Source/Urho3D/Audio/SoundStream.h

@@ -34,11 +34,11 @@ public:
     /// Construct.
     SoundStream();
     /// Destruct.
-    virtual ~SoundStream() override;
+    ~SoundStream() override;
 
     /// Seek to sample number. Return true on success. Need not be implemented by all streams.
     virtual bool Seek(unsigned sample_number);
-    
+
     /// Produce sound data into destination. Return number of bytes produced. Called by SoundSource from the mixing thread.
     virtual unsigned GetData(signed char* dest, unsigned numBytes) = 0;
 

Source/Urho3D/Core/Context.h

@@ -71,7 +71,7 @@ public:
     /// Construct.
     Context();
     /// Destruct.
-    virtual ~Context() override;
+    ~Context() override;
 
     /// Create an object by type. Return pointer to it or null if no factory found.
     template <class T> inline SharedPtr<T> CreateObject()

Source/Urho3D/Core/Object.h

@@ -84,7 +84,7 @@ public:
     /// Construct.
     Object(Context* context);
     /// Destruct. Clean up self from event sender & receiver structures.
-    virtual ~Object() override;
+    ~Object() override;
 
     /// Return type hash.
     virtual StringHash GetType() const = 0;
@@ -238,7 +238,7 @@ public:
     }
 
     /// Create an object of the specific type.
-    virtual SharedPtr<Object> CreateObject() override { return SharedPtr<Object>(new T(context_)); }
+    SharedPtr<Object> CreateObject() override { return SharedPtr<Object>(new T(context_)); }
 };
 
 /// Internal helper class for invoking event handler functions.
@@ -307,14 +307,14 @@ public:
     }
 
     /// Invoke event handler function.
-    virtual void Invoke(VariantMap& eventData) override
+    void Invoke(VariantMap& eventData) override
     {
         T* receiver = static_cast<T*>(receiver_);
         (receiver->*function_)(eventType_, eventData);
     }
 
     /// Return a unique copy of the event handler.
-    virtual EventHandler* Clone() const override
+    EventHandler* Clone() const override
     {
         return new EventHandlerImpl(static_cast<T*>(receiver_), function_, userData_);
     }
@@ -337,13 +337,13 @@ public:
     }
 
     /// Invoke event handler function.
-    virtual void Invoke(VariantMap& eventData) override
+    void Invoke(VariantMap& eventData) override
     {
         function_(eventType_, eventData);
     }
 
     /// Return a unique copy of the event handler.
-    virtual EventHandler* Clone() const override
+    EventHandler* Clone() const override
     {
         return new EventHandler11Impl(function_, userData_);
     }

Source/Urho3D/Core/Profiler.h

@@ -177,7 +177,7 @@ public:
     /// Construct.
     Profiler(Context* context);
     /// Destruct.
-    virtual ~Profiler() override;
+    ~Profiler() override;
 
     /// Begin timing a profiling block.
     void BeginBlock(const char* name)

Source/Urho3D/Core/Timer.h

@@ -83,7 +83,7 @@ public:
     /// Construct.
     Time(Context* context);
     /// Destruct. Reset the low-resolution timer period if set.
-    virtual ~Time() override;
+    ~Time() override;
 
     /// Begin new frame, with (last) frame duration in seconds and send frame start event.
     void BeginFrame(float timeStep);

Source/Urho3D/Core/Variant.h

@@ -244,7 +244,7 @@ public:
     const T& GetValue() const { return value_; }
 
     /// Assign value.
-    virtual bool Assign(const CustomVariantValue& rhs) override
+    bool Assign(const CustomVariantValue& rhs) override
     {
         if (const T* rhsValue = rhs.GetValuePtr<T>())
         {
@@ -254,22 +254,22 @@ public:
         return false;
     }
     /// Clone.
-    virtual CustomVariantValue* Clone() const override { return new ClassName(value_); }
+    CustomVariantValue* Clone() const override { return new ClassName(value_); }
     /// Placement clone.
-    virtual void Clone(void* dest) const override { new (dest) ClassName(value_); }
+    void Clone(void* dest) const override { new (dest) ClassName(value_); }
     /// Get size.
-    virtual unsigned GetSize() const override { return sizeof(ClassName); }
+    unsigned GetSize() const override { return sizeof(ClassName); }
 
     /// Compare to another custom value.
-    virtual bool Compare(const CustomVariantValue& rhs) const override
+    bool Compare(const CustomVariantValue& rhs) const override
     {
         const T* rhsValue = rhs.GetValuePtr<T>();
         return rhsValue && Traits::Compare(value_, *rhsValue);
     }
     /// Compare to zero.
-    virtual bool IsZero() const override { return Traits::IsZero(value_);}
+    bool IsZero() const override { return Traits::IsZero(value_);}
     /// Convert custom value to string.
-    virtual String ToString() const override { return Traits::ToString(value_); }
+    String ToString() const override { return Traits::ToString(value_); }
 
 private:
     /// Value.

Source/Urho3D/Core/WorkQueue.cpp

@@ -43,7 +43,7 @@ public:
     }
 
     /// Process work items until stopped.
-    virtual void ThreadFunction() override
+    void ThreadFunction() override
     {
         // Init FPU state first
         InitFPU();
@@ -382,7 +382,7 @@ void WorkQueue::ReturnToPool(SharedPtr<WorkItem>& item)
     // Check if this was a pooled item and set it to usable
     if (item->pooled_)
     {
-        // Reset the values to their defaults. This should 
+        // Reset the values to their defaults. This should
         // be safe to do here as the completed event has
         // already been handled and this is part of the
         // internal pool.

Source/Urho3D/Core/WorkQueue.h

@@ -82,7 +82,7 @@ public:
     /// Construct.
     WorkQueue(Context* context);
     /// Destruct.
-    virtual ~WorkQueue() override;
+    ~WorkQueue() override;
 
     /// Create worker threads. Can only be called once.
     void CreateThreads(unsigned numThreads);

Source/Urho3D/Database/SQLite/SQLiteConnection.h

@@ -39,7 +39,7 @@ public:
     /// Construct.
     DbConnection(Context* context, const String& connectionString);
     /// Destruct.
-    ~DbConnection();
+    ~DbConnection() override;
     /// Finalize all prepared statements, close all BLOB handles, and finish all sqlite3_backup objects
     void Finalize();
 

Source/Urho3D/Engine/Console.h

@@ -47,7 +47,7 @@ public:
     /// Construct.
     Console(Context* context);
     /// Destruct.
-    virtual ~Console() override;
+    ~Console() override;
 
     /// Set UI elements' style from an XML file.
     void SetDefaultStyle(XMLFile* style);

Source/Urho3D/Engine/DebugHud.h

@@ -50,7 +50,7 @@ public:
     /// Construct.
     DebugHud(Context* context);
     /// Destruct.
-    virtual ~DebugHud() override;
+    ~DebugHud() override;
 
     /// Update. Called by HandlePostUpdate().
     void Update();

Source/Urho3D/Engine/Engine.h

@@ -40,7 +40,7 @@ public:
     /// Construct.
     Engine(Context* context);
     /// Destruct. Free all subsystems.
-    virtual ~Engine() override;
+    ~Engine() override;
 
     /// Initialize engine using parameters given and show the application window. Return true if successful.
     bool Initialize(const VariantMap& parameters);

Source/Urho3D/Graphics/AnimatedModel.h

@@ -43,30 +43,30 @@ public:
     /// Construct.
     AnimatedModel(Context* context);
     /// Destruct.
-    virtual ~AnimatedModel() override;
+    ~AnimatedModel() override;
     /// Register object factory. Drawable must be registered first.
     static void RegisterObject(Context* context);
 
     /// Load from binary data. Return true if successful.
-    virtual bool Load(Deserializer& source, bool setInstanceDefault = false) override;
+    bool Load(Deserializer& source, bool setInstanceDefault = false) override;
     /// Load from XML data. Return true if successful.
-    virtual bool LoadXML(const XMLElement& source, bool setInstanceDefault = false) override;
+    bool LoadXML(const XMLElement& source, bool setInstanceDefault = false) override;
     /// Load from JSON data. Return true if successful.
-    virtual bool LoadJSON(const JSONValue& source, bool setInstanceDefault = false) override;
+    bool LoadJSON(const JSONValue& source, bool setInstanceDefault = false) override;
     /// Apply attribute changes that can not be applied immediately. Called after scene load or a network update.
-    virtual void ApplyAttributes() override;
+    void ApplyAttributes() override;
     /// Process octree raycast. May be called from a worker thread.
-    virtual void ProcessRayQuery(const RayOctreeQuery& query, PODVector<RayQueryResult>& results) override;
+    void ProcessRayQuery(const RayOctreeQuery& query, PODVector<RayQueryResult>& results) override;
     /// Update before octree reinsertion. Is called from a worker thread.
-    virtual void Update(const FrameInfo& frame) override;
+    void Update(const FrameInfo& frame) override;
     /// Calculate distance and prepare batches for rendering. May be called from worker thread(s), possibly re-entrantly.
-    virtual void UpdateBatches(const FrameInfo& frame) override;
+    void UpdateBatches(const FrameInfo& frame) override;
     /// Prepare geometry for rendering. Called from a worker thread if possible (no GPU update.)
-    virtual void UpdateGeometry(const FrameInfo& frame) override;
+    void UpdateGeometry(const FrameInfo& frame) override;
     /// Return whether a geometry update is necessary, and if it can happen in a worker thread.
-    virtual UpdateGeometryType GetUpdateGeometryType() override;
+    UpdateGeometryType GetUpdateGeometryType() override;
     /// Visualize the component as debug geometry.
-    virtual void DrawDebugGeometry(DebugRenderer* debug, bool depthTest) override;
+    void DrawDebugGeometry(DebugRenderer* debug, bool depthTest) override;
 
     /// Set model.
     void SetModel(Model* model, bool createBones = true);
@@ -170,11 +170,11 @@ public:
 
 protected:
     /// Handle node being assigned.
-    virtual void OnNodeSet(Node* node) override;
+    void OnNodeSet(Node* node) override;
     /// Handle node transform being dirtied.
-    virtual void OnMarkedDirty(Node* node) override;
+    void OnMarkedDirty(Node* node) override;
     /// Recalculate the world-space bounding box.
-    virtual void OnWorldBoundingBoxUpdate() override;
+    void OnWorldBoundingBoxUpdate() override;
 
 private:
     /// Assign skeleton and animation bone node references as a postprocess. Called by ApplyAttributes.

Source/Urho3D/Graphics/Animation.h

@@ -115,14 +115,14 @@ public:
     /// Construct.
     Animation(Context* context);
     /// Destruct.
-    virtual ~Animation() override;
+    ~Animation() override;
     /// Register object factory.
     static void RegisterObject(Context* context);
 
     /// Load resource from stream. May be called from a worker thread. Return true if successful.
-    virtual bool BeginLoad(Deserializer& source) override;
+    bool BeginLoad(Deserializer& source) override;
     /// Save resource. Return true if successful.
-    virtual bool Save(Serializer& dest) const override;
+    bool Save(Serializer& dest) const override;
 
     /// Set animation name.
     void SetAnimationName(const String& name);

Source/Urho3D/Graphics/AnimationController.h

@@ -89,12 +89,12 @@ public:
     /// Construct.
     AnimationController(Context* context);
     /// Destruct.
-    virtual ~AnimationController() override;
+    ~AnimationController() override;
     /// Register object factory.
     static void RegisterObject(Context* context);
 
     /// Handle enabled/disabled state change.
-    virtual void OnSetEnabled() override;
+    void OnSetEnabled() override;
 
     /// Update the animations. Is called from HandleScenePostUpdate().
     virtual void Update(float timeStep);
@@ -190,7 +190,7 @@ public:
 
 protected:
     /// Handle scene being assigned.
-    virtual void OnSceneSet(Scene* scene) override;
+    void OnSceneSet(Scene* scene) override;
 
 private:
     /// Add an animation state either to AnimatedModel or as a node animation.

Source/Urho3D/Graphics/AnimationState.h

@@ -74,7 +74,7 @@ public:
     /// Construct with root scene node and animation pointers.
     AnimationState(Node* node, Animation* animation);
     /// Destruct.
-    virtual ~AnimationState() override;
+    ~AnimationState() override;
 
     /// Set start bone. Not supported in node animation mode. Resets any assigned per-bone weights.
     void SetStartBone(Bone* bone);

Source/Urho3D/Graphics/BillboardSet.h

@@ -66,18 +66,18 @@ public:
     /// Construct.
     BillboardSet(Context* context);
     /// Destruct.
-    virtual ~BillboardSet() override;
+    ~BillboardSet() override;
     /// Register object factory.
     static void RegisterObject(Context* context);
 
     /// Process octree raycast. May be called from a worker thread.
-    virtual void ProcessRayQuery(const RayOctreeQuery& query, PODVector<RayQueryResult>& results) override;
+    void ProcessRayQuery(const RayOctreeQuery& query, PODVector<RayQueryResult>& results) override;
     /// Calculate distance and prepare batches for rendering. May be called from worker thread(s), possibly re-entrantly.
-    virtual void UpdateBatches(const FrameInfo& frame) override;
+    void UpdateBatches(const FrameInfo& frame) override;
     /// Prepare geometry for rendering. Called from a worker thread if possible (no GPU update.)
-    virtual void UpdateGeometry(const FrameInfo& frame) override;
+    void UpdateGeometry(const FrameInfo& frame) override;
     /// Return whether a geometry update is necessary, and if it can happen in a worker thread.
-    virtual UpdateGeometryType GetUpdateGeometryType() override;
+    UpdateGeometryType GetUpdateGeometryType() override;
 
     /// Set material.
     void SetMaterial(Material* material);
@@ -148,7 +148,7 @@ public:
 
 protected:
     /// Recalculate the world-space bounding box.
-    virtual void OnWorldBoundingBoxUpdate() override;
+    void OnWorldBoundingBoxUpdate() override;
     /// Mark billboard vertex buffer to need an update.
     void MarkPositionsDirty();
 

Source/Urho3D/Graphics/Camera.h

@@ -49,12 +49,12 @@ public:
     /// Construct.
     Camera(Context* context);
     /// Destruct.
-    virtual ~Camera() override;
+    ~Camera() override;
     /// Register object factory.
     static void RegisterObject(Context* context);
 
     /// Visualize the component as debug geometry.
-    virtual void DrawDebugGeometry(DebugRenderer* debug, bool depthTest) override;
+    void DrawDebugGeometry(DebugRenderer* debug, bool depthTest) override;
 
     /// Set near clip distance.
     void SetNearClip(float nearClip);
@@ -95,7 +95,7 @@ public:
     /// Set vertical flipping mode. Called internally by View to resolve OpenGL / Direct3D9 rendertarget sampling differences.
     void SetFlipVertical(bool enable);
     /// Set custom projection matrix, which should be specified in D3D convention with depth range 0 - 1. Disables auto aspect ratio.
-    /** Change any of the standard view parameters (FOV, far clip, zoom etc.) to revert to the standard projection. 
+    /** Change any of the standard view parameters (FOV, far clip, zoom etc.) to revert to the standard projection.
         Note that the custom projection is not serialized or replicated through the network.
      */
     void SetProjection(const Matrix4& projection);
@@ -212,9 +212,9 @@ public:
 
 protected:
     /// Handle node being assigned.
-    virtual void OnNodeSet(Node* node) override;
+    void OnNodeSet(Node* node) override;
     /// Handle node transform being dirtied.
-    virtual void OnMarkedDirty(Node* node) override;
+    void OnMarkedDirty(Node* node) override;
 
 private:
     /// Recalculate projection matrix.

Source/Urho3D/Graphics/ConstantBuffer.h

@@ -39,12 +39,12 @@ public:
     /// Construct.
     ConstantBuffer(Context* context);
     /// Destruct.
-    virtual ~ConstantBuffer() override;
+    ~ConstantBuffer() override;
 
     /// Recreate the GPU resource and restore data if applicable.
-    virtual void OnDeviceReset() override;
+    void OnDeviceReset() override;
     /// Release the buffer.
-    virtual void Release() override;
+    void Release() override;
 
     /// Set size and create GPU-side buffer. Return true on success.
     bool SetSize(unsigned size);

Source/Urho3D/Graphics/CustomGeometry.h

@@ -53,18 +53,18 @@ public:
     /// Construct.
     CustomGeometry(Context* context);
     /// Destruct.
-    virtual ~CustomGeometry() override;
+    ~CustomGeometry() override;
     /// Register object factory. Drawable must be registered first.
     static void RegisterObject(Context* context);
 
     /// Process octree raycast. May be called from a worker thread.
-    virtual void ProcessRayQuery(const RayOctreeQuery& query, PODVector<RayQueryResult>& results) override;
+    void ProcessRayQuery(const RayOctreeQuery& query, PODVector<RayQueryResult>& results) override;
     /// Return the geometry for a specific LOD level.
-    virtual Geometry* GetLodGeometry(unsigned batchIndex, unsigned level) override;
+    Geometry* GetLodGeometry(unsigned batchIndex, unsigned level) override;
     /// Return number of occlusion geometry triangles.
-    virtual unsigned GetNumOccluderTriangles() override;
+    unsigned GetNumOccluderTriangles() override;
     /// Draw to occlusion buffer. Return true if did not run out of triangles.
-    virtual bool DrawOcclusion(OcclusionBuffer* buffer) override;
+    bool DrawOcclusion(OcclusionBuffer* buffer) override;
 
     /// Clear all geometries.
     void Clear();
@@ -124,7 +124,7 @@ public:
 
 protected:
     /// Recalculate the world-space bounding box.
-    virtual void OnWorldBoundingBoxUpdate() override;
+    void OnWorldBoundingBoxUpdate() override;
 
 private:
     /// Primitive type per geometry.

Source/Urho3D/Graphics/DebugRenderer.h

@@ -100,7 +100,7 @@ public:
     /// Construct.
     DebugRenderer(Context* context);
     /// Destruct.
-    virtual ~DebugRenderer() override;
+    ~DebugRenderer() override;
     /// Register object factory.
     static void RegisterObject(Context* context);
 

Source/Urho3D/Graphics/DecalSet.h

@@ -110,22 +110,22 @@ public:
     /// Construct.
     DecalSet(Context* context);
     /// Destruct.
-    virtual ~DecalSet() override;
+    ~DecalSet() override;
     /// Register object factory.
     static void RegisterObject(Context* context);
 
     /// Apply attribute changes that can not be applied immediately. Called after scene load or a network update.
-    virtual void ApplyAttributes() override;
+    void ApplyAttributes() override;
     /// Handle enabled/disabled state change.
-    virtual void OnSetEnabled() override;
+    void OnSetEnabled() override;
     /// Process octree raycast. May be called from a worker thread.
-    virtual void ProcessRayQuery(const RayOctreeQuery& query, PODVector<RayQueryResult>& results) override;
+    void ProcessRayQuery(const RayOctreeQuery& query, PODVector<RayQueryResult>& results) override;
     /// Calculate distance and prepare batches for rendering. May be called from worker thread(s), possibly re-entrantly.
-    virtual void UpdateBatches(const FrameInfo& frame) override;
+    void UpdateBatches(const FrameInfo& frame) override;
     /// Prepare geometry for rendering. Called from a worker thread if possible (no GPU update.)
-    virtual void UpdateGeometry(const FrameInfo& frame) override;
+    void UpdateGeometry(const FrameInfo& frame) override;
     /// Return whether a geometry update is necessary, and if it can happen in a worker thread.
-    virtual UpdateGeometryType GetUpdateGeometryType() override;
+    UpdateGeometryType GetUpdateGeometryType() override;
 
     /// Set material. The material should use a small negative depth bias to avoid Z-fighting.
     void SetMaterial(Material* material);
@@ -161,7 +161,7 @@ public:
 
     /// Return maximum number of decal vertex indices.
     unsigned GetMaxIndices() const { return maxIndices_; }
-    
+
     /// Return whether is optimizing GPU buffer sizes according to current amount of decals.
     bool GetOptimizeBufferSize() const { return optimizeBufferSize_; }
 
@@ -176,9 +176,9 @@ public:
 
 protected:
     /// Recalculate the world-space bounding box.
-    virtual void OnWorldBoundingBoxUpdate() override;
+    void OnWorldBoundingBoxUpdate() override;
     /// Handle node transform being dirtied.
-    virtual void OnMarkedDirty(Node* node) override;
+    void OnMarkedDirty(Node* node) override;
 
 private:
     /// Get triangle faces from the target geometry.

Source/Urho3D/Graphics/Drawable.h

@@ -117,12 +117,12 @@ public:
     /// Construct.
     Drawable(Context* context, unsigned char drawableFlags);
     /// Destruct.
-    virtual ~Drawable() override;
+    ~Drawable() override;
     /// Register object attributes. Drawable must be registered first.
     static void RegisterObject(Context* context);
 
     /// Handle enabled/disabled state change.
-    virtual void OnSetEnabled() override;
+    void OnSetEnabled() override;
     /// Process octree raycast. May be called from a worker thread.
     virtual void ProcessRayQuery(const RayOctreeQuery& query, PODVector<RayQueryResult>& results);
     /// Update before octree reinsertion. Is called from a worker thread
@@ -144,7 +144,7 @@ public:
     /// Draw to occlusion buffer. Return true if did not run out of triangles.
     virtual bool DrawOcclusion(OcclusionBuffer* buffer);
     /// Visualize the component as debug geometry.
-    virtual void DrawDebugGeometry(DebugRenderer* debug, bool depthTest) override;
+    void DrawDebugGeometry(DebugRenderer* debug, bool depthTest) override;
 
     /// Set draw distance.
     void SetDrawDistance(float distance);
@@ -304,11 +304,11 @@ public:
 
 protected:
     /// Handle node being assigned.
-    virtual void OnNodeSet(Node* node) override;
+    void OnNodeSet(Node* node) override;
     /// Handle scene being assigned.
-    virtual void OnSceneSet(Scene* scene) override;
+    void OnSceneSet(Scene* scene) override;
     /// Handle node transform being dirtied.
-    virtual void OnMarkedDirty(Node* node) override;
+    void OnMarkedDirty(Node* node) override;
     /// Recalculate the world-space bounding box.
     virtual void OnWorldBoundingBoxUpdate() = 0;