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

Timestamp:

Dec 2, 2015, 11:22:03 PM (9 years ago)

Author:

landauf

Message:

use actual types instead of 'auto'. only exception is for complicated template types, e.g. when iterating over a map

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 (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)
+        for (ConfigFileSection* section : this->sections_)
+        {
+            file << section->getFileEntry() << endl;
+
+            for (std::list<ConfigFileEntry*>::const_iterator it_entries = section->getEntriesBegin(); it_entries != section->getEntriesEnd(); ++it_entries)
                 file << (*it_entries)->getFileEntry() << endl;
 
@@ -278 +278 @@
         @brief Returns a pointer to the section with given name (or nullptr if the section doesn't exist).
     */
-    ConfigFileSection* ConfigFile::getSection(const std::string& section) const
-    {
-        for (const auto & elem : this->sections_)
-            if ((elem)->getName() == section)
-                return (elem);
+    ConfigFileSection* ConfigFile::getSection(const std::string& sectionName) const
+    {
+        for (ConfigFileSection* section : this->sections_)
+            if (section->getName() == sectionName)
+                return section;
         return nullptr;
     }
@@ -289 +289 @@
         @brief Returns a pointer to the section with given name. If it doesn't exist, the section is created.
     */
-    ConfigFileSection* ConfigFile::getOrCreateSection(const std::string& section)
-    {
-        for (auto & elem : this->sections_)
-            if ((elem)->getName() == section)
-                return (elem);
+    ConfigFileSection* ConfigFile::getOrCreateSection(const std::string& sectionName)
+    {
+        for (ConfigFileSection* section : this->sections_)
+            if (section->getName() == sectionName)
+                return section;
 
         this->bUpdated_ = true;
 
-        return (*this->sections_.insert(this->sections_.end(), new ConfigFileSection(section)));
+        return (*this->sections_.insert(this->sections_.end(), new ConfigFileSection(sectionName)));
     }
 
@@ -307 +307 @@
         bool sectionsUpdated = false;
 
-        for (auto & elem : this->sections_)
-        {
-            if ((elem)->bUpdated_)
+        for (ConfigFileSection* section : this->sections_)
+        {
+            if (section->bUpdated_)
             {
                 sectionsUpdated = true;
-                (elem)->bUpdated_ = false;
+                section->bUpdated_ = false;
             }
         }

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

@@ -53 +53 @@
     ConfigFileManager::~ConfigFileManager()
     {
-        for (const auto & elem : this->configFiles_)
-            if (elem)
-                delete (elem);
+        for (ConfigFile* configFile : this->configFiles_)
+            if (configFile)
+                delete configFile;
     }
 

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

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

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

@@ -130 +130 @@
 
                 this->value_ = V();
-                for (auto & elem : defvalue)
-                    this->valueVector_.push_back(MultiType(elem));
+                for (const D& defvalueElement : defvalue)
+                    this->valueVector_.push_back(MultiType(defvalueElement));
 
                 this->initVector();
@@ -183 +183 @@
                     std::vector<T> temp = *value;
                     value->clear();
-                    for (auto & elem : this->valueVector_)
-                        value->push_back(elem);
+                    for (const MultiType& vectorEntry : this->valueVector_)
+                        value->push_back(vectorEntry);
 
                     if (value->size() != temp.size())
@@ -211 +211 @@
                 {
                     value->clear();
-                    for (auto & elem : this->valueVector_)
-                        value->push_back(elem);
+                    for (const MultiType& vectorEntry : this->valueVector_)
+                        value->push_back(vectorEntry);
                 }
                 return *this;