Use override where possible and remove unnecessary usages of the virtual keyword.

136 files changed, 566 insertions, 566 deletions

diff --git a/src/kvilib/ext/KviCryptEngine.h b/src/kvilib/ext/KviCryptEngine.h
index aa5759da3..b442417aa 100644
--- a/src/kvilib/ext/KviCryptEngine.h
+++ b/src/kvilib/ext/KviCryptEngine.h
@@ -80,7 +80,7 @@ public:
 	};
 
 	KviCryptEngine();
-	virtual ~KviCryptEngine();
+	~KviCryptEngine();
 
 #ifdef COMPILE_CRYPT_SUPPORT
 private:
diff --git a/src/kvilib/net/KviDnsResolver.h b/src/kvilib/net/KviDnsResolver.h
index 43cb596b1..603a53315 100644
--- a/src/kvilib/net/KviDnsResolver.h
+++ b/src/kvilib/net/KviDnsResolver.h
@@ -92,7 +92,7 @@ class KVILIB_API KviDnsResolver : public QObject, public KviHeapObject
 	Q_PROPERTY(bool blockingDelete READ isRunning)
 public:
 	KviDnsResolver();
-	virtual ~KviDnsResolver();
+	~KviDnsResolver();
 
 public:
 	enum QueryType
@@ -138,7 +138,7 @@ public:
 	bool isRunning() const;
 
 protected:
-	virtual bool event(QEvent * e);
+	bool event(QEvent * e) override;
 
 private:
 	KviDnsResolverResult * result();
@@ -167,7 +167,7 @@ public:
 		KVI_ASSERT(pResult);
 	}
 
-	virtual ~KviDnsResolverThreadEvent()
+	~KviDnsResolverThreadEvent()
 	{
 		delete m_pResult;
 	}
@@ -187,7 +187,7 @@ class KviDnsResolverThread : public QThread
 
 protected:
 	KviDnsResolverThread(KviDnsResolver * pDns);
-	virtual ~KviDnsResolverThread();
+	~KviDnsResolverThread();
 
 protected:
 	QString m_szQuery;
@@ -202,7 +202,7 @@ public:
 	};
 
 protected:
-	virtual void run();
+	void run() override;
 	KviError::Code translateDnsError(int iErr);
 	void postDnsError(KviDnsResolverResult * pDns, KviError::Code error);
 };
diff --git a/src/kvilib/net/KviDnsResolverNew.h b/src/kvilib/net/KviDnsResolverNew.h
index 067397ef7..ca4a663d9 100644
--- a/src/kvilib/net/KviDnsResolverNew.h
+++ b/src/kvilib/net/KviDnsResolverNew.h
@@ -64,7 +64,7 @@ public:
 	/// Destroys the instance of KviDnsResolver
 	/// and frees all the relevant resources
 	///
-	virtual ~KviDnsResolver();
+	~KviDnsResolver();
 
 public:
 	enum QueryType
diff --git a/src/kvilib/net/KviHttpRequest.h b/src/kvilib/net/KviHttpRequest.h
index 6d165d011..2accde92f 100644
--- a/src/kvilib/net/KviHttpRequest.h
+++ b/src/kvilib/net/KviHttpRequest.h
@@ -78,7 +78,7 @@ public:
 public:
 	KviHttpRequest();
 
-	virtual ~KviHttpRequest();
+	~KviHttpRequest();
 
 protected:
 	// data
diff --git a/src/kvilib/system/KviThread.h b/src/kvilib/system/KviThread.h
index 732fa9e65..3995cd4b4 100644
--- a/src/kvilib/system/KviThread.h
+++ b/src/kvilib/system/KviThread.h
@@ -226,7 +226,7 @@ protected:
 	void exit();
 	// The tricky part: threadsafe event dispatching
 	// Slave thread -> main thread objects
-	void postEvent(QObject * o, QEvent * e);
+	virtual void postEvent(QObject * o, QEvent * e);
 
 private:
 	void setRunning(bool bRunning);
@@ -282,7 +282,7 @@ protected:
 public:
 	KviThreadEvent(int evId, KviThread * sender = 0)
 	    : QEvent((QEvent::Type)KVI_THREAD_EVENT), m_eventId(evId), m_pSender(sender){};
-	virtual ~KviThreadEvent(){};
+	~KviThreadEvent(){};
 
 public:
 	// This is the sender of the event
@@ -300,7 +300,7 @@ protected:
 public:
 	KviThreadDataEvent(int evId, TData * pData = 0, KviThread * sender = 0)
 	    : KviThreadEvent(evId, sender) { m_pData = pData; };
-	virtual ~KviThreadDataEvent()
+	~KviThreadDataEvent()
 	{
 		if(m_pData)
 			delete m_pData;
diff --git a/src/kvilib/tal/KviTalGroupBox.h b/src/kvilib/tal/KviTalGroupBox.h
index e98e3f44f..15554d65f 100644
--- a/src/kvilib/tal/KviTalGroupBox.h
+++ b/src/kvilib/tal/KviTalGroupBox.h
@@ -161,7 +161,7 @@ public:
 	void setLayout(QLayout * newLayout);
 
 protected:
-	virtual void childEvent(QChildEvent * e);
+	void childEvent(QChildEvent * e) override;
 };
 
 #endif // _KVI_TAL_GROUPBOX_H_
diff --git a/src/kvilib/tal/KviTalHBox.h b/src/kvilib/tal/KviTalHBox.h
index c2c37b880..5352d3940 100644
--- a/src/kvilib/tal/KviTalHBox.h
+++ b/src/kvilib/tal/KviTalHBox.h
@@ -113,7 +113,7 @@ public:
 	void addSpacing(int iSpace);
 
 protected:
-	virtual void childEvent(QChildEvent * e);
+	void childEvent(QChildEvent * e) override;
 };
 
 #endif // _KVI_TAL_HBOX_H_
diff --git a/src/kvilib/tal/KviTalIconAndRichTextItemDelegate.h b/src/kvilib/tal/KviTalIconAndRichTextItemDelegate.h
index 60581a315..b4215802a 100644
--- a/src/kvilib/tal/KviTalIconAndRichTextItemDelegate.h
+++ b/src/kvilib/tal/KviTalIconAndRichTextItemDelegate.h
@@ -95,7 +95,7 @@ public:
 	* \param index The model index for the item
 	* \return QSize
 	*/
-	QSize sizeHint(const QStyleOptionViewItem & option, const QModelIndex & index) const;
+	QSize sizeHint(const QStyleOptionViewItem & option, const QModelIndex & index) const override;
 
 	/**
 	* \brief Paints the view
diff --git a/src/kvilib/tal/KviTalListWidget.h b/src/kvilib/tal/KviTalListWidget.h
index 6a6de7050..dc5617ed5 100644
--- a/src/kvilib/tal/KviTalListWidget.h
+++ b/src/kvilib/tal/KviTalListWidget.h
@@ -38,11 +38,11 @@ public:
 	KviTalListWidget(QWidget * pParent, QString name, Qt::WindowType f = Qt::Widget);
 	KviTalListWidget(QWidget * pParent)
 	    : QListWidget(pParent){};
-	virtual ~KviTalListWidget(){};
+	~KviTalListWidget() = default;
 
 protected:
-	virtual bool event(QEvent * e);
-	virtual bool eventFilter(QObject * o, QEvent * e);
+	bool event(QEvent * e) override;
+	bool eventFilter(QObject * o, QEvent * e) override;
 signals:
 	void tipRequest(QListWidgetItem *, const QPoint &);
 };
@@ -57,7 +57,7 @@ public:
 	KviTalListWidgetItem(KviTalListWidget * pParent, QString & label)
 	    : QListWidgetItem(label, pParent){};
 	KviTalListWidget * listWidget() { return (KviTalListWidget *)QListWidgetItem::listWidget(); };
-	virtual ~KviTalListWidgetItem(){};
+	~KviTalListWidgetItem() = default;
 };
 
 class KVILIB_API KviTalListWidgetText : public KviTalListWidgetItem
diff --git a/src/kvilib/tal/KviTalToolTip.h b/src/kvilib/tal/KviTalToolTip.h
index 41f8dc54f..a7662b2c5 100644
--- a/src/kvilib/tal/KviTalToolTip.h
+++ b/src/kvilib/tal/KviTalToolTip.h
@@ -45,7 +45,7 @@ protected:
 	KviTalToolTip * m_pToolTip;
 
 protected:
-	virtual bool eventFilter(QObject * pObject, QEvent * pEvent);
+	bool eventFilter(QObject * pObject, QEvent * pEvent) override;
 	void toolTipDying();
 };
 
diff --git a/src/kvilib/tal/KviTalVBox.h b/src/kvilib/tal/KviTalVBox.h
index 1a33517e9..06f2e2411 100644
--- a/src/kvilib/tal/KviTalVBox.h
+++ b/src/kvilib/tal/KviTalVBox.h
@@ -106,7 +106,7 @@ public:
 	void addStretch(int iStretch);
 
 protected:
-	virtual void childEvent(QChildEvent * e);
+	void childEvent(QChildEvent * e) override;
 };
 
 #endif // _KVI_TAL_VBOX_H_
diff --git a/src/kvilib/tal/KviTalWizard.h b/src/kvilib/tal/KviTalWizard.h
index 13fd7bac2..8b50155cc 100644
--- a/src/kvilib/tal/KviTalWizard.h
+++ b/src/kvilib/tal/KviTalWizard.h
@@ -149,12 +149,12 @@ protected:
 	///
 	/// Displays the first page if no other page is shown yet.
 	///
-	virtual void showEvent(QShowEvent * e);
+	void showEvent(QShowEvent * e) override;
 
 	///
 	/// Handles redirects the close button to the "cancel" operation.
 	///
-	virtual void closeEvent(QCloseEvent * e);
+	void closeEvent(QCloseEvent * e) override;
 
 protected:
 	void setCurrentPage(KviTalWizardPageData * pData);
diff --git a/src/kvirc/kernel/KviIpcSentinel.h b/src/kvirc/kernel/KviIpcSentinel.h
index c0f59f9f8..273ffa6b9 100644
--- a/src/kvirc/kernel/KviIpcSentinel.h
+++ b/src/kvirc/kernel/KviIpcSentinel.h
@@ -55,7 +55,7 @@ protected: // protected members
 	bool x11GetRemoteMessage();
 #endif //!COMPILE_X11_SUPPORT
 
-	virtual bool nativeEvent(const QByteArray & id, void * msg, long * res);
+	bool nativeEvent(const QByteArray & id, void * msg, long * res) override;
 };
 #endif //!COMPILE_NO_IPC
 
diff --git a/src/kvirc/kvs/KviKvsTimerManager.h b/src/kvirc/kvs/KviKvsTimerManager.h
index 5dcacbe71..2fa33cc5a 100644
--- a/src/kvirc/kvs/KviKvsTimerManager.h
+++ b/src/kvirc/kvs/KviKvsTimerManager.h
@@ -127,7 +127,7 @@ public:
 
 protected:
 	void scheduleKill(KviKvsTimer * t);
-	virtual void timerEvent(QTimerEvent * e);
+	void timerEvent(QTimerEvent * e) override;
 };
 
 #endif //!_KVI_KVS_TIMERMANAGER_H_
diff --git a/src/kvirc/kvs/object/KviKvsObject.h b/src/kvirc/kvs/object/KviKvsObject.h
index 9af090be9..fdef5e20c 100644
--- a/src/kvirc/kvs/object/KviKvsObject.h
+++ b/src/kvirc/kvs/object/KviKvsObject.h
@@ -54,7 +54,7 @@ class KVIRC_API KviKvsObject : public QObject
 	Q_OBJECT
 public:
 	KviKvsObject(KviKvsObjectClass * pClass, KviKvsObject * pParent, const QString & szName);
-	virtual ~KviKvsObject();
+	~KviKvsObject();
 
 protected:
 	// main data
@@ -160,8 +160,8 @@ protected:
 	void registerChild(KviKvsObject * c);
 	void unregisterChild(KviKvsObject * c);
 
-	virtual bool eventFilter(QObject * o, QEvent * e); //necessary ?
-	virtual void timerEvent(QTimerEvent * e);
+	bool eventFilter(QObject * o, QEvent * e) override; //necessary ?
+	void timerEvent(QTimerEvent * e) override;
 
 protected:
 	bool function_name(KviKvsObjectFunctionCall * c);
diff --git a/src/kvirc/ui/KviChannelWindow.h b/src/kvirc/ui/KviChannelWindow.h
index 1d5e54881..c32adfc67 100644
--- a/src/kvirc/ui/KviChannelWindow.h
+++ b/src/kvirc/ui/KviChannelWindow.h
@@ -211,7 +211,7 @@ public:
 	* \brief Returns the button container object
 	* \return QFrame *
 	*/
-	QFrame * buttonContainer() { return (QFrame *)m_pButtonContainer; };
+	QFrame * buttonContainer() override { return (QFrame *)m_pButtonContainer; }
 
 	/**
 	* \brief Returns a list of masks for a specific mode
@@ -242,7 +242,7 @@ public:
 	* \brief Returns the name of the channel
 	* \return const QString &
 	*/
-	virtual const QString & target() { return windowName(); };
+	const QString & target() override { return windowName(); }
 
 	/**
 	* \brief Returns the name of the channel with user flags
@@ -471,7 +471,7 @@ public:
 	* \param puActivityTemperature The temperature of the activity
 	* \return bool
 	*/
-	virtual bool activityMeter(unsigned int * puActivityValue, unsigned int * puActivityTemperature);
+	bool activityMeter(unsigned int * puActivityValue, unsigned int * puActivityTemperature) override;
 
 	/**
 	* \brief Sets the channel as dead
@@ -510,7 +510,7 @@ public:
 	* \brief Returns the size of the channel
 	* \return QSize
 	*/
-	virtual QSize sizeHint() const;
+	QSize sizeHint() const override;
 
 	/**
 	* \brief Enables or disable the userlist updates
@@ -772,14 +772,14 @@ public:
 	* \param bUserFeedback Whether to display the echo feedback to the user
 	* \return void
 	*/
-	void ownMessage(const QString & szBuffer, bool bUserFeedback = true);
+	void ownMessage(const QString & szBuffer, bool bUserFeedback = true) override;
 
 	/**
 	* \brief Called when we perform an action
 	* \param szBuffer The buffer :)
 	* \return void
 	*/
-	void ownAction(const QString & szBuffer);
+	void ownAction(const QString & szBuffer) override;
 
 	/**
 	* \brief Sets a plain (parameter-less) channel mode, (eg: +m)
@@ -862,14 +862,14 @@ public:
 	* \brief Called when the channel losts the focus by the user
 	* \return void
 	*/
-	virtual void lostUserFocus();
+	void lostUserFocus() override;
 
 	/**
 	* \brief Creates the tooltip over the channel treeview
 	* \param szBuffer The buffer where to store the data
 	* \return void
 	*/
-	virtual void getWindowListTipText(QString & szBuffer);
+	void getWindowListTipText(QString & szBuffer) override;
 
 	/**
 	* \brief Unhighlights the windowlist item
@@ -896,7 +896,7 @@ public:
 	* See also: view()
 	* \return KviIrcView *
 	*/
-	virtual KviIrcView * lastClickedView() const;
+	KviIrcView * lastClickedView() const override;
 
 protected:
 	/**
@@ -905,59 +905,59 @@ protected:
 	* \param pEvent The event
 	* \return bool
 	*/
-	bool eventFilter(QObject * pObject, QEvent * pEvent);
+	bool eventFilter(QObject * pObject, QEvent * pEvent) override;
 
 	/**
 	* \brief Returns the correct icon for the channel
 	* \return QPixmap *
 	*/
-	virtual QPixmap * myIconPtr();
+	QPixmap * myIconPtr() override;
 
 	/**
 	* \brief Fills in the caption buffers
 	* \return void
 	*/
-	virtual void fillCaptionBuffers();
+	void fillCaptionBuffers() override;
 
 	/**
 	* \brief Gets the group name
 	* \param szBuffer The buffer where to save the data
 	* \return void
 	*/
-	virtual void getConfigGroupName(QString & szBuffer);
+	void getConfigGroupName(QString & szBuffer) override;
 
 	/**
 	* \brief Saves the properties to file
 	* \param pCfg The config file
 	* \return void
 	*/
-	virtual void saveProperties(KviConfigurationFile * pCfg);
+	void saveProperties(KviConfigurationFile * pCfg) override;
 
 	/**
 	* \brief Loads the properties from file
 	* \param pCfg The config file
 	* \return void
 	*/
-	virtual void loadProperties(KviConfigurationFile * pCfg);
+	void loadProperties(KviConfigurationFile * pCfg) override;
 
 	/**
 	* \brief Applies the options
 	* \return void
 	*/
-	virtual void applyOptions();
+	void applyOptions() override;
 
 	/**
 	* \brief Gets the base name for log file
 	* \param szBuffer The buffer where to save data
 	* \return void
 	*/
-	virtual void getBaseLogFileName(QString & szBuffer);
+	void getBaseLogFileName(QString & szBuffer) override;
 
 	/**
 	* \brief Trigger the OnChannelWindowCreated event
 	* \return void
 	*/
-	virtual void triggerCreationEvents();
+	void triggerCreationEvents() override;
 
 	/**
 	* \brief Called when someone sets a mask in the channel's lists
@@ -1003,10 +1003,10 @@ protected:
 	* \param szMessage The message :)
 	* \return void
 	*/
-	virtual void preprocessMessage(QString & szMessage);
+	void preprocessMessage(QString & szMessage) override;
 
