Introduce (in a totally optional way) the C++2011 feature to explicitely mark overrides. This bit us quite a few times in the past, so if we start using this more then those with GCC 4.7 will at least catch the errors when they happen :)

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11231 178a84e3-b1eb-0310-8ba1-8eac791a3b58

src/guiengine/screen.hpp

@@ -22,6 +22,7 @@
 #include <map>
 #include <string>
 #include <typeinfo>
+#include "utils/cpp2011.h"
 
 #include <irrString.h>
 #include <IXMLReader.h>

src/states_screens/addons_screen.hpp

@@ -73,24 +73,24 @@ public:
     void loadList();
 
     /** \brief implement callback from parent class GUIEngine::Screen */
-    virtual void loadedFromFile();
+    virtual void loadedFromFile() OVERRIDE;
 
-    virtual void unloaded();
+    virtual void unloaded() OVERRIDE;
     
     /** \brief implement callback from parent class GUIEngine::Screen */
-    virtual void eventCallback(GUIEngine::Widget* widget, 
+    virtual void eventCallback(GUIEngine::Widget* widget, const std::string& name,
-                               const std::string& name, const int playerID);
+                               const int playerID) OVERRIDE;
 
     /** \brief implement callback from parent class GUIEngine::Screen */
-    virtual void beforeAddingWidget();
+    virtual void beforeAddingWidget() OVERRIDE;
     
     virtual void onColumnClicked(int columnId);
 
-    virtual void init();
+    virtual void init() OVERRIDE;
-    virtual void tearDown();
+    virtual void tearDown() OVERRIDE;
     
     /** \brief implement callback from parent class GUIEngine::Screen */
-    virtual void onUpdate(float dt, irr::video::IVideoDriver*);
+    virtual void onUpdate(float dt, irr::video::IVideoDriver*) OVERRIDE;
 
     void    setLastSelected();
 

src/states_screens/arenas_screen.hpp

@@ -37,16 +37,17 @@ class ArenasScreen : public GUIEngine::Screen, public GUIEngine::ScreenSingleton
 public:
     
     /** \brief implement callback from parent class GUIEngine::Screen */
-    virtual void beforeAddingWidget();
+    virtual void beforeAddingWidget() OVERRIDE;
     
     /** \brief implement callback from parent class GUIEngine::Screen */
-    virtual void loadedFromFile();
+    virtual void loadedFromFile() OVERRIDE;
     
     /** \brief implement callback from parent class GUIEngine::Screen */
-    virtual void init();
+    virtual void init() OVERRIDE;
         
     /** \brief implement callback from parent class GUIEngine::Screen */
-    virtual void eventCallback(GUIEngine::Widget* widget, const std::string& name, const int playerID);
+    virtual void eventCallback(GUIEngine::Widget* widget, const std::string& name,
+                               const int playerID) OVERRIDE;
 
     void setFocusOnTrack(const std::string& trackName);
 };

src/states_screens/credits.hpp

@@ -66,18 +66,18 @@ public:
     void reset();
     
     /** \brief implement callback from parent class GUIEngine::Screen */
-    virtual void loadedFromFile();
+    virtual void loadedFromFile() OVERRIDE;
     
     /** \brief implement optional callback from parent class 
      *  GUIEngine::Screen */
-    void onUpdate(float dt, irr::video::IVideoDriver*);
+    void onUpdate(float dt, irr::video::IVideoDriver*) OVERRIDE;
     
     /** \brief implement callback from parent class GUIEngine::Screen */
-    void init();
+    void init() OVERRIDE;
     
     /** \brief implement callback from parent class GUIEngine::Screen */
     void eventCallback(GUIEngine::Widget* widget, const std::string& name, 
-                       const int playerID);
+                       const int playerID) OVERRIDE;
 };
 
 #endif

src/states_screens/feature_unlocked.hpp

@@ -126,18 +126,19 @@ class FeatureUnlockedCutScene : public GUIEngine::Screen, public GUIEngine::Scre
 public:
 
     /** \brief implement optional callback from parent class GUIEngine::Screen */
