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

8 files changed, 57 insertions, 57 deletions

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