Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 22 additions & 22 deletions Core/GameEngine/Source/GameClient/GUI/IMEManager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -90,38 +90,38 @@ 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



/// Checks for and services IME messages. Returns TRUE if message serviced
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:

Expand Down
4 changes: 2 additions & 2 deletions Core/Libraries/Source/WWVegas/WWLib/multilist.h
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ class MultiListClass : public GenericMultiListClass

MultiListClass() { }

virtual ~MultiListClass()
virtual ~MultiListClass() override
{
while (!Is_Empty()) {
Remove_Head();
Expand Down Expand Up @@ -342,7 +342,7 @@ class RefMultiListClass : public GenericMultiListClass
{
public:

virtual ~RefMultiListClass()
virtual ~RefMultiListClass() override
{
while (!Is_Empty()) {
Release_Head();
Expand Down
4 changes: 2 additions & 2 deletions Core/Libraries/Source/debug/internal.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
46 changes: 23 additions & 23 deletions Core/Libraries/Source/debug/internal_io.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -228,26 +228,26 @@ 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
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;
};
4 changes: 2 additions & 2 deletions Core/Libraries/Source/profile/internal_cmd.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 {}
};
2 changes: 1 addition & 1 deletion Core/Tools/DebugWindow/DebugWindow.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ class CDebugWindowApp : public CWinApp
{
public:
CDebugWindowApp();
~CDebugWindowApp();
~CDebugWindowApp() override;
DebugWindowDialog* GetDialogWindow();
void SetDialogWindow(DebugWindowDialog* pWnd);

Expand Down
2 changes: 1 addition & 1 deletion Core/Tools/ParticleEditor/CButtonShowColor.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion Core/Tools/ParticleEditor/MoreParmsDialog.h
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down
2 changes: 1 addition & 1 deletion Core/Tools/ParticleEditor/ParticleEditor.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ class CDebugWindowApp : public CWinApp
{
public:
CDebugWindowApp();
~CDebugWindowApp();
~CDebugWindowApp() override;
DebugWindowDialog* GetDialogWindow();
void SetDialogWindow(DebugWindowDialog* pWnd);

Expand Down
2 changes: 1 addition & 1 deletion Core/Tools/ParticleEditor/ParticleEditorDialog.h
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion Core/Tools/W3DView/AdvancedAnimSheet.h
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ class CAdvancedAnimSheet : public CPropertySheet

// Implementation
public:
virtual ~CAdvancedAnimSheet();
virtual ~CAdvancedAnimSheet() override;

// Generated message map functions
protected:
Expand Down
2 changes: 1 addition & 1 deletion Core/Tools/W3DView/AnimMixingPage.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class CAnimMixingPage : public CPropertyPage
// Construction
public:
CAnimMixingPage(CAdvancedAnimSheet *sheet = nullptr);
~CAnimMixingPage();
~CAnimMixingPage() override;

// Dialog Data
//{{AFX_DATA(CAnimMixingPage)
Expand Down
2 changes: 1 addition & 1 deletion Core/Tools/W3DView/AnimReportPage.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class CAnimReportPage : public CPropertyPage
// Construction
public:
CAnimReportPage(CAdvancedAnimSheet *sheet = nullptr);
~CAnimReportPage();
~CAnimReportPage() override;

// Dialog Data
//{{AFX_DATA(CAnimReportPage)
Expand Down
2 changes: 1 addition & 1 deletion Core/Tools/W3DView/AnimationPropPage.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class CAnimationPropPage : public CPropertyPage
// Construction
public:
CAnimationPropPage();
~CAnimationPropPage();
~CAnimationPropPage() override;

// Dialog Data
//{{AFX_DATA(CAnimationPropPage)
Expand Down
2 changes: 1 addition & 1 deletion Core/Tools/W3DView/AssetPropertySheet.h
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ class CAssetPropertySheet : public CPropertySheet

// Implementation
public:
virtual ~CAssetPropertySheet();
virtual ~CAssetPropertySheet() override;

// Generated message map functions
protected:
Expand Down
2 changes: 1 addition & 1 deletion Core/Tools/W3DView/ColorBar.h
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ class ColorBarClass : public CWnd

// Implementation
public:
virtual ~ColorBarClass();
virtual ~ColorBarClass() override;

// Generated message map functions
protected:
Expand Down
2 changes: 1 addition & 1 deletion Core/Tools/W3DView/ColorPicker.h
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ class ColorPickerClass : public CWnd

// Implementation
public:
virtual ~ColorPickerClass();
virtual ~ColorPickerClass() override;

// Generated message map functions
protected:
Expand Down
2 changes: 1 addition & 1 deletion Core/Tools/W3DView/DialogToolbar.h
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ class DialogToolbarClass : public CToolBar
{
public:
DialogToolbarClass ();
virtual ~DialogToolbarClass () {}
virtual ~DialogToolbarClass () override {}

// Form Data
public:
Expand Down
2 changes: 1 addition & 1 deletion Core/Tools/W3DView/EmitterColorPropPage.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class EmitterColorPropPageClass : public CPropertyPage
// Construction
public:
EmitterColorPropPageClass (EmitterInstanceListClass *pemitter_list = nullptr);
~EmitterColorPropPageClass ();
~EmitterColorPropPageClass () override;

// Dialog Data
//{{AFX_DATA(EmitterColorPropPageClass)
Expand Down
2 changes: 1 addition & 1 deletion Core/Tools/W3DView/EmitterFramePropPage.h
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ class EmitterFramePropPageClass : public CPropertyPage
// Construction
public:
EmitterFramePropPageClass();
~EmitterFramePropPageClass();
~EmitterFramePropPageClass() override;

// Dialog Data
//{{AFX_DATA(EmitterFramePropPageClass)
Expand Down
2 changes: 1 addition & 1 deletion Core/Tools/W3DView/EmitterGeneralPropPage.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class EmitterGeneralPropPageClass : public CPropertyPage
// Construction
public:
EmitterGeneralPropPageClass (EmitterInstanceListClass *pemitter_list = nullptr);
~EmitterGeneralPropPageClass ();
~EmitterGeneralPropPageClass () override;

// Dialog Data
//{{AFX_DATA(EmitterGeneralPropPageClass)
Expand Down
34 changes: 17 additions & 17 deletions Core/Tools/W3DView/EmitterInstanceList.h
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ class EmitterInstanceListClass : public ParticleEmitterDefClass
EmitterInstanceListClass (const EmitterInstanceListClass &src)
: ParticleEmitterDefClass (src) { }

virtual ~EmitterInstanceListClass ();
virtual ~EmitterInstanceListClass () override;

///////////////////////////////////////////////////////
// Public methods
Expand All @@ -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<Vector3> &keyframes);
virtual void Set_Opacity_Keyframes (ParticlePropertyStruct<float> &keyframes);
virtual void Set_Size_Keyframes (ParticlePropertyStruct<float> &keyframes);
virtual void Set_Rotation_Keyframes (ParticlePropertyStruct<float> &keyframes, float orient_rnd);
virtual void Set_Frame_Keyframes (ParticlePropertyStruct<float> &keyframes);
virtual void Set_Blur_Time_Keyframes (ParticlePropertyStruct<float> &keyframes);

virtual void Get_Color_Keyframes (ParticlePropertyStruct<Vector3> &keyframes) const;
virtual void Get_Opacity_Keyframes (ParticlePropertyStruct<float> &keyframes) const;
virtual void Get_Size_Keyframes (ParticlePropertyStruct<float> &keyframes) const;
virtual void Set_Color_Keyframes (ParticlePropertyStruct<Vector3> &keyframes) override;
virtual void Set_Opacity_Keyframes (ParticlePropertyStruct<float> &keyframes) override;
virtual void Set_Size_Keyframes (ParticlePropertyStruct<float> &keyframes) override;
virtual void Set_Rotation_Keyframes (ParticlePropertyStruct<float> &keyframes, float orient_rnd) override;
virtual void Set_Frame_Keyframes (ParticlePropertyStruct<float> &keyframes) override;
virtual void Set_Blur_Time_Keyframes (ParticlePropertyStruct<float> &keyframes) override;

virtual void Get_Color_Keyframes (ParticlePropertyStruct<Vector3> &keyframes) const override;
virtual void Get_Opacity_Keyframes (ParticlePropertyStruct<float> &keyframes) const override;
virtual void Get_Size_Keyframes (ParticlePropertyStruct<float> &keyframes) const override;


private:
Expand Down
2 changes: 1 addition & 1 deletion Core/Tools/W3DView/EmitterLineGroupPropPage.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class EmitterLineGroupPropPageClass : public CPropertyPage
// Construction
public:
EmitterLineGroupPropPageClass();
~EmitterLineGroupPropPageClass();
~EmitterLineGroupPropPageClass() override;

// Dialog Data
//{{AFX_DATA(EmitterLineGroupPropPageClass)
Expand Down
2 changes: 1 addition & 1 deletion Core/Tools/W3DView/EmitterLinePropPage.h
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ class EmitterLinePropPageClass : public CPropertyPage
// Construction
public:
EmitterLinePropPageClass();
~EmitterLinePropPageClass();
~EmitterLinePropPageClass() override;

// Dialog Data
//{{AFX_DATA(EmitterLinePropPageClass)
Expand Down
Loading
Loading