refactor: Add override keyword to virtual function overrides in Tools and set compile option -Wsuggest-override

Generals/Code/Tools/GUIEdit/Include/GUIEditDisplay.h

@@ -64,68 +64,68 @@ class GUIEditDisplay : public Display
 public:
 
 	GUIEditDisplay( void );
-	virtual ~GUIEditDisplay( void );
+	virtual ~GUIEditDisplay( void ) override;
 
-	virtual void draw( void ) { };
+	virtual void draw( void ) override { };
 
 	/// draw a line on the display in pixel coordinates with the specified color
 	virtual void drawLine( Int startX, Int startY, Int endX, Int endY,
-												 Real lineWidth, UnsignedInt lineColor );
+												 Real lineWidth, UnsignedInt lineColor ) override;
 	virtual void drawLine( Int startX, Int startY, Int endX, Int endY,
-												 Real lineWidth, UnsignedInt lineColor1, UnsignedInt lineColor2 ) { }
+												 Real lineWidth, UnsignedInt lineColor1, UnsignedInt lineColor2 ) override { }
 	/// draw a rect border on the display in pixel coordinates with the specified color
 	virtual void drawOpenRect( Int startX, Int startY, Int width, Int height,
-														 Real lineWidth, UnsignedInt lineColor );
+														 Real lineWidth, UnsignedInt lineColor ) override;
 	/// draw a filled rect on the display in pixel coords with the specified color
 	virtual void drawFillRect( Int startX, Int startY, Int width, Int height,
-														 UnsignedInt color );
+														 UnsignedInt color ) override;
 
 	/// Draw a percentage of a rectangle, much like a clock
-	virtual void drawRectClock(Int startX, Int startY, Int width, Int height, Int percent, UnsignedInt color) { }
-	virtual void drawRemainingRectClock(Int startX, Int startY, Int width, Int height, Int percent, UnsignedInt color) { }
+	virtual void drawRectClock(Int startX, Int startY, Int width, Int height, Int percent, UnsignedInt color) override { }
+	virtual void drawRemainingRectClock(Int startX, Int startY, Int width, Int height, Int percent, UnsignedInt color) override { }
 
 	/// draw an image fit within the screen coordinates
 	virtual void drawImage( const Image *image, Int startX, Int startY,
-													Int endX, Int endY, Color color = 0xFFFFFFFF, DrawImageMode mode=DRAW_IMAGE_ALPHA);
+													Int endX, Int endY, Color color = 0xFFFFFFFF, DrawImageMode mode=DRAW_IMAGE_ALPHA) override;
 	/// image clipping support
-	virtual void setClipRegion( IRegion2D *region );
-	virtual Bool isClippingEnabled( void );
-	virtual void enableClipping( Bool onoff );
+	virtual void setClipRegion( IRegion2D *region ) override;
+	virtual Bool isClippingEnabled( void ) override;
+	virtual void enableClipping( Bool onoff ) override;
 
 	// These are stub functions to allow compilation:
 
 	/// Create a video buffer that can be used for this display
-	virtual VideoBuffer*	createVideoBuffer( void ) { return nullptr; }
+	virtual VideoBuffer*	createVideoBuffer( void ) override { return nullptr; }
 
 	/// draw a video buffer fit within the screen coordinates
-	virtual void drawScaledVideoBuffer( VideoBuffer *buffer, VideoStreamInterface *stream ) { }
+	virtual void drawScaledVideoBuffer( VideoBuffer *buffer, VideoStreamInterface *stream ) override { }
 	virtual void drawVideoBuffer( VideoBuffer *buffer, Int startX, Int startY,
-																Int endX, Int endY ) { }
-	virtual void takeScreenShot(void){ }
-	virtual void toggleMovieCapture(void) {}
+																Int endX, Int endY ) override { }
+	virtual void takeScreenShot(void) override { }
+	virtual void toggleMovieCapture(void) override {}
 
 	// methods that we need to stub
