Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Nov 23, 2015, 10:20:29 PM (9 years ago)
Author:
landauf
Message:

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

Location:
code/branches/cpp11_v2/src/libraries/core
Files:
29 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)
Note: See TracChangeset for help on using the changeset viewer.