diff --git a/include/AudioAlsa.h b/include/AudioAlsa.h
index e1024b030..6bbd4aecd 100644
--- a/include/AudioAlsa.h
+++ b/include/AudioAlsa.h
@@ -69,7 +69,7 @@ public:
 
 public:
 	AudioAlsa( bool & _success_ful, AudioEngine* audioEngine );
-	virtual ~AudioAlsa();
+	~AudioAlsa() override;
 
 	inline static QString name()
 	{
diff --git a/include/AudioAlsaSetupWidget.h b/include/AudioAlsaSetupWidget.h
index 9e168934e..f68d71e8a 100644
--- a/include/AudioAlsaSetupWidget.h
+++ b/include/AudioAlsaSetupWidget.h
@@ -47,7 +47,7 @@ class AudioAlsaSetupWidget : public AudioDeviceSetupWidget
 
 public:
 	AudioAlsaSetupWidget( QWidget * _parent );
-	virtual ~AudioAlsaSetupWidget();
+	~AudioAlsaSetupWidget() override;
 
 	void saveSettings() override;
 
diff --git a/include/AudioDeviceSetupWidget.h b/include/AudioDeviceSetupWidget.h
index 6bf656e0a..392cbd3a4 100644
--- a/include/AudioDeviceSetupWidget.h
+++ b/include/AudioDeviceSetupWidget.h
@@ -36,7 +36,7 @@ class AudioDeviceSetupWidget : public TabWidget
 public:
 	AudioDeviceSetupWidget( const QString & _caption, QWidget * _parent );
 
-	virtual ~AudioDeviceSetupWidget();
+	~AudioDeviceSetupWidget() override;
 
 	virtual void saveSettings() = 0;
 
diff --git a/include/AudioDummy.h b/include/AudioDummy.h
index f2c198bbc..3677bf451 100644
--- a/include/AudioDummy.h
+++ b/include/AudioDummy.h
@@ -43,7 +43,7 @@ public:
 		_success_ful = true;
 	}
 
-	virtual ~AudioDummy()
+	~AudioDummy() override
 	{
 		stopProcessing();
 	}
@@ -62,7 +62,7 @@ public:
 		{
 		}
 
-		virtual ~setupWidget()
+		~setupWidget() override
 		{
 		}
 
diff --git a/include/AudioEngine.h b/include/AudioEngine.h
index 08e03a113..44854c826 100644
--- a/include/AudioEngine.h
+++ b/include/AudioEngine.h
@@ -387,7 +387,7 @@ private:
 
 
 	AudioEngine( bool renderOnly );
-	virtual ~AudioEngine();
+	~AudioEngine() override;
 
 	void startProcessing(bool needsFifo = true);
 	void stopProcessing();
diff --git a/include/AudioEngineWorkerThread.h b/include/AudioEngineWorkerThread.h
index 811f75753..87e2791b1 100644
--- a/include/AudioEngineWorkerThread.h
+++ b/include/AudioEngineWorkerThread.h
@@ -78,7 +78,7 @@ public:
 
 
 	AudioEngineWorkerThread( AudioEngine* audioEngine );
-	virtual ~AudioEngineWorkerThread();
+	~AudioEngineWorkerThread() override;
 
 	virtual void quit();
 
diff --git a/include/AudioFileDevice.h b/include/AudioFileDevice.h
index 937cd9d00..a9fbcbc88 100644
--- a/include/AudioFileDevice.h
+++ b/include/AudioFileDevice.h
@@ -40,7 +40,7 @@ public:
 	AudioFileDevice(OutputSettings const & outputSettings,
 			const ch_cnt_t _channels, const QString & _file,
 			AudioEngine* audioEngine );
-	virtual ~AudioFileDevice();
+	~AudioFileDevice() override;
 
 	QString outputFile() const
 	{
diff --git a/include/AudioFileFlac.h b/include/AudioFileFlac.h
index 675ab21d9..542a2e717 100644
--- a/include/AudioFileFlac.h
+++ b/include/AudioFileFlac.h
@@ -43,7 +43,7 @@ public:
 			AudioEngine* audioEngine
 	);
 