-	virtual void resizeEvent(QResizeEvent *);
-	virtual void closeEvent(QCloseEvent * pEvent);
+	void resizeEvent(QResizeEvent *) override;
+	void closeEvent(QCloseEvent * pEvent) override;
 public slots:
 	/**
 	* \brief Toggles the double view mode
diff --git a/src/kvirc/ui/KviColorSelectionWindow.h b/src/kvirc/ui/KviColorSelectionWindow.h
index adb67d09e..913691663 100644
--- a/src/kvirc/ui/KviColorSelectionWindow.h
+++ b/src/kvirc/ui/KviColorSelectionWindow.h
@@ -67,10 +67,10 @@ public:
 
 private:
 	virtual void show();
-	virtual void paintEvent(QPaintEvent * e);
-	virtual void keyPressEvent(QKeyEvent * e);
-	virtual void mousePressEvent(QMouseEvent * e);
-	virtual void timerEvent(QTimerEvent * e);
+	void paintEvent(QPaintEvent * e) override;
+	void keyPressEvent(QKeyEvent * e) override;
+	void mousePressEvent(QMouseEvent * e) override;
+	void timerEvent(QTimerEvent * e) override;
 };
 
 #endif //_KVI_COLORWIN_H_
diff --git a/src/kvirc/ui/KviConsoleWindow.h b/src/kvirc/ui/KviConsoleWindow.h
index 81cd77b61..58e64b9c7 100644
--- a/src/kvirc/ui/KviConsoleWindow.h
+++ b/src/kvirc/ui/KviConsoleWindow.h
@@ -98,22 +98,22 @@ protected:
 
 protected:
 	// UI
-	virtual QPixmap * myIconPtr();
-	virtual void fillCaptionBuffers();
-	virtual void resizeEvent(QResizeEvent * e);
-	virtual void closeEvent(QCloseEvent * e);
-	virtual void getBaseLogFileName(QString & buffer);
-	virtual void getWindowListTipText(QString & buffer);
-	virtual QSize sizeHint() const;
-	virtual void applyOptions();
-	virtual void triggerCreationEvents();
+	QPixmap * myIconPtr() override;
+	void fillCaptionBuffers() override;
+	void resizeEvent(QResizeEvent * e) override;
+	void closeEvent(QCloseEvent * e) override;
+	void getBaseLogFileName(QString & buffer) override;
+	void getWindowListTipText(QString & buffer) override;
+	QSize sizeHint() const override;
+	void applyOptions() override;
+	void triggerCreationEvents() override;
 	void fillStatusString();
 	//void socketError(int iError);
 	//void socketStateChange();
 	//void registerLinkMonitor(KviIrcSocketMonitor * m);
 	//void unregisterLinkMonitor(KviIrcSocketMonitor * m);
-	virtual void loadProperties(KviConfigurationFile * cfg);
-	virtual void saveProperties(KviConfigurationFile * cfg);
+	void loadProperties(KviConfigurationFile * cfg) override;
+	void saveProperties(KviConfigurationFile * cfg) override;
 
 	void destroyConnection();
 	// internal helper for applyHighlighting
diff --git a/src/kvirc/ui/KviCtcpPageDialog.h b/src/kvirc/ui/KviCtcpPageDialog.h
index c76d463c2..c37fafd5a 100644
--- a/src/kvirc/ui/KviCtcpPageDialog.h
+++ b/src/kvirc/ui/KviCtcpPageDialog.h
@@ -52,8 +52,8 @@ protected:
 	void center();
 
 protected:
-	virtual void showEvent(QShowEvent * e);
-	virtual void closeEvent(QCloseEvent * e);
+	void showEvent(QShowEvent * e) override;
+	void closeEvent(QCloseEvent * e) override;
 protected slots:
 	void die();
 };
diff --git a/src/kvirc/ui/KviCustomToolBar.h b/src/kvirc/ui/KviCustomToolBar.h
index 6eaf8b15d..e6987478e 100644
--- a/src/kvirc/ui/KviCustomToolBar.h
+++ b/src/kvirc/ui/KviCustomToolBar.h
@@ -51,17 +51,17 @@ protected:
 public:
 	KviCustomToolBarDescriptor * descriptor() { return m_pDescriptor; };
 protected:
-	virtual void dragEnterEvent(QDragEnterEvent * e);
-	virtual void dragMoveEvent(QDragMoveEvent * e);
-	virtual void dragLeaveEvent(QDragLeaveEvent * e);
-	virtual void dropEvent(QDropEvent * e);
-	virtual void childEvent(QChildEvent * e);
-	virtual bool eventFilter(QObject * o, QEvent * e);
+	void dragEnterEvent(QDragEnterEvent * e) override;
+	void dragMoveEvent(QDragMoveEvent * e) override;
+	void dragLeaveEvent(QDragLeaveEvent * e) override;
+	void dropEvent(QDropEvent * e) override;
+	void childEvent(QChildEvent * e) override;
+	bool eventFilter(QObject * o, QEvent * e) override;
 	QAction * actionForWidget(QWidget * pWidget);
 	void drag(QWidget * pChild, const QPoint & pnt);
 	void filterChild(QObject * o);
 	void unfilterChild(QObject * o);
-	virtual void paintEvent(QPaintEvent * e);
+	void paintEvent(QPaintEvent * e) override;
 	void syncDescriptor();
 protected slots:
 	void beginCustomize();
@@ -79,10 +79,10 @@ protected:
 	KviCustomToolBar * m_pToolBar;
 
 public:
-	QSize sizeHint() const;
+	QSize sizeHint() const override;
 
 protected:
-	void paintEvent(QPaintEvent * e);
+	void paintEvent(QPaintEvent * e) override;
 };
 
 #endif //_KVI_CUSTOMTOOLBAR_H_
diff --git a/src/kvirc/ui/KviDebugWindow.h b/src/kvirc/ui/KviDebugWindow.h
index ee7ea2d44..3f2424f8c 100644
--- a/src/kvirc/ui/KviDebugWindow.h
+++ b/src/kvirc/ui/KviDebugWindow.h
@@ -45,13 +45,13 @@ public:
 	static KviDebugWindow * getInstance();
 
 protected:
-	virtual QPixmap * myIconPtr();
-	virtual void fillCaptionBuffers();
-	virtual void resizeEvent(QResizeEvent * e);
-	virtual void loadProperties(KviConfigurationFile * cfg);
-	virtual void saveProperties(KviConfigurationFile * cfg);
-	virtual void getBaseLogFileName(QString & buffer);
-	virtual QSize sizeHint() const;
+	QPixmap * myIconPtr() override;
+	void fillCaptionBuffers() override;
+	void resizeEvent(QResizeEvent * e) override;
+	void loadProperties(KviConfigurationFile * cfg) override;
+	void saveProperties(KviConfigurationFile * cfg) override;
+	void getBaseLogFileName(QString & buffer) override;
+	QSize sizeHint() const override;
 };
 
 #endif //_KVI_DEBUGWINDOW_H_
diff --git a/src/kvirc/ui/KviHistoryWindow.h b/src/kvirc/ui/KviHistoryWindow.h
index 297aeb277..7270c8519 100644
--- a/src/kvirc/ui/KviHistoryWindow.h
+++ b/src/kvirc/ui/KviHistoryWindow.h
@@ -95,10 +95,10 @@ private:
 	void fill();
 
 	//bool findTypedSeq(); // returns true if it is a complete word
-	virtual void keyPressEvent(QKeyEvent * e);
-	virtual void mousePressEvent(QMouseEvent * e);
-	virtual void timerEvent(QTimerEvent * e);
-	virtual void hideEvent(QHideEvent * e);
+	void keyPressEvent(QKeyEvent * e) override;
+	void mousePressEvent(QMouseEvent * e) override;
+	void timerEvent(QTimerEvent * e) override;
+	void hideEvent(QHideEvent * e) override;
 public slots:
 	/**
 	* \brief Called when the owner is dead
diff --git a/src/kvirc/ui/KviImageDialog.h b/src/kvirc/ui/KviImageDialog.h
index af05dba36..42773bea7 100644
--- a/src/kvirc/ui/KviImageDialog.h
+++ b/src/kvirc/ui/KviImageDialog.h
@@ -52,7 +52,7 @@ public:
 	const QString & tipText() { return m_szTipText; };
 	virtual int height(const KviTalListWidget *) const;
 	virtual int width(const KviTalListWidget *) const;
-	virtual void paint(QPainter * p);
+	void paint(QPainter * p) override;
 };
 
 #define KID_TYPE_BUILTIN_IMAGES_SMALL 1
@@ -70,7 +70,7 @@ public:
 	    int initialType = 0,
 	    const QString & szInitialDir = QString(),
 	    int maxPreviewFileSize = 256000, bool modal = false);
-	virtual ~KviImageDialog();
+	~KviImageDialog();
 
 protected:
 	QComboBox * m_pTypeComboBox;
@@ -97,7 +97,7 @@ public:
 protected:
 	void startJob(int type, const QString & szInitialPath = QString());
 	void jobTerminated();
-	virtual void closeEvent(QCloseEvent * e);
+	void closeEvent(QCloseEvent * e) override;
 protected slots:
 	void okClicked();
 	void cancelClicked();
diff --git a/src/kvirc/ui/KviInput.h b/src/kvirc/ui/KviInput.h
index d0097567d..6beb4b69d 100644
--- a/src/kvirc/ui/KviInput.h
+++ b/src/kvirc/ui/KviInput.h
@@ -174,9 +174,9 @@ public:
 	KviInputHistory * history() { return KviInputHistory::instance(); }
 protected:
 	void installShortcuts();
-	virtual void focusInEvent(QFocusEvent * e);
-	virtual void setFocusProxy(QWidget * w);
-	virtual void keyPressEvent(QKeyEvent * e);
+	void focusInEvent(QFocusEvent * e) override;
+	void setFocusProxy(QWidget * w);
+	void keyPressEvent(QKeyEvent * e) override;
 public slots:
 	/**
 	* \brief Toggles the multiline editor
diff --git a/src/kvirc/ui/KviIrcToolBar.h b/src/kvirc/ui/KviIrcToolBar.h
index 81d62b6e2..d833b1737 100644
--- a/src/kvirc/ui/KviIrcToolBar.h
+++ b/src/kvirc/ui/KviIrcToolBar.h
@@ -55,14 +55,14 @@ private:
 	bool m_bResizeMode;
 
 public:
-	virtual QSize sizeHint() const;
+	QSize sizeHint() const override;
 
 protected:
-	virtual void mouseMoveEvent(QMouseEvent * e);
-	virtual void mousePressEvent(QMouseEvent * e);
-	virtual void mouseReleaseEvent(QMouseEvent * e);
+	void mouseMoveEvent(QMouseEvent * e) override;
+	void mousePressEvent(QMouseEvent * e) override;
+	void mouseReleaseEvent(QMouseEvent * e) override;
 
-	virtual void paintEvent(QPaintEvent * e);
+	void paintEvent(QPaintEvent * e) override;
 	virtual void drawContents(QPainter * p);
 };
 
diff --git a/src/kvirc/ui/KviIrcView.h b/src/kvirc/ui/KviIrcView.h
index 48c6d23a6..14cf22952 100644
--- a/src/kvirc/ui/KviIrcView.h
+++ b/src/kvirc/ui/KviIrcView.h
@@ -205,28 +205,28 @@ public:
 	void prevPage();
 	void scrollTop();
 	void scrollBottom();
-	virtual QSize sizeHint() const;
+	QSize sizeHint() const override;
 	const QString & lastLineOfText();
 	const QString & lastMessageText();
-	virtual void setFont(const QFont & f);
+	void setFont(const QFont & f);
 	void scrollToMarker();
 
 protected:
-	virtual void paintEvent(QPaintEvent *);
-	virtual void resizeEvent(QResizeEvent *);
-	virtual void mousePressEvent(QMouseEvent * e);
-	virtual void mouseReleaseEvent(QMouseEvent *);
-	virtual void mouseDoubleClickEvent(QMouseEvent * e);
-	virtual void mouseMoveEvent(QMouseEvent * e);
-	virtual void timerEvent(QTimerEvent * e);
-	virtual void dragEnterEvent(QDragEnterEvent * e);
-	virtual void dropEvent(QDropEvent * e);
-	virtual void showEvent(QShowEvent * e);
-	virtual bool event(QEvent * e);
-	virtual void wheelEvent(QWheelEvent * e);
-	virtual void keyPressEvent(QKeyEvent * e);
+	void paintEvent(QPaintEvent *) override;
+	void resizeEvent(QResizeEvent *) override;
+	void mousePressEvent(QMouseEvent * e) override;
+	void mouseReleaseEvent(QMouseEvent *) override;
+	void mouseDoubleClickEvent(QMouseEvent * e) override;
+	void mouseMoveEvent(QMouseEvent * e) override;
+	void timerEvent(QTimerEvent * e) override;
+	void dragEnterEvent(QDragEnterEvent * e) override;
+	void dropEvent(QDropEvent * e) override;
+	void showEvent(QShowEvent * e) override;
+	bool event(QEvent * e) override;
+	void wheelEvent(QWheelEvent * e) override;
+	void keyPressEvent(QKeyEvent * e) override;
 	void maybeTip(const QPoint & pnt);
-	virtual void leaveEvent(QEvent *);
+	void leaveEvent(QEvent *) override;
 
 private:
 	void triggerMouseRelatedKvsEvents(QMouseEvent * e);
diff --git a/src/kvirc/ui/KviMainWindow.h b/src/kvirc/ui/KviMainWindow.h
index c8b1b06cf..76d70b2ea 100644
--- a/src/kvirc/ui/KviMainWindow.h
+++ b/src/kvirc/ui/KviMainWindow.h
@@ -183,13 +183,13 @@ protected:
 	void childConnectionServerInfoChange(KviIrcConnection * c);
 	void childWindowSelectionStateChange(KviWindow * pWnd, bool bGotSelectionNow);
 
-	virtual void closeEvent(QCloseEvent * e);
-	virtual void hideEvent(QHideEvent * e);
-	virtual void resizeEvent(QResizeEvent * e);
-	virtual void moveEvent(QMoveEvent * e);
-	virtual bool focusNextPrevChild(bool next);
-	virtual void changeEvent(QEvent * event);
-	virtual void contextMenuEvent(QContextMenuEvent * event);
+	void closeEvent(QCloseEvent * e) override;
+	void hideEvent(QHideEvent * e) override;
+	void resizeEvent(QResizeEvent * e) override;
+	void moveEvent(QMoveEvent * e) override;
+	bool focusNextPrevChild(bool next) override;
+	void changeEvent(QEvent * event) override;
+	void contextMenuEvent(QContextMenuEvent * event) override;
 
 	void updatePseudoTransparency();
 	void installAccelerators();
diff --git a/src/kvirc/ui/KviMaskEditor.h b/src/kvirc/ui/KviMaskEditor.h
index 4cfe2e0d9..35b1aa596 100644
--- a/src/kvirc/ui/KviMaskEditor.h
+++ b/src/kvirc/ui/KviMaskEditor.h
@@ -90,7 +90,7 @@ protected:
 	KviChannelWindow * m_pChannel;
 	KviMaskEditor * m_pEditor;
 protected slots:
-	virtual void accept();
+	void accept() override;
 };
 
 class KVIRC_API KviMaskEditor : public KviWindowToolWidget
diff --git a/src/kvirc/ui/KviOptionsWidget.h b/src/kvirc/ui/KviOptionsWidget.h
index e28394d24..50b350793 100644
--- a/src/kvirc/ui/KviOptionsWidget.h
+++ b/src/kvirc/ui/KviOptionsWidget.h
@@ -149,10 +149,10 @@ public:
 
 	void removeSelector(KviSelectorInterface * pInterface);
 
-	virtual void commit();
-	virtual void childEvent(QChildEvent * e);
+	void commit() override;
+	void childEvent(QChildEvent * e) override;
 
-	virtual bool eventFilter(QObject * watched, QEvent * e);
+	bool eventFilter(QObject * watched, QEvent * e) override;
 
 protected slots:
 	// this is internal to the options dialog (options module)
diff --git a/src/kvirc/ui/KviQueryWindow.h b/src/kvirc/ui/KviQueryWindow.h
index c1dcc687d..20e8d91ff 100644
--- a/src/kvirc/ui/KviQueryWindow.h
+++ b/src/kvirc/ui/KviQueryWindow.h
@@ -109,13 +109,13 @@ public:
 	* \brief Returns the size of the query object
 	* \return QSize
 	*/
-	virtual QSize sizeHint() const;
+	QSize sizeHint() const override;
 
 	/**
 	* \brief Returns the name of the query target
 	* \return const QString &
 	*/
-	virtual const QString & target() { return windowName(); };
+	const QString & target() override { return windowName(); }
 
 	/**
 	* \brief Sets the target of the query
@@ -130,13 +130,13 @@ public:
 	* \brief Returns the button container
 	* \return QFrame *
 	*/
-	QFrame * buttonContainer() { return (QFrame *)m_pButtonGrid; };
+	QFrame * buttonContainer() override { return (QFrame *)m_pButtonGrid; }
 
 	/**
 	* \brief Applies the options
 	* \return void
 	*/
-	virtual void applyOptions();
+	void applyOptions() override;
 
 	/**
 	* \brief Called when a user performs an action
@@ -178,14 +178,14 @@ public:
 	* \param bUserFeedback Whether to display the echo feedback to the user
 	* \return void
 	*/
-	void ownMessage(const QString & szBuffer, bool bUserFeedback = true);
+	void ownMessage(const QString & szBuffer, bool bUserFeedback = true) override;
 
 	/**
 	* \brief Called when we perform an action
 	* \param szBuffer The buffer :)
 	* \return void
 	*/
-	void ownAction(const QString & szBuffer);
+	void ownAction(const QString & szBuffer) override;
 
 	/**
 	* \brief Returns the number of selected users in the userlist
@@ -255,48 +255,48 @@ protected:
 	* \brief Gets the window list and info label tooltip text
 	* \return QString
 	*/
-	virtual void getWindowListTipText(QString & szBuffer);
+	void getWindowListTipText(QString & szBuffer) override;
 
 	/**
 	* \brief Returns the icon associated to the query
 	* \return QPixmap *
 	*/
-	virtual QPixmap * myIconPtr();
+	QPixmap * myIconPtr() override;
 
 	/**
 	* \brief Fills in the caption buffers
 	* \return void
 	*/
-	virtual void fillCaptionBuffers();
+	void fillCaptionBuffers() override;
 
 	/**
 	* \brief Loads the properties from file
 	* \param pCfg The configuration file
 	* \return void
 	*/
-	virtual void loadProperties(KviConfigurationFile * pCfg);
+	void loadProperties(KviConfigurationFile * pCfg) override;
 
 	/**
 	* \brief Saves the properties to file
 	* \param pCfg The configuration file
 	* \return void
 	*/
-	virtual void saveProperties(KviConfigurationFile * pCfg);
+	void saveProperties(KviConfigurationFile * pCfg) override;
 
 	/**
 	* \brief Gets the base of the log file name
 	* \param szBuffer The buffer where to save the info
 	* \return void
 	*/
-	virtual void getBaseLogFileName(QString & szBuffer);
+	void getBaseLogFileName(QString & szBuffer) override;
 
 	/**
 	* \brief Trigger the OnQueryWindowCreated event
 	* \return void
 	*/
-	virtual void triggerCreationEvents();
+	void triggerCreationEvents() override;
 
