Merge pull request #1962 from DarthGandalf/modernize

Apply several fixes of clang-tidy

12 files changed, 109 insertions, 117 deletions

diff --git a/src/modules/dcc/DccBroker.cpp b/src/modules/dcc/DccBroker.cpp
index 08e9373d8..efe4d36ac 100644
--- a/src/modules/dcc/DccBroker.cpp
+++ b/src/modules/dcc/DccBroker.cpp
@@ -60,7 +60,7 @@ extern KVIRC_API KviSharedFilesManager * g_pSharedFilesManager;
 //#warning "The broker might lookup the remote host name"
 
 DccBroker::DccBroker()
-    : QObject(0)
+    : QObject(nullptr)
 {
 	setObjectName("dcc_broker");
 	DccFileTransfer::init();
@@ -81,7 +81,7 @@ DccBroker::~DccBroker()
 	while(m_pBoxList->first())
 		delete m_pBoxList->first();
 	delete m_pBoxList;
-	m_pBoxList = 0;
+	m_pBoxList = nullptr;
 	while(m_pDccWindowList->first())
 		delete m_pDccWindowList->first();
 	delete m_pDccWindowList;
@@ -106,12 +106,12 @@ KviDccZeroPortTag * DccBroker::findZeroPortTag(const QString & szTag)
 {
 	KviDccZeroPortTag * t = m_pZeroPortTags->find(szTag);
 	if(!t)
-		return 0;
+		return nullptr;
 	if(t->m_tTimestamp.secsTo(QDateTime::currentDateTime()) > 180)
 	{
 		// too late man...
 		m_pZeroPortTags->remove(szTag);
-		return 0;
+		return nullptr;
 	}
 	return t;
 }
@@ -140,7 +140,7 @@ void DccBroker::unregisterDccBox(DccDialog * box)
 void DccBroker::cancelDcc(DccDescriptor * dcc)
 {
 	delete dcc;
-	dcc = 0;
+	dcc = nullptr;
 }
 
 void DccBroker::cancelDcc(DccDialog * box, DccDescriptor * dcc)
@@ -148,7 +148,7 @@ void DccBroker::cancelDcc(DccDialog * box, DccDescriptor * dcc)
 	if(box)
 		box->forgetDescriptor();
 	delete dcc;
-	dcc = 0;
+	dcc = nullptr;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -160,7 +160,7 @@ void DccBroker::rsendManage(DccDescriptor * dcc)
 	// We need the filename...
 	QFileInfo fi(dcc->szLocalFileName);
 	if(fi.exists())
-		rsendExecute(0, dcc);
+		rsendExecute(nullptr, dcc);
 	else
 		rsendAskForFileName(dcc);
 }
@@ -326,7 +326,7 @@ void DccBroker::handleChatRequest(DccDescriptor * dcc)
 	else
 	{
 		// auto accept
-		executeChat(0, dcc);
+		executeChat(nullptr, dcc);
 	}
 }
 
@@ -380,7 +380,7 @@ void DccBroker::activeVoiceManage(DccDescriptor * dcc)
 	else
 	{
 		// auto accept
-		activeVoiceExecute(0, dcc);
+		activeVoiceExecute(nullptr, dcc);
 	}
 }
 
@@ -584,7 +584,7 @@ void DccBroker::recvFileManage(DccDescriptor * dcc)
 		{
 			if(size >= KVI_OPTION_UINT(KviOption_uintMaximumRequestedAvatarSize))
 			{
-				cancelDcc(0, dcc);
+				cancelDcc(nullptr, dcc);
 				return;
 			}
 		}
@@ -659,7 +659,7 @@ void DccBroker::recvFileManage(DccDescriptor * dcc)
 			    &(dcc->szType), &(dcc->szNick), &(dcc->szUser),
 			    &(dcc->szHost), &(dcc->szFileName));
 		}
-		chooseSaveFileName(0, dcc);
+		chooseSaveFileName(nullptr, dcc);
 	}
 }
 
@@ -737,7 +737,7 @@ void DccBroker::chooseSaveFileName(DccDialog * box, DccDescriptor * dcc)
 		       true,
 		       g_pMainWindow))
 		{
-			renameOverwriteResume(0, dcc);
+			renameOverwriteResume(nullptr, dcc);
 		}
 		else
 		{
@@ -758,7 +758,7 @@ void DccBroker::chooseSaveFileName(DccDialog * box, DccDescriptor * dcc)
 			    &(dcc->szType), &(dcc->szFileName), &(dcc->szLocalFileName));
 		}
 
-		renameOverwriteResume(0, dcc);
+		renameOverwriteResume(nullptr, dcc);
 	}
 }
 
