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

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

Files:

• ConfigurablePaths.cc (modified) (1 diff)
• Core.h (modified) (1 diff)
• CoreIncludes.h (modified) (2 diffs)
• CoreStaticInitializationHandler.h (modified) (1 diff)
• GUIManager.cc (modified) (3 diffs)
• GUIManager.h (modified) (1 diff)
• Game.h (modified) (1 diff)
• GraphicsManager.cc (modified) (1 diff)
• GraphicsManager.h (modified) (1 diff)
• LuaState.cc (modified) (1 diff)
• Namespace.h (modified) (1 diff)
• Template.h (modified) (1 diff)
• XMLPort.h (modified) (7 diffs)
• class/Identifier.h (modified) (1 diff)
• class/Super.h (modified) (1 diff)
• command/ConsoleCommandIncludes.h (modified) (1 diff)
• command/ConsoleCommandManager.h (modified) (1 diff)
• command/Functor.h (modified) (6 diffs)
• command/IOConsolePOSIX.h (modified) (1 diff)
• command/IOConsoleWindows.h (modified) (1 diff)
• command/Shell.h (modified) (2 diffs)
• commandline/CommandLineIncludes.h (modified) (1 diff)
• config/ConfigFile.cc (modified) (1 diff)
• config/ConfigFileEntryComment.h (modified) (1 diff)
• config/ConfigFileEntryValue.h (modified) (1 diff)
• config/ConfigFileEntryVectorValue.h (modified) (1 diff)
• config/ConfigValueContainer.h (modified) (1 diff)
• input/HalfAxis.h (modified) (1 diff)
• input/InputBuffer.h (modified) (2 diffs)
• input/InputCommands.h (modified) (2 diffs)
• input/InputDevice.h (modified) (6 diffs)
• input/InputManager.h (modified) (1 diff)
• input/InputState.h (modified) (1 diff)
• input/JoyStick.h (modified) (4 diffs)
• input/KeyBinder.h (modified) (1 diff)
• input/KeyDetector.h (modified) (1 diff)
• input/Keyboard.h (modified) (1 diff)
• input/Mouse.h (modified) (3 diffs)
• module/StaticInitializationHandlerIncludes.h (modified) (1 diff)
• object/DestroyLaterManager.h (modified) (1 diff)
• object/IteratorBase.h (modified) (1 diff)
• object/ObjectListBase.h (modified) (1 diff)
• object/WeakPtr.h (modified) (1 diff)
• singleton/ScopedSingletonIncludes.h (modified) (1 diff)
• singleton/ScopedSingletonWrapper.h (modified) (4 diffs)

code/branches/cpp11_v2/src/libraries/core/ConfigurablePaths.cc

@@ -54 +54 @@
 #include "util/Exception.h"
 #include "commandline/CommandLineIncludes.h"
+#include "core/ApplicationPaths.h"
 
 // Differentiate Boost Filesystem v2 and v3

code/branches/cpp11_v2/src/libraries/core/Core.h

@@ -45 +45 @@
 
 #include <string>
+#include <list>
 #include "util/DestructionHelper.h"
 #include "util/Singleton.h"

code/branches/cpp11_v2/src/libraries/core/CoreIncludes.h

@@ -221 +221 @@
         struct InheritsFromClass : public Identifier::InheritsFrom
         {
-            virtual Identifier* getParent() const { return Class(T); }
+            virtual Identifier* getParent() const override { return Class(T); }
         };
 
@@ -231 +231 @@
             ~StaticallyInitializedIdentifier() { delete identifier_; }
 
-            virtual void load()
+            virtual void load() override
             {
                 IdentifierManager::getInstance().addIdentifier(this->identifier_);
             }
 
