Changeset 10845 for code/branches/cpp11_v2/src/orxonox/overlays

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/orxonox/overlays

Files:

• GUISheet.h (modified) (1 diff)
• InGameConsole.h (modified) (3 diffs)
• OrxonoxOverlay.h (modified) (1 diff)

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

@@ -44 +44 @@
         ~GUISheet();
 
-        void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+        virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
 
         void show();

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

@@ -53 +53 @@
         void setConfigValues();
 
-        void preUpdate(const Clock& time) override;
-        void postUpdate(const Clock& time) override { /*no action*/ }
+        virtual void preUpdate(const Clock& time) override;
+        virtual void postUpdate(const Clock& time) override { /*no action*/ }
 
         static void openConsole();
@@ -65 +65 @@
         void deactivate();
 
-        void linesChanged() override;
-        void lineAdded() override;
-        void inputChanged() override;
-        void cursorChanged() override;
-        void executed() override;
-        void exit() override;
+        virtual void linesChanged() override;
+        virtual void lineAdded() override;
+        virtual void inputChanged() override;
+        virtual void cursorChanged() override;
+        virtual void executed() override;
+        virtual void exit() override;
 
         void shiftLines();
@@ -77 +77 @@
         void print(const std::string& text, Shell::LineType type, int index, bool alwaysShift = false);
 
-        void windowResized(unsigned int newWidth, unsigned int newHeight) override;
+        virtual void windowResized(unsigned int newWidth, unsigned int newHeight) override;
 
         // config value related

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

@@ -206 +206 @@
 
     private:
-        void windowResized(unsigned int newWidth, unsigned int newHeight) override;
+        virtual void windowResized(unsigned int newWidth, unsigned int newHeight) override;
 
         static unsigned int hudOverlayCounter_s;   //!< Static counter for hud elements