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

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/command

Files:

• ConsoleCommandIncludes.h (modified) (1 diff)
• ConsoleCommandManager.h (modified) (1 diff)
• Functor.h (modified) (6 diffs)
• IOConsolePOSIX.h (modified) (1 diff)
• IOConsoleWindows.h (modified) (1 diff)
• Shell.h (modified) (2 diffs)

code/branches/cpp11_v2/src/libraries/core/command/ConsoleCommandIncludes.h

@@ -316 +316 @@
             ~StaticallyInitializedConsoleCommand() { delete command_; }
 
-            virtual void load();
-            virtual void unload();
+            virtual void load() override;
+            virtual void unload() override;
 
             inline ConsoleCommand& getCommand()

code/branches/cpp11_v2/src/libraries/core/command/ConsoleCommandManager.h

@@ -38 +38 @@
 
 #include "util/Singleton.h"
+
+#include <map>
 
 namespace orxonox

code/branches/cpp11_v2/src/libraries/core/command/Functor.h

@@ -249 +249 @@
 
             // see Functor::operator()()
-            MultiType operator()(const MultiType& param1 = MultiType::Null, const MultiType& param2 = MultiType::Null, const MultiType& param3 = MultiType::Null, const MultiType& param4 = MultiType::Null, const MultiType& param5 = MultiType::Null)
+            MultiType operator()(const MultiType& param1 = MultiType::Null, const MultiType& param2 = MultiType::Null, const MultiType& param3 = MultiType::Null, const MultiType& param4 = MultiType::Null, const MultiType& param5 = MultiType::Null) override
             {
                 // call the function if an object was assigned
@@ -262 +262 @@
 
             // see Functor::getType()
-            inline Functor::Type::Enum getType() const
+            inline Functor::Type::Enum getType() const override
                 { return Functor::Type::Member; }
 
@@ -280 +280 @@
 
             // see Functor::setRawObjectPointer()
-            inline void setRawObjectPointer(void* object)
+            inline void setRawObjectPointer(void* object) override
                 { this->setObject((O*)object); }
             // see Functor::getRawObjectPointer()
-            inline void* getRawObjectPointer() const
+            inline void* getRawObjectPointer() const override
                 { return this->object_; }
 
             // see Functor::setSafeMode()
-            inline void setSafeMode(bool bSafeMode)
+            inline void setSafeMode(bool bSafeMode) override
             {
                 if (bSafeMode == this->bSafeMode_)
@@ -309 +309 @@
 
             /// Will be called by Destroyable::~Destroyable() if the stored object is deleted and the Functor is in safe mode.
-            inline void objectDeleted()
+            inline void objectDeleted() override
                 { this->object_ = nullptr; }
 
@@ -328 +328 @@
 
             // see Functor::operator()()
-            MultiType operator()(const MultiType& param1 = MultiType::Null, const MultiType& param2 = MultiType::Null, const MultiType& param3 = MultiType::Null, const MultiType& param4 = MultiType::Null, const MultiType& param5 = MultiType::Null)
+            MultiType operator()(const MultiType& param1 = MultiType::Null, const MultiType& param2 = MultiType::Null, const MultiType& param3 = MultiType::Null, const MultiType& param4 = MultiType::Null, const MultiType& param5 = MultiType::Null) override
             {
                 return (*this)((void*)nullptr, param1, param2, param3, param4, param5);
@@ -334 +334 @@
 
             // see Functor::getType()
-            inline Functor::Type::Enum getType() const
+            inline Functor::Type::Enum getType() const override
                 { return Functor::Type::Static; }
 
             // see Functor::setRawObjectPointer()
-            inline void setRawObjectPointer(void*)
+            inline void setRawObjectPointer(void*) override
                 { orxout(internal_warning) << "Can't assign an object pointer to a static functor" << endl; }
             // see Functor::getRawObjectPointer()
-            inline void* getRawObjectPointer() const
+            inline void* getRawObjectPointer() const override
                 { return nullptr; }
 
             // see Functor::setSafeMode()
-            inline void setSafeMode(bool) {}
+            inline void setSafeMode(bool) override {}
     };
 

code/branches/cpp11_v2/src/libraries/core/command/IOConsolePOSIX.h

@@ -65 +65 @@
 
         // Methods from ShellListener
-        void linesChanged();
-        void lineAdded();
-        void inputChanged();
-        void cursorChanged();
-        void executed();
-        void exit();
+        void linesChanged() override;
+        void lineAdded() override;
+        void inputChanged() override;
+        void cursorChanged() override;
+        void executed() override;
+        void exit() override;
 
         bool willPrintStatusLines();

code/branches/cpp11_v2/src/libraries/core/command/IOConsoleWindows.h

@@ -67 +67 @@
 
         // Methods from ShellListener
-        void linesChanged();
-        void lineAdded();
-        void inputChanged();
-        void cursorChanged();
-        void executed();
-        void exit();
+        void linesChanged() override;
+        void lineAdded() override;
+        void inputChanged() override;
+        void cursorChanged() override;
+        void executed() override;
+        void exit() override;
 
         void resetTerminalMode();

code/branches/cpp11_v2/src/libraries/core/command/Shell.h

@@ -151 +151 @@
 
             // DevModeListener
-            void devModeChanged(bool value);
+            void devModeChanged(bool value) override;
 
             void addToHistory(const std::string& command);
@@ -157 +157 @@
             void clearInput();
             // BaseWriter
-            virtual void printLine(const std::string& line, OutputLevel level);
+            virtual void printLine(const std::string& line, OutputLevel level) override;
 
             void configureInputBuffer();