Changeset 11064

Timestamp:

Jan 14, 2016, 10:58:46 PM (9 years ago)

Author:

landauf

Message:

made some functions non-virtual

Location:

code/branches/cpp11_v3/src

Files:

• modules/overlays/hud/HUDWeapon.h (modified) (2 diffs)
• modules/overlays/hud/HUDWeaponMode.h (modified) (2 diffs)
• modules/overlays/hud/HUDWeaponSystem.h (modified) (1 diff)
• modules/pickup/items/MunitionPickup.h (modified) (1 diff)
• modules/weapons/projectiles/MineProjectile.h (modified) (2 diffs)
• orxonox/weaponsystem/ReplenishingMunition.h (modified) (1 diff)

code/branches/cpp11_v3/src/modules/overlays/hud/HUDWeapon.h

@@ -64 +64 @@
         virtual void sizeChanged();
 
-        virtual void setWeapon(Weapon* weapon);
+        void setWeapon(Weapon* weapon);
 
         inline void setWeaponModeHUDActualSize(Vector2 vector)
@@ -84 +84 @@
 
     private:
-        virtual void createHUDChilds();
-        virtual void positionHUDChilds();
-        virtual void destroyHUDChilds();
-        virtual void updateWeaponModeList();
-        virtual void updateSize();
-        virtual void updatePosition();
+        void createHUDChilds();
+        void positionHUDChilds();
+        void destroyHUDChilds();
+        void updateWeaponModeList();
+        void updateSize();
+        void updatePosition();
 
         WeakPtr<Pawn> owner_;

code/branches/cpp11_v3/src/modules/overlays/hud/HUDWeaponMode.h

@@ -65 +65 @@
         virtual void sizeChanged();
 
-        virtual void setWeaponMode(WeaponMode* weaponMode);
+        void setWeaponMode(WeaponMode* weaponMode);
 
         inline void setWeaponModeHUDActualSize(Vector2 vector)
@@ -88 +88 @@
 
     private:
-        virtual void updateSize();
-        virtual void updatePosition();
-        virtual void positionHUDChilds();
+        void updateSize();
+        void updatePosition();
+        void positionHUDChilds();
 
         WeakPtr<Pawn> owner_;

code/branches/cpp11_v3/src/modules/overlays/hud/HUDWeaponSystem.h

@@ -64 +64 @@
             { return weaponModeHUDSize_; }
     private:
-        virtual void updateWeaponList();
-        virtual void createHUDChilds();
-        virtual void positionHUDChilds();
-        virtual void destroyHUDChilds();
+        void updateWeaponList();
+        void createHUDChilds();
+        void positionHUDChilds();
+        void destroyHUDChilds();
 
         WeakPtr<Pawn> owner_;

code/branches/cpp11_v3/src/modules/pickup/items/MunitionPickup.h

@@ -63 +63 @@
             virtual void changedUsed(void); //!< Is called when the pickup has transited from used to unused or the other way around.
 
-            virtual void addMunitionContainer(MunitionContainer* munitionContainer);
+            void addMunitionContainer(MunitionContainer* munitionContainer);
             MunitionContainer* getMunitionContainer(unsigned int index);
 

code/branches/cpp11_v3/src/modules/weapons/projectiles/MineProjectile.h

@@ -59 +59 @@
             virtual void XMLEventPort(Element& xmlelement, XMLPort::Mode mode);
 
-            virtual void setMaxTimeUntilExplosion(float maxTimeUntilExplosion);
-            virtual void setTimeUntilActivation(float timeUntilActivation);
+            void setMaxTimeUntilExplosion(float maxTimeUntilExplosion);
+            void setTimeUntilActivation(float timeUntilActivation);
         protected:
             static const float triggerRadius_;
@@ -84 +84 @@
             WeakPtr<DistanceTrigger> distanceTrigger_;
 
-            virtual void destructionEffect();
-            virtual void allowExplosion();
-            virtual void explode();
+            void destructionEffect();
+            void allowExplosion();
+            void explode();
     };
 }

code/branches/cpp11_v3/src/orxonox/weaponsystem/ReplenishingMunition.h

@@ -56 +56 @@
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
             
-            virtual float getProgress();
+            float getProgress();
             inline unsigned int getReplenishAmount() const
                 { return replenishAmount_; }