-	virtual ~AudioFileFlac();
+	~AudioFileFlac() override;
 
 	static AudioFileDevice* getInst(QString const& outputFilename,
 			OutputSettings const& outputSettings,
@@ -65,7 +65,7 @@ private:
 	SF_INFO  m_sfinfo;
 	SNDFILE* m_sf;
 
-	virtual void writeBuffer(surroundSampleFrame const* _ab,
+	void writeBuffer(surroundSampleFrame const* _ab,
 						fpp_t const frames,
 						float master_gain) override;
 
diff --git a/include/AudioFileMP3.h b/include/AudioFileMP3.h
index 16c3617a8..290c9ccbf 100644
--- a/include/AudioFileMP3.h
+++ b/include/AudioFileMP3.h
@@ -45,7 +45,7 @@ public:
 			bool & successful,
 			const QString & _file,
 			AudioEngine* audioEngine );
-	virtual ~AudioFileMP3();
+	~AudioFileMP3() override;
 
 	static AudioFileDevice * getInst( const QString & outputFilename,
 					  OutputSettings const & outputSettings,
@@ -58,7 +58,7 @@ public:
 	}
 
 protected:
-	virtual void writeBuffer( const surroundSampleFrame * /* _buf*/,
+	void writeBuffer( const surroundSampleFrame * /* _buf*/,
 				  const fpp_t /*_frames*/,
 				  const float /*_master_gain*/ ) override;
 
diff --git a/include/AudioFileOgg.h b/include/AudioFileOgg.h
index 7e6921015..18617fa5f 100644
--- a/include/AudioFileOgg.h
+++ b/include/AudioFileOgg.h
@@ -45,7 +45,7 @@ public:
 			bool & _success_ful,
 			const QString & _file,
 			AudioEngine* audioEngine );
-	virtual ~AudioFileOgg();
+	~AudioFileOgg() override;
 
 	static AudioFileDevice * getInst( const QString & outputFilename,
 					  OutputSettings const & outputSettings,
@@ -58,7 +58,7 @@ public:
 
 
 private:
-	virtual void writeBuffer( const surroundSampleFrame * _ab,
+	void writeBuffer( const surroundSampleFrame * _ab,
 						const fpp_t _frames,
 						const float _master_gain ) override;
 
diff --git a/include/AudioFileWave.h b/include/AudioFileWave.h
index e9425dd86..8dd3566f4 100644
--- a/include/AudioFileWave.h
+++ b/include/AudioFileWave.h
@@ -42,7 +42,7 @@ public:
 			bool & successful,
 			const QString & file,
 			AudioEngine* audioEngine );
-	virtual ~AudioFileWave();
+	~AudioFileWave() override;
 
 	static AudioFileDevice * getInst( const QString & outputFilename,
 					  OutputSettings const & outputSettings,
@@ -56,7 +56,7 @@ public:
 
 
 private:
-	virtual void writeBuffer( const surroundSampleFrame * _ab,
+	void writeBuffer( const surroundSampleFrame * _ab,
 						const fpp_t _frames,
 						float _master_gain ) override;
 
diff --git a/include/AudioJack.h b/include/AudioJack.h
index 648bb157d..7b6597e86 100644
--- a/include/AudioJack.h
+++ b/include/AudioJack.h
@@ -58,7 +58,7 @@ class AudioJack : public QObject, public AudioDevice
 	Q_OBJECT
 public:
 	AudioJack( bool & _success_ful, AudioEngine* audioEngine );
-	virtual ~AudioJack();
+	~AudioJack() override;
 
 	// this is to allow the jack midi connection to use the same jack client connection
 	// the jack callback is handled here, we call the midi client so that it can read
@@ -78,9 +78,9 @@ class setupWidget : public gui::AudioDeviceSetupWidget
 	{
 	public:
 		setupWidget( QWidget * _parent );
-		virtual ~setupWidget();
+		~setupWidget() override;
 
-		virtual void saveSettings();
+		void saveSettings() override;
 
 	private:
 		QLineEdit * m_clientName;
@@ -96,13 +96,13 @@ private slots:
 private:
 	bool initJackClient();
 
-	virtual void startProcessing();
-	virtual void stopProcessing();
-	virtual void applyQualitySettings();
+	void startProcessing() override;
+	void stopProcessing() override;
+	void applyQualitySettings() override;
 
-	virtual void registerPort( AudioPort * _port );
-	virtual void unregisterPort( AudioPort * _port );
-	virtual void renamePort( AudioPort * _port );
+	void registerPort( AudioPort * _port ) override;
+	void unregisterPort( AudioPort * _port ) override;
+	void renamePort( AudioPort * _port ) override;
 
 	int processCallback( jack_nframes_t _nframes, void * _udata );
 
diff --git a/include/AudioOss.h b/include/AudioOss.h
index 4a552040b..71103586a 100644
--- a/include/AudioOss.h
+++ b/include/AudioOss.h
@@ -51,7 +51,7 @@ class AudioOss : public QThread, public AudioDevice
 	Q_OBJECT
 public:
 	AudioOss( bool & _success_ful, AudioEngine* audioEngine );
-	virtual ~AudioOss();
+	~AudioOss() override;
 
 	inline static QString name()
 	{
@@ -65,7 +65,7 @@ class setupWidget : public gui::AudioDeviceSetupWidget
 	{
 	public:
 		setupWidget( QWidget * _parent );
-		virtual ~setupWidget();
+		~setupWidget() override;
 
 		void saveSettings() override;
 
diff --git a/include/AudioPortAudio.h b/include/AudioPortAudio.h
index 10dab74eb..2c3aa6bc8 100644
--- a/include/AudioPortAudio.h
+++ b/include/AudioPortAudio.h
@@ -77,7 +77,7 @@ class AudioPortAudio : public AudioDevice
 {
 public:
 	AudioPortAudio( bool & _success_ful, AudioEngine* audioEngine );
-	virtual ~AudioPortAudio();
+	~AudioPortAudio() override;
 
 	inline static QString name()
 	{
@@ -94,10 +94,10 @@ public:
 	{
 	public:
 		setupWidget( QWidget * _parent );
-		virtual ~setupWidget();
+		~setupWidget() override;
 
-		virtual void saveSettings();
-		virtual void show();
+		void saveSettings() override;
+		void show() override;
 
 	private:
 		gui::ComboBox * m_backend;
@@ -107,9 +107,9 @@ public:
 	} ;
 
 private:
-	virtual void startProcessing();
-	virtual void stopProcessing();
-	virtual void applyQualitySettings();
+	void startProcessing() override;
+	void stopProcessing() override;
+	void applyQualitySettings() override;
 
 #ifdef PORTAUDIO_V19
 	static int _process_callback( const void *_inputBuffer, void * _outputBuffer,
diff --git a/include/AudioPulseAudio.h b/include/AudioPulseAudio.h
index 70da08087..a4721dfbd 100644
--- a/include/AudioPulseAudio.h
+++ b/include/AudioPulseAudio.h
@@ -52,7 +52,7 @@ class AudioPulseAudio : public QThread, public AudioDevice
 	Q_OBJECT
 public:
 	AudioPulseAudio( bool & _success_ful, AudioEngine* audioEngine );
-	virtual ~AudioPulseAudio();
+	~AudioPulseAudio() override;
 
 	inline static QString name()
 	{
@@ -66,7 +66,7 @@ public:
 	{
 	public:
 		setupWidget( QWidget * _parent );
-		virtual ~setupWidget();
+		~setupWidget() override;
 
 		void saveSettings() override;
 
diff --git a/include/AudioSampleRecorder.h b/include/AudioSampleRecorder.h
index 294ffa17d..e2f84dad0 100644
--- a/include/AudioSampleRecorder.h
+++ b/include/AudioSampleRecorder.h
@@ -41,14 +41,14 @@ class AudioSampleRecorder : public AudioDevice
 {
 public:
 	AudioSampleRecorder( const ch_cnt_t _channels, bool & _success_ful, AudioEngine* audioEngine );
-	virtual ~AudioSampleRecorder();
+	~AudioSampleRecorder() override;
 
 	f_cnt_t framesRecorded() const;
 	void createSampleBuffer( SampleBuffer** sampleBuffer );
 
 
 private:
-	virtual void writeBuffer( const surroundSampleFrame * _ab,
+	void writeBuffer( const surroundSampleFrame * _ab,
 						const fpp_t _frames,
 						const float _master_gain ) override;
 
diff --git a/include/AudioSdl.h b/include/AudioSdl.h
index b49e2ebe9..c3b9d27d3 100644
--- a/include/AudioSdl.h
+++ b/include/AudioSdl.h
@@ -48,7 +48,7 @@ class AudioSdl : public AudioDevice
 {
 public:
 	AudioSdl( bool & _success_ful, AudioEngine* audioEngine );
-	virtual ~AudioSdl();
+	~AudioSdl() override;
 
 	inline static QString name()
 	{
diff --git a/include/AudioSndio.h b/include/AudioSndio.h
index 5fb7c78fc..ebc443a68 100644
--- a/include/AudioSndio.h
+++ b/include/AudioSndio.h
@@ -52,7 +52,7 @@ class AudioSndio : public QThread, public AudioDevice
 	Q_OBJECT
 public:
 	AudioSndio( bool & _success_ful, AudioEngine * _audioEngine );
-	virtual ~AudioSndio();
+	~AudioSndio() override;
 
 	inline static QString name( void )
 	{
@@ -63,7 +63,7 @@ public:
 	{
 	public:
 		setupWidget( QWidget * _parent );
-		virtual ~setupWidget();
+		~setupWidget() override;
 
 		void saveSettings( void ) override;
 
diff --git a/include/AutomatableButton.h b/include/AutomatableButton.h
index fefaf70e3..d8c58523c 100644
--- a/include/AutomatableButton.h
+++ b/include/AutomatableButton.h
@@ -42,7 +42,7 @@ class LMMS_EXPORT AutomatableButton : public QPushButton, public BoolModelView
 public:
 	AutomatableButton( QWidget * _parent, const QString & _name
 			= QString() );
-	virtual ~AutomatableButton();
+	~AutomatableButton() override;
 
 	inline void setCheckable( bool _on )
 	{
@@ -87,7 +87,7 @@ class LMMS_EXPORT automatableButtonGroup : public QWidget, public IntModelView
 public:
 	automatableButtonGroup( QWidget * _parent, const QString & _name
 			= QString() );
-	virtual ~automatableButtonGroup();
+	~automatableButtonGroup() override;
 
 	void addButton( AutomatableButton * _btn );
 	void removeButton( AutomatableButton * _btn );
diff --git a/include/AutomatableModel.h b/include/AutomatableModel.h
index 672abaf81..5e8a17763 100644
--- a/include/AutomatableModel.h
+++ b/include/AutomatableModel.h
@@ -89,7 +89,7 @@ public:
 	};
 
 
-	virtual ~AutomatableModel();
+	~AutomatableModel() override;
 
 	// Implement those by using the MODEL_IS_VISITABLE macro
 	virtual void accept(ModelVisitor& v) = 0;
diff --git a/include/AutomatableModelView.h b/include/AutomatableModelView.h
index fa8926c0c..1e8ef7398 100644
--- a/include/AutomatableModelView.h
+++ b/include/AutomatableModelView.h
@@ -39,7 +39,7 @@ class LMMS_EXPORT AutomatableModelView : public ModelView
 {
 public:
 	AutomatableModelView( Model* model, QWidget* _this );
-	virtual ~AutomatableModelView() = default;
+	~AutomatableModelView() override = default;
 
 	// some basic functions for convenience
 	AutomatableModel* modelUntyped()
diff --git a/include/AutomatableSlider.h b/include/AutomatableSlider.h
index d6a95f5d8..cadaaf8db 100644
--- a/include/AutomatableSlider.h
+++ b/include/AutomatableSlider.h
@@ -39,7 +39,7 @@ class AutomatableSlider : public QSlider, public IntModelView
 	Q_OBJECT
 public:
 	AutomatableSlider( QWidget * _parent, const QString & _name = QString() );
-	virtual ~AutomatableSlider();
+	~AutomatableSlider() override;
 
 	bool showStatus()
 	{
diff --git a/include/AutomationClip.h b/include/AutomationClip.h
index 376c1e9e7..63c13a120 100644
--- a/include/AutomationClip.h
+++ b/include/AutomationClip.h
@@ -65,7 +65,7 @@ public:
 
 	AutomationClip( AutomationTrack * _auto_track );
 	AutomationClip( const AutomationClip & _clip_to_copy );
-	virtual ~AutomationClip() = default;
+	~AutomationClip() override = default;
 
 	bool addObject( AutomatableModel * _obj, bool _search_dup = true );
 
diff --git a/include/AutomationClipView.h b/include/AutomationClipView.h
index 0b80ad2eb..1a2e80248 100644
--- a/include/AutomationClipView.h
+++ b/include/AutomationClipView.h
@@ -45,7 +45,7 @@ class AutomationClipView : public ClipView
 
 public:
 	AutomationClipView( AutomationClip * _clip, TrackView * _parent );
-	virtual ~AutomationClipView();
+	~AutomationClipView() override;
 
 public slots:
 	/// Opens this view's clip in the global automation editor
diff --git a/include/AutomationEditor.h b/include/AutomationEditor.h
index d9d1b0a10..c710c5007 100644
--- a/include/AutomationEditor.h
+++ b/include/AutomationEditor.h
@@ -167,7 +167,7 @@ private:
 
 	AutomationEditor();
 	AutomationEditor( const AutomationEditor & );
-	virtual ~AutomationEditor();
+	~AutomationEditor() override;
 
 	static QPixmap * s_toolDraw;
 	static QPixmap * s_toolErase;
@@ -255,7 +255,7 @@ class AutomationEditorWindow : public Editor
 	static const int INITIAL_HEIGHT = 480;
 public:
 	AutomationEditorWindow();
-	~AutomationEditorWindow();
+	~AutomationEditorWindow() override;
 
 	void setCurrentClip(AutomationClip* clip);
 	const AutomationClip* currentClip();
diff --git a/include/AutomationTrack.h b/include/AutomationTrack.h
index 1bbc77b1c..1779bf102 100644
--- a/include/AutomationTrack.h
+++ b/include/AutomationTrack.h
@@ -37,9 +37,9 @@ class AutomationTrack : public Track
 	Q_OBJECT
 public:
 	AutomationTrack( TrackContainer* tc, bool _hidden = false );
-	virtual ~AutomationTrack() = default;
+	~AutomationTrack() override = default;
 
-	virtual bool play( const TimePos & _start, const fpp_t _frames,
+	bool play( const TimePos & _start, const fpp_t _frames,
 						const f_cnt_t _frame_base, int _clip_num = -1 ) override;
 
 	QString nodeName() const override
@@ -50,7 +50,7 @@ public:
 	gui::TrackView * createView( gui::TrackContainerView* ) override;
 	Clip* createClip(const TimePos & pos) override;
 
-	virtual void saveTrackSpecificSettings( QDomDocument & _doc,
+	void saveTrackSpecificSettings( QDomDocument & _doc,
 							QDomElement & _parent ) override;
 	void loadTrackSpecificSettings( const QDomElement & _this ) override;
 
diff --git a/include/AutomationTrackView.h b/include/AutomationTrackView.h
index b5bafe58e..18454bec2 100644
--- a/include/AutomationTrackView.h
+++ b/include/AutomationTrackView.h
@@ -41,7 +41,7 @@ class AutomationTrackView : public TrackView
 {
 public:
 	AutomationTrackView( AutomationTrack* at, TrackContainerView* tcv );
-	virtual ~AutomationTrackView() = default;
+	~AutomationTrackView() override = default;
 
 	void dragEnterEvent( QDragEnterEvent * _dee ) override;
 	void dropEvent( QDropEvent * _de ) override;
diff --git a/include/CPULoadWidget.h b/include/CPULoadWidget.h
index 9cf275fb3..31aecb016 100644
--- a/include/CPULoadWidget.h
+++ b/include/CPULoadWidget.h
@@ -43,7 +43,7 @@ class CPULoadWidget : public QWidget
 	Q_OBJECT
 public:
 	CPULoadWidget( QWidget * _parent );
-	virtual ~CPULoadWidget();
+	~CPULoadWidget() override;
 
 
 protected:
diff --git a/include/CaptionMenu.h b/include/CaptionMenu.h
index 2309cec6f..a3724e127 100644
--- a/include/CaptionMenu.h
+++ b/include/CaptionMenu.h
@@ -41,7 +41,7 @@ class LMMS_EXPORT CaptionMenu : public QMenu
 	Q_OBJECT
 public:
 	CaptionMenu( const QString & _title, QWidget * _parent = 0 );
-	virtual ~CaptionMenu();
+	~CaptionMenu() override;
 } ;
 
 
diff --git a/include/Clip.h b/include/Clip.h
index 5c70aeaba..14595263e 100644
--- a/include/Clip.h
+++ b/include/Clip.h
@@ -53,7 +53,7 @@ class LMMS_EXPORT Clip : public Model, public JournallingObject
 	mapPropertyFromModel(bool,isSolo,setSolo,m_soloModel);
 public:
 	Clip( Track * track );
-	virtual ~Clip();
+	~Clip() override;
 
 	inline Track * getTrack() const
 	{
diff --git a/include/ClipView.h b/include/ClipView.h
index 00a8b261e..8cfb9e7a4 100644
--- a/include/ClipView.h
+++ b/include/ClipView.h
@@ -71,7 +71,7 @@ public:
 	const static int BORDER_WIDTH = 2;
 
 	ClipView( Clip * clip, TrackView * tv );
-	virtual ~ClipView();
+	~ClipView() override;
 
 	bool fixedClips();
 
diff --git a/include/ComboBox.h b/include/ComboBox.h
index 412279d15..9b51d87ab 100644
--- a/include/ComboBox.h
+++ b/include/ComboBox.h
@@ -40,7 +40,7 @@ class LMMS_EXPORT ComboBox : public QWidget, public IntModelView
 	Q_OBJECT
 public:
 	ComboBox( QWidget* parent = nullptr, const QString& name = QString() );
-	virtual ~ComboBox();
+	~ComboBox() override;
 
 	ComboBoxModel* model()
 	{
diff --git a/include/ComboBoxModel.h b/include/ComboBoxModel.h
index faff03620..ef21eb12e 100644
--- a/include/ComboBoxModel.h
+++ b/include/ComboBoxModel.h
@@ -47,7 +47,7 @@ public:
 	{
 	}
 
-	virtual ~ComboBoxModel()
+	~ComboBoxModel() override
 	{
 		clear();
 	}
diff --git a/include/ConfigManager.h b/include/ConfigManager.h
index 6aa7fc037..52e318508 100644
--- a/include/ConfigManager.h
+++ b/include/ConfigManager.h
@@ -274,7 +274,7 @@ private:
 
 	ConfigManager();
 	ConfigManager(const ConfigManager & _c);
-	~ConfigManager();
+	~ConfigManager() override;
 
 	void upgrade_1_1_90();
 	void upgrade_1_1_91();
diff --git a/include/Controller.h b/include/Controller.h
index c2e5205d2..f11294a39 100644
--- a/include/Controller.h
+++ b/include/Controller.h
@@ -70,7 +70,7 @@ public:
 	Controller( ControllerTypes _type, Model * _parent,
 						const QString & _display_name );
 
-	virtual ~Controller();
+	~Controller() override;
 
 	virtual float currentValue( int _offset );
 	// The per-controller get-value-in-buffers function
diff --git a/include/ControllerConnection.h b/include/ControllerConnection.h
index 50b98539c..54bfaa10d 100644
--- a/include/ControllerConnection.h
+++ b/include/ControllerConnection.h
@@ -58,7 +58,7 @@ public:
 	ControllerConnection(Controller * _controller);
 	ControllerConnection( int _controllerId );
 
-	virtual ~ControllerConnection();
+	~ControllerConnection() override;
 
 	inline Controller * getController()
 	{
diff --git a/include/ControllerConnectionDialog.h b/include/ControllerConnectionDialog.h
index 62980987f..5565c8a67 100644
--- a/include/ControllerConnectionDialog.h
+++ b/include/ControllerConnectionDialog.h
@@ -61,7 +61,7 @@ class ControllerConnectionDialog : public QDialog
 public:
 	ControllerConnectionDialog( QWidget * _parent,
 			const AutomatableModel * _target_model );
-	virtual ~ControllerConnectionDialog();
+	~ControllerConnectionDialog() override;
 
 	Controller * chosenController()
 	{
diff --git a/include/ControllerDialog.h b/include/ControllerDialog.h
index 0592cadf3..351afd66a 100644
--- a/include/ControllerDialog.h
+++ b/include/ControllerDialog.h
@@ -44,7 +44,7 @@ class ControllerDialog : public QWidget, public ModelView
 public:
 	ControllerDialog( Controller * _controller, QWidget * _parent );
 
-	virtual ~ControllerDialog();
+	~ControllerDialog() override;
 
 
 signals:
diff --git a/include/ControllerRackView.h b/include/ControllerRackView.h
index 6d60562f6..a522071c8 100644
--- a/include/ControllerRackView.h
+++ b/include/ControllerRackView.h
@@ -53,7 +53,7 @@ class ControllerRackView : public QWidget, public SerializingObject
 	Q_OBJECT
 public:
 	ControllerRackView();
-	virtual ~ControllerRackView();
+	~ControllerRackView() override;
 
 	void saveSettings( QDomDocument & _doc, QDomElement & _parent ) override;
 	void loadSettings( const QDomElement & _this ) override;
diff --git a/include/ControllerView.h b/include/ControllerView.h
index 2e18e1320..8b8db0674 100644
--- a/include/ControllerView.h
+++ b/include/ControllerView.h
@@ -48,7 +48,7 @@ class ControllerView : public QFrame, public ModelView
 	Q_OBJECT
 public:
 	ControllerView( Controller * _controller, QWidget * _parent );
-	virtual ~ControllerView();
+	~ControllerView() override;
 
 	inline Controller * getController()
 	{
diff --git a/include/CustomTextKnob.h b/include/CustomTextKnob.h
index 403799ff0..cde718810 100644
--- a/include/CustomTextKnob.h
+++ b/include/CustomTextKnob.h
@@ -25,7 +25,7 @@ public:
 	}
 
 private:
-	virtual QString displayValue() const;
+	QString displayValue() const override;
 
 protected:
 	QString m_value_text;
diff --git a/include/DetuningHelper.h b/include/DetuningHelper.h
index 7444b8b22..c67ae41c6 100644
--- a/include/DetuningHelper.h
+++ b/include/DetuningHelper.h
@@ -42,7 +42,7 @@ public:
 	{
 	}
 
-	virtual ~DetuningHelper()
+	~DetuningHelper() override
 	{
 	}
 
diff --git a/include/DummyEffect.h b/include/DummyEffect.h
index 8d0f769b6..637feaba1 100644
--- a/include/DummyEffect.h
+++ b/include/DummyEffect.h
@@ -60,7 +60,7 @@ public:
 	{
 	}
 
-	virtual ~DummyEffectControls()
+	~DummyEffectControls() override
 	{
 	}
 
@@ -102,7 +102,7 @@ public:
 		setName();
 	}
 
-	virtual ~DummyEffect()
+	~DummyEffect() override
 	{
 	}
 
diff --git a/include/DummyInstrument.h b/include/DummyInstrument.h
index 27246e6eb..7f85d83b5 100644
--- a/include/DummyInstrument.h
+++ b/include/DummyInstrument.h
@@ -47,7 +47,7 @@ public:
 	{
 	}
 
-	virtual ~DummyInstrument()
+	~DummyInstrument() override
 	{
 	}
 
diff --git a/include/DummyPlugin.h b/include/DummyPlugin.h
index 313649526..fd98b831c 100644
--- a/include/DummyPlugin.h
+++ b/include/DummyPlugin.h
@@ -41,7 +41,7 @@ public:
 	{
 	}
 
-	virtual ~DummyPlugin()
+	~DummyPlugin() override
 	{
 	}
 
diff --git a/include/Editor.h b/include/Editor.h
index 88cd84654..60760f2b4 100644
--- a/include/Editor.h
+++ b/include/Editor.h
@@ -81,7 +81,7 @@ protected:
 	/// \param	record	If set true, the editor's toolbar will contain record
 	///					buttons in addition to the play and stop buttons.
 	Editor(bool record = false, bool record_step = false);
-	virtual ~Editor();
+	~Editor() override;
 
 
 	DropToolBar* m_toolBar;
diff --git a/include/Effect.h b/include/Effect.h
index abd65f207..471f031c9 100644
--- a/include/Effect.h
+++ b/include/Effect.h
@@ -55,7 +55,7 @@ public:
 	Effect( const Plugin::Descriptor * _desc,
 			Model * _parent,
 			const Descriptor::SubPluginFeatures::Key * _key );
-	virtual ~Effect();
+	~Effect() override;
 
 	void saveSettings( QDomDocument & _doc, QDomElement & _parent ) override;
 	void loadSettings( const QDomElement & _this ) override;
diff --git a/include/EffectChain.h b/include/EffectChain.h
index ca7648761..2a0cbc758 100644
--- a/include/EffectChain.h
+++ b/include/EffectChain.h
@@ -48,7 +48,7 @@ class LMMS_EXPORT EffectChain : public Model, public SerializingObject
 	Q_OBJECT
 public:
 	EffectChain( Model * _parent );
-	virtual ~EffectChain();
+	~EffectChain() override;
 
 	void saveSettings( QDomDocument & _doc, QDomElement & _parent ) override;
 	void loadSettings( const QDomElement & _this ) override;
diff --git a/include/EffectControlDialog.h b/include/EffectControlDialog.h
index ec0ef3f1d..59e422264 100644
--- a/include/EffectControlDialog.h
+++ b/include/EffectControlDialog.h
@@ -44,7 +44,7 @@ class LMMS_EXPORT EffectControlDialog : public QWidget, public ModelView
 	Q_OBJECT
 public:
 	EffectControlDialog( EffectControls * _controls );
-	virtual ~EffectControlDialog();
+	~EffectControlDialog() override;
 
 	virtual bool isResizable() const {return false;}
 
diff --git a/include/EffectControls.h b/include/EffectControls.h
index b8e7d0041..95ef0039c 100644
--- a/include/EffectControls.h
+++ b/include/EffectControls.h
@@ -51,7 +51,7 @@ public:
 	{
 	}
 
-	virtual ~EffectControls()
+	~EffectControls() override
 	{
 	}
 
diff --git a/include/EffectRackView.h b/include/EffectRackView.h
index 014a07dfe..fb68fda68 100644
--- a/include/EffectRackView.h
+++ b/include/EffectRackView.h
@@ -47,7 +47,7 @@ class EffectRackView : public QWidget, public ModelView
 	Q_OBJECT
 public:
 	EffectRackView( EffectChain* model, QWidget* parent = nullptr );
-	virtual ~EffectRackView();
+	~EffectRackView() override;
 
 	static constexpr int DEFAULT_WIDTH = 245;
 
diff --git a/include/EffectSelectDialog.h b/include/EffectSelectDialog.h
index bf1b6ba04..b0acfb734 100644
--- a/include/EffectSelectDialog.h
+++ b/include/EffectSelectDialog.h
@@ -43,7 +43,7 @@ class EffectSelectDialog : public QDialog
 	Q_OBJECT
 public:
 	EffectSelectDialog( QWidget * _parent );
-	virtual ~EffectSelectDialog();
+	~EffectSelectDialog() override;
 
 	Effect * instantiateSelectedPlugin( EffectChain * _parent );
 
diff --git a/include/EffectView.h b/include/EffectView.h
index 9f30575e9..90bb54896 100644
--- a/include/EffectView.h
+++ b/include/EffectView.h
@@ -49,7 +49,7 @@ class EffectView : public PluginView
 	Q_OBJECT
 public:
 	EffectView( Effect * _model, QWidget * _parent );
-	virtual ~EffectView();
+	~EffectView() override;
 
 	inline Effect * effect()
 	{
diff --git a/include/EnvelopeAndLfoParameters.h b/include/EnvelopeAndLfoParameters.h
index 0a4a0d0f2..7b630b1b0 100644
--- a/include/EnvelopeAndLfoParameters.h
+++ b/include/EnvelopeAndLfoParameters.h
@@ -78,7 +78,7 @@ public:
 
 	EnvelopeAndLfoParameters( float _value_for_zero_amount,
 							Model * _parent );
-	virtual ~EnvelopeAndLfoParameters();
+	~EnvelopeAndLfoParameters() override;
 
 	static inline float expKnobVal( float _val )
 	{
diff --git a/include/EnvelopeAndLfoView.h b/include/EnvelopeAndLfoView.h
index 2067f9291..a82ccf606 100644
--- a/include/EnvelopeAndLfoView.h
+++ b/include/EnvelopeAndLfoView.h
@@ -54,7 +54,7 @@ class EnvelopeAndLfoView : public QWidget, public ModelView
 	Q_OBJECT
 public:
 	EnvelopeAndLfoView( QWidget * _parent );
-	virtual ~EnvelopeAndLfoView();
+	~EnvelopeAndLfoView() override;
 
 
 protected:
diff --git a/include/ExportFilter.h b/include/ExportFilter.h
index 29cb1c711..3aaa2f986 100644
--- a/include/ExportFilter.h
+++ b/include/ExportFilter.h
@@ -40,7 +40,7 @@ class LMMS_EXPORT ExportFilter : public Plugin
 {
 public:
 	ExportFilter( const Descriptor * _descriptor ) : Plugin( _descriptor, nullptr ) {}
-	virtual ~ExportFilter() {}
+	~ExportFilter() override {}
 
 
 	virtual bool tryExport(const TrackContainer::TrackList &tracks,
diff --git a/include/FadeButton.h b/include/FadeButton.h
index ee0936ca7..b4a78d5ee 100644
--- a/include/FadeButton.h
+++ b/include/FadeButton.h
@@ -44,7 +44,7 @@ public:
 		const QColor & _hold_color,
 		QWidget * _parent );
 
-	virtual ~FadeButton();
+	~FadeButton() override;
 	void setActiveColor( const QColor & activated_color );
 
 
diff --git a/include/Fader.h b/include/Fader.h
index 355684c4a..54acfc57d 100644
--- a/include/Fader.h
+++ b/include/Fader.h
@@ -72,7 +72,7 @@ public:
 
 	Fader( FloatModel * _model, const QString & _name, QWidget * _parent );
 	Fader( FloatModel * _model, const QString & _name, QWidget * _parent, QPixmap * back, QPixmap * leds, QPixmap * knob );
-	virtual ~Fader() = default;
+	~Fader() override = default;
 
 	void init(FloatModel * model, QString const & name);
 
diff --git a/include/FileBrowser.h b/include/FileBrowser.h
index eb50dd1bb..315248d42 100644
--- a/include/FileBrowser.h
+++ b/include/FileBrowser.h
@@ -68,7 +68,7 @@ public:
 			const QString& userDir = "",
 			const QString& factoryDir = "");
 
-	virtual ~FileBrowser() = default;
+	~FileBrowser() override = default;
 
 private slots:
 	void reloadTree( void );
@@ -107,7 +107,7 @@ class FileBrowserTreeWidget : public QTreeWidget
 	Q_OBJECT
 public:
 	FileBrowserTreeWidget( QWidget * parent );
-	virtual ~FileBrowserTreeWidget() = default;
+	~FileBrowserTreeWidget() override = default;
 
 	//! This method returns a QList with paths (QString's) of all directories
 	//! that are expanded in the tree.
diff --git a/include/Graph.h b/include/Graph.h
index 7a9599f12..747fcf29a 100644
--- a/include/Graph.h
+++ b/include/Graph.h
@@ -67,7 +67,7 @@ public:
 		int _width = 132,
 		int _height = 104
 	);
-	virtual ~Graph() = default;
+	~Graph() override = default;
 
 	void setForeground( const QPixmap & _pixmap );
 
@@ -151,7 +151,7 @@ public:
 			bool _default_constructed = false,
 			float _step = 0.0 );
 
-	virtual ~graphModel() = default;
+	~graphModel() override = default;
 
 	// TODO: saveSettings, loadSettings?
 
diff --git a/include/GroupBox.h b/include/GroupBox.h
index 6a282fedb..e20db80a6 100644
--- a/include/GroupBox.h
+++ b/include/GroupBox.h
@@ -42,7 +42,7 @@ class GroupBox : public QWidget, public BoolModelView
 	Q_OBJECT
 public:
 	GroupBox( const QString & _caption, QWidget * _parent = nullptr );
-	virtual ~GroupBox();
+	~GroupBox() override;
 
 	void modelChanged() override;
 
diff --git a/include/GuiApplication.h b/include/GuiApplication.h
index 84697175f..e39983138 100644
--- a/include/GuiApplication.h
+++ b/include/GuiApplication.h
@@ -50,7 +50,7 @@ class LMMS_EXPORT GuiApplication : public QObject
 	Q_OBJECT;
 public:
 	explicit GuiApplication();
-	~GuiApplication();
+	~GuiApplication() override;
 
 	static GuiApplication* instance();
 #ifdef LMMS_BUILD_WIN32
diff --git a/include/ImportFilter.h b/include/ImportFilter.h
index 60eca6f80..9635fedb5 100644
--- a/include/ImportFilter.h
+++ b/include/ImportFilter.h
@@ -42,7 +42,7 @@ class LMMS_EXPORT ImportFilter : public Plugin
 public:
 	ImportFilter( const QString & _file_name,
 					const Descriptor * _descriptor );
-	virtual ~ImportFilter();
+	~ImportFilter() override;
 
 
 	// tries to import given file to given track-container by having all
diff --git a/include/InlineAutomation.h b/include/InlineAutomation.h
index 453184329..435604506 100644
--- a/include/InlineAutomation.h
+++ b/include/InlineAutomation.h
@@ -42,7 +42,7 @@ public:
 	{
 	}
 
-	virtual ~InlineAutomation()
+	~InlineAutomation() override
 	{
 		if( m_autoClip )
 		{
diff --git a/include/Instrument.h b/include/Instrument.h
index 7ec3c66be..4e48e2fd6 100644
--- a/include/Instrument.h
+++ b/include/Instrument.h
@@ -60,7 +60,7 @@ public:
 	Instrument(InstrumentTrack * _instrument_track,
 			const Descriptor * _descriptor,
 			const Descriptor::SubPluginFeatures::Key * key = nullptr);
-	virtual ~Instrument() = default;
+	~Instrument() override = default;
 
 	// --------------------------------------------------------------------
 	// functions that can/should be re-implemented:
diff --git a/include/InstrumentFunctionViews.h b/include/InstrumentFunctionViews.h
index bf4b07668..99ba92031 100644
--- a/include/InstrumentFunctionViews.h
+++ b/include/InstrumentFunctionViews.h
@@ -50,7 +50,7 @@ class InstrumentFunctionNoteStackingView : public QWidget, public ModelView
 	Q_OBJECT
 public:
 	InstrumentFunctionNoteStackingView( InstrumentFunctionNoteStacking* cc, QWidget* parent = nullptr );
-	virtual ~InstrumentFunctionNoteStackingView();
+	~InstrumentFunctionNoteStackingView() override;
 
 
 private:
@@ -73,7 +73,7 @@ class InstrumentFunctionArpeggioView : public QWidget, public ModelView
 	Q_OBJECT
 public:
 	InstrumentFunctionArpeggioView( InstrumentFunctionArpeggio* arp, QWidget* parent = nullptr );
-	virtual ~InstrumentFunctionArpeggioView();
+	~InstrumentFunctionArpeggioView() override;
 
 
 private:
diff --git a/include/InstrumentFunctions.h b/include/InstrumentFunctions.h
index ef1d17902..76e522bc5 100644
--- a/include/InstrumentFunctions.h
+++ b/include/InstrumentFunctions.h
@@ -58,7 +58,7 @@ private:
 
 public:
 	InstrumentFunctionNoteStacking( Model * _parent );
-	virtual ~InstrumentFunctionNoteStacking();
+	~InstrumentFunctionNoteStacking() override;
 
 	void processNote( NotePlayHandle* n );
 
@@ -180,7 +180,7 @@ public:
 	} ;
 
 	InstrumentFunctionArpeggio( Model * _parent );
-	virtual ~InstrumentFunctionArpeggio();
+	~InstrumentFunctionArpeggio() override;
 
 	void processNote( NotePlayHandle* n );
 
diff --git a/include/InstrumentMidiIOView.h b/include/InstrumentMidiIOView.h
index 399aee890..821488390 100644
--- a/include/InstrumentMidiIOView.h
+++ b/include/InstrumentMidiIOView.h
@@ -50,7 +50,7 @@ class InstrumentMidiIOView : public QWidget, public ModelView
 	Q_OBJECT
 public:
 	InstrumentMidiIOView( QWidget* parent );
-	virtual ~InstrumentMidiIOView();
+	~InstrumentMidiIOView() override;
 
 
 private:
diff --git a/include/InstrumentPlayHandle.h b/include/InstrumentPlayHandle.h
index 2d7bfa587..2935d36ba 100644
--- a/include/InstrumentPlayHandle.h
+++ b/include/InstrumentPlayHandle.h
@@ -38,7 +38,7 @@ class LMMS_EXPORT InstrumentPlayHandle : public PlayHandle
 public:
 	InstrumentPlayHandle( Instrument * instrument, InstrumentTrack* instrumentTrack );
 
-	virtual ~InstrumentPlayHandle()
+	~InstrumentPlayHandle() override
 	{
 	}
 
diff --git a/include/InstrumentSoundShaping.h b/include/InstrumentSoundShaping.h
index 00208392d..1df6b858b 100644
--- a/include/InstrumentSoundShaping.h
+++ b/include/InstrumentSoundShaping.h
@@ -46,7 +46,7 @@ class InstrumentSoundShaping : public Model, public JournallingObject
 	Q_OBJECT
 public:
 	InstrumentSoundShaping( InstrumentTrack * _instrument_track );
-	virtual ~InstrumentSoundShaping();
+	~InstrumentSoundShaping() override;
 
 	void processAudioBuffer( sampleFrame * _ab, const fpp_t _frames,
 							NotePlayHandle * _n );
diff --git a/include/InstrumentSoundShapingView.h b/include/InstrumentSoundShapingView.h
index 9b4efcfab..aa8aff19d 100644
--- a/include/InstrumentSoundShapingView.h
+++ b/include/InstrumentSoundShapingView.h
@@ -47,7 +47,7 @@ class InstrumentSoundShapingView : public QWidget, public ModelView
 	Q_OBJECT
 public:
 	InstrumentSoundShapingView( QWidget * _parent );
-	virtual ~InstrumentSoundShapingView();
+	~InstrumentSoundShapingView() override;
 
 	void setFunctionsHidden( bool hidden );
 
diff --git a/include/InstrumentTrack.h b/include/InstrumentTrack.h
index d05da176b..90cd25814 100644
--- a/include/InstrumentTrack.h
+++ b/include/InstrumentTrack.h
@@ -64,7 +64,7 @@ class LMMS_EXPORT InstrumentTrack : public Track, public MidiEventProcessor
 	mapPropertyFromModel(int,getVolume,setVolume,m_volumeModel);
 public:
 	InstrumentTrack( TrackContainer* tc );
-	virtual ~InstrumentTrack();
+	~InstrumentTrack() override;
 
 	// used by instrument
 	void processAudioBuffer( sampleFrame * _buf, const fpp_t _frames,
@@ -122,7 +122,7 @@ public:
 	}
 
 	// play everything in given frame-range - creates note-play-handles
-	virtual bool play( const TimePos & _start, const fpp_t _frames,
+	bool play( const TimePos & _start, const fpp_t _frames,
 						const f_cnt_t _frame_base, int _clip_num = -1 ) override;
 	// create new view for me
 	gui::TrackView* createView( gui::TrackContainerView* tcv ) override;
@@ -132,7 +132,7 @@ public:
 
 
 	// called by track
-	virtual void saveTrackSpecificSettings( QDomDocument & _doc,
+	void saveTrackSpecificSettings( QDomDocument & _doc,
 							QDomElement & _parent ) override;
 	void loadTrackSpecificSettings( const QDomElement & _this ) override;
 
diff --git a/include/InstrumentTrackView.h b/include/InstrumentTrackView.h
index a5297b332..3201f81d6 100644
--- a/include/InstrumentTrackView.h
+++ b/include/InstrumentTrackView.h
@@ -46,7 +46,7 @@ class InstrumentTrackView : public TrackView
 	Q_OBJECT
 public:
 	InstrumentTrackView( InstrumentTrack * _it, TrackContainerView* tc );
-	virtual ~InstrumentTrackView();
+	~InstrumentTrackView() override;
 
 	InstrumentTrackWindow * getInstrumentTrackWindow();
 
diff --git a/include/InstrumentTrackWindow.h b/include/InstrumentTrackWindow.h
index cd208c165..68750c0b8 100644
--- a/include/InstrumentTrackWindow.h
+++ b/include/InstrumentTrackWindow.h
@@ -65,7 +65,7 @@ class InstrumentTrackWindow : public QWidget, public ModelView,
 	Q_OBJECT
 public:
 	InstrumentTrackWindow( InstrumentTrackView * _tv );
-	virtual ~InstrumentTrackWindow();
+	~InstrumentTrackWindow() override;
 
 	// parent for all internal tab-widgets
 	TabWidget * tabWidgetParent()
diff --git a/include/JournallingObject.h b/include/JournallingObject.h
index cd853dc7f..41ae65295 100644
--- a/include/JournallingObject.h
+++ b/include/JournallingObject.h
@@ -37,7 +37,7 @@ class LMMS_EXPORT JournallingObject : public SerializingObject
 {
 public:
 	JournallingObject();
-	virtual ~JournallingObject();
+	~JournallingObject() override;
 
 	inline jo_id_t id() const
 	{
@@ -60,7 +60,7 @@ public:
 
 	void addJournalCheckPoint();
 
-	virtual QDomElement saveState( QDomDocument & _doc,
+	QDomElement saveState( QDomDocument & _doc,
 									QDomElement & _parent ) override;
 
 	void restoreState( const QDomElement & _this ) override;
diff --git a/include/Ladspa2LMMS.h b/include/Ladspa2LMMS.h
index 63db75cd9..b1a21de70 100644
--- a/include/Ladspa2LMMS.h
+++ b/include/Ladspa2LMMS.h
@@ -68,7 +68,7 @@ public:
 
 private:
 	Ladspa2LMMS();
-	virtual ~Ladspa2LMMS();
+	~Ladspa2LMMS() override;
 
 	l_sortable_plugin_t m_instruments;
 	l_sortable_plugin_t m_validEffects;
diff --git a/include/LadspaControl.h b/include/LadspaControl.h
index 8b6fe3d19..3a0ea5cc8 100644
--- a/include/LadspaControl.h
+++ b/include/LadspaControl.h
@@ -52,7 +52,7 @@ class LMMS_EXPORT LadspaControl : public Model, public JournallingObject
 public:
 	LadspaControl( Model * _parent, port_desc_t * _port,
 							bool _link = false );
-	~LadspaControl();
+	~LadspaControl() override;
 
 	LADSPA_Data value();
 	ValueBuffer * valueBuffer();
diff --git a/include/LadspaControlView.h b/include/LadspaControlView.h
index 15eb722a7..c36135986 100644
--- a/include/LadspaControlView.h
+++ b/include/LadspaControlView.h
@@ -43,7 +43,7 @@ class LMMS_EXPORT LadspaControlView : public QWidget, public ModelView
 	Q_OBJECT
 public:
 	LadspaControlView( QWidget * _parent, LadspaControl * _ctl );
-	virtual ~LadspaControlView();
+	~LadspaControlView() override;
 
 private:
 	LadspaControl * m_ctl;
diff --git a/include/LcdSpinBox.h b/include/LcdSpinBox.h
index 1c30bfcf6..f310e46b2 100644
--- a/include/LcdSpinBox.h
+++ b/include/LcdSpinBox.h
@@ -40,7 +40,7 @@ public:
 
 	LcdSpinBox( int numDigits, const QString& style, QWidget* parent, const QString& name = QString() );
 
-	virtual ~LcdSpinBox() = default;
+	~LcdSpinBox() override = default;
 
 	void modelChanged() override
 	{
diff --git a/include/LcdWidget.h b/include/LcdWidget.h
index aad1d189a..d55cfc017 100644
--- a/include/LcdWidget.h
+++ b/include/LcdWidget.h
@@ -48,7 +48,7 @@ public:
 	LcdWidget(int numDigits, const QString& style, QWidget* parent, const QString& name = QString(),
 		bool leadingZero = false);
 
-	virtual ~LcdWidget();
+	~LcdWidget() override;
 
 	void setValue( int value );
 	void setLabel( const QString& label );
diff --git a/include/LedCheckBox.h b/include/LedCheckBox.h
index 8eac9b562..a215592e6 100644
--- a/include/LedCheckBox.h
+++ b/include/LedCheckBox.h
@@ -54,7 +54,7 @@ public:
 				const QString & _name = QString(),
 						LedColors _color = Yellow );
 
-	virtual ~LedCheckBox();
+	~LedCheckBox() override;
 
 
 	inline const QString & text()
diff --git a/include/LfoController.h b/include/LfoController.h
index 6ee136a14..48aee3d30 100644
--- a/include/LfoController.h
+++ b/include/LfoController.h
@@ -57,7 +57,7 @@ class LfoController : public Controller
 public:
 	LfoController( Model * _parent );
 
-	virtual ~LfoController();
+	~LfoController() override;
 
 	void saveSettings( QDomDocument & _doc, QDomElement & _this ) override;
 	void loadSettings( const QDomElement & _this ) override;
@@ -105,7 +105,7 @@ class LfoControllerDialog : public ControllerDialog
 	Q_OBJECT
 public:
 	LfoControllerDialog( Controller * _controller, QWidget * _parent );
-	virtual ~LfoControllerDialog();
+	~LfoControllerDialog() override;
 
 
 protected:
diff --git a/include/LinkedModelGroupViews.h b/include/LinkedModelGroupViews.h
index 50ef03596..91a8d53ca 100644
--- a/include/LinkedModelGroupViews.h
+++ b/include/LinkedModelGroupViews.h
@@ -70,7 +70,7 @@ public:
 	*/
 	LinkedModelGroupView(QWidget* parent, LinkedModelGroup* model,
 		std::size_t colNum);
-	~LinkedModelGroupView();
+	~LinkedModelGroupView() override;
 
 	//! Reconnect models if model changed
 	void modelChanged(LinkedModelGroup* linkedModelGroup);
diff --git a/include/LmmsPalette.h b/include/LmmsPalette.h
index 87ea18687..1840fb3eb 100644
--- a/include/LmmsPalette.h
+++ b/include/LmmsPalette.h
@@ -50,7 +50,7 @@ class LMMS_EXPORT LmmsPalette : public QWidget
 
 public:
 	LmmsPalette( QWidget * parent, QStyle * stylearg  ); 
-	virtual ~LmmsPalette();
+	~LmmsPalette() override;
 
 #define ACCESSMET( read, write ) \
 	QColor read () const; \
diff --git a/include/LmmsStyle.h b/include/LmmsStyle.h
index a4c9edd31..72895a102 100644
--- a/include/LmmsStyle.h
+++ b/include/LmmsStyle.h
@@ -66,23 +66,23 @@ public:
 	};
 
 	LmmsStyle();
-	virtual ~LmmsStyle()
+	~LmmsStyle() override
 	{
 	}
 
 	QPalette standardPalette( void ) const override;
 
-	virtual void drawComplexControl(
+	void drawComplexControl(
 				ComplexControl control,
 				const QStyleOptionComplex * option,
 					QPainter *painter,
 						const QWidget *widget ) const override;
-	virtual void drawPrimitive( PrimitiveElement element,
+	void drawPrimitive( PrimitiveElement element,
 					const QStyleOption *option,
 					QPainter *painter,
 					const QWidget *widget = 0 ) const override;
 
-	virtual int pixelMetric( PixelMetric metric,
+	int pixelMetric( PixelMetric metric,
 					const QStyleOption * option = 0,
 					const QWidget * widget = 0 ) const override;
 
diff --git a/include/LocklessAllocator.h b/include/LocklessAllocator.h
index 17f5ebfb5..054bb91e8 100644
--- a/include/LocklessAllocator.h
+++ b/include/LocklessAllocator.h
@@ -67,7 +67,7 @@ public:
 	{
 	}
 
-	virtual ~LocklessAllocatorT()
+	~LocklessAllocatorT() override
 	{
 	}
 
diff --git a/include/Lv2ViewBase.h b/include/Lv2ViewBase.h
index 74a0bd876..2be5d72a4 100644
--- a/include/Lv2ViewBase.h
+++ b/include/Lv2ViewBase.h
@@ -58,7 +58,7 @@ class Lv2ViewProc : public LinkedModelGroupView
 public:
 	//! @param colNum numbers of columns for the controls
 	Lv2ViewProc(QWidget *parent, Lv2Proc *ctrlBase, int colNum);
-	~Lv2ViewProc();
+	~Lv2ViewProc() override;
 
 private:
 	static AutoLilvNode uri(const char *uriStr);
diff --git a/include/MainWindow.h b/include/MainWindow.h
index 8fbc20e6a..05aa716b5 100644
--- a/include/MainWindow.h
+++ b/include/MainWindow.h
@@ -190,7 +190,7 @@ protected:
 private:
 	MainWindow();
 	MainWindow( const MainWindow & );
-	virtual ~MainWindow();
+	~MainWindow() override;
 
 	void finalize();
 
diff --git a/include/MeterDialog.h b/include/MeterDialog.h
index e606a4482..e744ea9d4 100644
--- a/include/MeterDialog.h
+++ b/include/MeterDialog.h
@@ -41,7 +41,7 @@ class MeterDialog : public QWidget, public ModelView
 	Q_OBJECT
 public:
 	MeterDialog( QWidget * _parent, bool _simple = false );
-	virtual ~MeterDialog();
+	~MeterDialog() override;
 
 	void modelChanged() override;
 
diff --git a/include/MeterModel.h b/include/MeterModel.h
index bcd3fa2b2..8ed4ba1aa 100644
--- a/include/MeterModel.h
+++ b/include/MeterModel.h
@@ -38,7 +38,7 @@ class MeterModel : public Model
 	mapPropertyFromModel(int,getDenominator,setDenominator,m_denominatorModel);
 public:
 	MeterModel( Model * _parent );
-	~MeterModel();
+	~MeterModel() override;
 
 	void saveSettings( QDomDocument & _doc, QDomElement & _this,
 						const QString & _name );
diff --git a/include/MidiAlsaRaw.h b/include/MidiAlsaRaw.h
index 3ab2b8af7..57a477264 100644
--- a/include/MidiAlsaRaw.h
+++ b/include/MidiAlsaRaw.h
@@ -48,7 +48,7 @@ class MidiAlsaRaw : public QThread, public MidiClientRaw
 	Q_OBJECT
 public:
 	MidiAlsaRaw();
-	virtual ~MidiAlsaRaw();
+	~MidiAlsaRaw() override;
 
 	static QString probeDevice();
 
diff --git a/include/MidiAlsaSeq.h b/include/MidiAlsaSeq.h
index 8a2d3a098..fa287a409 100644
--- a/include/MidiAlsaSeq.h
+++ b/include/MidiAlsaSeq.h
@@ -51,7 +51,7 @@ class MidiAlsaSeq : public QThread, public MidiClient
 	Q_OBJECT
 public:
 	MidiAlsaSeq();
-	virtual ~MidiAlsaSeq();
+	~MidiAlsaSeq() override;
 
 	static QString probeDevice();
 
@@ -70,7 +70,7 @@ public:
 
 
 
-	virtual void processOutEvent( const MidiEvent & _me,
+	void processOutEvent( const MidiEvent & _me,
 						const TimePos & _time,
 						const MidiPort * _port ) override;
 
@@ -95,20 +95,20 @@ public:
 	QString sourcePortName( const MidiEvent & ) const override;
 
 	// (un)subscribe given MidiPort to/from destination-port
-	virtual void subscribeReadablePort( MidiPort * _port,
+	void subscribeReadablePort( MidiPort * _port,
 						const QString & _dest,
 						bool _subscribe = true ) override;
-	virtual void subscribeWritablePort( MidiPort * _port,
+	void subscribeWritablePort( MidiPort * _port,
 						const QString & _dest,
 						bool _subscribe = true ) override;
-	virtual void connectRPChanged( QObject * _receiver,
+	void connectRPChanged( QObject * _receiver,
 							const char * _member ) override
 	{
 		connect( this, SIGNAL( readablePortsChanged() ),
 							_receiver, _member );
 	}
 
-	virtual void connectWPChanged( QObject * _receiver,
+	void connectWPChanged( QObject * _receiver,
 							const char * _member ) override
 	{
 		connect( this, SIGNAL( writablePortsChanged() ),
diff --git a/include/MidiClient.h b/include/MidiClient.h
index 835d2e46a..f5efc659a 100644
--- a/include/MidiClient.h
+++ b/include/MidiClient.h
@@ -125,7 +125,7 @@ class MidiClientRaw : public MidiClient
 {
 public:
 	MidiClientRaw();
-	virtual ~MidiClientRaw();
+	~MidiClientRaw() override;
 
 	// we are raw-clients for sure!
 	bool isRaw() const override
diff --git a/include/MidiClip.h b/include/MidiClip.h
index 173ca5699..6433ba507 100644
--- a/include/MidiClip.h
+++ b/include/MidiClip.h
@@ -55,7 +55,7 @@ public:
 
 	MidiClip( InstrumentTrack* instrumentTrack );
 	MidiClip( const MidiClip& other );
-	virtual ~MidiClip();
+	~MidiClip() override;
 
 	void init();
 
diff --git a/include/MidiClipView.h b/include/MidiClipView.h
index c9f1c3e1e..278e49443 100644
--- a/include/MidiClipView.h
+++ b/include/MidiClipView.h
@@ -43,7 +43,7 @@ class MidiClipView : public ClipView
 
 public:
 	MidiClipView( MidiClip* clip, TrackView* parent );
- 	virtual ~MidiClipView() = default;
+ 	~MidiClipView() override = default;
 
 	Q_PROPERTY(QColor noteFillColor READ getNoteFillColor WRITE setNoteFillColor)
 	Q_PROPERTY(QColor noteBorderColor READ getNoteBorderColor WRITE setNoteBorderColor)
diff --git a/include/MidiController.h b/include/MidiController.h
index 533f8ff03..8b1db0476 100644
--- a/include/MidiController.h
+++ b/include/MidiController.h
@@ -49,12 +49,12 @@ class MidiController : public Controller, public MidiEventProcessor
 	Q_OBJECT
 public:
 	MidiController( Model * _parent );
-	virtual ~MidiController();
+	~MidiController() override;
 
-	virtual void processInEvent( const MidiEvent & _me,
+	void processInEvent( const MidiEvent & _me,
 					const TimePos & _time, f_cnt_t offset = 0 ) override;
 
-	virtual void processOutEvent( const MidiEvent& _me,
+	void processOutEvent( const MidiEvent& _me,
 					const TimePos & _time, f_cnt_t offset = 0 ) override
 	{
 		// No output yet
diff --git a/include/MidiDummy.h b/include/MidiDummy.h
index 8744c6aa2..e1c0e3e6a 100644
--- a/include/MidiDummy.h
+++ b/include/MidiDummy.h
@@ -38,7 +38,7 @@ public:
 	MidiDummy()
 	{
 	}
-	virtual ~MidiDummy()
+	~MidiDummy() override
 	{
 	}
 
diff --git a/include/MidiJack.h b/include/MidiJack.h
index 16d09d431..a4a944b81 100644
--- a/include/MidiJack.h
+++ b/include/MidiJack.h
@@ -53,7 +53,7 @@ class MidiJack : public QThread, public MidiClientRaw
         Q_OBJECT
 public:
 	MidiJack();
-	virtual ~MidiJack();
+	~MidiJack() override;
 
 	jack_client_t* jackClient();
 
@@ -76,8 +76,8 @@ public:
 
 
 protected:
-	virtual void sendByte( const unsigned char c );
-	virtual void run();
+	void sendByte( const unsigned char c ) override;
+	void run() override;
 
 
 private:
diff --git a/include/MidiOss.h b/include/MidiOss.h
index 30f78bec1..944359055 100644
--- a/include/MidiOss.h
+++ b/include/MidiOss.h
@@ -44,7 +44,7 @@ class MidiOss : public QThread, public MidiClientRaw
 	Q_OBJECT
 public:
 	MidiOss();
-	virtual ~MidiOss();
+	~MidiOss() override;
 
 	static QString probeDevice();
 
diff --git a/include/MidiPort.h b/include/MidiPort.h
index 3d3ceffdb..562379ba8 100644
--- a/include/MidiPort.h
+++ b/include/MidiPort.h
@@ -83,7 +83,7 @@ public:
 			MidiEventProcessor* eventProcessor,
 			Model* parent = nullptr,
 			Mode mode = Disabled );
-	virtual ~MidiPort();
+	~MidiPort() override;
 
 	void setName( const QString& name );
 
diff --git a/include/MidiPortMenu.h b/include/MidiPortMenu.h
index 7f7689edc..eb44ace57 100644
--- a/include/MidiPortMenu.h
+++ b/include/MidiPortMenu.h
@@ -41,7 +41,7 @@ class MidiPortMenu : public QMenu, public ModelView
 	Q_OBJECT
 public:
 	MidiPortMenu( MidiPort::Modes _mode );
-	virtual ~MidiPortMenu();
+	~MidiPortMenu() override;
 
 
 public slots:
diff --git a/include/MidiSndio.h b/include/MidiSndio.h
index 07c42186d..1ffbae5ce 100644
--- a/include/MidiSndio.h
+++ b/include/MidiSndio.h
@@ -46,7 +46,7 @@ class MidiSndio : public QThread, public MidiClientRaw
 	Q_OBJECT
 public:
 	MidiSndio( void );
-	virtual ~MidiSndio();
+	~MidiSndio() override;
 
 	static QString probeDevice(void);
 
diff --git a/include/Mixer.h b/include/Mixer.h
index 36aa9f5d0..e6fdb2b06 100644
--- a/include/Mixer.h
+++ b/include/Mixer.h
@@ -102,7 +102,7 @@ class MixerRoute : public QObject
 	Q_OBJECT
 	public:		
 		MixerRoute( MixerChannel * from, MixerChannel * to, float amount );
-		virtual ~MixerRoute();
+		~MixerRoute() override;
 		
 	mix_ch_t senderIndex() const
 	{
@@ -143,7 +143,7 @@ class LMMS_EXPORT Mixer : public Model, public JournallingObject
 	Q_OBJECT
 public:
 	Mixer();
-	virtual ~Mixer();
+	~Mixer() override;
 
 	void mixToChannel( const sampleFrame * _buf, mix_ch_t _ch );
 
diff --git a/include/MixerLine.h b/include/MixerLine.h
index 12ac3df75..decd5f3aa 100644
--- a/include/MixerLine.h
+++ b/include/MixerLine.h
@@ -50,7 +50,7 @@ public:
 	Q_PROPERTY( QColor strokeInnerActive READ strokeInnerActive WRITE setStrokeInnerActive )
 	Q_PROPERTY( QColor strokeInnerInactive READ strokeInnerInactive WRITE setStrokeInnerInactive )
 	MixerLine( QWidget * _parent, MixerView * _mv, int _channelIndex);
-	~MixerLine();
+	~MixerLine() override;
 
 	void paintEvent( QPaintEvent * ) override;
 	void mousePressEvent( QMouseEvent * ) override;
diff --git a/include/MixerLineLcdSpinBox.h b/include/MixerLineLcdSpinBox.h
index 7e739093d..51c7ab938 100644
--- a/include/MixerLineLcdSpinBox.h
+++ b/include/MixerLineLcdSpinBox.h
@@ -41,7 +41,7 @@ public:
 	MixerLineLcdSpinBox(int numDigits, QWidget * parent, const QString& name, TrackView * tv = nullptr) :
 		LcdSpinBox(numDigits, parent, name), m_tv(tv)
 	{}
-	virtual ~MixerLineLcdSpinBox() {}
+	~MixerLineLcdSpinBox() override {}
 
 	void setTrackView(TrackView * tv);
 
diff --git a/include/MixerView.h b/include/MixerView.h
index 5e63194c9..a7b1b5191 100644
--- a/include/MixerView.h
+++ b/include/MixerView.h
@@ -66,7 +66,7 @@ public:
 
 
 	MixerView();
-	virtual ~MixerView();
+	~MixerView() override;
 
 	void keyPressEvent(QKeyEvent * e) override;
 
diff --git a/include/Model.h b/include/Model.h
index 1c96de21c..1621d77e8 100644
--- a/include/Model.h
+++ b/include/Model.h
@@ -45,7 +45,7 @@ public:
 	{
 	}
 
-	virtual ~Model()
+	~Model() override
 	{
 	}
 
diff --git a/include/NStateButton.h b/include/NStateButton.h
index ff48593a7..4dac1a436 100644
--- a/include/NStateButton.h
+++ b/include/NStateButton.h
@@ -41,7 +41,7 @@ class NStateButton : public ToolButton
 	Q_OBJECT
 public:
 	NStateButton( QWidget * _parent );
-	virtual ~NStateButton();
+	~NStateButton() override;
 	void addState( const QPixmap & _pixmap, const QString & _tooltip = "" );
 
 	inline void setGeneralToolTip( const QString & _tooltip )
diff --git a/include/Note.h b/include/Note.h
index d6e0b85c2..f1c10c0ac 100644
--- a/include/Note.h
+++ b/include/Note.h
@@ -98,7 +98,7 @@ public:
 		panning_t panning = DefaultPanning,
 		DetuningHelper * detuning = nullptr );
 	Note( const Note & note );
-	virtual ~Note();
+	~Note() override;
 
 	// used by GUI
 	inline void setSelected( const bool selected ) { m_selected = selected; }
diff --git a/include/NotePlayHandle.h b/include/NotePlayHandle.h
index 396d00e71..c0980c12b 100644
--- a/include/NotePlayHandle.h
+++ b/include/NotePlayHandle.h
@@ -74,7 +74,7 @@ public:
 					NotePlayHandle* parent = nullptr,
 					int midiEventChannel = -1,
 					Origin origin = OriginMidiClip );
-	virtual ~NotePlayHandle();
+	~NotePlayHandle() override;
 
 	void * operator new ( size_t size, void * p )
 	{
diff --git a/include/Oscilloscope.h b/include/Oscilloscope.h
index 4404fd98b..db4cf2b4a 100644
--- a/include/Oscilloscope.h
+++ b/include/Oscilloscope.h
@@ -43,7 +43,7 @@ public:
 	Q_PROPERTY( QColor clippingColor READ clippingColor WRITE setClippingColor )
 
 	Oscilloscope( QWidget * _parent );
-	virtual ~Oscilloscope();
+	~Oscilloscope() override;
 
 	void setActive( bool _active );
 
diff --git a/include/PatternClip.h b/include/PatternClip.h
index a1beb00f5..f1d0e2557 100644
--- a/include/PatternClip.h
+++ b/include/PatternClip.h
@@ -39,7 +39,7 @@ class PatternClip : public Clip
 {
 public:
 	PatternClip(Track* track);
-	virtual ~PatternClip() = default;
+	~PatternClip() override = default;
 
 	void saveSettings( QDomDocument & _doc, QDomElement & _parent ) override;
 	void loadSettings( const QDomElement & _this ) override;
diff --git a/include/PatternClipView.h b/include/PatternClipView.h
index d66de70f0..d170e4bef 100644
--- a/include/PatternClipView.h
+++ b/include/PatternClipView.h
@@ -44,7 +44,7 @@ class PatternClipView : public ClipView
 	Q_OBJECT
 public:
 	PatternClipView(Clip* clip, TrackView* tv);
-	virtual ~PatternClipView() = default;
+	~PatternClipView() override = default;
 
 
 public slots:
diff --git a/include/PatternStore.h b/include/PatternStore.h
index 39b65d1c1..58791e40d 100644
--- a/include/PatternStore.h
+++ b/include/PatternStore.h
@@ -68,7 +68,7 @@ class LMMS_EXPORT PatternStore : public TrackContainer
 	mapPropertyFromModel(int, currentPattern, setCurrentPattern, m_patternComboBoxModel);
 public:
 	PatternStore();
-	virtual ~PatternStore();
+	~PatternStore() override;
 
 	virtual bool play(TimePos start, const fpp_t frames, const f_cnt_t frameBase, int clipNum = -1);
 
diff --git a/include/PatternTrack.h b/include/PatternTrack.h
index a8e7a505c..3527b5e49 100644
--- a/include/PatternTrack.h
+++ b/include/PatternTrack.h
@@ -51,15 +51,15 @@ class LMMS_EXPORT PatternTrack : public Track
 	Q_OBJECT
 public:
 	PatternTrack(TrackContainer* tc);
-	virtual ~PatternTrack();
+	~PatternTrack() override;
 
-	virtual bool play( const TimePos & _start, const fpp_t _frames,
+	bool play( const TimePos & _start, const fpp_t _frames,
 
 						const f_cnt_t _frame_base, int _clip_num = -1 ) override;
 	gui::TrackView * createView( gui::TrackContainerView* tcv ) override;
 	Clip* createClip(const TimePos & pos) override;
 
-	virtual void saveTrackSpecificSettings( QDomDocument & _doc,
+	void saveTrackSpecificSettings( QDomDocument & _doc,
 							QDomElement & _parent ) override;
 	void loadTrackSpecificSettings( const QDomElement & _this ) override;
 
diff --git a/include/PatternTrackView.h b/include/PatternTrackView.h
index 41f8fac33..b6d33e444 100644
--- a/include/PatternTrackView.h
+++ b/include/PatternTrackView.h
@@ -45,7 +45,7 @@ class PatternTrackView : public TrackView
 	Q_OBJECT
 public:
 	PatternTrackView(PatternTrack* pt, TrackContainerView* tcv);
-	virtual ~PatternTrackView();
+	~PatternTrackView() override;
 
 	bool close() override;
 
diff --git a/include/PeakController.h b/include/PeakController.h
index d50c0b06f..01a8e968c 100644
--- a/include/PeakController.h
+++ b/include/PeakController.h
@@ -47,7 +47,7 @@ public:
 		PeakControllerEffect *_peak_effect = nullptr );
 
 
-	virtual ~PeakController();
+	~PeakController() override;
 
 	void saveSettings( QDomDocument & _doc, QDomElement & _this ) override;
 	void loadSettings( const QDomElement & _this ) override;
@@ -92,7 +92,7 @@ class PeakControllerDialog : public ControllerDialog
 	Q_OBJECT
 public:
 	PeakControllerDialog( Controller * _controller, QWidget * _parent );
-	virtual ~PeakControllerDialog();
+	~PeakControllerDialog() override;
 
 protected:
 	void contextMenuEvent( QContextMenuEvent * _me ) override;
diff --git a/include/PianoRoll.h b/include/PianoRoll.h
index 73a2e5b76..3d74a79d6 100644
--- a/include/PianoRoll.h
+++ b/include/PianoRoll.h
@@ -298,7 +298,7 @@ private:
 
 	PianoRoll();
 	PianoRoll( const PianoRoll & );
-	virtual ~PianoRoll();
+	~PianoRoll() override;
 
 	void autoScroll(const TimePos & t );
 
diff --git a/include/PianoView.h b/include/PianoView.h
index 7a6ab6479..7f586809d 100644
--- a/include/PianoView.h
+++ b/include/PianoView.h
@@ -44,7 +44,7 @@ class PianoView : public QWidget, public ModelView
 	Q_OBJECT
 public:
 	PianoView( QWidget * _parent );
-	virtual ~PianoView() = default;
+	~PianoView() override = default;
 
 	static int getKeyFromKeyEvent( QKeyEvent * _ke );
 
diff --git a/include/PixmapButton.h b/include/PixmapButton.h
index f4062826d..ec5ac1b28 100644
--- a/include/PixmapButton.h
+++ b/include/PixmapButton.h
@@ -40,7 +40,7 @@ class LMMS_EXPORT PixmapButton : public AutomatableButton
 public:
 	PixmapButton( QWidget * _parent,
 					const QString & _name = QString() );
-	virtual ~PixmapButton();
+	~PixmapButton() override;
 
 	void setActiveGraphic( const QPixmap & _pm );
 	void setInactiveGraphic( const QPixmap & _pm, bool _update = true );
diff --git a/include/Plugin.h b/include/Plugin.h
index b50d81116..7042edb41 100644
--- a/include/Plugin.h
+++ b/include/Plugin.h
@@ -244,7 +244,7 @@ public:
 	//!   See the key() function
 	Plugin(const Descriptor * descriptor, Model * parent,
 		const Descriptor::SubPluginFeatures::Key *key = nullptr);
-	virtual ~Plugin();
+	~Plugin() override;
 
 	//! Return display-name out of sub plugin or descriptor
 	QString displayName() const override;
diff --git a/include/PluginBrowser.h b/include/PluginBrowser.h
index 0b2a59d15..75fa543f4 100644
--- a/include/PluginBrowser.h
+++ b/include/PluginBrowser.h
@@ -41,7 +41,7 @@ class PluginBrowser : public SideBarWidget
 	Q_OBJECT
 public:
 	PluginBrowser( QWidget * _parent );
-	virtual ~PluginBrowser() = default;
+	~PluginBrowser() override = default;
 
 private slots:
 	void onFilterChanged( const QString & filter );
diff --git a/include/PresetPreviewPlayHandle.h b/include/PresetPreviewPlayHandle.h
index 9dd151330..dfff0fc21 100644
--- a/include/PresetPreviewPlayHandle.h
+++ b/include/PresetPreviewPlayHandle.h
@@ -40,7 +40,7 @@ class LMMS_EXPORT PresetPreviewPlayHandle : public PlayHandle
 {
 public:
 	PresetPreviewPlayHandle( const QString& presetFile, bool loadByPlugin = false, DataFile *dataFile = 0 );
-	virtual ~PresetPreviewPlayHandle();
+	~PresetPreviewPlayHandle() override;
 
 	inline bool affinityMatters() const override
 	{
diff --git a/include/ProjectNotes.h b/include/ProjectNotes.h
index fda5c9b51..384f24f79 100644
--- a/include/ProjectNotes.h
+++ b/include/ProjectNotes.h
@@ -44,7 +44,7 @@ class LMMS_EXPORT ProjectNotes : public QMainWindow, public SerializingObject
 	Q_OBJECT
 public:
 	ProjectNotes();
-	virtual ~ProjectNotes();
+	~ProjectNotes() override;
 
 	void clear();
 	void setText( const QString & _text );
diff --git a/include/ProjectRenderer.h b/include/ProjectRenderer.h
index bd61c4730..9fa0bc507 100644
--- a/include/ProjectRenderer.h
+++ b/include/ProjectRenderer.h
@@ -64,7 +64,7 @@ public:
 				const OutputSettings & _os,
 				ExportFileFormats _file_format,
 				const QString & _out_file );
-	virtual ~ProjectRenderer();
+	~ProjectRenderer() override;
 
 	bool isReady() const
 	{
diff --git a/include/RemotePlugin.h b/include/RemotePlugin.h
index ec08896e2..73810150d 100644
--- a/include/RemotePlugin.h
+++ b/include/RemotePlugin.h
@@ -39,7 +39,7 @@ class ProcessWatcher : public QThread
 	Q_OBJECT
 public:
 	ProcessWatcher( RemotePlugin * );
-	virtual ~ProcessWatcher() = default;
+	~ProcessWatcher() override = default;
 
 	void stop()
 	{
@@ -66,7 +66,7 @@ class LMMS_EXPORT RemotePlugin : public QObject, public RemotePluginBase
 	Q_OBJECT
 public:
 	RemotePlugin();
-	virtual ~RemotePlugin();
+	~RemotePlugin() override;
 
 	inline bool isRunning()
 	{
diff --git a/include/RemotePluginClient.h b/include/RemotePluginClient.h
index 69a9d41e9..b96b71b85 100644
--- a/include/RemotePluginClient.h
+++ b/include/RemotePluginClient.h
@@ -51,11 +51,11 @@ public:
 #else
 	RemotePluginClient( const char * socketPath );
 #endif
-	virtual ~RemotePluginClient();
+	~RemotePluginClient() override;
 
 	const VstSyncData* getVstSyncData();
 
-	virtual bool processMessage( const message & _m );
+	bool processMessage( const message & _m ) override;
 
 	virtual void process( const sampleFrame * _in_buf,
 					sampleFrame * _out_buf ) = 0;
diff --git a/include/RenameDialog.h b/include/RenameDialog.h
index c1e30b9d8..f2a289ee0 100644
--- a/include/RenameDialog.h
+++ b/include/RenameDialog.h
@@ -40,7 +40,7 @@ class RenameDialog : public QDialog
 	Q_OBJECT
 public:
 	RenameDialog( QString & _string );
-	~RenameDialog();
+	~RenameDialog() override;
 
 
 protected:
diff --git a/include/RenderManager.h b/include/RenderManager.h
index ff59cb953..9ec4c511e 100644
--- a/include/RenderManager.h
+++ b/include/RenderManager.h
@@ -46,7 +46,7 @@ public:
 		ProjectRenderer::ExportFileFormats fmt,
 		QString outputPath);
 
-	virtual ~RenderManager();
+	~RenderManager() override;
 
 	/// Export all unmuted tracks into a single file
 	void renderProject();
diff --git a/include/RingBuffer.h b/include/RingBuffer.h
index efb5afd39..c7db6b4e5 100644
--- a/include/RingBuffer.h
+++ b/include/RingBuffer.h
@@ -53,7 +53,7 @@ public:
  * 	\param size The size of the buffer in milliseconds. The actual size will be size + period size
  */
 	RingBuffer( float size );
-	virtual ~RingBuffer();
+	~RingBuffer() override;
 
 
 
diff --git a/include/RowTableView.h b/include/RowTableView.h
index fc55383a1..9934dbade 100644
--- a/include/RowTableView.h
+++ b/include/RowTableView.h
@@ -39,7 +39,7 @@ class RowTableView : public QTableView
 	Q_OBJECT
 public:
 	RowTableView( QWidget * parent = 0 );
-	virtual ~RowTableView();
+	~RowTableView() override;
 
 	void setModel( QAbstractItemModel * model ) override;
 
diff --git a/include/Rubberband.h b/include/Rubberband.h
index 1332a932d..b00d10dd6 100644
--- a/include/Rubberband.h
+++ b/include/Rubberband.h
@@ -44,7 +44,7 @@ public:
 	{
 	}
 
-	virtual ~selectableObject()
+	~selectableObject() override
 	{
 	}
 
@@ -80,7 +80,7 @@ class RubberBand : public QRubberBand
 {
 public:
 	RubberBand( QWidget * _parent );
-	virtual ~RubberBand();
+	~RubberBand() override;
 
 	QVector<selectableObject *> selectedObjects() const;
 	QVector<selectableObject *> selectableObjects() const;
diff --git a/include/SampleBuffer.h b/include/SampleBuffer.h
index b556fccbe..f4d67859e 100644
--- a/include/SampleBuffer.h
+++ b/include/SampleBuffer.h
@@ -119,7 +119,7 @@ public:
 	friend void swap(SampleBuffer & first, SampleBuffer & second) noexcept;
 	SampleBuffer& operator= (const SampleBuffer that);
 
-	virtual ~SampleBuffer();
+	~SampleBuffer() override;
 
 	bool play(
 		sampleFrame * ab,
diff --git a/include/SampleClip.h b/include/SampleClip.h
index 52a2d6209..51225ded8 100644
--- a/include/SampleClip.h
+++ b/include/SampleClip.h
@@ -47,7 +47,7 @@ class SampleClip : public Clip
 public:
 	SampleClip( Track * _track );
 	SampleClip( const SampleClip& orig );
-	virtual ~SampleClip();
+	~SampleClip() override;
 
 	SampleClip& operator=( const SampleClip& that ) = delete;
 
diff --git a/include/SampleClipView.h b/include/SampleClipView.h
index d5218e28a..74873dca7 100644
--- a/include/SampleClipView.h
+++ b/include/SampleClipView.h
@@ -44,7 +44,7 @@ class SampleClipView : public ClipView
 
 public:
 	SampleClipView( SampleClip * _clip, TrackView * _tv );
-	virtual ~SampleClipView() = default;
+	~SampleClipView() override = default;
 
 public slots:
 	void updateSample();
diff --git a/include/SamplePlayHandle.h b/include/SamplePlayHandle.h
index d27591df3..69ee3b38d 100644
--- a/include/SamplePlayHandle.h
+++ b/include/SamplePlayHandle.h
@@ -46,7 +46,7 @@ public:
 	SamplePlayHandle( SampleBuffer* sampleBuffer , bool ownAudioPort = true );
 	SamplePlayHandle( const QString& sampleFile );
 	SamplePlayHandle( SampleClip* clip );
-	virtual ~SamplePlayHandle();
+	~SamplePlayHandle() override;
 
 	inline bool affinityMatters() const override
 	{
diff --git a/include/SampleRecordHandle.h b/include/SampleRecordHandle.h
index 724f4216d..466e240a8 100644
--- a/include/SampleRecordHandle.h
+++ b/include/SampleRecordHandle.h
@@ -46,7 +46,7 @@ class SampleRecordHandle : public PlayHandle
 {
 public:
 	SampleRecordHandle( SampleClip* clip );
-	virtual ~SampleRecordHandle();
+	~SampleRecordHandle() override;
 
 	void play( sampleFrame * _working_buffer ) override;
 	bool isFinished() const override;
diff --git a/include/SampleTrack.h b/include/SampleTrack.h
index 677e04889..8f424178a 100644
--- a/include/SampleTrack.h
+++ b/include/SampleTrack.h
@@ -47,15 +47,15 @@ class SampleTrack : public Track
 	Q_OBJECT
 public:
 	SampleTrack( TrackContainer* tc );
-	virtual ~SampleTrack();
+	~SampleTrack() override;
 
-	virtual bool play( const TimePos & _start, const fpp_t _frames,
+	bool play( const TimePos & _start, const fpp_t _frames,
 						const f_cnt_t _frame_base, int _clip_num = -1 ) override;
 	gui::TrackView * createView( gui::TrackContainerView* tcv ) override;
 	Clip* createClip(const TimePos & pos) override;
 
 
-	virtual void saveTrackSpecificSettings( QDomDocument & _doc,
+	void saveTrackSpecificSettings( QDomDocument & _doc,
 							QDomElement & _parent ) override;
 	void loadTrackSpecificSettings( const QDomElement & _this ) override;
 
diff --git a/include/SampleTrackView.h b/include/SampleTrackView.h
index 1223f999d..9921aa735 100644
--- a/include/SampleTrackView.h
+++ b/include/SampleTrackView.h
@@ -47,7 +47,7 @@ class SampleTrackView : public TrackView
 	Q_OBJECT
 public:
 	SampleTrackView( SampleTrack* Track, TrackContainerView* tcv );
-	virtual ~SampleTrackView();
+	~SampleTrackView() override;
 
 	SampleTrackWindow * getSampleTrackWindow()
 	{
diff --git a/include/SampleTrackWindow.h b/include/SampleTrackWindow.h
index dd670fd09..fb4e3f5e8 100644
--- a/include/SampleTrackWindow.h
+++ b/include/SampleTrackWindow.h
@@ -50,7 +50,7 @@ class SampleTrackWindow : public QWidget, public ModelView, public SerializingOb
 	Q_OBJECT
 public:
 	SampleTrackWindow(SampleTrackView * tv);
-	virtual ~SampleTrackWindow();
+	~SampleTrackWindow() override;
 
 	SampleTrack * model()
 	{
diff --git a/include/SetupDialog.h b/include/SetupDialog.h
index 28668d8e9..9ce6e043d 100644
--- a/include/SetupDialog.h
+++ b/include/SetupDialog.h
@@ -64,7 +64,7 @@ public:
 	};
 
 	SetupDialog(ConfigTabs tab_to_open = GeneralSettings);
-	virtual ~SetupDialog();
+	~SetupDialog() override;
 
 
 protected slots:
diff --git a/include/SideBar.h b/include/SideBar.h
index 70bac6385..ba9fe11a6 100644
--- a/include/SideBar.h
+++ b/include/SideBar.h
@@ -42,7 +42,7 @@ class SideBar : public QToolBar
 	Q_OBJECT
 public:
 	SideBar( Qt::Orientation _orientation, QWidget * _parent );
-	virtual ~SideBar();
+	~SideBar() override;
 
 	void appendTab( SideBarWidget * _sbw );
 
diff --git a/include/SideBarWidget.h b/include/SideBarWidget.h
index 71a33a3ce..4b7ff4b2d 100644
--- a/include/SideBarWidget.h
+++ b/include/SideBarWidget.h
@@ -41,7 +41,7 @@ class SideBarWidget : public QWidget
 public:
 	SideBarWidget( const QString & _title, const QPixmap & _icon,
 							QWidget * _parent );
-	virtual ~SideBarWidget();
+	~SideBarWidget() override;
 
 	inline const QPixmap & icon() const
 	{
diff --git a/include/Song.h b/include/Song.h
index cfe63a2ea..422e645bf 100644
--- a/include/Song.h
+++ b/include/Song.h
@@ -406,7 +406,7 @@ private slots:
 private:
 	Song();
 	Song( const Song & );
-	virtual ~Song();
+	~Song() override;
 
 
 	inline bar_t currentBar() const
diff --git a/include/SongEditor.h b/include/SongEditor.h
index 29a9be0bf..b848fe776 100644
--- a/include/SongEditor.h
+++ b/include/SongEditor.h
@@ -66,7 +66,7 @@ public:
 	};
 
 	SongEditor( Song * song );
-	~SongEditor();
+	~SongEditor() override;
 
 	void saveSettings( QDomDocument& doc, QDomElement& element ) override;
 	void loadSettings( const QDomElement& element ) override;
diff --git a/include/StringPairDrag.h b/include/StringPairDrag.h
index 9da2381b0..e58b88f90 100644
--- a/include/StringPairDrag.h
+++ b/include/StringPairDrag.h
@@ -44,7 +44,7 @@ class LMMS_EXPORT StringPairDrag : public QDrag
 public:
 	StringPairDrag( const QString & _key, const QString & _value,
 					const QPixmap & _icon, QWidget * _w );
-	~StringPairDrag();
+	~StringPairDrag() override;
 
 	static bool processDragEnterEvent( QDragEnterEvent * _dee,
 						const QString & _allowed_keys );
diff --git a/include/TabBar.h b/include/TabBar.h
index 9239aef94..2395e15f5 100644
--- a/include/TabBar.h
+++ b/include/TabBar.h
@@ -46,7 +46,7 @@ class LMMS_EXPORT TabBar : public QWidget
 public:
 	TabBar( QWidget * _parent,
 			QBoxLayout::Direction _dir = QBoxLayout::LeftToRight );
-	virtual ~TabBar() = default;
+	~TabBar() override = default;
 
 	TabButton * addTab( QWidget * _w, const QString & _text,
 					int _id, bool _add_stretch = false,
diff --git a/include/TabButton.h b/include/TabButton.h
index d5d70fcac..6d58cc10e 100644
--- a/include/TabButton.h
+++ b/include/TabButton.h
@@ -45,7 +45,7 @@ public:
 						SLOT( slotClicked() ) );
 	}
 
-	~TabButton()
+	~TabButton() override
 	{
 	}
 
diff --git a/include/TabWidget.h b/include/TabWidget.h
index fdd0123da..0f998e9e2 100644
--- a/include/TabWidget.h
+++ b/include/TabWidget.h
@@ -43,7 +43,7 @@ public:
 	//!   If false, all child widget will be cut down to the TabWidget's size
 	TabWidget( const QString & _caption, QWidget * _parent,
 				bool usePixmap = false, bool resizable = false );
-	virtual ~TabWidget() = default;
+	~TabWidget() override = default;
 
 	void addTab( QWidget * w, const QString & name, const char *pixmap = nullptr, int idx = -1 );
 
diff --git a/include/TemplatesMenu.h b/include/TemplatesMenu.h
index 45c7bce4b..7f425bd2f 100644
--- a/include/TemplatesMenu.h
+++ b/include/TemplatesMenu.h
@@ -37,7 +37,7 @@ class TemplatesMenu : public QMenu
 	Q_OBJECT
 public:
 	TemplatesMenu(QWidget *parent = nullptr);
-	virtual ~TemplatesMenu() = default;
+	~TemplatesMenu() override = default;
 
 private slots:
 	static void createNewProjectFromTemplate(QAction * _action);
diff --git a/include/TempoSyncKnob.h b/include/TempoSyncKnob.h
index 22a21f3dc..25a3b7e3b 100644
--- a/include/TempoSyncKnob.h
+++ b/include/TempoSyncKnob.h
@@ -42,7 +42,7 @@ class LMMS_EXPORT TempoSyncKnob : public Knob
 	Q_OBJECT
 public:
 	TempoSyncKnob( knobTypes knobNum, QWidget* parent = nullptr, const QString& name = QString() );
-	virtual ~TempoSyncKnob();
+	~TempoSyncKnob() override;
 
 	const QString & syncDescription();
 	void setSyncDescription( const QString & _new_description );
diff --git a/include/TextFloat.h b/include/TextFloat.h
index 580c3b979..8a5ad9685 100644
--- a/include/TextFloat.h
+++ b/include/TextFloat.h
@@ -39,7 +39,7 @@ class LMMS_EXPORT TextFloat : public QWidget
 	Q_OBJECT
 public:
 	TextFloat();
-	virtual ~TextFloat()
+	~TextFloat() override
 	{
 	}
 
diff --git a/include/TimeDisplayWidget.h b/include/TimeDisplayWidget.h
index d8e38333a..33e23c222 100644
--- a/include/TimeDisplayWidget.h
+++ b/include/TimeDisplayWidget.h
@@ -39,7 +39,7 @@ class TimeDisplayWidget : public QWidget
 	Q_OBJECT
 public:
 	TimeDisplayWidget();
-	virtual ~TimeDisplayWidget() = default;
+	~TimeDisplayWidget() override = default;
 
 
 protected:
diff --git a/include/TimeLineWidget.h b/include/TimeLineWidget.h
index 4cbddcda4..bada25640 100644
--- a/include/TimeLineWidget.h
+++ b/include/TimeLineWidget.h
@@ -78,7 +78,7 @@ public:
 
 	TimeLineWidget(int xoff, int yoff, float ppb, Song::PlayPos & pos,
 				const TimePos & begin, Song::PlayModes mode, QWidget * parent);
-	virtual ~TimeLineWidget();
+	~TimeLineWidget() override;
 
 	inline QColor const & getBarLineColor() const { return m_barLineColor; }
 	inline void setBarLineColor(QColor const & barLineColor) { m_barLineColor = barLineColor; }
diff --git a/include/ToolButton.h b/include/ToolButton.h
index c6e80b4c2..c173a9052 100644
--- a/include/ToolButton.h
+++ b/include/ToolButton.h
@@ -43,7 +43,7 @@ public:
 		QToolButton(_parent)
 	{ }
 
-	virtual ~ToolButton() = default;
+	~ToolButton() override = default;
 
 } ;
 
diff --git a/include/ToolPlugin.h b/include/ToolPlugin.h
index 899c31906..311757cf4 100644
--- a/include/ToolPlugin.h
+++ b/include/ToolPlugin.h
@@ -38,7 +38,7 @@ class LMMS_EXPORT ToolPlugin : public Plugin
 {
 public:
 	ToolPlugin( const Descriptor * _descriptor, Model * _parent );
-	virtual ~ToolPlugin();
+	~ToolPlugin() override;
 
 	// instantiate tool-plugin with given name or return NULL
 	// on failure
diff --git a/include/Track.h b/include/Track.h
index ec069c38f..1cf3f94c2 100644
--- a/include/Track.h
+++ b/include/Track.h
@@ -85,7 +85,7 @@ public:
 	} ;
 
 	Track( TrackTypes type, TrackContainer * tc );
-	virtual ~Track();
+	~Track() override;
 
 	static Track * create( TrackTypes tt, TrackContainer * tc );
 	static Track * create( const QDomElement & element,
diff --git a/include/TrackContainer.h b/include/TrackContainer.h
index beb7564ad..c2344db85 100644
--- a/include/TrackContainer.h
+++ b/include/TrackContainer.h
@@ -57,7 +57,7 @@ public:
 	} ;
 
 	TrackContainer();
-	virtual ~TrackContainer();
+	~TrackContainer() override;
 
 	void saveSettings( QDomDocument & _doc, QDomElement & _parent ) override;
 
diff --git a/include/TrackContainerView.h b/include/TrackContainerView.h
index edcffeb2f..7d9a648aa 100644
--- a/include/TrackContainerView.h
+++ b/include/TrackContainerView.h
@@ -73,7 +73,7 @@ class TrackContainerView : public QWidget, public ModelView,
 	Q_OBJECT
 public:
 	TrackContainerView( TrackContainer* tc );
-	virtual ~TrackContainerView();
+	~TrackContainerView() override;
 
 	void saveSettings( QDomDocument & _doc, QDomElement & _this ) override;
 	void loadSettings( const QDomElement & _this ) override;
@@ -184,7 +184,7 @@ private:
 	{
 	public:
 		scrollArea( TrackContainerView* parent );
-		virtual ~scrollArea();
+		~scrollArea() override;
 
 	protected:
 		void wheelEvent( QWheelEvent * _we ) override;
diff --git a/include/TrackContentWidget.h b/include/TrackContentWidget.h
index 228a3e739..4fad4ceb0 100644
--- a/include/TrackContentWidget.h
+++ b/include/TrackContentWidget.h
@@ -56,7 +56,7 @@ class TrackContentWidget : public QWidget, public JournallingObject
 
 public:
 	TrackContentWidget( TrackView * parent );
-	virtual ~TrackContentWidget();
+	~TrackContentWidget() override;
 
 	/*! \brief Updates the background tile pixmap. */
 	void updateBackground();
diff --git a/include/TrackLabelButton.h b/include/TrackLabelButton.h
index 3be64adee..30dd60d59 100644
--- a/include/TrackLabelButton.h
+++ b/include/TrackLabelButton.h
@@ -41,7 +41,7 @@ class TrackLabelButton : public QToolButton
 	Q_OBJECT
 public:
 	TrackLabelButton( TrackView * _tv, QWidget * _parent );
-	virtual ~TrackLabelButton();
+	~TrackLabelButton() override;
 
 
 public slots:
diff --git a/include/TrackOperationsWidget.h b/include/TrackOperationsWidget.h
index 92f1a889c..08b3e599e 100644
--- a/include/TrackOperationsWidget.h
+++ b/include/TrackOperationsWidget.h
@@ -40,7 +40,7 @@ class TrackOperationsWidget : public QWidget
 	Q_OBJECT
 public:
 	TrackOperationsWidget( TrackView * parent );
-	~TrackOperationsWidget();
+	~TrackOperationsWidget() override;
 
 
 protected:
diff --git a/include/TrackView.h b/include/TrackView.h
index 2f5c5ed28..f98579201 100644
--- a/include/TrackView.h
+++ b/include/TrackView.h
@@ -64,7 +64,7 @@ class TrackView : public QWidget, public ModelView, public JournallingObject
 	Q_OBJECT
 public:
 	TrackView( Track * _track, TrackContainerView* tcv );
-	virtual ~TrackView();
+	~TrackView() override;
 
 	inline const Track * getTrack() const
 	{
diff --git a/include/VstSyncController.h b/include/VstSyncController.h
index 947a65ea2..d5e6617cd 100644
--- a/include/VstSyncController.h
+++ b/include/VstSyncController.h
@@ -40,7 +40,7 @@ class VstSyncController : public QObject
 	Q_OBJECT
 public:
 	VstSyncController();
-	~VstSyncController();
+	~VstSyncController() override;
 
 	void setAbsolutePosition( double ticks );
 
diff --git a/include/embed.h b/include/embed.h
index 5dd6a41a2..23aebccec 100644
--- a/include/embed.h
+++ b/include/embed.h
@@ -120,7 +120,7 @@ public:
 	{
 	}
 
-	virtual QPixmap pixmap() const
+	QPixmap pixmap() const override
 	{
 		if( !m_name.isEmpty() )
 		{
@@ -130,7 +130,7 @@ public:
 		return( QPixmap() );
 	}
 
-	virtual QString pixmapName() const
+	QString pixmapName() const override
 	{
 		return QString( STRINGIFY(PLUGIN_NAME) ) + "::" + m_name;
 	}
diff --git a/plugins/Amplifier/Amplifier.h b/plugins/Amplifier/Amplifier.h
index 941971ae7..cc973cc27 100644
--- a/plugins/Amplifier/Amplifier.h
+++ b/plugins/Amplifier/Amplifier.h
@@ -37,10 +37,10 @@ class AmplifierEffect : public Effect
 {
 public:
 	AmplifierEffect( Model* parent, const Descriptor::SubPluginFeatures::Key* key );
-	virtual ~AmplifierEffect();
-	virtual bool processAudioBuffer( sampleFrame* buf, const fpp_t frames );
+	~AmplifierEffect() override;
+	bool processAudioBuffer( sampleFrame* buf, const fpp_t frames ) override;
 
-	virtual EffectControls* controls()
+	EffectControls* controls() override
 	{
 		return &m_ampControls;
 	}
diff --git a/plugins/Amplifier/AmplifierControlDialog.h b/plugins/Amplifier/AmplifierControlDialog.h
index 6362d5f72..fd2c7a338 100644
--- a/plugins/Amplifier/AmplifierControlDialog.h
+++ b/plugins/Amplifier/AmplifierControlDialog.h
@@ -42,7 +42,7 @@ class AmplifierControlDialog : public EffectControlDialog
 	Q_OBJECT
 public:
 	AmplifierControlDialog( AmplifierControls* controls );
-	virtual ~AmplifierControlDialog()
+	~AmplifierControlDialog() override
 	{
 	}
 
diff --git a/plugins/Amplifier/AmplifierControls.h b/plugins/Amplifier/AmplifierControls.h
index 7eaa0f099..6382b27fe 100644
--- a/plugins/Amplifier/AmplifierControls.h
+++ b/plugins/Amplifier/AmplifierControls.h
@@ -45,23 +45,23 @@ class AmplifierControls : public EffectControls
 	Q_OBJECT
 public:
 	AmplifierControls( AmplifierEffect* effect );
-	virtual ~AmplifierControls()
+	~AmplifierControls() override
 	{
 	}
 
-	virtual void saveSettings( QDomDocument & _doc, QDomElement & _parent );
-	virtual void loadSettings( const QDomElement & _this );
-	inline virtual QString nodeName() const
+	void saveSettings( QDomDocument & _doc, QDomElement & _parent ) override;
+	void loadSettings( const QDomElement & _this ) override;
+	inline QString nodeName() const override
 	{
 		return "AmplifierControls";
 	}
 
-	virtual int controlCount()
+	int controlCount() override
 	{
 		return 4;
 	}
 
-	virtual gui::EffectControlDialog* createView()
+	gui::EffectControlDialog* createView() override
 	{
 		return new gui::AmplifierControlDialog( this );
 	}
diff --git a/plugins/BassBooster/BassBooster.h b/plugins/BassBooster/BassBooster.h
index 9edca3b22..19eb9c50e 100644
--- a/plugins/BassBooster/BassBooster.h
+++ b/plugins/BassBooster/BassBooster.h
@@ -37,10 +37,10 @@ class BassBoosterEffect : public Effect
 {
 public:
 	BassBoosterEffect( Model* parent, const Descriptor::SubPluginFeatures::Key* key );
-	virtual ~BassBoosterEffect();
-	virtual bool processAudioBuffer( sampleFrame* buf, const fpp_t frames );
+	~BassBoosterEffect() override;
+	bool processAudioBuffer( sampleFrame* buf, const fpp_t frames ) override;
 
-	virtual EffectControls* controls()
+	EffectControls* controls() override
 	{
 		return &m_bbControls;
 	}
diff --git a/plugins/BassBooster/BassBoosterControlDialog.h b/plugins/BassBooster/BassBoosterControlDialog.h
index 89a60fa1a..968db7e60 100644
--- a/plugins/BassBooster/BassBoosterControlDialog.h
+++ b/plugins/BassBooster/BassBoosterControlDialog.h
@@ -40,7 +40,7 @@ class BassBoosterControlDialog : public EffectControlDialog
 	Q_OBJECT
 public:
 	BassBoosterControlDialog( BassBoosterControls* controls );
-	virtual ~BassBoosterControlDialog()
+	~BassBoosterControlDialog() override
 	{
 	}
 
diff --git a/plugins/BassBooster/BassBoosterControls.h b/plugins/BassBooster/BassBoosterControls.h
index c67ce4d7a..099862a02 100644
--- a/plugins/BassBooster/BassBoosterControls.h
+++ b/plugins/BassBooster/BassBoosterControls.h
@@ -39,23 +39,23 @@ class BassBoosterControls : public EffectControls
 	Q_OBJECT
 public:
 	BassBoosterControls( BassBoosterEffect* effect );
-	virtual ~BassBoosterControls()
+	~BassBoosterControls() override
 	{
 	}
 
-	virtual void saveSettings( QDomDocument & _doc, QDomElement & _parent );
-	virtual void loadSettings( const QDomElement & _this );
-	inline virtual QString nodeName() const
+	void saveSettings( QDomDocument & _doc, QDomElement & _parent ) override;
+	void loadSettings( const QDomElement & _this ) override;
+	inline QString nodeName() const override
 	{
 		return "bassboostercontrols";
 	}
 
-	virtual int controlCount()
+	int controlCount() override
 	{
 		return 3;
 	}
 
-	virtual gui::EffectControlDialog* createView()
+	gui::EffectControlDialog* createView() override
 	{
 		return new gui::BassBoosterControlDialog( this );
 	}
diff --git a/plugins/BitInvader/BitInvader.h b/plugins/BitInvader/BitInvader.h
index cce524beb..90a5dffa8 100644
--- a/plugins/BitInvader/BitInvader.h
+++ b/plugins/BitInvader/BitInvader.h
@@ -74,25 +74,25 @@ class BitInvader : public Instrument
 	Q_OBJECT
 public:
 	BitInvader(InstrumentTrack * _instrument_track );
-	virtual ~BitInvader();
+	~BitInvader() override;
 
-	virtual void playNote( NotePlayHandle * _n,
-						sampleFrame * _working_buffer );
-	virtual void deleteNotePluginData( NotePlayHandle * _n );
+	void playNote( NotePlayHandle * _n,
+						sampleFrame * _working_buffer ) override;
+	void deleteNotePluginData( NotePlayHandle * _n ) override;
 
 
-	virtual void saveSettings( QDomDocument & _doc,
-							QDomElement & _parent );
-	virtual void loadSettings( const QDomElement & _this );
+	void saveSettings( QDomDocument & _doc,
+							QDomElement & _parent ) override;
+	void loadSettings( const QDomElement & _this ) override;
 
-	virtual QString nodeName() const;
+	QString nodeName() const override;
 
-	virtual f_cnt_t desiredReleaseFrames() const
+	f_cnt_t desiredReleaseFrames() const override
 	{
 		return( 64 );
 	}
 
-	virtual gui::PluginView * instantiateView( QWidget * _parent );
+	gui::PluginView * instantiateView( QWidget * _parent ) override;
 
 protected slots:
 	void lengthChanged();
@@ -124,7 +124,7 @@ public:
 	BitInvaderView( Instrument * _instrument,
 					QWidget * _parent );
 
-	virtual ~BitInvaderView() {};
+	~BitInvaderView() override {};
 
 protected slots:
 	//void sampleSizeChanged( float _new_sample_length );
@@ -142,7 +142,7 @@ protected slots:
 	void smoothClicked( void  );
 
 private:
-	virtual void modelChanged();
+	void modelChanged() override;
 
 	Knob * m_sampleLengthKnob;
 	PixmapButton * m_sinWaveBtn;
diff --git a/plugins/Bitcrush/Bitcrush.h b/plugins/Bitcrush/Bitcrush.h
index 670742e20..a6e5556a2 100644
--- a/plugins/Bitcrush/Bitcrush.h
+++ b/plugins/Bitcrush/Bitcrush.h
@@ -40,10 +40,10 @@ class BitcrushEffect : public Effect
 {
 public:
 	BitcrushEffect( Model* parent, const Descriptor::SubPluginFeatures::Key* key );
-	virtual ~BitcrushEffect();
-	virtual bool processAudioBuffer( sampleFrame* buf, const fpp_t frames );
+	~BitcrushEffect() override;
+	bool processAudioBuffer( sampleFrame* buf, const fpp_t frames ) override;
 
-	virtual EffectControls* controls()
+	EffectControls* controls() override
 	{
 		return &m_controls;
 	}
diff --git a/plugins/Bitcrush/BitcrushControlDialog.h b/plugins/Bitcrush/BitcrushControlDialog.h
index 49d5bce7e..9649d50f2 100644
--- a/plugins/Bitcrush/BitcrushControlDialog.h
+++ b/plugins/Bitcrush/BitcrushControlDialog.h
@@ -43,7 +43,7 @@ class BitcrushControlDialog : public EffectControlDialog
 	Q_OBJECT
 public:
 	BitcrushControlDialog( BitcrushControls * controls );
-	virtual ~BitcrushControlDialog()
+	~BitcrushControlDialog() override
 	{
 	}
 };
diff --git a/plugins/Bitcrush/BitcrushControls.h b/plugins/Bitcrush/BitcrushControls.h
index ed69dd704..963fb298e 100644
--- a/plugins/Bitcrush/BitcrushControls.h
+++ b/plugins/Bitcrush/BitcrushControls.h
@@ -40,21 +40,21 @@ class BitcrushControls : public EffectControls
 	Q_OBJECT
 public:
 	BitcrushControls( BitcrushEffect * eff );
-	virtual ~BitcrushControls();
+	~BitcrushControls() override;
 
-	virtual void saveSettings( QDomDocument & doc, QDomElement & elem );
-	virtual void loadSettings( const QDomElement & elem );
-	inline virtual QString nodeName() const
+	void saveSettings( QDomDocument & doc, QDomElement & elem ) override;
+	void loadSettings( const QDomElement & elem ) override;
+	inline QString nodeName() const override
 	{
 		return( "bitcrushcontrols" );
 	}
 
-	virtual int controlCount()
+	int controlCount() override
 	{
 		return( 9 );
 	}
 
-	virtual gui::EffectControlDialog * createView()
+	gui::EffectControlDialog * createView() override
 	{
 		return( new gui::BitcrushControlDialog( this ) );
 	}
diff --git a/plugins/CarlaBase/Carla.h b/plugins/CarlaBase/Carla.h
index 2010ac3c4..e04444f91 100644
--- a/plugins/CarlaBase/Carla.h
+++ b/plugins/CarlaBase/Carla.h
@@ -93,7 +93,7 @@ public:
 		return !reg.exactMatch(name);
 	}
 
-	inline virtual void loadSettings(const QDomElement& element, const QString& name = QString("value")) override
+	inline void loadSettings(const QDomElement& element, const QString& name = QString("value")) override
 	{
 		AutomatableModel::loadSettings(element, name);
 		bool mustQuote = mustQuoteName(name);
@@ -104,7 +104,7 @@ public:
 		}
 	}
 
-	inline virtual void saveSettings(QDomDocument& doc, QDomElement& element,
+	inline void saveSettings(QDomDocument& doc, QDomElement& element,
 		const QString& name = QString( "value" )) override
 	{
 		if (m_isEnabled)
@@ -177,7 +177,7 @@ public:
     static const uint32_t kMaxMidiEvents = 512;
 
     CarlaInstrument(InstrumentTrack* const instrumentTrack, const Descriptor* const descriptor, const bool isPatchbay);
-    virtual ~CarlaInstrument();
+    ~CarlaInstrument() override;
 
     // Carla NativeHostDescriptor functions
     uint32_t handleGetBufferSize() const;
@@ -189,13 +189,13 @@ public:
     intptr_t handleDispatcher(const NativeHostDispatcherOpcode opcode, const int32_t index, const intptr_t value, void* const ptr, const float opt);
 
     // LMMS functions
-    virtual Flags flags() const;
-    virtual QString nodeName() const;
-    virtual void saveSettings(QDomDocument& doc, QDomElement& parent);
-    virtual void loadSettings(const QDomElement& elem);
-    virtual void play(sampleFrame* workingBuffer);
-    virtual bool handleMidiEvent(const MidiEvent& event, const TimePos& time, f_cnt_t offset);
-    virtual gui::PluginView* instantiateView(QWidget* parent);
+    Flags flags() const override;
+    QString nodeName() const override;
+    void saveSettings(QDomDocument& doc, QDomElement& parent) override;
+    void loadSettings(const QDomElement& elem) override;
+    void play(sampleFrame* workingBuffer) override;
+    bool handleMidiEvent(const MidiEvent& event, const TimePos& time, f_cnt_t offset) override;
+    gui::PluginView* instantiateView(QWidget* parent) override;
 
 signals:
     void uiClosed();
@@ -255,7 +255,7 @@ public:
 		setWindowFlags(windowFlags);
 	}
 
-	virtual void resizeEvent(QResizeEvent * event) override
+	void resizeEvent(QResizeEvent * event) override
 	{
 		if (mousePress) {
 			resizing = true;
@@ -263,13 +263,13 @@ public:
 		SubWindow::resizeEvent(event);
 	}
 
-	virtual void mousePressEvent(QMouseEvent * event) override
+	void mousePressEvent(QMouseEvent * event) override
 	{
 		mousePress = true;
 		SubWindow::mousePressEvent(event);
 	}
 
-	virtual void mouseReleaseEvent(QMouseEvent * event) override
+	void mouseReleaseEvent(QMouseEvent * event) override
 	{
 		if (resizing) {
 			resizing = false;
@@ -279,7 +279,7 @@ public:
 		SubWindow::mouseReleaseEvent(event);
 	}
 
-	virtual void closeEvent(QCloseEvent * event) override
+	void closeEvent(QCloseEvent * event) override
 	{
 		emit uiClosed();
 		event->accept();
@@ -298,7 +298,7 @@ class CarlaInstrumentView : public InstrumentViewFixedSize
 
 public:
     CarlaInstrumentView(CarlaInstrument* const instrument, QWidget* const parent);
-    virtual ~CarlaInstrumentView();
+    ~CarlaInstrumentView() override;
 
 private slots:
     void toggleUI(bool);
@@ -307,8 +307,8 @@ private slots:
     void paramsUiClosed();
 
 private:
-    virtual void modelChanged();
-    virtual void timerEvent(QTimerEvent*);
+    void modelChanged() override;
+    void timerEvent(QTimerEvent*) override;
 
     NativePluginHandle fHandle;
     const NativePluginDescriptor* fDescriptor;
@@ -333,7 +333,7 @@ class CarlaParamsView : public InstrumentView
 	Q_OBJECT
 public:
 	CarlaParamsView(CarlaInstrumentView* const instrumentView, QWidget* const parent);
-	virtual ~CarlaParamsView();
+	~CarlaParamsView() override;
 
 signals:
 	void uiClosed();
diff --git a/plugins/CrossoverEQ/CrossoverEQ.h b/plugins/CrossoverEQ/CrossoverEQ.h
index 4e5872f0c..fe9b4541b 100644
--- a/plugins/CrossoverEQ/CrossoverEQ.h
+++ b/plugins/CrossoverEQ/CrossoverEQ.h
@@ -39,10 +39,10 @@ class CrossoverEQEffect : public Effect
 {
 public:
 	CrossoverEQEffect( Model* parent, const Descriptor::SubPluginFeatures::Key* key );
-	virtual ~CrossoverEQEffect();
-	virtual bool processAudioBuffer( sampleFrame* buf, const fpp_t frames );
+	~CrossoverEQEffect() override;
+	bool processAudioBuffer( sampleFrame* buf, const fpp_t frames ) override;
 
-	virtual EffectControls* controls()
+	EffectControls* controls() override
 	{
 		return &m_controls;
 	}
diff --git a/plugins/CrossoverEQ/CrossoverEQControlDialog.h b/plugins/CrossoverEQ/CrossoverEQControlDialog.h
index f28366557..bad64a8bb 100644
--- a/plugins/CrossoverEQ/CrossoverEQControlDialog.h
+++ b/plugins/CrossoverEQ/CrossoverEQControlDialog.h
@@ -45,7 +45,7 @@ class CrossoverEQControlDialog : public EffectControlDialog
 	Q_OBJECT
 public:
 	CrossoverEQControlDialog( CrossoverEQControls * controls );
-	virtual ~CrossoverEQControlDialog()
+	~CrossoverEQControlDialog() override
 	{
 	}
 	
diff --git a/plugins/CrossoverEQ/CrossoverEQControls.h b/plugins/CrossoverEQ/CrossoverEQControls.h
index 7f9417365..458300d89 100644
--- a/plugins/CrossoverEQ/CrossoverEQControls.h
+++ b/plugins/CrossoverEQ/CrossoverEQControls.h
@@ -40,21 +40,21 @@ class CrossoverEQControls : public EffectControls
 	Q_OBJECT
 public:
 	CrossoverEQControls( CrossoverEQEffect * eff );
-	virtual ~CrossoverEQControls() {}
+	~CrossoverEQControls() override {}
 
-	virtual void saveSettings( QDomDocument & doc, QDomElement & elem );
-	virtual void loadSettings( const QDomElement & elem );
-	inline virtual QString nodeName() const
+	void saveSettings( QDomDocument & doc, QDomElement & elem ) override;
+	void loadSettings( const QDomElement & elem ) override;
+	inline QString nodeName() const override
 	{
 		return( "crossoevereqcontrols" );
 	}
 
-	virtual int controlCount()
+	int controlCount() override
 	{
 		return( 11 );
 	}
 
-	virtual gui::EffectControlDialog * createView()
+	gui::EffectControlDialog * createView() override
 	{
 		return( new gui::CrossoverEQControlDialog( this ) );
 	}
diff --git a/plugins/Delay/DelayControls.h b/plugins/Delay/DelayControls.h
index 4f4b193f4..3d9393b76 100644
--- a/plugins/Delay/DelayControls.h
+++ b/plugins/Delay/DelayControls.h
@@ -40,19 +40,19 @@ class DelayControls : public EffectControls
 	Q_OBJECT
 public:
 	DelayControls( DelayEffect* effect );
-	virtual ~DelayControls()
+	~DelayControls() override
 	{
 	}
-	virtual void saveSettings( QDomDocument& doc, QDomElement& parent );
-	virtual void loadSettings( const QDomElement& _this );
-	inline virtual QString nodeName() const
+	void saveSettings( QDomDocument& doc, QDomElement& parent ) override;
+	void loadSettings( const QDomElement& _this ) override;
+	inline QString nodeName() const override
 	{
 		return "Delay";
 	}
-	virtual int controlCount(){
+	int controlCount() override{
 		return 5;
 	}
-	virtual gui::EffectControlDialog* createView()
+	gui::EffectControlDialog* createView() override
 	{
 		return new gui::DelayControlsDialog( this );
 	}
diff --git a/plugins/Delay/DelayControlsDialog.h b/plugins/Delay/DelayControlsDialog.h
index 9ab349d4e..115287cda 100644
--- a/plugins/Delay/DelayControlsDialog.h
+++ b/plugins/Delay/DelayControlsDialog.h
@@ -42,7 +42,7 @@ class DelayControlsDialog : public EffectControlDialog
 	Q_OBJECT
 public:
 	DelayControlsDialog( DelayControls* controls );
-	virtual ~DelayControlsDialog()
+	~DelayControlsDialog() override
 	{
 	}
 };
@@ -52,13 +52,13 @@ class XyPad : public QWidget
 	Q_OBJECT
 public:
 	XyPad( QWidget *parent = 0, FloatModel *xModel = 0, FloatModel *yModel = 0 );
-	~XyPad() {}
+	~XyPad() override {}
 
 protected:
-	virtual void paintEvent ( QPaintEvent * event );
-	virtual void mousePressEvent(QMouseEvent * event );
-	virtual void mouseReleaseEvent(QMouseEvent * event);
-	virtual void mouseMoveEvent(QMouseEvent * event);
+	void paintEvent ( QPaintEvent * event ) override;
+	void mousePressEvent(QMouseEvent * event ) override;
+	void mouseReleaseEvent(QMouseEvent * event) override;
+	void mouseMoveEvent(QMouseEvent * event) override;
 
 private:
 	FloatModel *m_xModel;
diff --git a/plugins/Delay/DelayEffect.h b/plugins/Delay/DelayEffect.h
index 2757d6cc4..b6c090ff0 100644
--- a/plugins/Delay/DelayEffect.h
+++ b/plugins/Delay/DelayEffect.h
@@ -38,9 +38,9 @@ class DelayEffect : public Effect
 {
 public:
 	DelayEffect(Model* parent , const Descriptor::SubPluginFeatures::Key* key );
-	virtual ~DelayEffect();
-	virtual bool processAudioBuffer( sampleFrame* buf, const fpp_t frames );
-	virtual EffectControls* controls()
+	~DelayEffect() override;
+	bool processAudioBuffer( sampleFrame* buf, const fpp_t frames ) override;
+	EffectControls* controls() override
 	{
 		return &m_delayControls;
 	}
diff --git a/plugins/DualFilter/DualFilter.h b/plugins/DualFilter/DualFilter.h
index bfc9dc81b..c179edbcc 100644
--- a/plugins/DualFilter/DualFilter.h
+++ b/plugins/DualFilter/DualFilter.h
@@ -39,10 +39,10 @@ class DualFilterEffect : public Effect
 {
 public:
 	DualFilterEffect( Model* parent, const Descriptor::SubPluginFeatures::Key* key );
-	virtual ~DualFilterEffect();
-	virtual bool processAudioBuffer( sampleFrame* buf, const fpp_t frames );
+	~DualFilterEffect() override;
+	bool processAudioBuffer( sampleFrame* buf, const fpp_t frames ) override;
 
-	virtual EffectControls* controls()
+	EffectControls* controls() override
 	{
 		return &m_dfControls;
 	}
diff --git a/plugins/DualFilter/DualFilterControlDialog.h b/plugins/DualFilter/DualFilterControlDialog.h
index a6ac46954..88b3fe17a 100644
--- a/plugins/DualFilter/DualFilterControlDialog.h
+++ b/plugins/DualFilter/DualFilterControlDialog.h
@@ -43,7 +43,7 @@ class DualFilterControlDialog : public EffectControlDialog
 	Q_OBJECT
 public:
 	DualFilterControlDialog( DualFilterControls* controls );
-	virtual ~DualFilterControlDialog()
+	~DualFilterControlDialog() override
 	{
 	}
 
diff --git a/plugins/DualFilter/DualFilterControls.h b/plugins/DualFilter/DualFilterControls.h
index 586b2d15a..a3676295d 100644
--- a/plugins/DualFilter/DualFilterControls.h
+++ b/plugins/DualFilter/DualFilterControls.h
@@ -42,23 +42,23 @@ class DualFilterControls : public EffectControls
 	Q_OBJECT
 public:
 	DualFilterControls( DualFilterEffect* effect );
-	virtual ~DualFilterControls()
+	~DualFilterControls() override
 	{
 	}
 
-	virtual void saveSettings( QDomDocument & _doc, QDomElement & _parent );
-	virtual void loadSettings( const QDomElement & _this );
-	inline virtual QString nodeName() const
+	void saveSettings( QDomDocument & _doc, QDomElement & _parent ) override;
+	void loadSettings( const QDomElement & _this ) override;
+	inline QString nodeName() const override
 	{
 		return "DualFilterControls";
 	}
 
-	virtual int controlCount()
+	int controlCount() override
 	{
 		return 11;
 	}
 
-	virtual gui::EffectControlDialog* createView()
+	gui::EffectControlDialog* createView() override
 	{
 		return new gui::DualFilterControlDialog( this );
 	}
diff --git a/plugins/DynamicsProcessor/DynamicsProcessor.h b/plugins/DynamicsProcessor/DynamicsProcessor.h
index 91763e682..576accdcc 100644
--- a/plugins/DynamicsProcessor/DynamicsProcessor.h
+++ b/plugins/DynamicsProcessor/DynamicsProcessor.h
@@ -41,11 +41,11 @@ class DynProcEffect : public Effect
 public:
 	DynProcEffect( Model * _parent,
 			const Descriptor::SubPluginFeatures::Key * _key );
-	virtual ~DynProcEffect();
-	virtual bool processAudioBuffer( sampleFrame * _buf,
-							const fpp_t _frames );
+	~DynProcEffect() override;
+	bool processAudioBuffer( sampleFrame * _buf,
+							const fpp_t _frames ) override;
 
-	virtual EffectControls * controls()
+	EffectControls * controls() override
 	{
 		return( &m_dpControls );
 	}
diff --git a/plugins/DynamicsProcessor/DynamicsProcessorControlDialog.h b/plugins/DynamicsProcessor/DynamicsProcessorControlDialog.h
index 0b4091b30..8b755620e 100644
--- a/plugins/DynamicsProcessor/DynamicsProcessorControlDialog.h
+++ b/plugins/DynamicsProcessor/DynamicsProcessorControlDialog.h
@@ -43,7 +43,7 @@ class DynProcControlDialog : public EffectControlDialog
 	Q_OBJECT
 public:
 	DynProcControlDialog( DynProcControls * _controls );
-	virtual ~DynProcControlDialog()
+	~DynProcControlDialog() override
 	{
 	}
 
diff --git a/plugins/DynamicsProcessor/DynamicsProcessorControls.h b/plugins/DynamicsProcessor/DynamicsProcessorControls.h
index cb9aebb6a..c68bdcc0c 100644
--- a/plugins/DynamicsProcessor/DynamicsProcessorControls.h
+++ b/plugins/DynamicsProcessor/DynamicsProcessorControls.h
@@ -49,25 +49,25 @@ public:
 		NumStereoModes
 	};
 	DynProcControls( DynProcEffect * _eff );
-	virtual ~DynProcControls()
+	~DynProcControls() override
 	{
 	}
 
-	virtual void saveSettings( QDomDocument & _doc, QDomElement & _parent );
-	virtual void loadSettings( const QDomElement & _this );
-	inline virtual QString nodeName() const
+	void saveSettings( QDomDocument & _doc, QDomElement & _parent ) override;
+	void loadSettings( const QDomElement & _this ) override;
+	inline QString nodeName() const override
 	{
 		return( "dynamicsprocessor_controls" );
 	}
 
 	virtual void setDefaultShape();
 
-	virtual int controlCount()
+	int controlCount() override
 	{
 		return( 6 );
 	}
 
-	virtual gui::EffectControlDialog * createView()
+	gui::EffectControlDialog * createView() override
 	{
 		return( new gui::DynProcControlDialog( this ) );
 	}
diff --git a/plugins/Eq/EqControls.h b/plugins/Eq/EqControls.h
index 8a2061cce..9b0d67742 100644
--- a/plugins/Eq/EqControls.h
+++ b/plugins/Eq/EqControls.h
@@ -44,25 +44,25 @@ class EqControls : public EffectControls
 	Q_OBJECT
 public:
 	explicit EqControls( EqEffect* effect );
-	virtual ~EqControls()
+	~EqControls() override
 	{
 	}
 
-	virtual void saveSettings ( QDomDocument& doc, QDomElement& parent );
+	void saveSettings ( QDomDocument& doc, QDomElement& parent ) override;
 
-	virtual void loadSettings ( const QDomElement &_this );
+	void loadSettings ( const QDomElement &_this ) override;
 
-	inline virtual QString nodeName() const
+	inline QString nodeName() const override
 	{
 		return "Eq";
 	}
 
-	virtual int controlCount()
+	int controlCount() override
 	{
 		return 42;
 	}
 
-	virtual gui::EffectControlDialog* createView();
+	gui::EffectControlDialog* createView() override;
 
 	float m_inPeakL;
 	float m_inPeakR;
diff --git a/plugins/Eq/EqControlsDialog.h b/plugins/Eq/EqControlsDialog.h
index 297737699..1ec7e3e9a 100644
--- a/plugins/Eq/EqControlsDialog.h
+++ b/plugins/Eq/EqControlsDialog.h
@@ -47,7 +47,7 @@ class EqControlsDialog : public EffectControlDialog
 	Q_OBJECT
 public:
 	EqControlsDialog( EqControls * controls );
-	virtual ~EqControlsDialog()
+	~EqControlsDialog() override
 	{
 	}
 
@@ -57,7 +57,7 @@ private:
 	EqControls * m_controls;
 	EqParameterWidget * m_parameterWidget;
 
-	virtual void mouseDoubleClickEvent(QMouseEvent *event);
+	void mouseDoubleClickEvent(QMouseEvent *event) override;
 
 	EqBand *setBand( int index, BoolModel *active, FloatModel *freq, FloatModel *res, FloatModel *gain, QColor color, QString name, float *peakL, float *peakR, BoolModel *hp12, BoolModel *hp24, BoolModel *hp48, BoolModel *lp12, BoolModel *lp24, BoolModel *lp48 );
 
diff --git a/plugins/Eq/EqCurve.h b/plugins/Eq/EqCurve.h
index c7e7d0688..e01e30841 100644
--- a/plugins/Eq/EqCurve.h
+++ b/plugins/Eq/EqCurve.h
@@ -55,7 +55,7 @@ public:
 	static float gainToYPixel( float gain, int h, float pixelPerUnitHeight );
 	static float yPixelToGain( float y, int h, float pixelPerUnitHeight );
 
-	QRectF boundingRect() const;
+	QRectF boundingRect() const override;
 	QPainterPath getCurvePath();
 	float getPeakCurve( float x );
 	float getHighShelfCurve( float x );
@@ -83,13 +83,13 @@ signals:
 	void positionChanged();
 
 protected:
-	void mousePressEvent( QGraphicsSceneMouseEvent *event );
-	void mouseReleaseEvent( QGraphicsSceneMouseEvent *event );
-	void paint( QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget );
-	void wheelEvent( QGraphicsSceneWheelEvent *wevent );
-	void hoverEnterEvent( QGraphicsSceneHoverEvent *hevent );
-	void hoverLeaveEvent( QGraphicsSceneHoverEvent *hevent );
-	QVariant itemChange( GraphicsItemChange change, const QVariant &value );
+	void mousePressEvent( QGraphicsSceneMouseEvent *event ) override;
+	void mouseReleaseEvent( QGraphicsSceneMouseEvent *event ) override;
+	void paint( QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget ) override;
+	void wheelEvent( QGraphicsSceneWheelEvent *wevent ) override;
+	void hoverEnterEvent( QGraphicsSceneHoverEvent *hevent ) override;
+	void hoverLeaveEvent( QGraphicsSceneHoverEvent *hevent ) override;
+	QVariant itemChange( GraphicsItemChange change, const QVariant &value ) override;
 
 private:
 	double calculateGain( const double freq, const double a1, const double a2, const double b0, const double b1, const double b2 );
@@ -120,11 +120,11 @@ class EqCurve : public QGraphicsObject
 	Q_OBJECT
 public:
 	EqCurve( QList<EqHandle*> *handle, int x, int y );
-	QRectF boundingRect() const;
+	QRectF boundingRect() const override;
 	void setModelChanged(bool mc);
 
 protected:
-	void paint( QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget );
+	void paint( QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget ) override;
 
 private:
 	QList<EqHandle*> *m_handle;
diff --git a/plugins/Eq/EqEffect.h b/plugins/Eq/EqEffect.h
index 3697a11e2..e3bf6fd54 100644
--- a/plugins/Eq/EqEffect.h
+++ b/plugins/Eq/EqEffect.h
@@ -36,9 +36,9 @@ class EqEffect : public Effect
 {
 public:
 	EqEffect( Model * parent , const Descriptor::SubPluginFeatures::Key * key );
-	virtual ~EqEffect();
-	virtual bool processAudioBuffer( sampleFrame * buf, const fpp_t frames );
-	virtual EffectControls * controls()
+	~EqEffect() override;
+	bool processAudioBuffer( sampleFrame * buf, const fpp_t frames ) override;
+	EffectControls * controls() override
 	{
 		return &m_eqControls;
 	}
diff --git a/plugins/Eq/EqFader.h b/plugins/Eq/EqFader.h
index 1601081e9..aec6a9e18 100644
--- a/plugins/Eq/EqFader.h
+++ b/plugins/Eq/EqFader.h
@@ -72,7 +72,7 @@ public:
 
 
 
-	~EqFader()
+	~EqFader() override
 	{
 	}
 
diff --git a/plugins/Eq/EqFilter.h b/plugins/Eq/EqFilter.h
index 7361c751c..c64f6d5c3 100644
--- a/plugins/Eq/EqFilter.h
+++ b/plugins/Eq/EqFilter.h
@@ -181,7 +181,7 @@ protected:
 class EqHp12Filter : public EqFilter
 {
 public :
-	virtual void calcCoefficents()
+	void calcCoefficents() override
 	{
 
 		// calc intermediate
@@ -226,7 +226,7 @@ public :
 class EqLp12Filter : public EqFilter
 {
 public :
-	virtual void calcCoefficents()
+	void calcCoefficents() override
 	{
 
 		// calc intermediate
@@ -270,7 +270,7 @@ class EqPeakFilter : public EqFilter
 public:
 
 
-	virtual void calcCoefficents()
+	void calcCoefficents() override
 	{
 		// calc intermediate
 		float w0 = F_2PI * m_freq / m_sampleRate;
@@ -300,7 +300,7 @@ public:
 		setCoeffs( a1, a2, b0, b1, b2 );
 	}
 
-	virtual inline void setParameters( float sampleRate, float freq, float bw, float gain )
+	inline void setParameters( float sampleRate, float freq, float bw, float gain ) override
 	{
 		bool hasChanged = false;
 		if( sampleRate != m_sampleRate )
@@ -334,7 +334,7 @@ public:
 class EqLowShelfFilter : public EqFilter
 {
 public :
-	virtual void calcCoefficents()
+	void calcCoefficents() override
 	{
 
 		// calc intermediate
@@ -373,7 +373,7 @@ public :
 class EqHighShelfFilter : public EqFilter
 {
 public :
-	virtual void calcCoefficents()
+	void calcCoefficents() override
 	{
 
 		// calc intermediate
diff --git a/plugins/Eq/EqParameterWidget.h b/plugins/Eq/EqParameterWidget.h
index abfe5a9bb..f80499395 100644
--- a/plugins/Eq/EqParameterWidget.h
+++ b/plugins/Eq/EqParameterWidget.h
@@ -74,7 +74,7 @@ class EqParameterWidget : public QWidget
 	Q_OBJECT
 public:
 	explicit EqParameterWidget( QWidget *parent = 0, EqControls * controls = 0 );
-	~EqParameterWidget();
+	~EqParameterWidget() override;
 	QList<EqHandle*> *m_handleList;
 
 	const int bandCount()
diff --git a/plugins/Eq/EqSpectrumView.h b/plugins/Eq/EqSpectrumView.h
index c9bfebeb5..f0a8fda3c 100644
--- a/plugins/Eq/EqSpectrumView.h
+++ b/plugins/Eq/EqSpectrumView.h
@@ -74,7 +74,7 @@ class EqSpectrumView : public QWidget
 	Q_OBJECT
 public:
 	explicit EqSpectrumView( EqAnalyser *b, QWidget *_parent = 0 );
-	virtual ~EqSpectrumView()
+	~EqSpectrumView() override
 	{
 	}
 
@@ -82,7 +82,7 @@ public:
 	void setColor( const QColor &value );
 
 protected:
-	virtual void paintEvent( QPaintEvent *event );
+	void paintEvent( QPaintEvent *event ) override;
 
 private slots:
 	void periodicalUpdate();
diff --git a/plugins/Flanger/FlangerControls.h b/plugins/Flanger/FlangerControls.h
index 1d112bc99..b004e5e33 100644
--- a/plugins/Flanger/FlangerControls.h
+++ b/plugins/Flanger/FlangerControls.h
@@ -39,20 +39,20 @@ class FlangerControls : public EffectControls
 	Q_OBJECT
 public:
 	FlangerControls( FlangerEffect* effect );
-	virtual ~FlangerControls()
+	~FlangerControls() override
 	{
 	}
-	virtual void saveSettings ( QDomDocument& doc, QDomElement& parent );
-	virtual void loadSettings ( const QDomElement &_this );
-	inline virtual QString nodeName() const
+	void saveSettings ( QDomDocument& doc, QDomElement& parent ) override;
+	void loadSettings ( const QDomElement &_this ) override;
+	inline QString nodeName() const override
 	{
 		return "Flanger";
 	}
-	virtual int controlCount()
+	int controlCount() override
 	{
 		return 7;
 	}
-	virtual gui::EffectControlDialog* createView()
+	gui::EffectControlDialog* createView() override
 	{
 		return new gui::FlangerControlsDialog( this );
 	}
diff --git a/plugins/Flanger/FlangerControlsDialog.h b/plugins/Flanger/FlangerControlsDialog.h
index 6aed1b6b4..587046ad7 100644
--- a/plugins/Flanger/FlangerControlsDialog.h
+++ b/plugins/Flanger/FlangerControlsDialog.h
@@ -42,7 +42,7 @@ class FlangerControlsDialog : public EffectControlDialog
 	Q_OBJECT
 public:
 	FlangerControlsDialog( FlangerControls* controls );
-	virtual ~FlangerControlsDialog()
+	~FlangerControlsDialog() override
 	{
 	}
 };
diff --git a/plugins/Flanger/FlangerEffect.h b/plugins/Flanger/FlangerEffect.h
index d32429194..45dd5cafd 100644
--- a/plugins/Flanger/FlangerEffect.h
+++ b/plugins/Flanger/FlangerEffect.h
@@ -44,9 +44,9 @@ class FlangerEffect : public Effect
 {
 public:
 	FlangerEffect( Model* parent , const Descriptor::SubPluginFeatures::Key* key );
-	virtual ~FlangerEffect();
-	virtual bool processAudioBuffer( sampleFrame *buf, const fpp_t frames );
-	virtual EffectControls* controls()
+	~FlangerEffect() override;
+	bool processAudioBuffer( sampleFrame *buf, const fpp_t frames ) override;
+	EffectControls* controls() override
 	{
 		return &m_flangerControls;
 	}
diff --git a/plugins/FreeBoy/FreeBoy.h b/plugins/FreeBoy/FreeBoy.h
index 6f92b41e9..8b46a5e68 100644
--- a/plugins/FreeBoy/FreeBoy.h
+++ b/plugins/FreeBoy/FreeBoy.h
@@ -52,21 +52,21 @@ class FreeBoyInstrument : public Instrument
 public:
 
 	FreeBoyInstrument( InstrumentTrack * _instrument_track );
-	virtual ~FreeBoyInstrument();
+	~FreeBoyInstrument() override;
 
-	virtual void playNote( NotePlayHandle * _n,
-						sampleFrame * _working_buffer );
-	virtual void deleteNotePluginData( NotePlayHandle * _n );
+	void playNote( NotePlayHandle * _n,
+						sampleFrame * _working_buffer ) override;
+	void deleteNotePluginData( NotePlayHandle * _n ) override;
 
 
-	virtual void saveSettings( QDomDocument & _doc, QDomElement & _parent );
-	virtual void loadSettings( const QDomElement & _this );
+	void saveSettings( QDomDocument & _doc, QDomElement & _parent ) override;
+	void loadSettings( const QDomElement & _this ) override;
 
-	virtual QString nodeName() const;
+	QString nodeName() const override;
 
-	virtual f_cnt_t desiredReleaseFrames() const;
+	f_cnt_t desiredReleaseFrames() const override;
 
-	virtual gui::PluginView* instantiateView( QWidget * _parent );
+	gui::PluginView* instantiateView( QWidget * _parent ) override;
 
 
 /*public slots:
@@ -129,10 +129,10 @@ class FreeBoyInstrumentView : public InstrumentViewFixedSize
 	Q_OBJECT
 public:
 	FreeBoyInstrumentView( Instrument * _instrument, QWidget * _parent );
-	virtual ~FreeBoyInstrumentView();
+	~FreeBoyInstrumentView() override;
 
 private:
-	virtual void modelChanged();
+	void modelChanged() override;
 
 	Knob * m_ch1SweepTimeKnob;
 	PixmapButton * m_ch1SweepDirButton;
diff --git a/plugins/GigPlayer/GigPlayer.h b/plugins/GigPlayer/GigPlayer.h
index c192ee4ae..5adeddc3e 100644
--- a/plugins/GigPlayer/GigPlayer.h
+++ b/plugins/GigPlayer/GigPlayer.h
@@ -243,35 +243,35 @@ class GigInstrument : public Instrument
 
 public:
 	GigInstrument( InstrumentTrack * _instrument_track );
-	virtual ~GigInstrument();
+	~GigInstrument() override;
 
-	virtual void play( sampleFrame * _working_buffer );
+	void play( sampleFrame * _working_buffer ) override;
 
-	virtual void playNote( NotePlayHandle * _n,
-						sampleFrame * _working_buffer );
-	virtual void deleteNotePluginData( NotePlayHandle * _n );
+	void playNote( NotePlayHandle * _n,
+						sampleFrame * _working_buffer ) override;
+	void deleteNotePluginData( NotePlayHandle * _n ) override;
 
 
-	virtual void saveSettings( QDomDocument & _doc, QDomElement & _parent );
-	virtual void loadSettings( const QDomElement & _this );
+	void saveSettings( QDomDocument & _doc, QDomElement & _parent ) override;
+	void loadSettings( const QDomElement & _this ) override;
 
-	virtual void loadFile( const QString & _file );
+	void loadFile( const QString & _file ) override;
 
-	virtual AutomatableModel * childModel( const QString & _modelName );
+	AutomatableModel * childModel( const QString & _modelName ) override;
 
-	virtual QString nodeName() const;
+	QString nodeName() const override;
 
-	virtual f_cnt_t desiredReleaseFrames() const
+	f_cnt_t desiredReleaseFrames() const override
 	{
 		return 0;
 	}
 
-	virtual Flags flags() const
+	Flags flags() const override
 	{
 		return IsSingleStreamed|IsNotBendable;
 	}
 
-	virtual gui::PluginView* instantiateView( QWidget * _parent );
+	gui::PluginView* instantiateView( QWidget * _parent ) override;
 
 	QString getCurrentPatchName();
 
@@ -352,10 +352,10 @@ class GigInstrumentView : public InstrumentViewFixedSize
 public:
 	GigInstrumentView( Instrument * _instrument,
 					QWidget * _parent );
-	virtual ~GigInstrumentView();
+	~GigInstrumentView() override;
 
 private:
-	virtual void modelChanged();
+	void modelChanged() override;
 
 	PixmapButton * m_fileDialogButton;
 	PixmapButton * m_patchDialogButton;
diff --git a/plugins/GigPlayer/PatchesDialog.cpp b/plugins/GigPlayer/PatchesDialog.cpp
index a5066c2af..3f7035c61 100644
--- a/plugins/GigPlayer/PatchesDialog.cpp
+++ b/plugins/GigPlayer/PatchesDialog.cpp
@@ -42,7 +42,7 @@ public:
 		: QTreeWidgetItem( pListView, pItemAfter ) {}
 
 	// Sort/compare overriden method.
-	bool operator< ( const QTreeWidgetItem& other ) const
+	bool operator< ( const QTreeWidgetItem& other ) const override
 	{
 		int iColumn = QTreeWidgetItem::treeWidget()->sortColumn();
 		const QString& s1 = text( iColumn );
diff --git a/plugins/GigPlayer/PatchesDialog.h b/plugins/GigPlayer/PatchesDialog.h
index c43b4cb5c..4912f2bc1 100644
--- a/plugins/GigPlayer/PatchesDialog.h
+++ b/plugins/GigPlayer/PatchesDialog.h
@@ -50,7 +50,7 @@ public:
 	PatchesDialog(QWidget * pParent = 0, Qt::WindowFlags wflags = QFlag(0));
 
 	// Destructor.
-	virtual ~PatchesDialog();
+	~PatchesDialog() override;
 
 
 	void setup( GigInstance * pSynth, int iChan, const QString & chanName,
@@ -64,8 +64,8 @@ public slots:
 
 protected slots:
 
-	void accept();
-	void reject();
+	void accept() override;
+	void reject() override;
 
 protected:
 
diff --git a/plugins/HydrogenImport/HydrogenImport.h b/plugins/HydrogenImport/HydrogenImport.h
index 657d61f0c..a9398d18f 100644
--- a/plugins/HydrogenImport/HydrogenImport.h
+++ b/plugins/HydrogenImport/HydrogenImport.h
@@ -15,14 +15,14 @@ public:
 	HydrogenImport( const QString & _file );
         bool readSong();
 
-	virtual ~HydrogenImport();
+	~HydrogenImport() override;
 
-	virtual gui::PluginView* instantiateView( QWidget * )
+	gui::PluginView* instantiateView( QWidget * ) override
 	{
 		return( nullptr );
 	}
 private:
-	virtual bool tryImport( TrackContainer* tc );
+	bool tryImport( TrackContainer* tc ) override;
 };
 
 
diff --git a/plugins/Kicker/Kicker.h b/plugins/Kicker/Kicker.h
index f48a5ab12..10c77fe0f 100644
--- a/plugins/Kicker/Kicker.h
+++ b/plugins/Kicker/Kicker.h
@@ -54,28 +54,28 @@ class KickerInstrument : public Instrument
 	Q_OBJECT
 public:
 	KickerInstrument( InstrumentTrack * _instrument_track );
-	virtual ~KickerInstrument();
+	~KickerInstrument() override;
 
-	virtual void playNote( NotePlayHandle * _n,
-						sampleFrame * _working_buffer );
-	virtual void deleteNotePluginData( NotePlayHandle * _n );
+	void playNote( NotePlayHandle * _n,
+						sampleFrame * _working_buffer ) override;
+	void deleteNotePluginData( NotePlayHandle * _n ) override;
 
-	virtual void saveSettings( QDomDocument & _doc, QDomElement & _parent );
-	virtual void loadSettings( const QDomElement & _this );
+	void saveSettings( QDomDocument & _doc, QDomElement & _parent ) override;
+	void loadSettings( const QDomElement & _this ) override;
 
-	virtual QString nodeName() const;
+	QString nodeName() const override;
 
-	virtual Flags flags() const
+	Flags flags() const override
 	{
 		return IsNotBendable;
 	}
 
-	virtual f_cnt_t desiredReleaseFrames() const
+	f_cnt_t desiredReleaseFrames() const override
 	{
 		return( 512 );
 	}
 
-	virtual gui::PluginView* instantiateView( QWidget * _parent );
+	gui::PluginView* instantiateView( QWidget * _parent ) override;
 
 
 private:
@@ -109,10 +109,10 @@ class KickerInstrumentView : public InstrumentViewFixedSize
 	Q_OBJECT
 public:
 	KickerInstrumentView( Instrument * _instrument, QWidget * _parent );
-	virtual ~KickerInstrumentView();
+	~KickerInstrumentView() override;
 
 private:
-	virtual void modelChanged();
+	void modelChanged() override;
 
 	Knob * m_startFreqKnob;
 	Knob * m_endFreqKnob;
diff --git a/plugins/LadspaBrowser/LadspaBrowser.h b/plugins/LadspaBrowser/LadspaBrowser.h
index f1f88872c..93533906e 100644
--- a/plugins/LadspaBrowser/LadspaBrowser.h
+++ b/plugins/LadspaBrowser/LadspaBrowser.h
@@ -46,7 +46,7 @@ class LadspaBrowserView : public ToolPluginView
 	Q_OBJECT
 public:
 	LadspaBrowserView( ToolPlugin * _tool );
-	virtual ~LadspaBrowserView();
+	~LadspaBrowserView() override;
 
 
 public slots:
@@ -69,22 +69,22 @@ class LadspaBrowser : public ToolPlugin
 {
 public:
 	LadspaBrowser();
-	virtual ~LadspaBrowser();
+	~LadspaBrowser() override;
 
-	virtual gui::PluginView* instantiateView( QWidget * )
+	gui::PluginView* instantiateView( QWidget * ) override
 	{
 		return new gui::LadspaBrowserView( this );
 	}
 
-	virtual QString nodeName() const;
+	QString nodeName() const override;
 
-	virtual void saveSettings( QDomDocument& doc, QDomElement& element )
+	void saveSettings( QDomDocument& doc, QDomElement& element ) override
 	{
 		Q_UNUSED(doc)
 		Q_UNUSED(element)
 	}
 
-	virtual void loadSettings( const QDomElement& element )
+	void loadSettings( const QDomElement& element ) override
 	{
 		Q_UNUSED(element)
 	}
diff --git a/plugins/LadspaBrowser/LadspaDescription.h b/plugins/LadspaBrowser/LadspaDescription.h
index 0e54acd32..1d2b03fac 100644
--- a/plugins/LadspaBrowser/LadspaDescription.h
+++ b/plugins/LadspaBrowser/LadspaDescription.h
@@ -44,7 +44,7 @@ class LadspaDescription : public QWidget
 	Q_OBJECT
 public:
 	LadspaDescription( QWidget * _parent, LadspaPluginType _type );
-	virtual ~LadspaDescription();
+	~LadspaDescription() override;
 
 
 signals:
diff --git a/plugins/LadspaBrowser/LadspaPortDialog.h b/plugins/LadspaBrowser/LadspaPortDialog.h
index 1473b1ecf..3f7d83df7 100644
--- a/plugins/LadspaBrowser/LadspaPortDialog.h
+++ b/plugins/LadspaBrowser/LadspaPortDialog.h
@@ -40,7 +40,7 @@ class LadspaPortDialog : public QDialog
 	Q_OBJECT
 public:
 	LadspaPortDialog( const ladspa_key_t & _key );
-	virtual ~LadspaPortDialog();
+	~LadspaPortDialog() override;
 
 };
 
diff --git a/plugins/LadspaEffect/LadspaControlDialog.h b/plugins/LadspaEffect/LadspaControlDialog.h
index 3a102599b..25df5ee11 100644
--- a/plugins/LadspaEffect/LadspaControlDialog.h
+++ b/plugins/LadspaEffect/LadspaControlDialog.h
@@ -50,7 +50,7 @@ class LadspaControlDialog : public EffectControlDialog
 	Q_OBJECT
 public:
 	LadspaControlDialog( LadspaControls * _ctl );
-	~LadspaControlDialog();
+	~LadspaControlDialog() override;
 
 
 private slots:
diff --git a/plugins/LadspaEffect/LadspaControls.h b/plugins/LadspaEffect/LadspaControls.h
index e8f8863cf..b84202012 100644
--- a/plugins/LadspaEffect/LadspaControls.h
+++ b/plugins/LadspaEffect/LadspaControls.h
@@ -43,21 +43,21 @@ class LadspaControls : public EffectControls
 	Q_OBJECT
 public:
 	LadspaControls( LadspaEffect * _eff );
-	virtual ~LadspaControls();
+	~LadspaControls() override;
 
-	inline int controlCount()
+	inline int controlCount() override
 	{
 		return m_controlCount;
 	}
 
-	virtual void saveSettings( QDomDocument & _doc, QDomElement & _parent );
-	virtual void loadSettings( const QDomElement & _this );
-	inline virtual QString nodeName() const
+	void saveSettings( QDomDocument & _doc, QDomElement & _parent ) override;
+	void loadSettings( const QDomElement & _this ) override;
+	inline QString nodeName() const override
 	{
 		return "ladspacontrols";
 	}
 
-	virtual gui::EffectControlDialog* createView()
+	gui::EffectControlDialog* createView() override
 	{
 		return new gui::LadspaControlDialog( this );
 	}
diff --git a/plugins/LadspaEffect/LadspaEffect.h b/plugins/LadspaEffect/LadspaEffect.h
index 153e2adeb..0bb0f2126 100644
--- a/plugins/LadspaEffect/LadspaEffect.h
+++ b/plugins/LadspaEffect/LadspaEffect.h
@@ -46,14 +46,14 @@ class LadspaEffect : public Effect
 public:
 	LadspaEffect( Model * _parent,
 			const Descriptor::SubPluginFeatures::Key * _key );
-	virtual ~LadspaEffect();
+	~LadspaEffect() override;
 
-	virtual bool processAudioBuffer( sampleFrame * _buf,
-							const fpp_t _frames );
+	bool processAudioBuffer( sampleFrame * _buf,
+							const fpp_t _frames ) override;
 	
 	void setControl( int _control, LADSPA_Data _data );
 
-	virtual EffectControls * controls()
+	EffectControls * controls() override
 	{
 		return m_controls;
 	}
diff --git a/plugins/LadspaEffect/LadspaSubPluginFeatures.h b/plugins/LadspaEffect/LadspaSubPluginFeatures.h
index 36edeebd3..c65dce9fe 100644
--- a/plugins/LadspaEffect/LadspaSubPluginFeatures.h
+++ b/plugins/LadspaEffect/LadspaSubPluginFeatures.h
@@ -44,7 +44,7 @@ public:
 	void fillDescriptionWidget( QWidget * _parent,
 												const Key * _key ) const override;
 
-	virtual void listSubPluginKeys( const Plugin::Descriptor * _desc,
+	void listSubPluginKeys( const Plugin::Descriptor * _desc,
 												KeyList & _kl ) const override;
 
 
diff --git a/plugins/Lb302/Lb302.h b/plugins/Lb302/Lb302.h
index 550c3d00a..770fb451e 100644
--- a/plugins/Lb302/Lb302.h
+++ b/plugins/Lb302/Lb302.h
@@ -92,11 +92,11 @@ class Lb302FilterIIR2 : public Lb302Filter
 {
 	public:
 	Lb302FilterIIR2(Lb302FilterKnobState* p_fs);
-	virtual ~Lb302FilterIIR2();
+	~Lb302FilterIIR2() override;
 
-	virtual void recalc();
-	virtual void envRecalc();
-	virtual float process(const float& samp);
+	void recalc() override;
+	void envRecalc() override;
+	float process(const float& samp) override;
 
 	protected:
 	float vcf_d1,           //   d1 and d2 are added back into the sample with
@@ -118,9 +118,9 @@ class Lb302Filter3Pole : public Lb302Filter
 	Lb302Filter3Pole(Lb302FilterKnobState* p_fs);
 
 	//virtual void recalc();
-	virtual void envRecalc();
-	virtual void recalc();
-	virtual float process(const float& samp);
+	void envRecalc() override;
+	void recalc() override;
+	float process(const float& samp) override;
 
 	protected:
 	float kfcn,
@@ -150,30 +150,30 @@ class Lb302Synth : public Instrument
 	Q_OBJECT
 public:
 	Lb302Synth( InstrumentTrack * _instrument_track );
-	virtual ~Lb302Synth();
+	~Lb302Synth() override;
 
-	virtual void play( sampleFrame * _working_buffer );
-	virtual void playNote( NotePlayHandle * _n,
-						sampleFrame * _working_buffer );
-	virtual void deleteNotePluginData( NotePlayHandle * _n );
+	void play( sampleFrame * _working_buffer ) override;
+	void playNote( NotePlayHandle * _n,
+						sampleFrame * _working_buffer ) override;
+	void deleteNotePluginData( NotePlayHandle * _n ) override;
 
 
-	virtual void saveSettings( QDomDocument & _doc, QDomElement & _parent );
-	virtual void loadSettings( const QDomElement & _this );
+	void saveSettings( QDomDocument & _doc, QDomElement & _parent ) override;
+	void loadSettings( const QDomElement & _this ) override;
 
-	virtual QString nodeName() const;
+	QString nodeName() const override;
 
-	virtual Flags flags() const
+	Flags flags() const override
 	{
 		return IsSingleStreamed;
 	}
 
-	virtual f_cnt_t desiredReleaseFrames() const
+	f_cnt_t desiredReleaseFrames() const override
 	{
 		return 0; //4048;
 	}
 
-	virtual gui::PluginView* instantiateView( QWidget * _parent );
+	gui::PluginView* instantiateView( QWidget * _parent ) override;
 
 private:
 	void processNote( NotePlayHandle * n );
@@ -277,10 +277,10 @@ class Lb302SynthView : public InstrumentViewFixedSize
 public:
 	Lb302SynthView( Instrument * _instrument,
 	                QWidget * _parent );
-	virtual ~Lb302SynthView();
+	~Lb302SynthView() override;
 
 private:
-	virtual void modelChanged();
+	void modelChanged() override;
 
 	Knob * m_vcfCutKnob;
 	Knob * m_vcfResKnob;
diff --git a/plugins/MidiExport/MidiExport.h b/plugins/MidiExport/MidiExport.h
index f443c965f..ccbb370ca 100644
--- a/plugins/MidiExport/MidiExport.h
+++ b/plugins/MidiExport/MidiExport.h
@@ -63,16 +63,16 @@ class MidiExport: public ExportFilter
 // 	Q_OBJECT
 public:
 	MidiExport();
-	~MidiExport();
+	~MidiExport() override;
 
-	virtual gui::PluginView* instantiateView(QWidget *)
+	gui::PluginView* instantiateView(QWidget *) override
 	{
 		return nullptr;
 	}
 
-	virtual bool tryExport(const TrackContainer::TrackList &tracks,
+	bool tryExport(const TrackContainer::TrackList &tracks,
 				const TrackContainer::TrackList &patternTracks,
-				int tempo, int masterPitch, const QString &filename);
+				int tempo, int masterPitch, const QString &filename) override;
 	
 private:
 	void writeMidiClip(MidiNoteVector &midiClip, const QDomNode& n,
diff --git a/plugins/MidiImport/MidiImport.h b/plugins/MidiImport/MidiImport.h
index a7ab478a2..bb2893116 100644
--- a/plugins/MidiImport/MidiImport.h
+++ b/plugins/MidiImport/MidiImport.h
@@ -41,16 +41,16 @@ class MidiImport : public ImportFilter
 	Q_OBJECT
 public:
 	MidiImport( const QString & _file );
-	virtual ~MidiImport();
+	~MidiImport() override;
 
-	virtual gui::PluginView* instantiateView( QWidget * )
+	gui::PluginView* instantiateView( QWidget * ) override
 	{
 		return( nullptr );
 	}
 
 
 private:
-	virtual bool tryImport( TrackContainer* tc );
+	bool tryImport( TrackContainer* tc ) override;
 
 	bool readSMF( TrackContainer* tc );
 	bool readRIFF( TrackContainer* tc );
diff --git a/plugins/MidiImport/portsmf/allegro.h b/plugins/MidiImport/portsmf/allegro.h
index 698801f78..e21a8f817 100644
--- a/plugins/MidiImport/portsmf/allegro.h
+++ b/plugins/MidiImport/portsmf/allegro.h
@@ -293,26 +293,26 @@ public:
 
 typedef class Alg_note : public Alg_event {
 public:
-    virtual ~Alg_note();
+    ~Alg_note() override;
     Alg_note(Alg_note *); // copy constructor
     float pitch; // pitch in semitones (69 = A440)
     float loud;  // dynamic corresponding to MIDI velocity
     double dur;   // duration in seconds (normally to release point)
     Alg_parameters_ptr parameters; // attribute/value pair list
     Alg_note() { type = 'n'; parameters = nullptr; }
-    void show();
+    void show() override;
 } *Alg_note_ptr;
 
 
 typedef class Alg_update : public Alg_event {
 public:
-    virtual ~Alg_update() {};
+    ~Alg_update() override {};
     Alg_update(Alg_update *); // copy constructor
     Alg_parameter parameter; // an update contains one attr/value pair
 
 
     Alg_update() { type = 'u'; }
-    void show();
+    void show() override;
 } *Alg_update_ptr;
 
 
@@ -402,7 +402,7 @@ public:
 
     // The destructor does not free events because they are owned
     // by a track or seq structure.
-    virtual ~Alg_event_list();
+    ~Alg_event_list() override;
 
     // Returns the duration of the sequence in beats or seconds
     double get_beat_dur() { return beat_dur; }
@@ -548,7 +548,7 @@ public:
     // setting buffer, but it is not the Serial_read_buffer's responsibility
     // to delete the buffer (owner might want to reuse it), so the destructor
     // does nothing.
-    virtual ~Serial_read_buffer() {  }
+    ~Serial_read_buffer() override {  }
 #if defined(_WIN32)
 //#pragma warning(disable: 546) // cast to int is OK, we only want low 7 bits
 //#pragma warning(disable: 4311) // type cast pointer to long warning
@@ -588,7 +588,7 @@ typedef class Serial_write_buffer: public Serial_buffer {
     // This destructor will only run when the program exits, which will only
     // add overhead to the exit process, but it will eliminate an incorrect
     // report of memory leakage from automation that doesn't know better. -RBD
-    virtual ~Serial_write_buffer() {
+    ~Serial_write_buffer() override {
         if (buffer) delete [] buffer;
     }
     void init_for_write() { ptr = buffer; }
@@ -654,7 +654,7 @@ protected:
 public:
     void serialize_track();
     void unserialize_track();
-    virtual Alg_event_ptr const &operator[](int i) {
+    Alg_event_ptr const &operator[](int i) override {
         assert(i >= 0 && i < len);
         return events[i];
     }
@@ -669,7 +669,7 @@ public:
     // copy constructor: event_list is copied, map is installed and referenced
     Alg_track(Alg_event_list_ref event_list, Alg_time_map_ptr map, 
               bool units_are_seconds);
-    virtual ~Alg_track() { // note: do not call set_time_map(NULL)!
+    ~Alg_track() override { // note: do not call set_time_map(NULL)!
         if (time_map) time_map->dereference();
         time_map = nullptr; }
 
@@ -1030,11 +1030,11 @@ public:
     Alg_seq(std::istream &file, bool smf, double *offset_ptr = nullptr);
     // create from filename
     Alg_seq(const char *filename, bool smf, double *offset_ptr = nullptr);
-    virtual ~Alg_seq();
+    ~Alg_seq() override;
     int get_read_error() { return error; }
-    void serialize(void **buffer, long *bytes);
+    void serialize(void **buffer, long *bytes) override;
     void copy_time_sigs_to(Alg_seq *dest); // a utility function
-    void set_time_map(Alg_time_map *map);
+    void set_time_map(Alg_time_map *map) override;
 
     // encode sequence structure into contiguous, moveable memory block
     // address of newly allocated memory is assigned to *buffer, which must
@@ -1060,22 +1060,22 @@ public:
     // caller must not delete the result.
     Alg_track_ptr track(int);
 
-    virtual Alg_event_ptr const &operator[](int i);
+    Alg_event_ptr const &operator[](int i) override;
 
-    virtual void convert_to_seconds();
-    virtual void convert_to_beats();
+    void convert_to_seconds() override;
+    void convert_to_beats() override;
 
     Alg_track_ptr cut_from_track(int track_num, double start, double dur, 
                                  bool all);
-    Alg_seq *cut(double t, double len, bool all);
+    Alg_seq *cut(double t, double len, bool all) override;
     void insert_silence_in_track(int track_num, double t, double len);
-    void insert_silence(double t, double len);
+    void insert_silence(double t, double len) override;
     Alg_track_ptr copy_track(int track_num, double t, double len, bool all);
-    Alg_seq *copy(double start, double len, bool all);
+    Alg_seq *copy(double start, double len, bool all) override;
     void paste(double start, Alg_seq *seq);
-    virtual void clear(double t, double len, bool all);
-    virtual void merge(double t, Alg_event_list_ptr seq);
-    virtual void silence(double t, double len, bool all);
+    void clear(double t, double len, bool all) override;
+    void merge(double t, Alg_event_list_ptr seq) override;
+    void silence(double t, double len, bool all) override;
     void clear_track(int track_num, double start, double len, bool all);
     void silence_track(int track_num, double start, double len, bool all);
     Alg_event_list_ptr find_in_track(int track_num, double t, double len,
@@ -1100,7 +1100,7 @@ public:
     // add_event takes a pointer to an event on the heap. The event is not
     // copied, and this Alg_seq becomes the owner and freer of the event.
     void add_event(Alg_event_ptr event, int track_num);
-    void add(Alg_event_ptr event) { assert(false); } // call add_event instead
+    void add(Alg_event_ptr event) override { assert(false); } // call add_event instead
     // get the tempo starting at beat
     double get_tempo(double beat);
     bool set_tempo(double bpm, double start_beat, double end_beat);
@@ -1112,7 +1112,7 @@ public:
                          double *num, double *den);
     // void set_events(Alg_event_ptr *events, long len, long max);
     void merge_tracks();    // move all track data into one track
-    void set_in_use(bool flag); // set in_use flag on all tracks
+    void set_in_use(bool flag) override; // set in_use flag on all tracks
 } *Alg_seq_ptr, &Alg_seq_ref;
 
 
diff --git a/plugins/MidiImport/portsmf/allegrosmfrd.cpp b/plugins/MidiImport/portsmf/allegrosmfrd.cpp
index a221ca11b..388f4c9c9 100644
--- a/plugins/MidiImport/portsmf/allegrosmfrd.cpp
+++ b/plugins/MidiImport/portsmf/allegrosmfrd.cpp
@@ -65,36 +65,36 @@ protected:
 
     double get_time();
     void update(int chan, int key, Alg_parameter_ptr param);
-    void *Mf_malloc(size_t size) { return malloc(size); }
-    void Mf_free(void *obj, size_t size) { free(obj); }
+    void *Mf_malloc(size_t size) override { return malloc(size); }
+    void Mf_free(void *obj, size_t size) override { free(obj); }
     /* Methods to be called while processing the MIDI file. */
-    void Mf_starttrack();
-    void Mf_endtrack();
-    int Mf_getc();
-    void Mf_chanprefix(int chan);
-    void Mf_portprefix(int port);
-    void Mf_eot();
-    void Mf_error(char *);
+    void Mf_starttrack() override;
+    void Mf_endtrack() override;
+    int Mf_getc() override;
+    void Mf_chanprefix(int chan) override;
+    void Mf_portprefix(int port) override;
+    void Mf_eot() override;
+    void Mf_error(char *) override;
     void Mf_error(const char *);
-    void Mf_header(int,int,int);
-    void Mf_on(int,int,int);
-    void Mf_off(int,int,int);
-    void Mf_pressure(int,int,int);
-    void Mf_controller(int,int,int);
-    void Mf_pitchbend(int,int,int);
-    void Mf_program(int,int);
-    void Mf_chanpressure(int,int);
+    void Mf_header(int,int,int) override;
+    void Mf_on(int,int,int) override;
+    void Mf_off(int,int,int) override;
+    void Mf_pressure(int,int,int) override;
+    void Mf_controller(int,int,int) override;
+    void Mf_pitchbend(int,int,int) override;
+    void Mf_program(int,int) override;
+    void Mf_chanpressure(int,int) override;
     void binary_msg(int len, unsigned char *msg, const char *attr_string);
-    void Mf_sysex(int,unsigned char*);
-    void Mf_arbitrary(int,unsigned char*);
-    void Mf_metamisc(int,int,unsigned char*);
-    void Mf_seqnum(int);
-    void Mf_smpte(int,int,int,int,int);
-    void Mf_timesig(int,int,int,int);
-    void Mf_tempo(int);
-    void Mf_keysig(int,int);
-    void Mf_sqspecific(int,unsigned char*);
-    void Mf_text(int,int,unsigned char*);
+    void Mf_sysex(int,unsigned char*) override;
+    void Mf_arbitrary(int,unsigned char*) override;
+    void Mf_metamisc(int,int,unsigned char*) override;
+    void Mf_seqnum(int) override;
+    void Mf_smpte(int,int,int,int,int) override;
+    void Mf_timesig(int,int,int,int) override;
+    void Mf_tempo(int) override;
+    void Mf_keysig(int,int) override;
+    void Mf_sqspecific(int,unsigned char*) override;
+    void Mf_text(int,int,unsigned char*) override;
 };
 
 
diff --git a/plugins/Monstro/Monstro.h b/plugins/Monstro/Monstro.h
index d6b57cfae..52f607a32 100644
--- a/plugins/Monstro/Monstro.h
+++ b/plugins/Monstro/Monstro.h
@@ -355,21 +355,21 @@ class MonstroInstrument : public Instrument
 
 public:
 	MonstroInstrument( InstrumentTrack * _instrument_track );
-	virtual ~MonstroInstrument();
+	~MonstroInstrument() override;
 
-	virtual void playNote( NotePlayHandle * _n,
-						sampleFrame * _working_buffer );
-	virtual void deleteNotePluginData( NotePlayHandle * _n );
+	void playNote( NotePlayHandle * _n,
+						sampleFrame * _working_buffer ) override;
+	void deleteNotePluginData( NotePlayHandle * _n ) override;
 
-	virtual void saveSettings( QDomDocument & _doc,
-							QDomElement & _this );
-	virtual void loadSettings( const QDomElement & _this );
+	void saveSettings( QDomDocument & _doc,
+							QDomElement & _this ) override;
+	void loadSettings( const QDomElement & _this ) override;
 
-	virtual QString nodeName() const;
+	QString nodeName() const override;
 
-	virtual f_cnt_t desiredReleaseFrames() const;
+	f_cnt_t desiredReleaseFrames() const override;
 
-	virtual gui::PluginView* instantiateView( QWidget * _parent );
+	gui::PluginView* instantiateView( QWidget * _parent ) override;
 
 public slots:
 	void updateVolume1();
@@ -593,13 +593,13 @@ class MonstroView : public InstrumentViewFixedSize
 public:
 	MonstroView( Instrument * _instrument,
 					QWidget * _parent );
-	virtual ~MonstroView();
+	~MonstroView() override;
 
 protected slots:
 	void updateLayout();
 
 private:
-	virtual void modelChanged();
+	void modelChanged() override;
 
 	void setWidgetBackground( QWidget * _widget, const QString & _pic );
 	QWidget * setupOperatorsView( QWidget * _parent );
diff --git a/plugins/MultitapEcho/MultitapEcho.h b/plugins/MultitapEcho/MultitapEcho.h
index 3d6772d24..6145b9f86 100644
--- a/plugins/MultitapEcho/MultitapEcho.h
+++ b/plugins/MultitapEcho/MultitapEcho.h
@@ -39,10 +39,10 @@ class MultitapEchoEffect : public Effect
 {
 public:
 	MultitapEchoEffect( Model* parent, const Descriptor::SubPluginFeatures::Key* key );
-	virtual ~MultitapEchoEffect();
-	virtual bool processAudioBuffer( sampleFrame* buf, const fpp_t frames );
+	~MultitapEchoEffect() override;
+	bool processAudioBuffer( sampleFrame* buf, const fpp_t frames ) override;
 
-	virtual EffectControls* controls()
+	EffectControls* controls() override
 	{
 		return &m_controls;
 	}
diff --git a/plugins/MultitapEcho/MultitapEchoControlDialog.h b/plugins/MultitapEcho/MultitapEchoControlDialog.h
index 6104d433e..0989046c1 100644
--- a/plugins/MultitapEcho/MultitapEchoControlDialog.h
+++ b/plugins/MultitapEcho/MultitapEchoControlDialog.h
@@ -44,7 +44,7 @@ class MultitapEchoControlDialog : public EffectControlDialog
 	Q_OBJECT
 public:
 	MultitapEchoControlDialog( MultitapEchoControls * controls );
-	virtual ~MultitapEchoControlDialog()
+	~MultitapEchoControlDialog() override
 	{
 	}
 };
diff --git a/plugins/MultitapEcho/MultitapEchoControls.h b/plugins/MultitapEcho/MultitapEchoControls.h
index 65311c157..7ded68cc8 100644
--- a/plugins/MultitapEcho/MultitapEchoControls.h
+++ b/plugins/MultitapEcho/MultitapEchoControls.h
@@ -41,11 +41,11 @@ class MultitapEchoControls : public EffectControls
 	Q_OBJECT
 public:
 	MultitapEchoControls( MultitapEchoEffect * eff );
-	virtual ~MultitapEchoControls();
+	~MultitapEchoControls() override;
 
-	virtual void saveSettings( QDomDocument & doc, QDomElement & parent );
-	virtual void loadSettings( const QDomElement & elem );
-	inline virtual QString nodeName() const
+	void saveSettings( QDomDocument & doc, QDomElement & parent ) override;
+	void loadSettings( const QDomElement & elem ) override;
+	inline QString nodeName() const override
 	{
 		return( "multitapechocontrols" );
 	}
@@ -53,12 +53,12 @@ public:
 	void setDefaultAmpShape();
 	void setDefaultLpShape();
 
-	virtual int controlCount()
+	int controlCount() override
 	{
 		return( 5 );
 	}
 
-	virtual gui::EffectControlDialog* createView()
+	gui::EffectControlDialog* createView() override
 	{
 		return( new gui::MultitapEchoControlDialog( this ) );
 	}
diff --git a/plugins/Nes/Nes.h b/plugins/Nes/Nes.h
index f57cca9e7..41e7b0d7f 100644
--- a/plugins/Nes/Nes.h
+++ b/plugins/Nes/Nes.h
@@ -211,25 +211,25 @@ class NesInstrument : public Instrument
 	Q_OBJECT
 public:
 	NesInstrument( InstrumentTrack * instrumentTrack );
-	virtual ~NesInstrument();
+	~NesInstrument() override;
 	
-	virtual void playNote( NotePlayHandle * n,
-						sampleFrame * workingBuffer );
-	virtual void deleteNotePluginData( NotePlayHandle * n );
+	void playNote( NotePlayHandle * n,
+						sampleFrame * workingBuffer ) override;
+	void deleteNotePluginData( NotePlayHandle * n ) override;
 
 
-	virtual void saveSettings( QDomDocument & doc,
-							QDomElement & element );
-	virtual void loadSettings( const QDomElement & element );
+	void saveSettings( QDomDocument & doc,
+							QDomElement & element ) override;
+	void loadSettings( const QDomElement & element ) override;
 
-	virtual QString nodeName() const;
+	QString nodeName() const override;
 
-	virtual f_cnt_t desiredReleaseFrames() const
+	f_cnt_t desiredReleaseFrames() const override
 	{
 		return( 8 );
 	}
 	
-	virtual gui::PluginView* instantiateView( QWidget * parent );
+	gui::PluginView* instantiateView( QWidget * parent ) override;
 	
 public slots:
 	void updateFreq1();
@@ -313,10 +313,10 @@ class NesInstrumentView : public InstrumentViewFixedSize
 public:
 	NesInstrumentView( Instrument * instrument,
 					QWidget * parent );
-	virtual ~NesInstrumentView();	
+	~NesInstrumentView() override;
 
 private:
-	virtual void modelChanged();
+	void modelChanged() override;
 	
 	// channel 1
 	PixmapButton * 	m_ch1EnabledBtn;
diff --git a/plugins/OpulenZ/OpulenZ.h b/plugins/OpulenZ/OpulenZ.h
index f2a13ffe0..1f999252f 100644
--- a/plugins/OpulenZ/OpulenZ.h
+++ b/plugins/OpulenZ/OpulenZ.h
@@ -59,24 +59,24 @@ class OpulenzInstrument : public Instrument
 	Q_OBJECT
 public:
 	OpulenzInstrument( InstrumentTrack * _instrument_track );
-	virtual ~OpulenzInstrument();
+	~OpulenzInstrument() override;
 
-	virtual QString nodeName() const;
-	virtual gui::PluginView* instantiateView( QWidget * _parent );
+	QString nodeName() const override;
+	gui::PluginView* instantiateView( QWidget * _parent ) override;
 
-	virtual Flags flags() const
+	Flags flags() const override
 	{
 		return IsSingleStreamed | IsMidiBased;
 	}
 
-	virtual bool handleMidiEvent( const MidiEvent& event, const TimePos& time, f_cnt_t offset = 0 );
-	virtual void play( sampleFrame * _working_buffer );
+	bool handleMidiEvent( const MidiEvent& event, const TimePos& time, f_cnt_t offset = 0 ) override;
+	void play( sampleFrame * _working_buffer ) override;
 
-	void saveSettings( QDomDocument & _doc, QDomElement & _this );
-	void loadSettings( const QDomElement & _this );
+	void saveSettings( QDomDocument & _doc, QDomElement & _this ) override;
+	void loadSettings( const QDomElement & _this ) override;
 	void loadPatch(const unsigned char inst[14]);
 	void tuneEqual(int center, float Hz);
-	virtual void loadFile( const QString& file );
+	void loadFile( const QString& file ) override;
 
 	IntModel m_patchModel;
 
@@ -163,9 +163,9 @@ class OpulenzInstrumentView : public InstrumentViewFixedSize
 	Q_OBJECT
 public:
 	OpulenzInstrumentView( Instrument * _instrument, QWidget * _parent );
-	virtual ~OpulenzInstrumentView();
+	~OpulenzInstrumentView() override;
 	LcdSpinBox *m_patch;
-	void modelChanged();
+	void modelChanged() override;
 
 	Knob *op1_a_kn;
 	Knob *op1_d_kn;
diff --git a/plugins/Organic/Organic.h b/plugins/Organic/Organic.h
index b2f5ed518..bc951ad49 100644
--- a/plugins/Organic/Organic.h
+++ b/plugins/Organic/Organic.h
@@ -105,7 +105,7 @@ private:
 	float m_phaseOffsetRight;
 
 	OscillatorObject( Model * _parent, int _index );
-	virtual ~OscillatorObject();
+	~OscillatorObject() override;
 
 	friend class OrganicInstrument;
 	friend class gui::OrganicInstrumentView;
@@ -124,17 +124,17 @@ class OrganicInstrument : public Instrument
 	Q_OBJECT
 public:
 	OrganicInstrument( InstrumentTrack * _instrument_track );
-	virtual ~OrganicInstrument();
+	~OrganicInstrument() override;
 
-	virtual void playNote( NotePlayHandle * _n,
-						sampleFrame * _working_buffer );
-	virtual void deleteNotePluginData( NotePlayHandle * _n );
+	void playNote( NotePlayHandle * _n,
+						sampleFrame * _working_buffer ) override;
+	void deleteNotePluginData( NotePlayHandle * _n ) override;
 
 
-	virtual void saveSettings( QDomDocument & _doc, QDomElement & _parent );
-	virtual void loadSettings( const QDomElement & _this );
+	void saveSettings( QDomDocument & _doc, QDomElement & _parent ) override;
+	void loadSettings( const QDomElement & _this ) override;
 
-	virtual QString nodeName() const;
+	QString nodeName() const override;
 
 	int intRand( int min, int max );
 
@@ -172,7 +172,7 @@ private:
 	FloatModel  m_fx1Model;
 	FloatModel  m_volModel;
 
-	virtual gui::PluginView* instantiateView( QWidget * _parent );
+	gui::PluginView* instantiateView( QWidget * _parent ) override;
 
 
 private slots:
@@ -190,10 +190,10 @@ class OrganicInstrumentView : public InstrumentViewFixedSize
 	Q_OBJECT
 public:
 	OrganicInstrumentView( Instrument * _instrument, QWidget * _parent );
-	virtual ~OrganicInstrumentView();
+	~OrganicInstrumentView() override;
 
 private:
-	virtual void modelChanged();
+	void modelChanged() override;
 
 	struct OscillatorKnobs
 	{
diff --git a/plugins/Patman/Patman.h b/plugins/Patman/Patman.h
index 5088068df..206c2e503 100644
--- a/plugins/Patman/Patman.h
+++ b/plugins/Patman/Patman.h
@@ -57,26 +57,26 @@ class PatmanInstrument : public Instrument
 	Q_OBJECT
 public:
 	PatmanInstrument( InstrumentTrack * _track );
-	virtual ~PatmanInstrument();
+	~PatmanInstrument() override;
 
-	virtual void playNote( NotePlayHandle * _n,
-						sampleFrame * _working_buffer );
-	virtual void deleteNotePluginData( NotePlayHandle * _n );
+	void playNote( NotePlayHandle * _n,
+						sampleFrame * _working_buffer ) override;
+	void deleteNotePluginData( NotePlayHandle * _n ) override;
 
 
-	virtual void saveSettings( QDomDocument & _doc, QDomElement & _parent );
-	virtual void loadSettings( const QDomElement & _this );
+	void saveSettings( QDomDocument & _doc, QDomElement & _parent ) override;
+	void loadSettings( const QDomElement & _this ) override;
 
-	virtual void loadFile( const QString & _file );
+	void loadFile( const QString & _file ) override;
 
-	virtual QString nodeName( void ) const;
+	QString nodeName( void ) const override;
 
-	virtual f_cnt_t desiredReleaseFrames( void ) const
+	f_cnt_t desiredReleaseFrames( void ) const override
 	{
 		return( 128 );
 	}
 
-	virtual gui::PluginView* instantiateView( QWidget * _parent );
+	gui::PluginView* instantiateView( QWidget * _parent ) override;
 
 
 public slots:
@@ -131,7 +131,7 @@ class PatmanView : public InstrumentViewFixedSize
 	Q_OBJECT
 public:
 	PatmanView( Instrument * _instrument, QWidget * _parent );
-	virtual ~PatmanView();
+	~PatmanView() override;
 
 
 public slots:
@@ -140,13 +140,13 @@ public slots:
 
 
 protected:
-	virtual void dragEnterEvent( QDragEnterEvent * _dee );
-	virtual void dropEvent( QDropEvent * _de );
-	virtual void paintEvent( QPaintEvent * );
+	void dragEnterEvent( QDragEnterEvent * _dee ) override;
+	void dropEvent( QDropEvent * _de ) override;
+	void paintEvent( QPaintEvent * ) override;
 
 
 private:
-	virtual void modelChanged( void );
+	void modelChanged( void ) override;
 
 	PatmanInstrument * m_pi;
 	QString m_displayFilename;
diff --git a/plugins/PeakControllerEffect/PeakControllerEffect.h b/plugins/PeakControllerEffect/PeakControllerEffect.h
index 3d944a1a6..f2bafedda 100644
--- a/plugins/PeakControllerEffect/PeakControllerEffect.h
+++ b/plugins/PeakControllerEffect/PeakControllerEffect.h
@@ -40,8 +40,8 @@ class PeakControllerEffect : public Effect
 public:
 	PeakControllerEffect( Model * parent, 
 						const Descriptor::SubPluginFeatures::Key * _key );
-	virtual ~PeakControllerEffect();
-	virtual bool processAudioBuffer( sampleFrame * _buf,
+	~PeakControllerEffect() override;
+	bool processAudioBuffer( sampleFrame * _buf,
 									const fpp_t _frames ) override;
 
 	EffectControls * controls() override
diff --git a/plugins/PeakControllerEffect/PeakControllerEffectControlDialog.h b/plugins/PeakControllerEffect/PeakControllerEffectControlDialog.h
index 721167975..7ccb4a14c 100644
--- a/plugins/PeakControllerEffect/PeakControllerEffectControlDialog.h
+++ b/plugins/PeakControllerEffect/PeakControllerEffectControlDialog.h
@@ -45,7 +45,7 @@ class PeakControllerEffectControlDialog : public EffectControlDialog
 public:
 	PeakControllerEffectControlDialog(
 				PeakControllerEffectControls * _controls );
-	virtual ~PeakControllerEffectControlDialog()
+	~PeakControllerEffectControlDialog() override
 	{
 	}
 
diff --git a/plugins/PeakControllerEffect/PeakControllerEffectControls.h b/plugins/PeakControllerEffect/PeakControllerEffectControls.h
index 278c2f069..6eb3dad44 100644
--- a/plugins/PeakControllerEffect/PeakControllerEffectControls.h
+++ b/plugins/PeakControllerEffect/PeakControllerEffectControls.h
@@ -41,7 +41,7 @@ class PeakControllerEffectControls : public EffectControls
 	Q_OBJECT
 public:
 	PeakControllerEffectControls( PeakControllerEffect * _eff );
-	virtual ~PeakControllerEffectControls()
+	~PeakControllerEffectControls() override
 	{
 	}
 
diff --git a/plugins/ReverbSC/ReverbSC.h b/plugins/ReverbSC/ReverbSC.h
index 0cbeba875..2cb119bff 100644
--- a/plugins/ReverbSC/ReverbSC.h
+++ b/plugins/ReverbSC/ReverbSC.h
@@ -44,10 +44,10 @@ class ReverbSCEffect : public Effect
 {
 public:
 	ReverbSCEffect( Model* parent, const Descriptor::SubPluginFeatures::Key* key );
-	virtual ~ReverbSCEffect();
-	virtual bool processAudioBuffer( sampleFrame* buf, const fpp_t frames );
+	~ReverbSCEffect() override;
+	bool processAudioBuffer( sampleFrame* buf, const fpp_t frames ) override;
 
-	virtual EffectControls* controls()
+	EffectControls* controls() override
 	{
 		return &m_reverbSCControls;
 	}
diff --git a/plugins/ReverbSC/ReverbSCControlDialog.h b/plugins/ReverbSC/ReverbSCControlDialog.h
index ba373509a..0c02d7865 100644
--- a/plugins/ReverbSC/ReverbSCControlDialog.h
+++ b/plugins/ReverbSC/ReverbSCControlDialog.h
@@ -42,7 +42,7 @@ class ReverbSCControlDialog : public EffectControlDialog
 	Q_OBJECT
 public:
 	ReverbSCControlDialog( ReverbSCControls* controls );
-	virtual ~ReverbSCControlDialog()
+	~ReverbSCControlDialog() override
 	{
 	}
 
diff --git a/plugins/ReverbSC/ReverbSCControls.h b/plugins/ReverbSC/ReverbSCControls.h
index 2bd76990a..b58254dcf 100644
--- a/plugins/ReverbSC/ReverbSCControls.h
+++ b/plugins/ReverbSC/ReverbSCControls.h
@@ -40,23 +40,23 @@ class ReverbSCControls : public EffectControls
 	Q_OBJECT
 public:
 	ReverbSCControls( ReverbSCEffect* effect );
-	virtual ~ReverbSCControls()
+	~ReverbSCControls() override
 	{
 	}
 
-	virtual void saveSettings( QDomDocument & _doc, QDomElement & _parent );
-	virtual void loadSettings( const QDomElement & _this );
-	inline virtual QString nodeName() const
+	void saveSettings( QDomDocument & _doc, QDomElement & _parent ) override;
+	void loadSettings( const QDomElement & _this ) override;
+	inline QString nodeName() const override
 	{
 		return "ReverbSCControls";
 	}
 
-	virtual int controlCount()
+	int controlCount() override
 	{
 		return 4;
 	}
 
-	virtual gui::EffectControlDialog* createView()
+	gui::EffectControlDialog* createView() override
 	{
 		return new gui::ReverbSCControlDialog( this );
 	}
diff --git a/plugins/Sf2Player/PatchesDialog.cpp b/plugins/Sf2Player/PatchesDialog.cpp
index 3cba7561f..e3e882e69 100644
--- a/plugins/Sf2Player/PatchesDialog.cpp
+++ b/plugins/Sf2Player/PatchesDialog.cpp
@@ -47,7 +47,7 @@ public:
 		: QTreeWidgetItem( pListView, pItemAfter ) {}
 
 	// Sort/compare overriden method.
-	bool operator< ( const QTreeWidgetItem& other ) const
+	bool operator< ( const QTreeWidgetItem& other ) const override
 	{
 		int iColumn = QTreeWidgetItem::treeWidget()->sortColumn();
 		const QString& s1 = text( iColumn );
diff --git a/plugins/Sf2Player/PatchesDialog.h b/plugins/Sf2Player/PatchesDialog.h
index 9f80981df..af1207ce1 100644
--- a/plugins/Sf2Player/PatchesDialog.h
+++ b/plugins/Sf2Player/PatchesDialog.h
@@ -50,7 +50,7 @@ public:
 	PatchesDialog(QWidget *pParent = 0, Qt::WindowFlags wflags = QFlag(0));
 
 	// Destructor.
-	virtual ~PatchesDialog();
+	~PatchesDialog() override;
 
 
 	void setup(fluid_synth_t *pSynth, int iChan, const QString & _chanName,
@@ -64,8 +64,8 @@ public slots:
 
 protected slots:
 
-	void accept();
-	void reject();
+	void accept() override;
+	void reject() override;
 
 protected:
 
diff --git a/plugins/Sf2Player/Sf2Player.h b/plugins/Sf2Player/Sf2Player.h
index 3824595ea..1ce6d0fdd 100644
--- a/plugins/Sf2Player/Sf2Player.h
+++ b/plugins/Sf2Player/Sf2Player.h
@@ -63,35 +63,35 @@ class Sf2Instrument : public Instrument
 
 public:
 	Sf2Instrument( InstrumentTrack * _instrument_track );
-	virtual ~Sf2Instrument();
+	~Sf2Instrument() override;
 
-	virtual void play( sampleFrame * _working_buffer );
+	void play( sampleFrame * _working_buffer ) override;
 
-	virtual void playNote( NotePlayHandle * _n,
-						sampleFrame * _working_buffer );
-	virtual void deleteNotePluginData( NotePlayHandle * _n );
+	void playNote( NotePlayHandle * _n,
+						sampleFrame * _working_buffer ) override;
+	void deleteNotePluginData( NotePlayHandle * _n ) override;
 
 
-	virtual void saveSettings( QDomDocument & _doc, QDomElement & _parent );
-	virtual void loadSettings( const QDomElement & _this );
+	void saveSettings( QDomDocument & _doc, QDomElement & _parent ) override;
+	void loadSettings( const QDomElement & _this ) override;
 
-	virtual void loadFile( const QString & _file );
+	void loadFile( const QString & _file ) override;
 
-	virtual AutomatableModel * childModel( const QString & _modelName );
+	AutomatableModel * childModel( const QString & _modelName ) override;
 
-	virtual QString nodeName() const;
+	QString nodeName() const override;
 
-	virtual f_cnt_t desiredReleaseFrames() const
+	f_cnt_t desiredReleaseFrames() const override
 	{
 		return 0;
 	}
 
-	virtual Flags flags() const
+	Flags flags() const override
 	{
 		return IsSingleStreamed;
 	}
 
-	virtual gui::PluginView* instantiateView( QWidget * _parent );
+	gui::PluginView* instantiateView( QWidget * _parent ) override;
 	
 	QString getCurrentPatchName();
 
@@ -203,10 +203,10 @@ class Sf2InstrumentView : public InstrumentViewFixedSize
 public:
 	Sf2InstrumentView( Instrument * _instrument,
 					QWidget * _parent );
-	virtual ~Sf2InstrumentView();
+	~Sf2InstrumentView() override;
 
 private:
-	virtual void modelChanged();
+	void modelChanged() override;
 
 	PixmapButton * m_fileDialogButton;
 	PixmapButton * m_patchDialogButton;
diff --git a/plugins/Sfxr/Sfxr.h b/plugins/Sfxr/Sfxr.h
index 4c14d33bb..6aafe9961 100644
--- a/plugins/Sfxr/Sfxr.h
+++ b/plugins/Sfxr/Sfxr.h
@@ -140,7 +140,7 @@ public:
 	{
 	}
 	/* purpose: prevent the initial value of the model from being changed */
-	virtual void loadSettings( const QDomElement& element, const QString& name = QString( "value" ) )
+	void loadSettings( const QDomElement& element, const QString& name = QString( "value" ) ) override
 	{
 		float oldInitValue = initValue();
 		FloatModel::loadSettings(element, name);
@@ -161,7 +161,7 @@ public:
 	{
 	}
 	/* purpose: prevent the initial value of the model from being changed */
-	virtual void loadSettings( const QDomElement& element, const QString& name = QString( "value" ) )
+	void loadSettings( const QDomElement& element, const QString& name = QString( "value" ) ) override
 	{
 		float oldInitValue = initValue();
 		FloatModel::loadSettings(element, name);
@@ -176,18 +176,18 @@ class SfxrInstrument : public Instrument
 	Q_OBJECT
 public:
 	SfxrInstrument(InstrumentTrack * _instrument_track );
-	virtual ~SfxrInstrument();
+	~SfxrInstrument() override;
 
-	virtual void playNote( NotePlayHandle * _n, sampleFrame * _working_buffer );
-	virtual void deleteNotePluginData( NotePlayHandle * _n );
+	void playNote( NotePlayHandle * _n, sampleFrame * _working_buffer ) override;
+	void deleteNotePluginData( NotePlayHandle * _n ) override;
 
-	virtual void saveSettings( QDomDocument & _doc,
-							QDomElement & _parent );
-	virtual void loadSettings( const QDomElement & _this );
+	void saveSettings( QDomDocument & _doc,
+							QDomElement & _parent ) override;
+	void loadSettings( const QDomElement & _this ) override;
 
-	virtual QString nodeName() const;
+	QString nodeName() const override;
 
-	virtual gui::PluginView* instantiateView( QWidget * _parent );
+	gui::PluginView* instantiateView( QWidget * _parent ) override;
 
 	void resetModels();
 
@@ -240,7 +240,7 @@ public:
 	SfxrInstrumentView( Instrument * _instrument,
 					QWidget * _parent );
 
-	virtual ~SfxrInstrumentView() {};
+	~SfxrInstrumentView() override {};
 
 protected slots:
 	void genPickup();
@@ -256,7 +256,7 @@ protected slots:
 	void previewSound();
 
 private:
-	virtual void modelChanged();
+	void modelChanged() override;
 
 	Knob * m_attKnob; //Attack Time
 	Knob * m_holdKnob; //Sustain Time
diff --git a/plugins/Sid/SidInstrument.h b/plugins/Sid/SidInstrument.h
index 3a92605b6..1c8fecc95 100644
--- a/plugins/Sid/SidInstrument.h
+++ b/plugins/Sid/SidInstrument.h
@@ -58,7 +58,7 @@ public:
 		NumWaveShapes
 	};
 	VoiceObject( Model * _parent, int _idx );
-	virtual ~VoiceObject();
+	~VoiceObject() override;
 
 
 private:
@@ -97,21 +97,21 @@ public:
 
 
 	SidInstrument( InstrumentTrack * _instrument_track );
-	virtual ~SidInstrument();
+	~SidInstrument() override;
 
-	virtual void playNote( NotePlayHandle * _n,
-						sampleFrame * _working_buffer );
-	virtual void deleteNotePluginData( NotePlayHandle * _n );
+	void playNote( NotePlayHandle * _n,
+						sampleFrame * _working_buffer ) override;
+	void deleteNotePluginData( NotePlayHandle * _n ) override;
 
 
-	virtual void saveSettings( QDomDocument & _doc, QDomElement & _parent );
-	virtual void loadSettings( const QDomElement & _this );
+	void saveSettings( QDomDocument & _doc, QDomElement & _parent ) override;
+	void loadSettings( const QDomElement & _this ) override;
 
-	virtual QString nodeName() const;
+	QString nodeName() const override;
 
-	virtual f_cnt_t desiredReleaseFrames() const;
+	f_cnt_t desiredReleaseFrames() const override;
 
-	virtual gui::PluginView* instantiateView( QWidget * _parent );
+	gui::PluginView* instantiateView( QWidget * _parent ) override;
 
 
 /*public slots:
@@ -147,10 +147,10 @@ class SidInstrumentView : public InstrumentViewFixedSize
 	Q_OBJECT
 public:
 	SidInstrumentView( Instrument * _instrument, QWidget * _parent );
-	virtual ~SidInstrumentView();
+	~SidInstrumentView() override;
 
 private:
-	virtual void modelChanged();
+	void modelChanged() override;
 	
 	automatableButtonGroup * m_passBtnGrp;
 	automatableButtonGroup * m_sidTypeBtnGrp;
diff --git a/plugins/SpectrumAnalyzer/Analyzer.h b/plugins/SpectrumAnalyzer/Analyzer.h
index 9013b6745..5be1f9ba8 100644
--- a/plugins/SpectrumAnalyzer/Analyzer.h
+++ b/plugins/SpectrumAnalyzer/Analyzer.h
@@ -43,7 +43,7 @@ class Analyzer : public Effect
 {
 public:
 	Analyzer(Model *parent, const Descriptor::SubPluginFeatures::Key *key);
-	virtual ~Analyzer();
+	~Analyzer() override;
 
 	bool processAudioBuffer(sampleFrame *buffer, const fpp_t frame_count) override;
 	EffectControls *controls() override {return &m_controls;}
diff --git a/plugins/SpectrumAnalyzer/SaControls.h b/plugins/SpectrumAnalyzer/SaControls.h
index 70a7559f2..b2fc1cc87 100644
--- a/plugins/SpectrumAnalyzer/SaControls.h
+++ b/plugins/SpectrumAnalyzer/SaControls.h
@@ -49,7 +49,7 @@ class SaControls : public EffectControls
 	Q_OBJECT
 public:
 	explicit SaControls(Analyzer* effect);
-	virtual ~SaControls() {}
+	~SaControls() override {}
 
 	gui::EffectControlDialog* createView() override;
 
diff --git a/plugins/SpectrumAnalyzer/SaControlsDialog.h b/plugins/SpectrumAnalyzer/SaControlsDialog.h
index 1504da3dc..ac28be4bf 100644
--- a/plugins/SpectrumAnalyzer/SaControlsDialog.h
+++ b/plugins/SpectrumAnalyzer/SaControlsDialog.h
@@ -47,7 +47,7 @@ class SaControlsDialog : public EffectControlDialog
 	Q_OBJECT
 public:
 	explicit SaControlsDialog(SaControls *controls, SaProcessor *processor);
-	virtual ~SaControlsDialog() {}
+	~SaControlsDialog() override {}
 
 	bool isResizable() const override {return true;}
 	QSize sizeHint() const override;
diff --git a/plugins/SpectrumAnalyzer/SaSpectrumView.h b/plugins/SpectrumAnalyzer/SaSpectrumView.h
index 4ac24cbf0..d50c893e5 100644
--- a/plugins/SpectrumAnalyzer/SaSpectrumView.h
+++ b/plugins/SpectrumAnalyzer/SaSpectrumView.h
@@ -54,7 +54,7 @@ class SaSpectrumView : public QWidget
 	Q_OBJECT
 public:
 	explicit SaSpectrumView(SaControls *controls, SaProcessor *processor, QWidget *_parent = 0);
-	virtual ~SaSpectrumView() {}
+	~SaSpectrumView() override {}
 
 	QSize sizeHint() const override {return QSize(400, 200);}
 
diff --git a/plugins/SpectrumAnalyzer/SaWaterfallView.h b/plugins/SpectrumAnalyzer/SaWaterfallView.h
index cdfad6ad4..2855eb925 100644
--- a/plugins/SpectrumAnalyzer/SaWaterfallView.h
+++ b/plugins/SpectrumAnalyzer/SaWaterfallView.h
@@ -49,7 +49,7 @@ class SaWaterfallView : public QWidget
 	Q_OBJECT
 public:
 	explicit SaWaterfallView(SaControls *controls, SaProcessor *processor, QWidget *_parent = 0);
-	virtual ~SaWaterfallView() {}
+	~SaWaterfallView() override {}
 
 	QSize sizeHint() const override {return QSize(400, 350);}
 
diff --git a/plugins/StereoEnhancer/StereoEnhancer.h b/plugins/StereoEnhancer/StereoEnhancer.h
index a3f4a6de4..5872100d3 100644
--- a/plugins/StereoEnhancer/StereoEnhancer.h
+++ b/plugins/StereoEnhancer/StereoEnhancer.h
@@ -39,11 +39,11 @@ class StereoEnhancerEffect : public Effect
 public:
 	StereoEnhancerEffect( Model * parent,
 	                      const Descriptor::SubPluginFeatures::Key * _key );
-	virtual ~StereoEnhancerEffect();
-	virtual bool processAudioBuffer( sampleFrame * _buf,
-		                                          const fpp_t _frames );
+	~StereoEnhancerEffect() override;
+	bool processAudioBuffer( sampleFrame * _buf,
+		                                          const fpp_t _frames ) override;
 
-	virtual EffectControls * controls()
+	EffectControls * controls() override
 	{
 		return( &m_bbControls );
 	}
diff --git a/plugins/StereoEnhancer/StereoEnhancerControlDialog.h b/plugins/StereoEnhancer/StereoEnhancerControlDialog.h
index 62f78d1cd..3f063ec63 100644
--- a/plugins/StereoEnhancer/StereoEnhancerControlDialog.h
+++ b/plugins/StereoEnhancer/StereoEnhancerControlDialog.h
@@ -42,7 +42,7 @@ class StereoEnhancerControlDialog : public EffectControlDialog
 	Q_OBJECT
 public:
 	StereoEnhancerControlDialog( StereoEnhancerControls * _controls );
-	virtual ~StereoEnhancerControlDialog()
+	~StereoEnhancerControlDialog() override
 	{
 	}
 
diff --git a/plugins/StereoEnhancer/StereoEnhancerControls.h b/plugins/StereoEnhancer/StereoEnhancerControls.h
index c9a0f6e61..0b016aa2b 100644
--- a/plugins/StereoEnhancer/StereoEnhancerControls.h
+++ b/plugins/StereoEnhancer/StereoEnhancerControls.h
@@ -39,23 +39,23 @@ class StereoEnhancerControls : public EffectControls
 	Q_OBJECT
 public:
 	StereoEnhancerControls( StereoEnhancerEffect( * _eff ) ); 
-	virtual ~StereoEnhancerControls()
+	~StereoEnhancerControls() override
 	{
 	}
 
-	virtual void saveSettings( QDomDocument & _doc, QDomElement & _parent );
-	virtual void loadSettings( const QDomElement & _this );
-	inline virtual QString nodeName() const
+	void saveSettings( QDomDocument & _doc, QDomElement & _parent ) override;
+	void loadSettings( const QDomElement & _this ) override;
+	inline QString nodeName() const override
 	{
 		return( "stereoenhancercontrols" );
 	}
 
-	virtual int controlCount()
+	int controlCount() override
 	{
 		return( 1 );
 	}
 	
-	virtual gui::EffectControlDialog* createView()
+	gui::EffectControlDialog* createView() override
 	{
 		return new gui::StereoEnhancerControlDialog( this );
 	}
diff --git a/plugins/StereoMatrix/StereoMatrix.h b/plugins/StereoMatrix/StereoMatrix.h
index 88d265ad2..a8a373317 100644
--- a/plugins/StereoMatrix/StereoMatrix.h
+++ b/plugins/StereoMatrix/StereoMatrix.h
@@ -38,11 +38,11 @@ class StereoMatrixEffect : public Effect
 public:
 	StereoMatrixEffect( Model * parent, 
 	                      const Descriptor::SubPluginFeatures::Key * _key );
-	virtual ~StereoMatrixEffect();
-	virtual bool processAudioBuffer( sampleFrame * _buf,
-		                                          const fpp_t _frames );
+	~StereoMatrixEffect() override;
+	bool processAudioBuffer( sampleFrame * _buf,
+		                                          const fpp_t _frames ) override;
 
-	virtual EffectControls* controls()
+	EffectControls* controls() override
 	{
 		return( &m_smControls );
 	}
diff --git a/plugins/StereoMatrix/StereoMatrixControlDialog.h b/plugins/StereoMatrix/StereoMatrixControlDialog.h
index fd5cf786a..41eb9cdb4 100644
--- a/plugins/StereoMatrix/StereoMatrixControlDialog.h
+++ b/plugins/StereoMatrix/StereoMatrixControlDialog.h
@@ -41,7 +41,7 @@ class StereoMatrixControlDialog : public EffectControlDialog
 	Q_OBJECT
 public:
 	StereoMatrixControlDialog( StereoMatrixControls * _controls );
-	virtual ~StereoMatrixControlDialog()
+	~StereoMatrixControlDialog() override
 	{
 	}
 
diff --git a/plugins/StereoMatrix/StereoMatrixControls.h b/plugins/StereoMatrix/StereoMatrixControls.h
index 97f0cf8e1..04a10f237 100644
--- a/plugins/StereoMatrix/StereoMatrixControls.h
+++ b/plugins/StereoMatrix/StereoMatrixControls.h
@@ -39,23 +39,23 @@ class StereoMatrixControls : public EffectControls
 	Q_OBJECT
 public:
 	StereoMatrixControls( StereoMatrixEffect( * _eff ) ); 
-	virtual ~StereoMatrixControls()
+	~StereoMatrixControls() override
 	{
 	}
 
-	virtual void saveSettings( QDomDocument & _doc, QDomElement & _parent );
-	virtual void loadSettings( const QDomElement & _this );
-	inline virtual QString nodeName() const
+	void saveSettings( QDomDocument & _doc, QDomElement & _parent ) override;
+	void loadSettings( const QDomElement & _this ) override;
+	inline QString nodeName() const override
 	{
 		return( "stereomatrixcontrols" );
 	}
 
-	virtual int controlCount()
+	int controlCount() override
 	{
 		return( 1 );
 	}
 	
-	virtual gui::EffectControlDialog* createView()
+	gui::EffectControlDialog* createView() override
 	{
 		return new gui::StereoMatrixControlDialog( this );
 	}
diff --git a/plugins/Stk/Mallets/Mallets.h b/plugins/Stk/Mallets/Mallets.h
index 51b0bfb43..e8ec15360 100644
--- a/plugins/Stk/Mallets/Mallets.h
+++ b/plugins/Stk/Mallets/Mallets.h
@@ -160,17 +160,17 @@ class MalletsInstrument : public Instrument
 	Q_OBJECT
 public:
 	MalletsInstrument( InstrumentTrack * _instrument_track );
-	virtual ~MalletsInstrument();
+	~MalletsInstrument() override;
 
-	virtual void playNote( NotePlayHandle * _n,
-						sampleFrame * _working_buffer );
-	virtual void deleteNotePluginData( NotePlayHandle * _n );
+	void playNote( NotePlayHandle * _n,
+						sampleFrame * _working_buffer ) override;
+	void deleteNotePluginData( NotePlayHandle * _n ) override;
 
 
-	virtual void saveSettings( QDomDocument & _doc, QDomElement & _parent );
-	virtual void loadSettings( const QDomElement & _this );
+	void saveSettings( QDomDocument & _doc, QDomElement & _parent ) override;
+	void loadSettings( const QDomElement & _this ) override;
 
-	virtual QString nodeName() const;
+	QString nodeName() const override;
 
 	gui::PluginView* instantiateView( QWidget * _parent ) override;
 
@@ -219,13 +219,13 @@ class MalletsInstrumentView: public InstrumentViewFixedSize
 public:
 	MalletsInstrumentView( MalletsInstrument * _instrument,
 				QWidget * _parent );
-	virtual ~MalletsInstrumentView();
+	~MalletsInstrumentView() override;
 
 public slots:
 	void changePreset();
 
 private:
-	virtual void modelChanged();
+	void modelChanged() override;
 
 	void setWidgetBackground( QWidget * _widget, const QString & _pic );
 	QWidget * setupModalBarControls( QWidget * _parent );
diff --git a/plugins/TripleOscillator/TripleOscillator.h b/plugins/TripleOscillator/TripleOscillator.h
index 1c8871796..0cb0e69a0 100644
--- a/plugins/TripleOscillator/TripleOscillator.h
+++ b/plugins/TripleOscillator/TripleOscillator.h
@@ -57,7 +57,7 @@ class OscillatorObject : public Model
 	Q_OBJECT
 public:
 	OscillatorObject( Model * _parent, int _idx );
-	virtual ~OscillatorObject();
+	~OscillatorObject() override;
 
 
 private:
@@ -108,24 +108,24 @@ class TripleOscillator : public Instrument
 	Q_OBJECT
 public:
 	TripleOscillator( InstrumentTrack * _track );
-	virtual ~TripleOscillator();
+	~TripleOscillator() override;
 
-	virtual void playNote( NotePlayHandle * _n,
-						sampleFrame * _working_buffer );
-	virtual void deleteNotePluginData( NotePlayHandle * _n );
+	void playNote( NotePlayHandle * _n,
+						sampleFrame * _working_buffer ) override;
+	void deleteNotePluginData( NotePlayHandle * _n ) override;
 
 
-	virtual void saveSettings( QDomDocument & _doc, QDomElement & _parent );
-	virtual void loadSettings( const QDomElement & _this );
+	void saveSettings( QDomDocument & _doc, QDomElement & _parent ) override;
+	void loadSettings( const QDomElement & _this ) override;
 
-	virtual QString nodeName() const;
+	QString nodeName() const override;
 
-	virtual f_cnt_t desiredReleaseFrames() const
+	f_cnt_t desiredReleaseFrames() const override
 	{
 		return( 128 );
 	}
 
-	virtual gui::PluginView* instantiateView( QWidget * _parent );
+	gui::PluginView* instantiateView( QWidget * _parent ) override;
 
 
 protected slots:
@@ -157,11 +157,11 @@ class TripleOscillatorView : public InstrumentViewFixedSize
 	Q_OBJECT
 public:
 	TripleOscillatorView( Instrument * _instrument, QWidget * _parent );
-	virtual ~TripleOscillatorView();
+	~TripleOscillatorView() override;
 
 
 private:
-	virtual void modelChanged();
+	void modelChanged() override;
 
 	automatableButtonGroup * m_mod1BtnGrp;
 	automatableButtonGroup * m_mod2BtnGrp;
diff --git a/plugins/Vectorscope/VecControls.h b/plugins/Vectorscope/VecControls.h
index e4aa27b43..76b0f388e 100644
--- a/plugins/Vectorscope/VecControls.h
+++ b/plugins/Vectorscope/VecControls.h
@@ -47,7 +47,7 @@ class VecControls : public EffectControls
 	Q_OBJECT
 public:
 	explicit VecControls(Vectorscope *effect);
-	virtual ~VecControls() {}
+	~VecControls() override {}
 
 	gui::EffectControlDialog* createView() override;
 
diff --git a/plugins/Vectorscope/VecControlsDialog.h b/plugins/Vectorscope/VecControlsDialog.h
index 97108cdf4..616e55b44 100644
--- a/plugins/Vectorscope/VecControlsDialog.h
+++ b/plugins/Vectorscope/VecControlsDialog.h
@@ -43,7 +43,7 @@ class VecControlsDialog : public EffectControlDialog
 	Q_OBJECT
 public:
 	explicit VecControlsDialog(VecControls *controls);
-	virtual ~VecControlsDialog() {}
+	~VecControlsDialog() override {}
 
 	bool isResizable() const override {return true;}
 	QSize sizeHint() const override;
diff --git a/plugins/Vectorscope/VectorView.h b/plugins/Vectorscope/VectorView.h
index 0aae988db..347aa8a18 100644
--- a/plugins/Vectorscope/VectorView.h
+++ b/plugins/Vectorscope/VectorView.h
@@ -44,7 +44,7 @@ class VectorView : public QWidget
 	Q_OBJECT
 public:
 	explicit VectorView(VecControls *controls, LocklessRingBuffer<sampleFrame> *inputBuffer, unsigned short displaySize, QWidget *parent = 0);
-	virtual ~VectorView() {}
+	~VectorView() override {}
 
 	QSize sizeHint() const override {return QSize(300, 300);}
 
diff --git a/plugins/Vectorscope/Vectorscope.h b/plugins/Vectorscope/Vectorscope.h
index 973fecf0e..e3e92b205 100644
--- a/plugins/Vectorscope/Vectorscope.h
+++ b/plugins/Vectorscope/Vectorscope.h
@@ -37,7 +37,7 @@ class Vectorscope : public Effect
 {
 public:
 	Vectorscope(Model *parent, const Descriptor::SubPluginFeatures::Key *key);
-	virtual ~Vectorscope() {};
+	~Vectorscope() override {};
 
 	bool processAudioBuffer(sampleFrame *buffer, const fpp_t frame_count) override;
 	EffectControls *controls() override {return &m_controls;}
diff --git a/plugins/Vestige/Vestige.cpp b/plugins/Vestige/Vestige.cpp
index 9088321cc..150a4f1e4 100644
--- a/plugins/Vestige/Vestige.cpp
+++ b/plugins/Vestige/Vestige.cpp
@@ -103,11 +103,11 @@ public:
 		setWindowFlags( Qt::WindowCloseButtonHint );
 	}
 
-	virtual ~vstSubWin()
+	~vstSubWin() override
 	{
 	}
 
-	virtual void closeEvent( QCloseEvent * e )
+	void closeEvent( QCloseEvent * e ) override
 	{
 		// ignore close-events - for some reason otherwise the VST GUI
 		// remains hidden when re-opening
diff --git a/plugins/Vibed/NineButtonSelector.h b/plugins/Vibed/NineButtonSelector.h
index 1c3183055..90c4d53e8 100644
--- a/plugins/Vibed/NineButtonSelector.h
+++ b/plugins/Vibed/NineButtonSelector.h
@@ -67,7 +67,7 @@ public:
 				int _default,
 				int _x, int _y,
 				QWidget * _parent);
-	virtual ~NineButtonSelector();
+	~NineButtonSelector() override;
 	
 //	inline int getSelected() { 
 //		return( castModel<NineButtonSelectorModel>()->value() );
@@ -86,13 +86,13 @@ public slots:
 	void button6Clicked();
 	void button7Clicked();
 	void button8Clicked();
-	void contextMenuEvent( QContextMenuEvent * );
+	void contextMenuEvent( QContextMenuEvent * ) override;
 	
 signals:
 	void NineButtonSelection( int );
 	
 private:
-	virtual void modelChanged();
+	void modelChanged() override;
 	void updateButton( int );
 
 	QList<PixmapButton *> m_buttons;
diff --git a/plugins/Vibed/Vibed.h b/plugins/Vibed/Vibed.h
index f13fd665a..c6fdee385 100644
--- a/plugins/Vibed/Vibed.h
+++ b/plugins/Vibed/Vibed.h
@@ -97,11 +97,11 @@ class VibedView : public InstrumentViewFixedSize
 public:
 	VibedView( Instrument * _instrument,
 					QWidget * _parent );
-	virtual ~VibedView() {};
+	~VibedView() override {};
 
 public slots:
 	void showString( int _string );
-	void contextMenuEvent( QContextMenuEvent * );
+	void contextMenuEvent( QContextMenuEvent * ) override;
 
 protected slots:
 	void sinWaveClicked();
@@ -114,7 +114,7 @@ protected slots:
 	void normalizeClicked();
 
 private:
-	virtual void modelChanged();
+	void modelChanged() override;
 
 
 	// String-related
diff --git a/plugins/VstBase/VstPlugin.h b/plugins/VstBase/VstPlugin.h
index f73c1c876..c0f8e79e5 100644
--- a/plugins/VstBase/VstPlugin.h
+++ b/plugins/VstBase/VstPlugin.h
@@ -45,7 +45,7 @@ class VSTBASE_EXPORT VstPlugin : public RemotePlugin, public JournallingObject
 	Q_OBJECT
 public:
 	VstPlugin( const QString & _plugin );
-	virtual ~VstPlugin();
+	~VstPlugin() override;
 
 	void tryLoad( const QString &remoteVstPluginExecutable );
 
@@ -112,7 +112,7 @@ public:
 	void loadSettings( const QDomElement & _this ) override;
 	void saveSettings( QDomDocument & _doc, QDomElement & _this ) override;
 
-	virtual QString nodeName() const override
+	QString nodeName() const override
 	{
 		return "vstplugin";
 	}
diff --git a/plugins/VstEffect/VstEffect.h b/plugins/VstEffect/VstEffect.h
index 12b15dc49..586d00d3b 100644
--- a/plugins/VstEffect/VstEffect.h
+++ b/plugins/VstEffect/VstEffect.h
@@ -43,12 +43,12 @@ class VstEffect : public Effect
 public:
 	VstEffect( Model * _parent,
 			const Descriptor::SubPluginFeatures::Key * _key );
-	virtual ~VstEffect();
+	~VstEffect() override;
 
-	virtual bool processAudioBuffer( sampleFrame * _buf,
-							const fpp_t _frames );
+	bool processAudioBuffer( sampleFrame * _buf,
+							const fpp_t _frames ) override;
 
-	virtual EffectControls * controls()
+	EffectControls * controls() override
 	{
 		return &m_vstControls;
 	}
diff --git a/plugins/VstEffect/VstEffectControlDialog.h b/plugins/VstEffect/VstEffectControlDialog.h
index f54ab750c..1fb538ca5 100644
--- a/plugins/VstEffect/VstEffectControlDialog.h
+++ b/plugins/VstEffect/VstEffectControlDialog.h
@@ -50,7 +50,7 @@ class VstEffectControlDialog : public EffectControlDialog
 	Q_OBJECT
 public:
 	VstEffectControlDialog( VstEffectControls * _controls );
-	virtual ~VstEffectControlDialog();
+	~VstEffectControlDialog() override;
 
 protected:
 	void paintEvent( QPaintEvent * _pe ) override;
diff --git a/plugins/VstEffect/VstEffectControls.h b/plugins/VstEffect/VstEffectControls.h
index 24d5961ae..6e142b38c 100644
--- a/plugins/VstEffect/VstEffectControls.h
+++ b/plugins/VstEffect/VstEffectControls.h
@@ -55,18 +55,18 @@ class VstEffectControls : public EffectControls
 	Q_OBJECT
 public:
 	VstEffectControls( VstEffect * _eff );
-	virtual ~VstEffectControls();
+	~VstEffectControls() override;
 
-	virtual void saveSettings( QDomDocument & _doc, QDomElement & _parent );
-	virtual void loadSettings( const QDomElement & _this );
-	inline virtual QString nodeName() const
+	void saveSettings( QDomDocument & _doc, QDomElement & _parent ) override;
+	void loadSettings( const QDomElement & _this ) override;
+	inline QString nodeName() const override
 	{
 		return "vsteffectcontrols";
 	}
 
-	virtual int controlCount();
+	int controlCount() override;
 
-	virtual gui::EffectControlDialog* createView();
+	gui::EffectControlDialog* createView() override;
 
 
 protected slots:
@@ -113,7 +113,7 @@ class ManageVSTEffectView : public QObject
 	Q_OBJECT
 public:
 	ManageVSTEffectView( VstEffect * _eff, VstEffectControls * m_vi );
-	virtual ~ManageVSTEffectView();
+	~ManageVSTEffectView() override;
 
 
 protected slots:
diff --git a/plugins/VstEffect/VstSubPluginFeatures.h b/plugins/VstEffect/VstSubPluginFeatures.h
index d3b9de58c..c5dc87d14 100644
--- a/plugins/VstEffect/VstSubPluginFeatures.h
+++ b/plugins/VstEffect/VstSubPluginFeatures.h
@@ -40,11 +40,11 @@ class VstSubPluginFeatures : public Plugin::Descriptor::SubPluginFeatures
 public:
 	VstSubPluginFeatures( Plugin::PluginTypes _type );
 
-	virtual void fillDescriptionWidget( QWidget * _parent,
-											const Key * _key ) const;
+	void fillDescriptionWidget( QWidget * _parent,
+											const Key * _key ) const override;
 
-	virtual void listSubPluginKeys( const Plugin::Descriptor * _desc,
-											KeyList & _kl ) const;
+	void listSubPluginKeys( const Plugin::Descriptor * _desc,
+											KeyList & _kl ) const override;
 private:
 	void addPluginsFromDir(QStringList* filenames,  QString path) const;
 } ;
diff --git a/plugins/Watsyn/Watsyn.h b/plugins/Watsyn/Watsyn.h
index 454329b57..cee2d807b 100644
--- a/plugins/Watsyn/Watsyn.h
+++ b/plugins/Watsyn/Watsyn.h
@@ -139,25 +139,25 @@ class WatsynInstrument : public Instrument
 	Q_OBJECT
 public:
 	WatsynInstrument( InstrumentTrack * _instrument_track );
-	virtual ~WatsynInstrument();
+	~WatsynInstrument() override;
 
-	virtual void playNote( NotePlayHandle * _n,
-						sampleFrame * _working_buffer );
-	virtual void deleteNotePluginData( NotePlayHandle * _n );
+	void playNote( NotePlayHandle * _n,
+						sampleFrame * _working_buffer ) override;
+	void deleteNotePluginData( NotePlayHandle * _n ) override;
 
 
-	virtual void saveSettings( QDomDocument & _doc,
-							QDomElement & _this );
-	virtual void loadSettings( const QDomElement & _this );
+	void saveSettings( QDomDocument & _doc,
+							QDomElement & _this ) override;
+	void loadSettings( const QDomElement & _this ) override;
 
-	virtual QString nodeName() const;
+	QString nodeName() const override;
 
-	virtual f_cnt_t desiredReleaseFrames() const
+	f_cnt_t desiredReleaseFrames() const override
 	{
 		return( 64 );
 	}
 
-	virtual gui::PluginView* instantiateView( QWidget * _parent );
+	gui::PluginView* instantiateView( QWidget * _parent ) override;
 
 public slots:
 	void updateVolumes();
@@ -310,7 +310,7 @@ class WatsynView : public InstrumentViewFixedSize
 public:
 	WatsynView( Instrument * _instrument,
 					QWidget * _parent );
-	virtual ~WatsynView();
+	~WatsynView() override;
 
 protected slots:
 	void updateLayout();
@@ -328,7 +328,7 @@ protected slots:
 	void loadClicked();
 
 private:
-	virtual void modelChanged();
+	void modelChanged() override;
 
 // knobs
 	Knob * a1_volKnob;
diff --git a/plugins/WaveShaper/WaveShaper.h b/plugins/WaveShaper/WaveShaper.h
index 7364784bb..075c0ec6b 100644
--- a/plugins/WaveShaper/WaveShaper.h
+++ b/plugins/WaveShaper/WaveShaper.h
@@ -39,11 +39,11 @@ class WaveShaperEffect : public Effect
 public:
 	WaveShaperEffect( Model * _parent,
 			const Descriptor::SubPluginFeatures::Key * _key );
-	virtual ~WaveShaperEffect();
-	virtual bool processAudioBuffer( sampleFrame * _buf,
-							const fpp_t _frames );
+	~WaveShaperEffect() override;
+	bool processAudioBuffer( sampleFrame * _buf,
+							const fpp_t _frames ) override;
 
-	virtual EffectControls * controls()
+	EffectControls * controls() override
 	{
 		return( &m_wsControls );
 	}
diff --git a/plugins/WaveShaper/WaveShaperControlDialog.h b/plugins/WaveShaper/WaveShaperControlDialog.h
index 672b55f62..be3838f46 100644
--- a/plugins/WaveShaper/WaveShaperControlDialog.h
+++ b/plugins/WaveShaper/WaveShaperControlDialog.h
@@ -42,7 +42,7 @@ class WaveShaperControlDialog : public EffectControlDialog
 	Q_OBJECT
 public:
 	WaveShaperControlDialog( WaveShaperControls * _controls );
-	virtual ~WaveShaperControlDialog()
+	~WaveShaperControlDialog() override
 	{
 	}
 
diff --git a/plugins/WaveShaper/WaveShaperControls.h b/plugins/WaveShaper/WaveShaperControls.h
index f94bc3d9b..2719514f5 100644
--- a/plugins/WaveShaper/WaveShaperControls.h
+++ b/plugins/WaveShaper/WaveShaperControls.h
@@ -42,25 +42,25 @@ class WaveShaperControls : public EffectControls
 	Q_OBJECT
 public:
 	WaveShaperControls( WaveShaperEffect * _eff );
-	virtual ~WaveShaperControls()
+	~WaveShaperControls() override
 	{
 	}
 
-	virtual void saveSettings( QDomDocument & _doc, QDomElement & _parent );
-	virtual void loadSettings( const QDomElement & _this );
-	inline virtual QString nodeName() const
+	void saveSettings( QDomDocument & _doc, QDomElement & _parent ) override;
+	void loadSettings( const QDomElement & _this ) override;
+	inline QString nodeName() const override
 	{
 		return( "waveshapercontrols" );
 	}
 
 	virtual void setDefaultShape();
 
-	virtual int controlCount()
+	int controlCount() override
 	{
 		return( 4 );
 	}
 
-	virtual gui::EffectControlDialog* createView()
+	gui::EffectControlDialog* createView() override
 	{
 		return( new gui::WaveShaperControlDialog( this ) );
 	}
diff --git a/plugins/Xpressive/ExprSynth.cpp b/plugins/Xpressive/ExprSynth.cpp
index ac850bca9..afd6da1f9 100644
--- a/plugins/Xpressive/ExprSynth.cpp
+++ b/plugins/Xpressive/ExprSynth.cpp
@@ -56,7 +56,7 @@ struct freefunc0 : public exprtk::ifunction<T>
 	freefunc0() : exprtk::ifunction<T>(0) {
 		if (optimize) { exprtk::disable_has_side_effects(*this); }
 	}
-	inline T operator()()
+	inline T operator()() override
 	{ return Functor::process(); }
 };
 template <typename T,typename Functor,bool optimize>
@@ -67,7 +67,7 @@ struct freefunc1 : public exprtk::ifunction<T>
 	freefunc1() : exprtk::ifunction<T>(1) {
 		if (optimize) { exprtk::disable_has_side_effects(*this); }
 	}
-	inline T operator()(const T& x)
+	inline T operator()(const T& x) override
 	{ return Functor::process(x); }
 };
 
@@ -76,7 +76,7 @@ struct IntegrateFunction : public exprtk::ifunction<T>
 {
 
 	using exprtk::ifunction<T>::operator();
-	virtual ~IntegrateFunction()
+	~IntegrateFunction() override
 	{
 		delete [] m_counters;
 	}
@@ -94,7 +94,7 @@ struct IntegrateFunction : public exprtk::ifunction<T>
 		clearArray(m_counters,max_counters);
 	}
 
-	inline T operator()(const T& x)
+	inline T operator()(const T& x) override
 	{
 		if (*m_frame == 0)
 		{
@@ -131,7 +131,7 @@ struct LastSampleFunction : public exprtk::ifunction<T>
 {
 
 	using exprtk::ifunction<T>::operator();
-	virtual ~LastSampleFunction()
+	~LastSampleFunction() override
 	{
 		delete [] m_samples;
 	}
@@ -145,7 +145,7 @@ struct LastSampleFunction : public exprtk::ifunction<T>
 		clearArray(m_samples, history_size);
 	}
 
-	inline T operator()(const T& x)
+	inline T operator()(const T& x) override
 	{
 		if (!std::isnan(x) && !std::isinf(x))
 		{
@@ -187,7 +187,7 @@ struct WaveValueFunction : public exprtk::ifunction<T>
 	m_size(s)
 	{}
 
-	inline T operator()(const T& index)
+	inline T operator()(const T& index) override
 	{
 		return m_vec[(int) ( positiveFraction(index) * m_size )];
 	}
@@ -205,7 +205,7 @@ struct WaveValueFunctionInterpolate : public exprtk::ifunction<T>
 	m_size(s)
 	{}
 
-	inline T operator()(const T& index)
+	inline T operator()(const T& index) override
 	{
 		const T x = positiveFraction(index) * m_size;
 		const int ix = (int)x;
@@ -321,7 +321,7 @@ struct RandomVectorSeedFunction : public exprtk::ifunction<float>
 		return static_cast<int>(res) / (float)(1 << 31);
 	}
 
-	inline float operator()(const float& index,const float& seed)
+	inline float operator()(const float& index,const float& seed) override
 	{
 		int irseed;
 		if (seed < 0 || std::isnan(seed) || std::isinf(seed))
@@ -346,7 +346,7 @@ struct RandomVectorFunction : public exprtk::ifunction<float>
 	m_rseed(seed)
 	{ exprtk::disable_has_side_effects(*this); }
 
-	inline float operator()(const float& index)
+	inline float operator()(const float& index) override
 	{
 		return RandomVectorSeedFunction::randv(index,m_rseed);
 	}
diff --git a/plugins/ZynAddSubFx/RemoteZynAddSubFx.cpp b/plugins/ZynAddSubFx/RemoteZynAddSubFx.cpp
index 2d9a2701e..b2e47cade 100644
--- a/plugins/ZynAddSubFx/RemoteZynAddSubFx.cpp
+++ b/plugins/ZynAddSubFx/RemoteZynAddSubFx.cpp
@@ -64,17 +64,17 @@ public:
 		pthread_create( &m_messageThreadHandle, nullptr, messageLoop, this );
 	}
 
-	virtual ~RemoteZynAddSubFx()
+	~RemoteZynAddSubFx() override
 	{
 		Nio::stop();
 	}
 
-	virtual void updateSampleRate()
+	void updateSampleRate() override
 	{
 		LocalZynAddSubFx::setSampleRate( sampleRate() );
 	}
 
-	virtual void updateBufferSize()
+	void updateBufferSize() override
 	{
 		LocalZynAddSubFx::setBufferSize( bufferSize() );
 	}
@@ -91,7 +91,7 @@ public:
 		m_guiExit = true;
 	}
 
-	virtual bool processMessage( const message & _m )
+	bool processMessage( const message & _m ) override
 	{
 		switch( _m.id )
 		{
@@ -133,13 +133,13 @@ public:
 	}
 
 	// all functions are called while m_master->mutex is held
-	virtual void processMidiEvent( const MidiEvent& event, const f_cnt_t /* _offset */ )
+	void processMidiEvent( const MidiEvent& event, const f_cnt_t /* _offset */ ) override
 	{
 		LocalZynAddSubFx::processMidiEvent( event );
 	}
 
 
-	virtual void process( const sampleFrame * _in, sampleFrame * _out )
+	void process( const sampleFrame * _in, sampleFrame * _out ) override
 	{
 		LocalZynAddSubFx::processAudio( _out );
 	}
diff --git a/src/core/PresetPreviewPlayHandle.cpp b/src/core/PresetPreviewPlayHandle.cpp
index 0ce248e9c..1734ef497 100644
--- a/src/core/PresetPreviewPlayHandle.cpp
+++ b/src/core/PresetPreviewPlayHandle.cpp
@@ -53,7 +53,7 @@ public:
 		m_previewInstrumentTrack->setPreviewMode( true );
 	}
 
-	virtual ~PreviewTrackContainer()
+	~PreviewTrackContainer() override
 	{
 	}
 
diff --git a/src/gui/MixerView.cpp b/src/gui/MixerView.cpp
index 0a24b32cc..5368fcf7d 100644
--- a/src/gui/MixerView.cpp
+++ b/src/gui/MixerView.cpp
@@ -113,7 +113,7 @@ MixerView::MixerView() :
 		public:
 			ChannelArea( QWidget * parent, MixerView * mv ) :
 				QScrollArea( parent ), m_mv( mv ) {}
-			~ChannelArea() {}
+			~ChannelArea() override {}
 			void keyPressEvent( QKeyEvent * e ) override
 			{
 				m_mv->keyPressEvent( e );
diff --git a/src/gui/RowTableView.cpp b/src/gui/RowTableView.cpp
index cef8b87ea..be4824016 100644
--- a/src/gui/RowTableView.cpp
+++ b/src/gui/RowTableView.cpp
@@ -41,13 +41,13 @@ public:
 		m_table( table )
 		{
 		}
-	virtual void paint( QPainter * painter,
+	void paint( QPainter * painter,
 					const QStyleOptionViewItem & option,
 					const QModelIndex & index ) const override;
 
 
 protected:
-	virtual void initStyleOption( QStyleOptionViewItem * option,
+	void initStyleOption( QStyleOptionViewItem * option,
 					const QModelIndex & index ) const override;
 
 
diff --git a/src/gui/SideBar.cpp b/src/gui/SideBar.cpp
index 4c6f6abd1..0eca4d9f8 100644
--- a/src/gui/SideBar.cpp
+++ b/src/gui/SideBar.cpp
@@ -44,7 +44,7 @@ public:
 	{
 	}
 
-	virtual ~SideBarButton() = default;
+	~SideBarButton() override = default;
 
 	Qt::Orientation orientation() const
 	{
diff --git a/src/gui/modals/ControllerConnectionDialog.cpp b/src/gui/modals/ControllerConnectionDialog.cpp
index 008acbdb5..b8d323709 100644
--- a/src/gui/modals/ControllerConnectionDialog.cpp
+++ b/src/gui/modals/ControllerConnectionDialog.cpp
@@ -60,7 +60,7 @@ public:
 	}
 
 
-	virtual ~AutoDetectMidiController()
+	~AutoDetectMidiController() override
 	{
 	}
 
diff --git a/tests/QTestSuite.h b/tests/QTestSuite.h
index e0bd164ed..6cd27f5aa 100644
--- a/tests/QTestSuite.h
+++ b/tests/QTestSuite.h
@@ -10,7 +10,7 @@ class QTestSuite : public QObject
 	Q_OBJECT
 public:
 	explicit QTestSuite(QObject *parent = 0);
-	~QTestSuite();
+	~QTestSuite() override;
 
 	static QList<QTestSuite*> suites();