@@ -834,17 +834,17 @@ void DccBroker::renameOverwriteResume(DccDialog * box, DccDescriptor * dcc)
 		{
 			// yep, auto resume...
 			dcc->bResume = true;
-			recvFileExecute(0, dcc);
+			recvFileExecute(nullptr, dcc);
 		}
 		else if(iRemoteSize == (quint64)fi.size())
 		{
 			dcc->console()->output(KVI_OUT_DCCMSG, "Transfer aborted: file %Q already completed", &(dcc->szLocalFileName));
-			cancelDcc(0, dcc);
+			cancelDcc(nullptr, dcc);
 		}
 		else
 		{
 			// otherwise auto rename
-			renameDccSendFile(0, dcc);
+			renameDccSendFile(nullptr, dcc);
 		}
 		return;
 	}
@@ -852,7 +852,7 @@ void DccBroker::renameOverwriteResume(DccDialog * box, DccDescriptor * dcc)
 	dcc->szLocalFileSize = "0";
 
 	// everything OK
-	recvFileExecute(0, dcc);
+	recvFileExecute(nullptr, dcc);
 }
 
 void DccBroker::renameDccSendFile(DccDialog * box, DccDescriptor * dcc)
@@ -894,7 +894,7 @@ void DccBroker::renameDccSendFile(DccDialog * box, DccDescriptor * dcc)
 
 	dcc->szLocalFileSize = "0"; // 0 for sure
 
-	recvFileExecute(0, dcc);
+	recvFileExecute(nullptr, dcc);
 }
 
 void DccBroker::recvFileExecute(DccDialog * box, DccDescriptor * dcc)
@@ -940,7 +940,7 @@ void DccBroker::sendFileManage(DccDescriptor * dcc)
 				if(d->szLocalFileName.isEmpty())
 					cancelDcc(d);
 				else
-					sendFileExecute(0, d);
+					sendFileExecute(nullptr, d);
 			}
 			delete dcc;
 		}
diff --git a/src/modules/dcc/DccChatWindow.cpp b/src/modules/dcc/DccChatWindow.cpp
index 4e9a3c50e..53f4d4894 100644
--- a/src/modules/dcc/DccChatWindow.cpp
+++ b/src/modules/dcc/DccChatWindow.cpp
@@ -105,7 +105,7 @@ DccChatWindow::DccChatWindow(DccDescriptor * dcc, const char * name)
 
 	//setFocusHandler(m_pInput,this);
 
-	m_pSlaveThread = 0;
+	m_pSlaveThread = nullptr;
 
 	if(KVI_OPTION_BOOL(KviOption_boolAutoLogDccChat))
 		m_pIrcView->startLogging();
@@ -119,7 +119,7 @@ DccChatWindow::DccChatWindow(DccDescriptor * dcc, const char * name)
 	connect(m_pMarshal, SIGNAL(sslError(const char *)), this, SLOT(sslError(const char *)));
 #endif
 
-	m_pSlaveThread = 0;
+	m_pSlaveThread = nullptr;
 
 	startConnection();
 }
@@ -131,7 +131,7 @@ DccChatWindow::~DccChatWindow()
 	{
 		m_pSlaveThread->terminate();
 		delete m_pSlaveThread;
-		m_pSlaveThread = 0;
+		m_pSlaveThread = nullptr;
 	}
 	KviThreadManager::killPendingEvents(this);
 }
