Changeset 10817 for code/branches/cpp11_v2/src/modules/pickup

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/modules/pickup

Files:

• CollectiblePickup.h (modified) (1 diff)
• Pickup.h (modified) (2 diffs)
• PickupCollection.h (modified) (2 diffs)
• PickupManager.h (modified) (1 diff)
• PickupRepresentation.h (modified) (2 diffs)
• PickupSpawner.h (modified) (1 diff)

code/branches/cpp11_v2/src/modules/pickup/CollectiblePickup.h

@@ -61 +61 @@
             virtual ~CollectiblePickup(); //! Destructor.
 
-            virtual void changedUsed(void); //!< Is called when the pickup has transited from used to unused or the other way around.
-            virtual void changedPickedUp(void); //!< Is called when the pickup has transited from picked up to dropped or the other way around.
+            virtual void changedUsed(void) override; //!< Is called when the pickup has transited from used to unused or the other way around.
+            virtual void changedPickedUp(void) override; //!< Is called when the pickup has transited from picked up to dropped or the other way around.
 
             /**

code/branches/cpp11_v2/src/modules/pickup/Pickup.h

@@ -103 +103 @@
             virtual ~Pickup(); //!< Destructor.
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
 
-            virtual const std::string& getRepresentationName() const
+            virtual const std::string& getRepresentationName() const override
                 { return this->representationName_; }
 
@@ -149 +149 @@
                 { return this->getDurationType() == pickupDurationType::continuous; }
 
-            virtual void changedPickedUp(void); //!< Should be called when the pickup has transited from picked up to dropped or the other way around.
+            virtual void changedPickedUp(void) override; //!< Should be called when the pickup has transited from picked up to dropped or the other way around.
 
         protected:
-            virtual bool createSpawner(void); //!< Facilitates the creation of a PickupSpawner upon dropping of the Pickupable.
+            virtual bool createSpawner(void) override; //!< Facilitates the creation of a PickupSpawner upon dropping of the Pickupable.
 
             /**

code/branches/cpp11_v2/src/modules/pickup/PickupCollection.h

@@ -73 +73 @@
             virtual ~PickupCollection(); //!< Destructor.
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Creates an instance of this Class through XML.
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; //!< Creates an instance of this Class through XML.
 
-            virtual void changedUsed(void); //!< Is called when the pickup has transited from used to unused or the other way around.
-            virtual void changedCarrier(void); //!< Is called when the pickup has changed its PickupCarrier.
-            virtual void changedPickedUp(void); //!< Is called when the pickup has transited from picked up to dropped or the other way around.
+            virtual void changedUsed(void) override; //!< Is called when the pickup has transited from used to unused or the other way around.
+            virtual void changedCarrier(void) override; //!< Is called when the pickup has changed its PickupCarrier.
+            virtual void changedPickedUp(void) override; //!< Is called when the pickup has transited from picked up to dropped or the other way around.
 
-            virtual bool isTarget(const PickupCarrier* carrier) const; //!< Get whether a given class, represented by the input Identifier, is a target of this PickupCollection.
+            virtual bool isTarget(const PickupCarrier* carrier) const override; //!< Get whether a given class, represented by the input Identifier, is a target of this PickupCollection.
 
             inline void setRepresentationName(const std::string& name)
                 { this->representationName_ = name; }
-            virtual const std::string& getRepresentationName() const
+            virtual const std::string& getRepresentationName() const override
                 { return this->representationName_; }
 
@@ -98 +98 @@
 
         protected:
-            virtual bool createSpawner(void); //!< Facilitates the creation of a PickupSpawner upon dropping of the Pickupable.
+            virtual bool createSpawner(void) override; //!< Facilitates the creation of a PickupSpawner upon dropping of the Pickupable.
 
         private:

code/branches/cpp11_v2/src/modules/pickup/PickupManager.h

@@ -117 +117 @@
             PickupRepresentation* getRepresentation(const std::string& name); // tolua_export
 
-            virtual void pickupChangedUsed(Pickupable* pickup, bool used); //!< Is called by the PickupListener to notify the PickupManager, that the input Pickupable has transited to the input used state.
+            virtual void pickupChangedUsed(Pickupable* pickup, bool used) override; //!< Is called by the PickupListener to notify the PickupManager, that the input Pickupable has transited to the input used state.
             static void pickupChangedUsedNetwork(uint32_t pickup, bool inUse, bool usable, bool unusable); //!< Helper method to react to the change in the used status of a Pickupable.
-            virtual void pickupChangedPickedUp(Pickupable* pickup, bool pickedUp); //!< Is called by the PickupListener to notify the PickupManager, that the input Pickupable has transited to the input pickedUp state.
+            virtual void pickupChangedPickedUp(Pickupable* pickup, bool pickedUp) override; //!< Is called by the PickupListener to notify the PickupManager, that the input Pickupable has transited to the input pickedUp state.
             static void pickupChangedPickedUpNetwork(uint32_t pickup, bool usable, uint32_t representationObjectId, const std::string& representationName, bool pickedUp); //!< Helper method to react to the change in the pickedUp status of a Pickupable.
 

code/branches/cpp11_v2/src/modules/pickup/PickupRepresentation.h

@@ -98 +98 @@
             virtual ~PickupRepresentation(); //!< Destructor.
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating a PickupRepresentation object through XML.
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; //!< Method for creating a PickupRepresentation object through XML.
 
             /**
@@ -129 +129 @@
             inline const std::string& getInventoryRepresentation(void) const { return this->inventoryRepresentation_; } // tolua_export
 
-            virtual void changedName();
+            virtual void changedName() override;
 
             StaticEntity* createSpawnerRepresentation(PickupSpawner* spawner); //!< Create a spawnerRepresentation for a specific PickupSpawner.

code/branches/cpp11_v2/src/modules/pickup/PickupSpawner.h

@@ -82 +82 @@
             static PickupSpawner* createDroppedPickup(Context* context, Pickupable* pickup, PickupCarrier* carrier, float triggerDistance = 10.0);
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);  //!< Method for creating a PickupSpawner through XML.
-            virtual void tick(float dt); //!< Tick, checks if any Pawn is close enough to trigger.
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;  //!< Method for creating a PickupSpawner through XML.
+            virtual void tick(float dt) override; //!< Tick, checks if any Pawn is close enough to trigger.
 
             /**