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

Timestamp:

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

Files:

• ConfigFile.cc (modified) (4 diffs)
• ConfigFileManager.cc (modified) (1 diff)
• ConfigFileSection.cc (modified) (3 diffs)
• ConfigValueContainer.h (modified) (3 diffs)

code/branches/cpp11_v2/src/libraries/core/config/ConfigFile.cc

@@ -234 +234 @@
         }
 
-        for (std::list<ConfigFileSection*>::const_iterator it = this->sections_.begin(); it != this->sections_.end(); ++it)
-        {
-            file << (*it)->getFileEntry() << endl;
-
-            for (std::list<ConfigFileEntry*>::const_iterator it_entries = (*it)->getEntriesBegin(); it_entries != (*it)->getEntriesEnd(); ++it_entries)
+        for (const auto & elem : this->sections_)
+        {
+            file << (elem)->getFileEntry() << endl;
+
+            for (std::list<ConfigFileEntry*>::const_iterator it_entries = (elem)->getEntriesBegin(); it_entries != (elem)->getEntriesEnd(); ++it_entries)
                 file << (*it_entries)->getFileEntry() << endl;
 
@@ -280 +280 @@
     ConfigFileSection* ConfigFile::getSection(const std::string& section) const
     {
-        for (std::list<ConfigFileSection*>::const_iterator it = this->sections_.begin(); it != this->sections_.end(); ++it)
-            if ((*it)->getName() == section)
-                return (*it);
+        for (const auto & elem : this->sections_)
+            if ((elem)->getName() == section)
+                return (elem);
         return nullptr;
     }
@@ -291 +291 @@
     ConfigFileSection* ConfigFile::getOrCreateSection(const std::string& section)
     {
-        for (std::list<ConfigFileSection*>::iterator it = this->sections_.begin(); it != this->sections_.end(); ++it)
-            if ((*it)->getName() == section)
-                return (*it);
+        for (auto & elem : this->sections_)
+            if ((elem)->getName() == section)
+                return (elem);
 
         this->bUpdated_ = true;
@@ -307 +307 @@
         bool sectionsUpdated = false;
 
-        for (std::list<ConfigFileSection*>::iterator it = this->sections_.begin(); it != this->sections_.end(); ++it)
-        {
-            if ((*it)->bUpdated_)
+        for (auto & elem : this->sections_)
+        {
+            if ((elem)->bUpdated_)
             {
                 sectionsUpdated = true;
-                (*it)->bUpdated_ = false;
+                (elem)->bUpdated_ = false;
             }
         }

code/branches/cpp11_v2/src/libraries/core/config/ConfigFileManager.cc

@@ -53 +53 @@
     ConfigFileManager::~ConfigFileManager()
     {
-        for (std::array<ConfigFile*, 3>::const_iterator it = this->configFiles_.begin(); it != this->configFiles_.end(); ++it)
-            if (*it)
-                delete (*it);
+        for (const auto & elem : this->configFiles_)
+            if (elem)
+                delete (elem);
     }
 

code/branches/cpp11_v2/src/libraries/core/config/ConfigFileSection.cc

@@ -80 +80 @@
     {
         unsigned int size = 0;
-        for (std::list<ConfigFileEntry*>::const_iterator it = this->entries_.begin(); it != this->entries_.end(); ++it)
-            if ((*it)->getName() == name)
-                if ((*it)->getIndex() >= size)
-                    size = (*it)->getIndex() + 1;
+        for (const auto & elem : this->entries_)
+            if ((elem)->getName() == name)
+                if ((elem)->getIndex() >= size)
+                    size = (elem)->getIndex() + 1;
         return size;
     }
@@ -105 +105 @@
     ConfigFileEntry* ConfigFileSection::getEntry(const std::string& name) const
     {
-        for (std::list<ConfigFileEntry*>::const_iterator it = this->entries_.begin(); it != this->entries_.end(); ++it)
+        for (const auto & elem : this->entries_)
         {
-            if ((*it)->getName() == name)
-                return *it;
+            if ((elem)->getName() == name)
+                return elem;
         }
         return nullptr;
@@ -121 +121 @@
     ConfigFileEntry* ConfigFileSection::getEntry(const std::string& name, unsigned int index) const
     {
-        for (std::list<ConfigFileEntry*>::const_iterator it = this->entries_.begin(); it != this->entries_.end(); ++it)
+        for (const auto & elem : this->entries_)
         {
-            if (((*it)->getName() == name) && ((*it)->getIndex() == index))
-                return *it;
+            if (((elem)->getName() == name) && ((elem)->getIndex() == index))
+                return elem;
         }
         return nullptr;

code/branches/cpp11_v2/src/libraries/core/config/ConfigValueContainer.h

@@ -130 +130 @@
 
                 this->value_ = V();
-                for (unsigned int i = 0; i < defvalue.size(); i++)
-                    this->valueVector_.push_back(MultiType(defvalue[i]));
+                for (auto & elem : defvalue)
+                    this->valueVector_.push_back(MultiType(elem));
 
                 this->initVector();
@@ -183 +183 @@
                     std::vector<T> temp = *value;
                     value->clear();
-                    for (unsigned int i = 0; i < this->valueVector_.size(); ++i)
-                        value->push_back(this->valueVector_[i]);
+                    for (auto & elem : this->valueVector_)
+                        value->push_back(elem);
 
                     if (value->size() != temp.size())
@@ -211 +211 @@
                 {
                     value->clear();
-                    for (unsigned int i = 0; i < this->valueVector_.size(); ++i)
-                        value->push_back(this->valueVector_[i]);
+                    for (auto & elem : this->valueVector_)
+                        value->push_back(elem);
                 }
                 return *this;