Merge branch 'master' into python3

24 files changed, 149 insertions, 158 deletions

diff --git a/src/modules/dcc/DccBroker.cpp b/src/modules/dcc/DccBroker.cpp
index dda25a544..6de88fe67 100644
--- a/src/modules/dcc/DccBroker.cpp
+++ b/src/modules/dcc/DccBroker.cpp
@@ -241,7 +241,7 @@ void DccBroker::rsendExecute(DccDescriptor * dcc)
 		szTag = t->m_szTag;
 
 		// DCC [ST]SEND <filename> <fakeipaddress> <zero-port> <filesize> <sessionid>
-		dcc->console()->connection()->sendFmtData("PRIVMSG %s :%cDCC %s %s 127.0.0.1 0 %s %s%c",
+		dcc->console()->connection()->sendFmtData("PRIVMSG %s :%cDCC %s %s 2130706433 0 %s %s%c",
 		    dcc->console()->connection()->encodeText(dcc->szNick).data(),
 		    0x01,
 		    dcc->console()->connection()->encodeText(dcc->szType).data(),
diff --git a/src/modules/dcc/DccCanvasWindow.cpp b/src/modules/dcc/DccCanvasWindow.cpp
index 19389dab0..e2adee2a4 100644
--- a/src/modules/dcc/DccCanvasWindow.cpp
+++ b/src/modules/dcc/DccCanvasWindow.cpp
@@ -114,7 +114,7 @@ DccCanvasWindow::DccCanvasWindow(DccDescriptor * dcc, const char * name)
 			output(KVI_OUT_DCCMSG, __tr2qs_ctx("Contacting host %Q on port %Q", "dcc"), &(dcc->szIp), &(dcc->szPort));
 	}
 
-	//	m_pSlaveThread = 0;
+	//	m_pSlaveThread = nullptr;
 }
 
 DccCanvasWindow::~DccCanvasWindow()
@@ -124,7 +124,7 @@ DccCanvasWindow::~DccCanvasWindow()
 	//	{
 	//		m_pSlaveThread->terminate();
 	//		delete m_pSlaveThread;
-	//		m_pSlaveThread = 0;
+	//		m_pSlaveThread = nullptr;
 	//	}
 	KviThreadManager::killPendingEvents(this);
 	//	delete m_pDescriptor;
@@ -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,11 +173,11 @@ 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());
-	output(KVI_OUT_ACTION, "%Q %s", &(m_pDescriptor->szLocalNick), text);
+	output(KVI_OUT_OWNACTION, "%Q %s", &(m_pDescriptor->szLocalNick), text);
 }
 
 bool DccCanvasWindow::event(QEvent * e)
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.cpp b/src/modules/dcc/DccChatWindow.cpp
index 1af5aa314..f10caab61 100644
--- a/src/modules/dcc/DccChatWindow.cpp
+++ b/src/modules/dcc/DccChatWindow.cpp
@@ -407,7 +407,7 @@ void DccChatWindow::ownAction(const QString & text)
 			return;
 		KviCString buf(KviCString::Format, "%cACTION %s%c\r\n", 0x01, d, 0x01);
 		m_pSlaveThread->sendRawData(buf.ptr(), buf.len());