-    void onUpdate(float dt, irr::video::IVideoDriver*);
+    void onUpdate(float dt, irr::video::IVideoDriver*) OVERRIDE;
     
     /** \brief implement callback from parent class GUIEngine::Screen */
-    virtual void loadedFromFile();
+    virtual void loadedFromFile() OVERRIDE;
     
     /** \brief implement callback from parent class GUIEngine::Screen */
-    void init();
+    void init() OVERRIDE;
     
     /** \brief implement callback from parent class GUIEngine::Screen */
-    void tearDown();
+    void tearDown() OVERRIDE;
     
-    void eventCallback(GUIEngine::Widget* widget, const std::string& name, const int playerID);
+    void eventCallback(GUIEngine::Widget* widget, const std::string& name,
+                       const int playerID) OVERRIDE;
     
     /** Call before showing up the screen to make a kart come out of the chest.
         'addUnlockedThings' will invoke this, so you generally don't need to call this directly. */
@@ -165,7 +166,7 @@ public:
     void addTrophy(RaceManager::Difficulty difficulty);
     
     /** override from base class to handle escape press */
-    virtual bool onEscapePressed();
+    virtual bool onEscapePressed() OVERRIDE;
 };
 
 #endif

src/states_screens/grand_prix_lose.hpp

@@ -72,24 +72,25 @@ class GrandPrixLose : public GUIEngine::Screen, public GUIEngine::ScreenSingleto
 public:
 
     /** \brief implement callback from parent class GUIEngine::Screen */
-    virtual void loadedFromFile();
+    virtual void loadedFromFile() OVERRIDE;
     
     /** \brief implement optional callback from parent class GUIEngine::Screen */
-    void onUpdate(float dt, irr::video::IVideoDriver*);
+    void onUpdate(float dt, irr::video::IVideoDriver*) OVERRIDE;
     
     /** \brief implement callback from parent class GUIEngine::Screen */
-    void init();
+    void init() OVERRIDE;
     
     /** \brief implement callback from parent class GUIEngine::Screen */
-    void tearDown();
+    void tearDown() OVERRIDE;
     
     /** \brief implement callback from parent class GUIEngine::Screen */
-    void eventCallback(GUIEngine::Widget* widget, const std::string& name, const int playerID);
+    void eventCallback(GUIEngine::Widget* widget, const std::string& name,
+                       const int playerID) OVERRIDE;
     
     /** \brief set which karts lost this GP */
     void setKarts(std::vector<std::string> ident);
 
-    virtual MusicInformation* getMusic() const { return m_music; }
+    virtual MusicInformation* getMusic() const OVERRIDE { return m_music; }
 
 };
 

src/states_screens/grand_prix_win.hpp

@@ -71,24 +71,25 @@ class GrandPrixWin : public GUIEngine::Screen, public GUIEngine::ScreenSingleton
 public:
 
     /** \brief implement callback from parent class GUIEngine::Screen */
-    virtual void loadedFromFile();
+    virtual void loadedFromFile() OVERRIDE;
     
     /** \brief implement optional callback from parent class GUIEngine::Screen */
-    void onUpdate(float dt, irr::video::IVideoDriver*);
+    void onUpdate(float dt, irr::video::IVideoDriver*) OVERRIDE;
     
     /** \brief implement callback from parent class GUIEngine::Screen */
-    void init();
+    void init() OVERRIDE;
     
     /** \brief implement callback from parent class GUIEngine::Screen */
-    void tearDown();
+    void tearDown() OVERRIDE;
     
     /** \brief implement callback from parent class GUIEngine::Screen */
-    void eventCallback(GUIEngine::Widget* widget, const std::string& name, const int playerID);
+    void eventCallback(GUIEngine::Widget* widget, const std::string& name,
+                       const int playerID) OVERRIDE;
     
     /** \pre must be called after pushing the screen, but before onUpdate had the chance to be invoked */
     void setKarts(const std::string idents[3]);
 
-    virtual MusicInformation* getMusic() const { return m_music; }
+    virtual MusicInformation* getMusic() const OVERRIDE { return m_music; }
 };
 
 #endif

