diff --git a/aegisub/src/ass_attachment.h b/aegisub/src/ass_attachment.h index 3ae9063a1..c05d54696 100644 --- a/aegisub/src/ass_attachment.h +++ b/aegisub/src/ass_attachment.h @@ -75,9 +75,9 @@ public: /// @param raw If false, remove the SSA filename mangling wxString GetFileName(bool raw=false) const; - const wxString GetEntryData() const; - AssEntryGroup Group() const { return group; } - AssEntry *Clone() const; + const wxString GetEntryData() const override; + AssEntryGroup Group() const override { return group; } + AssEntry *Clone() const override; AssAttachment(wxString const& name, AssEntryGroup group); }; diff --git a/aegisub/src/ass_dialogue.h b/aegisub/src/ass_dialogue.h index c5a3015cf..06361d0f0 100644 --- a/aegisub/src/ass_dialogue.h +++ b/aegisub/src/ass_dialogue.h @@ -85,7 +85,7 @@ public: class AssDialogueBlockPlain : public AssDialogueBlock { public: - AssBlockType GetType() const { return BLOCK_PLAIN; } + AssBlockType GetType() const override { return BLOCK_PLAIN; } AssDialogueBlockPlain(wxString const& text = wxString()) : AssDialogueBlock(text) { } }; @@ -93,7 +93,7 @@ class AssDialogueBlockDrawing : public AssDialogueBlock { public: int Scale; - AssBlockType GetType() const { return BLOCK_DRAWING; } + AssBlockType GetType() const override { return BLOCK_DRAWING; } AssDialogueBlockDrawing(wxString const& text, int scale) : AssDialogueBlock(text), Scale(scale) { } void TransformCoords(int trans_x,int trans_y,double mult_x,double mult_y); }; @@ -105,8 +105,8 @@ public: std::vector Tags; - AssBlockType GetType() const { return BLOCK_OVERRIDE; } - wxString GetText(); + AssBlockType GetType() const override { return BLOCK_OVERRIDE; } + wxString GetText() override; void ParseTags(); void AddTag(wxString const& tag); @@ -143,7 +143,7 @@ public: /// Raw text data wxString Text; - AssEntryGroup Group() const { return ENTRY_DIALOGUE; } + AssEntryGroup Group() const override { return ENTRY_DIALOGUE; } /// @brief Parse raw ASS data into everything else /// @param data ASS line @@ -172,9 +172,9 @@ public: /// If blocks have been parsed, update the text from their current value void UpdateText(); - const wxString GetEntryData() const; + const wxString GetEntryData() const override; /// Do nothing - void SetEntryData(wxString const&) { } + void SetEntryData(wxString const&) override { } template void SetMarginString(wxString const& value) { SetMarginString(value, which);} @@ -187,7 +187,7 @@ public: /// @param pad Pad the number to four digits wxString GetMarginString(int which, bool pad=true) const; /// Get the line as SSA rather than ASS - wxString GetSSAText() const; + wxString GetSSAText() const override; /// Does this line collide with the passed line? bool CollidesWith(const AssDialogue *target) const; diff --git a/aegisub/src/ass_style.h b/aegisub/src/ass_style.h index 6d523f869..48a85efb1 100644 --- a/aegisub/src/ass_style.h +++ b/aegisub/src/ass_style.h @@ -78,9 +78,9 @@ public: AssStyle(); AssStyle(wxString data, int version=1); - wxString GetSSAText() const; - AssEntryGroup Group() const { return ENTRY_STYLE; } - AssEntry *Clone() const; + wxString GetSSAText() const override; + AssEntryGroup Group() const override { return ENTRY_STYLE; } + AssEntry *Clone() const override; /// Convert an ASS alignment to the equivalent SSA alignment static int AssToSsa(int ass_align);