diff --git a/Core/GameEngine/Source/GameClient/GUI/IMEManager.cpp b/Core/GameEngine/Source/GameClient/GUI/IMEManager.cpp index 5de6d1a5c54..e832f06c17e 100644 --- a/Core/GameEngine/Source/GameClient/GUI/IMEManager.cpp +++ b/Core/GameEngine/Source/GameClient/GUI/IMEManager.cpp @@ -90,29 +90,29 @@ class IMEManager : public IMEManagerInterface public: IMEManager(); - ~IMEManager(); + ~IMEManager() override; - virtual void init(); - virtual void reset(); - virtual void update(); + virtual void init() override; + virtual void reset() override; + virtual void update() override; - virtual void attach( GameWindow *window ); ///< attach IME to specified window - virtual void detach(); ///< detach IME from current window - virtual void enable(); ///< Enable IME - virtual void disable(); ///< Disable IME - virtual Bool isEnabled(); ///< Is IME enabled - virtual Bool isAttachedTo( GameWindow *window ); ///< Is the manager attached toa window - virtual GameWindow* getWindow(); ///< Returns the window we are currently attached to - virtual Bool isComposing(); ///< Manager is currently composing new input string - virtual void getCompositionString( UnicodeString &string ); ///< Return the current composition string - virtual Int getCompositionCursorPosition(); ///< Returns the composition cursor position - virtual Int getIndexBase(); ///< Get index base for candidate list + virtual void attach( GameWindow *window ) override; ///< attach IME to specified window + virtual void detach() override; ///< detach IME from current window + virtual void enable() override; ///< Enable IME + virtual void disable() override; ///< Disable IME + virtual Bool isEnabled() override; ///< Is IME enabled + virtual Bool isAttachedTo( GameWindow *window ) override; ///< Is the manager attached toa window + virtual GameWindow* getWindow() override; ///< Returns the window we are currently attached to + virtual Bool isComposing() override; ///< Manager is currently composing new input string + virtual void getCompositionString( UnicodeString &string ) override; ///< Return the current composition string + virtual Int getCompositionCursorPosition() override; ///< Returns the composition cursor position + virtual Int getIndexBase() override; ///< Get index base for candidate list - virtual Int getCandidateCount(); ///< Returns the total number of candidates - virtual const UnicodeString* getCandidate( Int index ); ///< Returns the candidate string - virtual Int getSelectedCandidateIndex(); ///< Returns the indexed of the currently selected candidate - virtual Int getCandidatePageSize(); ///< Returns the page size for the candidates list - virtual Int getCandidatePageStart(); ///< Returns the index of the first visibel candidate + virtual Int getCandidateCount() override; ///< Returns the total number of candidates + virtual const UnicodeString* getCandidate( Int index ) override; ///< Returns the candidate string + virtual Int getSelectedCandidateIndex() override; ///< Returns the indexed of the currently selected candidate + virtual Int getCandidatePageSize() override; ///< Returns the page size for the candidates list + virtual Int getCandidatePageStart() override; ///< Returns the index of the first visibel candidate @@ -120,8 +120,8 @@ class IMEManager : public IMEManagerInterface virtual Bool serviceIMEMessage( void *windowsHandle, UnsignedInt message, Int wParam, - Int lParam ); - virtual Int result(); ///< result return value of last serviced IME message + Int lParam ) override; + virtual Int result() override; ///< result return value of last serviced IME message protected: diff --git a/Core/Libraries/Source/WWVegas/WWLib/multilist.h b/Core/Libraries/Source/WWVegas/WWLib/multilist.h index eea610c3074..e2085838676 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/multilist.h +++ b/Core/Libraries/Source/WWVegas/WWLib/multilist.h @@ -218,7 +218,7 @@ class MultiListClass : public GenericMultiListClass MultiListClass() { } - virtual ~MultiListClass() + virtual ~MultiListClass() override { while (!Is_Empty()) { Remove_Head(); @@ -342,7 +342,7 @@ class RefMultiListClass : public GenericMultiListClass { public: - virtual ~RefMultiListClass() + virtual ~RefMultiListClass() override { while (!Is_Empty()) { Release_Head(); diff --git a/Core/Libraries/Source/debug/internal.h b/Core/Libraries/Source/debug/internal.h index 3b5b8efc163..8a7be5aaf2e 100644 --- a/Core/Libraries/Source/debug/internal.h +++ b/Core/Libraries/Source/debug/internal.h @@ -86,9 +86,9 @@ class DebugCmdInterfaceDebug: public DebugCmdInterface { public: virtual bool Execute(class Debug& dbg, const char *cmd, CommandMode cmdmode, - unsigned argn, const char * const * argv); + unsigned argn, const char * const * argv) override; - virtual void Delete() + virtual void Delete() override { this->~DebugCmdInterfaceDebug(); DebugFreeMemory(this); diff --git a/Core/Libraries/Source/debug/internal_io.h b/Core/Libraries/Source/debug/internal_io.h index b1ccef70f0f..1b550fab418 100644 --- a/Core/Libraries/Source/debug/internal_io.h +++ b/Core/Libraries/Source/debug/internal_io.h @@ -59,14 +59,14 @@ class DebugIOCon: public DebugIOInterface public: explicit DebugIOCon(); - virtual ~DebugIOCon(); - virtual int Read(char *buf, int maxchar); - virtual void Write(StringType type, const char *src, const char *str); - virtual void EmergencyFlush() {} + virtual ~DebugIOCon() override; + virtual int Read(char *buf, int maxchar) override; + virtual void Write(StringType type, const char *src, const char *str) override; + virtual void EmergencyFlush() override {} virtual void Execute(class Debug& dbg, const char *cmd, bool structuredCmd, - unsigned argn, const char * const * argv); + unsigned argn, const char * const * argv) override; static DebugIOInterface *Create(); - virtual void Delete(); + virtual void Delete() override; }; /// \internal \brief con flat I/O class @@ -210,14 +210,14 @@ class DebugIOFlat: public DebugIOInterface public: explicit DebugIOFlat(); - virtual ~DebugIOFlat(); - virtual int Read(char *buf, int maxchar) { return 0; } - virtual void Write(StringType type, const char *src, const char *str); - virtual void EmergencyFlush(); + virtual ~DebugIOFlat() override; + virtual int Read(char *buf, int maxchar) override { return 0; } + virtual void Write(StringType type, const char *src, const char *str) override; + virtual void EmergencyFlush() override; virtual void Execute(class Debug& dbg, const char *cmd, bool structuredCmd, - unsigned argn, const char * const * argv); + unsigned argn, const char * const * argv) override; static DebugIOInterface *Create(); - virtual void Delete(); + virtual void Delete() override; }; /// \internal \brief net debug I/O class @@ -228,14 +228,14 @@ class DebugIONet: public DebugIOInterface public: explicit DebugIONet(); - virtual ~DebugIONet(); - virtual int Read(char *buf, int maxchar); - virtual void Write(StringType type, const char *src, const char *str); - virtual void EmergencyFlush(); + virtual ~DebugIONet() override; + virtual int Read(char *buf, int maxchar) override; + virtual void Write(StringType type, const char *src, const char *str) override; + virtual void EmergencyFlush() override; virtual void Execute(class Debug& dbg, const char *cmd, bool structuredCmd, - unsigned argn, const char * const * argv); + unsigned argn, const char * const * argv) override; static DebugIOInterface *Create(); - virtual void Delete(); + virtual void Delete() override; }; /// \internal \brief ods debug I/O class @@ -243,11 +243,11 @@ class DebugIOOds: public DebugIOInterface { public: explicit DebugIOOds() {} - virtual int Read(char *buf, int maxchar) { return 0; } - virtual void Write(StringType type, const char *src, const char *str); - virtual void EmergencyFlush() {} + virtual int Read(char *buf, int maxchar) override { return 0; } + virtual void Write(StringType type, const char *src, const char *str) override; + virtual void EmergencyFlush() override {} virtual void Execute(class Debug& dbg, const char *cmd, bool structuredCmd, - unsigned argn, const char * const * argv) {} + unsigned argn, const char * const * argv) override {} static DebugIOInterface *Create(); - virtual void Delete(); + virtual void Delete() override; }; diff --git a/Core/Libraries/Source/profile/internal_cmd.h b/Core/Libraries/Source/profile/internal_cmd.h index a315fc6e2a9..a1d43bf0897 100644 --- a/Core/Libraries/Source/profile/internal_cmd.h +++ b/Core/Libraries/Source/profile/internal_cmd.h @@ -51,6 +51,6 @@ class ProfileCmdInterface: public DebugCmdInterface void RunResultFunctions(); virtual bool Execute(class Debug& dbg, const char *cmd, CommandMode cmdmode, - unsigned argn, const char * const * argv); - virtual void Delete() {} + unsigned argn, const char * const * argv) override; + virtual void Delete() override {} }; diff --git a/Core/Tools/DebugWindow/DebugWindow.h b/Core/Tools/DebugWindow/DebugWindow.h index fb9366810b6..9e11d6e047d 100644 --- a/Core/Tools/DebugWindow/DebugWindow.h +++ b/Core/Tools/DebugWindow/DebugWindow.h @@ -38,7 +38,7 @@ class CDebugWindowApp : public CWinApp { public: CDebugWindowApp(); - ~CDebugWindowApp(); + ~CDebugWindowApp() override; DebugWindowDialog* GetDialogWindow(); void SetDialogWindow(DebugWindowDialog* pWnd); diff --git a/Core/Tools/ParticleEditor/CButtonShowColor.h b/Core/Tools/ParticleEditor/CButtonShowColor.h index 64238d4585c..f570742769b 100644 --- a/Core/Tools/ParticleEditor/CButtonShowColor.h +++ b/Core/Tools/ParticleEditor/CButtonShowColor.h @@ -29,7 +29,7 @@ class CButtonShowColor : public CButton const RGBColor& getColor() const { return m_color; } void setColor(Int color) { m_color.setFromInt(color); } void setColor(const RGBColor& color) { m_color = color; } - ~CButtonShowColor(); + ~CButtonShowColor() override; static COLORREF RGBtoBGR(Int color); diff --git a/Core/Tools/ParticleEditor/MoreParmsDialog.h b/Core/Tools/ParticleEditor/MoreParmsDialog.h index 6e57198500d..2d1800b2588 100644 --- a/Core/Tools/ParticleEditor/MoreParmsDialog.h +++ b/Core/Tools/ParticleEditor/MoreParmsDialog.h @@ -46,7 +46,7 @@ class MoreParmsDialog : public CDialog public: enum { IDD = IDD_PSEd_EditMoreParms }; MoreParmsDialog(UINT nIDTemplate = MoreParmsDialog::IDD, CWnd* pParentWnd = nullptr); - virtual ~MoreParmsDialog(); + virtual ~MoreParmsDialog() override; void InitPanel(); diff --git a/Core/Tools/ParticleEditor/ParticleEditor.h b/Core/Tools/ParticleEditor/ParticleEditor.h index e498f903e5e..9099fa7a55c 100644 --- a/Core/Tools/ParticleEditor/ParticleEditor.h +++ b/Core/Tools/ParticleEditor/ParticleEditor.h @@ -38,7 +38,7 @@ class CDebugWindowApp : public CWinApp { public: CDebugWindowApp(); - ~CDebugWindowApp(); + ~CDebugWindowApp() override; DebugWindowDialog* GetDialogWindow(); void SetDialogWindow(DebugWindowDialog* pWnd); diff --git a/Core/Tools/ParticleEditor/ParticleEditorDialog.h b/Core/Tools/ParticleEditor/ParticleEditorDialog.h index 69203757a5c..e33ae65606b 100644 --- a/Core/Tools/ParticleEditor/ParticleEditorDialog.h +++ b/Core/Tools/ParticleEditor/ParticleEditorDialog.h @@ -55,7 +55,7 @@ class DebugWindowDialog : public CDialog public: enum {IDD = IDD_PSEd}; DebugWindowDialog(UINT nIDTemplate = DebugWindowDialog::IDD, CWnd* pParentWnd = nullptr); - virtual ~DebugWindowDialog(); + virtual ~DebugWindowDialog() override; void InitPanel(); HWND GetMainWndHWND(); diff --git a/Core/Tools/W3DView/AdvancedAnimSheet.h b/Core/Tools/W3DView/AdvancedAnimSheet.h index 42244a55901..345e3cee940 100644 --- a/Core/Tools/W3DView/AdvancedAnimSheet.h +++ b/Core/Tools/W3DView/AdvancedAnimSheet.h @@ -62,7 +62,7 @@ class CAdvancedAnimSheet : public CPropertySheet // Implementation public: - virtual ~CAdvancedAnimSheet(); + virtual ~CAdvancedAnimSheet() override; // Generated message map functions protected: diff --git a/Core/Tools/W3DView/AnimMixingPage.h b/Core/Tools/W3DView/AnimMixingPage.h index 0a917858dc8..df4314d8838 100644 --- a/Core/Tools/W3DView/AnimMixingPage.h +++ b/Core/Tools/W3DView/AnimMixingPage.h @@ -33,7 +33,7 @@ class CAnimMixingPage : public CPropertyPage // Construction public: CAnimMixingPage(CAdvancedAnimSheet *sheet = nullptr); - ~CAnimMixingPage(); + ~CAnimMixingPage() override; // Dialog Data //{{AFX_DATA(CAnimMixingPage) diff --git a/Core/Tools/W3DView/AnimReportPage.h b/Core/Tools/W3DView/AnimReportPage.h index 591aa82e269..8432b41aa8e 100644 --- a/Core/Tools/W3DView/AnimReportPage.h +++ b/Core/Tools/W3DView/AnimReportPage.h @@ -34,7 +34,7 @@ class CAnimReportPage : public CPropertyPage // Construction public: CAnimReportPage(CAdvancedAnimSheet *sheet = nullptr); - ~CAnimReportPage(); + ~CAnimReportPage() override; // Dialog Data //{{AFX_DATA(CAnimReportPage) diff --git a/Core/Tools/W3DView/AnimationPropPage.h b/Core/Tools/W3DView/AnimationPropPage.h index cd10d5cd399..f31d4e1ad6e 100644 --- a/Core/Tools/W3DView/AnimationPropPage.h +++ b/Core/Tools/W3DView/AnimationPropPage.h @@ -31,7 +31,7 @@ class CAnimationPropPage : public CPropertyPage // Construction public: CAnimationPropPage(); - ~CAnimationPropPage(); + ~CAnimationPropPage() override; // Dialog Data //{{AFX_DATA(CAnimationPropPage) diff --git a/Core/Tools/W3DView/AssetPropertySheet.h b/Core/Tools/W3DView/AssetPropertySheet.h index c770b2f5752..08bd1a295f5 100644 --- a/Core/Tools/W3DView/AssetPropertySheet.h +++ b/Core/Tools/W3DView/AssetPropertySheet.h @@ -45,7 +45,7 @@ class CAssetPropertySheet : public CPropertySheet // Implementation public: - virtual ~CAssetPropertySheet(); + virtual ~CAssetPropertySheet() override; // Generated message map functions protected: diff --git a/Core/Tools/W3DView/ColorBar.h b/Core/Tools/W3DView/ColorBar.h index a66c9a0af46..2c6410e7ba3 100644 --- a/Core/Tools/W3DView/ColorBar.h +++ b/Core/Tools/W3DView/ColorBar.h @@ -108,7 +108,7 @@ class ColorBarClass : public CWnd // Implementation public: - virtual ~ColorBarClass(); + virtual ~ColorBarClass() override; // Generated message map functions protected: diff --git a/Core/Tools/W3DView/ColorPicker.h b/Core/Tools/W3DView/ColorPicker.h index fa6d833158c..3339d11bec6 100644 --- a/Core/Tools/W3DView/ColorPicker.h +++ b/Core/Tools/W3DView/ColorPicker.h @@ -82,7 +82,7 @@ class ColorPickerClass : public CWnd // Implementation public: - virtual ~ColorPickerClass(); + virtual ~ColorPickerClass() override; // Generated message map functions protected: diff --git a/Core/Tools/W3DView/DialogToolbar.h b/Core/Tools/W3DView/DialogToolbar.h index c614a35d13a..e1812168d26 100644 --- a/Core/Tools/W3DView/DialogToolbar.h +++ b/Core/Tools/W3DView/DialogToolbar.h @@ -46,7 +46,7 @@ class DialogToolbarClass : public CToolBar { public: DialogToolbarClass (); - virtual ~DialogToolbarClass () {} + virtual ~DialogToolbarClass () override {} // Form Data public: diff --git a/Core/Tools/W3DView/EmitterColorPropPage.h b/Core/Tools/W3DView/EmitterColorPropPage.h index e928e421fd7..6e64455dd72 100644 --- a/Core/Tools/W3DView/EmitterColorPropPage.h +++ b/Core/Tools/W3DView/EmitterColorPropPage.h @@ -39,7 +39,7 @@ class EmitterColorPropPageClass : public CPropertyPage // Construction public: EmitterColorPropPageClass (EmitterInstanceListClass *pemitter_list = nullptr); - ~EmitterColorPropPageClass (); + ~EmitterColorPropPageClass () override; // Dialog Data //{{AFX_DATA(EmitterColorPropPageClass) diff --git a/Core/Tools/W3DView/EmitterFramePropPage.h b/Core/Tools/W3DView/EmitterFramePropPage.h index f2f80553da2..ace4125c05c 100644 --- a/Core/Tools/W3DView/EmitterFramePropPage.h +++ b/Core/Tools/W3DView/EmitterFramePropPage.h @@ -36,7 +36,7 @@ class EmitterFramePropPageClass : public CPropertyPage // Construction public: EmitterFramePropPageClass(); - ~EmitterFramePropPageClass(); + ~EmitterFramePropPageClass() override; // Dialog Data //{{AFX_DATA(EmitterFramePropPageClass) diff --git a/Core/Tools/W3DView/EmitterGeneralPropPage.h b/Core/Tools/W3DView/EmitterGeneralPropPage.h index 1096611b810..833de0ddb12 100644 --- a/Core/Tools/W3DView/EmitterGeneralPropPage.h +++ b/Core/Tools/W3DView/EmitterGeneralPropPage.h @@ -39,7 +39,7 @@ class EmitterGeneralPropPageClass : public CPropertyPage // Construction public: EmitterGeneralPropPageClass (EmitterInstanceListClass *pemitter_list = nullptr); - ~EmitterGeneralPropPageClass (); + ~EmitterGeneralPropPageClass () override; // Dialog Data //{{AFX_DATA(EmitterGeneralPropPageClass) diff --git a/Core/Tools/W3DView/EmitterInstanceList.h b/Core/Tools/W3DView/EmitterInstanceList.h index dd5453cd057..20cca34c371 100644 --- a/Core/Tools/W3DView/EmitterInstanceList.h +++ b/Core/Tools/W3DView/EmitterInstanceList.h @@ -53,7 +53,7 @@ class EmitterInstanceListClass : public ParticleEmitterDefClass EmitterInstanceListClass (const EmitterInstanceListClass &src) : ParticleEmitterDefClass (src) { } - virtual ~EmitterInstanceListClass (); + virtual ~EmitterInstanceListClass () override; /////////////////////////////////////////////////////// // Public methods @@ -71,30 +71,30 @@ class EmitterInstanceListClass : public ParticleEmitterDefClass // definition and can be used to create a new prototype loader. // - virtual void Set_Velocity (const Vector3 &value); - virtual void Set_Acceleration (const Vector3 &value); - virtual void Set_Burst_Size (unsigned int count); - virtual void Set_Outward_Vel (float value); - virtual void Set_Vel_Inherit (float value); + virtual void Set_Velocity (const Vector3 &value) override; + virtual void Set_Acceleration (const Vector3 &value) override; + virtual void Set_Burst_Size (unsigned int count) override; + virtual void Set_Outward_Vel (float value) override; + virtual void Set_Vel_Inherit (float value) override; // // Randomizer accessors // - virtual void Set_Velocity_Random (Vector3Randomizer *randomizer); + virtual void Set_Velocity_Random (Vector3Randomizer *randomizer) override; // // Keyframe accessors // - virtual void Set_Color_Keyframes (ParticlePropertyStruct &keyframes); - virtual void Set_Opacity_Keyframes (ParticlePropertyStruct &keyframes); - virtual void Set_Size_Keyframes (ParticlePropertyStruct &keyframes); - virtual void Set_Rotation_Keyframes (ParticlePropertyStruct &keyframes, float orient_rnd); - virtual void Set_Frame_Keyframes (ParticlePropertyStruct &keyframes); - virtual void Set_Blur_Time_Keyframes (ParticlePropertyStruct &keyframes); - - virtual void Get_Color_Keyframes (ParticlePropertyStruct &keyframes) const; - virtual void Get_Opacity_Keyframes (ParticlePropertyStruct &keyframes) const; - virtual void Get_Size_Keyframes (ParticlePropertyStruct &keyframes) const; + virtual void Set_Color_Keyframes (ParticlePropertyStruct &keyframes) override; + virtual void Set_Opacity_Keyframes (ParticlePropertyStruct &keyframes) override; + virtual void Set_Size_Keyframes (ParticlePropertyStruct &keyframes) override; + virtual void Set_Rotation_Keyframes (ParticlePropertyStruct &keyframes, float orient_rnd) override; + virtual void Set_Frame_Keyframes (ParticlePropertyStruct &keyframes) override; + virtual void Set_Blur_Time_Keyframes (ParticlePropertyStruct &keyframes) override; + + virtual void Get_Color_Keyframes (ParticlePropertyStruct &keyframes) const override; + virtual void Get_Opacity_Keyframes (ParticlePropertyStruct &keyframes) const override; + virtual void Get_Size_Keyframes (ParticlePropertyStruct &keyframes) const override; private: diff --git a/Core/Tools/W3DView/EmitterLineGroupPropPage.h b/Core/Tools/W3DView/EmitterLineGroupPropPage.h index fd502f7ab1f..637b2ca11dd 100644 --- a/Core/Tools/W3DView/EmitterLineGroupPropPage.h +++ b/Core/Tools/W3DView/EmitterLineGroupPropPage.h @@ -39,7 +39,7 @@ class EmitterLineGroupPropPageClass : public CPropertyPage // Construction public: EmitterLineGroupPropPageClass(); - ~EmitterLineGroupPropPageClass(); + ~EmitterLineGroupPropPageClass() override; // Dialog Data //{{AFX_DATA(EmitterLineGroupPropPageClass) diff --git a/Core/Tools/W3DView/EmitterLinePropPage.h b/Core/Tools/W3DView/EmitterLinePropPage.h index 8e6566b1c0e..e9ada2a5899 100644 --- a/Core/Tools/W3DView/EmitterLinePropPage.h +++ b/Core/Tools/W3DView/EmitterLinePropPage.h @@ -36,7 +36,7 @@ class EmitterLinePropPageClass : public CPropertyPage // Construction public: EmitterLinePropPageClass(); - ~EmitterLinePropPageClass(); + ~EmitterLinePropPageClass() override; // Dialog Data //{{AFX_DATA(EmitterLinePropPageClass) diff --git a/Core/Tools/W3DView/EmitterParticlePropPage.h b/Core/Tools/W3DView/EmitterParticlePropPage.h index b3a084d425c..a92acee4612 100644 --- a/Core/Tools/W3DView/EmitterParticlePropPage.h +++ b/Core/Tools/W3DView/EmitterParticlePropPage.h @@ -39,7 +39,7 @@ class EmitterParticlePropPageClass : public CPropertyPage // Construction public: EmitterParticlePropPageClass (EmitterInstanceListClass *pemitter_list = nullptr); - ~EmitterParticlePropPageClass (); + ~EmitterParticlePropPageClass () override; // Dialog Data //{{AFX_DATA(EmitterParticlePropPageClass) diff --git a/Core/Tools/W3DView/EmitterPhysicsPropPage.h b/Core/Tools/W3DView/EmitterPhysicsPropPage.h index c94a0c44501..3af0f56d21b 100644 --- a/Core/Tools/W3DView/EmitterPhysicsPropPage.h +++ b/Core/Tools/W3DView/EmitterPhysicsPropPage.h @@ -38,7 +38,7 @@ class EmitterPhysicsPropPageClass : public CPropertyPage // Construction public: EmitterPhysicsPropPageClass (EmitterInstanceListClass *pemitter_list = nullptr); - ~EmitterPhysicsPropPageClass (); + ~EmitterPhysicsPropPageClass () override; // Dialog Data //{{AFX_DATA(EmitterPhysicsPropPageClass) diff --git a/Core/Tools/W3DView/EmitterPropertySheet.h b/Core/Tools/W3DView/EmitterPropertySheet.h index 80a9bca7937..361d3e5b46e 100644 --- a/Core/Tools/W3DView/EmitterPropertySheet.h +++ b/Core/Tools/W3DView/EmitterPropertySheet.h @@ -61,12 +61,12 @@ class EmitterPropertySheetClass : public CPropertySheet // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(EmitterPropertySheetClass) protected: - virtual LRESULT WindowProc(UINT message, WPARAM wParam, LPARAM lParam); + virtual LRESULT WindowProc(UINT message, WPARAM wParam, LPARAM lParam) override; //}}AFX_VIRTUAL // Implementation public: - virtual ~EmitterPropertySheetClass(); + virtual ~EmitterPropertySheetClass() override; // Generated message map functions protected: diff --git a/Core/Tools/W3DView/EmitterRotationPropPage.h b/Core/Tools/W3DView/EmitterRotationPropPage.h index 977561c66dc..9f2b6d47ac2 100644 --- a/Core/Tools/W3DView/EmitterRotationPropPage.h +++ b/Core/Tools/W3DView/EmitterRotationPropPage.h @@ -38,7 +38,7 @@ class EmitterRotationPropPageClass : public CPropertyPage // Construction public: EmitterRotationPropPageClass(); - ~EmitterRotationPropPageClass(); + ~EmitterRotationPropPageClass() override; // Dialog Data //{{AFX_DATA(EmitterRotationPropPageClass) diff --git a/Core/Tools/W3DView/EmitterSizePropPage.h b/Core/Tools/W3DView/EmitterSizePropPage.h index d53b5975dab..7f357de378d 100644 --- a/Core/Tools/W3DView/EmitterSizePropPage.h +++ b/Core/Tools/W3DView/EmitterSizePropPage.h @@ -39,7 +39,7 @@ class EmitterSizePropPageClass : public CPropertyPage // Construction public: EmitterSizePropPageClass(EmitterInstanceListClass *pemitter = nullptr); - ~EmitterSizePropPageClass(); + ~EmitterSizePropPageClass() override; // Dialog Data //{{AFX_DATA(EmitterSizePropPageClass) diff --git a/Core/Tools/W3DView/EmitterUserPropPage.h b/Core/Tools/W3DView/EmitterUserPropPage.h index accdb6e5324..66db288932f 100644 --- a/Core/Tools/W3DView/EmitterUserPropPage.h +++ b/Core/Tools/W3DView/EmitterUserPropPage.h @@ -36,7 +36,7 @@ class EmitterUserPropPageClass : public CPropertyPage // Construction public: EmitterUserPropPageClass (EmitterInstanceListClass *pemitter_list = nullptr); - ~EmitterUserPropPageClass (); + ~EmitterUserPropPageClass () override; // Dialog Data //{{AFX_DATA(EmitterUserPropPageClass) diff --git a/Core/Tools/W3DView/GammaDialog.h b/Core/Tools/W3DView/GammaDialog.h index 6252b3d024b..05bf15b0913 100644 --- a/Core/Tools/W3DView/GammaDialog.h +++ b/Core/Tools/W3DView/GammaDialog.h @@ -42,7 +42,7 @@ class GammaDialogClass : public CDialog // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(GammaDialogClass) protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support + virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support //}}AFX_VIRTUAL // Implementation @@ -50,8 +50,8 @@ class GammaDialogClass : public CDialog // Generated message map functions //{{AFX_MSG(GammaDialogClass) - virtual BOOL OnInitDialog(); - virtual void OnOK(); + virtual BOOL OnInitDialog() override; + virtual void OnOK() override; afx_msg void OnReleasedcaptureGammaSlider(NMHDR* pNMHDR, LRESULT* pResult); //}}AFX_MSG DECLARE_MESSAGE_MAP() diff --git a/Core/Tools/W3DView/GraphicView.h b/Core/Tools/W3DView/GraphicView.h index 7175327089c..6b3a2b4519a 100644 --- a/Core/Tools/W3DView/GraphicView.h +++ b/Core/Tools/W3DView/GraphicView.h @@ -66,7 +66,7 @@ class CGraphicView : public CView // Implementation protected: - virtual ~CGraphicView(); + virtual ~CGraphicView() override; #ifdef RTS_DEBUG virtual void AssertValid() const override; virtual void Dump(CDumpContext& dc) const override; diff --git a/Core/Tools/W3DView/HierarchyPropPage.h b/Core/Tools/W3DView/HierarchyPropPage.h index bd70b4f939e..a4776f9a4be 100644 --- a/Core/Tools/W3DView/HierarchyPropPage.h +++ b/Core/Tools/W3DView/HierarchyPropPage.h @@ -31,7 +31,7 @@ class CHierarchyPropPage : public CPropertyPage // Construction public: CHierarchyPropPage (const CString &stringHierarchyName); - ~CHierarchyPropPage (); + ~CHierarchyPropPage () override; // Dialog Data //{{AFX_DATA(CHierarchyPropPage) @@ -44,14 +44,14 @@ class CHierarchyPropPage : public CPropertyPage // ClassWizard generate virtual function overrides //{{AFX_VIRTUAL(CHierarchyPropPage) 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(CHierarchyPropPage) - virtual BOOL OnInitDialog(); + virtual BOOL OnInitDialog() override; afx_msg void OnDblclkSubObjectList(NMHDR* pNMHDR, LRESULT* pResult); //}}AFX_MSG DECLARE_MESSAGE_MAP() diff --git a/Core/Tools/W3DView/MeshPropPage.h b/Core/Tools/W3DView/MeshPropPage.h index 4286b4ea337..08ee399c5fa 100644 --- a/Core/Tools/W3DView/MeshPropPage.h +++ b/Core/Tools/W3DView/MeshPropPage.h @@ -31,7 +31,7 @@ class CMeshPropPage : public CPropertyPage // Construction public: CMeshPropPage (const CString &stringMeshName); - ~CMeshPropPage (); + ~CMeshPropPage () override; // Dialog Data //{{AFX_DATA(CMeshPropPage) @@ -45,14 +45,14 @@ class CMeshPropPage : public CPropertyPage // ClassWizard generate virtual function overrides //{{AFX_VIRTUAL(CMeshPropPage) 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(CMeshPropPage) - virtual BOOL OnInitDialog(); + virtual BOOL OnInitDialog() override; afx_msg void OnClose(); //}}AFX_MSG DECLARE_MESSAGE_MAP() diff --git a/Core/Tools/W3DView/OpacityVectorDialog.h b/Core/Tools/W3DView/OpacityVectorDialog.h index 0d1a41737aa..bb31b1beecf 100644 --- a/Core/Tools/W3DView/OpacityVectorDialog.h +++ b/Core/Tools/W3DView/OpacityVectorDialog.h @@ -48,8 +48,8 @@ class OpacityVectorDialogClass : public CDialog // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(OpacityVectorDialogClass) protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support - virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult); + virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support + virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult) override; //}}AFX_VIRTUAL // Implementation @@ -57,9 +57,9 @@ class OpacityVectorDialogClass : public CDialog // Generated message map functions //{{AFX_MSG(OpacityVectorDialogClass) - virtual BOOL OnInitDialog(); - virtual void OnOK(); - virtual void OnCancel(); + virtual BOOL OnInitDialog() override; + virtual void OnOK() override; + virtual void OnCancel() override; afx_msg void OnHScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar); //}}AFX_MSG DECLARE_MESSAGE_MAP() diff --git a/Core/Tools/W3DView/ParticleBlurTimeKeyDialog.h b/Core/Tools/W3DView/ParticleBlurTimeKeyDialog.h index acdd78cbb61..db7c368359b 100644 --- a/Core/Tools/W3DView/ParticleBlurTimeKeyDialog.h +++ b/Core/Tools/W3DView/ParticleBlurTimeKeyDialog.h @@ -41,8 +41,8 @@ class ParticleBlurTimeKeyDialogClass : public CDialog // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(ParticleBlurTimeKeyDialogClass) protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support - virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult); + virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support + virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult) override; //}}AFX_VIRTUAL // Implementation @@ -50,7 +50,7 @@ class ParticleBlurTimeKeyDialogClass : public CDialog // Generated message map functions //{{AFX_MSG(ParticleBlurTimeKeyDialogClass) - virtual BOOL OnInitDialog(); + virtual BOOL OnInitDialog() override; afx_msg void OnOk2(); //}}AFX_MSG DECLARE_MESSAGE_MAP() diff --git a/Core/Tools/W3DView/ParticleRotationKeyDialog.h b/Core/Tools/W3DView/ParticleRotationKeyDialog.h index d2fa14e3269..aebe5991a51 100644 --- a/Core/Tools/W3DView/ParticleRotationKeyDialog.h +++ b/Core/Tools/W3DView/ParticleRotationKeyDialog.h @@ -41,8 +41,8 @@ class ParticleRotationKeyDialogClass : public CDialog // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(ParticleRotationKeyDialogClass) protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support - virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult); + virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support + virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult) override; //}}AFX_VIRTUAL // Implementation @@ -50,8 +50,8 @@ class ParticleRotationKeyDialogClass : public CDialog // Generated message map functions //{{AFX_MSG(ParticleRotationKeyDialogClass) - virtual BOOL OnInitDialog(); - virtual void OnOK(); + virtual BOOL OnInitDialog() override; + virtual void OnOK() override; //}}AFX_MSG DECLARE_MESSAGE_MAP() diff --git a/Core/Tools/W3DView/ParticleSizeDialog.h b/Core/Tools/W3DView/ParticleSizeDialog.h index 8303479c9c7..2cc06120008 100644 --- a/Core/Tools/W3DView/ParticleSizeDialog.h +++ b/Core/Tools/W3DView/ParticleSizeDialog.h @@ -41,8 +41,8 @@ class ParticleSizeDialogClass : public CDialog // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(ParticleSizeDialogClass) protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support - virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult); + virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support + virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult) override; //}}AFX_VIRTUAL // Implementation @@ -50,8 +50,8 @@ class ParticleSizeDialogClass : public CDialog // Generated message map functions //{{AFX_MSG(ParticleSizeDialogClass) - virtual BOOL OnInitDialog(); - virtual void OnOK(); + virtual BOOL OnInitDialog() override; + virtual void OnOK() override; //}}AFX_MSG DECLARE_MESSAGE_MAP() diff --git a/Core/Tools/W3DView/PlaySoundDialog.h b/Core/Tools/W3DView/PlaySoundDialog.h index 1162955df3b..c0f2d16fe5a 100644 --- a/Core/Tools/W3DView/PlaySoundDialog.h +++ b/Core/Tools/W3DView/PlaySoundDialog.h @@ -44,7 +44,7 @@ class PlaySoundDialogClass : public CDialog // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(PlaySoundDialogClass) protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support + virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support //}}AFX_VIRTUAL // Implementation @@ -53,8 +53,8 @@ class PlaySoundDialogClass : public CDialog // Generated message map functions //{{AFX_MSG(PlaySoundDialogClass) afx_msg void OnPlaySoundEffect(); - virtual void OnCancel(); - virtual BOOL OnInitDialog(); + virtual void OnCancel() override; + virtual BOOL OnInitDialog() override; afx_msg void OnStopSoundEffect(); //}}AFX_MSG DECLARE_MESSAGE_MAP() diff --git a/Core/Tools/W3DView/ResolutionDialog.h b/Core/Tools/W3DView/ResolutionDialog.h index ddb0be63a8f..2080596cbce 100644 --- a/Core/Tools/W3DView/ResolutionDialog.h +++ b/Core/Tools/W3DView/ResolutionDialog.h @@ -43,7 +43,7 @@ class ResolutionDialogClass : public CDialog // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(ResolutionDialogClass) protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support + virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support //}}AFX_VIRTUAL // Implementation @@ -51,8 +51,8 @@ class ResolutionDialogClass : public CDialog // Generated message map functions //{{AFX_MSG(ResolutionDialogClass) - virtual BOOL OnInitDialog(); - virtual void OnOK(); + virtual BOOL OnInitDialog() override; + virtual void OnOK() override; afx_msg void OnDblclkResolutionListCtrl(NMHDR* pNMHDR, LRESULT* pResult); //}}AFX_MSG DECLARE_MESSAGE_MAP() diff --git a/Core/Tools/W3DView/RingColorPropPage.h b/Core/Tools/W3DView/RingColorPropPage.h index 4d2d6f67a28..5775281ec53 100644 --- a/Core/Tools/W3DView/RingColorPropPage.h +++ b/Core/Tools/W3DView/RingColorPropPage.h @@ -37,7 +37,7 @@ class RingColorPropPageClass : public CPropertyPage // Construction public: RingColorPropPageClass (RingRenderObjClass *ring = nullptr); - ~RingColorPropPageClass (); + ~RingColorPropPageClass () override; // Dialog Data //{{AFX_DATA(RingColorPropPageClass) @@ -51,18 +51,18 @@ class RingColorPropPageClass : public CPropertyPage // ClassWizard generate virtual function overrides //{{AFX_VIRTUAL(RingColorPropPageClass) public: - virtual BOOL OnApply(); - virtual void OnCancel(); + virtual BOOL OnApply() override; + virtual void OnCancel() override; protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support - virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult); + virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support + virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult) override; //}}AFX_VIRTUAL // Implementation protected: // Generated message map functions //{{AFX_MSG(RingColorPropPageClass) - virtual BOOL OnInitDialog(); + virtual BOOL OnInitDialog() override; afx_msg void OnDestroy(); //}}AFX_MSG DECLARE_MESSAGE_MAP() diff --git a/Core/Tools/W3DView/RingGeneralPropPage.h b/Core/Tools/W3DView/RingGeneralPropPage.h index 66701ab910f..0d8c286075e 100644 --- a/Core/Tools/W3DView/RingGeneralPropPage.h +++ b/Core/Tools/W3DView/RingGeneralPropPage.h @@ -37,7 +37,7 @@ class RingGeneralPropPageClass : public CPropertyPage // Construction public: RingGeneralPropPageClass (RingRenderObjClass *ring = nullptr); - ~RingGeneralPropPageClass (); + ~RingGeneralPropPageClass () override; // Dialog Data //{{AFX_DATA(RingGeneralPropPageClass) @@ -51,18 +51,18 @@ class RingGeneralPropPageClass : public CPropertyPage // ClassWizard generate virtual function overrides //{{AFX_VIRTUAL(RingGeneralPropPageClass) public: - virtual BOOL OnApply(); + virtual BOOL OnApply() override; protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support - virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult); - virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam); + virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support + virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult) override; + virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam) override; //}}AFX_VIRTUAL // Implementation protected: // Generated message map functions //{{AFX_MSG(RingGeneralPropPageClass) - virtual BOOL OnInitDialog(); + virtual BOOL OnInitDialog() override; afx_msg void OnBrowseButton(); afx_msg void OnChangeFilenameEdit(); afx_msg void OnChangeNameEdit(); diff --git a/Core/Tools/W3DView/RingPropertySheet.h b/Core/Tools/W3DView/RingPropertySheet.h index 4e101da0baf..cd0bdf4e824 100644 --- a/Core/Tools/W3DView/RingPropertySheet.h +++ b/Core/Tools/W3DView/RingPropertySheet.h @@ -71,12 +71,12 @@ class RingPropertySheetClass : public CPropertySheet // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(RingPropertySheetClass) protected: - virtual LRESULT WindowProc(UINT message, WPARAM wParam, LPARAM lParam); + virtual LRESULT WindowProc(UINT message, WPARAM wParam, LPARAM lParam) override; //}}AFX_VIRTUAL // Implementation public: - virtual ~RingPropertySheetClass(); + virtual ~RingPropertySheetClass() override; // Generated message map functions protected: diff --git a/Core/Tools/W3DView/RingSizePropPage.h b/Core/Tools/W3DView/RingSizePropPage.h index 820cd11e28d..cfb08a77cde 100644 --- a/Core/Tools/W3DView/RingSizePropPage.h +++ b/Core/Tools/W3DView/RingSizePropPage.h @@ -37,7 +37,7 @@ class RingSizePropPageClass : public CPropertyPage // Construction public: RingSizePropPageClass(RingRenderObjClass *ring = nullptr); - ~RingSizePropPageClass(); + ~RingSizePropPageClass() override; // Dialog Data //{{AFX_DATA(RingSizePropPageClass) @@ -53,19 +53,19 @@ class RingSizePropPageClass : public CPropertyPage // ClassWizard generate virtual function overrides //{{AFX_VIRTUAL(RingSizePropPageClass) public: - virtual BOOL OnApply(); - virtual void OnCancel(); + virtual BOOL OnApply() override; + virtual void OnCancel() override; protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support - virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult); - virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam); + virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support + virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult) override; + virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam) override; //}}AFX_VIRTUAL // Implementation protected: // Generated message map functions //{{AFX_MSG(RingSizePropPageClass) - virtual BOOL OnInitDialog(); + virtual BOOL OnInitDialog() override; afx_msg void OnDestroy(); //}}AFX_MSG DECLARE_MESSAGE_MAP() diff --git a/Core/Tools/W3DView/SaveSettingsDialog.h b/Core/Tools/W3DView/SaveSettingsDialog.h index b3d9b8be186..8a8799bbe95 100644 --- a/Core/Tools/W3DView/SaveSettingsDialog.h +++ b/Core/Tools/W3DView/SaveSettingsDialog.h @@ -41,8 +41,8 @@ class CSaveSettingsDialog : public CDialog // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(CSaveSettingsDialog) protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support - virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam); + virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support + virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam) override; //}}AFX_VIRTUAL // Implementation @@ -50,10 +50,10 @@ class CSaveSettingsDialog : public CDialog // Generated message map functions //{{AFX_MSG(CSaveSettingsDialog) - virtual BOOL OnInitDialog(); + virtual BOOL OnInitDialog() override; afx_msg void OnBrowseButton(); afx_msg void OnUpdateFilenameEdit(); - virtual void OnOK(); + virtual void OnOK() override; //}}AFX_MSG DECLARE_MESSAGE_MAP() diff --git a/Core/Tools/W3DView/ScaleDialog.h b/Core/Tools/W3DView/ScaleDialog.h index 9872f26e191..207c15605dc 100644 --- a/Core/Tools/W3DView/ScaleDialog.h +++ b/Core/Tools/W3DView/ScaleDialog.h @@ -42,8 +42,8 @@ class ScaleDialogClass : public CDialog // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(ScaleDialogClass) protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support - virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult); + virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support + virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult) override; //}}AFX_VIRTUAL // Implementation @@ -51,8 +51,8 @@ class ScaleDialogClass : public CDialog // Generated message map functions //{{AFX_MSG(ScaleDialogClass) - virtual BOOL OnInitDialog(); - virtual void OnOK(); + virtual BOOL OnInitDialog() override; + virtual void OnOK() override; //}}AFX_MSG DECLARE_MESSAGE_MAP() diff --git a/Core/Tools/W3DView/SceneLightDialog.h b/Core/Tools/W3DView/SceneLightDialog.h index c10dc4d535f..f14c1aba7e1 100644 --- a/Core/Tools/W3DView/SceneLightDialog.h +++ b/Core/Tools/W3DView/SceneLightDialog.h @@ -51,8 +51,8 @@ class CSceneLightDialog : public CDialog // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(CSceneLightDialog) protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support - virtual LRESULT WindowProc(UINT message, WPARAM wParam, LPARAM lParam); + virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support + virtual LRESULT WindowProc(UINT message, WPARAM wParam, LPARAM lParam) override; //}}AFX_VIRTUAL // Implementation @@ -60,9 +60,9 @@ class CSceneLightDialog : public CDialog // Generated message map functions //{{AFX_MSG(CSceneLightDialog) - virtual BOOL OnInitDialog(); + virtual BOOL OnInitDialog() override; afx_msg void OnHScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar); - virtual void OnCancel(); + virtual void OnCancel() override; afx_msg void OnGrayscaleCheck(); afx_msg void OnChannelBothRadio(); afx_msg void OnChannelDiffuseRadio(); diff --git a/Core/Tools/W3DView/ScreenCursor.h b/Core/Tools/W3DView/ScreenCursor.h index 19f65a6f904..29000220b5b 100644 --- a/Core/Tools/W3DView/ScreenCursor.h +++ b/Core/Tools/W3DView/ScreenCursor.h @@ -53,7 +53,7 @@ class ScreenCursorClass : public RenderObjClass //////////////////////////////////////////////////////////////////////// ScreenCursorClass (); ScreenCursorClass (const ScreenCursorClass &src); - virtual ~ScreenCursorClass (); + virtual ~ScreenCursorClass () override; //////////////////////////////////////////////////////////////////////// // Public operators @@ -69,15 +69,15 @@ class ScreenCursorClass : public RenderObjClass //////////////////////////////////////////////////////////////////////// // Base class overrides //////////////////////////////////////////////////////////////////////// - RenderObjClass * Clone () const { return new ScreenCursorClass (*this); } - virtual int Class_ID() const { return CLASSID_LAST + 103L; } - virtual void Render (RenderInfoClass &rinfo); - virtual void On_Frame_Update (); - virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const; - virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const; - - virtual void Notify_Added(SceneClass * scene); - virtual void Notify_Removed(SceneClass * scene); + RenderObjClass * Clone () const override { return new ScreenCursorClass (*this); } + virtual int Class_ID() const override { return CLASSID_LAST + 103L; } + virtual void Render (RenderInfoClass &rinfo) override; + virtual void On_Frame_Update () override; + virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const override; + virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const override; + + virtual void Notify_Added(SceneClass * scene) override; + virtual void Notify_Removed(SceneClass * scene) override; protected: diff --git a/Core/Tools/W3DView/SoundEditDialog.h b/Core/Tools/W3DView/SoundEditDialog.h index 6a962164c08..c757b2571bd 100644 --- a/Core/Tools/W3DView/SoundEditDialog.h +++ b/Core/Tools/W3DView/SoundEditDialog.h @@ -37,7 +37,7 @@ class SoundEditDialogClass : public CDialog { public: SoundEditDialogClass (CWnd *parent); - virtual ~SoundEditDialogClass (); + virtual ~SoundEditDialogClass () override; // Form Data public: @@ -57,7 +57,7 @@ class SoundEditDialogClass : public CDialog // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(SoundEditDialogClass) protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support + virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support //}}AFX_VIRTUAL // Implementation @@ -73,9 +73,9 @@ class SoundEditDialogClass : public CDialog afx_msg void On2DRadio(); afx_msg void On3DRadio(); afx_msg void OnPlay(); - virtual BOOL OnInitDialog(); - virtual void OnOK(); - virtual void OnCancel(); + virtual BOOL OnInitDialog() override; + virtual void OnOK() override; + virtual void OnCancel() override; //}}AFX_MSG DECLARE_MESSAGE_MAP() diff --git a/Core/Tools/W3DView/SphereColorPropPage.h b/Core/Tools/W3DView/SphereColorPropPage.h index b0df952f9ee..776f74ce391 100644 --- a/Core/Tools/W3DView/SphereColorPropPage.h +++ b/Core/Tools/W3DView/SphereColorPropPage.h @@ -37,7 +37,7 @@ class SphereColorPropPageClass : public CPropertyPage // Construction public: SphereColorPropPageClass (SphereRenderObjClass *sphere = nullptr); - ~SphereColorPropPageClass (); + ~SphereColorPropPageClass () override; // Dialog Data //{{AFX_DATA(SphereColorPropPageClass) @@ -51,18 +51,18 @@ class SphereColorPropPageClass : public CPropertyPage // ClassWizard generate virtual function overrides //{{AFX_VIRTUAL(SphereColorPropPageClass) public: - virtual BOOL OnApply(); - virtual void OnCancel(); + virtual BOOL OnApply() override; + virtual void OnCancel() override; protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support - virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult); + virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support + virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult) override; //}}AFX_VIRTUAL // Implementation protected: // Generated message map functions //{{AFX_MSG(SphereColorPropPageClass) - virtual BOOL OnInitDialog(); + virtual BOOL OnInitDialog() override; afx_msg void OnDestroy(); afx_msg void OnOpacityVectorCheck(); afx_msg void OnInvertVectorCheck(); diff --git a/Core/Tools/W3DView/SphereGeneralPropPage.h b/Core/Tools/W3DView/SphereGeneralPropPage.h index 868f1975b2c..585260ccd37 100644 --- a/Core/Tools/W3DView/SphereGeneralPropPage.h +++ b/Core/Tools/W3DView/SphereGeneralPropPage.h @@ -37,7 +37,7 @@ class SphereGeneralPropPageClass : public CPropertyPage // Construction public: SphereGeneralPropPageClass (SphereRenderObjClass *sphere = nullptr); - ~SphereGeneralPropPageClass (); + ~SphereGeneralPropPageClass () override; // Dialog Data //{{AFX_DATA(SphereGeneralPropPageClass) @@ -50,18 +50,18 @@ class SphereGeneralPropPageClass : public CPropertyPage // ClassWizard generate virtual function overrides //{{AFX_VIRTUAL(SphereGeneralPropPageClass) public: - virtual BOOL OnApply(); + virtual BOOL OnApply() override; protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support - virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult); - virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam); + virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support + virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult) override; + virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam) override; //}}AFX_VIRTUAL // Implementation protected: // Generated message map functions //{{AFX_MSG(SphereGeneralPropPageClass) - virtual BOOL OnInitDialog(); + virtual BOOL OnInitDialog() override; afx_msg void OnBrowseButton(); afx_msg void OnChangeFilenameEdit(); afx_msg void OnChangeNameEdit(); diff --git a/Core/Tools/W3DView/SpherePropertySheet.h b/Core/Tools/W3DView/SpherePropertySheet.h index 2589687b2a3..a34d4723314 100644 --- a/Core/Tools/W3DView/SpherePropertySheet.h +++ b/Core/Tools/W3DView/SpherePropertySheet.h @@ -71,12 +71,12 @@ class SpherePropertySheetClass : public CPropertySheet // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(SpherePropertySheetClass) protected: - virtual LRESULT WindowProc(UINT message, WPARAM wParam, LPARAM lParam); + virtual LRESULT WindowProc(UINT message, WPARAM wParam, LPARAM lParam) override; //}}AFX_VIRTUAL // Implementation public: - virtual ~SpherePropertySheetClass(); + virtual ~SpherePropertySheetClass() override; // Generated message map functions protected: diff --git a/Core/Tools/W3DView/SphereSizePropPage.h b/Core/Tools/W3DView/SphereSizePropPage.h index 3bbbe4123b2..7f6eb2bd18c 100644 --- a/Core/Tools/W3DView/SphereSizePropPage.h +++ b/Core/Tools/W3DView/SphereSizePropPage.h @@ -37,7 +37,7 @@ class SphereSizePropPageClass : public CPropertyPage // Construction public: SphereSizePropPageClass(SphereRenderObjClass *sphere = nullptr); - ~SphereSizePropPageClass(); + ~SphereSizePropPageClass() override; // Dialog Data //{{AFX_DATA(SphereSizePropPageClass) @@ -52,19 +52,19 @@ class SphereSizePropPageClass : public CPropertyPage // ClassWizard generate virtual function overrides //{{AFX_VIRTUAL(SphereSizePropPageClass) public: - virtual BOOL OnApply(); - virtual void OnCancel(); + virtual BOOL OnApply() override; + virtual void OnCancel() override; protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support - virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult); - virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam); + virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support + virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult) override; + virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam) override; //}}AFX_VIRTUAL // Implementation protected: // Generated message map functions //{{AFX_MSG(SphereSizePropPageClass) - virtual BOOL OnInitDialog(); + virtual BOOL OnInitDialog() override; afx_msg void OnDestroy(); //}}AFX_MSG DECLARE_MESSAGE_MAP() diff --git a/Core/Tools/W3DView/TexturePathDialog.h b/Core/Tools/W3DView/TexturePathDialog.h index 58082664864..960a79d6629 100644 --- a/Core/Tools/W3DView/TexturePathDialog.h +++ b/Core/Tools/W3DView/TexturePathDialog.h @@ -41,7 +41,7 @@ class TexturePathDialogClass : public CDialog // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(TexturePathDialogClass) protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support + virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support //}}AFX_VIRTUAL // Implementation @@ -49,8 +49,8 @@ class TexturePathDialogClass : public CDialog // Generated message map functions //{{AFX_MSG(TexturePathDialogClass) - virtual BOOL OnInitDialog(); - virtual void OnOK(); + virtual BOOL OnInitDialog() override; + virtual void OnOK() override; afx_msg void OnBrowse1(); afx_msg void OnBrowse2(); //}}AFX_MSG diff --git a/Core/Tools/W3DView/Toolbar.h b/Core/Tools/W3DView/Toolbar.h index fbab2af7cb9..d79da687ca9 100644 --- a/Core/Tools/W3DView/Toolbar.h +++ b/Core/Tools/W3DView/Toolbar.h @@ -82,7 +82,7 @@ class CFancyToolbar : public CControlBar // Public Contructors // CFancyToolbar (); - virtual ~CFancyToolbar (); + virtual ~CFancyToolbar () override; //////////////////////////////////////////////////////// diff --git a/Core/Tools/W3DView/ViewerScene.cpp b/Core/Tools/W3DView/ViewerScene.cpp index ae9486a097d..911aaed1de1 100644 --- a/Core/Tools/W3DView/ViewerScene.cpp +++ b/Core/Tools/W3DView/ViewerScene.cpp @@ -53,10 +53,10 @@ class ViewerSceneIterator : public SceneIterator { public: - virtual void First(); - virtual void Next(); - virtual bool Is_Done(); - virtual RenderObjClass * Current_Item(); + virtual void First() override; + virtual void Next() override; + virtual bool Is_Done() override; + virtual RenderObjClass * Current_Item() override; protected: diff --git a/Core/Tools/W3DView/VolumeRandomDialog.h b/Core/Tools/W3DView/VolumeRandomDialog.h index 7ff8c1e96f1..b69915cd0e7 100644 --- a/Core/Tools/W3DView/VolumeRandomDialog.h +++ b/Core/Tools/W3DView/VolumeRandomDialog.h @@ -51,8 +51,8 @@ class VolumeRandomDialogClass : public CDialog // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(VolumeRandomDialogClass) protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support - virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult); + virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support + virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult) override; //}}AFX_VIRTUAL // Implementation @@ -60,8 +60,8 @@ class VolumeRandomDialogClass : public CDialog // Generated message map functions //{{AFX_MSG(VolumeRandomDialogClass) - virtual void OnOK(); - virtual BOOL OnInitDialog(); + virtual void OnOK() override; + virtual BOOL OnInitDialog() override; afx_msg void OnBoxRadio(); afx_msg void OnCylinderRadio(); afx_msg void OnSphereRadio(); diff --git a/Core/Tools/W3DView/W3DView.cpp b/Core/Tools/W3DView/W3DView.cpp index 552740b4937..a4384115689 100644 --- a/Core/Tools/W3DView/W3DView.cpp +++ b/Core/Tools/W3DView/W3DView.cpp @@ -275,13 +275,13 @@ class CAboutDlg : public CDialog // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(CAboutDlg) protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support + virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support //}}AFX_VIRTUAL // Implementation protected: //{{AFX_MSG(CAboutDlg) - virtual BOOL OnInitDialog(); + virtual BOOL OnInitDialog() override; //}}AFX_MSG DECLARE_MESSAGE_MAP() }; diff --git a/Core/Tools/W3DView/W3DViewDoc.h b/Core/Tools/W3DView/W3DViewDoc.h index 768af4f6480..28297114cfe 100644 --- a/Core/Tools/W3DView/W3DViewDoc.h +++ b/Core/Tools/W3DView/W3DViewDoc.h @@ -88,7 +88,7 @@ class CW3DViewDoc : public CDocument // Implementation public: - virtual ~CW3DViewDoc(); + virtual ~CW3DViewDoc() override; #ifdef RTS_DEBUG virtual void AssertValid() const override; virtual void Dump(CDumpContext& dc) const override; diff --git a/Core/Tools/W3DView/W3DViewView.h b/Core/Tools/W3DView/W3DViewView.h index c69d133494d..08e1cfda240 100644 --- a/Core/Tools/W3DView/W3DViewView.h +++ b/Core/Tools/W3DView/W3DViewView.h @@ -39,14 +39,14 @@ class CW3DViewView : public CView // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(CW3DViewView) public: - virtual void OnDraw(CDC* pDC); // overridden to draw this view - virtual BOOL PreCreateWindow(CREATESTRUCT& cs); + virtual void OnDraw(CDC* pDC) override; // overridden to draw this view + virtual BOOL PreCreateWindow(CREATESTRUCT& cs) override; protected: //}}AFX_VIRTUAL // Implementation public: - virtual ~CW3DViewView(); + virtual ~CW3DViewView() override; #ifdef RTS_DEBUG virtual void AssertValid() const override; virtual void Dump(CDumpContext& dc) const override; diff --git a/Generals/Code/GameEngine/Include/Common/MapReaderWriterInfo.h b/Generals/Code/GameEngine/Include/Common/MapReaderWriterInfo.h index c370ac5b3c0..9089411e091 100644 --- a/Generals/Code/GameEngine/Include/Common/MapReaderWriterInfo.h +++ b/Generals/Code/GameEngine/Include/Common/MapReaderWriterInfo.h @@ -70,7 +70,7 @@ class InputStream { variety of sources, such as FILE* or CFile. */ class ChunkInputStream : public InputStream{ public: - virtual Int read(void *pData, Int numBytes) = 0; + virtual Int read(void *pData, Int numBytes) override = 0; virtual UnsignedInt tell() = 0; virtual Bool absoluteSeek(UnsignedInt pos) = 0; virtual Bool eof() = 0; diff --git a/Generals/Code/GameEngine/Include/GameLogic/VictoryConditions.h b/Generals/Code/GameEngine/Include/GameLogic/VictoryConditions.h index 59d54c40113..423012829b4 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/VictoryConditions.h +++ b/Generals/Code/GameEngine/Include/GameLogic/VictoryConditions.h @@ -51,9 +51,9 @@ class VictoryConditionsInterface : public SubsystemInterface public: VictoryConditionsInterface() { m_victoryConditions = 0; } - virtual void init() = 0; - virtual void reset() = 0; - virtual void update() = 0; + virtual void init() override = 0; + virtual void reset() override = 0; + virtual void update() override = 0; void setVictoryConditions( Int victoryConditions ) { m_victoryConditions = victoryConditions; } Int getVictoryConditions() { return m_victoryConditions; } diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/decalmsh.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/decalmsh.h index ce5afef9731..114bacf508a 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/decalmsh.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/decalmsh.h @@ -76,7 +76,7 @@ class DecalMeshClass : public RefCountClass public: DecalMeshClass(MeshClass * parent,DecalSystemClass * system); - virtual ~DecalMeshClass(); + virtual ~DecalMeshClass() override; // world_vertex_locs and world_vertex_norms are dynamically updated worldspace vertex data // which are used by some decal types which cannot use static object geometry (such as decals @@ -121,21 +121,21 @@ class RigidDecalMeshClass : public DecalMeshClass public: RigidDecalMeshClass(MeshClass * parent,DecalSystemClass * system); - virtual ~RigidDecalMeshClass(); + virtual ~RigidDecalMeshClass() override; // Rigid decal meshes have static geometry so they do not use world_vertex_locs/norms - virtual void Render(); + virtual void Render() override; virtual bool Create_Decal( DecalGeneratorClass * generator, const OBBoxClass & localbox, SimpleDynVecClass & apt, - const DynamicVectorClass * world_vertex_locs = 0); + const DynamicVectorClass * world_vertex_locs = 0) override; - virtual bool Delete_Decal(uint32 id); + virtual bool Delete_Decal(uint32 id) override; - int Decal_Count(); - uint32 Get_Decal_ID(int decal_index); + int Decal_Count() override; + uint32 Get_Decal_ID(int decal_index) override; protected: @@ -186,21 +186,21 @@ class SkinDecalMeshClass : public DecalMeshClass public: SkinDecalMeshClass(MeshClass * parent,DecalSystemClass * system); - virtual ~SkinDecalMeshClass(); + virtual ~SkinDecalMeshClass() override; // Skin decals use world_vertex_locs/norms since they cannot use static geometry - virtual void Render(); + virtual void Render() override; virtual bool Create_Decal( DecalGeneratorClass * generator, const OBBoxClass & localbox, SimpleDynVecClass & apt, - const DynamicVectorClass * world_vertex_locs); + const DynamicVectorClass * world_vertex_locs) override; - virtual bool Delete_Decal(uint32 id); + virtual bool Delete_Decal(uint32 id) override; - int Decal_Count(); - uint32 Get_Decal_ID(int decal_index); + int Decal_Count() override; + uint32 Get_Decal_ID(int decal_index) override; protected: diff --git a/GeneralsMD/Code/GameEngine/Include/Common/MapReaderWriterInfo.h b/GeneralsMD/Code/GameEngine/Include/Common/MapReaderWriterInfo.h index c114ad29109..773beecd74d 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/MapReaderWriterInfo.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/MapReaderWriterInfo.h @@ -72,7 +72,7 @@ class InputStream { variety of sources, such as FILE* or CFile. */ class ChunkInputStream : public InputStream{ public: - virtual Int read(void *pData, Int numBytes) = 0; + virtual Int read(void *pData, Int numBytes) override = 0; virtual UnsignedInt tell() = 0; virtual Bool absoluteSeek(UnsignedInt pos) = 0; virtual Bool eof() = 0; diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/VictoryConditions.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/VictoryConditions.h index 418bb958f3c..26c2e0a5027 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/VictoryConditions.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/VictoryConditions.h @@ -51,9 +51,9 @@ class VictoryConditionsInterface : public SubsystemInterface public: VictoryConditionsInterface() { m_victoryConditions = 0; } - virtual void init() = 0; - virtual void reset() = 0; - virtual void update() = 0; + virtual void init() override = 0; + virtual void reset() override = 0; + virtual void update() override = 0; void setVictoryConditions( Int victoryConditions ) { m_victoryConditions = victoryConditions; } Int getVictoryConditions() { return m_victoryConditions; } diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/decalmsh.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/decalmsh.h index 76721adebe0..93f8de36e52 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/decalmsh.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/decalmsh.h @@ -76,7 +76,7 @@ class DecalMeshClass : public RefCountClass public: DecalMeshClass(MeshClass * parent,DecalSystemClass * system); - virtual ~DecalMeshClass(); + virtual ~DecalMeshClass() override; // world_vertex_locs and world_vertex_norms are dynamically updated worldspace vertex data // which are used by some decal types which cannot use static object geometry (such as decals @@ -121,21 +121,21 @@ class RigidDecalMeshClass : public DecalMeshClass public: RigidDecalMeshClass(MeshClass * parent,DecalSystemClass * system); - virtual ~RigidDecalMeshClass(); + virtual ~RigidDecalMeshClass() override; // Rigid decal meshes have static geometry so they do not use world_vertex_locs/norms - virtual void Render(); + virtual void Render() override; virtual bool Create_Decal( DecalGeneratorClass * generator, const OBBoxClass & localbox, SimpleDynVecClass & apt, - const DynamicVectorClass * world_vertex_locs = 0); + const DynamicVectorClass * world_vertex_locs = 0) override; - virtual bool Delete_Decal(uint32 id); + virtual bool Delete_Decal(uint32 id) override; - int Decal_Count(); - uint32 Get_Decal_ID(int decal_index); + int Decal_Count() override; + uint32 Get_Decal_ID(int decal_index) override; protected: @@ -186,21 +186,21 @@ class SkinDecalMeshClass : public DecalMeshClass public: SkinDecalMeshClass(MeshClass * parent,DecalSystemClass * system); - virtual ~SkinDecalMeshClass(); + virtual ~SkinDecalMeshClass() override; // Skin decals use world_vertex_locs/norms since they cannot use static geometry - virtual void Render(); + virtual void Render() override; virtual bool Create_Decal( DecalGeneratorClass * generator, const OBBoxClass & localbox, SimpleDynVecClass & apt, - const DynamicVectorClass * world_vertex_locs); + const DynamicVectorClass * world_vertex_locs) override; - virtual bool Delete_Decal(uint32 id); + virtual bool Delete_Decal(uint32 id) override; - int Decal_Count(); - uint32 Get_Decal_ID(int decal_index); + int Decal_Count() override; + uint32 Get_Decal_ID(int decal_index) override; protected: diff --git a/GeneralsMD/Code/Tools/wdump/mainfrm.h b/GeneralsMD/Code/Tools/wdump/mainfrm.h index e3130518162..bc73b93bc2b 100644 --- a/GeneralsMD/Code/Tools/wdump/mainfrm.h +++ b/GeneralsMD/Code/Tools/wdump/mainfrm.h @@ -46,7 +46,7 @@ class CMainFrame : public CFrameWnd // Implementation public: - virtual ~CMainFrame(); + virtual ~CMainFrame() override; #ifdef RTS_DEBUG virtual void AssertValid() const override; virtual void Dump(CDumpContext& dc) const override; diff --git a/GeneralsMD/Code/Tools/wdump/rawfilem.h b/GeneralsMD/Code/Tools/wdump/rawfilem.h index 540a091f1ca..44ad98dc63f 100644 --- a/GeneralsMD/Code/Tools/wdump/rawfilem.h +++ b/GeneralsMD/Code/Tools/wdump/rawfilem.h @@ -143,28 +143,28 @@ class RawFileMClass : public FileClass RawFileMClass(); RawFileMClass (RawFileMClass const & f); RawFileMClass & operator = (RawFileMClass const & f); - virtual ~RawFileMClass(); - - virtual char const * File_Name() const; - virtual char const * Set_Name(char const *filename); - virtual int Create(); - virtual int Delete(); - virtual bool Is_Available(int forced=false); - virtual bool Is_Open() const; - virtual int Open(char const *filename, int rights=READ); - virtual int Open(int rights=READ); - virtual int Read(void *buffer, int size); - virtual int Seek(int pos, int dir=SEEK_CUR); - virtual int Size(); - virtual int Write(void const *buffer, int size); - virtual void Close(); - virtual unsigned long Get_Date_Time(); - virtual bool Set_Date_Time(unsigned long datetime); + virtual ~RawFileMClass() override; + + virtual char const * File_Name() const override; + virtual char const * Set_Name(char const *filename) override; + virtual int Create() override; + virtual int Delete() override; + virtual bool Is_Available(int forced=false) override; + virtual bool Is_Open() const override; + virtual int Open(char const *filename, int rights=READ) override; + virtual int Open(int rights=READ) override; + virtual int Read(void *buffer, int size) override; + virtual int Seek(int pos, int dir=SEEK_CUR) override; + virtual int Size() override; + virtual int Write(void const *buffer, int size) override; + virtual void Close() override; + virtual unsigned long Get_Date_Time() override; + virtual bool Set_Date_Time(unsigned long datetime) override; virtual void Error(int error, int canretry = false, char const * filename=nullptr); void Bias(int start, int length=-1); - HANDLE_TYPE Get_File_Handle() { return (Handle); }; + HANDLE_TYPE Get_File_Handle() override { return (Handle); }; /* ** These bias values enable a sub-portion of a file to appear as if it diff --git a/GeneralsMD/Code/Tools/wdump/wdeview.h b/GeneralsMD/Code/Tools/wdump/wdeview.h index c1f70adc3f9..79b0a9fd6a5 100644 --- a/GeneralsMD/Code/Tools/wdump/wdeview.h +++ b/GeneralsMD/Code/Tools/wdump/wdeview.h @@ -46,7 +46,7 @@ class CWDumpEditView : public CEditView // Implementation protected: - virtual ~CWDumpEditView(); + virtual ~CWDumpEditView() override; #ifdef RTS_DEBUG virtual void AssertValid() const override; virtual void Dump(CDumpContext& dc) const override; diff --git a/GeneralsMD/Code/Tools/wdump/wdlview.h b/GeneralsMD/Code/Tools/wdump/wdlview.h index e03fd17c1d6..cb89d0a5162 100644 --- a/GeneralsMD/Code/Tools/wdump/wdlview.h +++ b/GeneralsMD/Code/Tools/wdump/wdlview.h @@ -48,7 +48,7 @@ class CWDumpListView : public CListView // Implementation protected: - virtual ~CWDumpListView(); + virtual ~CWDumpListView() override; #ifdef RTS_DEBUG virtual void AssertValid() const override; virtual void Dump(CDumpContext& dc) const override; diff --git a/GeneralsMD/Code/Tools/wdump/wdtview.h b/GeneralsMD/Code/Tools/wdump/wdtview.h index 86631662926..198992bc420 100644 --- a/GeneralsMD/Code/Tools/wdump/wdtview.h +++ b/GeneralsMD/Code/Tools/wdump/wdtview.h @@ -46,7 +46,7 @@ class CWDumpTreeView : public CTreeView // Implementation protected: - virtual ~CWDumpTreeView(); + virtual ~CWDumpTreeView() override; #ifdef RTS_DEBUG virtual void AssertValid() const override; virtual void Dump(CDumpContext& dc) const override; diff --git a/GeneralsMD/Code/Tools/wdump/wdumpdoc.h b/GeneralsMD/Code/Tools/wdump/wdumpdoc.h index 6aef0d8ae06..544a3ca2388 100644 --- a/GeneralsMD/Code/Tools/wdump/wdumpdoc.h +++ b/GeneralsMD/Code/Tools/wdump/wdumpdoc.h @@ -54,7 +54,7 @@ class CWdumpDoc : public CDocument // Implementation public: - virtual ~CWdumpDoc(); + virtual ~CWdumpDoc() override; #ifdef RTS_DEBUG virtual void AssertValid() const override; virtual void Dump(CDumpContext& dc) const override; diff --git a/GeneralsMD/Code/Tools/wdump/wdview.h b/GeneralsMD/Code/Tools/wdump/wdview.h index fc764b4c4dc..1b8ceb6afbb 100644 --- a/GeneralsMD/Code/Tools/wdump/wdview.h +++ b/GeneralsMD/Code/Tools/wdump/wdview.h @@ -46,7 +46,7 @@ class CWdumpView : public CView // Implementation public: - virtual ~CWdumpView(); + virtual ~CWdumpView() override; #ifdef RTS_DEBUG virtual void AssertValid() const override; virtual void Dump(CDumpContext& dc) const override;