-            virtual void unload()
+            virtual void unload() override
             {
                 IdentifierManager::getInstance().removeIdentifier(this->identifier_);

code/branches/cpp11_v2/src/libraries/core/CoreStaticInitializationHandler.h

@@ -43 +43 @@
             CoreStaticInitializationHandler() : bInitInstances_(false) {}
 
-            virtual void setupHandler();
-            virtual void shutdownHandler();
+            virtual void setupHandler() override;
+            virtual void shutdownHandler() override;
 
-            virtual void loadModule(ModuleInstance* module);
-            virtual void unloadModule(ModuleInstance* module);
+            virtual void loadModule(ModuleInstance* module) override;
+            virtual void unloadModule(ModuleInstance* module) override;
 
             inline void setInitInstances(bool bInitInstances)

code/branches/cpp11_v2/src/libraries/core/GUIManager.cc

@@ -124 +124 @@
     {
     public:
-        void logEvent(const CEGUI::String& message, CEGUI::LoggingLevel level = CEGUI::Standard)
+        void logEvent(const CEGUI::String& message, CEGUI::LoggingLevel level = CEGUI::Standard) override
         {
             OutputLevel orxonoxLevel = level::debug_output;
@@ -143 +143 @@
 
         /// Carbon copy from CEGUIDefaultLogger.cpp with a bugfix for Windows
-        void setLogFilename(const CEGUI::String& filename, bool append = false)
+        void setLogFilename(const CEGUI::String& filename, bool append = false) override
         {
             // Close current log file (if any)
@@ -228 +228 @@
     public:
         /// Callback from Ogre invoked before other stuff in our target queue is rendered
-        void renderQueueStarted(Ogre::uint8 id, const Ogre::String& invocation, bool& skipThisQueue)
+        void renderQueueStarted(Ogre::uint8 id, const Ogre::String& invocation, bool& skipThisQueue) override
         {
             if (id == Ogre::RENDER_QUEUE_OVERLAY && invocation.empty())

code/branches/cpp11_v2/src/libraries/core/GUIManager.h

@@ -169 +169 @@
 
         // keyHandler functions
-        void buttonPressed (const KeyEvent& evt);
-        void buttonReleased(const KeyEvent& evt);
+        void buttonPressed (const KeyEvent& evt) override;
+        void buttonReleased(const KeyEvent& evt) override;
 
         // mouseHandler functions
-        void buttonPressed (MouseButtonCode::ByEnum id);
-        void buttonReleased(MouseButtonCode::ByEnum id);
-        void mouseMoved    (IntVector2 abs, IntVector2 rel, IntVector2 clippingSize);
-        void mouseScrolled (int abs, int rel);
+        void buttonPressed (MouseButtonCode::ByEnum id) override;
+        void buttonReleased(MouseButtonCode::ByEnum id) override;
+        void mouseMoved    (IntVector2 abs, IntVector2 rel, IntVector2 clippingSize) override;
+        void mouseScrolled (int abs, int rel) override;
         void mouseLeft     ();
 
         // window event handler
-        virtual void windowResized(unsigned int newWidth, unsigned int newHeight);
-        virtual void windowFocusChanged(bool bFocus);
+        virtual void windowResized(unsigned int newWidth, unsigned int newHeight) override;
+        virtual void windowFocusChanged(bool bFocus) override;
 
 #ifdef ORXONOX_OLD_CEGUI

code/branches/cpp11_v2/src/libraries/core/Game.h

@@ -135 +135 @@
         {
         public:
-            std::shared_ptr<GameState> fabricateInternal(const GameStateInfo& info)
+            std::shared_ptr<GameState> fabricateInternal(const GameStateInfo& info) override
                 { return std::shared_ptr<GameState>(std::make_shared<T>(info)); }
         };

code/branches/cpp11_v2/src/libraries/core/GraphicsManager.cc

@@ -82 +82 @@
     {
     public:
-        void windowResized     (Ogre::RenderWindow* rw)
+        void windowResized     (Ogre::RenderWindow* rw) override
             { orxonox::WindowEventListener::resizeWindow(rw->getWidth(), rw->getHeight()); }
-        void windowFocusChange (Ogre::RenderWindow* rw)
+        void windowFocusChange (Ogre::RenderWindow* rw) override
             { orxonox::WindowEventListener::changeWindowFocus(rw->isActive()); }
-        void windowClosed      (Ogre::RenderWindow* rw)
+        void windowClosed      (Ogre::RenderWindow* rw) override
             { orxonox::Game::getInstance().stop(); }
-        void windowMoved       (Ogre::RenderWindow* rw)
+        void windowMoved       (Ogre::RenderWindow* rw) override
             { orxonox::WindowEventListener::moveWindow(); }
     };

code/branches/cpp11_v2/src/libraries/core/GraphicsManager.h

@@ -111 +111 @@
         // event from Ogre::LogListener
 #if OGRE_VERSION >= 0x010800
-        void messageLogged(const std::string& message, Ogre::LogMessageLevel lml, bool maskDebug, const std::string& logName, bool& skipThisMessage);
+        void messageLogged(const std::string& message, Ogre::LogMessageLevel lml, bool maskDebug, const std::string& logName, bool& skipThisMessage) override;
 #else
         void messageLogged(const std::string& message, Ogre::LogMessageLevel lml, bool maskDebug, const std::string& logName);

code/branches/cpp11_v2/src/libraries/core/LuaState.cc

@@ -33 +33 @@
 extern "C" {
 #include <lua.h>
-#include <lualib.h>
+#include <lualib.h>     
 }
 #include <loki/ScopeGuard.h>

code/branches/cpp11_v2/src/libraries/core/Namespace.h

@@ -50 +50 @@
             virtual ~Namespace();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
 
             void loadObjects(BaseObject* object);

code/branches/cpp11_v2/src/libraries/core/Template.h

@@ -54 +54 @@
             virtual ~Template();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-            virtual void changedName();
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+            virtual void changedName() override;
 
             inline void setLink(const std::string& link)

code/branches/cpp11_v2/src/libraries/core/XMLPort.h

@@ -459 +459 @@
             }
 
-            virtual XMLPortParamContainer& defaultValue(unsigned int index, const MultiType& param)
+            virtual XMLPortParamContainer& defaultValue(unsigned int index, const MultiType& param) override
             {
                 if (!this->loadexecutor_->defaultValueSet(index))
@@ -465 +465 @@
                 return this->portIfWaitingForDefaultValues(this->parseResult_, this->parseParams_);
             }
-            virtual XMLPortParamContainer& defaultValues(const MultiType& param1)
+            virtual XMLPortParamContainer& defaultValues(const MultiType& param1) override
             {
                 if (!this->loadexecutor_->defaultValueSet(0))
@@ -471 +471 @@
                 return this->portIfWaitingForDefaultValues(this->parseResult_, this->parseParams_);
             }
-            virtual XMLPortParamContainer& defaultValues(const MultiType& param1, const MultiType& param2)
+            virtual XMLPortParamContainer& defaultValues(const MultiType& param1, const MultiType& param2) override
             {
                 if ((!this->loadexecutor_->defaultValueSet(0)) || (!this->loadexecutor_->defaultValueSet(1)))
@@ -477 +477 @@
                 return this->portIfWaitingForDefaultValues(this->parseResult_, this->parseParams_);
             }
-            virtual XMLPortParamContainer& defaultValues(const MultiType& param1, const MultiType& param2, const MultiType& param3)
+            virtual XMLPortParamContainer& defaultValues(const MultiType& param1, const MultiType& param2, const MultiType& param3) override
             {
                 if ((!this->loadexecutor_->defaultValueSet(0)) || (!this->loadexecutor_->defaultValueSet(1)) || (!this->loadexecutor_->defaultValueSet(2)))
@@ -483 +483 @@
                 return this->portIfWaitingForDefaultValues(this->parseResult_, this->parseParams_);
             }
-            virtual XMLPortParamContainer& defaultValues(const MultiType& param1, const MultiType& param2, const MultiType& param3, const MultiType& param4)
+            virtual XMLPortParamContainer& defaultValues(const MultiType& param1, const MultiType& param2, const MultiType& param3, const MultiType& param4) override
             {
                 if ((!this->loadexecutor_->defaultValueSet(0)) || (!this->loadexecutor_->defaultValueSet(1)) || (!this->loadexecutor_->defaultValueSet(2)) || (!this->loadexecutor_->defaultValueSet(3)))
@@ -489 +489 @@
                 return this->portIfWaitingForDefaultValues(this->parseResult_, this->parseParams_);
             }
-            virtual XMLPortParamContainer& defaultValues(const MultiType& param1, const MultiType& param2, const MultiType& param3, const MultiType& param4, const MultiType& param5)
+            virtual XMLPortParamContainer& defaultValues(const MultiType& param1, const MultiType& param2, const MultiType& param3, const MultiType& param4, const MultiType& param5) override
             {
                 if ((!this->loadexecutor_->defaultValueSet(0)) || (!this->loadexecutor_->defaultValueSet(1)) || (!this->loadexecutor_->defaultValueSet(2)) || (!this->loadexecutor_->defaultValueSet(3)) || (!this->loadexecutor_->defaultValueSet(4)))
@@ -556 +556 @@
             }
 
-            void callLoadExecutor(BaseObject* object, BaseObject* newObject)
+            void callLoadExecutor(BaseObject* object, BaseObject* newObject) override
             {
                 T* castObject = orxonox_cast<T*>(object);

code/branches/cpp11_v2/src/libraries/core/class/Identifier.h

@@ -289 +289 @@
             bool initializeObject(T* object);
 
-            virtual void updateConfigValues(bool updateChildren = true) const;
-
-            virtual const std::type_info& getTypeInfo()
+            virtual void updateConfigValues(bool updateChildren = true) const override;
+
+            virtual const std::type_info& getTypeInfo() override
                 { return typeid(T); }
 
-            virtual bool canDynamicCastObjectToIdentifierClass(Identifiable* object) const
+            virtual bool canDynamicCastObjectToIdentifierClass(Identifiable* object) const override
                 { return dynamic_cast<T*>(object) != nullptr; }
 
-            virtual void destroyObjects();
+            virtual void destroyObjects() override;
 
             static ClassIdentifier<T>* getIdentifier();

code/branches/cpp11_v2/src/libraries/core/class/Super.h

@@ -584 +584 @@
         // Creates the super-function-callers by calling the first SuperFunctionCondition check
         // This get's called within the initialization of an Identifier
-        virtual void createSuperFunctionCaller() const
+        virtual void createSuperFunctionCaller() const override
         {
             SuperFunctionCondition<0, T, 0, 0>::superCheck();

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();

code/branches/cpp11_v2/src/libraries/core/commandline/CommandLineIncludes.h

@@ -64 +64 @@
             ~StaticallyInitializedCommandLineArgument() { delete argument_; }
 
-            virtual void load()
+            virtual void load() override
                 { CommandLineParser::addArgument(this->argument_); }
 
-            virtual void unload()
+            virtual void unload() override
                 { CommandLineParser::removeArgument(this->argument_); }
 

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())

code/branches/cpp11_v2/src/libraries/core/input/HalfAxis.h

@@ -56 +56 @@
         using Button::execute;
         bool execute();
-        bool addParamCommand(ParamCommand* command);
-        void clear();
+        bool addParamCommand(ParamCommand* command) override;
+        void clear() override;
         void reset();
 

code/branches/cpp11_v2/src/libraries/core/input/InputBuffer.h

@@ -66 +66 @@
         { }
         virtual ~InputBufferListenerTuple() { }
-        void callFunction()
+        void callFunction() override
         {
             (listener_->*function_)();
@@ -165 +165 @@
                 { if (this->cursor_ > 0) { --this->cursor_; } }
 
-            void buttonPressed(const KeyEvent& evt);
+            void buttonPressed(const KeyEvent& evt) override;
 
         private:
             bool charIsAllowed(const char& input);
 
-            void buttonHeld   (const KeyEvent& evt);
+            void buttonHeld   (const KeyEvent& evt) override;
             void processKey   (const KeyEvent& evt);
 
-            void keyboardUpdated(float dt);
+            void keyboardUpdated(float dt) override;
 
             std::string buffer_;

code/branches/cpp11_v2/src/libraries/core/input/InputCommands.h

@@ -76 +76 @@
     {
     public:
-        bool execute(float abs = 1.0f, float rel = 1.0f);
-        CommandEvaluation* getEvaluation();
-        virtual SimpleCommand* clone() { return new SimpleCommand(*this); }
+        bool execute(float abs = 1.0f, float rel = 1.0f) override;
+        CommandEvaluation* getEvaluation() override;
+        virtual SimpleCommand* clone() override { return new SimpleCommand(*this); }
 
         CommandEvaluation evaluation_;
@@ -104 +104 @@
     public:
         ParamCommand() : scale_(1.0f), paramCommand_(nullptr) { }
-        bool execute(float abs = 1.0f, float rel = 1.0f);
-        CommandEvaluation* getEvaluation();
-        virtual ParamCommand* clone() { return new ParamCommand(*this); }
+        bool execute(float abs = 1.0f, float rel = 1.0f) override;
+        CommandEvaluation* getEvaluation() override;
+        virtual ParamCommand* clone() override { return new ParamCommand(*this); }
 
         float scale_;

code/branches/cpp11_v2/src/libraries/core/input/InputDevice.h

@@ -153 +153 @@
 
         //! Captures OIS events (which then get distributed to the derived class) and creates the button held events
-        void update(const Clock& time)
+        void update(const Clock& time) override
         {
             oisDevice_->capture();
@@ -160 +160 @@
             for (unsigned int iB = 0; iB < pressedButtons_.size(); ++iB)
                 for (unsigned int iS = 0; iS < inputStates_.size(); ++iS)
-                    inputStates_[iS]->buttonEvent<ButtonEvent::THold, typename Traits::ButtonTypeParam>(
+                    inputStates_[iS]->template buttonEvent<ButtonEvent::THold, typename Traits::ButtonTypeParam>(
                         this->getDeviceID(), static_cast<DeviceClass*>(this)->getButtonEventArg(pressedButtons_[iB]));
 
@@ -171 +171 @@
 
         //! Clears the list of pressed buttons and calls the derived class's method
-        void clearBuffers()
+        void clearBuffers() override
         {
             pressedButtons_.clear();
@@ -180 +180 @@
         OISDeviceClass* getOISDevice()   { return this->oisDevice_; }
         // Returns the name of the derived class as string
-        std::string getClassName() const { return DeviceClass::getClassNameImpl(); }
+        std::string getClassName() const override { return DeviceClass::getClassNameImpl(); }
 
     protected:
@@ -197 +197 @@
             // Call states
             for (unsigned int i = 0; i < inputStates_.size(); ++i)
-                inputStates_[i]->buttonEvent<ButtonEvent::TPress, typename Traits::ButtonTypeParam>(this->getDeviceID(), static_cast<DeviceClass*>(this)->getButtonEventArg(button));
+                inputStates_[i]->template buttonEvent<ButtonEvent::TPress, typename Traits::ButtonTypeParam>(this->getDeviceID(), static_cast<DeviceClass*>(this)->getButtonEventArg(button));
         }
 
@@ -219 +219 @@
             // Call states
             for (unsigned int i = 0; i < inputStates_.size(); ++i)
-                inputStates_[i]->buttonEvent<ButtonEvent::TRelease, typename Traits::ButtonTypeParam>(this->getDeviceID(), static_cast<DeviceClass*>(this)->getButtonEventArg(button));
+                inputStates_[i]->template buttonEvent<ButtonEvent::TRelease, typename Traits::ButtonTypeParam>(this->getDeviceID(), static_cast<DeviceClass*>(this)->getButtonEventArg(button));
         }
 

code/branches/cpp11_v2/src/libraries/core/input/InputManager.h

@@ -208 +208 @@
 
         // From WindowEventListener
-        void windowFocusChanged(bool bFocus);
+        void windowFocusChanged(bool bFocus) override;
 
     private: // variables

code/branches/cpp11_v2/src/libraries/core/input/InputState.h

@@ -157 +157 @@
         ~InputState() { }
 
-        void JoyStickQuantityChanged(const std::vector<JoyStick*>& joyStickList);
+        void JoyStickQuantityChanged(const std::vector<JoyStick*>& joyStickList) override;
 
         //! Sets the priority (only to be used by the InputManager!)

code/branches/cpp11_v2/src/libraries/core/input/JoyStick.h

@@ -77 +77 @@
 
     private:
-        void calibrationStarted();
-        void calibrationStopped();
+        void calibrationStarted() override;
+        void calibrationStopped() override;
         void evaluateCalibration();
 
@@ -86 +86 @@
 
         //! OIS event handler
-        bool buttonPressed (const OIS::JoyStickEvent &arg, int button)
+        bool buttonPressed (const OIS::JoyStickEvent &arg, int button) override
         {
             super::buttonPressed(static_cast<JoyStickButtonCode::ByEnum>(button));
@@ -93 +93 @@
 
         //! OIS event handler
-        bool buttonReleased(const OIS::JoyStickEvent &arg, int button)
+        bool buttonReleased(const OIS::JoyStickEvent &arg, int button) override
         {
             super::buttonReleased(static_cast<JoyStickButtonCode::ByEnum>(button));
@@ -99 +99 @@
         }
 
-        bool axisMoved     (const OIS::JoyStickEvent &arg, int axis);
-        bool sliderMoved   (const OIS::JoyStickEvent &arg, int id);
-        bool povMoved      (const OIS::JoyStickEvent &arg, int id);
+        bool axisMoved     (const OIS::JoyStickEvent &arg, int axis) override;
+        bool sliderMoved   (const OIS::JoyStickEvent &arg, int id) override;
+        bool povMoved      (const OIS::JoyStickEvent &arg, int id) override;
         //! OIS event handler (don't remove that because of OIS version issues!)
-        bool vector3Moved  (const OIS::JoyStickEvent &arg, int id) { return true; }
+        bool vector3Moved  (const OIS::JoyStickEvent &arg, int id) override { return true; }
 
         //! Returns the class name as string

code/branches/cpp11_v2/src/libraries/core/input/KeyBinder.h

@@ -84 +84 @@
         void compilePointerLists();
         // from JoyStickQuantityListener interface
-        virtual void JoyStickQuantityChanged(const std::vector<JoyStick*>& joyStickList);
-
-        void allDevicesUpdated(float dt);
-        void mouseUpdated(float dt);
-        void joyStickUpdated(unsigned int joyStick, float dt);
+        virtual void JoyStickQuantityChanged(const std::vector<JoyStick*>& joyStickList) override;
+
+        void allDevicesUpdated(float dt) override;
+        void mouseUpdated(float dt) override;
+        void joyStickUpdated(unsigned int joyStick, float dt) override;
         // internal
         void tickHalfAxis(HalfAxis& halfAxis);
 
-        void buttonPressed (const KeyEvent& evt);
-        void buttonReleased(const KeyEvent& evt);
-        void buttonHeld    (const KeyEvent& evt);
-
-        void buttonPressed (MouseButtonCode::ByEnum button);
-        void buttonReleased(MouseButtonCode::ByEnum button);
-        void buttonHeld    (MouseButtonCode::ByEnum button);
-        void mouseMoved    (IntVector2 abs, IntVector2 rel, IntVector2 clippingSize);
-        void mouseScrolled (int abs, int rel);
-
-        void buttonPressed (unsigned int device, JoyStickButtonCode::ByEnum button);
-        void buttonReleased(unsigned int device, JoyStickButtonCode::ByEnum button);
-        void buttonHeld    (unsigned int device, JoyStickButtonCode::ByEnum button);
-        void axisMoved     (unsigned int device, unsigned int axis, float value);
+        void buttonPressed (const KeyEvent& evt) override;
+        void buttonReleased(const KeyEvent& evt) override;
+        void buttonHeld    (const KeyEvent& evt) override;
+
+        void buttonPressed (MouseButtonCode::ByEnum button) override;
+        void buttonReleased(MouseButtonCode::ByEnum button) override;
+        void buttonHeld    (MouseButtonCode::ByEnum button) override;
+        void mouseMoved    (IntVector2 abs, IntVector2 rel, IntVector2 clippingSize) override;
+        void mouseScrolled (int abs, int rel) override;
+
+        void buttonPressed (unsigned int device, JoyStickButtonCode::ByEnum button) override;
+        void buttonReleased(unsigned int device, JoyStickButtonCode::ByEnum button) override;
+        void buttonHeld    (unsigned int device, JoyStickButtonCode::ByEnum button) override;
+        void axisMoved     (unsigned int device, unsigned int axis, float value) override;
 
     protected: // variables

code/branches/cpp11_v2/src/libraries/core/input/KeyDetector.h

@@ -51 +51 @@
 
         void callback(const std::string& name);
-        void JoyStickQuantityChanged(const std::vector<JoyStick*>& joyStickList);
+        void JoyStickQuantityChanged(const std::vector<JoyStick*>& joyStickList) override;
         void assignCommands();
 

code/branches/cpp11_v2/src/libraries/core/input/Keyboard.h

@@ -75 +75 @@
         }
 
-        bool keyPressed(const OIS::KeyEvent& arg);
-        bool keyReleased(const OIS::KeyEvent& arg);
+        bool keyPressed(const OIS::KeyEvent& arg) override;
+        bool keyReleased(const OIS::KeyEvent& arg) override;
 
         //! Returns the class name as string

code/branches/cpp11_v2/src/libraries/core/input/Mouse.h

@@ -74 +74 @@
     private:
         //! OIS event handler
-        bool mousePressed(const OIS::MouseEvent &arg, OIS::MouseButtonID id)
+        bool mousePressed(const OIS::MouseEvent &arg, OIS::MouseButtonID id) override
         {
             super::buttonPressed(static_cast<MouseButtonCode::ByEnum>(id));
@@ -81 +81 @@
 
         //! OIS event handler
-        bool mouseReleased(const OIS::MouseEvent &arg, OIS::MouseButtonID id)
+        bool mouseReleased(const OIS::MouseEvent &arg, OIS::MouseButtonID id) override
         {
             super::buttonReleased(static_cast<MouseButtonCode::ByEnum>(id));
@@ -87 +87 @@
         }
 
-        bool mouseMoved(const OIS::MouseEvent &arg);
+        bool mouseMoved(const OIS::MouseEvent &arg) override;
 
-        void windowResized(unsigned int newWidth, unsigned int newHeight);
+        void windowResized(unsigned int newWidth, unsigned int newHeight) override;
 
         // Returns the class name as string

code/branches/cpp11_v2/src/libraries/core/module/StaticInitializationHandlerIncludes.h

@@ -53 +53 @@
             ~StaticallyInitializedStaticInitializationHandler() { delete handler_; }
 
-            virtual void load();
-            virtual void unload();
+            virtual void load() override;
+            virtual void unload() override;
 
             inline StaticInitializationHandler& getHandler()

code/branches/cpp11_v2/src/libraries/core/object/DestroyLaterManager.h

@@ -45 +45 @@
             virtual ~DestroyLaterManager();
 
-            virtual void preUpdate(const Clock& time) { /*no action*/ }
-            virtual void postUpdate(const Clock& time);
+            virtual void preUpdate(const Clock& time) override { /*no action*/ }
+            virtual void postUpdate(const Clock& time) override;
 
             void retain(Destroyable* instance)

code/branches/cpp11_v2/src/libraries/core/object/IteratorBase.h

@@ -175 +175 @@
                 @param object The object to compare with
             */
-            virtual void removedElement(ObjectListBaseElement* element)
+            virtual void removedElement(ObjectListBaseElement* element) override
             {
                 if (this->element_ == element)

code/branches/cpp11_v2/src/libraries/core/object/ObjectListBase.h

@@ -82 +82 @@
             ObjectListElement(T* object) : ObjectListBaseElement(static_cast<Listable*>(object)), object_(object) {}
 
-            virtual void changeContext(Context* oldContext, Context* newContext)
+            virtual void changeContext(Context* oldContext, Context* newContext) override
             {
                 // add object to new context, but only if this element belongs exactly to the old context (and not to a sub-context to avoid re-adding objects

code/branches/cpp11_v2/src/libraries/core/object/WeakPtr.h

@@ -230 +230 @@
         private:
             /// Will be called by Destroyable::~Destroyable() if the stored object is deleted. Resets the wrapped pointer and executes the callback.
-            inline void objectDeleted()
+            inline void objectDeleted() override
             {
                 this->base_ = nullptr;

code/branches/cpp11_v2/src/libraries/core/singleton/ScopedSingletonIncludes.h

@@ -87 +87 @@
             ~StaticallyInitializedScopedSingletonWrapper() { delete wrapper_; }
 
-            virtual void load();
-            virtual void unload();
+            virtual void load() override;
+            virtual void unload() override;
 
             inline ScopedSingletonWrapper& getWrapper()

code/branches/cpp11_v2/src/libraries/core/singleton/ScopedSingletonWrapper.h

@@ -102 +102 @@
 
         //! Called if the Scope of the Singleton gets active (creates the instance)
-        void activated()
+        void activated() override
         {
             assert(singletonPtr_ == nullptr);
@@ -109 +109 @@
 
         //! Called if the Scope of this Singleton gets deactivated (destroys the instance)
-        void deactivated()
+        void deactivated() override
         {
             assert(singletonPtr_ != nullptr);
@@ -157 +157 @@
 
         //! Called if the Scope of the Singleton gets active (creates the instance)
-        void activated()
+        void activated() override
         {
             assert(singletonPtr_ == nullptr);
@@ -169 +169 @@
 
         //! Called if the Scope of this Singleton gets deactivated (destroys the instance)
-        void deactivated()
+        void deactivated() override
         {
             if (singletonPtr_ != nullptr)