-	virtual void setTimeOfDay( TimeOfDay tod ) {}
+	virtual void setTimeOfDay( TimeOfDay tod ) override {}
 	virtual void createLightPulse( const Coord3D *pos, const RGBColor *color, Real innerRadius, Real attenuationWidth,
-																 UnsignedInt increaseFrameTime, UnsignedInt decayFrameTime ) {}
-	virtual void setShroudLevel(Int x, Int y, CellShroudStatus setting) {}
-	void setBorderShroudLevel(UnsignedByte level){}
-	virtual void clearShroud() {}
-	virtual void preloadModelAssets( AsciiString model ) {}
-	virtual void preloadTextureAssets( AsciiString texture ) {}
-	virtual void toggleLetterBox(void) {}
-	virtual void enableLetterBox(Bool enable) {}
+																 UnsignedInt increaseFrameTime, UnsignedInt decayFrameTime ) override {}
+	virtual void setShroudLevel(Int x, Int y, CellShroudStatus setting) override {}
+	virtual void setBorderShroudLevel(UnsignedByte level) override {}
+	virtual void clearShroud() override {}
+	virtual void preloadModelAssets( AsciiString model ) override {}
+	virtual void preloadTextureAssets( AsciiString texture ) override {}
+	virtual void toggleLetterBox(void) override {}
+	virtual void enableLetterBox(Bool enable) override {}
 #if defined(RTS_DEBUG)
 	virtual void dumpModelAssets(const char *path) {}
 #endif
-	virtual void doSmartAssetPurgeAndPreload(const char* usageFileName) {}
+	virtual void doSmartAssetPurgeAndPreload(const char* usageFileName) override {}
 #if defined(RTS_DEBUG)
 	virtual void dumpAssetUsage(const char* mapname) {}
 #endif
 
-	virtual Real getAverageFPS(void) { return 0; }
-	virtual Real getCurrentFPS(void) { return 0; }
-	virtual Int getLastFrameDrawCalls( void ) { return 0; }
+	virtual Real getAverageFPS(void) override { return 0; }
+	virtual Real getCurrentFPS(void) override { return 0; }
+	virtual Int getLastFrameDrawCalls( void ) override { return 0; }
 
 protected:
 

Generals/Code/Tools/GUIEdit/Include/GUIEditWindowManager.h

@@ -46,16 +46,16 @@ class GUIEditWindowManager : public W3DGameWindowManager
 public:
 
 	GUIEditWindowManager( void );
-	virtual ~GUIEditWindowManager( void );
+	virtual ~GUIEditWindowManager( void ) override;
 
-	virtual void init( void );  ///< initialize system
+	virtual void init( void ) override;  ///< initialize system
 
-	virtual Int winDestroy( GameWindow *window );  ///< destroy this window
+	virtual Int winDestroy( GameWindow *window ) override;  ///< destroy this window
 	/// create a new window by setting up parameters and callbacks
 	virtual GameWindow *winCreate( GameWindow *parent, UnsignedInt status,
 																 Int x, Int y, Int width, Int height,
 																 GameWinSystemFunc system,
-																 WinInstanceData *instData = nullptr );
+																 WinInstanceData *instData = nullptr ) override;
 
 	// **************************************************************************
 	// GUIEdit specific methods *************************************************

Generals/Code/Tools/WorldBuilder/include/AutoEdgeOutTool.h

@@ -33,10 +33,10 @@ class AutoEdgeOutTool : public Tool
 {
 public:
 	AutoEdgeOutTool(void);
-	~AutoEdgeOutTool(void);
+	virtual ~AutoEdgeOutTool(void) override;
 
 public:
 	/// Perform tool on mouse down.
-	virtual void mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc);
-	virtual void activate(); ///< Become the current tool.
+	virtual void mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override;
+	virtual void activate() override; ///< Become the current tool.
 };

Generals/Code/Tools/WorldBuilder/include/BaseBuildProps.h

@@ -41,16 +41,16 @@ class BaseBuildProps : public CDialog
 	// ClassWizard generated virtual function overrides
 	//{{AFX_VIRTUAL(BaseBuildProps)
 	protected:
-	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
+	virtual void DoDataExchange(CDataExchange* pDX) override;    // DDX/DDV support
 	//}}AFX_VIRTUAL
 
 // Implementation
 protected:
 
 	// Generated message map functions
 	//{{AFX_MSG(BaseBuildProps)
