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

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

File:

• code/branches/cpp11_v2/src/libraries/core/ClassTreeMask.cc (modified) (5 diffs)

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

@@ -293 +293 @@
         {
             // No it's not: Search for classes inheriting from the given class and add the rules for them
-            for (std::set<const Identifier*>::const_iterator it = subclass->getDirectChildren().begin(); it != subclass->getDirectChildren().end(); ++it)
-                if ((*it)->isA(this->root_->getClass()))
-                    if (overwrite || (!this->nodeExists(*it))) // If we don't want to overwrite, only add nodes that don't already exist
-                        this->add(this->root_, *it, bInclude, overwrite);
+            for (const auto & elem : subclass->getDirectChildren())
+                if ((elem)->isA(this->root_->getClass()))
+                    if (overwrite || (!this->nodeExists(elem))) // If we don't want to overwrite, only add nodes that don't already exist
+                        this->add(this->root_, elem, bInclude, overwrite);
         }
 
@@ -325 +325 @@
         {
             // Search for an already existing node, containing the subclass we want to add
-            for (std::list<ClassTreeMaskNode*>::iterator it = node->subnodes_.begin(); it != node->subnodes_.end(); ++it)
+            for (auto & elem : node->subnodes_)
             {
-                if (subclass->isA((*it)->getClass()))
+                if (subclass->isA((elem)->getClass()))
                 {
                     // We've found an existing node -> delegate the work with a recursive function-call and return
-                    this->add(*it, subclass, bInclude, overwrite);
+                    this->add(elem, subclass, bInclude, overwrite);
                     return;
                 }
@@ -392 +392 @@
         if (!subclass)
             return;
-        for (std::set<const Identifier*>::const_iterator it = subclass->getDirectChildren().begin(); it != subclass->getDirectChildren().end(); ++it)
-            this->add(*it, this->isIncluded(*it), false, false);
+        for (const auto & elem : subclass->getDirectChildren())
+            this->add(elem, this->isIncluded(elem), false, false);
 
         this->add(subclass, bInclude, false, clean);
@@ -435 +435 @@
 
             // Go through the list of subnodes and look for a node containing the searched subclass and delegate the request by a recursive function-call.
-            for (std::list<ClassTreeMaskNode*>::iterator it = node->subnodes_.begin(); it != node->subnodes_.end(); ++it)
-                if (subclass->isA((*it)->getClass()))
-                    return isIncluded(*it, subclass);
+            for (auto & elem : node->subnodes_)
+                if (subclass->isA((elem)->getClass()))
+                    return isIncluded(elem, subclass);
 
             // There is no subnode containing our class -> the rule of the current node takes in effect
@@ -957 +957 @@
             // The bool is "false", meaning they have no subnodes and therefore need no further checks
             if (node->isIncluded())
-                for (std::set<const Identifier*>::iterator it = directChildren.begin(); it != directChildren.end(); ++it)
-                    this->subclasses_.insert(this->subclasses_.end(), std::pair<const Identifier*, bool>(*it, false));
+                for (const auto & elem : directChildren)
+                    this->subclasses_.insert(this->subclasses_.end(), std::pair<const Identifier*, bool>(elem, false));
         }
     }