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

Timestamp:

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

Author:

muemart

Message:

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

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

Location:

code/branches/cpp11_v2/src/modules/overlays

Files:

• FadeoutText.h (modified) (2 diffs)
• GUIOverlay.h (modified) (1 diff)
• OverlayText.h (modified) (2 diffs)
• debugging/DebugFPSText.h (modified) (1 diff)
• debugging/DebugPositionText.h (modified) (1 diff)
• debugging/DebugRTRText.h (modified) (1 diff)
• hud/AnnounceMessage.h (modified) (1 diff)
• hud/ChatOverlay.h (modified) (1 diff)
• hud/CountDown.h (modified) (1 diff)
• hud/DeathMessage.h (modified) (1 diff)
• hud/GametypeFadingMessage.h (modified) (1 diff)
• hud/GametypeStaticMessage.h (modified) (1 diff)
• hud/HUDBar.h (modified) (2 diffs)
• hud/HUDBoostBar.h (modified) (1 diff)
• hud/HUDEnemyHealthBar.cc (modified) (1 diff)
• hud/HUDEnemyHealthBar.h (modified) (1 diff)
• hud/HUDHealthBar.h (modified) (1 diff)
• hud/HUDNavigation.h (modified) (1 diff)
• hud/HUDRadar.h (modified) (3 diffs)
• hud/HUDSpeedBar.h (modified) (1 diff)
• hud/HUDTimer.h (modified) (1 diff)
• hud/KillMessage.h (modified) (1 diff)
• hud/LastManStandingInfos.h (modified) (1 diff)
• hud/LastTeamStandingInfos.h (modified) (1 diff)
• hud/PauseNotice.h (modified) (1 diff)
• hud/TeamBaseMatchScore.h (modified) (1 diff)
• stats/Scoreboard.h (modified) (2 diffs)
• stats/Stats.h (modified) (1 diff)

code/branches/cpp11_v2/src/modules/overlays/FadeoutText.h

@@ -44 +44 @@
             virtual ~FadeoutText() {}
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-            virtual void tick(float dt);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+            virtual void tick(float dt) override;
 
             inline void setDelay(float delay)
@@ -58 +58 @@
 
         private:
-            virtual void changedColour();
-            virtual void changedCaption();
+            virtual void changedColour() override;
+            virtual void changedCaption() override;
 
             void fadeout();

code/branches/cpp11_v2/src/modules/overlays/GUIOverlay.h

@@ -44 +44 @@
             virtual ~GUIOverlay();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
 
             void setGUIName(const std::string& name);
             inline const std::string& getGUIName() const { return this->guiName_; }
 
-            virtual void changedVisibility();
-            virtual void changedOwner();
+            virtual void changedVisibility() override;
+            virtual void changedOwner() override;
 
         private:

code/branches/cpp11_v2/src/modules/overlays/OverlayText.h

@@ -52 +52 @@
         virtual ~OverlayText();
 
-        virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+        virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
 
         void setCaption(const std::string& caption);
@@ -76 +76 @@
 
     protected:
-        virtual void sizeChanged();
+        virtual void sizeChanged() override;
         virtual void changedColour() {}
         virtual void changedCaption() {}

code/branches/cpp11_v2/src/modules/overlays/debugging/DebugFPSText.h

@@ -43 +43 @@
         virtual ~DebugFPSText();
 
-        virtual void tick(float dt);
+        virtual void tick(float dt) override;
     };
 }

code/branches/cpp11_v2/src/modules/overlays/debugging/DebugPositionText.h

@@ -43 +43 @@
         virtual ~DebugPositionText();
 
-        virtual void tick(float dt);
+        virtual void tick(float dt) override;
     };
 }

code/branches/cpp11_v2/src/modules/overlays/debugging/DebugRTRText.h

@@ -43 +43 @@
         virtual ~DebugRTRText();
 
-        virtual void tick(float dt);
+        virtual void tick(float dt) override;
     };
 }

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

@@ -43 +43 @@
             virtual ~AnnounceMessage() {}
 
-            virtual void changedOwner();
+            virtual void changedOwner() override;
 
-            void announcemessage(const GametypeInfo* gtinfo, const std::string& message);
+            void announcemessage(const GametypeInfo* gtinfo, const std::string& message) override;
 
         private:

code/branches/cpp11_v2/src/modules/overlays/hud/ChatOverlay.h

@@ -49 +49 @@
 
         protected:
