Skip to content

Commit b7df0dc

Browse files
committed
bugfix: Add missing virtual keyword to override method declarations in Tools
1 parent ad40797 commit b7df0dc

84 files changed

Lines changed: 115 additions & 115 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ class GUIEditDisplay : public Display
109109
virtual void createLightPulse( const Coord3D *pos, const RGBColor *color, Real innerRadius, Real attenuationWidth,
110110
UnsignedInt increaseFrameTime, UnsignedInt decayFrameTime ) override {}
111111
virtual void setShroudLevel(Int x, Int y, CellShroudStatus setting) override {}
112-
void setBorderShroudLevel(UnsignedByte level) override {}
112+
virtual void setBorderShroudLevel(UnsignedByte level) override {}
113113
virtual void clearShroud() override {}
114114
virtual void preloadModelAssets( AsciiString model ) override {}
115115
virtual void preloadTextureAssets( AsciiString texture ) override {}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class AutoEdgeOutTool : public Tool
3333
{
3434
public:
3535
AutoEdgeOutTool(void);
36-
~AutoEdgeOutTool(void) override;
36+
virtual ~AutoEdgeOutTool(void) override;
3737

3838
public:
3939
/// Perform tool on mouse down.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class BlendEdgeTool : public Tool
3636

3737
public:
3838
BlendEdgeTool(void);
39-
~BlendEdgeTool(void) override;
39+
virtual ~BlendEdgeTool(void) override;
4040

4141
public:
4242
/// Perform tool on mouse down.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class BorderTool : public Tool
3232

3333
public:
3434
BorderTool();
35-
~BorderTool() override;
35+
virtual ~BorderTool() override;
3636

3737
Int getToolID(void) {return m_toolID;}
3838
virtual void setCursor(void) override;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class BrushTool : public Tool
4242

4343
public:
4444
BrushTool(void);
45-
~BrushTool(void) override;
45+
virtual ~BrushTool(void) override;
4646

4747
public:
4848
static Int getWidth(void) {return m_brushWidth;}; ///<Returns width.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class BuildList : public COptionsPanel, public PopupSliderOwner
3636
public:
3737
BuildList(CWnd* pParent = nullptr); ///< standard constructor
3838

39-
~BuildList(void) override; ///< standard destructor
39+
virtual ~BuildList(void) override; ///< standard destructor
4040
enum { NAME_MAX_LEN = 64 };
4141
// Dialog Data
4242
//{{AFX_DATA(BuildList)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ class BuildListTool : public Tool
5656

5757
public:
5858
BuildListTool(void);
59-
~BuildListTool(void) override;
59+
virtual ~BuildListTool(void) override;
6060

6161
private:
6262
void createWindow(void);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class CButtonShowColor : public CButton
2727
const RGBColor& getColor(void) const { return m_color; }
2828
void setColor(Int color) { m_color.setFromInt(color); }
2929
void setColor(const RGBColor& color) { m_color = color; }
30-
~CButtonShowColor() override;
30+
virtual ~CButtonShowColor() override;
3131

3232

3333
static COLORREF RGBtoBGR(Int color);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class CFixTeamOwnerDialog : public CDialog
3232

3333
protected:
3434
virtual BOOL OnInitDialog() override;
35-
afx_msg void OnOK() override;
35+
virtual afx_msg void OnOK() override;
3636
DECLARE_MESSAGE_MAP()
3737

3838
protected:

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

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class Undoable : public RefCountClass
4242
public:
4343
Undoable(void);
4444

45-
~Undoable(void) override;
45+
virtual ~Undoable(void) override;
4646

4747
public:
4848
virtual void Do(void)=0; ///< pure virtual.
@@ -77,7 +77,7 @@ class WBDocUndoable : public Undoable
7777
WBDocUndoable(CWorldBuilderDoc *pDoc, WorldHeightMapEdit *pNewHtMap, Coord3D *pObjOffset = nullptr);
7878

7979
// destructor.
80-
~WBDocUndoable(void) override;
80+
virtual ~WBDocUndoable(void) override;
8181
virtual void Do(void) override;
8282
virtual void Undo(void) override;
8383
virtual void Redo(void) override;
@@ -99,7 +99,7 @@ class AddObjectUndoable : public Undoable
9999
AddObjectUndoable(CWorldBuilderDoc *pDoc, MapObject *pObjectToAdd);
100100

101101
// destructor.
102-
~AddObjectUndoable(void) override;
102+
virtual ~AddObjectUndoable(void) override;
103103
virtual void Do(void) override;
104104
virtual void Undo(void) override;
105105
};
@@ -146,7 +146,7 @@ class ModifyObjectUndoable : public Undoable
146146
public:
147147
ModifyObjectUndoable(CWorldBuilderDoc *pDoc);
148148
// destructor.
149-
~ModifyObjectUndoable(void) override;
149+
virtual ~ModifyObjectUndoable(void) override;
150150