-		output(KVI_OUT_ACTION, "%Q %Q", &(m_pDescriptor->szLocalNick), &szTmpBuffer);
+		output(KVI_OUT_OWNACTION, "%Q %Q", &(m_pDescriptor->szLocalNick), &szTmpBuffer);
 	}
 	else
 	{
@@ -904,9 +904,9 @@ bool DccChatThread::tryFlushOutBuffers()
 			{
 				int err = kvi_socket_error();
 #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
-				if((err != EAGAIN) || (err != EINTR) || (err != WSAEWOULDBLOCK))
+				if((err != EAGAIN) && (err != EINTR) && (err != WSAEWOULDBLOCK))
 #else
-				if((err != EAGAIN) || (err != EINTR))
+				if((err != EAGAIN) && (err != EINTR))
 #endif
 				{
 					postErrorEvent(KviError::translateSystemError(err));
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.cpp b/src/modules/dcc/DccDialog.cpp
index a6d113404..6beb70ad8 100644
--- a/src/modules/dcc/DccDialog.cpp
+++ b/src/modules/dcc/DccDialog.cpp
@@ -27,6 +27,7 @@
 #include "KviLocale.h"
 #include "KviIconManager.h"
 #include "KviApplication.h"
+#include "KviMainWindow.h"
 
 #include <QLayout>
 #include <QPushButton>
@@ -119,8 +120,11 @@ void DccAcceptDialog::closeEvent(QCloseEvent * e)
 
 void DccAcceptDialog::showEvent(QShowEvent * e)
 {
-	QRect rect = g_pApp->desktop()->screenGeometry(g_pApp->desktop()->primaryScreen());
-	move((rect.width() - width()) / 2, (rect.height() - height()) / 2);
+	int iScreen = g_pApp->desktop()->screenNumber(g_pMainWindow);
+	if(iScreen < 0)
+		iScreen = g_pApp->desktop()->primaryScreen();
+	QRect rect = g_pApp->desktop()->screenGeometry(iScreen);
+	move(rect.x() + ((rect.width() - width()) / 2),rect.y() + ((rect.height() - height()) / 2));
 	QWidget::showEvent(e);
 }
 
@@ -182,8 +186,11 @@ void DccRenameDialog::closeEvent(QCloseEvent * e)
 
 void DccRenameDialog::showEvent(QShowEvent * e)
 {
-	QRect rect = g_pApp->desktop()->screenGeometry(g_pApp->desktop()->primaryScreen());
-	move((rect.width() - width()) / 2, (rect.height() - height()) / 2);
+	int iScreen = g_pApp->desktop()->screenNumber(g_pMainWindow);
+	if(iScreen < 0)
+		iScreen = g_pApp->desktop()->primaryScreen();
+	QRect rect = g_pApp->desktop()->screenGeometry(iScreen);
+	move(rect.x() + ((rect.width() - width()) / 2),rect.y() + ((rect.height() - height()) / 2));
 	QWidget::showEvent(e);
 }
 
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.cpp b/src/modules/dcc/DccFileTransfer.cpp
index 2f3302521..34fa1ff34 100644
--- a/src/modules/dcc/DccFileTransfer.cpp
+++ b/src/modules/dcc/DccFileTransfer.cpp
@@ -1035,13 +1035,6 @@ void DccSendThread::run()
 												goto handle_system_error;
 												break;
 											case KviSSL::SyscallError:
-												if(written == 0)
-												{
-													raiseSSLError();
-													postErrorEvent(KviError::RemoteEndClosedConnection);
-													goto exit_dcc;
-												}
-												else
 												{
 													int iSSLErr = m_pSSL->getLastError(true);
 													if(iSSLErr != 0)
@@ -1889,9 +1882,9 @@ QString DccFileTransfer::tipText()
 {
 	QString s;
 
-	s = QString("<table><tr><td bgcolor=\"#000000\"><font color=\"#FFFFFF\"><b>DCC %1 (ID %2)</b></font></td></tr>").arg(m_szDccType.ptr()).arg(id());
+	s = QString(R"(<table><tr><td bgcolor="#000000"><font color="#FFFFFF"><b>DCC %1 (ID %2)</b></font></td></tr>)").arg(m_szDccType.ptr()).arg(id());
 
-	s += "<tr><td bgcolor=\"#404040\"><font color=\"#FFFFFF\">";
+	s += R"(<tr><td bgcolor="#404040"><font color="#FFFFFF">)";
 	s += __tr2qs_ctx("Transfer Log", "dcc");
 	s += "</font></td></tr>";
 	s += "<tr><td bgcolor=\"#C0C0C0\">";
@@ -2386,12 +2379,6 @@ bool DccFileTransfer::doResume(const char * filename, const char * port, quint64
 
 	if(!bFileNameMatches)
 	{
-		// bad file name
-		if(!bPortMatches)
-			return false; // neither filename nor port match
-
-		// port matches (this is very likely to be the right transfer)
-
 		if(!KVI_OPTION_BOOL(KviOption_boolAcceptBrokenFileNameDccResumeRequests))
 		{
 			if(_OUTPUT_VERBOSE)
diff --git a/src/modules/dcc/DccFileTransfer.h b/src/modules/dcc/DccFileTransfer.h
index f8fb48a05..4154cdcfc 100644
--- a/src/modules/dcc/DccFileTransfer.h
+++ b/src/modules/dcc/DccFileTransfer.h
@@ -51,7 +51,7 @@ class DccFileTransfer;
 class DccMarshal;
 class QMenu;
 
-typedef struct _KviDccSendThreadOptions
+struct KviDccSendThreadOptions
 {
 	KviCString szFileName;
 	quint64 uStartPosition;
@@ -61,7 +61,7 @@ typedef struct _KviDccSendThreadOptions
 	bool bNoAcks;
 	bool bIsTdcc;
 	unsigned int uMaxBandwidth;
-} KviDccSendThreadOptions;
+};
 
 class DccSendThread : public DccThread
 {
@@ -74,8 +74,8 @@ private:
 	uint m_uAverageSpeed;
 	uint m_uInstantSpeed;
 	quint64 m_uFilePosition;
-	quint64 m_uAckedBytes;
-	quint64 m_uTotalSentBytes;
+	quint64 m_uAckedBytes = 0;
+	quint64 m_uTotalSentBytes = 0;
 	// internal
 	unsigned long m_uStartTime;
 	unsigned long m_uInstantSpeedInterval;
@@ -99,7 +99,7 @@ protected:
 	virtual void run();
 };
 
-typedef struct _KviDccRecvThreadOptions
+struct KviDccRecvThreadOptions
 {
 	bool bResume;
 	KviCString szFileName;
@@ -110,7 +110,7 @@ typedef struct _KviDccRecvThreadOptions
 	bool bNoAcks;
 	bool bIsTdcc;
 	unsigned int uMaxBandwidth;
-} KviDccRecvThreadOptions;
+};
 
 class DccRecvThread : public DccThread
 {
@@ -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,18 +221,18 @@ 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();
+	KviWindow * dccMarshalOutputWindow() override;
+	const char * dccMarshalOutputContextString() override;
 
-	virtual void displayPaint(QPainter * p, int column, QRect rect);
-	virtual int displayHeight(int iLineSpacing);
-	virtual void fillContextPopup(QMenu * m);
+	void displayPaint(QPainter * p, int column, QRect rect) override;
+	int displayHeight(int iLineSpacing) override;
+	void fillContextPopup(QMenu * m) override;
 	virtual void fillStatusString(QString & szBuffer);
-	virtual bool active();
-	virtual QString tipText();
-	virtual QString localFileName();
+	bool active() override;
+	QString tipText() override;
+	QString localFileName() override;
 
 	bool isFileUpload() { return m_pDescriptor->isFileUpload(); };
 
diff --git a/src/modules/dcc/DccMarshal.cpp b/src/modules/dcc/DccMarshal.cpp
index fa7d2b0b3..486aa9aee 100644
--- a/src/modules/dcc/DccMarshal.cpp
+++ b/src/modules/dcc/DccMarshal.cpp
@@ -32,7 +32,7 @@
 #include "kvi_socket.h"
 #include "KviFileUtils.h"
 
-#include <stdlib.h> //for exit()
+#include <cstdlib> //for exit()
 
 #include <QTimer>
 
diff --git a/src/modules/dcc/DccThread.h b/src/modules/dcc/DccThread.h
index 25f6fc4fd..14cd96929 100644
--- a/src/modules/dcc/DccThread.h
+++ b/src/modules/dcc/DccThread.h
@@ -46,11 +46,11 @@
 // KviThreadDataEvent<int>
 #define KVI_DCC_THREAD_EVENT_ACTION (KVI_THREAD_USER_EVENT_BASE + 5)
 
-typedef struct _KviDccThreadIncomingData
+struct KviDccThreadIncomingData
 {
 	int iLen;
 	char * buffer;
-} KviDccThreadIncomingData;
+};
 
 class DccThread : public KviSensitiveThread
 {
diff --git a/src/modules/dcc/DccVideoWindow.cpp b/src/modules/dcc/DccVideoWindow.cpp
index ea19273fb..963a30b36 100644
--- a/src/modules/dcc/DccVideoWindow.cpp
+++ b/src/modules/dcc/DccVideoWindow.cpp
@@ -72,9 +72,8 @@ bool kvi_dcc_video_is_valid_codec(const char * codecName)
 	return false;
 }
 
-static DccVideoCodec * kvi_dcc_video_get_codec(const char * codecName)
+static DccVideoCodec * kvi_dcc_video_get_codec([[maybe_unused]] const char * codecName)
 {
-	Q_UNUSED(codecName);
 #ifndef COMPILE_DISABLE_OGG_THEORA
 	if(kvi_strEqualCI("theora", codecName))
 		return new DccVideoTheoraCodec();
@@ -259,7 +258,7 @@ bool DccVideoThread::handleIncomingData(KviDccThreadIncomingData * data, bool bC
 				// no more data in the buffer
 				KVI_ASSERT(data->iLen == 0);
 				KviMemory::free(data->buffer);
-				data->buffer = end = aux = 0;
+				data->buffer = end = aux = nullptr;
 			}
 			postEvent(parent(), e);
 		}
@@ -281,7 +280,7 @@ bool DccVideoThread::handleIncomingData(KviDccThreadIncomingData * data, bool bC
 			e->setData(s);
 			data->iLen = 0;
 			KviMemory::free(data->buffer);
-			data->buffer = 0;
+			data->buffer = nullptr;
 			postEvent(parent(), e);
 		}
 	}
@@ -396,8 +395,8 @@ DccVideoWindow::DccVideoWindow(DccDescriptor * dcc, const char * name)
     : DccWindow(KviWindow::DccVideo, name, dcc)
 {
 	m_pDescriptor = dcc;
-	m_pSlaveThread = 0;
-	m_pszTarget = 0;
+	m_pSlaveThread = nullptr;
+	m_pszTarget = nullptr;
 
 	m_pButtonBox = new KviTalHBox(this);
 
@@ -501,51 +500,51 @@ DccVideoWindow::~DccVideoWindow()
 	if(m_pInVideoLabel)
 	{
 		delete m_pInVideoLabel;
-		m_pInVideoLabel = 0;
+		m_pInVideoLabel = nullptr;
 	}
 	if(m_pCameraView)
 	{
 		delete m_pCameraView;
-		m_pCameraView = 0;
+		m_pCameraView = nullptr;
 	}
 	if(m_pCameraImage)
 	{
 		delete m_pCameraImage;
-		m_pCameraImage = 0;
+		m_pCameraImage = nullptr;
 	}
 	if(m_pCamera)
 	{
 		delete m_pCamera;
-		m_pCamera = 0;
+		m_pCamera = nullptr;
 	}
 	if(m_pCDevices)
 	{
 		delete m_pCDevices;
-		m_pCDevices = 0;
+		m_pCDevices = nullptr;
 	}
 	if(m_pCInputs)
 	{
 		delete m_pCInputs;
-		m_pCInputs = 0;
+		m_pCInputs = nullptr;
 	}
 	if(m_pCStandards)
 	{
 		delete m_pCStandards;
-		m_pCStandards = 0;
+		m_pCStandards = nullptr;
 	}
 	if(m_pVideoLabel[0])
 	{
 		delete m_pVideoLabel[2];
 		delete m_pVideoLabel[1];
 		delete m_pVideoLabel[0];
-		m_pVideoLabel[2] = 0;
-		m_pVideoLabel[1] = 0;
-		m_pVideoLabel[0] = 0;
+		m_pVideoLabel[2] = nullptr;
+		m_pVideoLabel[1] = nullptr;
+		m_pVideoLabel[0] = nullptr;
 	}
 	if(m_pLayout)
 	{
 		delete m_pLayout;
-		m_pLayout = 0;
+		m_pLayout = nullptr;
 	}
 
 	g_pDccBroker->unregisterDccWindow(this);
@@ -554,7 +553,7 @@ DccVideoWindow::~DccVideoWindow()
 	{
 		m_pSlaveThread->terminate();
 		delete m_pSlaveThread;
-		m_pSlaveThread = 0;
+		m_pSlaveThread = nullptr;
 	}
 
 	KviThreadManager::killPendingEvents(this);
@@ -562,7 +561,7 @@ DccVideoWindow::~DccVideoWindow()
 	if(m_pszTarget)
 	{
 		delete m_pszTarget;
-		m_pszTarget = 0;
+		m_pszTarget = nullptr;
 	}
 }
 
@@ -792,7 +791,7 @@ void DccVideoWindow::ownAction(const QString & text)
 			return;
 		KviCString buf(KviCString::Format, "%cACTION %s%c\r\n", 0x01, d, 0x01);
 		m_tmpTextDataOut.append(buf.ptr(), buf.len());
-		output(KVI_OUT_ACTION, "%Q %Q", &(m_pDescriptor->szLocalNick), &szTmpBuffer);
+		output(KVI_OUT_OWNACTION, "%Q %Q", &(m_pDescriptor->szLocalNick), &szTmpBuffer);
 	}
 	else
 	{
diff --git a/src/modules/dcc/DccVideoWindow.h b/src/modules/dcc/DccVideoWindow.h
index eca3ed97f..1210dcc8b 100644
--- a/src/modules/dcc/DccVideoWindow.h
+++ b/src/modules/dcc/DccVideoWindow.h
@@ -64,11 +64,11 @@ extern bool kvi_dcc_video_is_valid_codec(const char * codecName);
 #define KVI_DCC_VIDEO_THREAD_ACTION_STOP_PLAYING 3
 #define KVI_DCC_VIDEO_THREAD_ACTION_GRAB_FRAME 4
 
-typedef struct _KviDccVideoThreadOptions
+struct KviDccVideoThreadOptions
 {
 	QString szVideoDevice;
 	DccVideoCodec * pCodec;
-} KviDccVideoThreadOptions;
+};
 
 class DccVideoThread : public DccThread
 {
@@ -102,9 +102,9 @@ protected:
 	void stopRecording();
 	void startPlaying();
 	void stopPlaying();
-	inline bool isPlaying() { return m_bPlaying; };
-	virtual void run();
-	virtual bool handleIncomingData(KviDccThreadIncomingData * data, bool bCritical);
+	bool isPlaying() const { return m_bPlaying; }
+	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/DccVoiceAdpcmCodec.cpp b/src/modules/dcc/DccVoiceAdpcmCodec.cpp
index f3b9e0334..de05544e1 100644
--- a/src/modules/dcc/DccVoiceAdpcmCodec.cpp
+++ b/src/modules/dcc/DccVoiceAdpcmCodec.cpp
@@ -53,7 +53,7 @@
 #define _ADPCMCODEC_CPP_
 #include "DccVoiceAdpcmCodec.h"
 
-#include <stdio.h> /*DBG*/
+#include <cstdio> /*DBG*/
 
 #ifndef __STDC__
 #define signed
diff --git a/src/modules/dcc/DccVoiceAdpcmCodec.h b/src/modules/dcc/DccVoiceAdpcmCodec.h
index e437c18b5..8015bd052 100644
--- a/src/modules/dcc/DccVoiceAdpcmCodec.h
+++ b/src/modules/dcc/DccVoiceAdpcmCodec.h
@@ -47,11 +47,11 @@
 
 #include "DccVoiceCodec.h"
 
-typedef struct adpcm_state
+struct ADPCM_state
 {
 	short valprev; /* Previous output value */
 	char index;    /* HelpIndex into stepsize table */
-} ADPCM_state;
+};
 
 class DccVoiceAdpcmCodec : public DccVoiceCodec
 {
diff --git a/src/modules/dcc/DccVoiceCodec.cpp b/src/modules/dcc/DccVoiceCodec.cpp
index 8f52060a2..5e70d176c 100644
--- a/src/modules/dcc/DccVoiceCodec.cpp
+++ b/src/modules/dcc/DccVoiceCodec.cpp
@@ -29,8 +29,7 @@
 #include <QBuffer>
 
 DccVoiceCodec::DccVoiceCodec()
-{
-}
+    = default;
 
 DccVoiceCodec::~DccVoiceCodec()
     = default;
@@ -95,8 +94,7 @@ int DccVoiceNullCodec::decodedFrameSize()
 }
 
 DccVideoCodec::DccVideoCodec()
-{
-}
+    = default;
 
 DccVideoCodec::~DccVideoCodec()
     = default;
@@ -265,19 +263,19 @@ DccVideoTheoraCodec::DccVideoTheoraCodec()
     : DccVideoCodec()
 {
 	m_szName = "theora";
-	m_pEncoder = 0;
-	m_pDecoder = 0;
+	m_pEncoder = nullptr;
+	m_pDecoder = nullptr;
 }
 
 DccVideoTheoraCodec::~DccVideoTheoraCodec()
 {
 	if(m_pEncoder)
 		delete m_pEncoder;
-	m_pEncoder = 0;
+	m_pEncoder = nullptr;
 
 	if(m_pDecoder)
 		delete m_pDecoder;
-	m_pDecoder = 0;
+	m_pDecoder = nullptr;
 }
 
 void DccVideoTheoraCodec::encodeVideo(KviDataBuffer * videoSignal, KviDataBuffer * stream)
diff --git a/src/modules/dcc/DccVoiceGsmCodec.cpp b/src/modules/dcc/DccVoiceGsmCodec.cpp
index e2a23bb4e..3a7929b3d 100644
--- a/src/modules/dcc/DccVoiceGsmCodec.cpp
+++ b/src/modules/dcc/DccVoiceGsmCodec.cpp
@@ -33,12 +33,12 @@
 #define GSM_UNPACKED_FRAME_SIZE_IN_BYTES 320
 #define GSM_UNPACKED_FRAME_SIZE_IN_SHORTS 160
 
-void * (*gsm_session_create)() = 0;
-void (*gsm_session_destroy)(void *) = 0;
-void (*gsm_session_encode)(void *, short *, unsigned char *) = 0;
-int (*gsm_session_decode)(void *, unsigned char *, short *) = 0;
+void * (*gsm_session_create)() = nullptr;
+void (*gsm_session_destroy)(void *) = nullptr;
+void (*gsm_session_encode)(void *, short *, unsigned char *) = nullptr;
+int (*gsm_session_decode)(void *, unsigned char *, short *) = nullptr;
 
-void * g_pGSMCodecLibraryHandle = 0;
+void * g_pGSMCodecLibraryHandle = nullptr;
 
 bool kvi_gsm_codec_init()
 {
@@ -57,7 +57,7 @@ bool kvi_gsm_codec_init()
 	if(!(gsm_session_create && gsm_session_destroy && gsm_session_encode && gsm_session_decode))
 	{
 		dlclose(g_pGSMCodecLibraryHandle);
-		g_pGSMCodecLibraryHandle = 0;
+		g_pGSMCodecLibraryHandle = nullptr;
 		return false;
 	}
 	return true;
@@ -68,7 +68,7 @@ void kvi_gsm_codec_done()
 	if(g_pGSMCodecLibraryHandle)
 	{
 		dlclose(g_pGSMCodecLibraryHandle);
-		g_pGSMCodecLibraryHandle = 0;
+		g_pGSMCodecLibraryHandle = nullptr;
 	}
 }
 
diff --git a/src/modules/dcc/DccVoiceWindow.cpp b/src/modules/dcc/DccVoiceWindow.cpp
index be04e9e83..279823727 100644
--- a/src/modules/dcc/DccVoiceWindow.cpp
+++ b/src/modules/dcc/DccVoiceWindow.cpp
@@ -49,7 +49,7 @@
 #include <sys/time.h>
 #include <sys/types.h>
 #include <unistd.h>
-#include <errno.h>
+#include <cerrno>
 #include <fcntl.h>
 #include <sys/stat.h>  // for open()
 #include <sys/ioctl.h> // for ioctl()
@@ -1014,7 +1014,7 @@ void DccVoiceWindow::startOrStopTalking(bool bStart)
 		stopTalking();
 }
 
-int DccVoiceWindow::getMixerVolume(void) const
+int DccVoiceWindow::getMixerVolume() const
 {
 #ifndef COMPILE_DISABLE_DCC_VOICE
 	int fd;
diff --git a/src/modules/dcc/DccVoiceWindow.h b/src/modules/dcc/DccVoiceWindow.h
index e0d526382..f0f7dc898 100644
--- a/src/modules/dcc/DccVoiceWindow.h
+++ b/src/modules/dcc/DccVoiceWindow.h
@@ -51,14 +51,14 @@ extern bool kvi_dcc_voice_is_valid_codec(const char * codecName);
 #define KVI_DCC_VOICE_THREAD_ACTION_START_PLAYING 2
 #define KVI_DCC_VOICE_THREAD_ACTION_STOP_PLAYING 3
 
-typedef struct _KviDccVoiceThreadOptions
+struct KviDccVoiceThreadOptions
 {
 	bool bForceHalfDuplex;
 	int iPreBufferSize;
 	int iSampleRate;
 	KviCString szSoundDevice;
 	DccVoiceCodec * pCodec;
-} KviDccVoiceThreadOptions;
+};
 
 class DccVoiceThread : public DccThread
 {
@@ -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();
@@ -188,7 +188,7 @@ public:
 KviVoiceParty::KviVoiceParty(const QString &szNick,const QString &szIp,unsigned short uPort)
 : m_szIp(szIp), m_uPort(uPort), m_szNick(szNick)
 {
-	m_pChildrenTree = 0;
+	m_pChildrenTree = nullptr;
 }
 
 KviVoiceParty::~KviVoiceParty()
@@ -241,8 +241,8 @@ KviVoiceLink::KviVoiceLink(KviVoiceParty * pRemoteParty)
 {
 	KviQString::sprintf("%Q:%u",&(pRemoteParty->nick()),pRemoteParty->port());
 	m_pRemoteParty = pRemoteParty;
-	m_pAudioEncoder = 0;
-	m_pAudioDecoder = 0;
+	m_pAudioEncoder = nullptr;
+	m_pAudioDecoder = nullptr;
 }
 
 KviVoiceLink::~KviVoiceLink()
diff --git a/src/modules/dcc/DccWindow.h b/src/modules/dcc/DccWindow.h
index 31a4710fd..483f1ad43 100644
--- a/src/modules/dcc/DccWindow.h
+++ b/src/modules/dcc/DccWindow.h
@@ -45,7 +45,7 @@ protected:
 public:
 	DccDescriptor * descriptor() { return m_pDescriptor; };
 	const DccMarshal * marshal() { return m_pMarshal; };
-	virtual DccThread * getSlaveThread() { return 0; };
+	virtual DccThread * getSlaveThread() { return nullptr; }
 	virtual KviWindow * dccMarshalOutputWindow();
 	virtual const char * dccMarshalOutputContextString();
 };
diff --git a/src/modules/dcc/canvaswidget.cpp b/src/modules/dcc/canvaswidget.cpp
index 8da7a0204..03d69ac58 100644
--- a/src/modules/dcc/canvaswidget.cpp
+++ b/src/modules/dcc/canvaswidget.cpp
@@ -466,7 +466,7 @@ KviCanvasView::KviCanvasView(QCanvas * c, DccCanvasWidget * cw, QWidget * par)
 	m_pCanvasWidget = cw;
 	m_state = Idle;
 	m_dragMode = None;
-	m_pSelectedItem = 0;
+	m_pSelectedItem = nullptr;
 	viewport()->setMouseTracking(true);
 }
 
@@ -562,7 +562,7 @@ static void calcPolygonPoints(QPointArray & pnts, unsigned int nVertices)
 
 void KviCanvasView::insertObjectAt(const QPoint & pnt, ObjectType o)
 {
-	QCanvasItem * r = 0;
+	QCanvasItem * r = nullptr;
 
 	switch(o)
 	{
@@ -655,7 +655,7 @@ void KviCanvasView::clearSelection()
 	if(!m_pSelectedItem)
 		return;
 	m_pSelectedItem->setSelected(false);
-	m_pSelectedItem = 0;
+	m_pSelectedItem = nullptr;
 	m_pCanvasWidget->m_pPropertiesWidget->editItem(0);
 }
 
@@ -1297,7 +1297,7 @@ QWidget * KviVariantTableItem::createEditor() const
 		default:
 			break;
 	}
-	return 0;
+	return nullptr;
 }
 
 void KviVariantTableItem::setContentFromEditor(QWidget * w)
@@ -1429,7 +1429,7 @@ void KviCanvasItemPropertiesWidget::editItem(QCanvasItem * it)
 		return;
 	}
 
-	QMap<QString, QVariant> * m = 0;
+	QMap<QString, QVariant> * m = nullptr;
 
 	switch(KVI_CANVAS_RTTI_CONTROL_TYPE(it))
 	{
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/dcc/libkvidcc.cpp b/src/modules/dcc/libkvidcc.cpp
index 510c5b122..16427465b 100644
--- a/src/modules/dcc/libkvidcc.cpp
+++ b/src/modules/dcc/libkvidcc.cpp
@@ -2420,7 +2420,7 @@ static bool dcc_kvs_fnc_ircContext(KviKvsModuleFunctionCall * c)
 		}
 		else
 		{
-			c->error(__tr2qs_ctx("The IRC context that originated the DCC doesn't exists anymore.", "dcc"));
+			c->error(__tr2qs_ctx("The IRC context that originated the DCC doesn't exist anymore.", "dcc"));
 			return false;
 		}
 	}
diff --git a/src/modules/dcc/requests.cpp b/src/modules/dcc/requests.cpp
index 2e856ac44..7440c58ad 100644
--- a/src/modules/dcc/requests.cpp
+++ b/src/modules/dcc/requests.cpp
@@ -1175,12 +1175,12 @@ static void dccModuleParseDccList(KviDccRequest *)
 	// FIXME!
 }
 
-typedef void (*dccParseProc)(KviDccRequest *);
-typedef struct _dccParseProcEntry
+using dccParseProc = void (*)(KviDccRequest *);
+struct dccParseProcEntry
 {
 	const char * type;
 	dccParseProc proc;
-} dccParseProcEntry;
+};
 
 #define KVI_NUM_KNOWN_DCC_TYPES 28