Changeset 10821 for code/branches/cpp11_v2/src/libraries/util

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/util

Files:

• DisplayStringConversions.h (modified) (1 diff)
• Serialise.h (modified) (1 diff)
• SignalHandler.cc (modified) (2 diffs)
• SmallObjectAllocator.cc (modified) (1 diff)
• StringUtils.cc (modified) (5 diffs)
• output/BaseWriter.cc (modified) (1 diff)
• output/MemoryWriter.cc (modified) (1 diff)
• output/OutputListener.cc (modified) (3 diffs)
• output/OutputManager.cc (modified) (4 diffs)
• output/SubcontextOutputListener.cc (modified) (1 diff)

code/branches/cpp11_v2/src/libraries/util/DisplayStringConversions.h

@@ -51 +51 @@
             {
                 Ogre::UTFString::code_point cp;
-                for (unsigned int i = 0; i < input.size(); ++i)
+                for (auto & elem : input)
                 {
-                  cp = input[i];
+                  cp = elem;
                   cp &= 0xFF;
                   output->append(1, cp);

code/branches/cpp11_v2/src/libraries/util/Serialise.h

@@ -672 +672 @@
     {
         uint32_t tempsize = sizeof(uint32_t); // for the number of entries
-        for( typename std::set<T>::iterator it=((std::set<T>*)(&variable))->begin(); it!=((std::set<T>*)(&variable))->end(); ++it)
-            tempsize += returnSize( *it );
+        for(const auto & elem : *((std::set<T>*)(&variable)))
+            tempsize += returnSize( elem );
         return tempsize;
     }

code/branches/cpp11_v2/src/libraries/util/SignalHandler.cc

@@ -81 +81 @@
     void SignalHandler::dontCatch()
     {
-      for ( SignalRecList::iterator it = sigRecList.begin(); it != sigRecList.end(); it++ )
-      {
-        signal( it->signal, it->handler );
+      for (auto & elem : sigRecList)
+      {
+        signal( elem.signal, elem.handler );
       }
 
@@ -133 +133 @@
       }
 
-      for ( SignalCallbackList::iterator it = SignalHandler::getInstance().callbackList.begin(); it != SignalHandler::getInstance().callbackList.end(); it++  )
-      {
-        (*(it->cb))( it->someData );
+      for (auto & elem : SignalHandler::getInstance().callbackList)
+      {
+        (*(elem.cb))( elem.someData );
       }
 

code/branches/cpp11_v2/src/libraries/util/SmallObjectAllocator.cc

@@ -53 +53 @@
     SmallObjectAllocator::~SmallObjectAllocator()
     {
-        for (std::vector<char*>::iterator it = this->blocks_.begin(); it != this->blocks_.end(); ++it)
-            delete[] *it;
+        for (auto & elem : this->blocks_)
+            delete[] elem;
     }
 

code/branches/cpp11_v2/src/libraries/util/StringUtils.cc

@@ -262 +262 @@
         std::string output(str.size() * 2, ' ');
         size_t i = 0;
-        for (size_t pos = 0; pos < str.size(); ++pos)
-        {
-            switch (str[pos])
+        for (auto & elem : str)
+        {
+            switch (elem)
             {
             case '\\': output[i] = '\\'; output[i + 1] = '\\'; break;
@@ -276 +276 @@
             case  '"': output[i] = '\\'; output[i + 1] =  '"'; break;
             case '\0': output[i] = '\\'; output[i + 1] =  '0'; break;
-            default  : output[i] = str[pos]; ++i; continue;
+            default  : output[i] = elem; ++i; continue;
             }
             i += 2;
@@ -336 +336 @@
     void lowercase(std::string* str)
     {
-        for (size_t i = 0; i < str->size(); ++i)
-        {
-            (*str)[i] = static_cast<char>(tolower((*str)[i]));
+        for (auto & elem : *str)
+        {
+            elem = static_cast<char>(tolower(elem));
         }
     }
@@ -353 +353 @@
     void uppercase(std::string* str)
     {
-        for (size_t i = 0; i < str->size(); ++i)
-        {
-            (*str)[i] = static_cast<char>(toupper((*str)[i]));
+        for (auto & elem : *str)
+        {
+            elem = static_cast<char>(toupper(elem));
         }
     }
@@ -460 +460 @@
     {
         size_t j = 0;
-        for (size_t i = 0; i < str.size(); ++i)
-        {
-            if (str[i] == target)
+        for (auto & elem : str)
+        {
+            if (elem == target)
             {
-                str[i] = replacement;
+                elem = replacement;
                 ++j;
             }

code/branches/cpp11_v2/src/libraries/util/output/BaseWriter.cc

@@ -116 +116 @@
 
         // iterate over all strings in the config-vector
-        for (size_t i = 0; i < this->configurableAdditionalContexts_.size(); ++i)
+        for (auto & full_name : this->configurableAdditionalContexts_)
         {
-            const std::string& full_name = this->configurableAdditionalContexts_[i];
+            
 
             // split the name into main-name and sub-name (if given; otherwise sub-name remains empty). both names are separated by ::

code/branches/cpp11_v2/src/libraries/util/output/MemoryWriter.cc

@@ -65 +65 @@
     void MemoryWriter::resendOutput(OutputListener* listener) const
     {
-        for (size_t i = 0; i < this->messages_.size(); ++i)
+        for (auto & message : this->messages_)
         {
-            const Message& message = this->messages_[i];
+            
             listener->unfilteredOutput(message.level, *message.context, message.lines);
         }

code/branches/cpp11_v2/src/libraries/util/output/OutputListener.cc

@@ -111 +111 @@
         this->levelMask_ = mask;
 
-        for (size_t i = 0; i < this->listeners_.size(); ++i)
-            this->listeners_[i]->updatedLevelMask(this);
+        for (auto & elem : this->listeners_)
+            elem->updatedLevelMask(this);
     }
 
@@ -142 +142 @@
         this->additionalContextsLevelMask_ = mask;
 
-        for (size_t i = 0; i < this->listeners_.size(); ++i)
-            this->listeners_[i]->updatedAdditionalContextsLevelMask(this);
+        for (auto & elem : this->listeners_)
+            elem->updatedAdditionalContextsLevelMask(this);
     }
 
@@ -153 +153 @@
         this->additionalContextsMask_ = mask;
 
-        for (size_t i = 0; i < this->listeners_.size(); ++i)
-            this->listeners_[i]->updatedAdditionalContextsMask(this);
+        for (auto & elem : this->listeners_)
+            elem->updatedAdditionalContextsMask(this);
     }
 

code/branches/cpp11_v2/src/libraries/util/output/OutputManager.cc

@@ -132 +132 @@
         vectorize(message, '\n', &lines);
 
-        for (size_t i = 0; i < this->listeners_.size(); ++i)
-            this->listeners_[i]->unfilteredOutput(level, context, lines);
+        for (auto & elem : this->listeners_)
+            elem->unfilteredOutput(level, context, lines);
     }
 
@@ -179 +179 @@
     {
         int mask = 0;
-        for (size_t i = 0; i < this->listeners_.size(); ++i)
-            mask |= this->listeners_[i]->getLevelMask();
+        for (auto & elem : this->listeners_)
+            mask |= elem->getLevelMask();
         this->combinedLevelMask_ = static_cast<OutputLevel>(mask);
     }
@@ -190 +190 @@
     {
         int mask = 0;
-        for (size_t i = 0; i < this->listeners_.size(); ++i)
-            mask |= this->listeners_[i]->getAdditionalContextsLevelMask();
+        for (auto & elem : this->listeners_)
+            mask |= elem->getAdditionalContextsLevelMask();
         this->combinedAdditionalContextsLevelMask_ = static_cast<OutputLevel>(mask);
     }
@@ -201 +201 @@
     {
         this->combinedAdditionalContextsMask_ = 0;
-        for (size_t i = 0; i < this->listeners_.size(); ++i)
-            this->combinedAdditionalContextsMask_ |= this->listeners_[i]->getAdditionalContextsMask();
+        for (auto & elem : this->listeners_)
+            this->combinedAdditionalContextsMask_ |= elem->getAdditionalContextsMask();
     }
 

code/branches/cpp11_v2/src/libraries/util/output/SubcontextOutputListener.cc

@@ -79 +79 @@
 
         // compose the mask of subcontexts and build the set of sub-context-IDs
-        for (std::set<const OutputContextContainer*>::const_iterator it = subcontexts.begin(); it != subcontexts.end(); ++it)
+        for (const auto & subcontext : subcontexts)
         {
-            this->subcontextsCheckMask_ |= (*it)->mask;
-            this->subcontexts_.insert((*it)->sub_id);
+            this->subcontextsCheckMask_ |= (subcontext)->mask;
+            this->subcontexts_.insert((subcontext)->sub_id);
         }