-	virtual BOOL OnInitDialog();
-	virtual void OnOK();
+	virtual BOOL OnInitDialog() override;
+	virtual void OnOK() override;
 	//}}AFX_MSG
 	DECLARE_MESSAGE_MAP()
 

Generals/Code/Tools/WorldBuilder/include/BlendEdgeTool.h

@@ -36,11 +36,11 @@ class BlendEdgeTool : public Tool
 
 public:
 	BlendEdgeTool(void);
-	~BlendEdgeTool(void);
+	virtual ~BlendEdgeTool(void) override;
 
 public:
 	/// Perform tool on mouse down.
-	virtual void mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc);
-	virtual void mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc);
+	virtual void mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override;
+	virtual void mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override;
 
 };

Generals/Code/Tools/WorldBuilder/include/BlendMaterial.h

@@ -45,18 +45,18 @@ class BlendMaterial : public COptionsPanel
 	// ClassWizard generated virtual function overrides
 	//{{AFX_VIRTUAL(BlendMaterial)
 	protected:
-	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
-	virtual void OnOK(){return;};  ///< Modeless dialogs don't OK, so eat this for modeless.
-	virtual void OnCancel(){return;}; ///< Modeless dialogs don't close on ESC, so eat this for modeless.
-	virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult);
+	virtual void DoDataExchange(CDataExchange* pDX) override;    // DDX/DDV support
+	virtual void OnOK() override {return;};  ///< Modeless dialogs don't OK, so eat this for modeless.
+	virtual void OnCancel() override {return;}; ///< Modeless dialogs don't close on ESC, so eat this for modeless.
+	virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult) override;
 	//}}AFX_VIRTUAL
 
 // Implementation
 protected:
 	enum {MIN_TILE_SIZE=2, MAX_TILE_SIZE = 100};
 	// Generated message map functions
 	//{{AFX_MSG(BlendMaterial)
-	virtual BOOL OnInitDialog();
+	virtual BOOL OnInitDialog() override;
 	//}}AFX_MSG
 	DECLARE_MESSAGE_MAP()
 

Generals/Code/Tools/WorldBuilder/include/BorderTool.h

@@ -32,17 +32,17 @@ class BorderTool : public Tool
 
 	public:
 		BorderTool();
-		~BorderTool();
+		virtual ~BorderTool() override;
 
 		Int getToolID(void) {return m_toolID;}
-		virtual void setCursor(void);
+		virtual void setCursor(void) override;
 
-		virtual void activate();
-		virtual void deactivate();
+		virtual void activate() override;
+		virtual void deactivate() override;
 
-		virtual Bool followsTerrain(void) { return false;	}
+		virtual Bool followsTerrain(void) override { return false;	}
 
-		virtual void mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc);
-		virtual void mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc);
-		virtual void mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc);
+		virtual void mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override;
+		virtual void mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override;
+		virtual void mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override;
 };

Generals/Code/Tools/WorldBuilder/include/BrushTool.h

@@ -42,7 +42,7 @@ class BrushTool : public Tool
 
 public:
 	BrushTool(void);
-	~BrushTool(void);
+	virtual ~BrushTool(void) override;
 
 public:
 	static Int getWidth(void) {return m_brushWidth;};  ///<Returns width.
@@ -53,11 +53,11 @@ class BrushTool : public Tool
 	static void setHeight(Int height);
 
 public:
-	virtual void mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc);
-	virtual void mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc);
-	virtual void mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc);
-	virtual WorldHeightMapEdit *getHeightMap(void) {return m_htMapEditCopy;};
-	virtual void activate(); ///< Become the current tool.
-	virtual Bool followsTerrain(void) {return false;};
+	virtual void mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override;
+	virtual void mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override;
+	virtual void mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override;
+	virtual WorldHeightMapEdit *getHeightMap(void) override {return m_htMapEditCopy;};
+	virtual void activate() override; ///< Become the current tool.
+	virtual Bool followsTerrain(void) override {return false;};
 
 };

Generals/Code/Tools/WorldBuilder/include/BuildList.h

@@ -36,7 +36,7 @@ class BuildList : public COptionsPanel, public PopupSliderOwner
 public:
  	BuildList(CWnd* pParent = nullptr);   ///< standard constructor
 
