Changeset 10817 for code/branches/cpp11_v2/src/orxonox/interfaces

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)

Location:

code/branches/cpp11_v2/src/orxonox/interfaces

Files:

• PickupCarrier.h (modified) (1 diff)
• Pickupable.h (modified) (2 diffs)

code/branches/cpp11_v2/src/orxonox/interfaces/PickupCarrier.h

@@ -77 +77 @@
             PickupCarrier(); //!< Constructor.
             virtual ~PickupCarrier(); //!< Destructor.
-            void preDestroy(void); //!< Is called before the PickupCarrier is effectively destroyed.
+            void preDestroy(void) override; //!< Is called before the PickupCarrier is effectively destroyed.
 
             bool isTarget(const Pickupable* pickup) const; //!< Can be used to check whether the PickupCarrier or a child of his is a target ot the input Pickupable.

code/branches/cpp11_v2/src/orxonox/interfaces/Pickupable.h

@@ -144 +144 @@
 
         protected:
-            virtual void preDestroy(void); //!< A method that is called by Destroyable::destroy() before the object is actually destroyed.
+            virtual void preDestroy(void) override; //!< A method that is called by Destroyable::destroy() before the object is actually destroyed.
             virtual void destroyPickup(void); //!< Destroys a Pickupable.
             virtual void carrierDestroyed(void); //!< Is called by the PickupCarrier when it is being destroyed.
@@ -182 +182 @@
         // For implementing the Rewardable interface:
         public:
-            virtual bool reward(PlayerInfo* player); //!< Method to transcribe a Pickupable as a Rewardable to the player.
+            virtual bool reward(PlayerInfo* player) override; //!< Method to transcribe a Pickupable as a Rewardable to the player.
 
     };