Changeset 10916 for code/branches/cpp11_v2/src/orxonox/weaponsystem/Weapon.cc

Timestamp:

Dec 2, 2015, 11:22:03 PM (8 years ago)

Author:

landauf

Message:

use actual types instead of 'auto'. only exception is for complicated template types, e.g. when iterating over a map

File:

• code/branches/cpp11_v2/src/orxonox/weaponsystem/Weapon.cc (modified) (4 diffs)

code/branches/cpp11_v2/src/orxonox/weaponsystem/Weapon.cc

@@ -61 +61 @@
                 this->weaponPack_->removeWeapon(this);
 
-            for (auto & elem : this->weaponmodes_)
-                elem.second->destroy();
+            for (auto& mapEntry : this->weaponmodes_)
+                mapEntry.second->destroy();
         }
     }
@@ -85 +85 @@
     {
         unsigned int i = 0;
-        for (const auto & elem : this->weaponmodes_)
+        for (const auto& mapEntry : this->weaponmodes_)
         {
             if (i == index)
-                return elem.second;
+                return mapEntry.second;
 
             ++i;
@@ -136 +136 @@
     void Weapon::reload()
     {
-        for (auto & elem : this->weaponmodes_)
-            elem.second->reload();
+        for (auto& mapEntry : this->weaponmodes_)
+            mapEntry.second->reload();
     }
 
@@ -148 +148 @@
     void Weapon::notifyWeaponModes()
     {
-        for (auto & elem : this->weaponmodes_)
-            elem.second->setWeapon(this);
+        for (auto& mapEntry : this->weaponmodes_)
+            mapEntry.second->setWeapon(this);
     }
 }