From 4502a9893d50104e73996a9d453608c582baf3a4 Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Tue, 30 Dec 2014 19:11:57 -0800 Subject: [PATCH] Make some virtual destructors protected instead --- src/audio_marker.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/audio_marker.h b/src/audio_marker.h index 383ab87ac..ba725ed4c 100644 --- a/src/audio_marker.h +++ b/src/audio_marker.h @@ -39,6 +39,8 @@ namespace agi { /// @class AudioMarker /// @brief A marker on the audio display class AudioMarker { +protected: + ~AudioMarker()=default; public: /// Describe which directions a marker has feet in enum FeetStyle { @@ -68,10 +70,9 @@ class AudioMarkerProvider { protected: /// One or more of the markers provided by this object have changed agi::signal::Signal<> AnnounceMarkerMoved; -public: - /// Virtual destructor, does nothing - virtual ~AudioMarkerProvider() = default; + ~AudioMarkerProvider() = default; +public: /// @brief Return markers in a time range virtual void GetMarkers(const TimeRange &range, AudioMarkerVector &out) const = 0; @@ -84,6 +85,8 @@ class AudioLabelProvider { protected: /// One or more of the labels provided by this object have changed agi::signal::Signal<> AnnounceLabelChanged; + + ~AudioLabelProvider() = default; public: /// A label for a range of time on the audio display struct AudioLabel { @@ -93,9 +96,6 @@ public: TimeRange range; }; - /// Virtual destructor, does nothing - virtual ~AudioLabelProvider() = default; - /// @brief Get labels in a time range /// @param range Range of times to get labels for /// @param[out] out Vector which should be filled with the labels