-	virtual void resizeEvent(QResizeEvent *);
+	void resizeEvent(QResizeEvent *) override;
 protected slots:
 	/**
 	* \brief Triggers the OnQueryPopupRequest event
diff --git a/src/kvirc/ui/KviStatusBar.h b/src/kvirc/ui/KviStatusBar.h
index 991c6cc20..044f1f871 100644
--- a/src/kvirc/ui/KviStatusBar.h
+++ b/src/kvirc/ui/KviStatusBar.h
@@ -311,12 +311,12 @@ protected slots:
 	void setPermanentMessage();
 
 protected:
-	virtual void mousePressEvent(QMouseEvent * e);
-	virtual void mouseDoubleClickEvent(QMouseEvent * e);
-	virtual bool event(QEvent * e);
-	void dropEvent(QDropEvent * de);
-	void dragMoveEvent(QDragMoveEvent * de);
-	void dragEnterEvent(QDragEnterEvent * event);
+	void mousePressEvent(QMouseEvent * e) override;
+	void mouseDoubleClickEvent(QMouseEvent * e) override;
+	bool event(QEvent * e) override;
+	void dropEvent(QDropEvent * de) override;
+	void dragMoveEvent(QDragMoveEvent * de) override;
+	void dragEnterEvent(QDragEnterEvent * event) override;
 };
 
 #endif // _KVI_STATUSBAR_H_
diff --git a/src/kvirc/ui/KviStatusBarApplet.h b/src/kvirc/ui/KviStatusBarApplet.h
index 8520a4b21..14bcef6ba 100644
--- a/src/kvirc/ui/KviStatusBarApplet.h
+++ b/src/kvirc/ui/KviStatusBarApplet.h
@@ -94,7 +94,7 @@ protected:
 
 public:
 	KviStatusBarApplet(KviStatusBar * pParent, KviStatusBarAppletDescriptor * pDescriptor);
-	virtual ~KviStatusBarApplet();
+	~KviStatusBarApplet();
 
 public:
 	KviStatusBar * statusBar() { return m_pStatusBar; };
@@ -120,7 +120,7 @@ class KviStatusBarClock : public KviStatusBarApplet
 	Q_OBJECT
 public:
 	KviStatusBarClock(KviStatusBar * pParent, KviStatusBarAppletDescriptor * pDescriptor);
-	virtual ~KviStatusBarClock();
+	~KviStatusBarClock();
 	enum Format
 	{
 		HMS,
@@ -136,11 +136,11 @@ public:
 	static void selfRegister(KviStatusBar * pBar);
 
 protected:
-	virtual void fillContextPopup(QMenu * p);
-	virtual void timerEvent(QTimerEvent * e);
+	void fillContextPopup(QMenu * p) override;
+	void timerEvent(QTimerEvent * e) override;
 
-	virtual void loadState(const char * pcPrefix, KviConfigurationFile * pCfg);
-	virtual void saveState(const char * pcPrefix, KviConfigurationFile * pCfg);
+	void loadState(const char * pcPrefix, KviConfigurationFile * pCfg) override;
+	void saveState(const char * pcPrefix, KviConfigurationFile * pCfg) override;
 	void adjustMinWidth();
 protected slots:
 	void toggleUtc();
@@ -153,16 +153,16 @@ class KviStatusBarConnectionTimer : public KviStatusBarApplet
 	Q_OBJECT
 public:
 	KviStatusBarConnectionTimer(KviStatusBar * pParent, KviStatusBarAppletDescriptor * pDescriptor);
-	virtual ~KviStatusBarConnectionTimer();
+	~KviStatusBarConnectionTimer();
 
 protected:
 	bool m_bTotal;
 
 protected:
-	virtual void timerEvent(QTimerEvent * e);
-	virtual void fillContextPopup(QMenu * p);
-	virtual void loadState(const char * pcPrefix, KviConfigurationFile * pCfg);
-	virtual void saveState(const char * pcPrefix, KviConfigurationFile * pCfg);
+	void timerEvent(QTimerEvent * e) override;
+	void fillContextPopup(QMenu * p) override;
+	void loadState(const char * pcPrefix, KviConfigurationFile * pCfg) override;
+	void saveState(const char * pcPrefix, KviConfigurationFile * pCfg) override;
 
 public:
 	static void selfRegister(KviStatusBar * pBar);
@@ -175,7 +175,7 @@ class KviStatusBarSeparator : public KviStatusBarApplet
 	Q_OBJECT
 public:
 	KviStatusBarSeparator(KviStatusBar * pParent, KviStatusBarAppletDescriptor * pDescriptor);
-	virtual ~KviStatusBarSeparator();
+	~KviStatusBarSeparator();
 
 public:
 	static void selfRegister(KviStatusBar * pBar);
@@ -186,7 +186,7 @@ class KviStatusBarAwayIndicator : public KviStatusBarApplet
 	Q_OBJECT
 public:
 	KviStatusBarAwayIndicator(KviStatusBar * pParent, KviStatusBarAppletDescriptor * pDescriptor);
-	virtual ~KviStatusBarAwayIndicator();
+	~KviStatusBarAwayIndicator();
 
 public:
 	static void selfRegister(KviStatusBar * pBar);
@@ -195,11 +195,11 @@ protected:
 	bool m_bAwayOnAllContexts;
 
 protected:
-	virtual void mouseDoubleClickEvent(QMouseEvent * e);
-	virtual QString tipText(const QPoint &);
-	virtual void fillContextPopup(QMenu * p);
-	virtual void loadState(const char * pcPrefix, KviConfigurationFile * pCfg);
-	virtual void saveState(const char * pcPrefix, KviConfigurationFile * pCfg);
+	void mouseDoubleClickEvent(QMouseEvent * e) override;
+	QString tipText(const QPoint &) override;
+	void fillContextPopup(QMenu * p) override;
+	void loadState(const char * pcPrefix, KviConfigurationFile * pCfg) override;
+	void saveState(const char * pcPrefix, KviConfigurationFile * pCfg) override;
 protected slots:
 	void updateDisplay();
 	void toggleContext();
@@ -210,14 +210,14 @@ class KviStatusBarLagIndicator : public KviStatusBarApplet
 	Q_OBJECT
 public:
 	KviStatusBarLagIndicator(KviStatusBar * pParent, KviStatusBarAppletDescriptor * pDescriptor);
-	virtual ~KviStatusBarLagIndicator(){};
+	~KviStatusBarLagIndicator() = default;
 
 public:
 	static void selfRegister(KviStatusBar * pBar);
 
 protected:
-	virtual void mouseDoubleClickEvent(QMouseEvent * e);
-	virtual QString tipText(const QPoint &);
+	void mouseDoubleClickEvent(QMouseEvent * e) override;
+	QString tipText(const QPoint &) override;
 protected slots:
 	void updateDisplay();
 };
@@ -227,15 +227,15 @@ class KviStatusBarUpdateIndicator : public KviStatusBarApplet
 	Q_OBJECT
 public:
 	KviStatusBarUpdateIndicator(KviStatusBar * pParent, KviStatusBarAppletDescriptor * pDescriptor);
-	virtual ~KviStatusBarUpdateIndicator();
+	~KviStatusBarUpdateIndicator();
 	static void selfRegister(KviStatusBar * pBar);
 
 protected:
-	virtual void mouseDoubleClickEvent(QMouseEvent * e);
-	virtual QString tipText(const QPoint &);
-	virtual void fillContextPopup(QMenu * p);
-	virtual void loadState(const char * pcPrefix, KviConfigurationFile * pCfg);
-	virtual void saveState(const char * pcPrefix, KviConfigurationFile * pCfg);
+	void mouseDoubleClickEvent(QMouseEvent * e) override;
+	QString tipText(const QPoint &) override;
+	void fillContextPopup(QMenu * p) override;
+	void loadState(const char * pcPrefix, KviConfigurationFile * pCfg) override;
+	void saveState(const char * pcPrefix, KviConfigurationFile * pCfg) override;
 	void checkVersion();
 	void getNewVersion();
 protected slots:
diff --git a/src/kvirc/ui/KviTextIconWindow.h b/src/kvirc/ui/KviTextIconWindow.h
index 63b528321..232726ff6 100644
--- a/src/kvirc/ui/KviTextIconWindow.h
+++ b/src/kvirc/ui/KviTextIconWindow.h
@@ -83,7 +83,7 @@ private:
 	void doHide();
 
 private:
-	virtual bool eventFilter(QObject * o, QEvent * e);
+	bool eventFilter(QObject * o, QEvent * e) override;
 	void autoSelectBestMatchBasedOnOwnerText();
 
 public slots:
diff --git a/src/kvirc/ui/KviThemedComboBox.h b/src/kvirc/ui/KviThemedComboBox.h
index c2d6be781..a409decd3 100644
--- a/src/kvirc/ui/KviThemedComboBox.h
+++ b/src/kvirc/ui/KviThemedComboBox.h
@@ -42,8 +42,8 @@ private:
 	KviWindow * m_pKviWindow;
 
 protected:
-	virtual void paintEvent(QPaintEvent * event);
-	virtual void keyPressEvent(QKeyEvent * e);
+	void paintEvent(QPaintEvent * event) override;
+	void keyPressEvent(QKeyEvent * e) override;
 
 public:
 	int dummyRead() const { return 0; };
diff --git a/src/kvirc/ui/KviThemedLabel.h b/src/kvirc/ui/KviThemedLabel.h
index 90548952f..de54f8d32 100644
--- a/src/kvirc/ui/KviThemedLabel.h
+++ b/src/kvirc/ui/KviThemedLabel.h
@@ -42,8 +42,8 @@ private:
 	KviWindow * m_pKviWindow;
 
 protected:
-	virtual void paintEvent(QPaintEvent * event);
-	virtual void mouseDoubleClickEvent(QMouseEvent * e);
+	void paintEvent(QPaintEvent * event) override;
+	void mouseDoubleClickEvent(QMouseEvent * e) override;
 
 public:
 	int dummyRead() const { return 0; };
diff --git a/src/kvirc/ui/KviThemedLineEdit.h b/src/kvirc/ui/KviThemedLineEdit.h
index 5bf39578a..4e9e54758 100644
--- a/src/kvirc/ui/KviThemedLineEdit.h
+++ b/src/kvirc/ui/KviThemedLineEdit.h
@@ -42,7 +42,7 @@ private:
 	KviWindow * m_pKviWindow;
 
 protected:
-	virtual void paintEvent(QPaintEvent * event);
+	void paintEvent(QPaintEvent * event) override;
 
 public:
 	int dummyRead() const { return 0; };
diff --git a/src/kvirc/ui/KviTopicWidget.h b/src/kvirc/ui/KviTopicWidget.h
index 123567be3..85410612a 100644
--- a/src/kvirc/ui/KviTopicWidget.h
+++ b/src/kvirc/ui/KviTopicWidget.h
@@ -97,10 +97,10 @@ protected:
 	void updateToolTip();
 	void deactivate();
 	void iconButtonClicked();
-	virtual bool eventFilter(QObject * o, QEvent * e);
-	virtual void mousePressEvent(QMouseEvent * e);
-	virtual void keyPressEvent(QKeyEvent * e);
-	virtual void resizeEvent(QResizeEvent * e);
+	bool eventFilter(QObject * o, QEvent * e) override;
+	void mousePressEvent(QMouseEvent * e) override;
+	void keyPressEvent(QKeyEvent * e) override;
+	void resizeEvent(QResizeEvent * e) override;
 
 public:
 	void insertChar(QChar c);
@@ -115,7 +115,7 @@ public:
 	const QString & topic() { return m_szTopic; };
 	const QString & topicSetBy() { return m_szSetBy; };
 	const QString & topicSetAt() { return m_szSetAt; };
-	virtual QSize sizeHint() const;
+	QSize sizeHint() const override;
 	void applyOptions();
 
 	static void paintColoredText(QPainter * p, QString szText, const QPalette & palette, const QRect & rect);
diff --git a/src/kvirc/ui/KviTreeWindowList.h b/src/kvirc/ui/KviTreeWindowList.h
index 741f3517f..5b5d6d509 100644
--- a/src/kvirc/ui/KviTreeWindowList.h
+++ b/src/kvirc/ui/KviTreeWindowList.h
@@ -45,10 +45,10 @@ public:
 
 public:
 	virtual QString key() const;
-	virtual void captionChanged();
-	virtual void highlight(int iLevel = 1);
-	virtual void unhighlight();
-	virtual void setProgress(int progress);
+	void captionChanged() override;
+	void highlight(int iLevel = 1) override;
+	void unhighlight() override;
+	void setProgress(int progress) override;
 	virtual void applyOptions();
 
 protected:
@@ -69,11 +69,11 @@ public:
 	~KviTreeWindowListTreeWidget();
 	bool isReverseSort() { return bReverseSort; };
 protected:
-	virtual void mousePressEvent(QMouseEvent * e);
-	virtual void mouseMoveEvent(QMouseEvent * e);
-	virtual void wheelEvent(QWheelEvent * e);
-	virtual void mouseDoubleClickEvent(QMouseEvent * e);
-	virtual void paintEvent(QPaintEvent * event);
+	void mousePressEvent(QMouseEvent * e) override;
+	void mouseMoveEvent(QMouseEvent * e) override;
+	void wheelEvent(QWheelEvent * e) override;
+	void mouseDoubleClickEvent(QMouseEvent * e) override;
+	void paintEvent(QPaintEvent * event) override;
 
 private:
 	KviWindowListItem * lastItem();
@@ -97,21 +97,21 @@ private:
 	QStyledItemDelegate * m_pItemDelegate;
 
 public:
-	virtual KviWindowListItem * addItem(KviWindow *);
-	virtual bool removeItem(KviWindowListItem *);
-	virtual void setActiveItem(KviWindowListItem *);
-	virtual KviWindowListItem * firstItem();
-	virtual KviWindowListItem * nextItem(void);
-	virtual KviWindowListItem * lastItem();
-	virtual KviWindowListItem * prevItem(void);
-	virtual bool setIterationPointer(KviWindowListItem * it);
-	virtual void updatePseudoTransparency();
-	virtual void updateActivityMeter();
+	KviWindowListItem * addItem(KviWindow *) override;
+	bool removeItem(KviWindowListItem *) override;
+	void setActiveItem(KviWindowListItem *) override;
+	KviWindowListItem * firstItem() override;
+	KviWindowListItem * nextItem(void) override;
+	KviWindowListItem * lastItem() override;
+	KviWindowListItem * prevItem(void) override;
+	bool setIterationPointer(KviWindowListItem * it) override;
+	void updatePseudoTransparency() override;
+	void updateActivityMeter() override;
 
-	virtual void wheelEvent(QWheelEvent * e);
+	void wheelEvent(QWheelEvent * e) override;
 
 protected:
-	virtual void moveEvent(QMoveEvent *);
+	void moveEvent(QMoveEvent *) override;
 protected slots:
 	void tipRequest(KviDynamicToolTip * tip, const QPoint & pnt);
 };
diff --git a/src/kvirc/ui/KviUserListView.h b/src/kvirc/ui/KviUserListView.h
index 6f2577bc7..8ef104262 100644
--- a/src/kvirc/ui/KviUserListView.h
+++ b/src/kvirc/ui/KviUserListView.h
@@ -105,7 +105,7 @@ public:
 	/**
 	* \brief Destroys the userlist tooltip
 	*/
-	virtual ~KviUserListToolTip();
+	~KviUserListToolTip();
 
 private:
 	KviUserListView * m_pListView;
@@ -116,7 +116,7 @@ public:
 	* \param pnt The point where to show to tooltip
 	* \return void
 	*/
-	virtual void maybeTip(const QPoint & pnt);
+	void maybeTip(const QPoint & pnt) override;
 
 	/**
 	* \brief Shows the tooltip
@@ -806,7 +806,7 @@ protected:
 	*/
 	void updateScrollBarRange();
 
-	virtual void resizeEvent(QResizeEvent * e);
+	void resizeEvent(QResizeEvent * e) override;
 
 public slots:
 	/**
@@ -855,14 +855,14 @@ protected:
 	bool m_bIgnoreScrollBar;
 
 protected:
-	virtual void paintEvent(QPaintEvent * e);
-	virtual void resizeEvent(QResizeEvent * e);
-	virtual void mousePressEvent(QMouseEvent * e);
-	virtual void mouseMoveEvent(QMouseEvent * e);
-	virtual void mouseReleaseEvent(QMouseEvent * e);
-	virtual void mouseDoubleClickEvent(QMouseEvent * e);
-	virtual void wheelEvent(QWheelEvent * e);
-	virtual void keyPressEvent(QKeyEvent * e);
+	void paintEvent(QPaintEvent * e) override;
+	void resizeEvent(QResizeEvent * e) override;
+	void mousePressEvent(QMouseEvent * e) override;
+	void mouseMoveEvent(QMouseEvent * e) override;
+	void mouseReleaseEvent(QMouseEvent * e) override;
+	void mouseDoubleClickEvent(QMouseEvent * e) override;
+	void wheelEvent(QWheelEvent * e) override;
+	void keyPressEvent(QKeyEvent * e) override;
 protected slots:
 
 	/**
diff --git a/src/kvirc/ui/KviWebPackageManagementDialog.h b/src/kvirc/ui/KviWebPackageManagementDialog.h
index 49235ccee..7659a41ed 100644
--- a/src/kvirc/ui/KviWebPackageManagementDialog.h
+++ b/src/kvirc/ui/KviWebPackageManagementDialog.h
@@ -58,7 +58,7 @@ public:
 	/// Destroys the instance of KviWebPackageManagementDialog
 	/// and frees all the relevant resources
 	///
-	virtual ~KviWebPackageManagementDialog();
+	~KviWebPackageManagementDialog();
 
 private:
 	QToolBar * m_pToolBar;
@@ -71,7 +71,7 @@ private:
 
 protected:
 	void setPackagePageUrl(const QString & szUrl);
-	virtual void showEvent(QShowEvent * e);
+	void showEvent(QShowEvent * e) override;
 
 	virtual bool packageIsInstalled(const QString & szId, const QString & szVersion) = 0;
 	virtual bool installPackage(const QString & szPath, QString & szError) = 0;
diff --git a/src/kvirc/ui/KviWindow.h b/src/kvirc/ui/KviWindow.h
index 265781d26..8e3766869 100644
--- a/src/kvirc/ui/KviWindow.h
+++ b/src/kvirc/ui/KviWindow.h
@@ -171,7 +171,7 @@ public:
 	/**
 	* \brief Destroys the window object
 	*/
-	virtual ~KviWindow();
+	~KviWindow();
 
 protected:            // almost private: don't touch :D
 	QString m_szName; // the current window name (usually also the target)
@@ -485,14 +485,14 @@ protected:
 	// Sets the type of this window: be careful with this
 	void setType(Type eType) { m_eType = eType; };
 
-	bool eventFilter(QObject * pObject, QEvent * pEvent);
+	bool eventFilter(QObject * pObject, QEvent * pEvent) override;
 
 	// Virtuals overridden to manage the internal layouts...
-	virtual void moveEvent(QMoveEvent * pEvent);
-	virtual void closeEvent(QCloseEvent * pEvent);
-	virtual void childEvent(QChildEvent * pEvent);
-	virtual void focusInEvent(QFocusEvent *);
-	virtual void inputMethodEvent(QInputMethodEvent * e);
+	void moveEvent(QMoveEvent * pEvent) override;
+	void closeEvent(QCloseEvent * pEvent) override;
+	void childEvent(QChildEvent * pEvent) override;
+	void focusInEvent(QFocusEvent *) override;
+	void inputMethodEvent(QInputMethodEvent * e) override;
 
 	void childInserted(QWidget * pObject);
 	void childRemoved(QWidget * pObject);
@@ -506,7 +506,7 @@ protected:
 	// This is called by KviInput: actually it links the widgetAdded
 	virtual void childrenTreeChanged(QWidget * pAdded);
 
-	virtual bool focusNextPrevChild(bool bNext);
+	bool focusNextPrevChild(bool bNext) override;
 
 	virtual void preprocessMessage(QString & szMessage);
 public slots:
diff --git a/src/kvirc/ui/KviWindowListBase.h b/src/kvirc/ui/KviWindowListBase.h
index dfa24b89f..a2a025832 100644
--- a/src/kvirc/ui/KviWindowListBase.h
+++ b/src/kvirc/ui/KviWindowListBase.h
@@ -79,7 +79,7 @@ class KVIRC_API KviWindowListBase : public QDockWidget
 	Q_OBJECT
 public:
 	KviWindowListBase();
-	virtual ~KviWindowListBase();
+	~KviWindowListBase();
 
 protected:
 	KviMainWindow * m_pFrm;
@@ -100,7 +100,7 @@ public:
 	virtual void switchWindow(bool bNext, bool bInContextOnly, bool bHighlightedOnly = false);
 	virtual void updatePseudoTransparency(){};
 	virtual void applyOptions();
-	virtual void wheelEvent(QWheelEvent * e);
+	void wheelEvent(QWheelEvent * e) override;
 	static void getTextForConsole(QString & szText, KviConsoleWindow * pConsole);
 	Qt::DockWidgetArea currentDockArea() { return currentArea; };
 protected slots:
