Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 10845


Ignore:
Timestamp:
Nov 23, 2015, 10:20:29 PM (8 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
Files:
91 edited

Legend:

Unmodified
Added
Removed

  • code/branches/cpp11_v2/src/libraries/core/BaseObject.h

    r10768 r10845  
    163163            inline void setScene(const StrongOrWeakPtr<Scene>& scene, uint32_t sceneID) { this->scene_ = scene; this->sceneID_=sceneID; }
    164164            inline Scene* getScene() const { return this->scene_.get(); }
    165             inline virtual uint32_t getSceneID() const { return this->sceneID_; }
     165            virtual inline uint32_t getSceneID() const { return this->sceneID_; }
    166166
    167167            inline void setGametype(const StrongOrWeakPtr<Gametype>& gametype) { this->gametype_ = gametype; }

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

    r10817 r10845  
    124124    {
    125125    public:
    126         void logEvent(const CEGUI::String& message, CEGUI::LoggingLevel level = CEGUI::Standard) override
     126        virtual void logEvent(const CEGUI::String& message, CEGUI::LoggingLevel level = CEGUI::Standard) override
    127127        {
    128128            OutputLevel orxonoxLevel = level::debug_output;
    … …  
    143143
    144144        /// Carbon copy from CEGUIDefaultLogger.cpp with a bugfix for Windows
    145         void setLogFilename(const CEGUI::String& filename, bool append = false) override
     145        virtual void setLogFilename(const CEGUI::String& filename, bool append = false) override
    146146        {
    147147            // Close current log file (if any)
    … …  
    228228    public:
    229229        /// Callback from Ogre invoked before other stuff in our target queue is rendered
    230         void renderQueueStarted(Ogre::uint8 id, const Ogre::String& invocation, bool& skipThisQueue) override
     230        virtual void renderQueueStarted(Ogre::uint8 id, const Ogre::String& invocation, bool& skipThisQueue) override
    231231        {
    232232            if (id == Ogre::RENDER_QUEUE_OVERLAY && invocation.empty())

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

    r10817 r10845  
    169169
    170170        // keyHandler functions
    171         void buttonPressed (const KeyEvent& evt) override;
    172         void buttonReleased(const KeyEvent& evt) override;
     171        virtual void buttonPressed (const KeyEvent& evt) override;
     172        virtual void buttonReleased(const KeyEvent& evt) override;
    173173
    174174        // mouseHandler functions
    175         void buttonPressed (MouseButtonCode::ByEnum id) override;
    176         void buttonReleased(MouseButtonCode::ByEnum id) override;
    177         void mouseMoved    (IntVector2 abs, IntVector2 rel, IntVector2 clippingSize) override;
    178         void mouseScrolled (int abs, int rel) override;
     175        virtual void buttonPressed (MouseButtonCode::ByEnum id) override;
     176        virtual void buttonReleased(MouseButtonCode::ByEnum id) override;
     177        virtual void mouseMoved    (IntVector2 abs, IntVector2 rel, IntVector2 clippingSize) override;
     178        virtual void mouseScrolled (int abs, int rel) override;
    179179        void mouseLeft     ();
    180180

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

    r10817 r10845  
    135135        {
    136136        public:
    137             std::shared_ptr<GameState> fabricateInternal(const GameStateInfo& info) override
     137            virtual std::shared_ptr<GameState> fabricateInternal(const GameStateInfo& info) override
    138138                { return std::shared_ptr<GameState>(std::make_shared<T>(info)); }
    139139        };

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

    r10817 r10845  
    8282    {
    8383    public:
    84         void windowResized     (Ogre::RenderWindow* rw) override
     84        virtual void windowResized     (Ogre::RenderWindow* rw) override
    8585            { orxonox::WindowEventListener::resizeWindow(rw->getWidth(), rw->getHeight()); }
    86         void windowFocusChange (Ogre::RenderWindow* rw) override
     86        virtual void windowFocusChange (Ogre::RenderWindow* rw) override
    8787            { orxonox::WindowEventListener::changeWindowFocus(rw->isActive()); }
    88         void windowClosed      (Ogre::RenderWindow* rw) override
     88        virtual void windowClosed      (Ogre::RenderWindow* rw) override
    8989            { orxonox::Game::getInstance().stop(); }
    90         void windowMoved       (Ogre::RenderWindow* rw) override
     90        virtual void windowMoved       (Ogre::RenderWindow* rw) override
    9191            { orxonox::WindowEventListener::moveWindow(); }
    9292    };

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

    r10817 r10845  
    111111        // event from Ogre::LogListener
    112112#if OGRE_VERSION >= 0x010800
    113         void messageLogged(const std::string& message, Ogre::LogMessageLevel lml, bool maskDebug, const std::string& logName, bool& skipThisMessage) override;
     113        virtual void messageLogged(const std::string& message, Ogre::LogMessageLevel lml, bool maskDebug, const std::string& logName, bool& skipThisMessage) override;
    114114#else
    115         void messageLogged(const std::string& message, Ogre::LogMessageLevel lml, bool maskDebug, const std::string& logName);
     115        virtual void messageLogged(const std::string& message, Ogre::LogMessageLevel lml, bool maskDebug, const std::string& logName) override;
    116116#endif
    117117

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

    r10817 r10845  
    556556            }
    557557
    558             void callLoadExecutor(BaseObject* object, BaseObject* newObject) override
     558            virtual void callLoadExecutor(BaseObject* object, BaseObject* newObject) override
    559559            {
    560560                T* castObject = orxonox_cast<T*>(object);

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

    r10828 r10845  
    249249
    250250            // see Functor::operator()()
    251             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
     251            virtual 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
    252252            {
    253253                // call the function if an object was assigned
    … …  
    262262
    263263            // see Functor::getType()
    264             inline Functor::Type::Enum getType() const override
     264            virtual inline Functor::Type::Enum getType() const override
    265265                { return Functor::Type::Member; }
    266266
    … …  
    280280
    281281            // see Functor::setRawObjectPointer()
    282             inline void setRawObjectPointer(void* object) override
     282            virtual inline void setRawObjectPointer(void* object) override
    283283                { this->setObject((O*)object); }
    284284            // see Functor::getRawObjectPointer()
    285             inline void* getRawObjectPointer() const override
     285            virtual inline void* getRawObjectPointer() const override
    286286                { return this->object_; }
    287287
    288288            // see Functor::setSafeMode()
    289             inline void setSafeMode(bool bSafeMode) override
     289            virtual inline void setSafeMode(bool bSafeMode) override
    290290            {
    291291                if (bSafeMode == this->bSafeMode_)
    … …  
    309309
    310310            /// Will be called by Destroyable::~Destroyable() if the stored object is deleted and the Functor is in safe mode.
    311             inline void objectDeleted() override
     311            virtual inline void objectDeleted() override
    312312                { this->object_ = nullptr; }
    313313
    … …  
    328328
    329329            // see Functor::operator()()
    330             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
     330            virtual 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
    331331            {
    332332                return (*this)((void*)nullptr, param1, param2, param3, param4, param5);
    … …  
    334334
    335335            // see Functor::getType()
    336             inline Functor::Type::Enum getType() const override
     336            virtual inline Functor::Type::Enum getType() const override
    337337                { return Functor::Type::Static; }
    338338
    339339            // see Functor::setRawObjectPointer()
    340             inline void setRawObjectPointer(void*) override
     340            virtual inline void setRawObjectPointer(void*) override
    341341                { orxout(internal_warning) << "Can't assign an object pointer to a static functor" << endl; }
    342342            // see Functor::getRawObjectPointer()
    343             inline void* getRawObjectPointer() const override
     343            virtual inline void* getRawObjectPointer() const override
    344344                { return nullptr; }
    345345
    346346            // see Functor::setSafeMode()
    347             inline void setSafeMode(bool) override {}
     347            virtual inline void setSafeMode(bool) override {}
    348348    };
    349349

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

    r10817 r10845  
    6565
    6666        // Methods from ShellListener
    67         void linesChanged() override;
    68         void lineAdded() override;
    69         void inputChanged() override;
    70         void cursorChanged() override;
    71         void executed() override;
    72         void exit() override;
     67        virtual void linesChanged() override;
     68        virtual void lineAdded() override;
     69        virtual void inputChanged() override;
     70        virtual void cursorChanged() override;
     71        virtual void executed() override;
     72        virtual void exit() override;
    7373
    7474        bool willPrintStatusLines();

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

    r10817 r10845  
    6767
    6868        // Methods from ShellListener
    69         void linesChanged() override;
    70         void lineAdded() override;
    71         void inputChanged() override;
    72         void cursorChanged() override;
    73         void executed() override;
    74         void exit() override;
     69        virtual void linesChanged() override;
     70        virtual void lineAdded() override;
     71        virtual void inputChanged() override;
     72        virtual void cursorChanged() override;
     73        virtual void executed() override;
     74        virtual void exit() override;
    7575
    7676        void resetTerminalMode();

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

    r10817 r10845  
    151151
    152152            // DevModeListener
    153             void devModeChanged(bool value) override;
     153            virtual void devModeChanged(bool value) override;
    154154
    155155            void addToHistory(const std::string& command);

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

    r10817 r10845  
    5454
    5555            /// Destructor
    56             inline virtual ~ConfigFileEntryComment() {}
     56            virtual inline ~ConfigFileEntryComment() {}
    5757
    58             inline virtual const std::string& getName() const override
     58            virtual inline const std::string& getName() const override
    5959                { return this->comment_; }
    6060
    61             inline virtual void setComment(const std::string& comment) override
     61            virtual inline void setComment(const std::string& comment) override
    6262                { this->comment_ = comment; }
    6363
    64             inline virtual void setValue(const std::string& value) override
     64            virtual inline void setValue(const std::string& value) override
    6565                {}
    66             inline virtual const std::string& getValue() const override
     66            virtual inline const std::string& getValue() const override
    6767                { return BLANKSTRING; }
    6868
    69             inline void setString(bool bString) override
     69            virtual inline void setString(bool bString) override
    7070                {}
    7171
    72             inline virtual const std::string& getFileEntry() const override
     72            virtual inline const std::string& getFileEntry() const override
    7373                { return this->comment_; }
    7474

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

    r10817 r10845  
    6767
    6868            /// Destructor
    69             inline virtual ~ConfigFileEntryValue() {}
     69            virtual inline ~ConfigFileEntryValue() {}
    7070
    71             inline virtual const std::string& getName() const override
     71            virtual inline const std::string& getName() const override
    7272                { return this->name_; }
    7373
    74             inline virtual void setComment(const std::string& comment) override
     74            virtual inline void setComment(const std::string& comment) override
    7575                { this->additionalComment_ = comment; this->update(); }
    7676
    77             inline virtual void setValue(const std::string& value) override
     77            virtual inline void setValue(const std::string& value) override
    7878                { this->value_ = value; this->update(); }
    79             inline virtual const std::string& getValue() const override
     79            virtual inline const std::string& getValue() const override
    8080                { return this->value_; }
    8181
    82             inline void virtual setString(bool bString) override
     82            virtual inline void setString(bool bString) override
    8383                { this->bString_ = bString; this->update(); }
    8484
    85             inline virtual const std::string& getFileEntry() const override
     85            virtual inline const std::string& getFileEntry() const override
    8686                { return this->fileEntry_; }
    8787
    8888            /// Returns the "key" of the value (in this case it's just the name of the entry, but for vectors it's different)
    89             inline virtual const std::string& getKeyString() const
     89            virtual inline const std::string& getKeyString() const
    9090                { return this->name_; }
    9191

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

    r10817 r10845  
    6767            inline ~ConfigFileEntryVectorValue() {}
    6868
    69             inline unsigned int getIndex() const override
     69            virtual inline unsigned int getIndex() const override
    7070                { return this->index_; }
    7171
    7272            /// Returns the "key" of the value (the name of the vector plus the index of the element)
    73             inline const std::string& getKeyString() const override
     73            virtual inline const std::string& getKeyString() const override
    7474                { return this->keyString_; }
    7575
    7676        private:
    77             void update() override;
     77            virtual void update() override;
    7878
    7979            unsigned int index_;        ///< The index of the element in the vector

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

    r10821 r10845  
    5959        public:
    6060            virtual void call(void* object) = 0;
    61             inline virtual ~ConfigValueCallbackBase() {}
     61            virtual inline ~ConfigValueCallbackBase() {}
    6262    };
    6363
    … …  
    6767        public:
    6868            inline ConfigValueCallback(void (T::*function) (void)) : function_(function) {}
    69             inline virtual ~ConfigValueCallback() {}
    70             inline virtual void call(void* object) override
     69            virtual inline ~ConfigValueCallback() {}
     70            virtual inline void call(void* object) override
    7171            {
    7272                if (!IdentifierManager::getInstance().isCreatingHierarchy())

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

    r10818 r10845  
    6868            ~SettingsConfigFile();
    6969
    70             void load() override; // tolua_export
     70            virtual void load() override; // tolua_export
    7171            void setFilename(const std::string& filename); // tolua_export
    7272            void clean(bool bCleanComments = false); // tolua_export

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

    r10817 r10845  
    5656        using Button::execute;
    5757        bool execute();
    58         bool addParamCommand(ParamCommand* command) override;
    59         void clear() override;
     58        virtual bool addParamCommand(ParamCommand* command) override;
     59        virtual void clear() override;
    6060        void reset();
    6161

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

    r10817 r10845  
    6666        { }
    6767        virtual ~InputBufferListenerTuple() { }
    68         void callFunction() override
     68        virtual void callFunction() override
    6969        {
    7070            (listener_->*function_)();
    … …  
    165165                { if (this->cursor_ > 0) { --this->cursor_; } }
    166166
    167             void buttonPressed(const KeyEvent& evt) override;
     167            virtual void buttonPressed(const KeyEvent& evt) override;
    168168
    169169        private:
    170170            bool charIsAllowed(const char& input);
    171171
    172             void buttonHeld  (const KeyEvent& evt) override;
    173             void processKey   (const KeyEvent& evt);
     172            virtual void buttonHeld (const KeyEvent& evt) override;
     173            void processKey (const KeyEvent& evt);
    174174
    175             void keyboardUpdated(float dt) override;
     175            virtual void keyboardUpdated(float dt) override;
    176176
    177177            std::string buffer_;

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

    r10817 r10845  
    7676    {
    7777    public:
    78         bool execute(float abs = 1.0f, float rel = 1.0f) override;
    79         CommandEvaluation* getEvaluation() override;
     78        virtual bool execute(float abs = 1.0f, float rel = 1.0f) override;
     79        virtual CommandEvaluation* getEvaluation() override;
    8080        virtual SimpleCommand* clone() override { return new SimpleCommand(*this); }
    8181
    … …  
    104104    public:
    105105        ParamCommand() : scale_(1.0f), paramCommand_(nullptr) { }
    106         bool execute(float abs = 1.0f, float rel = 1.0f) override;
    107         CommandEvaluation* getEvaluation() override;
     106        virtual bool execute(float abs = 1.0f, float rel = 1.0f) override;
     107        virtual CommandEvaluation* getEvaluation() override;
    108108        virtual ParamCommand* clone() override { return new ParamCommand(*this); }
    109109

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

    r10821 r10845  
    153153
    154154        //! Captures OIS events (which then get distributed to the derived class) and creates the button held events
    155         void update(const Clock& time) override
     155        virtual void update(const Clock& time) override
    156156        {
    157157            oisDevice_->capture();
    … …  
    171171
    172172        //! Clears the list of pressed buttons and calls the derived class's method
    173         void clearBuffers() override
     173        virtual void clearBuffers() override
    174174        {
    175175            pressedButtons_.clear();
    … …  
    180180        OISDeviceClass* getOISDevice()   { return this->oisDevice_; }
    181181        // Returns the name of the derived class as string
    182         std::string getClassName() const override { return DeviceClass::getClassNameImpl(); }
     182        virtual std::string getClassName() const override { return DeviceClass::getClassNameImpl(); }
    183183
    184184    protected:

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

    r10817 r10845  
    208208
    209209        // From WindowEventListener
    210         void windowFocusChanged(bool bFocus) override;
     210        virtual void windowFocusChanged(bool bFocus) override;
    211211
    212212    private: // variables

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

    r10817 r10845  
    157157        ~InputState() { }
    158158
    159         void JoyStickQuantityChanged(const std::vector<JoyStick*>& joyStickList) override;
     159        virtual void JoyStickQuantityChanged(const std::vector<JoyStick*>& joyStickList) override;
    160160
    161161        //! Sets the priority (only to be used by the InputManager!)

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

    r10817 r10845  
    7777
    7878    private:
    79         void calibrationStarted() override;
    80         void calibrationStopped() override;
     79        virtual void calibrationStarted() override;
     80        virtual void calibrationStopped() override;
    8181        void evaluateCalibration();
    8282
    … …  
    8686
    8787        //! OIS event handler
    88         bool buttonPressed (const OIS::JoyStickEvent &arg, int button) override
     88        virtual bool buttonPressed (const OIS::JoyStickEvent &arg, int button) override
    8989        {
    9090            super::buttonPressed(static_cast<JoyStickButtonCode::ByEnum>(button));
    … …  
    9393
    9494        //! OIS event handler
    95         bool buttonReleased(const OIS::JoyStickEvent &arg, int button) override
     95        virtual bool buttonReleased(const OIS::JoyStickEvent &arg, int button) override
    9696        {
    9797            super::buttonReleased(static_cast<JoyStickButtonCode::ByEnum>(button));
    … …  
    9999        }
    100100
    101         bool axisMoved     (const OIS::JoyStickEvent &arg, int axis) override;
    102         bool sliderMoved   (const OIS::JoyStickEvent &arg, int id) override;
    103         bool povMoved      (const OIS::JoyStickEvent &arg, int id) override;
     101        virtual bool axisMoved     (const OIS::JoyStickEvent &arg, int axis) override;
     102        virtual bool sliderMoved   (const OIS::JoyStickEvent &arg, int id) override;
     103        virtual bool povMoved      (const OIS::JoyStickEvent &arg, int id) override;
    104104        //! OIS event handler (don't remove that because of OIS version issues!)
    105         bool vector3Moved  (const OIS::JoyStickEvent &arg, int id) override { return true; }
     105        virtual bool vector3Moved  (const OIS::JoyStickEvent &arg, int id) override { return true; }
    106106
    107107        //! Returns the class name as string

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

    r10821 r10845  
    8686        virtual void JoyStickQuantityChanged(const std::vector<JoyStick*>& joyStickList) override;
    8787
    88         void allDevicesUpdated(float dt) override;
    89         void mouseUpdated(float dt) override;
    90         void joyStickUpdated(unsigned int joyStick, float dt) override;
     88        virtual void allDevicesUpdated(float dt) override;
     89        virtual void mouseUpdated(float dt) override;
     90        virtual void joyStickUpdated(unsigned int joyStick, float dt) override;
    9191        // internal
    9292        void tickHalfAxis(HalfAxis& halfAxis);
    9393
    94         void buttonPressed (const KeyEvent& evt) override;
    95         void buttonReleased(const KeyEvent& evt) override;
    96         void buttonHeld    (const KeyEvent& evt) override;
    97 
    98         void buttonPressed (MouseButtonCode::ByEnum button) override;
    99         void buttonReleased(MouseButtonCode::ByEnum button) override;
    100         void buttonHeld    (MouseButtonCode::ByEnum button) override;
    101         void mouseMoved    (IntVector2 abs, IntVector2 rel, IntVector2 clippingSize) override;
    102         void mouseScrolled (int abs, int rel) override;
    103 
    104         void buttonPressed (unsigned int device, JoyStickButtonCode::ByEnum button) override;
    105         void buttonReleased(unsigned int device, JoyStickButtonCode::ByEnum button) override;
    106         void buttonHeld    (unsigned int device, JoyStickButtonCode::ByEnum button) override;
    107         void axisMoved     (unsigned int device, unsigned int axis, float value) override;
     94        virtual void buttonPressed (const KeyEvent& evt) override;
     95        virtual void buttonReleased(const KeyEvent& evt) override;
     96        virtual void buttonHeld    (const KeyEvent& evt) override;
     97
     98        virtual void buttonPressed (MouseButtonCode::ByEnum button) override;
     99        virtual void buttonReleased(MouseButtonCode::ByEnum button) override;
     100        virtual void buttonHeld    (MouseButtonCode::ByEnum button) override;
     101        virtual void mouseMoved    (IntVector2 abs, IntVector2 rel, IntVector2 clippingSize) override;
     102        virtual void mouseScrolled (int abs, int rel) override;
     103
     104        virtual void buttonPressed (unsigned int device, JoyStickButtonCode::ByEnum button) override;
     105        virtual void buttonReleased(unsigned int device, JoyStickButtonCode::ByEnum button) override;
     106        virtual void buttonHeld    (unsigned int device, JoyStickButtonCode::ByEnum button) override;
     107        virtual void axisMoved     (unsigned int device, unsigned int axis, float value) override;
    108108
    109109    protected: // variables

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

    r10817 r10845  
    5151
    5252        void callback(const std::string& name);
    53         void JoyStickQuantityChanged(const std::vector<JoyStick*>& joyStickList) override;
     53        virtual void JoyStickQuantityChanged(const std::vector<JoyStick*>& joyStickList) override;
    5454        void assignCommands();
    5555

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

    r10817 r10845  
    7575        }
    7676
    77         bool keyPressed(const OIS::KeyEvent& arg) override;
    78         bool keyReleased(const OIS::KeyEvent& arg) override;
     77        virtual bool keyPressed(const OIS::KeyEvent& arg) override;
     78        virtual bool keyReleased(const OIS::KeyEvent& arg) override;
    7979
    8080        //! Returns the class name as string

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

    r10817 r10845  
    7474    private:
    7575        //! OIS event handler
    76         bool mousePressed(const OIS::MouseEvent &arg, OIS::MouseButtonID id) override
     76        virtual bool mousePressed(const OIS::MouseEvent &arg, OIS::MouseButtonID id) override
    7777        {
    7878            super::buttonPressed(static_cast<MouseButtonCode::ByEnum>(id));
    … …  
    8181
    8282        //! OIS event handler
    83         bool mouseReleased(const OIS::MouseEvent &arg, OIS::MouseButtonID id) override
     83        virtual bool mouseReleased(const OIS::MouseEvent &arg, OIS::MouseButtonID id) override
    8484        {
    8585            super::buttonReleased(static_cast<MouseButtonCode::ByEnum>(id));
    … …  
    8787        }
    8888
    89         bool mouseMoved(const OIS::MouseEvent &arg) override;
     89        virtual bool mouseMoved(const OIS::MouseEvent &arg) override;
    9090
    91         void windowResized(unsigned int newWidth, unsigned int newHeight) override;
     91        virtual void windowResized(unsigned int newWidth, unsigned int newHeight) override;
    9292
    9393        // Returns the class name as string

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

    r10817 r10845  
    124124
    125125            /// Destructor
    126             inline virtual ~WeakPtr()
     126            virtual inline ~WeakPtr()
    127127            {
    128128                this->unregisterAsDestructionListener(this->base_);
    … …  
    230230        private:
    231231            /// Will be called by Destroyable::~Destroyable() if the stored object is deleted. Resets the wrapped pointer and executes the callback.
    232             inline void objectDeleted() override
     232            virtual inline void objectDeleted() override
    233233            {
    234234                this->base_ = nullptr;

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

    r10817 r10845  
    102102
    103103        //! Called if the Scope of the Singleton gets active (creates the instance)
    104         void activated() override
     104        virtual void activated() override
    105105        {
    106106            assert(singletonPtr_ == nullptr);
    … …  
    109109
    110110        //! Called if the Scope of this Singleton gets deactivated (destroys the instance)
    111         void deactivated() override
     111        virtual void deactivated() override
    112112        {
    113113            assert(singletonPtr_ != nullptr);
    … …  
    157157
    158158        //! Called if the Scope of the Singleton gets active (creates the instance)
    159         void activated() override
     159        virtual void activated() override
    160160        {
    161161            assert(singletonPtr_ == nullptr);
    … …  
    169169
    170170        //! Called if the Scope of this Singleton gets deactivated (destroys the instance)
    171         void deactivated() override
     171        virtual void deactivated() override
    172172        {
    173173            if (singletonPtr_ != nullptr)

  • code/branches/cpp11_v2/src/libraries/network/Client.h

    r10817 r10845  
    7676    static Client* getInstance(){ return singletonPtr_s; } // tolua_export
    7777
    78     bool establishConnection() override;
     78    virtual bool establishConnection() override;
    7979    void setDestination( const std::string& serverAddress, unsigned int port ); // tolua_export
    80     bool closeConnection() override;
    81     void queuePacket(ENetPacket* packet, int clientID, uint8_t channelID) override;
     80    virtual bool closeConnection() override;
     81    virtual void queuePacket(ENetPacket* packet, int clientID, uint8_t channelID) override;
    8282    virtual bool sendPacket( packet::Packet* packet ) override{ return packet->send( static_cast<Host*>(this) ); }
    8383    virtual void doSendChat(const std::string& message, unsigned int sourceID, unsigned int targetID) override;
    … …  
    9191    Client(const Client& copy); // not used
    9292    virtual bool isServer_() override{return false;}
    93     void processPacket(packet::Packet* packet) override;
     93    virtual void processPacket(packet::Packet* packet) override;
    9494
    9595    static Client* singletonPtr_s;

  • code/branches/cpp11_v2/src/libraries/network/NetworkFunction.h

    r10817 r10845  
    142142    { }
    143143
    144     inline bool call(uint32_t objectID) override
     144    virtual inline bool call(uint32_t objectID) override
    145145    {
    146146      if ( Synchronisable::getSynchronisable(objectID)!=nullptr )
    … …  
    152152        return false;
    153153    }
    154     inline bool call(uint32_t objectID, const MultiType& mt1) override
     154    virtual inline bool call(uint32_t objectID, const MultiType& mt1) override
    155155    {
    156156      if ( Synchronisable::getSynchronisable(objectID)!=nullptr )
    … …  
    162162        return false;
    163163    }
    164     inline bool call(uint32_t objectID, const MultiType& mt1, const MultiType& mt2) override
     164    virtual inline bool call(uint32_t objectID, const MultiType& mt1, const MultiType& mt2) override
    165165    {
    166166      if ( Synchronisable::getSynchronisable(objectID)!=nullptr )
    … …  
    172172        return false;
    173173    }
    174     inline bool call(uint32_t objectID, const MultiType& mt1, const MultiType& mt2, const MultiType& mt3) override
     174    virtual inline bool call(uint32_t objectID, const MultiType& mt1, const MultiType& mt2, const MultiType& mt3) override
    175175    {
    176176      if ( Synchronisable::getSynchronisable(objectID)!=nullptr )
    … …  
    182182        return false;
    183183    }
    184     inline bool call(uint32_t objectID, const MultiType& mt1, const MultiType& mt2, const MultiType& mt3, const MultiType& mt4) override
     184    virtual inline bool call(uint32_t objectID, const MultiType& mt1, const MultiType& mt2, const MultiType& mt3, const MultiType& mt4) override
    185185    {
    186186      if ( Synchronisable::getSynchronisable(objectID)!=nullptr )
    … …  
    192192        return false;
    193193    }
    194     inline bool call(uint32_t objectID, const MultiType& mt1, const MultiType& mt2, const MultiType& mt3, const MultiType& mt4, const MultiType& mt5) override
     194    virtual inline bool call(uint32_t objectID, const MultiType& mt1, const MultiType& mt2, const MultiType& mt3, const MultiType& mt4, const MultiType& mt5) override
    195195    {
    196196      if ( Synchronisable::getSynchronisable(objectID)!=nullptr )

  • code/branches/cpp11_v2/src/libraries/network/Server.h

    r10817 r10845  
    6161    void open();
    6262    void close();
    63     void queuePacket(ENetPacket *packet, int clientID, uint8_t channelID) override;
     63    virtual void queuePacket(ENetPacket *packet, int clientID, uint8_t channelID) override;
    6464    virtual bool sendPacket( packet::Packet* packet ) override{ return packet->send( static_cast<Host*>(this) ); }
    6565    void update(const Clock& time);
    … …  
    7676    unsigned int playerID(){return 0;}
    7777
    78     void addPeer(uint32_t peerID) override;
    79     void removePeer(uint32_t peerID) override;
    80     void processPacket(packet::Packet* packet) override;
     78    virtual void addPeer(uint32_t peerID) override;
     79    virtual void removePeer(uint32_t peerID) override;
     80    virtual void processPacket(packet::Packet* packet) override;
    8181
    8282    bool createClient(int clientID);

  • code/branches/cpp11_v2/src/libraries/network/packet/Acknowledgement.h

    r10817 r10845  
    4646  ~Acknowledgement();
    4747
    48   inline unsigned int getSize() const override;
     48  virtual inline unsigned int getSize() const override;
    4949  virtual bool process(orxonox::Host* host) override;
    5050

  • code/branches/cpp11_v2/src/libraries/network/packet/Chat.h

    r10817 r10845  
    4949
    5050  /* get size of packet */
    51   inline unsigned int getSize() const override;
     51  virtual inline unsigned int getSize() const override;
    5252
    5353  /* process chat message packet and remove it afterwards */

  • code/branches/cpp11_v2/src/libraries/network/packet/ClassID.h

    r10817 r10845  
    4747  ~ClassID();
    4848
    49   uint32_t getSize() const override;
     49  virtual uint32_t getSize() const override;
    5050  virtual bool process(orxonox::Host* host) override;
    5151

  • code/branches/cpp11_v2/src/libraries/network/packet/DeleteObjects.h

    r10817 r10845  
    4848  bool fetchIDs();
    4949
    50   inline unsigned int getSize() const override;
     50  virtual inline unsigned int getSize() const override;
    5151  virtual bool process(orxonox::Host* host) override;
    5252

  • code/branches/cpp11_v2/src/libraries/network/packet/FunctionCalls.h

    r10817 r10845  
    5252  ~FunctionCalls();
    5353
    54   inline unsigned int getSize() const override
     54  virtual inline unsigned int getSize() const override
    5555    { assert(!this->isDataENetAllocated()); return currentSize_; }
    5656  virtual bool process(orxonox::Host* host) override;

  • code/branches/cpp11_v2/src/libraries/network/packet/Welcome.h

    r10817 r10845  
    4545  virtual ~Welcome();
    4646
    47   uint8_t *getData() override;
    48   inline unsigned int getSize() const override;
     47  virtual uint8_t *getData() override;
     48  virtual inline unsigned int getSize() const override;
    4949  virtual bool process(orxonox::Host* host) override;
    5050

  • code/branches/cpp11_v2/src/libraries/tools/BulletDebugDrawer.h

    r10817 r10845  
    4444
    4545        protected:
    46             bool frameStarted(const Ogre::FrameEvent& evt) override;
    47             bool frameEnded(const Ogre::FrameEvent& evt) override;
     46            virtual bool frameStarted(const Ogre::FrameEvent& evt) override;
     47            virtual bool frameEnded(const Ogre::FrameEvent& evt) override;
    4848
    4949        private:

  • code/branches/cpp11_v2/src/libraries/util/MultiType.h

    r10817 r10845  
    175175        public:
    176176            inline MT_ValueBase(void* data, Type::Enum type) : type_(type), bLastConversionSuccessful(true), data_(data) {}
    177             inline virtual ~MT_ValueBase() {}
     177            virtual inline ~MT_ValueBase() {}
    178178
    179179            virtual MT_ValueBase* clone() const = 0;

  • code/branches/cpp11_v2/src/libraries/util/MultiTypeValue.h

    r10817 r10845  
    5858
    5959        /// Creates a copy of itself.
    60         inline MT_ValueBase* clone() const override { return new MT_Value<T>(this->value_, this->type_); }
     60        virtual inline MT_ValueBase* clone() const override { return new MT_Value<T>(this->value_, this->type_); }
    6161
    6262        /// Resets the current value to the default.
    63         inline void reset() override { this->value_ = zeroise<T>(); bLastConversionSuccessful = true; }
    64 
    65         inline bool getValue(char*                 value) const override { return convertValue<T, char                >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
    66         inline bool getValue(unsigned char*        value) const override { return convertValue<T, unsigned char       >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
    67         inline bool getValue(short*                value) const override { return convertValue<T, short               >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
    68         inline bool getValue(unsigned short*       value) const override { return convertValue<T, unsigned short      >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
    69         inline bool getValue(int*                  value) const override { return convertValue<T, int                 >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
    70         inline bool getValue(unsigned int*         value) const override { return convertValue<T, unsigned int        >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
    71         inline bool getValue(long*                 value) const override { return convertValue<T, long                >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
    72         inline bool getValue(unsigned long*        value) const override { return convertValue<T, unsigned long       >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
    73         inline bool getValue(long long*            value) const override { return convertValue<T, long long           >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
    74         inline bool getValue(unsigned long long*   value) const override { return convertValue<T, unsigned long long  >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
    75         inline bool getValue(float*                value) const override { return convertValue<T, float               >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
    76         inline bool getValue(double*               value) const override { return convertValue<T, double              >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
    77         inline bool getValue(long double*          value) const override { return convertValue<T, long double         >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
    78         inline bool getValue(bool*                 value) const override { return convertValue<T, bool                >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
    79         inline bool getValue(void**                value) const override { return convertValue<T, void*               >(value, value_, nullptr); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
    80         inline bool getValue(std::string*          value) const override { return convertValue<T, std::string         >(value, value_, NilValue<std::string>         ()); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
    81         inline bool getValue(orxonox::Vector2*     value) const override { return convertValue<T, orxonox::Vector2    >(value, value_, NilValue<orxonox::Vector2>    ()); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
    82         inline bool getValue(orxonox::Vector3*     value) const override { return convertValue<T, orxonox::Vector3    >(value, value_, NilValue<orxonox::Vector3>    ()); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
    83         inline bool getValue(orxonox::Vector4*     value) const override { return convertValue<T, orxonox::Vector4    >(value, value_, NilValue<orxonox::Vector4>    ()); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
    84         inline bool getValue(orxonox::ColourValue* value) const override { return convertValue<T, orxonox::ColourValue>(value, value_, NilValue<orxonox::ColourValue>()); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
    85         inline bool getValue(orxonox::Quaternion*  value) const override { return convertValue<T, orxonox::Quaternion >(value, value_, NilValue<orxonox::Quaternion> ()); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
    86         inline bool getValue(orxonox::Radian*      value) const override { return convertValue<T, orxonox::Radian     >(value, value_, NilValue<orxonox::Radian>     ()); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
    87         inline bool getValue(orxonox::Degree*      value) const override { return convertValue<T, orxonox::Degree     >(value, value_, NilValue<orxonox::Degree>     ()); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
     63        virtual inline void reset() override { this->value_ = zeroise<T>(); bLastConversionSuccessful = true; }
     64
     65        virtual inline bool getValue(char*                 value) const override { return convertValue<T, char                >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
     66        virtual inline bool getValue(unsigned char*        value) const override { return convertValue<T, unsigned char       >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
     67        virtual inline bool getValue(short*                value) const override { return convertValue<T, short               >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
     68        virtual inline bool getValue(unsigned short*       value) const override { return convertValue<T, unsigned short      >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
     69        virtual inline bool getValue(int*                  value) const override { return convertValue<T, int                 >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
     70        virtual inline bool getValue(unsigned int*         value) const override { return convertValue<T, unsigned int        >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
     71        virtual inline bool getValue(long*                 value) const override { return convertValue<T, long                >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
     72        virtual inline bool getValue(unsigned long*        value) const override { return convertValue<T, unsigned long       >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
     73        virtual inline bool getValue(long long*            value) const override { return convertValue<T, long long           >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
     74        virtual inline bool getValue(unsigned long long*   value) const override { return convertValue<T, unsigned long long  >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
     75        virtual inline bool getValue(float*                value) const override { return convertValue<T, float               >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
     76        virtual inline bool getValue(double*               value) const override { return convertValue<T, double              >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
     77        virtual inline bool getValue(long double*          value) const override { return convertValue<T, long double         >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
     78        virtual inline bool getValue(bool*                 value) const override { return convertValue<T, bool                >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
     79        virtual inline bool getValue(void**                value) const override { return convertValue<T, void*               >(value, value_, nullptr); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
     80        virtual inline bool getValue(std::string*          value) const override { return convertValue<T, std::string         >(value, value_, NilValue<std::string>         ()); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
     81        virtual inline bool getValue(orxonox::Vector2*     value) const override { return convertValue<T, orxonox::Vector2    >(value, value_, NilValue<orxonox::Vector2>    ()); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
     82        virtual inline bool getValue(orxonox::Vector3*     value) const override { return convertValue<T, orxonox::Vector3    >(value, value_, NilValue<orxonox::Vector3>    ()); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
     83        virtual inline bool getValue(orxonox::Vector4*     value) const override { return convertValue<T, orxonox::Vector4    >(value, value_, NilValue<orxonox::Vector4>    ()); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
     84        virtual inline bool getValue(orxonox::ColourValue* value) const override { return convertValue<T, orxonox::ColourValue>(value, value_, NilValue<orxonox::ColourValue>()); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
     85        virtual inline bool getValue(orxonox::Quaternion*  value) const override { return convertValue<T, orxonox::Quaternion >(value, value_, NilValue<orxonox::Quaternion> ()); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
     86        virtual inline bool getValue(orxonox::Radian*      value) const override { return convertValue<T, orxonox::Radian     >(value, value_, NilValue<orxonox::Radian>     ()); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
     87        virtual inline bool getValue(orxonox::Degree*      value) const override { return convertValue<T, orxonox::Degree     >(value, value_, NilValue<orxonox::Degree>     ()); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
    8888
    8989        /**
    … …  
    9191            @param other The other MultiType
    9292        */
    93         inline bool setValue(const MultiType& other) override
     93        virtual inline bool setValue(const MultiType& other) override
    9494        {
    9595            if (other.value_)
    … …  
    104104        }
    105105
    106         inline bool setValue(const char& value) override                { return (bLastConversionSuccessful = convertValue<char                , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
    107         inline bool setValue(const unsigned char& value) override        { return (bLastConversionSuccessful = convertValue<unsigned char       , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
    108         inline bool setValue(const short& value) override                { return (bLastConversionSuccessful = convertValue<short               , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
    109         inline bool setValue(const unsigned short& value) override      { return (bLastConversionSuccessful = convertValue<unsigned short      , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
    110         inline bool setValue(const int& value) override                  { return (bLastConversionSuccessful = convertValue<int                 , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
    111         inline bool setValue(const unsigned int& value) override        { return (bLastConversionSuccessful = convertValue<unsigned int        , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
    112         inline bool setValue(const long& value) override                { return (bLastConversionSuccessful = convertValue<long                , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
    113         inline bool setValue(const unsigned long& value) override        { return (bLastConversionSuccessful = convertValue<unsigned long       , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
    114         inline bool setValue(const long long& value) override            { return (bLastConversionSuccessful = convertValue<long long           , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
    115         inline bool setValue(const unsigned long long& value) override  { return (bLastConversionSuccessful = convertValue<unsigned long long  , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
    116         inline bool setValue(const float& value) override                { return (bLastConversionSuccessful = convertValue<float               , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
    117         inline bool setValue(const double& value) override              { return (bLastConversionSuccessful = convertValue<double              , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
    118         inline bool setValue(const long double& value) override          { return (bLastConversionSuccessful = convertValue<long double         , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
    119         inline bool setValue(const bool& value) override                { return (bLastConversionSuccessful = convertValue<bool                , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
    120         inline bool setValue(      void* const& value) override          { return (bLastConversionSuccessful = convertValue<void*               , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
    121         inline bool setValue(const std::string& value) override          { return (bLastConversionSuccessful = convertValue<std::string         , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
    122         inline bool setValue(const orxonox::Vector2& value) override    { return (bLastConversionSuccessful = convertValue<orxonox::Vector2    , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
    123         inline bool setValue(const orxonox::Vector3& value) override    { return (bLastConversionSuccessful = convertValue<orxonox::Vector3    , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
    124         inline bool setValue(const orxonox::Vector4& value) override    { return (bLastConversionSuccessful = convertValue<orxonox::Vector4    , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
    125         inline bool setValue(const orxonox::ColourValue& value) override { return (bLastConversionSuccessful = convertValue<orxonox::ColourValue, T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
    126         inline bool setValue(const orxonox::Quaternion& value) override { return (bLastConversionSuccessful = convertValue<orxonox::Quaternion , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
    127         inline bool setValue(const orxonox::Radian& value) override      { return (bLastConversionSuccessful = convertValue<orxonox::Radian     , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
    128         inline bool setValue(const orxonox::Degree& value) override      { return (bLastConversionSuccessful = convertValue<orxonox::Degree     , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
     106        virtual inline bool setValue(const char& value)                 override { return (bLastConversionSuccessful = convertValue<char                , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
     107        virtual inline bool setValue(const unsigned char& value)        override { return (bLastConversionSuccessful = convertValue<unsigned char       , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
     108        virtual inline bool setValue(const short& value)                override { return (bLastConversionSuccessful = convertValue<short               , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
     109        virtual inline bool setValue(const unsigned short& value)       override { return (bLastConversionSuccessful = convertValue<unsigned short      , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
     110        virtual inline bool setValue(const int& value)                  override { return (bLastConversionSuccessful = convertValue<int                 , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
     111        virtual inline bool setValue(const unsigned int& value)         override { return (bLastConversionSuccessful = convertValue<unsigned int        , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
     112        virtual inline bool setValue(const long& value)                 override { return (bLastConversionSuccessful = convertValue<long                , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
     113        virtual inline bool setValue(const unsigned long& value)        override { return (bLastConversionSuccessful = convertValue<unsigned long       , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
     114        virtual inline bool setValue(const long long& value)            override { return (bLastConversionSuccessful = convertValue<long long           , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
     115        virtual inline bool setValue(const unsigned long long& value)   override { return (bLastConversionSuccessful = convertValue<unsigned long long  , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
     116        virtual inline bool setValue(const float& value)                override { return (bLastConversionSuccessful = convertValue<float               , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
     117        virtual inline bool setValue(const double& value)               override { return (bLastConversionSuccessful = convertValue<double              , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
     118        virtual inline bool setValue(const long double& value)          override { return (bLastConversionSuccessful = convertValue<long double         , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
     119        virtual inline bool setValue(const bool& value)                 override { return (bLastConversionSuccessful = convertValue<bool                , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
     120        virtual inline bool setValue(      void* const& value)          override { return (bLastConversionSuccessful = convertValue<void*               , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
     121        virtual inline bool setValue(const std::string& value)          override { return (bLastConversionSuccessful = convertValue<std::string         , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
     122        virtual inline bool setValue(const orxonox::Vector2& value)     override { return (bLastConversionSuccessful = convertValue<orxonox::Vector2    , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
     123        virtual inline bool setValue(const orxonox::Vector3& value)     override { return (bLastConversionSuccessful = convertValue<orxonox::Vector3    , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
     124        virtual inline bool setValue(const orxonox::Vector4& value)     override { return (bLastConversionSuccessful = convertValue<orxonox::Vector4    , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
     125        virtual inline bool setValue(const orxonox::ColourValue& value) override { return (bLastConversionSuccessful = convertValue<orxonox::ColourValue, T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
     126        virtual inline bool setValue(const orxonox::Quaternion& value)  override { return (bLastConversionSuccessful = convertValue<orxonox::Quaternion , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
     127        virtual inline bool setValue(const orxonox::Radian& value)      override { return (bLastConversionSuccessful = convertValue<orxonox::Radian     , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
     128        virtual inline bool setValue(const orxonox::Degree& value)      override { return (bLastConversionSuccessful = convertValue<orxonox::Degree     , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
    129129
    130130        /// Puts the current value on the stream
    131         inline void toString(std::ostream& outstream) const override { outstream << this->value_; }
     131        virtual inline void toString(std::ostream& outstream) const override { outstream << this->value_; }
    132132
    133133        /// loads data from the bytestream (mem) into the MT and increases the bytestream pointer by the size of the data
    134         inline void importData( uint8_t*& mem ) override         { loadAndIncrease( /*(const T&)*/this->value_, mem ); }
     134        virtual inline void importData( uint8_t*& mem ) override         { loadAndIncrease( /*(const T&)*/this->value_, mem ); }
    135135        /// saves data from the MT into the bytestream (mem) and increases the bytestream pointer by the size of the data
    136         inline void exportData( uint8_t*& mem ) const override   { saveAndIncrease( /*(const T&)*/this->value_, mem ); }
     136        virtual inline void exportData( uint8_t*& mem ) const override   { saveAndIncrease( /*(const T&)*/this->value_, mem ); }
    137137        /// returns the size of the data that would be saved by exportData
    138         inline uint8_t getSize() const override { return returnSize( this->value_ ); }
     138        virtual inline uint8_t getSize() const override { return returnSize( this->value_ ); }
    139139
    140140        T value_; ///< The stored value

  • code/branches/cpp11_v2/src/modules/designtools/CreateStars.h

    r10817 r10845  
    4343            void createBillboards();
    4444
    45             void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
     45            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
    4646
    4747            void setNumStars(int num) {

  • code/branches/cpp11_v2/src/modules/designtools/SkyboxGenerator.h

    r10817 r10845  
    6565            SkyboxGenerator();
    6666            virtual ~SkyboxGenerator();
    67             void tick(float dt) override; // This is where the skybox generation happens.
     67            virtual void tick(float dt) override; // This is where the skybox generation happens.
    6868            static void createSkybox(void); // Generate the 6 faces of a skybox.
    6969            void setConfigValues(void); // Sets some config values.

  • code/branches/cpp11_v2/src/modules/gametypes/OldRaceCheckPoint.h

    r10817 r10845  
    6464            inline float getTimeLimit()
    6565                { return this->bTimeLimit_;}
    66             inline const WorldEntity* getWorldEntity() const override
     66            virtual inline const WorldEntity* getWorldEntity() const override
    6767                { return this; }
    6868

  • code/branches/cpp11_v2/src/modules/gametypes/RaceCheckPoint.h

    r10817 r10845  
    9494            virtual void fire(bool bIsTriggered, BaseObject* originator) override;
    9595
    96             inline const WorldEntity* getWorldEntity() const override
     96            virtual inline const WorldEntity* getWorldEntity() const override
    9797            {
    9898                return this;

  • code/branches/cpp11_v2/src/modules/gametypes/SpaceRace.h

    r10817 r10845  
    5757            virtual ~SpaceRace() {}
    5858
    59             void tick(float dt) override;
     59            virtual void tick(float dt) override;
    6060
    6161            virtual void end() override;
    … …  
    7070                { return this->clock_; }
    7171
    72             bool allowPawnHit(Pawn* victim, Pawn* originator) override;
    73             bool allowPawnDamage(Pawn* victim, Pawn* originator) override;
    74             bool allowPawnDeath(Pawn* victim, Pawn* originator) override;
     72            virtual bool allowPawnHit(Pawn* victim, Pawn* originator) override;
     73            virtual bool allowPawnDamage(Pawn* victim, Pawn* originator) override;
     74            virtual bool allowPawnDeath(Pawn* victim, Pawn* originator) override;
    7575
    7676        private:

  • code/branches/cpp11_v2/src/modules/gametypes/SpaceRaceManager.h

    r10817 r10845  
    5858            virtual ~SpaceRaceManager() ;
    5959
    60             void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
     60            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
    6161
    6262            void addCheckpoint(RaceCheckPoint* checkpoint);
    … …  
    6969            std::vector<RaceCheckPoint*> getAllCheckpoints();
    7070
    71             void tick(float dt) override;
     71            virtual void tick(float dt) override;
    7272
    7373        protected:

  • code/branches/cpp11_v2/src/modules/objects/Attacher.h

    r10817 r10845  
    6464                { return this->targetname_; }
    6565
    66             void loadedNewXMLName(BaseObject* object) override;
     66            virtual void loadedNewXMLName(BaseObject* object) override;
    6767
    6868        private:

  • code/branches/cpp11_v2/src/modules/objects/SpaceBoundaries.h

    r10817 r10845  
    9393            int getReaction();
    9494
    95             void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
     95            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
    9696
    97             void tick(float dt) override;
     97            virtual void tick(float dt) override;
    9898
    9999        private:

  • code/branches/cpp11_v2/src/modules/overlays/hud/AnnounceMessage.h

    r10817 r10845  
    4545            virtual void changedOwner() override;
    4646
    47             void announcemessage(const GametypeInfo* gtinfo, const std::string& message) override;
     47            virtual void announcemessage(const GametypeInfo* gtinfo, const std::string& message) override;
    4848
    4949        private:

  • code/branches/cpp11_v2/src/modules/overlays/hud/DeathMessage.h

    r10817 r10845  
    4545            virtual void changedOwner() override;
    4646
    47             void deathmessage(const GametypeInfo* gtinfo, const std::string& message) override;
     47            virtual void deathmessage(const GametypeInfo* gtinfo, const std::string& message) override;
    4848
    4949        private:

  • code/branches/cpp11_v2/src/modules/overlays/hud/GametypeFadingMessage.h

    r10817 r10845  
    4545            virtual void changedOwner() override;
    4646
    47             void fadingmessage(const GametypeInfo* gtinfo, const std::string& message) override;
     47            virtual void fadingmessage(const GametypeInfo* gtinfo, const std::string& message) override;
    4848
    4949        private:

  • code/branches/cpp11_v2/src/modules/overlays/hud/GametypeStaticMessage.h

    r10817 r10845  
    4848            virtual void changedOwner() override;
    4949
    50             void staticmessage(const GametypeInfo* gtinfo, const std::string& message, const ColourValue& colour) override;
     50            virtual void staticmessage(const GametypeInfo* gtinfo, const std::string& message, const ColourValue& colour) override;
    5151
    5252        private:

  • code/branches/cpp11_v2/src/modules/overlays/hud/HUDEnemyHealthBar.h

    r10817 r10845  
    4343            virtual void tick(float dt) override;
    4444
    45             void changedOwner() override;
     45            virtual void changedOwner() override;
    4646
    4747        private:

  • code/branches/cpp11_v2/src/modules/overlays/hud/HUDNavigation.h

    r10817 r10845  
    6565            virtual void radarTick(float dt) override {}
    6666
    67             inline float getRadarSensitivity() const override
     67            virtual inline float getRadarSensitivity() const override
    6868                { return 1.0f; }
    6969

  • code/branches/cpp11_v2/src/modules/overlays/hud/HUDRadar.h

    r10817 r10845  
    8080        void set3DMaterialBack(std::string material3DBack) { this->material3DBack_ = material3DBack; }
    8181
    82         float getRadarSensitivity() const override { return this->sensitivity_; }
     82        virtual float getRadarSensitivity() const override { return this->sensitivity_; }
    8383        // used also by RadarListener interface!
    8484        void setRadarSensitivity(float sensitivity) { this->sensitivity_ = sensitivity; }
    … …  
    9292        virtual void removeObject(RadarViewable* viewable) override;
    9393        virtual void objectChanged( RadarViewable* rv ) override;
    94         void radarTick(float dt) override;
     94        virtual void radarTick(float dt) override;
    9595        bool showObject( RadarViewable* rv ); //!< Do not display an object on radar, if showObject(.) is false.
    9696

  • code/branches/cpp11_v2/src/modules/overlays/hud/KillMessage.h

    r10817 r10845  
    4545            virtual void changedOwner() override;
    4646
    47             void killmessage(const GametypeInfo* gtinfo, const std::string& message) override;
     47            virtual void killmessage(const GametypeInfo* gtinfo, const std::string& message) override;
    4848
    4949        private:

  • code/branches/cpp11_v2/src/modules/portals/PortalEndPoint.h

    r10817 r10845  
    6969                { this->trigger_->addTarget(target); }
    7070
    71             void XMLEventPort(Element& xmlelement, XMLPort::Mode mode) override;
     71            virtual void XMLEventPort(Element& xmlelement, XMLPort::Mode mode) override;
    7272            static std::map<unsigned int, PortalEndPoint *> idMap_s; //!< Maps the id of each PortalEndPoint to a pointer to that PortalEndPoint
    7373            inline void setReenterDelay(unsigned int seconds)

  • code/branches/cpp11_v2/src/orxonox/PlayerManager.h

    r10817 r10845  
    5050                { return this->clients_; }
    5151
    52             void clientConnected(unsigned int clientID) override;
    53             void clientDisconnected(unsigned int clientID) override;
     52            virtual void clientConnected(unsigned int clientID) override;
     53            virtual void clientDisconnected(unsigned int clientID) override;
    5454            void disconnectAllClients();
    5555

  • code/branches/cpp11_v2/src/orxonox/Scene.h

    r10818 r10845  
    8080                { return this->radar_; }
    8181
    82             inline virtual uint32_t getSceneID() const override { return this->getObjectID(); }
     82            virtual inline uint32_t getSceneID() const override { return this->getObjectID(); }
    8383
    8484            virtual void tick(float dt) override;

  • code/branches/cpp11_v2/src/orxonox/chat/ChatInputHandler.h

    r10817 r10845  
    125125       * history window of the full chat window)
    126126       */
    127       void incomingChat(const std::string& message, const std::string& name) override;
     127      virtual void incomingChat(const std::string& message, const std::string& name) override;
    128128
    129129      /** \param full true means show full chat window with history,

  • code/branches/cpp11_v2/src/orxonox/collisionshapes/CompoundCollisionShape.h

    r10817 r10845  
    7474        private:
    7575            void updatePublicShape();
    76             inline virtual btCollisionShape* createNewShape() const override
     76            virtual inline btCollisionShape* createNewShape() const override
    7777                { assert(false); return nullptr; }
    7878

  • code/branches/cpp11_v2/src/orxonox/collisionshapes/WorldEntityCollisionShape.h

    r10817 r10845  
    4949
    5050        private:
    51             void parentChanged() override;
     51            virtual void parentChanged() override;
    5252
    5353            WorldEntity* worldEntityOwner_;

  • code/branches/cpp11_v2/src/orxonox/gamestates/GSClient.h

    r10817 r10845  
    4343        ~GSClient();
    4444
    45         void activate() override;
    46         void deactivate() override;
    47         void update(const Clock& time) override;
     45        virtual void activate() override;
     46        virtual void deactivate() override;
     47        virtual void update(const Clock& time) override;
    4848    };
    4949}

  • code/branches/cpp11_v2/src/orxonox/gamestates/GSGraphics.h

    r10817 r10845  
    5353        ~GSGraphics();
    5454
    55         void activate() override;
    56         void deactivate() override;
    57         void update(const Clock& time) override;
     55        virtual void activate() override;
     56        virtual void deactivate() override;
     57        virtual void update(const Clock& time) override;
    5858
    5959    private:

  • code/branches/cpp11_v2/src/orxonox/gamestates/GSLevel.h

    r10817 r10845  
    4444        ~GSLevel();
    4545
    46         void activate() override;
    47         void deactivate() override;
    48         void update(const Clock& time) override;
     46        virtual void activate() override;
     47        virtual void deactivate() override;
     48        virtual void update(const Clock& time) override;
    4949
    5050        static void startMainMenu(void); //!< Starts the MainMenu

  • code/branches/cpp11_v2/src/orxonox/gamestates/GSMainMenu.h

    r10817 r10845  
    4444        ~GSMainMenu();
    4545
    46         void activate() override;
    47         void deactivate() override;
    48         void update(const Clock& time) override;
     46        virtual void activate() override;
     47        virtual void deactivate() override;
     48        virtual void update(const Clock& time) override;
    4949
    5050        void setConfigValues();

  • code/branches/cpp11_v2/src/orxonox/gamestates/GSMasterServer.h

    r10817 r10845  
    4545      ~GSMasterServer();
    4646
    47       void activate() override;
    48       void deactivate() override;
    49       void update(const Clock& time) override;
     47      virtual void activate() override;
     48      virtual void deactivate() override;
     49      virtual void update(const Clock& time) override;
    5050
    5151    private:

  • code/branches/cpp11_v2/src/orxonox/gamestates/GSRoot.h

    r10817 r10845  
    4444        static void printObjects();
    4545
    46         void activate() override;
    47         void deactivate() override;
    48         void update(const Clock& time) override;
     46        virtual void activate() override;
     47        virtual void deactivate() override;
     48        virtual void update(const Clock& time) override;
    4949
    5050        // this has to be public because proteced triggers a bug in msvc

  • code/branches/cpp11_v2/src/orxonox/gamestates/GSServer.h

    r10817 r10845  
    4343        ~GSServer();
    4444
    45         void activate() override;
    46         void deactivate() override;
    47         void update(const Clock& time) override;
     45        virtual void activate() override;
     46        virtual void deactivate() override;
     47        virtual void update(const Clock& time) override;
    4848
    4949    private:

  • code/branches/cpp11_v2/src/orxonox/gamestates/GSStandalone.h

    r10817 r10845  
    4141        ~GSStandalone();
    4242
    43         void activate() override;
    44         void deactivate() override;
    45         void update(const Clock& time) override;
     43        virtual void activate() override;
     44        virtual void deactivate() override;
     45        virtual void update(const Clock& time) override;
    4646
    4747    private:

  • code/branches/cpp11_v2/src/orxonox/gametypes/Dynamicmatch.h

    r10817 r10845  
    7878            void grantPigBoost(SpaceShip* spaceship); // Grant the piggy a boost.
    7979            void resetSpeedFactor(SpaceShip* spaceship);
    80             void tick (float dt) override;// used to end the game
    81             SpawnPoint* getBestSpawnPoint(PlayerInfo* player) const override;
     80            virtual void tick (float dt) override;// used to end the game
     81            virtual SpawnPoint* getBestSpawnPoint(PlayerInfo* player) const override;
    8282
    8383

  • code/branches/cpp11_v2/src/orxonox/gametypes/LastManStanding.h

    r10817 r10845  
    8080
    8181            void punishPlayer(PlayerInfo* player); //!< Function in order to kill a player. Punishment for hiding longer than "timeRemaining".
    82             void tick (float dt) override; //!< used to end the game
     82            virtual void tick (float dt) override; //!< used to end the game
    8383    };
    8484}

  • code/branches/cpp11_v2/src/orxonox/gametypes/LastTeamStanding.h

    r10817 r10845  
    8080            virtual bool allowPawnDamage(Pawn* victim, Pawn* originator = nullptr) override; //!< If a player shoot's an opponent, his punishment countdown will be resetted.
    8181            virtual void playerStartsControllingPawn(PlayerInfo* player, Pawn* pawn) override; //!< Resets punishment time and respawn delay.
    82             void tick (float dt) override; //!< used to end the game
     82            virtual void tick (float dt) override; //!< used to end the game
    8383            virtual void end() override; //!< Sends an end message.
    8484            void punishPlayer(PlayerInfo* player); //!< Function in order to kill a player. Punishment for hiding longer than "timeRemaining".

  • code/branches/cpp11_v2/src/orxonox/gametypes/UnderAttack.h

    r10817 r10845  
    4343
    4444            void setConfigValues();
    45             void tick (float dt) override;
     45            virtual void tick (float dt) override;
    4646            void addDestroyer(Destroyer* destroyer);
    4747            inline Destroyer* getDestroyer() const

  • code/branches/cpp11_v2/src/orxonox/graphics/Camera.h

    r10817 r10845  
    7272            void configvaluecallback_changedNearClipDistance();
    7373
    74             void windowResized(unsigned int newWidth, unsigned int newHeight) override;
     74            virtual void windowResized(unsigned int newWidth, unsigned int newHeight) override;
    7575
    7676            Ogre::Camera*    camera_;

  • code/branches/cpp11_v2/src/orxonox/infos/Bot.h

    r10817 r10845  
    4545            void setConfigValues();
    4646
    47             inline bool isInitialized() const override
     47            virtual inline bool isInitialized() const override
    4848                { return true; }
    49             inline float getPing() const override
     49            virtual inline float getPing() const override
    5050                { return 0; }
    51             inline float getPacketLossRatio() const override
     51            virtual inline float getPacketLossRatio() const override
    5252                { return 0; }
    5353

  • code/branches/cpp11_v2/src/orxonox/infos/HumanPlayer.h

    r10817 r10845  
    4545            void setConfigValues();
    4646
    47             bool isInitialized() const override;
    48             float getPing() const override;
    49             float getPacketLossRatio() const override;
     47            virtual bool isInitialized() const override;
     48            virtual float getPing() const override;
     49            virtual float getPacketLossRatio() const override;
    5050
    5151            void setClientID(unsigned int clientID);

  • code/branches/cpp11_v2/src/orxonox/interfaces/PickupCarrier.h

    r10817 r10845  
    7777            PickupCarrier(); //!< Constructor.
    7878            virtual ~PickupCarrier(); //!< Destructor.
    79             void preDestroy(void) override; //!< Is called before the PickupCarrier is effectively destroyed.
     79            virtual void preDestroy(void) override; //!< Is called before the PickupCarrier is effectively destroyed.
    8080
    8181            bool isTarget(const Pickupable* pickup) const; //!< Can be used to check whether the PickupCarrier or a child of his is a target ot the input Pickupable.

  • code/branches/cpp11_v2/src/orxonox/overlays/GUISheet.h

    r10817 r10845  
    4444        ~GUISheet();
    4545
    46         void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
     46        virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
    4747
    4848        void show();

  • code/branches/cpp11_v2/src/orxonox/overlays/InGameConsole.h

    r10817 r10845  
    5353        void setConfigValues();
    5454
    55         void preUpdate(const Clock& time) override;
    56         void postUpdate(const Clock& time) override { /*no action*/ }
     55        virtual void preUpdate(const Clock& time) override;
     56        virtual void postUpdate(const Clock& time) override { /*no action*/ }
    5757
    5858        static void openConsole();
    … …  
    6565        void deactivate();
    6666
    67         void linesChanged() override;
    68         void lineAdded() override;
    69         void inputChanged() override;
    70         void cursorChanged() override;
    71         void executed() override;
    72         void exit() override;
     67        virtual void linesChanged() override;
     68        virtual void lineAdded() override;
     69        virtual void inputChanged() override;
     70        virtual void cursorChanged() override;
     71        virtual void executed() override;
     72        virtual void exit() override;
    7373
    7474        void shiftLines();
    … …  
    7777        void print(const std::string& text, Shell::LineType type, int index, bool alwaysShift = false);
    7878
    79         void windowResized(unsigned int newWidth, unsigned int newHeight) override;
     79        virtual void windowResized(unsigned int newWidth, unsigned int newHeight) override;
    8080
    8181        // config value related

  • code/branches/cpp11_v2/src/orxonox/overlays/OrxonoxOverlay.h

    r10817 r10845  
    206206
    207207    private:
    208         void windowResized(unsigned int newWidth, unsigned int newHeight) override;
     208        virtual void windowResized(unsigned int newWidth, unsigned int newHeight) override;
    209209
    210210        static unsigned int hudOverlayCounter_s;   //!< Static counter for hud elements

  • code/branches/cpp11_v2/src/orxonox/sound/AmbientSound.h

    r10817 r10845  
    5050        AmbientSound();
    5151
    52         void play() override;
    53         bool stop() override;
    54         void pause() override;
     52        virtual void play() override;
     53        virtual bool stop() override;
     54        virtual void pause() override;
    5555
    5656        bool setAmbientSource(const std::string& source);
    … …  
    6666
    6767    private:
    68         void preDestroy() override;
    69         float getRealVolume() override;
    70         bool moodChanged(const std::string& mood) override;
     68        virtual void preDestroy() override;
     69        virtual float getRealVolume() override;
     70        virtual bool moodChanged(const std::string& mood) override;
    7171        inline void ambientSourceChanged()
    7272            { this->setAmbientSource(this->ambientSource_); }

  • code/branches/cpp11_v2/src/orxonox/sound/SoundManager.h

    r10817 r10845  
    6868        ~SoundManager();
    6969
    70         void preUpdate(const Clock& time) override;
    71         void postUpdate(const Clock& time) override { /*no action*/ }
     70        virtual void preUpdate(const Clock& time) override;
     71        virtual void postUpdate(const Clock& time) override { /*no action*/ }
    7272        void setConfigValues();
    7373

  • code/branches/cpp11_v2/src/orxonox/sound/WorldAmbientSound.h

    r10817 r10845  
    5050            virtual ~WorldAmbientSound();
    5151
    52             void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
    53             void XMLEventPort(Element& xmlelement, XMLPort::Mode mode) override;
     52            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
     53            virtual void XMLEventPort(Element& xmlelement, XMLPort::Mode mode) override;
    5454
    5555            virtual void changedActivity() override;

  • code/branches/cpp11_v2/src/orxonox/sound/WorldSound.h

    r10817 r10845  
    4747        WorldSound(Context* context);
    4848
    49         void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
    50         void XMLEventPort(Element& xmlelement, XMLPort::Mode mode) override;
    51         void changedActivity() override;
     49        virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
     50        virtual void XMLEventPort(Element& xmlelement, XMLPort::Mode mode) override;
     51        virtual void changedActivity() override;
    5252
    53         void tick(float dt) override;
     53        virtual void tick(float dt) override;
    5454
    5555    protected:
    … …  
    5858    private:
    5959        void registerVariables();
    60         void initialiseSource() override;
    61         float getRealVolume() override;
     60        virtual void initialiseSource() override;
     61        virtual float getRealVolume() override;
    6262    };
    6363}

  • code/branches/cpp11_v2/src/orxonox/worldentities/ControllableEntity.h

    r10817 r10845  
    141141            using MobileEntity::setAngularVelocity;
    142142
    143             void setPosition(const Vector3& position) override;
    144             void setOrientation(const Quaternion& orientation) override;
    145             void setVelocity(const Vector3& velocity) override;
    146             void setAngularVelocity(const Vector3& velocity) override;
     143            virtual void setPosition(const Vector3& position) override;
     144            virtual void setOrientation(const Quaternion& orientation) override;
     145            virtual void setVelocity(const Vector3& velocity) override;
     146            virtual void setAngularVelocity(const Vector3& velocity) override;
    147147
    148148            inline bool hasLocalController() const
    … …  
    214214
    215215            // Bullet btMotionState related
    216             void setWorldTransform(const btTransform& worldTrans) override;
     216            virtual void setWorldTransform(const btTransform& worldTrans) override;
    217217
    218218            unsigned int server_overwrite_;

  • code/branches/cpp11_v2/src/orxonox/worldentities/MobileEntity.h

    r10817 r10845  
    6464            inline void setVelocity(float x, float y, float z)
    6565                { this->setVelocity(Vector3(x, y, z)); }
    66             inline const Vector3& getVelocity() const override
     66            virtual inline const Vector3& getVelocity() const override
    6767                { return this->linearVelocity_; }
    6868            /**
    … …  
    109109            // Bullet btMotionState related
    110110            virtual void setWorldTransform(const btTransform& worldTrans) override;
    111             void getWorldTransform(btTransform& worldTrans) const override;
     111            virtual void getWorldTransform(btTransform& worldTrans) const override;
    112112
    113113            Vector3 linearAcceleration_;

  • code/branches/cpp11_v2/src/orxonox/worldentities/MovableEntity.h

    r10817 r10845  
    5252            using WorldEntity::setOrientation;
    5353
    54             inline void setPosition(const Vector3& position) override
     54            virtual inline void setPosition(const Vector3& position) override
    5555                { MobileEntity::setPosition(position); this->overwrite_position_ = this->getPosition(); }
    56             inline void setOrientation(const Quaternion& orientation) override
     56            virtual inline void setOrientation(const Quaternion& orientation) override
    5757                { MobileEntity::setOrientation(orientation); this->overwrite_orientation_ = this->getOrientation(); }
    5858
    … …  
    7979        private:
    8080            void registerVariables();
    81             void clientConnected(unsigned int clientID) override;
    82             void clientDisconnected(unsigned int clientID) override;
     81            virtual void clientConnected(unsigned int clientID) override;
     82            virtual void clientDisconnected(unsigned int clientID) override;
    8383            void resynchronize();
    8484

  • code/branches/cpp11_v2/src/orxonox/worldentities/StaticEntity.h

    r10817 r10845  
    5555            using WorldEntity::setOrientation;
    5656
    57             void setPosition(const Vector3& position) override;
    58             void setOrientation(const Quaternion& orientation) override;
     57            virtual void setPosition(const Vector3& position) override;
     58            virtual void setOrientation(const Quaternion& orientation) override;
    5959
    6060        private:
    6161            void registerVariables();
    62             bool isCollisionTypeLegal(CollisionType type) const override;
     62            virtual bool isCollisionTypeLegal(CollisionType type) const override;
    6363
    6464            // network callbacks
    … …  
    6969
    7070            // Bullet btMotionState related
    71             void setWorldTransform(const btTransform& worldTrans) override;
    72             void getWorldTransform(btTransform& worldTrans) const override;
     71            virtual void setWorldTransform(const btTransform& worldTrans) override;
     72            virtual void getWorldTransform(btTransform& worldTrans) const override;
    7373    };
    7474}

  • code/branches/cpp11_v2/src/orxonox/worldentities/pawns/FpsPlayer.h

    r10818 r10845  
    6969            virtual void fire();
    7070
    71             bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint) override;
     71            virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint) override;
    7272
    7373            virtual void addedWeaponPack(WeaponPack* wPack);
Note: See TracChangeset for help on using the changeset viewer.