Merge pull request #2835 from daschuer/override

Override keywords 

14 files changed, 10 insertions, 23 deletions

diff --git a/src/analyzer/analyzerebur128.h b/src/analyzer/analyzerebur128.h
index d796af56bb..d725f31eb6 100644
--- a/src/analyzer/analyzerebur128.h
+++ b/src/analyzer/analyzerebur128.h
@@ -9,7 +9,7 @@
 class AnalyzerEbur128 : public Analyzer {
   public:
     AnalyzerEbur128(UserSettingsPointer pConfig);
-    virtual ~AnalyzerEbur128();
+    ~AnalyzerEbur128() override;
 
     static bool isEnabled(const ReplayGainSettings& rgSettings) {
         return rgSettings.isAnalyzerEnabled(2);
diff --git a/src/analyzer/analyzergain.h b/src/analyzer/analyzergain.h
index 577b61f2f5..dbe426b919 100644
--- a/src/analyzer/analyzergain.h
+++ b/src/analyzer/analyzergain.h
@@ -16,7 +16,7 @@ class ReplayGain;
 class AnalyzerGain : public Analyzer {
   public:
     AnalyzerGain(UserSettingsPointer pConfig);
-    virtual ~AnalyzerGain();
+    ~AnalyzerGain() override;
 
     static bool isEnabled(const ReplayGainSettings& rgSettings) {
         return rgSettings.isAnalyzerEnabled(1);
diff --git a/src/engine/sidechain/enginesidechain.h b/src/engine/sidechain/enginesidechain.h
index ad37821da8..91a0cfd8a3 100644
--- a/src/engine/sidechain/enginesidechain.h
+++ b/src/engine/sidechain/enginesidechain.h
@@ -33,7 +33,7 @@ class EngineSideChain : public QThread, public AudioDestination {
     Q_OBJECT
   public:
     EngineSideChain(UserSettingsPointer pConfig, CSAMPLE* sidechainMix);
-    virtual ~EngineSideChain();
+    ~EngineSideChain() override;
 
     // Not thread-safe, wait-free. Submit buffer of samples to the sidechain for
     // processing. Should only be called from a single writer thread (typically
diff --git a/src/engine/sidechain/networkinputstreamworker.cpp b/src/engine/sidechain/networkinputstreamworker.cpp
index bb71ed2308..cda90395e3 100644
--- a/src/engine/sidechain/networkinputstreamworker.cpp
+++ b/src/engine/sidechain/networkinputstreamworker.cpp
@@ -6,9 +6,6 @@
 NetworkInputStreamWorker::NetworkInputStreamWorker() {
 }
 
-NetworkInputStreamWorker::~NetworkInputStreamWorker() {
-}
-
 void NetworkInputStreamWorker::setSourceFifo(FIFO<CSAMPLE>* pFifo) {
     (void)pFifo;
 }
diff --git a/src/engine/sidechain/networkinputstreamworker.h b/src/engine/sidechain/networkinputstreamworker.h
index 7eca6589ac..1e2336ea24 100644
--- a/src/engine/sidechain/networkinputstreamworker.h
+++ b/src/engine/sidechain/networkinputstreamworker.h
@@ -10,7 +10,7 @@
 class NetworkInputStreamWorker {
   public:
     NetworkInputStreamWorker();
-    virtual ~NetworkInputStreamWorker();
+    virtual ~NetworkInputStreamWorker() = default;
 
     void setSourceFifo(FIFO<CSAMPLE>* pFifo);
 };
diff --git a/src/engine/sidechain/networkoutputstreamworker.cpp b/src/engine/sidechain/networkoutputstreamworker.cpp
index 0a18d760a3..1e61e1c86a 100644
--- a/src/engine/sidechain/networkoutputstreamworker.cpp
+++ b/src/engine/sidechain/networkoutputstreamworker.cpp
@@ -20,9 +20,6 @@ NetworkOutputStreamWorker::NetworkOutputStreamWorker()
       m_outputDrift(false) {
 }
 
-NetworkOutputStreamWorker::~NetworkOutputStreamWorker() {
-}
-
 void NetworkOutputStreamWorker::outputAvailable() {
 }
 
diff --git a/src/engine/sidechain/networkoutputstreamworker.h b/src/engine/sidechain/networkoutputstreamworker.h
index b4580946fc..ce520a4f4a 100644
--- a/src/engine/sidechain/networkoutputstreamworker.h
+++ b/src/engine/sidechain/networkoutputstreamworker.h
@@ -44,7 +44,7 @@ enum NetworkOutputStreamWorkerStates {
 class NetworkOutputStreamWorker {
   public:
     NetworkOutputStreamWorker();
-    virtual ~NetworkOutputStreamWorker();
+    virtual ~NetworkOutputStreamWorker() = default;
 
     virtual void process(const CSAMPLE* pBuffer, const int iBufferSize) = 0;
     virtual void shutdown() = 0;
diff --git a/src/engine/sidechain/shoutconnection.h b/src/engine/sidechain/shoutconnection.h
index aad2782dab..937bd5020c 100644
--- a/src/engine/sidechain/shoutconnection.h
+++ b/src/engine/sidechain/shoutconnection.h
@@ -37,7 +37,7 @@ class ShoutConnection
     Q_OBJECT
   public:
     ShoutConnection(BroadcastProfilePtr profile, UserSettingsPointer pConfig);
-    virtual ~ShoutConnection();
+    ~ShoutConnection() override;
 
     // This is called by the Engine implementation for each sample. Encode and
     // send the stream, as well as check for metadata changes.
@@ -167,4 +167,3 @@ class ShoutConnection
 typedef QSharedPointer<ShoutConnection> ShoutConnectionPtr;
 
 #endif // ENGINE_SIDECHAIN_SHOUTCONNECTION_H
-
diff --git a/src/engine/sidechain/sidechainworker.h b/src/engine/sidechain/sidechainworker.h
index ad44194fd9..514929339a 100644
--- a/src/engine/sidechain/sidechainworker.h
+++ b/src/engine/sidechain/sidechainworker.h
@@ -6,7 +6,7 @@
 class SideChainWorker {
   public:
     SideChainWorker() { }
-    virtual ~SideChainWorker() { }
+    virtual ~SideChainWorker() = default;
     virtual void process(const CSAMPLE* pBuffer, const int iBufferSize) = 0;
     virtual void shutdown() = 0;
 };
diff --git a/src/errordialoghandler.h b/src/errordialoghandler.h
index eb146ae2ff..6bd26bddd8 100644
--- a/src/errordialoghandler.h
+++ b/src/errordialoghandler.h
@@ -143,7 +143,7 @@ class ErrorDialogHandler : public QObject {
     }
     static void setEnabled(bool enabled);
 
-    virtual ~ErrorDialogHandler();
+    ~ErrorDialogHandler() override;
     // Call this to get a new instance of ErrorDialogProperties to populate with
     // data
     ErrorDialogProperties* newDialogProperties();
diff --git a/src/util/battery/battery.cpp b/src/util/battery/battery.cpp
index 26cfb4e6ba..0d01c8b603 100644
--- a/src/util/battery/battery.cpp
+++ b/src/util/battery/battery.cpp
@@ -26,9 +26,6 @@ Battery::Battery(QObject* parent)
     m_timer.start(mixxx::Duration::fromMillis(kiUpdateInterval));
 }
 
-Battery::~Battery() {
-}
-
 Battery* Battery::getBattery(QObject* parent) {
 #ifdef __BATTERY__
 #if defined(Q_OS_WIN)
diff --git a/src/util/battery/battery.h b/src/util/battery/battery.h
index 557b812aca..7f41035fe3 100644
--- a/src/util/battery/battery.h
+++ b/src/util/battery/battery.h
@@ -14,7 +14,7 @@ class Battery : public QObject {
         CHARGED,
     };
     static Battery* getBattery(QObject* parent=nullptr);
-    virtual ~Battery();
+    ~Battery() override = default;
 
     // The number of minutes the battery has remaining to depletion (when
     // m_chargingState is DISCHARGING) or to being fully charged (when
diff --git a/src/util/battery/batterywindows.cpp b/src/util/battery/batterywindows.cpp
index 130bcb1d20..1482dea7ec 100644
--- a/src/util/battery/batterywindows.cpp
+++ b/src/util/battery/batterywindows.cpp
@@ -11,9 +11,6 @@ BatteryWindows::BatteryWindows(QObject* pParent)
         : Battery(pParent) {
 }
 
-BatteryWindows::~BatteryWindows() {
-}
-
 void BatteryWindows::read() {
     m_iMinutesLeft = Battery::TIME_UNKNOWN;
     m_dPercentage = 0.0;
diff --git a/src/util/battery/batterywindows.h b/src/util/battery/batterywindows.h
index eeca029dd6..6dcf64402f 100644
--- a/src/util/battery/batterywindows.h
+++ b/src/util/battery/batterywindows.h
@@ -6,7 +6,7 @@
 class BatteryWindows : public Battery {
   public:
     BatteryWindows(QObject* pParent=nullptr);
-    virtual ~BatteryWindows();
+    ~BatteryWindows() override = default;
 
   protected:
     void read() override;