Changeset 11059 for code/branches/cpp11_v3/src/orxonox

Timestamp:

Jan 13, 2016, 10:19:21 PM (9 years ago)

Author:

landauf

Message:

return const-ref to collections instead of pointer

Location:

code/branches/cpp11_v3/src/orxonox

Files:

• weaponsystem/Weapon.h (modified) (1 diff)
• weaponsystem/WeaponPack.cc (modified) (1 diff)
• weaponsystem/WeaponPack.h (modified) (1 diff)
• weaponsystem/WeaponSystem.cc (modified) (1 diff)
• weaponsystem/WeaponSystem.h (modified) (1 diff)
• worldentities/pawns/Pawn.cc (modified) (1 diff)
• worldentities/pawns/Pawn.h (modified) (1 diff)

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

@@ -57 +57 @@
             void addWeaponmode(WeaponMode* weaponmode);
             WeaponMode* getWeaponmode(unsigned int index) const;
-            inline std::multimap<unsigned int, WeaponMode*>* getAllWeaponmodes()
-                { return &weaponmodes_; }
+            inline const std::multimap<unsigned int, WeaponMode*>& getAllWeaponmodes() const
+                { return weaponmodes_; }
             inline int getNumWeaponModes() const
                 { return weaponmodes_.size(); }

code/branches/cpp11_v3/src/orxonox/weaponsystem/WeaponPack.cc

@@ -124 +124 @@
     }
 
-    std::vector<Weapon*>* WeaponPack::getAllWeapons()
-    {
-        return &weapons_;        
-    }    
-
     void WeaponPack::addDefaultWeaponmodeLink(DefaultWeaponmodeLink* link)
     {

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

@@ -52 +52 @@
             void removeWeapon(Weapon * weapon);
             Weapon * getWeapon(unsigned int index) const;
-            std::vector<Weapon*>* getAllWeapons();
+            inline const std::vector<Weapon*>& getAllWeapons() const
+                { return weapons_; }
 
             inline size_t getNumWeapons() const

code/branches/cpp11_v3/src/orxonox/weaponsystem/WeaponSystem.cc

@@ -240 +240 @@
     }
 
-    std::vector<WeaponPack *> * WeaponSystem::getAllWeaponPacks()
-    {
-        return &weaponPacks_;
-    }    
-
     bool WeaponSystem::swapWeaponSlots(WeaponSlot * wSlot1, WeaponSlot * wSlot2)
     {

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

@@ -67 +67 @@
             void removeWeaponPack(WeaponPack * wPack);
             WeaponPack * getWeaponPack(unsigned int index) const;
-            std::vector<WeaponPack *> * getAllWeaponPacks();
+            inline const std::vector<WeaponPack *>& getAllWeaponPacks() const
+                { return weaponPacks_; }
 
             // configure slots and firemodes

code/branches/cpp11_v3/src/orxonox/worldentities/pawns/Pawn.cc

@@ -513 +513 @@
     }
 
-    std::vector<WeaponPack *> * Pawn::getAllWeaponPacks()
-    {
-        if (this->weaponSystem_)
-            return this->weaponSystem_->getAllWeaponPacks();
-        else
-            return 0;        
-    }
-
     void Pawn::addMunitionXML(Munition* munition)
     {

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

@@ -170 +170 @@
             void addWeaponPackXML(WeaponPack * wPack);
             WeaponPack * getWeaponPack(unsigned int index) const;
-            std::vector<WeaponPack *> * getAllWeaponPacks();
 
             void addMunitionXML(Munition* munition);