@@ -137,17 +137,17 @@ protected:
 	KviDynamicToolTip * m_pTip;
 
 protected:
-	virtual void mousePressEvent(QMouseEvent * e);
-	virtual void contextMenuEvent(QContextMenuEvent * e);
+	void mousePressEvent(QMouseEvent * e) override;
+	void contextMenuEvent(QContextMenuEvent * e) override;
 	virtual void drawButtonLabel(QPainter * p);
-	virtual void paintEvent(QPaintEvent * e);
+	void paintEvent(QPaintEvent * e) override;
 
 public:
-	virtual bool active() { return m_bActive; };
-	virtual void highlight(int iLevel = 1);
-	virtual void unhighlight();
-	virtual void setProgress(int progress);
-	virtual void captionChanged();
+	bool active() override { return m_bActive; }
+	void highlight(int iLevel = 1) override;
+	void unhighlight() override;
+	void setProgress(int progress) override;
+	void captionChanged() override;
 
 protected:
 	void setActive(bool bActive);
@@ -171,10 +171,10 @@ public:
 	~KviClassicWindowListToolButton() {};
 
 protected:
-	virtual void mousePressEvent(QMouseEvent *e);
+	void mousePressEvent(QMouseEvent *e) override;
 
 public:
-	virtual QSize sizeHint() const;
+	QSize sizeHint() const override;
 };
 
 class KVIRC_API KviClassicWindowList : public KviWindowListBase
@@ -194,19 +194,19 @@ protected:
 	void insertButton(KviWindowListButton * b);
 
 public:
-	virtual void resizeEvent(QResizeEvent * e);
+	void resizeEvent(QResizeEvent * e) override;
 
 public:
-	virtual KviWindowListItem * addItem(KviWindow *);
-	virtual bool removeItem(KviWindowListItem *);
-	virtual void setActiveItem(KviWindowListItem *);
-	virtual KviWindowListItem * firstItem();
-	virtual KviWindowListItem * lastItem(void);
-	virtual KviWindowListItem * nextItem();
-	virtual KviWindowListItem * prevItem(void);
-	virtual bool setIterationPointer(KviWindowListItem * it);
-	virtual void updateActivityMeter();
-	virtual void applyOptions();
+	KviWindowListItem * addItem(KviWindow *) override;
+	bool removeItem(KviWindowListItem *) override;
+	void setActiveItem(KviWindowListItem *) override;
+	KviWindowListItem * firstItem() override;
+	KviWindowListItem * lastItem(void) override;
+	KviWindowListItem * nextItem() override;
+	KviWindowListItem * prevItem(void) override;
+	bool setIterationPointer(KviWindowListItem * it) override;
+	void updateActivityMeter() override;
+	void applyOptions() override;
 protected slots:
 	void orientationChangedSlot(Qt::Orientation o);
 	void doLayout();
@@ -223,8 +223,8 @@ private:
 	KviWindowListBase * m_pParent;
 
 public:
-	QSize sizeHint() const;
-	void paintEvent(QPaintEvent *);
+	QSize sizeHint() const override;
+	void paintEvent(QPaintEvent *) override;
 };
 
 #endif //_KVI_WINDOWLIST_H_
diff --git a/src/kvirc/ui/KviWindowStack.h b/src/kvirc/ui/KviWindowStack.h
index f1dfa6cde..9c79d740c 100644
--- a/src/kvirc/ui/KviWindowStack.h
+++ b/src/kvirc/ui/KviWindowStack.h
@@ -64,7 +64,7 @@ public:
 	* \brief Filters out some events: (de)activation events, window switching
 	* \return bool
 	*/
-	//bool eventFilter(QObject *obj, QEvent *event);
+	//bool eventFilter(QObject *obj, QEvent *event) override;
 protected:
 	/// Holds the specialized window popup
 	QMenu * m_pWindowPopup;
diff --git a/src/modules/about/AboutDialog.h b/src/modules/about/AboutDialog.h
index 7f4f819df..6cf4608e2 100644
--- a/src/modules/about/AboutDialog.h
+++ b/src/modules/about/AboutDialog.h
@@ -34,7 +34,7 @@ public:
 	~AboutDialog();
 
 protected:
-	virtual void closeEvent(QCloseEvent * e);
+	void closeEvent(QCloseEvent * e) override;
 protected slots:
 	void closeButtonPressed();
 };
diff --git a/src/modules/about/libkviabout.h b/src/modules/about/libkviabout.h
index b396f64eb..386b488fd 100644
--- a/src/modules/about/libkviabout.h
+++ b/src/modules/about/libkviabout.h
@@ -44,8 +44,8 @@ public:
 	KviDlgAbout * m_pAboutDialog;
 	QPixmap     * m_pMemPixmap;
 public:
-	virtual void drawContents(QPainter *p);
-	virtual void resizeEvent(QResizeEvent *e);
+	void drawContents(QPainter *p) override;
+	void resizeEvent(QResizeEvent *e) override;
 };
 
 
@@ -60,8 +60,8 @@ public:
 //	void closed();
 private slots:
 	void close();
-	virtual void closeEvent(QCloseEvent *);
-//	virtual void paintEvent(QPaintEvent *);
+	void closeEvent(QCloseEvent *) override;
+//	void paintEvent(QPaintEvent *) override;
 	void scrollText();
 public:
 	int              m_posy;
@@ -80,7 +80,7 @@ public:
 private slots:
 	void close();
 private:
-	virtual void closeEvent(QCloseEvent *);
+	void closeEvent(QCloseEvent *) override;
 
 	QLabel		* m_pPicLabel;
 	QLabel		* m_pTextLabel;
diff --git a/src/modules/actioneditor/ActionEditor.h b/src/modules/actioneditor/ActionEditor.h
index 8a88c7778..cd35d1e80 100644
--- a/src/modules/actioneditor/ActionEditor.h
+++ b/src/modules/actioneditor/ActionEditor.h
@@ -99,7 +99,7 @@ public:
 	~ActionEditorTreeView();
 
 protected:
-	virtual void resizeEvent(QResizeEvent * e);
+	void resizeEvent(QResizeEvent * e) override;
 };
 
 class SingleActionEditor : public QWidget
@@ -192,10 +192,10 @@ protected:
 	ActionEditor * m_pEditor;
 
 protected:
-	virtual QPixmap * myIconPtr();
-	virtual void getConfigGroupName(QString & szName);
-	virtual void saveProperties(KviConfigurationFile *);
-	virtual void loadProperties(KviConfigurationFile *);
+	QPixmap * myIconPtr() override;
+	void getConfigGroupName(QString & szName) override;
+	void saveProperties(KviConfigurationFile *) override;
+	void loadProperties(KviConfigurationFile *) override;
 protected slots:
 	void cancelClicked();
 	void okClicked();
diff --git a/src/modules/addon/AddonManagementDialog.h b/src/modules/addon/AddonManagementDialog.h
index b2181c502..86abd484a 100644
--- a/src/modules/addon/AddonManagementDialog.h
+++ b/src/modules/addon/AddonManagementDialog.h
@@ -84,7 +84,7 @@ public:
 
 protected:
 	void fillListView();
-	virtual void closeEvent(QCloseEvent * e);
+	void closeEvent(QCloseEvent * e) override;
 protected slots:
 	void currentChanged(QListWidgetItem * i, QListWidgetItem *);
 	void closeClicked();
diff --git a/src/modules/addon/PackAddonDialog.h b/src/modules/addon/PackAddonDialog.h
index d6ddec1f1..4464f2da0 100644
--- a/src/modules/addon/PackAddonDialog.h
+++ b/src/modules/addon/PackAddonDialog.h
@@ -92,7 +92,7 @@ protected:
 	* \brief Runs the packAddon() function and closes the wizard
 	* \return void
 	*/
-	virtual void accept();
+	void accept() override;
 
 	/**
 	* \brief Creates the addon package
@@ -201,7 +201,7 @@ protected:
 	* \brief Perform initial tasks before showing the widget
 	* \return void
 	*/
-	virtual void initializePage();
+	void initializePage() override;
 };
 
 /**
@@ -232,7 +232,7 @@ protected:
 	* \brief Perform initial tasks before showing the widget
 	* \return void
 	*/
-	virtual void initializePage();
+	void initializePage() override;
 };
 
 class PackAddonSummaryFilesWidget : public QDialog
@@ -249,10 +249,10 @@ protected:
 public:
 	void setPath(QString & szPath) { m_szPath = szPath; };
 protected:
-	virtual void showEvent(QShowEvent *);
+	void showEvent(QShowEvent *) override;
 protected slots:
-	virtual void accept();
-	virtual void reject();
+	void accept() override;
+	void reject() override;
 };
 
 #endif //!_PACKADDONDIALOG_H_
diff --git a/src/modules/aliaseditor/AliasEditorWindow.h b/src/modules/aliaseditor/AliasEditorWindow.h
index cd993f83f..f9dd3d8ee 100644
--- a/src/modules/aliaseditor/AliasEditorWindow.h
+++ b/src/modules/aliaseditor/AliasEditorWindow.h
@@ -182,10 +182,10 @@ protected:
 	AliasEditorWidget * m_pEditor;
 
 protected:
-	virtual QPixmap * myIconPtr();
-	virtual void getConfigGroupName(QString & szName);
-	virtual void saveProperties(KviConfigurationFile *);
-	virtual void loadProperties(KviConfigurationFile *);
+	QPixmap * myIconPtr() override;
+	void getConfigGroupName(QString & szName) override;
+	void saveProperties(KviConfigurationFile *) override;
+	void loadProperties(KviConfigurationFile *) override;
 protected slots:
 	void cancelClicked();
 	void okClicked();
diff --git a/src/modules/avatar/libkviavatar.h b/src/modules/avatar/libkviavatar.h
index 0509ebc2f..54f3c5a5a 100644
--- a/src/modules/avatar/libkviavatar.h
+++ b/src/modules/avatar/libkviavatar.h
@@ -45,7 +45,7 @@ protected:
 	KviIrcConnection * m_pConnection;
 
 protected:
-	virtual void closeEvent(QCloseEvent * e);
+	void closeEvent(QCloseEvent * e) override;
 	const QString & avatarName() { return m_szAvatarName; };
 protected slots:
 	void okClicked();
diff --git a/src/modules/channelsjoin/ChannelsJoinDialog.h b/src/modules/channelsjoin/ChannelsJoinDialog.h
index ed3361c3c..541fcfe81 100644
--- a/src/modules/channelsjoin/ChannelsJoinDialog.h
+++ b/src/modules/channelsjoin/ChannelsJoinDialog.h
@@ -67,8 +67,8 @@ protected:
 	* \param e mouse event descriptor
 	* \return void
 	*/
-	virtual void mousePressEvent(QMouseEvent * e);
-	virtual void mouseDoubleClickEvent(QMouseEvent * e);
+	void mousePressEvent(QMouseEvent * e) override;
+	void mouseDoubleClickEvent(QMouseEvent * e) override;
 };
 
 /**
diff --git a/src/modules/classeditor/ClassEditorWindow.h b/src/modules/classeditor/ClassEditorWindow.h
index e12386a5e..c320937a2 100644
--- a/src/modules/classeditor/ClassEditorWindow.h
+++ b/src/modules/classeditor/ClassEditorWindow.h
@@ -73,7 +73,7 @@ public:
 	~ClassEditorTreeWidget();
 
 protected:
-	virtual void mousePressEvent(QMouseEvent * e);
+	void mousePressEvent(QMouseEvent * e) override;
 signals:
 	/**
 	* \brief Emitted when we press the mouse right button
@@ -305,14 +305,14 @@ public:
 	* \param pCfg The configuration file
 	* \return void
 	*/
-	virtual void saveProperties(KviConfigurationFile * pCfg);
+	void saveProperties(KviConfigurationFile * pCfg);
 
 	/**
 	* \brief Called to load the window properties
 	* \param pCfg The configuration file
 	* \return void
 	*/
-	virtual void loadProperties(KviConfigurationFile * pCfg);
+	void loadProperties(KviConfigurationFile * pCfg);
 
 	/**
 	* \brief Builds the class!
@@ -497,7 +497,7 @@ protected:
 	* \brief Returns the class editor small icon
 	* \return QPixmap *
 	*/
-	virtual QPixmap * myIconPtr();
+	QPixmap * myIconPtr() override;
 
 	/**
 	* \brief Sets the configuration group name as classeditor
@@ -511,14 +511,14 @@ protected:
 	* \param pCfg The configuration file
 	* \return void
 	*/
-	virtual void saveProperties(KviConfigurationFile * pCfg);
+	void saveProperties(KviConfigurationFile * pCfg) override;
 
 	/**
 	* \brief Called to load the window properties
 	* \param pCfg The configuration file
 	* \return void
 	*/
