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

Timestamp:

Nov 4, 2015, 10:25:42 PM (9 years ago)

Author:

landauf

Message:

replace 'NULL' by 'nullptr'

Location:

code/branches/cpp11_v2/src/libraries/core/config

Files:

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

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

@@ -275 +275 @@
 
     /**
-        @brief Returns a pointer to the section with given name (or NULL if the section doesn't exist).
+        @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
@@ -282 +282 @@
             if ((*it)->getName() == section)
                 return (*it);
-        return NULL;
+        return nullptr;
     }
 

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

@@ -44 +44 @@
     ConfigFileManager* ConfigFileManager::singletonPtr_s = 0;
 
-    /// Constructor: Initializes the array of config files with NULL.
+    /// Constructor: Initializes the array of config files with nullptr.
     ConfigFileManager::ConfigFileManager()
     {
-        this->configFiles_.assign(NULL);
+        this->configFiles_.assign(nullptr);
     }
 

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

@@ -99 +99 @@
 
     /**
-        @brief Returns the entry with given name (or NULL if it doesn't exist).
+        @brief Returns the entry with given name (or nullptr if it doesn't exist).
 
         @param name     The name of the entry
@@ -110 +110 @@
                 return *it;
         }
-        return NULL;
+        return nullptr;
     }
 
     /**
-        @brief Returns the entry of a vector element with given name and index (or NULL if it doesn't exist).
+        @brief Returns the entry of a vector element with given name and index (or nullptr if it doesn't exist).
 
         @param name     The name of the vector
@@ -126 +126 @@
                 return *it;
         }
-        return NULL;
+        return nullptr;
     }
 

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

@@ -223 +223 @@
             inline const std::string& getSectionName() const
                 { return this->sectionname_; }
-            /// Returns the associated identifier (can be NULL).
+            /// Returns the associated identifier (can be nullptr).
             inline Identifier* getIdentifier() const
                 { return this->identifier_; }

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

@@ -106 +106 @@
     void SettingsConfigFile::addConfigValueContainer(ConfigValueContainer* container)
     {
-        if (container == NULL)
+        if (container == nullptr)
             return;
         std::pair<std::string, ConfigValueContainer*> second(getLowercase(container->getName()), container);
@@ -118 +118 @@
     void SettingsConfigFile::removeConfigValueContainer(ConfigValueContainer* container)
     {
-        if (container == NULL)
+        if (container == nullptr)
             return;
         const std::string& sectionLC = getLowercase(container->getSectionName());
@@ -269 +269 @@
             {
                 std::string value;
-                it->second.second->getValue<std::string, void>(&value, NULL);
+                it->second.second->getValue<std::string, void>(&value, nullptr);
                 return value;
             }