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

Timestamp:

Nov 19, 2015, 11:40:28 AM (9 years ago)

Author:

muemart

Message:

Run clang-modernize -add-override
A few notes:

• There are probably some overrides missing, especially in funky templatey code
• Virtual methods with wrong signatures were not fixed, needs to be done by hand (only warnings get emitted)

Location:

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

Files:

• ConfigFile.cc (modified) (1 diff)
• ConfigFileEntryComment.h (modified) (1 diff)
• ConfigFileEntryValue.h (modified) (1 diff)
• ConfigFileEntryVectorValue.h (modified) (1 diff)
• ConfigValueContainer.h (modified) (1 diff)

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

@@ -38 +38 @@
 #include <iterator>
 #include <algorithm>
+#include <fstream>
 
 #include "util/Convert.h"

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

@@ -56 +56 @@
             inline virtual ~ConfigFileEntryComment() {}
 
-            inline virtual const std::string& getName() const
+            inline virtual const std::string& getName() const override
                 { return this->comment_; }
 
-            inline virtual void setComment(const std::string& comment)
+            inline virtual void setComment(const std::string& comment) override
                 { this->comment_ = comment; }
 
-            inline virtual void setValue(const std::string& value)
+            inline virtual void setValue(const std::string& value) override
                 {}
-            inline virtual const std::string& getValue() const
+            inline virtual const std::string& getValue() const override
                 { return BLANKSTRING; }
 
-            inline void setString(bool bString)
+            inline void setString(bool bString) override
                 {}
 
-            inline virtual const std::string& getFileEntry() const
+            inline virtual const std::string& getFileEntry() const override
                 { return this->comment_; }
 

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

@@ -69 +69 @@
             inline virtual ~ConfigFileEntryValue() {}
 
-            inline virtual const std::string& getName() const
+            inline virtual const std::string& getName() const override
                 { return this->name_; }
 
-            inline virtual void setComment(const std::string& comment)
+            inline virtual void setComment(const std::string& comment) override
                 { this->additionalComment_ = comment; this->update(); }
 
-            inline virtual void setValue(const std::string& value)
+            inline virtual void setValue(const std::string& value) override
                 { this->value_ = value; this->update(); }
-            inline virtual const std::string& getValue() const
+            inline virtual const std::string& getValue() const override
                 { return this->value_; }
 
-            inline void virtual setString(bool bString)
+            inline void virtual setString(bool bString) override
                 { this->bString_ = bString; this->update(); }
 
-            inline virtual const std::string& getFileEntry() const
+            inline virtual const std::string& getFileEntry() const override
                 { return this->fileEntry_; }
 

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

@@ -67 +67 @@
             inline ~ConfigFileEntryVectorValue() {}
 
-            inline unsigned int getIndex() const
+            inline unsigned int getIndex() const override
                 { return this->index_; }
 
             /// Returns the "key" of the value (the name of the vector plus the index of the element)
-            inline const std::string& getKeyString() const
+            inline const std::string& getKeyString() const override
                 { return this->keyString_; }
 
         private:
-            void update();
+            void update() override;
 
             unsigned int index_;        ///< The index of the element in the vector

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

@@ -68 +68 @@
             inline ConfigValueCallback(void (T::*function) (void)) : function_(function) {}
             inline virtual ~ConfigValueCallback() {}
-            inline virtual void call(void* object)
+            inline virtual void call(void* object) override
             {
                 if (!IdentifierManager::getInstance().isCreatingHierarchy())