Merge pull request #3667 from softins/mac-missing-overrides

Add missing override specifiers

Author: pljones

src/clientsettingsdlg.h

@@ -69,7 +69,7 @@ class CClientSettingsDlg : public CBaseDlg, private Ui_CClientSettingsDlgBase
     void    UpdateAudioFaderSlider();
     QString GenSndCrdBufferDelayString ( const int iFrameSize, const QString strAddText = "" );
 
-    virtual void showEvent ( QShowEvent* );
+    virtual void showEvent ( QShowEvent* ) override;
     virtual bool eventFilter ( QObject* obj, QEvent* event ) override;
 
     CClient*         pClient;

src/sound/coreaudio-mac/sound.h

@@ -42,28 +42,28 @@ class CSound : public CSoundBase
 
     virtual ~CSound();
 
-    virtual int  Init ( const int iNewPrefMonoBufferSize );
-    virtual void Start();
-    virtual void Stop();
+    virtual int  Init ( const int iNewPrefMonoBufferSize ) override;
+    virtual void Start() override;
+    virtual void Stop() override;
 
     // channel selection
-    virtual int     GetNumInputChannels() { return iNumInChanPlusAddChan; }
-    virtual QString GetInputChannelName ( const int iDiD ) { return sChannelNamesInput[iDiD]; }
-    virtual void    SetLeftInputChannel ( const int iNewChan );
-    virtual void    SetRightInputChannel ( const int iNewChan );
-    virtual int     GetLeftInputChannel() { return iSelInputLeftChannel; }
-    virtual int     GetRightInputChannel() { return iSelInputRightChannel; }
-
-    virtual int     GetNumOutputChannels() { return iNumOutChan; }
-    virtual QString GetOutputChannelName ( const int iDiD ) { return sChannelNamesOutput[iDiD]; }
-    virtual void    SetLeftOutputChannel ( const int iNewChan );
-    virtual void    SetRightOutputChannel ( const int iNewChan );
-    virtual int     GetLeftOutputChannel() { return iSelOutputLeftChannel; }
-    virtual int     GetRightOutputChannel() { return iSelOutputRightChannel; }
+    virtual int     GetNumInputChannels() override { return iNumInChanPlusAddChan; }
+    virtual QString GetInputChannelName ( const int iDiD ) override { return sChannelNamesInput[iDiD]; }
+    virtual void    SetLeftInputChannel ( const int iNewChan ) override;
+    virtual void    SetRightInputChannel ( const int iNewChan ) override;
+    virtual int     GetLeftInputChannel() override { return iSelInputLeftChannel; }
+    virtual int     GetRightInputChannel() override { return iSelInputRightChannel; }
+
+    virtual int     GetNumOutputChannels() override { return iNumOutChan; }
+    virtual QString GetOutputChannelName ( const int iDiD ) override { return sChannelNamesOutput[iDiD]; }
+    virtual void    SetLeftOutputChannel ( const int iNewChan ) override;
+    virtual void    SetRightOutputChannel ( const int iNewChan ) override;
+    virtual int     GetLeftOutputChannel() override { return iSelOutputLeftChannel; }
+    virtual int     GetRightOutputChannel() override { return iSelOutputRightChannel; }
 
     // MIDI functions
-    virtual void        EnableMIDI ( const bool bEnable );
-    virtual bool        IsMIDIEnabled() const;
+    virtual void        EnableMIDI ( const bool bEnable ) override;
+    virtual bool        IsMIDIEnabled() const override;
     virtual QStringList GetMIDIDevNames() override;
 
     // these variables/functions should be protected but cannot since we want
@@ -97,7 +97,7 @@ class CSound : public CSoundBase
     CVector<int>   vecNumOutBufChan;
 
 protected:
-    virtual QString LoadAndInitializeDriver ( QString strDriverName, bool );
+    virtual QString LoadAndInitializeDriver ( QString strDriverName, bool ) override;
 
     QString CheckDeviceCapabilities ( const int iDriverIdx );
     void    UpdateChSelection();