mia/Aegisub
1
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity

Add explicit override specifiers to ASS-related virtuals

Browse source
This commit is contained in:
Thomas Goyne 2012-11-26 06:57:58 -08:00
parent 2a6c6616a9
commit 5309f7fb9d
3 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
aegisub/src/ass_attachment.h
View file

@ -75,9 +75,9 @@ public:
/// @param raw If false, remove the SSA filename mangling /// @param raw If false, remove the SSA filename mangling
wxString GetFileName(bool raw=false) const; wxString GetFileName(bool raw=false) const;
const wxString GetEntryData() const; const wxString GetEntryData() const override;
AssEntryGroup Group() const { return group; } AssEntryGroup Group() const override { return group; }
AssEntry *Clone() const; AssEntry *Clone() const override;
AssAttachment(wxString const& name, AssEntryGroup group); AssAttachment(wxString const& name, AssEntryGroup group);
}; };

16
aegisub/src/ass_dialogue.h
View file

@ -85,7 +85,7 @@ public:
class AssDialogueBlockPlain : public AssDialogueBlock { class AssDialogueBlockPlain : public AssDialogueBlock {
public: public:
AssBlockType GetType() const { return BLOCK_PLAIN; } AssBlockType GetType() const override { return BLOCK_PLAIN; }
AssDialogueBlockPlain(wxString const& text = wxString()) : AssDialogueBlock(text) { } AssDialogueBlockPlain(wxString const& text = wxString()) : AssDialogueBlock(text) { }
}; };
@ -93,7 +93,7 @@ class AssDialogueBlockDrawing : public AssDialogueBlock {
public: public:
int Scale; 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) { } AssDialogueBlockDrawing(wxString const& text, int scale) : AssDialogueBlock(text), Scale(scale) { }
void TransformCoords(int trans_x,int trans_y,double mult_x,double mult_y); void TransformCoords(int trans_x,int trans_y,double mult_x,double mult_y);
}; };
@ -105,8 +105,8 @@ public:
std::vector<AssOverrideTag*> Tags; std::vector<AssOverrideTag*> Tags;
AssBlockType GetType() const { return BLOCK_OVERRIDE; } AssBlockType GetType() const override { return BLOCK_OVERRIDE; }
wxString GetText(); wxString GetText() override;
void ParseTags(); void ParseTags();
void AddTag(wxString const& tag); void AddTag(wxString const& tag);
@ -143,7 +143,7 @@ public:
/// Raw text data /// Raw text data
wxString Text; wxString Text;
AssEntryGroup Group() const { return ENTRY_DIALOGUE; } AssEntryGroup Group() const override { return ENTRY_DIALOGUE; }
/// @brief Parse raw ASS data into everything else /// @brief Parse raw ASS data into everything else
/// @param data ASS line /// @param data ASS line
@ -172,9 +172,9 @@ public:
/// If blocks have been parsed, update the text from their current value /// If blocks have been parsed, update the text from their current value
void UpdateText(); void UpdateText();
const wxString GetEntryData() const; const wxString GetEntryData() const override;
/// Do nothing /// Do nothing
void SetEntryData(wxString const&) { } void SetEntryData(wxString const&) override { }
template<int which> template<int which>
void SetMarginString(wxString const& value) { SetMarginString(value, which);} void SetMarginString(wxString const& value) { SetMarginString(value, which);}
@ -187,7 +187,7 @@ public:
/// @param pad Pad the number to four digits /// @param pad Pad the number to four digits
wxString GetMarginString(int which, bool pad=true) const; wxString GetMarginString(int which, bool pad=true) const;
/// Get the line as SSA rather than ASS /// Get the line as SSA rather than ASS
wxString GetSSAText() const; wxString GetSSAText() const override;
/// Does this line collide with the passed line? /// Does this line collide with the passed line?
bool CollidesWith(const AssDialogue *target) const; bool CollidesWith(const AssDialogue *target) const;

6
aegisub/src/ass_style.h
View file

@ -78,9 +78,9 @@ public:
AssStyle(); AssStyle();
AssStyle(wxString data, int version=1); AssStyle(wxString data, int version=1);
wxString GetSSAText() const; wxString GetSSAText() const override;
AssEntryGroup Group() const { return ENTRY_STYLE; } AssEntryGroup Group() const override { return ENTRY_STYLE; }
AssEntry *Clone() const; AssEntry *Clone() const override;
/// Convert an ASS alignment to the equivalent SSA alignment /// Convert an ASS alignment to the equivalent SSA alignment
static int AssToSsa(int ass_align); static int AssToSsa(int ass_align);