-	~BuildList(void);   ///< standard destructor
+	virtual ~BuildList(void) override;   ///< standard destructor
 	enum { NAME_MAX_LEN = 64 };
 // Dialog Data
 	//{{AFX_DATA(BuildList)
@@ -49,17 +49,17 @@ class BuildList : public COptionsPanel, public PopupSliderOwner
 	// ClassWizard generated virtual function overrides
 	//{{AFX_VIRTUAL(BuildList)
 	protected:
-	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
-	virtual void OnOK(){return;};  ///< Modeless dialogs don't OK, so eat this for modeless.
-	virtual void OnCancel(){return;}; ///< Modeless dialogs don't close on ESC, so eat this for modeless.
+	virtual void DoDataExchange(CDataExchange* pDX) override;    // DDX/DDV support
+	virtual void OnOK() override {return;};  ///< Modeless dialogs don't OK, so eat this for modeless.
+	virtual void OnCancel() override {return;}; ///< Modeless dialogs don't close on ESC, so eat this for modeless.
 	//}}AFX_VIRTUAL
 
 // Implementation
 protected:
 
 	// Generated message map functions
 	//{{AFX_MSG(BuildList)
-	virtual BOOL OnInitDialog();
+	virtual BOOL OnInitDialog() override;
 	afx_msg void OnSelchangeSidesCombo();
 	afx_msg void OnMoveUp();
 	afx_msg void OnMoveDown();
@@ -97,9 +97,9 @@ class BuildList : public COptionsPanel, public PopupSliderOwner
 	static void update(void) {if (m_staticThis) m_staticThis->loadSides();};
 	static void setSelectedBuildList(BuildListInfo *pInfo);
 
-	virtual void GetPopSliderInfo(const long sliderID, long *pMin, long *pMax, long *pLineSize, long *pInitial);
-	virtual void PopSliderChanged(const long sliderID, long theVal);
-	virtual void PopSliderFinished(const long sliderID, long theVal);
+	virtual void GetPopSliderInfo(const long sliderID, long *pMin, long *pMax, long *pLineSize, long *pInitial) override;
+	virtual void PopSliderChanged(const long sliderID, long theVal) override;
+	virtual void PopSliderFinished(const long sliderID, long theVal) override;
 
 };
 

Generals/Code/Tools/WorldBuilder/include/BuildListTool.h

@@ -56,7 +56,7 @@ class BuildListTool : public Tool
 
 public:
 	BuildListTool(void);
-	~BuildListTool(void);
+	virtual ~BuildListTool(void) override;
 
 private:
 	void createWindow(void);
@@ -68,10 +68,10 @@ class BuildListTool : public Tool
 
 public:
 	/// Perform tool on mouse down.
-	virtual void mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc);
-	virtual void mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc);
-	virtual void mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc);
-	virtual void setCursor(void);
-	virtual void activate(); ///< Become the current tool.
-	virtual void deactivate(); ///< Become not the current tool.
+	virtual void mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override;
+	virtual void mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override;
+	virtual void mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override;
+	virtual void setCursor(void) override;
+	virtual void activate() override; ///< Become the current tool.
+	virtual void deactivate() override; ///< Become not the current tool.
 };

Generals/Code/Tools/WorldBuilder/include/CButtonShowColor.h

@@ -27,7 +27,7 @@ class CButtonShowColor : public CButton
 		const RGBColor& getColor(void) const { return m_color; }
 		void setColor(Int color) { m_color.setFromInt(color); }
 		void setColor(const RGBColor& color) { m_color = color; }
-		~CButtonShowColor();
+		virtual ~CButtonShowColor() override;
 
 
 		static COLORREF RGBtoBGR(Int color);

Generals/Code/Tools/WorldBuilder/include/CFixTeamOwnerDialog.h

@@ -31,8 +31,8 @@ class CFixTeamOwnerDialog : public CDialog
 		Bool pickedValidTeam() { return m_pickedValidTeam; }
 
 	protected:
-		virtual BOOL OnInitDialog();
-		afx_msg void OnOK();
+		virtual BOOL OnInitDialog() override;
+		virtual afx_msg void OnOK() override;
 		DECLARE_MESSAGE_MAP()
 
 	protected: