tidy: Use the 'override' keyword on destructors.

The new override keyword should be used on functions in a derived classes that overload a function in their base class. It implicitly declares the function as virtual, so it replaces that keyword. It additionally requires that a function exist in the base class with the exact same type signature. I.E. it validates that the overridden function exists. This prevents functions that look like they override a base class function but don't. https://clang.llvm.org/extra/clang-tidy/checks/modernize-use-override.html
MythTV · Mar 26, 2019 · a3ffc24 · a3ffc24
1 parent e661c1d
commit a3ffc24
Show file tree

Hide file tree

Showing 32 changed files with 36 additions and 37 deletions.
diff --git a/mythtv/libs/libmyth/audio/audiooutput.h b/mythtv/libs/libmyth/audio/audiooutput.h
@@ -59,7 +59,7 @@ class MPUBLIC AudioOutput : public VolumeBase, public OutputListeners
         bool willsuspendpa = true);
 
     AudioOutput() = default;
-    virtual ~AudioOutput();
+    ~AudioOutput() override;
 
     // reconfigure sound out for new params
     virtual void Reconfigure(const AudioSettings &settings) = 0;

diff --git a/mythtv/libs/libmyth/audio/audiooutput_omx.h b/mythtv/libs/libmyth/audio/audiooutput_omx.h
@@ -16,7 +16,7 @@ class AudioOutputOMX : public AudioOutputBase, private OMXComponentCtx
 {
   public:
     explicit AudioOutputOMX(const AudioSettings &settings);
-    virtual ~AudioOutputOMX();
+    ~AudioOutputOMX() override;
 
     // No copying
     AudioOutputOMX(const AudioOutputOMX&) = delete;

diff --git a/mythtv/libs/libmyth/audio/audiooutputalsa.h b/mythtv/libs/libmyth/audio/audiooutputalsa.h
@@ -13,7 +13,7 @@ class AudioOutputALSA : public AudioOutputBase
 {
   public:
     explicit AudioOutputALSA(const AudioSettings &settings);
-    virtual ~AudioOutputALSA();
+    ~AudioOutputALSA() override;
 
     // Volume control
     int GetVolumeChannel(int channel) const override; // VolumeBase

diff --git a/mythtv/libs/libmyth/audio/audiooutputbase.h b/mythtv/libs/libmyth/audio/audiooutputbase.h
@@ -51,7 +51,7 @@ class AudioOutputBase : public AudioOutput, public MThread
  public:
     const char *quality_string(int q);
     explicit AudioOutputBase(const AudioSettings &settings);
-    virtual ~AudioOutputBase();
+    ~AudioOutputBase() override;
 
     AudioOutputSettings* GetOutputSettingsCleaned(bool digital = true) override; // AudioOutput
     AudioOutputSettings* GetOutputSettingsUsers(bool digital = false) override; // AudioOutput

diff --git a/mythtv/libs/libmyth/audio/audiooutputgraph.h b/mythtv/libs/libmyth/audio/audiooutputgraph.h
@@ -14,7 +14,7 @@ class MPUBLIC AudioOutputGraph : public MythTV::Visual
 {
 public:
     AudioOutputGraph();
-    virtual ~AudioOutputGraph();
+    ~AudioOutputGraph() override;
 
     // Properties
     void SetPainter(MythPainter* /*painter*/);

diff --git a/mythtv/libs/libmyth/audio/audiooutputjack.h b/mythtv/libs/libmyth/audio/audiooutputjack.h
@@ -19,7 +19,7 @@ class AudioOutputJACK : public AudioOutputBase
 
   public:
     explicit AudioOutputJACK(const AudioSettings &settings);
-    virtual ~AudioOutputJACK();
+    ~AudioOutputJACK() override;
 
     // Volume control
     int GetVolumeChannel(int channel) const override; // VolumeBase

diff --git a/mythtv/libs/libmyth/audio/audiooutputnull.h b/mythtv/libs/libmyth/audio/audiooutputnull.h
@@ -22,8 +22,7 @@ class AudioOutputNULL : public AudioOutputBase
 {
   public:
     explicit AudioOutputNULL(const AudioSettings &settings);
-
-    virtual ~AudioOutputNULL();
+    ~AudioOutputNULL() override;
 
     void Reset(void) override; // AudioOutputBase
 

diff --git a/mythtv/libs/libmyth/audio/audiooutputoss.h b/mythtv/libs/libmyth/audio/audiooutputoss.h
@@ -13,7 +13,7 @@ class AudioOutputOSS : public AudioOutputBase
 {
   public:
     explicit AudioOutputOSS(const AudioSettings &settings);
-    virtual ~AudioOutputOSS();
+    ~AudioOutputOSS() override;
 
     // Volume control
     int GetVolumeChannel(int channel) const override; // VolumeBase

diff --git a/mythtv/libs/libmyth/audio/audiooutputpulse.h b/mythtv/libs/libmyth/audio/audiooutputpulse.h
@@ -28,7 +28,7 @@ class AudioOutputPulseAudio : public AudioOutputBase
 {
   public:
     explicit AudioOutputPulseAudio(const AudioSettings &settings);
-   ~AudioOutputPulseAudio();
+   ~AudioOutputPulseAudio() override;
 
     int GetVolumeChannel(int channel) const override; // VolumeBase
     void SetVolumeChannel(int channel, int volume) override; // VolumeBase

diff --git a/mythtv/libs/libmyth/mythcontext.cpp b/mythtv/libs/libmyth/mythcontext.cpp
@@ -70,7 +70,7 @@ class MythContextPrivate : public QObject
 
   public:
     MythContextPrivate(MythContext *lparent);
-   ~MythContextPrivate();
+   ~MythContextPrivate() override;
 
     bool Init        (bool gui,
                       bool prompt, bool noPrompt,

diff --git a/mythtv/libs/libmythbase/mythcorecontext.cpp b/mythtv/libs/libmythbase/mythcorecontext.cpp
@@ -57,7 +57,7 @@ class MythCoreContextPrivate : public QObject
   public:
     MythCoreContextPrivate(MythCoreContext *lparent, QString binversion,
                            QObject *guicontext);
-   ~MythCoreContextPrivate();
+   ~MythCoreContextPrivate() override;
 
     bool WaitForWOL(int timeout_in_ms = INT_MAX);
 

diff --git a/mythtv/libs/libmythbase/mythsystem.cpp b/mythtv/libs/libmythbase/mythsystem.cpp
@@ -70,7 +70,7 @@ class MythSystemLegacyWrapper : public MythSystem
         return wrapper;
     }
 
-    ~MythSystemLegacyWrapper(void)
+    ~MythSystemLegacyWrapper(void) override
     {
         Wait(0);
     }

diff --git a/mythtv/libs/libmythbase/serverpool.cpp b/mythtv/libs/libmythbase/serverpool.cpp
@@ -31,7 +31,7 @@ class PrivUdpSocket : public QUdpSocket
 public:
     PrivUdpSocket(QObject *parent, QNetworkAddressEntry host) :
         QUdpSocket(parent), m_host(host) { };
-    ~PrivUdpSocket() = default;
+    ~PrivUdpSocket() override = default;
     QNetworkAddressEntry host()
     {
         return m_host;

diff --git a/mythtv/libs/libmythmetadata/imagemetadata.cpp b/mythtv/libs/libmythmetadata/imagemetadata.cpp
@@ -268,7 +268,7 @@ class PictureMetaData : public ImageMetaData
 {
 public:
     explicit PictureMetaData(const QString &filePath);
-    ~PictureMetaData() = default; // libexiv2 closes file, cleans up via autoptrs
+    ~PictureMetaData() override = default; // libexiv2 closes file, cleans up via autoptrs
 
     bool        IsValid() override // ImageMetaData
         { return m_image.get(); }
@@ -494,7 +494,7 @@ class VideoMetaData : public ImageMetaData
 {
 public:
     explicit VideoMetaData(const QString &filePath);
-    ~VideoMetaData();
+    ~VideoMetaData() override;
 
     bool        IsValid() override  // ImageMetaData
         { return m_dict; }

diff --git a/mythtv/libs/libmythprotoserver/sockethandler/filetransfer.h b/mythtv/libs/libmythprotoserver/sockethandler/filetransfer.h
@@ -45,7 +45,7 @@ class FileTransfer : public SocketHandler
     void SetTimeout(bool fast);
 
   private:
-   ~FileTransfer();
+   ~FileTransfer() override;
 
     volatile bool  m_readthreadlive {true};
     bool           m_readsLocked {false};

diff --git a/mythtv/libs/libmythtv/AirPlay/mythairplayserver.h b/mythtv/libs/libmythtv/AirPlay/mythairplayserver.h
@@ -86,7 +86,7 @@ class MTV_PUBLIC MythAirplayServer : public ServerPool
     void timeout(void);
 
   private:
-    virtual ~MythAirplayServer(void);
+    ~MythAirplayServer(void) override;
     void Teardown(void);
     void HandleResponse(APHTTPRequest *req, QTcpSocket *socket);
     QByteArray StatusToString(int status);

diff --git a/mythtv/libs/libmythtv/AirPlay/mythraopconnection.h b/mythtv/libs/libmythtv/AirPlay/mythraopconnection.h
@@ -51,7 +51,7 @@ class MTV_PUBLIC MythRAOPConnection : public QObject
   public:
     MythRAOPConnection(QObject *parent, QTcpSocket *socket, QByteArray id,
                        int port);
-   ~MythRAOPConnection();
+   ~MythRAOPConnection() override;
     bool Init(void);
     QTcpSocket *GetSocket()   { return m_socket;   }
     int         GetDataPort() { return m_dataPort; }

diff --git a/mythtv/libs/libmythtv/AirPlay/mythraopdevice.h b/mythtv/libs/libmythtv/AirPlay/mythraopdevice.h
@@ -35,7 +35,7 @@ class MTV_PUBLIC MythRAOPDevice : public ServerPool
     void deleteClient();
 
   private:
-    virtual ~MythRAOPDevice(void);
+    ~MythRAOPDevice(void) override;
     void Teardown(void);
     bool RegisterForBonjour(void);
 

diff --git a/mythtv/libs/libmythtv/Bluray/bdoverlayscreen.h b/mythtv/libs/libmythtv/Bluray/bdoverlayscreen.h
@@ -10,7 +10,7 @@ class BDOverlayScreen : public MythScreenType
 {
   public:
     BDOverlayScreen(MythPlayer *player, const QString &name);
-   ~BDOverlayScreen();
+   ~BDOverlayScreen() override;
 
     void DisplayBDOverlay(BDOverlay *overlay);
 

diff --git a/mythtv/libs/libmythtv/Bluray/bdringbuffer.h b/mythtv/libs/libmythtv/Bluray/bdringbuffer.h
@@ -76,7 +76,7 @@ class MTV_PUBLIC BDRingBuffer : public RingBuffer
 
   public:
     explicit BDRingBuffer(const QString &lfilename);
-    virtual ~BDRingBuffer();
+    ~BDRingBuffer() override;
 
     bool IsStreamed(void) override { return true; } // RingBuffer
 

diff --git a/mythtv/libs/libmythtv/DVD/avformatdecoderdvd.h b/mythtv/libs/libmythtv/DVD/avformatdecoderdvd.h
@@ -14,7 +14,7 @@ class AvFormatDecoderDVD : public AvFormatDecoder
     AvFormatDecoderDVD(MythPlayer *parent, const ProgramInfo &pginfo,
                        PlayerFlags flags)
         : AvFormatDecoder(parent, pginfo, flags) {}
-    virtual ~AvFormatDecoderDVD();
+    ~AvFormatDecoderDVD() override;
     void Reset(bool reset_video_data, bool seek_reset, bool reset_file) override; // AvFormatDecoder
     void UpdateFramesPlayed(void) override; // AvFormatDecoder
     bool GetFrame(DecodeType decodetype) override; // AvFormatDecoder

diff --git a/mythtv/libs/libmythtv/DVD/dvdringbuffer.h b/mythtv/libs/libmythtv/DVD/dvdringbuffer.h
@@ -35,7 +35,7 @@ class MTV_PUBLIC MythDVDContext : public ReferenceCounter
 
   public:
     MythDVDContext() = delete;    // Default constructor should not be called
-    virtual ~MythDVDContext() = default;
+    ~MythDVDContext() override = default;
 
     int64_t  GetStartPTS()          const { return (int64_t)m_pci.pci_gi.vobu_s_ptm;    }
     int64_t  GetEndPTS()            const { return (int64_t)m_pci.pci_gi.vobu_e_ptm;    }
@@ -94,7 +94,7 @@ class MTV_PUBLIC DVDRingBuffer : public RingBuffer
 
   public:
     explicit DVDRingBuffer(const QString &lfilename);
-    virtual ~DVDRingBuffer();
+    ~DVDRingBuffer() override;
 
     // gets
     int  GetTitle(void)        const { return m_title;                  }

diff --git a/mythtv/libs/libmythtv/HLS/httplivestreambuffer.h b/mythtv/libs/libmythtv/HLS/httplivestreambuffer.h
@@ -45,7 +45,7 @@ class HLSRingBuffer : public RingBuffer
 public:
     explicit HLSRingBuffer(const QString &lfilename);
     HLSRingBuffer(const QString &lfilename, bool open);
-    virtual ~HLSRingBuffer();
+    ~HLSRingBuffer() override;
 
     bool IsOpen(void) const override; // RingBuffer
     long long GetReadPosition(void) const override; // RingBuffer

diff --git a/mythtv/libs/libmythtv/recorders/dvbdev/dvbci.cpp b/mythtv/libs/libmythtv/recorders/dvbdev/dvbci.cpp
@@ -914,7 +914,7 @@ class cCiApplicationInformation : public cCiSession {
   char *menuString;
 public:
   cCiApplicationInformation(int SessionId, cCiTransportConnection *Tc);
-  virtual ~cCiApplicationInformation();
+  ~cCiApplicationInformation() override;
   bool Process(int Length = 0, const uint8_t *Data = nullptr) override; // cCiSession
   bool EnterMenu(void);
   char *GetApplicationString() { return strdup(menuString); };
@@ -1211,7 +1211,7 @@ class cCiMMI : public cCiSession {
   cCiEnquiry *enquiry;
 public:
   cCiMMI(int SessionId, cCiTransportConnection *Tc);
-  virtual ~cCiMMI();
+  ~cCiMMI() override;
   bool Process(int Length = 0, const uint8_t *Data = nullptr) override; // cCiSession
   bool HasUserIO(void) override { return menu || enquiry; } // cCiSession
   cCiMenu *Menu(void);

diff --git a/mythtv/libs/libmythtv/vaapicontext.cpp b/mythtv/libs/libmythtv/vaapicontext.cpp
@@ -103,7 +103,7 @@ class VAAPIDisplay : ReferenceCounter
         m_va_disp(nullptr), m_x_disp(nullptr),
         m_driver() { }
   public:
-   ~VAAPIDisplay()
+   ~VAAPIDisplay() override
     {
         if (m_va_disp)
         {

diff --git a/mythtv/libs/libmythui/mythrender_vdpau.cpp b/mythtv/libs/libmythui/mythrender_vdpau.cpp
@@ -246,7 +246,7 @@ class VDPAUVideoMixer : public VDPAUResource
         memset(&m_csc, 0, sizeof(VdpCSCMatrix));
     }
 
-   ~VDPAUVideoMixer()
+   ~VDPAUVideoMixer() override
     {
         delete m_noise_reduction;
         delete m_sharpness;

diff --git a/mythtv/libs/libmythupnp/websocket_extensions/websocket_mythevent.h b/mythtv/libs/libmythupnp/websocket_extensions/websocket_mythevent.h
@@ -17,7 +17,7 @@ class WebSocketMythEvent : public WebSocketExtension
 
   public:
     WebSocketMythEvent();
-    virtual ~WebSocketMythEvent();
+    ~WebSocketMythEvent() override;
 
     bool HandleTextFrame(const WebSocketFrame &frame) override; // WebSocketExtension
     void customEvent(QEvent* /*event*/) override; // QObject

diff --git a/mythtv/programs/mythbackend/mainserver.cpp b/mythtv/programs/mythbackend/mainserver.cpp
@@ -145,7 +145,7 @@ class ProcessRequestRunnable : public QRunnable
         m_sock->IncrRef();
     }
 
-    virtual ~ProcessRequestRunnable()
+    ~ProcessRequestRunnable() override
     {
         if (m_sock)
         {
@@ -174,7 +174,7 @@ class FreeSpaceUpdater : public QRunnable
     {
         m_lastRequest.start();
     }
-    ~FreeSpaceUpdater()
+    ~FreeSpaceUpdater() override
     {
         QMutexLocker locker(&m_parent.m_masterFreeSpaceListLock);
         m_parent.m_masterFreeSpaceListUpdater = nullptr;

diff --git a/mythtv/programs/mythfrontend/guidegrid.cpp b/mythtv/programs/mythfrontend/guidegrid.cpp
@@ -270,7 +270,7 @@ class GuideUpdateProgramRow : public GuideUpdaterBase
             for (int j = 0; j < MAX_DISPLAY_TIMES; ++j)
                 m_programInfos[i][j] = nullptr;
     }
-    virtual ~GuideUpdateProgramRow() = default;
+    ~GuideUpdateProgramRow() override = default;
     bool ExecuteNonUI(void) override // GuideUpdaterBase
     {
         // Don't bother to do any work if the starting coordinates of

diff --git a/mythtv/programs/mythfrontend/main.cpp b/mythtv/programs/mythfrontend/main.cpp
@@ -171,7 +171,7 @@ namespace
             }
         }
 
-        ~RunSettingsCompletion() = default;
+        ~RunSettingsCompletion() override = default;
 
       private slots:
         void OnPasswordResultReady(bool passwordValid,

diff --git a/mythtv/programs/mythfrontend/playbackboxhelper.cpp b/mythtv/programs/mythfrontend/playbackboxhelper.cpp
@@ -35,7 +35,7 @@ class PBHEventHandler : public QObject
     {
         StorageGroup::ClearGroupToUseCache();
     }
-    ~PBHEventHandler()
+    ~PBHEventHandler() override
     {
         if (m_freeSpaceTimerId)
             killTimer(m_freeSpaceTimerId);

diff --git a/mythtv/programs/mythfrontend/videodlg.cpp b/mythtv/programs/mythfrontend/videodlg.cpp
@@ -297,7 +297,7 @@ namespace
             //       Having it here causes a runtime error on windows
         }
 
-       ~FanartLoader()
+       ~FanartLoader() override
         {
             m_fanartTimer.stop();
             m_fanartTimer.disconnect(this);