Changeset 10821 for code/branches/cpp11_v2/src/modules/objects/eventsystem

Timestamp:

Nov 21, 2015, 7:05:53 PM (9 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

Location:

code/branches/cpp11_v2/src/modules/objects/eventsystem

Files:

• EventDispatcher.cc (modified) (3 diffs)
• EventFilter.cc (modified) (2 diffs)

code/branches/cpp11_v2/src/modules/objects/eventsystem/EventDispatcher.cc

@@ -45 +45 @@
     {
         if (this->isInitialized())
-            for (std::list<BaseObject*>::iterator it = this->targets_.begin(); it != this->targets_.end(); ++it)
-                (*it)->destroy();
+            for (auto & elem : this->targets_)
+                (elem)->destroy();
     }
 
@@ -61 +61 @@
     void EventDispatcher::processEvent(Event& event)
     {
-        for (std::list<BaseObject*>::iterator it = this->targets_.begin(); it != this->targets_.end(); ++it)
-            (*it)->processEvent(event);
+        for (auto & elem : this->targets_)
+            (elem)->processEvent(event);
     }
 
@@ -73 +73 @@
     {
         unsigned int i = 0;
-        for (std::list<BaseObject*>::const_iterator it = this->targets_.begin(); it != this->targets_.end(); ++it)
+        for (const auto & elem : this->targets_)
         {
             if (i == index)
-                return (*it);
+                return (elem);
             ++i;
         }

code/branches/cpp11_v2/src/modules/objects/eventsystem/EventFilter.cc

@@ -96 +96 @@
     {
         unsigned int i = 0;
-        for (std::list<BaseObject*>::const_iterator it = this->sources_.begin(); it != this->sources_.end(); ++it)
+        for (const auto & elem : this->sources_)
         {
             if (i == index)
-                return (*it);
+                return (elem);
             ++i;
         }
@@ -113 +113 @@
     {
         unsigned int i = 0;
-        for (std::list<EventName*>::const_iterator it = this->names_.begin(); it != this->names_.end(); ++it)
+        for (const auto & elem : this->names_)
         {
             if (i == index)
-                return (*it);
+                return (elem);
             ++i;
         }