From cc5952035e7d6f4db6ba6597126d33247134bdae Mon Sep 17 00:00:00 2001
From: Thomas Goyne <plorkyeran@aegisub.org>
Date: Sun, 16 Jan 2011 07:14:47 +0000
Subject: [PATCH] Don't declare methods as virtual in a class not intended to
 be inherited from

Originally committed to SVN as r5190.
---
 aegisub/src/audio_timing_dialogue.cpp | 40 +++++++++++++--------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/aegisub/src/audio_timing_dialogue.cpp b/aegisub/src/audio_timing_dialogue.cpp
index fbf3d864d..19ea71b70 100644
--- a/aegisub/src/audio_timing_dialogue.cpp
+++ b/aegisub/src/audio_timing_dialogue.cpp
@@ -69,10 +69,10 @@ class AudioMarkerDialogueTiming : public AudioMarker {
 
 public:
 	// AudioMarker interface
-	virtual int64_t GetPosition() const { return position; }
-	virtual wxPen GetStyle() const { return style; }
-	virtual FeetStyle GetFeet() const { return feet; }
-	virtual bool CanSnap() const { return true; }
+	int64_t GetPosition() const { return position; }
+	wxPen GetStyle() const { return style; }
+	FeetStyle GetFeet() const { return feet; }
+	bool CanSnap() const { return true; }
 
 public:
 	// Specific interface
@@ -159,36 +159,36 @@ class AudioTimingControllerDialogue : public AudioTimingController, private Sele
 	AssFile *ass;
 
 	// SubtitleSelectionListener interface
-	virtual void OnActiveLineChanged(AssDialogue *new_line);
-	virtual void OnSelectedSetChanged(const Selection &lines_added, const Selection &lines_removed);
+	void OnActiveLineChanged(AssDialogue *new_line);
+	void OnSelectedSetChanged(const Selection &lines_added, const Selection &lines_removed);
 
 	// AssFile events
 	void OnFileChanged(int type);
 
 public:
 	// AudioMarkerProvider interface
-	virtual void GetMarkers(const SampleRange &range, AudioMarkerVector &out_markers) const;
+	void GetMarkers(const SampleRange &range, AudioMarkerVector &out_markers) const;
 
 	// AudioTimingController interface
-	virtual wxString GetWarningMessage() const;
-	virtual SampleRange GetIdealVisibleSampleRange() const;
-	virtual SampleRange GetPrimaryPlaybackRange() const;
-	virtual bool HasLabels() const;
-	virtual void Next();
-	virtual void Prev();
-	virtual void Commit();
-	virtual void Revert();
-	virtual bool IsNearbyMarker(int64_t sample, int sensitivity) const;
-	virtual AudioMarker * OnLeftClick(int64_t sample, int sensitivity);
-	virtual AudioMarker * OnRightClick(int64_t sample, int sensitivity);
-	virtual void OnMarkerDrag(AudioMarker *marker, int64_t new_position);
+	wxString GetWarningMessage() const;
+	SampleRange GetIdealVisibleSampleRange() const;
+	SampleRange GetPrimaryPlaybackRange() const;
+	bool HasLabels() const;
+	void Next();
+	void Prev();
+	void Commit();
+	void Revert();
+	bool IsNearbyMarker(int64_t sample, int sensitivity) const;
+	AudioMarker * OnLeftClick(int64_t sample, int sensitivity);
+	AudioMarker * OnRightClick(int64_t sample, int sensitivity);
+	void OnMarkerDrag(AudioMarker *marker, int64_t new_position);
 
 public:
 	// Specific interface
 
 	/// @brief Constructor
 	AudioTimingControllerDialogue(AudioController *audio_controller, SelectionController<AssDialogue> *selection_controller, AssFile *ass);
-	virtual ~AudioTimingControllerDialogue();
+	~AudioTimingControllerDialogue();
 };