Changeset 10916 for code/branches/cpp11_v2/src/libraries/core/BaseObject.cc

Timestamp:

Dec 2, 2015, 11:22:03 PM (9 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/libraries/core/BaseObject.cc (modified) (6 diffs)

code/branches/cpp11_v2/src/libraries/core/BaseObject.cc

@@ -234 +234 @@
     {
         unsigned int i = 0;
-        for (const auto & elem : this->templates_)
+        for (Template* temp : this->templates_)
         {
             if (i == index)
-                return (elem);
+                return temp;
             i++;
         }
@@ -269 +269 @@
     {
         unsigned int i = 0;
-        for (const auto & elem : this->eventSources_)
-        {
-            if (elem.second != state)
+        for (const auto& mapEntry : this->eventSources_)
+        {
+            if (mapEntry.second != state)
                 continue;
 
             if (i == index)
-                return elem.first;
+                return mapEntry.first;
             ++i;
         }
@@ -296 +296 @@
     {
         unsigned int i = 0;
-        for (const auto & elem : this->eventListenersXML_)
+        for (BaseObject* listener : this->eventListenersXML_)
         {
             if (i == index)
-                return elem;
+                return listener;
             ++i;
         }
@@ -358 +358 @@
         Event event(activate, originator, name);
 
-        for (const auto & elem : this->eventListeners_)
-        {
-            event.statename_ = (elem)->eventSources_[this];
-            (elem)->processEvent(event);
+        for (BaseObject* listener : this->eventListeners_)
+        {
+            event.statename_ = listener->eventSources_[this];
+            listener->processEvent(event);
         }
     }
@@ -370 +370 @@
     void BaseObject::fireEvent(Event& event)
     {
-        for (const auto & elem : this->eventListeners_)
-            (elem)->processEvent(event);
+        for (BaseObject* listener : this->eventListeners_)
+            listener->processEvent(event);
     }
 
@@ -474 +474 @@
 
             // iterate through all states and get the event sources
-            for (auto & statename : eventnames)
-            {
-                
-
+            for (const std::string& statename : eventnames)
+            {
                 // if the event state is already known, continue with the next state
                 orxonox::EventState* eventstate = object->getEventState(statename);