kallisti5 · Jarod42 · Sep 19, 2024 · Sep 18, 2024
diff --git a/demo/ff/include/ffcharacterchooser.hpp b/demo/ff/include/ffcharacterchooser.hpp
@@ -50,12 +50,13 @@ class FFCharacterChooser : public gcn::Widget, gcn::KeyListener
 {
 public:
     FFCharacterChooser();
-    ~FFCharacterChooser();
-    void draw(gcn::Graphics* graphics);
+    ~FFCharacterChooser() override;
+    void draw(gcn::Graphics* graphics) override;
+    void keyPressed(gcn::KeyEvent& keyEvent) override;
+
     int getSelected();
     void setSelected(int selected);
     void setDistance(int distance);
-    void keyPressed(gcn::KeyEvent& keyEvent);
 
 private:
     int mSelected;

diff --git a/demo/ff/include/ffcontainer.hpp b/demo/ff/include/ffcontainer.hpp
@@ -50,15 +50,16 @@ class FFContainer : public gcn::Container
 {
 public:
     FFContainer();
-    ~FFContainer();
-    void logic();
-    void draw(gcn::Graphics* graphics);
+    ~FFContainer() override;
+    void logic() override;
+    void draw(gcn::Graphics* graphics) override;
+    gcn::Rectangle getChildrenArea() override;
+
     void setVisible(bool visible);
     void setWidth(int width);
     void setHeight(int width);
     void setDimension(const gcn::Rectangle &dimension);
     void slideContentTo(int y);
-    gcn::Rectangle getChildrenArea();
 
 private:
     int mRealWidth;

diff --git a/demo/ff/include/ffdemo.hpp b/demo/ff/include/ffdemo.hpp
@@ -59,10 +59,11 @@ class FFDemo : public gcn::ActionListener, public gcn::KeyListener
 {
 public:
     FFDemo();
-    ~FFDemo();
+    ~FFDemo() override;
+    void action(const gcn::ActionEvent& actionEvent) override;
+    void keyPressed(gcn::KeyEvent& keyEvent) override;
+
     void run();
-    void action(const gcn::ActionEvent& actionEvent);
-    void keyPressed(gcn::KeyEvent& keyEvent);
 
 private:
     void input();

diff --git a/demo/ff/include/fflistbox.hpp b/demo/ff/include/fflistbox.hpp
@@ -50,8 +50,9 @@ class FFListBox : public gcn::ListBox
 {
 public:
     FFListBox();
-    ~FFListBox();
-    void draw(gcn::Graphics* graphics);
+    ~FFListBox() override;
+    void draw(gcn::Graphics* graphics) override;
+
     void setSelected(int i);
 
 private:

diff --git a/demo/ff/include/ffscrollarea.hpp b/demo/ff/include/ffscrollarea.hpp
@@ -50,8 +50,8 @@ class FFScrollArea : public gcn::ScrollArea, public gcn::KeyListener
 {
 public:
     FFScrollArea();
-    void draw(gcn::Graphics *graphics);
-    void keyPressed(gcn::KeyEvent &keyEvent);
+    void draw(gcn::Graphics* graphics) override;
+    void keyPressed(gcn::KeyEvent& keyEvent) override;
 };
 
 #endif
diff --git a/demo/ff/include/stringlistmodel.hpp b/demo/ff/include/stringlistmodel.hpp
@@ -52,15 +52,8 @@ class StringListModel : public gcn::ListModel
 public:
     StringListModel() {}
 
-    int getNumberOfElements()
-    {
-        return mStrings.size();
-    }
-
-    std::string getElementAt(int i)
-    {
-        return mStrings.at(i);
-    }
+    int getNumberOfElements() override { return mStrings.size(); }
+    std::string getElementAt(int i) override { return mStrings.at(i); }
 
     void add(std::string str)
     {

diff --git a/examples/action_example.hpp b/examples/action_example.hpp
@@ -58,7 +58,7 @@ namespace ActionExample
             button2->addActionListener(this);
         }
 
-        ~MainContainer()
+        ~MainContainer() override
         {
             delete font;
 
@@ -74,7 +74,7 @@ namespace ActionExample
 
         // Implement the action function in ActionListener to receive actions
         // The eventId tells us which widget called the action function.
-        virtual void action(const gcn::ActionEvent& actionEvent)
+        void action(const gcn::ActionEvent& actionEvent) override
         {
             std::string str;
             std::ostringstream os(str);

diff --git a/examples/rickroll_example.hpp b/examples/rickroll_example.hpp
@@ -57,7 +57,7 @@ namespace RickRollExample
             button2->addActionListener(this);
         }
 
-        ~MainContainer()
+        ~MainContainer() override
         {
             delete font;
 
@@ -73,7 +73,7 @@ namespace RickRollExample
 
         // Implement the action function in ActionListener to receive actions
         // The eventId tells us which widget called the action function.
-        virtual void action(const gcn::ActionEvent& actionEvent)
+        void action(const gcn::ActionEvent& actionEvent) override
         {
             // Here we use the widget pointer to check which widget the action
             // originated from.

diff --git a/examples/widgets_example.hpp b/examples/widgets_example.hpp
@@ -10,9 +10,9 @@ namespace WidgetsExample
     class DemoListModel : public gcn::ListModel
     {
     public:
-        virtual int getNumberOfElements() { return 5; }
+        int getNumberOfElements() override { return 5; }
 
-        virtual std::string getElementAt(int i)
+        std::string getElementAt(int i) override
         {
             switch (i)
             {

diff --git a/include/guisan/actionevent.hpp b/include/guisan/actionevent.hpp
@@ -103,7 +103,7 @@ namespace gcn
         /**
          * Destructor.
          */
-        virtual ~ActionEvent();
+        ~ActionEvent() override;
 
         /**
          * Gets the identifier of the event. An identifier can

diff --git a/include/guisan/containerevent.hpp b/include/guisan/containerevent.hpp
@@ -79,7 +79,7 @@ namespace gcn
         /**
          * Destructor.
          */
-        virtual ~ContainerEvent();
+        ~ContainerEvent() override;
 
         /**
          * Gets the container the event concerns.

diff --git a/include/guisan/defaultfont.hpp b/include/guisan/defaultfont.hpp
@@ -74,7 +74,7 @@ namespace gcn
         /**
          * Destructor.
          */
-        virtual ~DefaultFont(){}
+        ~DefaultFont() override {}
 
         /**
          * Draws a glyph as a rectangle. The glyphs will always be drawn as
@@ -95,13 +95,11 @@ namespace gcn
 
         // Inherited from Font
 
-        virtual void drawString(Graphics* graphics, const std::string& text, int x, int y, bool enabled);
-
-        virtual int getWidth(const std::string& text) const;
-
-        virtual int getHeight() const;
-
-        virtual int getStringIndexAt(const std::string& text, int x) const;
+        void drawString(
+            Graphics* graphics, const std::string& text, int x, int y, bool enabled) override;
+        int getWidth(const std::string& text) const override;
+        int getHeight() const override;
+        int getStringIndexAt(const std::string& text, int x) const override;
     };
 }
 

diff --git a/include/guisan/genericinput.hpp b/include/guisan/genericinput.hpp
@@ -147,18 +147,13 @@ namespace gcn
          */
         void pushMouseMoved(int x, int y);
 
-
         // Inherited from Input
 
-        virtual bool isKeyQueueEmpty();
-
-        virtual KeyInput dequeueKeyInput();
-
-        virtual bool isMouseQueueEmpty();
-
-        virtual MouseInput dequeueMouseInput();
-
-        virtual void _pollInput();
+        bool isKeyQueueEmpty() override;
+        KeyInput dequeueKeyInput() override;
+        bool isMouseQueueEmpty() override;
+        MouseInput dequeueMouseInput() override;
+        void _pollInput() override;
 
     protected:
         /**

diff --git a/include/guisan/imagefont.hpp b/include/guisan/imagefont.hpp
@@ -142,7 +142,7 @@ pqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"); @endcode
         /**
          * Destructor.
          */
-        virtual ~ImageFont();
+        ~ImageFont() override;
 
         /**
          * Draws a glyph.
@@ -205,14 +205,10 @@ pqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"); @endcode
 
         // Inherited from Font
 
-        virtual int getWidth(const std::string& text) const;
-
-        virtual void drawString(Graphics* graphics, const std::string& text,
-                                int x, int y, bool enabled);
-
-        virtual int getHeight() const;
-
-        virtual int getStringIndexAt(const std::string& text, int x) const;
+        int getWidth(const std::string& text) const override;
+        void drawString(Graphics* graphics, const std::string& text, int x, int y, bool enabled) override;
+        int getHeight() const override;
+        int getStringIndexAt(const std::string& text, int x) const override;
 
     protected:
         /**

diff --git a/include/guisan/keyevent.hpp b/include/guisan/keyevent.hpp
@@ -107,7 +107,7 @@ namespace gcn
         /**
          * Destructor.
          */
-        virtual ~KeyEvent();
+        ~KeyEvent() override;
 
         /**
          * Gets the type of the event.

diff --git a/include/guisan/opengl/openglgraphics.hpp b/include/guisan/opengl/openglgraphics.hpp
@@ -92,7 +92,7 @@ namespace gcn
         /**
          * Destructor.
          */
-        virtual ~OpenGLGraphics();
+        ~OpenGLGraphics() override;
 
         /**
          * Sets the target plane on where to draw.
@@ -120,29 +120,24 @@ namespace gcn
 
         // Inherited from Graphics
 
-        virtual void _beginDraw();
+        void _beginDraw() override;
+        void _endDraw() override;
 
-        virtual void _endDraw();
+        bool pushClipArea(Rectangle area) override;
+        void popClipArea() override;
 
-        virtual bool pushClipArea(Rectangle area);
-
-        virtual void popClipArea();
-
-        virtual void drawImage(const Image* image, int srcX, int srcY,
+        void drawImage(const Image* image, int srcX, int srcY,
                                int dstX, int dstY, int width,
-                               int height);
-
-        virtual void drawPoint(int x, int y);
-
-        virtual void drawLine(int x1, int y1, int x2, int y2);
-
-        virtual void drawRectangle(const Rectangle& rectangle);
+                               int height) override;
 
-        virtual void fillRectangle(const Rectangle& rectangle);
+        void drawPoint(int x, int y) override;
+        void drawLine(int x1, int y1, int x2, int y2) override;
 
-        virtual void setColor(const Color& color);
+        void drawRectangle(const Rectangle& rectangle) override;
+        void fillRectangle(const Rectangle& rectangle) override;
 
-        virtual const Color& getColor();
+        void setColor(const Color& color) override;
+        const Color& getColor() override;
 
     protected:
         int mWidth, mHeight;

diff --git a/include/guisan/opengl/openglimage.hpp b/include/guisan/opengl/openglimage.hpp
@@ -114,7 +114,7 @@ namespace gcn
         /**
          * Destructor.
          */
-        virtual ~OpenGLImage();
+        ~OpenGLImage() override;
 
         /**
          * Gets the OpenGL texture handle for the image.
@@ -138,30 +138,26 @@ namespace gcn
          */
         virtual int getTextureHeight() const;
 
-
         // Inherited from Image
 
-        virtual void free();
-
-        virtual int getWidth() const;
+        void free() override;
 
-        virtual int getHeight() const;
+        int getWidth() const override;
+        int getHeight() const override;
 
-        virtual Color getPixel(int x, int y);
+        Color getPixel(int x, int y) override;
+        void putPixel(int x, int y, const Color& color) override;
 
-        virtual void putPixel(int x, int y, const Color& color);
-
-        virtual void convertToDisplayFormat();
+        void convertToDisplayFormat() override;
 
     protected:
         GLuint mTextureHandle;
         unsigned int* mPixels;
         bool mAutoFree;
         int mWidth;
         int mHeight;
-		int mTextureWidth;
-		int mTextureHeight;
-
+        int mTextureWidth;
+        int mTextureHeight;
     };
 }
 

diff --git a/include/guisan/opengl/openglsdlimageloader.hpp b/include/guisan/opengl/openglsdlimageloader.hpp
@@ -75,8 +75,7 @@ namespace gcn
 
         // Inherited from ImageLoader
 
-        virtual Image* load(const std::string& filename,
-                            bool convertToDisplayFormat = true)
+        Image* load(const std::string& filename, bool convertToDisplayFormat = true) override
         {
             SDL_Surface *loadedSurface = loadSDLSurface(filename);