Changeset 10821 for code/branches/cpp11_v2/src/libraries/core/object

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/libraries/core/object

Files:

• Context.cc (modified) (1 diff)
• Listable.cc (modified) (2 diffs)
• ObjectListBase.cc (modified) (1 diff)

code/branches/cpp11_v2/src/libraries/core/object/Context.cc

@@ -70 +70 @@
         // unregister context from object lists before object lists are destroyed
         this->unregisterObject();
-        for (size_t i = 0; i < this->objectLists_.size(); ++i)
-            delete this->objectLists_[i];
+        for (auto & elem : this->objectLists_)
+            delete elem;
     }
 

code/branches/cpp11_v2/src/libraries/core/object/Listable.cc

@@ -76 +76 @@
     void Listable::unregisterObject()
     {
-        for (size_t i = 0; i < this->elements_.size(); ++i)
-            Listable::deleteObjectListElement(this->elements_[i]);
+        for (auto & elem : this->elements_)
+            Listable::deleteObjectListElement(elem);
         this->elements_.clear();
     }
@@ -91 +91 @@
         this->elements_.clear();
 
-        for (size_t i = 0; i < copy.size(); ++i)
+        for (auto & elem : copy)
         {
-            copy[i]->changeContext(this->context_, context);
-            Listable::deleteObjectListElement(copy[i]);
+            elem->changeContext(this->context_, context);
+            Listable::deleteObjectListElement(elem);
         }
 

code/branches/cpp11_v2/src/libraries/core/object/ObjectListBase.cc

@@ -92 +92 @@
     void ObjectListBase::notifyRemovalListeners(ObjectListBaseElement* element) const
     {
-        for (std::vector<ObjectListElementRemovalListener*>::const_iterator it = this->listeners_.begin(); it != this->listeners_.end(); ++it)
-            (*it)->removedElement(element);
+        for (const auto & elem : this->listeners_)
+            (elem)->removedElement(element);
     }