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

Timestamp:

Nov 19, 2015, 11:40:28 AM (10 years ago)

Author:

muemart

Message:

Run clang-modernize -add-override
A few notes:

• There are probably some overrides missing, especially in funky templatey code
• Virtual methods with wrong signatures were not fixed, needs to be done by hand (only warnings get emitted)

Location:

code/branches/cpp11_v2/src/orxonox/overlays

Files:

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

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

@@ -44 +44 @@
         ~GUISheet();
 
-        void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+        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);
-        void postUpdate(const Clock& time) { /*no action*/ }
+        void preUpdate(const Clock& time) override;
+        void postUpdate(const Clock& time) override { /*no action*/ }
 
         static void openConsole();
@@ -65 +65 @@
         void deactivate();
 
-        void linesChanged();
-        void lineAdded();
-        void inputChanged();
-        void cursorChanged();
-        void executed();
-        void exit();
+        void linesChanged() override;
+        void lineAdded() override;
+        void inputChanged() override;
+        void cursorChanged() override;
+        void executed() override;
+        void exit() override;
 
         void 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);
+        void windowResized(unsigned int newWidth, unsigned int newHeight) override;
 
         // config value related

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

@@ -90 +90 @@
         virtual ~OrxonoxOverlay();
 
-        virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-
-        virtual void changedName();
+        virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+
+        virtual void changedName() override;
 
         //! Shows the overlay with an detour to BaseObject::visibility_
@@ -167 +167 @@
         void setBackgroundColour(ColourValue colour);
 
-        virtual void changedVisibility();
+        virtual void changedVisibility() override;
 
         inline void setOwner(BaseObject* owner)
@@ -206 +206 @@
 
     private:
-        void windowResized(unsigned int newWidth, unsigned int newHeight);
+        void windowResized(unsigned int newWidth, unsigned int newHeight) override;
 
         static unsigned int hudOverlayCounter_s;   //!< Static counter for hud elements

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

@@ -58 +58 @@
         ~OverlayGroup();
 
-        virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+        virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
 
         static void toggleVisibility(const std::string& name);
@@ -68 +68 @@
             { return this->hudElements_; }
 
-        virtual void changedVisibility();
+        virtual void changedVisibility() override;
 
         void setOwner(BaseObject* owner);