-            virtual void incomingChat(const std::string& message, const std::string& name);
+            virtual void incomingChat(const std::string& message, const std::string& name) override;
 
             std::list<Ogre::DisplayString> messages_;

code/branches/cpp11_v2/src/modules/overlays/hud/CountDown.h

@@ -44 +44 @@
             virtual ~CountDown();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-            virtual void changedOwner();
-            virtual void tick(float dt);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+            virtual void changedOwner() override;
+            virtual void tick(float dt) override;
 
             inline void setCounter(float value)

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

@@ -43 +43 @@
             virtual ~DeathMessage() {}
 
-            virtual void changedOwner();
+            virtual void changedOwner() override;
 
-            void deathmessage(const GametypeInfo* gtinfo, const std::string& message);
+            void deathmessage(const GametypeInfo* gtinfo, const std::string& message) override;
 
         private:

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

@@ -43 +43 @@
             virtual ~GametypeFadingMessage();
 
-            virtual void changedOwner();
+            virtual void changedOwner() override;
 
-            void fadingmessage(const GametypeInfo* gtinfo, const std::string& message);
+            void fadingmessage(const GametypeInfo* gtinfo, const std::string& message) override;
 
         private:

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

@@ -46 +46 @@
             virtual ~GametypeStaticMessage();
 
-            virtual void changedOwner();
+            virtual void changedOwner() override;
 
-            void staticmessage(const GametypeInfo* gtinfo, const std::string& message, const ColourValue& colour);
+            void staticmessage(const GametypeInfo* gtinfo, const std::string& message, const ColourValue& colour) override;
 
         private:

code/branches/cpp11_v2/src/modules/overlays/hud/HUDBar.h

@@ -51 +51 @@
         virtual ~BarColour() { }
 
-        virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+        virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
 
         void setColour(const ColourValue& colour) { this->colour_ = colour; }
@@ -71 +71 @@
         virtual ~HUDBar();
 
-        virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+        virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
 
         void clearColours();

code/branches/cpp11_v2/src/modules/overlays/hud/HUDBoostBar.h

@@ -43 +43 @@
         virtual ~HUDBoostBar();
 
-        virtual void tick(float dt);
-        virtual void changedOwner();
+        virtual void tick(float dt) override;
+        virtual void changedOwner() override;
 
     private:

code/branches/cpp11_v2/src/modules/overlays/hud/HUDEnemyHealthBar.cc

@@ -30 +30 @@
 
 #include "core/config/ConfigValueIncludes.h"
+#include "core/CoreIncludes.h"
 #include "worldentities/pawns/Pawn.h"
 

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

@@ -41 +41 @@
 
             void setConfigValues();
-            virtual void tick(float dt);
+            virtual void tick(float dt) override;
 
-            void changedOwner();
+            void changedOwner() override;
 
         private:

code/branches/cpp11_v2/src/modules/overlays/hud/HUDHealthBar.h

@@ -45 +45 @@
             virtual ~HUDHealthBar();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-            virtual void tick(float dt);
-            virtual void changedOwner();
-            virtual void changedOverlayGroup();
-            virtual void changedVisibility();
-            virtual void changedName();
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+            virtual void tick(float dt) override;
+            virtual void changedOwner() override;
+            virtual void changedOverlayGroup() override;
+            virtual void changedVisibility() override;
+            virtual void changedName() override;
 
             inline void setTextFont(const std::string& font)

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

@@ -51 +51 @@
             void setConfigValues();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-            virtual void tick(float dt);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+            virtual void tick(float dt) override;
 
             // RadarListener interface
-            virtual void addObject(RadarViewable* object);
-            virtual void removeObject(RadarViewable* viewable);
-            virtual void objectChanged(RadarViewable* viewable);
+            virtual void addObject(RadarViewable* object) override;
+            virtual void removeObject(RadarViewable* viewable) override;
+            virtual void objectChanged(RadarViewable* viewable) override;
 
-            virtual void changedOwner();
-            virtual void sizeChanged();
-            virtual void angleChanged() { }
-            virtual void positionChanged() { }
-            virtual void radarTick(float dt) {}
+            virtual void changedOwner() override;
+            virtual void sizeChanged() override;
+            virtual void angleChanged() override { }
+            virtual void positionChanged() override { }
+            virtual void radarTick(float dt) override {}
 
-            inline float getRadarSensitivity() const
+            inline float getRadarSensitivity() const override
                 { return 1.0f; }
 

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

