Changeset 10817 for code/branches/cpp11_v2/src/orxonox/worldentities/ControllableEntity.h

Timestamp:

Nov 19, 2015, 11:40:28 AM (9 years ago)

Author:

muemart

Message:

Run clang-modernize -add-override
A few notes:

• There are probably some overrides missing, especially in funky templatey code
• Virtual methods with wrong signatures were not fixed, needs to be done by hand (only warnings get emitted)

File:

• code/branches/cpp11_v2/src/orxonox/worldentities/ControllableEntity.h (modified) (5 diffs)

code/branches/cpp11_v2/src/orxonox/worldentities/ControllableEntity.h

@@ -54 +54 @@
             virtual ~ControllableEntity();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-            virtual void tick(float dt);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+            virtual void tick(float dt) override;
             void setConfigValues();
 
@@ -141 +141 @@
             using MobileEntity::setAngularVelocity;
 
-            void setPosition(const Vector3& position);
-            void setOrientation(const Quaternion& orientation);
-            void setVelocity(const Vector3& velocity);
-            void setAngularVelocity(const Vector3& velocity);
+            void setPosition(const Vector3& position) override;
+            void setOrientation(const Quaternion& orientation) override;
+            void setVelocity(const Vector3& velocity) override;
+            void setAngularVelocity(const Vector3& velocity) override;
 
             inline bool hasLocalController() const
@@ -177 +177 @@
 
         protected:
-            virtual void preDestroy();
+            virtual void preDestroy() override;
 
             virtual void setPlayer(PlayerInfo* player); // don't call this directly, use friend class PlayerInfo instead
@@ -184 +184 @@
             virtual void startLocalHumanControl();
             virtual void stopLocalHumanControl();
-            virtual void parentChanged();
+            virtual void parentChanged() override;
 
             inline void setHudTemplate(const std::string& name)
@@ -214 +214 @@
 
             // Bullet btMotionState related
-            void setWorldTransform(const btTransform& worldTrans);
+            void setWorldTransform(const btTransform& worldTrans) override;
 
             unsigned int server_overwrite_;