From d5f36af87e5a0210fe58cfc13f8c85e5a828ffb1 Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Fri, 28 Dec 2012 19:49:48 -0800 Subject: [PATCH] Add override attributes to the subtitle formats --- aegisub/src/subtitle_format_ass.h | 10 +++++----- aegisub/src/subtitle_format_ebu3264.h | 4 ++-- aegisub/src/subtitle_format_encore.h | 6 +++--- aegisub/src/subtitle_format_microdvd.h | 10 +++++----- aegisub/src/subtitle_format_mkv.h | 4 ++-- aegisub/src/subtitle_format_srt.h | 10 +++++----- aegisub/src/subtitle_format_transtation.h | 6 +++--- aegisub/src/subtitle_format_ttxt.h | 8 ++++---- aegisub/src/subtitle_format_txt.h | 12 ++++++------ 9 files changed, 35 insertions(+), 35 deletions(-) diff --git a/aegisub/src/subtitle_format_ass.h b/aegisub/src/subtitle_format_ass.h index 928901d83..f51954917 100644 --- a/aegisub/src/subtitle_format_ass.h +++ b/aegisub/src/subtitle_format_ass.h @@ -38,12 +38,12 @@ class AssSubtitleFormat : public SubtitleFormat { public: AssSubtitleFormat(); - wxArrayString GetReadWildcards() const; - wxArrayString GetWriteWildcards() const; + wxArrayString GetReadWildcards() const override; + wxArrayString GetWriteWildcards() const override; // Naturally the ASS subtitle format can save all Ass files - bool CanSave(const AssFile*) const { return true; } + bool CanSave(const AssFile*) const override { return true; } - void ReadFile(AssFile *target, wxString const& filename, wxString const& forceEncoding) const; - void WriteFile(const AssFile *src, wxString const& filename, wxString const& encoding) const; + void ReadFile(AssFile *target, wxString const& filename, wxString const& forceEncoding) const override; + void WriteFile(const AssFile *src, wxString const& filename, wxString const& encoding) const override; }; diff --git a/aegisub/src/subtitle_format_ebu3264.h b/aegisub/src/subtitle_format_ebu3264.h index b76d472c0..04179f9aa 100644 --- a/aegisub/src/subtitle_format_ebu3264.h +++ b/aegisub/src/subtitle_format_ebu3264.h @@ -27,8 +27,8 @@ class Ebu3264SubtitleFormat : public SubtitleFormat { public: Ebu3264SubtitleFormat(); - wxArrayString GetWriteWildcards() const; - void WriteFile(const AssFile *src, wxString const& filename, wxString const& encoding) const; + wxArrayString GetWriteWildcards() const override; + void WriteFile(const AssFile *src, wxString const& filename, wxString const& encoding) const override; DEFINE_SIMPLE_EXCEPTION(ConversionFailed, agi::InvalidInputException, "subtitle_io/ebu3264/conversion_error") }; diff --git a/aegisub/src/subtitle_format_encore.h b/aegisub/src/subtitle_format_encore.h index 57ccaa312..73ce73063 100644 --- a/aegisub/src/subtitle_format_encore.h +++ b/aegisub/src/subtitle_format_encore.h @@ -37,7 +37,7 @@ class EncoreSubtitleFormat : public SubtitleFormat { public: EncoreSubtitleFormat(); - wxArrayString GetWriteWildcards() const; - bool CanWriteFile(wxString const& filename) const; - void WriteFile(const AssFile *src, wxString const& filename, wxString const&) const; + wxArrayString GetWriteWildcards() const override; + bool CanWriteFile(wxString const& filename) const override; + void WriteFile(const AssFile *src, wxString const& filename, wxString const&) const override; }; diff --git a/aegisub/src/subtitle_format_microdvd.h b/aegisub/src/subtitle_format_microdvd.h index 054b6c75f..19833808a 100644 --- a/aegisub/src/subtitle_format_microdvd.h +++ b/aegisub/src/subtitle_format_microdvd.h @@ -38,11 +38,11 @@ class MicroDVDSubtitleFormat : public SubtitleFormat { public: MicroDVDSubtitleFormat(); - wxArrayString GetReadWildcards() const; - wxArrayString GetWriteWildcards() const; + wxArrayString GetReadWildcards() const override; + wxArrayString GetWriteWildcards() const override; - bool CanReadFile(wxString const& filename) const; - void ReadFile(AssFile *target, wxString const& filename, wxString const& forceEncoding) const; + bool CanReadFile(wxString const& filename) const override; + void ReadFile(AssFile *target, wxString const& filename, wxString const& forceEncoding) const override; - void WriteFile(const AssFile *src, wxString const& filename, wxString const& encoding) const; + void WriteFile(const AssFile *src, wxString const& filename, wxString const& encoding) const override; }; diff --git a/aegisub/src/subtitle_format_mkv.h b/aegisub/src/subtitle_format_mkv.h index e6d5b20c4..1026d07e0 100644 --- a/aegisub/src/subtitle_format_mkv.h +++ b/aegisub/src/subtitle_format_mkv.h @@ -37,7 +37,7 @@ class MKVSubtitleFormat : public SubtitleFormat { public: MKVSubtitleFormat(); - wxArrayString GetReadWildcards() const; + wxArrayString GetReadWildcards() const override; - void ReadFile(AssFile *target, wxString const& filename, wxString const& forceEncoding) const; + void ReadFile(AssFile *target, wxString const& filename, wxString const& forceEncoding) const override; }; diff --git a/aegisub/src/subtitle_format_srt.h b/aegisub/src/subtitle_format_srt.h index 2205eabde..f47a908bd 100644 --- a/aegisub/src/subtitle_format_srt.h +++ b/aegisub/src/subtitle_format_srt.h @@ -40,11 +40,11 @@ class SRTSubtitleFormat : public SubtitleFormat { wxString ConvertTags(const AssDialogue *diag) const; public: SRTSubtitleFormat(); - wxArrayString GetReadWildcards() const; - wxArrayString GetWriteWildcards() const; + wxArrayString GetReadWildcards() const override; + wxArrayString GetWriteWildcards() const override; - bool CanSave(const AssFile *file) const; + bool CanSave(const AssFile *file) const override; - void ReadFile(AssFile *target, wxString const& filename, wxString const& forceEncoding) const; - void WriteFile(const AssFile *src, wxString const& filename, wxString const& encoding) const; + void ReadFile(AssFile *target, wxString const& filename, wxString const& forceEncoding) const override; + void WriteFile(const AssFile *src, wxString const& filename, wxString const& encoding) const override; }; diff --git a/aegisub/src/subtitle_format_transtation.h b/aegisub/src/subtitle_format_transtation.h index ce4154140..f75bd9f1d 100644 --- a/aegisub/src/subtitle_format_transtation.h +++ b/aegisub/src/subtitle_format_transtation.h @@ -42,7 +42,7 @@ class TranStationSubtitleFormat : public SubtitleFormat { public: TranStationSubtitleFormat(); - bool CanWriteFile(wxString const& filename) const; - wxArrayString GetWriteWildcards() const; - void WriteFile(const AssFile *src, wxString const& filename, wxString const& encoding) const; + bool CanWriteFile(wxString const& filename) const override; + wxArrayString GetWriteWildcards() const override; + void WriteFile(const AssFile *src, wxString const& filename, wxString const& encoding) const override; }; diff --git a/aegisub/src/subtitle_format_ttxt.h b/aegisub/src/subtitle_format_ttxt.h index 100372cb4..fc57744ad 100644 --- a/aegisub/src/subtitle_format_ttxt.h +++ b/aegisub/src/subtitle_format_ttxt.h @@ -48,9 +48,9 @@ class TTXTSubtitleFormat : public SubtitleFormat { public: TTXTSubtitleFormat(); - wxArrayString GetReadWildcards() const; - wxArrayString GetWriteWildcards() const; + wxArrayString GetReadWildcards() const override; + wxArrayString GetWriteWildcards() const override; - void ReadFile(AssFile *target, wxString const& filename, wxString const& forceEncoding) const; - void WriteFile(const AssFile *src, wxString const& filename, wxString const& encoding) const; + void ReadFile(AssFile *target, wxString const& filename, wxString const& forceEncoding) const override; + void WriteFile(const AssFile *src, wxString const& filename, wxString const& encoding) const override; }; diff --git a/aegisub/src/subtitle_format_txt.h b/aegisub/src/subtitle_format_txt.h index a73cd5a55..6a9b7d1ef 100644 --- a/aegisub/src/subtitle_format_txt.h +++ b/aegisub/src/subtitle_format_txt.h @@ -37,13 +37,13 @@ class TXTSubtitleFormat : public SubtitleFormat { public: TXTSubtitleFormat(); - wxArrayString GetReadWildcards() const; - wxArrayString GetWriteWildcards() const; + wxArrayString GetReadWildcards() const override; + wxArrayString GetWriteWildcards() const override; // TXT format supports so little that it should always require an export - bool CanSave(const AssFile*) const { return false; } + bool CanSave(const AssFile*) const override { return false; } - bool CanWriteFile(wxString const& filename) const; - void ReadFile(AssFile *target, wxString const& filename, wxString const& forceEncoding) const; - void WriteFile(const AssFile *src, wxString const& filename, wxString const& encoding) const; + bool CanWriteFile(wxString const& filename) const override; + void ReadFile(AssFile *target, wxString const& filename, wxString const& forceEncoding) const override; + void WriteFile(const AssFile *src, wxString const& filename, wxString const& encoding) const override; };