@@ -628,7 +628,7 @@ void DccChatThread::run()
 {
 	KviDccThreadIncomingData data;
 	data.iLen = 0;
-	data.buffer = 0;
+	data.buffer = nullptr;
 
 	for(;;)
 	{
@@ -728,7 +728,7 @@ void DccChatThread::run()
 					else
 					{
 						KviMemory::free(data.buffer);
-						data.buffer = 0;
+						data.buffer = nullptr;
 					}
 
 					if(!handleInvalidSocketRead(readLen))
@@ -753,7 +753,7 @@ out_of_the_loop:
 	if(m_pSSL)
 	{
 		KviSSLMaster::freeSSL(m_pSSL);
-		m_pSSL = 0;
+		m_pSSL = nullptr;
 	}
 #endif
 
@@ -801,7 +801,7 @@ bool DccChatThread::handleIncomingData(KviDccThreadIncomingData * data, bool bCr
 				// 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);
 		}
@@ -823,7 +823,7 @@ bool DccChatThread::handleIncomingData(KviDccThreadIncomingData * data, bool bCr
 			e->setData(s);
 			data->iLen = 0;
 			KviMemory::free(data->buffer);
-			data->buffer = 0;
+			data->buffer = nullptr;
 			postEvent(parent(), e);
 		}
 	}
diff --git a/src/modules/dcc/DccDescriptor.cpp b/src/modules/dcc/DccDescriptor.cpp
index a1db30716..5e2abe9e8 100644
--- a/src/modules/dcc/DccDescriptor.cpp
+++ b/src/modules/dcc/DccDescriptor.cpp
@@ -32,7 +32,7 @@
 #include "KviApplication.h"
 
 static unsigned int g_uNextDescriptorId = 1; // we use 0 as an invalid descriptor id
-static KviPointerHashTable<int, DccDescriptor> * g_pDescriptorDict = 0;
+static KviPointerHashTable<int, DccDescriptor> * g_pDescriptorDict = nullptr;
 
 KviPointerHashTable<int, DccDescriptor> * DccDescriptor::descriptorDict()
 {
@@ -47,8 +47,8 @@ DccDescriptor::DccDescriptor(const DccDescriptor & src)
 DccDescriptor::DccDescriptor(KviConsoleWindow * pConsole)
 {
 	m_pConsole = pConsole;
-	m_pDccWindow = 0;
-	m_pDccTransfer = 0;
+	m_pDccWindow = nullptr;
+	m_pDccTransfer = nullptr;
 
 	m_uId = g_uNextDescriptorId;
 	g_uNextDescriptorId++;
@@ -112,7 +112,7 @@ DccDescriptor::~DccDescriptor()
 		if(g_pDescriptorDict->count() < 1)
 		{
 			delete g_pDescriptorDict;
-			g_pDescriptorDict = 0;
+			g_pDescriptorDict = nullptr;
 		}
 	}
 }
@@ -139,7 +139,7 @@ void DccDescriptor::triggerCreationEvent()
 DccDescriptor * DccDescriptor::find(unsigned int uId)
 {
 	if(!g_pDescriptorDict)
-		return 0;
+		return nullptr;
 	return g_pDescriptorDict->find((long)uId);
 }
 
diff --git a/src/modules/dcc/DccDialog.cpp b/src/modules/dcc/DccDialog.cpp
index 151422d87..a6d113404 100644
--- a/src/modules/dcc/DccDialog.cpp
+++ b/src/modules/dcc/DccDialog.cpp
@@ -48,17 +48,17 @@ DccDialog::~DccDialog()
 {
 	if(m_pDescriptor)
 		delete m_pDescriptor;
-	m_pDescriptor = 0;
+	m_pDescriptor = nullptr;
 	m_pBroker->unregisterDccBox(this);
 }
 
 void DccDialog::forgetDescriptor()
 {
-	m_pDescriptor = 0;
+	m_pDescriptor = nullptr;
 }
 
 DccAcceptDialog::DccAcceptDialog(DccBroker * br, DccDescriptor * dcc, const QString & text, const QString & capt)
-    : QWidget(0), DccDialog(br, dcc)
+    : QWidget(nullptr), DccDialog(br, dcc)
 {
 	setObjectName("dcc_accept_box");
 	//QVBoxLayout * vb = new QVBoxLayout(this,4,4);
@@ -90,8 +90,7 @@ DccAcceptDialog::DccAcceptDialog(DccBroker * br, DccDescriptor * dcc, const QStr
 }
 
 DccAcceptDialog::~DccAcceptDialog()
-{
-}
+    = default;
 
 void DccAcceptDialog::acceptClicked()
 {
@@ -126,7 +125,7 @@ void DccAcceptDialog::showEvent(QShowEvent * e)
 }
 
 DccRenameDialog::DccRenameDialog(DccBroker * br, DccDescriptor * dcc, const QString & text, bool bDisableResume)
-    : QWidget(0), DccDialog(br, dcc)
+    : QWidget(nullptr), DccDialog(br, dcc)
 {
 	setObjectName("dcc_rename_box");
 	//QVBoxLayout * vb = new QVBoxLayout(this,4,4);
@@ -167,8 +166,7 @@ DccRenameDialog::DccRenameDialog(DccBroker * br, DccDescriptor * dcc, const QStr
 }
 
 DccRenameDialog::~DccRenameDialog()
-{
-}
+    = default;
 
 void DccRenameDialog::closeEvent(QCloseEvent * e)
 {
diff --git a/src/modules/dcc/DccFileTransfer.cpp b/src/modules/dcc/DccFileTransfer.cpp
index e1dca6012..a0689d05a 100644
--- a/src/modules/dcc/DccFileTransfer.cpp
+++ b/src/modules/dcc/DccFileTransfer.cpp
@@ -83,8 +83,8 @@ extern DccBroker * g_pDccBroker;
 
 extern KVIRC_API KviMediaManager * g_pMediaManager; // KviApplication.cpp
 
-static KviPointerList<DccFileTransfer> * g_pDccFileTransfers = 0;
-static QPixmap * g_pDccFileTransferIcon = 0;
+static KviPointerList<DccFileTransfer> * g_pDccFileTransfers = nullptr;
+static QPixmap * g_pDccFileTransferIcon = nullptr;
 
 //#warning "The events that have a KviCString data pointer should become real classes, that take care of deleting the data pointer!"
 //#warning "Otherwise, when left undispatched we will be leaking memory (event class destroyed but not the data ptr)"
@@ -99,7 +99,7 @@ DccRecvThread::DccRecvThread(QObject * par, kvi_socket_t fd, KviDccRecvThreadOpt
 
 	m_uTotalReceivedBytes = 0;
 	m_uInstantReceivedBytes = 0;
-	m_pFile = 0;
+	m_pFile = nullptr;
 	m_pTimeInterval = new KviMSecTimeInterval();
 	m_uStartTime = 0;
 	m_uInstantSpeedInterval = 0;
@@ -577,14 +577,14 @@ exit_dcc:
 	{
 		m_pFile->close();
 		delete m_pFile;
-		m_pFile = 0;
+		m_pFile = nullptr;
 	}
 
 #ifdef COMPILE_SSL_SUPPORT
 	if(m_pSSL)
 	{
 		KviSSLMaster::freeSSL(m_pSSL);
-		m_pSSL = 0;
+		m_pSSL = nullptr;
 	}
 #endif
 
@@ -672,8 +672,7 @@ void DccSendThread::updateStats()
 	m_pMutex->unlock();
 }
 
-union _ack_buffer
-{
+union _ack_buffer {
 	char cAckBuffer[4];
 	quint32 i32AckBuffer;
 };
@@ -1165,13 +1164,13 @@ exit_dcc:
 	KviMemory::free(buffer);
 	pFile->close();
 	delete pFile;
-	pFile = 0;
+	pFile = nullptr;
 
 #ifdef COMPILE_SSL_SUPPORT
 	if(m_pSSL)
 	{
 		KviSSLMaster::freeSSL(m_pSSL);
-		m_pSSL = 0;
+		m_pSSL = nullptr;
 	}
 #endif
 	kvi_socket_close(m_fd);
@@ -1194,8 +1193,8 @@ DccFileTransfer::DccFileTransfer(DccDescriptor * dcc)
 	init(); // ensure we're initialized
 	g_pDccFileTransfers->append(this);
 
-	m_pResumeTimer = 0;
-	m_pBandwidthDialog = 0;
+	m_pResumeTimer = nullptr;
+	m_pBandwidthDialog = nullptr;
 
 	m_szTransferIdString = QString(__tr2qs_ctx("TRANSFER %1", "dcc")).arg(id());
 
@@ -1219,8 +1218,8 @@ DccFileTransfer::DccFileTransfer(DccDescriptor * dcc)
 	if(dcc->bIsSSL)
 		m_szDccType.prepend("S");
 #endif
-	m_pSlaveRecvThread = 0;
-	m_pSlaveSendThread = 0;
+	m_pSlaveRecvThread = nullptr;
+	m_pSlaveSendThread = nullptr;
 
 	m_tTransferStartTime = 0;
 	m_tTransferEndTime = 0;
@@ -1254,14 +1253,14 @@ DccFileTransfer::~DccFileTransfer()
 	{
 		m_pSlaveRecvThread->terminate();
 		delete m_pSlaveRecvThread;
-		m_pSlaveRecvThread = 0;
+		m_pSlaveRecvThread = nullptr;
 	}
 
 	if(m_pSlaveSendThread)
 	{
 		m_pSlaveSendThread->terminate();
 		delete m_pSlaveSendThread;
-		m_pSlaveSendThread = 0;
+		m_pSlaveSendThread = nullptr;
 	}
 
 	KviThreadManager::killPendingEvents(this);
@@ -1272,7 +1271,7 @@ DccFileTransfer::~DccFileTransfer()
 
 void DccFileTransfer::bandwidthDialogDestroyed()
 {
-	m_pBandwidthDialog = 0;
+	m_pBandwidthDialog = nullptr;
 }
 
 KviWindow * DccFileTransfer::eventWindow()
@@ -1376,7 +1375,7 @@ void DccFileTransfer::resumeTimedOut()
 	if(m_pResumeTimer)
 	{
 		delete m_pResumeTimer;
-		m_pResumeTimer = 0;
+		m_pResumeTimer = nullptr;
 	}
 	handleMarshalError(KviError::ConnectionTimedOut);
 }
@@ -1916,7 +1915,7 @@ void DccFileTransfer::init()
 	if(pix)
 		g_pDccFileTransferIcon = new QPixmap(*pix);
 	else
-		g_pDccFileTransferIcon = 0;
+		g_pDccFileTransferIcon = nullptr;
 }
 
 void DccFileTransfer::done()
@@ -1926,10 +1925,10 @@ void DccFileTransfer::done()
 	while(DccFileTransfer * t = g_pDccFileTransfers->first())
 		delete t;
 	delete g_pDccFileTransfers;
-	g_pDccFileTransfers = 0;
+	g_pDccFileTransfers = nullptr;
 	if(g_pDccFileTransferIcon)
 		delete g_pDccFileTransferIcon;
-	g_pDccFileTransferIcon = 0;
+	g_pDccFileTransferIcon = nullptr;
 }
 
 unsigned int DccFileTransfer::transferCount()
@@ -1942,7 +1941,7 @@ unsigned int DccFileTransfer::transferCount()
 DccFileTransfer * DccFileTransfer::nonFailedTransferWithLocalFileName(const QString & szLocalFileName)
 {
 	if(!g_pDccFileTransfers)
-		return 0;
+		return nullptr;
 	for(DccFileTransfer * t = g_pDccFileTransfers->first(); t; t = g_pDccFileTransfers->next())
 	{
 #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
@@ -1956,7 +1955,7 @@ DccFileTransfer * DccFileTransfer::nonFailedTransferWithLocalFileName(const QStr
 				return t;
 		}
 	}
-	return 0;
+	return nullptr;
 }
 
 unsigned int DccFileTransfer::runningTransfersCount()
@@ -2356,7 +2355,7 @@ bool DccFileTransfer::resumeAccepted(const char * filename, const char * port, c
 	}
 
 	delete m_pResumeTimer;
-	m_pResumeTimer = 0;
+	m_pResumeTimer = nullptr;
 
 	outputAndLog(__tr2qs_ctx("RESUME accepted, transfer will begin at position %1", "dcc").arg(m_pDescriptor->szLocalFileSize));
 
@@ -2523,8 +2522,7 @@ DccFileTransferBandwidthDialog::DccFileTransferBandwidthDialog(QWidget * pParent
 }
 
 DccFileTransferBandwidthDialog::~DccFileTransferBandwidthDialog()
-{
-}
+    = default;
 
 void DccFileTransferBandwidthDialog::okClicked()
 {
diff --git a/src/modules/dcc/DccMarshal.cpp b/src/modules/dcc/DccMarshal.cpp
index 9f7b9af34..fa7d2b0b3 100644
--- a/src/modules/dcc/DccMarshal.cpp
+++ b/src/modules/dcc/DccMarshal.cpp
@@ -37,16 +37,16 @@
 #include <QTimer>
 
 DccMarshal::DccMarshal(DccMarshalOutputContext * ctx)
-    : QObject(0)
+    : QObject(nullptr)
 {
 	setObjectName("dcc_marshal");
-	m_pSn = 0;
+	m_pSn = nullptr;
 	m_fd = KVI_INVALID_SOCKET;
-	m_pTimeoutTimer = 0;
+	m_pTimeoutTimer = nullptr;
 	m_bIPv6 = false;
 	m_pOutputContext = ctx;
 #ifdef COMPILE_SSL_SUPPORT
-	m_pSSL = 0;
+	m_pSSL = nullptr;
 #endif
 	m_szIp = "";
 	m_szPort = "";
@@ -70,7 +70,7 @@ kvi_socket_t DccMarshal::releaseSocket()
 KviSSL * DccMarshal::releaseSSL()
 {
 	KviSSL * theSSL = m_pSSL;
-	m_pSSL = 0;
+	m_pSSL = nullptr;
 	return theSSL;
 }
 #endif
@@ -80,7 +80,7 @@ void DccMarshal::reset()
 	if(m_pSn)
 	{
 		delete m_pSn;
-		m_pSn = 0;
+		m_pSn = nullptr;
 	}
 	if(m_fd != KVI_INVALID_SOCKET)
 	{
@@ -93,13 +93,13 @@ void DccMarshal::reset()
 	{
 		//		qDebug("MARSHAL CLEARING THE SSL");
 		KviSSLMaster::freeSSL(m_pSSL);
-		m_pSSL = 0;
+		m_pSSL = nullptr;
 	}
 #endif
 	if(m_pTimeoutTimer)
 	{
 		delete m_pTimeoutTimer;
-		m_pTimeoutTimer = 0;
+		m_pTimeoutTimer = nullptr;
 	}
 	m_bIPv6 = false;
 }
@@ -119,7 +119,7 @@ KviError::Code DccMarshal::dccListen(const QString & ip, const QString & port, b
 	if(m_pTimeoutTimer)
 	{
 		delete m_pTimeoutTimer;
-		m_pTimeoutTimer = 0;
+		m_pTimeoutTimer = nullptr;
 	}
 
 #ifdef COMPILE_SSL_SUPPORT
@@ -287,7 +287,7 @@ void DccMarshal::doListen()
 	if(m_pTimeoutTimer)
 	{
 		delete m_pTimeoutTimer;
-		m_pTimeoutTimer = 0;
+		m_pTimeoutTimer = nullptr;
 	}
 
 	if(m_bUseTimeout)
@@ -329,7 +329,7 @@ void DccMarshal::doConnect()
 	if(m_pTimeoutTimer)
 	{
 		delete m_pTimeoutTimer;
-		m_pTimeoutTimer = 0;
+		m_pTimeoutTimer = nullptr;
 	}
 	// Check the address type
 	if(!KviNetUtils::isValidStringIp(m_szIp))
@@ -432,7 +432,7 @@ void DccMarshal::doConnect()
 	if(m_pTimeoutTimer)
 	{
 		delete m_pTimeoutTimer;
-		m_pTimeoutTimer = 0;
+		m_pTimeoutTimer = nullptr;
 	}
 
 	if(m_bUseTimeout)
@@ -453,7 +453,7 @@ void DccMarshal::snActivated(int)
 	if(m_pTimeoutTimer)
 	{
 		delete m_pTimeoutTimer;
-		m_pTimeoutTimer = 0;
+		m_pTimeoutTimer = nullptr;
 	}
 #ifdef COMPILE_IPV6_SUPPORT
 	struct sockaddr_in6 hostSockAddr6;
@@ -493,7 +493,7 @@ void DccMarshal::snActivated(int)
 		}
 		//Successfully connected...
 		delete m_pSn;
-		m_pSn = 0;
+		m_pSn = nullptr;
 		// get the local address
 		if(!kvi_socket_getsockname(m_fd, addr, &size))
 		{
@@ -528,7 +528,7 @@ void DccMarshal::snActivated(int)
 		{
 			// Connected
 			delete m_pSn;
-			m_pSn = 0;
+			m_pSn = nullptr;
 #ifdef COMPILE_IPV6_SUPPORT
 			if(m_bIPv6)
 			{
@@ -591,7 +591,7 @@ void DccMarshal::doSSLHandshake(int)
 	if(m_pSn)
 	{
 		delete m_pSn;
-		m_pSn = 0;
+		m_pSn = nullptr;
 	}
 
 	if(!m_pSSL)
diff --git a/src/modules/dcc/DccThread.cpp b/src/modules/dcc/DccThread.cpp
index d3ec9af52..45e393b44 100644
--- a/src/modules/dcc/DccThread.cpp
+++ b/src/modules/dcc/DccThread.cpp
@@ -44,7 +44,7 @@ DccThread::DccThread(QObject * par, kvi_socket_t fd)
 	m_pMutex = new KviMutex();
 #ifdef COMPILE_SSL_SUPPORT
 	//	qDebug("CLEARING SSL IN DccThread constructor");
-	m_pSSL = 0;
+	m_pSSL = nullptr;
 #endif
 }
 
@@ -53,7 +53,7 @@ DccThread::~DccThread()
 #ifdef COMPILE_SSL_SUPPORT
 	if(m_pSSL)
 		KviSSLMaster::freeSSL(m_pSSL);
-	m_pSSL = 0;
+	m_pSSL = nullptr;
 #endif
 	if(m_fd != KVI_INVALID_SOCKET)
 		kvi_socket_close(m_fd);
diff --git a/src/modules/dcc/DccVoiceCodec.cpp b/src/modules/dcc/DccVoiceCodec.cpp
index 57be1681e..8b153883a 100644
--- a/src/modules/dcc/DccVoiceCodec.cpp
+++ b/src/modules/dcc/DccVoiceCodec.cpp
@@ -33,8 +33,7 @@ DccVoiceCodec::DccVoiceCodec()
 }
 
 DccVoiceCodec::~DccVoiceCodec()
-{
-}
+    = default;
 
 void DccVoiceCodec::encode(KviDataBuffer *, KviDataBuffer *)
 {
@@ -66,8 +65,7 @@ DccVoiceNullCodec::DccVoiceNullCodec()
 }
 
 DccVoiceNullCodec::~DccVoiceNullCodec()
-{
-}
+    = default;
 
 void DccVoiceNullCodec::encode(KviDataBuffer * signal, KviDataBuffer * stream)
 {
@@ -103,8 +101,7 @@ DccVideoCodec::DccVideoCodec()
 }
 
 DccVideoCodec::~DccVideoCodec()
-{
-}
+    = default;
 
 void DccVideoCodec::encodeVideo(KviDataBuffer *, KviDataBuffer *)
 {
@@ -140,8 +137,7 @@ DccVideoSJpegCodec::DccVideoSJpegCodec()
 }
 
 DccVideoSJpegCodec::~DccVideoSJpegCodec()
-{
-}
+    = default;
 
 void DccVideoSJpegCodec::encodeVideo(KviDataBuffer * videoSignal, KviDataBuffer * stream)
 {
diff --git a/src/modules/dcc/DccVoiceWindow.cpp b/src/modules/dcc/DccVoiceWindow.cpp
index 0a353bfaf..6b5e524af 100644
--- a/src/modules/dcc/DccVoiceWindow.cpp
+++ b/src/modules/dcc/DccVoiceWindow.cpp
@@ -446,7 +446,7 @@ bool DccVoiceThread::soundStep()
 				// have stuff to play, but it's not enough to fill the pre-buffer
 				//
 				struct timeval tv;
-				gettimeofday(&tv, 0);
+				gettimeofday(&tv, nullptr);
 
 				long int sigBufferTime = (tv.tv_sec * 1000) + (tv.tv_usec / 1000);
 
@@ -487,7 +487,7 @@ bool DccVoiceThread::soundStep()
 		struct timeval tv;
 		tv.tv_sec = 0;
 		tv.tv_usec = 10;
-		int ret = select(m_soundFd + 1, &rs, 0, 0, &tv);
+		int ret = select(m_soundFd + 1, &rs, nullptr, nullptr, &tv);
 		if(ret > 0)
 		{
 			// This is rather easy...
@@ -693,7 +693,7 @@ DccVoiceWindow::DccVoiceWindow(DccDescriptor * dcc, const char * name)
     : DccWindow(KviWindow::DccVoice, name, dcc)
 {
 	m_pDescriptor = dcc;
-	m_pSlaveThread = 0;
+	m_pSlaveThread = nullptr;
 
 	m_pSplitter = new KviTalSplitter(Qt::Horizontal, this);
 	m_pSplitter->setObjectName("dcc_window_splitter");
@@ -772,7 +772,7 @@ DccVoiceWindow::~DccVoiceWindow()
 	{
 		m_pSlaveThread->terminate();
 		delete m_pSlaveThread;
-		m_pSlaveThread = 0;
+		m_pSlaveThread = nullptr;
 	}
 
 	KviThreadManager::killPendingEvents(this);
diff --git a/src/modules/dcc/DccWindow.cpp b/src/modules/dcc/DccWindow.cpp
index e9eb2c597..1e07848a1 100644
--- a/src/modules/dcc/DccWindow.cpp
+++ b/src/modules/dcc/DccWindow.cpp
@@ -31,7 +31,7 @@ DccWindow::DccWindow(KviWindow::Type eType, const char * name, DccDescriptor * d
 {
 	m_pDescriptor = d;
 	m_pDescriptor->setWindow(this);
-	m_pMarshal = 0;
+	m_pMarshal = nullptr;
 	m_pButtonBox = new KviTalHBox(this);
 	createTextEncodingButton(m_pButtonBox);
 }
diff --git a/src/modules/dcc/libkvidcc.cpp b/src/modules/dcc/libkvidcc.cpp
index 159ce8026..4095e2002 100644
--- a/src/modules/dcc/libkvidcc.cpp
+++ b/src/modules/dcc/libkvidcc.cpp
@@ -61,7 +61,7 @@
 
 //extern KVIRC_API KviSharedFilesManager * g_pSharedFilesManager;
 
-DccBroker * g_pDccBroker = 0;
+DccBroker * g_pDccBroker = nullptr;
 
 static void dcc_module_set_dcc_type(DccDescriptor * d, const char * szBaseType)
 {
@@ -80,7 +80,7 @@ static bool dcc_kvs_parse_default_parameters(DccDescriptor * d, KviKvsModuleComm
 
 	KviKvsVariant * pSw = c->switches()->find('m', "minimize");
 
-	if(pSw != 0)
+	if(pSw != nullptr)
 		d->bOverrideMinimize = pSw->asBoolean();
 	else
 		d->bOverrideMinimize = false;
@@ -455,7 +455,7 @@ static bool dcc_kvs_cmd_chat(KviKvsModuleCommandCall * c)
 
 	//c->window()->output(0,"%Q %Q %Q",&(d->szIp),&(d->szPort),&(d->szListenIp));
 	d->triggerCreationEvent();
-	g_pDccBroker->executeChat(0, d);
+	g_pDccBroker->executeChat(nullptr, d);
 
 	return true;
 }
@@ -608,7 +608,7 @@ static bool dcc_kvs_cmd_send(KviKvsModuleCommandCall * c)
 	d->szNick = szTarget; // we always specify the nickname
 
 	QString szTmp;
-	KviKvsVariant * pSw = 0;
+	KviKvsVariant * pSw = nullptr;
 
 	if((pSw = c->switches()->find('g', "get")))
 	{
@@ -637,10 +637,10 @@ static bool dcc_kvs_cmd_send(KviKvsModuleCommandCall * c)
 
 	d->szUser = __tr2qs_ctx("unknown", "dcc"); // username is always unknown
 	d->szHost = d->szUser;                     // host is always unknown
-	d->bRecvFile = pSw != 0;
+	d->bRecvFile = pSw != nullptr;
 	d->bNoAcks = c->switches()->find('b', "blind") || c->switches()->find('t', "tdcc");
 	d->bResume = false;
-	d->bAutoAccept = pSw != 0;
+	d->bAutoAccept = pSw != nullptr;
 	d->bIsIncomingAvatar = false;
 
 	if(!dcc_kvs_parse_default_parameters(d, c))
@@ -680,7 +680,7 @@ static bool dcc_kvs_cmd_send(KviKvsModuleCommandCall * c)
 		d->triggerCreationEvent();
 		if(!d->szLocalFileName.isEmpty())
 		{
-			g_pDccBroker->sendFileExecute(0, d);
+			g_pDccBroker->sendFileExecute(nullptr, d);
 		}
 		else
 		{
@@ -1155,7 +1155,7 @@ static bool dcc_kvs_cmd_voice(KviKvsModuleCommandCall * c)
 		d->bActive = true;
 
 		d->triggerCreationEvent();
-		g_pDccBroker->activeVoiceExecute(0, d);
+		g_pDccBroker->activeVoiceExecute(nullptr, d);
 	}
 	else
 	{
@@ -1621,7 +1621,7 @@ static bool dcc_module_cmd_canvas(KviModule *m,KviCommand *c)
 
 static DccDescriptor * dcc_kvs_find_dcc_descriptor(const kvs_uint_t & uId, KviKvsModuleRunTimeCall * c, bool bWarn = true)
 {
-	DccDescriptor * dcc = 0;
+	DccDescriptor * dcc = nullptr;
 	if(uId == 0)
 	{
 		if(c->window()->inherits("DccWindow"))
@@ -2648,7 +2648,7 @@ static bool dcc_kvs_fnc_session(KviKvsModuleFunctionCall * c)
 	KVSM_PARAMETER("window_id", KVS_PT_STRING, KVS_PF_OPTIONAL, szWinId)
 	KVSM_PARAMETERS_END(c)
 
-	DccDescriptor * dcc = 0;
+	DccDescriptor * dcc = nullptr;
 	if(szWinId.isEmpty())
 	{
 		if(c->window()->inherits("DccWindow"))
@@ -2855,7 +2855,7 @@ static bool dcc_kvs_fnc_getSSLCertInfo(KviKvsModuleFunctionCall * c)
 			return true;
 		}
 
-		DccThread * pSlaveThread = 0;
+		DccThread * pSlaveThread = nullptr;
 		if(dcc->window())
 			pSlaveThread = dcc->window()->getSlaveThread();
 		else if(dcc->transfer())
@@ -3004,7 +3004,7 @@ static bool dcc_module_init(KviModule * m)
 static bool dcc_module_cleanup(KviModule *)
 {
 	delete g_pDccBroker;
-	g_pDccBroker = 0;
+	g_pDccBroker = nullptr;
 #ifdef COMPILE_USE_GSM
 	kvi_gsm_codec_done();
 #endif
diff --git a/src/modules/dcc/requests.cpp b/src/modules/dcc/requests.cpp
index d27ea9b65..2fa80d575 100644
--- a/src/modules/dcc/requests.cpp
+++ b/src/modules/dcc/requests.cpp
@@ -307,7 +307,7 @@ static void dccModuleParseDccChat(KviDccRequest * dcc)
 			}
 			d->setZeroPortRequestTag(dcc->szParam4.ptr());
 			QString tmp;
-			if(!dcc_kvs_get_listen_ip_address(0, d->console(), tmp))
+			if(!dcc_kvs_get_listen_ip_address(nullptr, d->console(), tmp))
 				d->szListenIp = "0.0.0.0";
 			else
 				d->szListenIp = tmp;
@@ -521,7 +521,7 @@ static void dccModuleParseDccSend(KviDccRequest * dcc)
 		}
 		d->setZeroPortRequestTag(dcc->szParam5.ptr());
 		QString tmp;
-		if(!dcc_kvs_get_listen_ip_address(0, d->console(), tmp))
+		if(!dcc_kvs_get_listen_ip_address(nullptr, d->console(), tmp))
 			d->szListenIp = "0.0.0.0";
 		else
 			d->szListenIp = QString(tmp);
@@ -706,7 +706,7 @@ static void dccModuleParseDccRecv(KviDccRequest * dcc)
 		d->bActive = true;
 		dcc_module_set_dcc_type(d, "SEND");
 		d->triggerCreationEvent();
-		g_pDccBroker->sendFileExecute(0, d);
+		g_pDccBroker->sendFileExecute(nullptr, d);
 
 		return;
 	}
@@ -801,7 +801,7 @@ static void dccModuleParseDccRSend(KviDccRequest * dcc)
 	d->szIp = __tr2qs_ctx("(unknown)", "dcc");
 	d->szPort = d->szIp;
 	QString tmp;
-	if(!dcc_kvs_get_listen_ip_address(0, d->console(), tmp))
+	if(!dcc_kvs_get_listen_ip_address(nullptr, d->console(), tmp))
 	{
 		d->console()->output(KVI_OUT_DCCMSG,
 		    __tr2qs_ctx("No suitable interface to listen on, trying to continue anyway...", "dcc"));
@@ -949,7 +949,7 @@ static void dccModuleParseDccGet(KviDccRequest * dcc)
 	dcc_fill_local_nick_user_host(d, dcc);
 
 	QString tmp;
-	if(!dcc_kvs_get_listen_ip_address(0, d->console(), tmp))
+	if(!dcc_kvs_get_listen_ip_address(nullptr, d->console(), tmp))
 	{
 		d->console()->output(KVI_OUT_DCCMSG,
 		    __tr2qs_ctx("No suitable interface to listen on, trying to continue anyway...", "dcc"));
@@ -992,7 +992,7 @@ static void dccModuleParseDccGet(KviDccRequest * dcc)
 		    &(o->absFilePath()), &(d->szType));
 	}
 	d->triggerCreationEvent();
-	g_pDccBroker->sendFileExecute(0, d);
+	g_pDccBroker->sendFileExecute(nullptr, d);
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -1246,11 +1246,11 @@ KVIMODULEEXPORTFUNC void dccModuleCtcpDccParseRoutine(KviDccRequest * dcc)
 {
 	dcc->szType.toUpper();
 
-	for(int i = 0; i < KVI_NUM_KNOWN_DCC_TYPES; i++)
+	for(auto & i : dccParseProcTable)
 	{
-		if(kvi_strEqualCS(dccParseProcTable[i].type, dcc->szType.ptr()))
+		if(kvi_strEqualCS(i.type, dcc->szType.ptr()))
 		{
-			(dccParseProcTable[i].proc)(dcc);
+			(i.proc)(dcc);
 			return;
 		}
 	}