Changeset 2104 for code/trunk

Timestamp:

Nov 2, 2008, 12:53:39 AM (16 years ago)

Author:

landauf

Message:

removed some "extra qualifications" (only throws errors on newer versions of gcc)

Location:

code/trunk/src/orxonox/objects

Files:

• WeaponSystem.h (modified) (1 diff)
• weaponSystem/WeaponSet.h (modified) (1 diff)
• weaponSystem/WeaponSlot.h (modified) (1 diff)

code/trunk/src/orxonox/objects/WeaponSystem.h

@@ -53 +53 @@
             WeaponSet * getWeaponSetPointer(unsigned int n);
 
-            inline void WeaponSystem::setParentSpaceShip(SpaceShip *parentSpaceShip)
+            inline void setParentSpaceShip(SpaceShip *parentSpaceShip)
                 { parentSpaceShip_=parentSpaceShip; }
             inline SpaceShip * getParentSpaceShip()

code/trunk/src/orxonox/objects/weaponSystem/WeaponSet.h

@@ -46 +46 @@
             virtual ~WeaponSet();
 
-            virtual void WeaponSet::XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
 
-            void WeaponSet::attachWeaponSlot(WeaponSlot *wSlot);
-            void WeaponSet::fire();
+            void attachWeaponSlot(WeaponSlot *wSlot);
+            void fire();
             WeaponSlot * getWeaponSlotPointer(unsigned int n);
 
-            inline void WeaponSet::setParentWeaponSystem(WeaponSystem *parentWeaponSystem)
+            inline void setParentWeaponSystem(WeaponSystem *parentWeaponSystem)
                 { parentWeaponSystem_=parentWeaponSystem; }
             inline WeaponSystem * getParentWeaponSystem()

code/trunk/src/orxonox/objects/weaponSystem/WeaponSlot.h

@@ -52 +52 @@
             void fire();
 
-            inline void WeaponSlot::setParentWeaponSet(WeaponSet *parentWeaponSet)
+            inline void setParentWeaponSet(WeaponSet *parentWeaponSet)
                 { parentWeaponSet_=parentWeaponSet; }
             inline WeaponSet * getParentWeaponSet()