From 0b133de08f04e012b12e9ba971ee3ccfbbc52ba6 Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Tue, 11 Dec 2012 09:06:21 -0800 Subject: [PATCH] Remove pointless empty destructors An explicit empty destructor is only needed when a class has a smart pointer to an incomplete type. --- aegisub/src/ass_dialogue.h | 4 ---- aegisub/src/ass_exporter.cpp | 3 --- aegisub/src/ass_exporter.h | 1 - aegisub/src/ass_override.cpp | 3 --- aegisub/src/audio_box.cpp | 2 -- aegisub/src/audio_box.h | 1 - aegisub/src/audio_renderer.cpp | 4 ---- aegisub/src/audio_renderer.h | 6 ------ aegisub/src/dialog_about.cpp | 15 --------------- aegisub/src/dialog_about.h | 1 - aegisub/src/visual_tool.cpp | 3 --- aegisub/src/visual_tool.h | 2 +- 12 files changed, 1 insertion(+), 44 deletions(-) diff --git a/aegisub/src/ass_dialogue.h b/aegisub/src/ass_dialogue.h index 634dd7dff..a89e30e4a 100644 --- a/aegisub/src/ass_dialogue.h +++ b/aegisub/src/ass_dialogue.h @@ -49,9 +49,6 @@ enum AssBlockType { BLOCK_DRAWING }; -class AssOverrideParameter; -class AssOverrideTag; - std::size_t hash_value(wxString const& s); /// @class AssDialogueBlock @@ -104,7 +101,6 @@ public: class AssDialogueBlockOverride : public AssDialogueBlock { public: AssDialogueBlockOverride(wxString const& text = wxString()) : AssDialogueBlock(text) { } - ~AssDialogueBlockOverride(); std::vector Tags; diff --git a/aegisub/src/ass_exporter.cpp b/aegisub/src/ass_exporter.cpp index b85482f42..c5e13a796 100644 --- a/aegisub/src/ass_exporter.cpp +++ b/aegisub/src/ass_exporter.cpp @@ -57,9 +57,6 @@ AssExporter::AssExporter(agi::Context *c) { } -AssExporter::~AssExporter () { -} - void AssExporter::DrawSettings(wxWindow *parent, wxSizer *target_sizer) { is_default = false; for (auto filter : *AssExportFilterChain::GetFilterList()) { diff --git a/aegisub/src/ass_exporter.h b/aegisub/src/ass_exporter.h index ea2b350a7..93e72cc9a 100644 --- a/aegisub/src/ass_exporter.h +++ b/aegisub/src/ass_exporter.h @@ -63,7 +63,6 @@ class AssExporter { public: AssExporter(agi::Context *c); - ~AssExporter(); /// Get the names of all registered export filters wxArrayString GetAllFilterNames() const; diff --git a/aegisub/src/ass_override.cpp b/aegisub/src/ass_override.cpp index d9c173b1f..d5395eacc 100644 --- a/aegisub/src/ass_override.cpp +++ b/aegisub/src/ass_override.cpp @@ -423,9 +423,6 @@ void parse_parameters(AssOverrideTag *tag, const wxString &text, AssOverrideTagP } // From ass_dialogue.h -AssDialogueBlockOverride::~AssDialogueBlockOverride() { -} - void AssDialogueBlockOverride::ParseTags() { Tags.clear(); diff --git a/aegisub/src/audio_box.cpp b/aegisub/src/audio_box.cpp index c1d56167a..9a9a2860c 100644 --- a/aegisub/src/audio_box.cpp +++ b/aegisub/src/audio_box.cpp @@ -137,8 +137,6 @@ AudioBox::AudioBox(wxWindow *parent, agi::Context *context) audioDisplay->SetAmplitudeScale(pow(mid(1, VerticalZoom->GetValue(), 100) / 50.0, 3)); } -AudioBox::~AudioBox() { } - BEGIN_EVENT_TABLE(AudioBox,wxSashWindow) EVT_COMMAND_SCROLL(Audio_Horizontal_Zoom, AudioBox::OnHorizontalZoom) EVT_COMMAND_SCROLL(Audio_Vertical_Zoom, AudioBox::OnVerticalZoom) diff --git a/aegisub/src/audio_box.h b/aegisub/src/audio_box.h index 1ca8275de..0ca2fc9ba 100644 --- a/aegisub/src/audio_box.h +++ b/aegisub/src/audio_box.h @@ -86,7 +86,6 @@ class AudioBox : public wxSashWindow { public: AudioBox(wxWindow *parent, agi::Context *context); - ~AudioBox(); void ShowKaraokeBar(bool show); diff --git a/aegisub/src/audio_renderer.cpp b/aegisub/src/audio_renderer.cpp index 9c987c694..2966729aa 100644 --- a/aegisub/src/audio_renderer.cpp +++ b/aegisub/src/audio_renderer.cpp @@ -91,10 +91,6 @@ AudioRenderer::AudioRenderer() SetHeight(1); } -AudioRenderer::~AudioRenderer() -{ -} - void AudioRenderer::SetMillisecondsPerPixel(double new_pixel_ms) { if (pixel_ms == new_pixel_ms) return; diff --git a/aegisub/src/audio_renderer.h b/aegisub/src/audio_renderer.h index b1e01420a..40493b6ea 100644 --- a/aegisub/src/audio_renderer.h +++ b/aegisub/src/audio_renderer.h @@ -143,12 +143,6 @@ public: /// provider must be set before the audio renderer is functional. AudioRenderer(); - /// @brief Destructor - /// - /// Only destroys internal data, audio provider and bitmap providers are - /// owned by the consumer of audio rendering. - ~AudioRenderer(); - /// @brief Set horizontal zoom /// @param pixel_ms Milliseconds per pixel to render audio at /// diff --git a/aegisub/src/dialog_about.cpp b/aegisub/src/dialog_about.cpp index 7a410d597..3a444018b 100644 --- a/aegisub/src/dialog_about.cpp +++ b/aegisub/src/dialog_about.cpp @@ -32,9 +32,6 @@ /// @ingroup configuration_ui /// - -//////////// -// Includes #include "config.h" #include @@ -49,10 +46,6 @@ #include "libresrc/libresrc.h" #include "version.h" - -/// @brief Constructor -/// @param parent Parent frame. -/// AboutScreen::AboutScreen(wxWindow *parent) : wxDialog (parent, -1, _("About Aegisub"), wxDefaultPosition, wxDefaultSize, wxCAPTION | wxCLOSE_BOX , _("About Aegisub")) { @@ -157,11 +150,3 @@ AboutScreen::AboutScreen(wxWindow *parent) SetSizerAndFit(MainSizer); CentreOnParent(); } - - -/// @brief Destructor -/// -AboutScreen::~AboutScreen () { -} - - diff --git a/aegisub/src/dialog_about.h b/aegisub/src/dialog_about.h index 00a7fab88..751c5161e 100644 --- a/aegisub/src/dialog_about.h +++ b/aegisub/src/dialog_about.h @@ -39,5 +39,4 @@ class AboutScreen: public wxDialog { public: AboutScreen(wxWindow *parent); - ~AboutScreen(); }; diff --git a/aegisub/src/visual_tool.cpp b/aegisub/src/visual_tool.cpp index 322dae3f6..1117f820b 100644 --- a/aegisub/src/visual_tool.cpp +++ b/aegisub/src/visual_tool.cpp @@ -69,9 +69,6 @@ VisualToolBase::VisualToolBase(VideoDisplay *parent, agi::Context *context) parent->Bind(wxEVT_MOUSE_CAPTURE_LOST, &VisualToolBase::OnMouseCaptureLost, this); } -VisualToolBase::~VisualToolBase() { -} - void VisualToolBase::OnCommit(int type) { holding = false; dragging = false; diff --git a/aegisub/src/visual_tool.h b/aegisub/src/visual_tool.h index b0cca331b..838a66080 100644 --- a/aegisub/src/visual_tool.h +++ b/aegisub/src/visual_tool.h @@ -151,7 +151,7 @@ public: virtual void Draw()=0; virtual void SetDisplayArea(int x, int y, int w, int h); virtual void SetToolbar(wxToolBar *) { } - virtual ~VisualToolBase(); + virtual ~VisualToolBase() { } }; /// Visual tool base class containing all common feature-related functionality