151151
virtual void Do(void) override;
152152
virtual void Undo(void) override;
@@ -188,7 +188,7 @@ class ModifyFlagsUndoable : public Undoable
188188
public:
189189
ModifyFlagsUndoable(CWorldBuilderDoc *pDoc, Int flagMask, Int flagValue);
190190
// destructor.
191-
~ModifyFlagsUndoable(void) override;
191+
virtual ~ModifyFlagsUndoable(void) override;
192192

193193
virtual void Do(void) override;
194194
virtual void Undo(void) override;
@@ -205,7 +205,7 @@ class SidesListUndoable : public Undoable
205205
public:
206206

207207
SidesListUndoable(const SidesList& newSL, CWorldBuilderDoc *pDoc);
208-
~SidesListUndoable(void) override;
208+
virtual ~SidesListUndoable(void) override;
209209

210210
virtual void Do(void) override;
211211
virtual void Undo(void) override;
@@ -231,7 +231,7 @@ class DictItemUndoable : public Undoable
231231
// if you want to substitute the entire contents of the new dict, pass NAMEKEY_INVALID.
232232
DictItemUndoable(Dict **d, Dict data, NameKeyType key, Int dictsToModify = 1, CWorldBuilderDoc *pDoc = nullptr, Bool inval = false);
233233
// destructor.
234-
~DictItemUndoable(void) override;
234+
virtual ~DictItemUndoable(void) override;
235235

236236
virtual void Do(void) override;
237237
virtual void Undo(void) override;
@@ -267,7 +267,7 @@ class DeleteObjectUndoable : public Undoable
267267
DeleteObjectUndoable(CWorldBuilderDoc *pDoc);
268268

269269
// destructor.
270-
~DeleteObjectUndoable(void) override;
270+
virtual ~DeleteObjectUndoable(void) override;
271271
virtual void Do(void) override;
272272
virtual void Undo(void) override;
273273
};
@@ -282,7 +282,7 @@ class AddPolygonUndoable : public Undoable
282282
public:
283283
AddPolygonUndoable( PolygonTrigger *pTrig);
284284
// destructor.
285-
~AddPolygonUndoable(void) override;
285+
virtual ~AddPolygonUndoable(void) override;
286286
virtual void Do(void) override;
287287
virtual void Undo(void) override;
288288
};
@@ -297,7 +297,7 @@ class AddPolygonPointUndoable : public Undoable
297297
public:
298298
AddPolygonPointUndoable(PolygonTrigger *pTrig, ICoord3D pt);
299299
// destructor.
300-
~AddPolygonPointUndoable(void) override;
300+
virtual ~AddPolygonPointUndoable(void) override;
301301
virtual void Do(void) override;
302302
virtual void Undo(void) override;
303303
};
@@ -314,7 +314,7 @@ class ModifyPolygonPointUndoable : public Undoable
314314
public:
315315
ModifyPolygonPointUndoable(PolygonTrigger *pTrig, Int ndx);
316316
// destructor.
317-
~ModifyPolygonPointUndoable(void) override;
317+
virtual ~ModifyPolygonPointUndoable(void) override;
318318
virtual void Do(void) override;
319319
virtual void Undo(void) override;
320320
};
@@ -330,7 +330,7 @@ class MovePolygonUndoable : public Undoable
330330
public:
331331
MovePolygonUndoable(PolygonTrigger *pTrig);
332332
// destructor.
333-
~MovePolygonUndoable(void) override;
333+
virtual ~MovePolygonUndoable(void) override;
334334
virtual void Do(void) override;
335335
virtual void Undo(void) override;
336336

@@ -349,7 +349,7 @@ class InsertPolygonPointUndoable : public Undoable
349349
public:
350350
InsertPolygonPointUndoable(PolygonTrigger *pTrig, ICoord3D pt, Int ndx);
351351
// destructor.
352-
~InsertPolygonPointUndoable(void) override;
352+
virtual ~InsertPolygonPointUndoable(void) override;
353353
virtual void Do(void) override;
354354
virtual void Undo(void) override;
355355
};
@@ -365,7 +365,7 @@ class DeletePolygonPointUndoable : public Undoable
365365
public:
366366
DeletePolygonPointUndoable(PolygonTrigger *pTrig, Int ndx);
367367
// destructor.
368-
~DeletePolygonPointUndoable(void) override;
368+
virtual ~DeletePolygonPointUndoable(void) override;
369369
virtual void Do(void) override;
370370
virtual void Undo(void) override;
371371
};
@@ -380,7 +380,7 @@ class DeletePolygonUndoable : public Undoable
380380
public:
381381
DeletePolygonUndoable(PolygonTrigger *pTrig);
382382
// destructor.
383-
~DeletePolygonUndoable(void) override;
383+
virtual ~DeletePolygonUndoable(void) override;
384384
virtual void Do(void) override;
385385
virtual void Undo(void) override;
386386
};

0 commit comments

Comments
 (0)