src/states_screens/help_screen_1.hpp

@@ -34,13 +34,14 @@ class HelpScreen1 : public GUIEngine::Screen, public GUIEngine::ScreenSingleton<
 public:
 
     /** \brief implement callback from parent class GUIEngine::Screen */
-    virtual void loadedFromFile();
+    virtual void loadedFromFile() OVERRIDE;
     
     /** \brief implement callback from parent class GUIEngine::Screen */
-    virtual void eventCallback(GUIEngine::Widget* widget, const std::string& name, const int playerID);
+    virtual void eventCallback(GUIEngine::Widget* widget, const std::string& name,
+                               const int playerID) OVERRIDE;
     
     /** \brief implement callback from parent class GUIEngine::Screen */
-    virtual void init();
+    virtual void init() OVERRIDE;
 };
 
 #endif

src/states_screens/help_screen_2.hpp

@@ -34,13 +34,14 @@ class HelpScreen2 : public GUIEngine::Screen, public GUIEngine::ScreenSingleton<
 public:
     
     /** \brief implement callback from parent class GUIEngine::Screen */
-    virtual void loadedFromFile();
+    virtual void loadedFromFile() OVERRIDE;
     
     /** \brief implement callback from parent class GUIEngine::Screen */
-    virtual void eventCallback(GUIEngine::Widget* widget, const std::string& name, const int playerID);
+    virtual void eventCallback(GUIEngine::Widget* widget, const std::string& name,
+                               const int playerID) OVERRIDE;
     
     /** \brief implement callback from parent class GUIEngine::Screen */
-    virtual void init();
+    virtual void init() OVERRIDE;
-    };
+};
 
 #endif

src/states_screens/help_screen_3.hpp

@@ -35,13 +35,14 @@ class HelpScreen3 : public GUIEngine::Screen, public GUIEngine::ScreenSingleton<
 public:
     
     /** \brief implement callback from parent class GUIEngine::Screen */
-    virtual void loadedFromFile();
+    virtual void loadedFromFile() OVERRIDE;
     
     /** \brief implement callback from parent class GUIEngine::Screen */
-    virtual void eventCallback(GUIEngine::Widget* widget, const std::string& name, const int playerID);
+    virtual void eventCallback(GUIEngine::Widget* widget, const std::string& name,
+                               const int playerID) OVERRIDE;
     
     /** \brief implement callback from parent class GUIEngine::Screen */
-    virtual void init();
+    virtual void init() OVERRIDE;
     
 };
 

src/states_screens/help_screen_4.hpp

@@ -35,13 +35,14 @@ class HelpScreen4 : public GUIEngine::Screen, public GUIEngine::ScreenSingleton<
 public:
     
     /** \brief implement callback from parent class GUIEngine::Screen */
-    virtual void loadedFromFile();
+    virtual void loadedFromFile() OVERRIDE;
     
     /** \brief implement callback from parent class GUIEngine::Screen */
-    virtual void eventCallback(GUIEngine::Widget* widget, const std::string& name, const int playerID);
+    virtual void eventCallback(GUIEngine::Widget* widget, const std::string& name,
+                               const int playerID) OVERRIDE;
     
     /** \brief implement callback from parent class GUIEngine::Screen */
-    virtual void init();
+    virtual void init() OVERRIDE;
     
 };
 

src/states_screens/kart_selection.hpp

@@ -92,7 +92,7 @@ class KartSelectionScreen : public GUIEngine::Screen,
 public:
     
     /** \brief implement callback from parent class GUIEngine::Screen */
-    virtual void loadedFromFile();
+    virtual void loadedFromFile() OVERRIDE;
     
     void setMultiplayer(bool multiplayer);
     
@@ -111,25 +111,25 @@ public:
     bool playerQuit(StateManager::ActivePlayer* player);
     
      /** \brief implement callback from parent class GUIEngine::Screen */
-    virtual void init();
+    virtual void init() OVERRIDE;
     
-    virtual void beforeAddingWidget();
+    virtual void beforeAddingWidget() OVERRIDE;
     
      /** \brief implement callback from parent class GUIEngine::Screen */
-    virtual void tearDown();
+    virtual void tearDown() OVERRIDE;
     
     /** \brief implement callback from parent class GUIEngine::Screen */
-    virtual void eventCallback(GUIEngine::Widget* widget, 
+    virtual void eventCallback(GUIEngine::Widget* widget, const std::string& name,
-                               const std::string& name, const int playerID);
+                               const int playerID) OVERRIDE;
     
     /** \brief implement callback from parent class GUIEngine::Screen */
-    virtual void onUpdate(float dt, irr::video::IVideoDriver*);
+    virtual void onUpdate(float dt, irr::video::IVideoDriver*) OVERRIDE;
 
     /** \brief implement optional callback from parent 
      *  class GUIEngine::Screen */
-    virtual void unloaded();
+    virtual void unloaded() OVERRIDE;
     
     /** \brief implement optional callback from parent 
      *  class GUIEngine::Screen */
-    virtual bool onEscapePressed();
+    virtual bool onEscapePressed() OVERRIDE;
 };

src/states_screens/main_menu_screen.hpp

@@ -35,22 +35,23 @@ private:
     
 public:
     
-    virtual void onUpdate(float delta,  irr::video::IVideoDriver* driver);
+    virtual void onUpdate(float delta,  irr::video::IVideoDriver* driver) OVERRIDE;
     
     /** \brief implement callback from parent class GUIEngine::Screen */
-    virtual void loadedFromFile();
+    virtual void loadedFromFile() OVERRIDE;
     
     /** \brief implement callback from parent class GUIEngine::Screen */
-    virtual void eventCallback(GUIEngine::Widget* widget, const std::string& name, const int playerID);
+    virtual void eventCallback(GUIEngine::Widget* widget, const std::string& name,
+                               const int playerID) OVERRIDE;
     
     /** \brief implement callback from parent class GUIEngine::Screen */
-    virtual void init();
+    virtual void init() OVERRIDE;
     
     /** \brief implement callback from parent class GUIEngine::Screen */
-    virtual void tearDown();
+    virtual void tearDown() OVERRIDE;
     
     /** \brief implement callback from parent class GUIEngine::Screen */
-    virtual void onDisabledItemClicked(const std::string& item);
+    virtual void onDisabledItemClicked(const std::string& item) OVERRIDE;
 };
 
 #endif

src/states_screens/options_screen_audio.hpp

@@ -39,19 +39,20 @@ public:
     friend class GUIEngine::ScreenSingleton<OptionsScreenAudio>;
     
     /** \brief implement callback from parent class GUIEngine::Screen */
-    virtual void loadedFromFile();
+    virtual void loadedFromFile() OVERRIDE;
     
     /** \brief implement callback from parent class GUIEngine::Screen */
-    virtual void eventCallback(GUIEngine::Widget* widget, const std::string& name, const int playerID);
+    virtual void eventCallback(GUIEngine::Widget* widget, const std::string& name,
+                               const int playerID) OVERRIDE;
         
     /** \brief implement callback from parent class GUIEngine::Screen */
-    virtual void init();
+    virtual void init() OVERRIDE;
-    
+     
     /** \brief implement callback from parent class GUIEngine::Screen */
-    virtual void tearDown();
+    virtual void tearDown() OVERRIDE;
     
     /** \brief implement optional callback from parent class GUIEngine::Screen */
-    virtual void unloaded();
+    virtual void unloaded() OVERRIDE;
 };
 
 #endif

src/states_screens/options_screen_input2.hpp

@@ -59,22 +59,22 @@ public:
     void setDevice(DeviceConfig* config) { m_config = config; }
     
     /** \brief implement callback from parent class GUIEngine::Screen */
-    virtual void loadedFromFile();
+    virtual void loadedFromFile() OVERRIDE;
     
     /** \brief implement callback from parent class GUIEngine::Screen */
     virtual void eventCallback(GUIEngine::Widget* widget, 
-                               const std::string& name, const int playerID);
+                               const std::string& name, const int playerID) OVERRIDE;
     
     /** \brief implement optional callback from parent class 
      *  GUIEngine::Screen */
