mantarimay
/
Aegisub
forked from mia/Aegisub
1
0
Fork 0
Code Pull Requests Activity

Make some virtual destructors protected instead

This commit is contained in:
Thomas Goyne 2014-12-30 19:11:57 -08:00
parent b6edf58651
commit 4502a9893d
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/audio_marker.h
View File

@ -39,6 +39,8 @@ namespace agi {
/// @class AudioMarker /// @class AudioMarker
/// @brief A marker on the audio display /// @brief A marker on the audio display
class AudioMarker { class AudioMarker {
protected:
~AudioMarker()=default;
public: public:
/// Describe which directions a marker has feet in /// Describe which directions a marker has feet in
enum FeetStyle { enum FeetStyle {
@ -68,10 +70,9 @@ class AudioMarkerProvider {
protected: protected:
/// One or more of the markers provided by this object have changed /// One or more of the markers provided by this object have changed
agi::signal::Signal<> AnnounceMarkerMoved; agi::signal::Signal<> AnnounceMarkerMoved;
public:
/// Virtual destructor, does nothing
virtual ~AudioMarkerProvider() = default;
~AudioMarkerProvider() = default;
public:
/// @brief Return markers in a time range /// @brief Return markers in a time range
virtual void GetMarkers(const TimeRange &range, AudioMarkerVector &out) const = 0; virtual void GetMarkers(const TimeRange &range, AudioMarkerVector &out) const = 0;
@ -84,6 +85,8 @@ class AudioLabelProvider {
protected: protected:
/// One or more of the labels provided by this object have changed /// One or more of the labels provided by this object have changed
agi::signal::Signal<> AnnounceLabelChanged; agi::signal::Signal<> AnnounceLabelChanged;
~AudioLabelProvider() = default;
public: public:
/// A label for a range of time on the audio display /// A label for a range of time on the audio display
struct AudioLabel { struct AudioLabel {
@ -93,9 +96,6 @@ public:
TimeRange range; TimeRange range;
}; };
/// Virtual destructor, does nothing
virtual ~AudioLabelProvider() = default;
/// @brief Get labels in a time range /// @brief Get labels in a time range
/// @param range Range of times to get labels for /// @param range Range of times to get labels for
/// @param[out] out Vector which should be filled with the labels /// @param[out] out Vector which should be filled with the labels