-	virtual void loadProperties(KviConfigurationFile * pCfg);
+	void loadProperties(KviConfigurationFile * pCfg) override;
 protected slots:
 	/**
 	* \brief Called when we click the cancel button
diff --git a/src/modules/codetester/CodeTesterWindow.h b/src/modules/codetester/CodeTesterWindow.h
index 989578123..d71dbbf31 100644
--- a/src/modules/codetester/CodeTesterWindow.h
+++ b/src/modules/codetester/CodeTesterWindow.h
@@ -51,12 +51,12 @@ private slots:
 	void execute();
 
 protected:
-	virtual QPixmap * myIconPtr();
-	virtual void fillCaptionBuffers();
-	virtual void resizeEvent(QResizeEvent * e);
-	virtual void getConfigGroupName(QString & szName);
-	virtual void saveProperties(KviConfigurationFile *){};
-	virtual void loadProperties(KviConfigurationFile *){};
+	QPixmap * myIconPtr() override;
+	void fillCaptionBuffers() override;
+	void resizeEvent(QResizeEvent * e) override;
+	void getConfigGroupName(QString & szName) override;
+	void saveProperties(KviConfigurationFile *) override {}
+	void loadProperties(KviConfigurationFile *) override {}
 };
 
 #endif //_CODETESTER_H_
diff --git a/src/modules/dcc/DccCanvasWindow.cpp b/src/modules/dcc/DccCanvasWindow.cpp
index b89d04b09..89c71f55b 100644
--- a/src/modules/dcc/DccCanvasWindow.cpp
+++ b/src/modules/dcc/DccCanvasWindow.cpp
@@ -162,7 +162,7 @@ void DccCanvasWindow::getBaseLogFileName(KviCString & buffer)
 	buffer.sprintf("%s_%s_%s", m_pDescriptor->szNick.toUtf8().data(), m_pDescriptor->szIp.toUtf8().data(), m_pDescriptor->szPort.toUtf8().data());
 }
 
-void DccCanvasWindow::ownMessage(const char * text, bool bUserFeedback)
+void DccCanvasWindow::ownMessage(const QString & text, bool bUserFeedback)
 {
 	KviCString buf(KviCString::Format, "%s\r\n", text);
 	//	m_pSlaveThread->sendRawData(buf.ptr(),buf.len());
@@ -173,7 +173,7 @@ void DccCanvasWindow::ownMessage(const char * text, bool bUserFeedback)
 		    m_pDescriptor->szLocalHost.toUtf8().data(), text);
 }
 
-void DccCanvasWindow::ownAction(const char * text)
+void DccCanvasWindow::ownAction(const QString & text)
 {
 	KviCString buf(KviCString::Format, "%cACTION %s%c\r\n", text);
 	//	m_pSlaveThread->sendRawData(buf.ptr(),buf.len());
diff --git a/src/modules/dcc/DccCanvasWindow.h b/src/modules/dcc/DccCanvasWindow.h
index 6b89bc735..7e3e6ff29 100644
--- a/src/modules/dcc/DccCanvasWindow.h
+++ b/src/modules/dcc/DccCanvasWindow.h
@@ -53,15 +53,15 @@ protected:
 	QString m_szTarget;
 
 protected:
-	virtual const QString & target();
-	virtual void fillCaptionBuffers();
-	virtual void getBaseLogFileName(KviCString & buffer);
-	virtual QPixmap * myIconPtr();
-	virtual void resizeEvent(QResizeEvent * e);
-	virtual QSize sizeHint() const;
-	virtual bool event(QEvent * e);
-	virtual void ownMessage(const char * text, bool bUserFeedback = true);
-	virtual void ownAction(const char * text);
+	const QString & target() override;
+	void fillCaptionBuffers() override;
+	void getBaseLogFileName(KviCString & buffer) override;
+	QPixmap * myIconPtr() override;
+	void resizeEvent(QResizeEvent * e) override;
+	QSize sizeHint() const override;
+	bool event(QEvent * e) override;
+	void ownMessage(const QString & text, bool bUserFeedback = true) override;
+	void ownAction(const QString & text) override;
 protected slots:
 	void handleMarshalError(int err);
 	void connected();
diff --git a/src/modules/dcc/DccChatWindow.h b/src/modules/dcc/DccChatWindow.h
index b23da0943..2af9892c0 100644
--- a/src/modules/dcc/DccChatWindow.h
+++ b/src/modules/dcc/DccChatWindow.h
@@ -74,7 +74,7 @@ class DccChatWindow : public DccWindow
 public:
 	DccChatWindow(DccDescriptor * dcc, const char * name);
 	~DccChatWindow();
-	QFrame * buttonContainer() { return (QFrame *)m_pButtonContainer; };
+	QFrame * buttonContainer() override { return (QFrame *)m_pButtonContainer; }
 protected:
 	DccChatThread * m_pSlaveThread;
 	QString m_szTarget;
@@ -84,20 +84,20 @@ protected:
 	KviTalHBox * m_pButtonContainer;
 
 protected:
-	virtual const QString & target();
-	virtual void fillCaptionBuffers();
-	virtual void getBaseLogFileName(QString & buffer);
-	virtual QPixmap * myIconPtr();
-	virtual void resizeEvent(QResizeEvent * e);
-	virtual QSize sizeHint() const;
-	virtual const QString & localNick();
-	virtual bool event(QEvent * e);
-	virtual void ownMessage(const QString & text, bool bUserFeedback = true);
-	virtual void ownAction(const QString & text);
-	virtual void triggerCreationEvents();
-	virtual void triggerDestructionEvents();
+	const QString & target() override;
+	void fillCaptionBuffers() override;
+	void getBaseLogFileName(QString & buffer) override;
+	QPixmap * myIconPtr() override;
+	void resizeEvent(QResizeEvent * e) override;
+	QSize sizeHint() const override;
+	const QString & localNick() override;
+	bool event(QEvent * e) override;
+	void ownMessage(const QString & text, bool bUserFeedback = true) override;
+	void ownAction(const QString & text) override;
+	void triggerCreationEvents() override;
+	void triggerDestructionEvents() override;
 	void startConnection();
-	virtual DccThread * getSlaveThread() { return m_pSlaveThread; };
+	DccThread * getSlaveThread() override { return m_pSlaveThread; }
 protected slots:
 	void handleMarshalError(KviError::Code eError);
 	void connected();
diff --git a/src/modules/dcc/DccDialog.h b/src/modules/dcc/DccDialog.h
index ded6dc942..a6e6d8c7d 100644
--- a/src/modules/dcc/DccDialog.h
+++ b/src/modules/dcc/DccDialog.h
@@ -50,8 +50,8 @@ public:
 	~DccAcceptDialog();
 
 protected:
-	virtual void closeEvent(QCloseEvent * e);
-	virtual void showEvent(QShowEvent * e);
+	void closeEvent(QCloseEvent * e) override;
+	void showEvent(QShowEvent * e) override;
 private slots:
 	void acceptClicked();
 	void rejectClicked();
@@ -68,8 +68,8 @@ public:
 	~DccRenameDialog();
 
 protected:
-	virtual void closeEvent(QCloseEvent * e);
-	virtual void showEvent(QShowEvent * e);
+	void closeEvent(QCloseEvent * e) override;
+	void showEvent(QShowEvent * e) override;
 private slots:
 	void renameClicked();
 	void overwriteClicked();
diff --git a/src/modules/dcc/DccFileTransfer.h b/src/modules/dcc/DccFileTransfer.h
index c9a8b5ddb..29ea3abcb 100644
--- a/src/modules/dcc/DccFileTransfer.h
+++ b/src/modules/dcc/DccFileTransfer.h
@@ -165,7 +165,7 @@ protected:
 	QSpinBox * m_pLimitBox;
 
 protected:
-	virtual void closeEvent(QCloseEvent * e);
+	void closeEvent(QCloseEvent * e) override;
 protected slots:
 	void okClicked();
 	void cancelClicked();
@@ -221,7 +221,7 @@ public:
 	static bool handleResumeAccepted(const char * filename, const char * port, const char * szZeroPortTag);
 	static bool handleResumeRequest(const char * filename, const char * port, quint64 filePos);
 
-	virtual bool event(QEvent * e);
+	bool event(QEvent * e) override;
 
 	virtual KviWindow * dccMarshalOutputWindow();
 	virtual const char * dccMarshalOutputContextString();
diff --git a/src/modules/dcc/DccVideoWindow.h b/src/modules/dcc/DccVideoWindow.h
index 492744a57..080e652e6 100644
--- a/src/modules/dcc/DccVideoWindow.h
+++ b/src/modules/dcc/DccVideoWindow.h
@@ -103,8 +103,8 @@ protected:
 	void startPlaying();
 	void stopPlaying();
 	bool isPlaying() const { return m_bPlaying; }
-	virtual void run();
-	virtual bool handleIncomingData(KviDccThreadIncomingData * data, bool bCritical);
+	void run() override;
+	bool handleIncomingData(KviDccThreadIncomingData * data, bool bCritical) override;
 };
 
 class DccVideoWindow : public DccWindow
@@ -135,21 +135,21 @@ protected:
 	QString m_szLocalNick;
 
 protected:
-	virtual void triggerCreationEvents();
-	virtual void triggerDestructionEvents();
-	virtual const QString & target();
-	virtual void fillCaptionBuffers();
-	virtual QPixmap * myIconPtr();
-	virtual bool event(QEvent * e);
-	virtual void getBaseLogFileName(QString & buffer);
+	void triggerCreationEvents() override;
+	void triggerDestructionEvents() override;
+	const QString & target() override;
+	void fillCaptionBuffers() override;
+	QPixmap * myIconPtr() override;
+	bool event(QEvent * e) override;
+	void getBaseLogFileName(QString & buffer) override;
 	void startTalking();
 	void stopTalking();
 	void startConnection();
-	virtual const QString & localNick();
-	virtual void ownMessage(const QString & text, bool bUserFeedback = true);
-	virtual void ownAction(const QString & text);
-	virtual void resizeEvent(QResizeEvent *);
-	virtual QSize sizeHint() const;
+	const QString & localNick() override;
+	void ownMessage(const QString & text, bool bUserFeedback = true) override;
+	void ownAction(const QString & text) override;
+	void resizeEvent(QResizeEvent *) override;
+	QSize sizeHint() const override;
 protected slots:
 	void handleMarshalError(KviError::Code eError);
 	void connected();
diff --git a/src/modules/dcc/DccVoiceWindow.h b/src/modules/dcc/DccVoiceWindow.h
index e0d526382..59d30ecaa 100644
--- a/src/modules/dcc/DccVoiceWindow.h
+++ b/src/modules/dcc/DccVoiceWindow.h
@@ -125,14 +125,14 @@ protected:
 	DccVoiceThread * m_pSlaveThread;
 
 protected:
-	virtual void focusInEvent(QFocusEvent *);
-	virtual const QString & target();
-	virtual void fillCaptionBuffers();
-	virtual QPixmap * myIconPtr();
-	virtual void resizeEvent(QResizeEvent * e);
-	virtual QSize sizeHint() const;
-	virtual bool event(QEvent * e);
-	virtual void getBaseLogFileName(QString & buffer);
+	void focusInEvent(QFocusEvent *) override;
+	const QString & target() override;
+	void fillCaptionBuffers() override;
+	QPixmap * myIconPtr() override;
+	void resizeEvent(QResizeEvent * e) override;
+	QSize sizeHint() const override;
+	bool event(QEvent * e) override;
+	void getBaseLogFileName(QString & buffer) override;
 	void startTalking();
 	void stopTalking();
 	void startConnection();
diff --git a/src/modules/dcc/canvaswidget.h b/src/modules/dcc/canvaswidget.h
index d6737cef4..c03a750c7 100644
--- a/src/modules/dcc/canvaswidget.h
+++ b/src/modules/dcc/canvaswidget.h
@@ -263,9 +263,9 @@ protected:
 	void setItemSelected(QCanvasItem * it);
 	void clearSelection();
 	void insertObjectAt(const QPoint & pnt, ObjectType o);
-	virtual void contentsMousePressEvent(QMouseEvent * e);
-	virtual void contentsMouseMoveEvent(QMouseEvent * e);
-	virtual void contentsMouseReleaseEvent(QMouseEvent * e);
+	void contentsMousePressEvent(QMouseEvent * e) override;
+	void contentsMouseMoveEvent(QMouseEvent * e) override;
+	void contentsMouseReleaseEvent(QMouseEvent * e) override;
 public slots:
 	void insertRectangle();
 	void insertRichText();
@@ -328,7 +328,7 @@ protected:
 	KviCanvasItemPropertiesWidget * m_pPropertiesWidget;
 
 protected:
-	virtual void resizeEvent(QResizeEvent *);
+	void resizeEvent(QResizeEvent *) override;
 };
 #endif
 
diff --git a/src/modules/dialog/libkvidialog.h b/src/modules/dialog/libkvidialog.h
index 5bec526e4..ac0eb86fc 100644
--- a/src/modules/dialog/libkvidialog.h
+++ b/src/modules/dialog/libkvidialog.h
@@ -49,7 +49,7 @@ public:
 	    KviWindow * pWindow, bool modal = false);
 	~KviKvsCallbackMessageBox();
 protected slots:
-	virtual void done(int code);
+	void done(int code) override;
 };
 
 class KviKvsCallbackTextInput : public QDialog, public KviKvsCallbackObject
@@ -79,13 +79,13 @@ protected:
 	int m_iDefaultButton;
 
 protected:
-	virtual void closeEvent(QCloseEvent * e);
-	virtual void showEvent(QShowEvent * e);
+	void closeEvent(QCloseEvent * e) override;
+	void showEvent(QShowEvent * e) override;
 protected slots:
 	void b0Clicked();
 	void b1Clicked();
 	void b2Clicked();
-	virtual void done(int code);
+	void done(int code) override;
 };
 
 class KviKvsCallbackFileDialog : public KviFileDialog, public KviKvsCallbackObject
@@ -102,7 +102,7 @@ public:
 	~KviKvsCallbackFileDialog();
 
 protected:
-	virtual void done(int code);
+	void done(int code) override;
 };
 
 class KviKvsCallbackImageDialog : public KviImageDialog, public KviKvsCallbackObject
@@ -120,7 +120,7 @@ public:
 	~KviKvsCallbackImageDialog();
 
 protected:
-	virtual void done(int code);
+	void done(int code) override;
 };
 
 #endif //_KVI_DIALOG_H_
diff --git a/src/modules/eventeditor/EventEditorWindow.h b/src/modules/eventeditor/EventEditorWindow.h
index 5dbfc69fa..0425b13ea 100644
--- a/src/modules/eventeditor/EventEditorWindow.h
+++ b/src/modules/eventeditor/EventEditorWindow.h
@@ -84,7 +84,7 @@ public:
 	~EventEditorTreeWidget(){};
 
 protected:
-	void mousePressEvent(QMouseEvent * e);
+	void mousePressEvent(QMouseEvent * e) override;
 signals:
 	void rightButtonPressed(QTreeWidgetItem *, QPoint);
 };
@@ -121,7 +121,7 @@ protected slots:
 	void eventHandlerDisabled(const QString & szName);
 
 protected:
-	void showEvent(QShowEvent * e);
+	void showEvent(QShowEvent * e) override;
 
 private:
 	void oneTimeSetup();
@@ -138,11 +138,11 @@ protected:
 	EventEditor * m_pEditor;
 
 protected:
-	virtual QPixmap * myIconPtr();
-	virtual void fillCaptionBuffers();
-	virtual void getConfigGroupName(QString & szName);
-	virtual void saveProperties(KviConfigurationFile *);
-	virtual void loadProperties(KviConfigurationFile *);
+	QPixmap * myIconPtr() override;
+	void fillCaptionBuffers() override;
+	void getConfigGroupName(QString & szName) override;
+	void saveProperties(KviConfigurationFile *) override;
+	void loadProperties(KviConfigurationFile *) override;
 protected slots:
 	void cancelClicked();
 	void okClicked();
diff --git a/src/modules/filetransferwindow/FileTransferWindow.h b/src/modules/filetransferwindow/FileTransferWindow.h
index 120d87c50..89839c674 100644
--- a/src/modules/filetransferwindow/FileTransferWindow.h
+++ b/src/modules/filetransferwindow/FileTransferWindow.h
@@ -51,11 +51,11 @@ class FileTransferWidget : public KviTalTableWidget
 public:
 	FileTransferWidget(QWidget * pParent);
 	~FileTransferWidget(){};
-	void paintEvent(QPaintEvent * event);
+	void paintEvent(QPaintEvent * event) override;
 	int dummyRead() const { return 0; };
 protected:
-	void mousePressEvent(QMouseEvent * e);
-	void mouseDoubleClickEvent(QMouseEvent * e);
+	void mousePressEvent(QMouseEvent * e) override;
+	void mouseDoubleClickEvent(QMouseEvent * e) override;
 signals:
 	void rightButtonPressed(FileTransferItem *, QPoint pnt);
 	void doubleClicked(FileTransferItem *, QPoint pnt);
@@ -117,18 +117,18 @@ public:                 // Methods
 	virtual void die();
 
 protected:
-	virtual QPixmap * myIconPtr();
-	virtual void fillCaptionBuffers();
-	virtual void applyOptions();
-	virtual void resizeEvent(QResizeEvent * e);
-	virtual void getBaseLogFileName(QString & buffer);
+	QPixmap * myIconPtr() override;
+	void fillCaptionBuffers() override;
+	void applyOptions() override;
+	void resizeEvent(QResizeEvent * e) override;
+	void getBaseLogFileName(QString & buffer) override;
 	FileTransferItem * findItem(KviFileTransfer * t);
 	void fillTransferView();
 	KviFileTransfer * selectedTransfer();
-	bool eventFilter(QObject * obj, QEvent * ev);
+	bool eventFilter(QObject * obj, QEvent * ev) override;
 
 public:
-	virtual QSize sizeHint() const;
+	QSize sizeHint() const override;
 	int lineSpacing() { return m_iLineSpacing; };
 protected slots:
 	void transferRegistered(KviFileTransfer * t);
diff --git a/src/modules/help/HelpWindow.h b/src/modules/help/HelpWindow.h
index 1447d15dc..865fb5fee 100644
--- a/src/modules/help/HelpWindow.h
+++ b/src/modules/help/HelpWindow.h
@@ -72,11 +72,11 @@ protected:
 public:
 	HelpWidget * helpWidget() { return m_pHelpWidget; };
 protected:
-	virtual QPixmap * myIconPtr();
-	virtual void fillCaptionBuffers();
-	virtual void resizeEvent(QResizeEvent * e);
-	virtual void saveProperties(KviConfigurationFile * cfg);
-	virtual void loadProperties(KviConfigurationFile * cfg);
+	QPixmap * myIconPtr() override;
+	void fillCaptionBuffers() override;
+	void resizeEvent(QResizeEvent * e) override;
+	void saveProperties(KviConfigurationFile * cfg) override;
+	void loadProperties(KviConfigurationFile * cfg) override;
 
 public:
 #ifdef COMPILE_WEBKIT_SUPPORT
diff --git a/src/modules/iograph/libkviiograph.h b/src/modules/iograph/libkviiograph.h
index c66812b48..9c7c0eeb1 100644
--- a/src/modules/iograph/libkviiograph.h
+++ b/src/modules/iograph/libkviiograph.h
@@ -51,8 +51,8 @@ protected:
 	kvi_u64_t m_uLastRecvBytes;
 
 protected:
-	virtual void timerEvent(QTimerEvent * e);
-	virtual void paintEvent(QPaintEvent * e);
+	void timerEvent(QTimerEvent * e) override;
+	void paintEvent(QPaintEvent * e) override;
 };
 
 class KviIOGraphWindow : public KviWindow
@@ -67,12 +67,12 @@ private:
 	virtual void updatePseudoTransparency();
 
 protected:
-	virtual QPixmap * myIconPtr();
-	virtual void fillCaptionBuffers();
-	virtual void resizeEvent(QResizeEvent * e);
+	QPixmap * myIconPtr() override;
+	void fillCaptionBuffers() override;
+	void resizeEvent(QResizeEvent * e) override;
 	virtual void die();
-	virtual void moveEvent(QMoveEvent *);
-	virtual void paintEvent(QPaintEvent * e);
+	void moveEvent(QMoveEvent *) override;
+	void paintEvent(QPaintEvent * e) override;
 };
 
 #endif
diff --git a/src/modules/links/LinksWindow.h b/src/modules/links/LinksWindow.h
index 89b4b40b6..b7456f5d2 100644
--- a/src/modules/links/LinksWindow.h
+++ b/src/modules/links/LinksWindow.h
@@ -56,7 +56,7 @@ public:
 	~LinksListView(){};
 
 protected:
-	void mousePressEvent(QMouseEvent * e);
+	void mousePressEvent(QMouseEvent * e) override;
 signals:
 	void rightButtonPressed(QTreeWidgetItem *, QPoint);
 };
@@ -79,16 +79,16 @@ protected:
 	KviThemedLabel * m_pInfoLabel;
 
 public: // Methods
-	virtual void control(int msg);
-	virtual void processData(KviIrcMessage * msg);
-	virtual void die();
+	void control(int msg) override;
+	void processData(KviIrcMessage * msg) override;
+	void die() override;
 
 protected:
-	virtual QPixmap * myIconPtr();
-	virtual void fillCaptionBuffers();
-	virtual void applyOptions();
-	virtual void resizeEvent(QResizeEvent * e);
-	virtual void getBaseLogFileName(QString & buffer);
+	QPixmap * myIconPtr() override;
+	void fillCaptionBuffers() override;
+	void applyOptions() override;
+	void resizeEvent(QResizeEvent * e) override;
+	void getBaseLogFileName(QString & buffer) override;
 protected slots:
 	void showHostPopup(QTreeWidgetItem * i, const QPoint & p);
 	void hostPopupClicked(QAction * pAction);
@@ -96,7 +96,7 @@ protected slots:
 	void connectionStateChange();
 
 public:
-	virtual QSize sizeHint() const;
+	QSize sizeHint() const override;
 
 private:
 	void reset();
diff --git a/src/modules/list/ListWindow.h b/src/modules/list/ListWindow.h
index 997c471a4..30da96db0 100644
--- a/src/modules/list/ListWindow.h
+++ b/src/modules/list/ListWindow.h
@@ -115,17 +115,17 @@ protected:
 	KviPointerList<ChannelTreeWidgetItemData> * m_pItemList;
 
 public: // Methods
-	virtual void control(int iMsg);
-	virtual void processData(KviIrcMessage * pMsg);
-	virtual void die();
-	virtual QSize sizeHint() const;
+	void control(int iMsg) override;
+	void processData(KviIrcMessage * pMsg) override;
+	void die() override;
+	QSize sizeHint() const override;
 
 protected:
-	virtual QPixmap * myIconPtr();
-	virtual void fillCaptionBuffers();
-	virtual void applyOptions();
-	virtual void resizeEvent(QResizeEvent * e);
-	virtual void getBaseLogFileName(QString & szBuffer);
+	QPixmap * myIconPtr() override;
+	void fillCaptionBuffers() override;
+	void applyOptions() override;
+	void resizeEvent(QResizeEvent * e) override;
+	void getBaseLogFileName(QString & szBuffer) override;
 protected slots:
 	void flush();
 	void itemDoubleClicked(QTreeWidgetItem * it, int);
diff --git a/src/modules/logview/LogViewWindow.h b/src/modules/logview/LogViewWindow.h
index dfe267426..b90866b39 100644
--- a/src/modules/logview/LogViewWindow.h
+++ b/src/modules/logview/LogViewWindow.h
@@ -55,7 +55,7 @@ public:
 	~LogViewListView(){};
 
 protected:
-	void mousePressEvent(QMouseEvent * pEvent);
+	void mousePressEvent(QMouseEvent * pEvent) override;
 signals:
 	void rightButtonPressed(QTreeWidgetItem *, QPoint);
 };
@@ -119,12 +119,12 @@ protected:
 	void recurseDirectory(const QString & szDir);
 	void setupItemList();
 
-	virtual QPixmap * myIconPtr();
-	virtual void resizeEvent(QResizeEvent * pEvent);
-	virtual void keyPressEvent(QKeyEvent * pEvent);
-	virtual void fillCaptionBuffers();
+	QPixmap * myIconPtr() override;
+	void resizeEvent(QResizeEvent * pEvent) override;
+	void keyPressEvent(QKeyEvent * pEvent) override;
+	void fillCaptionBuffers() override;
 	virtual void die();
-	virtual QSize sizeHint() const;
+	QSize sizeHint() const override;
 protected slots:
 	void rightButtonClicked(QTreeWidgetItem *, const QPoint &);
 	void itemSelected(QTreeWidgetItem * pItem, QTreeWidgetItem *);
diff --git a/src/modules/mircimport/libkvimircimport.h b/src/modules/mircimport/libkvimircimport.h
index 3069849b4..4c8e00206 100644
--- a/src/modules/mircimport/libkvimircimport.h
+++ b/src/modules/mircimport/libkvimircimport.h
@@ -43,8 +43,8 @@ public:
 
 public:
 	int doImport(const QString & filename);
-	virtual void start();
-	virtual void die();
+	void start() override;
+	void die() override;
 };
 
 class KviRemoteMircServersIniImport : public KviMircServersIniImport
@@ -58,8 +58,8 @@ protected:
 	KviRemoteMircServerImportWizard * m_pWizard;
 
 public:
-	virtual void start();
-	virtual void die();
+	void start() override;
+	void die() override;
 };
 
 class KviRemoteMircServerImportWizard : public KviTalWizard
@@ -77,8 +77,8 @@ protected:
 	QString m_szTmpFileName;
 
 protected:
-	virtual void closeEvent(QCloseEvent * e);
-	virtual void done(int r);
+	void closeEvent(QCloseEvent * e) override;
+	void done(int r) override;
 	void start();
 protected slots:
 	void getListMessage(const QString & message);
diff --git a/src/modules/objects/KvsObject_button.h b/src/modules/objects/KvsObject_button.h
index 45e1e3408..cb8758d57 100644
--- a/src/modules/objects/KvsObject_button.h
+++ b/src/modules/objects/KvsObject_button.h
@@ -36,7 +36,7 @@ public:
 public:
 	QWidget * widget() { return (QWidget *)object(); };
 protected:
-	virtual bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams);
+	bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams) override;
 
 	bool setText(KviKvsObjectFunctionCall * c);
 	bool text(KviKvsObjectFunctionCall * c);
diff --git a/src/modules/objects/KvsObject_checkBox.h b/src/modules/objects/KvsObject_checkBox.h
index 1db7575f8..68dca40ff 100644
--- a/src/modules/objects/KvsObject_checkBox.h
+++ b/src/modules/objects/KvsObject_checkBox.h
@@ -36,7 +36,7 @@ public:
 public:
 	QWidget * widget() { return (QWidget *)object(); };
 protected:
-	virtual bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams);
+	bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams) override;
 	bool setChecked(KviKvsObjectFunctionCall * c);
 	bool isChecked(KviKvsObjectFunctionCall * c);
 	bool toggleEvent(KviKvsObjectFunctionCall * c);
diff --git a/src/modules/objects/KvsObject_colorDialog.h b/src/modules/objects/KvsObject_colorDialog.h
index 35321731c..a6d37121f 100644
--- a/src/modules/objects/KvsObject_colorDialog.h
+++ b/src/modules/objects/KvsObject_colorDialog.h
@@ -36,7 +36,7 @@ public:
 public:
 	QWidget * widget() { return (QWidget *)object(); }
 protected:
-	virtual bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams);
+	bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams) override;
 	bool setCurrentColor(KviKvsObjectFunctionCall * c);
 	bool currentColorChangedEvent(KviKvsObjectFunctionCall * c);
 	bool colorSelectedEvent(KviKvsObjectFunctionCall * c);
diff --git a/src/modules/objects/KvsObject_comboBox.h b/src/modules/objects/KvsObject_comboBox.h
index 2d14c01f9..dc0376229 100644
--- a/src/modules/objects/KvsObject_comboBox.h
+++ b/src/modules/objects/KvsObject_comboBox.h
@@ -37,7 +37,7 @@ public:
 public:
 	QWidget * widget() { return (QWidget *)object(); };
 protected:
-	virtual bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams);
+	bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams) override;
 
 	bool insertItem(KviKvsObjectFunctionCall * c);
 	bool changeItem(KviKvsObjectFunctionCall * c);
diff --git a/src/modules/objects/KvsObject_dateTimeEdit.h b/src/modules/objects/KvsObject_dateTimeEdit.h
index f10340900..400c32f8a 100644
--- a/src/modules/objects/KvsObject_dateTimeEdit.h
+++ b/src/modules/objects/KvsObject_dateTimeEdit.h
@@ -39,7 +39,7 @@ public:
 public:
 	QWidget * widget() { return (QWidget *)object(); };
 protected:
-	virtual bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams);
+	bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams) override;
 
 	bool date(KviKvsObjectFunctionCall * c);
 	bool setDate(KviKvsObjectFunctionCall * c);
diff --git a/src/modules/objects/KvsObject_dialog.h b/src/modules/objects/KvsObject_dialog.h
index 14c2b668c..9975d944b 100644
--- a/src/modules/objects/KvsObject_dialog.h
+++ b/src/modules/objects/KvsObject_dialog.h
@@ -35,7 +35,7 @@ public:
 public:
 	QWidget * widget() { return (QWidget *)object(); };
 protected:
-	virtual bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams);
+	bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams) override;
 	bool setModal(KviKvsObjectFunctionCall * c);
 };
 
diff --git a/src/modules/objects/KvsObject_dockWindow.h b/src/modules/objects/KvsObject_dockWindow.h
index dab239f54..0fe56de9c 100644
--- a/src/modules/objects/KvsObject_dockWindow.h
+++ b/src/modules/objects/KvsObject_dockWindow.h
@@ -34,7 +34,7 @@ class KvsObject_dockWindow : public KvsObject_widget
 public:
 	KVSO_DECLARE_OBJECT(KvsObject_dockWindow)
 protected:
-	virtual bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams);
+	bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams) override;
 
 	bool addWidget(KviKvsObjectFunctionCall * c);
 	bool setAllowedDockAreas(KviKvsObjectFunctionCall * c);
diff --git a/src/modules/objects/KvsObject_groupBox.h b/src/modules/objects/KvsObject_groupBox.h
index 50cf5a78e..f2506d6fa 100644
--- a/src/modules/objects/KvsObject_groupBox.h
+++ b/src/modules/objects/KvsObject_groupBox.h
@@ -36,7 +36,7 @@ public:
 public:
 	QWidget * widget() { return (QWidget *)object(); };
 protected:
-	virtual bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams);
+	bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams) override;
 
 	bool setTitle(KviKvsObjectFunctionCall * c);
 	bool title(KviKvsObjectFunctionCall * c);
diff --git a/src/modules/objects/KvsObject_hBox.h b/src/modules/objects/KvsObject_hBox.h
index ef2ce93ca..e94717587 100644
--- a/src/modules/objects/KvsObject_hBox.h
+++ b/src/modules/objects/KvsObject_hBox.h
@@ -34,7 +34,7 @@ public:
 public:
 	QWidget * widget() { return (QWidget *)object(); };
 protected:
-	virtual bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams);
+	bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams) override;
 
 	bool setMargin(KviKvsObjectFunctionCall * c);
 	bool setSpacing(KviKvsObjectFunctionCall * c);
diff --git a/src/modules/objects/KvsObject_label.h b/src/modules/objects/KvsObject_label.h
index 1382c60f6..de6728ab2 100644
--- a/src/modules/objects/KvsObject_label.h
+++ b/src/modules/objects/KvsObject_label.h
@@ -35,7 +35,7 @@ public:
 public:
 	QWidget * widget() { return (QWidget *)object(); };
 protected:
-	virtual bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams);
+	bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams) override;
 
 	bool setTitle(KviKvsObjectFunctionCall * c);
 	bool setText(KviKvsObjectFunctionCall * c);
diff --git a/src/modules/objects/KvsObject_layout.h b/src/modules/objects/KvsObject_layout.h
index 99b0c1238..c41a01e66 100644
--- a/src/modules/objects/KvsObject_layout.h
+++ b/src/modules/objects/KvsObject_layout.h
@@ -33,7 +33,7 @@ public:
 public:
 	QWidget * widget() { return (QWidget *)object(); };
 protected:
-	virtual bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams);
+	bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams) override;
 
 	bool addWidget(KviKvsObjectFunctionCall * c);
 	bool addMultiCellWidget(KviKvsObjectFunctionCall * c);
diff --git a/src/modules/objects/KvsObject_lcd.h b/src/modules/objects/KvsObject_lcd.h
index 3595aa164..f1a923906 100644
--- a/src/modules/objects/KvsObject_lcd.h
+++ b/src/modules/objects/KvsObject_lcd.h
@@ -34,7 +34,7 @@ public:
 public:
 	QWidget * widget() { return (QWidget *)object(); };
 protected:
-	virtual bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams);
+	bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams) override;
 
 	bool displayStr(KviKvsObjectFunctionCall * c);
 	bool setMode(KviKvsObjectFunctionCall * c);
diff --git a/src/modules/objects/KvsObject_lineEdit.h b/src/modules/objects/KvsObject_lineEdit.h
index a004190a2..92e1d8754 100644
--- a/src/modules/objects/KvsObject_lineEdit.h
+++ b/src/modules/objects/KvsObject_lineEdit.h
@@ -42,7 +42,7 @@ protected:
 	QCompleter * m_pCompleter;
 
 protected:
-	virtual bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams);
+	bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams) override;
 
 	bool setCompleter(KviKvsObjectFunctionCall * c);
 	bool enableCompleter(KviKvsObjectFunctionCall * c);
diff --git a/src/modules/objects/KvsObject_listWidget.h b/src/modules/objects/KvsObject_listWidget.h
index c1eb80fcb..90a6b14c4 100644
--- a/src/modules/objects/KvsObject_listWidget.h
+++ b/src/modules/objects/KvsObject_listWidget.h
@@ -36,7 +36,7 @@ public:
 public:
 	QWidget * widget() { return (QWidget *)object(); };
 protected:
-	virtual bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams);
+	bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams) override;
 
 	bool insertItem(KviKvsObjectFunctionCall * c);
 	bool changeItem(KviKvsObjectFunctionCall * c);
diff --git a/src/modules/objects/KvsObject_mainWindow.h b/src/modules/objects/KvsObject_mainWindow.h
index 88eb727bd..01e1f0859 100644
--- a/src/modules/objects/KvsObject_mainWindow.h
+++ b/src/modules/objects/KvsObject_mainWindow.h
@@ -35,7 +35,7 @@ public:
 public:
 	QWidget * widget() { return (QWidget *)object(); };
 protected:
-	virtual bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams);
+	bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams) override;
 
 	bool setCentralWidget(KviKvsObjectFunctionCall * c);
 };
diff --git a/src/modules/objects/KvsObject_menuBar.h b/src/modules/objects/KvsObject_menuBar.h
index f0bcd5c14..a1e8a5478 100644
--- a/src/modules/objects/KvsObject_menuBar.h
+++ b/src/modules/objects/KvsObject_menuBar.h
@@ -35,7 +35,7 @@ public:
 public:
 	QWidget * widget() { return (QWidget *)object(); };
 protected:
-	virtual bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams);
+	bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams) override;
 
 	bool insertItem(KviKvsObjectFunctionCall * c);
 };
diff --git a/src/modules/objects/KvsObject_multiLineEdit.h b/src/modules/objects/KvsObject_multiLineEdit.h
index a17bbb39b..576715d59 100644
--- a/src/modules/objects/KvsObject_multiLineEdit.h
+++ b/src/modules/objects/KvsObject_multiLineEdit.h
@@ -36,7 +36,7 @@ public:
 public:
 	QWidget * widget() { return (QWidget *)object(); };
 protected:
-	virtual bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams);
+	bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams) override;
 	bool functionTextLine(KviKvsObjectFunctionCall * c);
 	bool functionInsertLine(KviKvsObjectFunctionCall * c);
 	bool functionRemoveLine(KviKvsObjectFunctionCall * c);
diff --git a/src/modules/objects/KvsObject_popupMenu.h b/src/modules/objects/KvsObject_popupMenu.h
index 67624bf72..ac52f7744 100644
--- a/src/modules/objects/KvsObject_popupMenu.h
+++ b/src/modules/objects/KvsObject_popupMenu.h
@@ -38,7 +38,7 @@ public:
 public:
 	QWidget * widget() { return (QWidget *)object(); };
 protected:
-	virtual bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams);
+	bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams) override;
 
 	bool insertItem(KviKvsObjectFunctionCall * c);
 	bool setTitle(KviKvsObjectFunctionCall * c);
diff --git a/src/modules/objects/KvsObject_progressBar.h b/src/modules/objects/KvsObject_progressBar.h
index 4a957ae20..284753c45 100644
--- a/src/modules/objects/KvsObject_progressBar.h
+++ b/src/modules/objects/KvsObject_progressBar.h
@@ -35,7 +35,7 @@ public:
 public:
 	QWidget * widget() { return (QWidget *)object(); };
 protected:
-	virtual bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams);
+	bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams) override;
 
 	bool setProgress(KviKvsObjectFunctionCall * c);
 	bool setTotalSteps(KviKvsObjectFunctionCall * c);
diff --git a/src/modules/objects/KvsObject_radioButton.h b/src/modules/objects/KvsObject_radioButton.h
index b57cd3801..81af5d1c9 100644
--- a/src/modules/objects/KvsObject_radioButton.h
+++ b/src/modules/objects/KvsObject_radioButton.h
@@ -36,7 +36,7 @@ public:
 public:
 	QWidget * widget() { return (QWidget *)object(); };
 protected:
-	virtual bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams);
+	bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams) override;
 
 	bool setText(KviKvsObjectFunctionCall * c);
 	bool isChecked(KviKvsObjectFunctionCall * c);
diff --git a/src/modules/objects/KvsObject_slider.h b/src/modules/objects/KvsObject_slider.h
index 953add8a9..5ce6ae201 100644
--- a/src/modules/objects/KvsObject_slider.h
+++ b/src/modules/objects/KvsObject_slider.h
@@ -36,7 +36,7 @@ public:
 public:
 	QWidget * widget() { return (QWidget *)object(); };
 protected:
-	virtual bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams);
+	bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams) override;
 
 	bool setTracking(KviKvsObjectFunctionCall * c);
 	bool setValue(KviKvsObjectFunctionCall * c);
diff --git a/src/modules/objects/KvsObject_socket.h b/src/modules/objects/KvsObject_socket.h
index 94ec58f5c..09c8159eb 100644
--- a/src/modules/objects/KvsObject_socket.h
+++ b/src/modules/objects/KvsObject_socket.h
@@ -41,7 +41,7 @@ protected:
 	bool bIsSetFromExternal = false;
 
 protected:
-	virtual bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams);
+	bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams) override;
 	const char * getStateString(QAbstractSocket::SocketState);
 
 	void setInternalSocket(QAbstractSocket * pSocket)
diff --git a/src/modules/objects/KvsObject_spinBox.h b/src/modules/objects/KvsObject_spinBox.h
index f0eb2313d..76f25d9e2 100644
--- a/src/modules/objects/KvsObject_spinBox.h
+++ b/src/modules/objects/KvsObject_spinBox.h
@@ -36,7 +36,7 @@ public:
 public:
 	QWidget * widget() { return (QWidget *)object(); };
 protected:
-	virtual bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams);
+	bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams) override;
 
 	bool setTracking(KviKvsObjectFunctionCall * c);
 
diff --git a/src/modules/objects/KvsObject_tabWidget.h b/src/modules/objects/KvsObject_tabWidget.h
index 9b0b14d1c..5db1f58b3 100644
--- a/src/modules/objects/KvsObject_tabWidget.h
+++ b/src/modules/objects/KvsObject_tabWidget.h
@@ -36,7 +36,7 @@ public:
 public:
 	QWidget * widget() { return (QWidget *)object(); };
 protected:
-	virtual bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams);
+	bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams) override;
 	QList<kvs_hobject_t> tabsList;
 
 	bool addTab(KviKvsObjectFunctionCall * c);
diff --git a/src/modules/objects/KvsObject_tableWidget.h b/src/modules/objects/KvsObject_tableWidget.h
index 5f58804b7..559f7f724 100644
--- a/src/modules/objects/KvsObject_tableWidget.h
+++ b/src/modules/objects/KvsObject_tableWidget.h
@@ -46,8 +46,8 @@ protected:
 	KvsObject_tableWidget * m_pParentScript;
 
 public:
-	QSize sizeHint(const QStyleOptionViewItem & option, const QModelIndex & index) const;
-	void paint(QPainter * pPainter, const QStyleOptionViewItem & option, const QModelIndex & index) const;
+	QSize sizeHint(const QStyleOptionViewItem & option, const QModelIndex & index) const override;
+	void paint(QPainter * pPainter, const QStyleOptionViewItem & option, const QModelIndex & index) const override;
 };
 
 class KvsObject_tableWidget : public KvsObject_widget
@@ -64,7 +64,7 @@ protected:
 	KviCellItemDelegate * m_pCellItemDelegate = nullptr;
 
 protected:
-	virtual bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams);
+	bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams) override;
 
 	bool setText(KviKvsObjectFunctionCall * c);
 	bool setForeground(KviKvsObjectFunctionCall * c);
diff --git a/src/modules/objects/KvsObject_textBrowser.h b/src/modules/objects/KvsObject_textBrowser.h
index a4fc36041..eda1d4ea6 100644
--- a/src/modules/objects/KvsObject_textBrowser.h
+++ b/src/modules/objects/KvsObject_textBrowser.h
@@ -38,7 +38,7 @@ public:
 public:
 	QWidget * widget() { return (QWidget *)object(); };
 protected:
-	virtual bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams);
+	bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams) override;
 
 	bool setSource(KviKvsObjectFunctionCall * c);
 	bool forward(KviKvsObjectFunctionCall * c);
diff --git a/src/modules/objects/KvsObject_toolBar.h b/src/modules/objects/KvsObject_toolBar.h
index ce6fa0620..7eaa60bae 100644
--- a/src/modules/objects/KvsObject_toolBar.h
+++ b/src/modules/objects/KvsObject_toolBar.h
@@ -35,7 +35,7 @@ public:
 public:
 	QWidget * widget() { return (QWidget *)object(); };
 protected:
-	virtual bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams);
+	bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams) override;
 
 	bool addSeparator(KviKvsObjectFunctionCall * c);
 	bool setLabel(KviKvsObjectFunctionCall * c);
diff --git a/src/modules/objects/KvsObject_toolButton.h b/src/modules/objects/KvsObject_toolButton.h
index f9dcbb7d7..7cb4e43b4 100644
--- a/src/modules/objects/KvsObject_toolButton.h
+++ b/src/modules/objects/KvsObject_toolButton.h
@@ -36,7 +36,7 @@ public:
 public:
 	QWidget * widget() { return (QWidget *)object(); };
 protected:
-	virtual bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams);
+	bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams) override;
 
 	bool setImage(KviKvsObjectFunctionCall * c);
 	bool setUsesBigPixmap(KviKvsObjectFunctionCall * c);
diff --git a/src/modules/objects/KvsObject_treeWidget.h b/src/modules/objects/KvsObject_treeWidget.h
index db277c107..bfa64c589 100644
--- a/src/modules/objects/KvsObject_treeWidget.h
+++ b/src/modules/objects/KvsObject_treeWidget.h
@@ -42,7 +42,7 @@ public:
 	void fileDropped(QString &, QTreeWidgetItem *);
 
 protected:
-	virtual bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams);
+	bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams) override;
 
 	bool setBackgroundImage(KviKvsObjectFunctionCall * c);
 	bool addColumn(KviKvsObjectFunctionCall * c);
@@ -90,15 +90,15 @@ class KviKvsTreeWidget : public QTreeWidget
 	Q_OBJECT
 public:
 	KviKvsTreeWidget(QWidget * par, const char * name, KvsObject_treeWidget *);
-	virtual ~KviKvsTreeWidget();
+	~KviKvsTreeWidget();
 
 protected:
 	KvsObject_treeWidget * m_pParentScript;
 
 protected:
-	void dropEvent(QDropEvent * e);
-	void dragEnterEvent(QDragEnterEvent * e);
-	void dragMoveEvent(QDragMoveEvent * e);
+	void dropEvent(QDropEvent * e) override;
+	void dragEnterEvent(QDragEnterEvent * e) override;
+	void dragMoveEvent(QDragMoveEvent * e) override;
 };
 
 #endif // _CLASS_TREEWIDGET_H_
diff --git a/src/modules/objects/KvsObject_treeWidgeteItem.h b/src/modules/objects/KvsObject_treeWidgeteItem.h
index 8d3aa01f6..9e4c13f6e 100644
--- a/src/modules/objects/KvsObject_treeWidgeteItem.h
+++ b/src/modules/objects/KvsObject_treeWidgeteItem.h
@@ -40,7 +40,7 @@ protected:
 	QTreeWidgetItem * m_pTreeWidgetItem;
 
 protected:
-	virtual bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams);
+	bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams) override;
 
 protected:
 	bool setText(KviKvsObjectFunctionCall * c);
@@ -68,7 +68,7 @@ class KviKvsStandardTreeWidgetItem : public QTreeWidgetItem
 public:
 	KviKvsStandardTreeWidgetItem(KvsObject_treeWidgetItem * ob, QTreeWidget * par);
 	KviKvsStandardTreeWidgetItem(KvsObject_treeWidgetItem * ob, QTreeWidgetItem * par);
-	virtual ~KviKvsStandardTreeWidgetItem();
+	~KviKvsStandardTreeWidgetItem();
 
 protected:
 	KvsObject_treeWidgetItem * m_pMasterObject;
diff --git a/src/modules/objects/KvsObject_vBox.h b/src/modules/objects/KvsObject_vBox.h
index 24b7ae590..4b46c4274 100644
--- a/src/modules/objects/KvsObject_vBox.h
+++ b/src/modules/objects/KvsObject_vBox.h
@@ -36,7 +36,7 @@ public:
 public:
 	QWidget * widget() { return (QWidget *)object(); };
 protected:
-	virtual bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams);
+	bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams) override;
 	bool setMargin(KviKvsObjectFunctionCall * c);
 	bool setSpacing(KviKvsObjectFunctionCall * c);
 	bool setStretchFactor(KviKvsObjectFunctionCall * c);
diff --git a/src/modules/objects/KvsObject_webView.h b/src/modules/objects/KvsObject_webView.h
index de0457d76..92c47804a 100644
--- a/src/modules/objects/KvsObject_webView.h
+++ b/src/modules/objects/KvsObject_webView.h
@@ -44,15 +44,15 @@ public:
 	KviKvsWebView(QWidget * par, const char * name, KvsObject_webView *);
 	//void accept();
 	//void reject();
-	virtual ~KviKvsWebView();
+	~KviKvsWebView();
 
 protected:
 	KvsObject_webView * m_pParentScript;
 
 protected:
-	virtual void mouseMoveEvent(QMouseEvent * ev);
-	virtual void contextMenuEvent(QContextMenuEvent *);
-	virtual bool event(QEvent * e);
+	void mouseMoveEvent(QMouseEvent * ev) override;
+	void contextMenuEvent(QContextMenuEvent *) override;
+	bool event(QEvent * e) override;
 	/*protected slots:
 	void slotNextClicked();
 	void slotBackClicked();
@@ -83,7 +83,7 @@ public:
 protected:
 	void getFrames(QWebFrame * pCurFrame, QStringList & szFramesNames);
 	QWebFrame * findFrame(QWebFrame * pCurFrame, QString & szFrameName);
-	virtual bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams);
+	bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams) override;
 	bool removeFromDocument(KviKvsObjectFunctionCall * c);
 	bool makePreview(KviKvsObjectFunctionCall * c);
 
@@ -160,7 +160,7 @@ class KviKvsDownloadHandler : public QObject
 public:
 	KviKvsDownloadHandler(KvsObject_webView * pParent, QFile * pFile, QNetworkReply * pNetReply, int iId);
 
-	virtual ~KviKvsDownloadHandler();
+	~KviKvsDownloadHandler();
 
 protected:
 	KvsObject_webView * m_pParentScript;
diff --git a/src/modules/objects/KvsObject_widget.h b/src/modules/objects/KvsObject_widget.h
index 2c8e24b67..a7fc36a17 100644
--- a/src/modules/objects/KvsObject_widget.h
+++ b/src/modules/objects/KvsObject_widget.h
@@ -46,12 +46,12 @@ public:
 	QWidget * widget() { return (QWidget *)object(); };
 
 protected:
-	virtual bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams);
+	bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams) override;
 
 #ifdef COMPILE_WEBKIT_SUPPORT
 	QWebView * m_pWebview = nullptr;
 #endif
-	virtual bool eventFilter(QObject * o, QEvent * e);
+	bool eventFilter(QObject * o, QEvent * e) override;
 	KviKvsRunTimeContext * m_pContext = nullptr;
 	QGraphicsDropShadowEffect * pGraphicsEffect = nullptr;
 	// ok, it is clear that we're messing with the naming conventions for the
@@ -144,12 +144,12 @@ class KviKvsWidget : public QWidget
 	Q_PROPERTY(QSize sizeHint READ sizeHint)
 public:
 	KviKvsWidget(KvsObject_widget * ob, QWidget * par);
-	virtual ~KviKvsWidget();
+	~KviKvsWidget();
 
 protected:
 	KvsObject_widget * m_pObject;
 
 public:
-	QSize sizeHint() const;
+	QSize sizeHint() const override;
 };
 #endif //_CLASS_WIDGET_H_
diff --git a/src/modules/objects/KvsObject_window.h b/src/modules/objects/KvsObject_window.h
index c70bbc59d..0c21138ff 100644
--- a/src/modules/objects/KvsObject_window.h
+++ b/src/modules/objects/KvsObject_window.h
@@ -63,7 +63,7 @@ public:
 	QWidget * widget() { return (QWidget *)object(); }
 
 protected:
-	virtual bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams);
+	bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams) override;
 
 	bool setWindowTitle(KviKvsObjectFunctionCall * c);
 	bool setIcon(KviKvsObjectFunctionCall * c);
diff --git a/src/modules/objects/KvsObject_wizard.h b/src/modules/objects/KvsObject_wizard.h
index 976e25f93..b37b0aa8a 100644
--- a/src/modules/objects/KvsObject_wizard.h
+++ b/src/modules/objects/KvsObject_wizard.h
@@ -41,7 +41,7 @@ public:
 	void backClicked();
 
 protected:
-	virtual bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams);
+	bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams) override;
 
 	bool addPage(KviKvsObjectFunctionCall * c);
 	bool insertPage(KviKvsObjectFunctionCall * c);
@@ -68,7 +68,7 @@ public:
 	KviKvsMdmWizard(QWidget * par, const char * name, KvsObject_wizard *);
 	void accept();
 	void reject();
-	virtual ~KviKvsMdmWizard();
+	~KviKvsMdmWizard();
 
 protected:
 	KvsObject_wizard * m_pParentScript;
diff --git a/src/modules/objects/KvsObject_workspace.h b/src/modules/objects/KvsObject_workspace.h
index 3a8aa1c0a..40d7bb5c8 100644
--- a/src/modules/objects/KvsObject_workspace.h
+++ b/src/modules/objects/KvsObject_workspace.h
@@ -36,7 +36,7 @@ public:
 	QWidget * widget() { return (QWidget *)object(); };
 protected:
 	QHash<kvs_hobject_t, QMdiSubWindow *> * pWidgetDict;
-	virtual bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams);
+	bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams) override;
 
 	bool addSubWindow(KviKvsObjectFunctionCall * c);
 	bool removeSubWindow(KviKvsObjectFunctionCall * c);
diff --git a/src/modules/objects/KvsObject_wrapper.h b/src/modules/objects/KvsObject_wrapper.h
index 523ffe6c6..0a79d2d3b 100644
--- a/src/modules/objects/KvsObject_wrapper.h
+++ b/src/modules/objects/KvsObject_wrapper.h
@@ -37,7 +37,7 @@ public:
 public:
 	QWidget * widget() { return (QWidget *)object(); };
 protected:
-	virtual bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams);
+	bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams) override;
 	QWidget * findTopLevelWidgetToWrap(const QString & szClass, const QString & szName, bool bRecursive);
 	QWidget * findWidgetToWrap(const QString & szClass, const QString & szName, QWidget * pParent, bool bRecursive);
 };
diff --git a/src/modules/options/OptionsDialog.h b/src/modules/options/OptionsDialog.h
index 182438de8..8af5e1048 100644
--- a/src/modules/options/OptionsDialog.h
+++ b/src/modules/options/OptionsDialog.h
@@ -93,9 +93,9 @@ private slots:
 
 protected:
 	void apply(bool bDialogAboutToClose);
-	virtual void closeEvent(QCloseEvent * e);
-	virtual void keyPressEvent(QKeyEvent * e);
-	virtual void showEvent(QShowEvent * e);
+	void closeEvent(QCloseEvent * e) override;
+	void keyPressEvent(QKeyEvent * e) override;
+	void showEvent(QShowEvent * e) override;
 	bool recursiveSearch(OptionsDialogTreeWidgetItem * pItem, const QStringList & lKeywords);
 	void clearSearch();
 	bool searchInSelectors(KviOptionsWidget * pWidget, const QStringList & lKeywords);
diff --git a/src/modules/options/OptionsWidget_identity.h b/src/modules/options/OptionsWidget_identity.h
index 6193ad09a..f06a02db0 100644
--- a/src/modules/options/OptionsWidget_identity.h
+++ b/src/modules/options/OptionsWidget_identity.h
@@ -70,7 +70,7 @@ protected:
 	QString m_szAvatarName;
 
 protected:
-	virtual void closeEvent(QCloseEvent * e);
+	void closeEvent(QCloseEvent * e) override;
 	const QString & avatarName() { return m_szAvatarName; };
 protected slots:
 	void okClicked();
@@ -94,7 +94,7 @@ protected:
 	QString m_szUrl;
 
 protected:
-	virtual void closeEvent(QCloseEvent * e);
+	void closeEvent(QCloseEvent * e) override;
 	const QString & localFileName() { return m_szLocalFileName; };
 	const QString & errorMessage() { return m_szErrorMessage; };
 protected slots:
@@ -161,7 +161,7 @@ protected slots:
 	void setNickAlternatives();
 
 protected:
-	virtual void commit();
+	void commit() override;
 };
 
 #define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_identityAvatar KviIconManager::Avatar
@@ -186,7 +186,7 @@ protected slots:
 	void chooseAvatar();
 
 protected:
-	virtual void commit();
+	void commit() override;
 };
 
 #define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_identityAdvanced KviIconManager::Gui
diff --git a/src/modules/options/OptionsWidget_sound.h b/src/modules/options/OptionsWidget_sound.h
index 06f7c2920..82e1abb8e 100644
--- a/src/modules/options/OptionsWidget_sound.h
+++ b/src/modules/options/OptionsWidget_sound.h
@@ -72,8 +72,8 @@ protected:
 protected:
 	void soundFillBox();
 	void mediaFillBox();
-	virtual void commit();
-	virtual void showEvent(QShowEvent * e);
+	void commit() override;
+	void showEvent(QShowEvent * e) override;
 protected slots:
 	void soundTest();
 	void soundAutoDetect();
diff --git a/src/modules/popupeditor/PopupEditorWindow.h b/src/modules/popupeditor/PopupEditorWindow.h
index 127ed1994..9384e9e72 100644
--- a/src/modules/popupeditor/PopupEditorWindow.h
+++ b/src/modules/popupeditor/PopupEditorWindow.h
@@ -189,7 +189,7 @@ protected slots:
 	void popupRefresh(const QString & szName);
 
 protected:
-	void showEvent(QShowEvent * e);
+	void showEvent(QShowEvent * e) override;
 	void getExportPopupBuffer(QString & buffer, MenuTreeWidgetItem * it);
 
 private:
diff --git a/src/modules/raweditor/RawEditorWindow.h b/src/modules/raweditor/RawEditorWindow.h
index 903c76c94..dc8c42b8e 100644
--- a/src/modules/raweditor/RawEditorWindow.h
+++ b/src/modules/raweditor/RawEditorWindow.h
@@ -123,7 +123,7 @@ protected slots:
 	void exportCurrentHandler();
 
 protected:
-	void showEvent(QShowEvent * e);
+	void showEvent(QShowEvent * e) override;
 
 private:
 	void oneTimeSetup();
@@ -140,11 +140,11 @@ protected:
 	RawEditorWidget * m_pEditor;
 
 protected:
-	virtual QPixmap * myIconPtr();
-	virtual void fillCaptionBuffers();
-	virtual void getConfigGroupName(QString & szName);
-	virtual void saveProperties(KviConfigurationFile *);
-	virtual void loadProperties(KviConfigurationFile *);
+	QPixmap * myIconPtr() override;
+	void fillCaptionBuffers() override;
+	void getConfigGroupName(QString & szName) override;
+	void saveProperties(KviConfigurationFile *) override;
+	void loadProperties(KviConfigurationFile *) override;
 protected slots:
 	void cancelClicked();
 	void okClicked();
diff --git a/src/modules/reguser/RegisteredUserEntryDialog.h b/src/modules/reguser/RegisteredUserEntryDialog.h
index 36dd0d640..8bb40f72e 100644
--- a/src/modules/reguser/RegisteredUserEntryDialog.h
+++ b/src/modules/reguser/RegisteredUserEntryDialog.h
@@ -61,7 +61,7 @@ protected:
 
 protected:
 	void fillData();
-	virtual void closeEvent(QCloseEvent *);
+	void closeEvent(QCloseEvent *) override;
 protected slots:
 	void okClicked();
 	void addClicked();
@@ -82,7 +82,7 @@ protected:
 	QLineEdit * m_pUserEdit;
 	QLineEdit * m_pHostEdit;
 
-	virtual void closeEvent(QCloseEvent *);
+	void closeEvent(QCloseEvent *) override;
 protected slots:
 	void okClicked();
 };
@@ -92,7 +92,7 @@ class RegisteredUserEntryDialog : public KviTalTabDialog
 	Q_OBJECT
 public:
 	RegisteredUserEntryDialog(QWidget * p, KviRegisteredUser * r, bool bModal = true);
-	virtual ~RegisteredUserEntryDialog();
+	~RegisteredUserEntryDialog();
 
 protected:
 	KviRegisteredUser * m_pUser;
@@ -129,7 +129,7 @@ protected:
 	QCheckBox * m_pIgnoreDcc;
 	QCheckBox * m_pIgnoreHighlight;
 
-	virtual void closeEvent(QCloseEvent *);
+	void closeEvent(QCloseEvent *) override;
 protected slots:
 	void okClicked();
 	void addMaskClicked();
diff --git a/src/modules/reguser/RegisteredUsersDialog.h b/src/modules/reguser/RegisteredUsersDialog.h
index 5a049dc20..f066a21f5 100644
--- a/src/modules/reguser/RegisteredUsersDialog.h
+++ b/src/modules/reguser/RegisteredUsersDialog.h
@@ -46,7 +46,7 @@ public:
 	~KviRegisteredUsersListView(){};
 
 protected:
-	void mousePressEvent(QMouseEvent * e);
+	void mousePressEvent(QMouseEvent * e) override;
 signals:
 	void rightButtonPressed(QTreeWidgetItem *, QPoint);
 };
@@ -57,7 +57,7 @@ public:
 	RegisteredUsersDialogItemDelegate(KviRegisteredUsersListView * pWidget = 0)
 	    : QStyledItemDelegate(pWidget){};
 	~RegisteredUsersDialogItemDelegate(){};
-	QSize sizeHint(const QStyleOptionViewItem & option, const QModelIndex & index) const;
+	QSize sizeHint(const QStyleOptionViewItem & option, const QModelIndex & index) const override;
 	void paint(QPainter * painter, const QStyleOptionViewItem & option, const QModelIndex & index) const;
 };
 
@@ -141,7 +141,7 @@ protected:
 	void fillList();
 	void editItem(RegisteredUsersDialogItem * i);
 	void editGroup(KviRegisteredUserGroup * group);
-	virtual void closeEvent(QCloseEvent *);
+	void closeEvent(QCloseEvent *) override;
 protected slots:
 	void cancelClicked();
 	void okClicked();
diff --git a/src/modules/reguser/RegistrationWizard.h b/src/modules/reguser/RegistrationWizard.h
index b41ac6a06..bfbd380c9 100644
--- a/src/modules/reguser/RegistrationWizard.h
+++ b/src/modules/reguser/RegistrationWizard.h
@@ -80,9 +80,9 @@ public:
 	KviPixmap * m_pAvatar;
 
 protected:
-	virtual void showEvent(QShowEvent * e);
-	virtual void accept();
-	virtual void reject();
+	void showEvent(QShowEvent * e) override;
+	void accept() override;
+	void reject() override;
 protected slots:
 	void realNameChanged(const QString & str);
 	void maskChanged(const QString & str);
diff --git a/src/modules/rijndael/libkvirijndael.h b/src/modules/rijndael/libkvirijndael.h
index ef54e7ec6..eb9a371d3 100644
--- a/src/modules/rijndael/libkvirijndael.h
+++ b/src/modules/rijndael/libkvirijndael.h
@@ -38,7 +38,7 @@ class KviRijndaelEngine : public KviCryptEngine
 	Q_OBJECT
 public:
 	KviRijndaelEngine();
-	virtual ~KviRijndaelEngine();
+	~KviRijndaelEngine();
 
 private:
 	enum OperationalMode
@@ -71,7 +71,7 @@ class KviRijndaelHexEngine : public KviRijndaelEngine
 	Q_OBJECT
 public:
 	KviRijndaelHexEngine() : KviRijndaelEngine(){}
-	virtual ~KviRijndaelHexEngine(){}
+	~KviRijndaelHexEngine() = default;
 
 protected:
 	bool binaryToAscii(const char * inBuffer, int len, KviCString & outBuffer) override;
@@ -83,7 +83,7 @@ class KviRijndael128HexEngine : public KviRijndaelHexEngine
 	Q_OBJECT
 public:
 	KviRijndael128HexEngine() : KviRijndaelHexEngine(){}
-	virtual ~KviRijndael128HexEngine(){}
+	~KviRijndael128HexEngine() = default;
 
 protected:
 	int getKeyLen() const override { return 16; }
@@ -95,7 +95,7 @@ class KviRijndael192HexEngine : public KviRijndaelHexEngine
 	Q_OBJECT
 public:
 	KviRijndael192HexEngine() : KviRijndaelHexEngine(){}
-	virtual ~KviRijndael192HexEngine(){}
+	~KviRijndael192HexEngine() = default;
 
 protected:
 	int getKeyLen() const override { return 24; }
@@ -107,7 +107,7 @@ class KviRijndael256HexEngine : public KviRijndaelHexEngine
 	Q_OBJECT
 public:
 	KviRijndael256HexEngine() : KviRijndaelHexEngine(){}
-	virtual ~KviRijndael256HexEngine(){}
+	~KviRijndael256HexEngine() = default;
 
 protected:
 	int getKeyLen() const override { return 32; }
@@ -118,7 +118,7 @@ class KviRijndaelBase64Engine : public KviRijndaelEngine
 	Q_OBJECT
 public:
 	KviRijndaelBase64Engine() : KviRijndaelEngine(){}
-	virtual ~KviRijndaelBase64Engine(){}
+	~KviRijndaelBase64Engine() = default;
 
 protected:
 	bool binaryToAscii(const char * inBuffer, int len, KviCString & outBuffer) override;
@@ -130,7 +130,7 @@ class KviRijndael128Base64Engine : public KviRijndaelBase64Engine
 	Q_OBJECT
 public:
 	KviRijndael128Base64Engine() : KviRijndaelBase64Engine(){}
-	virtual ~KviRijndael128Base64Engine(){}
+	~KviRijndael128Base64Engine() = default;
 
 protected:
 	int getKeyLen() const override { return 16; }
@@ -142,7 +142,7 @@ class KviRijndael192Base64Engine : public KviRijndaelBase64Engine
 	Q_OBJECT
 public:
 	KviRijndael192Base64Engine() : KviRijndaelBase64Engine(){}
-	virtual ~KviRijndael192Base64Engine(){}
+	~KviRijndael192Base64Engine() = default;
 
 protected:
 	int getKeyLen() const override { return 24; }
@@ -154,7 +154,7 @@ class KviRijndael256Base64Engine : public KviRijndaelBase64Engine
 	Q_OBJECT
 public:
 	KviRijndael256Base64Engine() : KviRijndaelBase64Engine(){}
-	virtual ~KviRijndael256Base64Engine(){}
+	~KviRijndael256Base64Engine() = default;
 
 protected:
 	int getKeyLen() const override { return 32; }
@@ -169,7 +169,7 @@ class KviMircryptionEngine : public KviCryptEngine
 	Q_OBJECT
 public:
 	KviMircryptionEngine();
-	virtual ~KviMircryptionEngine();
+	~KviMircryptionEngine();
 
 protected:
 	KviCString m_szEncryptKey;
diff --git a/src/modules/setup/SetupWizard.h b/src/modules/setup/SetupWizard.h
index 9cec49c09..be71335a7 100644
--- a/src/modules/setup/SetupWizard.h
+++ b/src/modules/setup/SetupWizard.h
@@ -137,14 +137,14 @@ public:
 protected:
 	void makeLink();
 	void setUrlHandlers();
-	virtual void showEvent(QShowEvent * e);
+	void showEvent(QShowEvent * e) override;
 	void enableOrDisableIdentityPageNextButton();
 public slots:
 	void chooseOldDataPath();
 	void chooseDataPath();
 	void chooseIncomingPath();
-	virtual void accept();
-	virtual void reject();
+	void accept() override;
+	void reject() override;
 
 	void oldDirClicked();
 	void newDirClicked();
diff --git a/src/modules/snd/libkvisnd.h b/src/modules/snd/libkvisnd.h
index 47f8ce119..38e2e03a2 100644
--- a/src/modules/snd/libkvisnd.h
+++ b/src/modules/snd/libkvisnd.h
@@ -170,7 +170,7 @@ protected:
 protected:
 	void registerSoundThread(KviSoundThread * t);
 	void unregisterSoundThread(KviSoundThread * t);
-	virtual bool event(QEvent * e);
+	bool event(QEvent * e) override;
 
 protected:
 	void stopAllSoundThreads();
diff --git a/src/modules/term/TermWidget.h b/src/modules/term/TermWidget.h
index 78d1b89c4..d9e41fae0 100644
--- a/src/modules/term/TermWidget.h
+++ b/src/modules/term/TermWidget.h
@@ -53,7 +53,7 @@ private:
 	QWidget * m_pKonsoleWidget;
 
 protected:
-	virtual void resizeEvent(QResizeEvent * e);
+	void resizeEvent(QResizeEvent * e) override;
 protected slots:
 	void closeClicked();
 	void changeTitle(int i, const QString & str);
@@ -62,7 +62,7 @@ protected slots:
 
 public:
 	QWidget * konsoleWidget() { return m_pKonsoleWidget ? m_pKonsoleWidget : this; };
-	virtual QSize sizeHint() const;
+	QSize sizeHint() const override;
 	int dummy() const { return 0; };
 protected slots:
 	void konsoleDestroyed();
diff --git a/src/modules/term/TermWindow.h b/src/modules/term/TermWindow.h
index 954d9dc6f..2fc4a87ec 100644
--- a/src/modules/term/TermWindow.h
+++ b/src/modules/term/TermWindow.h
@@ -43,12 +43,12 @@ protected:
 	TermWidget * m_pTermWidget;
 
 protected:
-	virtual QPixmap * myIconPtr();
-	virtual void fillCaptionBuffers();
-	virtual void resizeEvent(QResizeEvent * e);
+	QPixmap * myIconPtr() override;
+	void fillCaptionBuffers() override;
+	void resizeEvent(QResizeEvent * e) override;
 
 public:
-	virtual QSize sizeHint() const;
+	QSize sizeHint() const override;
 };
 #else
 #include <QObject>
diff --git a/src/modules/theme/PackThemeDialog.h b/src/modules/theme/PackThemeDialog.h
index 0fc4fe98e..aabdb9f90 100644
--- a/src/modules/theme/PackThemeDialog.h
+++ b/src/modules/theme/PackThemeDialog.h
@@ -66,7 +66,7 @@ protected:
 
 	//QWidget                      * m_pImageSelectionPage;
 protected:
-	virtual void accept();
+	void accept() override;
 	bool packTheme();
 };
 
@@ -95,7 +95,7 @@ public:
 	QLineEdit * m_pPackageAuthorEdit;
 
 protected:
-	virtual void initializePage();
+	void initializePage() override;
 };
 
 class PackThemeImageWidget : public QWizardPage
@@ -125,7 +125,7 @@ protected:
 	QString m_szPackagePath;
 
 protected:
-	virtual void initializePage();
+	void initializePage() override;
 };
 
 #endif //!_PACKTHEMEDIALOG_H_
diff --git a/src/modules/theme/ThemeManagementDialog.h b/src/modules/theme/ThemeManagementDialog.h
index b09b4b2c8..5ce7dfa41 100644
--- a/src/modules/theme/ThemeManagementDialog.h
+++ b/src/modules/theme/ThemeManagementDialog.h
@@ -52,7 +52,7 @@ class ThemeListWidgetItem : public KviTalListWidgetItem
 {
 public:
 	ThemeListWidgetItem(KviTalListWidget * pBox, KviThemeInfo * pInfo);
-	virtual ~ThemeListWidgetItem();
+	~ThemeListWidgetItem();
 
 public:
 	KviThemeInfo * m_pThemeInfo;
@@ -66,7 +66,7 @@ class ThemeManagementDialog : public QWidget
 	Q_OBJECT
 public:
 	ThemeManagementDialog(QWidget * parent);
-	virtual ~ThemeManagementDialog();
+	~ThemeManagementDialog();
 
 protected:
 	static ThemeManagementDialog * m_pInstance;
@@ -86,7 +86,7 @@ public:
 
 protected:
 	void fillThemeBox(bool bBuiltin);
-	virtual void closeEvent(QCloseEvent * e);
+	void closeEvent(QCloseEvent * e) override;
 protected slots:
 	void saveCurrentTheme();
 	void getMoreThemes();
diff --git a/src/modules/theme/WebThemeInterfaceDialog.h b/src/modules/theme/WebThemeInterfaceDialog.h
index cc517027c..42c906540 100644
--- a/src/modules/theme/WebThemeInterfaceDialog.h
+++ b/src/modules/theme/WebThemeInterfaceDialog.h
@@ -42,8 +42,8 @@ private:
 	QString m_szGlobalThemesPath;
 
 protected:
-	virtual bool packageIsInstalled(const QString & szId, const QString & szVersion);
-	virtual bool installPackage(const QString & szPath, QString & szError);
+	bool packageIsInstalled(const QString & szId, const QString & szVersion) override;
+	bool installPackage(const QString & szPath, QString & szError) override;
 };
 
 #endif //COMPILE_WEBKIT_SUPPORT
diff --git a/src/modules/tip/libkvitip.h b/src/modules/tip/libkvitip.h
index 09f06a120..89880864b 100644
--- a/src/modules/tip/libkvitip.h
+++ b/src/modules/tip/libkvitip.h
@@ -60,7 +60,7 @@ protected:
 	KviConfigurationFile * m_pConfig;
 	QString m_szConfigFileName; // no path!
 protected:
-	virtual void showEvent(QShowEvent * e);
+	void showEvent(QShowEvent * e) override;
 
 public:
 	bool openConfig(QString filename, bool bEnsureExists = true);
diff --git a/src/modules/toolbareditor/CustomizeToolBarsDialog.h b/src/modules/toolbareditor/CustomizeToolBarsDialog.h
index 937c5c72e..4077f5c15 100644
--- a/src/modules/toolbareditor/CustomizeToolBarsDialog.h
+++ b/src/modules/toolbareditor/CustomizeToolBarsDialog.h
@@ -61,8 +61,8 @@ public:
 	static void cleanup();
 
 protected:
-	virtual void showEvent(QShowEvent * e);
-	virtual void closeEvent(QCloseEvent * e);
+	void showEvent(QShowEvent * e) override;
+	void closeEvent(QCloseEvent * e) override;
 protected slots:
 	void closeClicked();
 	void newToolBar();
@@ -112,7 +112,7 @@ class TrashcanLabel : public QLabel
 	Q_OBJECT
 public:
 	TrashcanLabel(QWidget * p);
-	virtual ~TrashcanLabel();
+	~TrashcanLabel();
 
 protected:
 	unsigned int m_uFlashCount;
@@ -120,8 +120,8 @@ protected:
 	QColor m_clrOriginal;
 
 protected:
-	virtual void dragEnterEvent(QDragEnterEvent * e);
-	virtual void dropEvent(QDropEvent * e);
+	void dragEnterEvent(QDragEnterEvent * e) override;
+	void dropEvent(QDropEvent * e) override;
 public slots:
 	void flash();
 protected slots:
diff --git a/src/modules/torrent/KTorrentDbusInterface.h b/src/modules/torrent/KTorrentDbusInterface.h
index 0aadd8396..5cbcc51b6 100644
--- a/src/modules/torrent/KTorrentDbusInterface.h
+++ b/src/modules/torrent/KTorrentDbusInterface.h
@@ -38,35 +38,35 @@ class KTorrentDbusInterface : public TorrentInterface
 
 public:
 	KTorrentDbusInterface();
-	virtual ~KTorrentDbusInterface();
+	~KTorrentDbusInterface();
 
-	virtual int detect();
+	int detect() override;
 
-	virtual bool startAll();
-	virtual bool stopAll();
+	bool startAll() override;
+	bool stopAll() override;
 
-	virtual int count();
-	virtual bool start(int i);
-	virtual bool stop(int i);
-	virtual bool announce(int i);
-	virtual QString state(int i);
-	virtual QString name(int i);
-	virtual int fileCount(int i);
-	virtual QString fileName(int i, int file);
-	virtual QString filePriority(int i, int file);
-	virtual bool setFilePriority(int i, int file, const QString & prio);
+	int count() override;
+	bool start(int i) override;
+	bool stop(int i) override;
+	bool announce(int i) override;
+	QString state(int i) override;
+	QString name(int i) override;
+	int fileCount(int i) override;
+	QString fileName(int i, int file) override;
+	QString filePriority(int i, int file) override;
+	bool setFilePriority(int i, int file, const QString & prio) override;
 
-	virtual int maxUploadSpeed();
-	virtual int maxDownloadSpeed();
+	int maxUploadSpeed() override;
+	int maxDownloadSpeed() override;
 
-	virtual bool setMaxUploadSpeed(int kbytes_per_sec);
-	virtual bool setMaxDownloadSpeed(int kbytes_per_sec);
+	bool setMaxUploadSpeed(int kbytes_per_sec) override;
+	bool setMaxDownloadSpeed(int kbytes_per_sec) override;
 
-	virtual float speedUp();
-	virtual float speedDown();
+	float speedUp() override;
+	float speedDown() override;
 
-	virtual float trafficUp();
-	virtual float trafficDown();
+	float trafficUp() override;
+	float trafficDown() override;
 	/*
 	private slots:
 		// polls client and extracts information.
diff --git a/src/modules/torrent/StatusBarApplet.h b/src/modules/torrent/StatusBarApplet.h
index 26d3358c9..53c013262 100644
--- a/src/modules/torrent/StatusBarApplet.h
+++ b/src/modules/torrent/StatusBarApplet.h
@@ -36,7 +36,7 @@ class StatusBarApplet : public KviStatusBarApplet
 	Q_OBJECT
 public:
 	StatusBarApplet(KviStatusBar * parent, KviStatusBarAppletDescriptor * desc);
-	virtual ~StatusBarApplet();
+	~StatusBarApplet() override;
 	static void selfRegister(KviStatusBar * bar);
 private slots:
 	void update();
diff --git a/src/modules/torrent/TorrentInterface.h b/src/modules/torrent/TorrentInterface.h
index efae2a708..276fd46d6 100644
--- a/src/modules/torrent/TorrentInterface.h
+++ b/src/modules/torrent/TorrentInterface.h
@@ -35,7 +35,7 @@ class TorrentInterface : public QObject
 {
 public:
 	TorrentInterface() {}
-	virtual ~TorrentInterface() {}
+	~TorrentInterface() {}
 
 	virtual int detect() = 0;
 
@@ -119,7 +119,7 @@ public:
 	{                                                                     \
 	public:                                                               \
 		_interfaceclass##Descriptor();                                    \
-		virtual ~_interfaceclass##Descriptor();                           \
+		~_interfaceclass##Descriptor();                                   \
                                                                           \
 	protected:                                                            \
 		_interfaceclass * m_pInstance;                                    \
@@ -127,9 +127,9 @@ public:
 		QString m_szDescription;                                          \
                                                                           \
 	public:                                                               \
-		virtual const QString & name();                                   \
-		virtual const QString & description();                            \
-		virtual TorrentInterface * instance();                            \
+		const QString & name() override;                                    \
+		const QString & description() override;                             \
+		TorrentInterface * instance() override;                             \
 	};
 
 #define TORR_IMPLEMENT_DESCRIPTOR(_interfaceclass, _name, _description) \
diff --git a/src/modules/upnp/Manager.h b/src/modules/upnp/Manager.h
index 69fd14ed5..4ee83d435 100644
--- a/src/modules/upnp/Manager.h
+++ b/src/modules/upnp/Manager.h
@@ -59,7 +59,7 @@ namespace UPnP
 
 	public: // public methods
 		// The destructor
-		virtual ~Manager();
+		~Manager();
 
 		// Return the external IP address
 		QString getExternalIpAddress() const;
diff --git a/src/modules/upnp/RootService.h b/src/modules/upnp/RootService.h
index 971e86be2..97d319fa0 100644
--- a/src/modules/upnp/RootService.h
+++ b/src/modules/upnp/RootService.h
@@ -55,7 +55,7 @@ namespace UPnP
 		// The constructor
 		RootService(const QString & hostname, int port, const QString & rootUrl);
 		// The destructor
-		virtual ~RootService();
+		~RootService();
 
 		// Return the device type
 		QString getDeviceType() const;
@@ -74,7 +74,7 @@ namespace UPnP
 
 	protected: // Protected methods
 		// The control point received a response to callInformationUrl()
-		virtual void gotInformationResponse(const QDomNode & response);
+		void gotInformationResponse(const QDomNode & response) override;
 
 	private: // Private methods
 		// Recursively add all devices and embedded devices to the deviceServices_ map
diff --git a/src/modules/upnp/Service.h b/src/modules/upnp/Service.h
index acae54418..c65c132c6 100644
--- a/src/modules/upnp/Service.h
+++ b/src/modules/upnp/Service.h
@@ -75,7 +75,7 @@ namespace UPnP
 		// The constructor for action services
 		Service(const ServiceParameters & params);
 		// The destructor
-		virtual ~Service();
+		~Service();
 
 		// Get the number of pending requests
 		int getPendingRequests() const;
diff --git a/src/modules/upnp/SsdpConnection.h b/src/modules/upnp/SsdpConnection.h
index 0068f2f25..8be9cdc3c 100644
--- a/src/modules/upnp/SsdpConnection.h
+++ b/src/modules/upnp/SsdpConnection.h
@@ -58,7 +58,7 @@ namespace UPnP
 
 	public:
 		SsdpConnection();
-		virtual ~SsdpConnection();
+		~SsdpConnection();
 
 		void queryDevices(int bindPort = 1500);
 
diff --git a/src/modules/upnp/WanConnectionService.h b/src/modules/upnp/WanConnectionService.h
index 24e306dff..6e950dd5b 100644
--- a/src/modules/upnp/WanConnectionService.h
+++ b/src/modules/upnp/WanConnectionService.h
@@ -68,7 +68,7 @@ namespace UPnP
 		// The constructor
 		WanConnectionService(const ServiceParameters & params);
 		// The destructor
-		virtual ~WanConnectionService();
+		~WanConnectionService();
 
 		// Add a port mapping
 		void addPortMapping(const QString & protocol, const QString & remoteHost, int externalPort,
@@ -93,7 +93,7 @@ namespace UPnP
 
 	protected: // protected methods
 		// The control point received a response to callAction()
-		virtual void gotActionResponse(const QString & responseType, const QMap<QString, QString> & resultValues);
+		void gotActionResponse(const QString & responseType, const QMap<QString, QString> & resultValues) override;
 
 	private: // private attributes
 		// The external IP address
diff --git a/src/modules/upnp/igdcontrolpoint.h b/src/modules/upnp/igdcontrolpoint.h
index e292c0e72..209b28ee7 100644
--- a/src/modules/upnp/igdcontrolpoint.h
+++ b/src/modules/upnp/igdcontrolpoint.h
@@ -61,7 +61,7 @@ namespace UPnP
 		// The constructor
 		IgdControlPoint(const QString & hostname, int port, const QString & rootUrl);
 		// The destructor
-		virtual ~IgdControlPoint();
+		~IgdControlPoint();
 
 		// Return the external IP address
 		QString getExternalIpAddress() const;
diff --git a/src/modules/url/libkviurl.h b/src/modules/url/libkviurl.h
index a26ad3836..36c4628aa 100644
--- a/src/modules/url/libkviurl.h
+++ b/src/modules/url/libkviurl.h
@@ -64,8 +64,8 @@ public:
 	~UrlDialogTreeWidget(){};
 
 protected:
-	void mousePressEvent(QMouseEvent * e);
-	void paintEvent(QPaintEvent * event);
+	void mousePressEvent(QMouseEvent * e) override;
+	void paintEvent(QPaintEvent * event) override;
 signals:
 	void rightButtonPressed(QTreeWidgetItem *, QPoint);
 	void contextMenuRequested(QPoint);
@@ -83,8 +83,8 @@ private:
 	QMenu * m_pListPopup = nullptr; // dynamic popup menu
 	QString m_szUrl;      // used to pass URLs to sayToWin slot
 protected:
-	QPixmap * myIconPtr();
-	void resizeEvent(QResizeEvent *);
+	QPixmap * myIconPtr() override;
+	void resizeEvent(QResizeEvent *) override;
 
 public:
 	UrlDialogTreeWidget * m_pUrlList;
@@ -136,7 +136,7 @@ public:
 private:
 	QCheckBox * cb[cbnum];
 	BanFrame * m_pBanFrame;
-	void closeEvent(QCloseEvent *);
+	void closeEvent(QCloseEvent *) override;
 protected slots:
 	void acceptbtn();
 	void discardbtn();
diff --git a/src/modules/window/UserWindow.h b/src/modules/window/UserWindow.h
index 43df1af47..ab8901db8 100644
--- a/src/modules/window/UserWindow.h
+++ b/src/modules/window/UserWindow.h
@@ -44,9 +44,9 @@ protected:
 	QString m_szIcon;
 
 protected:
-	virtual void resizeEvent(QResizeEvent *);
-	virtual QPixmap * myIconPtr();
-	virtual void fillCaptionBuffers();
+	void resizeEvent(QResizeEvent *) override;
+	QPixmap * myIconPtr() override;
+	void fillCaptionBuffers() override;
 
 public:
 	void setWindowTitleStrings(const QString & szPlainText);