-    virtual void unloaded();
+    virtual void unloaded() OVERRIDE;
     
     /** \brief implement callback from parent class GUIEngine::Screen */
-    virtual void init();
+    virtual void init() OVERRIDE;
     
     /** \brief implement optional callback from parent class 
      *  GUIEngine::Screen */
-    virtual bool onEscapePressed();
+    virtual bool onEscapePressed() OVERRIDE;
 
     /**
       * \brief invoke in "input sensing" mode, when input was sensed.
@@ -83,7 +83,7 @@ public:
     void gotSensedInput(const Input& sensedInput);
     
     /** \brief Implement IConfirmDialogListener callback */
-    virtual void onConfirm();
+    virtual void onConfirm() OVERRIDE;
 };
 
 #endif

src/states_screens/options_screen_players.hpp

@@ -42,10 +42,11 @@ public:
     friend class GUIEngine::ScreenSingleton<OptionsScreenPlayers>;
     
     /** \brief implement callback from parent class GUIEngine::Screen */
-    virtual void loadedFromFile();
+    virtual void loadedFromFile() OVERRIDE;
     
     /** \brief implement callback from parent class GUIEngine::Screen */
-    virtual void eventCallback(GUIEngine::Widget* widget, const std::string& name, const int playerID);
+    virtual void eventCallback(GUIEngine::Widget* widget, const std::string& name,
+                               const int playerID) OVERRIDE;
     
     /**
      * \brief Adds a new player (if 'player' is NULL) or renames an existing player (if 'player' is not NULL)
@@ -57,10 +58,10 @@ public:
     void selectPlayer(const irr::core::stringw& name);
     
     /** \brief implement callback from parent class GUIEngine::Screen */
-    virtual void init();
+    virtual void init() OVERRIDE;
     
     /** \brief implement callback from parent class GUIEngine::Screen */
-    virtual void tearDown();
+    virtual void tearDown() OVERRIDE;
     
     /** \brief implement callback from EnterPlayerNameDialog::INewPlayerListener */
     virtual void onNewPlayerWithName(const irr::core::stringw& newName);

src/states_screens/options_screen_ui.hpp

@@ -42,19 +42,20 @@ public:
     friend class GUIEngine::ScreenSingleton<OptionsScreenUI>;
     
     /** \brief implement callback from parent class GUIEngine::Screen */
-    virtual void loadedFromFile();
+    virtual void loadedFromFile() OVERRIDE;
     
     /** \brief implement callback from parent class GUIEngine::Screen */
-    virtual void eventCallback(GUIEngine::Widget* widget, const std::string& name, const int playerID);
+    virtual void eventCallback(GUIEngine::Widget* widget, const std::string& name,
+                               const int playerID) OVERRIDE;
         
     /** \brief implement callback from parent class GUIEngine::Screen */
-    virtual void init();
+    virtual void init() OVERRIDE;
     
     /** \brief implement callback from parent class GUIEngine::Screen */
-    virtual void tearDown();
+    virtual void tearDown() OVERRIDE;
     
     /** \brief implement optional callback from parent class GUIEngine::Screen */
-    virtual void unloaded();
+    virtual void unloaded() OVERRIDE;
 };
 
 #endif

src/states_screens/options_screen_video.hpp

@@ -44,19 +44,20 @@ public:
     friend class GUIEngine::ScreenSingleton<OptionsScreenVideo>;
     
     /** \brief implement callback from parent class GUIEngine::Screen */
-    virtual void loadedFromFile();
+    virtual void loadedFromFile() OVERRIDE;
     
     /** \brief implement callback from parent class GUIEngine::Screen */
-    virtual void eventCallback(GUIEngine::Widget* widget, const std::string& name, const int playerID);
+    virtual void eventCallback(GUIEngine::Widget* widget, const std::string& name,
+                               const int playerID) OVERRIDE;
         
     /** \brief implement callback from parent class GUIEngine::Screen */
-    virtual void init();
+    virtual void init() OVERRIDE;
     
     /** \brief implement callback from parent class GUIEngine::Screen */
