diff options
| author | Uwe Klotz <uklotz@mixxx.org> | 2020-06-08 11:23:37 +0200 |
|---|---|---|
| committer | Uwe Klotz <uklotz@mixxx.org> | 2020-06-08 11:23:37 +0200 |
| commit | 673d3cf68c8f3023456134af87046fdf2d78f06e (patch) | |
| tree | 70542fa7bef8a19c0890bc546f1dcfd5926a236f /src/track | |
| parent | 54cd0e8e0be91888803635bf335a3b46bbe137cd (diff) | |
| parent | 0a07c616bf44dd5a13118e9151eb8483f8b6ff9d (diff) | |
Merge branch '2.3' of git@github.com:mixxxdj/mixxx.git
Diffstat (limited to 'src/track')
| -rw-r--r-- | src/track/beats.h | 4 | ||||
| -rw-r--r-- | src/track/globaltrackcache.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/track/beats.h b/src/track/beats.h index 1ec09096d7..cdd155e97d 100644 --- a/src/track/beats.h +++ b/src/track/beats.h @@ -21,7 +21,7 @@ typedef QSharedPointer<Beats> BeatsPointer; class BeatIterator { public: - virtual ~BeatIterator() {} + virtual ~BeatIterator() = default; virtual bool hasNext() const = 0; virtual double next() = 0; }; @@ -33,7 +33,7 @@ class Beats : public QObject { Q_OBJECT public: Beats() { } - virtual ~Beats() { } + ~Beats() override = default; enum Capabilities { BEATSCAP_NONE = 0x0000, diff --git a/src/track/globaltrackcache.h b/src/track/globaltrackcache.h index e10ad765e1..7c3c170254 100644 --- a/src/track/globaltrackcache.h +++ b/src/track/globaltrackcache.h @@ -29,7 +29,7 @@ private: TrackFile fileInfo) = 0; protected: - virtual ~GlobalTrackCacheRelocator() {} + virtual ~GlobalTrackCacheRelocator() = default; }; typedef void (*deleteTrackFn_t)(Track*); @@ -233,7 +233,7 @@ class GlobalTrackCache : public QObject { GlobalTrackCache( GlobalTrackCacheSaver* pSaver, deleteTrackFn_t deleteTrackFn); - ~GlobalTrackCache(); + ~GlobalTrackCache() override; void relocateTracks( GlobalTrackCacheRelocator* /*nullable*/ pRelocator); |