@@ -50 +50 @@
         virtual ~HUDRadar();
 
-        virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-        virtual void changedOwner();
+        virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+        virtual void changedOwner() override;
         void setConfigValues();
 
@@ -80 +80 @@
         void set3DMaterialBack(std::string material3DBack) { this->material3DBack_ = material3DBack; }
 
-        float getRadarSensitivity() const { return this->sensitivity_; }
+        float getRadarSensitivity() const override { return this->sensitivity_; }
         // used also by RadarListener interface!
         void setRadarSensitivity(float sensitivity) { this->sensitivity_ = sensitivity; }
@@ -89 +89 @@
 
         // RadarListener interface
-        virtual void addObject(RadarViewable* viewable);
-        virtual void removeObject(RadarViewable* viewable);
-        virtual void objectChanged( RadarViewable* rv );
-        void radarTick(float dt);
+        virtual void addObject(RadarViewable* viewable) override;
+        virtual void removeObject(RadarViewable* viewable) override;
+        virtual void objectChanged( RadarViewable* rv ) override;
+        void radarTick(float dt) override;
         bool showObject( RadarViewable* rv ); //!< Do not display an object on radar, if showObject(.) is false.
 

code/branches/cpp11_v2/src/modules/overlays/hud/HUDSpeedBar.h

@@ -44 +44 @@
         virtual ~HUDSpeedBar();
 
-        virtual void tick(float dt);
-        virtual void changedOwner();
+        virtual void tick(float dt) override;
+        virtual void changedOwner() override;
 
     private:

code/branches/cpp11_v2/src/modules/overlays/hud/HUDTimer.h

@@ -43 +43 @@
         virtual ~HUDTimer();
 
-        virtual void tick(float dt);
+        virtual void tick(float dt) override;
 
-        virtual void changedOwner();
+        virtual void changedOwner() override;
 
     private:

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

@@ -43 +43 @@
             virtual ~KillMessage() {}
 
-            virtual void changedOwner();
+            virtual void changedOwner() override;
 
-            void killmessage(const GametypeInfo* gtinfo, const std::string& message);
+            void killmessage(const GametypeInfo* gtinfo, const std::string& message) override;
 
         private:

code/branches/cpp11_v2/src/modules/overlays/hud/LastManStandingInfos.h

@@ -43 +43 @@
             virtual ~LastManStandingInfos();
 
-            virtual void tick(float dt);
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-            virtual void changedOwner();
+            virtual void tick(float dt) override;
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+            virtual void changedOwner() override;
 
             inline void setShowLives(bool value)

code/branches/cpp11_v2/src/modules/overlays/hud/LastTeamStandingInfos.h

@@ -43 +43 @@
             virtual ~LastTeamStandingInfos();
 
-            virtual void tick(float dt);
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-            virtual void changedOwner();
+            virtual void tick(float dt) override;
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+            virtual void changedOwner() override;
 
             inline void setShowLives(bool value)

code/branches/cpp11_v2/src/modules/overlays/hud/PauseNotice.h

@@ -42 +42 @@
             PauseNotice(Context* context);
 
-            virtual void changedOwner();
+            virtual void changedOwner() override;
 
         protected:
-            virtual void changedTimeFactor(float factor_new, float factor_old);
+            virtual void changedTimeFactor(float factor_new, float factor_old) override;
 
         private:

code/branches/cpp11_v2/src/modules/overlays/hud/TeamBaseMatchScore.h

@@ -43 +43 @@
             virtual ~TeamBaseMatchScore();
 
-            virtual void tick(float dt);
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-            virtual void changedOwner();
+            virtual void tick(float dt) override;
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+            virtual void changedOwner() override;
 
             inline void setShowBases(bool value)

code/branches/cpp11_v2/src/modules/overlays/stats/Scoreboard.h

@@ -44 +44 @@
         virtual ~Scoreboard();
 
-        virtual void tick(float dt);
+        virtual void tick(float dt) override;
 
         inline void setCreateLines(CreateLines* cl)
@@ -51 +51 @@
             { return this->createlines_; }
 
-        virtual void changedVisibility();
+        virtual void changedVisibility() override;
 
     private: // functions

code/branches/cpp11_v2/src/modules/overlays/stats/Stats.h

@@ -46 +46 @@
         void setConfigValues();
 
-        virtual void tick(float dt);
+        virtual void tick(float dt) override;
 
     private: // variables