-    virtual void tearDown();
+    virtual void tearDown() OVERRIDE;
     
     /** \brief implement optional callback from parent class GUIEngine::Screen */
-    virtual void unloaded();
+    virtual void unloaded() OVERRIDE;
     
     void         updateGfxSlider();
 };

src/states_screens/race_result_gui.hpp

@@ -199,14 +199,14 @@ public:
     /** \brief Implement callback from parent class GUIEngine::Screen */
     virtual void loadedFromFile() {};
 
-    virtual void init();
+    virtual void init() OVERRIDE;
-    virtual void tearDown();    
+    virtual void tearDown() OVERRIDE;
-    virtual bool onEscapePressed();
+    virtual bool onEscapePressed() OVERRIDE;
     virtual GUIEngine::EventPropagation 
                  filterActions(PlayerAction action, int deviceID, const unsigned int value,
-                               Input::InputType type, int playerId);
+                               Input::InputType type, int playerId) OVERRIDE;
     void eventCallback(GUIEngine::Widget* widget, const std::string& name, 
-                       const int playerID);
+                       const int playerID) OVERRIDE;
 
 
     friend class GUIEngine::ScreenSingleton<RaceResultGUI>;
@@ -218,7 +218,7 @@ public:
     /** No kart specific view needs to be rendered in the result gui. */
     virtual void renderPlayerView(const AbstractKart *kart) {}
 
-    virtual void onUpdate(float dt, irr::video::IVideoDriver*);
+    virtual void onUpdate(float dt, irr::video::IVideoDriver*) OVERRIDE;
 
     /** No more messages need to be displayed, but the function might still be
      *  called (e.g. 'new lap' message if the end controller is used for more

src/states_screens/race_setup_screen.cpp

@@ -28,6 +28,7 @@
 
 #include "states_screens/race_setup_screen.hpp"
 
+
 const int CONFIG_CODE_NORMAL = 0;
 const int CONFIG_CODE_TIMETRIAL = 1;
 const int CONFIG_CODE_FTL = 2;

src/states_screens/race_setup_screen.hpp

@@ -42,13 +42,14 @@ class RaceSetupScreen : public GUIEngine::Screen, public GUIEngine::ScreenSingle
 public:
     
     /** \brief implement callback from parent class GUIEngine::Screen */
-    virtual void loadedFromFile();
+    virtual void loadedFromFile() OVERRIDE;
     
     /** \brief implement callback from parent class GUIEngine::Screen */
-    virtual void eventCallback(GUIEngine::Widget* widget, const std::string& name, const int playerID);
+    virtual void eventCallback(GUIEngine::Widget* widget, const std::string& name,
+                               const int playerID) OVERRIDE;
     
     /** \brief implement callback from parent class GUIEngine::Screen */
-    virtual void init();
+    virtual void init() OVERRIDE;
 };
 
 #endif

src/states_screens/tracks_screen.hpp

@@ -41,16 +41,17 @@ class TracksScreen : public GUIEngine::Screen, public GUIEngine::ScreenSingleton
 public:
     
     /** \brief implement callback from parent class GUIEngine::Screen */
-    virtual void loadedFromFile();
+    virtual void loadedFromFile() OVERRIDE;
     
     /** \brief implement callback from parent class GUIEngine::Screen */
-    virtual void eventCallback(GUIEngine::Widget* widget, const std::string& name, const int playerID);
+    virtual void eventCallback(GUIEngine::Widget* widget, const std::string& name,
+                               const int playerID) OVERRIDE;
     
     /** \brief implement callback from parent class GUIEngine::Screen */
-    virtual void init();
+    virtual void init() OVERRIDE;
     
     /** \brief implement callback from parent class GUIEngine::Screen */
-    virtual void beforeAddingWidget();
+    virtual void beforeAddingWidget() OVERRIDE;
 
     
     void setFocusOnTrack(const std::string& trackName);

src/utils/cpp2011.h

@@ -0,0 +1,10 @@
+
+#if __cplusplus >= 201103
+
+    #define OVERRIDE override
+    
+#else
+
+    #define OVERRIDE
+    
+#endif