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

Timestamp:

Nov 21, 2015, 7:05:53 PM (8 years ago)

Author:

muemart

Message:

Run clang-modernize -loop-convert

• Again, not all possible loops were converted
• It can do pretty cool transformations, but I had to fix a few compile errors, so there might be some runtime errors lurking around too

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 (std::set<Template*>::const_iterator it = this->templates_.begin(); it != this->templates_.end(); ++it)
+        for (const auto & elem : this->templates_)
         {
             if (i == index)
-                return (*it);
+                return (elem);
             i++;
         }
@@ -269 +269 @@
     {
         unsigned int i = 0;
-        for (std::map<BaseObject*, std::string>::const_iterator it = this->eventSources_.begin(); it != this->eventSources_.end(); ++it)
-        {
-            if (it->second != state)
+        for (const auto & elem : this->eventSources_)
+        {
+            if (elem.second != state)
                 continue;
 
             if (i == index)
-                return it->first;
+                return elem.first;
             ++i;
         }
@@ -296 +296 @@
     {
         unsigned int i = 0;
-        for (std::set<BaseObject*>::const_iterator it = this->eventListenersXML_.begin(); it != this->eventListenersXML_.end(); ++it)
+        for (const auto & elem : this->eventListenersXML_)
         {
             if (i == index)
-                return *it;
+                return elem;
             ++i;
         }
@@ -358 +358 @@
         Event event(activate, originator, name);
 
-        for (std::set<BaseObject*>::iterator it = this->eventListeners_.begin(); it != this->eventListeners_.end(); ++it)
-        {
-            event.statename_ = (*it)->eventSources_[this];
-            (*it)->processEvent(event);
+        for (const auto & elem : this->eventListeners_)
+        {
+            event.statename_ = (elem)->eventSources_[this];
+            (elem)->processEvent(event);
         }
     }
@@ -370 +370 @@
     void BaseObject::fireEvent(Event& event)
     {
-        for (std::set<BaseObject*>::iterator it = this->eventListeners_.begin(); it != this->eventListeners_.end(); ++it)
-            (*it)->processEvent(event);
+        for (const auto & elem : this->eventListeners_)
+            (elem)->processEvent(event);
     }
 
@@ -474 +474 @@
 
             // iterate through all states and get the event sources
-            for (std::list<std::string>::iterator it = eventnames.begin(); it != eventnames.end(); ++it)
+            for (auto & statename : eventnames)
             {
-                const std::string& statename = (*it);
+                
 
                 // if the event state is already known, continue with the next state