Changeset 10545

Timestamp:

Jul 14, 2015, 11:23:57 PM (9 years ago)

Author:

bknecht

Message:

rewrote a couple of for loops to use C++11 notation. Also made small change in ObjectList so it can almost be used like a normal list with C++11 notation

Location:

code/branches/cpp11/src

Files:

• libraries/core/object/ObjectListBase.h (modified) (1 diff)
• orxonox/chat/ChatManager.cc (modified) (1 diff)
• orxonox/controllers/ArtificialController.cc (modified) (4 diffs)

code/branches/cpp11/src/libraries/core/object/ObjectListBase.h

@@ -93 +93 @@
             }
 
+            operator T*()
+            {
+                return object_;
+            }
+
             T* object_;              //!< The object
     };

code/branches/cpp11/src/orxonox/chat/ChatManager.cc

@@ -105 +105 @@
 
         // notify all listeners
-        for (ObjectList<ChatListener>::iterator it = ObjectList<ChatListener>::begin(); it != ObjectList<ChatListener>::end(); ++it)
-            it->incomingChat(text, name);
+        for (ChatListener* listener : ObjectList<ChatListener>())
+                listener->incomingChat(text, name);
     }
 

code/branches/cpp11/src/orxonox/controllers/ArtificialController.cc

@@ -205 +205 @@
     void ArtificialController::setAllBotLevel(float level)
     {
-        for (ObjectList<ArtificialController>::iterator it = ObjectList<ArtificialController>::begin(); it != ObjectList<ArtificialController>::end(); ++it)
-            it->setBotLevel(level);
+        for (ArtificialController* controller : ObjectList<ArtificialController>())
+            controller->setBotLevel(level);
     }
 
@@ -229 +229 @@
     int ArtificialController::getFiremode(std::string name)
     {
-        for (std::map< std::string, int >::iterator it = this->weaponModes_.begin(); it != this->weaponModes_.end(); ++it)
-        {
-            if (it->first == name)
-                return it->second;
+        for (auto firemode : this->weaponModes_)
+        {
+            if (firemode.first == name)
+                return firemode.second;
         }
         return -1;
@@ -257 +257 @@
     {
         WorldEntity* waypoint = NULL;
-        for (ObjectList<WorldEntity>::iterator it = ObjectList<WorldEntity>::begin(); it != ObjectList<WorldEntity>::end(); ++it)
-        {
-            if((*it)->getIdentifier() == ClassByString(name))
+        for (WorldEntity* we : ObjectList<WorldEntity>())
+        {
+            if(we->getIdentifier() == ClassByString(name))
             {
                 ControllableEntity* controllable = this->getControllableEntity();
                 if(!controllable) continue;
-                float actualDistance = ( (*it)->getPosition() - controllable->getPosition() ).length();
+                float actualDistance = ( we->getPosition() - controllable->getPosition() ).length();
                 if(actualDistance > searchDistance || actualDistance < 5.0f) continue;
                     // TODO: PickupSpawner: adjust waypoint accuracy to PickupSpawner's triggerdistance
@@ -269 +269 @@
                 else
                 {
-                    waypoint = *it;
+                    waypoint = we;
                     break;
                 }