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

Timestamp:

Nov 19, 2015, 11:40:28 AM (8 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/pawns/Pawn.h (modified) (6 diffs)

code/branches/cpp11_v2/src/orxonox/worldentities/pawns/Pawn.h

@@ -61 +61 @@
             virtual ~Pawn();
 
-            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;
 
             inline bool isAlive() const
@@ -143 +143 @@
             virtual void kill();
 
-            virtual void fired(unsigned int firemode);
-            virtual void reload();
+            virtual void fired(unsigned int firemode) override;
+            virtual void reload() override;
             virtual void postSpawn();
 
@@ -179 +179 @@
 
 
-            virtual void startLocalHumanControl();
+            virtual void startLocalHumanControl() override;
 
             void setAimPosition( Vector3 position )
@@ -186 +186 @@
                 { return this->aimPosition_; }
 
-            virtual const Vector3& getCarrierPosition(void) const
+            virtual const Vector3& getCarrierPosition(void) const override
                 { return this->getWorldPosition(); };
 
-            virtual void changedVisibility();
+            virtual void changedVisibility() override;
 
             void setExplosionSound(const std::string& engineSound);
@@ -195 +195 @@
 
         protected:
-            virtual void preDestroy();
-
-            virtual void setPlayer(PlayerInfo* player);
-            virtual void removePlayer();
+            virtual void preDestroy() override;
+
+            virtual void setPlayer(PlayerInfo* player) override;
+            virtual void removePlayer() override;
 
             virtual void death();
@@ -212 +212 @@
             bool bAlive_;
 
-            virtual std::vector<PickupCarrier*>* getCarrierChildren(void) const
+            virtual std::vector<PickupCarrier*>* getCarrierChildren(void) const override
                 { return new std::vector<PickupCarrier*>(); }
-            virtual PickupCarrier* getCarrierParent(void) const
+            virtual PickupCarrier* getCarrierParent(void) const override
                 { return nullptr; }