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

Timestamp:

Nov 23, 2015, 10:20:29 PM (9 years ago)

Author:

landauf

Message:

always use 'virtual' in the declaration of virtual functions even if they are inherited

Location:

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

Files:

• ConfigFileEntryComment.h (modified) (1 diff)
• ConfigFileEntryValue.h (modified) (1 diff)
• ConfigFileEntryVectorValue.h (modified) (1 diff)
• ConfigValueContainer.h (modified) (2 diffs)
• SettingsConfigFile.h (modified) (1 diff)

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

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

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

@@ -67 +67 @@
 
             /// Destructor
-            inline virtual ~ConfigFileEntryValue() {}
+            virtual inline ~ConfigFileEntryValue() {}
 
-            inline virtual const std::string& getName() const override
+            virtual inline const std::string& getName() const override
                 { return this->name_; }
 
-            inline virtual void setComment(const std::string& comment) override
+            virtual inline void setComment(const std::string& comment) override
                 { this->additionalComment_ = comment; this->update(); }
 
-            inline virtual void setValue(const std::string& value) override
+            virtual inline void setValue(const std::string& value) override
                 { this->value_ = value; this->update(); }
-            inline virtual const std::string& getValue() const override
+            virtual inline const std::string& getValue() const override
                 { return this->value_; }
 
-            inline void virtual setString(bool bString) override
+            virtual inline void setString(bool bString) override
                 { this->bString_ = bString; this->update(); }
 
-            inline virtual const std::string& getFileEntry() const override
+            virtual inline const std::string& getFileEntry() const override
                 { return this->fileEntry_; }
 
             /// Returns the "key" of the value (in this case it's just the name of the entry, but for vectors it's different)
-            inline virtual const std::string& getKeyString() const
+            virtual inline const std::string& getKeyString() const
                 { return this->name_; }
 

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

@@ -67 +67 @@
             inline ~ConfigFileEntryVectorValue() {}
 
-            inline unsigned int getIndex() const override
+            virtual 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 override
+            virtual inline const std::string& getKeyString() const override
                 { return this->keyString_; }
 
         private:
-            void update() override;
+            virtual void update() override;
 
             unsigned int index_;        ///< The index of the element in the vector

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

@@ -59 +59 @@
         public:
             virtual void call(void* object) = 0;
-            inline virtual ~ConfigValueCallbackBase() {}
+            virtual inline ~ConfigValueCallbackBase() {}
     };
 
@@ -67 +67 @@
         public:
             inline ConfigValueCallback(void (T::*function) (void)) : function_(function) {}
-            inline virtual ~ConfigValueCallback() {}
-            inline virtual void call(void* object) override
+            virtual inline ~ConfigValueCallback() {}
+            virtual inline void call(void* object) override
             {
                 if (!IdentifierManager::getInstance().isCreatingHierarchy())

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

@@ -68 +68 @@
             ~SettingsConfigFile();
 
-            void load() override; // tolua_export
+            virtual void load() override; // tolua_export
             void setFilename(const std::string& filename); // tolua_export
             void clean(bool bCleanComments = false); // tolua_export