Merge pull request #1962 from DarthGandalf/modernize

Apply several fixes of clang-tidy

450 files changed, 3965 insertions, 4288 deletions

diff --git a/src/kvilib/config/KviBuildInfo.cpp b/src/kvilib/config/KviBuildInfo.cpp
index ed1d7b4df..aa4cb3479 100644
--- a/src/kvilib/config/KviBuildInfo.cpp
+++ b/src/kvilib/config/KviBuildInfo.cpp
@@ -90,7 +90,7 @@ const char * feature_array[] = {
 #endif
 	"Qt5",
 	"KVS",
-	0
+	nullptr
 };
 
 namespace KviBuildInfo
diff --git a/src/kvilib/core/KviCString.cpp b/src/kvilib/core/KviCString.cpp
index d68b023ae..bee6a30a0 100644
--- a/src/kvilib/core/KviCString.cpp
+++ b/src/kvilib/core/KviCString.cpp
@@ -210,8 +210,8 @@ bool kvi_matchStringCI(const char * exp, const char * str)
 	// str = arexoxmexamemizazv
 	//                         .
 	//                         n
-	const char * afterWild = 0;
-	const char * nextStrToCheck = 0;
+	const char * afterWild = nullptr;
+	const char * nextStrToCheck = nullptr;
 
 	while(*exp)
 	{
@@ -272,8 +272,8 @@ bool kvi_matchStringCS(const char * exp, const char * str)
 	// str = arexoxmexamemizazv
 	//                         .
 	//                         n
-	const char * afterWild = 0;
-	const char * nextStrToCheck = 0;
+	const char * afterWild = nullptr;
+	const char * nextStrToCheck = nullptr;
 
 	while(*exp)
 	{
@@ -336,8 +336,8 @@ bool kvi_matchStringWithTerminator(const char * exp, const char * str, char term
 	// str = arexoxmexamemizazv
 	//                         .
 	//                         n
-	const char * afterWild = 0;
-	const char * nextStrToCheck = 0;
+	const char * afterWild = nullptr;
+	const char * nextStrToCheck = nullptr;
 
 	while(NOT_AT_END(exp))
 	{
@@ -424,7 +424,7 @@ bool kvi_matchWildExpr(const char * m1, const char * m2)
 
 	if(!(m1 && m2 && (*m1)))
 		return false;
-	const char * savePos1 = 0;
+	const char * savePos1 = nullptr;
 	const char * savePos2 = m2;
 	while(*m1)
 	{
@@ -563,7 +563,7 @@ bool kvi_matchWildExprWithTerminator(const char * m1, const char * m2, char term
 	bool bSwapped = false;
 	if(!(m1 && m2 && (NOT_AT_END(m1))))
 		return false;
-	const char * savePos1 = 0;
+	const char * savePos1 = nullptr;
 	const char * savePos2 = m2;
 	while(NOT_AT_END(m1))
 	{
@@ -1421,7 +1421,7 @@ int KviCString::hexToBuffer(char ** buffer,bool bNullToNewlines)
 
 int KviCString::hexToBuffer(char ** buffer, bool bNullToNewlines)
 {
-	*buffer = 0;
+	*buffer = nullptr;
 	if((m_len == 0) || (m_len & 1))
 		return -1; // this is an error
 	int len = (m_len / 2);
@@ -1440,7 +1440,7 @@ int KviCString::hexToBuffer(char ** buffer, bool bNullToNewlines)
 		if(*ptr == -1)
 		{
 			KviMemory::free(*buffer);
-			*buffer = 0;
+			*buffer = nullptr;
 			return -1;
 		}
 		aux++;
@@ -1448,7 +1448,7 @@ int KviCString::hexToBuffer(char ** buffer, bool bNullToNewlines)
 		if(aux2 == -1)
 		{
 			KviMemory::free(*buffer);
-			*buffer = 0;
+			*buffer = nullptr;
 			return -1;
 		}
 		*ptr += aux2;
@@ -1525,7 +1525,7 @@ static unsigned char get_base64_idx(char base64)
 
 int KviCString::base64ToBuffer(char ** buffer, bool)
 {
-	*buffer = 0;
+	*buffer = nullptr;
 	if((m_len == 0) || (m_len & 3))
 		return -1; // this is an error
 	int len = (m_len >> 2) * 3;
@@ -1545,7 +1545,7 @@ int KviCString::base64ToBuffer(char ** buffer, bool)
 			// ops... there was a padding and we still have chars after it
 			// this is an error
 			KviMemory::free(*buffer);
-			*buffer = 0;
+			*buffer = nullptr;
 			return -1;
 		}
 		aux1 = get_base64_idx(*aux_ptr++);
@@ -1556,14 +1556,14 @@ int KviCString::base64ToBuffer(char ** buffer, bool)
 		{
 			// error
 			KviMemory::free(*buffer);
-			*buffer = 0;
+			*buffer = nullptr;
 			return -1;
 		}
 		if((aux1 | aux2) > 63)
 		{
 			// again error...impossible padding
 			KviMemory::free(*buffer);
-			*buffer = 0;
+			*buffer = nullptr;
 			return -1;
 		}
 		if(aux4 == 64)
@@ -1588,7 +1588,7 @@ int KviCString::base64ToBuffer(char ** buffer, bool)
 			{
 				// error... impossible padding
 				KviMemory::free(*buffer);
-				*buffer = 0;
+				*buffer = nullptr;
 				return -1;
 			}
 			else
@@ -1992,7 +1992,7 @@ KviCString ** KviCString::splitToArray(char sep, int max, int * realCount) const
 	}
 	if(realCount)
 		*realCount = number;
-	strings[number] = 0;
+	strings[number] = nullptr;
 	return strings;
 }
 /*
@@ -2104,7 +2104,7 @@ KviCString & KviCString::hexEncodeWithTable(const unsigned char table[256])
 	char * aux = m_ptr;
 	char * begin = m_ptr;
 
-	char * n = 0;
+	char * n = nullptr;
 	int curSize = 0;
 
 	while(*aux)
@@ -2208,7 +2208,7 @@ KviCString & KviCString::hexDecode(const char * pFrom)
 	const char * aux = pFrom;
 	const char * begin = pFrom;
 
-	char * n = 0;
+	char * n = nullptr;
 	int curSize = 0;
 
 	while(*aux)
diff --git a/src/kvilib/core/KviQString.cpp b/src/kvilib/core/KviQString.cpp
index a8e268419..2be3a4faa 100644
--- a/src/kvilib/core/KviQString.cpp
+++ b/src/kvilib/core/KviQString.cpp
@@ -967,7 +967,7 @@ namespace KviQString
 			return false;
 		}
 
-		const QChar * pSavePos1 = 0;
+		const QChar * pSavePos1 = nullptr;
 		const QChar * pSavePos2 = pM2;
 		while(pM1->unicode())
 		{
diff --git a/src/kvilib/ext/KviAnimatedPixmapCache.cpp b/src/kvilib/ext/KviAnimatedPixmapCache.cpp
index ab972f4ff..746b8118e 100644
--- a/src/kvilib/ext/KviAnimatedPixmapCache.cpp
+++ b/src/kvilib/ext/KviAnimatedPixmapCache.cpp
@@ -30,8 +30,8 @@
 
 #define FRAME_DELAY 100
 
-KviAnimatedPixmapCache * KviAnimatedPixmapCache::m_pInstance = NULL;
-static QPixmap * g_pDummyPixmap = NULL;
+KviAnimatedPixmapCache * KviAnimatedPixmapCache::m_pInstance = nullptr;
+static QPixmap * g_pDummyPixmap = nullptr;
 
 KviAnimatedPixmapCache::KviAnimatedPixmapCache()
 {
@@ -45,9 +45,9 @@ KviAnimatedPixmapCache::~KviAnimatedPixmapCache()
 	if(g_pDummyPixmap)
 	{
 		delete g_pDummyPixmap;
-		g_pDummyPixmap = NULL;
+		g_pDummyPixmap = nullptr;
 	}
-	m_pInstance = NULL;
+	m_pInstance = nullptr;
 }
 
 void KviAnimatedPixmapCache::init()
@@ -62,13 +62,13 @@ void KviAnimatedPixmapCache::done()
 	if(!m_pInstance)
 		return;
 	delete m_pInstance;
-	m_pInstance = NULL;
+	m_pInstance = nullptr;
 }
 
 KviAnimatedPixmapCache::Data * KviAnimatedPixmapCache::internalLoad(const QString & szFile, int iWidth, int iHeight)
 {
 	m_cacheMutex.lock();
-	Data * newData = 0;
+	Data * newData = nullptr;
 
 	QMultiHash<QString, Data *>::iterator i = m_hCache.find(szFile);
 	while(i != m_hCache.end() && i.key() == szFile && !newData)
@@ -114,7 +114,7 @@ KviAnimatedPixmapCache::Data * KviAnimatedPixmapCache::internalResize(Data * dat
 
 	bool hasToBeResized = false;
 
-	Data * newData = 0;
+	Data * newData = nullptr;
 	QMultiHash<QString, Data *>::iterator i = m_hCache.find(data->file);
 	while(i != m_hCache.end() && i.key() == data->file && !newData)
 	{
@@ -229,10 +229,10 @@ void KviAnimatedPixmapCache::timeoutEvent()
 		i = m_timerData.erase(i);
 	}
 
-	for(int i = 0; i < processed.size(); ++i)
+	for(auto i : processed)
 	{
 		// increase the frame index and emit the signal
-		processed.at(i)->nextFrame(true);
+		i->nextFrame(true);
 	}
 
 	// m_timerMutex.unlock();
diff --git a/src/kvilib/ext/KviCommandFormatter.cpp b/src/kvilib/ext/KviCommandFormatter.cpp
index 47a60452b..2ce62246d 100644
--- a/src/kvilib/ext/KviCommandFormatter.cpp
+++ b/src/kvilib/ext/KviCommandFormatter.cpp
@@ -57,11 +57,11 @@ namespace KviCommandFormatter
 	bool hasLeadingChars(QStringList & list, const QChar & c)
 	{
 		bool bGotIt = false;
-		for(QStringList::Iterator it = list.begin(); it != list.end(); ++it)
+		for(auto & it : list)
 		{
-			if((*it).length() < 1)
+			if(it.length() < 1)
 				continue;
-			if((*it).at(0) == c)
+			if(it.at(0) == c)
 			{
 				// found at least one such leading char
 				bGotIt = true;
@@ -69,12 +69,12 @@ namespace KviCommandFormatter
 			else
 			{
 				// we pretend this line to be empty
-				QString szTmp = *it;
+				QString szTmp = it;
 				szTmp = szTmp.trimmed();
 
 				if(!szTmp.isEmpty())
 					return false;
-				*it = ""; // set it to empty also in the main buffer
+				it = ""; // set it to empty also in the main buffer
 			}
 		}
 		return bGotIt;
@@ -92,9 +92,9 @@ namespace KviCommandFormatter
 
 	void trimLeading(QStringList & list)
 	{
-		for(QStringList::Iterator it = list.begin(); it != list.end(); ++it)
+		for(auto & it : list)
 		{
-			(*it).remove(0, 1);
+			it.remove(0, 1);
 		}
 	}
 
@@ -110,9 +110,9 @@ namespace KviCommandFormatter
 
 	void addLeading(QStringList & list, const QChar & c)
 	{
-		for(QStringList::Iterator it = list.begin(); it != list.end(); ++it)
+		for(auto & it : list)
 		{
-			(*it).prepend(c);
+			it.prepend(c);
 		}
 	}
 
@@ -139,9 +139,9 @@ namespace KviCommandFormatter
 		//szBuffer = list.join("\n"); join implementation sux :D
 		// we WANT the last newline
 		szBuffer = "";
-		for(QStringList::Iterator it = list.begin(); it != list.end(); ++it)
+		for(auto & it : list)
 		{
-			szBuffer.append(*it);
+			szBuffer.append(it);
 			szBuffer.append(QChar('\n'));
 		}
 	}
@@ -202,9 +202,9 @@ namespace KviCommandFormatter
 		//szBuffer = list.join("\n"); join implementation sux :D
 		// we WANT the last newline
 		szBuffer = "";
-		for(QStringList::Iterator it = list.begin(); it != list.end(); ++it)
+		for(auto & it : list)
 		{
-			szBuffer.append(*it);
+			szBuffer.append(it);
 			szBuffer.append(QChar('\n'));
 		}
 	}
diff --git a/src/kvilib/ext/KviConfigurationFile.cpp b/src/kvilib/ext/KviConfigurationFile.cpp
index 7a291a5a0..ba016ba33 100644
--- a/src/kvilib/ext/KviConfigurationFile.cpp
+++ b/src/kvilib/ext/KviConfigurationFile.cpp
@@ -140,7 +140,7 @@ bool KviConfigurationFile::load()
 		return false;
 
 	KviCString tmp;
-	KviConfigurationFileGroup * p_group = 0;
+	KviConfigurationFileGroup * p_group = nullptr;
 
 	int iLoadBlockSize = LOAD_BLOCK_SIZE;
 
@@ -588,12 +588,12 @@ void KviConfigurationFile::setGroup(const QString & szGroup)
 bool KviConfigurationFile::hasKey(const QString & szKey)
 {
 	KviConfigurationFileGroup * p_group = getCurrentGroup();
-	return (p_group->find(szKey) != 0);
+	return (p_group->find(szKey) != nullptr);
 }
 
 bool KviConfigurationFile::hasGroup(const QString & szGroup)
 {
-	return (m_pDict->find(szGroup) != 0);
+	return (m_pDict->find(szGroup) != nullptr);
 }
 
 KviConfigurationFileGroup * KviConfigurationFile::getCurrentGroup()
@@ -675,10 +675,10 @@ QList<int> KviConfigurationFile::readIntListEntry(const QString & szKey, const Q
 
 	//qDebug("Got option list for group %s and key %s: %s",m_szGroup.latin1(),szKey.latin1(),p_str->latin1());
 
-	for(QStringList::Iterator it = sl.begin(); it != sl.end(); ++it)
+	for(auto & it : sl)
 	{
 		bool bOk;
-		int iTmp = (*it).toInt(&bOk);
+		int iTmp = it.toInt(&bOk);
 		if(bOk)
 			ret.append(iTmp);
 	}
@@ -691,11 +691,11 @@ void KviConfigurationFile::writeEntry(const QString & szKey, const QList<int> &
 	m_bDirty = true;
 	KviConfigurationFileGroup * p_group = getCurrentGroup();
 	KviCString szData;
-	for(QList<int>::ConstIterator it = list.begin(); it != list.end(); ++it)
+	for(int it : list)
 	{
 		if(szData.hasData())
 			szData.append(',');
-		szData.append(KviCString::Format, "%d", *it);
+		szData.append(KviCString::Format, "%d", it);
 	}
 	//qDebug("Writing option list for group %s and key %s: %s",m_szGroup.latin1(),szKey.latin1(),szData.ptr());
 
diff --git a/src/kvilib/ext/KviCryptEngine.cpp b/src/kvilib/ext/KviCryptEngine.cpp
index 5d3665d25..f31b17cd8 100644
--- a/src/kvilib/ext/KviCryptEngine.cpp
+++ b/src/kvilib/ext/KviCryptEngine.cpp
@@ -151,13 +151,12 @@ KviCryptEngine::KviCryptEngine()
 #ifdef COMPILE_CRYPT_SUPPORT
 	setLastError(__tr2qs("Invalid encryption engine"));
 	m_iMaxEncryptLen = -1; // unlimited
-	m_deallocFunc = 0;
+	m_deallocFunc = nullptr;
 #endif //COMPILE_CRYPT_SUPPORT
 }
 
 KviCryptEngine::~KviCryptEngine()
-{
-}
+    = default;
 
 #ifdef COMPILE_CRYPT_SUPPORT
 
diff --git a/src/kvilib/ext/KviCryptEngineManager.cpp b/src/kvilib/ext/KviCryptEngineManager.cpp
index c17361b29..ffc6e10c5 100644
--- a/src/kvilib/ext/KviCryptEngineManager.cpp
+++ b/src/kvilib/ext/KviCryptEngineManager.cpp
@@ -68,10 +68,10 @@ KviCryptEngine * KviCryptEngineManager::allocateEngine(const QString & szName)
 {
 	KviCryptEngineDescription * pDesc = m_pEngineDict->find(szName);
 	if(!pDesc)
-		return 0;
+		return nullptr;
 	KviCryptEngine * pEngine = pDesc->m_allocFunc();
 	if(!pEngine)
-		return 0;
+		return nullptr;
 	pEngine->m_deallocFunc = pDesc->m_deallocFunc; // remember the dealloc func from now on
 	return pEngine;
 }
diff --git a/src/kvilib/ext/KviDataBuffer.cpp b/src/kvilib/ext/KviDataBuffer.cpp
index 517adfd8a..9a416e74f 100644
--- a/src/kvilib/ext/KviDataBuffer.cpp
+++ b/src/kvilib/ext/KviDataBuffer.cpp
@@ -43,7 +43,7 @@ KviDataBuffer::KviDataBuffer(int uSize, const unsigned char * data)
 KviDataBuffer::KviDataBuffer()
 {
 	m_uSize = 0;
-	m_pData = 0;
+	m_pData = nullptr;
 }
 
 KviDataBuffer::~KviDataBuffer()
@@ -115,7 +115,7 @@ void KviDataBuffer::remove(int uSize)
 	else
 	{
 		KviMemory::free(m_pData);
-		m_pData = 0;
+		m_pData = nullptr;
 	}
 }
 
@@ -129,7 +129,7 @@ void KviDataBuffer::resize(int uSize)
 	else
 	{
 		KviMemory::free(m_pData);
-		m_pData = 0;
+		m_pData = nullptr;
 	}
 	m_uSize = uSize;
 }
diff --git a/src/kvilib/ext/KviMediaManager.cpp b/src/kvilib/ext/KviMediaManager.cpp
index 2c2a1b58b..bc7218ed7 100644
--- a/src/kvilib/ext/KviMediaManager.cpp
+++ b/src/kvilib/ext/KviMediaManager.cpp
@@ -87,7 +87,7 @@ KviMediaType * KviMediaManager::findMediaTypeByIanaType(const char * ianaType)
 			return mt;
 	}
 
-	return 0;
+	return nullptr;
 }
 
 KviMediaType * KviMediaManager::findMediaTypeByFileMask(const char * filemask)
@@ -100,7 +100,7 @@ KviMediaType * KviMediaManager::findMediaTypeByFileMask(const char * filemask)
 			return mt;
 	}
 
-	return 0;
+	return nullptr;
 }
 
 void KviMediaManager::copyMediaType(KviMediaType * dst, KviMediaType * src)
@@ -436,7 +436,7 @@ static KviDefaultMediaType g_defMediaTypes[] = {
 	{ "*.tar.bz2", "", "applicatoin/x-bzip2", "BZipped tarball", "run ark $0" },
 	{ "*.tgz", "", "application/x-gzip", "GZipped tarball", "run ark $0" },
 	{ "*.wav", "", "audio/wav", "Wave audio", "run play $0" },
-	{ 0, 0, 0, 0, 0 }
+	{ nullptr, nullptr, nullptr, nullptr, nullptr }
 };
 
 void KviMediaManager::load(const QString & filename)
diff --git a/src/kvilib/ext/KviMessageTypeSettings.cpp b/src/kvilib/ext/KviMessageTypeSettings.cpp
index cda5365e2..2b40515e8 100644
--- a/src/kvilib/ext/KviMessageTypeSettings.cpp
+++ b/src/kvilib/ext/KviMessageTypeSettings.cpp
@@ -50,17 +50,7 @@ KviMessageTypeSettings::KviMessageTypeSettings(const KviMessageTypeSettings & ms
 }
 
 KviMessageTypeSettings::~KviMessageTypeSettings()
-{
-}
+    = default;
 
 KviMessageTypeSettings & KviMessageTypeSettings::operator=(const KviMessageTypeSettings & msg)
-{
-	//if(m_szType.ptr() == msg.m_szType.ptr())return (*this); // self assignment (!!!)
-	m_szType = msg.m_szType;
-	m_iPixId = msg.m_iPixId;
-	m_cForeColor = msg.m_cForeColor;
-	m_cBackColor = msg.m_cBackColor;
-	m_bLogEnabled = msg.m_bLogEnabled;
-	m_iLevel = msg.m_iLevel;
-	return (*this);
-}
+    = default;
diff --git a/src/kvilib/ext/KviMiscUtils.cpp b/src/kvilib/ext/KviMiscUtils.cpp
index f7cd1a007..3a147ebe4 100644
--- a/src/kvilib/ext/KviMiscUtils.cpp
+++ b/src/kvilib/ext/KviMiscUtils.cpp
@@ -71,10 +71,10 @@ namespace KviMiscUtils
 		if(sl.isEmpty())
 			return false;
 		// must all be numbers
-		for(QStringList::Iterator it = sl.begin(); it != sl.end(); ++it)
+		for(auto & it : sl)
 		{
 			bool bOk;
-			int i = (*it).toInt(&bOk);
+			int i = it.toInt(&bOk);
 			if(!bOk)
 				return false;
 			if(i < 0)
diff --git a/src/kvilib/ext/KviPixmap.cpp b/src/kvilib/ext/KviPixmap.cpp
index bc5605c0a..5fe1738a7 100644
--- a/src/kvilib/ext/KviPixmap.cpp
+++ b/src/kvilib/ext/KviPixmap.cpp
@@ -28,18 +28,18 @@
 
 KviPixmap::KviPixmap()
 {
-	m_pPix = 0;
+	m_pPix = nullptr;
 }
 
 KviPixmap::KviPixmap(const char * path)
 {
-	m_pPix = 0;
+	m_pPix = nullptr;
 	load(path);
 }
 
 KviPixmap::KviPixmap(const KviPixmap & pix)
 {
-	m_pPix = 0;
+	m_pPix = nullptr;
 	m_szPath = pix.path();
 
 	if(!m_szPath.isEmpty())
@@ -56,7 +56,7 @@ KviPixmap::~KviPixmap()
 	if(m_pPix)
 	{
 		delete m_pPix;
-		m_pPix = 0; // just to be sure :)
+		m_pPix = nullptr; // just to be sure :)
 	}
 }
 
@@ -65,7 +65,7 @@ bool KviPixmap::load(const char * path)
 	if(m_pPix)
 	{
 		delete m_pPix;
-		m_pPix = 0;
+		m_pPix = nullptr;
 	}
 	m_szPath = path;
 	if(m_szPath.isEmpty())
@@ -76,7 +76,7 @@ bool KviPixmap::load(const char * path)
 	if(m_pPix->isNull())
 	{
 		delete m_pPix;
-		m_pPix = 0;
+		m_pPix = nullptr;
 		m_szPath = "";
 		return false;
 	}
@@ -88,7 +88,7 @@ bool KviPixmap::load(const QString & path)
 	if(m_pPix)
 	{
 		delete m_pPix;
-		m_pPix = 0;
+		m_pPix = nullptr;
 	}
 	m_szPath = path;
 	if(m_szPath.isEmpty())
@@ -99,7 +99,7 @@ bool KviPixmap::load(const QString & path)
 	if(m_pPix->isNull())
 	{
 		delete m_pPix;
-		m_pPix = 0;
+		m_pPix = nullptr;
 		m_szPath = "";
 		return false;
 	}
@@ -125,7 +125,7 @@ void KviPixmap::setNull()
 	if(m_pPix)
 	{
 		delete m_pPix;
-		m_pPix = 0;
+		m_pPix = nullptr;
 	}
 	m_szPath = "";
 }
@@ -140,7 +140,7 @@ KviPixmap & KviPixmap::operator=(const KviPixmap & pix)
 	if(m_pPix)
 	{
 		delete m_pPix;
-		m_pPix = 0;
+		m_pPix = nullptr;
 	}
 	m_szPath = pix.path();
 
diff --git a/src/kvilib/ext/KviProxy.cpp b/src/kvilib/ext/KviProxy.cpp
index 702f9a120..c5729c631 100644
--- a/src/kvilib/ext/KviProxy.cpp
+++ b/src/kvilib/ext/KviProxy.cpp
@@ -48,8 +48,7 @@ KviProxy::KviProxy(const KviProxy & prx)
 }
 
 KviProxy::~KviProxy()
-{
-}
+    = default;
 
 static const QString proxy_protocols_table[3] = { "SOCKSv4", "SOCKSv5", "HTTP" };
 
@@ -83,8 +82,8 @@ void KviProxy::setNamedProtocol(const char * proto)
 
 void KviProxy::getSupportedProtocolNames(QStringList & buf)
 {
-	for(int i = 0; i < 3; i++)
-		buf.append(QString(proxy_protocols_table[i]));
+	for(const auto & i : proxy_protocols_table)
+		buf.append(QString(i));
 }
 
 void KviProxy::normalizeUserAndPass()
diff --git a/src/kvilib/ext/KviProxyDataBase.cpp b/src/kvilib/ext/KviProxyDataBase.cpp
index 5ae2de6e8..2fed69f3b 100644
--- a/src/kvilib/ext/KviProxyDataBase.cpp
+++ b/src/kvilib/ext/KviProxyDataBase.cpp
@@ -30,7 +30,7 @@ KviProxyDataBase::KviProxyDataBase()
 {
 	m_pProxyList = new KviPointerList<KviProxy>;
 	m_pProxyList->setAutoDelete(true);
-	m_pCurrentProxy = 0;
+	m_pCurrentProxy = nullptr;
 }
 
 KviProxyDataBase::~KviProxyDataBase()
@@ -65,7 +65,7 @@ KviProxy * KviProxyDataBase::findProxy(const KviProxy * pProxy, bool bName)
 				return p;
 		}
 	}
-	return 0;
+	return nullptr;
 }
 
 void KviProxyDataBase::clear()
@@ -73,7 +73,7 @@ void KviProxyDataBase::clear()
 	delete m_pProxyList;
 	m_pProxyList = new KviPointerList<KviProxy>;
 	m_pProxyList->setAutoDelete(true);
-	m_pCurrentProxy = 0;
+	m_pCurrentProxy = nullptr;
 }
 
 void KviProxyDataBase::load(const QString & filename)
diff --git a/src/kvilib/ext/KviRegisteredChannelDataBase.cpp b/src/kvilib/ext/KviRegisteredChannelDataBase.cpp
index 01e03dd3e..12836d9e1 100644
--- a/src/kvilib/ext/KviRegisteredChannelDataBase.cpp
+++ b/src/kvilib/ext/KviRegisteredChannelDataBase.cpp
@@ -92,7 +92,7 @@ KviRegisteredChannel * KviRegisteredChannelDataBase::find(const QString & name,
 	KviRegisteredChannelList * l = m_pChannelDict->value(name);
 
 	if(!l)
-		return 0;
+		return nullptr;
 
 	for(KviRegisteredChannel * c = l->first(); c; c = l->next())
 	{
@@ -100,7 +100,7 @@ KviRegisteredChannel * KviRegisteredChannelDataBase::find(const QString & name,
 			return c;
 	}
 
-	return 0;
+	return nullptr;
 }
 
 KviRegisteredChannel * KviRegisteredChannelDataBase::findExact(const QString & name, const QString & netmask)
@@ -108,7 +108,7 @@ KviRegisteredChannel * KviRegisteredChannelDataBase::findExact(const QString & n
 	KviRegisteredChannelList * l = m_pChannelDict->value(name);
 
 	if(!l)
-		return 0;
+		return nullptr;
 
 	for(KviRegisteredChannel * c = l->first(); c; c = l->next())
 	{
@@ -116,7 +116,7 @@ KviRegisteredChannel * KviRegisteredChannelDataBase::findExact(const QString & n
 			return c;
 	}
 
-	return 0;
+	return nullptr;
 }
 
 void KviRegisteredChannelDataBase::remove(KviRegisteredChannel * c)
diff --git a/src/kvilib/ext/KviRegisteredUser.cpp b/src/kvilib/ext/KviRegisteredUser.cpp
index a2bab964b..6cffad003 100644
--- a/src/kvilib/ext/KviRegisteredUser.cpp
+++ b/src/kvilib/ext/KviRegisteredUser.cpp
@@ -32,7 +32,7 @@ KviRegisteredUser::KviRegisteredUser(const QString & name)
 	m_iIgnoreFlags = 0;
 	m_bIgnoreEnabled = false;
 	m_szName = name;
-	m_pPropertyDict = 0;
+	m_pPropertyDict = nullptr;
 	m_pMaskList = new KviPointerList<KviIrcMask>;
 	m_pMaskList->setAutoDelete(true);
 }
@@ -58,7 +58,7 @@ KviIrcMask * KviRegisteredUser::findMask(const KviIrcMask & mask)
 		if(*m == mask)
 			return m;
 	}
-	return 0;
+	return nullptr;
 }
 
 bool KviRegisteredUser::addMask(KviIrcMask * mask)
@@ -66,7 +66,7 @@ bool KviRegisteredUser::addMask(KviIrcMask * mask)
 	if(findMask(*mask))
 	{
 		delete mask;
-		mask = 0;
+		mask = nullptr;
 		return false;
 	}
 	m_pMaskList->append(mask);
@@ -133,7 +133,7 @@ void KviRegisteredUser::setProperty(const QString & name, const QString & value)
 		else
 		{
 			delete val;
-			val = 0;
+			val = nullptr;
 		}
 	}
 	else
diff --git a/src/kvilib/ext/KviRegisteredUserDataBase.cpp b/src/kvilib/ext/KviRegisteredUserDataBase.cpp
index bc0f64c19..534907ce8 100644
--- a/src/kvilib/ext/KviRegisteredUserDataBase.cpp
+++ b/src/kvilib/ext/KviRegisteredUserDataBase.cpp
@@ -116,7 +116,7 @@
 		It provides a set of commands for adding and removing masks and manipulating properties.[br]
 */
 
-KVILIB_API KviRegisteredUserDataBase * g_pRegisteredUserDataBase = 0;
+KVILIB_API KviRegisteredUserDataBase * g_pRegisteredUserDataBase = nullptr;
 
 //============================================================================================================
 //
@@ -150,9 +150,9 @@ KviRegisteredUserDataBase::~KviRegisteredUserDataBase()
 KviRegisteredUser * KviRegisteredUserDataBase::addUser(const QString & name)
 {
 	if(name.isEmpty())
-		return 0;
+		return nullptr;
 	if(m_pUserDict->find(name))
-		return 0;
+		return nullptr;
 	KviRegisteredUser * u = new KviRegisteredUser(name);
 	m_pUserDict->replace(u->name(), u); //u->name() because we're NOT copying keys!
 	emit(userAdded(name));
@@ -162,9 +162,9 @@ KviRegisteredUser * KviRegisteredUserDataBase::addUser(const QString & name)
 KviRegisteredUserGroup * KviRegisteredUserDataBase::addGroup(const QString & name)
 {
 	if(name.isEmpty())
-		return 0;
+		return nullptr;
 	if(m_pGroupDict->find(name))
-		return 0;
+		return nullptr;
 	KviRegisteredUserGroup * pGroup = new KviRegisteredUserGroup(name);
 	m_pGroupDict->replace(pGroup->name(), pGroup); //u->name() because we're NOT copying keys!
 	return pGroup;
@@ -173,7 +173,7 @@ KviRegisteredUserGroup * KviRegisteredUserDataBase::addGroup(const QString & nam
 KviRegisteredUser * KviRegisteredUserDataBase::getUser(const QString & name)
 {
 	if(name.isEmpty())
-		return 0;
+		return nullptr;
 	KviRegisteredUser * u = m_pUserDict->find(name);
 	if(!u)
 	{
@@ -202,7 +202,7 @@ static void append_mask_to_list(KviRegisteredUserMaskList * l, KviRegisteredUser
 KviRegisteredUser * KviRegisteredUserDataBase::addMask(KviRegisteredUser * u, KviIrcMask * mask)
 {
 	if(!u || !mask)
-		return 0;
+		return nullptr;
 	KVI_ASSERT(u == m_pUserDict->find(u->name()));
 
 	KviRegisteredUserMaskList * l;
@@ -213,7 +213,7 @@ KviRegisteredUser * KviRegisteredUserDataBase::addMask(KviRegisteredUser * u, Kv
 			if(*(m->mask()) == *mask)
 			{
 				delete mask;
-				mask = 0;
+				mask = nullptr;
 				return m->user();
 			}
 		}
@@ -232,7 +232,7 @@ KviRegisteredUser * KviRegisteredUserDataBase::addMask(KviRegisteredUser * u, Kv
 				if(*(m->mask()) == *mask)
 				{
 					delete mask;
-					mask = 0;
+					mask = nullptr;
 					return m->user();
 				}
 			}
@@ -248,24 +248,24 @@ KviRegisteredUser * KviRegisteredUserDataBase::addMask(KviRegisteredUser * u, Kv
 			{
 				qDebug("Oops! Received an incoherent regusers action, recovered?");
 				delete l;
-				l = 0;
+				l = nullptr;
 			}
 			else
 			{
 				append_mask_to_list(l, u, mask);
 				m_pMaskDict->insert(mask->nick(), l);
 			}
-			return 0;
+			return nullptr;
 		}
 	}
 	// Ok...add it
 	if(!u->addMask(mask))
 	{
 		qDebug("Oops! Received an incoherent regusers action, recovered?");
-		return 0; // ops...already there ?
+		return nullptr; // ops...already there ?
 	}
 	append_mask_to_list(l, u, mask);
-	return 0;
+	return nullptr;
 }
 
 void KviRegisteredUserDataBase::copyFrom(KviRegisteredUserDataBase * db)
@@ -424,14 +424,14 @@ KviRegisteredUser * KviRegisteredUserDataBase::findMatchingUser(const QString &
 	KviRegisteredUserMask * m = findMatchingMask(nick, user, host);
 	if(m)
 		return m->user();
-	return 0; // no match at all
+	return nullptr; // no match at all
 }
 
 KviRegisteredUserMask * KviRegisteredUserDataBase::findMatchingMask(const QString & nick, const QString & user, const QString & host)
 {
 	// first lookup the nickname in the maskDict
 	if(nick.isEmpty())
-		return 0;
+		return nullptr;
 	KviRegisteredUserMaskList * l = m_pMaskDict->find(nick);
 	if(l)
 	{
@@ -447,7 +447,7 @@ KviRegisteredUserMask * KviRegisteredUserDataBase::findMatchingMask(const QStrin
 		if(m->mask()->matchesFixed(nick, user, host))
 			return m;
 	}
-	return 0; // no match at all
+	return nullptr; // no match at all
 }
 
 KviRegisteredUser * KviRegisteredUserDataBase::findUserWithMask(const KviIrcMask & mask)
@@ -455,14 +455,14 @@ KviRegisteredUser * KviRegisteredUserDataBase::findUserWithMask(const KviIrcMask
 	KviRegisteredUserMask * m = findExactMask(mask);
 	if(m)
 		return m->user();
-	return 0;
+	return nullptr;
 }
 
 KviRegisteredUserMask * KviRegisteredUserDataBase::findExactMask(const KviIrcMask & mask)
 {
 	// first lookup the nickname in the maskDict
 	if(mask.nick() == "")
-		return 0;
+		return nullptr;
 	KviRegisteredUserMaskList * l = m_pMaskDict->find(mask.nick());
 	if(l)
 	{
@@ -478,7 +478,7 @@ KviRegisteredUserMask * KviRegisteredUserDataBase::findExactMask(const KviIrcMas
 		if(*(m->mask()) == mask)
 			return m;
 	}
-	return 0; // no match at all
+	return nullptr; // no match at all
 }
 /*
 bool KviRegisteredUserDataBase::isIgnoredUser(const QString & nick,const QString & user,const QString & host)
diff --git a/src/kvilib/ext/KviRegisteredUserGroup.cpp b/src/kvilib/ext/KviRegisteredUserGroup.cpp
index f7254ced0..2bef321c0 100644
--- a/src/kvilib/ext/KviRegisteredUserGroup.cpp
+++ b/src/kvilib/ext/KviRegisteredUserGroup.cpp
@@ -30,5 +30,4 @@ KviRegisteredUserGroup::KviRegisteredUserGroup(const QString & szName)
 }
 
 KviRegisteredUserGroup::~KviRegisteredUserGroup()
-{
-}
+    = default;
diff --git a/src/kvilib/ext/KviRuntimeInfo.cpp b/src/kvilib/ext/KviRuntimeInfo.cpp
index 2cfa1eb74..41838c04e 100644
--- a/src/kvilib/ext/KviRuntimeInfo.cpp
+++ b/src/kvilib/ext/KviRuntimeInfo.cpp
@@ -38,8 +38,7 @@
 #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
 #include <winsock2.h>
 
-typedef enum _QueryInfo
-{
+typedef enum _QueryInfo {
 	Os_Release,
 	Os_Version,
 	Os_Type
diff --git a/src/kvilib/ext/KviSharedFile.cpp b/src/kvilib/ext/KviSharedFile.cpp
index c074cb60c..29127bf26 100644
--- a/src/kvilib/ext/KviSharedFile.cpp
+++ b/src/kvilib/ext/KviSharedFile.cpp
@@ -37,5 +37,4 @@ KviSharedFile::KviSharedFile(const QString & szName, const QString & szAbsPath,
 }
 
 KviSharedFile::~KviSharedFile()
-{
-}
+    = default;
diff --git a/src/kvilib/ext/KviSharedFilesManager.cpp b/src/kvilib/ext/KviSharedFilesManager.cpp
index 67b13b458..5c070b529 100644
--- a/src/kvilib/ext/KviSharedFilesManager.cpp
+++ b/src/kvilib/ext/KviSharedFilesManager.cpp
@@ -96,7 +96,7 @@ KviSharedFilesManager::~KviSharedFilesManager()
 void KviSharedFilesManager::cleanup()
 {
 	KviPointerHashTableIterator<QString, KviSharedFileList> it(*m_pSharedListDict);
-	time_t curTime = time(0);
+	time_t curTime = time(nullptr);
 
 	bool bOtherStuffToCleanup = false;
 	//bool bChanged = false;
@@ -242,7 +242,7 @@ KviSharedFile * KviSharedFilesManager::addSharedFile(const QString & szName, con
 		}
 
 		// Now insert
-		KviSharedFile * o = new KviSharedFile(szName, szAbsPath, szMask, timeoutInSecs > 0 ? (((int)(time(0))) + timeoutInSecs) : 0, inf.size());
+		KviSharedFile * o = new KviSharedFile(szName, szAbsPath, szMask, timeoutInSecs > 0 ? (((int)(time(nullptr))) + timeoutInSecs) : 0, inf.size());
 
 		doInsert(l, o);
 
@@ -259,7 +259,7 @@ KviSharedFile * KviSharedFilesManager::addSharedFile(const QString & szName, con
 	else
 	{
 		qDebug("File %s unreadable: can't add offer", szAbsPath.toUtf8().data());
-		return 0;
+		return nullptr;
 	}
 }
 
@@ -267,7 +267,7 @@ KviSharedFile * KviSharedFilesManager::lookupSharedFile(const QString & szName,
 {
 	KviSharedFileList * l = m_pSharedListDict->find(szName);
 	if(!l)
-		return 0;
+		return nullptr;
 
 	for(KviSharedFile * o = l->first(); o; o = l->next())
 	{
@@ -291,7 +291,7 @@ KviSharedFile * KviSharedFilesManager::lookupSharedFile(const QString & szName,
 		}
 	}
 
-	return 0;
+	return nullptr;
 }
 bool KviSharedFilesManager::removeSharedFile(const QString & szName, const QString & szMask, unsigned int uFileSize)
 {
diff --git a/src/kvilib/ext/KviStringConversion.cpp b/src/kvilib/ext/KviStringConversion.cpp
index 5e5e6b0d1..cfbdf8acb 100644
--- a/src/kvilib/ext/KviStringConversion.cpp
+++ b/src/kvilib/ext/KviStringConversion.cpp
@@ -87,14 +87,14 @@ namespace KviStringConversion
 
 	void encodePath(QStringList & buffer)
 	{
-		for(QStringList::Iterator it = buffer.begin(); it != buffer.end(); ++it)
-			encodePath(*it);
+		for(auto & it : buffer)
+			encodePath(it);
 	}
 
 	void decodePath(QStringList & buffer)
 	{
-		for(QStringList::Iterator it = buffer.begin(); it != buffer.end(); ++it)
-			decodePath(*it);
+		for(auto & it : buffer)
+			decodePath(it);
 	}
 
 	void toString(const bool bValue, QString & szBuffer)
diff --git a/src/kvilib/file/KviFile.cpp b/src/kvilib/file/KviFile.cpp
index 1d19cb653..e285ed13d 100644
--- a/src/kvilib/file/KviFile.cpp
+++ b/src/kvilib/file/KviFile.cpp
@@ -39,8 +39,7 @@ KviFile::KviFile(const QString & szName)
 }
 
 KviFile::~KviFile()
-{
-}
+    = default;
 
 bool KviFile::save(kvi_u8_t t)
 {
@@ -186,7 +185,7 @@ bool KviFile::load(KviPointerList<KviCString> * pData)
 		if(!load(*s))
 		{
 			delete s;
-			s = 0;
+			s = nullptr;
 			return false;
 		}
 		pData->append(s);
diff --git a/src/kvilib/file/KviFileUtils.cpp b/src/kvilib/file/KviFileUtils.cpp
index 6e4fe6b05..ed1fef7f1 100644
--- a/src/kvilib/file/KviFileUtils.cpp
+++ b/src/kvilib/file/KviFileUtils.cpp
@@ -351,13 +351,13 @@ namespace KviFileUtils
 		if(f.read(pcBuf, f.size()) != ((long int)f.size()))
 		{
 			delete[] pcBuf;
-			pcBuf = 0;
+			pcBuf = nullptr;
 			return false;
 		}
 		pcBuf[f.size()] = '\0';
 		szBuffer = QString::fromUtf8(pcBuf);
 		delete[] pcBuf;
-		pcBuf = 0;
+		pcBuf = nullptr;
 		return true;
 	}
 
@@ -450,9 +450,9 @@ namespace KviFileUtils
 	{
 		QString szSrc(szPath);
 		szPath = "";
-		for(int i = 0; i < szSrc.length(); i++)
+		for(const auto & i : szSrc)
 		{
-			QChar cur = szSrc[i];
+			QChar cur = i;
 			if(!(cur.isLetter() || cur.isDigit() || cur == ' ' || cur == '_' || cur == '.' || cur == '#' || cur == '%'))
 			{
 				if(cur.row() != 0)
@@ -480,9 +480,9 @@ namespace KviFileUtils
 	{
 		QString szSrc(szPath);
 		szPath = "";
-		for(int i = 0; i < szSrc.length(); i++)
+		for(const auto & i : szSrc)
 		{
-			QChar cur = szSrc[i];
+			QChar cur = i;
 #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
 			if(cur.unicode() < 32 || cur == '<' || cur == '>' || cur == ':' || cur == '"' || cur == '/' || cur == '\\' || cur == '|' || cur == '?' || cur == '*')
 #else
diff --git a/src/kvilib/file/KviPackageIOEngine.cpp b/src/kvilib/file/KviPackageIOEngine.cpp
index 8cd38d6a1..5dcfde4ca 100644
--- a/src/kvilib/file/KviPackageIOEngine.cpp
+++ b/src/kvilib/file/KviPackageIOEngine.cpp
@@ -99,7 +99,7 @@
 
 KviPackageIOEngine::KviPackageIOEngine()
 {
-	m_pProgressDialog = 0;
+	m_pProgressDialog = nullptr;
 	m_pStringInfoFields = new KviPointerHashTable<QString, QString>();
 	m_pStringInfoFields->setAutoDelete(true);
 	m_pBinaryInfoFields = new KviPointerHashTable<QString, QByteArray>();
@@ -132,7 +132,7 @@ bool KviPackageIOEngine::updateProgress(int iProgress, const QString & szLabel)
 
 void KviPackageIOEngine::showProgressDialog(const QString & szCaption, int iTotalSteps)
 {
-	m_pProgressDialog = new QProgressDialog(QString(""), __tr2qs("Cancel"), 0, iTotalSteps, 0);
+	m_pProgressDialog = new QProgressDialog(QString(""), __tr2qs("Cancel"), 0, iTotalSteps, nullptr);
 	m_pProgressDialog->setModal(true);
 	m_pProgressDialog->setWindowTitle(szCaption);
 
@@ -146,7 +146,7 @@ void KviPackageIOEngine::hideProgressDialog()
 	if(!m_pProgressDialog)
 		return;
 	delete m_pProgressDialog;
-	m_pProgressDialog = 0;
+	m_pProgressDialog = nullptr;
 }
 
 bool KviPackageIOEngine::writeError()
diff --git a/src/kvilib/file/KviPackageReader.cpp b/src/kvilib/file/KviPackageReader.cpp
index 6da01c703..ed16432c3 100644
--- a/src/kvilib/file/KviPackageReader.cpp
+++ b/src/kvilib/file/KviPackageReader.cpp
@@ -44,8 +44,7 @@ KviPackageReader::KviPackageReader()
 }
 
 KviPackageReader::~KviPackageReader()
-{
-}
+    = default;
 
 bool KviPackageReader::readHeaderInternal(KviFile * pFile, const QString &)
 {
diff --git a/src/kvilib/irc/KviAvatarCache.cpp b/src/kvilib/irc/KviAvatarCache.cpp
index 22d9db2b9..3b1ed37a8 100644
--- a/src/kvilib/irc/KviAvatarCache.cpp
+++ b/src/kvilib/irc/KviAvatarCache.cpp
@@ -35,7 +35,7 @@
 // keep the unaccessed avatars for 30 days
 #define MAX_UNACCESSED_TIME (3600 * 24 * 30)
 
-KviAvatarCache * KviAvatarCache::m_pAvatarCacheInstance = 0;
+KviAvatarCache * KviAvatarCache::m_pAvatarCacheInstance = nullptr;
 
 void KviAvatarCache::init()
 {
@@ -57,7 +57,7 @@ void KviAvatarCache::done()
 	}
 
 	delete m_pAvatarCacheInstance;
-	m_pAvatarCacheInstance = 0;
+	m_pAvatarCacheInstance = nullptr;
 }
 
 KviAvatarCache::KviAvatarCache()
diff --git a/src/kvilib/irc/KviIdentityProfile.cpp b/src/kvilib/irc/KviIdentityProfile.cpp
index 943504ee0..4c7c312e2 100644
--- a/src/kvilib/irc/KviIdentityProfile.cpp
+++ b/src/kvilib/irc/KviIdentityProfile.cpp
@@ -31,8 +31,7 @@ KviIdentityProfile::KviIdentityProfile()
 }
 
 KviIdentityProfile::~KviIdentityProfile()
-{
-}
+    = default;
 
 void KviIdentityProfile::copyFrom(const KviIdentityProfile & src)
 {
diff --git a/src/kvilib/irc/KviIdentityProfileSet.cpp b/src/kvilib/irc/KviIdentityProfileSet.cpp
index 73121866d..1c10e1c2c 100644
--- a/src/kvilib/irc/KviIdentityProfileSet.cpp
+++ b/src/kvilib/irc/KviIdentityProfileSet.cpp
@@ -25,19 +25,19 @@
 #include "KviIdentityProfileSet.h"
 #include "KviConfigurationFile.h"
 
-KviIdentityProfileSet * KviIdentityProfileSet::m_pSelf = NULL;
+KviIdentityProfileSet * KviIdentityProfileSet::m_pSelf = nullptr;
 unsigned int KviIdentityProfileSet::m_uCount = 0;
 
 KviIdentityProfileSet::KviIdentityProfileSet()
     : KviHeapObject()
 {
 	m_bEnabled = false;
-	m_pProfiles = 0;
+	m_pProfiles = nullptr;
 }
 
 KviIdentityProfileSet::KviIdentityProfileSet(const KviIdentityProfileSet & set)
 {
-	m_pProfiles = 0;
+	m_pProfiles = nullptr;
 	copyFrom(set);
 }
 
@@ -68,7 +68,7 @@ void KviIdentityProfileSet::clear()
 	if(m_pProfiles)
 	{
 		delete m_pProfiles;
-		m_pProfiles = 0;
+		m_pProfiles = nullptr;
 	}
 	m_bEnabled = false;
 }
@@ -76,7 +76,7 @@ void KviIdentityProfileSet::clear()
 KviIdentityProfile * KviIdentityProfileSet::findName(const QString & szName)
 {
 	if(!m_pProfiles)
-		return 0;
+		return nullptr;
 
 	KviIdentityProfile * pProfile;
 	for(pProfile = m_pProfiles->first(); pProfile; pProfile = m_pProfiles->next())
@@ -85,13 +85,13 @@ KviIdentityProfile * KviIdentityProfileSet::findName(const QString & szName)
 			return pProfile;
 	}
 
-	return 0;
+	return nullptr;
 }
 
 KviIdentityProfile * KviIdentityProfileSet::findNetwork(const QString & szNetwork)
 {
 	if(!m_pProfiles)
-		return 0;
+		return nullptr;
 
 	KviIdentityProfile * pProfile;
 	for(pProfile = m_pProfiles->first(); pProfile; pProfile = m_pProfiles->next())
@@ -100,7 +100,7 @@ KviIdentityProfile * KviIdentityProfileSet::findNetwork(const QString & szNetwor
 			return pProfile;
 	}
 
-	return 0;
+	return nullptr;
 }
 
 void KviIdentityProfileSet::copyFrom(const KviIdentityProfileSet & src)
@@ -126,7 +126,7 @@ void KviIdentityProfileSet::copyFrom(const KviIdentityProfileSet & src)
 		{
 			m_bEnabled = false;
 			delete m_pProfiles;
-			m_pProfiles = 0;
+			m_pProfiles = nullptr;
 		}
 		else
 		{
@@ -139,7 +139,7 @@ void KviIdentityProfileSet::copyFrom(const KviIdentityProfileSet & src)
 		if(m_pProfiles)
 		{
 			delete m_pProfiles;
-			m_pProfiles = 0;
+			m_pProfiles = nullptr;
 		}
 	}
 }
@@ -231,7 +231,7 @@ bool KviIdentityProfileSet::loadPrivate(KviConfigurationFile * pCfg, const QStri
 	{
 		m_bEnabled = false;
 		delete m_pProfiles;
-		m_pProfiles = 0;
+		m_pProfiles = nullptr;
 		return false;
 	}
 	return true;
diff --git a/src/kvilib/irc/KviIrcNetwork.cpp b/src/kvilib/irc/KviIrcNetwork.cpp
index 3e828331b..ef80ce02c 100644
--- a/src/kvilib/irc/KviIrcNetwork.cpp
+++ b/src/kvilib/irc/KviIrcNetwork.cpp
@@ -28,8 +28,8 @@
 
 KviIrcNetwork::KviIrcNetwork(const KviIrcNetwork & src)
 {
-	m_pChannelList = 0;
-	m_pNickServRuleSet = 0;
+	m_pChannelList = nullptr;
+	m_pNickServRuleSet = nullptr;
 	m_pServerList = new KviPointerList<KviIrcServer>;
 	m_pServerList->setAutoDelete(true);
 	copyFrom(src);
@@ -38,12 +38,12 @@ KviIrcNetwork::KviIrcNetwork(const KviIrcNetwork & src)
 KviIrcNetwork::KviIrcNetwork(const QString & name)
 {
 	m_szName = name;
-	m_pChannelList = 0;
-	m_pNickServRuleSet = 0;
+	m_pChannelList = nullptr;
+	m_pNickServRuleSet = nullptr;
 	m_bAutoConnect = false;
 	m_pServerList = new KviPointerList<KviIrcServer>;
 	m_pServerList->setAutoDelete(true);
-	m_pCurrentServer = 0;
+	m_pCurrentServer = nullptr;
 }
 
 KviIrcNetwork::~KviIrcNetwork()
@@ -68,7 +68,7 @@ void KviIrcNetwork::setAutoJoinChannelList(const QString & szNewChannelList)
 		delete m_pChannelList;
 	QStringList lChans = szNewChannelList.split(",");
 	if(lChans.isEmpty())
-		m_pChannelList = NULL;
+		m_pChannelList = nullptr;
 	else
 		m_pChannelList = new QStringList(lChans);
 }
@@ -100,13 +100,13 @@ void KviIrcNetwork::copyFrom(const KviIrcNetwork & src)
 	if(src.m_pChannelList)
 		m_pChannelList = new QStringList(*(src.m_pChannelList));
 	else
-		m_pChannelList = 0;
+		m_pChannelList = nullptr;
 	if(m_pNickServRuleSet)
 		delete m_pNickServRuleSet;
 	if(src.m_pNickServRuleSet)
 		m_pNickServRuleSet = new KviNickServRuleSet(*(src.m_pNickServRuleSet));
 	else
-		m_pNickServRuleSet = 0;
+		m_pNickServRuleSet = nullptr;
 	/*
 	// We don't copy the server list, since this function is called in KviIrcServerOptionsWidget::commit()
 	// to recreate the server list from scratch; copying the original servers will mean duplicate servers
@@ -130,7 +130,7 @@ KviIrcServer * KviIrcNetwork::findServer(const QString & szHostname)
 		if(KviQString::equalCI(s->hostName(), szHostname))
 			return s;
 	}
-	return 0;
+	return nullptr;
 }
 
 KviIrcServer * KviIrcNetwork::findServer(const KviIrcServer * pServer)
@@ -155,7 +155,7 @@ KviIrcServer * KviIrcNetwork::findServer(const KviIrcServer * pServer)
 				return s;
 		}
 	}
-	return 0;
+	return nullptr;
 }
 
 void KviIrcNetwork::setCurrentServer(KviIrcServer * srv)
diff --git a/src/kvilib/irc/KviIrcServer.cpp b/src/kvilib/irc/KviIrcServer.cpp
index 957df7f00..67c4012b6 100644
--- a/src/kvilib/irc/KviIrcServer.cpp
+++ b/src/kvilib/irc/KviIrcServer.cpp
@@ -45,10 +45,10 @@
 
 KviIrcServer::KviIrcServer()
 {
-	m_pReconnectInfo = NULL;
+	m_pReconnectInfo = nullptr;
 	m_uFlags = Flags::CAP | Flags::STARTTLS;
 	m_uPort = 6667;
-	m_pAutoJoinChannelList = NULL;
+	m_pAutoJoinChannelList = nullptr;
 	m_bAutoConnect = false;
 	m_iProxy = -1;
 }
@@ -57,7 +57,7 @@ KviProxy * KviIrcServer::proxyServer(KviProxyDataBase * pDb)
 {
 	int i = 0;
 	if(proxy() < 0)
-		return 0;
+		return nullptr;
 	KviPointerList<KviProxy> * proxylist = pDb->proxyList();
 	for(KviProxy * pProxy = proxylist->first(); pProxy; pProxy = proxylist->next())
 	{
@@ -65,7 +65,7 @@ KviProxy * KviIrcServer::proxyServer(KviProxyDataBase * pDb)
 			return pProxy;
 		i++;
 	}
-	return 0;
+	return nullptr;
 }
 
 KviIrcServer::KviIrcServer(const KviIrcServer & serv)
@@ -96,12 +96,12 @@ KviIrcServer::KviIrcServer(const KviIrcServer & serv)
 	if(serv.m_pAutoJoinChannelList)
 		m_pAutoJoinChannelList = new QStringList(*(serv.m_pAutoJoinChannelList));
 	else
-		m_pAutoJoinChannelList = NULL;
+		m_pAutoJoinChannelList = nullptr;
 
 	if(serv.m_pReconnectInfo)
 		m_pReconnectInfo = new KviIrcServerReconnectInfo(*(serv.m_pReconnectInfo));
 	else
-		m_pReconnectInfo = NULL;
+		m_pReconnectInfo = nullptr;
 }
 
 void KviIrcServer::operator=(const KviIrcServer & serv)
@@ -134,14 +134,14 @@ void KviIrcServer::operator=(const KviIrcServer & serv)
 	if(serv.m_pAutoJoinChannelList)
 		m_pAutoJoinChannelList = new QStringList(*(serv.m_pAutoJoinChannelList));
 	else
-		m_pAutoJoinChannelList = NULL;
+		m_pAutoJoinChannelList = nullptr;
 
 	if(m_pReconnectInfo)
 		delete m_pReconnectInfo;
 	if(serv.m_pReconnectInfo)
 		m_pReconnectInfo = new KviIrcServerReconnectInfo(*(serv.m_pReconnectInfo));
 	else
-		m_pReconnectInfo = NULL;
+		m_pReconnectInfo = nullptr;
 }
 
 KviIrcServer::~KviIrcServer()
@@ -149,12 +149,12 @@ KviIrcServer::~KviIrcServer()
 	if(m_pAutoJoinChannelList)
 	{
 		delete m_pAutoJoinChannelList;
-		m_pAutoJoinChannelList = NULL;
+		m_pAutoJoinChannelList = nullptr;
 	}
 	if(m_pReconnectInfo)
 	{
 		delete m_pReconnectInfo;
-		m_pReconnectInfo = NULL;
+		m_pReconnectInfo = nullptr;
 	}
 }
 
@@ -170,13 +170,13 @@ void KviIrcServer::clearReconnectInfo()
 	if(!m_pReconnectInfo)
 		return;
 	delete m_pReconnectInfo;
-	m_pReconnectInfo = NULL;
+	m_pReconnectInfo = nullptr;
 }
 
 void KviIrcServer::generateUniqueId()
 {
 	struct timeval tv;
-	kvi_gettimeofday(&tv, 0);
+	kvi_gettimeofday(&tv, nullptr);
 	m_szId = QString("myserver%1%2%3").arg(tv.tv_usec).arg(rand() % 1000).arg(rand() % 1000);
 }
 
@@ -213,7 +213,7 @@ void KviIrcServer::setAutoJoinChannelList(const QString & szNewChannelList)
 		delete m_pAutoJoinChannelList;
 	QStringList lChans = szNewChannelList.split(",");
 	if(lChans.isEmpty())
-		m_pAutoJoinChannelList = NULL;
+		m_pAutoJoinChannelList = nullptr;
 	else
 		m_pAutoJoinChannelList = new QStringList(lChans);
 }
diff --git a/src/kvilib/irc/KviIrcServerDataBase.cpp b/src/kvilib/irc/KviIrcServerDataBase.cpp
index 65d3fc305..872f88a82 100644
--- a/src/kvilib/irc/KviIrcServerDataBase.cpp
+++ b/src/kvilib/irc/KviIrcServerDataBase.cpp
@@ -37,8 +37,8 @@ KviIrcServerDataBase::KviIrcServerDataBase()
 {
 	m_pRecords = new KviPointerHashTable<QString, KviIrcNetwork>(17, false);
 	m_pRecords->setAutoDelete(true);
-	m_pAutoConnectOnStartupServers = 0;
-	m_pAutoConnectOnStartupNetworks = 0;
+	m_pAutoConnectOnStartupServers = nullptr;
+	m_pAutoConnectOnStartupNetworks = nullptr;
 }
 
 KviIrcServerDataBase::~KviIrcServerDataBase()
@@ -56,7 +56,7 @@ void KviIrcServerDataBase::clearAutoConnectOnStartupServers()
 		return;
 
 	delete m_pAutoConnectOnStartupServers;
-	m_pAutoConnectOnStartupServers = 0;
+	m_pAutoConnectOnStartupServers = nullptr;
 }
 
 void KviIrcServerDataBase::clearAutoConnectOnStartupNetworks()
@@ -65,7 +65,7 @@ void KviIrcServerDataBase::clearAutoConnectOnStartupNetworks()
 		return;
 
 	delete m_pAutoConnectOnStartupNetworks;
-	m_pAutoConnectOnStartupNetworks = 0;
+	m_pAutoConnectOnStartupNetworks = nullptr;
 }
 
 void KviIrcServerDataBase::clear()
@@ -92,13 +92,13 @@ unsigned int KviIrcServerDataBase::networkCount() const
 
 KviIrcNetwork * KviIrcServerDataBase::currentNetwork()
 {
-	KviIrcNetwork * pNet = 0;
+	KviIrcNetwork * pNet = nullptr;
 	if(!m_szCurrentNetwork.isEmpty())
 		pNet = m_pRecords->find(m_szCurrentNetwork);
 	if(pNet)
 		return pNet;
 
-	return 0;
+	return nullptr;
 }
 
 bool KviIrcServerDataBase::makeCurrentBestServerInNetwork(const QString & szNetName, KviIrcNetwork * pNet, QString & szError)
@@ -144,10 +144,10 @@ bool KviIrcServerDataBase::makeCurrentBestServerInNetwork(const QString & szNetN
 
 bool KviIrcServerDataBase::makeCurrentServer(KviIrcServerDefinition * pDef, QString & szError)
 {
-	KviIrcServer * pServer = 0;
+	KviIrcServer * pServer = nullptr;
 
 	KviPointerHashTableIterator<QString, KviIrcNetwork> it(*m_pRecords);
-	KviIrcNetwork * pNet = 0;
+	KviIrcNetwork * pNet = nullptr;
 	KviIrcServer * pServ;
 
 	if(KviQString::equalCIN(pDef->szServer, "net:", 4))
diff --git a/src/kvilib/irc/KviIrcServerReconnectInfo.cpp b/src/kvilib/irc/KviIrcServerReconnectInfo.cpp
index c46fb6fac..354eac588 100644
--- a/src/kvilib/irc/KviIrcServerReconnectInfo.cpp
+++ b/src/kvilib/irc/KviIrcServerReconnectInfo.cpp
@@ -30,8 +30,7 @@ KviIrcServerReconnectInfo::KviIrcServerReconnectInfo()
 }
 
 KviIrcServerReconnectInfo::~KviIrcServerReconnectInfo()
-{
-}
+    = default;
 
 KviIrcServerReconnectInfo::KviIrcServerReconnectInfo(const KviIrcServerReconnectInfo & info)
 {
diff --git a/src/kvilib/irc/KviIrcUserDataBase.cpp b/src/kvilib/irc/KviIrcUserDataBase.cpp
index 5d177fbe6..aa1ecedda 100644
--- a/src/kvilib/irc/KviIrcUserDataBase.cpp
+++ b/src/kvilib/irc/KviIrcUserDataBase.cpp
@@ -65,28 +65,28 @@ QColor * KviIrcUserDataBase::customColor(const QString & szNick)
 {
 	KviIrcUserEntry * pEntry = find(szNick);
 	if(!pEntry)
-		return 0;
+		return nullptr;
 	if(pEntry->m_szLastRegisteredMatchNick != szNick)
 		registeredUser(szNick);
 
 	if(!pEntry->m_bNotFoundRegUserLookup)
 		return &(pEntry->m_cachedColor);
 
-	return 0;
+	return nullptr;
 }
 
 KviRegisteredUser * KviIrcUserDataBase::registeredUser(const QString & szNick, const QString & szUser, const QString & szHost)
 {
 	if(szNick.isEmpty())
-		return 0;
+		return nullptr;
 	KviIrcUserEntry * pEntry = find(szNick);
 	if(!pEntry)
 		return g_pRegisteredUserDataBase->findMatchingUser(szNick, szUser, szHost);
 
-	KviRegisteredUser * pUser = 0;
+	KviRegisteredUser * pUser = nullptr;
 
 	if(pEntry->m_bNotFoundRegUserLookup && pEntry->m_szLastRegisteredMatchNick == szNick)
-		return 0;
+		return nullptr;
 
 	if(!pEntry->m_szRegisteredUserName.isEmpty() && pEntry->m_szLastRegisteredMatchNick == szNick)
 		pUser = g_pRegisteredUserDataBase->getUser(pEntry->m_szRegisteredUserName);
@@ -122,10 +122,10 @@ KviRegisteredUser * KviIrcUserDataBase::registeredUser(const QString & szNick, c
 KviRegisteredUser * KviIrcUserDataBase::registeredUser(const QString & szNick)
 {
 	if(szNick.isEmpty())
-		return 0;
+		return nullptr;
 	KviIrcUserEntry * pEntry = find(szNick);
 	if(!pEntry)
-		return 0;
+		return nullptr;
 	return registeredUser(szNick, pEntry->user(), pEntry->host());
 }
 
diff --git a/src/kvilib/irc/KviNickServRuleSet.cpp b/src/kvilib/irc/KviNickServRuleSet.cpp
index b7d3178f4..9e47eb14e 100644
--- a/src/kvilib/irc/KviNickServRuleSet.cpp
+++ b/src/kvilib/irc/KviNickServRuleSet.cpp
@@ -64,12 +64,12 @@ KviNickServRuleSet::KviNickServRuleSet()
     : KviHeapObject()
 {
 	m_bEnabled = false;
-	m_pRules = 0;
+	m_pRules = nullptr;
 }
 
 KviNickServRuleSet::KviNickServRuleSet(const KviNickServRuleSet & s)
 {
-	m_pRules = 0;
+	m_pRules = nullptr;
 	copyFrom(s);
 }
 
@@ -108,12 +108,12 @@ KviNickServRuleSet * KviNickServRuleSet::load(KviConfigurationFile * pCfg, const
 	szTmp = QString("%1NSRules").arg(szPrefix);
 	unsigned int uCount = pCfg->readUIntEntry(szTmp, 0);
 	if(uCount == 0)
-		return 0;
+		return nullptr;
 	KviNickServRuleSet * pSet = new KviNickServRuleSet();
 	if(pSet->loadPrivate(pCfg, szPrefix, uCount))
 		return pSet;
 	delete pSet;
-	return 0;
+	return nullptr;
 }
 
 void KviNickServRuleSet::load(const QString & szConfigFile)
@@ -165,7 +165,7 @@ bool KviNickServRuleSet::loadPrivate(KviConfigurationFile * pCfg, const QString
 	{
 		m_bEnabled = false;
 		delete m_pRules;
-		m_pRules = 0;
+		m_pRules = nullptr;
 		return false;
 	}
 	return true;
@@ -176,7 +176,7 @@ void KviNickServRuleSet::clear()
 	if(m_pRules)
 	{
 		delete m_pRules;
-		m_pRules = 0;
+		m_pRules = nullptr;
 	}
 	m_bEnabled = false;
 }
@@ -199,7 +199,7 @@ KviNickServRuleSet * KviNickServRuleSet::createInstance()
 KviNickServRule * KviNickServRuleSet::matchRule(const QString & szNick, const KviIrcMask * pNickServ, const QString & szMsg, const QString & szServer)
 {
 	if(!m_pRules)
-		return 0;
+		return nullptr;
 
 	for(KviNickServRule * r = m_pRules->first(); r; r = m_pRules->next())
 	{
@@ -218,7 +218,7 @@ KviNickServRule * KviNickServRuleSet::matchRule(const QString & szNick, const Kv
 		if(re.exactMatch(szMsg))
 			return r;
 	}
-	return 0;
+	return nullptr;
 }
 
 void KviNickServRuleSet::copyFrom(const KviNickServRuleSet & src)
@@ -242,7 +242,7 @@ void KviNickServRuleSet::copyFrom(const KviNickServRuleSet & src)
 		{
 			m_bEnabled = false;
 			delete m_pRules;
-			m_pRules = 0;
+			m_pRules = nullptr;
 		}
 		else
 		{
@@ -255,7 +255,7 @@ void KviNickServRuleSet::copyFrom(const KviNickServRuleSet & src)
 		if(m_pRules)
 		{
 			delete m_pRules;
-			m_pRules = 0;
+			m_pRules = nullptr;
 		}
 	}
 }
diff --git a/src/kvilib/irc/KviUserIdentity.cpp b/src/kvilib/irc/KviUserIdentity.cpp
index 717c77b81..0e8efe2df 100644
--- a/src/kvilib/irc/KviUserIdentity.cpp
+++ b/src/kvilib/irc/KviUserIdentity.cpp
@@ -34,8 +34,7 @@ KviUserIdentity::KviUserIdentity()
 }
 
 KviUserIdentity::~KviUserIdentity()
-{
-}
+    = default;
 
 bool KviUserIdentity::load(KviConfigurationFile & cfg)
 {
diff --git a/src/kvilib/irc/KviUserIdentityManager.cpp b/src/kvilib/irc/KviUserIdentityManager.cpp
index e2169e3f7..5c72bc563 100644
--- a/src/kvilib/irc/KviUserIdentityManager.cpp
+++ b/src/kvilib/irc/KviUserIdentityManager.cpp
@@ -27,7 +27,7 @@
 #include "KviLocale.h"
 #include "kvi_defaults.h"
 
-KviUserIdentityManager * KviUserIdentityManager::m_pInstance = 0;
+KviUserIdentityManager * KviUserIdentityManager::m_pInstance = nullptr;
 
 KviUserIdentityManager::KviUserIdentityManager()
     : KviHeapObject()
@@ -53,7 +53,7 @@ void KviUserIdentityManager::done()
 	if(!m_pInstance)
 		return;
 	delete m_pInstance;
-	m_pInstance = 0;
+	m_pInstance = nullptr;
 }
 
 const KviUserIdentity * KviUserIdentityManager::defaultIdentity()
diff --git a/src/kvilib/locale/KviLocale.cpp b/src/kvilib/locale/KviLocale.cpp
index 75ac4bee1..0deaf28fc 100644
--- a/src/kvilib/locale/KviLocale.cpp
+++ b/src/kvilib/locale/KviLocale.cpp
@@ -45,11 +45,11 @@
 #include <QLocale>
 #include <QByteArray>
 
-KVILIB_API KviMessageCatalogue * g_pMainCatalogue = NULL;
+KVILIB_API KviMessageCatalogue * g_pMainCatalogue = nullptr;
 
-static KviTranslator * g_pTranslator = NULL;
-static KviPointerHashTable<const char *, KviMessageCatalogue> * g_pCatalogueDict = NULL;
-static QTextCodec * g_pUtf8TextCodec = NULL;
+static KviTranslator * g_pTranslator = nullptr;
+static KviPointerHashTable<const char *, KviMessageCatalogue> * g_pCatalogueDict = nullptr;
+static QTextCodec * g_pUtf8TextCodec = nullptr;
 static QString g_szDefaultLocalePath; // FIXME: Convert this to a search path list
 
 /////////////////////////////////////////////////////////////////////////////////////
@@ -280,24 +280,24 @@ public:
 public:
 	bool ok() { return m_pRecvCodec && g_pUtf8TextCodec; };
 
-	virtual int mibEnum() const { return 0; };
+	int mibEnum() const override { return 0; };
 
-	virtual QByteArray name() const { return m_szName; };
+	QByteArray name() const override { return m_szName; };
 protected:
-	virtual QByteArray convertFromUnicode(const QChar * input, int number, ConverterState * state) const
+	QByteArray convertFromUnicode(const QChar * input, int number, ConverterState * state) const override
 	{
 		return m_pSendCodec->fromUnicode(input, number, state);
 	}
-	virtual QString convertToUnicode(const char * chars, int len, ConverterState * state) const
+	QString convertToUnicode(const char * chars, int len, ConverterState * state) const override
 	{
-		if(g_utf8_validate(chars, len, NULL))
+		if(g_utf8_validate(chars, len, nullptr))
 			return g_pUtf8TextCodec->toUnicode(chars, len, state);
 
 		return m_pRecvCodec->toUnicode(chars, len, state);
 	}
 };
 
-static KviPointerHashTable<const char *, KviSmartTextCodec> * g_pSmartCodecDict = 0;
+static KviPointerHashTable<const char *, KviSmartTextCodec> * g_pSmartCodecDict = nullptr;
 
 static const char * encoding_groups[] = {
 	"Unicode",
@@ -310,7 +310,7 @@ static const char * encoding_groups[] = {
 	"Japanese",
 	"Other asiatic",
 #endif
-	0
+	nullptr
 };
 
 static KviLocale::EncodingDescription supported_encodings[] = {
@@ -462,11 +462,11 @@ static KviLocale::EncodingDescription supported_encodings[] = {
 	{ "UTF-8 [TSCII]"        , 1 , 1 , 7, "Unicode - Tamil" },
 	{ "UTF-8 [CP-949]"       , 1 , 1 , 7, "Unicode - Korean Codepage" },
 #endif
-	{ 0                      , 0 , 0 , 0 , 0 }
+	{ nullptr                      , 0 , 0 , 0 , nullptr }
 	// clang-format on
 };
 
-KviLocale * KviLocale::m_pSelf = NULL;
+KviLocale * KviLocale::m_pSelf = nullptr;
 unsigned int KviLocale::m_uCount = 0;
 KviCString KviLocale::g_szLang = "";
 
@@ -555,14 +555,14 @@ KviLocale::~KviLocale()
 	delete g_pMainCatalogue;
 	delete g_pCatalogueDict;
 	delete g_pSmartCodecDict;
-	g_pMainCatalogue = 0;
-	g_pCatalogueDict = 0;
-	g_pSmartCodecDict = 0;
+	g_pMainCatalogue = nullptr;
+	g_pCatalogueDict = nullptr;
+	g_pSmartCodecDict = nullptr;
 	if(g_pTranslator)
 	{
 		m_pApp->removeTranslator(g_pTranslator);
 		delete g_pTranslator;
-		g_pTranslator = 0;
+		g_pTranslator = nullptr;
 	}
 }
 
@@ -695,7 +695,7 @@ KviMessageCatalogue * KviLocale::loadCatalogue(const QString & szName, const QSt
 		return pCatalogue; // already loaded
 
 	if(!findCatalogue(szBuffer, szName, szLocaleDir))
-		return NULL;
+		return nullptr;
 
 	pCatalogue = new KviMessageCatalogue();
 	if(pCatalogue->load(szBuffer))
@@ -704,7 +704,7 @@ KviMessageCatalogue * KviLocale::loadCatalogue(const QString & szName, const QSt
 		return pCatalogue;
 	}
 	delete pCatalogue;
-	return NULL;
+	return nullptr;
 }
 
 bool KviLocale::unloadCatalogue(const QString & szName)
diff --git a/src/kvilib/locale/KviMessageCatalogue.cpp b/src/kvilib/locale/KviMessageCatalogue.cpp
index 6ff0baadd..252ad2717 100644
--- a/src/kvilib/locale/KviMessageCatalogue.cpp
+++ b/src/kvilib/locale/KviMessageCatalogue.cpp
@@ -123,10 +123,10 @@ static int somePrimeNumbers[90] = {
 
 int kvi_getFirstBiggerPrime(int iNumber)
 {
-	for(int i = 0; i < 90; i++)
+	for(int somePrimeNumber : somePrimeNumbers)
 	{
-		if(somePrimeNumbers[i] >= iNumber)
-			return somePrimeNumbers[i];
+		if(somePrimeNumber >= iNumber)
+			return somePrimeNumber;
 	}
 	return 9973; //error!
 }
@@ -285,7 +285,7 @@ bool KviMessageCatalogue::load(const QString & szName)
 	KviMemory::free(pcBuffer);
 	f.close();
 
-	m_pTextCodec = 0;
+	m_pTextCodec = nullptr;
 
 	// find out the text encoding, if possible
 	if(szHeader.hasData())
diff --git a/src/kvilib/locale/KviTranslationEntry.cpp b/src/kvilib/locale/KviTranslationEntry.cpp
index 0c7fd3715..f770d29ed 100644
--- a/src/kvilib/locale/KviTranslationEntry.cpp
+++ b/src/kvilib/locale/KviTranslationEntry.cpp
@@ -29,13 +29,13 @@
 KviTranslationEntry::KviTranslationEntry(char * pcKey, int iKeyLen, char * pcTr, int iTrLen)
     : m_szKey(pcKey, iKeyLen), m_szEncodedTranslation(pcTr, iTrLen)
 {
-	m_pTranslation = NULL;
+	m_pTranslation = nullptr;
 }
 
 KviTranslationEntry::KviTranslationEntry(const char * pcKeyAndTr)
     : m_szKey(pcKeyAndTr), m_szEncodedTranslation(pcKeyAndTr)
 {
-	m_pTranslation = NULL;
+	m_pTranslation = nullptr;
 }
 
 KviTranslationEntry::~KviTranslationEntry()
diff --git a/src/kvilib/locale/KviTranslator.cpp b/src/kvilib/locale/KviTranslator.cpp
index bc32345ae..f4bff95df 100644
--- a/src/kvilib/locale/KviTranslator.cpp
+++ b/src/kvilib/locale/KviTranslator.cpp
@@ -33,8 +33,7 @@ KviTranslator::KviTranslator(QObject * pParent)
 }
 
 KviTranslator::~KviTranslator()
-{
-}
+    = default;
 
 QString KviTranslator::translate(const char *, const char * pcMessage, const char *) const
 {
diff --git a/src/kvilib/net/KviDnsResolver.cpp b/src/kvilib/net/KviDnsResolver.cpp
index 419019f57..365b88fc3 100644
--- a/src/kvilib/net/KviDnsResolver.cpp
+++ b/src/kvilib/net/KviDnsResolver.cpp
@@ -88,8 +88,7 @@ KviDnsResolverThread::KviDnsResolverThread(KviDnsResolver * pDns)
 }
 
 KviDnsResolverThread::~KviDnsResolverThread()
-{
-}
+    = default;
 
 KviError::Code KviDnsResolverThread::translateDnsError(int iErr)
 {
@@ -286,14 +285,14 @@ void KviDnsResolverThread::run()
 			ipv4Addr.sin_family = AF_INET;
 			ipv4Addr.sin_port = 0;
 			// NI_NAMEREQD as last param ?
-			retVal = getnameinfo((struct sockaddr *)&ipv4Addr, sizeof(ipv4Addr), retname, 1025, 0, 0, NI_NAMEREQD);
+			retVal = getnameinfo((struct sockaddr *)&ipv4Addr, sizeof(ipv4Addr), retname, 1025, nullptr, 0, NI_NAMEREQD);
 #ifdef COMPILE_IPV6_SUPPORT
 		}
 		else
 		{
 			ipv6Addr.sin6_family = AF_INET6;
 			ipv6Addr.sin6_port = 0;
-			retVal = getnameinfo((struct sockaddr *)&ipv6Addr, sizeof(ipv6Addr), retname, 1025, 0, 0, NI_NAMEREQD);
+			retVal = getnameinfo((struct sockaddr *)&ipv6Addr, sizeof(ipv6Addr), retname, 1025, nullptr, 0, NI_NAMEREQD);
 		}
 #endif
 
@@ -312,7 +311,7 @@ void KviDnsResolverThread::run()
 		//#ifdef COMPILE_IPV6_SUPPORT
 		//		struct in6_addr in6Addr;
 		//#endif
-		struct addrinfo * pRet = 0;
+		struct addrinfo * pRet = nullptr;
 		struct addrinfo * pNext;
 		struct addrinfo hints;
 		hints.ai_flags = 0; //AI_CANONNAME; <-- for IPV6 it makes cannoname to point to the IP address!
@@ -324,11 +323,11 @@ void KviDnsResolverThread::run()
 		hints.ai_socktype = SOCK_STREAM;
 		hints.ai_protocol = 0;
 		hints.ai_addrlen = 0;
-		hints.ai_canonname = 0;
-		hints.ai_addr = 0;
-		hints.ai_next = 0;
+		hints.ai_canonname = nullptr;
+		hints.ai_addr = nullptr;
+		hints.ai_next = nullptr;
 
-		retVal = getaddrinfo(m_szQuery.toUtf8().data(), 0, &hints, &pRet);
+		retVal = getaddrinfo(m_szQuery.toUtf8().data(), nullptr, &hints, &pRet);
 
 		if(retVal != 0)
 		{
@@ -397,7 +396,7 @@ KviDnsResolver::KviDnsResolver()
 {
 	m_pSlaveThread = new KviDnsResolverThread(this);
 	m_pDnsResult = new KviDnsResolverResult();
-	m_pAuxData = 0;
+	m_pAuxData = nullptr;
 	m_state = Idle;
 }
 
diff --git a/src/kvilib/net/KviHttpRequest.cpp b/src/kvilib/net/KviHttpRequest.cpp
index d5947ae8b..3293a12d2 100644
--- a/src/kvilib/net/KviHttpRequest.cpp
+++ b/src/kvilib/net/KviHttpRequest.cpp
@@ -58,13 +58,13 @@ KviHttpRequest::KviHttpRequest()
     : QObject()
 {
 	m_p = new KviHttpRequestPrivate();
-	m_p->pSocket = NULL;
+	m_p->pSocket = nullptr;
 	m_p->bIsSSL = false;
-	m_p->pConnectTimeoutTimer = NULL;
+	m_p->pConnectTimeoutTimer = nullptr;
 	m_p->pBuffer = new KviDataBuffer();
-	m_p->pFile = NULL;
+	m_p->pFile = nullptr;
 
-	m_pPrivateData = 0;
+	m_pPrivateData = nullptr;
 	m_bHeaderProcessed = false;
 	m_uConnectionTimeout = 60;
 	m_bFollowRedirects = true;
@@ -100,7 +100,7 @@ void KviHttpRequest::resetInternalStatus()
 	if(m_p->pConnectTimeoutTimer)
 	{
 		delete m_p->pConnectTimeoutTimer;
-		m_p->pConnectTimeoutTimer = NULL;
+		m_p->pConnectTimeoutTimer = nullptr;
 	}
 
 	if(m_p->pSocket)
@@ -110,7 +110,7 @@ void KviHttpRequest::resetInternalStatus()
 	{
 		m_p->pFile->close();
 		delete m_p->pFile;
-		m_p->pFile = NULL;
+		m_p->pFile = nullptr;
 	}
 
 	m_p->pBuffer->clear();
@@ -221,7 +221,7 @@ void KviHttpRequest::closeSocket()
 
 	//delete m_p->pSocket;
 
-	m_p->pSocket = NULL;
+	m_p->pSocket = nullptr;
 }
 
 void KviHttpRequest::slotSocketDisconnected()
@@ -264,7 +264,7 @@ void KviHttpRequest::slotSocketConnected()
 	if(m_p->pConnectTimeoutTimer)
 	{
 		delete m_p->pConnectTimeoutTimer;
-		m_p->pConnectTimeoutTimer = NULL;
+		m_p->pConnectTimeoutTimer = nullptr;
 	}
 
 	emit connectionEstablished();
@@ -440,7 +440,7 @@ bool KviHttpRequest::doConnect()
 	if(m_p->pConnectTimeoutTimer)
 	{
 		delete m_p->pConnectTimeoutTimer;
-		m_p->pConnectTimeoutTimer = NULL;
+		m_p->pConnectTimeoutTimer = nullptr;
 	}
 
 	m_p->pConnectTimeoutTimer = new QTimer();
diff --git a/src/kvilib/net/KviNetUtils.cpp b/src/kvilib/net/KviNetUtils.cpp
index b5ee05ad9..f48ccdcb9 100644
--- a/src/kvilib/net/KviNetUtils.cpp
+++ b/src/kvilib/net/KviNetUtils.cpp
@@ -540,7 +540,7 @@ bool kvi_select(int fd, bool * bCanRead, bool * bCanWrite, int iUSecs)
 	tv.tv_sec = 0;
 	tv.tv_usec = iUSecs;
 
-	int ret = select(fd + 1, &rs, &ws, 0, &tv);
+	int ret = select(fd + 1, &rs, &ws, nullptr, &tv);
 	if(ret < 1)
 		return false; // EINTR or ENOSTUFFATALL
 
@@ -664,8 +664,7 @@ namespace KviNetUtils
 	}
 
 #ifdef COMPILE_GET_INTERFACE_ADDRESS
-	union sockaddr_union
-	{
+	union sockaddr_union {
 		struct sockaddr sa;
 		struct sockaddr_in sin;
 	};
@@ -807,7 +806,7 @@ KviSockaddr::KviSockaddr(const char * szIpAddress, kvi_u32_t uPort, bool bIPv6,
 	hints.ai_socktype = bUdp ? SOCK_DGRAM : SOCK_STREAM;
 
 	hints.ai_protocol = 0;
-	m_pData = 0;
+	m_pData = nullptr;
 	KviCString szPort(KviCString::Format, "%u", uPort);
 	getaddrinfo(szIpAddress, szPort.ptr(), &hints, &m_pData);
 }
@@ -825,9 +824,9 @@ KviSockaddr::KviSockaddr(kvi_u32_t uPort, bool bIPv6, bool bUdp) // passive sock
 #endif
 	hints.ai_socktype = bUdp ? SOCK_DGRAM : SOCK_STREAM;
 	hints.ai_protocol = 0;
-	m_pData = 0;
+	m_pData = nullptr;
 	KviCString szPort(KviCString::Format, "%u", uPort);
-	getaddrinfo(0, szPort.ptr(), &hints, &m_pData);
+	getaddrinfo(nullptr, szPort.ptr(), &hints, &m_pData);
 }
 
 KviSockaddr::~KviSockaddr()
@@ -835,14 +834,14 @@ KviSockaddr::~KviSockaddr()
 	if(m_pData)
 	{
 		freeaddrinfo(m_pData);
-		m_pData = 0;
+		m_pData = nullptr;
 	}
 }
 
 struct sockaddr * KviSockaddr::socketAddress()
 {
 	if(!m_pData)
-		return 0;
+		return nullptr;
 	return (m_pData)->ai_addr;
 }
 
diff --git a/src/kvilib/net/KviNetworkAccessManager.cpp b/src/kvilib/net/KviNetworkAccessManager.cpp
index 1142c355b..c3409afc4 100644
--- a/src/kvilib/net/KviNetworkAccessManager.cpp
+++ b/src/kvilib/net/KviNetworkAccessManager.cpp
@@ -25,9 +25,7 @@
 #include "KviNetworkAccessManager.h"
 
 KviNetworkAccessManager::KviNetworkAccessManager()
-{
-}
+    = default;
 
 KviNetworkAccessManager::~KviNetworkAccessManager()
-{
-}
+    = default;
diff --git a/src/kvilib/net/KviSSL.cpp b/src/kvilib/net/KviSSL.cpp
index 8e8b9f6c1..81bd0df14 100644
--- a/src/kvilib/net/KviSSL.cpp
+++ b/src/kvilib/net/KviSSL.cpp
@@ -44,7 +44,7 @@
 #endif
 
 static bool g_bSSLInitialized = false;
-static KviMutex * g_pSSLMutex = 0;
+static KviMutex * g_pSSLMutex = nullptr;
 
 static inline void my_ssl_lock()
 {
@@ -58,10 +58,10 @@ static inline void my_ssl_unlock()
 
 // THIS PART OF OpenSSL SUCKS
 
-static DH * dh_512 = 0;
-static DH * dh_1024 = 0;
-static DH * dh_2048 = 0;
-static DH * dh_4096 = 0;
+static DH * dh_512 = nullptr;
+static DH * dh_1024 = nullptr;
+static DH * dh_2048 = nullptr;
+static DH * dh_4096 = nullptr;
 
 static unsigned char dh512_p[] = {
 	0x90, 0x86, 0xDD, 0x06, 0xE8, 0x0F, 0x10, 0x86, 0xF0, 0x91, 0xC5, 0x55,
@@ -163,9 +163,9 @@ static unsigned char dh4096_g[] = { 0x02 };
 
 static DH * my_get_dh(int keylength)
 {
-	DH * dh = 0;
-	unsigned char * p = 0;
-	unsigned char * g = 0;
+	DH * dh = nullptr;
+	unsigned char * p = nullptr;
+	unsigned char * g = nullptr;
 	int sp = 0;
 	int sg = 0;
 	switch(keylength)
@@ -208,13 +208,13 @@ static DH * my_get_dh(int keylength)
 		return dh;
 	dh = DH_new();
 	if(!dh)
-		return 0;
-	dh->p = BN_bin2bn(p, sp, 0);
-	dh->g = BN_bin2bn(g, sg, 0);
-	if((dh->p == 0) || (dh->g == 0))
+		return nullptr;
+	dh->p = BN_bin2bn(p, sp, nullptr);
+	dh->g = BN_bin2bn(g, sg, nullptr);
+	if((dh->p == nullptr) || (dh->g == nullptr))
 	{
 		DH_free(dh);
-		return 0;
+		return nullptr;
 	}
 	return dh;
 }
@@ -248,7 +248,7 @@ void KviSSL::globalDestroy()
 		DH_free(dh_4096);
 	globalSSLDestroy();
 	delete g_pSSLMutex;
-	g_pSSLMutex = 0;
+	g_pSSLMutex = nullptr;
 }
 
 void KviSSL::globalSSLInit()
@@ -280,8 +280,8 @@ void KviSSL::globalSSLDestroy()
 KviSSL::KviSSL()
 {
 	globalSSLInit();
-	m_pSSL = 0;
-	m_pSSLCtx = 0;
+	m_pSSL = nullptr;
+	m_pSSLCtx = nullptr;
 }
 
 KviSSL::~KviSSL()
@@ -328,12 +328,12 @@ void KviSSL::shutdown()
 		SSL_shutdown(m_pSSL);
 #endif
 		SSL_free(m_pSSL);
-		m_pSSL = 0;
+		m_pSSL = nullptr;
 	}
 	if(m_pSSLCtx)
 	{
 		SSL_CTX_free(m_pSSLCtx);
-		m_pSSLCtx = 0;
+		m_pSSLCtx = nullptr;
 	}
 }
 
@@ -402,7 +402,7 @@ KviSSL::Result KviSSL::useCertificateFile(QString cert, QString pass)
 	m_szPass = pass.toUtf8().data();
 	if(m_szPass.len() < 4)
 		m_szPass.append("xxxx");
-	X509 * x509 = 0;
+	X509 * x509 = nullptr;
 
 #ifdef COMPILE_ON_WINDOWS
 	FILE * f = _wfopen(cert.toStdWString().data(), L"r");
@@ -436,7 +436,7 @@ KviSSL::Result KviSSL::usePrivateKeyFile(QString key, QString pass)
 	if(m_szPass.len() < 4)
 		m_szPass.append("xxxx");
 
-	EVP_PKEY * k = 0;
+	EVP_PKEY * k = nullptr;
 
 #ifdef COMPILE_ON_WINDOWS
 	FILE * f = _wfopen(key.toStdWString().data(), L"r");
@@ -581,34 +581,34 @@ KviSSL::Result KviSSL::getProtocolError(int ret)
 KviSSLCertificate * KviSSL::getPeerCertificate()
 {
 	if(!m_pSSL)
-		return 0;
+		return nullptr;
 	X509 * x509 = SSL_get_peer_certificate(m_pSSL);
 	if(!x509)
-		return 0;
+		return nullptr;
 	return new KviSSLCertificate(x509);
 }
 
 KviSSLCertificate * KviSSL::getLocalCertificate()
 {
 	if(!m_pSSL)
-		return 0;
+		return nullptr;
 	X509 * x509 = SSL_get_certificate(m_pSSL);
 	if(!x509)
-		return 0;
+		return nullptr;
 	return new KviSSLCertificate(x509);
 }
 
 KviSSLCipherInfo * KviSSL::getCurrentCipherInfo()
 {
 	if(!m_pSSL)
-		return 0;
+		return nullptr;
 #if OPENSSL_VERSION_NUMBER >= 0x10000000L
 	const SSL_CIPHER * c = SSL_get_current_cipher(m_pSSL);
 #else
 	SSL_CIPHER * c = SSL_get_current_cipher(m_pSSL);
 #endif
 	if(!c)
-		return 0;
+		return nullptr;
 	return new KviSSLCipherInfo(c, m_pSSL);
 }
 
@@ -618,7 +618,7 @@ KviSSLCertificate::KviSSLCertificate(X509 * x509)
 	m_pSubject->setAutoDelete(true);
 	m_pIssuer = new KviPointerHashTable<const char *, KviCString>(17);
 	m_pIssuer->setAutoDelete(true);
-	m_pX509 = 0;
+	m_pX509 = nullptr;
 	setX509(x509);
 }
 
@@ -701,10 +701,10 @@ int KviSSLCertificate::fingerprintDigestId()
 		return 0;
 	}
 
-	const EVP_MD * mdType = NULL;
+	const EVP_MD * mdType = nullptr;
 	mdType = EVP_get_digestbyname(OBJ_nid2sn(NID));
 
-	if(mdType == NULL)
+	if(mdType == nullptr)
 	{
 		// Unknown digest
 		return 0;
@@ -752,10 +752,10 @@ int KviSSLCertificate::getFingerprint(unsigned char * bufferData, unsigned int *
 	if(!m_pX509)
 		return -99;
 
-	const EVP_MD * mdType = NULL;
+	const EVP_MD * mdType = nullptr;
 	mdType = EVP_get_digestbyname(digestName);
 
-	if(mdType == NULL)
+	if(mdType == nullptr)
 	{
 		// Unknown digest
 		return -98;
@@ -910,8 +910,7 @@ KviSSLCipherInfo::KviSSLCipherInfo(SSL_CIPHER * c, SSL * s)
 }
 
 KviSSLCipherInfo::~KviSSLCipherInfo()
-{
-}
+    = default;
 
 #ifdef COMPILE_ON_WINDOWS
 
diff --git a/src/kvilib/net/KviUrl.cpp b/src/kvilib/net/KviUrl.cpp
index 96ca812c9..6a1779b2d 100644
--- a/src/kvilib/net/KviUrl.cpp
+++ b/src/kvilib/net/KviUrl.cpp
@@ -47,8 +47,7 @@ KviUrl::KviUrl(const QString & szUrl)
 }
 
 KviUrl::~KviUrl()
-{
-}
+    = default;
 
 void KviUrl::parse()
 {
diff --git a/src/kvilib/system/KviEnvironment.cpp b/src/kvilib/system/KviEnvironment.cpp
index 91cf19765..e702e264e 100644
--- a/src/kvilib/system/KviEnvironment.cpp
+++ b/src/kvilib/system/KviEnvironment.cpp
@@ -84,7 +84,7 @@ namespace KviEnvironment
 		else
 		{
 			// hmmm
-			if(getVariable(name) == 0)
+			if(getVariable(name) == nullptr)
 			{
 				// ok, the string is not in the environment
 				// we can free it
diff --git a/src/kvilib/system/KviThread.cpp b/src/kvilib/system/KviThread.cpp
index bf8ece991..4b9e3060b 100644
--- a/src/kvilib/system/KviThread.cpp
+++ b/src/kvilib/system/KviThread.cpp
@@ -129,7 +129,7 @@ static void kvi_threadCatchSigpipe()
 	act.sa_flags |= SA_RESTART;
 #endif
 
-	if(sigaction(SIGPIPE, &act, 0L) == -1)
+	if(sigaction(SIGPIPE, &act, nullptr) == -1)
 		qDebug("Failed to set the handler for SIGPIPE.");
 #endif
 }
@@ -149,7 +149,7 @@ static void kvi_threadInitialize()
 // over this length, the slave is forced to usleep()
 #define KVI_THREAD_MAX_EVENT_QUEUE_LENGTH 50
 
-static KviThreadManager * g_pThreadManager = 0;
+static KviThreadManager * g_pThreadManager = nullptr;
 
 void KviThreadManager::globalInit()
 {
@@ -160,7 +160,7 @@ void KviThreadManager::globalInit()
 void KviThreadManager::globalDestroy()
 {
 	delete g_pThreadManager;
-	g_pThreadManager = 0;
+	g_pThreadManager = nullptr;
 }
 
 KviThreadManager::KviThreadManager()
@@ -220,11 +220,11 @@ KviThreadManager::~KviThreadManager()
 #if !defined(COMPILE_ON_WINDOWS) && !defined(COMPILE_ON_MINGW)
 	m_pSn->setEnabled(false);
 	delete m_pSn;
-	m_pSn = 0;
+	m_pSn = nullptr;
 #endif
 
 	// we're no longer in this world
-	g_pThreadManager = 0;
+	g_pThreadManager = nullptr;
 
 #if !defined(COMPILE_ON_WINDOWS) && !defined(COMPILE_ON_MINGW)
 	// close the pipes
@@ -237,16 +237,16 @@ KviThreadManager::~KviThreadManager()
 		m_pEventQueue->removeFirst();
 	}
 	delete m_pEventQueue;
-	m_pEventQueue = 0;
+	m_pEventQueue = nullptr;
 #endif
 
 	m_pMutex->unlock();
 
 	// finish the cleanup
 	delete m_pMutex;
-	m_pMutex = 0;
+	m_pMutex = nullptr;
 	delete m_pThreadList;
-	m_pThreadList = 0;
+	m_pThreadList = nullptr;
 
 	// byez :)
 }
@@ -450,7 +450,7 @@ static void * internal_start_thread(void * arg)
 {
 	// Slave thread...
 	((KviThread *)arg)->internalThreadRun_doNotTouchThis();
-	return 0;
+	return nullptr;
 }
 #endif
 
@@ -601,10 +601,10 @@ KviSensitiveThread::~KviSensitiveThread()
 	m_pLocalEventQueueMutex->lock();
 	m_pLocalEventQueue->setAutoDelete(true);
 	delete m_pLocalEventQueue;
-	m_pLocalEventQueue = 0;
+	m_pLocalEventQueue = nullptr;
 	m_pLocalEventQueueMutex->unlock();
 	delete m_pLocalEventQueueMutex;
-	m_pLocalEventQueueMutex = 0;
+	m_pLocalEventQueueMutex = nullptr;
 	//	qDebug("Exiting KviSensitiveThread::~KviSensitiveThread (this=%d)",this);
 }
 
diff --git a/src/kvilib/system/KviTimeUtils.cpp b/src/kvilib/system/KviTimeUtils.cpp
index dcb2f0485..0caf327af 100644
--- a/src/kvilib/system/KviTimeUtils.cpp
+++ b/src/kvilib/system/KviTimeUtils.cpp
@@ -65,7 +65,7 @@ KviMSecTimeInterval::KviMSecTimeInterval()
 unsigned long KviMSecTimeInterval::mark()
 {
 	struct timeval tmv;
-	kvi_gettimeofday(&tmv, 0);
+	kvi_gettimeofday(&tmv, nullptr);
 	unsigned long uDiff = ((((unsigned long)(tmv.tv_sec)) - m_uReferenceSecs) * 1000);
 	if(((unsigned long)(tmv.tv_usec)) > m_uReferenceUSecs)
 		uDiff += (((unsigned long)(tmv.tv_usec) - m_uReferenceUSecs) / 1000);
@@ -81,7 +81,7 @@ namespace KviTimeUtils
 	long long getCurrentTimeMills()
 	{
 		struct timeval tmv;
-		kvi_gettimeofday(&tmv, 0);
+		kvi_gettimeofday(&tmv, nullptr);
 		long long result = tmv.tv_sec * 1000 + tmv.tv_usec / 1000;
 		return result;
 	}
diff --git a/src/kvilib/tal/KviTalApplication.cpp b/src/kvilib/tal/KviTalApplication.cpp
index 3ff6964fc..6854c9f50 100644
--- a/src/kvilib/tal/KviTalApplication.cpp
+++ b/src/kvilib/tal/KviTalApplication.cpp
@@ -39,8 +39,7 @@ KviTalApplication::KviTalApplication(int & iArgc, char ** ppcArgv)
 #endif //!defined(COMPILE_KDE4_SUPPORT)
 
 KviTalApplication::~KviTalApplication()
-{
-}
+    = default;
 
 void KviTalApplication::commitData(QSessionManager & manager)
 {
diff --git a/src/kvilib/tal/KviTalFileDialog.cpp b/src/kvilib/tal/KviTalFileDialog.cpp
index 962832322..cb7f88a8f 100644
--- a/src/kvilib/tal/KviTalFileDialog.cpp
+++ b/src/kvilib/tal/KviTalFileDialog.cpp
@@ -43,8 +43,7 @@ KviTalFileDialog::KviTalFileDialog(const QString & szDirName, const QString & sz
 #endif //!defined(COMPILE_KDE4_SUPPORT))
 
 KviTalFileDialog::~KviTalFileDialog()
-{
-}
+    = default;
 
 void KviTalFileDialog::setFileMode(FileMode m)
 {
diff --git a/src/kvilib/tal/KviTalGroupBox.cpp b/src/kvilib/tal/KviTalGroupBox.cpp
index 10c948531..3e9f80796 100644
--- a/src/kvilib/tal/KviTalGroupBox.cpp
+++ b/src/kvilib/tal/KviTalGroupBox.cpp
@@ -41,13 +41,13 @@ KviTalGroupBox::KviTalGroupBox(QWidget * pParent, char * pcName)
 KviTalGroupBox::KviTalGroupBox(QWidget * pParent)
     : QGroupBox(pParent)
 {
-	m_pLayout = 0;
+	m_pLayout = nullptr;
 }
 
 KviTalGroupBox::KviTalGroupBox(const QString & szTitle, QWidget * pParent)
     : QGroupBox(szTitle, pParent)
 {
-	m_pLayout = 0;
+	m_pLayout = nullptr;
 }
 
 KviTalGroupBox::KviTalGroupBox(Qt::Orientation orientation, QWidget * pParent)
@@ -78,8 +78,7 @@ KviTalGroupBox::KviTalGroupBox(Qt::Orientation orientation, const QString & szTi
 }
 
 KviTalGroupBox::~KviTalGroupBox()
-{
-}
+    = default;
 
 void KviTalGroupBox::childEvent(QChildEvent * e)
 {
@@ -121,7 +120,7 @@ void KviTalGroupBox::setOrientation(Qt::Orientation orientation)
 	if(m_pLayout)
 	{
 		delete m_pLayout;
-		m_pLayout = NULL;
+		m_pLayout = nullptr;
 	}
 
 	mOrientation = orientation;
@@ -138,7 +137,7 @@ void KviTalGroupBox::setLayout(QLayout * layout)
 	if(m_pLayout)
 	{
 		delete m_pLayout;
-		m_pLayout = NULL;
+		m_pLayout = nullptr;
 	}
 
 	QGroupBox::setLayout(layout);
diff --git a/src/kvilib/tal/KviTalHBox.cpp b/src/kvilib/tal/KviTalHBox.cpp
index a43d1dea5..3e019f5ee 100644
--- a/src/kvilib/tal/KviTalHBox.cpp
+++ b/src/kvilib/tal/KviTalHBox.cpp
@@ -66,8 +66,7 @@ KviTalHBox::KviTalHBox(QWidget * pParent, char * pcName)
 }
 
 KviTalHBox::~KviTalHBox()
-{
-}
+    = default;
 
 void KviTalHBox::childEvent(QChildEvent * e)
 {
diff --git a/src/kvilib/tal/KviTalIconAndRichTextItemDelegate.cpp b/src/kvilib/tal/KviTalIconAndRichTextItemDelegate.cpp
index fddb43a34..725ddfbff 100644
--- a/src/kvilib/tal/KviTalIconAndRichTextItemDelegate.cpp
+++ b/src/kvilib/tal/KviTalIconAndRichTextItemDelegate.cpp
@@ -37,8 +37,7 @@ KviTalIconAndRichTextItemDelegate::KviTalIconAndRichTextItemDelegate(QAbstractIt
 }
 
 KviTalIconAndRichTextItemDelegate::~KviTalIconAndRichTextItemDelegate()
-{
-}
+    = default;
 
 void KviTalIconAndRichTextItemDelegate::paint(QPainter * pPainter, const QStyleOptionViewItem & option, const QModelIndex & index) const
 {
diff --git a/src/kvilib/tal/KviTalListWidget.cpp b/src/kvilib/tal/KviTalListWidget.cpp
index 6a2191968..85a615d1a 100644
--- a/src/kvilib/tal/KviTalListWidget.cpp
+++ b/src/kvilib/tal/KviTalListWidget.cpp
@@ -98,8 +98,7 @@ KviTalListWidgetText::KviTalListWidgetText(KviTalListWidget* listbox, const QStr
 }*/
 
 KviTalListWidgetText::~KviTalListWidgetText()
-{
-}
+    = default;
 
 void KviTalListWidgetText::paint(QPainter * painter)
 {
@@ -145,8 +144,7 @@ KviTalListWidgetPixmap::KviTalListWidgetPixmap(const QPixmap & pixmap)
 // }
 
 KviTalListWidgetPixmap::~KviTalListWidgetPixmap()
-{
-}
+    = default;
 
 KviTalListWidgetPixmap::KviTalListWidgetPixmap(KviTalListWidget * listbox, const QPixmap & pix, const QString & text)
     : KviTalListWidgetItem(listbox)
diff --git a/src/kvilib/tal/KviTalMainWindow.cpp b/src/kvilib/tal/KviTalMainWindow.cpp
index f0f3c92bc..9f05c9a23 100644
--- a/src/kvilib/tal/KviTalMainWindow.cpp
+++ b/src/kvilib/tal/KviTalMainWindow.cpp
@@ -43,5 +43,4 @@ KviTalMainWindow::KviTalMainWindow(QWidget * pParent, const char * pcName)
 #endif //!COMPILE_KDE_SUPPORT
 
 KviTalMainWindow::~KviTalMainWindow()
-{
-}
+    = default;
diff --git a/src/kvilib/tal/KviTalMenuBar.cpp b/src/kvilib/tal/KviTalMenuBar.cpp
index 2f9b9ae1b..ff21be92d 100644
--- a/src/kvilib/tal/KviTalMenuBar.cpp
+++ b/src/kvilib/tal/KviTalMenuBar.cpp
@@ -47,5 +47,4 @@ KviTalMenuBar::KviTalMenuBar(QWidget * pParent, const char * pcName)
 #endif //!COMPILE_KDE4_SUPPORT
 
 KviTalMenuBar::~KviTalMenuBar()
-{
-}
+    = default;
diff --git a/src/kvilib/tal/KviTalTabDialog.cpp b/src/kvilib/tal/KviTalTabDialog.cpp
index e4589d058..5207bf48f 100644
--- a/src/kvilib/tal/KviTalTabDialog.cpp
+++ b/src/kvilib/tal/KviTalTabDialog.cpp
@@ -45,8 +45,7 @@ KviTalTabDialog::KviTalTabDialog(QWidget * pParent, const char * name, bool bMod
 }
 
 KviTalTabDialog::~KviTalTabDialog()
-{
-}
+    = default;
 
 void KviTalTabDialog::addTab(QWidget * widget, const QString & label)
 {
diff --git a/src/kvilib/tal/KviTalToolTip.cpp b/src/kvilib/tal/KviTalToolTip.cpp
index 4ac018f13..89dbea20c 100644
--- a/src/kvilib/tal/KviTalToolTip.cpp
+++ b/src/kvilib/tal/KviTalToolTip.cpp
@@ -45,7 +45,7 @@ KviTalToolTipHelper::~KviTalToolTipHelper()
 
 void KviTalToolTipHelper::toolTipDying()
 {
-	m_pToolTip = 0;
+	m_pToolTip = nullptr;
 }
 
 bool KviTalToolTipHelper::eventFilter(QObject *, QEvent * pEvent)
@@ -76,7 +76,7 @@ KviTalToolTip::~KviTalToolTip()
 
 void KviTalToolTip::helperDying()
 {
-	m_pHelper = 0;
+	m_pHelper = nullptr;
 }
 
 void KviTalToolTip::add(QWidget * widget, const QString & text)
diff --git a/src/kvilib/tal/KviTalVBox.cpp b/src/kvilib/tal/KviTalVBox.cpp
index 91f2a8a8f..bc921e01a 100644
--- a/src/kvilib/tal/KviTalVBox.cpp
+++ b/src/kvilib/tal/KviTalVBox.cpp
@@ -40,8 +40,7 @@ KviTalVBox::KviTalVBox(QWidget * pParent, char * pcName)
 }
 
 KviTalVBox::~KviTalVBox()
-{
-}
+    = default;
 
 void KviTalVBox::childEvent(QChildEvent * e)
 {
diff --git a/src/kvilib/tal/KviTalWizard.cpp b/src/kvilib/tal/KviTalWizard.cpp
index 24f993889..18e04a2be 100644
--- a/src/kvilib/tal/KviTalWizard.cpp
+++ b/src/kvilib/tal/KviTalWizard.cpp
@@ -81,7 +81,7 @@ public:
 			if(pData->pWidget == pWidget)
 				return pData;
 		}
-		return NULL;
+		return nullptr;
 	}
 
 	KviTalWizardPageData * findFirstEnabledPage()
@@ -92,7 +92,7 @@ public:
 			if(pData->bEnabled)
 				return pData;
 		}
-		return NULL;
+		return nullptr;
 	}
 
 	KviTalWizardPageData * findLastEnabledPage()
@@ -103,7 +103,7 @@ public:
 			if(pData->bEnabled)
 				return pData;
 		}
-		return NULL;
+		return nullptr;
 	}
 
 	KviTalWizardPageData * findNextEnabledPage(QWidget * pReference)
@@ -112,13 +112,13 @@ public:
 			return findFirstEnabledPage();
 		KviTalWizardPageData * pData = findPage(pReference);
 		if(!pData)
-			return NULL;
+			return nullptr;
 		for(pData = pPageList->next(); pData; pData = pPageList->next())
 		{
 			if(pData->bEnabled)
 				return pData;
 		}
-		return NULL;
+		return nullptr;
 	}
 
 	KviTalWizardPageData * findPrevEnabledPage(QWidget * pReference)
@@ -127,13 +127,13 @@ public:
 			return findLastEnabledPage();
 		KviTalWizardPageData * pData = findPage(pReference);
 		if(!pData)
-			return NULL;
+			return nullptr;
 		for(pData = pPageList->prev(); pData; pData = pPageList->prev())
 		{
 			if(pData->bEnabled)
 				return pData;
 		}
-		return NULL;
+		return nullptr;
 	}
 
 	int reindexPages()
@@ -157,7 +157,7 @@ KviTalWizard::KviTalWizard(QWidget * pParent)
 	m_p = new KviTalWizardPrivate;
 	m_p->pPageList = new KviPointerList<KviTalWizardPageData>;
 	m_p->pPageList->setAutoDelete(true);
-	m_p->pCurrentPage = NULL;
+	m_p->pCurrentPage = nullptr;
 	m_p->iEnabledPageCount = 0;
 	m_p->pLayout = new QGridLayout(this);
 
@@ -317,7 +317,7 @@ bool KviTalWizard::setCurrentPage(QWidget * pWidget)
 QWidget * KviTalWizard::currentPage()
 {
 	if(!m_p->pCurrentPage)
-		return NULL;
+		return nullptr;
 	return m_p->pCurrentPage->pWidget;
 }
 
diff --git a/src/kvirc/kernel/KviAction.cpp b/src/kvirc/kernel/KviAction.cpp
index f416198a0..92053adce 100644
--- a/src/kvirc/kernel/KviAction.cpp
+++ b/src/kvirc/kernel/KviAction.cpp
@@ -41,8 +41,7 @@ KviActionCategory::KviActionCategory(const QString & szName, const QString & szV
 }
 
 KviActionCategory::~KviActionCategory()
-{
-}
+    = default;
 
 KviAction::KviAction(QObject * pParent, const QString & szName, const QString & szVisibleName, const QString & szDescription, KviActionCategory * pCategory, const QString & szBigIconId, const QString & szSmallIconId, unsigned int uFlags, const QString & szKeySequence)
     : QObject(pParent),
@@ -53,11 +52,11 @@ KviAction::KviAction(QObject * pParent, const QString & szName, const QString &
       m_szBigIconId(szBigIconId),
       m_szSmallIconId(szSmallIconId),
       m_eSmallIcon(KviIconManager::None),
-      m_pActionList(NULL),
+      m_pActionList(nullptr),
       m_uInternalFlags(KviAction::Enabled),
       m_uFlags(uFlags),
       m_szKeySequence(szKeySequence),
-      m_pAccel(NULL)
+      m_pAccel(nullptr)
 {
 }
 
@@ -69,11 +68,11 @@ KviAction::KviAction(QObject * pParent, const QString & szName, const QString &
       m_pCategory(pCategory),
       m_szBigIconId(szBigIconId),
       m_eSmallIcon(eSmallIcon),
-      m_pActionList(NULL),
+      m_pActionList(nullptr),
       m_uInternalFlags(KviAction::Enabled),
       m_uFlags(uFlags),
       m_szKeySequence(szKeySequence),
-      m_pAccel(NULL)
+      m_pAccel(nullptr)
 {
 }
 
@@ -115,14 +114,14 @@ void KviAction::registerAccelerator()
 	{
 		g_pMainWindow->freeAccelleratorKeySequence(m_szKeySequence);
 
-		m_pAccel = new QShortcut(m_szKeySequence, g_pMainWindow, 0, 0, Qt::ApplicationShortcut);
+		m_pAccel = new QShortcut(m_szKeySequence, g_pMainWindow, nullptr, nullptr, Qt::ApplicationShortcut);
 		connect(m_pAccel, SIGNAL(activated()), this, SLOT(activate()));
 		//no way to have Ctrl+Alt+Key events fired as no-ambiguous, probably qt bug
 		connect(m_pAccel, SIGNAL(activatedAmbiguously()), this, SLOT(activate()));
 	}
 	else
 	{
-		m_pAccel = NULL;
+		m_pAccel = nullptr;
 	}
 }
 
@@ -133,7 +132,7 @@ void KviAction::unregisterAccelerator()
 
 	delete m_pAccel;
 
-	m_pAccel = NULL;
+	m_pAccel = nullptr;
 }
 
 void KviAction::setEnabled(bool bEnabled)
@@ -184,17 +183,17 @@ QPixmap * KviAction::smallIcon()
 	{
 		QPixmap * pPix = g_pIconManager->getImage(m_szSmallIconId);
 		if(!pPix)
-			return NULL;
+			return nullptr;
 	}
 	if(m_eSmallIcon != KviIconManager::None)
 		return g_pIconManager->getSmallIcon(m_eSmallIcon);
-	return NULL;
+	return nullptr;
 }
 
 QPixmap * KviAction::bigIcon()
 {
 	if(m_szBigIconId.isEmpty())
-		return NULL;
+		return nullptr;
 	return g_pIconManager->getImage(m_szBigIconId);
 }
 
diff --git a/src/kvirc/kernel/KviActionManager.cpp b/src/kvirc/kernel/KviActionManager.cpp
index b2e700759..cf20bcaff 100644
--- a/src/kvirc/kernel/KviActionManager.cpp
+++ b/src/kvirc/kernel/KviActionManager.cpp
@@ -33,16 +33,16 @@
 #include "KviConfigurationFile.h"
 #include "KviMainWindow.h"
 
-KviActionManager * KviActionManager::m_pInstance = 0;
-KviActionCategory * KviActionManager::m_pCategoryIrc = 0;
-KviActionCategory * KviActionManager::m_pCategoryGeneric = 0;
-KviActionCategory * KviActionManager::m_pCategorySettings = 0;
-KviActionCategory * KviActionManager::m_pCategoryScripting = 0;
-KviActionCategory * KviActionManager::m_pCategoryGUI = 0;
-KviActionCategory * KviActionManager::m_pCategoryChannel = 0;
-KviActionCategory * KviActionManager::m_pCategoryTools = 0;
+KviActionManager * KviActionManager::m_pInstance = nullptr;
+KviActionCategory * KviActionManager::m_pCategoryIrc = nullptr;
+KviActionCategory * KviActionManager::m_pCategoryGeneric = nullptr;
+KviActionCategory * KviActionManager::m_pCategorySettings = nullptr;
+KviActionCategory * KviActionManager::m_pCategoryScripting = nullptr;
+KviActionCategory * KviActionManager::m_pCategoryGUI = nullptr;
+KviActionCategory * KviActionManager::m_pCategoryChannel = nullptr;
+KviActionCategory * KviActionManager::m_pCategoryTools = nullptr;
 bool KviActionManager::m_bCustomizingToolBars = false;
-KviCustomToolBar * KviActionManager::m_pCurrentToolBar = 0;
+KviCustomToolBar * KviActionManager::m_pCurrentToolBar = nullptr;
 // KviCoreActions.cpp
 extern void register_core_actions(KviActionManager *);
 
@@ -68,7 +68,7 @@ KviActionManager::KviActionManager()
 	CATEGORY(m_pCategoryTools, "tools", __tr2qs("Tools"), __tr2qs("Actions that will appear in the \"Tools\" menu"));
 
 	m_bCustomizingToolBars = false;
-	m_pCurrentToolBar = 0;
+	m_pCurrentToolBar = nullptr;
 	m_bCoreActionsRegistered = false;
 }
 
@@ -196,7 +196,7 @@ void KviActionManager::customizeToolBarsDialogDestroyed()
 	if(m_pCurrentToolBar)
 	{
 		m_pCurrentToolBar->update();
-		m_pCurrentToolBar = 0;
+		m_pCurrentToolBar = nullptr;
 	}
 	g_pApp->saveToolBars();
 }
@@ -238,7 +238,7 @@ void KviActionManager::done()
 	if(m_pInstance)
 	{
 		delete m_pInstance;
-		m_pInstance = 0;
+		m_pInstance = nullptr;
 	}
 }
 
@@ -310,7 +310,7 @@ KviAction * KviActionManager::getAction(const QString & szName)
 	// try to preload the module that might register this action...
 	QString szModule = szName.left(idx);
 	if(!g_pModuleManager->getModule(szModule))
-		return 0;
+		return nullptr;
 	return m_pActions->find(szName);
 }
 
diff --git a/src/kvirc/kernel/KviApplication.cpp b/src/kvirc/kernel/KviApplication.cpp
index 3ec651d87..6d7c2f81d 100644
--- a/src/kvirc/kernel/KviApplication.cpp
+++ b/src/kvirc/kernel/KviApplication.cpp
@@ -242,7 +242,7 @@ void KviApplication::setup()
 	// Don't move stuff around unless you really know what you're doing.
 
 	// Initialize the random number generator
-	::srand(::time(0));
+	::srand(::time(nullptr));
 
 #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
 	// setup winsock.dll
@@ -735,7 +735,7 @@ void KviApplication::notifierMessage(KviWindow * pWnd, int iIconId, const QStrin
 		actions << __tr2qs("View");
 		actions << __tr2qs("Ignore");
 
-		QPixmap * pIcon = 0;
+		QPixmap * pIcon = nullptr;
 		KviIconManager::SmallIcon eIcon = KviIconManager::None;
 		switch(pWnd->type())
 		{
@@ -961,7 +961,7 @@ void KviApplication::checkSuggestRestoreDefaultScript()
 	if(!KviDefaultScriptManager::instance()->isDefscriptUpToDate())
 	{
 		switch(
-		    QMessageBox::question(0, __tr2qs("Update Default Scripts - KVIrc"),
+		    QMessageBox::question(nullptr, __tr2qs("Update Default Scripts - KVIrc"),
 		        __tr2qs("<b>Hi!</b><br><br>"
 		                "<b>It seems that you have just upgraded KVIrc from a previous version.</b><br><br>"
 		                "The KVIrc default scripts needs to be updated too, to play nice with your fresh new KVIrc.<br>"
@@ -1027,7 +1027,7 @@ void KviApplication::checkSuggestRestoreDefaultScript()
 	bSuggestedOnce = true;
 
 	switch(
-	    QMessageBox::question(0, __tr2qs("Detected Installation Issues - KVIrc"),
+	    QMessageBox::question(nullptr, __tr2qs("Detected Installation Issues - KVIrc"),
 	        __tr2qs("<b>Oops!</b><br><br>"
 	                "<b>There are some reasons that make me think your KVIrc installation is incomplete.</b><br><br>"
 	                "You seem to be missing some of the features that the default KVIrc scripts provide."
@@ -1141,7 +1141,7 @@ KviPendingAvatarChange * KviApplication::findPendingAvatarChange(
     const QString & szRemoteUrl)
 {
 	if(!m_pPendingAvatarChanges)
-		return NULL;
+		return nullptr;
 
 	KviPendingAvatarChange * pAvatar;
 
@@ -1157,7 +1157,7 @@ KviPendingAvatarChange * KviApplication::findPendingAvatarChange(
 		}
 	}
 
-	return NULL;
+	return nullptr;
 }
 
 void KviApplication::fileDownloadTerminated(
@@ -1171,7 +1171,7 @@ void KviApplication::fileDownloadTerminated(
 	KviPendingAvatarChange * pAvatar;
 
 	if(m_pPendingAvatarChanges)
-		pAvatar = findPendingAvatarChange(0, szNick, szRemoteUrl);
+		pAvatar = findPendingAvatarChange(nullptr, szNick, szRemoteUrl);
 	else
 		pAvatar = nullptr;
 
@@ -1212,7 +1212,7 @@ void KviApplication::fileDownloadTerminated(
 				szMsg += szLocalFileName;
 				szMsg += ")";
 			}
-			notifierMessage(0, iIconId, KviQString::toHtmlEscaped(szMsg), KVI_OPTION_UINT(KviOption_uintNotifierAutoHideTime));
+			notifierMessage(nullptr, iIconId, KviQString::toHtmlEscaped(szMsg), KVI_OPTION_UINT(KviOption_uintNotifierAutoHideTime));
 		}
 		return;
 	}
@@ -1633,7 +1633,7 @@ void KviApplication::createFrame()
 	else
 		new KviMainWindow(new QWidget(0, 0));
 #else
-	new KviMainWindow(0);
+	new KviMainWindow(nullptr);
 #endif
 
 	Q_ASSERT(g_pMainWindow != nullptr);
@@ -1725,7 +1725,7 @@ KviConsoleWindow * KviApplication::findConsole(QString & szServer, QString & szN
 
 		++it;
 	}
-	return NULL;
+	return nullptr;
 }
 
 void KviApplication::restartLagMeters()
@@ -1778,7 +1778,7 @@ KviConsoleWindow * KviApplication::findConsole(unsigned int uIrcContextId)
 			return pWindow;
 		++it;
 	}
-	return NULL;
+	return nullptr;
 }
 
 KviConsoleWindow * KviApplication::topmostConnectedConsole()
@@ -1787,7 +1787,7 @@ KviConsoleWindow * KviApplication::topmostConnectedConsole()
 
 	KviConsoleWindow * pConsole = activeConsole();
 	if(!pConsole)
-		return NULL;
+		return nullptr;
 	if(pConsole->isConnected())
 		return pConsole;
 
@@ -1803,7 +1803,7 @@ KviConsoleWindow * KviApplication::topmostConnectedConsole()
 		++it;
 	}
 
-	return NULL;
+	return nullptr;
 }
 
 KviWindow * KviApplication::findWindow(const QString & szWindowId)
@@ -1821,7 +1821,7 @@ KviWindow * KviApplication::findWindowByCaption(const QString & szWindowCaption,
 			return it.current();
 		++it;
 	}
-	return NULL;
+	return nullptr;
 }
 
 void KviApplication::registerWindow(KviWindow * pWnd)
@@ -1837,7 +1837,7 @@ void KviApplication::unregisterWindow(KviWindow * pWnd)
 KviConsoleWindow * KviApplication::activeConsole()
 {
 	if(!g_pMainWindow)
-		return NULL;
+		return nullptr;
 	if(g_pActiveWindow)
 	{
 		if(g_pActiveWindow->console())
@@ -1909,16 +1909,13 @@ void KviApplication::buildRecentChannels()
 
 	QString szChan, szNet;
 
-	for(
-	    QStringList::Iterator it = KVI_OPTION_STRINGLIST(KviOption_stringlistRecentChannels).begin();
-	    it != KVI_OPTION_STRINGLIST(KviOption_stringlistRecentChannels).end();
-	    ++it)
+	for(auto & it : KVI_OPTION_STRINGLIST(KviOption_stringlistRecentChannels))
 	{
-		if((*it).isEmpty())
+		if(it.isEmpty())
 			continue;
 
-		szChan = (*it).section(KVI_RECENT_CHANNELS_SEPARATOR, 0, 0);
-		szNet = (*it).section(KVI_RECENT_CHANNELS_SEPARATOR, 1);
+		szChan = it.section(KVI_RECENT_CHANNELS_SEPARATOR, 0, 0);
+		szNet = it.section(KVI_RECENT_CHANNELS_SEPARATOR, 1);
 
 		if(szNet.isEmpty())
 			continue;
@@ -1976,11 +1973,11 @@ void KviApplication::fillRecentServersPopup(QMenu * pMenu)
 {
 	// FIXME: #warning "MAYBE DISABLE THE SERVERS THAT WE ARE ALREADY CONNECTED TO ?"
 	pMenu->clear();
-	for(QStringList::Iterator it = KVI_OPTION_STRINGLIST(KviOption_stringlistRecentServers).begin(); it != KVI_OPTION_STRINGLIST(KviOption_stringlistRecentServers).end(); ++it)
+	for(auto & it : KVI_OPTION_STRINGLIST(KviOption_stringlistRecentServers))
 	{
-		if(*it == "")
+		if(it == "")
 			continue;
-		pMenu->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Server)), *it);
+		pMenu->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Server)), it);
 	}
 }
 
@@ -1989,18 +1986,18 @@ void KviApplication::fillRecentNicknamesPopup(QMenu * pMenu, KviConsoleWindow *
 	pMenu->clear();
 	QAction * pAction;
 	bool bAlreadyFound = false;
-	for(QStringList::Iterator it = KVI_OPTION_STRINGLIST(KviOption_stringlistRecentNicknames).begin(); it != KVI_OPTION_STRINGLIST(KviOption_stringlistRecentNicknames).end(); ++it)
+	for(auto & it : KVI_OPTION_STRINGLIST(KviOption_stringlistRecentNicknames))
 	{
-		if(*it == "")
+		if(it == "")
 			continue;
-		pAction = pMenu->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Nick)), *it);
+		pAction = pMenu->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Nick)), it);
 		if(!pConsole->isConnected())
 			pAction->setEnabled(false);
 		else
 		{
 			if(!bAlreadyFound)
 			{
-				bool bIsCurrent = KviQString::equalCS(pConsole->connection()->currentNickName(), *it);
+				bool bIsCurrent = KviQString::equalCS(pConsole->connection()->currentNickName(), it);
 				pAction->setEnabled(!bIsCurrent);
 				if(bIsCurrent)
 					bAlreadyFound = true;
@@ -2016,15 +2013,15 @@ void KviApplication::fillRecentChannelsPopup(QMenu * pMenu, KviConsoleWindow * p
 	QStringList * pList = recentChannelsForNetwork(pConsole->currentNetworkName());
 	if(pList)
 	{
-		for(QStringList::Iterator it = pList->begin(); it != pList->end(); ++it)
+		for(auto & it : *pList)
 		{
-			if(*it == "")
+			if(it == "")
 				continue; // ?
-			pAction = pMenu->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Channel)), *it);
+			pAction = pMenu->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Channel)), it);
 			if(!pConsole->isConnected())
 				pAction->setEnabled(false);
 			else
-				pAction->setEnabled(!(pConsole->connection()->findChannel(*it)));
+				pAction->setEnabled(!(pConsole->connection()->findChannel(it)));
 		}
 	}
 }
@@ -2046,7 +2043,7 @@ void KviApplication::heartbeat(kvi_time_t tNow)
 		while(it.current())
 		{
 			if(it.current()->view() && it.current()->view()->isLogging())
-				it.current()->view()->startLogging(0);
+				it.current()->view()->startLogging(nullptr);
 			++it;
 		}
 	}
diff --git a/src/kvirc/kernel/KviApplication_filesystem.cpp b/src/kvirc/kernel/KviApplication_filesystem.cpp
index e000aacb4..451bf41aa 100644
--- a/src/kvirc/kernel/KviApplication_filesystem.cpp
+++ b/src/kvirc/kernel/KviApplication_filesystem.cpp
@@ -313,7 +313,7 @@ void KviApplication::getTmpFileName(QString & szBuffer, const QString & szEnding
 	KviQString::ensureLastCharIs(tmp, KVI_PATH_SEPARATOR_CHAR);
 
 	struct timeval tmv;
-	kvi_gettimeofday(&tmv, 0);
+	kvi_gettimeofday(&tmv, nullptr);
 
 	QString szFileName = szEndingFileName.isNull() ? QString("file.tmp") : szEndingFileName;
 	do
@@ -423,10 +423,9 @@ void KviApplication::getChannelDumpLogFileName(QString & szStr)
 bool KviApplication::findImageInImageSearchPath(QString & szRetPath, const QString & filename)
 {
 	// first lookup the user defined paths
-	for(QStringList::Iterator it = KVI_OPTION_STRINGLIST(KviOption_stringlistImageSearchPaths).begin();
-	    it != KVI_OPTION_STRINGLIST(KviOption_stringlistImageSearchPaths).end(); ++it)
+	for(auto & it : KVI_OPTION_STRINGLIST(KviOption_stringlistImageSearchPaths))
 	{
-		szRetPath = *it;
+		szRetPath = it;
 		KviQString::ensureLastCharIs(szRetPath, KVI_PATH_SEPARATOR_CHAR);
 		szRetPath.append(filename);
 		//qDebug("LOOK FOR %s",szRetPath.ptr());
diff --git a/src/kvirc/kernel/KviApplication_setup.cpp b/src/kvirc/kernel/KviApplication_setup.cpp
index d63d9ea0d..938b5072a 100644
--- a/src/kvirc/kernel/KviApplication_setup.cpp
+++ b/src/kvirc/kernel/KviApplication_setup.cpp
@@ -52,7 +52,7 @@
 #include <QDir>
 #include <QLibrary>
 
-static QLibrary * g_pSetupLibrary = 0;
+static QLibrary * g_pSetupLibrary = nullptr;
 
 //
 // Things launched at startup:
@@ -830,7 +830,7 @@ void KviApplication::setupFinish()
 
 	g_pSetupLibrary->unload();
 	delete g_pSetupLibrary;
-	g_pSetupLibrary = 0;
+	g_pSetupLibrary = nullptr;
 }
 
 void KviApplication::saveKvircDirectory()
@@ -851,7 +851,7 @@ void KviApplication::saveKvircDirectory()
 				pCfgMainGroup->writeEntry("SourcesDate", KVI_SOURCES_DATE_NUMERIC);
 				pCfg->sync();
 				delete pCfgMainGroup;
-				pCfgMainGroup = 0;
+				pCfgMainGroup = nullptr;
 				return;
 			}
 		}
diff --git a/src/kvirc/kernel/KviAsynchronousConnectionData.cpp b/src/kvirc/kernel/KviAsynchronousConnectionData.cpp
index eeb413ecc..21697370a 100644
--- a/src/kvirc/kernel/KviAsynchronousConnectionData.cpp
+++ b/src/kvirc/kernel/KviAsynchronousConnectionData.cpp
@@ -28,7 +28,7 @@
 KviAsynchronousConnectionData::KviAsynchronousConnectionData()
     : KviHeapObject()
 {
-	m_pReconnectInfo = 0;
+	m_pReconnectInfo = nullptr;
 	bUseLastServerInContext = false;
 }
 
diff --git a/src/kvirc/kernel/KviCoreActions.cpp b/src/kvirc/kernel/KviCoreActions.cpp
index 336cc5889..9b3c42651 100644
--- a/src/kvirc/kernel/KviCoreActions.cpp
+++ b/src/kvirc/kernel/KviCoreActions.cpp
@@ -606,13 +606,13 @@ void KviConnectAction::activeContextStateChanged()
 				txt = m_szDisconnectString;
 				break;
 			default:
-				p = 0;
+				p = nullptr;
 				break;
 		}
 	}
 	else
 	{
-		p = 0;
+		p = nullptr;
 	}
 
 	if(p)
@@ -738,7 +738,7 @@ KviSubmenuAction::KviSubmenuAction(
           eSmallIcon,
           uFlags)
 {
-	m_pPopup = 0;
+	m_pPopup = nullptr;
 }
 
 KviSubmenuAction::~KviSubmenuAction()
@@ -1107,12 +1107,12 @@ void KviGoAwayAction::activeContextStateChanged()
 		}
 		else
 		{
-			p = 0;
+			p = nullptr;
 		}
 	}
 	else
 	{
-		p = 0;
+		p = nullptr;
 	}
 
 	if(p)
diff --git a/src/kvirc/kernel/KviCustomToolBarDescriptor.cpp b/src/kvirc/kernel/KviCustomToolBarDescriptor.cpp
index 7e5ec238b..7ff3192a6 100644
--- a/src/kvirc/kernel/KviCustomToolBarDescriptor.cpp
+++ b/src/kvirc/kernel/KviCustomToolBarDescriptor.cpp
@@ -38,7 +38,7 @@ KviCustomToolBarDescriptor::KviCustomToolBarDescriptor(const QString & szId, con
 	m_szId = szId;
 	m_pActions = new KviPointerList<QString>;
 	m_pActions->setAutoDelete(true);
-	m_pToolBar = 0;
+	m_pToolBar = nullptr;
 	m_bVisibleAtStartup = false;
 	createLabelScript(szLabelCode);
 }
@@ -61,7 +61,7 @@ void KviCustomToolBarDescriptor::createLabelScript(const QString & szLabelCode)
 
 const QString & KviCustomToolBarDescriptor::label()
 {
-	if(!m_pLabelScript->run(g_pActiveWindow, 0, m_szParsedLabel))
+	if(!m_pLabelScript->run(g_pActiveWindow, nullptr, m_szParsedLabel))
 		m_szParsedLabel = m_pLabelScript->code();
 	return m_szParsedLabel;
 }
@@ -167,7 +167,7 @@ void KviCustomToolBarDescriptor::registerToolBar(KviCustomToolBar * t)
 
 void KviCustomToolBarDescriptor::unregisterToolBar(KviCustomToolBar *)
 {
-	m_pToolBar = 0;
+	m_pToolBar = nullptr;
 }
 
 void KviCustomToolBarDescriptor::rename(const QString & szNewLabelCode)
@@ -184,7 +184,7 @@ void KviCustomToolBarDescriptor::clear()
 	if(m_pToolBar)
 	{
 		delete m_pToolBar;
-		m_pToolBar = 0;
+		m_pToolBar = nullptr;
 	}
 }
 
diff --git a/src/kvirc/kernel/KviCustomToolBarManager.cpp b/src/kvirc/kernel/KviCustomToolBarManager.cpp
index 32d748512..9b5c68808 100644
--- a/src/kvirc/kernel/KviCustomToolBarManager.cpp
+++ b/src/kvirc/kernel/KviCustomToolBarManager.cpp
@@ -27,7 +27,7 @@
 #include "KviConfigurationFile.h"
 #include "KviLocale.h"
 
-KviCustomToolBarManager * KviCustomToolBarManager::m_pInstance = 0;
+KviCustomToolBarManager * KviCustomToolBarManager::m_pInstance = nullptr;
 
 KviCustomToolBarManager::KviCustomToolBarManager()
 {
@@ -49,7 +49,7 @@ KviCustomToolBar * KviCustomToolBarManager::firstExistingToolBar()
 			return d->toolBar();
 		++it;
 	}
-	return 0;
+	return nullptr;
 }
 
 void KviCustomToolBarManager::init()
@@ -63,7 +63,7 @@ void KviCustomToolBarManager::done()
 	if(m_pInstance)
 	{
 		delete m_pInstance;
-		m_pInstance = 0;
+		m_pInstance = nullptr;
 	}
 }
 
@@ -102,7 +102,7 @@ KviCustomToolBarDescriptor * KviCustomToolBarManager::findDescriptorByInternalId
 			return d;
 		++it;
 	}
-	return 0;
+	return nullptr;
 }
 
 bool KviCustomToolBarManager::renameDescriptor(const QString & szId, const QString & szNewId, const QString & szNewLabelCode)
@@ -149,7 +149,7 @@ void KviCustomToolBarManager::storeVisibilityState()
 	KviPointerHashTableIterator<QString, KviCustomToolBarDescriptor> it(*m_pDescriptors);
 	while(KviCustomToolBarDescriptor * d = it.current())
 	{
-		d->m_bVisibleAtStartup = d->toolBar() != 0;
+		d->m_bVisibleAtStartup = d->toolBar() != nullptr;
 		++it;
 	}
 }
@@ -160,7 +160,7 @@ int KviCustomToolBarManager::visibleToolBarCount()
 	KviPointerHashTableIterator<QString, KviCustomToolBarDescriptor> it(*m_pDescriptors);
 	while(KviCustomToolBarDescriptor * d = it.current())
 	{
-		if(d->toolBar() != 0)
+		if(d->toolBar() != nullptr)
 			cnt++;
 		++it;
 	}
diff --git a/src/kvirc/kernel/KviDefaultScript.cpp b/src/kvirc/kernel/KviDefaultScript.cpp
index 6736a92be..7af06a512 100644
--- a/src/kvirc/kernel/KviDefaultScript.cpp
+++ b/src/kvirc/kernel/KviDefaultScript.cpp
@@ -40,7 +40,7 @@
 #include <QPushButton>
 #include <QMessageBox>
 
-KviDefaultScriptManager * KviDefaultScriptManager::m_pSelf = NULL;
+KviDefaultScriptManager * KviDefaultScriptManager::m_pSelf = nullptr;
 unsigned int KviDefaultScriptManager::m_uCount = 0;
 
 KviDefaultScriptManager::KviDefaultScriptManager()
@@ -76,8 +76,7 @@ KviDefaultScriptManager::KviDefaultScriptManager()
 }
 
 KviDefaultScriptManager::~KviDefaultScriptManager()
-{
-}
+    = default;
 
 void KviDefaultScriptManager::init()
 {
@@ -127,13 +126,13 @@ void KviDefaultScriptManager::restore()
 	// Check data
 	if(!compareVersions(szGlobal, &szError))
 	{
-		QMessageBox::warning(0, __tr2qs("Restore Default - KVIrc"), szError, QMessageBox::Ok, QMessageBox::NoButton, QMessageBox::NoButton);
+		QMessageBox::warning(nullptr, __tr2qs("Restore Default - KVIrc"), szError, QMessageBox::Ok, QMessageBox::NoButton, QMessageBox::NoButton);
 		return;
 	}
 
 	if(m_bNoNeedToRestore)
 	{
-		if(QMessageBox::warning(0, __tr2qs("Restore Default - KVIrc"), szError, QMessageBox::Yes, QMessageBox::No) != QMessageBox::Yes)
+		if(QMessageBox::warning(nullptr, __tr2qs("Restore Default - KVIrc"), szError, QMessageBox::Yes, QMessageBox::No) != QMessageBox::Yes)
 			return;
 	}
 
@@ -497,8 +496,7 @@ KviDefaultScriptDialog::KviDefaultScriptDialog()
 }
 
 KviDefaultScriptDialog::~KviDefaultScriptDialog()
-{
-}
+    = default;
 
 void KviDefaultScriptDialog::toggleAll(bool)
 {
diff --git a/src/kvirc/kernel/KviFileTransfer.cpp b/src/kvirc/kernel/KviFileTransfer.cpp
index cf16cc3e1..ee12a704e 100644
--- a/src/kvirc/kernel/KviFileTransfer.cpp
+++ b/src/kvirc/kernel/KviFileTransfer.cpp
@@ -31,13 +31,13 @@
 
 #include <QMenu>
 
-static KviFileTransferManager * g_pFileTransferManager = 0;
+static KviFileTransferManager * g_pFileTransferManager = nullptr;
 
 KviFileTransferManager::KviFileTransferManager()
     : QObject()
 {
-	m_pTransferList = 0;
-	m_pTransferWindow = 0;
+	m_pTransferList = nullptr;
+	m_pTransferWindow = nullptr;
 }
 
 KviFileTransferManager::~KviFileTransferManager()
@@ -59,7 +59,7 @@ void KviFileTransferManager::cleanup()
 	if(g_pFileTransferManager)
 	{
 		delete g_pFileTransferManager;
-		g_pFileTransferManager = 0;
+		g_pFileTransferManager = nullptr;
 	}
 }
 
@@ -132,14 +132,14 @@ void KviFileTransferManager::unregisterTransfer(KviFileTransfer * t)
 	if(m_pTransferList->isEmpty())
 	{
 		delete m_pTransferList;
-		m_pTransferList = 0;
+		m_pTransferList = nullptr;
 	}
 }
 
 KviFileTransfer::KviFileTransfer()
     : QObject()
 {
-	m_pDisplayItem = 0;
+	m_pDisplayItem = nullptr;
 	m_iId = g_pApp->getGloballyUniqueId();
 	manager()->registerTransfer(this);
 }
diff --git a/src/kvirc/kernel/KviIconManager.cpp b/src/kvirc/kernel/KviIconManager.cpp
index c8153fdad..89dd35efa 100644
--- a/src/kvirc/kernel/KviIconManager.cpp
+++ b/src/kvirc/kernel/KviIconManager.cpp
@@ -78,7 +78,7 @@
 extern QPixmap * g_pUserChanStatePixmap;
 extern QPixmap * g_pActivityMeterPixmap;
 
-KviIconManager * g_pIconManager = 0;
+KviIconManager * g_pIconManager = nullptr;
 
 static const char * g_szIconNames[KviIconManager::IconCount] = {
 	"none",                 // 0
@@ -422,7 +422,7 @@ static const char * g_szIconNames[KviIconManager::IconCount] = {
 };
 
 KviIconWidget::KviIconWidget()
-    : QWidget(0)
+    : QWidget(nullptr)
 {
 	setObjectName("global_icon_widget");
 	init();
@@ -471,8 +471,7 @@ void KviIconWidget::init()
 }
 
 KviIconWidget::~KviIconWidget()
-{
-}
+    = default;
 
 void KviIconWidget::closeEvent(QCloseEvent * pEvent)
 {
@@ -542,7 +541,7 @@ KviIconManager::KviIconManager()
 {
 	int i = 0;
 	for(i = 0; i < IconCount; i++)
-		m_smallIcons[i] = 0;
+		m_smallIcons[i] = nullptr;
 
 	initQResourceBackend();
 
@@ -552,7 +551,7 @@ KviIconManager::KviIconManager()
 	m_uCacheTotalSize = 0;
 	m_uCacheMaxSize = 1024 * 1024; // 1 MB
 
-	m_pIconWidget = 0;
+	m_pIconWidget = nullptr;
 
 	QString szBuffer;
 
@@ -563,7 +562,7 @@ KviIconManager::KviIconManager()
 	g_pApp->findImage(szBuffer, KVI_ACTIVITYMETER_IMAGE_NAME);
 	g_pActivityMeterPixmap = new QPixmap(szBuffer);
 
-	m_pIconNames = 0;
+	m_pIconNames = nullptr;
 }
 
 KviIconManager::~KviIconManager()
@@ -1676,13 +1675,13 @@ void KviIconManager::showIconWidget()
 void KviIconManager::iconWidgetClosed()
 {
 	delete m_pIconWidget;
-	m_pIconWidget = 0;
+	m_pIconWidget = nullptr;
 }
 
 KviCachedPixmap * KviIconManager::getPixmapWithCache(const QString & szName)
 {
 	if(szName.isEmpty())
-		return 0;
+		return nullptr;
 
 	KviCachedPixmap * pCache = m_pCachedImages->find(szName);
 
@@ -1692,19 +1691,19 @@ KviCachedPixmap * KviIconManager::getPixmapWithCache(const QString & szName)
 		return pCache;
 	}
 
-	QPixmap * pPix = 0;
+	QPixmap * pPix = nullptr;
 
 	QString szRetPath;
 
 	if(!g_pApp->findImage(szRetPath, szName))
-		return 0;
+		return nullptr;
 
 	pPix = new QPixmap(szRetPath);
 	if(pPix->isNull())
 	{
 		delete pPix; // it is not an valid image!!! (really bad situation...)
-		pPix = 0;
-		return 0;
+		pPix = nullptr;
+		return nullptr;
 	}
 
 	pCache = new KviCachedPixmap(pPix, QString(szRetPath));
@@ -1716,7 +1715,7 @@ KviCachedPixmap * KviIconManager::getPixmapWithCache(const QString & szName)
 KviCachedPixmap * KviIconManager::getPixmapWithCacheScaleOnLoad(const QString & szName, int iMaxWidth, int iMaxHeight)
 {
 	if(szName.isEmpty())
-		return 0;
+		return nullptr;
 
 	KviCachedPixmap * pCache = m_pCachedImages->find(szName);
 
@@ -1726,19 +1725,19 @@ KviCachedPixmap * KviIconManager::getPixmapWithCacheScaleOnLoad(const QString &
 		return pCache;
 	}
 
-	QPixmap * pPix = 0;
+	QPixmap * pPix = nullptr;
 
 	QString szRetPath;
 
 	if(!g_pApp->findImage(szRetPath, szName))
-		return 0;
+		return nullptr;
 
 	pPix = new QPixmap(szRetPath);
 	if(pPix->isNull())
 	{
 		delete pPix; // it is not an valid image!!! (really bad situation...)
-		pPix = 0;
-		return 0;
+		pPix = nullptr;
+		return nullptr;
 	}
 	if((pPix->width() > iMaxWidth) || (pPix->height() > iMaxHeight))
 	{
@@ -1774,7 +1773,7 @@ void KviIconManager::addToCache(const QString & szName, KviCachedPixmap * pCache
 QPixmap * KviIconManager::getImage(const QString & szId, bool bCanBeNumber, QString * pszRetPath)
 {
 	if(szId.isEmpty())
-		return NULL;
+		return nullptr;
 
 	if(bCanBeNumber)
 	{
@@ -1804,7 +1803,7 @@ QPixmap * KviIconManager::getImage(const QString & szId, bool bCanBeNumber, QStr
 
 	KviCachedPixmap * pCache = getPixmapWithCache(szId);
 	if(!pCache)
-		return NULL;
+		return nullptr;
 
 	if(pszRetPath)
 		*pszRetPath = pCache->path();
@@ -1879,7 +1878,7 @@ KviAvatar * KviIconManager::getAvatar(const QString & szLocalPath, const QString
 	{
 		//both path and name empty => fail
 		if(szName.isEmpty())
-			return 0;
+			return nullptr;
 		if(KviQString::equalCIN("http://", szName, 7) || KviQString::equalCIN("https://", szName, 8))
 		{
 			// it's a URL, cache it locally
@@ -1898,7 +1897,7 @@ KviAvatar * KviIconManager::getAvatar(const QString & szLocalPath, const QString
 	else if(szName.isEmpty())
 	{
 		if(szLocalPath.isEmpty())
-			return 0;
+			return nullptr;
 		szP = szLocalPath;
 		szN = KviFileUtils::extractFileName(szLocalPath);
 	}
@@ -1914,7 +1913,7 @@ KviAvatar * KviIconManager::getAvatar(const QString & szLocalPath, const QString
 	//	,KVI_OPTION_UINT(KviOption_uintScaleAvatarsOnLoadHeight)) : getPixmapWithCache(szP);
 	//if(!p)return 0;
 
-	KviAvatar * pResult = 0;
+	KviAvatar * pResult = nullptr;
 
 	if(KviFileUtils::fileExists(szP))
 	{
@@ -1935,7 +1934,7 @@ KviAvatar * KviIconManager::getAvatar(const QString & szLocalPath, const QString
 	if(pResult && !pResult->isValid())
 	{
 		delete pResult;
-		pResult = 0;
+		pResult = nullptr;
 	}
 
 	return pResult;
@@ -1949,20 +1948,20 @@ void KviIconManager::clearCache()
 void KviIconManager::reloadImages()
 {
 	clearCache();
-	for(int i = 0; i < KviIconManager::IconCount; i++)
+	for(auto & m_smallIcon : m_smallIcons)
 	{
-		if(m_smallIcons[i])
-			delete m_smallIcons[i];
-		m_smallIcons[i] = 0;
+		if(m_smallIcon)
+			delete m_smallIcon;
+		m_smallIcon = nullptr;
 	}
 }
 
 QPixmap * KviIconManager::loadSmallIcon(int iIdx)
 {
 	if(iIdx >= KviIconManager::IconCount)
-		return 0;
+		return nullptr;
 	if(iIdx < 0)
-		return 0;
+		return nullptr;
 
 	QString szPath = QString(KVI_SMALLICONS_PREFIX "%1.png").arg(g_szIconNames[iIdx]);
 	//KviQString::sprintf(szPath,KVI_SMALLICONS_PREFIX "%s.png",g_szIconNames[iIdx]);
diff --git a/src/kvirc/kernel/KviIpcSentinel.cpp b/src/kvirc/kernel/KviIpcSentinel.cpp
index 9313f8f7a..74b1de287 100644
--- a/src/kvirc/kernel/KviIpcSentinel.cpp
+++ b/src/kvirc/kernel/KviIpcSentinel.cpp
@@ -109,7 +109,7 @@ static Window kvi_x11_findIpcSentinel(Window win)
 	Atom type;
 	int format;
 	unsigned long nItems, after;
-	unsigned char * data = 0;
+	unsigned char * data = nullptr;
 	if(XGetWindowProperty(kvi_ipc_get_xdisplay(), win, kvi_atom_ipc_sentinel_window, 0, 32, false, XA_STRING,
 	       &type, &format, &nItems, &after, &data)
 	    == Success)
@@ -215,7 +215,7 @@ bool kvi_sendIpcMessage(const char * message)
 //////////////////////////////////////////////////////////////////////
 
 KviIpcSentinel::KviIpcSentinel()
-    : QWidget(0)
+    : QWidget(nullptr)
 {
 	setObjectName("kvirc4_ipc_sentinel");
 #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
@@ -242,8 +242,7 @@ KviIpcSentinel::KviIpcSentinel()
 }
 
 KviIpcSentinel::~KviIpcSentinel()
-{
-}
+    = default;
 
 #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
 
@@ -275,7 +274,7 @@ bool KviIpcSentinel::x11GetRemoteMessage()
 	Atom type;
 	int format;
 	unsigned long nItems, after;
-	unsigned char * data = 0;
+	unsigned char * data = nullptr;
 	KviCString szData;
 
 	if(XGetWindowProperty(kvi_ipc_get_xdisplay(), winId(), kvi_atom_ipc_remote_command, 0, 1024, false, XA_STRING,
diff --git a/src/kvirc/kernel/KviIrcConnection.cpp b/src/kvirc/kernel/KviIrcConnection.cpp
index e7a591d68..1be0e9814 100644
--- a/src/kvirc/kernel/KviIrcConnection.cpp
+++ b/src/kvirc/kernel/KviIrcConnection.cpp
@@ -116,7 +116,7 @@ KviIrcConnection::~KviIrcConnection()
 	m_bIdentdAttached = false;
 	if(m_pLocalhostDns)
 	{
-		QObject::disconnect(m_pLocalhostDns, SIGNAL(lookupDone(KviDnsResolver *)), 0, 0);
+		QObject::disconnect(m_pLocalhostDns, SIGNAL(lookupDone(KviDnsResolver *)), nullptr, nullptr);
 		if(m_pLocalhostDns->isRunning())
 			m_pLocalhostDns->deleteLater();
 		else
@@ -441,8 +441,7 @@ void KviIrcConnection::handleInitialCapLs()
 
 	QString szRequests;
 
-	auto cap_add = [&](const char * c)
-	{
+	auto cap_add = [&](const char * c) {
 		if(serverInfo()->supportedCaps().contains(c, Qt::CaseInsensitive))
 		{
 			szRequests.append(c);
@@ -576,7 +575,7 @@ KviChannelWindow * KviIrcConnection::findChannel(const QString & szName)
 		if(KviQString::equalCI(szName, c->windowName()))
 			return c;
 	}
-	return 0;
+	return nullptr;
 }
 
 int KviIrcConnection::getCommonChannels(const QString & szNick, QString & szChansBuffer, bool bAddEscapeSequences)
@@ -709,7 +708,7 @@ KviQueryWindow * KviIrcConnection::findQuery(const QString & szName)
 		if(KviQString::equalCI(szName, c->windowName()))
 			return c;
 	}
-	return 0;
+	return nullptr;
 }
 
 void KviIrcConnection::registerChannel(KviChannelWindow * c)
@@ -1150,7 +1149,7 @@ void KviIrcConnection::useRealName(const QString & szRealName)
 		KviQString::escapeKvs(&szRealNameBuffer, KviQString::PermitVariables | KviQString::PermitFunctions);
 
 		KviKvsVariant vRet;
-		if(KviKvsScript::evaluate(szRealNameBuffer, console(), 0, &vRet))
+		if(KviKvsScript::evaluate(szRealNameBuffer, console(), nullptr, &vRet))
 			vRet.asString(szRealNameBuffer);
 	}
 
@@ -1985,7 +1984,7 @@ void KviIrcConnection::heartbeat(kvi_time_t tNow)
 				{
 					// find the channel that has the older list now
 					kvi_time_t tOldest = tNow;
-					KviChannelWindow * pOldest = 0;
+					KviChannelWindow * pOldest = nullptr;
 					for(KviChannelWindow * pChan = m_pChannelList->first(); pChan; pChan = m_pChannelList->next())
 					{
 						if(pChan->lastReceivedWhoReply() < tOldest)
diff --git a/src/kvirc/kernel/KviIrcConnectionAntiCtcpFloodData.cpp b/src/kvirc/kernel/KviIrcConnectionAntiCtcpFloodData.cpp
index 6c3cc310f..9ed3b769e 100644
--- a/src/kvirc/kernel/KviIrcConnectionAntiCtcpFloodData.cpp
+++ b/src/kvirc/kernel/KviIrcConnectionAntiCtcpFloodData.cpp
@@ -31,5 +31,4 @@ KviIrcConnectionAntiCtcpFloodData::KviIrcConnectionAntiCtcpFloodData()
 }
 
 KviIrcConnectionAntiCtcpFloodData::~KviIrcConnectionAntiCtcpFloodData()
-{
-}
+    = default;
diff --git a/src/kvirc/kernel/KviIrcConnectionAsyncWhoisData.cpp b/src/kvirc/kernel/KviIrcConnectionAsyncWhoisData.cpp
index 1c7dc703e..ac236eeb4 100644
--- a/src/kvirc/kernel/KviIrcConnectionAsyncWhoisData.cpp
+++ b/src/kvirc/kernel/KviIrcConnectionAsyncWhoisData.cpp
@@ -27,8 +27,8 @@
 
 KviAsyncWhoisInfo::KviAsyncWhoisInfo()
 {
-	pCallback = 0;
-	pMagic = 0;
+	pCallback = nullptr;
+	pMagic = nullptr;
 }
 
 KviAsyncWhoisInfo::~KviAsyncWhoisInfo()
diff --git a/src/kvirc/kernel/KviIrcConnectionNetsplitDetectorData.cpp b/src/kvirc/kernel/KviIrcConnectionNetsplitDetectorData.cpp
index 67e1225ee..a5868bca0 100644
--- a/src/kvirc/kernel/KviIrcConnectionNetsplitDetectorData.cpp
+++ b/src/kvirc/kernel/KviIrcConnectionNetsplitDetectorData.cpp
@@ -30,5 +30,4 @@ KviIrcConnectionNetsplitDetectorData::KviIrcConnectionNetsplitDetectorData()
 }
 
 KviIrcConnectionNetsplitDetectorData::~KviIrcConnectionNetsplitDetectorData()
-{
-}
+    = default;
diff --git a/src/kvirc/kernel/KviIrcConnectionServerInfo.cpp b/src/kvirc/kernel/KviIrcConnectionServerInfo.cpp
index 07a1f5320..3171b17e8 100644
--- a/src/kvirc/kernel/KviIrcConnectionServerInfo.cpp
+++ b/src/kvirc/kernel/KviIrcConnectionServerInfo.cpp
@@ -33,7 +33,7 @@ KviIrcConnectionServerInfo::KviIrcConnectionServerInfo()
 	m_szSupportedChannelTypes = "#&!+";
 	m_szSupportedModePrefixes = "@+";
 	m_szSupportedModeFlags = "ov";
-	m_pModePrefixTable = 0;
+	m_pModePrefixTable = nullptr;
 	buildModePrefixTable();
 	m_bSupportsWatchList = false;
 	m_bSupportsCodePages = false;
@@ -296,8 +296,7 @@ KviBasicIrcServerInfo::KviBasicIrcServerInfo(KviIrcConnectionServerInfo * pParen
 }
 
 KviBasicIrcServerInfo::~KviBasicIrcServerInfo()
-{
-}
+    = default;
 
 ////////////////
 // User modes
diff --git a/src/kvirc/kernel/KviIrcConnectionStateData.cpp b/src/kvirc/kernel/KviIrcConnectionStateData.cpp
index 515e90b70..19753bd27 100644
--- a/src/kvirc/kernel/KviIrcConnectionStateData.cpp
+++ b/src/kvirc/kernel/KviIrcConnectionStateData.cpp
@@ -41,8 +41,7 @@ KviIrcConnectionStateData::KviIrcConnectionStateData()
 }
 
 KviIrcConnectionStateData::~KviIrcConnectionStateData()
-{
-}
+    = default;
 
 void KviIrcConnectionStateData::changeEnabledCapList(const QString & szCapList)
 {
diff --git a/src/kvirc/kernel/KviIrcConnectionStatistics.cpp b/src/kvirc/kernel/KviIrcConnectionStatistics.cpp
index e2217baf2..edf6c7d57 100644
--- a/src/kvirc/kernel/KviIrcConnectionStatistics.cpp
+++ b/src/kvirc/kernel/KviIrcConnectionStatistics.cpp
@@ -31,5 +31,4 @@ KviIrcConnectionStatistics::KviIrcConnectionStatistics()
 }
 
 KviIrcConnectionStatistics::~KviIrcConnectionStatistics()
-{
-}
+    = default;
diff --git a/src/kvirc/kernel/KviIrcConnectionTarget.cpp b/src/kvirc/kernel/KviIrcConnectionTarget.cpp
index b81d4213e..5580e5b02 100644
--- a/src/kvirc/kernel/KviIrcConnectionTarget.cpp
+++ b/src/kvirc/kernel/KviIrcConnectionTarget.cpp
@@ -36,7 +36,7 @@ KviIrcConnectionTarget::KviIrcConnectionTarget(
 {
 	m_pNetwork = new KviIrcNetwork(*pNetwork);
 	m_pServer = new KviIrcServer(*pServer);
-	m_pProxy = pProxy ? new KviProxy(*pProxy) : NULL;
+	m_pProxy = pProxy ? new KviProxy(*pProxy) : nullptr;
 	m_szBindAddress = szBindAddress;
 }
 
@@ -53,5 +53,5 @@ void KviIrcConnectionTarget::clearProxy()
 	if(!m_pProxy)
 		return;
 	delete m_pProxy;
-	m_pProxy = 0;
+	m_pProxy = nullptr;
 }
diff --git a/src/kvirc/kernel/KviIrcConnectionTargetResolver.cpp b/src/kvirc/kernel/KviIrcConnectionTargetResolver.cpp
index c5aab2795..5a762e619 100644
--- a/src/kvirc/kernel/KviIrcConnectionTargetResolver.cpp
+++ b/src/kvirc/kernel/KviIrcConnectionTargetResolver.cpp
@@ -59,12 +59,12 @@ KviIrcConnectionTargetResolver::KviIrcConnectionTargetResolver(KviIrcConnection
     : QObject()
 {
 	m_pConnection = pConnection;
-	m_pTarget = 0;
+	m_pTarget = nullptr;
 	m_pConsole = m_pConnection->console();
 
-	m_pStartTimer = 0;
-	m_pProxyDns = 0;
-	m_pServerDns = 0;
+	m_pStartTimer = nullptr;
+	m_pProxyDns = nullptr;
+	m_pServerDns = nullptr;
 
 	m_eState = Idle;
 	m_eStatus = Success;
@@ -93,7 +93,7 @@ void KviIrcConnectionTargetResolver::cleanup()
 			// can't block : just delete it
 			delete m_pProxyDns;
 		}
-		m_pProxyDns = 0;
+		m_pProxyDns = nullptr;
 	}
 	if(m_pServerDns)
 	{
@@ -109,12 +109,12 @@ void KviIrcConnectionTargetResolver::cleanup()
 			// can't block : just delete it
 			delete m_pServerDns;
 		}
-		m_pServerDns = 0;
+		m_pServerDns = nullptr;
 	}
 	if(m_pStartTimer)
 	{
 		delete m_pStartTimer;
-		m_pStartTimer = 0;
+		m_pStartTimer = nullptr;
 	}
 }
 
@@ -127,7 +127,7 @@ void KviIrcConnectionTargetResolver::start(KviIrcConnectionTarget * t)
 	if(m_pStartTimer) // this should never happen I guess
 	{
 		delete m_pStartTimer;
-		m_pStartTimer = 0;
+		m_pStartTimer = nullptr;
 	}
 	m_pStartTimer = new QTimer(this);
 	connect(m_pStartTimer, SIGNAL(timeout()), this, SLOT(asyncStartResolve()));
@@ -153,7 +153,7 @@ void KviIrcConnectionTargetResolver::asyncStartResolve()
 	if(m_pStartTimer)
 	{
 		delete m_pStartTimer;
-		m_pStartTimer = 0;
+		m_pStartTimer = nullptr;
 	}
 
 	m_pConsole->output(KVI_OUT_SYSTEMMESSAGE,
@@ -240,7 +240,7 @@ void KviIrcConnectionTargetResolver::lookupProxyHostname()
 			{
 				qDebug("Something weird is happening, m_pProxyDns is non-zero in lookupProxyHostname()");
 				delete m_pProxyDns;
-				m_pProxyDns = 0;
+				m_pProxyDns = nullptr;
 			}
 
 			m_pProxyDns = new KviDnsResolver();
@@ -255,7 +255,7 @@ void KviIrcConnectionTargetResolver::lookupProxyHostname()
 				    __tr2qs("Resuming direct server connection"));
 				// FIXME: #warning "Option for resuming direct connection or not ?"
 				delete m_pProxyDns;
-				m_pProxyDns = 0;
+				m_pProxyDns = nullptr;
 				m_pTarget->clearProxy();
 				lookupServerHostname();
 			}
@@ -295,7 +295,7 @@ void KviIrcConnectionTargetResolver::proxyLookupTerminated(KviDnsResolver *)
 	}
 
 	delete m_pProxyDns;
-	m_pProxyDns = 0;
+	m_pProxyDns = nullptr;
 	if(m_pTarget->proxy())
 	{
 		if(m_pTarget->proxy()->protocol() == KviProxy::Http
@@ -358,7 +358,7 @@ void KviIrcConnectionTargetResolver::lookupServerHostname()
 			{
 				qDebug("Something weird is happening, m_pServerDns is non-zero in lookupServerHostname()");
 				delete m_pServerDns;
-				m_pServerDns = 0;
+				m_pServerDns = nullptr;
 			}
 			m_pServerDns = new KviDnsResolver();
 			connect(m_pServerDns, SIGNAL(lookupDone(KviDnsResolver *)), this,
@@ -451,7 +451,7 @@ void KviIrcConnectionTargetResolver::serverLookupTerminated(KviDnsResolver *)
 	m_pTarget->server()->setIp(szIpAddress);
 
 	delete m_pServerDns;
-	m_pServerDns = 0;
+	m_pServerDns = nullptr;
 	haveServerIp();
 }
 
diff --git a/src/kvirc/kernel/KviIrcContext.cpp b/src/kvirc/kernel/KviIrcContext.cpp
index 06467e692..8661c097a 100644
--- a/src/kvirc/kernel/KviIrcContext.cpp
+++ b/src/kvirc/kernel/KviIrcContext.cpp
@@ -67,29 +67,29 @@ extern KVIRC_API KviIrcServerDataBase * g_pServerDataBase;
 extern KVIRC_API KviProxyDataBase * g_pProxyDataBase;
 
 KviIrcContext::KviIrcContext(KviConsoleWindow * pConsole)
-    : QObject(0)
+    : QObject(nullptr)
 {
 	m_uId = g_uNextIrcContextId;
 	g_uNextIrcContextId++;
 
 	m_pConsole = pConsole;
 
-	m_pConnection = 0;
+	m_pConnection = nullptr;
 
-	m_pDeadChannels = 0;
-	m_pDeadQueries = 0;
-	m_pContextWindows = 0;
+	m_pDeadChannels = nullptr;
+	m_pDeadQueries = nullptr;
+	m_pContextWindows = nullptr;
 
-	m_pLinksWindow = 0;
-	m_pListWindow = 0;
+	m_pLinksWindow = nullptr;
+	m_pListWindow = nullptr;
 
 	m_eState = Idle;
 
-	m_pAsynchronousConnectionData = 0;
-	m_pSavedAsynchronousConnectionData = 0;
+	m_pAsynchronousConnectionData = nullptr;
+	m_pSavedAsynchronousConnectionData = nullptr;
 	m_uConnectAttemptCount = 0;
-	m_pMonitorList = 0;
-	m_pReconnectTimer = 0;
+	m_pMonitorList = nullptr;
+	m_pReconnectTimer = nullptr;
 
 	m_uConnectAttemptCount = 1;
 
@@ -108,7 +108,7 @@ KviIrcContext::~KviIrcContext()
 		else
 		{
 			delete m_pMonitorList;
-			m_pMonitorList = 0;
+			m_pMonitorList = nullptr;
 		}
 	}
 
@@ -149,7 +149,7 @@ void KviIrcContext::unregisterDataStreamMonitor(KviIrcDataStreamMonitor * m)
 	if(m_pMonitorList->isEmpty())
 	{
 		delete m_pMonitorList;
-		m_pMonitorList = 0;
+		m_pMonitorList = nullptr;
 	}
 }
 
@@ -166,7 +166,7 @@ void KviIrcContext::closeAllDeadChannels()
 		{
 			// ops....
 			delete m_pDeadChannels;
-			m_pDeadChannels = 0;
+			m_pDeadChannels = nullptr;
 		}
 	}
 }
@@ -184,7 +184,7 @@ void KviIrcContext::closeAllDeadQueries()
 		{
 			// ops....
 			delete m_pDeadQueries;
-			m_pDeadQueries = 0;
+			m_pDeadQueries = nullptr;
 		}
 	}
 }
@@ -202,7 +202,7 @@ void KviIrcContext::closeAllContextWindows()
 		{
 			// ops...
 			delete m_pContextWindows;
-			m_pContextWindows = 0;
+			m_pContextWindows = nullptr;
 		}
 	}
 }
@@ -210,40 +210,40 @@ void KviIrcContext::closeAllContextWindows()
 KviChannelWindow * KviIrcContext::findDeadChannel(const QString & name)
 {
 	if(!m_pDeadChannels)
-		return 0;
+		return nullptr;
 	for(KviChannelWindow * c = m_pDeadChannels->first(); c; c = m_pDeadChannels->next())
 	{
 		KVI_ASSERT(c->isDeadChan());
 		if(KviQString::equalCI(name, c->windowName()))
 			return c;
 	}
-	return 0;
+	return nullptr;
 }
 
 KviQueryWindow * KviIrcContext::findDeadQuery(const QString & name)
 {
 	if(!m_pDeadQueries)
-		return 0;
+		return nullptr;
 	for(KviQueryWindow * c = m_pDeadQueries->first(); c; c = m_pDeadQueries->next())
 	{
 		KVI_ASSERT(c->isDeadQuery());
 		if(KviQString::equalCI(name, c->windowName()))
 			return c;
 	}
-	return 0;
+	return nullptr;
 }
 
 KviQueryWindow * KviIrcContext::firstDeadQuery()
 {
 	if(!m_pDeadQueries)
-		return 0;
+		return nullptr;
 	return m_pDeadQueries->first();
 }
 
 KviChannelWindow * KviIrcContext::firstDeadChannel()
 {
 	if(!m_pDeadChannels)
-		return 0;
+		return nullptr;
 	return m_pDeadChannels->first();
 }
 
@@ -289,7 +289,7 @@ bool KviIrcContext::unregisterDeadChannel(KviChannelWindow * c)
 	if(m_pDeadChannels->isEmpty())
 	{
 		delete m_pDeadChannels;
-		m_pDeadChannels = 0;
+		m_pDeadChannels = nullptr;
 	}
 	return true;
 }
@@ -305,7 +305,7 @@ bool KviIrcContext::unregisterContextWindow(KviWindow * pWnd)
 	if(m_pContextWindows->isEmpty())
 	{
 		delete m_pContextWindows;
-		m_pContextWindows = 0;
+		m_pContextWindows = nullptr;
 	}
 	return true;
 }
@@ -321,7 +321,7 @@ bool KviIrcContext::unregisterDeadQuery(KviQueryWindow * q)
 	if(m_pDeadQueries->isEmpty())
 	{
 		delete m_pDeadQueries;
-		m_pDeadQueries = 0;
+		m_pDeadQueries = nullptr;
 	}
 	return true;
 }
@@ -357,7 +357,7 @@ void KviIrcContext::destroyConnection()
 	// make sure that m_pConnection is already 0 in any
 	// event triggered by KviIrcConnection destructor
 	KviIrcConnection * pTmp = m_pConnection;
-	m_pConnection = 0;
+	m_pConnection = nullptr;
 	delete pTmp;
 }
 
@@ -389,7 +389,7 @@ void KviIrcContext::destroyAsynchronousConnectionData()
 	if(!m_pAsynchronousConnectionData)
 		return;
 	delete m_pAsynchronousConnectionData;
-	m_pAsynchronousConnectionData = 0;
+	m_pAsynchronousConnectionData = nullptr;
 }
 
 void KviIrcContext::loginComplete()
@@ -405,7 +405,7 @@ void KviIrcContext::connectButtonClicked()
 		{
 			// reconnection was in progress...
 			delete m_pReconnectTimer;
-			m_pReconnectTimer = 0;
+			m_pReconnectTimer = nullptr;
 			destroyAsynchronousConnectionData();
 
 			m_pConsole->outputNoFmt(KVI_OUT_SYSTEMERROR,
@@ -433,7 +433,7 @@ void KviIrcContext::connectToCurrentServer()
 	if(m_pReconnectTimer)
 	{
 		delete m_pReconnectTimer;
-		m_pReconnectTimer = 0;
+		m_pReconnectTimer = nullptr;
 	}
 
 	m_pConsole->outputNoFmt(KVI_OUT_SYSTEMMESSAGE, " "); // spacer
@@ -443,7 +443,7 @@ void KviIrcContext::connectToCurrentServer()
 	if(!m_pAsynchronousConnectionData && m_pSavedAsynchronousConnectionData)
 	{
 		m_pAsynchronousConnectionData = m_pSavedAsynchronousConnectionData;
-		m_pSavedAsynchronousConnectionData = 0;
+		m_pSavedAsynchronousConnectionData = nullptr;
 	}
 
 	if(m_pAsynchronousConnectionData)
@@ -468,7 +468,7 @@ void KviIrcContext::connectToCurrentServer()
 				if(m_pSavedAsynchronousConnectionData->m_pReconnectInfo)
 					m_pAsynchronousConnectionData->m_pReconnectInfo = new KviIrcServerReconnectInfo(*(m_pSavedAsynchronousConnectionData->m_pReconnectInfo));
 				else
-					m_pAsynchronousConnectionData->m_pReconnectInfo = 0;
+					m_pAsynchronousConnectionData->m_pReconnectInfo = nullptr;
 
 				// and the other info, only if not overridden by the user
 				if(m_pAsynchronousConnectionData->szBindAddress.isEmpty())
@@ -518,9 +518,9 @@ void KviIrcContext::connectToCurrentServer()
 	}
 
 	KviIrcNetwork * net = g_pServerDataBase->currentNetwork();
-	KviIrcServer * srv = net ? net->currentServer() : 0;
+	KviIrcServer * srv = net ? net->currentServer() : nullptr;
 
-	KviProxy * prx = 0;
+	KviProxy * prx = nullptr;
 
 	if(!srv)
 	{
@@ -564,7 +564,7 @@ void KviIrcContext::connectToCurrentServer()
 	// Find out the identity we'll be using in this connection
 	// First check the server for one
 
-	const KviUserIdentity * pIdentity = 0;
+	const KviUserIdentity * pIdentity = nullptr;
 
 	QString szUserIdentityId = srv->userIdentityId();
 	if(!szUserIdentityId.isEmpty())
@@ -622,7 +622,7 @@ void KviIrcContext::connectToCurrentServer()
 	if(srv->reconnectInfo())
 		m_pSavedAsynchronousConnectionData->m_pReconnectInfo = new KviIrcServerReconnectInfo(*(srv->reconnectInfo()));
 	else
-		m_pSavedAsynchronousConnectionData->m_pReconnectInfo = 0;
+		m_pSavedAsynchronousConnectionData->m_pReconnectInfo = nullptr;
 
 	// this never fails!
 	m_pConnection->start();
@@ -847,7 +847,7 @@ void KviIrcContext::asynchronousConnect()
 	if(m_pReconnectTimer)
 	{
 		delete m_pReconnectTimer;
-		m_pReconnectTimer = 0;
+		m_pReconnectTimer = nullptr;
 	}
 
 	if(state() != Idle) // need a brutal disconnect here
@@ -879,7 +879,7 @@ void KviIrcContext::terminateConnectionRequest(bool bForce, const QString & szQu
 				KviQString::escapeKvs(&szQuit, KviQString::PermitVariables | KviQString::PermitFunctions);
 				QString buffer;
 				KviKvsVariant ret;
-				if(KviKvsScript::evaluate(szQuit, console(), 0, &ret))
+				if(KviKvsScript::evaluate(szQuit, console(), nullptr, &ret))
 					ret.asString(buffer);
 				else
 					buffer = szQuit;
diff --git a/src/kvirc/kernel/KviIrcLink.cpp b/src/kvirc/kernel/KviIrcLink.cpp
index d9068f181..17fdf0a86 100644
--- a/src/kvirc/kernel/KviIrcLink.cpp
+++ b/src/kvirc/kernel/KviIrcLink.cpp
@@ -60,13 +60,13 @@ KviIrcLink::KviIrcLink(KviIrcConnection * pConnection)
 	m_pTarget = pConnection->target();
 	m_pConsole = m_pConnection->console();
 
-	m_pSocket = 0;
-	m_pLinkFilter = 0;
-	m_pResolver = 0;
+	m_pSocket = nullptr;
+	m_pLinkFilter = nullptr;
+	m_pResolver = nullptr;
 
-	m_pReadBuffer = 0;    // incoming data buffer
-	m_uReadBufferLen = 0; // incoming data buffer length
-	m_uReadPackets = 0;   // total packets read per session
+	m_pReadBuffer = nullptr; // incoming data buffer
+	m_uReadBufferLen = 0;    // incoming data buffer length
+	m_uReadPackets = 0;      // total packets read per session
 
 	m_eState = Idle;
 }
@@ -89,7 +89,7 @@ KviIrcLink::~KviIrcLink()
 
 void KviIrcLink::linkFilterDestroyed()
 {
-	m_pLinkFilter = 0;
+	m_pLinkFilter = nullptr;
 	m_pConsole->output(KVI_OUT_SYSTEMWARNING,
 	    __tr2qs("Oops! For some reason the link filter object has been destroyed"));
 }
@@ -98,10 +98,10 @@ void KviIrcLink::destroySocket()
 {
 	if(m_pLinkFilter)
 	{
-		QObject::disconnect(m_pLinkFilter, 0, this, 0);
+		QObject::disconnect(m_pLinkFilter, nullptr, this, nullptr);
 		// the module extension server links must be destroyed in the module that provided it
 		m_pLinkFilter->die();
-		m_pLinkFilter = 0;
+		m_pLinkFilter = nullptr;
 	}
 
 	if(m_pSocket)
@@ -109,7 +109,7 @@ void KviIrcLink::destroySocket()
 		// We use deleteLater() here, since we could actually be inside an event
 		// related to the QSocketNotifier that the socket is attached to...
 		m_pSocket->deleteLater();
-		m_pSocket = 0;
+		m_pSocket = nullptr;
 	}
 }
 
@@ -126,7 +126,7 @@ void KviIrcLink::createSocket(const QString & szLinkFilterName)
 		return;
 
 	m_pLinkFilter = (KviMexLinkFilter *)g_pModuleExtensionManager->allocateExtension("linkfilter",
-	    szLinkFilterName.toUtf8().data(), m_pConsole, 0, this, szLinkFilterName.toUtf8().data());
+	    szLinkFilterName.toUtf8().data(), m_pConsole, nullptr, this, szLinkFilterName.toUtf8().data());
 
 	if(m_pLinkFilter)
 	{
@@ -188,12 +188,12 @@ void KviIrcLink::resolverTerminated()
 
 	// resolver terminated successfully
 	delete m_pResolver;
-	m_pResolver = 0;
+	m_pResolver = nullptr;
 
 	createSocket(m_pTarget->server()->linkFilter());
 
 	KviError::Code eError = m_pSocket->startConnection(m_pTarget->server(), m_pTarget->proxy(),
-	    m_pTarget->bindAddress().isEmpty() ? 0 : m_pTarget->bindAddress().toUtf8().data());
+	    m_pTarget->bindAddress().isEmpty() ? nullptr : m_pTarget->bindAddress().toUtf8().data());
 
 	if(eError != KviError::Success)
 	{
@@ -243,7 +243,7 @@ void KviIrcLink::processData(char * buffer, int iLen)
 				*(cMessageBuffer + iBufLen + m_uReadBufferLen) = '\0';
 				m_uReadBufferLen = 0;
 				KviMemory::free(m_pReadBuffer);
-				m_pReadBuffer = 0;
+				m_pReadBuffer = nullptr;
 			}
 			else
 			{
@@ -356,7 +356,7 @@ bool KviIrcLink::sendPacket(KviDataBuffer * pData)
 	if(!m_pSocket)
 	{
 		delete pData;
-		pData = 0;
+		pData = nullptr;
 		return false;
 	}
 
diff --git a/src/kvirc/kernel/KviIrcSocket.cpp b/src/kvirc/kernel/KviIrcSocket.cpp
index 206a09ad1..6c6652f18 100644
--- a/src/kvirc/kernel/KviIrcSocket.cpp
+++ b/src/kvirc/kernel/KviIrcSocket.cpp
@@ -69,26 +69,26 @@ KviIrcSocket::KviIrcSocket(KviIrcLink * pLink)
 
 	m_state = Idle; // current socket state
 
-	m_pRsn = 0;                  // read socket notifier
-	m_pWsn = 0;                  // write socket notifier
+	m_pRsn = nullptr;            // read socket notifier
+	m_pWsn = nullptr;            // write socket notifier
 	m_sock = KVI_INVALID_SOCKET; // socket
 
-	m_pIrcServer = 0; // current server data
-	m_pProxy = 0;     // current proxy data
+	m_pIrcServer = nullptr; // current server data
+	m_pProxy = nullptr;     // current proxy data
 
-	m_pTimeoutTimer = 0; // timeout for connect()
+	m_pTimeoutTimer = nullptr; // timeout for connect()
 
 	m_uReadBytes = 0;   // total read bytes per session
 	m_uSentBytes = 0;   // total sent bytes per session
 	m_uSentPackets = 0; // total packets sent per session
 
-	m_pSendQueueHead = 0; // data queue
-	m_pSendQueueTail = 0; //
+	m_pSendQueueHead = nullptr; // data queue
+	m_pSendQueueTail = nullptr; //
 
 	m_eLastError = KviError::Success;
 
 #ifdef COMPILE_SSL_SUPPORT
-	m_pSSL = 0;
+	m_pSSL = nullptr;
 #endif
 
 	m_tAntiFloodLastMessageTime.tv_sec = 0;
@@ -115,31 +115,31 @@ void KviIrcSocket::reset()
 	if(m_pSSL)
 	{
 		KviSSLMaster::freeSSL(m_pSSL);
-		m_pSSL = 0;
+		m_pSSL = nullptr;
 	}
 #endif
 	if(m_pIrcServer)
 	{
 		delete m_pIrcServer;
-		m_pIrcServer = 0;
+		m_pIrcServer = nullptr;
 	}
 
 	if(m_pProxy)
 	{
 		delete m_pProxy;
-		m_pProxy = 0;
+		m_pProxy = nullptr;
 	}
 
 	if(m_pRsn)
 	{
 		delete m_pRsn;
-		m_pRsn = 0;
+		m_pRsn = nullptr;
 	}
 
 	if(m_pWsn)
 	{
 		delete m_pWsn;
-		m_pWsn = 0;
+		m_pWsn = nullptr;
 	}
 
 	if(kvi_socket_isValid(m_sock))
@@ -152,7 +152,7 @@ void KviIrcSocket::reset()
 	{
 		m_pTimeoutTimer->stop();
 		delete m_pTimeoutTimer;
-		m_pTimeoutTimer = 0;
+		m_pTimeoutTimer = nullptr;
 	}
 
 	m_bInProcessData = false;
@@ -451,7 +451,7 @@ void KviIrcSocket::writeNotifierFired(int)
 	if(m_pTimeoutTimer)
 	{
 		delete m_pTimeoutTimer;
-		m_pTimeoutTimer = 0;
+		m_pTimeoutTimer = nullptr;
 	}
 
 	// Check for errors...
@@ -477,7 +477,7 @@ void KviIrcSocket::writeNotifierFired(int)
 
 	// kill the write notifier
 	delete m_pWsn;
-	m_pWsn = 0;
+	m_pWsn = nullptr;
 
 	//Successfully connected...
 	connectionEstablished();
@@ -508,7 +508,7 @@ void KviIrcSocket::connectedToProxy()
 	if(m_pRsn)
 	{
 		delete m_pRsn;
-		m_pRsn = 0;
+		m_pRsn = nullptr;
 	}
 
 	m_pRsn = new QSocketNotifier((int)m_sock, QSocketNotifier::Read);
@@ -1301,13 +1301,13 @@ void KviIrcSocket::proxyHandleHttpFinalReply(const char * pcBuffer, int)
 	if(m_pWsn)
 	{
 		delete m_pWsn;
-		m_pWsn = 0;
+		m_pWsn = nullptr;
 	}
 
 	if(m_pRsn)
 	{
 		delete m_pRsn;
-		m_pRsn = 0;
+		m_pRsn = nullptr;
 	}
 
 	m_pRsn = new QSocketNotifier((int)m_sock, QSocketNotifier::Read);
@@ -1376,13 +1376,13 @@ void KviIrcSocket::doSSLHandshake(int)
 	if(m_pRsn)
 	{
 		delete m_pRsn;
-		m_pRsn = 0;
+		m_pRsn = nullptr;
 	}
 
 	if(m_pWsn)
 	{
 		delete m_pWsn;
-		m_pWsn = 0;
+		m_pWsn = nullptr;
 	}
 
 	if(!m_pSSL)
@@ -1467,13 +1467,13 @@ void KviIrcSocket::linkUp()
 	if(m_pWsn)
 	{
 		delete m_pWsn;
-		m_pWsn = 0;
+		m_pWsn = nullptr;
 	}
 
 	if(m_pRsn)
 	{
 		delete m_pRsn;
-		m_pRsn = 0;
+		m_pRsn = nullptr;
 	}
 
 	m_pRsn = new QSocketNotifier((int)m_sock, QSocketNotifier::Read);
@@ -1619,7 +1619,7 @@ void KviIrcSocket::queue_insertMessage(KviIrcSocketMsgEntry * pMsg)
 {
 	KVI_ASSERT(pMsg);
 
-	pMsg->next_ptr = 0;
+	pMsg->next_ptr = nullptr;
 
 	if(m_pSendQueueHead)
 	{
@@ -1638,7 +1638,7 @@ void KviIrcSocket::free_msgEntry(KviIrcSocketMsgEntry * e)
 	if(e->pData)
 		delete e->pData;
 
-	e->pData = 0;
+	e->pData = nullptr;
 	KviMemory::free(e);
 }
 
@@ -1654,9 +1654,9 @@ bool KviIrcSocket::queue_removeMessage()
 	m_pSendQueueHead = pEntry->next_ptr;
 	KviMemory::free((void *)pEntry);
 
-	if(m_pSendQueueHead == 0)
+	if(m_pSendQueueHead == nullptr)
 	{
-		m_pSendQueueTail = 0;
+		m_pSendQueueTail = nullptr;
 		return false;
 	}
 	else
@@ -1673,7 +1673,7 @@ void KviIrcSocket::queue_removeAllMessages()
 
 void KviIrcSocket::queue_removePrivateMessages()
 {
-	KviIrcSocketMsgEntry * pPrevEntry = 0;
+	KviIrcSocketMsgEntry * pPrevEntry = nullptr;
 	KviIrcSocketMsgEntry * pEntry = m_pSendQueueHead;
 	while(pEntry)
 	{
@@ -1686,7 +1686,7 @@ void KviIrcSocket::queue_removePrivateMessages()
 				{
 					pPrevEntry->next_ptr = pEntry->next_ptr;
 					if(!pPrevEntry->next_ptr)
-						m_pSendQueueTail = 0;
+						m_pSendQueueTail = nullptr;
 					free_msgEntry(pEntry);
 					pEntry = pPrevEntry->next_ptr;
 				}
@@ -1694,7 +1694,7 @@ void KviIrcSocket::queue_removePrivateMessages()
 				{
 					m_pSendQueueHead = pEntry->next_ptr;
 					if(!m_pSendQueueHead)
-						m_pSendQueueTail = 0;
+						m_pSendQueueTail = nullptr;
 					free_msgEntry(pEntry);
 					pEntry = m_pSendQueueHead;
 				}
@@ -1721,7 +1721,7 @@ void KviIrcSocket::flushSendQueue()
 	{
 		if(KVI_OPTION_BOOL(KviOption_boolLimitOutgoingTraffic))
 		{
-			kvi_gettimeofday(&curTime, 0);
+			kvi_gettimeofday(&curTime, nullptr);
 
 			int iTimeDiff = curTime.tv_usec - m_tAntiFloodLastMessageTime.tv_usec;
 			iTimeDiff += (curTime.tv_sec - m_tAntiFloodLastMessageTime.tv_sec) * 1000000;
@@ -1976,7 +1976,7 @@ bool KviIrcSocket::sendPacket(KviDataBuffer * pData)
 	if(m_state != Connected)
 	{
 		delete pData;
-		pData = 0;
+		pData = nullptr;
 		return false;
 	}
 
diff --git a/src/kvirc/kernel/KviIrcUrl.cpp b/src/kvirc/kernel/KviIrcUrl.cpp
index 2c50cffd5..122f011e1 100644
--- a/src/kvirc/kernel/KviIrcUrl.cpp
+++ b/src/kvirc/kernel/KviIrcUrl.cpp
@@ -173,15 +173,15 @@ void KviIrcUrl::makeJoinCmd(const QStringList & chans, QString & szJoinCommand)
 	if(chans.count() != 0)
 	{
 
-		for(QStringList::ConstIterator it = chans.begin(); it != chans.end(); ++it)
+		for(const auto & chan : chans)
 		{
 
-			szCurPass = (*it).section('?', 1);
+			szCurPass = chan.section('?', 1);
 			if(szCurPass.isEmpty())
 			{
 				if(!szChannels.isEmpty())
 					szChannels.append(",");
-				szCurChan = (*it).section('?', 0, 0);
+				szCurChan = chan.section('?', 0, 0);
 				if(!(szCurChan[0] == '#' || szCurChan[0] == '&' || szCurChan[0] == '!'))
 					szCurChan.prepend('#');
 				szChannels.append(szCurChan);
@@ -190,7 +190,7 @@ void KviIrcUrl::makeJoinCmd(const QStringList & chans, QString & szJoinCommand)
 			{
 				if(!szProtectedChannels.isEmpty())
 					szProtectedChannels.append(",");
-				szCurChan = (*it).section('?', 0, 0);
+				szCurChan = chan.section('?', 0, 0);
 				if(!(szCurChan[0] == '#' || szCurChan[0] == '&' || szCurChan[0] == '!'))
 					szCurChan.prepend('#');
 				szProtectedChannels.append(szCurChan);
@@ -236,7 +236,7 @@ int KviIrcUrl::run(const QString & text, int contextSpec, KviConsoleWindow * pCo
 		if(pConsole)
 		{
 			KviConsoleWindow * pTmpConsole = pConsole;
-			pConsole = 0;
+			pConsole = nullptr;
 
 			if(pTmpConsole->connection())
 			{
@@ -261,8 +261,8 @@ int KviIrcUrl::run(const QString & text, int contextSpec, KviConsoleWindow * pCo
 	if(contextSpec & TryEveryContext)
 	{
 		KviPointerHashTableIterator<QString, KviWindow> it(*g_pGlobalWindowDict);
-		KviConsoleWindow * pTmpConsole = 0;
-		pConsole = 0;
+		KviConsoleWindow * pTmpConsole = nullptr;
+		pConsole = nullptr;
 
 		while(KviWindow * wnd = it.current())
 		{
diff --git a/src/kvirc/kernel/KviLagMeter.cpp b/src/kvirc/kernel/KviLagMeter.cpp
index 3aaa808f0..497f69754 100644
--- a/src/kvirc/kernel/KviLagMeter.cpp
+++ b/src/kvirc/kernel/KviLagMeter.cpp
@@ -50,7 +50,7 @@ KviLagMeter::KviLagMeter(KviIrcConnection * c)
 	m_tLastOwnCheck = 0;
 	m_tFirstOwnCheck = 0;
 	m_bOnAlarm = false;
-	m_pDeletionSignal = 0;
+	m_pDeletionSignal = nullptr;
 
 	// FIXME: We could use the KviIrcConnection::heartbeat() here!
 	if(KVI_OPTION_UINT(KviOption_uintLagMeterHeartbeat) < 2000)
@@ -72,7 +72,7 @@ KviLagMeter::~KviLagMeter()
 unsigned int KviLagMeter::secondsSinceLastCompleted()
 {
 	struct timeval tv;
-	kvi_gettimeofday(&tv, 0);
+	kvi_gettimeofday(&tv, nullptr);
 	return tv.tv_sec - m_tLastCompleted;
 }
 
@@ -114,12 +114,12 @@ void KviLagMeter::timerEvent(QTimerEvent *)
 		if(bDeletionSignal)
 			return; // killed, probably by a quit -f -u
 
-		m_pDeletionSignal = 0;
+		m_pDeletionSignal = nullptr;
 	}
 
 	// get current time
 	struct timeval tv;
-	kvi_gettimeofday(&tv, 0);
+	kvi_gettimeofday(&tv, nullptr);
 	unsigned int uDiff = tv.tv_sec - m_tLastCompleted;
 	unsigned int uHeartbeat = KVI_OPTION_UINT(KviOption_uintLagMeterHeartbeat) / 1000;
 	if(uHeartbeat < 2)
@@ -200,7 +200,7 @@ void KviLagMeter::lagCheckRegister(const char * key, unsigned int uReliability)
 	KviLagCheck * c = new KviLagCheck;
 	c->szKey = key;
 	struct timeval tv;
-	kvi_gettimeofday(&tv, 0);
+	kvi_gettimeofday(&tv, nullptr);
 	c->lSecs = tv.tv_sec;
 	c->lUSecs = tv.tv_usec;
 	c->uReliability = uReliability <= 100 ? uReliability : 100;
@@ -233,7 +233,7 @@ bool KviLagMeter::lagCheckComplete(const char * key)
 		m_pConnection->console()->output(KVI_OUT_VERBOSE, __tr2qs("Lag check completed (%s)"), key);
 
 	struct timeval tv;
-	kvi_gettimeofday(&tv, 0);
+	kvi_gettimeofday(&tv, nullptr);
 
 	unsigned int uLag = ((tv.tv_sec - c->lSecs) * 1000);
 	if(tv.tv_usec < c->lUSecs)
diff --git a/src/kvirc/kernel/KviMain.cpp b/src/kvirc/kernel/KviMain.cpp
index 535cc8344..d51cb50ab 100644
--- a/src/kvirc/kernel/KviMain.cpp
+++ b/src/kvirc/kernel/KviMain.cpp
@@ -347,7 +347,7 @@ int main(int argc, char ** argv)
 	ParseArgs a;
 	a.argc = argc;
 	a.argv = argv;
-	a.configFile = 0;
+	a.configFile = nullptr;
 	a.createFile = false;
 	a.bForceNewSession = false;
 	a.bShowPopup = false,
@@ -463,7 +463,7 @@ int main(int argc, char ** argv)
 				KviCString szTmp(KviCString::Format, "Another KVIrc session is already running on this display and with this user ID.\nUse %s -f if you want to force a new session.", argv[0]);
 				if(a.bShowPopup)
 				{
-					QMessageBox::information(0, "Duplicate Session - KVIrc", szTmp.ptr(), QMessageBox::Ok);
+					QMessageBox::information(nullptr, "Duplicate Session - KVIrc", szTmp.ptr(), QMessageBox::Ok);
 				}
 				else
 				{
diff --git a/src/kvirc/kernel/KviNotifyList.cpp b/src/kvirc/kernel/KviNotifyList.cpp
index 908835425..0691eaff3 100644
--- a/src/kvirc/kernel/KviNotifyList.cpp
+++ b/src/kvirc/kernel/KviNotifyList.cpp
@@ -114,7 +114,7 @@
 // Basic NotifyListManager: this does completely nothing
 
 KviNotifyListManager::KviNotifyListManager(KviIrcConnection * pConnection)
-    : QObject(0)
+    : QObject(nullptr)
 {
 	setObjectName("notify_list_manager");
 	m_pConnection = pConnection;
@@ -122,8 +122,7 @@ KviNotifyListManager::KviNotifyListManager(KviIrcConnection * pConnection)
 }
 
 KviNotifyListManager::~KviNotifyListManager()
-{
-}
+    = default;
 
 void KviNotifyListManager::start()
 {
@@ -1041,12 +1040,12 @@ bool KviStupidNotifyListManager::handleIsOn(KviIrcMessage * msg)
 	// ok...check the users that have left irc now...
 	QStringList sl = m_szLastIsOnMsg.isEmpty() ? QStringList() : m_szLastIsOnMsg.split(' ', QString::SkipEmptyParts);
 
-	for(QStringList::Iterator it = sl.begin(); it != sl.end(); ++it)
+	for(auto & it : sl)
 	{
-		if(m_pConsole->notifyListView()->findEntry(*it))
+		if(m_pConsole->notifyListView()->findEntry(it))
 		{
 			// has just left irc
-			notifyOffLine(*it);
+			notifyOffLine(it);
 		} // else has never been here...
 	}
 
@@ -1147,9 +1146,9 @@ void KviWatchNotifyListManager::buildRegUserDict()
 		{
 			notify = notify.trimmed();
 			QStringList sl = notify.split(' ', QString::SkipEmptyParts);
-			for(QStringList::Iterator it = sl.begin(); it != sl.end(); ++it)
+			for(auto & it : sl)
 			{
-				m_pRegUserDict->replace(*it, new QString(u->name()));
+				m_pRegUserDict->replace(it, new QString(u->name()));
 			}
 		}
 		++it;
diff --git a/src/kvirc/kernel/KviOptions.cpp b/src/kvirc/kernel/KviOptions.cpp
index c15d18529..6e8be48da 100644
--- a/src/kvirc/kernel/KviOptions.cpp
+++ b/src/kvirc/kernel/KviOptions.cpp
@@ -933,7 +933,7 @@ void KviApplication::saveOptions()
 
 	if(!cfg.ensureWritable())
 	{
-		QMessageBox::warning(0, __tr2qs("Warning While Writing Configuration - KVIrc"),
+		QMessageBox::warning(nullptr, __tr2qs("Warning While Writing Configuration - KVIrc"),
 		    __tr2qs("I can't write to the main configuration file:\n\t%1\nPlease ensure the directory exists and that you have the proper permissions before continuing, "
 		            "or else any custom configuration will be lost.")
 		        .arg(buffer));
@@ -1087,13 +1087,13 @@ namespace KviTheme
 			QDir d(szPicsPath);
 			QStringList sl = d.entryList(QDir::nameFiltersFromString("kvi_bigicon_*.png"), QDir::Files);
 
-			for(QStringList::Iterator it = sl.begin(); it != sl.end(); it++)
+			for(auto & it : sl)
 			{
-				KviCachedPixmap * p = g_pIconManager->getPixmapWithCache(*it);
+				KviCachedPixmap * p = g_pIconManager->getPixmapWithCache(it);
 				if(p)
 				{
 					QString szPixPath = szThemeDirPath;
-					szPixPath += *it;
+					szPixPath += it;
 
 					if(!KviFileUtils::copyFile(p->path(), szPixPath))
 					{
@@ -1390,13 +1390,13 @@ bool KviApplication::setOptionValue(const QString & optName, const QString & val
 			szBuffer = szVal;
 		}
 
-		for(int i = 0; i < KVI_NUM_PIXMAP_OPTIONS; i++)
+		for(auto & i : g_pixmapOptionsTable)
 		{
-			if(KviQString::equalCI(optName, g_pixmapOptionsTable[i].name))
+			if(KviQString::equalCI(optName, i.name))
 			{
-				if(!KviStringConversion::fromString(szBuffer, g_pixmapOptionsTable[i].option))
+				if(!KviStringConversion::fromString(szBuffer, i.option))
 					return false;
-				optionResetUpdate(g_pixmapOptionsTable[i].flags);
+				optionResetUpdate(i.flags);
 				return true;
 			}
 		}
diff --git a/src/kvirc/kernel/KviSSLMaster.cpp b/src/kvirc/kernel/KviSSLMaster.cpp
index 477887d33..b68a921d1 100644
--- a/src/kvirc/kernel/KviSSLMaster.cpp
+++ b/src/kvirc/kernel/KviSSLMaster.cpp
@@ -118,7 +118,7 @@ namespace KviSSLMaster
 		if(!s->initContext(m))
 		{
 			delete s;
-			return 0;
+			return nullptr;
 		}
 
 		if(!contextString)
@@ -180,7 +180,7 @@ namespace KviSSLMaster
 		if(!s->initSocket(sock))
 		{
 			delete s;
-			return 0;
+			return nullptr;
 		}
 
 		return s;
diff --git a/src/kvirc/kernel/KviTextIconManager.cpp b/src/kvirc/kernel/KviTextIconManager.cpp
index 101f5371f..512cd83df 100644
--- a/src/kvirc/kernel/KviTextIconManager.cpp
+++ b/src/kvirc/kernel/KviTextIconManager.cpp
@@ -52,13 +52,13 @@ static KviTextIconAssocEntry default_associations[] = {
 	{ ":S", KviIconManager::Afraid },
 	{ ":|", KviIconManager::Demoralized },
 	{ ":P'", KviIconManager::Slurp },
-	{ 0, 0 }
+	{ nullptr, 0 }
 };
 
-KVIRC_API KviTextIconManager * g_pTextIconManager = 0;
+KVIRC_API KviTextIconManager * g_pTextIconManager = nullptr;
 
 KviTextIcon::KviTextIcon(KviIconManager::SmallIcon eIcon)
-    : m_eIcon(eIcon), m_pAnimatedPixmap(NULL)
+    : m_eIcon(eIcon), m_pAnimatedPixmap(nullptr)
 {
 }
 
@@ -77,7 +77,7 @@ KviTextIcon::KviTextIcon(QString szFile)
 	}
 	else
 	{
-		m_pAnimatedPixmap = NULL;
+		m_pAnimatedPixmap = nullptr;
 	}
 }
 
@@ -88,7 +88,7 @@ KviTextIcon::KviTextIcon(KviTextIcon * pIcon)
 	if(pIcon->m_pAnimatedPixmap)
 		m_pAnimatedPixmap = new KviAnimatedPixmap(*(pIcon->m_pAnimatedPixmap));
 	else
-		m_pAnimatedPixmap = NULL;
+		m_pAnimatedPixmap = nullptr;
 }
 
 KviTextIcon::~KviTextIcon()
@@ -125,7 +125,7 @@ void KviTextIcon::setFilename(QString szFileName)
 	}
 	else
 	{
-		m_pAnimatedPixmap = NULL;
+		m_pAnimatedPixmap = nullptr;
 	}
 	m_szFileName = szFileName;
 }
@@ -290,7 +290,7 @@ int KviTextIconManager::load(const QString & szFileName, bool bMerge)
 		{
 			int iId = cfg.readIntEntry(*s, -1);
 			QString szTmp;
-			QPixmap * pix = 0;
+			QPixmap * pix = nullptr;
 			//qDebug("%s %s %i %i",__FILE__,__FUNCTION__,__LINE__,id);
 			if(iId > 0)
 			{
diff --git a/src/kvirc/kernel/KviTheme.cpp b/src/kvirc/kernel/KviTheme.cpp
index fa4f46548..f51a8abe3 100644
--- a/src/kvirc/kernel/KviTheme.cpp
+++ b/src/kvirc/kernel/KviTheme.cpp
@@ -45,8 +45,7 @@ KviThemeInfo::KviThemeInfo()
 }
 
 KviThemeInfo::~KviThemeInfo()
-{
-}
+    = default;
 
 void KviThemeInfo::setDirectoryAndLocation(const QString & szDirectory, Location eLocation)
 {
@@ -335,7 +334,7 @@ namespace KviTheme
 		QDir d(szThemePath);
 		QStringList sl = d.entryList(QDir::Dirs | QDir::NoDotAndDotDot);
 
-		for(QStringList::Iterator it = sl.begin(); it != sl.end(); ++it)
-			slThemes.append(*it);
+		for(auto & it : sl)
+			slThemes.append(it);
 	}
 };
diff --git a/src/kvirc/kernel/KviUserInput.cpp b/src/kvirc/kernel/KviUserInput.cpp
index f86a01338..d3cf57c63 100644
--- a/src/kvirc/kernel/KviUserInput.cpp
+++ b/src/kvirc/kernel/KviUserInput.cpp
@@ -89,14 +89,14 @@ namespace KviUserInput
 			KviQString::escapeKvs(&szCmd, KviQString::EscapeParenthesis);
 
 			KviKvsScript kvs(szContext.isEmpty() ? szUserFriendlyCommandlineContext : szContext, szCmd);
-			return (kvs.run(pWindow, 0, 0) != KviKvsScript::Error);
+			return (kvs.run(pWindow, nullptr, nullptr) != KviKvsScript::Error);
 		}
 		else
 		{
 			static QString szCommandlineContext(__tr2qs("commandline::kvs"));
 
 			KviKvsScript kvs(szContext.isEmpty() ? szCommandlineContext : szContext, szData);
-			return (kvs.run(pWindow, 0, 0 /*,KviKvsScript::AssumeLocals*/) != KviKvsScript::Error);
+			return (kvs.run(pWindow, nullptr, nullptr /*,KviKvsScript::AssumeLocals*/) != KviKvsScript::Error);
 		}
 	}
 
diff --git a/src/kvirc/kvs/KviKvsAction.cpp b/src/kvirc/kvs/KviKvsAction.cpp
index 434fbc204..d91d2638c 100644
--- a/src/kvirc/kvs/KviKvsAction.cpp
+++ b/src/kvirc/kvs/KviKvsAction.cpp
@@ -77,8 +77,7 @@ KviKvsAction::KviKvsAction(
 }
 
 KviKvsAction::~KviKvsAction()
-{
-}
+    = default;
 
 const QString & KviKvsAction::scriptCode()
 {
diff --git a/src/kvirc/kvs/KviKvsAliasManager.cpp b/src/kvirc/kvs/KviKvsAliasManager.cpp
index fc93b0b9c..9e980ebb9 100644
--- a/src/kvirc/kvs/KviKvsAliasManager.cpp
+++ b/src/kvirc/kvs/KviKvsAliasManager.cpp
@@ -25,7 +25,7 @@
 #include "KviKvsAliasManager.h"
 #include "KviConfigurationFile.h"
 
-KviKvsAliasManager * KviKvsAliasManager::m_pAliasManager = 0;
+KviKvsAliasManager * KviKvsAliasManager::m_pAliasManager = nullptr;
 
 KviKvsAliasManager::KviKvsAliasManager()
 {
@@ -37,7 +37,7 @@ KviKvsAliasManager::KviKvsAliasManager()
 KviKvsAliasManager::~KviKvsAliasManager()
 {
 	delete m_pAliasDict;
-	m_pAliasManager = 0;
+	m_pAliasManager = nullptr;
 }
 
 void KviKvsAliasManager::init()
diff --git a/src/kvirc/kvs/KviKvsArray.cpp b/src/kvirc/kvs/KviKvsArray.cpp
index 24235bf91..a70c0b415 100644
--- a/src/kvirc/kvs/KviKvsArray.cpp
+++ b/src/kvirc/kvs/KviKvsArray.cpp
@@ -32,7 +32,7 @@
 KviKvsArray::KviKvsArray()
     : KviHeapObject()
 {
-	m_pData = 0;
+	m_pData = nullptr;
 	m_uSize = 0;
 	m_uAllocSize = 0;
 }
@@ -51,12 +51,12 @@ KviKvsArray::KviKvsArray(const KviKvsArray & array)
 			if(array.m_pData[u])
 				m_pData[u] = new KviKvsVariant(*(array.m_pData[u]));
 			else
-				m_pData[u] = 0;
+				m_pData[u] = nullptr;
 		}
 	}
 	else
 	{
-		m_pData = 0;
+		m_pData = nullptr;
 	}
 }
 
@@ -115,7 +115,7 @@ void KviKvsArray::unset(kvs_uint_t uIdx)
 	if(m_pData[uIdx])
 	{
 		delete m_pData[uIdx];
-		m_pData[uIdx] = 0;
+		m_pData[uIdx] = nullptr;
 	}
 
 	if(uIdx == (m_uSize - 1))
@@ -157,7 +157,7 @@ void KviKvsArray::findNewSize()
 		else
 		{
 			KviMemory::free(m_pData);
-			m_pData = 0;
+			m_pData = nullptr;
 		}
 	}
 }
@@ -177,7 +177,7 @@ void KviKvsArray::set(kvs_uint_t uIdx, KviKvsVariant * pVal)
 			m_pData = (KviKvsVariant **)KviMemory::allocate((sizeof(KviKvsVariant *)) * m_uAllocSize);
 
 		for(kvs_uint_t u = m_uSize; u < uIdx; u++)
-			m_pData[u] = 0;
+			m_pData[u] = nullptr;
 		m_uSize = uIdx + 1;
 		m_pData[uIdx] = pVal;
 	}
@@ -209,7 +209,7 @@ KviKvsVariant * KviKvsArray::getAt(kvs_uint_t uIdx)
 			m_pData = (KviKvsVariant **)KviMemory::allocate((sizeof(KviKvsVariant *)) * m_uAllocSize);
 
 		for(kvs_uint_t u = m_uSize; u < uIdx; u++)
-			m_pData[u] = 0;
+			m_pData[u] = nullptr;
 		m_uSize = uIdx + 1;
 		m_pData[uIdx] = new KviKvsVariant();
 	}
diff --git a/src/kvirc/kvs/KviKvsArrayCast.cpp b/src/kvirc/kvs/KviKvsArrayCast.cpp
index 79e63a6ed..23f62c9e5 100644
--- a/src/kvirc/kvs/KviKvsArrayCast.cpp
+++ b/src/kvirc/kvs/KviKvsArrayCast.cpp
@@ -37,6 +37,6 @@ void KviKvsArrayCast::clear()
 	{
 		if(m_bOwned)
 			delete m_pArray;
-		m_pArray = 0;
+		m_pArray = nullptr;
 	}
 }
diff --git a/src/kvirc/kvs/KviKvsAsyncDnsOperation.cpp b/src/kvirc/kvs/KviKvsAsyncDnsOperation.cpp
index 228c7c2f6..3d7f4a50a 100644
--- a/src/kvirc/kvs/KviKvsAsyncDnsOperation.cpp
+++ b/src/kvirc/kvs/KviKvsAsyncDnsOperation.cpp
@@ -92,7 +92,7 @@ void KviKvsAsyncDnsOperation::lookupTerminated(KviDnsResolver *)
 			params.append(new KviKvsVariant(*m_pMagic));
 		}
 
-		m_pCallback->run(pWnd, &params, 0, KviKvsScript::PreserveParams);
+		m_pCallback->run(pWnd, &params, nullptr, KviKvsScript::PreserveParams);
 
 		delete this;
 		return;
diff --git a/src/kvirc/kvs/KviKvsCallbackObject.cpp b/src/kvirc/kvs/KviKvsCallbackObject.cpp
index 5aca4fa3b..da10ff97a 100644
--- a/src/kvirc/kvs/KviKvsCallbackObject.cpp
+++ b/src/kvirc/kvs/KviKvsCallbackObject.cpp
@@ -34,7 +34,7 @@ KviKvsCallbackObject::KviKvsCallbackObject(const QString & szCallbackName, KviWi
 	if(pTargetWindow)
 		m_pTargetConsole = pTargetWindow->console();
 	else
-		m_pTargetConsole = 0;
+		m_pTargetConsole = nullptr;
 	m_pMagicParams = new KviKvsVariantList();
 	if(pMagicParams)
 		for(KviKvsVariant * v = pMagicParams->first(); v; v = pMagicParams->next())
diff --git a/src/kvirc/kvs/KviKvsCoreCallbackCommands.cpp b/src/kvirc/kvs/KviKvsCoreCallbackCommands.cpp
index 4962116b4..076f4a108 100644
--- a/src/kvirc/kvs/KviKvsCoreCallbackCommands.cpp
+++ b/src/kvirc/kvs/KviKvsCoreCallbackCommands.cpp
@@ -456,7 +456,7 @@ namespace KviKvsCoreCallbackCommands
 		KVSCCC_PARAMETER("label", KVS_PT_NONEMPTYSTRING, KVS_PF_OPTIONAL, szLabel)
 		KVSCCC_PARAMETERS_END
 
-		KviScriptUserButton * pButton = 0;
+		KviScriptUserButton * pButton = nullptr;
 
 		if(!KVSCCC_pWindow->buttonContainer())
 		{
@@ -953,19 +953,19 @@ namespace KviKvsCoreCallbackCommands
 
 		int f = 0;
 
-		if(KVSCCC_pSwitches->find('t', "trigger-termination") != 0)
+		if(KVSCCC_pSwitches->find('t', "trigger-termination") != nullptr)
 			f |= KVI_KVS_PROCESSDESCRIPTOR_TRIGGERTERMINATED;
-		if(KVSCCC_pSwitches->find('n', "no-stdout") == 0)
+		if(KVSCCC_pSwitches->find('n', "no-stdout") == nullptr)
 			f |= KVI_KVS_PROCESSDESCRIPTOR_TRIGGERSTDOUT;
-		if(KVSCCC_pSwitches->find('e', "trigger-stderr") != 0)
+		if(KVSCCC_pSwitches->find('e', "trigger-stderr") != nullptr)
 			f |= KVI_KVS_PROCESSDESCRIPTOR_TRIGGERSTDERR;
-		if(KVSCCC_pSwitches->find('x', "trigger-startup") != 0)
+		if(KVSCCC_pSwitches->find('x', "trigger-startup") != nullptr)
 			f |= KVI_KVS_PROCESSDESCRIPTOR_TRIGGERSTARTED;
-		if(KVSCCC_pSwitches->find('b', "output-block") != 0)
+		if(KVSCCC_pSwitches->find('b', "output-block") != nullptr)
 			f |= KVI_KVS_PROCESSDESCRIPTOR_OUTPUTBYBLOCKS;
-		if(KVSCCC_pSwitches->find('w', "bind-to-window") != 0)
+		if(KVSCCC_pSwitches->find('w', "bind-to-window") != nullptr)
 			f |= KVI_KVS_PROCESSDESCRIPTOR_KILLIFNOWINDOW;
-		if(KVSCCC_pSwitches->find('d', "direct") != 0)
+		if(KVSCCC_pSwitches->find('d', "direct") != nullptr)
 			f |= KVI_KVS_PROCESSDESCRIPTOR_NOSHELL;
 
 		QString szShell;
@@ -999,7 +999,7 @@ namespace KviKvsCoreCallbackCommands
 		d->szCommandline = szCommandline;
 		d->szShell = szShell;
 		d->pWnd = KVSCCC_pContext->window();
-		d->pMagic = pMagic ? new KviKvsVariant(*pMagic) : 0;
+		d->pMagic = pMagic ? new KviKvsVariant(*pMagic) : nullptr;
 		d->iFlags = f;
 		d->pCallback = new KviKvsScript(*KVSCCC_pCallback);
 		d->iMaxRunTime = iMaxRunTime;
@@ -1008,7 +1008,7 @@ namespace KviKvsCoreCallbackCommands
 		KviKvsProcessAsyncOperation * op = new KviKvsProcessAsyncOperation(d);
 		if(!op->start())
 		{
-			if(KVSCCC_pSwitches->find('q', "quiet") == 0)
+			if(KVSCCC_pSwitches->find('q', "quiet") == nullptr)
 				KVSCCC_pContext->warning(__tr2qs_ctx("Failed to start the process", "kvs"));
 			delete op;
 		}
diff --git a/src/kvirc/kvs/KviKvsCoreFunctions_af.cpp b/src/kvirc/kvs/KviKvsCoreFunctions_af.cpp
index 6f683f859..b8ce2558f 100644
--- a/src/kvirc/kvs/KviKvsCoreFunctions_af.cpp
+++ b/src/kvirc/kvs/KviKvsCoreFunctions_af.cpp
@@ -97,7 +97,7 @@ namespace KviKvsCoreFunctions
 			if(cons)
 				wnd = cons->activeWindow();
 			else
-				wnd = 0;
+				wnd = nullptr;
 		}
 		else
 		{
@@ -529,7 +529,7 @@ namespace KviKvsCoreFunctions
 		return true;
 #else
 		KviSSL::globalSSLInit();
-		X509 * cert = 0;
+		X509 * cert = nullptr;
 
 		if(!KVI_OPTION_BOOL(KviOption_boolUseSSLCertificate))
 		{
@@ -547,7 +547,7 @@ namespace KviKvsCoreFunctions
 		}
 
 		QString szPass = KVI_OPTION_STRING(KviOption_stringSSLCertificatePass).toUtf8();
-		PEM_read_X509(f, &cert, NULL, szPass.data());
+		PEM_read_X509(f, &cert, nullptr, szPass.data());
 
 		fclose(f);
 
@@ -613,7 +613,7 @@ namespace KviKvsCoreFunctions
 		KVSCF_PARAMETER("context_id", KVS_PT_UINT, KVS_PF_OPTIONAL, uContextId)
 		KVSCF_PARAMETERS_END
 
-		KviWindow * wnd = 0;
+		KviWindow * wnd = nullptr;
 		if(KVSCF_pParams->count() > 0)
 		{
 			if(KVSCF_pParams->count() > 1)
@@ -626,7 +626,7 @@ namespace KviKvsCoreFunctions
 					if(cons->connection())
 						wnd = cons->connection()->findChannel(szName);
 					else
-						wnd = 0;
+						wnd = nullptr;
 				}
 			}
 			else
@@ -637,7 +637,7 @@ namespace KviKvsCoreFunctions
 				{
 					if(!KVSCF_pContext->window()->console())
 						KVSCF_pContext->warning(__tr2qs_ctx("This window is not associated to an IRC context", "kvs"));
-					wnd = 0;
+					wnd = nullptr;
 				}
 			}
 		}
@@ -707,7 +707,7 @@ namespace KviKvsCoreFunctions
 		KVSCF_PARAMETERS_BEGIN
 		KVSCF_PARAMETER("className", KVS_PT_NONEMPTYSTRING, 0, szClassName)
 		KVSCF_PARAMETERS_END
-		KVSCF_pRetBuffer->setBoolean(KviKvsKernel::instance()->objectController()->lookupClass(szClassName) != 0);
+		KVSCF_pRetBuffer->setBoolean(KviKvsKernel::instance()->objectController()->lookupClass(szClassName) != nullptr);
 		return true;
 	}
 
@@ -961,9 +961,9 @@ namespace KviKvsCoreFunctions
 			goto leavenow;
 		}
 
-		for(int i = 0; i < szFormat.size(); i++)
+		for(auto i : szFormat)
 		{
-			ushort ch = szFormat.at(i).unicode();
+			ushort ch = i.unicode();
 			iLength = 2;
 			iVal = 0x8000000;
 			cDiv = ' ';
@@ -1126,7 +1126,7 @@ namespace KviKvsCoreFunctions
 				//case 'Z':   // TZ abbrev.
 				//    szFmtTime +=
 				default:
-					szFmtTime += szFormat.at(i);
+					szFmtTime += i;
 			}
 
 			if(iVal != 0x8000000)
diff --git a/src/kvirc/kvs/KviKvsCoreFunctions_gl.cpp b/src/kvirc/kvs/KviKvsCoreFunctions_gl.cpp
index 5cff07ef2..9588ff209 100644
--- a/src/kvirc/kvs/KviKvsCoreFunctions_gl.cpp
+++ b/src/kvirc/kvs/KviKvsCoreFunctions_gl.cpp
@@ -348,7 +348,7 @@ namespace KviKvsCoreFunctions
 		Q_UNUSED(__pParams);
 
 		struct timeval tv;
-		kvi_gettimeofday(&tv, 0);
+		kvi_gettimeofday(&tv, nullptr);
 		kvs_real_t dTimestamp = (kvs_real_t)(tv.tv_sec);
 		dTimestamp += (((kvs_real_t)(tv.tv_usec)) / 1000000.0);
 		KVSCF_pRetBuffer->setReal(dTimestamp);
@@ -679,7 +679,7 @@ namespace KviKvsCoreFunctions
 	KVSCF(isEventEnabled)
 	{
 		QString szEventName, szHandlerName;
-		KviKvsScriptEventHandler * h = 0;
+		KviKvsScriptEventHandler * h = nullptr;
 
 		KVSCF_PARAMETERS_BEGIN
 		KVSCF_PARAMETER("event_name", KVS_PT_NONEMPTYSTRING, 0, szEventName)
@@ -910,7 +910,7 @@ namespace KviKvsCoreFunctions
 
 	KVSCF(keys)
 	{
-		KviKvsHash * pHash = 0;
+		KviKvsHash * pHash = nullptr;
 		KVSCF_PARAMETERS_BEGIN
 		KVSCF_PARAMETER("hash", KVS_PT_HASH, KVS_PF_OPTIONAL, pHash)
 		KVSCF_PARAMETERS_END
diff --git a/src/kvirc/kvs/KviKvsCoreFunctions_mr.cpp b/src/kvirc/kvs/KviKvsCoreFunctions_mr.cpp
index ae0263fb7..949b4ba12 100644
--- a/src/kvirc/kvs/KviKvsCoreFunctions_mr.cpp
+++ b/src/kvirc/kvs/KviKvsCoreFunctions_mr.cpp
@@ -284,7 +284,7 @@ namespace KviKvsCoreFunctions
 		// prologue: parameter handling
 		QString szClassName;
 		QString szName;
-		kvs_hobject_t hParent = 0;
+		kvs_hobject_t hParent = nullptr;
 		KviKvsVariantList vList;
 
 		KVSCF_PARAMETERS_BEGIN
@@ -302,7 +302,7 @@ namespace KviKvsCoreFunctions
 		}
 
 		KviKvsObject * pParent;
-		if(hParent != (kvs_hobject_t)0)
+		if(hParent != (kvs_hobject_t) nullptr)
 		{
 			pParent = KviKvsKernel::instance()->objectController()->lookupObject(hParent);
 			if(!pParent)
@@ -313,13 +313,13 @@ namespace KviKvsCoreFunctions
 		}
 		else
 		{
-			pParent = 0;
+			pParent = nullptr;
 		}
 
 		KviKvsObject * pObject = pClass->allocateInstance(pParent, szName, KVSCF_pContext, &vList);
 
 		// epilogue: set the return value
-		KVSCF_pRetBuffer->setHObject(pObject ? pObject->handle() : (kvs_hobject_t)0);
+		KVSCF_pRetBuffer->setHObject(pObject ? pObject->handle() : (kvs_hobject_t) nullptr);
 		return true;
 	}
 
@@ -380,7 +380,7 @@ namespace KviKvsCoreFunctions
 		Q_UNUSED(__pContext);
 		Q_UNUSED(__pParams);
 
-		KVSCF_pRetBuffer->setHObject(0);
+		KVSCF_pRetBuffer->setHObject(nullptr);
 		return true;
 	}
 
@@ -493,7 +493,7 @@ namespace KviKvsCoreFunctions
 		KVSCF_PARAMETER("context_id", KVS_PT_UINT, KVS_PF_OPTIONAL, uContextId)
 		KVSCF_PARAMETERS_END
 
-		KviWindow * wnd = 0;
+		KviWindow * wnd = nullptr;
 		if(KVSCF_pParams->count() > 0)
 		{
 			if(KVSCF_pParams->count() > 1)
@@ -506,7 +506,7 @@ namespace KviKvsCoreFunctions
 					if(cons->connection())
 						wnd = cons->connection()->findQuery(szName);
 					else
-						wnd = 0;
+						wnd = nullptr;
 				}
 			}
 			else
@@ -517,7 +517,7 @@ namespace KviKvsCoreFunctions
 				{
 					if(!KVSCF_pContext->window()->console())
 						KVSCF_pContext->warning(__tr2qs_ctx("This window is not associated to an IRC context", "kvs"));
-					wnd = 0;
+					wnd = nullptr;
 				}
 			}
 		}
diff --git a/src/kvirc/kvs/KviKvsCoreFunctions_sz.cpp b/src/kvirc/kvs/KviKvsCoreFunctions_sz.cpp
index f7ef9333c..ae230cbfd 100644
--- a/src/kvirc/kvs/KviKvsCoreFunctions_sz.cpp
+++ b/src/kvirc/kvs/KviKvsCoreFunctions_sz.cpp
@@ -161,7 +161,7 @@ namespace KviKvsCoreFunctions
 
 	KVSCF(serialize)
 	{
-		KviKvsVariant * pVar = 0;
+		KviKvsVariant * pVar = nullptr;
 		QString szBuffer;
 
 		KVSCF_PARAMETERS_BEGIN
@@ -494,7 +494,7 @@ namespace KviKvsCoreFunctions
 
 		// prologue: parameter handling
 		KviKvsObject * o = KVSCF_pContext->thisObject();
-		KVSCF_pRetBuffer->setHObject(o ? o->handle() : ((kvs_hobject_t)0));
+		KVSCF_pRetBuffer->setHObject(o ? o->handle() : ((kvs_hobject_t) nullptr));
 		return true;
 	}
 
@@ -920,7 +920,7 @@ namespace KviKvsCoreFunctions
 		Q_UNUSED(__pContext);
 		Q_UNUSED(__pParams);
 
-		KVSCF_pRetBuffer->setInteger((kvs_int_t)(time(0)));
+		KVSCF_pRetBuffer->setInteger((kvs_int_t)(time(nullptr)));
 		return true;
 	}
 
diff --git a/src/kvirc/kvs/KviKvsCoreSimpleCommands_af.cpp b/src/kvirc/kvs/KviKvsCoreSimpleCommands_af.cpp
index aa01e3f2a..6a2c6e0b3 100644
--- a/src/kvirc/kvs/KviKvsCoreSimpleCommands_af.cpp
+++ b/src/kvirc/kvs/KviKvsCoreSimpleCommands_af.cpp
@@ -362,7 +362,7 @@ namespace KviKvsCoreSimpleCommands
 #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
 		Beep(pitch, duration);
 #elif defined(COMPILE_X11_SUPPORT) && (!defined(COMPILE_NO_X_BELL))
-		bool bSync = (KVSCSC_pSwitches->find('s', "sync") != 0);
+		bool bSync = (KVSCSC_pSwitches->find('s', "sync") != nullptr);
 
 		XKeyboardState st;
 		XKeyboardControl ctl;
@@ -448,7 +448,7 @@ namespace KviKvsCoreSimpleCommands
 		KVSCSC_PARAMETER("parameter", KVS_PT_STRING, KVS_PF_OPTIONAL, tbPar)
 		KVSCSC_PARAMETERS_END
 
-		KviScriptUserButton * pButton = 0;
+		KviScriptUserButton * pButton = nullptr;
 
 		if(!KVSCSC_pWindow->buttonContainer())
 		{
@@ -689,7 +689,7 @@ namespace KviKvsCoreSimpleCommands
 		if(KviQString::equalCI(szCtcpData, "PING"))
 		{
 			struct timeval tv;
-			kvi_gettimeofday(&tv, 0);
+			kvi_gettimeofday(&tv, nullptr);
 			KviQString::appendFormatted(szCtcpData, " %d.%d", tv.tv_sec, tv.tv_usec);
 		}
 
@@ -905,11 +905,11 @@ namespace KviKvsCoreSimpleCommands
 
 	KVSCSC(deleteCKEYWORDWORKAROUND)
 	{
-		kvs_hobject_t hObject = (kvs_hobject_t)0;
+		kvs_hobject_t hObject = (kvs_hobject_t) nullptr;
 		KVSCSC_PARAMETERS_BEGIN
 		KVSCSC_PARAMETER("objectHandle", KVS_PT_HOBJECT, 0, hObject)
 		KVSCSC_PARAMETERS_END
-		if(hObject == (kvs_hobject_t)0)
+		if(hObject == (kvs_hobject_t) nullptr)
 		{
 			if(!KVSCSC_pSwitches->find('q', "quiet"))
 				KVSCSC_pContext->warning(__tr2qs_ctx("Can't delete a null object reference", "kvs"));
@@ -1590,7 +1590,7 @@ namespace KviKvsCoreSimpleCommands
 				KviKvsScript * s = h->script();
 				KviKvsScript copy(*s);
 				KviKvsVariant retVal;
-				copy.run(KVSCSC_pWindow, &vList, 0, KviKvsScript::PreserveParams);
+				copy.run(KVSCSC_pWindow, &vList, nullptr, KviKvsScript::PreserveParams);
 			}
 			else
 			{
diff --git a/src/kvirc/kvs/KviKvsCoreSimpleCommands_gl.cpp b/src/kvirc/kvs/KviKvsCoreSimpleCommands_gl.cpp
index 8c5b0cb7a..674bb4c6b 100644
--- a/src/kvirc/kvs/KviKvsCoreSimpleCommands_gl.cpp
+++ b/src/kvirc/kvs/KviKvsCoreSimpleCommands_gl.cpp
@@ -411,13 +411,13 @@ namespace KviKvsCoreSimpleCommands
 		QStringList slChans = szChans.split(",", QString::SkipEmptyParts);
 
 		QString szChanTypes = KVSCSC_pConnection->serverInfo()->supportedChannelTypes();
-		for(QStringList::Iterator it = slChans.begin(); it != slChans.end(); ++it)
+		for(auto & slChan : slChans)
 		{
-			if(!(*it).isEmpty())
+			if(!slChan.isEmpty())
 			{
 				bool bFound = false;
 				int id = 0;
-				QChar f = (*it)[0];
+				QChar f = slChan[0];
 				while((id < szChanTypes.length()) && !bFound)
 				{
 					if(f == szChanTypes[id])
@@ -425,7 +425,7 @@ namespace KviKvsCoreSimpleCommands
 					id++;
 				}
 				if(!bFound)
-					(*it).prepend("#");
+					slChan.prepend("#");
 			}
 		}
 
diff --git a/src/kvirc/kvs/KviKvsCoreSimpleCommands_mr.cpp b/src/kvirc/kvs/KviKvsCoreSimpleCommands_mr.cpp
index 1d6edf8a6..dc31ed177 100644
--- a/src/kvirc/kvs/KviKvsCoreSimpleCommands_mr.cpp
+++ b/src/kvirc/kvs/KviKvsCoreSimpleCommands_mr.cpp
@@ -486,7 +486,7 @@ namespace KviKvsCoreSimpleCommands
 				QString szName = "openurl::handler";
 				KviKvsScript script(szName, szCommand);
 
-				if(!script.run(KVSCSC_pWindow, &vList, 0, KviKvsScript::PreserveParams))
+				if(!script.run(KVSCSC_pWindow, &vList, nullptr, KviKvsScript::PreserveParams))
 					KVSCSC_pContext->warning(__tr2qs_ctx("The commandline for this URL type seems to be broken (%Q)", "kvs"), &szUrl);
 			}
 			else
@@ -746,7 +746,7 @@ namespace KviKvsCoreSimpleCommands
 
 		KviKvsScript s(szFileName, szBuffer);
 
-		KviKvsVariant * pRetVal = KVSCSC_pSwitches->find('r', "propagate-return") ? KVSCSC_pContext->returnValue() : 0;
+		KviKvsVariant * pRetVal = KVSCSC_pSwitches->find('r', "propagate-return") ? KVSCSC_pContext->returnValue() : nullptr;
 		KviKvsVariant vFileName(szFileName);
 		vList.prepend(&vFileName);
 
@@ -844,9 +844,9 @@ namespace KviKvsCoreSimpleCommands
 		if(!(KVSCSC_pConnection->sendFmtData("PART %s :%s", szEncodedChans.data(), szText.data())))
 			return KVSCSC_pContext->warningNoIrcConnection();
 
-		for(QStringList::Iterator it = sl.begin(); it != sl.end(); it++)
+		for(auto & it : sl)
 		{
-			KviChannelWindow * ch = KVSCSC_pConnection->findChannel(*it);
+			KviChannelWindow * ch = KVSCSC_pConnection->findChannel(it);
 			if(ch)
 			{
 				ch->partMessageSent(!KVSCSC_pSwitches->find('k', "keep"), !KVSCSC_pSwitches->find('s', "silent"));
@@ -854,7 +854,7 @@ namespace KviKvsCoreSimpleCommands
 			else
 			{
 				if(!KVSCSC_pSwitches->find('q', "quiet"))
-					KVSCSC_pContext->warning(__tr2qs_ctx("You don't appear to be on channel %s", "kvs"), (*it).toUtf8().data());
+					KVSCSC_pContext->warning(__tr2qs_ctx("You don't appear to be on channel %s", "kvs"), it.toUtf8().data());
 			}
 		}
 
@@ -964,7 +964,7 @@ namespace KviKvsCoreSimpleCommands
 			szParams.append(QString::fromLatin1(" $%1 ").arg(i));
 
 		KviKvsScript s("popup", "popup.show " + szSwitches + szParams);
-		s.run(KVSCSC_pContext->window(), &lParameters, 0, KviKvsScript::PreserveParams);
+		s.run(KVSCSC_pContext->window(), &lParameters, nullptr, KviKvsScript::PreserveParams);
 		return true;
 	}
 
@@ -1090,9 +1090,8 @@ namespace KviKvsCoreSimpleCommands
 		KviQueryWindow * query;
 
 		QStringList sl = szTargets.split(",", QString::SkipEmptyParts);
-		for(QStringList::Iterator it = sl.begin(); it != sl.end(); it++)
+		for(auto szNick : sl)
 		{
-			QString szNick = *it;
 			if(szNick.isEmpty())
 				KVSCSC_pContext->warning(__tr2qs_ctx("Empty target specified", "kvs"));
 			else
diff --git a/src/kvirc/kvs/KviKvsCoreSimpleCommands_sz.cpp b/src/kvirc/kvs/KviKvsCoreSimpleCommands_sz.cpp
index a54824b4d..11d12ee43 100644
--- a/src/kvirc/kvs/KviKvsCoreSimpleCommands_sz.cpp
+++ b/src/kvirc/kvs/KviKvsCoreSimpleCommands_sz.cpp
@@ -227,7 +227,7 @@ namespace KviKvsCoreSimpleCommands
 		KVSCSC_PARAMETER("port", KVS_PT_UINT, KVS_PF_OPTIONAL, uPort)
 		KVSCSC_PARAMETERS_END
 
-		KviConsoleWindow * console = 0;
+		KviConsoleWindow * console = nullptr;
 		if(KVSCSC_pSwitches->find('n', "new-context"))
 			console = g_pMainWindow->createNewConsole(false, !KVSCSC_pSwitches->find('m', "minimized"));
 		else
@@ -241,7 +241,7 @@ namespace KviKvsCoreSimpleCommands
 					// if there is a connection in progress, proceed in searching
 					if(console->connectionInProgress())
 					{
-						console = 0;
+						console = nullptr;
 					}
 				}
 				if(!console)
@@ -281,7 +281,7 @@ namespace KviKvsCoreSimpleCommands
 			}
 
 			KviAsynchronousConnectionData * d = new KviAsynchronousConnectionData();
-			d->bUseLastServerInContext = KVSCSC_pSwitches->find('l', "last") != 0;
+			d->bUseLastServerInContext = KVSCSC_pSwitches->find('l', "last") != nullptr;
 			d->szCommandToExecAfterConnect = szCmd;
 			d->szBindAddress = szBindAddress;
 			d->szPass = szPassword;
@@ -299,14 +299,14 @@ namespace KviKvsCoreSimpleCommands
 		{
 			// server is not empty.
 			KviAsynchronousConnectionData * d = new KviAsynchronousConnectionData();
-			d->bUseSSL = (KVSCSC_pSwitches->find('s', "ssl") != 0);
+			d->bUseSSL = (KVSCSC_pSwitches->find('s', "ssl") != nullptr);
 			d->bSTARTTLS = false;
 			d->szServer = szServer;
 			d->uPort = (kvi_u32_t)uPort;
 			d->szLinkFilter = szSocketFilter;
 			d->bPortIsOk = (uPort > 0);
 #ifdef COMPILE_IPV6_SUPPORT
-			d->bUseIPv6 = (KVSCSC_pSwitches->find('i', "ipv6") != 0) || KviNetUtils::isValidStringIPv6(szServer);
+			d->bUseIPv6 = (KVSCSC_pSwitches->find('i', "ipv6") != nullptr) || KviNetUtils::isValidStringIPv6(szServer);
 #else
 			d->bUseIPv6 = false;
 #endif
diff --git a/src/kvirc/kvs/KviKvsDnsManager.cpp b/src/kvirc/kvs/KviKvsDnsManager.cpp
index c506dca9a..b5487d39d 100644
--- a/src/kvirc/kvs/KviKvsDnsManager.cpp
+++ b/src/kvirc/kvs/KviKvsDnsManager.cpp
@@ -34,7 +34,7 @@
 #include "KviLocale.h"
 #include "KviError.h"
 
-KviKvsDnsManager * KviKvsDnsManager::m_pInstance = 0;
+KviKvsDnsManager * KviKvsDnsManager::m_pInstance = nullptr;
 
 KviKvsDnsObject::KviKvsDnsObject(KviDnsResolver * pDns, KviWindow * pWnd, const QString & szQuery, bool bRebindOnWindowClose, KviKvsScript * pCallback, KviKvsVariantList * pParameterList)
 {
@@ -48,7 +48,7 @@ KviKvsDnsObject::KviKvsDnsObject(KviDnsResolver * pDns, KviWindow * pWnd, const
 
 KviKvsDnsObject::~KviKvsDnsObject()
 {
-	QObject::disconnect(m_pDns, 0, 0, 0);
+	QObject::disconnect(m_pDns, nullptr, nullptr, nullptr);
 	if(m_pDns->isRunning())
 	{
 		//g_pApp->collectGarbage(m_pDns);
@@ -67,7 +67,7 @@ KviKvsDnsObject::~KviKvsDnsObject()
 KviKvsDnsManager::KviKvsDnsManager()
     : QObject()
 {
-	m_pDnsObjects = 0;
+	m_pDnsObjects = nullptr;
 }
 
 KviKvsDnsManager::~KviKvsDnsManager()
@@ -94,7 +94,7 @@ void KviKvsDnsManager::done()
 		return;
 	}
 	delete KviKvsDnsManager::m_pInstance;
-	KviKvsDnsManager::m_pInstance = 0;
+	KviKvsDnsManager::m_pInstance = nullptr;
 }
 
 void KviKvsDnsManager::addDns(KviKvsDnsObject * pObject)
@@ -156,7 +156,7 @@ void KviKvsDnsManager::dnsLookupTerminated(KviDnsResolver * pDns)
 		}
 		o->parameterList()->prepend(new KviKvsVariant(o->query())); // $0
 
-		copy.run(o->window(), o->parameterList(), 0, KviKvsScript::PreserveParams);
+		copy.run(o->window(), o->parameterList(), nullptr, KviKvsScript::PreserveParams);
 	}
 	else
 	{
diff --git a/src/kvirc/kvs/KviKvsKernel.cpp b/src/kvirc/kvs/KviKvsKernel.cpp
index 784438a67..c391a0261 100644
--- a/src/kvirc/kvs/KviKvsKernel.cpp
+++ b/src/kvirc/kvs/KviKvsKernel.cpp
@@ -37,7 +37,7 @@
 #include "KviModuleManager.h"
 
 #include <QDir>
-KviKvsKernel * KviKvsKernel::m_pKvsKernel = 0;
+KviKvsKernel * KviKvsKernel::m_pKvsKernel = nullptr;
 
 ////////////////////////////////////////////////////////////////////////////////
 // CONSTRUCTION AND DESTRUCTION
@@ -95,7 +95,7 @@ void KviKvsKernel::done()
 	if(m_pKvsKernel)
 	{
 		delete m_pKvsKernel;
-		m_pKvsKernel = 0;
+		m_pKvsKernel = nullptr;
 	}
 }
 
diff --git a/src/kvirc/kvs/KviKvsParameterProcessor.cpp b/src/kvirc/kvs/KviKvsParameterProcessor.cpp
index 4f81da83d..80ddbd0d5 100644
--- a/src/kvirc/kvs/KviKvsParameterProcessor.cpp
+++ b/src/kvirc/kvs/KviKvsParameterProcessor.cpp
@@ -59,20 +59,20 @@ namespace KviKvsParameterProcessor
 				*((bool *)(pFmtArray->pContainer)) = false;
 				break;
 			case KVS_PT_HASH:
-				*((KviKvsHash **)(pFmtArray->pContainer)) = 0;
+				*((KviKvsHash **)(pFmtArray->pContainer)) = nullptr;
 				break;
 			case KVS_PT_ARRAY:
-				*((KviKvsArray **)(pFmtArray->pContainer)) = 0;
+				*((KviKvsArray **)(pFmtArray->pContainer)) = nullptr;
 				break;
 			case KVS_PT_ARRAYCAST:
 				((KviKvsArrayCast *)(pFmtArray->pContainer))->clear();
 				break;
 			case KVS_PT_VARIANT:
-				*((KviKvsVariant **)(pFmtArray->pContainer)) = 0;
+				*((KviKvsVariant **)(pFmtArray->pContainer)) = nullptr;
 				break;
 			case KVS_PT_CSTRING:
 			case KVS_PT_NONEMPTYCSTRING:
-				*((QByteArray *)(pFmtArray->pContainer)) = 0;
+				*((QByteArray *)(pFmtArray->pContainer)) = nullptr;
 				break;
 			case KVS_PT_STRINGLIST:
 				((QStringList *)(pFmtArray->pContainer))->clear();
@@ -82,7 +82,7 @@ namespace KviKvsParameterProcessor
 				((KviKvsVariantList *)(pFmtArray->pContainer))->setAutoDelete(false);
 				break;
 			case KVS_PT_HOBJECT:
-				*((kvs_hobject_t *)(pFmtArray->pContainer)) = (kvs_hobject_t)0;
+				*((kvs_hobject_t *)(pFmtArray->pContainer)) = (kvs_hobject_t) nullptr;
 				break;
 			case KVS_PT_IGNORE:
 				// ignore :)
diff --git a/src/kvirc/kvs/KviKvsPopupManager.cpp b/src/kvirc/kvs/KviKvsPopupManager.cpp
index 8edcbefab..e3951888d 100644
--- a/src/kvirc/kvs/KviKvsPopupManager.cpp
+++ b/src/kvirc/kvs/KviKvsPopupManager.cpp
@@ -26,7 +26,7 @@
 #include "KviLocale.h"
 #include "KviConfigurationFile.h"
 
-KviKvsPopupManager * KviKvsPopupManager::m_pInstance = 0;
+KviKvsPopupManager * KviKvsPopupManager::m_pInstance = nullptr;
 
 KviKvsPopupManager::KviKvsPopupManager()
 {
diff --git a/src/kvirc/kvs/KviKvsPopupMenu.cpp b/src/kvirc/kvs/KviKvsPopupMenu.cpp
index 634f7b572..23aeda857 100644
--- a/src/kvirc/kvs/KviKvsPopupMenu.cpp
+++ b/src/kvirc/kvs/KviKvsPopupMenu.cpp
@@ -50,7 +50,7 @@ KviKvsPopupMenuItem::KviKvsPopupMenuItem(Type t, const QString & szItemName, con
 	if(szCondition.isEmpty())
 	{
 		// true by default
-		m_pKvsCondition = 0;
+		m_pKvsCondition = nullptr;
 	}
 	else
 	{
@@ -67,7 +67,7 @@ KviKvsPopupMenuItem::KviKvsPopupMenuItem(Type t, const QString & szItemName, con
 	if(!pCondition)
 	{
 		// true by default
-		m_pKvsCondition = 0;
+		m_pKvsCondition = nullptr;
 	}
 	else
 	{
@@ -87,17 +87,17 @@ void KviKvsPopupMenuItem::clear()
 
 KviKvsScript * KviKvsPopupMenuItem::kvsIcon()
 {
-	return 0;
+	return nullptr;
 }
 
 KviKvsScript * KviKvsPopupMenuItem::kvsText()
 {
-	return 0;
+	return nullptr;
 }
 
 KviKvsScript * KviKvsPopupMenuItem::kvsCode()
 {
-	return 0;
+	return nullptr;
 }
 
 bool KviKvsPopupMenuItem::evaluateCondition(KviKvsPopupMenuTopLevelData * pData)
@@ -132,8 +132,7 @@ KviKvsPopupMenuItemSeparator::KviKvsPopupMenuItemSeparator(const QString & szIte
 }
 
 KviKvsPopupMenuItemSeparator::~KviKvsPopupMenuItemSeparator()
-{
-}
+    = default;
 
 void KviKvsPopupMenuItemSeparator::fill(KviKvsPopupMenu * pMenu, KviKvsPopupMenuTopLevelData * pData, int)
 {
@@ -158,7 +157,7 @@ KviKvsPopupMenuItemWithTextAndIcon::KviKvsPopupMenuItemWithTextAndIcon(KviKvsPop
 
 	if(szIcon.isEmpty())
 	{
-		m_pKvsIcon = 0;
+		m_pKvsIcon = nullptr;
 	}
 	else
 	{
@@ -185,7 +184,7 @@ KviKvsPopupMenuItemWithTextAndIcon::KviKvsPopupMenuItemWithTextAndIcon(KviKvsPop
 
 	if(!pIcon)
 	{
-		m_pKvsIcon = 0;
+		m_pKvsIcon = nullptr;
 	}
 	else
 	{
@@ -213,9 +212,9 @@ KviKvsScript * KviKvsPopupMenuItemWithTextAndIcon::kvsText()
 QPixmap * KviKvsPopupMenuItemWithTextAndIcon::evaluateIcon(KviKvsPopupMenuTopLevelData * pData)
 {
 	if(!KVI_OPTION_BOOL(KviOption_boolShowIconsInPopupMenus))
-		return 0;
+		return nullptr;
 	if(!m_pKvsIcon)
-		return 0;
+		return nullptr;
 
 	KviKvsVariant vRet;
 	if(!m_pKvsIcon->run(pData->window(),
@@ -226,7 +225,7 @@ QPixmap * KviKvsPopupMenuItemWithTextAndIcon::evaluateIcon(KviKvsPopupMenuTopLev
 	{
 		// broken text
 		pData->window()->output(KVI_OUT_PARSERWARNING, __tr2qs_ctx("Broken icon parameter: ignoring", "kvs"));
-		return 0;
+		return nullptr;
 	}
 
 	QString szRet;
@@ -267,8 +266,7 @@ KviKvsPopupMenuItemLabelHelper::KviKvsPopupMenuItemLabelHelper(KviKvsPopupMenuIt
 }
 
 KviKvsPopupMenuItemLabelHelper::~KviKvsPopupMenuItemLabelHelper()
-{
-}
+    = default;
 
 void KviKvsPopupMenuItemLabelHelper::labelDestroyed()
 {
@@ -278,14 +276,14 @@ void KviKvsPopupMenuItemLabelHelper::labelDestroyed()
 KviKvsPopupMenuItemLabel::KviKvsPopupMenuItemLabel(const QString & szItemName, const QString & szText, const QString & szIcon, const QString & szCondition)
     : KviKvsPopupMenuItemWithTextAndIcon(KviKvsPopupMenuItem::Label, szItemName, szText, szIcon, szCondition)
 {
-	m_pLabel = 0;
+	m_pLabel = nullptr;
 	m_pSignalRelay = new KviKvsPopupMenuItemLabelHelper(this);
 }
 
 KviKvsPopupMenuItemLabel::KviKvsPopupMenuItemLabel(const QString & szItemName, const KviKvsScript * pText, const KviKvsScript * pIcon, const KviKvsScript * pCondition)
     : KviKvsPopupMenuItemWithTextAndIcon(KviKvsPopupMenuItem::Label, szItemName, pText, pIcon, pCondition)
 {
-	m_pLabel = 0;
+	m_pLabel = nullptr;
 	m_pSignalRelay = new KviKvsPopupMenuItemLabelHelper(this);
 }
 
@@ -301,7 +299,7 @@ KviKvsPopupMenuItemLabel::~KviKvsPopupMenuItemLabel()
 
 void KviKvsPopupMenuItemLabel::labelDestroyed()
 {
-	m_pLabel = 0; // someone (maybe qt, maybe us) has destroyed the label
+	m_pLabel = nullptr; // someone (maybe qt, maybe us) has destroyed the label
 }
 
 KviKvsPopupMenuItem * KviKvsPopupMenuItemLabel::clone() const
@@ -315,7 +313,7 @@ void KviKvsPopupMenuItemLabel::clear()
 	{
 		QObject::disconnect(m_pLabel, SIGNAL(destroyed()), m_pSignalRelay, SLOT(labelDestroyed()));
 		delete m_pLabel;
-		m_pLabel = 0;
+		m_pLabel = nullptr;
 	}
 }
 
@@ -454,7 +452,7 @@ KviKvsPopupMenuItemExtMenu::KviKvsPopupMenuItemExtMenu(const QString & szItemNam
 		m_szMenuName.remove(0, 1);
 		m_szMenuName.remove(m_szMenuName.length() - 1, 1);
 	}
-	m_pMenu = 0;
+	m_pMenu = nullptr;
 }
 
 KviKvsPopupMenuItemExtMenu::KviKvsPopupMenuItemExtMenu(const QString & szItemName, const QString & szMenuName, const KviKvsScript * pText, const KviKvsScript * pIcon, const KviKvsScript * pCondition)
@@ -466,7 +464,7 @@ KviKvsPopupMenuItemExtMenu::KviKvsPopupMenuItemExtMenu(const QString & szItemNam
 		m_szMenuName.remove(0, 1);
 		m_szMenuName.remove(m_szMenuName.length() - 1, 1);
 	}
-	m_pMenu = 0;
+	m_pMenu = nullptr;
 }
 
 KviKvsPopupMenuItemExtMenu::~KviKvsPopupMenuItemExtMenu()
@@ -480,7 +478,7 @@ void KviKvsPopupMenuItemExtMenu::clear()
 	if(m_pMenu)
 	{
 		delete m_pMenu;
-		m_pMenu = 0;
+		m_pMenu = nullptr;
 	}
 }
 
@@ -541,7 +539,7 @@ KviKvsPopupMenuTopLevelData::~KviKvsPopupMenuTopLevelData()
 }
 
 KviKvsPopupMenu::KviKvsPopupMenu(const QString & szName)
-    : QMenu(szName, 0)
+    : QMenu(szName, nullptr)
 {
 	m_szName = szName;
 	m_pItemList = new KviPointerList<KviKvsPopupMenuItem>;
@@ -550,9 +548,9 @@ KviKvsPopupMenu::KviKvsPopupMenu(const QString & szName)
 	m_pPrologues->setAutoDelete(true);
 	m_pEpilogues = new KviPointerList<KviKvsScript>;
 	m_pEpilogues->setAutoDelete(true);
-	m_pParentPopup = 0;
-	m_pTopLevelData = 0;
-	m_pTempTopLevelData = 0;
+	m_pParentPopup = nullptr;
+	m_pTopLevelData = nullptr;
+	m_pTempTopLevelData = nullptr;
 	m_bSetupDone = false;
 	connect(this, SIGNAL(triggered(QAction *)), this, SLOT(itemClicked(QAction *)));
 	connect(this, SIGNAL(aboutToShow()), this, SLOT(setupMenuContents()));
@@ -628,7 +626,7 @@ KviKvsPopupMenu * KviKvsPopupMenu::findChildPopupByName(const QString & szItemNa
 			continue;
 		return pMenu;
 	}
-	return NULL;
+	return nullptr;
 }
 
 bool KviKvsPopupMenu::removeItemByName(const QString & szItemName, bool bRecursive)
@@ -778,12 +776,12 @@ void KviKvsPopupMenu::clearMenuContents()
 	if(m_pTopLevelData)
 	{
 		delete m_pTopLevelData;
-		m_pTopLevelData = 0;
+		m_pTopLevelData = nullptr;
 	}
 	if(m_pTempTopLevelData)
 	{
 		delete m_pTempTopLevelData;
-		m_pTempTopLevelData = 0;
+		m_pTempTopLevelData = nullptr;
 	}
 }
 
@@ -793,12 +791,12 @@ void KviKvsPopupMenu::doClear()
 	if(m_pTopLevelData)
 	{
 		delete m_pTopLevelData;
-		m_pTopLevelData = 0;
+		m_pTopLevelData = nullptr;
 	}
 	if(m_pTempTopLevelData)
 	{
 		delete m_pTempTopLevelData;
-		m_pTempTopLevelData = 0;
+		m_pTempTopLevelData = nullptr;
 	}
 	m_bSetupDone = false;
 	m_pItemList->clear();
@@ -818,9 +816,9 @@ void KviKvsPopupMenu::lock(KviKvsPopupMenuTopLevelData::LockStatus eLock)
 void KviKvsPopupMenu::setupMenuContents()
 {
 	// This might be a compat problem later :((((
-	if(parentPopup() == 0)
+	if(parentPopup() == nullptr)
 	{
-		if(m_pTempTopLevelData == 0)
+		if(m_pTempTopLevelData == nullptr)
 		{
 			// We have been called by a KviMenuBar!
 			// m_bSetupDone is not valid here
@@ -837,7 +835,7 @@ void KviKvsPopupMenu::setupMenuContents()
 				qDebug("Oops! Something got messed in KviKvsPopupMenu activation system");
 			// Swap the top level data from temporary to the permanent
 			m_pTopLevelData = m_pTempTopLevelData;
-			m_pTempTopLevelData = 0;
+			m_pTempTopLevelData = nullptr;
 		}
 	}
 	else
@@ -890,7 +888,7 @@ void KviKvsPopupMenu::executePrologues(KviKvsPopupMenuTopLevelData * pData)
 	{
 		if(!s->run(pData->window(),
 		       pData->parameters(),
-		       0,
+		       nullptr,
 		       KviKvsScript::PreserveParams,
 		       pData->extendedRunTimeData()))
 		{
@@ -905,7 +903,7 @@ void KviKvsPopupMenu::executeEpilogues(KviKvsPopupMenuTopLevelData * pData)
 	{
 		if(!s->run(pData->window(),
 		       pData->parameters(),
-		       0,
+		       nullptr,
 		       KviKvsScript::PreserveParams,
 		       pData->extendedRunTimeData()))
 		{
@@ -943,7 +941,7 @@ void KviKvsPopupMenu::itemClicked(QAction * pAction)
 				lock(KviKvsPopupMenuTopLevelData::HardLocked);
 				if(d->extendedRunTimeData())
 					d->extendedRunTimeData()->setPopupId(new QString(it->name()));
-				((KviKvsPopupMenuItemItem *)it)->kvsCode()->run(d->window(), d->parameters(), 0, KviKvsScript::PreserveParams, d->extendedRunTimeData());
+				((KviKvsPopupMenuItemItem *)it)->kvsCode()->run(d->window(), d->parameters(), nullptr, KviKvsScript::PreserveParams, d->extendedRunTimeData());
 				// FIXME: should we print somethng if run() returns false ?
 				lock(KviKvsPopupMenuTopLevelData::Unlocked);
 			}
diff --git a/src/kvirc/kvs/KviKvsProcessManager.cpp b/src/kvirc/kvs/KviKvsProcessManager.cpp
index 8a5e22bff..e1ef10566 100644
--- a/src/kvirc/kvs/KviKvsProcessManager.cpp
+++ b/src/kvirc/kvs/KviKvsProcessManager.cpp
@@ -36,10 +36,10 @@ KviKvsProcessAsyncOperation::KviKvsProcessAsyncOperation(KviKvsProcessDescriptor
     : KviKvsAsyncOperation(d->pWnd)
 {
 	m_pData = d;
-	m_pProcess = 0;
+	m_pProcess = nullptr;
 	m_pExtendedRunTimeData = new KviKvsExtendedRunTimeData(new KviKvsHash(), true);
-	m_pPingTimer = 0;
-	m_pRunTimeTimer = 0;
+	m_pPingTimer = nullptr;
+	m_pRunTimeTimer = nullptr;
 	m_bDeletePending = false;
 }
 
@@ -51,7 +51,7 @@ KviKvsProcessAsyncOperation::~KviKvsProcessAsyncOperation()
 		delete m_pRunTimeTimer;
 	if(m_pProcess)
 	{
-		QObject::disconnect(m_pProcess, 0, this, 0);
+		QObject::disconnect(m_pProcess, nullptr, this, nullptr);
 		m_pProcess->kill();
 		delete m_pProcess;
 	}
diff --git a/src/kvirc/kvs/KviKvsRWEvaluationResult.cpp b/src/kvirc/kvs/KviKvsRWEvaluationResult.cpp
index e446394fe..71d4e4dd8 100644
--- a/src/kvirc/kvs/KviKvsRWEvaluationResult.cpp
+++ b/src/kvirc/kvs/KviKvsRWEvaluationResult.cpp
@@ -33,8 +33,7 @@ KviKvsRWEvaluationResult::KviKvsRWEvaluationResult(KviKvsRWEvaluationResult * pP
 }
 
 KviKvsRWEvaluationResult::~KviKvsRWEvaluationResult()
-{
-}
+    = default;
 
 KviKvsArrayElement::KviKvsArrayElement(KviKvsRWEvaluationResult * pParent, KviKvsVariant * pVariant, KviKvsArray * pArray, int iKey)
     : KviKvsRWEvaluationResult(pParent, pVariant)
diff --git a/src/kvirc/kvs/KviKvsReport.cpp b/src/kvirc/kvs/KviKvsReport.cpp
index 0ba56a316..2ac32a895 100644
--- a/src/kvirc/kvs/KviKvsReport.cpp
+++ b/src/kvirc/kvs/KviKvsReport.cpp
@@ -34,8 +34,8 @@
 KviKvsReport::KviKvsReport(Type t, const QString & szContext, const QString & szMessage, const QString & szLocation, KviWindow * pWindow)
     : m_eType(t), m_szContext(szContext), m_szMessage(szMessage), m_szLocation(szLocation), m_pWindow(pWindow)
 {
-	m_pCallStack = 0;
-	m_pCodeListing = 0;
+	m_pCallStack = nullptr;
+	m_pCodeListing = nullptr;
 }
 
 KviKvsReport::~KviKvsReport()
@@ -77,7 +77,7 @@ void KviKvsReport::findLineColAndListing(const QChar * pBegin, const QChar * pPo
 	iLine = 1;
 
 	const QChar * pBufferBegin = pBegin;
-	const QChar * pPrevLine = 0;
+	const QChar * pPrevLine = nullptr;
 	const QChar * pLineBegin = pBegin;
 
 	unsigned short us = pBegin->unicode();
diff --git a/src/kvirc/kvs/KviKvsRunTimeContext.cpp b/src/kvirc/kvs/KviKvsRunTimeContext.cpp
index 2ec479ede..3b611048c 100644
--- a/src/kvirc/kvs/KviKvsRunTimeContext.cpp
+++ b/src/kvirc/kvs/KviKvsRunTimeContext.cpp
@@ -65,7 +65,7 @@ KviKvsRunTimeContext::KviKvsRunTimeContext(KviKvsScript * pScript, KviWindow * p
 	m_pReturnValue = pRetVal;
 	m_uRunTimeFlags = 0;
 	m_pExtendedData = pExtData;
-	m_pDefaultReportLocation = 0;
+	m_pDefaultReportLocation = nullptr;
 }
 
 KviKvsRunTimeContext::~KviKvsRunTimeContext()
@@ -104,8 +104,8 @@ void KviKvsRunTimeContext::report(bool bError, KviKvsTreeNode * pNode, const QSt
 	QString szMsg;
 	KviQString::vsprintf(szMsg, szMsgFmt, va);
 
-	KviPointerList<QString> * pCodeListing = 0;
-	KviPointerList<QString> * pCallStack = 0;
+	KviPointerList<QString> * pCodeListing = nullptr;
+	KviPointerList<QString> * pCallStack = nullptr;
 	QString szLocation;
 
 	if(pNode)
diff --git a/src/kvirc/kvs/KviKvsScript.cpp b/src/kvirc/kvs/KviKvsScript.cpp
index 5fd14a817..c7540d28a 100644
--- a/src/kvirc/kvs/KviKvsScript.cpp
+++ b/src/kvirc/kvs/KviKvsScript.cpp
@@ -264,7 +264,7 @@ bool KviKvsScript::parse(KviWindow * pOutput, int iRunFlags)
 		}
 	} // else there is no tree at all, nobody can be locked inside
 
-	KviKvsParser p(this, (iRunFlags & Quiet) ? 0 : pOutput);
+	KviKvsParser p(this, (iRunFlags & Quiet) ? nullptr : pOutput);
 	// parse never blocks
 
 	int iFlags = iRunFlags & AssumeLocals ? KviKvsParser::AssumeLocals : 0;
diff --git a/src/kvirc/kvs/KviKvsScriptAddonManager.cpp b/src/kvirc/kvs/KviKvsScriptAddonManager.cpp
index e33766db5..9ad223469 100644
--- a/src/kvirc/kvs/KviKvsScriptAddonManager.cpp
+++ b/src/kvirc/kvs/KviKvsScriptAddonManager.cpp
@@ -32,7 +32,7 @@
 
 #include <QFileInfo>
 
-KviKvsScriptAddonManager * KviKvsScriptAddonManager::m_pInstance = 0;
+KviKvsScriptAddonManager * KviKvsScriptAddonManager::m_pInstance = nullptr;
 
 KviKvsScriptAddon::KviKvsScriptAddon(
     const QString & szName,
@@ -43,8 +43,8 @@ KviKvsScriptAddon::KviKvsScriptAddon(
     const QString & szIconId) : KviHeapObject(), m_szName(szName), m_szVersion(szVersion), m_szIconId(szIconId)
 {
 	allocateScripts(szVisibleNameCode, szDescriptionCode, szUninstallCallbackCode);
-	m_pConfigureCallback = 0;
-	m_pHelpCallback = 0;
+	m_pConfigureCallback = nullptr;
+	m_pHelpCallback = nullptr;
 }
 
 KviKvsScriptAddon::KviKvsScriptAddon(const KviKvsScriptAddon & a)
@@ -54,20 +54,20 @@ KviKvsScriptAddon::KviKvsScriptAddon(const KviKvsScriptAddon & a)
 	m_szVersion = a.m_szVersion;
 	m_szIconId = a.m_szIconId;
 	allocateScripts(a.m_pVisibleNameScript->code(), a.m_pDescriptionScript->code(), a.m_pUninstallCallback ? a.m_pUninstallCallback->code() : QString());
-	m_pConfigureCallback = 0;
+	m_pConfigureCallback = nullptr;
 	setConfigureCallback(a.m_pConfigureCallback ? a.m_pConfigureCallback->code() : QString());
-	m_pHelpCallback = 0;
+	m_pHelpCallback = nullptr;
 	setHelpCallback(a.m_pHelpCallback ? a.m_pHelpCallback->code() : QString());
 }
 
 KviKvsScriptAddon::KviKvsScriptAddon()
     : KviHeapObject()
 {
-	m_pVisibleNameScript = 0;
-	m_pDescriptionScript = 0;
-	m_pUninstallCallback = 0;
-	m_pConfigureCallback = 0;
-	m_pHelpCallback = 0;
+	m_pVisibleNameScript = nullptr;
+	m_pDescriptionScript = nullptr;
+	m_pUninstallCallback = nullptr;
+	m_pConfigureCallback = nullptr;
+	m_pHelpCallback = nullptr;
 }
 
 KviKvsScriptAddon::~KviKvsScriptAddon()
@@ -94,7 +94,7 @@ const QString & KviKvsScriptAddon::visibleName()
 {
 	if(!m_pVisibleNameScript)
 		return m_szVisibleName;
-	if(!m_pVisibleNameScript->run(g_pActiveWindow, 0, m_szVisibleName))
+	if(!m_pVisibleNameScript->run(g_pActiveWindow, nullptr, m_szVisibleName))
 		m_szVisibleName = m_pVisibleNameScript->code();
 	return m_szVisibleName;
 }
@@ -103,7 +103,7 @@ const QString & KviKvsScriptAddon::description()
 {
 	if(!m_pDescriptionScript)
 		return m_szDescription;
-	if(!m_pDescriptionScript->run(g_pActiveWindow, 0, m_szDescription))
+	if(!m_pDescriptionScript->run(g_pActiveWindow, nullptr, m_szDescription))
 		m_szDescription = m_pDescriptionScript->code();
 	return m_szDescription;
 }
@@ -175,7 +175,7 @@ void KviKvsScriptAddon::setConfigureCallback(const QString & szConfigureCallback
 		delete m_pConfigureCallback;
 	if(szConfigureCallbackCode.isEmpty())
 	{
-		m_pConfigureCallback = 0;
+		m_pConfigureCallback = nullptr;
 		return;
 	}
 
@@ -195,7 +195,7 @@ void KviKvsScriptAddon::setHelpCallback(const QString & szHelpCallbackCode)
 		delete m_pHelpCallback;
 	if(szHelpCallbackCode.isEmpty())
 	{
-		m_pHelpCallback = 0;
+		m_pHelpCallback = nullptr;
 		return;
 	}
 
diff --git a/src/kvirc/kvs/KviKvsSwitchList.cpp b/src/kvirc/kvs/KviKvsSwitchList.cpp
index d73e4f2e8..3929d6053 100644
--- a/src/kvirc/kvs/KviKvsSwitchList.cpp
+++ b/src/kvirc/kvs/KviKvsSwitchList.cpp
@@ -26,8 +26,8 @@
 
 KviKvsSwitchList::KviKvsSwitchList()
 {
-	m_pShortSwitchDict = 0;
-	m_pLongSwitchDict = 0;
+	m_pShortSwitchDict = nullptr;
+	m_pLongSwitchDict = nullptr;
 }
 
 KviKvsSwitchList::~KviKvsSwitchList()
@@ -43,12 +43,12 @@ void KviKvsSwitchList::clear()
 	if(m_pShortSwitchDict)
 	{
 		delete m_pShortSwitchDict;
-		m_pShortSwitchDict = 0;
+		m_pShortSwitchDict = nullptr;
 	}
 	if(m_pLongSwitchDict)
 	{
 		delete m_pLongSwitchDict;
-		m_pLongSwitchDict = 0;
+		m_pLongSwitchDict = nullptr;
 	}
 }
 
diff --git a/src/kvirc/kvs/KviKvsTimerManager.cpp b/src/kvirc/kvs/KviKvsTimerManager.cpp
index 027988aeb..9966f7bf1 100644
--- a/src/kvirc/kvs/KviKvsTimerManager.cpp
+++ b/src/kvirc/kvs/KviKvsTimerManager.cpp
@@ -55,7 +55,7 @@ KviKvsTimer::~KviKvsTimer()
 	delete m_pCallback;
 }
 
-KviKvsTimerManager * KviKvsTimerManager::m_pInstance = 0;
+KviKvsTimerManager * KviKvsTimerManager::m_pInstance = nullptr;
 
 KviKvsTimerManager::KviKvsTimerManager()
     : QObject()
@@ -64,7 +64,7 @@ KviKvsTimerManager::KviKvsTimerManager()
 	m_pTimerDictById->setAutoDelete(false);
 	m_pTimerDictByName = new KviPointerHashTable<QString, KviKvsTimer>(17, false);
 	m_pTimerDictByName->setAutoDelete(false);
-	m_pKilledTimerList = 0;
+	m_pKilledTimerList = nullptr;
 	m_iAssassinTimer = 0;
 	m_iCurrentTimer = 0;
 }
@@ -96,7 +96,7 @@ void KviKvsTimerManager::done()
 		return;
 	}
 	delete KviKvsTimerManager::m_pInstance;
-	KviKvsTimerManager::m_pInstance = 0;
+	KviKvsTimerManager::m_pInstance = nullptr;
 }
 
 bool KviKvsTimerManager::addTimer(const QString & szName, KviKvsTimer::Lifetime l, KviWindow * pWnd, int iDelay, KviKvsScript * pCallback, KviKvsVariantList * pParams)
@@ -106,9 +106,9 @@ bool KviKvsTimerManager::addTimer(const QString & szName, KviKvsTimer::Lifetime
 	if(iId <= 0)
 	{
 		delete pCallback;
-		pCallback = 0;
+		pCallback = nullptr;
 		delete pParams;
-		pParams = 0;
+		pParams = nullptr;
 		return false;
 	}
 
@@ -228,7 +228,7 @@ void KviKvsTimerManager::timerEvent(QTimerEvent * e)
 	m_iCurrentTimer = t->id();
 	bool bRet = copy.run(t->window(),
 	    t->parameterList(),
-	    0,
+	    nullptr,
 	    KviKvsScript::PreserveParams,
 	    t->runTimeData());
 
diff --git a/src/kvirc/kvs/KviKvsUserAction.cpp b/src/kvirc/kvs/KviKvsUserAction.cpp
index 738f9d34d..be3007c0e 100644
--- a/src/kvirc/kvs/KviKvsUserAction.cpp
+++ b/src/kvirc/kvs/KviKvsUserAction.cpp
@@ -47,7 +47,7 @@ KviKvsUserAction::KviKvsUserAction(QObject * pParent,
           szScriptCode,
           szVisibleNameCode,
           szDescriptionCode,
-          NULL,
+          nullptr,
           szBigIconId,
           szSmallIconId,
           uFlags,
@@ -69,11 +69,11 @@ KviKvsUserAction::KviKvsUserAction(QObject * pParent,
 }
 
 KviKvsUserAction::KviKvsUserAction(QObject * pParent)
-    : KviKvsAction(pParent, QString(), QString(), QString(), QString(), NULL, QString(), QString())
+    : KviKvsAction(pParent, QString(), QString(), QString(), QString(), nullptr, QString(), QString())
 {
 	// needs loading!
-	m_pDescriptionScript = 0;
-	m_pVisibleNameScript = 0;
+	m_pDescriptionScript = nullptr;
+	m_pVisibleNameScript = nullptr;
 }
 
 KviKvsUserAction::~KviKvsUserAction()
@@ -285,7 +285,7 @@ const QString & KviKvsUserAction::visibleName()
 {
 	if(!m_pVisibleNameScript)
 		return m_szVisibleName;
-	if(!m_pVisibleNameScript->run(g_pActiveWindow, 0, m_szVisibleName))
+	if(!m_pVisibleNameScript->run(g_pActiveWindow, nullptr, m_szVisibleName))
 		m_szVisibleName = m_pVisibleNameScript->code();
 	return m_szVisibleName;
 }
@@ -294,7 +294,7 @@ const QString & KviKvsUserAction::description()
 {
 	if(!m_pDescriptionScript)
 		return m_szDescription;
-	if(!m_pDescriptionScript->run(g_pActiveWindow, 0, m_szDescription))
+	if(!m_pDescriptionScript->run(g_pActiveWindow, nullptr, m_szDescription))
 		m_szDescription = m_pDescriptionScript->code();
 	return m_szDescription;
 }
diff --git a/src/kvirc/kvs/KviKvsVariant.cpp b/src/kvirc/kvs/KviKvsVariant.cpp
index fe97b986a..e29c18203 100644
--- a/src/kvirc/kvs/KviKvsVariant.cpp
+++ b/src/kvirc/kvs/KviKvsVariant.cpp
@@ -88,14 +88,14 @@ int KviKvsVariantComparison::compareIntArray(const KviKvsVariant * pV1, const Kv
 int KviKvsVariantComparison::compareIntHObject(const KviKvsVariant * pV1, const KviKvsVariant * pV2)
 {
 	if(pV1->m_pData->m_u.iInt == 0.0)
-		return (pV2->m_pData->m_u.hObject == (kvs_hobject_t)0) ? KviKvsVariantComparison::Equal : KviKvsVariantComparison::FirstGreater;
+		return (pV2->m_pData->m_u.hObject == (kvs_hobject_t) nullptr) ? KviKvsVariantComparison::Equal : KviKvsVariantComparison::FirstGreater;
 	return KviKvsVariantComparison::SecondGreater;
 }
 
 int KviKvsVariantComparison::compareRealHObject(const KviKvsVariant * pV1, const KviKvsVariant * pV2)
 {
 	if(*(pV1->m_pData->m_u.pReal) == 0.0)
-		return (pV2->m_pData->m_u.hObject == (kvs_hobject_t)0) ? KviKvsVariantComparison::Equal : KviKvsVariantComparison::FirstGreater;
+		return (pV2->m_pData->m_u.hObject == (kvs_hobject_t) nullptr) ? KviKvsVariantComparison::Equal : KviKvsVariantComparison::FirstGreater;
 	return KviKvsVariantComparison::SecondGreater;
 }
 
@@ -167,7 +167,7 @@ int KviKvsVariantComparison::compareStringHObject(const KviKvsVariant * pV1, con
 {
 	kvs_real_t dReal;
 
-	if(pV2->m_pData->m_u.hObject == (kvs_hobject_t)0)
+	if(pV2->m_pData->m_u.hObject == (kvs_hobject_t) nullptr)
 	{
 		if(pV1->m_pData->m_u.pString->isEmpty())
 			return KviKvsVariantComparison::Equal;
@@ -209,9 +209,9 @@ int KviKvsVariantComparison::compareBoolArray(const KviKvsVariant * pV1, const K
 int KviKvsVariantComparison::compareBoolHObject(const KviKvsVariant * pV1, const KviKvsVariant * pV2)
 {
 	if(pV1->m_pData->m_u.bBoolean)
-		return pV2->m_pData->m_u.hObject == ((kvs_hobject_t)0) ? KviKvsVariantComparison::FirstGreater : KviKvsVariantComparison::Equal;
+		return pV2->m_pData->m_u.hObject == ((kvs_hobject_t) nullptr) ? KviKvsVariantComparison::FirstGreater : KviKvsVariantComparison::Equal;
 	else
-		return pV2->m_pData->m_u.hObject == ((kvs_hobject_t)0) ? KviKvsVariantComparison::Equal : KviKvsVariantComparison::SecondGreater;
+		return pV2->m_pData->m_u.hObject == ((kvs_hobject_t) nullptr) ? KviKvsVariantComparison::Equal : KviKvsVariantComparison::SecondGreater;
 }
 
 int KviKvsVariantComparison::compareArrayHash(const KviKvsVariant * pV1, const KviKvsVariant * pV2)
@@ -226,20 +226,20 @@ int KviKvsVariantComparison::compareArrayHash(const KviKvsVariant * pV1, const K
 int KviKvsVariantComparison::compareHObjectHash(const KviKvsVariant * pV1, const KviKvsVariant * pV2)
 {
 	if(pV2->m_pData->m_u.pHash->isEmpty())
-		return pV1->m_pData->m_u.hObject == ((kvs_hobject_t)0) ? KviKvsVariantComparison::Equal : KviKvsVariantComparison::SecondGreater;
-	return pV1->m_pData->m_u.hObject == ((kvs_hobject_t)0) ? KviKvsVariantComparison::FirstGreater : KviKvsVariantComparison::Equal;
+		return pV1->m_pData->m_u.hObject == ((kvs_hobject_t) nullptr) ? KviKvsVariantComparison::Equal : KviKvsVariantComparison::SecondGreater;
+	return pV1->m_pData->m_u.hObject == ((kvs_hobject_t) nullptr) ? KviKvsVariantComparison::FirstGreater : KviKvsVariantComparison::Equal;
 }
 
 int KviKvsVariantComparison::compareHObjectArray(const KviKvsVariant * pV1, const KviKvsVariant * pV2)
 {
 	if(pV2->m_pData->m_u.pArray->isEmpty())
-		return pV1->m_pData->m_u.hObject == ((kvs_hobject_t)0) ? KviKvsVariantComparison::Equal : KviKvsVariantComparison::SecondGreater;
-	return pV1->m_pData->m_u.hObject == ((kvs_hobject_t)0) ? KviKvsVariantComparison::FirstGreater : KviKvsVariantComparison::Equal;
+		return pV1->m_pData->m_u.hObject == ((kvs_hobject_t) nullptr) ? KviKvsVariantComparison::Equal : KviKvsVariantComparison::SecondGreater;
+	return pV1->m_pData->m_u.hObject == ((kvs_hobject_t) nullptr) ? KviKvsVariantComparison::FirstGreater : KviKvsVariantComparison::Equal;
 }
 
 KviKvsVariant::KviKvsVariant()
 {
-	m_pData = 0;
+	m_pData = nullptr;
 }
 
 KviKvsVariant::KviKvsVariant(QString * pString, bool bEscape)
@@ -472,7 +472,7 @@ void KviKvsVariant::setNothing()
 			// just detach
 			m_pData->m_uRefs--;
 		}
-		m_pData = 0;
+		m_pData = nullptr;
 	}
 }
 
@@ -492,7 +492,7 @@ bool KviKvsVariant::isEmpty() const
 			return m_pData->m_u.pHash->isEmpty();
 			break;
 		case KviKvsVariantData::HObject:
-			return m_pData->m_u.hObject == 0;
+			return m_pData->m_u.hObject == nullptr;
 			break;
 		default: /* make gcc happy */
 			break;
@@ -553,7 +553,7 @@ bool KviKvsVariant::asHObject(kvs_hobject_t & hObject) const
 	if(!m_pData)
 	{
 		// nothing evaluates to a null object
-		hObject = 0;
+		hObject = nullptr;
 		return true;
 	}
 	switch(m_pData->m_eType)
@@ -565,7 +565,7 @@ bool KviKvsVariant::asHObject(kvs_hobject_t & hObject) const
 		case KviKvsVariantData::Integer:
 			if(m_pData->m_u.iInt == 0)
 			{
-				hObject = 0;
+				hObject = nullptr;
 				return true;
 			}
 			return false;
@@ -573,7 +573,7 @@ bool KviKvsVariant::asHObject(kvs_hobject_t & hObject) const
 		case KviKvsVariantData::String:
 			if(*(m_pData->m_u.pString) == "0")
 			{
-				hObject = 0;
+				hObject = nullptr;
 				return true;
 			}
 			return false;
@@ -581,7 +581,7 @@ bool KviKvsVariant::asHObject(kvs_hobject_t & hObject) const
 		case KviKvsVariantData::Boolean:
 			if(!(m_pData->m_u.bBoolean))
 			{
-				hObject = 0;
+				hObject = nullptr;
 				return true;
 			}
 		default: /* make gcc happy */
@@ -974,14 +974,14 @@ void KviKvsVariant::takeFrom(KviKvsVariant * pVariant)
 {
 	DETACH_CONTENTS
 	m_pData = pVariant->m_pData;
-	pVariant->m_pData = 0;
+	pVariant->m_pData = nullptr;
 }
 
 void KviKvsVariant::takeFrom(KviKvsVariant & variant)
 {
 	DETACH_CONTENTS
 	m_pData = variant.m_pData;
-	variant.m_pData = 0;
+	variant.m_pData = nullptr;
 }
 
 void KviKvsVariant::getTypeName(QString & szBuffer) const
@@ -1027,7 +1027,7 @@ bool KviKvsVariant::isEqualToNothing() const
 	switch(m_pData->m_eType)
 	{
 		case KviKvsVariantData::HObject:
-			return (m_pData->m_u.hObject == (kvs_hobject_t)0);
+			return (m_pData->m_u.hObject == (kvs_hobject_t) nullptr);
 			break;
 		case KviKvsVariantData::Integer:
 			return (m_pData->m_u.iInt == 0);
@@ -1082,7 +1082,7 @@ int KviKvsVariant::compare(const KviKvsVariant * pOther, bool bPreferNumeric) co
 				case KviKvsVariantData::HObject:
 					if(m_pData->m_u.hObject == pOther->m_pData->m_u.hObject)
 						return CMP_EQUAL;
-					if(m_pData->m_u.hObject == ((kvs_hobject_t)0))
+					if(m_pData->m_u.hObject == ((kvs_hobject_t) nullptr))
 						return CMP_OTHERGREATER;
 					return CMP_THISGREATER;
 					break;
@@ -1369,7 +1369,7 @@ void KviKvsVariant::serialize(QString & szResult)
 
 KviKvsVariant * KviKvsVariant::unserialize(const QString & szBuffer)
 {
-	KviKvsVariant * pResult = NULL;
+	KviKvsVariant * pResult = nullptr;
 
 	const QChar * pAux = (const QChar *)szBuffer.constData();
 
@@ -1380,7 +1380,7 @@ KviKvsVariant * KviKvsVariant::unserialize(const QString & szBuffer)
 		//strange extra characters?
 		if(pResult)
 			delete pResult;
-		pResult = NULL;
+		pResult = nullptr;
 	}
 
 	return pResult;
@@ -1388,7 +1388,7 @@ KviKvsVariant * KviKvsVariant::unserialize(const QString & szBuffer)
 
 KviKvsVariant * KviKvsVariant::unserialize(const QChar ** ppAux)
 {
-	KviKvsVariant * pResult = NULL;
+	KviKvsVariant * pResult = nullptr;
 
 	while((*ppAux)->isSpace())
 		(*ppAux)++;
@@ -1435,7 +1435,7 @@ KviKvsVariant * KviKvsVariant::unserialize(const QChar ** ppAux)
 			break;
 		default:
 			//incorrect value
-			return NULL;
+			return nullptr;
 	}
 
 	while((*ppAux)->isSpace())
@@ -1467,7 +1467,7 @@ KviKvsVariant * KviKvsVariant::unserializeBool(const QChar ** ppAux, bool bBool)
 
 	if(bOk)
 		return new KviKvsVariant(bBool);
-	return NULL;
+	return nullptr;
 }
 
 KviKvsVariant * KviKvsVariant::unserializeNull(const QChar ** ppAux)
@@ -1477,7 +1477,7 @@ KviKvsVariant * KviKvsVariant::unserializeNull(const QChar ** ppAux)
 		(*ppAux) += 4;
 		return new KviKvsVariant();
 	}
-	return NULL;
+	return nullptr;
 }
 
 KviKvsVariant * KviKvsVariant::unserializeNumber(const QChar ** ppAux)
@@ -1491,7 +1491,7 @@ KviKvsVariant * KviKvsVariant::unserializeNumber(const QChar ** ppAux)
 	}
 
 	if(!(*ppAux)->isDigit())
-		return NULL;
+		return nullptr;
 
 	while((*ppAux)->isDigit())
 	{
@@ -1650,7 +1650,7 @@ void KviKvsVariant::unserializeString(const QChar ** ppAux, QString & szData)
 							}
 						}
 						(*ppAux)--;
-						szData.append(QChar(szHex.toUInt(0, 16)));
+						szData.append(QChar(szHex.toUInt(nullptr, 16)));
 						break;
 					default:
 						//Fallback; incorrect escape
@@ -1671,7 +1671,7 @@ KviKvsVariant * KviKvsVariant::unserializeHash(const QChar ** ppAux)
 {
 	KviKvsHash * pHash = new KviKvsHash();
 	QString szKey;
-	KviKvsVariant * pElement = 0;
+	KviKvsVariant * pElement = nullptr;
 	//skip leading '{'
 	(*ppAux)++;
 	int i = 0;
@@ -1685,14 +1685,14 @@ KviKvsVariant * KviKvsVariant::unserializeHash(const QChar ** ppAux)
 		{
 			//strange characters
 			delete pHash;
-			return 0;
+			return nullptr;
 		}
 		unserializeString(ppAux, szKey);
 		if(szKey.isEmpty())
 		{
 			//Strange element name
 			delete pHash;
-			return 0;
+			return nullptr;
 		}
 
 		//skip leading space before ':'
@@ -1703,7 +1703,7 @@ KviKvsVariant * KviKvsVariant::unserializeHash(const QChar ** ppAux)
 		{
 			//strange characters
 			delete pHash;
-			return 0;
+			return nullptr;
 		}
 		(*ppAux)++;
 
@@ -1728,7 +1728,7 @@ KviKvsVariant * KviKvsVariant::unserializeHash(const QChar ** ppAux)
 					break;
 				default:
 					delete pHash;
-					return 0;
+					return nullptr;
 					break;
 			}
 		}
@@ -1736,16 +1736,16 @@ KviKvsVariant * KviKvsVariant::unserializeHash(const QChar ** ppAux)
 		{
 			//error
 			delete pHash;
-			return 0;
+			return nullptr;
 		}
 	}
-	return 0;
+	return nullptr;
 }
 
 KviKvsVariant * KviKvsVariant::unserializeArray(const QChar ** ppAux)
 {
 	KviKvsArray * pArray = new KviKvsArray();
-	KviKvsVariant * pElement = 0;
+	KviKvsVariant * pElement = nullptr;
 	(*ppAux)++;
 	int i = 0;
 	while(1)
@@ -1770,7 +1770,7 @@ KviKvsVariant * KviKvsVariant::unserializeArray(const QChar ** ppAux)
 					break;
 				default:
 					delete pArray;
-					return 0;
+					return nullptr;
 					break;
 			}
 		}
@@ -1778,8 +1778,8 @@ KviKvsVariant * KviKvsVariant::unserializeArray(const QChar ** ppAux)
 		{
 			//error
 			delete pArray;
-			return 0;
+			return nullptr;
 		}
 	}
-	return 0;
+	return nullptr;
 }
diff --git a/src/kvirc/kvs/KviKvsVariant.h b/src/kvirc/kvs/KviKvsVariant.h
index fe6ad4956..decfe90f5 100644
--- a/src/kvirc/kvs/KviKvsVariant.h
+++ b/src/kvirc/kvs/KviKvsVariant.h
@@ -66,8 +66,7 @@ protected:
 	* \union DataType
 	* \brief This union holds an integer or a double floating point number
 	*/
-	union DataType
-	{
+	union DataType {
 		kvs_int_t iInt;
 		kvs_real_t dReal;
 	};
@@ -136,8 +135,7 @@ public:
 	* \union DataType
 	* \brief Holds the value of the variant data
 	*/
-	union DataType
-	{
+	union DataType {
 		kvs_int_t iInt;
 		kvs_real_t * pReal;
 		QString * pString;
diff --git a/src/kvirc/kvs/event/KviKvsEvent.cpp b/src/kvirc/kvs/event/KviKvsEvent.cpp
index ba862cad8..9668910b5 100644
--- a/src/kvirc/kvs/event/KviKvsEvent.cpp
+++ b/src/kvirc/kvs/event/KviKvsEvent.cpp
@@ -33,7 +33,7 @@ void KviKvsEvent::clear()
 {
 	if(m_pHandlers)
 		delete m_pHandlers;
-	m_pHandlers = 0;
+	m_pHandlers = nullptr;
 }
 
 void KviKvsEvent::removeHandler(KviKvsEventHandler * h)
@@ -42,7 +42,7 @@ void KviKvsEvent::removeHandler(KviKvsEventHandler * h)
 	if(m_pHandlers->isEmpty())
 	{
 		delete m_pHandlers;
-		m_pHandlers = 0;
+		m_pHandlers = nullptr;
 	}
 }
 
@@ -75,6 +75,6 @@ void KviKvsEvent::clearScriptHandlers()
 	if(m_pHandlers->isEmpty())
 	{
 		delete m_pHandlers;
-		m_pHandlers = 0;
+		m_pHandlers = nullptr;
 	}
 }
diff --git a/src/kvirc/kvs/event/KviKvsEventHandler.cpp b/src/kvirc/kvs/event/KviKvsEventHandler.cpp
index 4ef01c592..d2fd494a5 100644
--- a/src/kvirc/kvs/event/KviKvsEventHandler.cpp
+++ b/src/kvirc/kvs/event/KviKvsEventHandler.cpp
@@ -30,8 +30,7 @@ KviKvsEventHandler::KviKvsEventHandler(Type t)
 }
 
 KviKvsEventHandler::~KviKvsEventHandler()
-{
-}
+    = default;
 
 KviKvsScriptEventHandler::KviKvsScriptEventHandler(const QString & szHandlerName, const QString & szContextName, const QString & szCode, bool bEnabled)
     : KviKvsEventHandler(KviKvsEventHandler::Script), m_szName(szHandlerName), m_bEnabled(bEnabled)
diff --git a/src/kvirc/kvs/event/KviKvsEventManager.cpp b/src/kvirc/kvs/event/KviKvsEventManager.cpp
index 1b413d5be..7f72aa96c 100644
--- a/src/kvirc/kvs/event/KviKvsEventManager.cpp
+++ b/src/kvirc/kvs/event/KviKvsEventManager.cpp
@@ -86,13 +86,13 @@
 		You may take a look at the list of available [doc:event_index_all]events[/doc].[br]
 */
 
-KviKvsEventManager * KviKvsEventManager::m_pInstance = 0;
+KviKvsEventManager * KviKvsEventManager::m_pInstance = nullptr;
 
 KviKvsEventManager::KviKvsEventManager()
 {
 	m_pInstance = this;
-	for(int i = 0; i < KVI_KVS_NUM_RAW_EVENTS; i++)
-		m_rawEventTable[i] = 0;
+	for(auto & i : m_rawEventTable)
+		i = nullptr;
 }
 
 KviKvsEventManager::~KviKvsEventManager()
@@ -143,7 +143,7 @@ KviKvsEvent * KviKvsEventManager::findAppEventByName(const QString & szName)
 		if((u == 4) && KviQString::equalCI(szName, "OnIrcConnectionEstablished"))
 			return &(m_appEventTable[u]);
 	}
-	return 0;
+	return nullptr;
 }
 
 bool KviKvsEventManager::addAppHandler(unsigned int uEvIdx, KviKvsEventHandler * h)
@@ -191,9 +191,9 @@ bool KviKvsEventManager::removeScriptAppHandler(unsigned int uEvIdx, const QStri
 KviKvsScriptEventHandler * KviKvsEventManager::findScriptRawHandler(unsigned int uEvIdx, const QString & szName)
 {
 	if(uEvIdx >= KVI_KVS_NUM_RAW_EVENTS)
-		return 0;
+		return nullptr;
 	if(!m_rawEventTable[uEvIdx])
-		return 0;
+		return nullptr;
 	KviKvsEventHandler * h;
 	for(h = m_rawEventTable[uEvIdx]->first(); h; h = m_rawEventTable[uEvIdx]->next())
 	{
@@ -205,16 +205,16 @@ KviKvsScriptEventHandler * KviKvsEventManager::findScriptRawHandler(unsigned int
 			}
 		}
 	}
-	return 0;
+	return nullptr;
 }
 
 KviKvsScriptEventHandler * KviKvsEventManager::findScriptAppHandler(unsigned int uEvIdx, const QString & szName)
 {
 	if(uEvIdx >= KVI_KVS_NUM_APP_EVENTS)
-		return 0;
+		return nullptr;
 	KviKvsEventHandler * h;
 	if(!(m_appEventTable[uEvIdx].handlers()))
-		return 0;
+		return nullptr;
 	for(h = m_appEventTable[uEvIdx].handlers()->first(); h; h = m_appEventTable[uEvIdx].handlers()->next())
 	{
 		if(h->type() == KviKvsEventHandler::Script)
@@ -225,7 +225,7 @@ KviKvsScriptEventHandler * KviKvsEventManager::findScriptAppHandler(unsigned int
 			}
 		}
 	}
-	return 0;
+	return nullptr;
 }
 
 bool KviKvsEventManager::enableScriptAppHandler(unsigned int uEvIdx, const QString & szName, bool bEnable)
@@ -273,14 +273,14 @@ bool KviKvsEventManager::removeModuleAppHandler(unsigned int uEvIdx, KviKvsModul
 void KviKvsEventManager::removeAllModuleAppHandlers(KviKvsModuleInterface * pIface)
 {
 	KviKvsEventHandler * h;
-	for(unsigned int i = 0; i < KVI_KVS_NUM_APP_EVENTS; i++)
+	for(auto & i : m_appEventTable)
 	{
-		if(!m_appEventTable[i].handlers())
+		if(!i.handlers())
 			continue;
 
 		KviPointerList<KviKvsEventHandler> l;
 		l.setAutoDelete(false);
-		for(h = m_appEventTable[i].handlers()->first(); h; h = m_appEventTable[i].handlers()->next())
+		for(h = i.handlers()->first(); h; h = i.handlers()->next())
 		{
 			if(h->type() == KviKvsEventHandler::Module)
 			{
@@ -302,21 +302,21 @@ void KviKvsEventManager::removeAllModuleAppHandlers(KviKvsModuleInterface * pIfa
 			// END COMPAT
 		}
 		for(h = l.first(); h; h = l.next())
-			m_appEventTable[i].removeHandler(h);
+			i.removeHandler(h);
 	}
 }
 
 void KviKvsEventManager::removeAllModuleRawHandlers(KviKvsModuleInterface * pIface)
 {
 	KviKvsEventHandler * h;
-	for(unsigned int i = 0; i < KVI_KVS_NUM_RAW_EVENTS; i++)
+	for(auto & i : m_rawEventTable)
 	{
-		if(!m_rawEventTable[i])
+		if(!i)
 			continue;
 
 		KviPointerList<KviKvsEventHandler> l;
 		l.setAutoDelete(false);
-		for(h = m_rawEventTable[i]->first(); h; h = m_rawEventTable[i]->next())
+		for(h = i->first(); h; h = i->next())
 		{
 			if(h->type() == KviKvsEventHandler::Module)
 			{
@@ -338,11 +338,11 @@ void KviKvsEventManager::removeAllModuleRawHandlers(KviKvsModuleInterface * pIfa
 			// END COMPAT
 		}
 		for(h = l.first(); h; h = l.next())
-			m_rawEventTable[i]->removeRef(h);
-		if(m_rawEventTable[i]->isEmpty())
+			i->removeRef(h);
+		if(i->isEmpty())
 		{
-			delete m_rawEventTable[i];
-			m_rawEventTable[i] = 0;
+			delete i;
+			i = nullptr;
 		}
 	}
 }
@@ -364,7 +364,7 @@ bool KviKvsEventManager::removeScriptRawHandler(unsigned int uEvIdx, const QStri
 				if(m_rawEventTable[uEvIdx]->isEmpty())
 				{
 					delete m_rawEventTable[uEvIdx];
-					m_rawEventTable[uEvIdx] = 0;
+					m_rawEventTable[uEvIdx] = nullptr;
 				}
 				return true;
 			}
@@ -399,7 +399,7 @@ bool KviKvsEventManager::removeModuleRawHandler(unsigned int uRawIdx, KviKvsModu
 				if(m_rawEventTable[uRawIdx]->isEmpty())
 				{
 					delete m_rawEventTable[uRawIdx];
-					m_rawEventTable[uRawIdx] = 0;
+					m_rawEventTable[uRawIdx] = nullptr;
 				}
 				return true;
 			}
@@ -433,22 +433,22 @@ void KviKvsEventManager::removeAllModuleHandlers(KviKvsModuleInterface * pIface)
 
 void KviKvsEventManager::removeAllScriptAppHandlers()
 {
-	for(size_t i = 0; i < KVI_KVS_NUM_APP_EVENTS; i++)
+	for(auto & i : m_appEventTable)
 	{
-		m_appEventTable[i].clearScriptHandlers();
+		i.clearScriptHandlers();
 	}
 }
 
 void KviKvsEventManager::removeAllScriptRawHandlers()
 {
-	for(size_t i = 0; i < KVI_KVS_NUM_RAW_EVENTS; i++)
+	for(auto & i : m_rawEventTable)
 	{
-		if(m_rawEventTable[i])
+		if(i)
 		{
 			KviPointerList<KviKvsEventHandler> dl;
 			dl.setAutoDelete(false);
 			KviKvsEventHandler * e;
-			for(e = m_rawEventTable[i]->first(); e; e = m_rawEventTable[i]->next())
+			for(e = i->first(); e; e = i->next())
 			{
 				if(e->type() == KviKvsEventHandler::Script)
 					dl.append(e);
@@ -456,13 +456,13 @@ void KviKvsEventManager::removeAllScriptRawHandlers()
 
 			for(e = dl.first(); e; e = dl.next())
 			{
-				m_rawEventTable[i]->removeRef(e);
+				i->removeRef(e);
 			}
 
-			if(m_rawEventTable[i]->isEmpty())
+			if(i->isEmpty())
 			{
-				delete m_rawEventTable[i];
-				m_rawEventTable[i] = 0;
+				delete i;
+				i = nullptr;
 			}
 		}
 	}
@@ -470,19 +470,19 @@ void KviKvsEventManager::removeAllScriptRawHandlers()
 
 void KviKvsEventManager::clearRawEvents()
 {
-	for(size_t i = 0; i < KVI_KVS_NUM_RAW_EVENTS; i++)
+	for(auto & i : m_rawEventTable)
 	{
-		if(m_rawEventTable[i])
-			delete m_rawEventTable[i];
-		m_rawEventTable[i] = 0;
+		if(i)
+			delete i;
+		i = nullptr;
 	}
 }
 
 void KviKvsEventManager::clearAppEvents()
 {
-	for(size_t i = 0; i < KVI_KVS_NUM_APP_EVENTS; i++)
+	for(auto & i : m_appEventTable)
 	{
-		m_appEventTable[i].clear();
+		i.clear();
 	}
 }
 
@@ -530,7 +530,7 @@ bool KviKvsEventManager::triggerHandlers(KviPointerList<KviKvsEventHandler> * pH
 				KviModule * m = (KviModule *)((KviKvsModuleEventHandler *)h)->moduleInterface();
 				KviKvsModuleEventHandlerRoutine * proc = ((KviKvsModuleEventHandler *)h)->handlerRoutine();
 				KviKvsVariant retVal;
-				KviKvsRunTimeContext ctx(0, pWnd, pParams, &retVal);
+				KviKvsRunTimeContext ctx(nullptr, pWnd, pParams, &retVal);
 				KviKvsModuleEventCall call(m, &ctx, pParams);
 				if(!(*proc)(&call))
 					bGotHalt = true;
diff --git a/src/kvirc/kvs/object/KviKvsObject.cpp b/src/kvirc/kvs/object/KviKvsObject.cpp
index 9b9d5b030..aadd38da0 100644
--- a/src/kvirc/kvs/object/KviKvsObject.cpp
+++ b/src/kvirc/kvs/object/KviKvsObject.cpp
@@ -627,19 +627,19 @@
 
 // we use a char * pointer just to store a number
 // we don't use void * just because incrementing a void pointer doesn't look that good
-static char * g_hNextObjectHandle = (char *)0;
+static char * g_hNextObjectHandle = (char *)nullptr;
 
 KviKvsObject::KviKvsObject(KviKvsObjectClass * pClass, KviKvsObject * pParent, const QString & szName)
     : QObject(pParent)
 {
 	setObjectName(szName);
 
-	if(g_hNextObjectHandle == 0)
+	if(g_hNextObjectHandle == nullptr)
 		g_hNextObjectHandle++; // make sure it's never 0
 	m_hObject = (kvs_hobject_t)g_hNextObjectHandle;
 	g_hNextObjectHandle++;
 
-	m_pObject = 0;
+	m_pObject = nullptr;
 	m_bObjectOwner = true; // true by default
 
 	m_szName = szName;
@@ -651,14 +651,14 @@ KviKvsObject::KviKvsObject(KviKvsObjectClass * pClass, KviKvsObject * pParent, c
 
 	m_pDataContainer = new KviKvsHash();
 
-	m_pFunctionHandlers = 0; // no local function handlers yet!
+	m_pFunctionHandlers = nullptr; // no local function handlers yet!
 
 	m_bInDelayedDeath = false;
 	m_bDestructorCalled = false;
 	m_bAboutToDie = false;
 
-	m_pSignalDict = 0;     // no signals connected to remote slots
-	m_pConnectionList = 0; // no local slots connected to remote signals
+	m_pSignalDict = nullptr;     // no signals connected to remote slots
+	m_pConnectionList = nullptr; // no local slots connected to remote signals
 
 	if(pParent)
 		pParent->registerChild(this);
@@ -800,7 +800,7 @@ QWidget * KviKvsObject::parentScriptWidget()
 				return (QWidget *)(parentObject()->object());
 		}
 	}
-	return 0;
+	return nullptr;
 }
 
 void KviKvsObject::unregisterChild(KviKvsObject * pChild)
@@ -880,7 +880,7 @@ bool KviKvsObject::disconnectSignal(const QString & sigName, KviKvsObject * pTar
 				if(m_pSignalDict->isEmpty())
 				{
 					delete m_pSignalDict;
-					m_pSignalDict = 0;
+					m_pSignalDict = nullptr;
 				}
 				return true;
 			}
@@ -906,7 +906,7 @@ bool KviKvsObject::disconnectSignal(const QString & sigName, KviKvsObjectConnect
 	if(m_pSignalDict->isEmpty())
 	{
 		delete m_pSignalDict;
-		m_pSignalDict = 0;
+		m_pSignalDict = nullptr;
 	}
 	return true;
 }
@@ -921,7 +921,7 @@ bool KviKvsObject::unregisterConnection(KviKvsObjectConnection * pConnection)
 	if(m_pConnectionList->isEmpty())
 	{
 		delete m_pConnectionList;
-		m_pConnectionList = 0;
+		m_pConnectionList = nullptr;
 	}
 	return true;
 }
@@ -938,7 +938,7 @@ int KviKvsObject::emitSignal(const QString & sigName, KviKvsObjectFunctionCall *
 	KviKvsVariant retVal;
 
 	// The objects we're going to disconnect
-	KviPointerList<KviKvsObjectConnection> * pDis = 0;
+	KviPointerList<KviKvsObjectConnection> * pDis = nullptr;
 
 	kvs_int_t emitted = 0;
 
@@ -1017,7 +1017,7 @@ bool KviKvsObject::function_name(KviKvsObjectFunctionCall * c)
 bool KviKvsObject::function_parent(KviKvsObjectFunctionCall * c)
 {
 	KviKvsObject * o = parentObject();
-	c->returnValue()->setHObject(o ? o->handle() : (kvs_hobject_t)0);
+	c->returnValue()->setHObject(o ? o->handle() : (kvs_hobject_t) nullptr);
 	return true;
 }
 
@@ -1073,7 +1073,7 @@ bool KviKvsObject::function_findChild(KviKvsObjectFunctionCall * c)
 	KVSO_PARAMETERS_END(c)
 
 	KviKvsObject * o = findChild(szClass, szName);
-	c->returnValue()->setHObject(o ? o->handle() : (kvs_hobject_t)0);
+	c->returnValue()->setHObject(o ? o->handle() : (kvs_hobject_t) nullptr);
 
 	return true;
 }
@@ -1121,7 +1121,7 @@ bool KviKvsObject::function_listProperties(KviKvsObjectFunctionCall * c)
 
 	c->returnValue()->setNothing();
 
-	KviKvsArray * a = bArray ? new KviKvsArray() : 0;
+	KviKvsArray * a = bArray ? new KviKvsArray() : nullptr;
 
 	KviWindow * w = c->context()->window();
 
@@ -1170,7 +1170,7 @@ bool KviKvsObject::function_listProperties(KviKvsObjectFunctionCall * c)
 				p = &prop;
 			}
 			else
-				p = 0;
+				p = nullptr;
 			cnt++;
 		}
 	}
@@ -1391,7 +1391,7 @@ bool KviKvsObject::function_setProperty(KviKvsObjectFunctionCall * c)
 		{
 			if(v->isHObject())
 			{
-				if(v->hobject() == (kvs_hobject_t)0)
+				if(v->hobject() == (kvs_hobject_t) nullptr)
 				{
 					// null pixmap
 					if(vv.type() == QVariant::Pixmap)
@@ -1659,7 +1659,7 @@ KviKvsObjectClass * KviKvsObject::getClass(const QString & classOverride)
 
 KviKvsObjectFunctionHandler * KviKvsObject::lookupFunctionHandler(const QString & funcName, const QString & classOverride)
 {
-	KviKvsObjectFunctionHandler * h = 0;
+	KviKvsObjectFunctionHandler * h = nullptr;
 
 	if(classOverride.isEmpty() && m_pFunctionHandlers)
 	{
@@ -1729,7 +1729,7 @@ void KviKvsObject::setObject(QObject * o, bool bIsOwned)
 
 void KviKvsObject::objectDestroyed()
 {
-	m_pObject = 0;
+	m_pObject = nullptr;
 	die();
 }
 
@@ -1752,7 +1752,7 @@ bool KviKvsObject::callFunction(KviKvsObject * pCaller, const QString & fncName,
 	KviKvsVariant rv;
 	if(!pRetVal)
 		pRetVal = &rv;
-	KviKvsRunTimeContext ctx(0, g_pApp->activeConsole(), KviKvsKernel::instance()->emptyParameterList(), pRetVal, 0);
+	KviKvsRunTimeContext ctx(nullptr, g_pApp->activeConsole(), KviKvsKernel::instance()->emptyParameterList(), pRetVal, nullptr);
 	if(!pParams)
 		pParams = KviKvsKernel::instance()->emptyParameterList();
 	return callFunction(pCaller, fncName, QString(), &ctx, pRetVal, pParams);
@@ -1815,7 +1815,7 @@ void KviKvsObject::registerPrivateImplementation(const QString & szFunctionName,
 			if(m_pFunctionHandlers->isEmpty())
 			{
 				delete m_pFunctionHandlers;
-				m_pFunctionHandlers = 0;
+				m_pFunctionHandlers = nullptr;
 			}
 		}
 	}
@@ -1863,5 +1863,5 @@ KviKvsObject * KviKvsObject::findChild(const QString & szClass, const QString &
 		if(c)
 			return c;
 	}
-	return 0;
+	return nullptr;
 }
diff --git a/src/kvirc/kvs/object/KviKvsObjectClass.cpp b/src/kvirc/kvs/object/KviKvsObjectClass.cpp
index 39d876944..bcf00adb0 100644
--- a/src/kvirc/kvs/object/KviKvsObjectClass.cpp
+++ b/src/kvirc/kvs/object/KviKvsObjectClass.cpp
@@ -129,17 +129,17 @@ void KviKvsObjectClass::registerStandardFalseReturnFunctionHandler(const QString
 KviKvsObject * KviKvsObjectClass::allocateInstance(KviKvsObject * pParent, const QString & szName, KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams)
 {
 	if(!m_allocProc)
-		return 0;
+		return nullptr;
 
 	KviKvsObject * pObject = m_allocProc(this, pParent, szName);
 	if(!pObject)
-		return 0;
+		return nullptr;
 
 	if(!pObject->init(pContext, pParams))
 	{
 		// internal init failure : abort
 		pObject->dieNow();
-		return 0;
+		return nullptr;
 	}
 
 	// copy params
@@ -159,7 +159,7 @@ KviKvsObject * KviKvsObjectClass::allocateInstance(KviKvsObject * pParent, const
 	{
 		// oops... constructor failed (script error!)
 		pObject->dieNow();
-		return 0;
+		return nullptr;
 	}
 
 	if(!ret.isEmpty())
diff --git a/src/kvirc/kvs/object/KviKvsObjectController.cpp b/src/kvirc/kvs/object/KviKvsObjectController.cpp
index b9c9a5983..48446d570 100644
--- a/src/kvirc/kvs/object/KviKvsObjectController.cpp
+++ b/src/kvirc/kvs/object/KviKvsObjectController.cpp
@@ -55,7 +55,7 @@ KviKvsObjectController::~KviKvsObjectController()
 		m_pTopLevelObjectList->first()->dieNow();
 	delete m_pTopLevelObjectList; // empty list
 	delete m_pObjectDict;         // empty dict
-	m_pObjectDict = 0;
+	m_pObjectDict = nullptr;
 	delete m_pObjectClass; // delete the class tree
 	delete m_pClassDict;   // empty dict
 }
@@ -64,7 +64,7 @@ void KviKvsObjectController::init()
 {
 	// allocate the "object" builtin class
 	// this is the only one that is always in core memory
-	m_pObjectClass = new KviKvsObjectClass(0, "object", objectClassCreateInstance, true);
+	m_pObjectClass = new KviKvsObjectClass(nullptr, "object", objectClassCreateInstance, true);
 
 	m_pObjectClass->registerFunctionHandler("name", KVI_PTR2MEMBER(KviKvsObject::function_name));
 	m_pObjectClass->registerFunctionHandler("startTimer", KVI_PTR2MEMBER(KviKvsObject::function_startTimer));
@@ -172,14 +172,14 @@ void KviKvsObjectController::unregisterClass(KviKvsObjectClass * pClass)
 void KviKvsObjectController::registerObject(KviKvsObject * pObject)
 {
 	m_pObjectDict->insert(pObject->handle(), pObject);
-	if(pObject->parent() == 0)
+	if(pObject->parent() == nullptr)
 		m_pTopLevelObjectList->append(pObject);
 }
 
 void KviKvsObjectController::unregisterObject(KviKvsObject * pObject)
 {
 	m_pObjectDict->remove(pObject->handle());
-	if(pObject->parent() == 0)
+	if(pObject->parent() == nullptr)
 		m_pTopLevelObjectList->removeRef(pObject);
 }
 
@@ -217,14 +217,14 @@ KviKvsObjectClass * KviKvsObjectController::lookupClass(const QString & szClass,
 		if(!pModule)
 		{
 			qDebug("Oops! something wrong with the libkviobjects module!");
-			return 0;
+			return nullptr;
 		}
 		else
 			pC = m_pClassDict->find(szClass);
 		if(!pC)
 		{
 			if(bBuiltinOnly)
-				return 0;
+				return nullptr;
 			// maybe we need to load it from permanent storage...
 			QString szPath;
 			QString szFileName = szClass.toLower();
@@ -234,9 +234,9 @@ KviKvsObjectClass * KviKvsObjectController::lookupClass(const QString & szClass,
 			if(!KviFileUtils::fileExists(szPath))
 				g_pApp->getGlobalKvircDirectory(szPath, KviApplication::Classes, szFileName);
 			if(!KviFileUtils::fileExists(szPath))
-				return 0;
+				return nullptr;
 			if(!KviKvsObjectClass::load(szPath))
-				return 0;
+				return nullptr;
 			pC = m_pClassDict->find(szClass);
 			if(pC)
 				pC->clearDirtyFlag(); // just loaded from disk: no need to sync it
@@ -247,7 +247,7 @@ KviKvsObjectClass * KviKvsObjectController::lookupClass(const QString & szClass,
 		if(bBuiltinOnly)
 		{
 			if(!pC->isBuiltin())
-				return 0;
+				return nullptr;
 		}
 	}
 	return pC;
diff --git a/src/kvirc/kvs/object/KviKvsObjectFunctionHandler.cpp b/src/kvirc/kvs/object/KviKvsObjectFunctionHandler.cpp
index 14639916f..3b99d5d9f 100644
--- a/src/kvirc/kvs/object/KviKvsObjectFunctionHandler.cpp
+++ b/src/kvirc/kvs/object/KviKvsObjectFunctionHandler.cpp
@@ -31,8 +31,7 @@ KviKvsObjectFunctionHandler::KviKvsObjectFunctionHandler(unsigned int uFlags)
 }
 
 KviKvsObjectFunctionHandler::~KviKvsObjectFunctionHandler()
-{
-}
+    = default;
 
 bool KviKvsObjectFunctionHandler::isScriptHandler()
 {
diff --git a/src/kvirc/kvs/object/KviKvsObjectFunctionHandlerImpl.cpp b/src/kvirc/kvs/object/KviKvsObjectFunctionHandlerImpl.cpp
index 7007cd275..efafcc616 100644
--- a/src/kvirc/kvs/object/KviKvsObjectFunctionHandlerImpl.cpp
+++ b/src/kvirc/kvs/object/KviKvsObjectFunctionHandlerImpl.cpp
@@ -78,8 +78,7 @@ KviKvsObjectCoreCallFunctionHandler::KviKvsObjectCoreCallFunctionHandler(const K
 }
 
 KviKvsObjectCoreCallFunctionHandler::~KviKvsObjectCoreCallFunctionHandler()
-{
-}
+    = default;
 
 KviKvsObjectFunctionHandler * KviKvsObjectCoreCallFunctionHandler::clone()
 {
diff --git a/src/kvirc/kvs/parser/KviKvsParser.cpp b/src/kvirc/kvs/parser/KviKvsParser.cpp
index b7f6e68e9..39bd50b4e 100644
--- a/src/kvirc/kvs/parser/KviKvsParser.cpp
+++ b/src/kvirc/kvs/parser/KviKvsParser.cpp
@@ -38,7 +38,7 @@ KviKvsParser::KviKvsParser(KviKvsScript * pScript, KviWindow * pOutputWindow)
 	// no need to initialize m_pBuffer
 	// no need to initialize m_ptr
 	// no need to initialize m_bError
-	m_pGlobals = 0;
+	m_pGlobals = nullptr;
 	m_pScript = pScript;
 	m_pWindow = pOutputWindow;
 }
@@ -81,7 +81,7 @@ void KviKvsParser::report(bool bError, const QChar * pLocation, const QString &
 	QString szMsg;
 	KviQString::vsprintf(szMsg, szMsgFmt, va);
 
-	KviPointerList<QString> * pCodeListing = 0;
+	KviPointerList<QString> * pCodeListing = nullptr;
 	QString szLocation;
 
 	if(pLocation)
@@ -148,8 +148,8 @@ KviKvsTreeNodeInstruction * KviKvsParser::parse(const QChar * pBuffer, int iFlag
 
 	if(!pBuffer)
 	{
-		error(0, __tr2qs_ctx("Empty script", "kvs"));
-		return 0;
+		error(nullptr, __tr2qs_ctx("Empty script", "kvs"));
+		return nullptr;
 	}
 	return parseInstructionList();
 }
@@ -167,13 +167,13 @@ KviKvsTreeNodeInstruction * KviKvsParser::parseAsExpression(const QChar * pBuffe
 
 	if(!pBuffer)
 	{
-		error(0, __tr2qs_ctx("Empty script", "kvs"));
-		return 0;
+		error(nullptr, __tr2qs_ctx("Empty script", "kvs"));
+		return nullptr;
 	}
 
 	KviKvsTreeNodeExpression * expr = parseExpression(0);
 	if(!expr)
-		return 0;
+		return nullptr;
 	return new KviKvsTreeNodeExpressionReturn(pBuffer, expr);
 }
 
@@ -190,13 +190,13 @@ KviKvsTreeNodeInstruction * KviKvsParser::parseAsParameter(const QChar * pBuffer
 
 	if(!pBuffer)
 	{
-		error(0, __tr2qs_ctx("Empty script", "kvs"));
-		return 0;
+		error(nullptr, __tr2qs_ctx("Empty script", "kvs"));
+		return nullptr;
 	}
 
 	KviKvsTreeNodeDataList * l = parseCommandParameterList();
 	if(!l)
-		return 0;
+		return nullptr;
 
 	return new KviKvsTreeNodeParameterReturn(pBuffer, l);
 }
@@ -2266,7 +2266,7 @@ KviKvsTreeNodeInstruction * KviKvsParser::parseInstructionList()
 		if(!skipSpacesAndNewlines())
 		{
 			delete l;
-			return 0;
+			return nullptr;
 		}
 
 		if(KVSP_curCharUnicode != 0)
@@ -2281,7 +2281,7 @@ KviKvsTreeNodeInstruction * KviKvsParser::parseInstructionList()
 				{
 					// ops...
 					delete l;
-					return 0;
+					return nullptr;
 				} // else empty instruction
 			}
 		}
@@ -2301,7 +2301,7 @@ KviKvsTreeNodeInstruction * KviKvsParser::parseInstructionList()
 
 	// never here
 	KVSP_ASSERT(false);
-	return 0;
+	return nullptr;
 }
 
 KviKvsTreeNodeData * KviKvsParser::parseParameterPercentOrDollar()
@@ -2345,13 +2345,13 @@ KviKvsTreeNodeData * KviKvsParser::parsePercentOrDollar(bool bInObjScope)
 	{
 		r = parsePercent(bInObjScope);
 		if(!r)
-			return 0;
+			return nullptr;
 	}
 	else if(KVSP_curCharUnicode == '$')
 	{
 		r = parseDollar(bInObjScope);
 		if(!r)
-			return 0;
+			return nullptr;
 	}
 	else
 	{
@@ -2434,7 +2434,7 @@ KviKvsTreeNodeData * KviKvsParser::parsePercentOrDollar(bool bInObjScope)
 			if(!e)
 			{
 				delete r;
-				return 0;
+				return nullptr;
 			}
 
 			r = new KviKvsTreeNodeArrayElement(pBegin, r, e);
@@ -2462,7 +2462,7 @@ KviKvsTreeNodeData * KviKvsParser::parsePercentOrDollar(bool bInObjScope)
 			{
 				// error
 				delete r;
-				return 0;
+				return nullptr;
 			}
 
 			KVSP_ASSERT(KVSP_curCharUnicode == '}');
@@ -2534,7 +2534,7 @@ handle_scope_operator:
 	{
 		// must be an error
 		delete r;
-		return 0;
+		return nullptr;
 	}
 
 	if(!r2->canEvaluateInObjectScope())
@@ -2571,7 +2571,7 @@ KviKvsTreeNodeVariable * KviKvsParser::parsePercent(bool bInObjScope)
 	if(!((KVSP_curCharIsLetterOrNumber) || (KVSP_curCharUnicode == '_')))
 	{
 		error(KVSP_curCharPointer, __tr2qs_ctx("Syntax error after '%' variable prefix. If you want to use a plain '%' in the code you need to escape it", "kvs"));
-		return 0;
+		return nullptr;
 	}
 
 	const QChar * pIdBegin = KVSP_curCharPointer;
@@ -2589,7 +2589,7 @@ KviKvsTreeNodeVariable * KviKvsParser::parsePercent(bool bInObjScope)
 		if(bInObjScope)
 		{
 			error(KVSP_curCharPointer, __tr2qs_ctx("Objects have no extended scope variables", "kvs"));
-			return 0;
+			return nullptr;
 		}
 		return new KviKvsTreeNodeExtendedScopeVariable(pBegin, szIdentifier);
 	}
@@ -2625,16 +2625,16 @@ KviKvsTreeNodeInstruction * KviKvsParser::parseInstruction()
 		case '#':
 		case '/':
 			(void)parseComment(); // this will return 0 anyway
-			return 0;
+			return nullptr;
 			break;
 		case 0: // empty instruction
-			return 0;
+			return nullptr;
 			break;
 		case '\n':
 		case '\r':
 		case ';': // empty instruction
 			KVSP_skipChar;
-			return 0;
+			return nullptr;
 			break;
 		case '{': // command block
 			return parseInstructionBlock();
@@ -2654,14 +2654,14 @@ KviKvsTreeNodeInstruction * KviKvsParser::parseInstruction()
 			{
 				// what the heck is this ?
 				error(KVSP_curCharPointer, __tr2qs_ctx("Found character '%q' (Unicode %x) where an instruction was expected", "kvs"), KVSP_curCharPointer, KVSP_curCharUnicode);
-				return 0;
+				return nullptr;
 			}
 			break;
 	}
 
 	// never here
 	KVSP_ASSERT(false);
-	return 0;
+	return nullptr;
 }
 
 KviKvsTreeNodeInstruction * KviKvsParser::parseInstructionBlock()
@@ -2679,7 +2679,7 @@ KviKvsTreeNodeInstruction * KviKvsParser::parseInstructionBlock()
 		if(!skipSpacesAndNewlines())
 		{
 			delete b;
-			return 0;
+			return nullptr;
 		}
 
 		switch(KVSP_curCharUnicode)
@@ -2688,7 +2688,7 @@ KviKvsTreeNodeInstruction * KviKvsParser::parseInstructionBlock()
 				delete b;
 				warning(pBegin, __tr2qs_ctx("Unterminated instruction block", "kvs"));
 				error(KVSP_curCharPointer, __tr2qs_ctx("Unexpected end of script in instruction block (missing closing brace)", "kvs"));
-				return 0;
+				return nullptr;
 				break;
 			case '}':
 				KVSP_skipChar;
@@ -2697,7 +2697,7 @@ KviKvsTreeNodeInstruction * KviKvsParser::parseInstructionBlock()
 					if(b->instructionCount() < 1)
 					{
 						delete b;
-						return 0; // just an empty block
+						return nullptr; // just an empty block
 					}
 					// a single instruction
 					KviKvsTreeNodeInstruction * i = b->releaseFirst();
@@ -2717,14 +2717,14 @@ KviKvsTreeNodeInstruction * KviKvsParser::parseInstructionBlock()
 					{
 						// ops...
 						delete b;
-						return 0;
+						return nullptr;
 					} // else empty instruction
 				}
 				break;
 		}
 	}
 	// never reached
-	return 0;
+	return nullptr;
 }
 
 KviKvsTreeNodeSwitchList * KviKvsParser::parseCommandSwitchList()
@@ -2761,7 +2761,7 @@ KviKvsTreeNodeSwitchList * KviKvsParser::parseCommandSwitchList()
 				{
 					// not an error!
 					delete sw;
-					return 0;
+					return nullptr;
 				}
 				return sw;
 			}
@@ -2778,7 +2778,7 @@ KviKvsTreeNodeSwitchList * KviKvsParser::parseCommandSwitchList()
 				{
 					error(KVSP_curCharPointer, __tr2qs_ctx("Unexpected end of script after a switch dash", "kvs"));
 				}
-				return 0;
+				return nullptr;
 			}
 		}
 
@@ -2804,7 +2804,7 @@ KviKvsTreeNodeSwitchList * KviKvsParser::parseCommandSwitchList()
 				{
 					error(pBegin, __tr2qs_ctx("The above problem might be related to the switch dash and the following equal sign", "kvs"));
 					delete sw;
-					return 0;
+					return nullptr;
 				}
 				else
 				{
@@ -2857,7 +2857,7 @@ KviKvsTreeNodeDataList * KviKvsParser::parseCommandParameterList()
 				{
 					// this is an error
 					delete l;
-					return 0;
+					return nullptr;
 				}
 				l->addItem(p);
 				break;
@@ -2866,7 +2866,7 @@ KviKvsTreeNodeDataList * KviKvsParser::parseCommandParameterList()
 
 	// never here
 	KVSP_ASSERT(false);
-	return 0;
+	return nullptr;
 }
 
 KviPointerList<QString> * KviKvsParser::parseCommaSeparatedParameterListNoTree()
@@ -2884,13 +2884,13 @@ KviPointerList<QString> * KviKvsParser::parseCommaSeparatedParameterListNoTree()
 			case 0:
 				error(KVSP_curCharPointer, __tr2qs_ctx("Unexpected end of script in parameter list", "kvs"));
 				delete l;
-				return 0;
+				return nullptr;
 				break;
 			case '\r':
 			case '\n':
 				error(KVSP_curCharPointer, __tr2qs_ctx("Unexpected end of line in parameter list", "kvs"));
 				delete l;
-				return 0;
+				return nullptr;
 				break;
 			/*
 			case ',':
@@ -2910,7 +2910,7 @@ KviPointerList<QString> * KviKvsParser::parseCommaSeparatedParameterListNoTree()
 				{
 					// this is an error
 					delete l;
-					return 0;
+					return nullptr;
 				}
 				delete p;
 				QString * s = new QString(QString(pBegin, KVSP_curCharPointer - pBegin).trimmed());
@@ -2933,7 +2933,7 @@ KviPointerList<QString> * KviKvsParser::parseCommaSeparatedParameterListNoTree()
 
 	// never here
 	KVSP_ASSERT(false);
-	return 0;
+	return nullptr;
 }
 
 KviKvsTreeNodeDataList * KviKvsParser::parseCommaSeparatedParameterList()
@@ -2950,13 +2950,13 @@ KviKvsTreeNodeDataList * KviKvsParser::parseCommaSeparatedParameterList()
 			case 0:
 				error(KVSP_curCharPointer, __tr2qs_ctx("Unexpected end of script in parameter list", "kvs"));
 				delete l;
-				return 0;
+				return nullptr;
 				break;
 			case '\r':
 			case '\n':
 				error(KVSP_curCharPointer, __tr2qs_ctx("Unexpected end of line in parameter list", "kvs"));
 				delete l;
-				return 0;
+				return nullptr;
 				break;
 			/*
 			case ',':
@@ -2974,7 +2974,7 @@ KviKvsTreeNodeDataList * KviKvsParser::parseCommaSeparatedParameterList()
 				{
 					// this is an error
 					delete l;
-					return 0;
+					return nullptr;
 				}
 				l->addItem(p);
 
@@ -2994,7 +2994,7 @@ KviKvsTreeNodeDataList * KviKvsParser::parseCommaSeparatedParameterList()
 
 	// never here
 	KVSP_ASSERT(false);
-	return 0;
+	return nullptr;
 }
 
 #define LITERAL_PARAM_PARSING_FUNCTION_BEGIN(__funcname)    \
@@ -3331,14 +3331,14 @@ end_of_the_array_index:
 					delete l;
 					warning(pBegin, __tr2qs_ctx("Unterminated hash key", "kvs"));
 					error(KVSP_curCharPointer, __tr2qs_ctx("Unexpected end of script in hash key (missing '}' character?)", "kvs"));
-					return 0;
+					return nullptr;
 					break;
 				case '\r':
 				case '\n':
 					delete l;
 					warning(pBegin, __tr2qs_ctx("Unterminated hash key", "kvs"));
 					error(KVSP_curCharPointer, __tr2qs_ctx("Unexpected end of line in hash key (missing '}' character or unescaped newline)", "kvs"));
-					return 0;
+					return nullptr;
 					break;
 				case ' ':
 				case '\t':
@@ -3363,7 +3363,7 @@ end_of_the_array_index:
 					{
 						// this is an error
 						delete l;
-						return 0;
+						return nullptr;
 					}
 					l->append(p);
 				}
@@ -3382,7 +3382,7 @@ end_of_the_array_index:
 					{
 						// error
 						delete l;
-						return 0;
+						return nullptr;
 					}
 					l->append(p);
 				}
@@ -3410,7 +3410,7 @@ end_of_the_array_index:
 			return p;
 		}
 		// never reached
-		return 0;
+		return nullptr;
 	}
 
 	/*
@@ -3453,7 +3453,7 @@ PARENTHESIS_PARAMETER_PARSING_FUNCTION_END()
 					{
 						// this is an error
 						delete l;
-						return 0;
+						return nullptr;
 					}
 					l->append(p);
 				}
@@ -3479,7 +3479,7 @@ PARENTHESIS_PARAMETER_PARSING_FUNCTION_END()
 					{
 						// this is an error
 						delete l;
-						return 0;
+						return nullptr;
 					}
 					l->append(p);
 				}
@@ -3512,7 +3512,7 @@ PARENTHESIS_PARAMETER_PARSING_FUNCTION_END()
 			return p;
 		}
 		// never reached
-		return 0;
+		return nullptr;
 	}
 
 	KviKvsTreeNodeData * KviKvsParser::parseSingleParameterInParenthesis()
@@ -3547,7 +3547,7 @@ PARENTHESIS_PARAMETER_PARSING_FUNCTION_END()
 					{
 						// this is an error
 						delete l;
-						return 0;
+						return nullptr;
 					}
 					l->append(p);
 				}
@@ -3573,7 +3573,7 @@ PARENTHESIS_PARAMETER_PARSING_FUNCTION_END()
 					{
 						// this is an error
 						delete l;
-						return 0;
+						return nullptr;
 					}
 					l->append(p);
 				}
@@ -3605,7 +3605,7 @@ PARENTHESIS_PARAMETER_PARSING_FUNCTION_END()
 			return p;
 		}
 		// never reached
-		return 0;
+		return nullptr;
 	}
 
 	KviKvsTreeNodeData * KviKvsParser::parseStringParameter()
@@ -3627,14 +3627,14 @@ PARENTHESIS_PARAMETER_PARSING_FUNCTION_END()
 					delete l;
 					warning(pBegin, __tr2qs_ctx("Unterminated string constant", "kvs"));
 					error(KVSP_curCharPointer, __tr2qs_ctx("Unexpected end of script in string constant (missing \" character?)", "kvs"));
-					return 0;
+					return nullptr;
 					break;
 				case '\r':
 				case '\n':
 					delete l;
 					warning(pBegin, __tr2qs_ctx("Unterminated string constant", "kvs"));
 					error(KVSP_curCharPointer, __tr2qs_ctx("Unexpected end of line in string constant (missing \" character or unescaped newline)", "kvs"));
-					return 0;
+					return nullptr;
 					break;
 				case '$':
 				case '%':
@@ -3646,7 +3646,7 @@ PARENTHESIS_PARAMETER_PARSING_FUNCTION_END()
 					{
 						// this is an error
 						delete l;
-						return 0;
+						return nullptr;
 					}
 					l->append(p);
 				}
@@ -3692,7 +3692,7 @@ PARENTHESIS_PARAMETER_PARSING_FUNCTION_END()
 			}
 		}
 		// never reached
-		return 0;
+		return nullptr;
 	}
 
 	KviKvsTreeNodeData * KviKvsParser::parseCommandParameter(bool bPreferNumeric)
@@ -3727,7 +3727,7 @@ PARENTHESIS_PARAMETER_PARSING_FUNCTION_END()
 					{
 						// this is an error
 						delete l;
-						return 0;
+						return nullptr;
 					}
 					l->append(p);
 				}
@@ -3740,7 +3740,7 @@ PARENTHESIS_PARAMETER_PARSING_FUNCTION_END()
 					{
 						// this is an error
 						delete l;
-						return 0;
+						return nullptr;
 					}
 					l->append(p);
 				}
@@ -3784,5 +3784,5 @@ PARENTHESIS_PARAMETER_PARSING_FUNCTION_END()
 			return p;
 		}
 		// never reached
-		return 0;
+		return nullptr;
 	}
diff --git a/src/kvirc/kvs/parser/KviKvsParser_command.cpp b/src/kvirc/kvs/parser/KviKvsParser_command.cpp
index 94de8e47b..7722b4466 100644
--- a/src/kvirc/kvs/parser/KviKvsParser_command.cpp
+++ b/src/kvirc/kvs/parser/KviKvsParser_command.cpp
@@ -42,7 +42,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseCommand()
 
 	int iIdentifierLen = KVSP_curCharPointer - pIdentifier;
 
-	const QChar * pSecondPart = 0;
+	const QChar * pSecondPart = nullptr;
 	int iSecondPartLen = 0;
 
 	bool bHasNamespaceSoMustBeAlias = false;
@@ -58,7 +58,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseCommand()
 		{
 			warning(KVSP_curCharPointer - 1, __tr2qs_ctx("Stray dot ('.') character or invalid following module command name", "kvs"));
 			error(KVSP_curCharPointer, __tr2qs_ctx("Syntax error: malformed module command identifier", "kvs"));
-			return 0;
+			return nullptr;
 		}
 
 		KVSP_skipChar;
@@ -86,7 +86,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseCommand()
 				{
 					warning(KVSP_curCharPointer - 1, __tr2qs_ctx("Stray '::' sequence or invalid following alias name", "kvs"));
 					error(KVSP_curCharPointer, __tr2qs_ctx("Syntax error: malformed alias identifier", "kvs"));
-					return 0;
+					return nullptr;
 				}
 
 				KVSP_skipChar;
@@ -97,7 +97,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseCommand()
 			{
 				warning(KVSP_curCharPointer - 1, __tr2qs_ctx("Stray ':' character: did you mean '...<namespace>::<alias_name>' ?", "kvs"));
 				error(KVSP_curCharPointer, __tr2qs_ctx("Syntax error: malformed (alias?) command identifier", "kvs"));
-				return 0;
+				return nullptr;
 			}
 
 			iIdentifierLen = KVSP_curCharPointer - pIdentifier;
@@ -107,7 +107,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseCommand()
 
 	skipSpaces();
 
-	KviKvsTreeNodeSwitchList * sw = 0;
+	KviKvsTreeNodeSwitchList * sw = nullptr;
 	KviKvsTreeNodeData * pRebindData;
 
 	if(KVSP_curCharUnicode == '-')
@@ -117,10 +117,10 @@ KviKvsTreeNodeCommand * KviKvsParser::parseCommand()
 		if(!sw)
 		{
 			if(error())
-				return 0;
+				return nullptr;
 			// else it might be a negative number or something that does not seem
 			// to be a switch anyway
-			pRebindData = 0;
+			pRebindData = nullptr;
 		}
 		else
 		{
@@ -129,10 +129,10 @@ KviKvsTreeNodeCommand * KviKvsParser::parseCommand()
 	}
 	else
 	{
-		pRebindData = 0;
+		pRebindData = nullptr;
 	}
 
-	KviKvsTreeNodeCommand * cmd = 0;
+	KviKvsTreeNodeCommand * cmd = nullptr;
 
 	if(!bHasNamespaceSoMustBeAlias)
 	{
@@ -182,7 +182,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseCommand()
 									delete sw;
 								if(pRebindData)
 									delete pRebindData;
-								return 0;
+								return nullptr;
 							}
 							cmd->setLocation(pIdentifier);
 							if(sw)
@@ -223,7 +223,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseCommand()
 						delete sw;
 					if(pRebindData)
 						delete pRebindData;
-					return 0;
+					return nullptr;
 				}
 				cmd->setLocation(pIdentifier);
 				if(sw)
@@ -249,7 +249,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseCommand()
 					delete sw;
 				if(pRebindData)
 					delete pRebindData;
-				return 0;
+				return nullptr;
 			}
 			if(!skipSpacesAndNewlines())
 			{
@@ -258,7 +258,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseCommand()
 				if(pRebindData)
 					delete pRebindData;
 				delete dl;
-				return 0;
+				return nullptr;
 			}
 
 			const QChar * pClbkBegin = KVSP_curCharPointer;
@@ -272,7 +272,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseCommand()
 						delete sw;
 					if(pRebindData)
 						delete pRebindData;
-					return 0;
+					return nullptr;
 				}
 				// actually we need empty callbacks (for alias() at least)
 				// the single command implementations should take care of checking it
@@ -324,7 +324,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseCommand()
 						delete pRebindData;
 					delete dl;
 					delete clbk;
-					return 0;
+					return nullptr;
 				}
 			}
 
@@ -348,7 +348,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseCommand()
 			delete sw;
 		if(pRebindData)
 			delete pRebindData;
-		return 0; // this MUST be an error
+		return nullptr; // this MUST be an error
 	}
 
 	if(bHasNamespaceSoMustBeAlias)
diff --git a/src/kvirc/kvs/parser/KviKvsParser_comment.cpp b/src/kvirc/kvs/parser/KviKvsParser_comment.cpp
index 0967711da..2d789c976 100644
--- a/src/kvirc/kvs/parser/KviKvsParser_comment.cpp
+++ b/src/kvirc/kvs/parser/KviKvsParser_comment.cpp
@@ -58,7 +58,7 @@ KviKvsTreeNode * KviKvsParser::parseComment()
 							case 0:
 								warning(pBegin, __tr2qs_ctx("Unterminated c-style multi-line comment", "kvs"));
 								error(KVSP_curCharPointer, __tr2qs_ctx("Unexpected end of script in multi-line comment", "kvs"));
-								return 0;
+								return nullptr;
 								break;
 							case '*':
 								while(KVSP_curCharUnicode == '*')
@@ -66,7 +66,7 @@ KviKvsTreeNode * KviKvsParser::parseComment()
 								if(KVSP_curCharUnicode == '/')
 								{
 									KVSP_skipChar;
-									return 0;
+									return nullptr;
 								}
 								break;
 						}
@@ -76,7 +76,7 @@ KviKvsTreeNode * KviKvsParser::parseComment()
 				break;
 				default:
 					error(KVSP_curCharPointer, __tr2qs_ctx("Unexpected character '%q' (Unicode %x) after a slash (is it a typo or a malformed comment begin?)", "kvs"), KVSP_curCharPointer, KVSP_curCharUnicode);
-					return 0;
+					return nullptr;
 					break;
 			}
 			break;
@@ -85,5 +85,5 @@ KviKvsTreeNode * KviKvsParser::parseComment()
 			KVSP_ASSERT(false);
 			break;
 	}
-	return 0;
+	return nullptr;
 }
diff --git a/src/kvirc/kvs/parser/KviKvsParser_dollar.cpp b/src/kvirc/kvs/parser/KviKvsParser_dollar.cpp
index ad4c03121..adee3621e 100644
--- a/src/kvirc/kvs/parser/KviKvsParser_dollar.cpp
+++ b/src/kvirc/kvs/parser/KviKvsParser_dollar.cpp
@@ -45,7 +45,7 @@ KviKvsTreeNodeData * KviKvsParser::parseDollar(bool bInObjScope)
 		else
 			warning(KVSP_curCharPointer, __tr2qs_ctx("Unexpected character %q (Unicode %x) after '$' function call prefix", "kvs"), KVSP_curCharPointer, KVSP_curCharUnicode);
 		error(KVSP_curCharPointer, __tr2qs_ctx("Syntax error after '$' function call prefix. If you want to use a plain '$' in the code you need to escape it", "kvs"));
-		return 0;
+		return nullptr;
 	}
 
 	if(KVSP_curCharUnicode == '(')
@@ -54,7 +54,7 @@ KviKvsTreeNodeData * KviKvsParser::parseDollar(bool bInObjScope)
 		if(bInObjScope)
 		{
 			error(KVSP_curCharPointer, __tr2qs_ctx("Invalid expression evaluation in object scope", "kvs"));
-			return 0;
+			return nullptr;
 		}
 
 		KVSP_skipChar;
@@ -69,17 +69,17 @@ KviKvsTreeNodeData * KviKvsParser::parseDollar(bool bInObjScope)
 		if(bInObjScope)
 		{
 			error(KVSP_curCharPointer, __tr2qs_ctx("Invalid command evaluation in object scope", "kvs"));
-			return 0;
+			return nullptr;
 		}
 
 		KviKvsTreeNodeInstruction * i = parseInstructionBlock();
 		if(!i)
 		{
 			if(error())
-				return 0;
+				return nullptr;
 			// trigger an error anyway: this is abused syntax :D
 			error(KVSP_curCharPointer, __tr2qs_ctx("Empty instruction block for command evaluation", "kvs"));
-			return 0;
+			return nullptr;
 		}
 
 		return new KviKvsTreeNodeCommandEvaluation(pDollarBegin, i);
@@ -91,7 +91,7 @@ KviKvsTreeNodeData * KviKvsParser::parseDollar(bool bInObjScope)
 		if(bInObjScope)
 		{
 			error(KVSP_curCharPointer, __tr2qs_ctx("Parameter identifiers are forbidden in object scope (after the '->' operator)", "kvs"));
-			return 0;
+			return nullptr;
 		}
 
 		KVSP_skipChar;
@@ -107,7 +107,7 @@ KviKvsTreeNodeData * KviKvsParser::parseDollar(bool bInObjScope)
 		if(bInObjScope)
 		{
 			error(KVSP_curCharPointer, __tr2qs_ctx("Parameter identifiers are forbidden in object scope (after the '->' operator)", "kvs"));
-			return 0;
+			return nullptr;
 		}
 
 		pBegin = KVSP_curCharPointer;
@@ -172,7 +172,7 @@ KviKvsTreeNodeData * KviKvsParser::parseDollar(bool bInObjScope)
 		if(bInObjScope)
 		{
 			error(KVSP_curCharPointer, __tr2qs_ctx("Syntax error: invalid $$ ($this) function call in object scope", "kvs"));
-			return 0;
+			return nullptr;
 		}
 		// handle $$
 		KVSP_skipChar;
@@ -201,7 +201,7 @@ KviKvsTreeNodeData * KviKvsParser::parseDollar(bool bInObjScope)
 					{
 						warning(KVSP_curCharPointer - 1, __tr2qs_ctx("Stray '::' sequence or invalid following alias name", "kvs"));
 						error(KVSP_curCharPointer, __tr2qs_ctx("Syntax error: malformed alias function call identifier", "kvs"));
-						return 0;
+						return nullptr;
 					}
 
 					KVSP_skipChar;
@@ -212,7 +212,7 @@ KviKvsTreeNodeData * KviKvsParser::parseDollar(bool bInObjScope)
 				{
 					warning(KVSP_curCharPointer - 1, __tr2qs_ctx("Stray ':' character: did you mean '...<namespace>::<alias_name>' ?", "kvs"));
 					error(KVSP_curCharPointer, __tr2qs_ctx("Syntax error: malformed (alias?) function call identifier", "kvs"));
-					return 0;
+					return nullptr;
 				}
 			}
 		}
@@ -220,7 +220,7 @@ KviKvsTreeNodeData * KviKvsParser::parseDollar(bool bInObjScope)
 
 	QString szIdentifier1(pBegin, KVSP_curCharPointer - pBegin);
 
-	const QChar * pId2 = 0;
+	const QChar * pId2 = nullptr;
 	int iId2Len = 0;
 	bool bModuleFunctionCall = false;
 
@@ -270,7 +270,7 @@ KviKvsTreeNodeData * KviKvsParser::parseDollar(bool bInObjScope)
 					else
 					{
 						KVSP_setCurCharPointer(pOriginalEndOfId1);
-						pId2 = 0;
+						pId2 = nullptr;
 						iId2Len = 0;
 						break;
 					}
@@ -278,7 +278,7 @@ KviKvsTreeNodeData * KviKvsParser::parseDollar(bool bInObjScope)
 				else
 				{
 					KVSP_setCurCharPointer(pOriginalEndOfId1);
-					pId2 = 0;
+					pId2 = nullptr;
 					iId2Len = 0;
 					break;
 				}
@@ -315,7 +315,7 @@ KviKvsTreeNodeData * KviKvsParser::parseDollar(bool bInObjScope)
 			KVSP_backChar;
 			l = parseCommaSeparatedParameterList();
 			if(!l)
-				return 0; // error
+				return nullptr; // error
 		}
 	}
 
@@ -365,5 +365,5 @@ KviKvsTreeNodeData * KviKvsParser::parseDollar(bool bInObjScope)
 
 	// not reached
 	KVSP_ASSERT(false);
-	return 0;
+	return nullptr;
 }
diff --git a/src/kvirc/kvs/parser/KviKvsParser_expression.cpp b/src/kvirc/kvs/parser/KviKvsParser_expression.cpp
index 18617d8ae..a1030a6c8 100644
--- a/src/kvirc/kvs/parser/KviKvsParser_expression.cpp
+++ b/src/kvirc/kvs/parser/KviKvsParser_expression.cpp
@@ -210,7 +210,7 @@ KviKvsTreeNodeExpressionBinaryOperator * KviKvsParser::parseExpressionBinaryOper
 	}
 
 	error(KVSP_curCharPointer, __tr2qs_ctx("Unknown binary operator '%q'", "kvs"), KVSP_curCharPointer);
-	return 0;
+	return nullptr;
 }
 
 static unsigned char binary_operator_initial_char[256] = {
@@ -293,7 +293,7 @@ KviKvsTreeNodeExpression * KviKvsParser::parseExpressionOperand(char terminator)
 		case '\r':
 		case '\n':
 			error(KVSP_curCharPointer, __tr2qs_ctx("Unexpected end of script in expression", "kvs"));
-			return 0;
+			return nullptr;
 			break;
 		case '(':
 			KVSP_skipChar;
@@ -306,7 +306,7 @@ KviKvsTreeNodeExpression * KviKvsParser::parseExpressionOperand(char terminator)
 			skipSpaces();
 			KviKvsTreeNodeExpression * d = parseExpressionOperand(terminator);
 			if(!d)
-				return 0;
+				return nullptr;
 			return new KviKvsTreeNodeExpressionUnaryOperatorNegate(d->location(), d);
 		}
 		break;
@@ -316,7 +316,7 @@ KviKvsTreeNodeExpression * KviKvsParser::parseExpressionOperand(char terminator)
 			skipSpaces();
 			KviKvsTreeNodeExpression * d = parseExpressionOperand(terminator);
 			if(!d)
-				return 0;
+				return nullptr;
 			return new KviKvsTreeNodeExpressionUnaryOperatorLogicalNot(d->location(), d);
 		}
 		break;
@@ -326,7 +326,7 @@ KviKvsTreeNodeExpression * KviKvsParser::parseExpressionOperand(char terminator)
 			skipSpaces();
 			KviKvsTreeNodeExpression * d = parseExpressionOperand(terminator);
 			if(!d)
-				return 0;
+				return nullptr;
 			return new KviKvsTreeNodeExpressionUnaryOperatorBitwiseNot(d->location(), d);
 		}
 		break;
@@ -338,7 +338,7 @@ KviKvsTreeNodeExpression * KviKvsParser::parseExpressionOperand(char terminator)
 
 	// not reached
 	KVSP_ASSERT(false);
-	return 0;
+	return nullptr;
 }
 
 KviKvsTreeNodeExpression * KviKvsParser::parseExpressionOperandCore(char terminator)
@@ -361,7 +361,7 @@ KviKvsTreeNodeExpression * KviKvsParser::parseExpressionOperandCore(char termina
 			case '\n':
 				error(KVSP_curCharPointer, __tr2qs_ctx("Unexpected end of script in expression", "kvs"));
 				delete pDataList;
-				return 0;
+				return nullptr;
 				break;
 			case ' ':
 			case '\t':
@@ -379,7 +379,7 @@ KviKvsTreeNodeExpression * KviKvsParser::parseExpressionOperandCore(char termina
 				if(!d)
 				{
 					delete pDataList;
-					return 0;
+					return nullptr;
 				}
 				pDataList->append(d);
 			}
@@ -393,7 +393,7 @@ KviKvsTreeNodeExpression * KviKvsParser::parseExpressionOperandCore(char termina
 				if(!d)
 				{
 					delete pDataList;
-					return 0;
+					return nullptr;
 				}
 				pDataList->append(d);
 			}
@@ -449,7 +449,7 @@ KviKvsTreeNodeExpression * KviKvsParser::parseExpressionOperandCore(char termina
 				{
 					error(KVSP_curCharPointer, __tr2qs_ctx("Unexpected character %q (Unicode %h) in expression. If it meant to be a string use the quotes.", "kvs"), KVSP_curCharPointer, KVSP_curCharUnicode);
 					delete pDataList;
-					return 0;
+					return nullptr;
 				}
 				break;
 		}
@@ -464,7 +464,7 @@ postprocess_operand:
 	{
 		delete pDataList;
 		error(KVSP_curCharPointer, __tr2qs_ctx("Unexpected empty expression operand", "kvs"));
-		return 0;
+		return nullptr;
 	}
 
 	if(pDataList->count() > 1)
@@ -500,7 +500,7 @@ KviKvsTreeNodeExpression * KviKvsParser::parseExpression(char terminator)
 
 	KviKvsTreeNodeExpression * left = parseExpressionOperand(terminator);
 	if(!left)
-		return 0;
+		return nullptr;
 	QString sz;
 	left->contextDescription(sz);
 
@@ -518,7 +518,7 @@ KviKvsTreeNodeExpression * KviKvsParser::parseExpression(char terminator)
 	if(!curTopOperator)
 	{
 		delete left;
-		return 0; // error
+		return nullptr; // error
 	}
 	curTopOperator->contextDescription(sz);
 
@@ -542,7 +542,7 @@ KviKvsTreeNodeExpression * KviKvsParser::parseExpression(char terminator)
 		if(!operand)
 		{
 			delete curTopOperator;
-			return 0;
+			return nullptr;
 		}
 		operand->contextDescription(sz);
 
@@ -560,7 +560,7 @@ KviKvsTreeNodeExpression * KviKvsParser::parseExpression(char terminator)
 		{
 			delete curTopOperator;
 			delete operand;
-			return 0;
+			return nullptr;
 		}
 
 		auxOperator->contextDescription(sz);
@@ -579,7 +579,7 @@ KviKvsTreeNodeExpression * KviKvsParser::parseExpression(char terminator)
 			incompleteOperator->setRight(operand); //right tree complete
 			// go up until we find an operator with lower precedence than auxOperator (>=)
 			KviKvsTreeNodeExpression * tempOperator = incompleteOperator->parentWithPrecedenceLowerThan(auxOperator->precedence());
-			if(tempOperator == 0)
+			if(tempOperator == nullptr)
 			{
 				auxOperator->setLeft(curTopOperator);
 				curTopOperator = auxOperator;
@@ -592,12 +592,12 @@ KviKvsTreeNodeExpression * KviKvsParser::parseExpression(char terminator)
 			}
 		}
 		incompleteOperator = auxOperator;
-		KVSP_ASSERT(incompleteOperator->right() == 0);
+		KVSP_ASSERT(incompleteOperator->right() == nullptr);
 	}
 
 	KVSP_ASSERT(false);
 
-	return 0; //newer here
+	return nullptr; //newer here
 
 	/*
 
diff --git a/src/kvirc/kvs/parser/KviKvsParser_lside.cpp b/src/kvirc/kvs/parser/KviKvsParser_lside.cpp
index 96575082d..26258b9e7 100644
--- a/src/kvirc/kvs/parser/KviKvsParser_lside.cpp
+++ b/src/kvirc/kvs/parser/KviKvsParser_lside.cpp
@@ -118,7 +118,7 @@ KviKvsTreeNodeData * KviKvsParser::parseOperationRightSide(bool bPreferNumeric)
 				{
 					// this is an error
 					delete l;
-					return 0;
+					return nullptr;
 				}
 				l->append(p);
 				break;
@@ -149,7 +149,7 @@ end_of_the_param:
 		}
 	}
 	// never reached
-	return 0;
+	return nullptr;
 }
 
 /*
@@ -530,7 +530,7 @@ KviKvsTreeNodeData * KviKvsParser::parseBindingOperationParameter()
 				{
 					// this is an error
 					delete l;
-					return 0;
+					return nullptr;
 				}
 				l->append(p);
 			}
@@ -543,7 +543,7 @@ KviKvsTreeNodeData * KviKvsParser::parseBindingOperationParameter()
 				{
 					// this is an error
 					delete l;
-					return 0;
+					return nullptr;
 				}
 				l->append(p);
 			}
@@ -573,7 +573,7 @@ end_of_function_parameter:
 		return p;
 	}
 	// never reached
-	return 0;
+	return nullptr;
 }
 
 KviKvsTreeNodeOperation * KviKvsParser::parseBindingOperation()
@@ -592,27 +592,27 @@ KviKvsTreeNodeOperation * KviKvsParser::parseBindingOperation()
 	if(KVSP_curCharUnicode != '/')
 	{
 		error(KVSP_curCharPointer, __tr2qs_ctx("Found character '%q' (Unicode %x) where a slash '/' was expected", "kvs"), KVSP_curCharPointer, KVSP_curCharUnicode);
-		return 0;
+		return nullptr;
 	}
 
 	KVSP_skipChar;
 
 	KviKvsTreeNodeData * pFirst = parseBindingOperationParameter();
 	if(!pFirst)
-		return 0;
+		return nullptr;
 
 	if(KVSP_curCharIsEndOfCommand)
 	{
 		error(KVSP_curCharPointer, __tr2qs_ctx("Unexpected end of command in binding operation, at least two slashes are missing", "kvs"));
 		delete pFirst;
-		return 0;
+		return nullptr;
 	}
 
 	if(KVSP_curCharUnicode != '/')
 	{
 		error(KVSP_curCharPointer, __tr2qs_ctx("Found character '%q' (Unicode %x) where a slash '/' was expected", "kvs"), KVSP_curCharPointer, KVSP_curCharUnicode);
 		delete pFirst;
-		return 0;
+		return nullptr;
 	}
 
 	KVSP_skipChar;
@@ -621,21 +621,21 @@ KviKvsTreeNodeOperation * KviKvsParser::parseBindingOperation()
 	if(!pSecond)
 	{
 		delete pFirst;
-		return 0;
+		return nullptr;
 	}
 
 	if(KVSP_curCharIsEndOfCommand)
 	{
 		error(KVSP_curCharPointer, __tr2qs_ctx("Unexpected end of command in binding operation, at least one slash is missing", "kvs"));
 		delete pFirst;
-		return 0;
+		return nullptr;
 	}
 
 	if(KVSP_curCharUnicode != '/')
 	{
 		error(KVSP_curCharPointer, __tr2qs_ctx("Found character '%q' (Unicode %x) where a slash '/' was expected", "kvs"), KVSP_curCharPointer, KVSP_curCharUnicode);
 		delete pFirst;
-		return 0;
+		return nullptr;
 	}
 
 	KVSP_skipChar;
@@ -647,7 +647,7 @@ KviKvsTreeNodeOperation * KviKvsParser::parseBindingOperation()
 		{
 			delete pFirst;
 			delete pSecond;
-			return 0;
+			return nullptr;
 		}
 
 		pThird = new KviKvsTreeNodeConstantData(KVSP_curCharPointer, new KviKvsVariant(QString("")));
@@ -670,7 +670,7 @@ KviKvsTreeNodeOperation * KviKvsParser::parseBindingOperation()
 	}
 
 	error(KVSP_curCharPointer, __tr2qs_ctx("Unknown binding operation '%Q'", "kvs"), &szOp);
-	return 0;
+	return nullptr;
 }
 
 KviKvsTreeNodeOperation * KviKvsParser::parseOperation()
@@ -690,7 +690,7 @@ KviKvsTreeNodeOperation * KviKvsParser::parseOperation()
 				if(KVSP_curCharIsEndOfCommand)
 				{
 					error(KVSP_curCharPointer, __tr2qs_ctx("Missing right side operand for the binding operator '=~'", "kvs"));
-					return 0;
+					return nullptr;
 				}
 				return parseBindingOperation();
 			}
@@ -699,7 +699,7 @@ KviKvsTreeNodeOperation * KviKvsParser::parseOperation()
 				skipSpaces();
 				KviKvsTreeNodeData * d = parseOperationRightSide(true);
 				if(!d)
-					return 0; // error
+					return nullptr; // error
 				return new KviKvsTreeNodeOperationAssignment(pBegin, d);
 			}
 		}
@@ -729,11 +729,11 @@ KviKvsTreeNodeOperation * KviKvsParser::parseOperation()
 					if(KVSP_curCharIsEndOfCommand)
 					{
 						error(KVSP_curCharPointer, __tr2qs_ctx("Missing right operand for operator '+='", "kvs"));
-						return 0;
+						return nullptr;
 					}
 					KviKvsTreeNodeData * d = parseOperationRightSide(true);
 					if(!d)
-						return 0; // error
+						return nullptr; // error
 					return new KviKvsTreeNodeOperationSelfSum(pBegin, d);
 					break;
 			}
@@ -766,11 +766,11 @@ KviKvsTreeNodeOperation * KviKvsParser::parseOperation()
 					if(KVSP_curCharIsEndOfCommand)
 					{
 						error(KVSP_curCharPointer, __tr2qs_ctx("Missing right operand for operator '-='", "kvs"));
-						return 0;
+						return nullptr;
 					}
 					KviKvsTreeNodeData * d = parseOperationRightSide(true);
 					if(!d)
-						return 0; // error
+						return nullptr; // error
 					return new KviKvsTreeNodeOperationSelfSubtraction(pBegin, d);
 					break;
 			}
@@ -788,11 +788,11 @@ KviKvsTreeNodeOperation * KviKvsParser::parseOperation()
 						if(KVSP_curCharIsEndOfCommand)
 						{
 							error(KVSP_curCharPointer, __tr2qs_ctx("Missing right operand for operator '<<='", "kvs"));
-							return 0;
+							return nullptr;
 						}
 						KviKvsTreeNodeData * d = parseOperationRightSide(true);
 						if(!d)
-							return 0; // error
+							return nullptr; // error
 						return new KviKvsTreeNodeOperationSelfShl(pBegin, d);
 					}
 					else
@@ -801,11 +801,11 @@ KviKvsTreeNodeOperation * KviKvsParser::parseOperation()
 						if(KVSP_curCharIsEndOfCommand)
 						{
 							error(KVSP_curCharPointer, __tr2qs_ctx("Missing right operand for operator '<<'", "kvs"));
-							return 0;
+							return nullptr;
 						}
 						KviKvsTreeNodeData * d = parseOperationRightSide();
 						if(!d)
-							return 0; // error
+							return nullptr; // error
 						return new KviKvsTreeNodeOperationStringAppendWithSpace(pBegin, d);
 					}
 					break;
@@ -816,11 +816,11 @@ KviKvsTreeNodeOperation * KviKvsParser::parseOperation()
 					if(KVSP_curCharIsEndOfCommand)
 					{
 						error(KVSP_curCharPointer, __tr2qs_ctx("Missing right operand for operator '<,'", "kvs"));
-						return 0;
+						return nullptr;
 					}
 					KviKvsTreeNodeData * d = parseOperationRightSide();
 					if(!d)
-						return 0; // error
+						return nullptr; // error
 					return new KviKvsTreeNodeOperationStringAppendWithComma(pBegin, d);
 				}
 				break;
@@ -831,11 +831,11 @@ KviKvsTreeNodeOperation * KviKvsParser::parseOperation()
 					if(KVSP_curCharIsEndOfCommand)
 					{
 						error(KVSP_curCharPointer, __tr2qs_ctx("Missing right operand for operator '<+'", "kvs"));
-						return 0;
+						return nullptr;
 					}
 					KviKvsTreeNodeData * d = parseOperationRightSide();
 					if(!d)
-						return 0; // error
+						return nullptr; // error
 					return new KviKvsTreeNodeOperationArrayAppend(pBegin, d);
 				}
 				break;
@@ -854,11 +854,11 @@ KviKvsTreeNodeOperation * KviKvsParser::parseOperation()
 						if(KVSP_curCharIsEndOfCommand)
 						{
 							error(KVSP_curCharPointer, __tr2qs_ctx("Missing right operand for operator '>>='", "kvs"));
-							return 0;
+							return nullptr;
 						}
 						KviKvsTreeNodeData * d = parseOperationRightSide(true);
 						if(!d)
-							return 0; // error
+							return nullptr; // error
 						return new KviKvsTreeNodeOperationSelfShr(pBegin, d);
 					}
 					break;
@@ -874,11 +874,11 @@ KviKvsTreeNodeOperation * KviKvsParser::parseOperation()
 					if(KVSP_curCharIsEndOfCommand)
 					{
 						error(KVSP_curCharPointer, __tr2qs_ctx("Missing right operand for operator '.='", "kvs"));
-						return 0;
+						return nullptr;
 					}
 					KviKvsTreeNodeData * d = parseOperationRightSide();
 					if(!d)
-						return 0; // error
+						return nullptr; // error
 					return new KviKvsTreeNodeOperationStringAppend(pBegin, d);
 					break;
 			}
@@ -912,7 +912,7 @@ KviKvsTreeNodeOperation * KviKvsParser::parseOperation()
 	}
 
 	error(pBegin, __tr2qs_ctx("Unknown operator", "kvs"));
-	return 0;
+	return nullptr;
 }
 
 KviKvsTreeNodeInstruction * KviKvsParser::parseVoidFunctionCallOrOperation()
@@ -926,7 +926,7 @@ KviKvsTreeNodeInstruction * KviKvsParser::parseVoidFunctionCallOrOperation()
 	if(!r)
 	{
 		// must be an error
-		return 0;
+		return nullptr;
 	}
 
 	skipSpaces();
@@ -946,7 +946,7 @@ KviKvsTreeNodeInstruction * KviKvsParser::parseVoidFunctionCallOrOperation()
 				error(KVSP_curCharPointer, __tr2qs_ctx("Unexpected end of script after a variable reference: expected operator", "kvs"));
 			}
 			delete r;
-			return 0;
+			return nullptr;
 		}
 		else
 		{
@@ -971,7 +971,7 @@ KviKvsTreeNodeInstruction * KviKvsParser::parseVoidFunctionCallOrOperation()
 			error(KVSP_curCharPointer, __tr2qs_ctx("Syntax error: confused by earlier errors: bailing out", "kvs"));
 		}
 		delete r;
-		return 0;
+		return nullptr;
 	}
 
 	// ok.. parse the operation
@@ -979,7 +979,7 @@ KviKvsTreeNodeInstruction * KviKvsParser::parseVoidFunctionCallOrOperation()
 	if(!op)
 	{
 		delete r;
-		return 0;
+		return nullptr;
 	}
 
 	op->setTargetVariableReference(r);
diff --git a/src/kvirc/kvs/parser/KviKvsParser_specialCommands.cpp b/src/kvirc/kvs/parser/KviKvsParser_specialCommands.cpp
index fea7e25f9..9107c157b 100644
--- a/src/kvirc/kvs/parser/KviKvsParser_specialCommands.cpp
+++ b/src/kvirc/kvs/parser/KviKvsParser_specialCommands.cpp
@@ -241,7 +241,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandUnset()
 		if(!d)
 		{
 			delete pVarList;
-			return 0;
+			return nullptr;
 		}
 
 		pVarList->append(d);
@@ -260,7 +260,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandUnset()
 		delete pVarList;
 		warning(KVSP_curCharPointer, __tr2qs_ctx("The 'unset' command needs a variable list", "kvs"));
 		error(KVSP_curCharPointer, __tr2qs_ctx("Found character %q (Unicode %x) where a variable was expected", "kvs"), KVSP_curCharPointer, KVSP_curCharUnicode);
-		return 0;
+		return nullptr;
 	}
 
 	if(!KVSP_curCharIsEndOfBuffer)
@@ -270,7 +270,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandUnset()
 	{
 		delete pVarList;
 		warning(KVSP_curCharPointer, __tr2qs_ctx("'unset' command used without a variable list", "kvs"));
-		return 0; // null unset ?
+		return nullptr; // null unset ?
 	}
 	return new KviKvsTreeNodeSpecialCommandUnset(pCmdBegin, pVarList);
 }
@@ -331,12 +331,12 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandGlobal()
 	{
 		warning(KVSP_curCharPointer, __tr2qs_ctx("The 'global' command needs a list of variables", "kvs"));
 		error(KVSP_curCharPointer, __tr2qs_ctx("Found character %q (Unicode %x) where a variable was expected", "kvs"), KVSP_curCharPointer, KVSP_curCharUnicode);
-		return 0;
+		return nullptr;
 	}
 
 	if(!KVSP_curCharIsEndOfBuffer)
 		KVSP_skipChar;
-	return 0;
+	return nullptr;
 }
 
 KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandClass()
@@ -431,28 +431,28 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandClass()
 	if(KVSP_curCharUnicode != '(')
 	{
 		error(KVSP_curCharPointer, __tr2qs_ctx("Found character %q (Unicode %x) where an open parenthesis was expected", "kvs"), KVSP_curCharPointer, KVSP_curCharUnicode);
-		return 0;
+		return nullptr;
 	}
 
 	const QChar * pBegin = KVSP_curCharPointer;
 
 	KviKvsTreeNodeDataList * l = parseCommaSeparatedParameterList();
 	if(!l)
-		return 0;
+		return nullptr;
 
 	KviKvsTreeNodeSpecialCommandClass * pClass = new KviKvsTreeNodeSpecialCommandClass(pBegin, l);
 
 	if(!skipSpacesAndNewlines())
 	{
 		delete pClass;
-		return 0;
+		return nullptr;
 	}
 
 	if(KVSP_curCharUnicode != '{')
 	{
 		errorBadChar(KVSP_curCharPointer, '{', "class");
 		delete pClass;
-		return 0;
+		return nullptr;
 	}
 
 	KVSP_skipChar;
@@ -460,7 +460,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandClass()
 	if(!skipSpacesAndNewlines())
 	{
 		delete pClass;
-		return 0;
+		return nullptr;
 	}
 
 	while(KVSP_curCharUnicode != '}')
@@ -471,12 +471,12 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandClass()
 			if(error())
 			{
 				delete pClass;
-				return 0;
+				return nullptr;
 			}
 			if(!skipSpacesAndNewlines())
 			{
 				delete pClass;
-				return 0;
+				return nullptr;
 			}
 			continue;
 		}
@@ -494,14 +494,14 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandClass()
 		{
 			error(KVSP_curCharPointer, __tr2qs_ctx("Unexpected end of buffer in class definition", "kvs"));
 			delete pClass;
-			return 0;
+			return nullptr;
 		}
 
 		if(KVSP_curCharPointer == pLabelBegin)
 		{
 			error(KVSP_curCharPointer, __tr2qs_ctx("Found character %q (Unicode %x) where a function name was expected", "kvs"), KVSP_curCharPointer, KVSP_curCharUnicode);
 			delete pClass;
-			return 0;
+			return nullptr;
 		}
 
 		QString szLabel(pLabelBegin, KVSP_curCharPointer - pLabelBegin);
@@ -523,14 +523,14 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandClass()
 				{
 					error(KVSP_curCharPointer, __tr2qs_ctx("Unexpected end of buffer in class definition", "kvs"));
 					delete pClass;
-					return 0;
+					return nullptr;
 				}
 
 				if(KVSP_curCharPointer == pLabelBegin)
 				{
 					error(KVSP_curCharPointer, __tr2qs_ctx("Found character %q (Unicode %x) where a function name was expected", "kvs"), KVSP_curCharPointer, KVSP_curCharUnicode);
 					delete pClass;
-					return 0;
+					return nullptr;
 				}
 				szLabel = QString(pLabelBegin, KVSP_curCharPointer - pLabelBegin);
 			}
@@ -550,14 +550,14 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandClass()
 				{
 					error(KVSP_curCharPointer, __tr2qs_ctx("Unexpected end of buffer in class definition", "kvs"));
 					delete pClass;
-					return 0;
+					return nullptr;
 				}
 
 				if(KVSP_curCharPointer == pLabelBegin)
 				{
 					error(KVSP_curCharPointer, __tr2qs_ctx("Found character %q (Unicode %x) where a function name was expected", "kvs"), KVSP_curCharPointer, KVSP_curCharUnicode);
 					delete pClass;
-					return 0;
+					return nullptr;
 				}
 				szLabel = QString(pLabelBegin, KVSP_curCharPointer - pLabelBegin);
 			}
@@ -566,7 +566,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandClass()
 		if(!skipSpacesAndNewlines())
 		{
 			delete pClass;
-			return 0;
+			return nullptr;
 		}
 		QString szReminder;
 		if(KVSP_curCharUnicode == '(')
@@ -580,7 +580,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandClass()
 			{
 				error(KVSP_curCharPointer, __tr2qs_ctx("Unexpected end of buffer in function parameter list reminder", "kvs"));
 				delete pClass;
-				return 0;
+				return nullptr;
 			}
 			szReminder = QString(pReminderBegin, KVSP_curCharPointer - pReminderBegin);
 			KVSP_skipChar;
@@ -588,7 +588,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandClass()
 			if(!skipSpacesAndNewlines())
 			{
 				delete pClass;
-				return 0;
+				return nullptr;
 			}
 		}
 
@@ -596,14 +596,14 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandClass()
 		{
 			error(KVSP_curCharPointer, __tr2qs_ctx("Unexpected end of buffer in class definition", "kvs"));
 			delete pClass;
-			return 0;
+			return nullptr;
 		}
 
 		if(KVSP_curCharUnicode != '{')
 		{
 			errorBadChar(KVSP_curCharPointer, '{', "class");
 			delete pClass;
-			return 0;
+			return nullptr;
 		}
 
 		pBegin = KVSP_curCharPointer;
@@ -614,7 +614,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandClass()
 			if(error())
 			{
 				delete pClass;
-				return 0;
+				return nullptr;
 			}
 		}
 		delete pInstruction;
@@ -631,7 +631,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandClass()
 		if(!skipSpacesAndNewlines())
 		{
 			delete pClass;
-			return 0;
+			return nullptr;
 		}
 	}
 
@@ -687,7 +687,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandWhile()
 	{
 		warning(KVSP_curCharPointer, __tr2qs_ctx("The while command needs an expression enclosed in parenthesis", "kvs"));
 		error(KVSP_curCharPointer, __tr2qs_ctx("Found character %q (Unicode %x) where an open parenthesis was expected", "kvs"), KVSP_curCharPointer, KVSP_curCharUnicode);
-		return 0;
+		return nullptr;
 	}
 
 	const QChar * pBegin = KVSP_curCharPointer;
@@ -698,13 +698,13 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandWhile()
 	if(!e)
 	{
 		// must be an error
-		return 0;
+		return nullptr;
 	}
 
 	if(!skipSpacesAndNewlines())
 	{
 		delete e;
-		return 0;
+		return nullptr;
 	}
 
 	if(KVSP_curCharUnicode == 0)
@@ -719,7 +719,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandWhile()
 		if(error())
 		{
 			delete e;
-			return 0;
+			return nullptr;
 		}
 	} // else, just an empty instruction
 
@@ -780,14 +780,14 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandDo()
 	if(!i)
 	{
 		if(error())
-			return 0;
+			return nullptr;
 	}
 
 	if(!skipSpacesAndNewlines())
 	{
 		if(i)
 			delete i;
-		return 0;
+		return nullptr;
 	}
 
 	static const unsigned short while_chars[10] = { 'W', 'w', 'H', 'h', 'I', 'i', 'L', 'l', 'E', 'e' };
@@ -805,7 +805,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandDo()
 					error(KVSP_curCharPointer, __tr2qs_ctx("Found character %q (Unicode %x) where a 'while' keyword was expected", "kvs"), KVSP_curCharPointer, KVSP_curCharUnicode);
 				if(i)
 					delete i;
-				return 0;
+				return nullptr;
 			}
 		}
 		else
@@ -817,7 +817,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandDo()
 	{
 		if(i)
 			delete i;
-		return 0;
+		return nullptr;
 	}
 
 	if(KVSP_curCharUnicode != '(')
@@ -826,7 +826,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandDo()
 		errorBadChar(KVSP_curCharPointer, '(', "do");
 		if(i)
 			delete i;
-		return 0;
+		return nullptr;
 	}
 
 	KVSP_skipChar;
@@ -837,7 +837,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandDo()
 		// must be an error
 		if(i)
 			delete i;
-		return 0;
+		return nullptr;
 	}
 
 	skipSpaces();
@@ -893,7 +893,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandIf()
 	{
 		warning(KVSP_curCharPointer, __tr2qs_ctx("The 'if' command needs an expression enclosed in parenthesis", "kvs"));
 		errorBadChar(KVSP_curCharPointer, '(', "if");
-		return 0;
+		return nullptr;
 	}
 
 	const QChar * pBegin = KVSP_curCharPointer;
@@ -904,13 +904,13 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandIf()
 	if(!e)
 	{
 		// must be an error
-		return 0;
+		return nullptr;
 	}
 
 	if(!skipSpacesAndNewlines())
 	{
 		delete e;
-		return 0;
+		return nullptr;
 	}
 
 	if(KVSP_curCharUnicode == 0)
@@ -925,7 +925,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandIf()
 		if(error())
 		{
 			delete e;
-			return 0;
+			return nullptr;
 		}
 	} // else, just an empty instruction
 
@@ -933,30 +933,30 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandIf()
 	{
 		if(i)
 			delete i;
-		return 0;
+		return nullptr;
 	}
 
 	const QChar * pElse = KVSP_curCharPointer;
 
 	if((KVSP_curCharUnicode != 'e') && (KVSP_curCharUnicode != 'E'))
-		return new KviKvsTreeNodeSpecialCommandIf(pBegin, e, i, 0);
+		return new KviKvsTreeNodeSpecialCommandIf(pBegin, e, i, nullptr);
 	KVSP_skipChar;
 	if((KVSP_curCharUnicode != 'l') && (KVSP_curCharUnicode != 'L'))
 	{
 		KVSP_setCurCharPointer(pElse);
-		return new KviKvsTreeNodeSpecialCommandIf(pBegin, e, i, 0);
+		return new KviKvsTreeNodeSpecialCommandIf(pBegin, e, i, nullptr);
 	}
 	KVSP_skipChar;
 	if((KVSP_curCharUnicode != 's') && (KVSP_curCharUnicode != 'S'))
 	{
 		KVSP_setCurCharPointer(pElse);
-		return new KviKvsTreeNodeSpecialCommandIf(pBegin, e, i, 0);
+		return new KviKvsTreeNodeSpecialCommandIf(pBegin, e, i, nullptr);
 	}
 	KVSP_skipChar;
 	if((KVSP_curCharUnicode != 'e') && (KVSP_curCharUnicode != 'E'))
 	{
 		KVSP_setCurCharPointer(pElse);
-		return new KviKvsTreeNodeSpecialCommandIf(pBegin, e, i, 0);
+		return new KviKvsTreeNodeSpecialCommandIf(pBegin, e, i, nullptr);
 	}
 	KVSP_skipChar;
 	if(KVSP_curCharIsLetterOrNumber)
@@ -981,7 +981,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandIf()
 		}
 
 		KVSP_setCurCharPointer(pElse);
-		return new KviKvsTreeNodeSpecialCommandIf(pBegin, e, i, 0);
+		return new KviKvsTreeNodeSpecialCommandIf(pBegin, e, i, nullptr);
 	}
 
 handle_else_instruction:
@@ -990,7 +990,7 @@ handle_else_instruction:
 		delete e;
 		if(i)
 			delete i;
-		return 0;
+		return nullptr;
 	}
 
 	KviKvsTreeNodeInstruction * i2 = parseInstruction();
@@ -1001,7 +1001,7 @@ handle_else_instruction:
 			delete e;
 			if(i)
 				delete i;
-			return 0;
+			return nullptr;
 		}
 	} // else, just an empty instruction
 
@@ -1090,7 +1090,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandFor()
 	{
 		warning(KVSP_curCharPointer, __tr2qs_ctx("The 'for' command needs an expression enclosed in parenthesis", "kvs"));
 		errorBadChar(KVSP_curCharPointer, '(', "for");
-		return 0;
+		return nullptr;
 	}
 
 	const QChar * pForBegin = KVSP_curCharPointer;
@@ -1103,7 +1103,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandFor()
 	if(!i1)
 	{
 		if(error())
-			return 0;
+			return nullptr;
 	} // else just empty instruction
 
 	skipSpaces();
@@ -1115,7 +1115,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandFor()
 		{
 			if(i1)
 				delete i1;
-			return 0;
+			return nullptr;
 		}
 	} // else just empty expression : assume true
 
@@ -1133,7 +1133,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandFor()
 				delete i1;
 			if(e)
 				delete e;
-			return 0;
+			return nullptr;
 		}
 	}
 
@@ -1161,7 +1161,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandFor()
 				delete i1;
 			if(e)
 				delete e;
-			return 0;
+			return nullptr;
 		}
 	} // else just empty instruction
 
@@ -1176,7 +1176,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandFor()
 			delete e;
 		if(i2)
 			delete i2;
-		return 0;
+		return nullptr;
 	}
 
 	KVSP_skipChar;
@@ -1189,7 +1189,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandFor()
 			delete e;
 		if(i2)
 			delete i2;
-		return 0;
+		return nullptr;
 	}
 
 	KviKvsTreeNodeInstruction * loop = parseInstruction();
@@ -1203,7 +1203,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandFor()
 				delete e;
 			if(i2)
 				delete i2;
-			return 0;
+			return nullptr;
 		}
 
 		if((!i1) && (!e) && (!i2))
@@ -1215,7 +1215,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandFor()
 				delete e;
 			if(i2)
 				delete i2;
-			return 0;
+			return nullptr;
 		}
 	} // else just an empty instruction
 
@@ -1271,7 +1271,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandForeach()
 	{
 		warning(KVSP_curCharPointer, __tr2qs_ctx("The 'foreach' command needs an expression enclosed in parenthesis", "kvs"));
 		errorBadChar(KVSP_curCharPointer, '(', "foreach");
-		return 0;
+		return nullptr;
 	}
 
 	const QChar * pForeachBegin = KVSP_curCharPointer;
@@ -1284,12 +1284,12 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandForeach()
 	{
 		warning(KVSP_curCharPointer, __tr2qs_ctx("The 'foreach' command expects a writable iteration variable as first parameter", "kvs"));
 		error(KVSP_curCharPointer, __tr2qs_ctx("Found character '%q' (Unicode %x) where '%' or '$' was expected: see /help foreach for the command syntax", "kvs"), KVSP_curCharPointer, KVSP_curCharUnicode);
-		return 0;
+		return nullptr;
 	}
 
 	KviKvsTreeNodeData * d = parsePercentOrDollar();
 	if(!d)
-		return 0;
+		return nullptr;
 
 	if(d->isFunctionCall() || d->isReadOnly())
 	{
@@ -1299,7 +1299,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandForeach()
 		else
 			error(KVSP_curCharPointer, __tr2qs_ctx("Unexpected read-only variable as 'foreach' iteration variable", "kvs"));
 		delete d;
-		return 0;
+		return nullptr;
 	}
 
 	skipSpaces();
@@ -1309,22 +1309,22 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandForeach()
 		{
 			error(KVSP_curCharPointer, __tr2qs_ctx("Unexpected end of 'foreach' parameters: at least one iteration data argument must be given", "kvs"));
 			delete d;
-			return 0;
+			return nullptr;
 		}
 		warning(KVSP_curCharPointer, __tr2qs_ctx("The 'foreach' command expects a comma separated list of iteration data items after the first parameter", "kvs"));
 		errorBadChar(KVSP_curCharPointer, ',', "foreach");
-		return 0;
+		return nullptr;
 	}
 
 	KviKvsTreeNodeDataList * l = parseCommaSeparatedParameterList();
 	if(!l)
-		return 0;
+		return nullptr;
 
 	if(!skipSpacesAndNewlines())
 	{
 		delete d;
 		delete l;
-		return 0;
+		return nullptr;
 	}
 
 	const QChar * pLoopBegin = KVSP_curCharPointer;
@@ -1333,7 +1333,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandForeach()
 	if(!loop)
 	{
 		if(error())
-			return 0;
+			return nullptr;
 		warning(pLoopBegin, __tr2qs_ctx("Found empty 'foreach' execution block: maybe you need to fix your script?", "kvs"));
 		loop = new KviKvsTreeNodeInstructionBlock(pLoopBegin);
 	}
@@ -1479,7 +1479,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandSwitch()
 	{
 		warning(KVSP_curCharPointer, __tr2qs_ctx("The 'switch' command needs an expression enclosed in parenthesis", "kvs"));
 		errorBadChar(KVSP_curCharPointer, '(', "switch");
-		return 0;
+		return nullptr;
 	}
 
 	const QChar * pBegin = KVSP_curCharPointer;
@@ -1490,20 +1490,20 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandSwitch()
 	if(!e)
 	{
 		// must be an error
-		return 0;
+		return nullptr;
 	}
 
 	if(!skipSpacesAndNewlines())
 	{
 		delete e;
-		return 0;
+		return nullptr;
 	}
 
 	if(KVSP_curCharUnicode != '{')
 	{
 		errorBadChar(KVSP_curCharPointer, '{', "switch");
 		delete e;
-		return 0;
+		return nullptr;
 	}
 
 	KVSP_skipChar;
@@ -1511,12 +1511,12 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandSwitch()
 	if(!skipSpacesAndNewlines())
 	{
 		delete e;
-		return 0;
+		return nullptr;
 	}
 
 	KviKvsTreeNodeSpecialCommandSwitch * pSwitch = new KviKvsTreeNodeSpecialCommandSwitch(pBegin, e);
 
-	KviKvsTreeNodeSpecialCommandSwitchLabel * pLabel = 0;
+	KviKvsTreeNodeSpecialCommandSwitchLabel * pLabel = nullptr;
 
 	while(KVSP_curCharUnicode != '}')
 	{
@@ -1530,14 +1530,14 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandSwitch()
 		{
 			error(KVSP_curCharPointer, __tr2qs_ctx("Unexpected end of buffer in switch condition block", "kvs"));
 			delete pSwitch;
-			return 0;
+			return nullptr;
 		}
 
 		if(KVSP_curCharPointer == pLabelBegin)
 		{
 			error(KVSP_curCharPointer, __tr2qs_ctx("Found character %q (Unicode %x) where a 'case','match','regexp','default' or 'break' label was expected", "kvs"), KVSP_curCharPointer, KVSP_curCharUnicode);
 			delete pSwitch;
-			return 0;
+			return nullptr;
 		}
 
 		QString szLabel(pLabelBegin, KVSP_curCharPointer - pLabelBegin);
@@ -1574,7 +1574,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandSwitch()
 				{
 					delete pSwitch;
 					delete pLabel;
-					return 0;
+					return nullptr;
 				}
 				continue;
 			}
@@ -1582,14 +1582,14 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandSwitch()
 			{
 				error(pLabelBegin, __tr2qs_ctx("Found 'break' label where a 'case','match','regexp' or 'default' label was expected", "kvs"));
 				delete pSwitch;
-				return 0;
+				return nullptr;
 			}
 		}
 		else
 		{
 			error(pLabelBegin, __tr2qs_ctx("Found token '%Q' where a 'case','match','regexp','default' or 'break' label was expected", "kvs"), &szLabel);
 			delete pSwitch;
-			return 0;
+			return nullptr;
 		}
 
 		if(bNeedParam)
@@ -1600,7 +1600,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandSwitch()
 				errorBadChar(KVSP_curCharPointer, '(', "switch");
 				delete pSwitch;
 				delete pLabel;
-				return 0;
+				return nullptr;
 			}
 			KVSP_skipChar;
 
@@ -1609,7 +1609,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandSwitch()
 			{
 				delete pSwitch;
 				delete pLabel;
-				return 0;
+				return nullptr;
 			}
 
 			pLabel->setParameter(pParameter);
@@ -1622,7 +1622,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandSwitch()
 		{
 			delete pSwitch;
 			delete pLabel;
-			return 0;
+			return nullptr;
 		}
 
 		KviKvsTreeNodeInstruction * pInstruction = parseInstruction();
@@ -1633,7 +1633,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandSwitch()
 			{
 				delete pSwitch;
 				delete pLabel;
-				return 0;
+				return nullptr;
 			}
 		}
 
@@ -1643,7 +1643,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandSwitch()
 		if(!skipSpacesAndNewlines())
 		{
 			delete pSwitch;
-			return 0;
+			return nullptr;
 		}
 	}
 
@@ -1653,7 +1653,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandSwitch()
 	{
 		error(pBegin, __tr2qs_ctx("Senseless empty switch command: fix the script", "kvs"));
 		delete pSwitch;
-		return 0;
+		return nullptr;
 	}
 
 	return pSwitch;
@@ -1664,7 +1664,7 @@ KviKvsTreeNodeSpecialCommandDefpopupLabelPopup * KviKvsParser::parseSpecialComma
 	if(KVSP_curCharUnicode != '{')
 	{
 		errorBadChar(KVSP_curCharPointer, '{', "defpopup");
-		return 0;
+		return nullptr;
 	}
 
 	KviKvsTreeNodeSpecialCommandDefpopupLabelPopup * pPopup = new KviKvsTreeNodeSpecialCommandDefpopupLabelPopup(KVSP_curCharPointer);
@@ -1674,7 +1674,7 @@ KviKvsTreeNodeSpecialCommandDefpopupLabelPopup * KviKvsParser::parseSpecialComma
 	if(!skipSpacesAndNewlines())
 	{
 		delete pPopup;
-		return 0;
+		return nullptr;
 	}
 
 	while(KVSP_curCharUnicode != '}')
@@ -1688,20 +1688,20 @@ KviKvsTreeNodeSpecialCommandDefpopupLabelPopup * KviKvsParser::parseSpecialComma
 		{
 			error(KVSP_curCharPointer, __tr2qs_ctx("Unexpected end of buffer in defpopup block", "kvs"));
 			delete pPopup;
-			return 0;
+			return nullptr;
 		}
 
 		if(KVSP_curCharPointer == pLabelBegin)
 		{
 			error(KVSP_curCharPointer, __tr2qs_ctx("Found character %q (Unicode %x) where a 'prologue', 'separator', 'separatorid', 'label', 'popup', 'item', 'extpopup' or 'epilogue' label was expected", "kvs"), KVSP_curCharPointer, KVSP_curCharUnicode);
 			delete pPopup;
-			return 0;
+			return nullptr;
 		}
 
 		QString szLabel(pLabelBegin, KVSP_curCharPointer - pLabelBegin);
 		QString szLabelLow = szLabel.toLower();
 
-		KviPointerList<QString> * pParameters = 0;
+		KviPointerList<QString> * pParameters = nullptr;
 
 		QString szCondition;
 
@@ -1761,7 +1761,7 @@ KviKvsTreeNodeSpecialCommandDefpopupLabelPopup * KviKvsParser::parseSpecialComma
 			if(!skipSpacesAndNewlines())
 			{
 				delete pPopup;
-				return 0;
+				return nullptr;
 			}
 
 			if(KVSP_curCharUnicode == '(')
@@ -1772,7 +1772,7 @@ KviKvsTreeNodeSpecialCommandDefpopupLabelPopup * KviKvsParser::parseSpecialComma
 					if(pParameters)
 						delete pParameters;
 					delete pPopup;
-					return 0;
+					return nullptr;
 				}
 			}
 			const QChar * pBegin = KVSP_curCharPointer;
@@ -1791,7 +1791,7 @@ KviKvsTreeNodeSpecialCommandDefpopupLabelPopup * KviKvsParser::parseSpecialComma
 					if(pParameters)
 						delete pParameters;
 					delete pPopup;
-					return 0;
+					return nullptr;
 				}
 				// empty instruction
 				if(bPrologue)
@@ -1804,7 +1804,7 @@ KviKvsTreeNodeSpecialCommandDefpopupLabelPopup * KviKvsParser::parseSpecialComma
 			{
 				QString szInstruction(pBegin, KVSP_curCharPointer - pBegin);
 				KviCommandFormatter::bufferFromBlock(szInstruction);
-				QString * pItemName = pParameters ? pParameters->first() : 0;
+				QString * pItemName = pParameters ? pParameters->first() : nullptr;
 				QString szItemName = pItemName ? *pItemName : QString();
 				if(bPrologue)
 					pPopup->addLabel(new KviKvsTreeNodeSpecialCommandDefpopupLabelPrologue(pLabelBegin, szInstruction, szItemName));
@@ -1830,7 +1830,7 @@ KviKvsTreeNodeSpecialCommandDefpopupLabelPopup * KviKvsParser::parseSpecialComma
 			EXTRACT_POPUP_LABEL_CONDITION
 			if(KVSP_curCharUnicode == ';')
 				KVSP_skipChar;
-			QString * pItemName = pParameters ? pParameters->first() : 0;
+			QString * pItemName = pParameters ? pParameters->first() : nullptr;
 			pPopup->addLabel(new KviKvsTreeNodeSpecialCommandDefpopupLabelSeparator(pLabelBegin, szCondition, pItemName ? *pItemName : QString()));
 			delete pParameters;
 		}
@@ -1846,7 +1846,7 @@ KviKvsTreeNodeSpecialCommandDefpopupLabelPopup * KviKvsParser::parseSpecialComma
 				error(pLabelBegin, __tr2qs_ctx("Unexpected empty <text> field in label parameters. See /help defpopup for the syntax", "kvs"));
 				delete pParameters;
 				delete pPopup;
-				return 0;
+				return nullptr;
 			}
 			QString * pIcon = pParameters->next();
 			if(KVSP_curCharUnicode == ';')
@@ -1867,7 +1867,7 @@ KviKvsTreeNodeSpecialCommandDefpopupLabelPopup * KviKvsParser::parseSpecialComma
 				error(pLabelBegin, __tr2qs_ctx("Unexpected empty <text> field in extpopup parameters. See /help defpopup for the syntax", "kvs"));
 				delete pParameters;
 				delete pPopup;
-				return 0;
+				return nullptr;
 			}
 			QString * pIcon = pParameters->next();
 			QString * pItemName = pParameters->next();
@@ -1877,7 +1877,7 @@ KviKvsTreeNodeSpecialCommandDefpopupLabelPopup * KviKvsParser::parseSpecialComma
 			{
 				delete pParameters;
 				delete pPopup;
-				return 0;
+				return nullptr;
 			}
 
 			pSubPopup->setCondition(szCondition);
@@ -1900,7 +1900,7 @@ KviKvsTreeNodeSpecialCommandDefpopupLabelPopup * KviKvsParser::parseSpecialComma
 				error(pLabelBegin, __tr2qs_ctx("Unexpected empty <text> field in extpopup parameters. See /help defpopup for the syntax", "kvs"));
 				delete pParameters;
 				delete pPopup;
-				return 0;
+				return nullptr;
 			}
 			QString * pIcon = pParameters->next();
 			QString * pItemName = pParameters->next();
@@ -1920,7 +1920,7 @@ KviKvsTreeNodeSpecialCommandDefpopupLabelPopup * KviKvsParser::parseSpecialComma
 					// error
 					delete pParameters;
 					delete pPopup;
-					return 0;
+					return nullptr;
 				}
 				// empty instruction
 				warning(pBegin, __tr2qs_ctx("Found empty instruction for popup item: maybe you need to fix the script?", "kvs"));
@@ -1953,7 +1953,7 @@ KviKvsTreeNodeSpecialCommandDefpopupLabelPopup * KviKvsParser::parseSpecialComma
 				error(pLabelBegin, __tr2qs_ctx("Unexpected empty <text> field in extpopup parameters. See /help defpopup for the syntax", "kvs"));
 				delete pParameters;
 				delete pPopup;
-				return 0;
+				return nullptr;
 			}
 			QString * pName = pParameters->next();
 			if(!pName)
@@ -1961,7 +1961,7 @@ KviKvsTreeNodeSpecialCommandDefpopupLabelPopup * KviKvsParser::parseSpecialComma
 				error(pLabelBegin, __tr2qs_ctx("Unexpected empty <name> field in extpopup parameters. See /help defpopup for the syntax", "kvs"));
 				delete pParameters;
 				delete pPopup;
-				return 0;
+				return nullptr;
 			}
 			QString * pIcon = pParameters->next();
 			QString * pItemName = pParameters->next();
@@ -1975,13 +1975,13 @@ KviKvsTreeNodeSpecialCommandDefpopupLabelPopup * KviKvsParser::parseSpecialComma
 			/////////////////////////////////////////////////////////////////////////////////////////////////
 			error(pLabelBegin, __tr2qs_ctx("Found token '%Q' where a 'prologue', 'separator', 'separatorid', 'label', 'popup', 'item', 'extpopup' or 'epilogue' label was expected", "kvs"), &szLabel);
 			delete pPopup;
-			return 0;
+			return nullptr;
 		}
 
 		if(!skipSpacesAndNewlines())
 		{
 			delete pPopup;
-			return 0;
+			return nullptr;
 		}
 	}
 
@@ -2087,7 +2087,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandDefpopup()
 	{
 		warning(KVSP_curCharPointer, __tr2qs_ctx("The 'defpopup' command needs an expression enclosed in parenthesis", "kvs"));
 		errorBadChar(KVSP_curCharPointer, '(', "defpopup");
-		return 0;
+		return nullptr;
 	}
 
 	const QChar * pBegin = KVSP_curCharPointer;
@@ -2096,19 +2096,19 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandDefpopup()
 
 	KviKvsTreeNodeData * pPopupName = parseSingleParameterInParenthesis();
 	if(!pPopupName)
-		return 0;
+		return nullptr;
 
 	if(!skipSpacesAndNewlines())
 	{
 		delete pPopupName;
-		return 0;
+		return nullptr;
 	}
 
 	KviKvsTreeNodeSpecialCommandDefpopupLabelPopup * pMainPopup = parseSpecialCommandDefpopupLabelPopup();
 	if(!pMainPopup)
 	{
 		delete pPopupName;
-		return 0;
+		return nullptr;
 	}
 
 	return new KviKvsTreeNodeSpecialCommandDefpopup(pBegin, pPopupName, pMainPopup);
@@ -2138,7 +2138,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandHelp()
 
 	KviKvsCoreSimpleCommandExecRoutine * r = KviKvsKernel::instance()->findCoreSimpleCommandExecRoutine(szHelpName);
 	if(!r)
-		return 0; // <--- internal error!
+		return nullptr; // <--- internal error!
 
 	KviKvsTreeNodeDataList * p = new KviKvsTreeNodeDataList(pBegin);
 	p->addItem(new KviKvsTreeNodeConstantData(pBegin, new KviKvsVariant(tmp)));
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeAliasFunctionCall.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeAliasFunctionCall.cpp
index 3c76aa91f..68130bedd 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeAliasFunctionCall.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeAliasFunctionCall.cpp
@@ -33,8 +33,7 @@ KviKvsTreeNodeAliasFunctionCall::KviKvsTreeNodeAliasFunctionCall(const QChar * p
 }
 
 KviKvsTreeNodeAliasFunctionCall::~KviKvsTreeNodeAliasFunctionCall()
-{
-}
+    = default;
 
 void KviKvsTreeNodeAliasFunctionCall::contextDescription(QString & szBuffer)
 {
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeAliasSimpleCommand.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeAliasSimpleCommand.cpp
index b60695166..a67932cba 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeAliasSimpleCommand.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeAliasSimpleCommand.cpp
@@ -41,8 +41,7 @@ KviKvsTreeNodeAliasSimpleCommand::KviKvsTreeNodeAliasSimpleCommand(const QChar *
 }
 
 KviKvsTreeNodeAliasSimpleCommand::~KviKvsTreeNodeAliasSimpleCommand()
-{
-}
+    = default;
 
 void KviKvsTreeNodeAliasSimpleCommand::contextDescription(QString & szBuffer)
 {
@@ -114,7 +113,7 @@ bool KviKvsTreeNodeAliasSimpleCommand::execute(KviKvsRunTimeContext * c)
 	//        it would avoid the constructor call each time
 	KviKvsExtendedRunTimeData extData(&swl);
 
-	if(!copy.run(c->window(), &l, 0, KviKvsScript::PreserveParams, &extData))
+	if(!copy.run(c->window(), &l, nullptr, KviKvsScript::PreserveParams, &extData))
 	{
 		c->error(this, __tr2qs_ctx("Error in inner alias command call '%Q', called from this context", "kvs"), &m_szCmdName);
 		return false;
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeArrayCount.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeArrayCount.cpp
index 06e72b7a3..8b2a32272 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeArrayCount.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeArrayCount.cpp
@@ -34,8 +34,7 @@ KviKvsTreeNodeArrayCount::KviKvsTreeNodeArrayCount(const QChar * pLocation, KviK
 }
 
 KviKvsTreeNodeArrayCount::~KviKvsTreeNodeArrayCount()
-{
-}
+    = default;
 
 void KviKvsTreeNodeArrayCount::contextDescription(QString & szBuffer)
 {
@@ -79,5 +78,5 @@ bool KviKvsTreeNodeArrayCount::evaluateReadOnlyInObjectScope(KviKvsObject * o, K
 
 bool KviKvsTreeNodeArrayCount::evaluateReadOnly(KviKvsRunTimeContext * c, KviKvsVariant * pBuffer)
 {
-	return evaluateReadOnlyInObjectScope(0, c, pBuffer);
+	return evaluateReadOnlyInObjectScope(nullptr, c, pBuffer);
 }
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeArrayElement.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeArrayElement.cpp
index 892cfab0e..7f9054cf5 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeArrayElement.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeArrayElement.cpp
@@ -119,7 +119,7 @@ KviKvsRWEvaluationResult * KviKvsTreeNodeArrayElement::evaluateReadWriteInObject
 {
 	kvs_int_t iVal;
 	if(!evaluateIndex(c, iVal))
-		return 0;
+		return nullptr;
 
 	KviKvsRWEvaluationResult * result;
 	if(o)
@@ -128,7 +128,7 @@ KviKvsRWEvaluationResult * KviKvsTreeNodeArrayElement::evaluateReadWriteInObject
 		result = m_pSource->evaluateReadWrite(c);
 
 	if(!result)
-		return 0;
+		return nullptr;
 
 	if(!result->result()->isArray())
 	{
@@ -146,10 +146,10 @@ KviKvsRWEvaluationResult * KviKvsTreeNodeArrayElement::evaluateReadWriteInObject
 
 bool KviKvsTreeNodeArrayElement::evaluateReadOnly(KviKvsRunTimeContext * c, KviKvsVariant * pBuffer)
 {
-	return evaluateReadOnlyInObjectScope(0, c, pBuffer);
+	return evaluateReadOnlyInObjectScope(nullptr, c, pBuffer);
 }
 
 KviKvsRWEvaluationResult * KviKvsTreeNodeArrayElement::evaluateReadWrite(KviKvsRunTimeContext * c)
 {
-	return evaluateReadWriteInObjectScope(0, c);
+	return evaluateReadWriteInObjectScope(nullptr, c);
 }
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeArrayOrHashElement.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeArrayOrHashElement.cpp
index 2cf8b4e7b..24a948274 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeArrayOrHashElement.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeArrayOrHashElement.cpp
@@ -30,8 +30,7 @@ KviKvsTreeNodeArrayOrHashElement::KviKvsTreeNodeArrayOrHashElement(const QChar *
 }
 
 KviKvsTreeNodeArrayOrHashElement::~KviKvsTreeNodeArrayOrHashElement()
-{
-}
+    = default;
 bool KviKvsTreeNodeArrayOrHashElement::isReadOnly()
 {
 	return m_pSource->isReadOnly();
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeArrayReferenceAssert.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeArrayReferenceAssert.cpp
index 1704bf58a..f8cdadc01 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeArrayReferenceAssert.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeArrayReferenceAssert.cpp
@@ -35,8 +35,7 @@ KviKvsTreeNodeArrayReferenceAssert::KviKvsTreeNodeArrayReferenceAssert(const QCh
 }
 
 KviKvsTreeNodeArrayReferenceAssert::~KviKvsTreeNodeArrayReferenceAssert()
-{
-}
+    = default;
 
 bool KviKvsTreeNodeArrayReferenceAssert::isReadOnly()
 {
@@ -88,17 +87,17 @@ KviKvsRWEvaluationResult * KviKvsTreeNodeArrayReferenceAssert::evaluateReadWrite
 		r = m_pSource->evaluateReadWrite(c);
 
 	if(!r)
-		return 0;
+		return nullptr;
 
 	return r;
 }
 
 bool KviKvsTreeNodeArrayReferenceAssert::evaluateReadOnly(KviKvsRunTimeContext * c, KviKvsVariant * pBuffer)
 {
-	return evaluateReadOnlyInObjectScope(0, c, pBuffer);
+	return evaluateReadOnlyInObjectScope(nullptr, c, pBuffer);
 }
 
 KviKvsRWEvaluationResult * KviKvsTreeNodeArrayReferenceAssert::evaluateReadWrite(KviKvsRunTimeContext * c)
 {
-	return evaluateReadWriteInObjectScope(0, c);
+	return evaluateReadWriteInObjectScope(nullptr, c);
 }
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeBase.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeBase.cpp
index a37589f1a..3f6ef6fc4 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeBase.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeBase.cpp
@@ -26,6 +26,6 @@
 
 KviKvsTreeNode::KviKvsTreeNode(const QChar * pLocation)
 {
-	m_pParent = 0;
+	m_pParent = nullptr;
 	m_pLocation = pLocation;
 }
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeBaseObjectFunctionCall.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeBaseObjectFunctionCall.cpp
index 098feaa05..ec22721d0 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeBaseObjectFunctionCall.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeBaseObjectFunctionCall.cpp
@@ -33,8 +33,7 @@ KviKvsTreeNodeBaseObjectFunctionCall::KviKvsTreeNodeBaseObjectFunctionCall(const
 }
 
 KviKvsTreeNodeBaseObjectFunctionCall::~KviKvsTreeNodeBaseObjectFunctionCall()
-{
-}
+    = default;
 
 void KviKvsTreeNodeBaseObjectFunctionCall::contextDescription(QString & szBuffer)
 {
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeCommand.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeCommand.cpp
index f873021f2..7ee0e2b51 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeCommand.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeCommand.cpp
@@ -29,7 +29,7 @@ KviKvsTreeNodeCommand::KviKvsTreeNodeCommand(const QChar * pLocation, const QStr
     : KviKvsTreeNodeInstruction(pLocation)
 {
 	m_szCmdName = szCmdName;
-	m_pSwitches = 0;
+	m_pSwitches = nullptr;
 }
 
 KviKvsTreeNodeCommand::~KviKvsTreeNodeCommand()
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeCoreCallbackCommand.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeCoreCallbackCommand.cpp
index 1b37ce593..49e24390f 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeCoreCallbackCommand.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeCoreCallbackCommand.cpp
@@ -35,8 +35,7 @@ KviKvsTreeNodeCoreCallbackCommand::KviKvsTreeNodeCoreCallbackCommand(const QChar
 }
 
 KviKvsTreeNodeCoreCallbackCommand::~KviKvsTreeNodeCoreCallbackCommand()
-{
-}
+    = default;
 
 void KviKvsTreeNodeCoreCallbackCommand::contextDescription(QString & szBuffer)
 {
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeCoreFunctionCall.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeCoreFunctionCall.cpp
index 4b0d4d935..699fe9bfb 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeCoreFunctionCall.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeCoreFunctionCall.cpp
@@ -32,8 +32,7 @@ KviKvsTreeNodeCoreFunctionCall::KviKvsTreeNodeCoreFunctionCall(const QChar * pLo
 }
 
 KviKvsTreeNodeCoreFunctionCall::~KviKvsTreeNodeCoreFunctionCall()
-{
-}
+    = default;
 
 void KviKvsTreeNodeCoreFunctionCall::contextDescription(QString & szBuffer)
 {
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeCoreSimpleCommand.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeCoreSimpleCommand.cpp
index 5170ab22c..fd5d1e99a 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeCoreSimpleCommand.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeCoreSimpleCommand.cpp
@@ -34,8 +34,7 @@ KviKvsTreeNodeCoreSimpleCommand::KviKvsTreeNodeCoreSimpleCommand(const QChar * p
 }
 
 KviKvsTreeNodeCoreSimpleCommand::~KviKvsTreeNodeCoreSimpleCommand()
-{
-}
+    = default;
 
 void KviKvsTreeNodeCoreSimpleCommand::contextDescription(QString & szBuffer)
 {
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeData.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeData.cpp
index 08713dd4f..aa90ceb37 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeData.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeData.cpp
@@ -26,13 +26,12 @@
 #include "KviLocale.h"
 
 KviKvsTreeNodeData::KviKvsTreeNodeData(const QChar * pLocation)
-    : KviKvsTreeNode(pLocation), m_pEndingLocation(0)
+    : KviKvsTreeNode(pLocation), m_pEndingLocation(nullptr)
 {
 }
 
 KviKvsTreeNodeData::~KviKvsTreeNodeData()
-{
-}
+    = default;
 
 void KviKvsTreeNodeData::contextDescription(QString & szBuffer)
 {
@@ -85,7 +84,7 @@ bool KviKvsTreeNodeData::evaluateReadOnly(KviKvsRunTimeContext * c, KviKvsVarian
 KviKvsRWEvaluationResult * KviKvsTreeNodeData::evaluateReadWrite(KviKvsRunTimeContext * c)
 {
 	c->error(this, __tr2qs_ctx("Internal error: trying to evaluate as read-write a read-only data location", "kvs"));
-	return 0;
+	return nullptr;
 }
 
 bool KviKvsTreeNodeData::evaluateReadOnlyInObjectScope(KviKvsObject *, KviKvsRunTimeContext * c, KviKvsVariant *)
@@ -97,5 +96,5 @@ bool KviKvsTreeNodeData::evaluateReadOnlyInObjectScope(KviKvsObject *, KviKvsRun
 KviKvsRWEvaluationResult * KviKvsTreeNodeData::evaluateReadWriteInObjectScope(KviKvsObject *, KviKvsRunTimeContext * c)
 {
 	c->error(this, __tr2qs_ctx("Internal error: trying to evaluate as read-write a read-only data location", "kvs"));
-	return 0;
+	return nullptr;
 }
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeDataList.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeDataList.cpp
index 3e8919366..4f78da661 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeDataList.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeDataList.cpp
@@ -54,7 +54,7 @@ KviKvsTreeNodeData * KviKvsTreeNodeDataList::releaseFirst()
 KviKvsTreeNodeData * KviKvsTreeNodeDataList::item(unsigned int uIdx)
 {
 	if(uIdx >= m_pDataList->count())
-		return 0;
+		return nullptr;
 	return m_pDataList->at(uIdx);
 }
 
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeExpression.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeExpression.cpp
index f2c791314..c6b2ace28 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeExpression.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeExpression.cpp
@@ -30,12 +30,11 @@
 KviKvsTreeNodeExpression::KviKvsTreeNodeExpression(const QChar * pLocation)
     : KviKvsTreeNodeData(pLocation)
 {
-	m_pParentExpression = 0;
+	m_pParentExpression = nullptr;
 }
 
 KviKvsTreeNodeExpression::~KviKvsTreeNodeExpression()
-{
-}
+    = default;
 
 void KviKvsTreeNodeExpression::contextDescription(QString & szBuffer)
 {
@@ -55,13 +54,13 @@ int KviKvsTreeNodeExpression::precedence()
 KviKvsTreeNodeExpression * KviKvsTreeNodeExpression::left()
 {
 	qDebug("KviKvsTreeNodeExpression::left() : should never end up here!");
-	return 0;
+	return nullptr;
 }
 
 KviKvsTreeNodeExpression * KviKvsTreeNodeExpression::right()
 {
 	qDebug("KviKvsTreeNodeExpression::right() : should never end up here!");
-	return 0;
+	return nullptr;
 }
 
 void KviKvsTreeNodeExpression::setLeft(KviKvsTreeNodeExpression *)
@@ -79,7 +78,7 @@ KviKvsTreeNodeExpression * KviKvsTreeNodeExpression::parentWithPrecedenceLowerTh
 	if(precedence() > iPrec)
 		return this;
 	if(!parentExpression())
-		return 0;
+		return nullptr;
 	return parentExpression()->parentWithPrecedenceLowerThan(iPrec);
 }
 
@@ -162,8 +161,7 @@ KviKvsTreeNodeExpressionOperator::KviKvsTreeNodeExpressionOperator(const QChar *
 }
 
 KviKvsTreeNodeExpressionOperator::~KviKvsTreeNodeExpressionOperator()
-{
-}
+    = default;
 
 void KviKvsTreeNodeExpressionOperator::contextDescription(QString & szBuffer)
 {
@@ -225,8 +223,7 @@ KviKvsTreeNodeExpressionUnaryOperatorNegate::KviKvsTreeNodeExpressionUnaryOperat
 }
 
 KviKvsTreeNodeExpressionUnaryOperatorNegate::~KviKvsTreeNodeExpressionUnaryOperatorNegate()
-{
-}
+    = default;
 
 void KviKvsTreeNodeExpressionUnaryOperatorNegate::contextDescription(QString & szBuffer)
 {
@@ -265,8 +262,7 @@ KviKvsTreeNodeExpressionUnaryOperatorBitwiseNot::KviKvsTreeNodeExpressionUnaryOp
 }
 
 KviKvsTreeNodeExpressionUnaryOperatorBitwiseNot::~KviKvsTreeNodeExpressionUnaryOperatorBitwiseNot()
-{
-}
+    = default;
 
 void KviKvsTreeNodeExpressionUnaryOperatorBitwiseNot::contextDescription(QString & szBuffer)
 {
@@ -305,8 +301,7 @@ KviKvsTreeNodeExpressionUnaryOperatorLogicalNot::KviKvsTreeNodeExpressionUnaryOp
 }
 
 KviKvsTreeNodeExpressionUnaryOperatorLogicalNot::~KviKvsTreeNodeExpressionUnaryOperatorLogicalNot()
-{
-}
+    = default;
 
 void KviKvsTreeNodeExpressionUnaryOperatorLogicalNot::contextDescription(QString & szBuffer)
 {
@@ -341,8 +336,8 @@ bool KviKvsTreeNodeExpressionUnaryOperatorLogicalNot::evaluateReadOnly(KviKvsRun
 KviKvsTreeNodeExpressionBinaryOperator::KviKvsTreeNodeExpressionBinaryOperator(const QChar * pLocation)
     : KviKvsTreeNodeExpressionOperator(pLocation)
 {
-	m_pLeft = 0;
-	m_pRight = 0;
+	m_pLeft = nullptr;
+	m_pRight = nullptr;
 }
 
 KviKvsTreeNodeExpressionBinaryOperator::~KviKvsTreeNodeExpressionBinaryOperator()
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeExtendedScopeVariable.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeExtendedScopeVariable.cpp
index 78dfa8e1d..87fee9c94 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeExtendedScopeVariable.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeExtendedScopeVariable.cpp
@@ -32,8 +32,7 @@ KviKvsTreeNodeExtendedScopeVariable::KviKvsTreeNodeExtendedScopeVariable(const Q
 }
 
 KviKvsTreeNodeExtendedScopeVariable::~KviKvsTreeNodeExtendedScopeVariable()
-{
-}
+    = default;
 
 void KviKvsTreeNodeExtendedScopeVariable::contextDescription(QString & szBuffer)
 {
@@ -72,8 +71,8 @@ KviKvsRWEvaluationResult * KviKvsTreeNodeExtendedScopeVariable::evaluateReadWrit
 	if(!c->extendedScopeVariables())
 	{
 		c->error(this, __tr2qs_ctx("There are no extended scope variables in this scope", "kvs"));
-		return 0;
+		return nullptr;
 	}
 
-	return new KviKvsHashElement(0, c->extendedScopeVariables()->get(m_szIdentifier), c->extendedScopeVariables(), m_szIdentifier);
+	return new KviKvsHashElement(nullptr, c->extendedScopeVariables()->get(m_szIdentifier), c->extendedScopeVariables(), m_szIdentifier);
 }
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeGlobalVariable.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeGlobalVariable.cpp
index eebdbdc99..7ac49af4b 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeGlobalVariable.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeGlobalVariable.cpp
@@ -31,8 +31,7 @@ KviKvsTreeNodeGlobalVariable::KviKvsTreeNodeGlobalVariable(const QChar * pLocati
 }
 
 KviKvsTreeNodeGlobalVariable::~KviKvsTreeNodeGlobalVariable()
-{
-}
+    = default;
 
 void KviKvsTreeNodeGlobalVariable::contextDescription(QString & szBuffer)
 {
@@ -58,5 +57,5 @@ bool KviKvsTreeNodeGlobalVariable::evaluateReadOnly(KviKvsRunTimeContext * c, Kv
 
 KviKvsRWEvaluationResult * KviKvsTreeNodeGlobalVariable::evaluateReadWrite(KviKvsRunTimeContext * c)
 {
-	return new KviKvsHashElement(0, c->globalVariables()->get(m_szIdentifier), c->globalVariables(), m_szIdentifier);
+	return new KviKvsHashElement(nullptr, c->globalVariables()->get(m_szIdentifier), c->globalVariables(), m_szIdentifier);
 }
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeHashCount.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeHashCount.cpp
index b23f14b43..4a65c991c 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeHashCount.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeHashCount.cpp
@@ -34,8 +34,7 @@ KviKvsTreeNodeHashCount::KviKvsTreeNodeHashCount(const QChar * pLocation, KviKvs
 }
 
 KviKvsTreeNodeHashCount::~KviKvsTreeNodeHashCount()
-{
-}
+    = default;
 
 void KviKvsTreeNodeHashCount::contextDescription(QString & szBuffer)
 {
@@ -78,5 +77,5 @@ bool KviKvsTreeNodeHashCount::evaluateReadOnlyInObjectScope(KviKvsObject * o, Kv
 }
 bool KviKvsTreeNodeHashCount::evaluateReadOnly(KviKvsRunTimeContext * c, KviKvsVariant * pBuffer)
 {
-	return evaluateReadOnlyInObjectScope(0, c, pBuffer);
+	return evaluateReadOnlyInObjectScope(nullptr, c, pBuffer);
 }
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeHashElement.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeHashElement.cpp
index 66012df12..ca1c127e4 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeHashElement.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeHashElement.cpp
@@ -109,7 +109,7 @@ KviKvsRWEvaluationResult * KviKvsTreeNodeHashElement::evaluateReadWriteInObjectS
 {
 	KviKvsVariant key;
 	if(!m_pKey->evaluateReadOnly(c, &key))
-		return 0;
+		return nullptr;
 
 	QString szKey;
 	key.asString(szKey);
@@ -125,7 +125,7 @@ KviKvsRWEvaluationResult * KviKvsTreeNodeHashElement::evaluateReadWriteInObjectS
 	else
 		result = m_pSource->evaluateReadWrite(c);
 	if(!result)
-		return 0;
+		return nullptr;
 
 	if(!result->result()->isHash())
 	{
@@ -145,10 +145,10 @@ KviKvsRWEvaluationResult * KviKvsTreeNodeHashElement::evaluateReadWriteInObjectS
 
 bool KviKvsTreeNodeHashElement::evaluateReadOnly(KviKvsRunTimeContext * c, KviKvsVariant * pBuffer)
 {
-	return evaluateReadOnlyInObjectScope(0, c, pBuffer);
+	return evaluateReadOnlyInObjectScope(nullptr, c, pBuffer);
 }
 
 KviKvsRWEvaluationResult * KviKvsTreeNodeHashElement::evaluateReadWrite(KviKvsRunTimeContext * c)
 {
-	return evaluateReadWriteInObjectScope(0, c);
+	return evaluateReadWriteInObjectScope(nullptr, c);
 }
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeHashReferenceAssert.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeHashReferenceAssert.cpp
index f088dbac9..26d3e5d59 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeHashReferenceAssert.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeHashReferenceAssert.cpp
@@ -34,8 +34,7 @@ KviKvsTreeNodeHashReferenceAssert::KviKvsTreeNodeHashReferenceAssert(const QChar
 }
 
 KviKvsTreeNodeHashReferenceAssert::~KviKvsTreeNodeHashReferenceAssert()
-{
-}
+    = default;
 
 bool KviKvsTreeNodeHashReferenceAssert::isReadOnly()
 {
@@ -86,17 +85,17 @@ KviKvsRWEvaluationResult * KviKvsTreeNodeHashReferenceAssert::evaluateReadWriteI
 	else
 		r = m_pSource->evaluateReadWrite(c);
 	if(!r)
-		return 0;
+		return nullptr;
 
 	return r;
 }
 
 bool KviKvsTreeNodeHashReferenceAssert::evaluateReadOnly(KviKvsRunTimeContext * c, KviKvsVariant * pBuffer)
 {
-	return evaluateReadOnlyInObjectScope(0, c, pBuffer);
+	return evaluateReadOnlyInObjectScope(nullptr, c, pBuffer);
 }
 
 KviKvsRWEvaluationResult * KviKvsTreeNodeHashReferenceAssert::evaluateReadWrite(KviKvsRunTimeContext * c)
 {
-	return evaluateReadWriteInObjectScope(0, c);
+	return evaluateReadWriteInObjectScope(nullptr, c);
 }
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeInstructionBlock.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeInstructionBlock.cpp
index e056cb79e..738a13302 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeInstructionBlock.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeInstructionBlock.cpp
@@ -59,7 +59,7 @@ KviKvsTreeNodeInstruction * KviKvsTreeNodeInstructionBlock::releaseFirst()
 	KviKvsTreeNodeInstruction * i = m_pInstructionList->first();
 	if(i)
 	{
-		i->setParent(0);
+		i->setParent(nullptr);
 		m_pInstructionList->removeFirst();
 	}
 	m_pInstructionList->setAutoDelete(true);
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeLocalVariable.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeLocalVariable.cpp
index d5cc822b0..de6d1310a 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeLocalVariable.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeLocalVariable.cpp
@@ -31,8 +31,7 @@ KviKvsTreeNodeLocalVariable::KviKvsTreeNodeLocalVariable(const QChar * pLocation
 }
 
 KviKvsTreeNodeLocalVariable::~KviKvsTreeNodeLocalVariable()
-{
-}
+    = default;
 
 void KviKvsTreeNodeLocalVariable::contextDescription(QString & szBuffer)
 {
@@ -61,7 +60,7 @@ bool KviKvsTreeNodeLocalVariable::evaluateReadOnly(KviKvsRunTimeContext * c, Kvi
 KviKvsRWEvaluationResult * KviKvsTreeNodeLocalVariable::evaluateReadWrite(KviKvsRunTimeContext * c)
 {
 	return new KviKvsHashElement(
-	    0,
+	    nullptr,
 	    c->localVariables()->get(m_szIdentifier),
 	    c->localVariables(),
 	    m_szIdentifier);
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeModuleCallbackCommand.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeModuleCallbackCommand.cpp
index 984b0cdd6..83b036923 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeModuleCallbackCommand.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeModuleCallbackCommand.cpp
@@ -38,8 +38,7 @@ KviKvsTreeNodeModuleCallbackCommand::KviKvsTreeNodeModuleCallbackCommand(const Q
 }
 
 KviKvsTreeNodeModuleCallbackCommand::~KviKvsTreeNodeModuleCallbackCommand()
-{
-}
+    = default;
 
 void KviKvsTreeNodeModuleCallbackCommand::contextDescription(QString & szBuffer)
 {
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeModuleFunctionCall.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeModuleFunctionCall.cpp
index 014c3e540..99717ca7b 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeModuleFunctionCall.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeModuleFunctionCall.cpp
@@ -37,8 +37,7 @@ KviKvsTreeNodeModuleFunctionCall::KviKvsTreeNodeModuleFunctionCall(const QChar *
 }
 
 KviKvsTreeNodeModuleFunctionCall::~KviKvsTreeNodeModuleFunctionCall()
-{
-}
+    = default;
 
 void KviKvsTreeNodeModuleFunctionCall::contextDescription(QString & szBuffer)
 {
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeModuleSimpleCommand.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeModuleSimpleCommand.cpp
index 43910279f..200e750cf 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeModuleSimpleCommand.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeModuleSimpleCommand.cpp
@@ -38,8 +38,7 @@ KviKvsTreeNodeModuleSimpleCommand::KviKvsTreeNodeModuleSimpleCommand(const QChar
 }
 
 KviKvsTreeNodeModuleSimpleCommand::~KviKvsTreeNodeModuleSimpleCommand()
-{
-}
+    = default;
 
 void KviKvsTreeNodeModuleSimpleCommand::contextDescription(QString & szBuffer)
 {
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeMultipleParameterIdentifier.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeMultipleParameterIdentifier.cpp
index 666dacc43..a3a636b4b 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeMultipleParameterIdentifier.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeMultipleParameterIdentifier.cpp
@@ -34,8 +34,7 @@ KviKvsTreeNodeMultipleParameterIdentifier::KviKvsTreeNodeMultipleParameterIdenti
 }
 
 KviKvsTreeNodeMultipleParameterIdentifier::~KviKvsTreeNodeMultipleParameterIdentifier()
-{
-}
+    = default;
 
 void KviKvsTreeNodeMultipleParameterIdentifier::contextDescription(QString & szBuffer)
 {
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeObjectField.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeObjectField.cpp
index 633c78467..b2c33675d 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeObjectField.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeObjectField.cpp
@@ -33,8 +33,7 @@ KviKvsTreeNodeObjectField::KviKvsTreeNodeObjectField(const QChar * pLocation, co
 }
 
 KviKvsTreeNodeObjectField::~KviKvsTreeNodeObjectField()
-{
-}
+    = default;
 
 void KviKvsTreeNodeObjectField::contextDescription(QString & szBuffer)
 {
@@ -65,5 +64,5 @@ bool KviKvsTreeNodeObjectField::evaluateReadOnlyInObjectScope(KviKvsObject * o,
 
 KviKvsRWEvaluationResult * KviKvsTreeNodeObjectField::evaluateReadWriteInObjectScope(KviKvsObject * o, KviKvsRunTimeContext *)
 {
-	return new KviKvsHashElement(0, o->dataContainer()->get(m_szIdentifier), o->dataContainer(), m_szIdentifier);
+	return new KviKvsHashElement(nullptr, o->dataContainer()->get(m_szIdentifier), o->dataContainer(), m_szIdentifier);
 }
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeObjectFunctionCall.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeObjectFunctionCall.cpp
index a331e73c9..b37107860 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeObjectFunctionCall.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeObjectFunctionCall.cpp
@@ -30,8 +30,7 @@ KviKvsTreeNodeObjectFunctionCall::KviKvsTreeNodeObjectFunctionCall(const QChar *
 }
 
 KviKvsTreeNodeObjectFunctionCall::~KviKvsTreeNodeObjectFunctionCall()
-{
-}
+    = default;
 
 void KviKvsTreeNodeObjectFunctionCall::contextDescription(QString & szBuffer)
 {
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeOperation.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeOperation.cpp
index 18734f180..c9b383d68 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeOperation.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeOperation.cpp
@@ -108,8 +108,7 @@ KviKvsTreeNodeOperationDecrement::KviKvsTreeNodeOperationDecrement(const QChar *
 }
 
 KviKvsTreeNodeOperationDecrement::~KviKvsTreeNodeOperationDecrement()
-{
-}
+    = default;
 
 void KviKvsTreeNodeOperationDecrement::contextDescription(QString & szBuffer)
 {
@@ -135,7 +134,7 @@ bool KviKvsTreeNodeOperationDecrement::execute(KviKvsRunTimeContext * c)
 	{
 		v->result()->setInteger(iVal - 1);
 		delete v;
-		v = 0;
+		v = nullptr;
 		return true;
 	}
 
@@ -144,7 +143,7 @@ bool KviKvsTreeNodeOperationDecrement::execute(KviKvsRunTimeContext * c)
 	{
 		v->result()->setReal(dVal - 1.0);
 		delete v;
-		v = 0;
+		v = nullptr;
 		return true;
 	}
 
@@ -159,8 +158,7 @@ KviKvsTreeNodeOperationIncrement::KviKvsTreeNodeOperationIncrement(const QChar *
 }
 
 KviKvsTreeNodeOperationIncrement::~KviKvsTreeNodeOperationIncrement()
-{
-}
+    = default;
 
 void KviKvsTreeNodeOperationIncrement::contextDescription(QString & szBuffer)
 {
@@ -186,7 +184,7 @@ bool KviKvsTreeNodeOperationIncrement::execute(KviKvsRunTimeContext * c)
 	{
 		v->result()->setInteger(iVal + 1);
 		delete v;
-		v = 0;
+		v = nullptr;
 		return true;
 	}
 
@@ -195,7 +193,7 @@ bool KviKvsTreeNodeOperationIncrement::execute(KviKvsRunTimeContext * c)
 	{
 		v->result()->setReal(dVal + 1.0);
 		delete v;
-		v = 0;
+		v = nullptr;
 		return true;
 	}
 	c->error(this, __tr2qs_ctx("The target variable didn't evaluate to an integer or real value", "kvs"));
@@ -253,7 +251,7 @@ bool KviKvsTreeNodeOperationSelfAnd::execute(KviKvsRunTimeContext * c)
 	{
 		c->error(this, __tr2qs_ctx("The left side of operator '&=' didn't evaluate to an integer", "kvs"));
 		delete target;
-		target = 0;
+		target = nullptr;
 		return false;
 	}
 
@@ -312,7 +310,7 @@ bool KviKvsTreeNodeOperationSelfDivision::execute(KviKvsRunTimeContext * c)
 	{
 		c->error(this, __tr2qs_ctx("The left side of operator '/=' didn't evaluate to a number", "kvs"));
 		delete target;
-		target = 0;
+		target = nullptr;
 		return false;
 	}
 
@@ -322,7 +320,7 @@ bool KviKvsTreeNodeOperationSelfDivision::execute(KviKvsRunTimeContext * c)
 		{
 			c->error(this, __tr2qs_ctx("Division by zero", "kvs"));
 			delete target;
-			target = 0;
+			target = nullptr;
 			return false;
 		}
 		if(lnum.isInteger())
@@ -336,7 +334,7 @@ bool KviKvsTreeNodeOperationSelfDivision::execute(KviKvsRunTimeContext * c)
 		{
 			c->error(this, __tr2qs_ctx("Division by zero", "kvs"));
 			delete target;
-			target = 0;
+			target = nullptr;
 			return false;
 		}
 		if(lnum.isInteger())
@@ -398,7 +396,7 @@ bool KviKvsTreeNodeOperationSelfModulus::execute(KviKvsRunTimeContext * c)
 	{
 		c->error(this, __tr2qs_ctx("The left side of operator '%=' didn't evaluate to a number", "kvs"));
 		delete target;
-		target = 0;
+		target = nullptr;
 		return false;
 	}
 
@@ -408,7 +406,7 @@ bool KviKvsTreeNodeOperationSelfModulus::execute(KviKvsRunTimeContext * c)
 		{
 			c->error(this, __tr2qs_ctx("Division by zero", "kvs"));
 			delete target;
-			target = 0;
+			target = nullptr;
 			return false;
 		}
 		if(lnum.isInteger())
@@ -422,7 +420,7 @@ bool KviKvsTreeNodeOperationSelfModulus::execute(KviKvsRunTimeContext * c)
 		{
 			c->error(this, __tr2qs_ctx("Division by zero", "kvs"));
 			delete target;
-			target = 0;
+			target = nullptr;
 			return false;
 		}
 		if(lnum.isInteger())
@@ -551,7 +549,7 @@ bool KviKvsTreeNodeOperationSelfOr::execute(KviKvsRunTimeContext * c)
 	{
 		c->error(this, __tr2qs_ctx("The left side of operator '|=' didn't evaluate to an integer", "kvs"));
 		delete target;
-		target = 0;
+		target = nullptr;
 		return false;
 	}
 
@@ -610,7 +608,7 @@ bool KviKvsTreeNodeOperationSelfShl::execute(KviKvsRunTimeContext * c)
 	{
 		c->error(this, __tr2qs_ctx("The left side of operator '<<=' didn't evaluate to an integer", "kvs"));
 		delete target;
-		target = 0;
+		target = nullptr;
 		return false;
 	}
 
@@ -669,7 +667,7 @@ bool KviKvsTreeNodeOperationSelfShr::execute(KviKvsRunTimeContext * c)
 	{
 		c->error(this, __tr2qs_ctx("The left side of operator '>>=' didn't evaluate to an integer", "kvs"));
 		delete target;
-		target = 0;
+		target = nullptr;
 		return false;
 	}
 
@@ -727,7 +725,7 @@ bool KviKvsTreeNodeOperationSelfSubtraction::execute(KviKvsRunTimeContext * c)
 	{
 		c->error(this, __tr2qs_ctx("The left side of operator '-=' didn't evaluate to a number", "kvs"));
 		delete target;
-		target = 0;
+		target = nullptr;
 		return false;
 	}
 
@@ -800,7 +798,7 @@ bool KviKvsTreeNodeOperationSelfSum::execute(KviKvsRunTimeContext * c)
 	{
 		c->error(this, __tr2qs_ctx("The left side of operator '+=' didn't evaluate to a number", "kvs"));
 		delete target;
-		target = 0;
+		target = nullptr;
 		return false;
 	}
 
@@ -873,7 +871,7 @@ bool KviKvsTreeNodeOperationSelfXor::execute(KviKvsRunTimeContext * c)
 	{
 		c->error(this, __tr2qs_ctx("The left side of operator '^=' didn't evaluate to an integer", "kvs"));
 		delete target;
-		target = 0;
+		target = nullptr;
 		return false;
 	}
 
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeParameterCount.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeParameterCount.cpp
index 91aa88d17..62fcfb402 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeParameterCount.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeParameterCount.cpp
@@ -32,8 +32,7 @@ KviKvsTreeNodeParameterCount::KviKvsTreeNodeParameterCount(const QChar * pLocati
 }
 
 KviKvsTreeNodeParameterCount::~KviKvsTreeNodeParameterCount()
-{
-}
+    = default;
 
 void KviKvsTreeNodeParameterCount::contextDescription(QString & szBuffer)
 {
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeRebindingSwitch.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeRebindingSwitch.cpp
index 1af7292f1..42cce4604 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeRebindingSwitch.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeRebindingSwitch.cpp
@@ -76,7 +76,7 @@ bool KviKvsTreeNodeRebindingSwitch::execute(KviKvsRunTimeContext * c)
 	if(szWinId.isEmpty())
 	{
 		c->warning(this, __tr2qs_ctx("Empty window identifier specified in the standard rebinding switch: no rebinding performed", "kvs"));
-		pNewWindow = 0;
+		pNewWindow = nullptr;
 	}
 
 	pNewWindow = g_pApp->findWindow(szWinId.toUtf8().data());
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeScopeOperator.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeScopeOperator.cpp
index 1d4580d91..90361ef4e 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeScopeOperator.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeScopeOperator.cpp
@@ -89,20 +89,20 @@ KviKvsObject * KviKvsTreeNodeScopeOperator::objectFromVariant(KviKvsRunTimeConte
 	if(!v->asHObject(hObject))
 	{
 		c->error(this, __tr2qs_ctx("The left side of the scope operator didn't evaluate as an object reference", "kvs"));
-		return 0;
+		return nullptr;
 	}
 
-	if(hObject == (kvs_hobject_t)0)
+	if(hObject == (kvs_hobject_t) nullptr)
 	{
 		c->error(this, __tr2qs_ctx("The left side of the scope operator evaluated to a null object reference", "kvs"));
-		return 0;
+		return nullptr;
 	}
 
 	KviKvsObject * o = KviKvsKernel::instance()->objectController()->lookupObject(hObject);
 	if(!o)
 	{
 		c->error(this, __tr2qs_ctx("The left side of the scope operator evaluated to an invalid object reference (object doesn't exist)", "kvs"));
-		return 0;
+		return nullptr;
 	}
 	return o;
 }
@@ -122,10 +122,10 @@ KviKvsRWEvaluationResult * KviKvsTreeNodeScopeOperator::evaluateReadWrite(KviKvs
 {
 	KviKvsVariant ret;
 	if(!m_pObjectReference->evaluateReadOnly(c, &ret))
-		return 0;
+		return nullptr;
 	KviKvsObject * o = objectFromVariant(c, &ret);
 	if(!o)
-		return 0;
+		return nullptr;
 	return m_pRightSide->evaluateReadWriteInObjectScope(o, c);
 }
 
@@ -144,9 +144,9 @@ KviKvsRWEvaluationResult * KviKvsTreeNodeScopeOperator::evaluateReadWriteInObjec
 {
 	KviKvsVariant ret;
 	if(!m_pObjectReference->evaluateReadOnlyInObjectScope(o, c, &ret))
-		return 0;
+		return nullptr;
 	KviKvsObject * pObject = objectFromVariant(c, &ret);
 	if(!pObject)
-		return 0;
+		return nullptr;
 	return m_pRightSide->evaluateReadWriteInObjectScope(pObject, c);
 }
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeSimpleCommand.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeSimpleCommand.cpp
index a38403c22..e598c24e3 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeSimpleCommand.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeSimpleCommand.cpp
@@ -31,8 +31,7 @@ KviKvsTreeNodeSimpleCommand::KviKvsTreeNodeSimpleCommand(const QChar * pLocation
 }
 
 KviKvsTreeNodeSimpleCommand::~KviKvsTreeNodeSimpleCommand()
-{
-}
+    = default;
 
 void KviKvsTreeNodeSimpleCommand::contextDescription(QString & szBuffer)
 {
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeSingleParameterIdentifier.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeSingleParameterIdentifier.cpp
index 3ad7915eb..c15323d67 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeSingleParameterIdentifier.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeSingleParameterIdentifier.cpp
@@ -33,8 +33,7 @@ KviKvsTreeNodeSingleParameterIdentifier::KviKvsTreeNodeSingleParameterIdentifier
 }
 
 KviKvsTreeNodeSingleParameterIdentifier::~KviKvsTreeNodeSingleParameterIdentifier()
-{
-}
+    = default;
 
 void KviKvsTreeNodeSingleParameterIdentifier::contextDescription(QString & szBuffer)
 {
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommand.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommand.cpp
index 4fa7981d2..6ef08aa42 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommand.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommand.cpp
@@ -30,8 +30,7 @@ KviKvsTreeNodeSpecialCommand::KviKvsTreeNodeSpecialCommand(const QChar * pLocati
 }
 
 KviKvsTreeNodeSpecialCommand::~KviKvsTreeNodeSpecialCommand()
-{
-}
+    = default;
 
 void KviKvsTreeNodeSpecialCommand::contextDescription(QString & szBuffer)
 {
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandBreak.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandBreak.cpp
index 6e8c41bcc..58c9a8f53 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandBreak.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandBreak.cpp
@@ -32,8 +32,7 @@ KviKvsTreeNodeSpecialCommandBreak::KviKvsTreeNodeSpecialCommandBreak(const QChar
 }
 
 KviKvsTreeNodeSpecialCommandBreak::~KviKvsTreeNodeSpecialCommandBreak()
-{
-}
+    = default;
 
 void KviKvsTreeNodeSpecialCommandBreak::contextDescription(QString & szBuffer)
 {
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandClass.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandClass.cpp
index 727b90c0b..e1744ebf5 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandClass.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandClass.cpp
@@ -153,7 +153,7 @@ bool KviKvsTreeNodeSpecialCommandClass::execute(KviKvsRunTimeContext * c)
 		c->error(this, __tr2qs_ctx("Can't override the builtin class '%Q'", "kvs"), &szClassName);
 		return false;
 	}
-	pActualClass = new KviKvsObjectClass(pBaseClass, szClassName, 0, false);
+	pActualClass = new KviKvsObjectClass(pBaseClass, szClassName, nullptr, false);
 
 	for(KviKvsTreeNodeSpecialCommandClassFunctionDefinition * d = m_pFunctions->first(); d; d = m_pFunctions->next())
 	{
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandContinue.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandContinue.cpp
index 9594ae041..744cfc928 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandContinue.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandContinue.cpp
@@ -32,8 +32,7 @@ KviKvsTreeNodeSpecialCommandContinue::KviKvsTreeNodeSpecialCommandContinue(const
 }
 
 KviKvsTreeNodeSpecialCommandContinue::~KviKvsTreeNodeSpecialCommandContinue()
-{
-}
+    = default;
 
 void KviKvsTreeNodeSpecialCommandContinue::contextDescription(QString & szBuffer)
 {
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandForeach.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandForeach.cpp
index 69ff97655..b3d4da886 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandForeach.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandForeach.cpp
@@ -77,7 +77,7 @@ bool KviKvsTreeNodeSpecialCommandForeach::execute(KviKvsRunTimeContext * c)
 			return false;
 	}
 
-	bool bIncludeEmptyScalars = swl.find('a', "all") != 0;
+	bool bIncludeEmptyScalars = swl.find('a', "all") != nullptr;
 
 	for(KviKvsVariant * pArg = l.first(); pArg; pArg = l.next())
 	{
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandSwitch.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandSwitch.cpp
index b276b30dd..c8946414a 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandSwitch.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandSwitch.cpp
@@ -33,8 +33,8 @@
 KviKvsTreeNodeSpecialCommandSwitchLabel::KviKvsTreeNodeSpecialCommandSwitchLabel(const QChar * pLocation)
     : KviKvsTreeNode(pLocation)
 {
-	m_pParameter = 0;
-	m_pInstruction = 0;
+	m_pParameter = nullptr;
+	m_pInstruction = nullptr;
 	m_bHasTerminatingBreak = false;
 }
 
@@ -70,8 +70,7 @@ KviKvsTreeNodeSpecialCommandSwitchLabelCase::KviKvsTreeNodeSpecialCommandSwitchL
 }
 
 KviKvsTreeNodeSpecialCommandSwitchLabelCase::~KviKvsTreeNodeSpecialCommandSwitchLabelCase()
-{
-}
+    = default;
 
 void KviKvsTreeNodeSpecialCommandSwitchLabelCase::contextDescription(QString & szBuffer)
 {
@@ -165,8 +164,7 @@ KviKvsTreeNodeSpecialCommandSwitchLabelMatch::KviKvsTreeNodeSpecialCommandSwitch
 }
 
 KviKvsTreeNodeSpecialCommandSwitchLabelMatch::~KviKvsTreeNodeSpecialCommandSwitchLabelMatch()
-{
-}
+    = default;
 
 void KviKvsTreeNodeSpecialCommandSwitchLabelMatch::contextDescription(QString & szBuffer)
 {
@@ -225,8 +223,7 @@ KviKvsTreeNodeSpecialCommandSwitchLabelRegexp::KviKvsTreeNodeSpecialCommandSwitc
 }
 
 KviKvsTreeNodeSpecialCommandSwitchLabelRegexp::~KviKvsTreeNodeSpecialCommandSwitchLabelRegexp()
-{
-}
+    = default;
 
 void KviKvsTreeNodeSpecialCommandSwitchLabelRegexp::contextDescription(QString & szBuffer)
 {
@@ -285,8 +282,7 @@ KviKvsTreeNodeSpecialCommandSwitchLabelDefault::KviKvsTreeNodeSpecialCommandSwit
 }
 
 KviKvsTreeNodeSpecialCommandSwitchLabelDefault::~KviKvsTreeNodeSpecialCommandSwitchLabelDefault()
-{
-}
+    = default;
 
 void KviKvsTreeNodeSpecialCommandSwitchLabelDefault::contextDescription(QString & szBuffer)
 {
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeSwitchList.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeSwitchList.cpp
index 0b7d8504e..7f6c39f86 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeSwitchList.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeSwitchList.cpp
@@ -28,8 +28,8 @@
 KviKvsTreeNodeSwitchList::KviKvsTreeNodeSwitchList(const QChar * pLocation)
     : KviKvsTreeNode(pLocation)
 {
-	m_pShortSwitchDict = 0;
-	m_pLongSwitchDict = 0;
+	m_pShortSwitchDict = nullptr;
+	m_pLongSwitchDict = nullptr;
 }
 
 KviKvsTreeNodeSwitchList::~KviKvsTreeNodeSwitchList()
@@ -165,5 +165,5 @@ KviKvsTreeNodeData * KviKvsTreeNodeSwitchList::getStandardRebindingSwitch()
 			return d;
 		}
 	}
-	return 0;
+	return nullptr;
 }
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeThisObjectFunctionCall.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeThisObjectFunctionCall.cpp
index b19463844..1cac36ac8 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeThisObjectFunctionCall.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeThisObjectFunctionCall.cpp
@@ -31,8 +31,7 @@ KviKvsTreeNodeThisObjectFunctionCall::KviKvsTreeNodeThisObjectFunctionCall(const
 }
 
 KviKvsTreeNodeThisObjectFunctionCall::~KviKvsTreeNodeThisObjectFunctionCall()
-{
-}
+    = default;
 
 void KviKvsTreeNodeThisObjectFunctionCall::contextDescription(QString & szBuffer)
 {
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeVariable.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeVariable.cpp
index cd0d8be67..defb33c0c 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeVariable.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeVariable.cpp
@@ -31,8 +31,7 @@ KviKvsTreeNodeVariable::KviKvsTreeNodeVariable(const QChar * pLocation, const QS
 }
 
 KviKvsTreeNodeVariable::~KviKvsTreeNodeVariable()
-{
-}
+    = default;
 
 bool KviKvsTreeNodeVariable::isReadOnly()
 {
diff --git a/src/kvirc/module/KviMexLinkFilter.cpp b/src/kvirc/module/KviMexLinkFilter.cpp
index ea1979106..bf547d64c 100644
--- a/src/kvirc/module/KviMexLinkFilter.cpp
+++ b/src/kvirc/module/KviMexLinkFilter.cpp
@@ -30,5 +30,4 @@ KviMexLinkFilter::KviMexLinkFilter(KviModuleExtensionDescriptor * d)
 }
 
 KviMexLinkFilter::~KviMexLinkFilter()
-{
-}
+    = default;
diff --git a/src/kvirc/module/KviMexServerImport.cpp b/src/kvirc/module/KviMexServerImport.cpp
index 6ddb444f6..b0bd23a63 100644
--- a/src/kvirc/module/KviMexServerImport.cpp
+++ b/src/kvirc/module/KviMexServerImport.cpp
@@ -30,5 +30,4 @@ KviMexServerImport::KviMexServerImport(KviModuleExtensionDescriptor * d)
 }
 
 KviMexServerImport::~KviMexServerImport()
-{
-}
+    = default;
diff --git a/src/kvirc/module/KviModule.cpp b/src/kvirc/module/KviModule.cpp
index a35386abd..83cd579ee 100644
--- a/src/kvirc/module/KviModule.cpp
+++ b/src/kvirc/module/KviModule.cpp
@@ -138,7 +138,7 @@ KviModule::KviModule(QLibrary * handle, KviModuleInfo * info, const QString & na
 	m_szName = name;
 	m_szFileName = filename;
 	m_uLock = 0;
-	m_lastAccessTime = (long int)time(0);
+	m_lastAccessTime = (long int)time(nullptr);
 }
 
 KviModule::~KviModule()
@@ -176,12 +176,12 @@ void KviModule::unregisterAllExtensions()
 
 void KviModule::updateAccessTime()
 {
-	m_lastAccessTime = (long int)time(0);
+	m_lastAccessTime = (long int)time(nullptr);
 }
 
 unsigned int KviModule::secondsSinceLastAccess()
 {
-	return (unsigned int)(((long int)time(0)) - m_lastAccessTime);
+	return (unsigned int)(((long int)time(nullptr)) - m_lastAccessTime);
 }
 
 #ifdef COMPILE_CRYPT_SUPPORT
diff --git a/src/kvirc/module/KviModuleExtension.cpp b/src/kvirc/module/KviModuleExtension.cpp
index 03f883f53..40f9f85d3 100644
--- a/src/kvirc/module/KviModuleExtension.cpp
+++ b/src/kvirc/module/KviModuleExtension.cpp
@@ -30,7 +30,7 @@
 #include "KviApplication.h"
 
 // created and destroyed in KviApplication.cpp
-KVIRC_API KviModuleExtensionManager * g_pModuleExtensionManager = 0;
+KVIRC_API KviModuleExtensionManager * g_pModuleExtensionManager = nullptr;
 
 KviModuleExtensionDescriptor::KviModuleExtensionDescriptor(KviModule * m, const KviCString & szType, const KviCString & szName, const QString & szVisibleName, KviModuleExtensionAllocRoutine r, const QPixmap & pix)
 {
@@ -44,7 +44,7 @@ KviModuleExtensionDescriptor::KviModuleExtensionDescriptor(KviModule * m, const
 	m_pObjectList = new KviPointerList<KviModuleExtension>;
 	m_pObjectList->setAutoDelete(false);
 	if(pix.isNull())
-		m_pIcon = 0;
+		m_pIcon = nullptr;
 	else
 		m_pIcon = new QPixmap(pix);
 }
@@ -63,7 +63,7 @@ void KviModuleExtensionDescriptor::setIcon(const QPixmap & pix)
 	if(m_pIcon)
 		delete m_pIcon;
 	if(pix.isNull())
-		m_pIcon = 0;
+		m_pIcon = nullptr;
 	else
 		m_pIcon = new QPixmap(pix);
 }
@@ -173,7 +173,7 @@ KviModuleExtensionDescriptor * KviModuleExtensionManager::findExtensionDescripto
 {
 	KviModuleExtensionDescriptorList * l = m_pExtensionDict->find(szType.ptr());
 	if(!l)
-		return 0;
+		return nullptr;
 
 	for(KviModuleExtensionDescriptor * d = l->first(); d; d = l->next())
 	{
@@ -181,14 +181,14 @@ KviModuleExtensionDescriptor * KviModuleExtensionManager::findExtensionDescripto
 			return d;
 	}
 
-	return 0;
+	return nullptr;
 }
 
 KviModuleExtension * KviModuleExtensionManager::allocateExtension(const KviCString & szType, const KviCString & szName, KviWindow * pWnd, KviPointerHashTable<QString, QVariant> * pParams, void * pSpecial, const QString & preloadModule)
 {
 	KviModuleExtensionDescriptorList * l = allocateExtensionGetDescriptorList(szType, preloadModule);
 	if(!l)
-		return 0;
+		return nullptr;
 
 	KviModuleExtensionDescriptor * d;
 
@@ -210,14 +210,14 @@ KviModuleExtension * KviModuleExtensionManager::allocateExtension(const KviCStri
 
 	// no way : no such extension
 
-	return 0;
+	return nullptr;
 }
 
 KviModuleExtension * KviModuleExtensionManager::allocateExtension(const KviCString & szType, int id, KviWindow * pWnd, KviPointerHashTable<QString, QVariant> * pParams, void * pSpecial, const QString & preloadModule)
 {
 	KviModuleExtensionDescriptorList * l = allocateExtensionGetDescriptorList(szType, preloadModule);
 	if(!l)
-		return 0;
+		return nullptr;
 
 	KviModuleExtensionDescriptor * d;
 	for(d = l->first(); d; d = l->next())
@@ -237,7 +237,7 @@ KviModuleExtension * KviModuleExtensionManager::allocateExtension(const KviCStri
 	}
 	// no way : no such extension
 
-	return 0;
+	return nullptr;
 }
 
 KviModuleExtension::KviModuleExtension(KviModuleExtensionDescriptor * d)
diff --git a/src/kvirc/module/KviModuleManager.cpp b/src/kvirc/module/KviModuleManager.cpp
index 3f34fd459..c9e3b0a49 100644
--- a/src/kvirc/module/KviModuleManager.cpp
+++ b/src/kvirc/module/KviModuleManager.cpp
@@ -36,7 +36,7 @@
 #include <QDir>
 #include <QLibrary>
 
-KviModuleManager * g_pModuleManager = 0;
+KviModuleManager * g_pModuleManager = nullptr;
 
 KviModuleManager::KviModuleManager()
 {
@@ -68,9 +68,8 @@ void KviModuleManager::loadModulesByCaps(const QString & caps, const QString & d
 	// FIXME: maybe check timestamps ? (old modules)
 
 	QStringList sl = d.entryList(QDir::Files | QDir::Readable | QDir::NoSymLinks);
-	for(QStringList::Iterator it = sl.begin(); it != sl.end(); ++it)
+	for(auto modname : sl)
 	{
-		QString modname = *it;
 		KviQString::cutToLast(modname, KVI_PATH_SEPARATOR_CHAR);
 		getModule(modname);
 	}
@@ -98,9 +97,9 @@ void KviModuleManager::completeModuleNames(const QString & path, const QString &
 	// FIXME: maybe check timestamps ? (old modules)
 
 	QStringList sl = d.entryList(QDir::Files | QDir::Readable | QDir::NoSymLinks);
-	for(QStringList::Iterator it = sl.begin(); it != sl.end(); ++it)
+	for(auto & it : sl)
 	{
-		QString * modname = new QString(*it);
+		QString * modname = new QString(it);
 		KviQString::cutToLast(*modname, KVI_PATH_SEPARATOR_CHAR);
 		KviQString::cutToFirst(*modname, "kvi");
 		if(KviQString::equalCIN(word, *modname, word.length()))
@@ -147,7 +146,7 @@ KviModule * KviModuleManager::getModule(const QString & modName)
 	if(!m)
 	{
 		if(!loadModule(modName))
-			return 0;
+			return nullptr;
 		m = m_pModuleDict->find(modName);
 	}
 	if(m)
diff --git a/src/kvirc/sparser/KviAntiSpam.cpp b/src/kvirc/sparser/KviAntiSpam.cpp
index 2c301ac21..faa16bc90 100644
--- a/src/kvirc/sparser/KviAntiSpam.cpp
+++ b/src/kvirc/sparser/KviAntiSpam.cpp
@@ -104,12 +104,11 @@
 
 bool kvi_mayBeSpam(KviCString * msg, KviCString & spamWord)
 {
-	for(QStringList::Iterator it = KVI_OPTION_STRINGLIST(KviOption_stringlistSpamWords).begin();
-	    it != KVI_OPTION_STRINGLIST(KviOption_stringlistSpamWords).end(); ++it)
+	for(auto & it : KVI_OPTION_STRINGLIST(KviOption_stringlistSpamWords))
 	{
 		// FIXME : This is SLOOOOOOOOW (QString -> ascii translation!!)
 
-		const char * aux = (*it).toLatin1();
+		const char * aux = it.toLatin1();
 		if(aux)
 		{
 			if(msg->findFirstIdx(aux, false) != -1)
diff --git a/src/kvirc/sparser/KviIrcMessage.cpp b/src/kvirc/sparser/KviIrcMessage.cpp
index f6809ce68..94a4be2e5 100644
--- a/src/kvirc/sparser/KviIrcMessage.cpp
+++ b/src/kvirc/sparser/KviIrcMessage.cpp
@@ -285,7 +285,7 @@ QString * KviIrcMessage::messageTagPtr(const QString & szTag)
 {
 	QHash<QString, QString>::iterator i = m_ParsedMessageTags.find(szTag);
 	if(i == m_ParsedMessageTags.end())
-		return NULL;
+		return nullptr;
 	return &*i;
 }
 
diff --git a/src/kvirc/sparser/KviIrcServerParser.cpp b/src/kvirc/sparser/KviIrcServerParser.cpp
index 143eef16f..e500b2b8a 100644
--- a/src/kvirc/sparser/KviIrcServerParser.cpp
+++ b/src/kvirc/sparser/KviIrcServerParser.cpp
@@ -34,17 +34,16 @@
 #include "KviKvsEventTriggers.h"
 #include "KviIrcConnectionStateData.h"
 
-KviIrcServerParser * g_pServerParser = 0;
+KviIrcServerParser * g_pServerParser = nullptr;
 
 KviIrcServerParser::KviIrcServerParser()
-    : QObject(0)
+    : QObject(nullptr)
 {
 	setObjectName("server_parser");
 }
 
 KviIrcServerParser::~KviIrcServerParser()
-{
-}
+    = default;
 
 void KviIrcServerParser::parseMessage(const char * message, KviIrcConnection * pConnection)
 {
diff --git a/src/kvirc/sparser/KviIrcServerParser_ctcp.cpp b/src/kvirc/sparser/KviIrcServerParser_ctcp.cpp
index e852c2eaa..8b895d7cf 100644
--- a/src/kvirc/sparser/KviIrcServerParser_ctcp.cpp
+++ b/src/kvirc/sparser/KviIrcServerParser_ctcp.cpp
@@ -641,7 +641,7 @@ const char * KviIrcServerParser::extractCtcpParameter(const char * msg_ptr, KviC
 	//
 
 	if(!msg_ptr)
-		return 0;
+		return nullptr;
 	while(*msg_ptr == ' ')
 		msg_ptr++; // skip leading spaces
 
@@ -745,7 +745,7 @@ const char * KviIrcServerParser::extractCtcpParameter(const char * p_msg_ptr, QS
 	const char * msg_ptr = p_msg_ptr;
 	int bInString = 0;
 	if(!msg_ptr)
-		return 0;
+		return nullptr;
 	while(*msg_ptr == ' ')
 		msg_ptr++; // skip leading spaces
 
@@ -1122,7 +1122,7 @@ void KviIrcServerParser::parseCtcpReplyPing(KviCtcpMessage * msg)
 		KviCString szTime;
 
 		struct timeval tv;
-		kvi_gettimeofday(&tv, 0);
+		kvi_gettimeofday(&tv, nullptr);
 
 		msg->pData = extractCtcpParameter(msg->pData, szTime, true);
 
@@ -1281,7 +1281,7 @@ static const char * ctcpTagTable[][2] = {
 	            " sets your own on this side if sent through a NOTICE" },
 	{ "DCC", "Initiates a DCC connection (XDCC,TDCC)" },
 	{ "PAGE", "Leaves a message for this user" },
-	{ 0, 0 }
+	{ nullptr, nullptr }
 };
 
 void KviIrcServerParser::parseCtcpRequestClientinfo(KviCtcpMessage * msg)
@@ -1448,7 +1448,7 @@ void KviIrcServerParser::parseCtcpRequestAction(KviCtcpMessage * msg)
 	//msg->pData = extractCtcpParameter(msg->pData,szData8,false);
 	szData8 = msg->pData;
 
-	KviWindow * pOut = 0;
+	KviWindow * pOut = nullptr;
 	bool bIsChannel = !IS_ME(msg->msg, msg->szTarget);
 
 	QString szData;
@@ -1490,7 +1490,7 @@ void KviIrcServerParser::parseCtcpRequestAction(KviCtcpMessage * msg)
 					query->setTarget(msg->pSource->nick(), msg->pSource->user(), msg->pSource->host());
 				}
 				if(!KVI_OPTION_STRING(KviOption_stringOnNewQueryOpenedSound).isEmpty())
-					KviKvsScript::run("snd.play $0", 0, new KviKvsVariantList(new KviKvsVariant(KVI_OPTION_STRING(KviOption_stringOnNewQueryOpenedSound))));
+					KviKvsScript::run("snd.play $0", nullptr, new KviKvsVariantList(new KviKvsVariant(KVI_OPTION_STRING(KviOption_stringOnNewQueryOpenedSound))));
 			}
 		}
 		else
@@ -1673,7 +1673,7 @@ void KviIrcServerParser::parseCtcpReplyAvatar(KviCtcpMessage * msg)
 	bool bPrivate = IS_ME(msg->msg, msg->szTarget);
 
 	QString textLine;
-	KviAvatar * avatar = 0;
+	KviAvatar * avatar = nullptr;
 
 	bool bResetAvatar = true;
 
@@ -1724,7 +1724,7 @@ void KviIrcServerParser::parseCtcpReplyAvatar(KviCtcpMessage * msg)
 
 		avatar = g_pIconManager->getAvatar(QString(), szRemoteFile);
 
-		if((avatar == 0) && e)
+		if((avatar == nullptr) && e)
 		{
 			// we have no such file on our HD....
 			bResetAvatar = false;
diff --git a/src/kvirc/sparser/KviIrcServerParser_literalHandlers.cpp b/src/kvirc/sparser/KviIrcServerParser_literalHandlers.cpp
index 01923c24b..69334a883 100644
--- a/src/kvirc/sparser/KviIrcServerParser_literalHandlers.cpp
+++ b/src/kvirc/sparser/KviIrcServerParser_literalHandlers.cpp
@@ -720,7 +720,7 @@ void KviIrcServerParser::parseLiteralKick(KviIrcMessage * msg)
 		       szNick, szUser, szHost, szKickMsg))
 			msg->setHaltOutput();
 		if(!KVI_OPTION_STRING(KviOption_stringOnMeKickedSound).isEmpty())
-			KviKvsScript::run("snd.play $0", 0, new KviKvsVariantList(new KviKvsVariant(KVI_OPTION_STRING(KviOption_stringOnMeKickedSound))));
+			KviKvsScript::run("snd.play $0", nullptr, new KviKvsVariantList(new KviKvsVariant(KVI_OPTION_STRING(KviOption_stringOnMeKickedSound))));
 
 		QString szPass = chan->hasChannelMode('k') ? chan->channelModeParam('k') : "";
 
@@ -1041,7 +1041,7 @@ void KviIrcServerParser::parseLiteralPrivmsg(KviIrcMessage * msg)
 				if(query)
 				{
 					if(!KVI_OPTION_STRING(KviOption_stringOnNewQueryOpenedSound).isEmpty())
-						KviKvsScript::run("snd.play $0", 0, new KviKvsVariantList(new KviKvsVariant(KVI_OPTION_STRING(KviOption_stringOnNewQueryOpenedSound))));
+						KviKvsScript::run("snd.play $0", nullptr, new KviKvsVariantList(new KviKvsVariant(KVI_OPTION_STRING(KviOption_stringOnNewQueryOpenedSound))));
 
 					if(KVI_OPTION_BOOL(KviOption_boolPasteLastLogOnQueryJoin))
 						query->pasteLastLog();
@@ -1298,7 +1298,7 @@ void KviIrcServerParser::parseLiteralNotice(KviIrcMessage * msg)
 		// Nickserv nick identification routine
 		QString szMsgText = msg->connection()->decodeText(msg->safeTrailing());
 		KviIrcMask talker(szNick, szUser, szHost);
-		KviNickServRule * rule = 0;
+		KviNickServRule * rule = nullptr;
 
 		// Figure out early if we have a query window open: if we have it then use it unconditionally
 		KviQueryWindow * query = msg->connection()->findQuery(szNick);
@@ -1490,7 +1490,7 @@ void KviIrcServerParser::parseLiteralNotice(KviIrcMessage * msg)
 				if(query)
 				{
 					if(!KVI_OPTION_STRING(KviOption_stringOnNewQueryOpenedSound).isEmpty())
-						KviKvsScript::run("snd.play $0", 0, new KviKvsVariantList(new KviKvsVariant(KVI_OPTION_STRING(KviOption_stringOnNewQueryOpenedSound))));
+						KviKvsScript::run("snd.play $0", nullptr, new KviKvsVariantList(new KviKvsVariant(KVI_OPTION_STRING(KviOption_stringOnNewQueryOpenedSound))));
 
 					if(KVI_OPTION_BOOL(KviOption_boolPasteLastLogOnQueryJoin))
 						query->pasteLastLog();
diff --git a/src/kvirc/sparser/KviIrcServerParser_numericHandlers.cpp b/src/kvirc/sparser/KviIrcServerParser_numericHandlers.cpp
index fbed5c25e..45aa7f5b4 100644
--- a/src/kvirc/sparser/KviIrcServerParser_numericHandlers.cpp
+++ b/src/kvirc/sparser/KviIrcServerParser_numericHandlers.cpp
@@ -1688,9 +1688,8 @@ void KviIrcServerParser::parseNumericWhoisChannels(KviIrcMessage * msg)
 		QStringList sl = szChans.split(" ", QString::SkipEmptyParts);
 		QString szChanList;
 
-		for(QStringList::Iterator it = sl.begin(); it != sl.end(); ++it)
+		for(auto szCur : sl)
 		{
-			QString szCur = *it;
 			// deals with <flag>[#channel] and [##channel]
 			int len = szCur.length();
 			int i = 0;
@@ -1999,7 +1998,7 @@ void KviIrcServerParser::parseNumericEndOfWhois(KviIrcMessage * msg)
 		vl.append(new KviKvsVariant(*(i->pMagic)));
 		vl.append(new KviKvsVariant(i->szAuth));
 		vl.append(new KviKvsVariant(i->szAdditional));
-		i->pCallback->run(i->pWindow, &vl, 0, KviKvsScript::PreserveParams);
+		i->pCallback->run(i->pWindow, &vl, nullptr, KviKvsScript::PreserveParams);
 		msg->connection()->asyncWhoisData()->remove(i);
 		return;
 	}
@@ -2052,7 +2051,7 @@ void KviIrcServerParser::parseNumericNoSuchNick(KviIrcMessage * msg)
 			for(unsigned int ii = 0; ii < 9; ii++)
 				vl.append(new KviKvsVariant());
 			vl.append(new KviKvsVariant(*(i->pMagic)));
-			i->pCallback->run(i->pWindow, &vl, 0, KviKvsScript::PreserveParams);
+			i->pCallback->run(i->pWindow, &vl, nullptr, KviKvsScript::PreserveParams);
 			msg->connection()->asyncWhoisData()->remove(i);
 			return;
 		}
@@ -2729,7 +2728,7 @@ void KviIrcServerParser::parseNumericNoSuchServer(KviIrcMessage * msg)
 		for(unsigned int ii = 0; ii < 9; ii++)
 			vl.append(new KviKvsVariant());
 		vl.append(new KviKvsVariant(*(i->pMagic)));
-		i->pCallback->run(i->pWindow, &vl, 0, KviKvsScript::PreserveParams);
+		i->pCallback->run(i->pWindow, &vl, nullptr, KviKvsScript::PreserveParams);
 		msg->connection()->asyncWhoisData()->remove(i);
 		return;
 	}
diff --git a/src/kvirc/sparser/KviIrcServerParser_tables.cpp b/src/kvirc/sparser/KviIrcServerParser_tables.cpp
index b867e296d..146dd7714 100644
--- a/src/kvirc/sparser/KviIrcServerParser_tables.cpp
+++ b/src/kvirc/sparser/KviIrcServerParser_tables.cpp
@@ -48,7 +48,7 @@ KviLiteralMessageParseStruct KviIrcServerParser::m_literalParseProcTable[] = {
 	{ "QUIT"         , PTM(parseLiteralQuit)         },
 	{ "TOPIC"        , PTM(parseLiteralTopic)        },
 	{ "WALLOPS"      , PTM(parseLiteralWallops)      },
-	{ 0              , 0                             }
+	{ nullptr              , nullptr                             }
 	// clang-format on
 };
 
@@ -62,7 +62,7 @@ KviCtcpMessageParseStruct KviIrcServerParser::m_ctcpParseProcTable[] = {
 	{ "CLIENTINFO" , PTM(REQ(Clientinfo)) , PTM(RPL(Generic))  , 0 },
 	{ "DCC"        , PTM(REQ(Dcc))        , PTM(REQ(Dcc))      , 0 },
 	{ "FINGER"     , PTM(REQ(Finger))     , PTM(RPL(Generic))  , 0 },
-	{ "LAGCHECK"   , 0                    , PTM(RPL(Lagcheck)) , KVI_CTCP_MESSAGE_PARSE_TRIGGERNOEVENT },
+	{ "LAGCHECK"   , nullptr                    , PTM(RPL(Lagcheck)) , KVI_CTCP_MESSAGE_PARSE_TRIGGERNOEVENT },
 	{ "PAGE"       , PTM(REQ(Page))       , PTM(RPL(Generic))  , 0 },
 	{ "PING"       , PTM(REQ(Ping))       , PTM(RPL(Ping))     , 0 },
 	{ "SOURCE"     , PTM(REQ(Source))     , PTM(RPL(Generic))  , 0 },
@@ -71,7 +71,7 @@ KviCtcpMessageParseStruct KviIrcServerParser::m_ctcpParseProcTable[] = {
 	{ "USERINFO"   , PTM(REQ(Userinfo))   , PTM(RPL(Userinfo)) , 0 },
 	{ "VERSION"    , PTM(REQ(Version))    , PTM(RPL(Generic))  , 0 },
 	{ "XDCC"       , PTM(REQ(Dcc))        , PTM(REQ(Dcc))      , 0 },
-	{ 0            , 0                    , 0                  , 0 }
+	{ nullptr            , nullptr                    , nullptr                  , 0 }
 	// clang-format on
 };
 
@@ -79,245 +79,245 @@ KviCtcpMessageParseStruct KviIrcServerParser::m_ctcpParseProcTable[] = {
 #undef RPL
 
 messageParseProc KviIrcServerParser::m_numericParseProcTable[1000] = {
-	0,                                            // 000
+	nullptr,                                      // 000
 	PTM(parseNumeric001),                         // 001 RPL_WELCOME
 	PTM(parseNumeric002),                         // 002 RPL_YOURHOST
 	PTM(parseNumeric003),                         // 003 RPL_CREATED
 	PTM(parseNumeric004),                         // 004 RPL_MYINFO
 	PTM(parseNumeric005),                         // 005 RPL_BOUNCE, RPL_PROTOCTL, RPL_ISUPPORT
-	0,                                            // 006 RPL_MAP
-	0,                                            // 007 RPL_MAPEND
+	nullptr,                                      // 006 RPL_MAP
+	nullptr,                                      // 007 RPL_MAPEND
 	PTM(parseNumericSnomask),                     // 008 RPL_SNOMASK
-	0,                                            // 009 RPL_STATMEMTOT
-	0,                                            // 010 RPL_BOUNCE, RPL_REDIR, RPL_STATMEM
-	0,                                            // 011
-	0,                                            // 012
-	0,                                            // 013
-	0,                                            // 014 RPL_YOURCOOKIE
-	0,                                            // 015 RPL_MAP
-	0,                                            // 016 RPL_MAPMORE
-	0,                                            // 017 RPL_MAPEND
-	0,                                            // 018
-	0,                                            // 019
+	nullptr,                                      // 009 RPL_STATMEMTOT
+	nullptr,                                      // 010 RPL_BOUNCE, RPL_REDIR, RPL_STATMEM
+	nullptr,                                      // 011
+	nullptr,                                      // 012
+	nullptr,                                      // 013
+	nullptr,                                      // 014 RPL_YOURCOOKIE
+	nullptr,                                      // 015 RPL_MAP
+	nullptr,                                      // 016 RPL_MAPMORE
+	nullptr,                                      // 017 RPL_MAPEND
+	nullptr,                                      // 018
+	nullptr,                                      // 019
 	PTM(parseNumeric020),                         // 020
-	0,                                            // 021
-	0,                                            // 022
-	0,                                            // 023
-	0,                                            // 024
-	0,                                            // 025
-	0,                                            // 026
-	0,                                            // 027
-	0,                                            // 028
-	0,                                            // 029
-	0,                                            // 030
-	0,                                            // 031
-	0,                                            // 032
-	0,                                            // 033
-	0,                                            // 034
-	0,                                            // 035
-	0,                                            // 036
-	0,                                            // 037
-	0,                                            // 038
-	0,                                            // 039
-	0,                                            // 040
-	0,                                            // 041
+	nullptr,                                      // 021
+	nullptr,                                      // 022
+	nullptr,                                      // 023
+	nullptr,                                      // 024
+	nullptr,                                      // 025
+	nullptr,                                      // 026
+	nullptr,                                      // 027
+	nullptr,                                      // 028
+	nullptr,                                      // 029
+	nullptr,                                      // 030
+	nullptr,                                      // 031
+	nullptr,                                      // 032
+	nullptr,                                      // 033
+	nullptr,                                      // 034
+	nullptr,                                      // 035
+	nullptr,                                      // 036
+	nullptr,                                      // 037
+	nullptr,                                      // 038
+	nullptr,                                      // 039
+	nullptr,                                      // 040
+	nullptr,                                      // 041
 	PTM(parseNumericYourUID),                     // 042 RPL_YOURID
-	0,                                            // 043 RPL_SAVENICK
-	0,                                            // 044
-	0,                                            // 045
-	0,                                            // 046
-	0,                                            // 047
-	0,                                            // 048
-	0,                                            // 049
-	0,                                            // 050 RPL_ATTEMPTINGJUNC
-	0,                                            // 051 RPL_ATTEMPTINGREROUTE
-	0,                                            // 052
-	0,                                            // 053
-	0,                                            // 054
-	0,                                            // 055
-	0,                                            // 056
-	0,                                            // 057
-	0,                                            // 058
-	0,                                            // 059
-	0,                                            // 060
-	0,                                            // 061
-	0,                                            // 062
-	0,                                            // 063
-	0,                                            // 064
-	0,                                            // 065
-	0,                                            // 066
-	0,                                            // 067
-	0,                                            // 068
-	0,                                            // 069
-	0,                                            // 070
-	0,                                            // 071
-	0,                                            // 072
-	0,                                            // 073
-	0,                                            // 074
-	0,                                            // 075
-	0,                                            // 076
-	0,                                            // 077
-	0,                                            // 078
-	0,                                            // 079
-	0,                                            // 080
-	0,                                            // 081
-	0,                                            // 082
-	0,                                            // 083
-	0,                                            // 084
-	0,                                            // 085
-	0,                                            // 086
-	0,                                            // 087
-	0,                                            // 088
-	0,                                            // 089
-	0,                                            // 090
-	0,                                            // 091
-	0,                                            // 092
-	0,                                            // 093
-	0,                                            // 094
-	0,                                            // 095
-	0,                                            // 096
-	0,                                            // 097
-	0,                                            // 098
-	0,                                            // 099
-	0,                                            // 100
-	0,                                            // 101
-	0,                                            // 102
-	0,                                            // 103
-	0,                                            // 104
-	0,                                            // 105
-	0,                                            // 106
-	0,                                            // 107
-	0,                                            // 108
-	0,                                            // 109
-	0,                                            // 110
-	0,                                            // 111
-	0,                                            // 112
-	0,                                            // 113
-	0,                                            // 114
-	0,                                            // 115
-	0,                                            // 116
-	0,                                            // 117
-	0,                                            // 118
-	0,                                            // 119
-	0,                                            // 120
-	0,                                            // 121
-	0,                                            // 122
-	0,                                            // 123
-	0,                                            // 124
-	0,                                            // 125
-	0,                                            // 126
-	0,                                            // 127
-	0,                                            // 128
-	0,                                            // 129
-	0,                                            // 130
-	0,                                            // 131
-	0,                                            // 132
-	0,                                            // 133
-	0,                                            // 134
-	0,                                            // 135
-	0,                                            // 136
-	0,                                            // 137
-	0,                                            // 138
-	0,                                            // 139
-	0,                                            // 140
-	0,                                            // 141
-	0,                                            // 142
-	0,                                            // 143
-	0,                                            // 144
-	0,                                            // 145
-	0,                                            // 146
-	0,                                            // 147
-	0,                                            // 148
-	0,                                            // 149
-	0,                                            // 150
-	0,                                            // 151
-	0,                                            // 152
-	0,                                            // 153
-	0,                                            // 154
-	0,                                            // 155
-	0,                                            // 156
-	0,                                            // 157
-	0,                                            // 158
-	0,                                            // 159
-	0,                                            // 160
-	0,                                            // 161
-	0,                                            // 162
-	0,                                            // 163
-	0,                                            // 164
-	0,                                            // 165
-	0,                                            // 166
-	0,                                            // 167
-	0,                                            // 168
-	0,                                            // 169
-	0,                                            // 170
-	0,                                            // 171
-	0,                                            // 172
-	0,                                            // 173
-	0,                                            // 174
-	0,                                            // 175
-	0,                                            // 176
-	0,                                            // 177
-	0,                                            // 178
-	0,                                            // 179
-	0,                                            // 180
-	0,                                            // 181
-	0,                                            // 182
-	0,                                            // 183
-	0,                                            // 184
-	0,                                            // 185
-	0,                                            // 186
-	0,                                            // 187
-	0,                                            // 188
-	0,                                            // 189
-	0,                                            // 190
-	0,                                            // 191
-	0,                                            // 192
-	0,                                            // 193
-	0,                                            // 194
-	0,                                            // 195
-	0,                                            // 196
-	0,                                            // 197
-	0,                                            // 198
-	0,                                            // 199
-	0,                                            // 200 RPL_TRACELINK
-	0,                                            // 201 RPL_TRACECONNECTING
-	0,                                            // 202 RPL_TRACEHANDSHAKE
-	0,                                            // 203 RPL_TRACEUNKNOWN
-	0,                                            // 204 RPL_TRACEOPERATOR
-	0,                                            // 205 RPL_TRACEUSER
-	0,                                            // 206 RPL_TRACESERVER
-	0,                                            // 207 RPL_TRACESERVICE
-	0,                                            // 208 RPL_TRACENEWTYPE
-	0,                                            // 209 RPL_TRACECLASS
-	0,                                            // 210 RPL_TRACERECONNECT, RPL_STATS
-	0,                                            // 211 RPL_STATSLINKINFO
-	0,                                            // 212 RPL_STATSCOMMANDS
-	0,                                            // 213 RPL_STATSCLINE
-	0,                                            // 214 RPL_STATSNLINE
-	0,                                            // 215 RPL_STATSILINE
-	0,                                            // 216 RPL_STATSKLINE
-	0,                                            // 217 RPL_STATSQLINE, RPL_STATSPLINE
-	0,                                            // 218 RPL_STATSYLINE
+	nullptr,                                      // 043 RPL_SAVENICK
+	nullptr,                                      // 044
+	nullptr,                                      // 045
+	nullptr,                                      // 046
+	nullptr,                                      // 047
+	nullptr,                                      // 048
+	nullptr,                                      // 049
+	nullptr,                                      // 050 RPL_ATTEMPTINGJUNC
+	nullptr,                                      // 051 RPL_ATTEMPTINGREROUTE
+	nullptr,                                      // 052
+	nullptr,                                      // 053
+	nullptr,                                      // 054
+	nullptr,                                      // 055
+	nullptr,                                      // 056
+	nullptr,                                      // 057
+	nullptr,                                      // 058
+	nullptr,                                      // 059
+	nullptr,                                      // 060
+	nullptr,                                      // 061
+	nullptr,                                      // 062
+	nullptr,                                      // 063
+	nullptr,                                      // 064
+	nullptr,                                      // 065
+	nullptr,                                      // 066
+	nullptr,                                      // 067
+	nullptr,                                      // 068
+	nullptr,                                      // 069
+	nullptr,                                      // 070
+	nullptr,                                      // 071
+	nullptr,                                      // 072
+	nullptr,                                      // 073
+	nullptr,                                      // 074
+	nullptr,                                      // 075
+	nullptr,                                      // 076
+	nullptr,                                      // 077
+	nullptr,                                      // 078
+	nullptr,                                      // 079
+	nullptr,                                      // 080
+	nullptr,                                      // 081
+	nullptr,                                      // 082
+	nullptr,                                      // 083
+	nullptr,                                      // 084
+	nullptr,                                      // 085
+	nullptr,                                      // 086
+	nullptr,                                      // 087
+	nullptr,                                      // 088
+	nullptr,                                      // 089
+	nullptr,                                      // 090
+	nullptr,                                      // 091
+	nullptr,                                      // 092
+	nullptr,                                      // 093
+	nullptr,                                      // 094
+	nullptr,                                      // 095
+	nullptr,                                      // 096
+	nullptr,                                      // 097
+	nullptr,                                      // 098
+	nullptr,                                      // 099
+	nullptr,                                      // 100
+	nullptr,                                      // 101
+	nullptr,                                      // 102
+	nullptr,                                      // 103
+	nullptr,                                      // 104
+	nullptr,                                      // 105
+	nullptr,                                      // 106
+	nullptr,                                      // 107
+	nullptr,                                      // 108
+	nullptr,                                      // 109
+	nullptr,                                      // 110
+	nullptr,                                      // 111
+	nullptr,                                      // 112
+	nullptr,                                      // 113
+	nullptr,                                      // 114
+	nullptr,                                      // 115
+	nullptr,                                      // 116
+	nullptr,                                      // 117
+	nullptr,                                      // 118
+	nullptr,                                      // 119
+	nullptr,                                      // 120
+	nullptr,                                      // 121
+	nullptr,                                      // 122
+	nullptr,                                      // 123
+	nullptr,                                      // 124
+	nullptr,                                      // 125
+	nullptr,                                      // 126
+	nullptr,                                      // 127
+	nullptr,                                      // 128
+	nullptr,                                      // 129
+	nullptr,                                      // 130
+	nullptr,                                      // 131
+	nullptr,                                      // 132
+	nullptr,                                      // 133
+	nullptr,                                      // 134
+	nullptr,                                      // 135
+	nullptr,                                      // 136
+	nullptr,                                      // 137
+	nullptr,                                      // 138
+	nullptr,                                      // 139
+	nullptr,                                      // 140
+	nullptr,                                      // 141
+	nullptr,                                      // 142
+	nullptr,                                      // 143
+	nullptr,                                      // 144
+	nullptr,                                      // 145
+	nullptr,                                      // 146
+	nullptr,                                      // 147
+	nullptr,                                      // 148
+	nullptr,                                      // 149
+	nullptr,                                      // 150
+	nullptr,                                      // 151
+	nullptr,                                      // 152
+	nullptr,                                      // 153
+	nullptr,                                      // 154
+	nullptr,                                      // 155
+	nullptr,                                      // 156
+	nullptr,                                      // 157
+	nullptr,                                      // 158
+	nullptr,                                      // 159
+	nullptr,                                      // 160
+	nullptr,                                      // 161
+	nullptr,                                      // 162
+	nullptr,                                      // 163
+	nullptr,                                      // 164
+	nullptr,                                      // 165
+	nullptr,                                      // 166
+	nullptr,                                      // 167
+	nullptr,                                      // 168
+	nullptr,                                      // 169
+	nullptr,                                      // 170
+	nullptr,                                      // 171
+	nullptr,                                      // 172
+	nullptr,                                      // 173
+	nullptr,                                      // 174
+	nullptr,                                      // 175
+	nullptr,                                      // 176
+	nullptr,                                      // 177
+	nullptr,                                      // 178
+	nullptr,                                      // 179
+	nullptr,                                      // 180
+	nullptr,                                      // 181
+	nullptr,                                      // 182
+	nullptr,                                      // 183
+	nullptr,                                      // 184
+	nullptr,                                      // 185
+	nullptr,                                      // 186
+	nullptr,                                      // 187
+	nullptr,                                      // 188
+	nullptr,                                      // 189
+	nullptr,                                      // 190
+	nullptr,                                      // 191
+	nullptr,                                      // 192
+	nullptr,                                      // 193
+	nullptr,                                      // 194
+	nullptr,                                      // 195
+	nullptr,                                      // 196
+	nullptr,                                      // 197
+	nullptr,                                      // 198
+	nullptr,                                      // 199
+	nullptr,                                      // 200 RPL_TRACELINK
+	nullptr,                                      // 201 RPL_TRACECONNECTING
+	nullptr,                                      // 202 RPL_TRACEHANDSHAKE
+	nullptr,                                      // 203 RPL_TRACEUNKNOWN
+	nullptr,                                      // 204 RPL_TRACEOPERATOR
+	nullptr,                                      // 205 RPL_TRACEUSER
+	nullptr,                                      // 206 RPL_TRACESERVER
+	nullptr,                                      // 207 RPL_TRACESERVICE
+	nullptr,                                      // 208 RPL_TRACENEWTYPE
+	nullptr,                                      // 209 RPL_TRACECLASS
+	nullptr,                                      // 210 RPL_TRACERECONNECT, RPL_STATS
+	nullptr,                                      // 211 RPL_STATSLINKINFO
+	nullptr,                                      // 212 RPL_STATSCOMMANDS
+	nullptr,                                      // 213 RPL_STATSCLINE
+	nullptr,                                      // 214 RPL_STATSNLINE
+	nullptr,                                      // 215 RPL_STATSILINE
+	nullptr,                                      // 216 RPL_STATSKLINE
+	nullptr,                                      // 217 RPL_STATSQLINE, RPL_STATSPLINE
+	nullptr,                                      // 218 RPL_STATSYLINE
 	PTM(parseNumericEndOfStats),                  // 219 RPL_ENDOFSTATS
-	0,                                            // 220 RPL_STATSPLINE, RPL_STATSBLINE
+	nullptr,                                      // 220 RPL_STATSPLINE, RPL_STATSBLINE
 	PTM(parseNumericUserMode),                    // 221 RPL_UMODEIS
 	PTM(parseNumericCodePageSet),                 // 222 RusNet Codepage set, RPL_MODLIST, RPL_SQLINE_NICK, RPL_STATSBLINE
-	0,                                            // 223 RPL_STATSELINE, RPL_STATSGLINE
-	0,                                            // 224 RPL_STATSFLINE, RPL_STATSTLINE
-	0,                                            // 225 RPL_STATSDLINE, RPL_STATSZLINE, RPL_STATSELINE
-	0,                                            // 226 RPL_STATSCOUNT, RPL_STATSNLINE
-	0,                                            // 227 RPL_STATSGLINE, RPL_STATSVLINE
-	0,                                            // 228 RPL_STATSQLINE
-	0,                                            // 229
-	0,                                            // 230
-	0,                                            // 231 RPL_SERVICEINFO
-	0,                                            // 232 RPL_ENDOFSERVICES, RPL_RULES
-	0,                                            // 233 RPL_SERVICE
-	0,                                            // 234 RPL_SERVLIST
-	0,                                            // 235 RPL_SERVLISTEND
-	0,                                            // 236 RPL_STATSVERBOSE
-	0,                                            // 237 RPL_STATSENGINE
-	0,                                            // 238 RPL_STATSFLINE
+	nullptr,                                      // 223 RPL_STATSELINE, RPL_STATSGLINE
+	nullptr,                                      // 224 RPL_STATSFLINE, RPL_STATSTLINE
+	nullptr,                                      // 225 RPL_STATSDLINE, RPL_STATSZLINE, RPL_STATSELINE
+	nullptr,                                      // 226 RPL_STATSCOUNT, RPL_STATSNLINE
+	nullptr,                                      // 227 RPL_STATSGLINE, RPL_STATSVLINE
+	nullptr,                                      // 228 RPL_STATSQLINE
+	nullptr,                                      // 229
+	nullptr,                                      // 230
+	nullptr,                                      // 231 RPL_SERVICEINFO
+	nullptr,                                      // 232 RPL_ENDOFSERVICES, RPL_RULES
+	nullptr,                                      // 233 RPL_SERVICE
+	nullptr,                                      // 234 RPL_SERVLIST
+	nullptr,                                      // 235 RPL_SERVLISTEND
+	nullptr,                                      // 236 RPL_STATSVERBOSE
+	nullptr,                                      // 237 RPL_STATSENGINE
+	nullptr,                                      // 238 RPL_STATSFLINE
 	PTM(parseNumericStats),                       // 239 RPL_STATSIAUTH
 	PTM(parseNumericStats),                       // 240 RPL_STATSVLINE
 	PTM(parseNumericStats),                       // 241 RPL_STATSLLINE
@@ -339,51 +339,51 @@ messageParseProc KviIrcServerParser::m_numericParseProcTable[1000] = {
 	PTM(parseNumericServerAdminInfoServerName),   // 257 RPL_ADMINLOC1
 	PTM(parseNumericServerAdminInfoAdminName),    // 258 RPL_ADMINLOC2
 	PTM(parseNumericServerAdminInfoAdminContact), // 259 RPL_ADMINEMAIL
-	0,                                            // 260
-	0,                                            // 261 RPL_TRACELOG
-	0,                                            // 262 RPL_TRACEPING, RPL_TRACEEND
+	nullptr,                                      // 260
+	nullptr,                                      // 261 RPL_TRACELOG
+	nullptr,                                      // 262 RPL_TRACEPING, RPL_TRACEEND
 	PTM(parseNumericTryAgain),                    // 263 RPL_TRYAGAIN
-	0,                                            // 264
+	nullptr,                                      // 264
 	PTM(parseNumericStats),                       // 265 RPL_LOCALUSERS
 	PTM(parseNumericStats),                       // 266 RPL_GLOBALUSERS
 	PTM(parseNumericStats),                       // 267 RPL_SHAREDUSERS, RPL_START_NETSTAT
-	0,                                            // 268 RPL_NETSTAT
-	0,                                            // 269 RPL_END_NETSTAT
-	0,                                            // 270 RPL_PRIVS, RPL_MAPUSERS
-	0,                                            // 271 RPL_SILELIST
-	0,                                            // 272 RPL_ENDOFSILELIST
-	0,                                            // 273 RPL_NOTIFY
-	0,                                            // 274 RPL_ENDOFNOTIFY, RPL_STATSDELTA
+	nullptr,                                      // 268 RPL_NETSTAT
+	nullptr,                                      // 269 RPL_END_NETSTAT
+	nullptr,                                      // 270 RPL_PRIVS, RPL_MAPUSERS
+	nullptr,                                      // 271 RPL_SILELIST
+	nullptr,                                      // 272 RPL_ENDOFSILELIST
+	nullptr,                                      // 273 RPL_NOTIFY
+	nullptr,                                      // 274 RPL_ENDOFNOTIFY, RPL_STATSDELTA
 	PTM(parseNumericWhoisOther),                  // 275 RPL_WHOISSSL, RPL_STATSDLINE
-	0,                                            // 276 RPL_VCHANEXIST
-	0,                                            // 277 RPL_VCHANLIST
-	0,                                            // 278 RPL_VCHANHELP
-	0,                                            // 279
-	0,                                            // 280 RPL_GLIST
-	0,                                            // 281 RPL_ENDOFGLIST, RPL_ACCEPTLIST
-	0,                                            // 282 RPL_ENDOFACCEPT, RPL_JUPELIST
-	0,                                            // 283 RPL_ALIST, RPL_ENDOFJUPELIST
-	0,                                            // 284 RPL_ENDOFALIST, RPL_FEATURE
-	0,                                            // 285 RPL_FEATURE, RPL_CHANINFO_HANDLE
-	0,                                            // 286 RPL_CHANINFO_USERS, RPL_CHKHEAD
-	0,                                            // 287 RPL_CHANINFO_CHOPS, RPL_CHANUSER
-	0,                                            // 288 RPL_CHANINFO_VOICES, RPL_PATCHHEAD
-	0,                                            // 289 RPL_CHANINFO_AWAY, RPL_PATCHCON
-	0,                                            // 290 RPL_CHANINFO_OPERS, RPL_HELPHDR, RPL_DATASTR
-	0,                                            // 291 RPL_CHANINFO_BANNED, RPL_HELPOP, RPL_ENDOFCHECK
-	0,                                            // 292 RPL_CHANINFO_BANS, RPL_HELPTLR
-	0,                                            // 293 RPL_CHANINFO_INVITE, RPL_HELPHLP
-	0,                                            // 294 RPL_CHANINFO_INVITES, RPL_HELPFWD
-	0,                                            // 295 RPL_CHANINFO_KICK, RPL_HELPIGN
-	0,                                            // 296 RPL_CHANINFO_KICKS
-	0,                                            // 297
-	0,                                            // 298
-	0,                                            // 299 RPL_END_CHANINFO
-	0,                                            // 300 RPL_NONE
+	nullptr,                                      // 276 RPL_VCHANEXIST
+	nullptr,                                      // 277 RPL_VCHANLIST
+	nullptr,                                      // 278 RPL_VCHANHELP
+	nullptr,                                      // 279
+	nullptr,                                      // 280 RPL_GLIST
+	nullptr,                                      // 281 RPL_ENDOFGLIST, RPL_ACCEPTLIST
+	nullptr,                                      // 282 RPL_ENDOFACCEPT, RPL_JUPELIST
+	nullptr,                                      // 283 RPL_ALIST, RPL_ENDOFJUPELIST
+	nullptr,                                      // 284 RPL_ENDOFALIST, RPL_FEATURE
+	nullptr,                                      // 285 RPL_FEATURE, RPL_CHANINFO_HANDLE
+	nullptr,                                      // 286 RPL_CHANINFO_USERS, RPL_CHKHEAD
+	nullptr,                                      // 287 RPL_CHANINFO_CHOPS, RPL_CHANUSER
+	nullptr,                                      // 288 RPL_CHANINFO_VOICES, RPL_PATCHHEAD
+	nullptr,                                      // 289 RPL_CHANINFO_AWAY, RPL_PATCHCON
+	nullptr,                                      // 290 RPL_CHANINFO_OPERS, RPL_HELPHDR, RPL_DATASTR
+	nullptr,                                      // 291 RPL_CHANINFO_BANNED, RPL_HELPOP, RPL_ENDOFCHECK
+	nullptr,                                      // 292 RPL_CHANINFO_BANS, RPL_HELPTLR
+	nullptr,                                      // 293 RPL_CHANINFO_INVITE, RPL_HELPHLP
+	nullptr,                                      // 294 RPL_CHANINFO_INVITES, RPL_HELPFWD
+	nullptr,                                      // 295 RPL_CHANINFO_KICK, RPL_HELPIGN
+	nullptr,                                      // 296 RPL_CHANINFO_KICKS
+	nullptr,                                      // 297
+	nullptr,                                      // 298
+	nullptr,                                      // 299 RPL_END_CHANINFO
+	nullptr,                                      // 300 RPL_NONE
 	PTM(parseNumericWhoisAway),                   // 301 RPL_AWAY
 	PTM(parseNumericUserhost),                    // 302 RPL_USERHOST
 	PTM(parseNumericIsOn),                        // 303 RPL_ISON
-	0,                                            // 304 RPL_TEXT, RPL_SYNTAX
+	nullptr,                                      // 304 RPL_TEXT, RPL_SYNTAX
 	PTM(parseNumericBackFromAway),                // 305 RPL_UNAWAY
 	PTM(parseNumericAway),                        // 306 RPL_NOWAWAY
 	PTM(parseNumericWhoisRegistered),             // 307 RPL_WHOISREGNICK
@@ -404,9 +404,9 @@ messageParseProc KviIrcServerParser::m_numericParseProcTable[1000] = {
 	PTM(parseNumericList),                        // 322 RPL_LIST
 	PTM(parseNumericListEnd),                     // 323 RPL_LISTEND
 	PTM(parseNumericChannelModeIs),               // 324 RPL_CHANNELMODEIS
-	0,                                            // 325 RPL_UNIQOPIS, RPL_CHANNELPASSIS
-	0,                                            // 326 RPL_NOCHANPASS
-	0,                                            // 327 RPL_CHPASSUNKNOWN
+	nullptr,                                      // 325 RPL_UNIQOPIS, RPL_CHANNELPASSIS
+	nullptr,                                      // 326 RPL_NOCHANPASS
+	nullptr,                                      // 327 RPL_CHPASSUNKNOWN
 	PTM(parseNumericChanUrl),                     // 328 RPL_CHANNEL_URL
 	PTM(parseNumericCreationTime),                // 329 RPL_CREATIONTIME, RPL_CHANNELCREATED
 	PTM(parseNumericWhoisAuth),                   // 330 RPL_WHOISAUTH
@@ -414,42 +414,42 @@ messageParseProc KviIrcServerParser::m_numericParseProcTable[1000] = {
 	PTM(parseNumericTopic),                       // 332 RPL_TOPIC
 	PTM(parseNumericTopicWhoTime),                // 333 RPL_TOPICWHOTIME, RPL_TOPICTIME
 	PTM(parseNumericCommandSyntax),               // 334 RPL_COMMANDSYNTAX
-	0,                                            // 335 RPL_WHOISBOT
-	0,                                            // 336
-	0,                                            // 337
+	nullptr,                                      // 335 RPL_WHOISBOT
+	nullptr,                                      // 336
+	nullptr,                                      // 337
 	PTM(parseNumericWhoisActually),               // 338 RPL_WHOISACTUALLY, RPL_CHANPASSOK
 	PTM(parseNumericWhoisOther),                  // 339 RPL_BADCHANPASS
-	0,                                            // 340 RPL_USERIP
+	nullptr,                                      // 340 RPL_USERIP
 	PTM(parseNumericInviting),                    // 341 RPL_INVITING
-	0,                                            // 342 RPL_SUMMONING
-	0,                                            // 343
+	nullptr,                                      // 342 RPL_SUMMONING
+	nullptr,                                      // 343
 	PTM(parseNumeric344),                         // 344 RPL_REOPLIST, RPL_QUIETLIST
 	PTM(parseNumeric345),                         // 345 RPL_ENDOFREOPLIST, RPL_INVITED, RPL_QUIETLISTEND
 	PTM(parseNumericInviteList),                  // 346 RPL_INVITELIST
 	PTM(parseNumericEndOfInviteList),             // 347 RPL_ENDOFINVITELIST
 	PTM(parseNumericExceptList),                  // 348 RPL_EXCEPTLIST
 	PTM(parseNumericEndOfExceptList),             // 349 RPL_ENDOFEXCEPTLIST
-	0,                                            // 350
-	0,                                            // 351 RPL_VERSION
+	nullptr,                                      // 350
+	nullptr,                                      // 351 RPL_VERSION
 	PTM(parseNumericWhoReply),                    // 352 RPL_WHOREPLY
 	PTM(parseNumericNames),                       // 353 RPL_NAMREPLY
 	PTM(parseNumericWhospcrpl),                   // 354 RPL_WHOSPCRPL
-	0,                                            // 355 RPL_NAMREPLY_
-	0,                                            // 356
-	0,                                            // 357 RPL_MAP
-	0,                                            // 358 RPL_MAPMORE
-	0,                                            // 359 RPL_MAPEND
-	0,                                            // 360
-	0,                                            // 361 RPL_KILLDONE
-	0,                                            // 362 RPL_CLOSING
-	0,                                            // 363 RPL_CLOSEEND
+	nullptr,                                      // 355 RPL_NAMREPLY_
+	nullptr,                                      // 356
+	nullptr,                                      // 357 RPL_MAP
+	nullptr,                                      // 358 RPL_MAPMORE
+	nullptr,                                      // 359 RPL_MAPEND
+	nullptr,                                      // 360
+	nullptr,                                      // 361 RPL_KILLDONE
+	nullptr,                                      // 362 RPL_CLOSING
+	nullptr,                                      // 363 RPL_CLOSEEND
 	PTM(parseNumericLinks),                       // 364 RPL_LINKS
 	PTM(parseNumericEndOfLinks),                  // 365 RPL_ENDOFLINKS
 	PTM(parseNumericEndOfNames),                  // 366 RPL_ENDOFNAMES
 	PTM(parseNumeric367),                         // 367 RPL_BANLIST
 	PTM(parseNumeric368),                         // 368 RPL_ENDOFBANLIST
 	PTM(parseNumericEndOfWhowas),                 // 369 RPL_ENDOFWHOWAS
-	0,                                            // 370
+	nullptr,                                      // 370
 	PTM(parseNumericInfo),                        // 371 RPL_INFO
 	PTM(parseNumericMotd),                        // 372 RPL_MOTD
 	PTM(parseNumericInfoStart),                   // 373 RPL_INFOSTART
@@ -458,625 +458,625 @@ messageParseProc KviIrcServerParser::m_numericParseProcTable[1000] = {
 	PTM(parseNumericMotd),                        // 376 RPL_ENDOFMOTD
 	PTM(parseNumericMotd),                        // 377 RPL_MOTD2, RPL_KICKEXPIRED, RPL_SPAM
 	PTM(parseNumericWhoisOther),                  // 378 RPL_WHOISHOST, RPL_BANEXPIRED
-	0,                                            // 379 RPL_KICKLINKED, RPL_WHOISMODES, RPL_WHOWASIP
-	0,                                            // 380 RPL_BANLINKED, RPL_YOURHELPER
+	nullptr,                                      // 379 RPL_KICKLINKED, RPL_WHOISMODES, RPL_WHOWASIP
+	nullptr,                                      // 380 RPL_BANLINKED, RPL_YOURHELPER
 	PTM(parseNumericYoureOper),                   // 381 RPL_YOUREOPER
-	0,                                            // 382 RPL_REHASHING
-	0,                                            // 383 RPL_YOURESERVICE
-	0,                                            // 384 RPL_MYPORTIS
-	0,                                            // 385 RPL_NOTOPERANYMORE
+	nullptr,                                      // 382 RPL_REHASHING
+	nullptr,                                      // 383 RPL_YOURESERVICE
+	nullptr,                                      // 384 RPL_MYPORTIS
+	nullptr,                                      // 385 RPL_NOTOPERANYMORE
 	PTM(parseNumericQList),                       // 386 RPL_QLIST
 	PTM(parseNumericEndOfQList),                  // 387 RPL_ENDOFQLIST, RPL_ENDOFIRCOPS
 	PTM(parseNumericAList),                       // 388 RPL_ALIST
 	PTM(parseNumericEndOfAList),                  // 389 RPL_ENDOFALIST
-	0,                                            // 390
+	nullptr,                                      // 390
 	PTM(parseNumericTime),                        // 391 RPL_TIME
-	0,                                            // 392 RPL_USERSSTART
-	0,                                            // 393 RPL_USERS
-	0,                                            // 394 RPL_ENDOFUSERS
-	0,                                            // 395 RPL_NOUSERS
+	nullptr,                                      // 392 RPL_USERSSTART
+	nullptr,                                      // 393 RPL_USERS
+	nullptr,                                      // 394 RPL_ENDOFUSERS
+	nullptr,                                      // 395 RPL_NOUSERS
 	PTM(parseNumericHiddenHost),                  // 396 RPL_HOSTHIDDEN, RPL_YOURDISPLAYEDHOST
-	0,                                            // 397
-	0,                                            // 398
-	0,                                            // 399
-	0,                                            // 400 ERR_UNKNOWNERROR
+	nullptr,                                      // 397
+	nullptr,                                      // 398
+	nullptr,                                      // 399
+	nullptr,                                      // 400 ERR_UNKNOWNERROR
 	PTM(parseNumericNoSuchNick),                  // 401 ERR_NOSUCHNICK
 	PTM(parseNumericNoSuchServer),                // 402 ERR_NOSUCHSERVER
 	PTM(parseNumericNoSuchChannel),               // 403 ERR_NOSUCHCHANNEL
 	PTM(parseNumericCannotSend),                  // 404 ERR_CANNOTSENDTOCHAN
-	0,                                            // 405 ERR_TOOMANYCHANNELS
+	nullptr,                                      // 405 ERR_TOOMANYCHANNELS
 	PTM(parseNumericNoSuchNick),                  // 406 ERR_WASNOSUCHNICK
-	0,                                            // 407 ERR_TOOMANYTARGETS
+	nullptr,                                      // 407 ERR_TOOMANYTARGETS
 	PTM(parseNumericCannotSendColor),             // 408 ERR_NOCOLORSONCHAN, ERR_NOSUCHSERVICE
-	0,                                            // 409 ERR_NOORIGIN
-	0,                                            // 410 ERR_INVALIDCAPSUBCOMMAND
-	0,                                            // 411 ERR_NORECIPIENT
-	0,                                            // 412 ERR_NOTEXTTOSEND
-	0,                                            // 413 ERR_NOTOPLEVEL
-	0,                                            // 414 ERR_WILDTOPLEVEL
+	nullptr,                                      // 409 ERR_NOORIGIN
+	nullptr,                                      // 410 ERR_INVALIDCAPSUBCOMMAND
+	nullptr,                                      // 411 ERR_NORECIPIENT
+	nullptr,                                      // 412 ERR_NOTEXTTOSEND
+	nullptr,                                      // 413 ERR_NOTOPLEVEL
+	nullptr,                                      // 414 ERR_WILDTOPLEVEL
 	PTM(otherChannelError),                       // 415 ERR_BADMASK
-	0,                                            // 416 ERR_TOOMANYMATCHES, ERR_QUERYTOOLONG
-	0,                                            // 417
-	0,                                            // 418
-	0,                                            // 419 ERR_LENGTHTRUNCATED
-	0,                                            // 420
+	nullptr,                                      // 416 ERR_TOOMANYMATCHES, ERR_QUERYTOOLONG
+	nullptr,                                      // 417
+	nullptr,                                      // 418
+	nullptr,                                      // 419 ERR_LENGTHTRUNCATED
+	nullptr,                                      // 420
 	PTM(parseNumericUnknownCommand),              // 421 ERR_UNKNOWNCOMMAND
 	PTM(parseNumericMotdMissing),                 // 422 ERR_NOMOTD
-	0,                                            // 423 ERR_NOADMININFO
-	0,                                            // 424 ERR_FILEERROR
-	0,                                            // 425 ERR_NOOPERMOTD
-	0,                                            // 426
-	0,                                            // 427
-	0,                                            // 428
-	0,                                            // 429 ERR_TOOMANYAWAY
-	0,                                            // 430 ERR_EVENTNICKCHANGE
-	0,                                            // 431 ERR_NONICKNAMEGIVEN
+	nullptr,                                      // 423 ERR_NOADMININFO
+	nullptr,                                      // 424 ERR_FILEERROR
+	nullptr,                                      // 425 ERR_NOOPERMOTD
+	nullptr,                                      // 426
+	nullptr,                                      // 427
+	nullptr,                                      // 428
+	nullptr,                                      // 429 ERR_TOOMANYAWAY
+	nullptr,                                      // 430 ERR_EVENTNICKCHANGE
+	nullptr,                                      // 431 ERR_NONICKNAMEGIVEN
 	PTM(parseNumericNicknameProblem),             // 432 ERR_ERRONEUSNICKNAME
 	PTM(parseNumericNicknameProblem),             // 433 ERR_NICKNAMEINUSE
-	0,                                            // 434 ERR_SERVICENAMEINUSE, ERR_NORULES
+	nullptr,                                      // 434 ERR_SERVICENAMEINUSE, ERR_NORULES
 	PTM(parseNumericBanOnChan),                   // 435 ERR_SERVICECONFUSED, ERR_BANONCHAN
-	0,                                            // 436 ERR_NICKCOLLISION
+	nullptr,                                      // 436 ERR_NICKCOLLISION
 	PTM(parseNumericUnavailResource),             // 437 ERR_UNAVAILRESOURCE, ERR_BANNICKCHANGE
-	0,                                            // 438 ERR_NICKTOOFAST, ERR_DEAD
-	0,                                            // 439 ERR_TARGETTOOFAST
-	0,                                            // 440 ERR_SERVICESDOWN
-	0,                                            // 441 ERR_USERNOTINCHANNEL
-	0,                                            // 442 ERR_NOTONCHANNEL
+	nullptr,                                      // 438 ERR_NICKTOOFAST, ERR_DEAD
+	nullptr,                                      // 439 ERR_TARGETTOOFAST
+	nullptr,                                      // 440 ERR_SERVICESDOWN
+	nullptr,                                      // 441 ERR_USERNOTINCHANNEL
+	nullptr,                                      // 442 ERR_NOTONCHANNEL
 	PTM(parseNumericUserInChan),                  // 443 ERR_USERONCHANNEL
-	0,                                            // 444 ERR_NOLOGIN
-	0,                                            // 445 ERR_SUMMONDISABLED
-	0,                                            // 446 ERR_USERSDISABLED
-	0,                                            // 447 ERR_NONICKCHANGE, ERR_CANTCHANGENICK
-	0,                                            // 448
-	0,                                            // 449 ERR_NOTIMPLEMENTED
-	0,                                            // 450
+	nullptr,                                      // 444 ERR_NOLOGIN
+	nullptr,                                      // 445 ERR_SUMMONDISABLED
+	nullptr,                                      // 446 ERR_USERSDISABLED
+	nullptr,                                      // 447 ERR_NONICKCHANGE, ERR_CANTCHANGENICK
+	nullptr,                                      // 448
+	nullptr,                                      // 449 ERR_NOTIMPLEMENTED
+	nullptr,                                      // 450
 	PTM(parseNumericNotRegistered),               // 451 ERR_NOTREGISTERED
-	0,                                            // 452 ERR_IDCOLLISION
-	0,                                            // 453 ERR_NICKLOST
-	0,                                            // 454
-	0,                                            // 455 ERR_HOSTILENAME
-	0,                                            // 456 ERR_ACCEPTFULL
-	0,                                            // 457 ERR_ACCEPTEXIST
-	0,                                            // 458 ERR_ACCEPTNOT
-	0,                                            // 459 ERR_NOHIDING
-	0,                                            // 460 ERR_NOTFORHALFOPS
+	nullptr,                                      // 452 ERR_IDCOLLISION
+	nullptr,                                      // 453 ERR_NICKLOST
+	nullptr,                                      // 454
+	nullptr,                                      // 455 ERR_HOSTILENAME
+	nullptr,                                      // 456 ERR_ACCEPTFULL
+	nullptr,                                      // 457 ERR_ACCEPTEXIST
+	nullptr,                                      // 458 ERR_ACCEPTNOT
+	nullptr,                                      // 459 ERR_NOHIDING
+	nullptr,                                      // 460 ERR_NOTFORHALFOPS
 	PTM(parseNumericNotEnoughParams),             // 461 ERR_NEEDMOREPARAMS
 	PTM(parseNumericAlreadyRegistered),           // 462 ERR_ALREADYREGISTERED
-	0,                                            // 463 ERR_NOPERMFORHOST
+	nullptr,                                      // 463 ERR_NOPERMFORHOST
 	PTM(parseNumericPasswordIncorrect),           // 464 ERR_PASSWDMISMATCH
-	0,                                            // 465 ERR_YOUREBANNEDCREEP
-	0,                                            // 466 ERR_YOUWILLBEBANNED
+	nullptr,                                      // 465 ERR_YOUREBANNEDCREEP
+	nullptr,                                      // 466 ERR_YOUWILLBEBANNED
 	PTM(otherChannelError),                       // 467 ERR_KEYSET
-	0,                                            // 468 ERR_ONLYSERVERSCANCHANGE
-	0,                                            // 469 ERR_LINKSET
+	nullptr,                                      // 468 ERR_ONLYSERVERSCANCHANGE
+	nullptr,                                      // 469 ERR_LINKSET
 	PTM(parseNumericForward),                     // 470 ERR_LINKCHANNEL, ERR_KICKEDFROMCHAN
 	PTM(parseNumericCantJoinChannel),             // 471 ERR_CHANNELISFULL
 	PTM(otherChannelError),                       // 472 ERR_UNKNOWNMODE
 	PTM(parseNumericCantJoinChannel),             // 473 ERR_INVITEONLYCHAN
 	PTM(parseNumericCantJoinChannel),             // 474 ERR_BANNEDFROMCHAN
 	PTM(parseNumericCantJoinChannel),             // 475 ERR_BADCHANNELKEY
-	0,                                            // 476 ERR_BADCHANMASK
+	nullptr,                                      // 476 ERR_BADCHANMASK
 	PTM(parseChannelHelp),                        // 477 RPL_CHANNELHELP
-	0,                                            // 478 ERR_BANLISTFULL
-	0,                                            // 479 ERR_BADCHANNAME, ERR_LINKFAIL
+	nullptr,                                      // 478 ERR_BANLISTFULL
+	nullptr,                                      // 479 ERR_BADCHANNAME, ERR_LINKFAIL
 	PTM(parseNumeric480),                         // 480 ERR_NOULINE, ERR_CANNOTKNOCK, ERR_SSLONLYCHAN
 	PTM(parseNumericNoPrivs),                     // 481 ERR_NOPRIVILEGES
 	PTM(otherChannelError),                       // 482 ERR_CHANOPRIVSNEEDED
-	0,                                            // 483 ERR_CANTKILLSERVER
-	0,                                            // 484 ERR_RESTRICTED, ERR_ISCHANSERVICE, ERR_DESYNC, ERR_ATTACKDENY
-	0,                                            // 485 ERR_UNIQOPRIVSNEEDED, ERR_KILLDENY, ERR_CANTKICKADMIN, ERR_ISREALSERVICE
+	nullptr,                                      // 483 ERR_CANTKILLSERVER
+	nullptr,                                      // 484 ERR_RESTRICTED, ERR_ISCHANSERVICE, ERR_DESYNC, ERR_ATTACKDENY
+	nullptr,                                      // 485 ERR_UNIQOPRIVSNEEDED, ERR_KILLDENY, ERR_CANTKICKADMIN, ERR_ISREALSERVICE
 	PTM(parseNumeric486),                         // 486 ERR_NONONREG, ERR_HTMDISABLED, ERR_ACCOUNTONLY
-	0,                                            // 487 ERR_CHANTOORECENT, ERR_MSGSERVICES
-	0,                                            // 488 ERR_TSLESSCHAN
-	0,                                            // 489 ERR_VOICENEEDED, ERR_SECUREONLYCHAN
-	0,                                            // 490 ERR_ALLMUSTSSL
-	0,                                            // 491 ERR_NOOPERHOST
-	0,                                            // 492 ERR_NOSERVICEHOST, ERR_NOCTCPALLOWED
-	0,                                            // 493 ERR_NOFEATURE
-	0,                                            // 494 ERR_BADFEATURE
-	0,                                            // 495 ERR_BADLOGTYPE, ERR_DELAYREJOIN
-	0,                                            // 496 ERR_BADLOGSYS
-	0,                                            // 497 ERR_BADLOGVALUE
-	0,                                            // 498 ERR_ISOPERLCHAN
-	0,                                            // 499 ERR_CHANOWNPRIVNEEDED
-	0,                                            // 500
-	0,                                            // 501 ERR_UMODEUNKNOWNFLAG, ERR_UNKNOWNSNOMASK
+	nullptr,                                      // 487 ERR_CHANTOORECENT, ERR_MSGSERVICES
+	nullptr,                                      // 488 ERR_TSLESSCHAN
+	nullptr,                                      // 489 ERR_VOICENEEDED, ERR_SECUREONLYCHAN
+	nullptr,                                      // 490 ERR_ALLMUSTSSL
+	nullptr,                                      // 491 ERR_NOOPERHOST
+	nullptr,                                      // 492 ERR_NOSERVICEHOST, ERR_NOCTCPALLOWED
+	nullptr,                                      // 493 ERR_NOFEATURE
+	nullptr,                                      // 494 ERR_BADFEATURE
+	nullptr,                                      // 495 ERR_BADLOGTYPE, ERR_DELAYREJOIN
+	nullptr,                                      // 496 ERR_BADLOGSYS
+	nullptr,                                      // 497 ERR_BADLOGVALUE
+	nullptr,                                      // 498 ERR_ISOPERLCHAN
+	nullptr,                                      // 499 ERR_CHANOWNPRIVNEEDED
+	nullptr,                                      // 500
+	nullptr,                                      // 501 ERR_UMODEUNKNOWNFLAG, ERR_UNKNOWNSNOMASK
 	PTM(parseNumericUsersDontMatch),              // 502 ERR_USERSDONTMATCH
-	0,                                            // 503 ERR_GHOSTEDCLIENT
-	0,                                            // 504 ERR_USERNOTONSERV
-	0,                                            // 505
-	0,                                            // 506
-	0,                                            // 507
-	0,                                            // 508
-	0,                                            // 509
-	0,                                            // 510
-	0,                                            // 511 ERR_SILELISTFULL
-	0,                                            // 512 ERR_TOOMANYWATCH
-	0,                                            // 513 ERR_BADPING
-	0,                                            // 514 ERR_INVALID_ERROR, ERR_TOOMANYDCC
-	0,                                            // 515 ERR_BADEXPIRE
-	0,                                            // 516 ERR_DONTCHEAT
-	0,                                            // 517 ERR_DISABLED
-	0,                                            // 518 ERR_NOINVITE, ERR_LONGMASK
-	0,                                            // 519 ERR_ADMONLY, ERR_TOOMANYUSERS
-	0,                                            // 520 ERR_OPERONLY, ERR_MASKTOOWIDE, ERR_WHOTRUNC, ERR_CANTJOINOPERSONLY
-	0,                                            // 521 ERR_LISTSYNTAX
-	0,                                            // 522 ERR_WHOSYNTAX
-	0,                                            // 523 ERR_WHOLIMEXCEED
-	0,                                            // 524 ERR_QUARANTINED, ERR_OPERSPVERIFY
-	0,                                            // 525 ERR_REMOTEPFX
-	0,                                            // 526 ERR_PFXUNROUTABLE
-	0,                                            // 527
-	0,                                            // 528
-	0,                                            // 529
-	0,                                            // 530
-	0,                                            // 531 ERR_CANTSENDTOUSER
-	0,                                            // 532
-	0,                                            // 533
-	0,                                            // 534
-	0,                                            // 535
-	0,                                            // 536
-	0,                                            // 537
-	0,                                            // 538
-	0,                                            // 539
-	0,                                            // 540
-	0,                                            // 541
-	0,                                            // 542
-	0,                                            // 543
-	0,                                            // 544
-	0,                                            // 545
-	0,                                            // 546
-	0,                                            // 547
-	0,                                            // 548
-	0,                                            // 549
-	0,                                            // 550 ERR_BADHOSTMASK
-	0,                                            // 551 ERR_HOSTUNAVAIL
-	0,                                            // 552 ERR_USINGSLINE
-	0,                                            // 553 ERR_STATSSLINE
-	0,                                            // 554
-	0,                                            // 555
-	0,                                            // 556
-	0,                                            // 557
-	0,                                            // 558
-	0,                                            // 559
-	0,                                            // 560
-	0,                                            // 561
-	0,                                            // 562
-	0,                                            // 563
-	0,                                            // 564
-	0,                                            // 565
-	0,                                            // 566
-	0,                                            // 567
-	0,                                            // 568
-	0,                                            // 569
-	0,                                            // 570
-	0,                                            // 571
-	0,                                            // 572
-	0,                                            // 573
-	0,                                            // 574
-	0,                                            // 575
-	0,                                            // 576
-	0,                                            // 577
-	0,                                            // 578
-	0,                                            // 579
-	0,                                            // 580
-	0,                                            // 581
-	0,                                            // 582
-	0,                                            // 583
-	0,                                            // 584
-	0,                                            // 585
-	0,                                            // 586
-	0,                                            // 587
-	0,                                            // 588
-	0,                                            // 589
-	0,                                            // 590
-	0,                                            // 591
-	0,                                            // 592
-	0,                                            // 593
-	0,                                            // 594
-	0,                                            // 595
-	0,                                            // 596
-	0,                                            // 597
-	0,                                            // 598
-	0,                                            // 599
+	nullptr,                                      // 503 ERR_GHOSTEDCLIENT
+	nullptr,                                      // 504 ERR_USERNOTONSERV
+	nullptr,                                      // 505
+	nullptr,                                      // 506
+	nullptr,                                      // 507
+	nullptr,                                      // 508
+	nullptr,                                      // 509
+	nullptr,                                      // 510
+	nullptr,                                      // 511 ERR_SILELISTFULL
+	nullptr,                                      // 512 ERR_TOOMANYWATCH
+	nullptr,                                      // 513 ERR_BADPING
+	nullptr,                                      // 514 ERR_INVALID_ERROR, ERR_TOOMANYDCC
+	nullptr,                                      // 515 ERR_BADEXPIRE
+	nullptr,                                      // 516 ERR_DONTCHEAT
+	nullptr,                                      // 517 ERR_DISABLED
+	nullptr,                                      // 518 ERR_NOINVITE, ERR_LONGMASK
+	nullptr,                                      // 519 ERR_ADMONLY, ERR_TOOMANYUSERS
+	nullptr,                                      // 520 ERR_OPERONLY, ERR_MASKTOOWIDE, ERR_WHOTRUNC, ERR_CANTJOINOPERSONLY
+	nullptr,                                      // 521 ERR_LISTSYNTAX
+	nullptr,                                      // 522 ERR_WHOSYNTAX
+	nullptr,                                      // 523 ERR_WHOLIMEXCEED
+	nullptr,                                      // 524 ERR_QUARANTINED, ERR_OPERSPVERIFY
+	nullptr,                                      // 525 ERR_REMOTEPFX
+	nullptr,                                      // 526 ERR_PFXUNROUTABLE
+	nullptr,                                      // 527
+	nullptr,                                      // 528
+	nullptr,                                      // 529
+	nullptr,                                      // 530
+	nullptr,                                      // 531 ERR_CANTSENDTOUSER
+	nullptr,                                      // 532
+	nullptr,                                      // 533
+	nullptr,                                      // 534
+	nullptr,                                      // 535
+	nullptr,                                      // 536
+	nullptr,                                      // 537
+	nullptr,                                      // 538
+	nullptr,                                      // 539
+	nullptr,                                      // 540
+	nullptr,                                      // 541
+	nullptr,                                      // 542
+	nullptr,                                      // 543
+	nullptr,                                      // 544
+	nullptr,                                      // 545
+	nullptr,                                      // 546
+	nullptr,                                      // 547
+	nullptr,                                      // 548
+	nullptr,                                      // 549
+	nullptr,                                      // 550 ERR_BADHOSTMASK
+	nullptr,                                      // 551 ERR_HOSTUNAVAIL
+	nullptr,                                      // 552 ERR_USINGSLINE
+	nullptr,                                      // 553 ERR_STATSSLINE
+	nullptr,                                      // 554
+	nullptr,                                      // 555
+	nullptr,                                      // 556
+	nullptr,                                      // 557
+	nullptr,                                      // 558
+	nullptr,                                      // 559
+	nullptr,                                      // 560
+	nullptr,                                      // 561
+	nullptr,                                      // 562
+	nullptr,                                      // 563
+	nullptr,                                      // 564
+	nullptr,                                      // 565
+	nullptr,                                      // 566
+	nullptr,                                      // 567
+	nullptr,                                      // 568
+	nullptr,                                      // 569
+	nullptr,                                      // 570
+	nullptr,                                      // 571
+	nullptr,                                      // 572
+	nullptr,                                      // 573
+	nullptr,                                      // 574
+	nullptr,                                      // 575
+	nullptr,                                      // 576
+	nullptr,                                      // 577
+	nullptr,                                      // 578
+	nullptr,                                      // 579
+	nullptr,                                      // 580
+	nullptr,                                      // 581
+	nullptr,                                      // 582
+	nullptr,                                      // 583
+	nullptr,                                      // 584
+	nullptr,                                      // 585
+	nullptr,                                      // 586
+	nullptr,                                      // 587
+	nullptr,                                      // 588
+	nullptr,                                      // 589
+	nullptr,                                      // 590
+	nullptr,                                      // 591
+	nullptr,                                      // 592
+	nullptr,                                      // 593
+	nullptr,                                      // 594
+	nullptr,                                      // 595
+	nullptr,                                      // 596
+	nullptr,                                      // 597
+	nullptr,                                      // 598
+	nullptr,                                      // 599
 	PTM(parseNumericWatch),                       // 600 RPL_LOGON
 	PTM(parseNumericWatch),                       // 601 RPL_LOGOFF
 	PTM(parseNumericWatch),                       // 602 RPL_WATCHOFF
-	0,                                            // 603 RPL_WATCHSTAT
+	nullptr,                                      // 603 RPL_WATCHSTAT
 	PTM(parseNumericWatch),                       // 604 RPL_NOWON
 	PTM(parseNumericWatch),                       // 605 RPL_NOWOFF
-	0,                                            // 606 RPL_WATCHLIST
-	0,                                            // 607 RPL_ENDOFWATCH
-	0,                                            // 608 RPL_WATCHCLEAR
-	0,                                            // 609
-	0,                                            // 610 RPL_MAPMORE, RPL_ISOPER
-	0,                                            // 611 RPL_ISLOCOP
-	0,                                            // 612 RPL_ISNOTOPER
-	0,                                            // 613 RPL_ENDOFISOPER
-	0,                                            // 614
-	0,                                            // 615 RPL_MAPMORE
-	0,                                            // 616 RPL_WHOISHOST
-	0,                                            // 617 RPL_DCCSTATUS, RPL_WHOISBOT
-	0,                                            // 618 RPL_DCCLIST
-	0,                                            // 619 RPL_ENDOFDCCLIST, RPL_WHOWASHOST
-	0,                                            // 620 RPL_DCCINFO, RPL_RULESSTART
-	0,                                            // 621 RPL_RULES
-	0,                                            // 622 RPL_ENDOFRULES
-	0,                                            // 623 RPL_MAPMORE
-	0,                                            // 624 RPL_OMOTDSTART
-	0,                                            // 625 RPL_OMOTD
-	0,                                            // 626 RPL_ENDOFO
-	0,                                            // 627
-	0,                                            // 628
-	0,                                            // 629
-	0,                                            // 630 RPL_SETTINGS
-	0,                                            // 631 RPL_ENDOFSETTINGS
-	0,                                            // 632
-	0,                                            // 633
-	0,                                            // 634
-	0,                                            // 635
-	0,                                            // 636
-	0,                                            // 637
-	0,                                            // 638
-	0,                                            // 639
-	0,                                            // 640 RPL_DUMPING
-	0,                                            // 641 RPL_DUMPRPL
-	0,                                            // 642 RPL_EODUMP
-	0,                                            // 643
-	0,                                            // 644
-	0,                                            // 645
-	0,                                            // 646
-	0,                                            // 647
-	0,                                            // 648
-	0,                                            // 649
-	0,                                            // 650
-	0,                                            // 651
-	0,                                            // 652
-	0,                                            // 653
-	0,                                            // 654
-	0,                                            // 655
-	0,                                            // 656
-	0,                                            // 657
-	0,                                            // 658
-	0,                                            // 659
-	0,                                            // 660 RPL_TRACEROUTE_HOP
-	0,                                            // 661 RPL_TRACEROUTE_START
-	0,                                            // 662 RPL_MODECHANGEWARN
-	0,                                            // 663 RPL_CHANREDIR
-	0,                                            // 664 RPL_SERVMODEIS
-	0,                                            // 665 RPL_OTHERUMODEIS
-	0,                                            // 666 RPL_ENDOF_GENERIC
-	0,                                            // 667
-	0,                                            // 668
-	0,                                            // 669
+	nullptr,                                      // 606 RPL_WATCHLIST
+	nullptr,                                      // 607 RPL_ENDOFWATCH
+	nullptr,                                      // 608 RPL_WATCHCLEAR
+	nullptr,                                      // 609
+	nullptr,                                      // 610 RPL_MAPMORE, RPL_ISOPER
+	nullptr,                                      // 611 RPL_ISLOCOP
+	nullptr,                                      // 612 RPL_ISNOTOPER
+	nullptr,                                      // 613 RPL_ENDOFISOPER
+	nullptr,                                      // 614
+	nullptr,                                      // 615 RPL_MAPMORE
+	nullptr,                                      // 616 RPL_WHOISHOST
+	nullptr,                                      // 617 RPL_DCCSTATUS, RPL_WHOISBOT
+	nullptr,                                      // 618 RPL_DCCLIST
+	nullptr,                                      // 619 RPL_ENDOFDCCLIST, RPL_WHOWASHOST
+	nullptr,                                      // 620 RPL_DCCINFO, RPL_RULESSTART
+	nullptr,                                      // 621 RPL_RULES
+	nullptr,                                      // 622 RPL_ENDOFRULES
+	nullptr,                                      // 623 RPL_MAPMORE
+	nullptr,                                      // 624 RPL_OMOTDSTART
+	nullptr,                                      // 625 RPL_OMOTD
+	nullptr,                                      // 626 RPL_ENDOFO
+	nullptr,                                      // 627
+	nullptr,                                      // 628
+	nullptr,                                      // 629
+	nullptr,                                      // 630 RPL_SETTINGS
+	nullptr,                                      // 631 RPL_ENDOFSETTINGS
+	nullptr,                                      // 632
+	nullptr,                                      // 633
+	nullptr,                                      // 634
+	nullptr,                                      // 635
+	nullptr,                                      // 636
+	nullptr,                                      // 637
+	nullptr,                                      // 638
+	nullptr,                                      // 639
+	nullptr,                                      // 640 RPL_DUMPING
+	nullptr,                                      // 641 RPL_DUMPRPL
+	nullptr,                                      // 642 RPL_EODUMP
+	nullptr,                                      // 643
+	nullptr,                                      // 644
+	nullptr,                                      // 645
+	nullptr,                                      // 646
+	nullptr,                                      // 647
+	nullptr,                                      // 648
+	nullptr,                                      // 649
+	nullptr,                                      // 650
+	nullptr,                                      // 651
+	nullptr,                                      // 652
+	nullptr,                                      // 653
+	nullptr,                                      // 654
+	nullptr,                                      // 655
+	nullptr,                                      // 656
+	nullptr,                                      // 657
+	nullptr,                                      // 658
+	nullptr,                                      // 659
+	nullptr,                                      // 660 RPL_TRACEROUTE_HOP
+	nullptr,                                      // 661 RPL_TRACEROUTE_START
+	nullptr,                                      // 662 RPL_MODECHANGEWARN
+	nullptr,                                      // 663 RPL_CHANREDIR
+	nullptr,                                      // 664 RPL_SERVMODEIS
+	nullptr,                                      // 665 RPL_OTHERUMODEIS
+	nullptr,                                      // 666 RPL_ENDOF_GENERIC
+	nullptr,                                      // 667
+	nullptr,                                      // 668
+	nullptr,                                      // 669
 	PTM(parseNumericStartTls),                    // 670 RPL_STARTTLSOK, RPL_WHOWASDETAILS
 	PTM(parseNumericWhoisOther),                  // 671 RPL_WHOISSECURE
-	0,                                            // 672 RPL_UNKNOWNMODES
-	0,                                            // 673 RPL_CANNOTSETMODES
-	0,                                            // 674
-	0,                                            // 675
-	0,                                            // 676
-	0,                                            // 677
-	0,                                            // 678 RPL_LUSERSTAFF
-	0,                                            // 679 RPL_TIMEONSERVERIS
-	0,                                            // 680
-	0,                                            // 681
-	0,                                            // 682 RPL_NETWORKS
-	0,                                            // 683
-	0,                                            // 684
-	0,                                            // 685
-	0,                                            // 686
-	0,                                            // 687 RPL_YOURLANGUAGEIS
-	0,                                            // 688 RPL_LANGUAGE
-	0,                                            // 689 RPL_WHOISSTAFF
-	0,                                            // 690 RPL_WHOISLANGUAGE
+	nullptr,                                      // 672 RPL_UNKNOWNMODES
+	nullptr,                                      // 673 RPL_CANNOTSETMODES
+	nullptr,                                      // 674
+	nullptr,                                      // 675
+	nullptr,                                      // 676
+	nullptr,                                      // 677
+	nullptr,                                      // 678 RPL_LUSERSTAFF
+	nullptr,                                      // 679 RPL_TIMEONSERVERIS
+	nullptr,                                      // 680
+	nullptr,                                      // 681
+	nullptr,                                      // 682 RPL_NETWORKS
+	nullptr,                                      // 683
+	nullptr,                                      // 684
+	nullptr,                                      // 685
+	nullptr,                                      // 686
+	nullptr,                                      // 687 RPL_YOURLANGUAGEIS
+	nullptr,                                      // 688 RPL_LANGUAGE
+	nullptr,                                      // 689 RPL_WHOISSTAFF
+	nullptr,                                      // 690 RPL_WHOISLANGUAGE
 	PTM(parseNumericStartTls),                    // 691 RPL_STARTTLSFAIL
-	0,                                            // 692
-	0,                                            // 693
-	0,                                            // 694
-	0,                                            // 695
-	0,                                            // 696
-	0,                                            // 697
-	0,                                            // 698
-	0,                                            // 699
+	nullptr,                                      // 692
+	nullptr,                                      // 693
+	nullptr,                                      // 694
+	nullptr,                                      // 695
+	nullptr,                                      // 696
+	nullptr,                                      // 697
+	nullptr,                                      // 698
+	nullptr,                                      // 699
 	PTM(parseNumericCodePageSet),                 // 700 RPL_CODEPAGESET
-	0,                                            // 701
-	0,                                            // 702 RPL_MODLIST, RPL_COMMANDS
+	nullptr,                                      // 701
+	nullptr,                                      // 702 RPL_MODLIST, RPL_COMMANDS
 	PTM(parseNumericCodePageScheme),              // 703 RPL_WHOISSCHEME, RPL_ENDOFMODLIST, RPL_COMMANDSEND
 	PTM(parseCommandSyntaxHelp),                  // 704 RPL_COMMANDSYNTAX, RPL_HELPSTART
 	PTM(parseCommandHelp),                        // 705 RPL_COMMANDHELP, RPL_HELPTXT
 	PTM(parseCommandEndOfHelp),                   // 706 RPL_ENDOFCOMMANDHELP, RPL_ENDOFHELP
-	0,                                            // 707
-	0,                                            // 708 RPL_ETRACEFULL
-	0,                                            // 709 RPL_ETRACE
-	0,                                            // 710 RPL_KNOCK
-	0,                                            // 711 RPL_KNOCKDLVR
-	0,                                            // 712 ERR_TOOMANYKNOCK
-	0,                                            // 713 ERR_CHANOPEN
-	0,                                            // 714 ERR_KNOCKONCHAN
-	0,                                            // 715 ERR_KNOCKDISABLED
+	nullptr,                                      // 707
+	nullptr,                                      // 708 RPL_ETRACEFULL
+	nullptr,                                      // 709 RPL_ETRACE
+	nullptr,                                      // 710 RPL_KNOCK
+	nullptr,                                      // 711 RPL_KNOCKDLVR
+	nullptr,                                      // 712 ERR_TOOMANYKNOCK
+	nullptr,                                      // 713 ERR_CHANOPEN
+	nullptr,                                      // 714 ERR_KNOCKONCHAN
+	nullptr,                                      // 715 ERR_KNOCKDISABLED
 	PTM(parseNumericNotifyGeneric),               // 716 RPL_TARGUMODEG
 	PTM(parseNumericNotifyGeneric),               // 717 RPL_TARGNOTIFY
 	PTM(parseNumericYouHaveCallerID),             // 718 RPL_UMODEGMSG
-	0,                                            // 719
-	0,                                            // 720 RPL_OMOTDSTART
-	0,                                            // 721 RPL_OMOTD
-	0,                                            // 722 RPL_ENDOFOMOTD
-	0,                                            // 723 ERR_NOPRIVS
-	0,                                            // 724 RPL_TESTMARK
-	0,                                            // 725 RPL_TESTLINE
-	0,                                            // 726 RPL_NOTESTLINE
-	0,                                            // 727
+	nullptr,                                      // 719
+	nullptr,                                      // 720 RPL_OMOTDSTART
+	nullptr,                                      // 721 RPL_OMOTD
+	nullptr,                                      // 722 RPL_ENDOFOMOTD
+	nullptr,                                      // 723 ERR_NOPRIVS
+	nullptr,                                      // 724 RPL_TESTMARK
+	nullptr,                                      // 725 RPL_TESTLINE
+	nullptr,                                      // 726 RPL_NOTESTLINE
+	nullptr,                                      // 727
 	PTM(parseNumeric728),                         // 728 RPL_QUIETLIST
 	PTM(parseNumeric729),                         // 729 RPL_QUIETLISTEND
-	0,                                            // 730
-	0,                                            // 731
-	0,                                            // 732
-	0,                                            // 733
-	0,                                            // 734
-	0,                                            // 735
-	0,                                            // 736
-	0,                                            // 737
-	0,                                            // 738
-	0,                                            // 739
-	0,                                            // 740
-	0,                                            // 741
+	nullptr,                                      // 730
+	nullptr,                                      // 731
+	nullptr,                                      // 732
+	nullptr,                                      // 733
+	nullptr,                                      // 734
+	nullptr,                                      // 735
+	nullptr,                                      // 736
+	nullptr,                                      // 737
+	nullptr,                                      // 738
+	nullptr,                                      // 739
+	nullptr,                                      // 740
+	nullptr,                                      // 741
 	PTM(parseNumeric742),                         // 742
-	0,                                            // 743
-	0,                                            // 744
-	0,                                            // 745
-	0,                                            // 746
-	0,                                            // 747
-	0,                                            // 748
-	0,                                            // 749
-	0,                                            // 750
-	0,                                            // 751
-	0,                                            // 752
-	0,                                            // 753
-	0,                                            // 754
-	0,                                            // 755
-	0,                                            // 756
-	0,                                            // 757
-	0,                                            // 758
-	0,                                            // 759
-	0,                                            // 760
-	0,                                            // 761
-	0,                                            // 762
-	0,                                            // 763
-	0,                                            // 764
-	0,                                            // 765
-	0,                                            // 766
-	0,                                            // 767
-	0,                                            // 768
-	0,                                            // 769
-	0,                                            // 770
-	0,                                            // 771 RPL_XINFO
-	0,                                            // 772
-	0,                                            // 773 RPL_XINFOSTART
-	0,                                            // 774 RPL_XINFOEND
-	0,                                            // 775
-	0,                                            // 776
-	0,                                            // 777
-	0,                                            // 778
-	0,                                            // 779
-	0,                                            // 780
-	0,                                            // 781
-	0,                                            // 782
-	0,                                            // 783
-	0,                                            // 784
-	0,                                            // 785
-	0,                                            // 786
-	0,                                            // 787
-	0,                                            // 788
-	0,                                            // 789
-	0,                                            // 790
-	0,                                            // 791
-	0,                                            // 792
-	0,                                            // 793
-	0,                                            // 794
-	0,                                            // 795
-	0,                                            // 796
-	0,                                            // 797
-	0,                                            // 798
-	0,                                            // 799
-	0,                                            // 800
-	0,                                            // 801
-	0,                                            // 802
-	0,                                            // 803
-	0,                                            // 804
-	0,                                            // 805
-	0,                                            // 806
-	0,                                            // 807
-	0,                                            // 808
-	0,                                            // 809
-	0,                                            // 810
-	0,                                            // 811
-	0,                                            // 812
-	0,                                            // 813
-	0,                                            // 814
-	0,                                            // 815
-	0,                                            // 816
-	0,                                            // 817
-	0,                                            // 818
-	0,                                            // 819
-	0,                                            // 820
-	0,                                            // 821
-	0,                                            // 822
-	0,                                            // 823
-	0,                                            // 824
-	0,                                            // 825
-	0,                                            // 826
-	0,                                            // 827
-	0,                                            // 828
-	0,                                            // 829
-	0,                                            // 830
-	0,                                            // 831
-	0,                                            // 832
-	0,                                            // 833
-	0,                                            // 834
-	0,                                            // 835
-	0,                                            // 836
-	0,                                            // 837
-	0,                                            // 838
-	0,                                            // 839
-	0,                                            // 840
-	0,                                            // 841
-	0,                                            // 842
-	0,                                            // 843
-	0,                                            // 844
-	0,                                            // 845
-	0,                                            // 846
-	0,                                            // 847
-	0,                                            // 848
-	0,                                            // 849
-	0,                                            // 850
-	0,                                            // 851
-	0,                                            // 852
-	0,                                            // 853
-	0,                                            // 854
-	0,                                            // 855
-	0,                                            // 856
-	0,                                            // 857
-	0,                                            // 858
-	0,                                            // 859
-	0,                                            // 860
-	0,                                            // 861
-	0,                                            // 862
-	0,                                            // 863
-	0,                                            // 864
-	0,                                            // 865
-	0,                                            // 866
-	0,                                            // 867
-	0,                                            // 868
-	0,                                            // 869
-	0,                                            // 870
-	0,                                            // 871
-	0,                                            // 872
-	0,                                            // 873
-	0,                                            // 874
-	0,                                            // 875
-	0,                                            // 876
-	0,                                            // 877
-	0,                                            // 878
-	0,                                            // 879
-	0,                                            // 880
-	0,                                            // 881
-	0,                                            // 882
-	0,                                            // 883
-	0,                                            // 884
-	0,                                            // 885
-	0,                                            // 886
-	0,                                            // 887
-	0,                                            // 888
-	0,                                            // 889
-	0,                                            // 890
-	0,                                            // 891
-	0,                                            // 892
-	0,                                            // 893
-	0,                                            // 894
-	0,                                            // 895
-	0,                                            // 896
-	0,                                            // 897
-	0,                                            // 898
-	0,                                            // 899
+	nullptr,                                      // 743
+	nullptr,                                      // 744
+	nullptr,                                      // 745
+	nullptr,                                      // 746
+	nullptr,                                      // 747
+	nullptr,                                      // 748
+	nullptr,                                      // 749
+	nullptr,                                      // 750
+	nullptr,                                      // 751
+	nullptr,                                      // 752
+	nullptr,                                      // 753
+	nullptr,                                      // 754
+	nullptr,                                      // 755
+	nullptr,                                      // 756
+	nullptr,                                      // 757
+	nullptr,                                      // 758
+	nullptr,                                      // 759
+	nullptr,                                      // 760
+	nullptr,                                      // 761
+	nullptr,                                      // 762
+	nullptr,                                      // 763
+	nullptr,                                      // 764
+	nullptr,                                      // 765
+	nullptr,                                      // 766
+	nullptr,                                      // 767
+	nullptr,                                      // 768
+	nullptr,                                      // 769
+	nullptr,                                      // 770
+	nullptr,                                      // 771 RPL_XINFO
+	nullptr,                                      // 772
+	nullptr,                                      // 773 RPL_XINFOSTART
+	nullptr,                                      // 774 RPL_XINFOEND
+	nullptr,                                      // 775
+	nullptr,                                      // 776
+	nullptr,                                      // 777
+	nullptr,                                      // 778
+	nullptr,                                      // 779
+	nullptr,                                      // 780
+	nullptr,                                      // 781
+	nullptr,                                      // 782
+	nullptr,                                      // 783
+	nullptr,                                      // 784
+	nullptr,                                      // 785
+	nullptr,                                      // 786
+	nullptr,                                      // 787
+	nullptr,                                      // 788
+	nullptr,                                      // 789
+	nullptr,                                      // 790
+	nullptr,                                      // 791
+	nullptr,                                      // 792
+	nullptr,                                      // 793
+	nullptr,                                      // 794
+	nullptr,                                      // 795
+	nullptr,                                      // 796
+	nullptr,                                      // 797
+	nullptr,                                      // 798
+	nullptr,                                      // 799
+	nullptr,                                      // 800
+	nullptr,                                      // 801
+	nullptr,                                      // 802
+	nullptr,                                      // 803
+	nullptr,                                      // 804
+	nullptr,                                      // 805
+	nullptr,                                      // 806
+	nullptr,                                      // 807
+	nullptr,                                      // 808
+	nullptr,                                      // 809
+	nullptr,                                      // 810
+	nullptr,                                      // 811
+	nullptr,                                      // 812
+	nullptr,                                      // 813
+	nullptr,                                      // 814
+	nullptr,                                      // 815
+	nullptr,                                      // 816
+	nullptr,                                      // 817
+	nullptr,                                      // 818
+	nullptr,                                      // 819
+	nullptr,                                      // 820
+	nullptr,                                      // 821
+	nullptr,                                      // 822
+	nullptr,                                      // 823
+	nullptr,                                      // 824
+	nullptr,                                      // 825
+	nullptr,                                      // 826
+	nullptr,                                      // 827
+	nullptr,                                      // 828
+	nullptr,                                      // 829
+	nullptr,                                      // 830
+	nullptr,                                      // 831
+	nullptr,                                      // 832
+	nullptr,                                      // 833
+	nullptr,                                      // 834
+	nullptr,                                      // 835
+	nullptr,                                      // 836
+	nullptr,                                      // 837
+	nullptr,                                      // 838
+	nullptr,                                      // 839
+	nullptr,                                      // 840
+	nullptr,                                      // 841
+	nullptr,                                      // 842
+	nullptr,                                      // 843
+	nullptr,                                      // 844
+	nullptr,                                      // 845
+	nullptr,                                      // 846
+	nullptr,                                      // 847
+	nullptr,                                      // 848
+	nullptr,                                      // 849
+	nullptr,                                      // 850
+	nullptr,                                      // 851
+	nullptr,                                      // 852
+	nullptr,                                      // 853
+	nullptr,                                      // 854
+	nullptr,                                      // 855
+	nullptr,                                      // 856
+	nullptr,                                      // 857
+	nullptr,                                      // 858
+	nullptr,                                      // 859
+	nullptr,                                      // 860
+	nullptr,                                      // 861
+	nullptr,                                      // 862
+	nullptr,                                      // 863
+	nullptr,                                      // 864
+	nullptr,                                      // 865
+	nullptr,                                      // 866
+	nullptr,                                      // 867
+	nullptr,                                      // 868
+	nullptr,                                      // 869
+	nullptr,                                      // 870
+	nullptr,                                      // 871
+	nullptr,                                      // 872
+	nullptr,                                      // 873
+	nullptr,                                      // 874
+	nullptr,                                      // 875
+	nullptr,                                      // 876
+	nullptr,                                      // 877
+	nullptr,                                      // 878
+	nullptr,                                      // 879
+	nullptr,                                      // 880
+	nullptr,                                      // 881
+	nullptr,                                      // 882
+	nullptr,                                      // 883
+	nullptr,                                      // 884
+	nullptr,                                      // 885
+	nullptr,                                      // 886
+	nullptr,                                      // 887
+	nullptr,                                      // 888
+	nullptr,                                      // 889
+	nullptr,                                      // 890
+	nullptr,                                      // 891
+	nullptr,                                      // 892
+	nullptr,                                      // 893
+	nullptr,                                      // 894
+	nullptr,                                      // 895
+	nullptr,                                      // 896
+	nullptr,                                      // 897
+	nullptr,                                      // 898
+	nullptr,                                      // 899
 	PTM(parseNumericSaslLogin),                   // 900 RPL_SASLLOGIN
-	0,                                            // 901
-	0,                                            // 902
+	nullptr,                                      // 901
+	nullptr,                                      // 902
 	PTM(parseNumericSaslSuccess),                 // 903 RPL_SASLSUCCESS
 	PTM(parseNumericSaslFail),                    // 904 RPL_SASLFAILED
 	PTM(parseNumericSaslFail),                    // 905 RPL_SASLERROR
 	PTM(parseNumericSaslFail),                    // 906 RPL_SASLABORT
 	PTM(parseNumericSaslFail),                    // 907 RPL_SASLALREADYAUTH
 	PTM(parseNumericSaslFail),                    // 908 RPL_SASLMECHS
-	0,                                            // 909
+	nullptr,                                      // 909
 	PTM(parseNumericChanAccessList),              // 910 RPL_CHANACCESS
 	PTM(parseNumericEndOfChanAccessList),         // 911 RPL_ENDOFCHANACCESS
-	0,                                            // 912
-	0,                                            // 913
-	0,                                            // 914
-	0,                                            // 915
-	0,                                            // 916
-	0,                                            // 917
-	0,                                            // 918
-	0,                                            // 919
-	0,                                            // 920
-	0,                                            // 921
-	0,                                            // 922
-	0,                                            // 923
-	0,                                            // 924
-	0,                                            // 925
-	0,                                            // 926
-	0,                                            // 927
-	0,                                            // 928
-	0,                                            // 929
-	0,                                            // 930
-	0,                                            // 931
-	0,                                            // 932
-	0,                                            // 933
-	0,                                            // 934
+	nullptr,                                      // 912
+	nullptr,                                      // 913
+	nullptr,                                      // 914
+	nullptr,                                      // 915
+	nullptr,                                      // 916
+	nullptr,                                      // 917
+	nullptr,                                      // 918
+	nullptr,                                      // 919
+	nullptr,                                      // 920
+	nullptr,                                      // 921
+	nullptr,                                      // 922
+	nullptr,                                      // 923
+	nullptr,                                      // 924
+	nullptr,                                      // 925
+	nullptr,                                      // 926
+	nullptr,                                      // 927
+	nullptr,                                      // 928
+	nullptr,                                      // 929
+	nullptr,                                      // 930
+	nullptr,                                      // 931
+	nullptr,                                      // 932
+	nullptr,                                      // 933
+	nullptr,                                      // 934
 	PTM(otherChannelError),                       // 935 RPL_WORDFILTERTOOLONG
-	0,                                            // 936 RPL_WORDFILTERED
+	nullptr,                                      // 936 RPL_WORDFILTERED
 	PTM(otherChannelError),                       // 937 RPL_WORDALREADYEXISTS
 	PTM(otherChannelError),                       // 938 RPL_NOSUCHWORDFILTER
 	PTM(otherChannelError),                       // 939 RPL_WORDFILTERFULL
 	PTM(parseNumericEndOfSpamFilterList),         // 940 RPL_SPAMFILTERLIST
 	PTM(parseNumericSpamFilterList),              // 941 RPL_ENDOFSPAMFILTERLIST
-	0,                                            // 942
-	0,                                            // 943
-	0,                                            // 944
-	0,                                            // 945
-	0,                                            // 946
-	0,                                            // 947
-	0,                                            // 948
-	0,                                            // 949
-	0,                                            // 950
-	0,                                            // 951
-	0,                                            // 952
+	nullptr,                                      // 942
+	nullptr,                                      // 943
+	nullptr,                                      // 944
+	nullptr,                                      // 945
+	nullptr,                                      // 946
+	nullptr,                                      // 947
+	nullptr,                                      // 948
+	nullptr,                                      // 949
+	nullptr,                                      // 950
+	nullptr,                                      // 951
+	nullptr,                                      // 952
 	PTM(parseNumericEndOfExemptChanOpList),       // 953 RPL_ENDOFEXEMPTCHANOPLIST
 	PTM(parseNumericExemptChanOpList),            // 954 RPL_EXEMPTCHANOPLIST
-	0,                                            // 955
-	0,                                            // 956
-	0,                                            // 957
-	0,                                            // 958
-	0,                                            // 959
-	0,                                            // 960
-	0,                                            // 961
-	0,                                            // 962
-	0,                                            // 963
-	0,                                            // 964
-	0,                                            // 965
-	0,                                            // 966
-	0,                                            // 967
-	0,                                            // 968
-	0,                                            // 969
-	0,                                            // 970
-	0,                                            // 971
-	0,                                            // 972 ERR_CANNOTDOCOMMAND, ERR_CANTUNLOADMODULE
-	0,                                            // 973 ERR_CANNOTCHANGEUMODE, RPL_UNLOADEDMODULE
-	0,                                            // 974 ERR_CANNOTCHANGECHANMODE, ERR_CANTLOADMODULE
-	0,                                            // 975 ERR_CANNOTCHANGESERVERMODE, RPL_LOADEDMODULE
-	0,                                            // 976 ERR_CANNOTSENDTONICK
-	0,                                            // 977 ERR_UNKNOWNSERVERMODE
-	0,                                            // 978
-	0,                                            // 979 ERR_SERVERMODELOCK
-	0,                                            // 980 ERR_BADCHARENCODING
-	0,                                            // 981 ERR_TOOMANYLANGUAGES
-	0,                                            // 982 ERR_NOLANGUAGE
-	0,                                            // 983 ERR_TEXTTOOSHORT
-	0,                                            // 984
-	0,                                            // 985
-	0,                                            // 986
-	0,                                            // 987
-	0,                                            // 988
-	0,                                            // 989
-	0,                                            // 990
-	0,                                            // 991
-	0,                                            // 992
-	0,                                            // 993
-	0,                                            // 994
-	0,                                            // 995
-	0,                                            // 996
-	0,                                            // 997
-	0,                                            // 998
-	0                                             // 999 ERR_NUMERIC_ERR
+	nullptr,                                      // 955
+	nullptr,                                      // 956
+	nullptr,                                      // 957
+	nullptr,                                      // 958
+	nullptr,                                      // 959
+	nullptr,                                      // 960
+	nullptr,                                      // 961
+	nullptr,                                      // 962
+	nullptr,                                      // 963
+	nullptr,                                      // 964
+	nullptr,                                      // 965
+	nullptr,                                      // 966
+	nullptr,                                      // 967
+	nullptr,                                      // 968
+	nullptr,                                      // 969
+	nullptr,                                      // 970
+	nullptr,                                      // 971
+	nullptr,                                      // 972 ERR_CANNOTDOCOMMAND, ERR_CANTUNLOADMODULE
+	nullptr,                                      // 973 ERR_CANNOTCHANGEUMODE, RPL_UNLOADEDMODULE
+	nullptr,                                      // 974 ERR_CANNOTCHANGECHANMODE, ERR_CANTLOADMODULE
+	nullptr,                                      // 975 ERR_CANNOTCHANGESERVERMODE, RPL_LOADEDMODULE
+	nullptr,                                      // 976 ERR_CANNOTSENDTONICK
+	nullptr,                                      // 977 ERR_UNKNOWNSERVERMODE
+	nullptr,                                      // 978
+	nullptr,                                      // 979 ERR_SERVERMODELOCK
+	nullptr,                                      // 980 ERR_BADCHARENCODING
+	nullptr,                                      // 981 ERR_TOOMANYLANGUAGES
+	nullptr,                                      // 982 ERR_NOLANGUAGE
+	nullptr,                                      // 983 ERR_TEXTTOOSHORT
+	nullptr,                                      // 984
+	nullptr,                                      // 985
+	nullptr,                                      // 986
+	nullptr,                                      // 987
+	nullptr,                                      // 988
+	nullptr,                                      // 989
+	nullptr,                                      // 990
+	nullptr,                                      // 991
+	nullptr,                                      // 992
+	nullptr,                                      // 993
+	nullptr,                                      // 994
+	nullptr,                                      // 995
+	nullptr,                                      // 996
+	nullptr,                                      // 997
+	nullptr,                                      // 998
+	nullptr                                       // 999 ERR_NUMERIC_ERR
 };
diff --git a/src/kvirc/ui/KviActionDrawer.cpp b/src/kvirc/ui/KviActionDrawer.cpp
index b4af502cd..c5f518db8 100644
--- a/src/kvirc/ui/KviActionDrawer.cpp
+++ b/src/kvirc/ui/KviActionDrawer.cpp
@@ -45,8 +45,7 @@ KviActionDrawer::KviActionDrawer(QWidget * pParent)
 }
 
 KviActionDrawer::~KviActionDrawer()
-{
-}
+    = default;
 
 void KviActionDrawer::fill()
 {
@@ -104,8 +103,7 @@ KviActionDrawerPage::KviActionDrawerPage(QWidget * pParent, const QString & szDe
 }
 
 KviActionDrawerPage::~KviActionDrawerPage()
-{
-}
+    = default;
 
 void KviActionDrawerPage::add(KviAction * pAction)
 {
@@ -123,8 +121,7 @@ KviActionDrawerPageListWidget::KviActionDrawerPageListWidget(KviActionDrawerPage
 }
 
 KviActionDrawerPageListWidget::~KviActionDrawerPageListWidget()
-{
-}
+    = default;
 
 void KviActionDrawerPageListWidget::mousePressEvent(QMouseEvent * e)
 {
@@ -179,5 +176,4 @@ KviActionDrawerPageListWidgetItem::KviActionDrawerPageListWidgetItem(KviTalListW
 }
 
 KviActionDrawerPageListWidgetItem::~KviActionDrawerPageListWidgetItem()
-{
-}
+    = default;
diff --git a/src/kvirc/ui/KviChannelWindow.cpp b/src/kvirc/ui/KviChannelWindow.cpp
index 0525520c8..5f1cf5350 100644
--- a/src/kvirc/ui/KviChannelWindow.cpp
+++ b/src/kvirc/ui/KviChannelWindow.cpp
@@ -174,9 +174,9 @@ KviChannelWindow::KviChannelWindow(KviConsoleWindow * lpConsole, const QString &
 		szListModes = pServerInfo->supportedListModes();
 		szListModes.remove('b');
 
-		for(int i = 0; i < szListModes.size(); ++i)
+		for(auto szListMode : szListModes)
 		{
-			char cMode = szListModes.at(i).unicode();
+			char cMode = szListMode.unicode();
 			QString szDescription = pServerInfo->getChannelModeDescription(cMode);
 			if(szDescription.isEmpty())
 				szDescription = __tr2qs("Mode \"%1\" masks").arg(cMode);
@@ -219,7 +219,7 @@ KviChannelWindow::KviChannelWindow(KviConsoleWindow * lpConsole, const QString &
 	m_pModeEditorButton = new KviWindowToolPageButton(KviIconManager::ChanModeHide, KviIconManager::ChanMode, __tr2qs("Mode editor"), buttonContainer(), false);
 	m_pModeEditorButton->setObjectName("mode_editor_button");
 	connect(m_pModeEditorButton, SIGNAL(clicked()), this, SLOT(toggleModeEditor()));
-	m_pModeEditor = 0;
+	m_pModeEditor = nullptr;
 
 #ifdef COMPILE_CRYPT_SUPPORT
 	createCryptControllerButton(m_pButtonContainer);
@@ -405,7 +405,7 @@ void KviChannelWindow::loadProperties(KviConfigurationFile * pCfg)
 		m_pListViewButton->setChecked(!bHidden);
 		if(!bHidden)
 			m_pSplitter->setSizes(m_SplitterSizesList);
-		resizeEvent(0);
+		resizeEvent(nullptr);
 	}
 
 	if(pCfg->readBoolEntry("ToolButtonsHidden", KVI_OPTION_BOOL(KviOption_boolHideWindowToolButtons)) != buttonContainer()->isHidden())
@@ -423,7 +423,7 @@ void KviChannelWindow::showDoubleView(bool bShow)
 		m_VertSplitterSizesList = m_pVertSplitter->sizes();
 
 		delete m_pMessageView;
-		m_pMessageView = 0;
+		m_pMessageView = nullptr;
 
 		if(m_pDoubleViewButton->isChecked())
 			m_pDoubleViewButton->setChecked(false);
@@ -500,7 +500,7 @@ void KviChannelWindow::toggleModeEditor()
 		m_pSplitter->setMinimumHeight(20);
 		if(m_pModeEditorButton->isChecked())
 			m_pModeEditorButton->setChecked(false);
-		resizeEvent(0);
+		resizeEvent(nullptr);
 	}
 	else
 	{
@@ -750,7 +750,7 @@ void KviChannelWindow::setDeadChan()
 	m_pUserListView->enableUpdates(false);
 	m_pUserListView->partAll();
 	m_pUserListView->enableUpdates(true);
-	m_pUserListView->setUserDataBase(0);
+	m_pUserListView->setUserDataBase(nullptr);
 
 	//clear all mask editors
 	QMap<char, KviMaskEditor *>::const_iterator iter2 = m_pListEditors.constBegin();
@@ -1847,7 +1847,7 @@ void KviChannelWindow::closeEvent(QCloseEvent * pEvent)
 			KviQString::escapeKvs(&szTmp, KviQString::PermitVariables | KviQString::PermitFunctions);
 			KviKvsVariant vRet;
 
-			if(KviKvsScript::evaluate(szTmp, this, 0, &vRet))
+			if(KviKvsScript::evaluate(szTmp, this, nullptr, &vRet))
 				vRet.asString(szTmp);
 
 			QByteArray dat = encodeText(szTmp);
diff --git a/src/kvirc/ui/KviColorSelectionWindow.cpp b/src/kvirc/ui/KviColorSelectionWindow.cpp
index 32d194c55..1e4d9df2d 100644
--- a/src/kvirc/ui/KviColorSelectionWindow.cpp
+++ b/src/kvirc/ui/KviColorSelectionWindow.cpp
@@ -32,13 +32,13 @@
 #include <QMouseEvent>
 
 KviColorWindow::KviColorWindow()
-    : QWidget(0)
+    : QWidget(nullptr)
 {
 	setObjectName("toplevel_color_window");
 	setWindowFlags(Qt::Popup);
 	setFocusPolicy(Qt::NoFocus);
 	setFixedSize(144, 36);
-	m_pOwner = 0;
+	m_pOwner = nullptr;
 	QFont fnt = QFont();
 	fnt.setStyleHint(QFont::TypeWriter);
 	fnt.setPointSize(10);
diff --git a/src/kvirc/ui/KviConsoleWindow.cpp b/src/kvirc/ui/KviConsoleWindow.cpp
index 63dfdf2ff..143195085 100644
--- a/src/kvirc/ui/KviConsoleWindow.cpp
+++ b/src/kvirc/ui/KviConsoleWindow.cpp
@@ -138,7 +138,7 @@ KviConsoleWindow::KviConsoleWindow(int iFlags)
 	m_pNotifyViewButton = new KviWindowToolPageButton(KviIconManager::HideListView, KviIconManager::ShowListView, __tr2qs("Notify list"), buttonContainer(), true);
 	connect(m_pNotifyViewButton, SIGNAL(clicked()), this, SLOT(toggleNotifyView()));
 
-	m_pNotifyListView = new KviUserListView(m_pSplitter, m_pNotifyViewButton, 0, this, 19, __tr2qs("Notify list"), "notify_list_view");
+	m_pNotifyListView = new KviUserListView(m_pSplitter, m_pNotifyViewButton, nullptr, this, 19, __tr2qs("Notify list"), "notify_list_view");
 
 	m_pInput = new KviInput(this, m_pNotifyListView);
 
@@ -154,12 +154,9 @@ void KviConsoleWindow::recentUrlsChanged()
 {
 	QString cur = m_pAddressEdit->currentText();
 	m_pAddressEdit->clear();
-	for(
-	    QStringList::Iterator it = KVI_OPTION_STRINGLIST(KviOption_stringlistRecentIrcUrls).begin();
-	    it != KVI_OPTION_STRINGLIST(KviOption_stringlistRecentIrcUrls).end();
-	    ++it)
+	for(auto & it : KVI_OPTION_STRINGLIST(KviOption_stringlistRecentIrcUrls))
 	{
-		m_pAddressEdit->addItem(*(g_pIconManager->getSmallIcon(KviIconManager::Url)), *it);
+		m_pAddressEdit->addItem(*(g_pIconManager->getSmallIcon(KviIconManager::Url)), it);
 	}
 
 	int i = m_pAddressEdit->findText(cur);
@@ -178,7 +175,7 @@ void KviConsoleWindow::recentUrlsChanged()
 
 bool KviConsoleWindow::connectionInProgress()
 {
-	if(context()->asynchronousConnectionData() != 0)
+	if(context()->asynchronousConnectionData() != nullptr)
 		return true;
 	if(context()->state() != KviIrcContext::Idle)
 		return true;
@@ -197,7 +194,7 @@ KviConsoleWindow::~KviConsoleWindow()
 	//if(m_pLastIrcServer)delete m_pLastIrcServer;
 
 	delete m_pContext;
-	m_pContext = 0;
+	m_pContext = nullptr;
 
 	delete m_pTmpHighLightedChannels;
 }
@@ -233,20 +230,18 @@ void KviConsoleWindow::completeChannel(const QString & word, KviPointerList<QStr
 	QStringList * pList = g_pApp->recentChannelsForNetwork(currentNetworkName());
 	if(pList)
 	{
-		for(QStringList::Iterator it = pList->begin(); it != pList->end(); ++it)
+		for(auto & it : *pList)
 		{
-			if(KviQString::equalCIN((*it), word, word.length()))
-				matches->append(new QString(*it));
+			if(KviQString::equalCIN(it, word, word.length()))
+				matches->append(new QString(it));
 		}
 	}
 }
 
 void KviConsoleWindow::completeServer(const QString & word, KviPointerList<QString> * matches)
 {
-	for(QStringList::Iterator it = KVI_OPTION_STRINGLIST(KviOption_stringlistRecentServers).begin(); it != KVI_OPTION_STRINGLIST(KviOption_stringlistRecentServers).end(); ++it)
+	for(auto srv : KVI_OPTION_STRINGLIST(KviOption_stringlistRecentServers))
 	{
-		QString srv((*it));
-
 		KviQString::cutToFirst(srv, '/');
 		while(srv.startsWith("/"))
 			srv.remove(0, 1);
@@ -507,7 +502,7 @@ void KviConsoleWindow::connectionDetached()
 {
 	//need to update URI?
 	m_pNotifyListView->partAll();
-	m_pNotifyListView->setUserDataBase(0); // this is rather for crash tests
+	m_pNotifyListView->setUserDataBase(nullptr); // this is rather for crash tests
 }
 
 void KviConsoleWindow::closeEvent(QCloseEvent * e)
@@ -588,7 +583,7 @@ int KviConsoleWindow::triggerOnHighlight(KviWindow * pWnd, int iType, const QStr
 			return iType;
 	}
 	if(!KVI_OPTION_STRING(KviOption_stringOnHighlightedMessageSound).isEmpty() && pWnd && !pWnd->hasAttention())
-		KviKvsScript::run("snd.play $0", 0, new KviKvsVariantList(new KviKvsVariant(KVI_OPTION_STRING(KviOption_stringOnHighlightedMessageSound))));
+		KviKvsScript::run("snd.play $0", nullptr, new KviKvsVariantList(new KviKvsVariant(KVI_OPTION_STRING(KviOption_stringOnHighlightedMessageSound))));
 
 	QString szMessageType = QString("%1").arg(iType);
 
@@ -645,28 +640,27 @@ int KviConsoleWindow::applyHighlighting(KviWindow * wnd, int type, const QString
 
 	if(KVI_OPTION_BOOL(KviOption_boolUseWordHighlighting))
 	{
-		for(QStringList::Iterator it = KVI_OPTION_STRINGLIST(KviOption_stringlistHighlightWords).begin();
-		    it != KVI_OPTION_STRINGLIST(KviOption_stringlistHighlightWords).end(); ++it)
+		for(auto & it : KVI_OPTION_STRINGLIST(KviOption_stringlistHighlightWords))
 		{
-			if((*it).isEmpty())
+			if(it.isEmpty())
 				continue;
 
 			if(KVI_OPTION_BOOL(KviOption_boolUseFullWordHighlighting))
 			{
-				if(szStripMsg.contains(*it, cs))
-					return triggerOnHighlight(wnd, type, nick, user, host, szMsg, *it);
+				if(szStripMsg.contains(it, cs))
+					return triggerOnHighlight(wnd, type, nick, user, host, szMsg, it);
 			}
 			else
 			{
 				if(!szPattern.isEmpty())
 					rgxHlite.setPattern(
-					    QString("(?:[%1]|\\s|^)%2(?:[%1]|\\s|$)").arg(QRegExp::escape(szPattern), QRegExp::escape(*it)));
+					    QString("(?:[%1]|\\s|^)%2(?:[%1]|\\s|$)").arg(QRegExp::escape(szPattern), QRegExp::escape(it)));
 				else
 					rgxHlite.setPattern(
-					    QString("(?:\\s|^)%1(?:\\s|$)").arg(QRegExp::escape(*it)));
+					    QString("(?:\\s|^)%1(?:\\s|$)").arg(QRegExp::escape(it)));
 				rgxHlite.setCaseSensitivity(cs);
 				if(szStripMsg.contains(rgxHlite))
-					return triggerOnHighlight(wnd, type, nick, user, host, szMsg, *it);
+					return triggerOnHighlight(wnd, type, nick, user, host, szMsg, it);
 			}
 		}
 	}
@@ -1027,7 +1021,7 @@ void KviConsoleWindow::resetAvatarForMatchingUsers(KviRegisteredUser * u)
 KviAvatar * KviConsoleWindow::setAvatar(const QString & nick, const QString & user, const QString & host, const QString & szLocalPath, const QString & szName)
 {
 	if(!connection())
-		return 0;
+		return nullptr;
 	KviIrcUserEntry * e = connection()->userDataBase()->find(nick);
 	if(e)
 	{
@@ -1035,13 +1029,13 @@ KviAvatar * KviConsoleWindow::setAvatar(const QString & nick, const QString & us
 		if((!user.isEmpty()) && e->hasUser())
 		{
 			if(!KviQString::equalCI(user, e->user()))
-				return 0;
+				return nullptr;
 		}
 
 		if((!host.isEmpty()) && e->hasHost())
 		{
 			if(!KviQString::equalCI(host, e->host()))
-				return 0;
+				return nullptr;
 		}
 
 		// Ok...got it
@@ -1058,7 +1052,7 @@ KviAvatar * KviConsoleWindow::setAvatar(const QString & nick, const QString & us
 				output(KVI_OUT_VERBOSE, __tr2qs("Failed to load avatar with name \"%Q\" and local path \"%Q\""), &szName, &szLocalPath);
 		}
 	}
-	return 0;
+	return nullptr;
 }
 
 KviAvatar * KviConsoleWindow::defaultAvatarFromOptions()
@@ -1066,13 +1060,13 @@ KviAvatar * KviConsoleWindow::defaultAvatarFromOptions()
 	QPixmap * avatar = KVI_OPTION_PIXMAP(KviOption_pixmapMyAvatar).pixmap();
 
 	if(!avatar)
-		return 0;
+		return nullptr;
 
 	if(avatar->isNull())
-		return 0;
+		return nullptr;
 
 	if(KVI_OPTION_STRING(KviOption_stringMyAvatar).isEmpty())
-		return 0;
+		return nullptr;
 
 	KviAvatar * loadedAvatar = new KviAvatar(KVI_OPTION_PIXMAP(KviOption_pixmapMyAvatar).path(), KVI_OPTION_STRING(KviOption_stringMyAvatar));
 
@@ -1080,18 +1074,18 @@ KviAvatar * KviConsoleWindow::defaultAvatarFromOptions()
 		return loadedAvatar;
 
 	delete loadedAvatar;
-	return 0;
+	return nullptr;
 }
 
 KviAvatar * KviConsoleWindow::currentAvatar()
 {
 	if(!connection())
-		return 0;
+		return nullptr;
 
 	KviIrcUserEntry * e = connection()->userDataBase()->find(connection()->userInfo()->nickName());
 
 	if(!e)
-		return 0;
+		return nullptr;
 
 	KviAvatar * a = e->avatar();
 
diff --git a/src/kvirc/ui/KviCryptController.cpp b/src/kvirc/ui/KviCryptController.cpp
index fe1dc8352..63b8839e9 100644
--- a/src/kvirc/ui/KviCryptController.cpp
+++ b/src/kvirc/ui/KviCryptController.cpp
@@ -55,8 +55,7 @@ KviEngineListBoxItem::KviEngineListBoxItem(KviTalListWidget * pList, KviCryptEng
 }
 
 KviEngineListBoxItem::~KviEngineListBoxItem()
-{
-}
+    = default;
 
 KviCryptController::KviCryptController(QWidget * pParent, KviWindowToolPageButton * pButton, KviWindow * pWnd, KviCryptSessionInfo * pInfo)
     : KviWindowToolWidget(pParent, pButton)
@@ -135,8 +134,8 @@ KviCryptController::KviCryptController(QWidget * pParent, KviWindowToolPageButto
 	pLayout->setRowStretch(3, 1);
 	pLayout->setColumnStretch(2, 1);
 
-	m_pLastItem = 0;
-	m_pSessionInfo = 0;
+	m_pLastItem = nullptr;
+	m_pSessionInfo = nullptr;
 
 	fillEngineList();
 
@@ -216,7 +215,7 @@ void KviCryptController::engineHighlighted(QListWidgetItem * pItem, QListWidgetI
 		enableWidgets(true);
 	}
 	else
-		m_pLastItem = 0;
+		m_pLastItem = nullptr;
 }
 
 void KviCryptController::enableCheckToggled(bool bChecked)
@@ -271,7 +270,7 @@ void KviCryptController::okClicked()
 				{
 					m_pWindow->output(KVI_OUT_SYSTEMERROR, __tr2qs("Encryption: can't create an engine instance: encryption disabled"));
 					delete m_pSessionInfo;
-					m_pSessionInfo = 0;
+					m_pSessionInfo = nullptr;
 				}
 				else
 				{
@@ -281,7 +280,7 @@ void KviCryptController::okClicked()
 						QString szErrStr = m_pSessionInfo->m_pEngine->lastError();
 						g_pCryptEngineManager->deallocateEngine(m_pSessionInfo->m_pEngine);
 						delete m_pSessionInfo;
-						m_pSessionInfo = 0;
+						m_pSessionInfo = nullptr;
 						m_pWindow->output(KVI_OUT_SYSTEMERROR, __tr2qs("Encryption: can't initialize the engine: %s"), szErrStr.toUtf8().data());
 					}
 					else
@@ -391,7 +390,7 @@ bool KviCryptController::initializeEngine(KviCryptEngine * pEngine)
 KviCryptSessionInfo * KviCryptController::getNewSessionInfo()
 {
 	KviCryptSessionInfo * pInfo = m_pSessionInfo;
-	m_pSessionInfo = 0;
+	m_pSessionInfo = nullptr;
 	return pInfo;
 }
 
@@ -408,7 +407,7 @@ void KviCryptController::destroyCryptSessionInfo(KviCryptSessionInfo ** ppInfo)
 	(*ppInfo)->m_pEngine->disconnect();                            // disconnect every signal (this is mainly for destroyed())
 	g_pCryptEngineManager->deallocateEngine((*ppInfo)->m_pEngine); // kill the engine
 	delete *ppInfo;
-	*ppInfo = 0;
+	*ppInfo = nullptr;
 }
 
 #endif //COMPILE_CRYPT_SUPPORT
diff --git a/src/kvirc/ui/KviCtcpPageDialog.cpp b/src/kvirc/ui/KviCtcpPageDialog.cpp
index d7c83efeb..8447e8ffb 100644
--- a/src/kvirc/ui/KviCtcpPageDialog.cpp
+++ b/src/kvirc/ui/KviCtcpPageDialog.cpp
@@ -42,7 +42,7 @@
 extern KVIRC_API KviCtcpPageDialog * g_pCtcpPageDialog;
 
 KviCtcpPageDialog::KviCtcpPageDialog()
-    : QWidget(0, Qt::WindowStaysOnTopHint | Qt::Tool | Qt::Dialog | Qt::Window)
+    : QWidget(nullptr, Qt::WindowStaysOnTopHint | Qt::Tool | Qt::Dialog | Qt::Window)
 {
 	setObjectName("kvirc_ctcppage_dialog");
 	setWindowTitle(__tr2qs("CTCP Page - KVIrc"));
@@ -65,7 +65,7 @@ KviCtcpPageDialog::KviCtcpPageDialog()
 
 KviCtcpPageDialog::~KviCtcpPageDialog()
 {
-	g_pCtcpPageDialog = 0;
+	g_pCtcpPageDialog = nullptr;
 }
 
 void KviCtcpPageDialog::center()
diff --git a/src/kvirc/ui/KviCustomToolBar.cpp b/src/kvirc/ui/KviCustomToolBar.cpp
index 4973add52..3e78806ad 100644
--- a/src/kvirc/ui/KviCustomToolBar.cpp
+++ b/src/kvirc/ui/KviCustomToolBar.cpp
@@ -41,13 +41,13 @@
 #include <QMimeData>
 #include <QMenu>
 
-static QAction * g_pDraggedAction = 0;
+static QAction * g_pDraggedAction = nullptr;
 
 KviCustomToolBar::KviCustomToolBar(KviCustomToolBarDescriptor * pDesc, const QString & szLabel, Qt::ToolBarArea type, const char * pcName)
     : KviToolBar(szLabel, type, pcName)
 {
 	m_pDescriptor = pDesc;
-	m_pFilteredChildren = 0;
+	m_pFilteredChildren = nullptr;
 	setAcceptDrops(true);
 	// if the user removes all the items from this toolbar, keep a minimum size to permit dropping new item
 	setMinimumSize(16, 16);
@@ -69,7 +69,7 @@ KviCustomToolBar::~KviCustomToolBar()
 	if(KviActionManager::customizingToolBars())
 	{
 		if(KviActionManager::currentToolBar() == this)
-			KviActionManager::instance()->setCurrentToolBar(0);
+			KviActionManager::instance()->setCurrentToolBar(nullptr);
 	}
 
 	if(m_pFilteredChildren)
@@ -130,10 +130,10 @@ void KviCustomToolBar::beginCustomize()
 	m_pFilteredChildren->setAutoDelete(true);
 	// filter the events for all the children
 	QList<QObject *> list = children();
-	for(QList<QObject *>::Iterator it = list.begin(); it != list.end(); ++it)
+	for(auto & it : list)
 	{
-		if((*it)->isWidgetType())
-			filterChild(*it);
+		if(it->isWidgetType())
+			filterChild(it);
 	}
 }
 
@@ -141,16 +141,16 @@ void KviCustomToolBar::endCustomize()
 {
 	// stop filtering events
 	QList<QObject *> list = children();
-	for(QList<QObject *>::Iterator it = list.begin(); it != list.end(); ++it)
+	for(auto & it : list)
 	{
-		if((*it)->isWidgetType())
-			unfilterChild(*it);
+		if(it->isWidgetType())
+			unfilterChild(it);
 	}
 
 	if(m_pFilteredChildren)
 	{
 		delete m_pFilteredChildren;
-		m_pFilteredChildren = 0;
+		m_pFilteredChildren = nullptr;
 	}
 	syncDescriptor();
 }
@@ -250,7 +250,7 @@ void KviCustomToolBar::dropEvent(QDropEvent * e)
 
 	if(!g_pDraggedAction->objectName().compare(e->mimeData()->text()))
 	{
-		g_pDraggedAction = 0;
+		g_pDraggedAction = nullptr;
 		e->acceptProposedAction();
 	}
 }
@@ -286,7 +286,7 @@ bool KviCustomToolBar::eventFilter(QObject * o, QEvent * e)
 					{
 						if(pEvent->pos().x() > (pMovedWidget->width() - 4))
 						{
-							g_pDraggedAction = 0;
+							g_pDraggedAction = nullptr;
 							return KviToolBar::eventFilter(o, e); // let the applet handle the event it
 						}
 					}
@@ -309,7 +309,7 @@ bool KviCustomToolBar::eventFilter(QObject * o, QEvent * e)
 
 					// search for the action after the moved one: we'll need it
 					// to reinsert m_pMovedChild in the right position if necessary
-					QAction * pAfterAction = 0;
+					QAction * pAfterAction = nullptr;
 					bool found = false;
 					foreach(QAction * pTmp, actions())
 					{
@@ -334,7 +334,7 @@ bool KviCustomToolBar::eventFilter(QObject * o, QEvent * e)
 						KviActionManager::instance()->emitRemoveActionsHintRequest();
 						insertAction(pAfterAction, g_pDraggedAction);
 					}
-					g_pDraggedAction = 0;
+					g_pDraggedAction = nullptr;
 					return true;
 				}
 			}
diff --git a/src/kvirc/ui/KviDebugWindow.cpp b/src/kvirc/ui/KviDebugWindow.cpp
index 3c4a5b604..262558f2f 100644
--- a/src/kvirc/ui/KviDebugWindow.cpp
+++ b/src/kvirc/ui/KviDebugWindow.cpp
@@ -37,22 +37,22 @@
 #include <QList>
 #include <QPixmap>
 
-KviDebugWindow * KviDebugWindow::m_pInstance = 0;
+KviDebugWindow * KviDebugWindow::m_pInstance = nullptr;
 
 KviDebugWindow::KviDebugWindow()
-    : KviWindow(KviWindow::Debug, __tr2qs("Debug Messages"), 0)
+    : KviWindow(KviWindow::Debug, __tr2qs("Debug Messages"), nullptr)
 {
 	m_pInstance = this;
 	m_pSplitter = new KviTalSplitter(Qt::Horizontal, this);
 	m_pSplitter->setObjectName("main_splitter");
 	m_pIrcView = new KviIrcView(m_pSplitter, this);
-	m_pInput = new KviInput(this, 0);
+	m_pInput = new KviInput(this, nullptr);
 	updateCaption();
 }
 
 KviDebugWindow::~KviDebugWindow()
 {
-	m_pInstance = 0;
+	m_pInstance = nullptr;
 }
 
 KviDebugWindow * KviDebugWindow::getInstance()
diff --git a/src/kvirc/ui/KviDynamicToolTip.cpp b/src/kvirc/ui/KviDynamicToolTip.cpp
index 8b3a3e079..a2121bd48 100644
--- a/src/kvirc/ui/KviDynamicToolTip.cpp
+++ b/src/kvirc/ui/KviDynamicToolTip.cpp
@@ -31,8 +31,7 @@ KviDynamicToolTipHelper::KviDynamicToolTipHelper(QWidget * parent, KviDynamicToo
 }
 
 KviDynamicToolTipHelper::~KviDynamicToolTipHelper()
-{
-}
+    = default;
 
 void KviDynamicToolTipHelper::maybeTip(const QPoint & pnt)
 {
diff --git a/src/kvirc/ui/KviFileDialog.cpp b/src/kvirc/ui/KviFileDialog.cpp
index 4e26a0161..ea52cf968 100644
--- a/src/kvirc/ui/KviFileDialog.cpp
+++ b/src/kvirc/ui/KviFileDialog.cpp
@@ -45,8 +45,7 @@ KviFileDialog::KviFileDialog(const QString & szDirName, const QString & szFilter
 }
 
 KviFileDialog::~KviFileDialog()
-{
-}
+    = default;
 
 /*
 void KviFileDialog::goKvirc()
diff --git a/src/kvirc/ui/KviHistoryWindow.cpp b/src/kvirc/ui/KviHistoryWindow.cpp
index c409e4e62..86ad584ad 100644
--- a/src/kvirc/ui/KviHistoryWindow.cpp
+++ b/src/kvirc/ui/KviHistoryWindow.cpp
@@ -40,7 +40,7 @@ KviHistoryWindow::KviHistoryWindow(QWidget * pParent)
     : QListWidget(pParent)
 {
 	m_pParent = pParent;
-	m_pOwner = 0;
+	m_pOwner = nullptr;
 	setSelectionMode(QAbstractItemView::SingleSelection);
 	setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
 
@@ -200,7 +200,7 @@ void KviHistoryWindow::keyPressEvent(QKeyEvent * e)
 
 void KviHistoryWindow::ownerDead()
 {
-	m_pOwner = 0;
+	m_pOwner = nullptr;
 	doHide();
 }
 
@@ -218,7 +218,7 @@ void KviHistoryWindow::timerEvent(QTimerEvent * e)
 		return;
 	}
 
-	m_pOwner = 0; // do not setFocus() to the owner after the timeout
+	m_pOwner = nullptr; // do not setFocus() to the owner after the timeout
 	doHide();
 }
 
@@ -253,15 +253,14 @@ void KviHistoryWindow::hideEvent(QHideEvent *)
 }
 
 KviHistoryWindowWidget::KviHistoryWindowWidget()
-    : QWidget(0)
+    : QWidget(nullptr)
 {
 	setWindowFlags(Qt::Popup);
 	m_pWindow = new KviHistoryWindow(this);
 }
 
 KviHistoryWindowWidget::~KviHistoryWindowWidget()
-{
-}
+    = default;
 
 void KviHistoryWindowWidget::popup(KviInput * pOwner)
 {
diff --git a/src/kvirc/ui/KviHtmlDialog.cpp b/src/kvirc/ui/KviHtmlDialog.cpp
index 07ae9ef23..3e316b441 100644
--- a/src/kvirc/ui/KviHtmlDialog.cpp
+++ b/src/kvirc/ui/KviHtmlDialog.cpp
@@ -120,8 +120,7 @@ KviHtmlDialog::KviHtmlDialog(QWidget * pParent, KviHtmlDialogData * pData)
 }
 
 KviHtmlDialog::~KviHtmlDialog()
-{
-}
+    = default;
 
 void KviHtmlDialog::button1Pressed()
 {
diff --git a/src/kvirc/ui/KviInput.cpp b/src/kvirc/ui/KviInput.cpp
index 8c93d03e8..2da13bd97 100644
--- a/src/kvirc/ui/KviInput.cpp
+++ b/src/kvirc/ui/KviInput.cpp
@@ -78,7 +78,7 @@ KviInput::KviInput(KviWindow * pPar, KviUserListView * pView)
 	m_pLayout->setSpacing(0);
 
 	m_pWindow = pPar;
-	m_pMultiLineEditor = 0;
+	m_pMultiLineEditor = nullptr;
 
 	m_pHideToolsButton = new QToolButton(this);
 	m_pHideToolsButton->setObjectName("hide_container_button");
@@ -211,8 +211,8 @@ void KviInput::inputEditorEnterPressed()
 
 void KviInput::installShortcuts()
 {
-	KviShortcut::create(KVI_SHORTCUTS_INPUT_MULTILINE, this, SLOT(toggleMultiLine()), 0, Qt::WidgetWithChildrenShortcut);
-	KviShortcut::create(KVI_SHORTCUTS_INPUT_MULTILINE_2, this, SLOT(toggleMultiLine()), 0, Qt::WidgetWithChildrenShortcut);
+	KviShortcut::create(KVI_SHORTCUTS_INPUT_MULTILINE, this, SLOT(toggleMultiLine()), nullptr, Qt::WidgetWithChildrenShortcut);
+	KviShortcut::create(KVI_SHORTCUTS_INPUT_MULTILINE_2, this, SLOT(toggleMultiLine()), nullptr, Qt::WidgetWithChildrenShortcut);
 }
 
 void KviInput::keyPressEvent(QKeyEvent * e)
@@ -258,7 +258,7 @@ void KviInput::keyPressEvent(QKeyEvent * e)
 									{
 										KVI_OPTION_BOOL(KviOption_boolWarnAboutPastingMultipleLines) = false;
 									}
-									else if(pMsgBox.clickedButton() == pNoButton || pMsgBox.clickedButton() == 0)
+									else if(pMsgBox.clickedButton() == pNoButton || pMsgBox.clickedButton() == nullptr)
 									{
 										return;
 									}
@@ -297,16 +297,16 @@ void KviInput::multiLineEditorButtonToggled(bool bOn)
 		m_pLayout->removeWidget(m_pHelpLabel);
 
 		KviScriptEditor::destroyInstance(m_pMultiLineEditor);
-		m_pMultiLineEditor = 0;
+		m_pMultiLineEditor = nullptr;
 
 		delete m_pHelpLabel;
-		m_pHelpLabel = 0;
+		m_pHelpLabel = nullptr;
 
 		szTmp.replace(QRegExp("[\a\f\n\r\v]"), QString(" "));
 		szTmp.replace('\t', QString(KVI_OPTION_UINT(KviOption_uintSpacesToExpandTabulationInput), ' ')); //expand tabs to spaces
 		m_pInputEditor->setText(szTmp);
 		m_pInputEditor->show();
-		m_pWindow->childrenTreeChanged(0);
+		m_pWindow->childrenTreeChanged(nullptr);
 		m_pInputEditor->setFocus();
 		m_pMultiEditorButton->setChecked(false);
 	}
diff --git a/src/kvirc/ui/KviInputEditor.cpp b/src/kvirc/ui/KviInputEditor.cpp
index f65e249fc..7ee0fa697 100644
--- a/src/kvirc/ui/KviInputEditor.cpp
+++ b/src/kvirc/ui/KviInputEditor.cpp
@@ -84,7 +84,7 @@ extern QPixmap * g_pShadedChildGlobalDesktopBackground;
 
 //static members initialization
 int KviInputEditor::g_iInputInstances = 0;
-QFontMetricsF * KviInputEditor::g_pLastFontMetrics = 0;
+QFontMetricsF * KviInputEditor::g_pLastFontMetrics = nullptr;
 int KviInputEditor::g_iCachedHeight = 0;
 
 #define KVI_INPUT_MAX_UNDO_SIZE 256
@@ -142,7 +142,7 @@ KviInputEditor::KviInputEditor(QWidget * pPar, KviWindow * pWnd, KviUserListView
 	g_iInputInstances++;
 	setObjectName("input_widget");
 
-	m_pIconMenu = 0;
+	m_pIconMenu = nullptr;
 	m_pInputParent = pPar;
 	m_iMaxBufferSize = KVI_INPUT_MAX_BUFFER_SIZE;
 	m_iCursorPosition = 0;  //Index of the char AFTER the cursor
@@ -168,8 +168,8 @@ KviInputEditor::KviInputEditor(QWidget * pPar, KviWindow * pWnd, KviUserListView
 	m_pHistory->setAutoDelete(true);
 	m_bReadOnly = false;
 
-	m_pUndoStack = NULL;
-	m_pRedoStack = NULL;
+	m_pUndoStack = nullptr;
+	m_pRedoStack = nullptr;
 
 	setAttribute(Qt::WA_InputMethodEnabled, true);
 
@@ -199,7 +199,7 @@ KviInputEditor::~KviInputEditor()
 	{
 		//last instance, delete shared resources
 		delete g_pLastFontMetrics;
-		g_pLastFontMetrics = 0;
+		g_pLastFontMetrics = nullptr;
 	}
 
 	if(m_pIconMenu)
@@ -248,7 +248,7 @@ void KviInputEditor::applyOptions(bool bRefreshCachedMetrics)
 		if(g_pLastFontMetrics)
 		{
 			delete g_pLastFontMetrics;
-			g_pLastFontMetrics = 0;
+			g_pLastFontMetrics = nullptr;
 		}
 
 		getLastFontMetrics(font());
@@ -273,9 +273,8 @@ void KviInputEditor::dropEvent(QDropEvent * e)
 	if(list.isEmpty())
 		return;
 
-	for(QList<QUrl>::Iterator it = list.begin(); it != list.end(); ++it)
+	for(auto url : list)
 	{
-		QUrl url = *it;
 		QString szPath = url.toLocalFile();
 		if(szPath.endsWith(KVI_FILEEXTENSION_SCRIPT, Qt::CaseInsensitive))
 		{
@@ -345,7 +344,7 @@ bool KviInputEditor::checkWordSpelling(const QString & szWord)
 
 	KviKvsVariant bCorrect;
 	KviKvsVariantList params(new KviKvsVariant(szWord));
-	KviKvsScript::evaluate("$spellchecker.check($0)", NULL, &params, &bCorrect);
+	KviKvsScript::evaluate("$spellchecker.check($0)", nullptr, &params, &bCorrect);
 
 	return bCorrect.asBoolean();
 #else
@@ -434,8 +433,8 @@ void KviInputEditor::splitTextIntoSpellCheckerBlocks(const QString & szText, Kvi
 		ADD_SPELLCHECKER_BLOCK(lBuffer, QString(pCommandBlockBegin, p - pCommandBlockBegin), pCommandBlockBegin - pBufferBegin, false, false);
 	}
 
-	const QChar * pNonWordBegin = NULL;
-	const QChar * pWordBegin = NULL;
+	const QChar * pNonWordBegin = nullptr;
+	const QChar * pWordBegin = nullptr;
 
 	while(p < e)
 	{
@@ -452,7 +451,7 @@ void KviInputEditor::splitTextIntoSpellCheckerBlocks(const QString & szText, Kvi
 					if(pNonWordBegin)
 					{
 						ADD_SPELLCHECKER_BLOCK(lBuffer, QString(pNonWordBegin, p - pNonWordBegin), pNonWordBegin - pBufferBegin, false, false);
-						pNonWordBegin = NULL;
+						pNonWordBegin = nullptr;
 					}
 					pWordBegin = p;
 				}
@@ -488,7 +487,7 @@ void KviInputEditor::splitTextIntoSpellCheckerBlocks(const QString & szText, Kvi
 
 							QString szWord(pWordBegin, p - pWordBegin);
 							ADD_SPELLCHECKER_BLOCK(lBuffer, szWord, pWordBegin - pBufferBegin, true, checkWordSpelling(szWord));
-							pWordBegin = NULL;
+							pWordBegin = nullptr;
 						}
 						pNonWordBegin = p;
 					}
@@ -817,7 +816,7 @@ void KviInputEditor::paintEvent(QPaintEvent *)
 #endif
 
 	// In Qt5 QStyle::drawPrimitive seems to always overwrite the background, no matter what.
-	qDrawShadePanel(&p, 0, 0, width(), height(), palette(), true, 1, NULL);
+	qDrawShadePanel(&p, 0, 0, width(), height(), palette(), true, 1, nullptr);
 
 	QRect r(1, 1, width() - 1, height() - 1);
 
@@ -1160,7 +1159,7 @@ void KviInputEditor::showContextPopupHere()
 
 KviInputEditorSpellCheckerBlock * KviInputEditor::findSpellCheckerBlockAtCursor(KviPointerList<KviInputEditorSpellCheckerBlock> & lBlocks)
 {
-	KviInputEditorSpellCheckerBlock * pCurrentBlock = NULL;
+	KviInputEditorSpellCheckerBlock * pCurrentBlock = nullptr;
 
 	for(KviInputEditorSpellCheckerBlock * pBlock = lBlocks.first(); pBlock; pBlock = lBlocks.next())
 	{
@@ -1211,7 +1210,7 @@ void KviInputEditor::fillSpellCheckerCorrectionsPopup()
 
 		KviKvsVariant aRet;
 		KviKvsVariantList params(new KviKvsVariant(pCurrentBlock->szText));
-		KviKvsScript::evaluate("$spellchecker.suggestions($0)", NULL, &params, &aRet);
+		KviKvsScript::evaluate("$spellchecker.suggestions($0)", nullptr, &params, &aRet);
 
 		KviKvsArrayCast aCast;
 		aRet.castToArray(&aCast);
@@ -1694,13 +1693,13 @@ void KviInputEditor::clearUndoStack()
 	if(m_pUndoStack)
 	{
 		delete m_pUndoStack;
-		m_pUndoStack = NULL;
+		m_pUndoStack = nullptr;
 	}
 
 	if(m_pRedoStack)
 	{
 		delete m_pRedoStack;
-		m_pRedoStack = NULL;
+		m_pRedoStack = nullptr;
 	}
 }
 
@@ -1887,60 +1886,60 @@ void KviInputEditor::inputMethodEvent(QInputMethodEvent * e)
 
 void KviInputEditor::installShortcuts()
 {
-	KviShortcut::create(KVI_SHORTCUTS_INPUT_HISTORY, this, SLOT(openHistory()), 0, Qt::WidgetShortcut);
-	KviShortcut::create(KVI_SHORTCUTS_INPUT_HISTORY_PREV, this, SLOT(historyPrev()), 0, Qt::WidgetShortcut);
-	KviShortcut::create(KVI_SHORTCUTS_INPUT_HISTORY_NEXT, this, SLOT(historyNext()), 0, Qt::WidgetShortcut);
-	KviShortcut::create(KVI_SHORTCUTS_INPUT_PREV_CHAR, this, SLOT(previousChar()), 0, Qt::WidgetShortcut);
-	KviShortcut::create(KVI_SHORTCUTS_INPUT_NEXT_CHAR, this, SLOT(nextChar()), 0, Qt::WidgetShortcut);
-	KviShortcut::create(KVI_SHORTCUTS_INPUT_PREV_CHAR_SELECT, this, SLOT(previousCharSelection()), 0, Qt::WidgetShortcut);
-	KviShortcut::create(KVI_SHORTCUTS_INPUT_NEXT_CHAR_SELECT, this, SLOT(nextCharSelection()), 0, Qt::WidgetShortcut);
-	KviShortcut::create(KVI_SHORTCUTS_INPUT_PREV_WORD, this, SLOT(previousWord()), 0, Qt::WidgetShortcut);
-	KviShortcut::create(KVI_SHORTCUTS_INPUT_NEXT_WORD, this, SLOT(nextWord()), 0, Qt::WidgetShortcut);
-	KviShortcut::create(KVI_SHORTCUTS_INPUT_PREV_WORD_SELECT, this, SLOT(previousWordSelection()), 0, Qt::WidgetShortcut);
-	KviShortcut::create(KVI_SHORTCUTS_INPUT_NEXT_WORD_SELECT, this, SLOT(nextWordSelection()), 0, Qt::WidgetShortcut);
-	KviShortcut::create(KVI_SHORTCUTS_INPUT_BOLD, this, SLOT(insertBold()), 0, Qt::WidgetShortcut);
-	KviShortcut::create(KVI_SHORTCUTS_INPUT_RESET, this, SLOT(insertReset()), 0, Qt::WidgetShortcut);
-	KviShortcut::create(KVI_SHORTCUTS_INPUT_UNDERLINE, this, SLOT(insertUnderline()), 0, Qt::WidgetShortcut);
-	KviShortcut::create(KVI_SHORTCUTS_INPUT_REVERSE, this, SLOT(insertReverse()), 0, Qt::WidgetShortcut);
-	KviShortcut::create(KVI_SHORTCUTS_INPUT_PLAINTEXT, this, SLOT(insertPlainText()), 0, Qt::WidgetShortcut);
-	KviShortcut::create(KVI_SHORTCUTS_INPUT_ICON, this, SLOT(insertIcon()), 0, Qt::WidgetShortcut);
-	KviShortcut::create(KVI_SHORTCUTS_INPUT_COLOR, this, SLOT(insertColor()), 0, Qt::WidgetShortcut);
-	KviShortcut::create(KVI_SHORTCUTS_INPUT_COPY, this, SLOT(copyInternal()), 0, Qt::WidgetShortcut);
-	KviShortcut::create(KVI_SHORTCUTS_INPUT_CUT, this, SLOT(cutInternal()), 0, Qt::WidgetShortcut);
-	KviShortcut::create(KVI_SHORTCUTS_INPUT_PASTE, this, SLOT(pasteInternal()), 0, Qt::WidgetShortcut);
-	KviShortcut::create(KVI_SHORTCUTS_INPUT_UNDO, this, SLOT(undoInternal()), 0, Qt::WidgetShortcut);
-	KviShortcut::create(KVI_SHORTCUTS_INPUT_REDO, this, SLOT(redoInternal()), 0, Qt::WidgetShortcut);
-	KviShortcut::create(KVI_SHORTCUTS_INPUT_SELECT_ALL, this, SLOT(selectAllInternal()), 0, Qt::WidgetShortcut);
-	KviShortcut::create(KVI_SHORTCUTS_INPUT_DELETE_PREV_WORD, this, SLOT(deletePreviousWord()), 0, Qt::WidgetShortcut);
-	KviShortcut::create(KVI_SHORTCUTS_INPUT_DELETE_NEXT_WORD, this, SLOT(deleteNextWord()), 0, Qt::WidgetShortcut);
-	KviShortcut::create(KVI_SHORTCUTS_WIN_PREV_LINE, this, SLOT(previousLine()), 0, Qt::WidgetShortcut);
-	KviShortcut::create(KVI_SHORTCUTS_WIN_NEXT_LINE, this, SLOT(nextLine()), 0, Qt::WidgetShortcut);
-	KviShortcut::create(KVI_SHORTCUTS_WIN_PREV_PAGE, this, SLOT(previousPage()), 0, Qt::WidgetShortcut);
-	KviShortcut::create(KVI_SHORTCUTS_WIN_NEXT_PAGE, this, SLOT(nextPage()), 0, Qt::WidgetShortcut);
-	KviShortcut::create(KVI_SHORTCUTS_WIN_SEARCH, this, SLOT(search()), 0, Qt::WidgetShortcut);
-	KviShortcut::create(KVI_SHORTCUTS_WIN_SCROLL_TO_LAST_READ_LINE, this, SLOT(scrollToLastReadLine()), 0, Qt::WidgetShortcut);
-	KviShortcut::create(KVI_SHORTCUTS_INPUT_SEND_PLAIN, this, SLOT(sendPlain()), 0, Qt::WidgetShortcut);
-	KviShortcut::create(KVI_SHORTCUTS_INPUT_SEND_PLAIN_2, this, SLOT(sendPlain()), 0, Qt::WidgetShortcut);
+	KviShortcut::create(KVI_SHORTCUTS_INPUT_HISTORY, this, SLOT(openHistory()), nullptr, Qt::WidgetShortcut);
+	KviShortcut::create(KVI_SHORTCUTS_INPUT_HISTORY_PREV, this, SLOT(historyPrev()), nullptr, Qt::WidgetShortcut);
+	KviShortcut::create(KVI_SHORTCUTS_INPUT_HISTORY_NEXT, this, SLOT(historyNext()), nullptr, Qt::WidgetShortcut);
+	KviShortcut::create(KVI_SHORTCUTS_INPUT_PREV_CHAR, this, SLOT(previousChar()), nullptr, Qt::WidgetShortcut);
+	KviShortcut::create(KVI_SHORTCUTS_INPUT_NEXT_CHAR, this, SLOT(nextChar()), nullptr, Qt::WidgetShortcut);
+	KviShortcut::create(KVI_SHORTCUTS_INPUT_PREV_CHAR_SELECT, this, SLOT(previousCharSelection()), nullptr, Qt::WidgetShortcut);
+	KviShortcut::create(KVI_SHORTCUTS_INPUT_NEXT_CHAR_SELECT, this, SLOT(nextCharSelection()), nullptr, Qt::WidgetShortcut);
+	KviShortcut::create(KVI_SHORTCUTS_INPUT_PREV_WORD, this, SLOT(previousWord()), nullptr, Qt::WidgetShortcut);
+	KviShortcut::create(KVI_SHORTCUTS_INPUT_NEXT_WORD, this, SLOT(nextWord()), nullptr, Qt::WidgetShortcut);
+	KviShortcut::create(KVI_SHORTCUTS_INPUT_PREV_WORD_SELECT, this, SLOT(previousWordSelection()), nullptr, Qt::WidgetShortcut);
+	KviShortcut::create(KVI_SHORTCUTS_INPUT_NEXT_WORD_SELECT, this, SLOT(nextWordSelection()), nullptr, Qt::WidgetShortcut);
+	KviShortcut::create(KVI_SHORTCUTS_INPUT_BOLD, this, SLOT(insertBold()), nullptr, Qt::WidgetShortcut);
+	KviShortcut::create(KVI_SHORTCUTS_INPUT_RESET, this, SLOT(insertReset()), nullptr, Qt::WidgetShortcut);
+	KviShortcut::create(KVI_SHORTCUTS_INPUT_UNDERLINE, this, SLOT(insertUnderline()), nullptr, Qt::WidgetShortcut);
+	KviShortcut::create(KVI_SHORTCUTS_INPUT_REVERSE, this, SLOT(insertReverse()), nullptr, Qt::WidgetShortcut);
+	KviShortcut::create(KVI_SHORTCUTS_INPUT_PLAINTEXT, this, SLOT(insertPlainText()), nullptr, Qt::WidgetShortcut);
+	KviShortcut::create(KVI_SHORTCUTS_INPUT_ICON, this, SLOT(insertIcon()), nullptr, Qt::WidgetShortcut);
+	KviShortcut::create(KVI_SHORTCUTS_INPUT_COLOR, this, SLOT(insertColor()), nullptr, Qt::WidgetShortcut);
+	KviShortcut::create(KVI_SHORTCUTS_INPUT_COPY, this, SLOT(copyInternal()), nullptr, Qt::WidgetShortcut);
+	KviShortcut::create(KVI_SHORTCUTS_INPUT_CUT, this, SLOT(cutInternal()), nullptr, Qt::WidgetShortcut);
+	KviShortcut::create(KVI_SHORTCUTS_INPUT_PASTE, this, SLOT(pasteInternal()), nullptr, Qt::WidgetShortcut);
+	KviShortcut::create(KVI_SHORTCUTS_INPUT_UNDO, this, SLOT(undoInternal()), nullptr, Qt::WidgetShortcut);
+	KviShortcut::create(KVI_SHORTCUTS_INPUT_REDO, this, SLOT(redoInternal()), nullptr, Qt::WidgetShortcut);
+	KviShortcut::create(KVI_SHORTCUTS_INPUT_SELECT_ALL, this, SLOT(selectAllInternal()), nullptr, Qt::WidgetShortcut);
+	KviShortcut::create(KVI_SHORTCUTS_INPUT_DELETE_PREV_WORD, this, SLOT(deletePreviousWord()), nullptr, Qt::WidgetShortcut);
+	KviShortcut::create(KVI_SHORTCUTS_INPUT_DELETE_NEXT_WORD, this, SLOT(deleteNextWord()), nullptr, Qt::WidgetShortcut);
+	KviShortcut::create(KVI_SHORTCUTS_WIN_PREV_LINE, this, SLOT(previousLine()), nullptr, Qt::WidgetShortcut);
+	KviShortcut::create(KVI_SHORTCUTS_WIN_NEXT_LINE, this, SLOT(nextLine()), nullptr, Qt::WidgetShortcut);
+	KviShortcut::create(KVI_SHORTCUTS_WIN_PREV_PAGE, this, SLOT(previousPage()), nullptr, Qt::WidgetShortcut);
+	KviShortcut::create(KVI_SHORTCUTS_WIN_NEXT_PAGE, this, SLOT(nextPage()), nullptr, Qt::WidgetShortcut);
+	KviShortcut::create(KVI_SHORTCUTS_WIN_SEARCH, this, SLOT(search()), nullptr, Qt::WidgetShortcut);
+	KviShortcut::create(KVI_SHORTCUTS_WIN_SCROLL_TO_LAST_READ_LINE, this, SLOT(scrollToLastReadLine()), nullptr, Qt::WidgetShortcut);
+	KviShortcut::create(KVI_SHORTCUTS_INPUT_SEND_PLAIN, this, SLOT(sendPlain()), nullptr, Qt::WidgetShortcut);
+	KviShortcut::create(KVI_SHORTCUTS_INPUT_SEND_PLAIN_2, this, SLOT(sendPlain()), nullptr, Qt::WidgetShortcut);
 	// 	KviShortcut::create(KVI_SHORTCUTS_INPUT_SEND_KVS,this,SLOT(sendKvs()),0,Qt::WidgetShortcut);
 	// 	KviShortcut::create(KVI_SHORTCUTS_INPUT_SEND_KVS_2,this,SLOT(sendKvs()),0,Qt::WidgetShortcut);
-	KviShortcut::create(KVI_SHORTCUTS_INPUT_HOME, this, SLOT(homeInternal()), 0, Qt::WidgetShortcut);
-	KviShortcut::create(KVI_SHORTCUTS_INPUT_END, this, SLOT(endInternal()), 0, Qt::WidgetShortcut);
-	KviShortcut::create(KVI_SHORTCUTS_INPUT_HOME_SELECT, this, SLOT(homeInternalSelection()), 0, Qt::WidgetShortcut);
-	KviShortcut::create(KVI_SHORTCUTS_INPUT_END_SELECT, this, SLOT(endInternalSelection()), 0, Qt::WidgetShortcut);
+	KviShortcut::create(KVI_SHORTCUTS_INPUT_HOME, this, SLOT(homeInternal()), nullptr, Qt::WidgetShortcut);
+	KviShortcut::create(KVI_SHORTCUTS_INPUT_END, this, SLOT(endInternal()), nullptr, Qt::WidgetShortcut);
+	KviShortcut::create(KVI_SHORTCUTS_INPUT_HOME_SELECT, this, SLOT(homeInternalSelection()), nullptr, Qt::WidgetShortcut);
+	KviShortcut::create(KVI_SHORTCUTS_INPUT_END_SELECT, this, SLOT(endInternalSelection()), nullptr, Qt::WidgetShortcut);
 	//KviShortcut::create(KVI_SHORTCUTS_INPUT_RETURN,this,SLOT(returnHit()),0,Qt::WidgetShortcut);
 	//KviShortcut::create(KVI_SHORTCUTS_INPUT_RETURN_2,this,SLOT(returnHit()),0,Qt::WidgetShortcut);
 	//KviShortcut::create(KVI_SHORTCUTS_INPUT_BACKSPACE,this,SLOT(backspaceHit()),0,Qt::WidgetShortcut);
 	//KviShortcut::create(KVI_SHORTCUTS_INPUT_BACKSPACE_2,this,SLOT(backspaceHit()),0,Qt::WidgetShortcut);
 	//KviShortcut::create(KVI_SHORTCUTS_INPUT_DELETE,this,SLOT(deleteHit()),0,Qt::WidgetShortcut);
-	KviShortcut::create(KVI_SHORTCUTS_INPUT_ESCAPE, this, SLOT(escapeHit()), 0, Qt::WidgetShortcut);
-	KviShortcut::create(KVI_SHORTCUTS_INPUT_COMMANDLINE, this, SLOT(toggleCommandMode()), 0, Qt::WidgetShortcut);
-	KviShortcut::create(KVI_SHORTCUTS_INPUT_DUMMY, this, SLOT(dummy()), 0, Qt::WidgetShortcut);
-	KviShortcut::create(KVI_SHORTCUTS_WIN_ZOOM_IN, this, SLOT(zoomIn()), 0, Qt::WidgetShortcut);
-	KviShortcut::create(KVI_SHORTCUTS_WIN_ZOOM_OUT, this, SLOT(zoomOut()), 0, Qt::WidgetShortcut);
-	KviShortcut::create(KVI_SHORTCUTS_INPUT_CORRECT_SPELLING, this, SLOT(showSpellCheckerCorrectionsPopup()), 0, Qt::WidgetShortcut);
+	KviShortcut::create(KVI_SHORTCUTS_INPUT_ESCAPE, this, SLOT(escapeHit()), nullptr, Qt::WidgetShortcut);
+	KviShortcut::create(KVI_SHORTCUTS_INPUT_COMMANDLINE, this, SLOT(toggleCommandMode()), nullptr, Qt::WidgetShortcut);
+	KviShortcut::create(KVI_SHORTCUTS_INPUT_DUMMY, this, SLOT(dummy()), nullptr, Qt::WidgetShortcut);
+	KviShortcut::create(KVI_SHORTCUTS_WIN_ZOOM_IN, this, SLOT(zoomIn()), nullptr, Qt::WidgetShortcut);
+	KviShortcut::create(KVI_SHORTCUTS_WIN_ZOOM_OUT, this, SLOT(zoomOut()), nullptr, Qt::WidgetShortcut);
+	KviShortcut::create(KVI_SHORTCUTS_INPUT_CORRECT_SPELLING, this, SLOT(showSpellCheckerCorrectionsPopup()), nullptr, Qt::WidgetShortcut);
 	// this is currently ambigous, since we're using it for scripting, too
 	KviShortcut::create(KVI_SHORTCUTS_WIN_ZOOM_DEFAULT, this, SLOT(zoomDefault()), SLOT(zoomDefault()), Qt::WidgetShortcut);
-	KviShortcut::create(KVI_SHORTCUTS_INPUT_MENU, this, SLOT(showContextPopupHere()), 0, Qt::WidgetShortcut);
+	KviShortcut::create(KVI_SHORTCUTS_INPUT_MENU, this, SLOT(showContextPopupHere()), nullptr, Qt::WidgetShortcut);
 }
 
 void KviInputEditor::zoomIn()
@@ -2644,7 +2643,7 @@ void KviInputEditor::undo()
 	if(m_pUndoStack->isEmpty())
 	{
 		delete m_pUndoStack;
-		m_pUndoStack = NULL;
+		m_pUndoStack = nullptr;
 	}
 
 	m_iSelectionBegin = -1;
@@ -2695,7 +2694,7 @@ void KviInputEditor::redo()
 	if(m_pRedoStack->isEmpty())
 	{
 		delete m_pRedoStack;
-		m_pRedoStack = NULL;
+		m_pRedoStack = nullptr;
 	}
 
 	m_iSelectionBegin = -1;
diff --git a/src/kvirc/ui/KviInputHistory.cpp b/src/kvirc/ui/KviInputHistory.cpp
index be6c9dc44..3093f8868 100644
--- a/src/kvirc/ui/KviInputHistory.cpp
+++ b/src/kvirc/ui/KviInputHistory.cpp
@@ -28,7 +28,7 @@
 #include "KviConfigurationFile.h"
 #include "KviCString.h"
 
-KviInputHistory * KviInputHistory::m_pSelf = NULL;
+KviInputHistory * KviInputHistory::m_pSelf = nullptr;
 unsigned int KviInputHistory::m_uCount = 0;
 
 KviInputHistory::KviInputHistory()
diff --git a/src/kvirc/ui/KviIpEditor.cpp b/src/kvirc/ui/KviIpEditor.cpp
index 1b1b215af..0e49e0596 100644
--- a/src/kvirc/ui/KviIpEditor.cpp
+++ b/src/kvirc/ui/KviIpEditor.cpp
@@ -42,10 +42,10 @@ KviIpEditor::KviIpEditor(QWidget * parent, AddressType addrType, const QString &
 	setObjectName(name);
 	for(int i = 0; i < 7; i++)
 	{
-		m_pEdit[i] = 0;
-		m_pLabel[i] = 0;
+		m_pEdit[i] = nullptr;
+		m_pLabel[i] = nullptr;
 	}
-	m_pEdit[7] = 0;
+	m_pEdit[7] = nullptr;
 	setFrameStyle(QFrame::Sunken | QFrame::StyledPanel);
 	setBackgroundRole(QPalette::Base);
 	setAddressType(addrType);
@@ -53,8 +53,7 @@ KviIpEditor::KviIpEditor(QWidget * parent, AddressType addrType, const QString &
 }
 
 KviIpEditor::~KviIpEditor()
-{
-}
+    = default;
 
 void KviIpEditor::setEnabled(bool bEnabled)
 {
@@ -91,11 +90,11 @@ KviIpEditor::AddressType KviIpEditor::addressType() const
 bool KviIpEditor::hasEmptyFields() const
 {
 	bool bHasEF = false;
-	for(int i = 0; i < 8; i++)
+	for(auto i : m_pEdit)
 	{
-		if(m_pEdit[i])
+		if(i)
 		{
-			if(m_pEdit[i]->text().isEmpty())
+			if(i->text().isEmpty())
 				bHasEF = true;
 		}
 	}
@@ -246,18 +245,18 @@ void KviIpEditor::recreateChildren()
 			if(m_pEdit[i])
 			{
 				delete m_pEdit[i];
-				m_pEdit[i] = 0;
+				m_pEdit[i] = nullptr;
 			}
 			if(m_pLabel[i - 1])
 			{
 				delete m_pLabel[i - 1];
-				m_pLabel[i - 1] = 0;
+				m_pLabel[i - 1] = nullptr;
 			}
 		}
 	}
 	//setMinimumWidth(4 + (max * minWidth) + ((max - 1) * m_pLabel[0]->sizeHint().width()));
 	setMinimumHeight(m_pLabel[0]->sizeHint().height() + 4);
-	resizeEvent(0);
+	resizeEvent(nullptr);
 }
 
 bool KviIpEditor::eventFilter(QObject * o, QEvent * e)
diff --git a/src/kvirc/ui/KviIrcToolBar.cpp b/src/kvirc/ui/KviIrcToolBar.cpp
index f11674511..2b0bc566a 100644
--- a/src/kvirc/ui/KviIrcToolBar.cpp
+++ b/src/kvirc/ui/KviIrcToolBar.cpp
@@ -53,7 +53,7 @@
 extern QPixmap * g_pShadedChildGlobalDesktopBackground;
 #endif
 
-static KviPointerList<KviToolBarGraphicalApplet> * g_pToolBarGraphicalAppletList = 0;
+static KviPointerList<KviToolBarGraphicalApplet> * g_pToolBarGraphicalAppletList = nullptr;
 
 KviToolBarGraphicalApplet::KviToolBarGraphicalApplet(QWidget * par, const char * name)
     : QWidget(par)
@@ -91,7 +91,7 @@ KviToolBarGraphicalApplet::~KviToolBarGraphicalApplet()
 	if(g_pToolBarGraphicalAppletList->isEmpty())
 	{
 		delete g_pToolBarGraphicalAppletList;
-		g_pToolBarGraphicalAppletList = 0;
+		g_pToolBarGraphicalAppletList = nullptr;
 	}
 }
 
@@ -205,8 +205,7 @@ KviIrcContextDisplay::KviIrcContextDisplay(QWidget * par, const char * name)
 }
 
 KviIrcContextDisplay::~KviIrcContextDisplay()
-{
-}
+    = default;
 
 void KviIrcContextDisplay::tipRequest(KviDynamicToolTip * tip, const QPoint &)
 {
@@ -286,7 +285,7 @@ void KviIrcContextDisplay::drawContents(QPainter * p)
 {
 	// The context indicator
 	KviWindow * wnd = g_pActiveWindow;
-	KviConsoleWindow * c = wnd ? wnd->console() : 0;
+	KviConsoleWindow * c = wnd ? wnd->console() : nullptr;
 
 	if(c)
 	{
diff --git a/src/kvirc/ui/KviIrcView.cpp b/src/kvirc/ui/KviIrcView.cpp
index d8366467c..61892a38b 100644
--- a/src/kvirc/ui/KviIrcView.cpp
+++ b/src/kvirc/ui/KviIrcView.cpp
@@ -216,11 +216,11 @@ KviIrcView::KviIrcView(QWidget * parent, KviWindow * pWnd)
 	                                         // 	setAttribute(Qt::WA_PaintOnScreen); // disable qt backing store (that would force us to trigger repaint() instead of the 10 times faster paintEvent(0))
 
 	m_iFlushTimer = 0;
-	m_pToolsPopup = 0;
-	m_pFirstLine = 0;
-	m_pCurLine = 0;
-	m_pLastLine = 0;
-	m_pCursorLine = 0;
+	m_pToolsPopup = nullptr;
+	m_pFirstLine = nullptr;
+	m_pCurLine = nullptr;
+	m_pLastLine = nullptr;
+	m_pCursorLine = nullptr;
 	m_uLineMarkLineIndex = KVI_IRCVIEW_INVALID_LINE_MARK_INDEX;
 	m_bHaveUnreadedHighlightedMessages = false;
 	m_bHaveUnreadedMessages = false;
@@ -228,8 +228,8 @@ KviIrcView::KviIrcView(QWidget * parent, KviWindow * pWnd)
 	m_iMaxLines = KVI_OPTION_UINT(KviOption_uintIrcViewMaxBufferSize);
 
 	m_uNextLineIndex = 0;
-	m_pSelectionInitLine = 0;
-	m_pSelectionEndLine = 0;
+	m_pSelectionInitLine = nullptr;
+	m_pSelectionEndLine = nullptr;
 	m_iSelectionInitCharIndex = 0;
 	m_iSelectionEndCharIndex = 0;
 	m_iSelectTimer = 0;
@@ -247,21 +247,21 @@ KviIrcView::KviIrcView(QWidget * parent, KviWindow * pWnd)
 	m_iMouseTimer = 0;
 
 	m_bAcceptDrops = false;
-	m_pPrivateBackgroundPixmap = 0;
+	m_pPrivateBackgroundPixmap = nullptr;
 	m_bSkipScrollBarRepaint = false;
-	m_pLogFile = 0;
+	m_pLogFile = nullptr;
 	m_pKviWindow = pWnd;
 
 	m_iUnprocessedPaintEventRequests = 0;
 	m_bPostedPaintEventPending = false;
 
-	m_pLastLinkUnderMouse = 0;
+	m_pLastLinkUnderMouse = nullptr;
 	m_iLastLinkRectTop = -1;
 	m_iLastLinkRectHeight = -1;
 
-	m_pMasterView = 0;
+	m_pMasterView = nullptr;
 
-	m_pToolWidget = 0;
+	m_pToolWidget = nullptr;
 
 	m_pWrappedBlockSelectionInfo = new KviIrcViewWrappedBlockSelectionInfo;
 
@@ -271,7 +271,7 @@ KviIrcView::KviIrcView(QWidget * parent, KviWindow * pWnd)
 	// say qt to avoid erasing on repaint
 	setAutoFillBackground(false);
 
-	m_pFm = 0; // will be updated in the first paint event
+	m_pFm = nullptr; // will be updated in the first paint event
 	m_iFontDescent = 0;
 	m_iFontLineSpacing = 0;
 	m_iFontLineWidth = 0;
@@ -400,7 +400,7 @@ void KviIrcView::setFont(const QFont & f)
 	{
 		// force an update to the font variables
 		delete m_pFm;
-		m_pFm = 0;
+		m_pFm = nullptr;
 	}
 	KviIrcViewLine * l = m_pFirstLine;
 	while(l)
@@ -473,7 +473,7 @@ void KviIrcView::setPrivateBackgroundPixmap(const QPixmap & pixmap, bool bRepain
 	if(m_pPrivateBackgroundPixmap)
 	{
 		delete m_pPrivateBackgroundPixmap;
-		m_pPrivateBackgroundPixmap = 0;
+		m_pPrivateBackgroundPixmap = nullptr;
 	}
 	if(!pixmap.isNull())
 		m_pPrivateBackgroundPixmap = new QPixmap(pixmap);
@@ -484,7 +484,7 @@ void KviIrcView::setPrivateBackgroundPixmap(const QPixmap & pixmap, bool bRepain
 
 void KviIrcView::emptyBuffer(bool bRepaint)
 {
-	while(m_pLastLine != 0)
+	while(m_pLastLine != nullptr)
 		removeHeadLine();
 	if(bRepaint)
 		update();
@@ -676,7 +676,7 @@ void KviIrcView::appendLine(KviIrcViewLine * ptr, bool bRepaint)
 		// There is at least one line in the view
 		m_pLastLine->pNext = ptr;
 		ptr->pPrev = m_pLastLine;
-		ptr->pNext = 0;
+		ptr->pNext = nullptr;
 		m_iNumLines++;
 
 		if(m_iNumLines > m_iMaxLines)
@@ -724,8 +724,8 @@ void KviIrcView::appendLine(KviIrcViewLine * ptr, bool bRepaint)
 		m_pLastLine = ptr;
 		m_pFirstLine = ptr;
 		m_pCurLine = ptr;
-		ptr->pPrev = 0;
-		ptr->pNext = 0;
+		ptr->pPrev = nullptr;
+		ptr->pNext = nullptr;
 		m_iNumLines = 1;
 		m_pScrollBar->setRange(0, 1);
 		m_pScrollBar->triggerAction(QAbstractSlider::SliderSingleStepAdd);
@@ -742,12 +742,12 @@ void KviIrcView::removeHeadLine(bool bRepaint)
 	if(!m_pLastLine)
 		return;
 	if(m_pFirstLine == m_pCursorLine)
-		m_pCursorLine = 0;
+		m_pCursorLine = nullptr;
 
 	if(m_pFirstLine->pNext)
 	{
 		KviIrcViewLine * aux_ptr = m_pFirstLine->pNext; //get the next line
-		aux_ptr->pPrev = 0;                             //becomes the first
+		aux_ptr->pPrev = nullptr;                       //becomes the first
 		if(m_pFirstLine == m_pCurLine)
 			m_pCurLine = aux_ptr;                           //move the cur line if necessary
 		delete_text_line(m_pFirstLine, &m_hAnimatedSmiles); //delete the struct
@@ -756,11 +756,11 @@ void KviIrcView::removeHeadLine(bool bRepaint)
 	}
 	else
 	{ //unique line
-		m_pCurLine = 0;
+		m_pCurLine = nullptr;
 		delete_text_line(m_pFirstLine, &m_hAnimatedSmiles);
-		m_pFirstLine = 0;
+		m_pFirstLine = nullptr;
 		m_iNumLines = 0;
-		m_pLastLine = 0;
+		m_pLastLine = nullptr;
 	}
 	if(bRepaint)
 		repaint();
@@ -818,11 +818,11 @@ void KviIrcView::splitMessagesTo(KviIrcView * v)
 			else
 			{
 				v->m_pFirstLine = l;
-				l->pPrev = 0;
+				l->pPrev = nullptr;
 				v->m_pLastLine = l;
 			}
 			tmp = l->pNext;
-			l->pNext = 0;
+			l->pNext = nullptr;
 			l = tmp;
 		}
 		else
@@ -834,8 +834,8 @@ void KviIrcView::splitMessagesTo(KviIrcView * v)
 	v->m_pCurLine = v->m_pLastLine;
 	m_pCurLine = m_pLastLine;
 
-	v->m_pCursorLine = 0;
-	m_pCursorLine = 0;
+	v->m_pCursorLine = nullptr;
+	m_pCursorLine = nullptr;
 
 	m_iLastScrollBarValue = m_iNumLines;
 	m_pScrollBar->setRange(0, m_iNumLines);
@@ -862,11 +862,11 @@ void KviIrcView::appendMessagesFrom(KviIrcView * v)
 	}
 	m_pLastLine = v->m_pLastLine;
 	m_pCurLine = m_pLastLine;
-	m_pCursorLine = 0;
-	v->m_pFirstLine = 0;
-	v->m_pLastLine = 0;
-	v->m_pCurLine = 0;
-	v->m_pCursorLine = 0;
+	m_pCursorLine = nullptr;
+	v->m_pFirstLine = nullptr;
+	v->m_pLastLine = nullptr;
+	v->m_pCurLine = nullptr;
+	v->m_pCursorLine = nullptr;
 	m_iNumLines += v->m_iNumLines;
 	v->m_iNumLines = 0;
 	//	v->m_pScrollBar->setRange(0,0);
@@ -919,21 +919,21 @@ void KviIrcView::joinMessagesFrom(KviIrcView * v)
 			else
 			{
 				m_pFirstLine = l2;
-				l2->pPrev = 0;
+				l2->pPrev = nullptr;
 			}
 			tmp = l2->pNext;
-			l2->pNext = 0;
+			l2->pNext = nullptr;
 			m_pLastLine = l2;
 			l2 = tmp;
 		}
 	}
 
 	m_pCurLine = m_pLastLine;
-	m_pCursorLine = 0;
-	v->m_pFirstLine = 0;
-	v->m_pLastLine = 0;
-	v->m_pCurLine = 0;
-	v->m_pCursorLine = 0;
+	m_pCursorLine = nullptr;
+	v->m_pFirstLine = nullptr;
+	v->m_pLastLine = nullptr;
+	v->m_pCurLine = nullptr;
+	v->m_pCursorLine = nullptr;
 	m_iNumLines += v->m_iNumLines;
 	v->m_iNumLines = 0;
 	//	v->m_pScrollBar->setRange(0,0);
@@ -1150,7 +1150,7 @@ void KviIrcView::paintEvent(QPaintEvent * p)
 
 	// Make sure that we have enough space to paint something...
 	if(maxLineWidth < m_iMinimumPaintWidth)
-		pCurTextLine = 0;
+		pCurTextLine = nullptr;
 
 	bool bLineMarkPainted = !KVI_OPTION_BOOL(KviOption_boolTrackLastReadTextViewLine);
 	int iLinesPerPage = 0;
@@ -1451,7 +1451,7 @@ void KviIrcView::paintEvent(QPaintEvent * p)
 						{
 							// There is another block...
 							// Check if it is a wrap...
-							if(pCurTextLine->pBlocks[i + 1].pChunk == 0)
+							if(pCurTextLine->pBlocks[i + 1].pChunk == nullptr)
 								wdth = widgetWidth - (curLeftCoord + KVI_IRCVIEW_HORIZONTAL_BORDER);
 							// else simply a zero characters block
 						}
@@ -1477,7 +1477,7 @@ void KviIrcView::paintEvent(QPaintEvent * p)
 					}
 					QString tmpQ;
 					tmpQ.setUtf16(block->pChunk->szSmileId, kvi_wstrlen(block->pChunk->szSmileId));
-					QPixmap * daIcon = 0;
+					QPixmap * daIcon = nullptr;
 					KviTextIcon * pIcon = g_pTextIconManager->lookupTextIcon(tmpQ);
 					if(pIcon)
 					{
@@ -1778,7 +1778,7 @@ void KviIrcView::calculateLineWraps(KviIrcViewLine * ptr, int maxWidth)
 				// FIXME what if the icon curBlockWidth is > maxWidth ? => endless loop
 				// This is an icon block: needs to be wrapped differently:
 				// The wrap block goes BEFORE the icon itself
-				ptr->pBlocks[ptr->iBlockCount].pChunk = 0;
+				ptr->pBlocks[ptr->iBlockCount].pChunk = nullptr;
 				ptr->pBlocks[ptr->iBlockCount].block_width = 0;
 				ptr->iBlockCount++;
 				ptr->pBlocks = (KviIrcViewWrappedBlock *)KviMemory::reallocate(ptr->pBlocks, (ptr->iBlockCount + 1) * sizeof(KviIrcViewWrappedBlock));
@@ -1826,7 +1826,7 @@ void KviIrcView::calculateLineWraps(KviIrcViewLine * ptr, int maxWidth)
 		ptr->pBlocks[ptr->iBlockCount].block_start = p - unicode;
 		ptr->pBlocks[ptr->iBlockCount].block_len = 0;
 		ptr->pBlocks[ptr->iBlockCount].block_width = 0;
-		ptr->pBlocks[ptr->iBlockCount].pChunk = 0;
+		ptr->pBlocks[ptr->iBlockCount].pChunk = nullptr;
 
 	wrap_line:
 		curLineWidth = 0;
@@ -2253,7 +2253,7 @@ void KviIrcView::toggleToolWidget()
 	if(m_pToolWidget && m_pToolWidget->isVisible())
 	{
 		m_pToolWidget->setVisible(false);
-		m_pCursorLine = 0;
+		m_pCursorLine = nullptr;
 
 		// When the tool widget is hidden, ensure the input is focussed (otherwise text is still entered into the 'string to find' widget...)
 		if(m_pKviWindow && m_pKviWindow->input())
@@ -2434,7 +2434,7 @@ void KviIrcView::findNext(const QString & szText, bool bCaseS, bool bRegExp, boo
 
 		} while(l != start);
 	}
-	m_pCursorLine = 0;
+	m_pCursorLine = nullptr;
 	repaint();
 	if(m_pToolWidget)
 		m_pToolWidget->setFindResult(__tr2qs("Not found"));
@@ -2493,7 +2493,7 @@ void KviIrcView::findPrev(const QString & szText, bool bCaseS, bool bRegExp, boo
 
 		} while(l != start);
 	}
-	m_pCursorLine = 0;
+	m_pCursorLine = nullptr;
 
 	repaint();
 	if(m_pToolWidget)
@@ -2516,9 +2516,9 @@ KviIrcViewLine * KviIrcView::getVisibleLineAt(int yPos)
 			l = l->pPrev;
 		}
 		else
-			return 0;
+			return nullptr;
 	}
-	return 0;
+	return nullptr;
 }
 
 int KviIrcView::getVisibleCharIndexAt(KviIrcViewLine *, int xPos, int yPos)
@@ -2575,7 +2575,7 @@ int KviIrcView::getVisibleCharIndexAt(KviIrcViewLine *, int xPos, int yPos)
 				i++;
 				while(i < l->iBlockCount)
 				{
-					if(l->pBlocks[i].pChunk == 0)
+					if(l->pBlocks[i].pChunk == nullptr)
 						break; //word wrap found
 					else
 						i++;
@@ -2613,7 +2613,7 @@ int KviIrcView::getVisibleCharIndexAt(KviIrcViewLine *, int xPos, int yPos)
 					else if(i < (l->iBlockCount - 1))
 					{
 						// There is another block, check if it is a wrap (we reached the end of the row)
-						if(l->pBlocks[i + 1].pChunk == 0)
+						if(l->pBlocks[i + 1].pChunk == nullptr)
 							break;
 						// else simply a zero characters block
 					}
@@ -2658,7 +2658,7 @@ KviIrcViewWrappedBlock * KviIrcView::getLinkUnderMouse(int xPos, int yPos, QRect
 	{
 		//no lines, go away
 		if(!l)
-			return 0;
+			return nullptr;
 
 		//subtract from iTop the height of the current line (aka go to the end of the previous / start of the current point)
 		iTop -= ((l->uLineWraps + 1) * m_iFontLineSpacing) + m_iFontDescent;
@@ -2694,7 +2694,7 @@ KviIrcViewWrappedBlock * KviIrcView::getLinkUnderMouse(int xPos, int yPos, QRect
 				i++;
 				while(i < l->iBlockCount)
 				{
-					if(l->pBlocks[i].pChunk == 0)
+					if(l->pBlocks[i].pChunk == nullptr)
 					{
 						//word wrap found
 						break;
@@ -2720,7 +2720,7 @@ KviIrcViewWrappedBlock * KviIrcView::getLinkUnderMouse(int xPos, int yPos, QRect
 					}
 				}
 				if(i >= l->iBlockCount)
-					return 0; //we reached the last chunk... there's something wrong, return
+					return nullptr; //we reached the last chunk... there's something wrong, return
 				else
 					iTop += m_iFontLineSpacing; //we found a word wrap, check the next row.
 			}
@@ -2740,13 +2740,13 @@ KviIrcViewWrappedBlock * KviIrcView::getLinkUnderMouse(int xPos, int yPos, QRect
 						iLeft += m_iWrapMargin;
 
 				if(xPos < iLeft)
-					return 0; // Mouse is out of this row boundaries
+					return nullptr; // Mouse is out of this row boundaries
 				for(;;)
 				{
 					int iLastLeft = iLeft;
 					//we've run till the end of the line, go away
 					if(i >= l->iBlockCount)
-						return 0;
+						return nullptr;
 					//we try to save the position of the last "text escape" tag we find
 					if(l->pBlocks[i].pChunk)
 						if(l->pBlocks[i].pChunk->type == KviControlCodes::Escape)
@@ -2769,7 +2769,7 @@ KviIrcViewWrappedBlock * KviIrcView::getLinkUnderMouse(int xPos, int yPos, QRect
 						if(i < (l->iBlockCount - 1))
 						{
 							// There is another block, check if it is a wrap (we reached the end of the row)
-							if(l->pBlocks[i + 1].pChunk == 0)
+							if(l->pBlocks[i + 1].pChunk == nullptr)
 							{
 								iBlockWidth = width() - iLastLeft;
 								iLeft = width();
@@ -2785,7 +2785,7 @@ KviIrcViewWrappedBlock * KviIrcView::getLinkUnderMouse(int xPos, int yPos, QRect
 						// Got it!
 						// link ?
 						bool bHadWordWraps = false;
-						while(l->pBlocks[i].pChunk == 0)
+						while(l->pBlocks[i].pChunk == nullptr)
 						{
 							// word wrap ?
 							if(i >= 0)
@@ -2794,7 +2794,7 @@ KviIrcViewWrappedBlock * KviIrcView::getLinkUnderMouse(int xPos, int yPos, QRect
 								bHadWordWraps = true;
 							}
 							else
-								return 0; // all word wraps ?!!!
+								return nullptr; // all word wraps ?!!!
 						}
 						if(iLastEscapeBlock != -1)
 						{
@@ -2911,14 +2911,14 @@ KviIrcViewWrappedBlock * KviIrcView::getLinkUnderMouse(int xPos, int yPos, QRect
 							}
 							return &(l->pBlocks[i]);
 						}
-						return 0;
+						return nullptr;
 					}
 					i++;
 				}
 			}
 		}
 	}
-	return 0;
+	return nullptr;
 }
 
 KviConsoleWindow * KviIrcView::console()
@@ -2938,7 +2938,7 @@ void KviIrcView::scrollToMarker()
 	while(pLine && (pLine->uIndex != m_uLineMarkLineIndex))
 		pLine = pLine->pPrev;
 
-	if(pLine == 0)
+	if(pLine == nullptr)
 	{
 		// The buffer has already cleaned the marker line
 		ensureLineVisible(m_pFirstLine);
diff --git a/src/kvirc/ui/KviIrcView_events.cpp b/src/kvirc/ui/KviIrcView_events.cpp
index f4ebb7d9d..874f45c4c 100644
--- a/src/kvirc/ui/KviIrcView_events.cpp
+++ b/src/kvirc/ui/KviIrcView_events.cpp
@@ -115,10 +115,10 @@ void KviIrcView::mouseDoubleClickEvent(QMouseEvent * e)
 		killTimer(m_iMouseTimer);
 		m_iMouseTimer = 0;
 		delete m_pLastEvent;
-		m_pLastEvent = 0;
+		m_pLastEvent = nullptr;
 	}
 
-	getLinkUnderMouse(e->pos().x(), e->pos().y(), 0, &szLinkCommandPart, &szLinkTextPart);
+	getLinkUnderMouse(e->pos().x(), e->pos().y(), nullptr, &szLinkCommandPart, &szLinkTextPart);
 
 	if(szLinkCommandPart.isEmpty())
 	{
@@ -282,7 +282,7 @@ void KviIrcView::mousePressEvent(QMouseEvent * e)
 		killTimer(m_iMouseTimer);
 		m_iMouseTimer = 0;
 		delete m_pLastEvent;
-		m_pLastEvent = 0;
+		m_pLastEvent = nullptr;
 	}
 	else
 	{
@@ -299,7 +299,7 @@ void KviIrcView::triggerMouseRelatedKvsEvents(QMouseEvent * e)
 {
 	QString linkCmd;
 	QString linkText;
-	getLinkUnderMouse(e->pos().x(), e->pos().y(), 0, &linkCmd, &linkText);
+	getLinkUnderMouse(e->pos().x(), e->pos().y(), nullptr, &linkCmd, &linkText);
 
 	QString szCmd(linkCmd);
 	szCmd.remove(0, 1);
@@ -674,8 +674,8 @@ void KviIrcView::mouseReleaseEvent(QMouseEvent * e)
 			if(c->supportsSelection())
 				c->setText(szSelectionText, QClipboard::Selection);
 		}
-		m_pSelectionInitLine = 0;
-		m_pSelectionEndLine = 0;
+		m_pSelectionInitLine = nullptr;
+		m_pSelectionEndLine = nullptr;
 		m_iSelectionInitCharIndex = 0;
 		m_iSelectionEndCharIndex = 0;
 	}
@@ -795,7 +795,7 @@ void KviIrcView::leaveEvent(QEvent *)
 {
 	if(m_pLastLinkUnderMouse)
 	{
-		m_pLastLinkUnderMouse = 0;
+		m_pLastLinkUnderMouse = nullptr;
 		update();
 	}
 }
@@ -816,7 +816,7 @@ void KviIrcView::timerEvent(QTimerEvent * e)
 		m_iMouseTimer = 0;
 		triggerMouseRelatedKvsEvents(m_pLastEvent);
 		delete m_pLastEvent;
-		m_pLastEvent = 0;
+		m_pLastEvent = nullptr;
 		return;
 	}
 
@@ -844,7 +844,7 @@ void KviIrcView::maybeTip(const QPoint & pnt)
 	if((linkUnderMouse == m_pLastLinkUnderMouse) && linkUnderMouse)
 		doLinkToolTip(rctLink, linkCmd, linkText);
 	else
-		m_pLastLinkUnderMouse = 0;
+		m_pLastLinkUnderMouse = nullptr;
 }
 
 void KviIrcView::doMarkerToolTip()
diff --git a/src/kvirc/ui/KviIrcView_getTextLine.cpp b/src/kvirc/ui/KviIrcView_getTextLine.cpp
index 43678ef08..e467223a9 100644
--- a/src/kvirc/ui/KviIrcView_getTextLine.cpp
+++ b/src/kvirc/ui/KviIrcView_getTextLine.cpp
@@ -165,7 +165,7 @@ const kvi_wchar_t * KviIrcView::getTextLine(
     bool bEnableTimeStamp,
     const QDateTime & datetime_param)
 {
-	const kvi_wchar_t * pUnEscapeAt = 0;
+	const kvi_wchar_t * pUnEscapeAt = nullptr;
 
 	// Splits the text data in lines (separated by '\n')
 
@@ -357,70 +357,70 @@ const kvi_wchar_t * KviIrcView::getTextLine(
 
 	static void * char_to_check_jump_table[256] = {
 		// clang-format off
-		&&found_end_of_buffer  ,0                      ,&&found_mirc_escape    ,&&found_color_escape   ,
-		0                      ,0                      ,0                      ,0                      ,
-		0                      ,0                      ,&&found_end_of_line    ,0                      ,
-		0                      ,&&found_command_escape ,0                      ,&&found_mirc_escape    ,
-		0                      ,0                      ,0                      ,0                      ,
-		0                      ,0                      ,&&found_mirc_escape    ,0                      ,
-		0                      ,0                      ,0                      ,0                      ,
-		0                      ,&&found_icon_escape    ,0                      ,&&found_mirc_escape    , // 000-031
-		0                      ,0                      ,0                      ,0                      ,
-		0                      ,0                      ,0                      ,0                      ,
-		0                      ,0                      ,0                      ,0                      ,
-		0                      ,0                      ,0                      ,0                      , // 032-047
-		0                      ,0                      ,0                      ,0                      ,
-		0                      ,0                      ,0                      ,0                      ,
-		0                      ,0                      ,&&check_emoticon_char  ,&&check_emoticon_char  ,
-		0                      ,&&check_emoticon_char  ,0                      ,0                      , // 048-063 // 61='=' , 59=';' , 58=':'
-		0                      ,0                      ,0                      ,0                      ,
-		0                      ,&&check_e2k_url        ,&&check_file_or_ftp_url,0                      ,
-		&&check_http_url       ,&&check_irc_url        ,0                      ,0                      ,
-		0                      ,&&check_mailto_or_magnet_url     ,0            ,0                      , // 064-079  // 070==F 072==H 073==I  077==M
-		0                      ,0                      ,0                      ,&&check_spotify_url    ,
-		0                      ,0                      ,0                      ,&&check_www_url        ,
-		0                      ,0                      ,0                      ,0                      ,
-		0                      ,0                      ,0                      ,0                      , // 080-095  // 083==S 087==W
-		0                      ,0                      ,0                      ,0                      ,
-		0                      ,&&check_e2k_url        ,&&check_file_or_ftp_url,0                      ,
-		&&check_http_url       ,&&check_irc_url        ,0                      ,0                      ,
-		0                      ,&&check_mailto_or_magnet_url     ,0            ,0                      , // 096-111  // 101=e 102=f 104=h 105=i 109==m
-		0                      ,0                      ,0                      ,&&check_spotify_url    ,
-		0                      ,0                      ,0                      ,&&check_www_url        ,
-		0                      ,0                      ,0                      ,0                      ,
-		0                      ,0                      ,0                      ,0                      , // 112-127  // 115==s 119==w
-		0                      ,0                      ,0                      ,0                      ,
-		0                      ,0                      ,0                      ,0                      ,
-		0                      ,0                      ,0                      ,0                      ,
-		0                      ,0                      ,0                      ,0                      , // 128-133
-		0                      ,0                      ,0                      ,0                      ,
-		0                      ,0                      ,0                      ,0                      ,
-		0                      ,0                      ,0                      ,0                      ,
-		0                      ,0                      ,0                      ,0                      , // 134-159
-		0                      ,0                      ,0                      ,0                      ,
-		0                      ,0                      ,0                      ,0                      ,
-		0                      ,0                      ,0                      ,0                      ,
-		0                      ,0                      ,0                      ,0                      , // 160-175
-		0                      ,0                      ,0                      ,0                      ,
-		0                      ,0                      ,0                      ,0                      ,
-		0                      ,0                      ,0                      ,0                      ,
-		0                      ,0                      ,0                      ,0                      , // 176-191
-		0                      ,0                      ,0                      ,0                      ,
-		0                      ,0                      ,0                      ,0                      ,
-		0                      ,0                      ,0                      ,0                      ,
-		0                      ,0                      ,0                      ,0                      , // 192-207
-		0                      ,0                      ,0                      ,0                      ,
-		0                      ,0                      ,0                      ,0                      ,
-		0                      ,0                      ,0                      ,0                      ,
-		0                      ,0                      ,0                      ,0                      , // 208-223
-		0                      ,0                      ,0                      ,0                      ,
-		0                      ,0                      ,0                      ,0                      ,
-		0                      ,0                      ,0                      ,0                      ,
-		0                      ,0                      ,0                      ,0                      , // 224-239
-		0                      ,0                      ,0                      ,0                      ,
-		0                      ,0                      ,0                      ,0                      ,
-		0                      ,0                      ,0                      ,0                      ,
-		0                      ,0                      ,0                      ,0                        // 240-255
+		&&found_end_of_buffer  ,nullptr                      ,&&found_mirc_escape    ,&&found_color_escape   ,
+		nullptr                      ,nullptr                      ,nullptr                      ,nullptr                      ,
+		nullptr                      ,nullptr                      ,&&found_end_of_line    ,nullptr                      ,
+		nullptr                      ,&&found_command_escape ,nullptr                      ,&&found_mirc_escape    ,
+		nullptr                      ,nullptr                      ,nullptr                      ,nullptr                      ,
+		nullptr                      ,nullptr                      ,&&found_mirc_escape    ,nullptr                      ,
+		nullptr                      ,nullptr                      ,nullptr                      ,nullptr                      ,
+		nullptr                      ,&&found_icon_escape    ,nullptr                      ,&&found_mirc_escape    , // 000-031
+		nullptr                      ,nullptr                      ,nullptr                      ,nullptr                      ,
+		nullptr                      ,nullptr                      ,nullptr                      ,nullptr                      ,
+		nullptr                      ,nullptr                      ,nullptr                      ,nullptr                      ,
+		nullptr                      ,nullptr                      ,nullptr                      ,nullptr                      , // 032-047
+		nullptr                      ,nullptr                      ,nullptr                      ,nullptr                      ,
+		nullptr                      ,nullptr                      ,nullptr                      ,nullptr                      ,
+		nullptr                      ,nullptr                      ,&&check_emoticon_char  ,&&check_emoticon_char  ,
+		nullptr                      ,&&check_emoticon_char  ,nullptr                      ,nullptr                      , // 048-063 // 61='=' , 59=';' , 58=':'
+		nullptr                      ,nullptr                      ,nullptr                      ,nullptr                      ,
+		nullptr                      ,&&check_e2k_url        ,&&check_file_or_ftp_url,nullptr                      ,
+		&&check_http_url       ,&&check_irc_url        ,nullptr                      ,nullptr                      ,
+		nullptr                      ,&&check_mailto_or_magnet_url     ,nullptr            ,nullptr                      , // 064-079  // 070==F 072==H 073==I  077==M
+		nullptr                      ,nullptr                      ,nullptr                      ,&&check_spotify_url    ,
+		nullptr                      ,nullptr                      ,nullptr                      ,&&check_www_url        ,
+		nullptr                      ,nullptr                      ,nullptr                      ,nullptr                      ,
+		nullptr                      ,nullptr                      ,nullptr                      ,nullptr                      , // 080-095  // 083==S 087==W
+		nullptr                      ,nullptr                      ,nullptr                      ,nullptr                      ,
+		nullptr                      ,&&check_e2k_url        ,&&check_file_or_ftp_url,nullptr                      ,
+		&&check_http_url       ,&&check_irc_url        ,nullptr                      ,nullptr                      ,
+		nullptr                      ,&&check_mailto_or_magnet_url     ,nullptr            ,nullptr                      , // 096-111  // 101=e 102=f 104=h 105=i 109==m
+		nullptr                      ,nullptr                      ,nullptr                      ,&&check_spotify_url    ,
+		nullptr                      ,nullptr                      ,nullptr                      ,&&check_www_url        ,
+		nullptr                      ,nullptr                      ,nullptr                      ,nullptr                      ,
+		nullptr                      ,nullptr                      ,nullptr                      ,nullptr                      , // 112-127  // 115==s 119==w
+		nullptr                      ,nullptr                      ,nullptr                      ,nullptr                      ,
+		nullptr                      ,nullptr                      ,nullptr                      ,nullptr                      ,
+		nullptr                      ,nullptr                      ,nullptr                      ,nullptr                      ,
+		nullptr                      ,nullptr                      ,nullptr                      ,nullptr                      , // 128-133
+		nullptr                      ,nullptr                      ,nullptr                      ,nullptr                      ,
+		nullptr                      ,nullptr                      ,nullptr                      ,nullptr                      ,
+		nullptr                      ,nullptr                      ,nullptr                      ,nullptr                      ,
+		nullptr                      ,nullptr                      ,nullptr                      ,nullptr                      , // 134-159
+		nullptr                      ,nullptr                      ,nullptr                      ,nullptr                      ,
+		nullptr                      ,nullptr                      ,nullptr                      ,nullptr                      ,
+		nullptr                      ,nullptr                      ,nullptr                      ,nullptr                      ,
+		nullptr                      ,nullptr                      ,nullptr                      ,nullptr                      , // 160-175
+		nullptr                      ,nullptr                      ,nullptr                      ,nullptr                      ,
+		nullptr                      ,nullptr                      ,nullptr                      ,nullptr                      ,
+		nullptr                      ,nullptr                      ,nullptr                      ,nullptr                      ,
+		nullptr                      ,nullptr                      ,nullptr                      ,nullptr                      , // 176-191
+		nullptr                      ,nullptr                      ,nullptr                      ,nullptr                      ,
+		nullptr                      ,nullptr                      ,nullptr                      ,nullptr                      ,
+		nullptr                      ,nullptr                      ,nullptr                      ,nullptr                      ,
+		nullptr                      ,nullptr                      ,nullptr                      ,nullptr                      , // 192-207
+		nullptr                      ,nullptr                      ,nullptr                      ,nullptr                      ,
+		nullptr                      ,nullptr                      ,nullptr                      ,nullptr                      ,
+		nullptr                      ,nullptr                      ,nullptr                      ,nullptr                      ,
+		nullptr                      ,nullptr                      ,nullptr                      ,nullptr                      , // 208-223
+		nullptr                      ,nullptr                      ,nullptr                      ,nullptr                      ,
+		nullptr                      ,nullptr                      ,nullptr                      ,nullptr                      ,
+		nullptr                      ,nullptr                      ,nullptr                      ,nullptr                      ,
+		nullptr                      ,nullptr                      ,nullptr                      ,nullptr                      , // 224-239
+		nullptr                      ,nullptr                      ,nullptr                      ,nullptr                      ,
+		nullptr                      ,nullptr                      ,nullptr                      ,nullptr                      ,
+		nullptr                      ,nullptr                      ,nullptr                      ,nullptr                      ,
+		nullptr                      ,nullptr                      ,nullptr                      ,nullptr                        // 240-255
 		// clang-format on
 	};
 
@@ -579,7 +579,7 @@ check_escape_switch:
 				// This is the terminator of an escape
 				APPEND_LAST_TEXT_BLOCK(data_ptr, p - data_ptr);
 				NEW_LINE_CHUNK(KviControlCodes::UnEscape);
-				pUnEscapeAt = 0;
+				pUnEscapeAt = nullptr;
 				p++;
 				data_ptr = p;
 				break;
@@ -1114,7 +1114,7 @@ check_emoticon_char:
 					case 39: //  -> alt 39 : teardrop
 					{
 						const kvi_wchar_t * item = p;
-						const kvi_wchar_t * item2 = 0;
+						const kvi_wchar_t * item2 = nullptr;
 						p++;
 						while(*p == *item)
 							p++;
@@ -1242,7 +1242,7 @@ void KviIrcView::appendText(int iMsgType, const kvi_wchar_t * data_ptr, int iFla
 	//appends a text string to the buffer list
 	//splits the lines
 	KVI_ASSERT(data_ptr);
-	m_pLastLinkUnderMouse = 0;
+	m_pLastLinkUnderMouse = nullptr;
 
 	if(!KVI_OPTION_BOOL(KviOption_boolStripControlCodesInLogs))
 	{
diff --git a/src/kvirc/ui/KviIrcView_loghandling.cpp b/src/kvirc/ui/KviIrcView_loghandling.cpp
index d6abb3fec..2e691caf7 100644
--- a/src/kvirc/ui/KviIrcView_loghandling.cpp
+++ b/src/kvirc/ui/KviIrcView_loghandling.cpp
@@ -93,7 +93,7 @@ void KviIrcView::stopLogging()
 		}
 #endif
 		delete m_pLogFile;
-		m_pLogFile = 0;
+		m_pLogFile = nullptr;
 	}
 }
 
@@ -193,7 +193,7 @@ void KviIrcView::setMasterView(KviIrcView * v)
 
 void KviIrcView::masterDead()
 {
-	m_pMasterView = 0;
+	m_pMasterView = nullptr;
 }
 
 bool KviIrcView::startLogging(const QString & fname, bool bPrependCurBuffer)
@@ -220,7 +220,7 @@ bool KviIrcView::startLogging(const QString & fname, bool bPrependCurBuffer)
 		if(!m_pLogFile->open(QIODevice::Append | QIODevice::WriteOnly))
 		{
 			delete m_pLogFile;
-			m_pLogFile = 0;
+			m_pLogFile = nullptr;
 			return false;
 		}
 	}
@@ -229,7 +229,7 @@ bool KviIrcView::startLogging(const QString & fname, bool bPrependCurBuffer)
 		if(!m_pLogFile->open(QIODevice::WriteOnly))
 		{
 			delete m_pLogFile;
-			m_pLogFile = 0;
+			m_pLogFile = nullptr;
 			return false;
 		}
 	}
diff --git a/src/kvirc/ui/KviIrcView_tools.cpp b/src/kvirc/ui/KviIrcView_tools.cpp
index 526ce30ca..a1c78fb9b 100644
--- a/src/kvirc/ui/KviIrcView_tools.cpp
+++ b/src/kvirc/ui/KviIrcView_tools.cpp
@@ -66,8 +66,7 @@ KviIrcMessageCheckListItem::KviIrcMessageCheckListItem(QTreeWidget * par, KviIrc
 }
 
 KviIrcMessageCheckListItem::~KviIrcMessageCheckListItem()
-{
-}
+    = default;
 
 KviIrcViewToolWidget::KviIrcViewToolWidget(KviIrcView * pParent)
     : QWidget(pParent)
@@ -167,8 +166,8 @@ KviIrcViewToolWidget::KviIrcViewToolWidget(KviIrcView * pParent)
 
 	// Focussing the 'string to find' widget has been moved to the toggle function so that it happens whenever the widget is shown
 
-	KviShortcut::create(Qt::Key_Escape, m_pIrcView, SLOT(toggleToolWidget()), 0, Qt::WidgetWithChildrenShortcut);
-	KviShortcut::create(KVI_SHORTCUTS_WIN_SEARCH, m_pIrcView, SLOT(toggleToolWidget()), 0, Qt::WidgetWithChildrenShortcut);
+	KviShortcut::create(Qt::Key_Escape, m_pIrcView, SLOT(toggleToolWidget()), nullptr, Qt::WidgetWithChildrenShortcut);
+	KviShortcut::create(KVI_SHORTCUTS_WIN_SEARCH, m_pIrcView, SLOT(toggleToolWidget()), nullptr, Qt::WidgetWithChildrenShortcut);
 }
 
 KviIrcViewToolWidget::~KviIrcViewToolWidget()
@@ -271,7 +270,7 @@ void KviIrcViewToolWidget::forceRepaint()
 #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
 	m_pIrcView->repaint();
 #else
-	m_pIrcView->paintEvent(0);
+	m_pIrcView->paintEvent(nullptr);
 #endif
 }
 
@@ -311,8 +310,7 @@ KviIrcViewToolTip::KviIrcViewToolTip(KviIrcView * pView)
 }
 
 KviIrcViewToolTip::~KviIrcViewToolTip()
-{
-}
+    = default;
 
 void KviIrcViewToolTip::maybeTip(const QPoint & pnt)
 {
diff --git a/src/kvirc/ui/KviMainWindow.cpp b/src/kvirc/ui/KviMainWindow.cpp
index 2c52c7387..e588a3698 100644
--- a/src/kvirc/ui/KviMainWindow.cpp
+++ b/src/kvirc/ui/KviMainWindow.cpp
@@ -90,7 +90,7 @@ extern QPixmap * g_pShadedChildGlobalDesktopBackground;
 
 // Declared and managed by KviApplication (KviApplication.cpp)
 extern KviConfigurationFile * g_pWinPropertiesConfig;
-KVIRC_API KviMainWindow * g_pMainWindow = NULL; // the one and only frame object
+KVIRC_API KviMainWindow * g_pMainWindow = nullptr; // the one and only frame object
 
 KviMainWindow::KviMainWindow(QWidget * pParent)
     : KviTalMainWindow(pParent, "kvirc_frame")
@@ -114,9 +114,9 @@ KviMainWindow::KviMainWindow(QWidget * pParent)
 	m_pModuleExtensionToolBarList = new KviPointerList<KviMexToolBar>;
 	m_pModuleExtensionToolBarList->setAutoDelete(false);
 
-	m_pActiveContext = NULL;
+	m_pActiveContext = nullptr;
 
-	m_pTrayIcon = NULL;
+	m_pTrayIcon = nullptr;
 
 	m_pSplitter = new QSplitter(Qt::Horizontal, this);
 	m_pSplitter->setObjectName("main_frame_splitter");
@@ -150,10 +150,10 @@ KviMainWindow::KviMainWindow(QWidget * pParent)
 	}
 	else
 	{
-		m_pStatusBar = NULL;
+		m_pStatusBar = nullptr;
 	}
 
-	m_pWindowList = NULL;
+	m_pWindowList = nullptr;
 
 	createWindowList();
 
@@ -210,7 +210,7 @@ KviMainWindow::~KviMainWindow()
 		t->die();
 	delete m_pModuleExtensionToolBarList;
 
-	KVI_OPTION_BOOL(KviOption_boolShowDockExtension) = m_pTrayIcon != NULL;
+	KVI_OPTION_BOOL(KviOption_boolShowDockExtension) = m_pTrayIcon != nullptr;
 
 	if(m_pTrayIcon)
 	{
@@ -254,15 +254,14 @@ void KviMainWindow::unregisterModuleExtensionToolBar(KviMexToolBar * t)
 
 void KviMainWindow::restoreModuleExtensionToolBars()
 {
-	for(QStringList::Iterator it = KVI_OPTION_STRINGLIST(KviOption_stringlistModuleExtensionToolbars).begin(); it != KVI_OPTION_STRINGLIST(KviOption_stringlistModuleExtensionToolbars).end(); ++it)
+	for(auto szEntry : KVI_OPTION_STRINGLIST(KviOption_stringlistModuleExtensionToolbars))
 	{
-		QString szEntry = *it;
 		int idx = szEntry.indexOf(':');
 		if(idx != -1)
 		{
 			QString szMod = szEntry.left(idx);
 			szEntry.remove(0, idx + 1);
-			g_pModuleExtensionManager->allocateExtension("toolbar", KviCString(szEntry), firstConsole(), 0, 0, szMod);
+			g_pModuleExtensionManager->allocateExtension("toolbar", KviCString(szEntry), firstConsole(), nullptr, nullptr, szMod);
 		}
 	}
 }
@@ -292,20 +291,20 @@ KviMexToolBar * KviMainWindow::moduleExtensionToolBar(int extensionId)
 		if(extensionId == t->descriptor()->id())
 			return t;
 	}
-	return 0;
+	return nullptr;
 }
 
 void KviMainWindow::installAccelerators()
 {
-	m_pAccellerators->append(KviShortcut::create(KVI_SHORTCUTS_WIN_PREV, this, SLOT(switchToPrevWindow()), 0, Qt::ApplicationShortcut));
-	m_pAccellerators->append(KviShortcut::create(KVI_SHORTCUTS_WIN_NEXT, this, SLOT(switchToNextWindow()), 0, Qt::ApplicationShortcut));
-	m_pAccellerators->append(KviShortcut::create(KVI_SHORTCUTS_WIN_PREV_CONTEXT, this, SLOT(switchToPrevWindowInContext()), 0, Qt::ApplicationShortcut));
-	m_pAccellerators->append(KviShortcut::create(KVI_SHORTCUTS_WIN_NEXT_CONTEXT, this, SLOT(switchToNextWindowInContext()), 0, Qt::ApplicationShortcut));
-	m_pAccellerators->append(KviShortcut::create(KVI_SHORTCUTS_WIN_PREV_HIGHLIGHT, this, SLOT(switchToPrevHighlightedWindow()), 0, Qt::ApplicationShortcut));
-	m_pAccellerators->append(KviShortcut::create(KVI_SHORTCUTS_WIN_NEXT_HIGHLIGHT, this, SLOT(switchToNextHighlightedWindow()), 0, Qt::ApplicationShortcut));
-	m_pAccellerators->append(KviShortcut::create(KVI_SHORTCUTS_WIN_CLOSE, this, SLOT(closeActiveWindow()), 0, Qt::ApplicationShortcut));
-	m_pAccellerators->append(KviShortcut::create(KVI_SHORTCUTS_WIN_PREV_TAB, this, SLOT(switchToPrevWindow()), 0, Qt::ApplicationShortcut));
-	m_pAccellerators->append(KviShortcut::create(KVI_SHORTCUTS_WIN_NEXT_TAB, this, SLOT(switchToNextWindow()), 0, Qt::ApplicationShortcut));
+	m_pAccellerators->append(KviShortcut::create(KVI_SHORTCUTS_WIN_PREV, this, SLOT(switchToPrevWindow()), nullptr, Qt::ApplicationShortcut));
+	m_pAccellerators->append(KviShortcut::create(KVI_SHORTCUTS_WIN_NEXT, this, SLOT(switchToNextWindow()), nullptr, Qt::ApplicationShortcut));
+	m_pAccellerators->append(KviShortcut::create(KVI_SHORTCUTS_WIN_PREV_CONTEXT, this, SLOT(switchToPrevWindowInContext()), nullptr, Qt::ApplicationShortcut));
+	m_pAccellerators->append(KviShortcut::create(KVI_SHORTCUTS_WIN_NEXT_CONTEXT, this, SLOT(switchToNextWindowInContext()), nullptr, Qt::ApplicationShortcut));
+	m_pAccellerators->append(KviShortcut::create(KVI_SHORTCUTS_WIN_PREV_HIGHLIGHT, this, SLOT(switchToPrevHighlightedWindow()), nullptr, Qt::ApplicationShortcut));
+	m_pAccellerators->append(KviShortcut::create(KVI_SHORTCUTS_WIN_NEXT_HIGHLIGHT, this, SLOT(switchToNextHighlightedWindow()), nullptr, Qt::ApplicationShortcut));
+	m_pAccellerators->append(KviShortcut::create(KVI_SHORTCUTS_WIN_CLOSE, this, SLOT(closeActiveWindow()), nullptr, Qt::ApplicationShortcut));
+	m_pAccellerators->append(KviShortcut::create(KVI_SHORTCUTS_WIN_PREV_TAB, this, SLOT(switchToPrevWindow()), nullptr, Qt::ApplicationShortcut));
+	m_pAccellerators->append(KviShortcut::create(KVI_SHORTCUTS_WIN_NEXT_TAB, this, SLOT(switchToNextWindow()), nullptr, Qt::ApplicationShortcut));
 
 	static int accel_table[] = {
 		Qt::Key_1 + Qt::ControlModifier, // script accels...
@@ -372,7 +371,7 @@ void KviMainWindow::accelActivated()
 
 void KviMainWindow::executeInternalCommand(int index)
 {
-	KviConsoleWindow * pConsole = 0;
+	KviConsoleWindow * pConsole = nullptr;
 	if(activeContext() && activeContext()->console())
 		pConsole = activeContext()->console();
 	else
@@ -383,7 +382,7 @@ void KviMainWindow::executeInternalCommand(int index)
 void KviMainWindow::saveWindowProperties(KviWindow * wnd, const QString & szSection)
 {
 	g_pWinPropertiesConfig->setGroup(szSection);
-	g_pWinPropertiesConfig->writeEntry("EntryTimestamp", (unsigned int)time(0));
+	g_pWinPropertiesConfig->writeEntry("EntryTimestamp", (unsigned int)time(nullptr));
 
 	// Allow max 80 window properties to be floating around
 	while(g_pWinPropertiesConfig->groupsCount() > 80)
@@ -391,7 +390,7 @@ void KviMainWindow::saveWindowProperties(KviWindow * wnd, const QString & szSect
 		// Kill the oldest group
 		KviConfigurationFileIterator it(*(g_pWinPropertiesConfig->dict()));
 		QString minKey;
-		unsigned int minVal = time(0);
+		unsigned int minVal = time(nullptr);
 		while(it.current() && minVal)
 		{
 			QString * pVal = it.current()->find("EntryTimestamp");
@@ -500,14 +499,14 @@ void KviMainWindow::closeWindow(KviWindow * wnd)
 			if(!bGotIt)
 			{
 				// :/
-				g_pActiveWindow = NULL;
-				m_pActiveContext = NULL;
+				g_pActiveWindow = nullptr;
+				m_pActiveContext = nullptr;
 			}
 		}
 		else
 		{
-			g_pActiveWindow = NULL;
-			m_pActiveContext = NULL;
+			g_pActiveWindow = nullptr;
+			m_pActiveContext = nullptr;
 		}
 	}
 
@@ -633,7 +632,7 @@ void KviMainWindow::undockWindow(KviWindow * wnd)
 		return;
 
 	m_pWindowStack->removeWidget(wnd);
-	wnd->setParent(NULL);
+	wnd->setParent(nullptr);
 
 	wnd->show();
 	wnd->youAreUndocked();
@@ -688,7 +687,7 @@ KviConsoleWindow * KviMainWindow::firstConsole()
 
 	// We end up here when we have not console windows.
 	// This may happen at early startup or late before shutdown.
-	return NULL;
+	return nullptr;
 }
 
 KviConsoleWindow * KviMainWindow::firstNotConnectedConsole()
@@ -701,7 +700,7 @@ KviConsoleWindow * KviMainWindow::firstNotConnectedConsole()
 				return (KviConsoleWindow *)wnd;
 		}
 	}
-	return 0;
+	return nullptr;
 }
 
 void KviMainWindow::childWindowCloseRequest(KviWindow * wnd)
@@ -717,7 +716,7 @@ void KviMainWindow::setActiveWindow(KviWindow * wnd)
 
 KviIrcConnection * KviMainWindow::activeConnection()
 {
-	return m_pActiveContext ? m_pActiveContext->connection() : 0;
+	return m_pActiveContext ? m_pActiveContext->connection() : nullptr;
 }
 
 void KviMainWindow::childWindowSelectionStateChange(KviWindow * pWnd, bool bGotSelectionNow)
@@ -856,7 +855,7 @@ void KviMainWindow::closeEvent(QCloseEvent * e)
 {
 	//check if the user just want us to minimize in tray; if we're not the sender
 	//of this signal (sender!=0), it has been generated by a "quit" action in a menu
-	if(KVI_OPTION_BOOL(KviOption_boolCloseInTray) && QObject::sender() == 0 && e->spontaneous())
+	if(KVI_OPTION_BOOL(KviOption_boolCloseInTray) && QObject::sender() == nullptr && e->spontaneous())
 	{
 		if(!trayIcon())
 		{
@@ -1073,7 +1072,7 @@ void KviMainWindow::fillToolBarsPopup(QMenu * p)
 	disconnect(p, SIGNAL(triggered(QAction *)), this, SLOT(toolbarsPopupSelected(QAction *))); // just to be sure
 	connect(p, SIGNAL(triggered(QAction *)), this, SLOT(toolbarsPopupSelected(QAction *)));
 
-	QAction * pAction = 0;
+	QAction * pAction = nullptr;
 	int cnt = 0;
 
 	KviModuleExtensionDescriptorList * l = g_pModuleExtensionManager->getExtensionList("toolbar");
diff --git a/src/kvirc/ui/KviMaskEditor.cpp b/src/kvirc/ui/KviMaskEditor.cpp
index 859e3be52..8fa50b74b 100644
--- a/src/kvirc/ui/KviMaskEditor.cpp
+++ b/src/kvirc/ui/KviMaskEditor.cpp
@@ -62,8 +62,7 @@ KviMaskItem::KviMaskItem(QTreeWidget * pParent, KviMaskEntry * pEntry)
 }
 
 KviMaskItem::~KviMaskItem()
-{
-}
+    = default;
 
 KviMaskInputDialog::KviMaskInputDialog(const QString & szMask, KviMaskEditor * pEditor, KviChannelWindow * pChannel)
     : QDialog(pEditor)
@@ -95,8 +94,7 @@ KviMaskInputDialog::KviMaskInputDialog(const QString & szMask, KviMaskEditor * p
 }
 
 KviMaskInputDialog::~KviMaskInputDialog()
-{
-}
+    = default;
 
 void KviMaskInputDialog::accept()
 {
@@ -131,7 +129,7 @@ KviMaskEditor::KviMaskEditor(QWidget * par, KviChannelWindow * pChannel, KviWind
 
 	m_cFlag = cMode;
 
-	KviIrcConnectionServerInfo * pServerInfo = 0;
+	KviIrcConnectionServerInfo * pServerInfo = nullptr;
 	QString szDescription = "";
 	if(m_pChannel)
 		pServerInfo = m_pChannel->serverInfo();
@@ -235,8 +233,7 @@ KviMaskEditor::KviMaskEditor(QWidget * par, KviChannelWindow * pChannel, KviWind
 }
 
 KviMaskEditor::~KviMaskEditor()
-{
-}
+    = default;
 
 void KviMaskEditor::updateOpStatus()
 {
diff --git a/src/kvirc/ui/KviMenuBar.cpp b/src/kvirc/ui/KviMenuBar.cpp
index f6dab7ec4..b6d7ec342 100644
--- a/src/kvirc/ui/KviMenuBar.cpp
+++ b/src/kvirc/ui/KviMenuBar.cpp
@@ -70,7 +70,7 @@ KviMenuBar::KviMenuBar(KviMainWindow * par, const char * name)
 	addDefaultItem("&IRC", pop);
 #endif //COMPILE_ON_MAC
 
-	m_pScriptItemList = 0;
+	m_pScriptItemList = nullptr;
 
 	pop = new QMenu("scripting", this);
 	setupScriptingPopup(pop);
@@ -303,7 +303,7 @@ void KviMenuBar::updateModulesToolsPopup()
 {
 	m_pModulesToolsPopup->clear();
 
-	QAction * pAction = 0;
+	QAction * pAction = nullptr;
 	KviModuleExtensionDescriptorList * l = g_pModuleExtensionManager->getExtensionList("tool");
 	if(l)
 	{
@@ -408,25 +408,25 @@ int KviMenuBar::getDefaultItemRealIndex(int iDefaultIndex)
 KviScriptMenuBarItem * KviMenuBar::findMenu(const QString & text)
 {
 	if(!m_pScriptItemList)
-		return 0;
+		return nullptr;
 	for(KviScriptMenuBarItem * i = m_pScriptItemList->first(); i; i = m_pScriptItemList->next())
 	{
 		if(KviQString::equalCI(text, i->szText))
 			return i;
 	}
-	return 0;
+	return nullptr;
 }
 
 KviScriptMenuBarItem * KviMenuBar::findMenu(KviKvsPopupMenu * p)
 {
 	if(!m_pScriptItemList)
-		return 0;
+		return nullptr;
 	for(KviScriptMenuBarItem * i = m_pScriptItemList->first(); i; i = m_pScriptItemList->next())
 	{
 		if(i->pPopup == p)
 			return i;
 	}
-	return 0;
+	return nullptr;
 }
 
 bool KviMenuBar::removeMenu(const QString & text)
diff --git a/src/kvirc/ui/KviMessageBox.cpp b/src/kvirc/ui/KviMessageBox.cpp
index a17279fd3..53b38f4f7 100644
--- a/src/kvirc/ui/KviMessageBox.cpp
+++ b/src/kvirc/ui/KviMessageBox.cpp
@@ -46,7 +46,7 @@ namespace KviMessageBox
 		KviQString::vsprintf(s, fmt, list);
 		kvi_va_end(list);
 #ifdef COMPILE_KDE_SUPPORT
-		KMessageBox::error(0, s, "KVIrc");
+		KMessageBox::error(nullptr, s, "KVIrc");
 #else
 		QMessageBox::warning(0, "KVIrc", s);
 #endif
@@ -60,7 +60,7 @@ namespace KviMessageBox
 		KviQString::vsprintf(s, fmt, list);
 		kvi_va_end(list);
 #ifdef COMPILE_KDE_SUPPORT
-		KMessageBox::information(0, s, "KVIrc");
+		KMessageBox::information(nullptr, s, "KVIrc");
 #else
 		QMessageBox::information(0, "KVIrc", s);
 #endif
@@ -75,7 +75,7 @@ namespace KviMessageBox
 		kvi_va_end(list);
 		bool bRet;
 #ifdef COMPILE_KDE_SUPPORT
-		bRet = (KMessageBox::questionYesNo(0, s, caption) == KMessageBox::Yes);
+		bRet = (KMessageBox::questionYesNo(nullptr, s, caption) == KMessageBox::Yes);
 #else
 		bRet = (QMessageBox::information(0, caption, s,
 		            QMessageBox::Yes | QMessageBox::Default,
diff --git a/src/kvirc/ui/KviModeEditor.cpp b/src/kvirc/ui/KviModeEditor.cpp
index 7caf4c9eb..b4c8810d7 100644
--- a/src/kvirc/ui/KviModeEditor.cpp
+++ b/src/kvirc/ui/KviModeEditor.cpp
@@ -78,8 +78,8 @@ KviModeEditor::KviModeEditor(QWidget * par, KviWindowToolPageButton * button, co
 	f->setFrameStyle(QFrame::HLine | QFrame::Sunken);
 	g->addWidget(f, 1, 0, 1, 3);
 
-	QCheckBox * pCheckBox = 0;
-	QLineEdit * pLineEdit = 0;
+	QCheckBox * pCheckBox = nullptr;
+	QLineEdit * pLineEdit = nullptr;
 	int iRow = 1;
 	QString szTmp;
 	QString cDesc;
@@ -143,7 +143,7 @@ KviModeEditor::KviModeEditor(QWidget * par, KviWindowToolPageButton * button, co
 	}
 
 	// third, check if the we have any info about other modes supported by the server
-	KviIrcConnectionServerInfo * pServerInfo = 0;
+	KviIrcConnectionServerInfo * pServerInfo = nullptr;
 	if(m_pChannel)
 		pServerInfo = m_pChannel->serverInfo();
 	if(!pServerInfo)
@@ -348,7 +348,7 @@ void KviModeEditor::commit()
 
 	// now flush out mode changes
 	int iModesPerLine = 3; // a good default
-	KviIrcConnectionServerInfo * pServerInfo = 0;
+	KviIrcConnectionServerInfo * pServerInfo = nullptr;
 	if(m_pChannel)
 		pServerInfo = m_pChannel->serverInfo();
 	if(pServerInfo)
@@ -441,11 +441,11 @@ void KviModeEditor::commit()
 inline const QString * KviModeEditor::getModeDescription(char cMode)
 {
 	if(!m_pChannel)
-		return 0;
+		return nullptr;
 	KviIrcConnectionServerInfo * pServerInfo = m_pChannel->serverInfo();
 	if(pServerInfo)
 		return &(pServerInfo->getChannelModeDescription(cMode));
-	return 0;
+	return nullptr;
 }
 
 inline bool KviModeEditor::modeNeedsParameterOnlyWhenSet(char cMode)
diff --git a/src/kvirc/ui/KviModeWidget.cpp b/src/kvirc/ui/KviModeWidget.cpp
index dd000d027..f95a75cfd 100644
--- a/src/kvirc/ui/KviModeWidget.cpp
+++ b/src/kvirc/ui/KviModeWidget.cpp
@@ -40,8 +40,7 @@ KviModeWidget::KviModeWidget(QWidget * par, KviChannelWindow * chan, const char
 }
 
 KviModeWidget::~KviModeWidget()
-{
-}
+    = default;
 
 void KviModeWidget::reset()
 {
@@ -118,9 +117,9 @@ void KviModeWidget::editorReturnPressed()
 		{
 			// first part: parameterless modes
 			QString szCurModes = szOldModes.count() ? szOldModes.at(0) : "";
-			for(int j = 0; j < szSubstring.length(); ++j)
+			for(auto j : szSubstring)
 			{
-				char cMode = szSubstring.at(j).unicode();
+				char cMode = j.unicode();
 				if(!szCurModes.contains(cMode))
 				{
 					// was not set, has to be inserted
@@ -168,9 +167,9 @@ void KviModeWidget::editorReturnPressed()
 		{
 			// first part: parameterless modes
 			QString szNewParameterLessModes = szNewModes.count() ? szNewModes.at(0) : "";
-			for(int j = 0; j < szSubstring.length(); ++j)
+			for(auto j : szSubstring)
 			{
-				char cMode = szSubstring.at(j).unicode();
+				char cMode = j.unicode();
 				if(!szNewParameterLessModes.contains(cMode))
 				{
 					// was set, has to be unset
@@ -182,7 +181,7 @@ void KviModeWidget::editorReturnPressed()
 
 	// now flush out mode changes
 	int iModesPerLine = 3; // a good default
-	KviIrcConnectionServerInfo * pServerInfo = 0;
+	KviIrcConnectionServerInfo * pServerInfo = nullptr;
 	if(m_pChannel)
 		pServerInfo = m_pChannel->serverInfo();
 	if(pServerInfo)
@@ -274,7 +273,7 @@ void KviModeWidget::editorReturnPressed()
 
 inline bool KviModeWidget::modeNeedsParameterOnlyWhenSet(char cMode)
 {
-	KviIrcConnectionServerInfo * pServerInfo = 0;
+	KviIrcConnectionServerInfo * pServerInfo = nullptr;
 	if(m_pChannel)
 		pServerInfo = m_pChannel->serverInfo();
 	if(pServerInfo)
diff --git a/src/kvirc/ui/KviOptionsWidget.cpp b/src/kvirc/ui/KviOptionsWidget.cpp
index 5db0f6f8b..a73a42909 100644
--- a/src/kvirc/ui/KviOptionsWidget.cpp
+++ b/src/kvirc/ui/KviOptionsWidget.cpp
@@ -53,8 +53,8 @@ KviOptionsWidget::KviOptionsWidget(QWidget * parent, const char * name, bool)
 	// FIXME: The bSunken value is ignored!
 	//if(bSunken)setFrameStyle(QFrame::StyledPanel | QFrame::Sunken);
 	//setFrameStyle(QFrame::StyledPanel | QFrame::Plain);
-	m_pLayout = 0;
-	m_pTabWidget = 0;
+	m_pLayout = nullptr;
+	m_pTabWidget = nullptr;
 	m_iResetFlags = 0;
 	m_iSelectors = 0;
 	m_pSelectorInterfaceList = new KviPointerList<KviSelectorInterface>();
diff --git a/src/kvirc/ui/KviQueryWindow.cpp b/src/kvirc/ui/KviQueryWindow.cpp
index 841dff9a5..35f6de933 100644
--- a/src/kvirc/ui/KviQueryWindow.cpp
+++ b/src/kvirc/ui/KviQueryWindow.cpp
@@ -438,7 +438,7 @@ void KviQueryWindow::setDeadQuery()
 	m_pUserListView->enableUpdates(false);
 	m_pUserListView->partAll();
 	m_pUserListView->enableUpdates(true);
-	m_pUserListView->setUserDataBase(0);
+	m_pUserListView->setUserDataBase(nullptr);
 	if(connection())
 		connection()->unregisterQuery(this);
 	if(context())
@@ -771,12 +771,12 @@ void KviQueryWindow::pasteLastLog()
 	bool bGzip;
 	QString szFileName;
 
-	for(QStringList::Iterator it = logList.begin(); it != logList.end(); ++it)
+	for(auto & it : logList)
 	{
 		int iLogYear, iLogMonth, iLogDay;
 
-		szFileName = (*it);
-		QString szTmpName = (*it);
+		szFileName = it;
+		QString szTmpName = it;
 		QFileInfo fi(szTmpName);
 		bGzip = false;
 
diff --git a/src/kvirc/ui/KviScriptButton.cpp b/src/kvirc/ui/KviScriptButton.cpp
index b9d92c1a8..70b01cce9 100644
--- a/src/kvirc/ui/KviScriptButton.cpp
+++ b/src/kvirc/ui/KviScriptButton.cpp
@@ -34,7 +34,7 @@
 KviScriptUserButton::KviScriptUserButton(QWidget * par, const char * name)
     : QToolButton(par)
 {
-	m_pScript = 0;
+	m_pScript = nullptr;
 	setObjectName(name);
 	//	setAutoRaise(true);
 	connect(this, SIGNAL(clicked()), this, SLOT(btnClicked()));
@@ -69,7 +69,7 @@ void KviScriptUserButton::btnClicked()
 	KviKvsVariantList vList;
 	vList.append((kvs_int_t)pos.x());
 	vList.append((kvs_int_t)pos.y());
-	m_pScript->run(pWnd, &vList, 0, KviKvsScript::PreserveParams);
+	m_pScript->run(pWnd, &vList, nullptr, KviKvsScript::PreserveParams);
 }
 
 KviWindowScriptButton::KviWindowScriptButton(QWidget * p, KviWindow * wnd, const char * name)
@@ -79,5 +79,4 @@ KviWindowScriptButton::KviWindowScriptButton(QWidget * p, KviWindow * wnd, const
 }
 
 KviWindowScriptButton::~KviWindowScriptButton()
-{
-}
+    = default;
diff --git a/src/kvirc/ui/KviScriptEditor.cpp b/src/kvirc/ui/KviScriptEditor.cpp
index fd0b962ab..68ee0a423 100644
--- a/src/kvirc/ui/KviScriptEditor.cpp
+++ b/src/kvirc/ui/KviScriptEditor.cpp
@@ -35,8 +35,7 @@ KviScriptEditor::KviScriptEditor(QWidget * par)
 }
 
 KviScriptEditor::~KviScriptEditor()
-{
-}
+    = default;
 
 void KviScriptEditor::setText(const char * txt)
 {
diff --git a/src/kvirc/ui/KviSelectors.cpp b/src/kvirc/ui/KviSelectors.cpp
index ad63dcd62..927b6b190 100644
--- a/src/kvirc/ui/KviSelectors.cpp
+++ b/src/kvirc/ui/KviSelectors.cpp
@@ -145,8 +145,7 @@ KviStringSelector::KviStringSelector(QWidget * par, const QString & txt, QString
 }
 
 KviStringSelector::~KviStringSelector()
-{
-}
+    = default;
 
 void KviStringSelector::commit()
 {
@@ -199,8 +198,7 @@ void KviPasswordSelector::checkToggled(int state)
 }
 
 KviPasswordSelector::~KviPasswordSelector()
-{
-}
+    = default;
 
 void KviPasswordSelector::commit()
 {
@@ -245,8 +243,7 @@ void KviPasswordLineEdit::checkToggled(int state)
 }
 
 KviPasswordLineEdit::~KviPasswordLineEdit()
-{
-}
+    = default;
 
 QString KviPasswordLineEdit::text()
 {
@@ -274,8 +271,7 @@ KviPixmapPreview::KviPixmapPreview(QWidget * par)
 }
 
 KviPixmapPreview::~KviPixmapPreview()
-{
-}
+    = default;
 
 void KviPixmapPreview::setPixmap(KviPixmap * pix)
 {
@@ -322,8 +318,7 @@ KviPixmapSelector::KviPixmapSelector(QWidget * par, const QString & txt, KviPixm
 }
 
 KviPixmapSelector::~KviPixmapSelector()
-{
-}
+    = default;
 
 void KviPixmapSelector::checkBoxToggled(bool)
 {
@@ -510,8 +505,7 @@ KviStringListSelector::KviStringListSelector(QWidget * par, const QString & txt,
 }
 
 KviStringListSelector::~KviStringListSelector()
-{
-}
+    = default;
 
 void KviStringListSelector::itemSelectionChanged()
 {
@@ -621,7 +615,7 @@ void KviColorSelector::forceColor(QColor clr)
 
 void KviColorSelector::changeClicked()
 {
-	QColor tmp = QColorDialog::getColor(m_memColor, 0, __tr2qs("Choose Color"), QColorDialog::ShowAlphaChannel);
+	QColor tmp = QColorDialog::getColor(m_memColor, nullptr, __tr2qs("Choose Color"), QColorDialog::ShowAlphaChannel);
 	if(tmp.isValid())
 		setButtonPalette(&tmp);
 }
@@ -706,7 +700,7 @@ KviMircTextColorSelector::KviMircTextColorSelector(QWidget * par, const QString
 
 	m_pContextPopup = new QMenu(this);
 
-	QAction * pAction = 0;
+	QAction * pAction = nullptr;
 	m_pForePopup = new QMenu(this);
 	connect(m_pForePopup, SIGNAL(triggered(QAction *)), this, SLOT(foreSelected(QAction *)));
 	int iColor;
@@ -738,8 +732,7 @@ KviMircTextColorSelector::KviMircTextColorSelector(QWidget * par, const QString
 }
 
 KviMircTextColorSelector::~KviMircTextColorSelector()
-{
-}
+    = default;
 
 void KviMircTextColorSelector::commit()
 {
@@ -815,12 +808,11 @@ KviSoundSelector::KviSoundSelector(QWidget * par, const QString & txt, QString *
 }
 
 KviSoundSelector::~KviSoundSelector()
-{
-}
+    = default;
 
 void KviSoundSelector::playSound()
 {
-	KviKvsScript::run("snd.play $0", 0, new KviKvsVariantList(new KviKvsVariant(m_pLineEdit->text())));
+	KviKvsScript::run("snd.play $0", nullptr, new KviKvsVariantList(new KviKvsVariant(m_pLineEdit->text())));
 }
 
 void KviSoundSelector::setEnabled(bool bEnabled)
@@ -883,8 +875,7 @@ KviChannelListSelector::KviChannelListSelector(QWidget * par, const QString & tx
 }
 
 KviChannelListSelector::~KviChannelListSelector()
-{
-}
+    = default;
 
 void KviChannelListSelector::commit()
 {
diff --git a/src/kvirc/ui/KviStatusBar.cpp b/src/kvirc/ui/KviStatusBar.cpp
index c51fd781e..ff58118cc 100644
--- a/src/kvirc/ui/KviStatusBar.cpp
+++ b/src/kvirc/ui/KviStatusBar.cpp
@@ -65,9 +65,9 @@ KviStatusBar::KviStatusBar(KviMainWindow * pFrame)
 	setSizeGripEnabled(false);
 	setAcceptDrops(true);
 
-	m_pContextPopup = 0;
-	m_pAppletsPopup = 0;
-	m_pClickedApplet = 0;
+	m_pContextPopup = nullptr;
+	m_pAppletsPopup = nullptr;
+	m_pClickedApplet = nullptr;
 
 	m_pAppletDescriptors = new KviPointerHashTable<QString, KviStatusBarAppletDescriptor>;
 	m_pAppletDescriptors->setAutoDelete(true);
@@ -85,7 +85,7 @@ KviStatusBar::KviStatusBar(KviMainWindow * pFrame)
 	m_pMessageQueue = new KviPointerList<KviStatusBarMessage>;
 	m_pMessageQueue->setAutoDelete(true);
 
-	m_pMessageTimer = 0;
+	m_pMessageTimer = nullptr;
 
 	m_pMessageLabel = new QLabel("<b>[x]</b> x", this);
 	m_pMessageLabel->setObjectName("msgstatuslabel");
@@ -109,7 +109,7 @@ KviStatusBar::KviStatusBar(KviMainWindow * pFrame)
 void KviStatusBar::dropEvent(QDropEvent * de)
 {
 	de->accept();
-	m_pClickedApplet = 0;
+	m_pClickedApplet = nullptr;
 }
 
 void KviStatusBar::dragEnterEvent(QDragEnterEvent * event)
@@ -120,7 +120,7 @@ void KviStatusBar::dragEnterEvent(QDragEnterEvent * event)
 void KviStatusBar::dragMoveEvent(QDragMoveEvent * de)
 {
 	// Unpack dropped data and handle it the way you want
-	if(de->mimeData()->hasFormat("kvirc/statusbarapplet") && de->source() != 0 && m_pClickedApplet && appletExists(m_pClickedApplet))
+	if(de->mimeData()->hasFormat("kvirc/statusbarapplet") && de->source() != nullptr && m_pClickedApplet && appletExists(m_pClickedApplet))
 	{
 		KviStatusBarApplet * pApplet = m_pAppletList->last();
 		int oldIndex = m_pClickedApplet->index();
@@ -303,7 +303,7 @@ KviStatusBarApplet * KviStatusBar::appletAt(const QPoint & pnt, bool bBestMatch)
 			}
 		}
 	}
-	return 0;
+	return nullptr;
 }
 
 void KviStatusBar::tipRequest(QHelpEvent * e)
@@ -404,7 +404,7 @@ void KviStatusBar::removeClickedApplet()
 		return;
 
 	delete m_pClickedApplet;
-	m_pClickedApplet = 0;
+	m_pClickedApplet = nullptr;
 }
 
 void KviStatusBar::appletsPopupAboutToShow()
@@ -417,7 +417,7 @@ void KviStatusBar::appletsPopupAboutToShow()
 	// FIXME: could we cache the module results in some way ?
 	g_pModuleManager->loadModulesByCaps("statusbarapplet");
 
-	QAction * pAction = 0;
+	QAction * pAction = nullptr;
 	KviPointerHashTableIterator<QString, KviStatusBarAppletDescriptor> it(*m_pAppletDescriptors);
 	while(KviStatusBarAppletDescriptor * d = it.current())
 	{
@@ -435,7 +435,7 @@ KviStatusBarApplet * KviStatusBar::createApplet(const QString & szInternalName)
 {
 	KviStatusBarAppletDescriptor * d = m_pAppletDescriptors->find(szInternalName);
 	if(!d)
-		return 0;
+		return nullptr;
 
 	return d->create(this);
 }
@@ -514,7 +514,7 @@ int KviStatusBar::insertPermanentWidgetAtTheEnd(QWidget * widget, int stretch)
 
 void KviStatusBar::mousePressEvent(QMouseEvent * e)
 {
-	m_pClickedApplet = 0;
+	m_pClickedApplet = nullptr;
 	if((e->button() == Qt::LeftButton) && (e->modifiers() & (Qt::ShiftModifier | Qt::ControlModifier)))
 	{
 		// move!
@@ -637,7 +637,7 @@ void KviStatusBar::messageTimerFired()
 	}
 	// nothing else to show
 	delete m_pMessageTimer;
-	m_pMessageTimer = 0;
+	m_pMessageTimer = nullptr;
 
 	setPermanentMessage();
 }
@@ -650,7 +650,7 @@ void KviStatusBar::showFirstMessageInQueue()
 		if(m_pMessageTimer)
 		{
 			delete m_pMessageTimer;
-			m_pMessageTimer = 0;
+			m_pMessageTimer = nullptr;
 		}
 		return;
 	}
diff --git a/src/kvirc/ui/KviStatusBarApplet.cpp b/src/kvirc/ui/KviStatusBarApplet.cpp
index 2a4fdf2dc..866ff762e 100644
--- a/src/kvirc/ui/KviStatusBarApplet.cpp
+++ b/src/kvirc/ui/KviStatusBarApplet.cpp
@@ -75,7 +75,7 @@ KviStatusBarAppletDescriptor::KviStatusBarAppletDescriptor(const QString & szVis
 	if(!pixIcon.isNull())
 		m_pIcon = new QPixmap(pixIcon);
 	else
-		m_pIcon = 0;
+		m_pIcon = nullptr;
 }
 
 KviStatusBarAppletDescriptor::~KviStatusBarAppletDescriptor()
@@ -137,8 +137,7 @@ KviStatusBarAwayIndicator::KviStatusBarAwayIndicator(KviStatusBar * pParent, Kvi
 }
 
 KviStatusBarAwayIndicator::~KviStatusBarAwayIndicator()
-{
-}
+    = default;
 
 void KviStatusBarAwayIndicator::updateDisplay()
 {
@@ -258,8 +257,7 @@ KviStatusBarLagIndicator::KviStatusBarLagIndicator(KviStatusBar * pParent, KviSt
 }
 
 KviStatusBarLagIndicator::~KviStatusBarLagIndicator()
-{
-}
+    = default;
 
 void KviStatusBarLagIndicator::mouseDoubleClickEvent(QMouseEvent * e)
 {
@@ -382,8 +380,7 @@ KviStatusBarClock::KviStatusBarClock(KviStatusBar * pParent, KviStatusBarAppletD
 }
 
 KviStatusBarClock::~KviStatusBarClock()
-{
-}
+    = default;
 
 void KviStatusBarClock::adjustMinWidth()
 {
@@ -477,14 +474,14 @@ void KviStatusBarClock::fillContextPopup(QMenu * p)
 void KviStatusBarClock::toggleUtc()
 {
 	m_bUtc = !m_bUtc;
-	timerEvent(0);
+	timerEvent(nullptr);
 }
 
 void KviStatusBarClock::toggle24h()
 {
 	m_b24h = !m_b24h;
 	adjustMinWidth();
-	timerEvent(0);
+	timerEvent(nullptr);
 }
 
 void KviStatusBarClock::changeFormat(QAction * pAct)
@@ -543,8 +540,7 @@ KviStatusBarConnectionTimer::KviStatusBarConnectionTimer(KviStatusBar * pParent,
 }
 
 KviStatusBarConnectionTimer::~KviStatusBarConnectionTimer()
-{
-}
+    = default;
 //g_pApp->topmostConnectedConsole()
 void KviStatusBarConnectionTimer::timerEvent(QTimerEvent *)
 {
@@ -622,8 +618,7 @@ KviStatusBarSeparator::KviStatusBarSeparator(KviStatusBar * pParent, KviStatusBa
 }
 
 KviStatusBarSeparator::~KviStatusBarSeparator()
-{
-}
+    = default;
 
 KviStatusBarApplet * CreateStatusBarSeparator(KviStatusBar * pBar, KviStatusBarAppletDescriptor * pDescriptor)
 {
@@ -648,7 +643,7 @@ KviStatusBarUpdateIndicator::KviStatusBarUpdateIndicator(KviStatusBar * pParent,
 	m_bUpdateStatus = false;
 	m_bUpdateOnStartup = false;
 	m_bUpdateRevision = false;
-	m_pHttpRequest = 0;
+	m_pHttpRequest = nullptr;
 
 	updateDisplay();
 
@@ -657,8 +652,7 @@ KviStatusBarUpdateIndicator::KviStatusBarUpdateIndicator(KviStatusBar * pParent,
 }
 
 KviStatusBarUpdateIndicator::~KviStatusBarUpdateIndicator()
-{
-}
+    = default;
 
 void KviStatusBarUpdateIndicator::updateDisplay()
 {
diff --git a/src/kvirc/ui/KviTextIconWindow.cpp b/src/kvirc/ui/KviTextIconWindow.cpp
index eccfe3205..1aa861507 100644
--- a/src/kvirc/ui/KviTextIconWindow.cpp
+++ b/src/kvirc/ui/KviTextIconWindow.cpp
@@ -41,9 +41,9 @@
 #include <QScrollBar>
 
 KviTextIconWindow::KviTextIconWindow()
-    : QWidget(0, Qt::Popup)
+    : QWidget(nullptr, Qt::Popup)
 {
-	m_pOwner = 0;
+	m_pOwner = nullptr;
 	m_bAltMode = false;
 
 	setFixedSize(KVI_TEXTICON_WIN_WIDTH, KVI_TEXTICON_WIN_HEIGHT);
@@ -107,7 +107,7 @@ void KviTextIconWindow::fill()
 	}
 
 	m_pTable->sortItems(0, Qt::AscendingOrder);
-	m_pTable->setCurrentItem(0);
+	m_pTable->setCurrentItem(nullptr);
 }
 
 void KviTextIconWindow::popup(QWidget * pOwner, bool bAltMode)
@@ -226,7 +226,7 @@ void KviTextIconWindow::autoSelectBestMatchBasedOnOwnerText()
 
 void KviTextIconWindow::ownerDead()
 {
-	m_pOwner = 0;
+	m_pOwner = nullptr;
 	doHide();
 }
 
diff --git a/src/kvirc/ui/KviThemedComboBox.cpp b/src/kvirc/ui/KviThemedComboBox.cpp
index c13064070..0ad01c966 100644
--- a/src/kvirc/ui/KviThemedComboBox.cpp
+++ b/src/kvirc/ui/KviThemedComboBox.cpp
@@ -51,8 +51,7 @@ KviThemedComboBox::KviThemedComboBox(QWidget * par, KviWindow * pWindow, const c
 }
 
 KviThemedComboBox::~KviThemedComboBox()
-{
-}
+    = default;
 
 void KviThemedComboBox::applyOptions()
 {
diff --git a/src/kvirc/ui/KviThemedLabel.cpp b/src/kvirc/ui/KviThemedLabel.cpp
index 55991353b..03f60c430 100644
--- a/src/kvirc/ui/KviThemedLabel.cpp
+++ b/src/kvirc/ui/KviThemedLabel.cpp
@@ -51,8 +51,7 @@ KviThemedLabel::KviThemedLabel(QWidget * par, KviWindow * pWindow, const char *
 }
 
 KviThemedLabel::~KviThemedLabel()
-{
-}
+    = default;
 
 void KviThemedLabel::applyOptions()
 {
@@ -79,7 +78,7 @@ void KviThemedLabel::paintEvent(QPaintEvent * e)
 	QPainter * p = new QPainter(this);
 
 	// In Qt5 QStyle::drawPrimitive seems to always overwrite the background, no matter what.
-	qDrawShadePanel(p, 0, 0, width(), height(), palette(), true, 1, NULL);
+	qDrawShadePanel(p, 0, 0, width(), height(), palette(), true, 1, nullptr);
 
 	QRect r(1, 1, width() - 2, height() - 2);
 
diff --git a/src/kvirc/ui/KviThemedLineEdit.cpp b/src/kvirc/ui/KviThemedLineEdit.cpp
index 09749cd95..d844000be 100644
--- a/src/kvirc/ui/KviThemedLineEdit.cpp
+++ b/src/kvirc/ui/KviThemedLineEdit.cpp
@@ -62,8 +62,7 @@ KviThemedLineEdit::KviThemedLineEdit(QWidget * par, KviWindow * pWindow, const c
 }
 
 KviThemedLineEdit::~KviThemedLineEdit()
-{
-}
+    = default;
 
 void KviThemedLineEdit::applyOptions()
 {
@@ -90,7 +89,7 @@ void KviThemedLineEdit::paintEvent(QPaintEvent * event)
 	QPalette pal = palette();
 
 	// In Qt5 QStyle::drawPrimitive seems to always overwrite the background, no matter what.
-	qDrawShadePanel(p, 0, 0, width(), height(), palette(), true, 1, NULL);
+	qDrawShadePanel(p, 0, 0, width(), height(), palette(), true, 1, nullptr);
 
 	QRect r(1, 1, width() - 2, height() - 2);
 
diff --git a/src/kvirc/ui/KviThemedTreeWidget.cpp b/src/kvirc/ui/KviThemedTreeWidget.cpp
index 26016aae6..ed80a149c 100644
--- a/src/kvirc/ui/KviThemedTreeWidget.cpp
+++ b/src/kvirc/ui/KviThemedTreeWidget.cpp
@@ -45,8 +45,7 @@ KviThemedTreeWidget::KviThemedTreeWidget(QWidget * par, KviWindow * pWindow, con
 }
 
 KviThemedTreeWidget::~KviThemedTreeWidget()
-{
-}
+    = default;
 
 void KviThemedTreeWidget::applyOptions()
 {
diff --git a/src/kvirc/ui/KviToolBar.cpp b/src/kvirc/ui/KviToolBar.cpp
index 08c8d8471..3b13f57f0 100644
--- a/src/kvirc/ui/KviToolBar.cpp
+++ b/src/kvirc/ui/KviToolBar.cpp
@@ -33,10 +33,10 @@
 #include <QMouseEvent>
 #include <QMenu>
 
-static QMenu * g_pToolBarContextPopup = 0;
-static QMenu * g_pToolBarWindowsPopup = 0;
-static QMenu * g_pToolBarIconSizesPopup = 0;
-static QMenu * g_pToolBarButtonStylePopup = 0;
+static QMenu * g_pToolBarContextPopup = nullptr;
+static QMenu * g_pToolBarWindowsPopup = nullptr;
+static QMenu * g_pToolBarIconSizesPopup = nullptr;
+static QMenu * g_pToolBarButtonStylePopup = nullptr;
 static uint uToolBarInstances = 0;
 
 KviToolBar::KviToolBar(const QString & szLabel, Qt::ToolBarArea type, const char * pcName)
@@ -68,10 +68,10 @@ KviToolBar::~KviToolBar()
 		if(g_pToolBarContextPopup)
 			delete g_pToolBarContextPopup;
 
-		g_pToolBarButtonStylePopup = 0;
-		g_pToolBarIconSizesPopup = 0;
-		g_pToolBarWindowsPopup = 0;
-		g_pToolBarContextPopup = 0;
+		g_pToolBarButtonStylePopup = nullptr;
+		g_pToolBarIconSizesPopup = nullptr;
+		g_pToolBarWindowsPopup = nullptr;
+		g_pToolBarContextPopup = nullptr;
 	}
 }
 
@@ -118,11 +118,11 @@ void KviToolBar::mousePressEvent(QMouseEvent * e)
 		// fill icon size menu
 		QActionGroup * pIconSizeGroup = new QActionGroup(g_pToolBarIconSizesPopup);
 
-		QAction * pTmp = 0;
+		QAction * pTmp = nullptr;
 		IconSizes iconSize;
-		for(uint i = 0; i < VALID_ICONSIZES_NUM; i++)
+		for(auto & valid_iconsize : valid_iconsizes)
 		{
-			iconSize = valid_iconsizes[i];
+			iconSize = valid_iconsize;
 
 			pTmp = pIconSizeGroup->addAction(g_pToolBarIconSizesPopup->addAction(__tr2qs(iconSize.pcName)));
 			pTmp->setData((uint)iconSize.uSize);
@@ -136,11 +136,11 @@ void KviToolBar::mousePressEvent(QMouseEvent * e)
 		// fill button style menu
 		QActionGroup * pButtonStyleGroup = new QActionGroup(g_pToolBarButtonStylePopup);
 
-		pTmp = 0;
+		pTmp = nullptr;
 		ButtonStyles buttonStyle;
-		for(uint i = 0; i < VALID_BUTTONSTYLES_NUM; i++)
+		for(auto & valid_buttonstyle : valid_buttonstyles)
 		{
-			buttonStyle = valid_buttonstyles[i];
+			buttonStyle = valid_buttonstyle;
 
 			pTmp = pButtonStyleGroup->addAction(g_pToolBarButtonStylePopup->addAction(__tr2qs(buttonStyle.pcName)));
 			pTmp->setData((uint)buttonStyle.uStyle);
diff --git a/src/kvirc/ui/KviTopicWidget.cpp b/src/kvirc/ui/KviTopicWidget.cpp
index 6e08d68af..a7d53c6d8 100644
--- a/src/kvirc/ui/KviTopicWidget.cpp
+++ b/src/kvirc/ui/KviTopicWidget.cpp
@@ -64,8 +64,7 @@ KviTopicListBoxItemDelegate::KviTopicListBoxItemDelegate(QAbstractItemView * pWi
 }
 
 KviTopicListBoxItemDelegate::~KviTopicListBoxItemDelegate()
-{
-}
+    = default;
 
 QSize KviTopicListBoxItemDelegate::sizeHint(const QStyleOptionViewItem &, const QModelIndex & index) const
 {
@@ -90,8 +89,7 @@ KviTopicListBoxItem::KviTopicListBoxItem(KviTalListWidget * listbox, const QStri
 }
 
 KviTopicListBoxItem::~KviTopicListBoxItem()
-{
-}
+    = default;
 
 int KviTopicListBoxItem::width(const KviTalListWidget * lb) const
 {
@@ -103,12 +101,12 @@ KviTopicWidget::KviTopicWidget(QWidget * par, KviChannelWindow * pChannel, const
 {
 	setObjectName(name);
 	m_pKviChannelWindow = pChannel;
-	m_pHistory = 0;
-	m_pAccept = 0;
-	m_pDiscard = 0;
-	m_pContextPopup = 0;
+	m_pHistory = nullptr;
+	m_pAccept = nullptr;
+	m_pDiscard = nullptr;
+	m_pContextPopup = nullptr;
 	m_iCursorPosition = 0;
-	m_pInput = 0;
+	m_pInput = nullptr;
 
 	m_pLabel = new KviThemedLabel(this, pChannel, "topic_label");
 	m_pLabel->setTextFormat(Qt::RichText);
@@ -324,9 +322,9 @@ void KviTopicWidget::setTopic(const QString & topic)
 	m_pLabel->setText(KviHtmlGenerator::convertToHtml(KviQString::toHtmlEscaped(m_szTopic)));
 
 	bool bFound = false;
-	for(QStringList::Iterator it = g_pRecentTopicList->begin(); it != g_pRecentTopicList->end(); ++it)
+	for(auto & it : *g_pRecentTopicList)
 	{
-		if(*it == m_szTopic)
+		if(it == m_szTopic)
 		{
 			bFound = true;
 			break;
@@ -448,7 +446,7 @@ void KviTopicWidget::switchMode()
 		}
 		w = w->parent();
 	}
-	if(m_pInput == 0)
+	if(m_pInput == nullptr)
 	{
 		m_pInput = new KviInputEditor(this, m_pKviChannelWindow);
 		m_pInput->setObjectName("topicw_inputeditor");
@@ -615,17 +613,17 @@ void KviTopicWidget::deactivate()
 	if(m_pInput)
 	{
 		m_pInput->deleteLater();
-		m_pInput = 0;
+		m_pInput = nullptr;
 		m_pHistory->deleteLater();
-		m_pHistory = 0;
+		m_pHistory = nullptr;
 		m_pAccept->deleteLater();
-		m_pAccept = 0;
+		m_pAccept = nullptr;
 		m_pDiscard->deleteLater();
-		m_pDiscard = 0;
+		m_pDiscard = nullptr;
 	}
 
 	m_pLabel->show();
-	resizeEvent(0);
+	resizeEvent(nullptr);
 	// try to find a KviWindow parent and give it the focus
 
 	m_pKviChannelWindow->setFocus();
@@ -643,8 +641,8 @@ void KviTopicWidget::historyClicked()
 		m_pCompletionBox->installEventFilter(this);
 		m_pCompletionBox->clear();
 
-		for(QStringList::Iterator it = g_pRecentTopicList->begin(); it != g_pRecentTopicList->end(); ++it)
-			new KviTopicListBoxItem(m_pCompletionBox, *it);
+		for(auto & it : *g_pRecentTopicList)
+			new KviTopicListBoxItem(m_pCompletionBox, it);
 
 		m_pCompletionBox->resize(m_pInput->width(), 6 * m_pCompletionBox->fontMetrics().height() + 20);
 		QPoint point = m_pInput->mapToGlobal(QPoint(0, 0));
diff --git a/src/kvirc/ui/KviTreeWindowList.cpp b/src/kvirc/ui/KviTreeWindowList.cpp
index 6c5b1fd78..d4ef2462c 100644
--- a/src/kvirc/ui/KviTreeWindowList.cpp
+++ b/src/kvirc/ui/KviTreeWindowList.cpp
@@ -65,8 +65,7 @@ KviTreeWindowListItem::KviTreeWindowListItem(KviTreeWindowListItem * par, KviWin
 }
 
 KviTreeWindowListItem::~KviTreeWindowListItem()
-{
-}
+    = default;
 
 void KviTreeWindowListItem::applyOptions()
 {
@@ -209,8 +208,7 @@ KviTreeWindowListTreeWidget::KviTreeWindowListTreeWidget(QWidget * par)
 }
 
 KviTreeWindowListTreeWidget::~KviTreeWindowListTreeWidget()
-{
-}
+    = default;
 
 void KviTreeWindowListTreeWidget::mouseMoveEvent(QMouseEvent *)
 {
@@ -396,8 +394,7 @@ KviTreeWindowList::KviTreeWindowList()
 }
 
 KviTreeWindowList::~KviTreeWindowList()
-{
-}
+    = default;
 
 void KviTreeWindowList::updatePseudoTransparency()
 {
@@ -499,14 +496,14 @@ KviWindowListItem * KviTreeWindowList::firstItem()
 KviWindowListItem * KviTreeWindowList::nextItem()
 {
 	if(!m_pCurrentItem)
-		return 0;
+		return nullptr;
 	return m_pCurrentItem = (KviTreeWindowListItem *)m_pTreeWidget->itemBelow(m_pCurrentItem);
 }
 
 KviWindowListItem * KviTreeWindowList::prevItem()
 {
 	if(!m_pCurrentItem)
-		return 0;
+		return nullptr;
 	return m_pCurrentItem = (KviTreeWindowListItem *)m_pTreeWidget->itemAbove(m_pCurrentItem);
 }
 
@@ -528,7 +525,7 @@ KviWindowListItem * KviTreeWindowList::lastItem()
 	}
 	else
 	{
-		return 0;
+		return nullptr;
 	}
 }
 
@@ -539,7 +536,7 @@ bool KviTreeWindowList::setIterationPointer(KviWindowListItem * it)
 		return true;
 	if(m_pTreeWidget == m_pCurrentItem->treeWidget())
 		return true;
-	m_pCurrentItem = 0;
+	m_pCurrentItem = nullptr;
 	return false;
 }
 
diff --git a/src/kvirc/ui/KviUserListView.cpp b/src/kvirc/ui/KviUserListView.cpp
index 629bb9939..09b339b7a 100644
--- a/src/kvirc/ui/KviUserListView.cpp
+++ b/src/kvirc/ui/KviUserListView.cpp
@@ -80,8 +80,7 @@ KviUserListToolTip::KviUserListToolTip(KviUserListView * pView, KviUserListViewA
 }
 
 KviUserListToolTip::~KviUserListToolTip()
-{
-}
+    = default;
 
 void KviUserListToolTip::maybeTip(const QPoint & pnt)
 {
@@ -100,7 +99,7 @@ KviUserListEntry::KviUserListEntry(KviUserListView * pParent, const QString & sz
 	m_iTemperature = bJoinTimeUnknown ? 0 : KVI_USERACTION_JOIN;
 
 	m_bSelected = false;
-	m_pAvatarPixmap = NULL;
+	m_pAvatarPixmap = nullptr;
 
 	updateAvatarData();
 	recalcSize();
@@ -117,7 +116,7 @@ void KviUserListEntry::detachAvatarData()
 	if(!m_pAvatarPixmap)
 		return;
 
-	m_pAvatarPixmap = NULL;
+	m_pAvatarPixmap = nullptr;
 }
 
 void KviUserListEntry::updateAvatarData()
@@ -163,7 +162,7 @@ void KviUserListEntry::avatarFrameChanged()
 
 void KviUserListEntry::avatarDestroyed()
 {
-	m_pAvatarPixmap = NULL;
+	m_pAvatarPixmap = nullptr;
 }
 
 bool KviUserListEntry::color(QColor & color)
@@ -231,9 +230,9 @@ KviUserListView::KviUserListView(QWidget * pParent, KviWindowToolPageButton * pB
 
 	m_pViewArea = new KviUserListViewArea(this);
 	m_pToolTip = new KviUserListToolTip(this, m_pViewArea);
-	m_pTopItem = 0;
-	m_pHeadItem = 0;
-	m_pTailItem = 0;
+	m_pTopItem = nullptr;
+	m_pHeadItem = nullptr;
+	m_pTailItem = nullptr;
 	m_iOpCount = 0;
 	m_iHalfOpCount = 0;
 	m_iVoiceCount = 0;
@@ -371,7 +370,7 @@ void KviUserListView::applyOptions()
 	updateScrollBarRange();
 	m_pUsersLabel->setFont(KVI_OPTION_FONT(KviOption_fontUserListView));
 	setMinimumWidth(22);
-	resizeEvent(0); // this will call update() too
+	resizeEvent(nullptr); // this will call update() too
 	repaint();
 }
 
@@ -710,7 +709,7 @@ void KviUserListView::insertUserEntry(const QString & szNnick, KviUserListEntry
 			// inserting
 			pUserEntry->m_pNext = pEntry;
 			pUserEntry->m_pPrev = pEntry->m_pPrev;
-			if(pUserEntry->m_pPrev == 0)
+			if(pUserEntry->m_pPrev == nullptr)
 				m_pHeadItem = pUserEntry;
 			else
 				pUserEntry->m_pPrev->m_pNext = pUserEntry;
@@ -750,7 +749,7 @@ void KviUserListView::insertUserEntry(const QString & szNnick, KviUserListEntry
 		{
 			// appending to the end (may be visible)
 			m_pTailItem->m_pNext = pUserEntry;
-			pUserEntry->m_pNext = 0;
+			pUserEntry->m_pNext = nullptr;
 			pUserEntry->m_pPrev = m_pTailItem;
 			m_pTailItem = pUserEntry;
 			triggerUpdate();
@@ -762,8 +761,8 @@ void KviUserListView::insertUserEntry(const QString & szNnick, KviUserListEntry
 		m_pHeadItem = pUserEntry;
 		m_pTailItem = pUserEntry;
 		m_pTopItem = pUserEntry;
-		pUserEntry->m_pNext = 0;
-		pUserEntry->m_pPrev = 0;
+		pUserEntry->m_pNext = nullptr;
+		pUserEntry->m_pPrev = nullptr;
 		triggerUpdate();
 	}
 
@@ -1115,7 +1114,7 @@ QString * KviUserListView::firstSelectedNickname()
 		}
 		m_pIterator = m_pIterator->m_pNext;
 	}
-	return 0;
+	return nullptr;
 }
 
 QString * KviUserListView::nextSelectedNickname()
@@ -1130,7 +1129,7 @@ QString * KviUserListView::nextSelectedNickname()
 		}
 		m_pIterator = m_pIterator->m_pNext;
 	}
-	return 0;
+	return nullptr;
 }
 
 void KviUserListView::appendSelectedNicknames(QString & szBuffer)
@@ -1292,7 +1291,7 @@ bool KviUserListView::partInternal(const QString & szNick, bool bRemoveDefinitiv
 	{
 		bGotTopItem = true; // !!! the previous while() does not handle it!
 		m_pTopItem = pUserEntry->m_pNext;
-		if(m_pTopItem == 0)
+		if(m_pTopItem == nullptr)
 			m_pTopItem = pUserEntry->m_pPrev;
 	}
 	if(pUserEntry == m_pHeadItem)
@@ -1412,9 +1411,9 @@ void KviUserListView::partAllButOne(const QString & szWhoNot)
 			list.append(it.currentKey());
 		++it;
 	}
-	for(QStringList::Iterator it2 = list.begin(); it2 != list.end(); it2++)
+	for(auto & it2 : list)
 	{
-		part(*it2);
+		part(it2);
 	}
 }
 
@@ -1430,8 +1429,8 @@ void KviUserListView::removeAllEntries()
 	}
 
 	m_pEntryDict->clear();
-	m_pHeadItem = 0;
-	m_pTopItem = 0;
+	m_pHeadItem = nullptr;
+	m_pTopItem = nullptr;
 	m_iVoiceCount = 0;
 	m_iHalfOpCount = 0;
 	m_iChanAdminCount = 0;
@@ -1498,9 +1497,9 @@ bool KviUserListView::itemVisible(KviUserListEntry * e)
 KviUserListEntry * KviUserListView::itemAt(const QPoint & pnt, QRect * pRect)
 {
 	if(!m_pTopItem)
-		return 0;
+		return nullptr;
 	if(pnt.y() < 0)
-		return 0;
+		return nullptr;
 
 	int iCurTop = KVI_USERLIST_BORDER_WIDTH - m_pViewArea->m_iTopItemOffset;
 	int iCurBottom = 0;
@@ -1522,7 +1521,7 @@ KviUserListEntry * KviUserListView::itemAt(const QPoint & pnt, QRect * pRect)
 		iCurTop = iCurBottom;
 		pEntry = pEntry->m_pNext;
 	}
-	return 0;
+	return nullptr;
 }
 
 void KviUserListView::userStats(KviUserListViewUserStats * pStats)
@@ -1690,12 +1689,11 @@ KviUserListViewArea::KviUserListViewArea(KviUserListView * pPar)
 	m_iLastScrollBarVal = 0;
 	m_iTopItemOffset = 0;
 	m_bIgnoreScrollBar = false;
-	m_pLastEntryUnderMouse = 0;
+	m_pLastEntryUnderMouse = nullptr;
 }
 
 KviUserListViewArea::~KviUserListViewArea()
-{
-}
+    = default;
 
 void KviUserListViewArea::scrollBarMoved(int iNewVal)
 {
@@ -1830,7 +1828,7 @@ void KviUserListViewArea::paintEvent(QPaintEvent * e)
 
 		if(iBottom >= r.top())
 		{
-			QColor * pClrFore = 0;
+			QColor * pClrFore = nullptr;
 			if(pEntry->m_bSelected)
 			{
 				QColor col(KVI_OPTION_COLOR(KviOption_colorUserListViewSelectionBackground));
@@ -2207,7 +2205,7 @@ void KviUserListViewArea::keyPressEvent(QKeyEvent * e)
 		else
 		{
 			KviUserListEntry * pAux = m_pListView->m_pHeadItem;
-			KviUserListEntry * pNick = 0;
+			KviUserListEntry * pNick = nullptr;
 			while(pAux)
 			{
 				if(pAux->m_bSelected)
@@ -2260,7 +2258,7 @@ void KviUserListViewArea::keyPressEvent(QKeyEvent * e)
 		else
 		{
 			KviUserListEntry * pAux = m_pListView->m_pTailItem;
-			KviUserListEntry * pNick = 0;
+			KviUserListEntry * pNick = nullptr;
 			while(pAux)
 			{
 				if(pAux->m_bSelected)
@@ -2313,7 +2311,7 @@ void KviUserListViewArea::keyPressEvent(QKeyEvent * e)
 		else
 		{
 			KviUserListEntry * pAux = m_pListView->m_pHeadItem;
-			KviUserListEntry * pNick = 0;
+			KviUserListEntry * pNick = nullptr;
 			while(pAux)
 			{
 				if(pAux->m_bSelected)
@@ -2380,7 +2378,7 @@ void KviUserListViewArea::keyPressEvent(QKeyEvent * e)
 		else
 		{
 			KviUserListEntry * pAux = m_pListView->m_pTailItem;
-			KviUserListEntry * pNick = 0;
+			KviUserListEntry * pNick = nullptr;
 			while(pAux)
 			{
 				if(pAux->m_bSelected)
@@ -2450,7 +2448,7 @@ void KviUserListViewArea::keyPressEvent(QKeyEvent * e)
 		QString szKey = e->text();
 		if(!szKey.isEmpty())
 		{
-			KviUserListEntry * pNick = 0;
+			KviUserListEntry * pNick = nullptr;
 			KviUserListEntry * pAux = m_pListView->m_pHeadItem;
 
 			if(m_pListView->selectedCount() == 1)
@@ -2582,7 +2580,7 @@ void KviUserListViewArea::mouseMoveEvent(QMouseEvent * e)
 
 void KviUserListViewArea::mouseReleaseEvent(QMouseEvent *)
 {
-	m_pLastEntryUnderMouse = 0;
+	m_pLastEntryUnderMouse = nullptr;
 }
 
 void KviUserListViewArea::wheelEvent(QWheelEvent * e)
diff --git a/src/kvirc/ui/KviWebPackageManagementDialog.cpp b/src/kvirc/ui/KviWebPackageManagementDialog.cpp
index 37feded05..dbdda58c9 100644
--- a/src/kvirc/ui/KviWebPackageManagementDialog.cpp
+++ b/src/kvirc/ui/KviWebPackageManagementDialog.cpp
@@ -101,8 +101,7 @@ KviWebPackageManagementDialog::KviWebPackageManagementDialog(QWidget * pParent)
 }
 
 KviWebPackageManagementDialog::~KviWebPackageManagementDialog()
-{
-}
+    = default;
 
 void KviWebPackageManagementDialog::setPackagePageUrl(const QString & szUrl)
 {
diff --git a/src/kvirc/ui/KviWindow.cpp b/src/kvirc/ui/KviWindow.cpp
index bfa725615..33fa5049e 100644
--- a/src/kvirc/ui/KviWindow.cpp
+++ b/src/kvirc/ui/KviWindow.cpp
@@ -97,7 +97,7 @@ static QAction * g_pMdiWindowSystemTextEncodingDefaultAction = nullptr;
 unsigned long int g_uUniqueWindowId = 1;
 
 KviWindow::KviWindow(Type eType, const QString & szName, KviConsoleWindow * lpConsole)
-    : QWidget(0)
+    : QWidget(nullptr)
 {
 	m_uId = g_uUniqueWindowId;
 	g_uUniqueWindowId++;
@@ -489,8 +489,8 @@ void KviWindow::setProgress(int iProgress)
 void KviWindow::listWindowTypes()
 {
 	outputNoFmt(KVI_OUT_SYSTEMMESSAGE, __tr2qs("List of window types available in this release of KVIrc:"));
-	for(int i = 0; i < KviWindow::TypeCount; i++)
-		outputNoFmt(KVI_OUT_SYSTEMMESSAGE, m_typeTable[i]);
+	for(auto & i : m_typeTable)
+		outputNoFmt(KVI_OUT_SYSTEMMESSAGE, i);
 }
 
 void KviWindow::getConfigGroupName(QString & szBuffer)
@@ -509,7 +509,7 @@ void KviWindow::getDefaultLogFileName(QString & szBuffer)
 		KviQString::escapeKvs(&szDynamicPath, KviQString::PermitVariables | KviQString::PermitFunctions);
 
 		KviKvsVariant vRet;
-		if(KviKvsScript::evaluate(szDynamicPath, this, 0, &vRet))
+		if(KviKvsScript::evaluate(szDynamicPath, this, nullptr, &vRet))
 			vRet.asString(szDynamicPath);
 	}
 
@@ -751,7 +751,7 @@ void KviWindow::createSystemTextEncodingPopup()
 			szTmp += ")";
 		}
 
-		disconnect(g_pMdiWindowSystemTextEncodingActionGroup, SIGNAL(triggered(QAction *)), 0, 0);
+		disconnect(g_pMdiWindowSystemTextEncodingActionGroup, SIGNAL(triggered(QAction *)), nullptr, nullptr);
 		connect(g_pMdiWindowSystemTextEncodingActionGroup, SIGNAL(triggered(QAction *)), this, SLOT(systemTextEncodingPopupActivated(QAction *)));
 		g_pMdiWindowSystemTextEncodingDefaultAction->setText(szTmp);
 
@@ -785,7 +785,7 @@ void KviWindow::createSystemTextEncodingPopup()
 		}
 	}
 
-	disconnect(g_pMdiWindowSystemTextEncodingActionGroup, SIGNAL(triggered(QAction *)), NULL, NULL);
+	disconnect(g_pMdiWindowSystemTextEncodingActionGroup, SIGNAL(triggered(QAction *)), nullptr, nullptr);
 	connect(g_pMdiWindowSystemTextEncodingActionGroup, SIGNAL(triggered(QAction *)), this, SLOT(systemTextEncodingPopupActivated(QAction *)));
 }
 
diff --git a/src/kvirc/ui/KviWindowListBase.cpp b/src/kvirc/ui/KviWindowListBase.cpp
index eb764c1ce..86f65ba39 100644
--- a/src/kvirc/ui/KviWindowListBase.cpp
+++ b/src/kvirc/ui/KviWindowListBase.cpp
@@ -64,7 +64,7 @@ extern QPixmap * g_pActivityMeterPixmap;
 //
 
 KviWindowListBase::KviWindowListBase()
-    : QDockWidget(__tr2qs("Window List"), g_pMainWindow), m_pTitleWidget(0)
+    : QDockWidget(__tr2qs("Window List"), g_pMainWindow), m_pTitleWidget(nullptr)
 {
 	// FIXME: this timer should be started only if KVI_OPTION_BOOL(KviOption_boolUseWindowListActivityMeter)
 	setObjectName("windowlist");
@@ -121,7 +121,7 @@ KviWindowListItem * KviWindowListBase::item(int number)
 {
 	KviWindowListItem * it = firstItem();
 	if(!setIterationPointer(it))
-		return 0;
+		return nullptr;
 
 	while(it && (number > 0))
 	{
@@ -246,7 +246,7 @@ KviWindowListItem::KviWindowListItem(KviWindow * wnd)
 
 KviWindowListItem::~KviWindowListItem()
 {
-	m_pWindow->m_pWindowListItem = 0;
+	m_pWindow->m_pWindowListItem = nullptr;
 }
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -561,7 +561,7 @@ KviClassicWindowList::KviClassicWindowList()
 KviClassicWindowList::~KviClassicWindowList()
 {
 	delete m_pButtonList;
-	m_pButtonList = 0;
+	m_pButtonList = nullptr;
 }
 
 void KviClassicWindowList::orientationChangedSlot(Qt::Orientation)
diff --git a/src/kvirc/ui/KviWindowStack.cpp b/src/kvirc/ui/KviWindowStack.cpp
index 20082c220..ab7fef1cd 100644
--- a/src/kvirc/ui/KviWindowStack.cpp
+++ b/src/kvirc/ui/KviWindowStack.cpp
@@ -71,13 +71,12 @@ KviWindowStack::KviWindowStack(QWidget * parent, const char * pcName)
 }
 
 KviWindowStack::~KviWindowStack()
-{
-}
+    = default;
 
 void KviWindowStack::currentWindowChanged(int iIdx)
 {
 	//if(g_pMainWindow->isActiveWindow())
-	g_pMainWindow->windowActivated((iIdx >= 0) ? (KviWindow *)widget(iIdx) : NULL);
+	g_pMainWindow->windowActivated((iIdx >= 0) ? (KviWindow *)widget(iIdx) : nullptr);
 }
 
 void KviWindowStack::addWindow(KviWindow * pWnd)
diff --git a/src/kvirc/ui/KviWindowToolWidget.cpp b/src/kvirc/ui/KviWindowToolWidget.cpp
index 5e642fc6f..f88093d0f 100644
--- a/src/kvirc/ui/KviWindowToolWidget.cpp
+++ b/src/kvirc/ui/KviWindowToolWidget.cpp
@@ -40,8 +40,7 @@ KviWindowToolWidget::KviWindowToolWidget(QWidget * pParent, KviWindowToolPageBut
 }
 
 KviWindowToolWidget::~KviWindowToolWidget()
-{
-}
+    = default;
 
 KviWindowToolPageButton::KviWindowToolPageButton(KviIconManager::SmallIcon eIconOff, KviIconManager::SmallIcon eIconOn, const QString & szText, QWidget * pParent, bool bOn)
     : QToolButton(pParent)
@@ -59,5 +58,4 @@ KviWindowToolPageButton::KviWindowToolPageButton(KviIconManager::SmallIcon eIcon
 }
 
 KviWindowToolPageButton::~KviWindowToolPageButton()
-{
-}
+    = default;
diff --git a/src/modules/about/AboutDialog.cpp b/src/modules/about/AboutDialog.cpp
index 8c8e48239..2f177a253 100644
--- a/src/modules/about/AboutDialog.cpp
+++ b/src/modules/about/AboutDialog.cpp
@@ -74,7 +74,7 @@ extern AboutDialog * g_pAboutDialog;
 #include "abouttext.inc"
 
 AboutDialog::AboutDialog()
-    : KviTalTabDialog(0)
+    : KviTalTabDialog(nullptr)
 {
 	setWindowTitle(__tr2qs_ctx("About KVIrc", "about"));
 	setOkButton(__tr2qs_ctx("Close", "about"));
@@ -239,7 +239,7 @@ AboutDialog::AboutDialog()
 
 AboutDialog::~AboutDialog()
 {
-	g_pAboutDialog = 0;
+	g_pAboutDialog = nullptr;
 }
 
 void AboutDialog::closeEvent(QCloseEvent * e)
diff --git a/src/modules/about/libkviabout.cpp b/src/modules/about/libkviabout.cpp
index 05ed81adb..910503cca 100644
--- a/src/modules/about/libkviabout.cpp
+++ b/src/modules/about/libkviabout.cpp
@@ -30,7 +30,7 @@
 #include "KviModule.h"
 #include "KviLocale.h"
 
-AboutDialog * g_pAboutDialog = 0;
+AboutDialog * g_pAboutDialog = nullptr;
 
 /*
 	@doc: about.kvirc
@@ -84,7 +84,7 @@ static bool about_module_cleanup(KviModule *)
 {
 	if(g_pAboutDialog)
 		delete g_pAboutDialog;
-	g_pAboutDialog = 0;
+	g_pAboutDialog = nullptr;
 	return true;
 }
 
diff --git a/src/modules/actioneditor/ActionEditor.cpp b/src/modules/actioneditor/ActionEditor.cpp
index 925061a31..e5de318e0 100644
--- a/src/modules/actioneditor/ActionEditor.cpp
+++ b/src/modules/actioneditor/ActionEditor.cpp
@@ -94,7 +94,7 @@ SingleActionEditor::SingleActionEditor(QWidget * par, ActionEditor * ed)
     : QWidget(par)
 {
 	m_pActionEditor = ed;
-	m_pActionData = 0;
+	m_pActionData = nullptr;
 
 	QGridLayout * g = new QGridLayout(this);
 
@@ -292,8 +292,7 @@ SingleActionEditor::SingleActionEditor(QWidget * par, ActionEditor * ed)
 }
 
 SingleActionEditor::~SingleActionEditor()
-{
-}
+    = default;
 
 void SingleActionEditor::channelQueryOrConsoleWindowCheckToggled(bool)
 {
@@ -608,8 +607,7 @@ ActionEditorTreeView::ActionEditorTreeView(QWidget * pParent)
 }
 
 ActionEditorTreeView::~ActionEditorTreeView()
-{
-}
+    = default;
 
 void ActionEditorTreeView::resizeEvent(QResizeEvent * e)
 {
@@ -650,8 +648,8 @@ ActionEditor::ActionEditor(QWidget * par)
 
 	m_pSingleActionEditor = new SingleActionEditor(m_pSplitter, this);
 
-	ActionEditorTreeWidgetItem * last = 0;
-	ActionEditorTreeWidgetItem * first = 0;
+	ActionEditorTreeWidgetItem * last = nullptr;
+	ActionEditorTreeWidgetItem * first = nullptr;
 
 	KviPointerHashTableIterator<QString, KviAction> it(*(KviActionManager::instance()->actions()));
 	while(KviAction * a = it.current())
@@ -668,7 +666,7 @@ ActionEditor::ActionEditor(QWidget * par)
 			    a->smallIconId(),
 			    a->flags(),
 			    a->keySequence(),
-			    0);
+			    nullptr);
 			ActionEditorTreeWidgetItem * lvi = new ActionEditorTreeWidgetItem(m_pTreeWidget, ad);
 			ad->m_pItem = lvi;
 			if(ad->m_szName == g_szLastEditedAction)
@@ -689,13 +687,12 @@ ActionEditor::ActionEditor(QWidget * par)
 	}
 	else
 	{
-		currentItemChanged(0, 0);
+		currentItemChanged(nullptr, nullptr);
 	}
 }
 
 ActionEditor::~ActionEditor()
-{
-}
+    = default;
 
 void ActionEditor::exportActions()
 {
@@ -765,7 +762,7 @@ void ActionEditor::deleteActions()
 	for(ActionEditorTreeWidgetItem * i = l.first(); i; i = l.next())
 	{
 		if(m_pSingleActionEditor->actionData() == i->actionData())
-			m_pSingleActionEditor->setActionData(0);
+			m_pSingleActionEditor->setActionData(nullptr);
 		delete i;
 	}
 }
@@ -807,7 +804,7 @@ void ActionEditor::newAction()
 	    QString(),
 	    0,
 	    QString(),
-	    0);
+	    nullptr);
 
 	ActionEditorTreeWidgetItem * lvi = new ActionEditorTreeWidgetItem(m_pTreeWidget, ad);
 	ad->m_pItem = lvi;
@@ -835,7 +832,7 @@ void ActionEditor::currentItemChanged(QTreeWidgetItem * i, QTreeWidgetItem *)
 	ActionEditorTreeWidgetItem * it = (ActionEditorTreeWidgetItem *)i;
 	if(!it)
 	{
-		m_pSingleActionEditor->setActionData(0);
+		m_pSingleActionEditor->setActionData(nullptr);
 		m_pDeleteActionsButton->setEnabled(false);
 		m_pExportActionsButton->setEnabled(false);
 		return;
@@ -879,7 +876,7 @@ void ActionEditor::commit()
 }
 
 ActionEditorWindow::ActionEditorWindow()
-    : KviWindow(KviWindow::ScriptEditor, "actioneditor", 0)
+    : KviWindow(KviWindow::ScriptEditor, "actioneditor", nullptr)
 {
 	g_pActionEditorWindow = this;
 	setFixedCaption(__tr2qs_ctx("Action Editor", "editor"));
@@ -911,7 +908,7 @@ ActionEditorWindow::ActionEditorWindow()
 
 ActionEditorWindow::~ActionEditorWindow()
 {
-	g_pActionEditorWindow = 0;
+	g_pActionEditorWindow = nullptr;
 }
 
 void ActionEditorWindow::okClicked()
diff --git a/src/modules/actioneditor/libkviactioneditor.cpp b/src/modules/actioneditor/libkviactioneditor.cpp
index a83450a03..a9da1c6c5 100644
--- a/src/modules/actioneditor/libkviactioneditor.cpp
+++ b/src/modules/actioneditor/libkviactioneditor.cpp
@@ -28,7 +28,7 @@
 #include "KviLocale.h"
 #include "KviMainWindow.h"
 
-ActionEditorWindow * g_pActionEditorWindow = 0;
+ActionEditorWindow * g_pActionEditorWindow = nullptr;
 
 /*
 	@doc: actioneditor.open
@@ -59,20 +59,20 @@ static bool actioneditor_kvs_cmd_open(KviKvsModuleCommandCall *)
 static bool actioneditor_module_init(KviModule * m)
 {
 	KVSM_REGISTER_SIMPLE_COMMAND(m, "open", actioneditor_kvs_cmd_open);
-	g_pActionEditorWindow = 0;
+	g_pActionEditorWindow = nullptr;
 	return true;
 }
 
 static bool actioneditor_module_can_unload(KviModule *)
 {
-	return (g_pActionEditorWindow == 0);
+	return (g_pActionEditorWindow == nullptr);
 }
 
 static bool actioneditor_module_cleanup(KviModule *)
 {
 	if(g_pActionEditorWindow && g_pMainWindow)
 		g_pMainWindow->closeWindow(g_pActionEditorWindow);
-	g_pActionEditorWindow = 0;
+	g_pActionEditorWindow = nullptr;
 	return true;
 }
 
diff --git a/src/modules/addon/AddonFunctions.cpp b/src/modules/addon/AddonFunctions.cpp
index 487681942..5ffd5466c 100644
--- a/src/modules/addon/AddonFunctions.cpp
+++ b/src/modules/addon/AddonFunctions.cpp
@@ -91,9 +91,9 @@ namespace AddonFunctions
 			return notAValidAddonPackage(szError);
 
 		// make sure the default fields exist
-		for(int i = 0; i < 6; i++)
+		for(auto & check_field : check_fields)
 		{
-			pValue = pInfoFields->find(check_fields[i]);
+			pValue = pInfoFields->find(check_field);
 			if(!pValue)
 				return notAValidAddonPackage(szError);
 		}
@@ -102,7 +102,7 @@ namespace AddonFunctions
 		// load its picture
 		pByteArray = r.binaryInfoFields()->find("Image");
 		if(pByteArray)
-			pix.loadFromData(*pByteArray, 0, 0);
+			pix.loadFromData(*pByteArray, nullptr, nullptr);
 
 		if(pix.isNull())
 		{
@@ -241,7 +241,7 @@ namespace AddonFunctions
 		}
 
 		if(!KviFileUtils::deleteDir(szUnpackPath))
-			QMessageBox::warning(NULL, __tr2qs_ctx("Warning While Unpacking Addon - KVIrc", "addon"), __tr2qs_ctx("Failed to delete the directory '%1'", "addon").arg(szUnpackPath));
+			QMessageBox::warning(nullptr, __tr2qs_ctx("Warning While Unpacking Addon - KVIrc", "addon"), __tr2qs_ctx("Failed to delete the directory '%1'", "addon").arg(szUnpackPath));
 
 		return true;
 	}
@@ -323,7 +323,7 @@ namespace AddonFunctions
 			}
 
 			QByteArray * pba = new QByteArray();
-			QBuffer bufferz(pba, 0);
+			QBuffer bufferz(pba, nullptr);
 
 			bufferz.open(QIODevice::WriteOnly);
 			pix.save(&bufferz, "PNG");
@@ -340,10 +340,8 @@ namespace AddonFunctions
 			return false;
 		}
 
-		for(QFileInfoList::Iterator it = ls.begin(); it != ls.end(); ++it)
+		for(auto & inf : ls)
 		{
-			const QFileInfo & inf = *it;
-
 			if(inf.isDir())
 			{
 				if(!pw.addDirectory(inf.absoluteFilePath(), QString("%1/").arg(inf.fileName())))
diff --git a/src/modules/addon/AddonManagementDialog.cpp b/src/modules/addon/AddonManagementDialog.cpp
index 3b96e47c4..754ef6ad7 100644
--- a/src/modules/addon/AddonManagementDialog.cpp
+++ b/src/modules/addon/AddonManagementDialog.cpp
@@ -60,7 +60,7 @@
 #include "WebAddonInterfaceDialog.h"
 #endif //COMPILE_WEBKIT_SUPPORT
 
-AddonManagementDialog * AddonManagementDialog::m_pInstance = 0;
+AddonManagementDialog * AddonManagementDialog::m_pInstance = nullptr;
 extern QRect g_rectManagementDialogGeometry;
 
 AddonListViewItem::AddonListViewItem(KviTalListWidget * v, KviKvsScriptAddon * a)
@@ -99,7 +99,7 @@ AddonManagementDialog::AddonManagementDialog(QWidget * p)
 	setWindowIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Addons)));
 
 #ifdef COMPILE_WEBKIT_SUPPORT
-	m_pWebInterfaceDialog = NULL;
+	m_pWebInterfaceDialog = nullptr;
 #endif //COMPILE_WEBKIT_SUPPORT
 
 	m_pInstance = this;
@@ -172,7 +172,7 @@ AddonManagementDialog::AddonManagementDialog(QWidget * p)
 
 	fillListView();
 
-	currentChanged(0, 0);
+	currentChanged(nullptr, nullptr);
 	connect(m_pListWidget, SIGNAL(currentItemChanged(QListWidgetItem *, QListWidgetItem *)), this, SLOT(currentChanged(QListWidgetItem *, QListWidgetItem *)));
 	m_pListWidget->setCurrentItem(m_pListWidget->item(0));
 
@@ -205,7 +205,7 @@ AddonManagementDialog::~AddonManagementDialog()
 		delete m_pWebInterfaceDialog;
 #endif //COMPILE_WEBKIT_SUPPORT
 	g_rectManagementDialogGeometry = QRect(pos().x(), pos().y(), size().width(), size().height());
-	m_pInstance = NULL;
+	m_pInstance = nullptr;
 }
 
 void AddonManagementDialog::fillListView()
@@ -280,14 +280,14 @@ void AddonManagementDialog::uninstallScript()
 	if(QMessageBox::question(
 	       this,
 	       __tr2qs_ctx("Confirm Addon Uninstallation - KVIrc", "addon"),
-	       txt, __tr2qs_ctx("Yes", "addon"), __tr2qs_ctx("No", "addon"), 0, 1)
+	       txt, __tr2qs_ctx("Yes", "addon"), __tr2qs_ctx("No", "addon"), nullptr, 1)
 	    != 0)
 		return;
 
 	KviKvsScriptAddonManager::instance()->unregisterAddon(it->addon()->name(), g_pActiveWindow);
 
 	fillListView();
-	currentChanged(0, 0);
+	currentChanged(nullptr, nullptr);
 }
 
 void AddonManagementDialog::getMoreScripts()
@@ -344,7 +344,7 @@ void AddonManagementDialog::installScript()
 	}
 
 	fillListView();
-	currentChanged(0, 0);
+	currentChanged(nullptr, nullptr);
 
 	//m_pListWidget->publicUpdateContents();
 	//m_pListWidget->triggerUpdate();
@@ -360,7 +360,7 @@ void AddonManagementDialog::cleanup()
 	if(!m_pInstance)
 		return;
 	delete m_pInstance;
-	m_pInstance = 0;
+	m_pInstance = nullptr;
 }
 
 void AddonManagementDialog::display(bool bTopLevel)
@@ -371,7 +371,7 @@ void AddonManagementDialog::display(bool bTopLevel)
 		{
 			if(m_pInstance->parent())
 			{
-				m_pInstance->setParent(0);
+				m_pInstance->setParent(nullptr);
 			}
 		}
 		else
@@ -386,7 +386,7 @@ void AddonManagementDialog::display(bool bTopLevel)
 	{
 		if(bTopLevel)
 		{
-			m_pInstance = new AddonManagementDialog(0);
+			m_pInstance = new AddonManagementDialog(nullptr);
 		}
 		else
 		{
diff --git a/src/modules/addon/PackAddonDialog.cpp b/src/modules/addon/PackAddonDialog.cpp
index b56fa3d12..cf416a4c3 100644
--- a/src/modules/addon/PackAddonDialog.cpp
+++ b/src/modules/addon/PackAddonDialog.cpp
@@ -119,8 +119,7 @@ PackAddonDialog::PackAddonDialog(QWidget * pParent)
 }
 
 PackAddonDialog::~PackAddonDialog()
-{
-}
+    = default;
 
 void PackAddonDialog::accept()
 {
@@ -250,8 +249,7 @@ PackAddonInfoPackageWidget::PackAddonInfoPackageWidget(PackAddonDialog * pParent
 }
 
 PackAddonInfoPackageWidget::~PackAddonInfoPackageWidget()
-{
-}
+    = default;
 
 PackAddonFileSelectionWidget::PackAddonFileSelectionWidget(PackAddonDialog * pParent)
     : QWizardPage(pParent)
@@ -276,8 +274,7 @@ PackAddonFileSelectionWidget::PackAddonFileSelectionWidget(PackAddonDialog * pPa
 }
 
 PackAddonFileSelectionWidget::~PackAddonFileSelectionWidget()
-{
-}
+    = default;
 
 PackAddonSaveSelectionWidget::PackAddonSaveSelectionWidget(PackAddonDialog * pParent)
     : QWizardPage(pParent)
@@ -303,8 +300,7 @@ PackAddonSaveSelectionWidget::PackAddonSaveSelectionWidget(PackAddonDialog * pPa
 }
 
 PackAddonSaveSelectionWidget::~PackAddonSaveSelectionWidget()
-{
-}
+    = default;
 
 void PackAddonSaveSelectionWidget::initializePage()
 {
@@ -335,8 +331,7 @@ PackAddonSummaryInfoWidget::PackAddonSummaryInfoWidget(PackAddonDialog * pParent
 }
 
 PackAddonSummaryInfoWidget::~PackAddonSummaryInfoWidget()
-{
-}
+    = default;
 
 void PackAddonSummaryInfoWidget::initializePage()
 {
@@ -417,8 +412,7 @@ PackAddonSummaryFilesWidget::PackAddonSummaryFilesWidget(PackAddonDialog * pPare
 }
 
 PackAddonSummaryFilesWidget::~PackAddonSummaryFilesWidget()
-{
-}
+    = default;
 
 void PackAddonSummaryFilesWidget::accept()
 {
diff --git a/src/modules/addon/WebAddonInterfaceDialog.cpp b/src/modules/addon/WebAddonInterfaceDialog.cpp
index b0f990571..ab639093c 100644
--- a/src/modules/addon/WebAddonInterfaceDialog.cpp
+++ b/src/modules/addon/WebAddonInterfaceDialog.cpp
@@ -46,8 +46,7 @@ WebAddonInterfaceDialog::WebAddonInterfaceDialog(QWidget * par)
 	        .arg(QString::fromUtf8(KviLocale::instance()->localeName().ptr())));
 }
 WebAddonInterfaceDialog::~WebAddonInterfaceDialog()
-{
-}
+    = default;
 
 bool WebAddonInterfaceDialog::installPackage(const QString & szPath, QString & szError)
 {
diff --git a/src/modules/addon/libkviaddon.cpp b/src/modules/addon/libkviaddon.cpp
index 6b96a0cf0..bc3ce94e2 100644
--- a/src/modules/addon/libkviaddon.cpp
+++ b/src/modules/addon/libkviaddon.cpp
@@ -730,9 +730,9 @@ static bool addon_kvs_cmd_installfiles(KviKvsModuleCommandCall * c)
 
 	KviFileUtils::makeDir(szTargetPath);
 
-	for(QStringList::Iterator it = lExpandedEntries.begin(); it != lExpandedEntries.end(); ++it)
+	for(auto & lExpandedEntrie : lExpandedEntries)
 	{
-		QFileInfo inf(*it);
+		QFileInfo inf(lExpandedEntrie);
 		if(!inf.exists())
 		{
 			qDebug("ERROR: file %s doesn't exist, but it should...", inf.fileName().toUtf8().data());
@@ -743,9 +743,9 @@ static bool addon_kvs_cmd_installfiles(KviKvsModuleCommandCall * c)
 		g_pApp->getLocalKvircDirectory(szTargetPath, KviApplication::None, szEntry);
 
 		if(!bQuiet)
-			c->window()->output(KVI_OUT_SYSTEMMESSAGE, __tr2qs_ctx("Installing file '%1' into '%2'", "addon").arg(*it).arg(szTargetPath));
+			c->window()->output(KVI_OUT_SYSTEMMESSAGE, __tr2qs_ctx("Installing file '%1' into '%2'", "addon").arg(lExpandedEntrie).arg(szTargetPath));
 
-		KviFileUtils::copyFile(*it, szTargetPath);
+		KviFileUtils::copyFile(lExpandedEntrie, szTargetPath);
 
 		a->addInstalledFile(szEntry);
 	}
diff --git a/src/modules/aliaseditor/AliasEditorWindow.cpp b/src/modules/aliaseditor/AliasEditorWindow.cpp
index 665a0ed62..66ee94d7b 100644
--- a/src/modules/aliaseditor/AliasEditorWindow.cpp
+++ b/src/modules/aliaseditor/AliasEditorWindow.cpp
@@ -60,7 +60,7 @@ extern AliasEditorWindow * g_pAliasEditorWindow;
 extern KviModule * g_pAliasEditorModule;
 
 AliasEditorTreeWidgetItem::AliasEditorTreeWidgetItem(QTreeWidget * pTreeWidget, Type eType, const QString & szName)
-    : QTreeWidgetItem(pTreeWidget), KviHeapObject(), m_eType(eType), m_pParentItem(0)
+    : QTreeWidgetItem(pTreeWidget), KviHeapObject(), m_eType(eType), m_pParentItem(nullptr)
 {
 	setName(szName);
 	m_cPos = 0;
@@ -120,8 +120,8 @@ AliasEditorWidget::AliasEditorWidget(QWidget * par)
 	m_pAliases->setAutoDelete(false);
 
 	m_bSaving = false;
-	m_pLastEditedItem = 0;
-	m_pLastClickedItem = 0;
+	m_pLastEditedItem = nullptr;
+	m_pLastClickedItem = nullptr;
 	m_szDir = QDir::homePath();
 
 	QGridLayout * l = new QGridLayout(this);
@@ -156,7 +156,7 @@ AliasEditorWidget::AliasEditorWidget(QWidget * par)
 
 	oneTimeSetup();
 
-	currentItemChanged(0, 0);
+	currentItemChanged(nullptr, nullptr);
 }
 
 AliasEditorWidget::~AliasEditorWidget()
@@ -206,24 +206,24 @@ QString AliasEditorWidget::buildFullItemName(AliasEditorTreeWidgetItem * it)
 //FIXME this should be called something like "findNamespace"
 AliasEditorTreeWidgetItem * AliasEditorWidget::findTopLevelItem(const QString & szName)
 {
-	AliasEditorTreeWidgetItem * pItem = 0;
+	AliasEditorTreeWidgetItem * pItem = nullptr;
 	for(int i = 0; i < m_pTreeWidget->topLevelItemCount(); i++)
 	{
 		pItem = (AliasEditorTreeWidgetItem *)m_pTreeWidget->topLevelItem(i);
 		if(pItem->text(0) == szName && pItem->isNamespace())
 			return (AliasEditorTreeWidgetItem *)m_pTreeWidget->topLevelItem(i);
 	}
-	return 0;
+	return nullptr;
 }
 
 AliasEditorTreeWidgetItem * AliasEditorWidget::findItem(const QString & szFullName)
 {
 	QStringList lNamespaces = szFullName.split("::");
 	if(!lNamespaces.count())
-		return 0;
+		return nullptr;
 	AliasEditorTreeWidgetItem * pItem = findTopLevelItem(lNamespaces.at(0));
 	if(!pItem)
-		return 0;
+		return nullptr;
 	bool bFound;
 	int i;
 	int j;
@@ -240,7 +240,7 @@ AliasEditorTreeWidgetItem * AliasEditorWidget::findItem(const QString & szFullNa
 			}
 		}
 		if(!bFound)
-			return 0;
+			return nullptr;
 	}
 	return (AliasEditorTreeWidgetItem *)pItem;
 }
@@ -249,7 +249,7 @@ AliasEditorTreeWidgetItem * AliasEditorWidget::createFullItem(const QString & sz
 {
 	QStringList lNamespaces = szFullName.split("::");
 	if(!lNamespaces.count())
-		return 0;
+		return nullptr;
 	if(lNamespaces.count() == 1)
 		return new AliasEditorTreeWidgetItem(m_pTreeWidget, AliasEditorTreeWidgetItem::Alias, lNamespaces.at(0));
 	AliasEditorTreeWidgetItem * pItem = findTopLevelItem(lNamespaces.at(0));
@@ -305,7 +305,7 @@ void AliasEditorWidget::aliasRefresh(const QString & szName)
 {
 	if(m_bSaving)
 		return;
-	AliasEditorTreeWidgetItem * item = 0;
+	AliasEditorTreeWidgetItem * item = nullptr;
 	KviKvsScript * alias = KviKvsAliasManager::instance()->aliasDict()->find(szName);
 
 	// search for old alias with same name
@@ -332,7 +332,7 @@ void AliasEditorWidget::aliasRefresh(const QString & szName)
 		return;
 	}
 	if(
-	    QMessageBox::warning(0, __tr2qs_ctx("Confirm Overwriting Current - KVIrc", "editor"),
+	    QMessageBox::warning(nullptr, __tr2qs_ctx("Confirm Overwriting Current - KVIrc", "editor"),
 	        __tr2qs_ctx("An external script has changed the alias you are currently editing. Do you want to accept the external changes?", "editor"),
 	        QMessageBox::Yes, QMessageBox::No | QMessageBox::Default | QMessageBox::Escape)
 	    != QMessageBox::Yes)
@@ -493,8 +493,8 @@ void AliasEditorWidget::renameItem()
 	bool bYesToAll = true;
 	removeItem(m_pLastEditedItem, &bYesToAll, true);
 
-	m_pLastEditedItem = 0;  // make sure it's true (but it already should be because of removeItem())
-	m_pLastClickedItem = 0; // make sure it's true (but it already should be because of removeItem())
+	m_pLastEditedItem = nullptr;  // make sure it's true (but it already should be because of removeItem())
+	m_pLastClickedItem = nullptr; // make sure it's true (but it already should be because of removeItem())
 	AliasEditorTreeWidgetItem * pItem = createFullItem(szNewName);
 	if(bAlias)
 	{
@@ -1000,9 +1000,9 @@ bool AliasEditorWidget::removeItem(AliasEditorTreeWidgetItem * it, bool * pbYesT
 	}
 
 	if(it == m_pLastEditedItem)
-		m_pLastEditedItem = 0;
+		m_pLastEditedItem = nullptr;
 	if(it == m_pLastClickedItem)
-		m_pLastClickedItem = 0;
+		m_pLastClickedItem = nullptr;
 	if(it->childCount())
 		removeItemChildren(it);
 	delete it;
@@ -1197,7 +1197,7 @@ void AliasEditorWidget::newItem(QString & szName, AliasEditorTreeWidgetItem::Typ
 {
 	if(m_pLastClickedItem)
 		if(!itemExists(m_pLastClickedItem))
-			m_pLastClickedItem = 0;
+			m_pLastClickedItem = nullptr;
 	if(m_pLastClickedItem)
 		buildFullItemPath(m_pLastClickedItem, szName);
 	int idx = 1;
@@ -1237,7 +1237,7 @@ void AliasEditorWidget::commit()
 }
 
 AliasEditorWindow::AliasEditorWindow()
-    : KviWindow(KviWindow::ScriptEditor, "aliaseditor", 0)
+    : KviWindow(KviWindow::ScriptEditor, "aliaseditor", nullptr)
 {
 	g_pAliasEditorWindow = this;
 
@@ -1270,7 +1270,7 @@ AliasEditorWindow::AliasEditorWindow()
 
 AliasEditorWindow::~AliasEditorWindow()
 {
-	g_pAliasEditorWindow = 0;
+	g_pAliasEditorWindow = nullptr;
 }
 
 void AliasEditorWindow::okClicked()
diff --git a/src/modules/aliaseditor/libkvialiaseditor.cpp b/src/modules/aliaseditor/libkvialiaseditor.cpp
index e7c0fbbab..9ec3cb0ac 100644
--- a/src/modules/aliaseditor/libkvialiaseditor.cpp
+++ b/src/modules/aliaseditor/libkvialiaseditor.cpp
@@ -28,8 +28,8 @@
 #include "KviLocale.h"
 #include "KviMainWindow.h"
 
-AliasEditorWindow * g_pAliasEditorWindow = 0;
-KviModule * g_pAliasEditorModule = 0;
+AliasEditorWindow * g_pAliasEditorWindow = nullptr;
+KviModule * g_pAliasEditorModule = nullptr;
 
 /*
 	@doc: aliaseditor.open
@@ -61,21 +61,21 @@ static bool aliaseditor_kvs_cmd_open(KviKvsModuleCommandCall *)
 static bool aliaseditor_module_init(KviModule * m)
 {
 	KVSM_REGISTER_SIMPLE_COMMAND(m, "open", aliaseditor_kvs_cmd_open);
-	g_pAliasEditorWindow = 0;
+	g_pAliasEditorWindow = nullptr;
 	g_pAliasEditorModule = m;
 	return true;
 }
 
 static bool aliaseditor_module_can_unload(KviModule *)
 {
-	return (g_pAliasEditorWindow == 0);
+	return (g_pAliasEditorWindow == nullptr);
 }
 
 static bool aliaseditor_module_cleanup(KviModule *)
 {
 	if(g_pAliasEditorWindow && g_pMainWindow)
 		g_pMainWindow->closeWindow(g_pAliasEditorWindow);
-	g_pAliasEditorWindow = 0;
+	g_pAliasEditorWindow = nullptr;
 	return true;
 }
 
diff --git a/src/modules/avatar/libkviavatar.cpp b/src/modules/avatar/libkviavatar.cpp
index 7f4f1fbca..244103018 100644
--- a/src/modules/avatar/libkviavatar.cpp
+++ b/src/modules/avatar/libkviavatar.cpp
@@ -55,7 +55,7 @@
 #include <QCloseEvent>
 #include <QByteArray>
 
-static KviPointerList<KviAsyncAvatarSelectionDialog> * g_pAvatarSelectionDialogList = 0;
+static KviPointerList<KviAsyncAvatarSelectionDialog> * g_pAvatarSelectionDialogList = nullptr;
 extern KVIRC_API KviSharedFilesManager * g_pSharedFilesManager;
 
 KviAsyncAvatarSelectionDialog::KviAsyncAvatarSelectionDialog(QWidget * par, const QString & szInitialPath, KviIrcConnection * c)
@@ -308,8 +308,8 @@ static bool avatar_kvs_cmd_unset(KviKvsModuleCommandCall * c)
 		return true;
 	}
 
-	e->setAvatar(0);
-	c->window()->console()->avatarChanged(0,
+	e->setAvatar(nullptr);
+	c->window()->console()->avatarChanged(nullptr,
 	    c->window()->connection()->userInfo()->nickName(),
 	    c->window()->connection()->userInfo()->userName(),
 	    c->window()->connection()->userInfo()->hostName(),
@@ -397,12 +397,12 @@ static bool avatar_kvs_cmd_notify(KviKvsModuleCommandCall * c)
 		KviIrcServerParser::encodeCtcpParameter(szTmp.toUtf8().data(), avatar);
 	}
 
-	KviSharedFile * o = 0;
+	KviSharedFile * o = nullptr;
 	if((!absPath.isEmpty()) && (!avatar.isEmpty()))
 	{
 		bool bTargetIsChan = (szTarget.contains('#') || szTarget.contains('&') || szTarget.contains('!') || szTarget.contains('+'));
 		if(bTargetIsChan)
-			o = g_pSharedFilesManager->lookupSharedFile(avatar, 0);
+			o = g_pSharedFilesManager->lookupSharedFile(avatar, nullptr);
 		else
 		{
 			KviIrcMask u(szTarget);
diff --git a/src/modules/chan/libkvichan.cpp b/src/modules/chan/libkvichan.cpp
index 119339c2d..e1c374f6d 100644
--- a/src/modules/chan/libkvichan.cpp
+++ b/src/modules/chan/libkvichan.cpp
@@ -54,7 +54,7 @@ static KviChannelWindow * chan_kvs_find_channel(KviKvsModuleFunctionCall * c, QS
 		{
 			if(!bNoWarnings)
 				c->warning(__tr2qs("Can't find the window with ID '%Q'"), &szChan);
-			return 0;
+			return nullptr;
 		}
 		if(w->type() == KviWindow::Channel)
 			return (KviChannelWindow *)w;
@@ -63,7 +63,7 @@ static KviChannelWindow * chan_kvs_find_channel(KviKvsModuleFunctionCall * c, QS
 		if(!bNoWarnings)
 			c->warning(__tr2qs("The specified window (%Q) is not a channel"), &szChan);
 	}
-	return 0;
+	return nullptr;
 }
 
 /*
@@ -1925,7 +1925,7 @@ static bool chan_kvs_fnc_common(KviKvsModuleFunctionCall * c)
 	KVSM_PARAMETER("context_id", KVS_PT_UINT, KVS_PF_OPTIONAL, iContextId)
 	KVSM_PARAMETERS_END(c)
 
-	KviConsoleWindow * pConsole = NULL;
+	KviConsoleWindow * pConsole = nullptr;
 	if(c->parameterCount() > 1)
 		pConsole = g_pApp->findConsole(iContextId);
 	else
diff --git a/src/modules/channelsjoin/ChannelsJoinDialog.cpp b/src/modules/channelsjoin/ChannelsJoinDialog.cpp
index 343c55c88..6055c8703 100644
--- a/src/modules/channelsjoin/ChannelsJoinDialog.cpp
+++ b/src/modules/channelsjoin/ChannelsJoinDialog.cpp
@@ -61,7 +61,7 @@ ChannelsJoinDialog::ChannelsJoinDialog(const char * name)
 	setWindowTitle(__tr2qs("Join Channels - KVIrc"));
 	setWindowIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Channel)));
 
-	m_pConsole = 0;
+	m_pConsole = nullptr;
 
 	QGridLayout * g = new QGridLayout(this);
 
@@ -152,7 +152,7 @@ ChannelsJoinDialog::~ChannelsJoinDialog()
 	KVI_OPTION_BOOL(KviOption_boolShowChannelsJoinOnIrc) = m_pShowAtStartupCheck->isChecked();
 
 	g_rectChannelsJoinGeometry = QRect(pos().x(), pos().y(), size().width(), size().height());
-	g_pChannelsWindow = 0;
+	g_pChannelsWindow = nullptr;
 }
 
 void ChannelsJoinDialog::setConsole(KviConsoleWindow * pConsole)
@@ -209,10 +209,10 @@ void ChannelsJoinDialog::fillListView()
 				hdr->setText(0, __tr2qs("Current Network"));
 				hdr->setExpanded(true);
 
-				for(QStringList::Iterator it = pList->begin(); it != pList->end(); ++it)
+				for(auto & it : *pList)
 				{
 					chld = new QTreeWidgetItem(hdr, RecentChannelItem);
-					chld->setText(0, *it);
+					chld->setText(0, it);
 					chld->setIcon(0, *(g_pIconManager->getSmallIcon(KviIconManager::Channel)));
 				}
 				hdr->sortChildren(0, Qt::AscendingOrder);
@@ -234,9 +234,8 @@ void ChannelsJoinDialog::fillListView()
 
 	for(QStringList * pChans = pDict->first(); pChans; pChans = pDict->next())
 	{
-		for(QStringList::Iterator it = pChans->begin(); it != pChans->end(); ++it)
+		for(auto chan : *pChans)
 		{
-			QString chan = *it;
 			if(hNoDuplicates.contains(chan.toLower()))
 				continue;
 			hNoDuplicates.insert(chan.toLower(), 1);
diff --git a/src/modules/channelsjoin/libkvichannelsjoin.cpp b/src/modules/channelsjoin/libkvichannelsjoin.cpp
index 2d1fca457..073c040fd 100644
--- a/src/modules/channelsjoin/libkvichannelsjoin.cpp
+++ b/src/modules/channelsjoin/libkvichannelsjoin.cpp
@@ -32,7 +32,7 @@
 
 #include <QSplitter>
 
-ChannelsJoinDialog * g_pChannelsWindow = 0;
+ChannelsJoinDialog * g_pChannelsWindow = nullptr;
 QRect g_rectChannelsJoinGeometry;
 
 /*
@@ -87,7 +87,7 @@ static bool channelsjoin_module_cleanup(KviModule * m)
 
 	if(g_pChannelsWindow)
 		delete g_pChannelsWindow;
-	g_pChannelsWindow = 0;
+	g_pChannelsWindow = nullptr;
 	return true;
 }
 
diff --git a/src/modules/classeditor/ClassEditorWindow.cpp b/src/modules/classeditor/ClassEditorWindow.cpp
index ec54bfe20..2dc0cc425 100644
--- a/src/modules/classeditor/ClassEditorWindow.cpp
+++ b/src/modules/classeditor/ClassEditorWindow.cpp
@@ -168,8 +168,8 @@ ClassEditorWidget::ClassEditorWidget(QWidget * pParent)
 {
 	m_pClasses = new KviPointerHashTable<QString, ClassEditorTreeWidgetItem>(100, false);
 	m_pClasses->setAutoDelete(false);
-	m_pLastEditedItem = 0;
-	m_pLastClickedItem = 0;
+	m_pLastEditedItem = nullptr;
+	m_pLastClickedItem = nullptr;
 	m_szDir = QDir::homePath();
 
 	QGridLayout * pLayout = new QGridLayout(this);
@@ -222,7 +222,7 @@ ClassEditorWidget::ClassEditorWidget(QWidget * pParent)
 
 	oneTimeSetup();
 	m_pTreeWidget->setSortingEnabled(true);
-	currentItemChanged(0, 0);
+	currentItemChanged(nullptr, nullptr);
 }
 
 ClassEditorWidget::~ClassEditorWidget()
@@ -313,7 +313,7 @@ ClassEditorTreeWidgetItem * ClassEditorWidget::createFullItem(const QString & sz
 
 	QStringList lNamespaces = szFullName.split("::");
 	if(lNamespaces.count() == 0)
-		return 0;
+		return nullptr;
 	if(lNamespaces.count() == 1)
 	{
 		ClassEditorTreeWidgetItem * pItem = findTopLevelItem(lNamespaces.at(0));
@@ -394,7 +394,7 @@ void ClassEditorWidget::oneTimeSetup()
 	while(KviKvsObjectClass * pClass = it.current())
 	{
 		if(pClass->isBuiltin())
-			m_pClasses->insert(it.currentKey(), 0);
+			m_pClasses->insert(it.currentKey(), nullptr);
 		else
 		{
 			QString szTmp;
@@ -860,7 +860,7 @@ void ClassEditorWidget::currentItemChanged(QTreeWidgetItem * pTree, QTreeWidgetI
 		KviPointerHashTable<QString, ClassEditorTreeWidgetItem> lFunctions;
 		lFunctions.setAutoDelete(false);
 
-		ClassEditorTreeWidgetItem * pItem = 0;
+		ClassEditorTreeWidgetItem * pItem = nullptr;
 		for(int i = 0; i < pTree->childCount(); i++)
 		{
 			pItem = ((ClassEditorTreeWidgetItem *)pTree->child(i));
@@ -1419,9 +1419,9 @@ bool ClassEditorWidget::removeItem(ClassEditorTreeWidgetItem * pItem, KviPointer
 	}
 
 	if(pItem == m_pLastEditedItem)
-		m_pLastEditedItem = 0;
+		m_pLastEditedItem = nullptr;
 	if(pItem == m_pLastClickedItem)
-		m_pLastClickedItem = 0;
+		m_pLastClickedItem = nullptr;
 	if(pItem->childCount())
 		removeItemChildren(pItem, lRemovedItems);
 	if(pItem->isClass())
@@ -1873,7 +1873,7 @@ void ClassEditorWidget::searchInheritedClasses(const QString szClass, KviPointer
 }
 
 ClassEditorWindow::ClassEditorWindow()
-    : KviWindow(KviWindow::ScriptEditor, "classeditor", 0)
+    : KviWindow(KviWindow::ScriptEditor, "classeditor", nullptr)
 {
 	g_pClassEditorWindow = this;
 
@@ -1906,7 +1906,7 @@ ClassEditorWindow::ClassEditorWindow()
 
 ClassEditorWindow::~ClassEditorWindow()
 {
-	g_pClassEditorWindow = 0;
+	g_pClassEditorWindow = nullptr;
 }
 
 void ClassEditorWindow::buildClicked()
@@ -2051,8 +2051,7 @@ KviClassEditorDialog::KviClassEditorDialog(QWidget * pParent, const QString & sz
 }
 
 KviClassEditorDialog::~KviClassEditorDialog()
-{
-}
+    = default;
 
 void KviClassEditorDialog::textChanged(const QString & szText)
 {
@@ -2153,8 +2152,7 @@ KviClassEditorFunctionDialog::KviClassEditorFunctionDialog(QWidget * pParent, co
 }
 
 KviClassEditorFunctionDialog::~KviClassEditorFunctionDialog()
-{
-}
+    = default;
 
 void KviClassEditorFunctionDialog::textChanged(const QString & szText)
 {
diff --git a/src/modules/classeditor/libkviclasseditor.cpp b/src/modules/classeditor/libkviclasseditor.cpp
index 20b628aa1..94457a28e 100644
--- a/src/modules/classeditor/libkviclasseditor.cpp
+++ b/src/modules/classeditor/libkviclasseditor.cpp
@@ -28,8 +28,8 @@
 #include "KviLocale.h"
 #include "KviMainWindow.h"
 
-ClassEditorWindow * g_pClassEditorWindow = 0;
-KviModule * g_pClassEditorModule = 0;
+ClassEditorWindow * g_pClassEditorWindow = nullptr;
+KviModule * g_pClassEditorModule = nullptr;
 
 /*
 	@doc: classeditor.open
@@ -60,21 +60,21 @@ static bool classeditor_kvs_cmd_open(KviKvsModuleCommandCall *)
 static bool classeditor_module_init(KviModule * m)
 {
 	KVSM_REGISTER_SIMPLE_COMMAND(m, "open", classeditor_kvs_cmd_open);
-	g_pClassEditorWindow = 0;
+	g_pClassEditorWindow = nullptr;
 	g_pClassEditorModule = m;
 	return true;
 }
 
 static bool classeditor_module_can_unload(KviModule *)
 {
-	return (g_pClassEditorWindow == 0);
+	return (g_pClassEditorWindow == nullptr);
 }
 
 static bool classeditor_module_cleanup(KviModule *)
 {
 	if(g_pClassEditorWindow && g_pMainWindow)
 		g_pMainWindow->closeWindow(g_pClassEditorWindow);
-	g_pClassEditorWindow = 0;
+	g_pClassEditorWindow = nullptr;
 	return true;
 }
 
diff --git a/src/modules/codetester/CodeTesterWindow.cpp b/src/modules/codetester/CodeTesterWindow.cpp
index 1a1d3d9dd..30018012c 100644
--- a/src/modules/codetester/CodeTesterWindow.cpp
+++ b/src/modules/codetester/CodeTesterWindow.cpp
@@ -80,7 +80,7 @@ void CodeTesterWidget::execute()
 }
 
 CodeTesterWindow::CodeTesterWindow()
-    : KviWindow(KviWindow::ScriptEditor, "codetester", 0)
+    : KviWindow(KviWindow::ScriptEditor, "codetester", nullptr)
 {
 	g_pCodeTesterWindowList->append(this);
 
diff --git a/src/modules/codetester/libkvicodetester.cpp b/src/modules/codetester/libkvicodetester.cpp
index 665e06119..bae8fbc3d 100644
--- a/src/modules/codetester/libkvicodetester.cpp
+++ b/src/modules/codetester/libkvicodetester.cpp
@@ -29,7 +29,7 @@
 #include "KviMainWindow.h"
 #include "KviPointerList.h"
 
-KviPointerList<CodeTesterWindow> * g_pCodeTesterWindowList = 0;
+KviPointerList<CodeTesterWindow> * g_pCodeTesterWindowList = nullptr;
 
 /*
 	@doc: codetester.open
diff --git a/src/modules/config/libkviconfig.cpp b/src/modules/config/libkviconfig.cpp
index f8dc47e80..3a355dc67 100644
--- a/src/modules/config/libkviconfig.cpp
+++ b/src/modules/config/libkviconfig.cpp
@@ -30,7 +30,7 @@
 #include "KviLocale.h"
 #include "KviPointerHashTable.h"
 
-static KviPointerHashTable<QString, KviConfigurationFile> * g_pConfigDict = 0;
+static KviPointerHashTable<QString, KviConfigurationFile> * g_pConfigDict = nullptr;
 static int g_iNextConfigId = 0;
 
 /*
@@ -901,7 +901,7 @@ static bool config_module_init(KviModule * m)
 static bool config_module_cleanup(KviModule *)
 {
 	delete g_pConfigDict;
-	g_pConfigDict = 0;
+	g_pConfigDict = nullptr;
 	return true;
 }
 
diff --git a/src/modules/context/libkvicontext.cpp b/src/modules/context/libkvicontext.cpp
index d8c1b87c6..ab6a874b1 100644
--- a/src/modules/context/libkvicontext.cpp
+++ b/src/modules/context/libkvicontext.cpp
@@ -671,7 +671,7 @@ static bool context_kvs_fnc_getSSLCertInfo(KviKvsModuleFunctionCall * c)
 	return true;
 #else
 
-	KviConsoleWindow * pConsole = NULL;
+	KviConsoleWindow * pConsole = nullptr;
 	if(c->parameterCount() > 2)
 		pConsole = g_pApp->findConsole(uContextId);
 	else
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;
 		}
 	}
diff --git a/src/modules/dialog/libkvidialog.cpp b/src/modules/dialog/libkvidialog.cpp
index 6b636528e..bd36697f6 100644
--- a/src/modules/dialog/libkvidialog.cpp
+++ b/src/modules/dialog/libkvidialog.cpp
@@ -59,7 +59,7 @@ KviKvsCallbackMessageBox::KviKvsCallbackMessageBox(
     const QString & szCode,
     KviKvsVariantList * pMagicParams,
     KviWindow * pWindow, bool modal)
-    : QMessageBox(0),
+    : QMessageBox(nullptr),
       KviKvsCallbackObject("dialog.message", pWindow, szCode, pMagicParams, 0)
 {
 	setObjectName("dialog_message");
@@ -561,8 +561,8 @@ KviKvsCallbackFileDialog::KviKvsCallbackFileDialog(
     : KviFileDialog(
           szInitialSelection,
           szFilter,
-          NULL, // parent
-          0,
+          nullptr, // parent
+          nullptr,
           modal),
       KviKvsCallbackObject("dialog.file", pWindow, szCode, pMagicParams, 0)
 {
@@ -592,9 +592,9 @@ void KviKvsCallbackFileDialog::done(int code)
 			KviKvsArray * a = new KviKvsArray();
 			QStringList sl = selectedFiles();
 			int idx = 0;
-			for(QStringList::Iterator it = sl.begin(); it != sl.end(); ++it)
+			for(auto & it : sl)
 			{
-				a->set(idx, new KviKvsVariant(*it));
+				a->set(idx, new KviKvsVariant(it));
 				idx++;
 			}
 			params.append(new KviKvsVariant(a));
@@ -704,7 +704,7 @@ KviKvsCallbackImageDialog::KviKvsCallbackImageDialog(
     const QString & szCode,
     KviKvsVariantList * pMagicParams,
     KviWindow * pWindow, bool modal)
-    : KviImageDialog(0, szCaption, iType, 0, szInitialSelection, iMaxSize, modal), KviKvsCallbackObject("dialog.image", pWindow, szCode, pMagicParams, 0)
+    : KviImageDialog(nullptr, szCaption, iType, 0, szInitialSelection, iMaxSize, modal), KviKvsCallbackObject("dialog.image", pWindow, szCode, pMagicParams, 0)
 {
 	g_pDialogModuleDialogList->append(this);
 	setObjectName("dialog_image");
@@ -956,7 +956,7 @@ static bool dialog_module_cleanup(KviModule *)
 	while(g_pDialogModuleDialogList->first())
 		delete g_pDialogModuleDialogList->first();
 	delete g_pDialogModuleDialogList;
-	g_pDialogModuleDialogList = 0;
+	g_pDialogModuleDialogList = nullptr;
 	return true;
 }
 
diff --git a/src/modules/editor/ScriptEditorImplementation.cpp b/src/modules/editor/ScriptEditorImplementation.cpp
index afc49e8d9..2a6d1cd73 100644
--- a/src/modules/editor/ScriptEditorImplementation.cpp
+++ b/src/modules/editor/ScriptEditorImplementation.cpp
@@ -95,7 +95,7 @@ static bool bCompleterReady = false;
 ScriptEditorWidget::ScriptEditorWidget(QWidget * pParent)
     : QTextEdit(pParent)
 {
-	m_pSyntaxHighlighter = 0;
+	m_pSyntaxHighlighter = nullptr;
 	setTabStopWidth(48);
 	setAcceptRichText(false);
 	setWordWrapMode(QTextOption::NoWrap);
@@ -103,7 +103,7 @@ ScriptEditorWidget::ScriptEditorWidget(QWidget * pParent)
 	m_szHelp = "Nothing";
 	updateOptions();
 	m_szFind = "";
-	m_pCompleter = 0;
+	m_pCompleter = nullptr;
 	QStringList szListFunctionsCommands;
 	QString tmp("kvscompleter.idx");
 	iModulesCount = 0;
@@ -146,7 +146,7 @@ void ScriptEditorWidget::checkReadyCompleter()
 	{
 		m_pStartTimer->stop();
 		delete m_pStartTimer;
-		m_pStartTimer = 0;
+		m_pStartTimer = nullptr;
 		loadCompleterFromFile();
 	}
 }
@@ -198,7 +198,7 @@ void ScriptEditorWidget::asyncCompleterCreation()
 	{
 		m_pStartTimer->stop();
 		m_pStartTimer->deleteLater();
-		m_pStartTimer = 0;
+		m_pStartTimer = nullptr;
 		QString szTmp("kvscompleter.idx");
 		QString szPath;
 		g_pApp->getLocalKvircDirectory(szPath, KviApplication::ConfigPlugins, szTmp);
@@ -304,7 +304,7 @@ void ScriptEditorWidget::disableSyntaxHighlighter()
 {
 	if(m_pSyntaxHighlighter)
 		delete m_pSyntaxHighlighter;
-	m_pSyntaxHighlighter = 0;
+	m_pSyntaxHighlighter = nullptr;
 }
 
 void ScriptEditorWidget::updateOptions()
@@ -635,8 +635,7 @@ ScriptEditorSyntaxHighlighter::ScriptEditorSyntaxHighlighter(ScriptEditorWidget
 }
 
 ScriptEditorSyntaxHighlighter::~ScriptEditorSyntaxHighlighter()
-{
-}
+    = default;
 
 void ScriptEditorSyntaxHighlighter::updateSyntaxtTextFormat()
 {
@@ -801,7 +800,7 @@ void ScriptEditorSyntaxHighlighter::highlightBlock(const QString & szText)
 ScriptEditorImplementation::ScriptEditorImplementation(QWidget * par)
     : KviScriptEditor(par)
 {
-	m_pOptionsDialog = 0;
+	m_pOptionsDialog = nullptr;
 	if(g_pScriptEditorWindowList->isEmpty())
 		loadOptions();
 	g_pScriptEditorWindowList->append(this);
@@ -863,7 +862,7 @@ ScriptEditorImplementation::~ScriptEditorImplementation()
 	if(m_pOptionsDialog)
 	{
 		m_pOptionsDialog->deleteLater();
-		m_pOptionsDialog = 0;
+		m_pOptionsDialog = nullptr;
 	}
 	g_pScriptEditorWindowList->removeRef(this);
 	if(g_pScriptEditorWindowList->isEmpty())
@@ -1143,8 +1142,7 @@ ScriptEditorReplaceDialog::ScriptEditorReplaceDialog(QWidget * pParent, const QS
 }
 
 ScriptEditorReplaceDialog::~ScriptEditorReplaceDialog()
-{
-}
+    = default;
 
 void ScriptEditorReplaceDialog::textChanged(const QString & szText)
 {
diff --git a/src/modules/editor/libkvieditor.cpp b/src/modules/editor/libkvieditor.cpp
index 1a71de977..72fbf9403 100644
--- a/src/modules/editor/libkvieditor.cpp
+++ b/src/modules/editor/libkvieditor.cpp
@@ -27,9 +27,9 @@
 #include "KviModule.h"
 #include "KviWindow.h"
 
-KviModule * g_pEditorModulePointer = 0;
+KviModule * g_pEditorModulePointer = nullptr;
 
-KviPointerList<ScriptEditorImplementation> * g_pScriptEditorWindowList = 0;
+KviPointerList<ScriptEditorImplementation> * g_pScriptEditorWindowList = nullptr;
 
 static bool editor_module_init(KviModule * m)
 {
@@ -69,14 +69,14 @@ static bool editor_module_cleanup(KviModule *)
 	}
 
 	delete g_pScriptEditorWindowList;
-	g_pScriptEditorWindowList = 0;
+	g_pScriptEditorWindowList = nullptr;
 
 	return true;
 }
 
 static bool editor_module_can_unload(KviModule *)
 {
-	return ((g_pScriptEditorWindowList == 0) || (g_pScriptEditorWindowList->count() == 0));
+	return ((g_pScriptEditorWindowList == nullptr) || (g_pScriptEditorWindowList->count() == 0));
 }
 
 KVIRC_MODULE(
diff --git a/src/modules/eventeditor/EventEditorWindow.cpp b/src/modules/eventeditor/EventEditorWindow.cpp
index 8136f69d9..1012de596 100644
--- a/src/modules/eventeditor/EventEditorWindow.cpp
+++ b/src/modules/eventeditor/EventEditorWindow.cpp
@@ -116,7 +116,7 @@ EventEditor::EventEditor(QWidget * par)
 	m_pEditor = KviScriptEditor::createInstance(box);
 	m_pEditor->setFocus();
 	m_bOneTimeSetupDone = false;
-	m_pLastEditedItem = 0;
+	m_pLastEditedItem = nullptr;
 }
 
 EventEditor::~EventEditor()
@@ -280,7 +280,7 @@ void EventEditor::addHandlerForCurrentEvent()
 	{
 		QTreeWidgetItem * it = m_pTreeWidget->selectedItems().first();
 
-		if(it->parent() == 0)
+		if(it->parent() == nullptr)
 		{
 			if(it->childCount() == 0)
 				it->setIcon(0, QIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Event))));
@@ -301,7 +301,7 @@ void EventEditor::removeCurrentHandler()
 	{
 		QTreeWidgetItem * it = m_pLastEditedItem;
 		QTreeWidgetItem * parent = m_pLastEditedItem->parent();
-		m_pLastEditedItem = 0;
+		m_pLastEditedItem = nullptr;
 		delete it;
 
 		if(parent)
@@ -322,7 +322,7 @@ void EventEditor::toggleCurrentHandlerEnabled()
 	{
 		m_pLastEditedItem->setEnabled(!(m_pLastEditedItem->m_bEnabled));
 		m_pTreeWidget->repaint(m_pTreeWidget->visualItemRect(m_pLastEditedItem));
-		currentItemChanged(m_pLastEditedItem, 0);
+		currentItemChanged(m_pLastEditedItem, nullptr);
 	}
 }
 
@@ -407,7 +407,7 @@ void EventEditor::currentItemChanged(QTreeWidgetItem * it, QTreeWidgetItem *)
 	}
 	else
 	{
-		m_pLastEditedItem = 0;
+		m_pLastEditedItem = nullptr;
 		m_pNameEditor->setEnabled(false);
 		m_pNameEditor->setText("");
 		m_pEditor->setEnabled(false);
@@ -525,7 +525,7 @@ void EventEditor::exportAllEvents()
 }
 
 EventEditorWindow::EventEditorWindow()
-    : KviWindow(KviWindow::ScriptEditor, "eventeditor", 0)
+    : KviWindow(KviWindow::ScriptEditor, "eventeditor", nullptr)
 {
 	g_pEventEditorWindow = this;
 
@@ -555,7 +555,7 @@ EventEditorWindow::EventEditorWindow()
 
 EventEditorWindow::~EventEditorWindow()
 {
-	g_pEventEditorWindow = 0;
+	g_pEventEditorWindow = nullptr;
 }
 
 void EventEditorWindow::okClicked()
diff --git a/src/modules/eventeditor/libkvieventeditor.cpp b/src/modules/eventeditor/libkvieventeditor.cpp
index a2ce4d8fa..04c4b1600 100644
--- a/src/modules/eventeditor/libkvieventeditor.cpp
+++ b/src/modules/eventeditor/libkvieventeditor.cpp
@@ -28,7 +28,7 @@
 #include "KviLocale.h"
 #include "KviMainWindow.h"
 
-EventEditorWindow * g_pEventEditorWindow = 0;
+EventEditorWindow * g_pEventEditorWindow = nullptr;
 
 /*
 	@doc: eventeditor.open
@@ -61,20 +61,20 @@ static bool eventeditor_module_init(KviModule * m)
 
 	KVSM_REGISTER_SIMPLE_COMMAND(m, "open", eventeditor_kvs_cmd_open);
 
-	g_pEventEditorWindow = 0;
+	g_pEventEditorWindow = nullptr;
 	return true;
 }
 
 static bool eventeditor_module_can_unload(KviModule *)
 {
-	return (g_pEventEditorWindow == 0);
+	return (g_pEventEditorWindow == nullptr);
 }
 
 static bool eventeditor_module_cleanup(KviModule *)
 {
 	if(g_pEventEditorWindow && g_pMainWindow)
 		g_pMainWindow->closeWindow(g_pEventEditorWindow);
-	g_pEventEditorWindow = 0;
+	g_pEventEditorWindow = nullptr;
 	return true;
 }
 
diff --git a/src/modules/file/libkvifile.cpp b/src/modules/file/libkvifile.cpp
index 9e25b7740..51e566502 100644
--- a/src/modules/file/libkvifile.cpp
+++ b/src/modules/file/libkvifile.cpp
@@ -271,7 +271,7 @@ static bool file_kvs_cmd_write(KviKvsModuleCommandCall * c)
 static bool file_kvs_cmd_writeBytes(KviKvsModuleCommandCall * c)
 {
 	QString szFileName;
-	KviKvsArray * pArray = NULL;
+	KviKvsArray * pArray = nullptr;
 
 	KVSM_PARAMETERS_BEGIN(c)
 	KVSM_PARAMETER("filename", KVS_PT_NONEMPTYSTRING, 0, szFileName)
@@ -759,7 +759,7 @@ static bool file_kvs_fnc_ls(KviKvsModuleFunctionCall * c)
 		return true;
 	}
 
-	QFlags<QDir::Filter> iFlags = 0;
+	QFlags<QDir::Filter> iFlags = nullptr;
 	if(szFlags.isEmpty())
 		iFlags = QDir::Dirs | QDir::Files | QDir::NoSymLinks | QDir::Readable | QDir::Writable | QDir::Executable | QDir::Hidden | QDir::System;
 	else
@@ -782,7 +782,7 @@ static bool file_kvs_fnc_ls(KviKvsModuleFunctionCall * c)
 			iFlags |= QDir::System;
 	}
 
-	QFlags<QDir::SortFlag> iSort = 0;
+	QFlags<QDir::SortFlag> iSort = nullptr;
 	if(szFlags.isEmpty())
 		iSort = QDir::Unsorted;
 	else
@@ -1573,7 +1573,7 @@ static bool file_kvs_fnc_digest(KviKvsModuleFunctionCall * c)
 	}
 
 	EVP_MD_CTX_init(&mdctx);
-	EVP_DigestInit_ex(&mdctx, pMD, NULL);
+	EVP_DigestInit_ex(&mdctx, pMD, nullptr);
 	EVP_DigestUpdate(&mdctx, content.constData(), content.size());
 	EVP_DigestFinal_ex(&mdctx, ucMDValue, &uMDLen);
 	EVP_MD_CTX_cleanup(&mdctx);
diff --git a/src/modules/filetransferwindow/FileTransferWindow.cpp b/src/modules/filetransferwindow/FileTransferWindow.cpp
index 5eb2ba172..9d3a7adab 100644
--- a/src/modules/filetransferwindow/FileTransferWindow.cpp
+++ b/src/modules/filetransferwindow/FileTransferWindow.cpp
@@ -86,7 +86,7 @@ FileTransferItem::FileTransferItem(FileTransferWidget * v, KviFileTransfer * t)
 
 FileTransferItem::~FileTransferItem()
 {
-	m_pTransfer->setDisplayItem(0);
+	m_pTransfer->setDisplayItem(nullptr);
 	delete col1Item;
 	delete col2Item;
 }
@@ -94,7 +94,7 @@ FileTransferItem::~FileTransferItem()
 void FileTransferItem::displayUpdate()
 {
 	//FIXME this hurts
-	int dummy = (int)time(NULL);
+	int dummy = (int)time(nullptr);
 	tableWidget()->model()->setData(tableWidget()->model()->index(row(), 0), dummy, Qt::DisplayRole);
 	tableWidget()->model()->setData(tableWidget()->model()->index(row(), 1), dummy, Qt::DisplayRole);
 	tableWidget()->model()->setData(tableWidget()->model()->index(row(), 2), dummy, Qt::DisplayRole);
@@ -254,7 +254,7 @@ FileTransferWindow::FileTransferWindow(
 	KviModuleExtensionDescriptor * d
 #endif
     )
-    : KviWindow(KviWindow::Tool, "file transfer window", 0)
+    : KviWindow(KviWindow::Tool, "file transfer window", nullptr)
 #if 0
 	, KviModuleExtension(d)
 #endif
@@ -262,9 +262,9 @@ FileTransferWindow::FileTransferWindow(
 	g_pFileTransferWindow = this;
 	setAutoFillBackground(false);
 
-	m_pContextPopup = 0;
-	m_pLocalFilePopup = 0;
-	m_pOpenFilePopup = 0;
+	m_pContextPopup = nullptr;
+	m_pLocalFilePopup = nullptr;
+	m_pOpenFilePopup = nullptr;
 
 	m_pTimer = new QTimer(this);
 	connect(m_pTimer, SIGNAL(timeout()), this, SLOT(heartbeat()));
@@ -311,8 +311,8 @@ FileTransferWindow::FileTransferWindow(
 
 FileTransferWindow::~FileTransferWindow()
 {
-	KviFileTransferManager::instance()->setTransferWindow(0);
-	g_pFileTransferWindow = 0;
+	KviFileTransferManager::instance()->setTransferWindow(nullptr);
+	g_pFileTransferWindow = nullptr;
 }
 
 bool FileTransferWindow::eventFilter(QObject * obj, QEvent * ev)
@@ -375,7 +375,7 @@ FileTransferItem * FileTransferWindow::findItem(KviFileTransfer * t)
 		if(it->transfer() == t)
 			return it;
 	}
-	return 0;
+	return nullptr;
 }
 
 void FileTransferWindow::transferRegistered(KviFileTransfer * t)
@@ -391,7 +391,7 @@ void FileTransferWindow::transferUnregistering(KviFileTransfer * t)
 	if(it)
 	{
 		delete it;
-		it = 0;
+		it = nullptr;
 	}
 }
 
@@ -545,10 +545,10 @@ void FileTransferWindow::rightButtonPressed(FileTransferItem * it, const QPoint
 KviFileTransfer * FileTransferWindow::selectedTransfer()
 {
 	if(m_pTableWidget->selectedItems().count() == 0)
-		return 0;
+		return nullptr;
 	FileTransferItem * it = (FileTransferItem *)m_pTableWidget->selectedItems().first();
 	if(!it)
-		return 0;
+		return nullptr;
 	FileTransferItem * i = (FileTransferItem *)it;
 	return i->transfer();
 }
@@ -781,7 +781,7 @@ void FileTransferWindow::heartbeat()
 	int i;
 	QModelIndex index;
 	FileTransferItem * it;
-	int dummy = (int)time(NULL);
+	int dummy = (int)time(nullptr);
 
 	for(i = 0; i <= m_pTableWidget->rowCount(); i++)
 	{
diff --git a/src/modules/filetransferwindow/libkvifiletransferwindow.cpp b/src/modules/filetransferwindow/libkvifiletransferwindow.cpp
index c7b332d1c..0c1a2db3a 100644
--- a/src/modules/filetransferwindow/libkvifiletransferwindow.cpp
+++ b/src/modules/filetransferwindow/libkvifiletransferwindow.cpp
@@ -32,7 +32,7 @@
 
 #include <QSplitter>
 
-FileTransferWindow * g_pFileTransferWindow = NULL;
+FileTransferWindow * g_pFileTransferWindow = nullptr;
 
 static FileTransferWindow * filetransferwindow_alloc(bool bCreateMinimized, bool bNoRaise)
 {
@@ -115,7 +115,7 @@ static bool filetransferwindow_module_cleanup(KviModule *)
 {
 	if(g_pFileTransferWindow && g_pMainWindow)
 		g_pMainWindow->closeWindow(g_pFileTransferWindow);
-	g_pFileTransferWindow = 0;
+	g_pFileTransferWindow = nullptr;
 	return true;
 }
 
diff --git a/src/modules/fish/libkvifish.cpp b/src/modules/fish/libkvifish.cpp
index 9abcd9597..113d7fff9 100644
--- a/src/modules/fish/libkvifish.cpp
+++ b/src/modules/fish/libkvifish.cpp
@@ -63,7 +63,7 @@ extern KVIRC_API KviCryptEngineManager * g_pCryptEngineManager;
 #include <openssl/ssl.h>
 #include <openssl/sha.h>
 
-DH * g_fish_dh = 0;
+DH * g_fish_dh = nullptr;
 
 // ### new sophie-germain 1080bit prime number ###
 // const char *g_fish_prime1080_bin="++ECLiPSE+is+proud+to+present+latest+FiSH+release+featuring+even+more+security+for+you+++shouts+go+out+to+TMG+for+helping+to+generate+this+cool+sophie+germain+prime+number++++/C32L";
@@ -134,7 +134,7 @@ bool fish_event_onQueryNotice(KviKvsModuleEventCall * c)
 	if(!szMessage.startsWith("DH1080_", Qt::CaseSensitive))
 		return true;
 
-	unsigned char * szMyPubKey = 0;
+	unsigned char * szMyPubKey = nullptr;
 	QByteArray szHisPubKey, szTmp;
 	int iMyPubKeyLen, *pMyPubKeyLen = &iMyPubKeyLen;
 	if(!fish_DH1080_gen(&szMyPubKey, pMyPubKeyLen))
@@ -212,7 +212,7 @@ bool fish_event_onQueryNotice(KviKvsModuleEventCall * c)
 #if defined(COMPILE_SSL_SUPPORT)
 	unsigned char * secret = (unsigned char *)KviMemory::allocate(DH_size(g_fish_dh));
 	int secretLen;
-	BIGNUM * bn = BN_bin2bn((unsigned char *)szHisPubKey.data(), szHisPubKey.size(), NULL);
+	BIGNUM * bn = BN_bin2bn((unsigned char *)szHisPubKey.data(), szHisPubKey.size(), nullptr);
 	if(-1 == (secretLen = DH_compute_key(secret, bn, g_fish_dh)))
 	{
 		c->warning(__tr2qs("FiSH: error verifying peer public key (size=%1)").arg(szHisPubKey.size()));
@@ -274,7 +274,7 @@ static bool fish_cmd_keyx(KviKvsModuleCommandCall * c)
 	KVSM_PARAMETER("target", KVS_PT_NONEMPTYSTRING, 0, szTarget)
 	KVSM_PARAMETERS_END(c)
 
-	unsigned char * szMyPubKey = 0;
+	unsigned char * szMyPubKey = nullptr;
 	KviCString szHisPubKey, szTmp;
 	int iMyPubKeyLen, *pMyPubKeyLen = &iMyPubKeyLen;
 	if(!fish_DH1080_gen(&szMyPubKey, pMyPubKeyLen))
diff --git a/src/modules/help/HelpIndex.cpp b/src/modules/help/HelpIndex.cpp
index 3fba3c74d..2504d1dc8 100644
--- a/src/modules/help/HelpIndex.cpp
+++ b/src/modules/help/HelpIndex.cpp
@@ -77,7 +77,7 @@ QDataStream & operator<<(QDataStream & s, const Document & l)
 }
 
 HelpIndex::HelpIndex(const QString & dp, const QString & hp)
-    : QObject(0), docPath(dp)
+    : QObject(nullptr), docPath(dp)
 {
 	Q_UNUSED(hp);
 
@@ -93,7 +93,7 @@ HelpIndex::HelpIndex(const QString & dp, const QString & hp)
 }
 
 HelpIndex::HelpIndex(const QStringList & dl, const QString & hp)
-    : QObject(0)
+    : QObject(nullptr)
 {
 	Q_UNUSED(hp);
 	docList = dl;
@@ -172,7 +172,7 @@ void HelpIndex::insertInDict(const QString & str, int docNum)
 {
 	if(str == QLatin1String("amp") || str == QLatin1String("nbsp"))
 		return;
-	Entry * e = 0;
+	Entry * e = nullptr;
 	if(dict.count())
 		e = dict[str];
 
@@ -349,18 +349,18 @@ void HelpIndex::readDocumentList()
 QStringList HelpIndex::query(const QStringList & terms, const QStringList & termSeq, const QStringList & seqWords)
 {
 	QList<Term> termList;
-	for(QStringList::ConstIterator it = terms.begin(); it != terms.end(); ++it)
+	for(const auto & term : terms)
 	{
-		Entry * e = 0;
-		if((*it).contains(QLatin1Char('*')))
+		Entry * e = nullptr;
+		if(term.contains(QLatin1Char('*')))
 		{
-			QVector<Document> wcts = setupDummyTerm(getWildcardTerms(*it));
+			QVector<Document> wcts = setupDummyTerm(getWildcardTerms(term));
 			termList.append(Term(QLatin1String("dummy"), wcts.count(), wcts));
 		}
-		else if(dict[*it])
+		else if(dict[term])
 		{
-			e = dict[*it];
-			termList.append(Term(*it, e->documents.count(), e->documents));
+			e = dict[term];
+			termList.append(Term(term, e->documents.count(), e->documents));
 		}
 		else
 		{
@@ -372,9 +372,9 @@ QStringList HelpIndex::query(const QStringList & terms, const QStringList & term
 	qSort(termList);
 
 	QVector<Document> minDocs = termList.takeFirst().documents;
-	for(QList<Term>::Iterator it = termList.begin(); it != termList.end(); ++it)
+	for(auto & it : termList)
 	{
-		Term * t = &(*it);
+		Term * t = &it;
 		QVector<Document> docs = t->documents;
 		for(QVector<Document>::Iterator minDoc_it = minDocs.begin(); minDoc_it != minDocs.end();)
 		{
@@ -399,15 +399,15 @@ QStringList HelpIndex::query(const QStringList & terms, const QStringList & term
 	qSort(minDocs);
 	if(termSeq.isEmpty())
 	{
-		for(QVector<Document>::Iterator it = minDocs.begin(); it != minDocs.end(); ++it)
-			results << docList.at((int)(*it).docNumber);
+		for(auto & minDoc : minDocs)
+			results << docList.at((int)minDoc.docNumber);
 		return results;
 	}
 
 	QString fileName;
-	for(QVector<Document>::Iterator it = minDocs.begin(); it != minDocs.end(); ++it)
+	for(auto & minDoc : minDocs)
 	{
-		fileName = docList[(int)(*it).docNumber];
+		fileName = docList[(int)minDoc.docNumber];
 		if(searchForPattern(termSeq, seqWords, fileName))
 			results << fileName;
 	}
@@ -531,13 +531,13 @@ QStringList HelpIndex::split(const QString & str)
 QVector<Document> HelpIndex::setupDummyTerm(const QStringList & terms)
 {
 	QList<Term> termList;
-	for(QStringList::ConstIterator it = terms.begin(); it != terms.end(); ++it)
+	for(const auto & term : terms)
 	{
-		Entry * e = 0;
-		if(dict[*it])
+		Entry * e = nullptr;
+		if(dict[term])
 		{
-			e = dict[*it];
-			termList.append(Term(*it, e->documents.count(), e->documents));
+			e = dict[term];
+			termList.append(Term(term, e->documents.count(), e->documents));
 		}
 	}
 	QVector<Document> maxList(0);
@@ -546,14 +546,14 @@ QVector<Document> HelpIndex::setupDummyTerm(const QStringList & terms)
 	qSort(termList);
 
 	maxList = termList.takeLast().documents;
-	for(QList<Term>::Iterator it = termList.begin(); it != termList.end(); ++it)
+	for(auto & it : termList)
 	{
-		Term * t = &(*it);
+		Term * t = &it;
 		QVector<Document> docs = t->documents;
-		for(QVector<Document>::iterator docIt = docs.begin(); docIt != docs.end(); ++docIt)
+		for(auto & doc : docs)
 		{
-			if(maxList.indexOf(*docIt) == -1)
-				maxList.append(*docIt);
+			if(maxList.indexOf(doc) == -1)
+				maxList.append(doc);
 		}
 	}
 	return maxList;
diff --git a/src/modules/help/HelpWidget.cpp b/src/modules/help/HelpWidget.cpp
index bdf6ec329..d8e3dbd33 100644
--- a/src/modules/help/HelpWidget.cpp
+++ b/src/modules/help/HelpWidget.cpp
@@ -59,8 +59,8 @@ HelpWidget::HelpWidget(QWidget * par, bool bIsStandalone)
 		g_pHelpWidgetList->append(this);
 	m_bIsStandalone = bIsStandalone;
 
-	new QShortcut(QKeySequence::Copy, this, SLOT(slotCopy()), 0, Qt::WidgetWithChildrenShortcut);
-	new QShortcut(QKeySequence::Find, this, SLOT(slotShowHideFind()), 0, bIsStandalone ? Qt::WidgetWithChildrenShortcut : Qt::WindowShortcut);
+	new QShortcut(QKeySequence::Copy, this, SLOT(slotCopy()), nullptr, Qt::WidgetWithChildrenShortcut);
+	new QShortcut(QKeySequence::Find, this, SLOT(slotShowHideFind()), nullptr, bIsStandalone ? Qt::WidgetWithChildrenShortcut : Qt::WindowShortcut);
 
 	// layout
 	m_pLayout = new QVBoxLayout(this);
diff --git a/src/modules/help/HelpWindow.cpp b/src/modules/help/HelpWindow.cpp
index 541ca1ca8..0f1803eca 100644
--- a/src/modules/help/HelpWindow.cpp
+++ b/src/modules/help/HelpWindow.cpp
@@ -249,9 +249,9 @@ void HelpWindow::startSearch()
 	m_terms.clear();
 	bool isPhrase = false;
 	QString s = "";
-	for(int i = 0; i < (int)buf.length(); ++i)
+	for(const auto & i : buf)
 	{
-		if(buf[i] == '\"')
+		if(i == '\"')
 		{
 			isPhrase = !isPhrase;
 			s = s.simplified();
@@ -259,7 +259,7 @@ void HelpWindow::startSearch()
 				m_terms << s;
 			s = "";
 		}
-		else if(buf[i] == ' ' && !isPhrase)
+		else if(i == ' ' && !isPhrase)
 		{
 			s = s.simplified();
 			if(!s.isEmpty())
@@ -267,7 +267,7 @@ void HelpWindow::startSearch()
 			s = "";
 		}
 		else
-			s += buf[i];
+			s += i;
 	}
 	if(!s.isEmpty())
 		m_terms << s;
diff --git a/src/modules/help/libkvihelp.cpp b/src/modules/help/libkvihelp.cpp
index c5dde5b99..d526c77a5 100644
--- a/src/modules/help/libkvihelp.cpp
+++ b/src/modules/help/libkvihelp.cpp
@@ -36,9 +36,9 @@
 #include <QFileInfo>
 #include <QSplitter>
 
-HelpIndex * g_pDocIndex = 0;
-KviPointerList<HelpWidget> * g_pHelpWidgetList = 0;
-KviPointerList<HelpWindow> * g_pHelpWindowList = 0;
+HelpIndex * g_pDocIndex = nullptr;
+KviPointerList<HelpWidget> * g_pHelpWidgetList = nullptr;
+KviPointerList<HelpWindow> * g_pHelpWindowList = nullptr;
 
 /*
 	@doc: help.open
@@ -246,11 +246,11 @@ static bool help_module_cleanup(KviModule *)
 	while(g_pHelpWidgetList->first())
 		delete g_pHelpWidgetList->first();
 	delete g_pHelpWidgetList;
-	g_pHelpWidgetList = 0;
+	g_pHelpWidgetList = nullptr;
 	while(g_pHelpWindowList->first())
 		g_pHelpWindowList->first()->close();
 	delete g_pHelpWindowList;
-	g_pHelpWindowList = 0;
+	g_pHelpWindowList = nullptr;
 	return true;
 }
 
diff --git a/src/modules/http/HttpFileTransfer.cpp b/src/modules/http/HttpFileTransfer.cpp
index 2719bc611..33ccd583e 100644
--- a/src/modules/http/HttpFileTransfer.cpp
+++ b/src/modules/http/HttpFileTransfer.cpp
@@ -37,8 +37,8 @@
 #include <QPainter>
 #include <QMenu>
 
-static KviPointerList<HttpFileTransfer> * g_pHttpFileTransfers = 0;
-static QPixmap * g_pHttpIcon = 0;
+static KviPointerList<HttpFileTransfer> * g_pHttpFileTransfers = nullptr;
+static QPixmap * g_pHttpIcon = nullptr;
 
 HttpFileTransfer::HttpFileTransfer()
     : KviFileTransfer()
@@ -52,7 +52,7 @@ HttpFileTransfer::HttpFileTransfer()
 
 	m_bNotifyCompletion = true;
 	m_bAutoClean = false;
-	m_pAutoCleanTimer = 0;
+	m_pAutoCleanTimer = nullptr;
 	m_bNoOutput = false;
 
 	m_pHttpRequest = new KviHttpRequest();
@@ -359,7 +359,7 @@ void HttpFileTransfer::init()
 	if(pix)
 		g_pHttpIcon = new QPixmap(*pix);
 	else
-		g_pHttpIcon = 0;
+		g_pHttpIcon = nullptr;
 }
 
 void HttpFileTransfer::done()
@@ -369,11 +369,11 @@ void HttpFileTransfer::done()
 	while(HttpFileTransfer * t = g_pHttpFileTransfers->first())
 		delete t;
 	delete g_pHttpFileTransfers;
-	g_pHttpFileTransfers = 0;
+	g_pHttpFileTransfers = nullptr;
 	if(g_pHttpIcon)
 	{
 		delete g_pHttpIcon;
-		g_pHttpIcon = 0;
+		g_pHttpIcon = nullptr;
 	}
 }
 
@@ -396,10 +396,10 @@ void HttpFileTransfer::requestSent(const QStringList & requestHeaders)
 	if(!m_bNoOutput)
 		out->output(KVI_OUT_GENERICSTATUS, __tr2qs_ctx("[HTTP %d]: Request data sent:", "http"), id());
 
-	for(QStringList::ConstIterator it = requestHeaders.begin(); it != requestHeaders.end(); ++it)
+	for(const auto & requestHeader : requestHeaders)
 	{
 		if(!m_bNoOutput)
-			out->output(KVI_OUT_GENERICSTATUS, "[HTTP %d]:   %s", id(), (*it).toUtf8().data());
+			out->output(KVI_OUT_GENERICSTATUS, "[HTTP %d]:   %s", id(), requestHeader.toUtf8().data());
 	}
 
 	m_lRequest = requestHeaders;
diff --git a/src/modules/ident/libkviident.cpp b/src/modules/ident/libkviident.cpp
index 8ec10f718..dcfe35ebf 100644
--- a/src/modules/ident/libkviident.cpp
+++ b/src/modules/ident/libkviident.cpp
@@ -39,8 +39,8 @@
 
 // FIXME: Should have a timeout on the requests!!!
 
-static KviIdentDaemon * g_pIdentDaemon = 0;
-static KviIdentSentinel * g_pIdentSentinel = 0;
+static KviIdentDaemon * g_pIdentDaemon = nullptr;
+static KviIdentSentinel * g_pIdentSentinel = nullptr;
 
 extern KVIRC_API int g_iIdentDaemonRunningUsers;
 
@@ -67,12 +67,12 @@ void stopIdentService()
 	//	qDebug("Stopping");
 	if(g_pIdentDaemon)
 		delete g_pIdentDaemon;
-	g_pIdentDaemon = 0;
+	g_pIdentDaemon = nullptr;
 	//	qDebug("Stopped");
 }
 
 KviIdentSentinel::KviIdentSentinel()
-    : QObject(0)
+    : QObject(nullptr)
 {
 }
 
@@ -144,7 +144,7 @@ KviIdentRequest::KviIdentRequest(kvi_socket_t sock, const char * host, kvi_u32_t
 	m_sock = sock;
 	m_szHost = host;
 	m_uPort = uPort;
-	m_tStart = time(0);
+	m_tStart = time(nullptr);
 }
 
 KviIdentRequest::~KviIdentRequest()
@@ -175,7 +175,7 @@ KviIdentDaemon::~KviIdentDaemon()
 	terminate();
 	g_iIdentDaemonRunningUsers = 0;
 
-	g_pIdentDaemon = 0;
+	g_pIdentDaemon = nullptr;
 	//	qDebug("Destructor gone");
 }
 
@@ -230,31 +230,31 @@ void KviIdentDaemon::run()
 
 	if(m_sock == KVI_INVALID_SOCKET)
 	{
-		postMessage(__tr("Can't start the Ident service : socket() failed"), 0);
+		postMessage(__tr("Can't start the Ident service : socket() failed"), nullptr);
 		goto exit_thread;
 	}
 
 	if(!kvi_socket_setNonBlocking(m_sock))
 	{
-		postMessage(__tr("Can't start the Ident service : async setting failed"), 0);
+		postMessage(__tr("Can't start the Ident service : async setting failed"), nullptr);
 		goto exit_thread;
 	}
 
 	if(!sa.socketAddress())
 	{
-		postMessage(__tr("Can't enable the Ident service : can't setup the listen address"), 0);
+		postMessage(__tr("Can't enable the Ident service : can't setup the listen address"), nullptr);
 		goto exit_thread;
 	}
 
 	if(!kvi_socket_bind(m_sock, sa.socketAddress(), ((int)(sa.addressLength()))))
 	{
-		postMessage(__tr("Can't start the Ident service : bind() failed"), 0);
+		postMessage(__tr("Can't start the Ident service : bind() failed"), nullptr);
 		goto exit_thread;
 	}
 
 	if(!kvi_socket_listen(m_sock, 128))
 	{
-		postMessage(__tr("Can't start the Ident service : listen() failed"), 0);
+		postMessage(__tr("Can't start the Ident service : listen() failed"), nullptr);
 		goto exit_thread;
 	}
 
@@ -267,13 +267,13 @@ void KviIdentDaemon::run()
 
 		if(m_sock6 == KVI_INVALID_SOCKET)
 		{
-			postMessage(__tr("Can't start the Ident service on IPv6 : socket() failed"), 0);
+			postMessage(__tr("Can't start the Ident service on IPv6 : socket() failed"), nullptr);
 			goto ipv6_failure;
 		}
 
 		if(!kvi_socket_setNonBlocking(m_sock6))
 		{
-			postMessage(__tr("Can't start the Ident service on IPv6 : async setting failed"), 0);
+			postMessage(__tr("Can't start the Ident service on IPv6 : async setting failed"), nullptr);
 			kvi_socket_close(m_sock6);
 			m_sock6 = KVI_INVALID_SOCKET;
 			goto ipv6_failure;
@@ -294,7 +294,7 @@ void KviIdentDaemon::run()
 #endif
 		if(!sa6.socketAddress())
 		{
-			postMessage(__tr("Can't enable the Ident service on IPv6 : can't setup the listen address"), 0);
+			postMessage(__tr("Can't enable the Ident service on IPv6 : can't setup the listen address"), nullptr);
 			kvi_socket_close(m_sock6);
 			m_sock6 = KVI_INVALID_SOCKET;
 			goto ipv6_failure;
@@ -302,7 +302,7 @@ void KviIdentDaemon::run()
 
 		if(!kvi_socket_bind(m_sock6, sa6.socketAddress(), ((int)(sa6.addressLength()))))
 		{
-			postMessage(__tr("Can't start the Ident service on IPv6 : bind() failed"), 0);
+			postMessage(__tr("Can't start the Ident service on IPv6 : bind() failed"), nullptr);
 			kvi_socket_close(m_sock6);
 			m_sock6 = KVI_INVALID_SOCKET;
 			goto ipv6_failure;
@@ -310,7 +310,7 @@ void KviIdentDaemon::run()
 
 		if(!kvi_socket_listen(m_sock6, 128))
 		{
-			postMessage(__tr("Can't start the Ident service on IPv6 : listen() failed"), 0);
+			postMessage(__tr("Can't start the Ident service on IPv6 : listen() failed"), nullptr);
 			kvi_socket_close(m_sock6);
 			m_sock6 = KVI_INVALID_SOCKET;
 			goto ipv6_failure;
@@ -326,18 +326,18 @@ ipv6_failure:
 		if(m_sock6 != KVI_INVALID_SOCKET)
 		{
 			if(_OUTPUT_PARANOIC)
-				postMessage(__tr("Starting Ident service (IPv4/v6 on separate namespaces)"), 0);
+				postMessage(__tr("Starting Ident service (IPv4/v6 on separate namespaces)"), nullptr);
 		}
 		else
 		{
 			if(_OUTPUT_PARANOIC)
-				postMessage(__tr("Starting Ident service (IPv4/v6 in IPv6 namespace)"), 0);
+				postMessage(__tr("Starting Ident service (IPv4/v6 in IPv6 namespace)"), nullptr);
 		}
 	}
 	else
 	{
 		if(_OUTPUT_PARANOIC)
-			postMessage(__tr("Starting Ident service (IPv4)"), 0);
+			postMessage(__tr("Starting Ident service (IPv4)"), nullptr);
 	}
 #else  //!COMPILE_IPV6_SUPPORT
 	if(_OUTPUT_PARANOIC)
@@ -386,7 +386,7 @@ ipv6_failure:
 
 		// FIXME: SO_REUSEADDR ?
 
-		int ret = kvi_socket_select(nmax + 1, &rs, 0, 0, &t);
+		int ret = kvi_socket_select(nmax + 1, &rs, nullptr, nullptr, &t);
 
 		if(ret == 0)
 			msleep(100);
@@ -522,7 +522,7 @@ ipv6_failure:
 			}
 		}
 
-		time_t curTime = time(0);
+		time_t curTime = time(nullptr);
 
 		for(r = m_pRequestList->first(); r; r = m_pRequestList->next())
 		{
@@ -554,7 +554,7 @@ exit_thread:
 	if(m_sock6 != KVI_INVALID_SOCKET)
 		kvi_socket_close(m_sock6);
 	delete m_pRequestList;
-	m_pRequestList = 0;
+	m_pRequestList = nullptr;
 
 	//	qDebug("RUN EXITING");
 }
@@ -621,7 +621,7 @@ static bool ident_module_cleanup(KviModule *)
 {
 	stopIdentService();
 	delete g_pIdentSentinel;
-	g_pIdentSentinel = 0;
+	g_pIdentSentinel = nullptr;
 
 	return true;
 }
diff --git a/src/modules/iograph/libkviiograph.cpp b/src/modules/iograph/libkviiograph.cpp
index 7589676f9..c9149a682 100644
--- a/src/modules/iograph/libkviiograph.cpp
+++ b/src/modules/iograph/libkviiograph.cpp
@@ -40,7 +40,7 @@
 extern KVIRC_API QPixmap * g_pShadedChildGlobalDesktopBackground;
 #endif
 
-KviIOGraphWindow * g_pIOGraphWindow = 0;
+KviIOGraphWindow * g_pIOGraphWindow = nullptr;
 
 KviIOGraphWindow::KviIOGraphWindow(const char * name)
     : KviWindow(KviWindow::IOGraph, name)
@@ -53,9 +53,9 @@ KviIOGraphWindow::~KviIOGraphWindow()
 {
 	if(m_pIOGraph)
 		delete m_pIOGraph;
-	m_pIOGraph = 0;
+	m_pIOGraph = nullptr;
 
-	g_pIOGraphWindow = 0;
+	g_pIOGraphWindow = nullptr;
 }
 
 QPixmap * KviIOGraphWindow::myIconPtr()
@@ -285,7 +285,7 @@ static bool iograph_module_cmd_open(KviKvsModuleCommandCall * c)
 
 static bool iograph_module_init(KviModule * m)
 {
-	g_pIOGraphWindow = 0;
+	g_pIOGraphWindow = nullptr;
 
 	KVSM_REGISTER_SIMPLE_COMMAND(m, "open", iograph_module_cmd_open);
 	return true;
@@ -295,7 +295,7 @@ static bool iograph_module_cleanup(KviModule *)
 {
 	if(g_pIOGraphWindow && g_pMainWindow)
 		g_pMainWindow->closeWindow(g_pIOGraphWindow);
-	g_pIOGraphWindow = 0;
+	g_pIOGraphWindow = nullptr;
 	return true;
 }
 
diff --git a/src/modules/lamerizer/libkvilamerizer.cpp b/src/modules/lamerizer/libkvilamerizer.cpp
index b56e7f74c..c3e5cd2f1 100644
--- a/src/modules/lamerizer/libkvilamerizer.cpp
+++ b/src/modules/lamerizer/libkvilamerizer.cpp
@@ -47,7 +47,7 @@
 #include "KviPointerList.h"
 #include "KviCryptEngineDescription.h"
 
-static KviPointerList<KviCryptEngine> * g_pEngineList = 0;
+static KviPointerList<KviCryptEngine> * g_pEngineList = nullptr;
 
 KviLamerizerEngine::KviLamerizerEngine(bool bLight)
     : KviCryptEngine()
@@ -236,7 +236,7 @@ static bool lamerizer_module_cleanup(KviModule * m)
 	while(g_pEngineList->first())
 		delete g_pEngineList->first();
 	delete g_pEngineList;
-	g_pEngineList = 0;
+	g_pEngineList = nullptr;
 	m->unregisterCryptEngines();
 	return true;
 #else
diff --git a/src/modules/language/detector.cpp b/src/modules/language/detector.cpp
index 2a641f0d5..99bf92d46 100644
--- a/src/modules/language/detector.cpp
+++ b/src/modules/language/detector.cpp
@@ -48,7 +48,7 @@ typedef struct _DetectorDescriptor
 	DetectorNGram * ngram_hash[256];
 } DetectorDescriptor;
 
-static DetectorNGram X[] = { { 0, 0 } };
+static DetectorNGram X[] = { { nullptr, 0 } };
 
 ///////////////////////////////////////////////////////////////////////////////
 // DEFINES THAT SAVE (A LOT OF) SPACE
@@ -18747,10 +18747,10 @@ void detect_language_and_encoding(const char * data, LanguageAndEncodingResult *
 	DetectorDescriptor * match[DLE_NUM_BEST_MATCHES];
 	for(i = 0; i < DLE_NUM_BEST_MATCHES; i++)
 	{
-		retBuffer->match[i].szLanguage = 0;
-		retBuffer->match[i].szEncoding = 0;
+		retBuffer->match[i].szLanguage = nullptr;
+		retBuffer->match[i].szEncoding = nullptr;
 		retBuffer->match[i].dScore = -99999999999.9;
-		match[i] = 0;
+		match[i] = nullptr;
 	}
 	retBuffer->dAccuracy = 0.0;
 
diff --git a/src/modules/links/LinksWindow.cpp b/src/modules/links/LinksWindow.cpp
index c29bd1ede..089ef86ef 100644
--- a/src/modules/links/LinksWindow.cpp
+++ b/src/modules/links/LinksWindow.cpp
@@ -101,7 +101,7 @@ LinksWindow::LinksWindow(KviConsoleWindow * lpConsole)
 LinksWindow::~LinksWindow()
 {
 	g_pLinksWindowList->removeRef(this);
-	m_pConsole->context()->setLinksWindowPointer(0);
+	m_pConsole->context()->setLinksWindowPointer(nullptr);
 	delete m_pLinkList;
 	delete m_pHostPopup;
 }
@@ -193,8 +193,8 @@ void LinksWindow::endOfLinks()
 	outputNoFmt(KVI_OUT_SYSTEMMESSAGE, __tr2qs("Received end of links."));
 	outputNoFmt(KVI_OUT_SYSTEMMESSAGE, "======================");
 
-	QTreeWidgetItem * it = 0;
-	QTreeWidgetItem * root = 0;
+	QTreeWidgetItem * it = nullptr;
+	QTreeWidgetItem * root = nullptr;
 
 	int totalHosts = 0;
 	int totalHops = 0;
@@ -342,11 +342,11 @@ void LinksWindow::endOfLinks()
 QTreeWidgetItem * LinksWindow::insertLink(KviLink * l)
 {
 	KVI_ASSERT(l->hops > 0);
-	QTreeWidgetItem * i = getItemByHost(l->parent.ptr(), 0);
-	QTreeWidgetItem * it = 0;
+	QTreeWidgetItem * i = getItemByHost(l->parent.ptr(), nullptr);
+	QTreeWidgetItem * it = nullptr;
 	if(!i)
 	{
-		return 0;
+		return nullptr;
 	}
 	else
 	{
@@ -387,7 +387,7 @@ QTreeWidgetItem * LinksWindow::getItemByHost(const char * host, QTreeWidgetItem
 				return ch;
 		}
 	}
-	return 0;
+	return nullptr;
 }
 
 void LinksWindow::showHostPopup(QTreeWidgetItem * i, const QPoint & p)
diff --git a/src/modules/links/libkvilinks.cpp b/src/modules/links/libkvilinks.cpp
index b35d9a846..16f5d7068 100644
--- a/src/modules/links/libkvilinks.cpp
+++ b/src/modules/links/libkvilinks.cpp
@@ -31,7 +31,7 @@
 
 #include <QSplitter>
 
-KviPointerList<LinksWindow> * g_pLinksWindowList = 0;
+KviPointerList<LinksWindow> * g_pLinksWindowList = nullptr;
 
 /*
 	@doc: links.open
@@ -93,7 +93,7 @@ static bool links_module_cleanup(KviModule *)
 	while(g_pLinksWindowList->first())
 		g_pLinksWindowList->first()->die();
 	delete g_pLinksWindowList;
-	g_pLinksWindowList = 0;
+	g_pLinksWindowList = nullptr;
 	return true;
 }
 
diff --git a/src/modules/list/ListWindow.cpp b/src/modules/list/ListWindow.cpp
index c323d12cd..a39703c36 100644
--- a/src/modules/list/ListWindow.cpp
+++ b/src/modules/list/ListWindow.cpp
@@ -63,8 +63,7 @@ ChannelTreeWidgetItemData::ChannelTreeWidgetItemData(const QString & szChan, con
 }
 
 ChannelTreeWidgetItemData::~ChannelTreeWidgetItemData()
-{
-}
+    = default;
 
 ChannelTreeWidgetItem::ChannelTreeWidgetItem(ChannelTreeWidgetItemData * pData)
     : QTreeWidgetItem(), m_pData(pData)
@@ -75,8 +74,7 @@ ChannelTreeWidgetItem::ChannelTreeWidgetItem(ChannelTreeWidgetItemData * pData)
 }
 
 ChannelTreeWidgetItem::~ChannelTreeWidgetItem()
-{
-}
+    = default;
 
 bool ChannelTreeWidgetItem::operator<(const QTreeWidgetItem & other) const
 {
@@ -104,8 +102,7 @@ ChannelTreeWidgetItemDelegate::ChannelTreeWidgetItemDelegate(QTreeWidget * pWidg
 }
 
 ChannelTreeWidgetItemDelegate::~ChannelTreeWidgetItemDelegate()
-{
-}
+    = default;
 
 #define BORDER 2
 
@@ -176,7 +173,7 @@ ListWindow::ListWindow(KviConsoleWindow * lpConsole)
 {
 	g_pListWindowList->append(this);
 
-	m_pFlushTimer = 0;
+	m_pFlushTimer = nullptr;
 
 	m_pItemList = new KviPointerList<ChannelTreeWidgetItemData>;
 	m_pItemList->setAutoDelete(false);
@@ -270,7 +267,7 @@ ListWindow::ListWindow(KviConsoleWindow * lpConsole)
 ListWindow::~ListWindow()
 {
 	g_pListWindowList->removeRef(this);
-	m_pConsole->context()->setListWindowPointer(0);
+	m_pConsole->context()->setListWindowPointer(nullptr);
 
 	if(m_pFlushTimer)
 		delete m_pFlushTimer;
@@ -366,7 +363,7 @@ void ListWindow::exportList()
 {
 	if(!m_pTreeWidget->topLevelItemCount())
 	{
-		QMessageBox::warning(0, __tr2qs("Warning While Exporting - KVIrc"), __tr2qs("You can't export an empty list!"));
+		QMessageBox::warning(nullptr, __tr2qs("Warning While Exporting - KVIrc"), __tr2qs("You can't export an empty list!"));
 		return;
 	}
 
@@ -472,7 +469,7 @@ void ListWindow::endOfList()
 	if(m_pFlushTimer)
 	{
 		delete m_pFlushTimer;
-		m_pFlushTimer = 0;
+		m_pFlushTimer = nullptr;
 	}
 	m_pRequestButton->setEnabled(true);
 	outputNoFmt(KVI_OUT_SYSTEMMESSAGE, __tr2qs("Channels list download finished"));
@@ -494,7 +491,7 @@ void ListWindow::liveSearch(const QString & szText)
 {
 	QRegExp res(szText, Qt::CaseInsensitive, QRegExp::Wildcard);
 
-	ChannelTreeWidgetItem * pItem = 0;
+	ChannelTreeWidgetItem * pItem = nullptr;
 	for(int i = 0; i < m_pTreeWidget->topLevelItemCount(); i++)
 	{
 		pItem = (ChannelTreeWidgetItem *)m_pTreeWidget->topLevelItem(i);
diff --git a/src/modules/list/libkvilist.cpp b/src/modules/list/libkvilist.cpp
index a20948673..63dd0a923 100644
--- a/src/modules/list/libkvilist.cpp
+++ b/src/modules/list/libkvilist.cpp
@@ -31,7 +31,7 @@
 
 #include <QSplitter>
 
-KviPointerList<ListWindow> * g_pListWindowList = 0;
+KviPointerList<ListWindow> * g_pListWindowList = nullptr;
 
 /*
 	@doc: list.open
@@ -82,7 +82,7 @@ static bool list_module_cleanup(KviModule *)
 	while(g_pListWindowList->first())
 		g_pListWindowList->first()->die();
 	delete g_pListWindowList;
-	g_pListWindowList = 0;
+	g_pListWindowList = nullptr;
 	return true;
 }
 
diff --git a/src/modules/logview/LogViewWidget.cpp b/src/modules/logview/LogViewWidget.cpp
index 5de6f3078..cf90ffa74 100644
--- a/src/modules/logview/LogViewWidget.cpp
+++ b/src/modules/logview/LogViewWidget.cpp
@@ -51,13 +51,13 @@ LogListViewItem::LogListViewItem(QTreeWidget * pPar, LogFile::Type eType, LogFil
 }
 
 LogListViewItemFolder::LogListViewItemFolder(QTreeWidgetItem * pPar, const QString & szLabel)
-    : LogListViewItem(pPar, LogFile::Other, 0)
+    : LogListViewItem(pPar, LogFile::Other, nullptr)
 {
 	setText(0, szLabel);
 }
 
 LogListViewItemType::LogListViewItemType(QTreeWidget * pPar, LogFile::Type eType)
-    : LogListViewItem(pPar, eType, 0)
+    : LogListViewItem(pPar, eType, nullptr)
 {
 	QIcon icon;
 	QString szText;
diff --git a/src/modules/logview/LogViewWindow.cpp b/src/modules/logview/LogViewWindow.cpp
index 0c5f0b9d6..68d02d51f 100644
--- a/src/modules/logview/LogViewWindow.cpp
+++ b/src/modules/logview/LogViewWindow.cpp
@@ -211,7 +211,7 @@ LogViewWindow::LogViewWindow()
 
 LogViewWindow::~LogViewWindow()
 {
-	g_pLogViewWindow = 0;
+	g_pLogViewWindow = nullptr;
 }
 
 void LogViewWindow::keyPressEvent(QKeyEvent * pEvent)
@@ -286,8 +286,8 @@ void LogViewWindow::setupItemList()
 	m_pProgressBar->setRange(0, m_logList.count());
 	m_pProgressBar->setValue(0);
 
-	m_pLastCategory = 0;
-	m_pLastGroupItem = 0;
+	m_pLastCategory = nullptr;
+	m_pLastGroupItem = nullptr;
 	m_logList.first();
 	m_pTimer->start(); //singleshot
 }
@@ -344,7 +344,7 @@ void LogViewWindow::filterNext()
 	{
 		if(m_pLastCategory->m_eType != pFile->type())
 		{
-			m_pLastCategory = 0;
+			m_pLastCategory = nullptr;
 			for(int i = 0; i < m_pListView->topLevelItemCount(); ++i)
 			{
 				LogListViewItemType * pTmp = (LogListViewItemType *)m_pListView->topLevelItem(i);
@@ -368,7 +368,7 @@ void LogViewWindow::filterNext()
 	if(m_szLastGroup != szCurGroup)
 	{
 		m_szLastGroup = szCurGroup;
-		m_pLastGroupItem = 0;
+		m_pLastGroupItem = nullptr;
 		for(int i = 0; i < m_pLastCategory->childCount(); ++i)
 		{
 			LogListViewItemFolder * pTmp = (LogListViewItemFolder *)m_pLastCategory->child(i);
@@ -425,16 +425,16 @@ void LogViewWindow::itemSelected(QTreeWidgetItem * it, QTreeWidgetItem *)
 	QStringList lines = szText.split('\n');
 	bool bOk;
 	int iMsgType;
-	for(QStringList::Iterator it = lines.begin(); it != lines.end(); ++it)
+	for(auto & line : lines)
 	{
-		QString szNum = (*it).section(' ', 0, 0);
+		QString szNum = line.section(' ', 0, 0);
 		iMsgType = szNum.toInt(&bOk);
 		if(iMsgType < 0 || iMsgType > (KVI_NUM_MSGTYPE_OPTIONS - 1))
 			iMsgType = 0;
 		if(bOk)
-			outputNoFmt(iMsgType, (*it).section(' ', 1), KviIrcView::NoRepaint | KviIrcView::NoTimestamp);
+			outputNoFmt(iMsgType, line.section(' ', 1), KviIrcView::NoRepaint | KviIrcView::NoTimestamp);
 		else
-			outputNoFmt(0, *it, KviIrcView::NoRepaint | KviIrcView::NoTimestamp);
+			outputNoFmt(0, line, KviIrcView::NoRepaint | KviIrcView::NoTimestamp);
 	}
 	m_pIrcView->repaint();
 }
@@ -474,7 +474,7 @@ void LogViewWindow::deleteCurrent()
 			       this,
 			       __tr2qs_ctx("Confirm Current User Log Deletion", "log"),
 			       __tr2qs_ctx("Do you really wish to delete this log?", "log"),
-			       __tr2qs("Yes"), __tr2qs("No"), 0, 1)
+			       __tr2qs("Yes"), __tr2qs("No"), nullptr, 1)
 			    != 0)
 				return;
 
@@ -492,7 +492,7 @@ void LogViewWindow::deleteCurrent()
 	       this,
 	       __tr2qs_ctx("Confirm Current User Logs Deletion", "log"),
 	       __tr2qs_ctx("Do you really wish to delete all these logs?", "log"),
-	       __tr2qs("Yes"), __tr2qs("No"), 0, 1)
+	       __tr2qs("Yes"), __tr2qs("No"), nullptr, 1)
 	    != 0)
 		return;
 	KviPointerList<LogListViewItem> itemsList;
@@ -633,9 +633,9 @@ void LogViewWindow::createLog(LogFile * pLog, int iId, QString * pszFile)
 				szLog += ".txt";
 
 			// Scan the file
-			for(QStringList::Iterator it = lines.begin(); it != lines.end(); ++it)
+			for(auto & line : lines)
 			{
-				szTmp = (*it);
+				szTmp = line;
 				szLine = KviControlCodes::stripControlBytes(szTmp);
 
 				// Remove icons' code
@@ -710,9 +710,9 @@ void LogViewWindow::createLog(LogFile * pLog, int iId, QString * pszFile)
 			szOutputBuffer += "<h2>" + szTitle + "</h2>\n<h3>Date: " + szDate + "</h3>\n";
 
 			// Scan the file
-			for(QStringList::Iterator it = lines.begin(); it != lines.end(); ++it)
+			for(auto & line : lines)
 			{
-				szTmp = (*it);
+				szTmp = line;
 
 				// Find who has talked
 				QString szTmpNick = szTmp.section(" ", 2, 2);
diff --git a/src/modules/logview/libkvilogview.cpp b/src/modules/logview/libkvilogview.cpp
index 165973955..3304ddc8b 100644
--- a/src/modules/logview/libkvilogview.cpp
+++ b/src/modules/logview/libkvilogview.cpp
@@ -34,7 +34,7 @@
 #include "KviApplication.h"
 
 static QRect g_rectLogViewGeometry;
-LogViewWindow * g_pLogViewWindow = 0;
+LogViewWindow * g_pLogViewWindow = nullptr;
 
 #define LOGVIEW_MODULE_EXTENSION_NAME "Log viewer extension"
 
@@ -78,7 +78,7 @@ static bool logview_kvs_cmd_open(KviKvsModuleCommandCall * c)
 
 static bool logview_module_init(KviModule * m)
 {
-	g_pLogViewWindow = 0;
+	g_pLogViewWindow = nullptr;
 
 	KVSM_REGISTER_SIMPLE_COMMAND(m, "open", logview_kvs_cmd_open);
 
@@ -89,7 +89,7 @@ static bool logview_module_cleanup(KviModule *)
 {
 	if(g_pLogViewWindow && g_pMainWindow)
 		g_pMainWindow->closeWindow(g_pLogViewWindow);
-	g_pLogViewWindow = 0;
+	g_pLogViewWindow = nullptr;
 	return true;
 }
 
diff --git a/src/modules/mediaplayer/MpMp3.cpp b/src/modules/mediaplayer/MpMp3.cpp
index caf35b8e7..98366a9c7 100644
--- a/src/modules/mediaplayer/MpMp3.cpp
+++ b/src/modules/mediaplayer/MpMp3.cpp
@@ -178,7 +178,7 @@ const char * emphasis_text[] = {
 
 void resetmp3infoStruct(mp3info * i)
 {
-	i->file = 0;
+	i->file = nullptr;
 	i->datasize = 0;
 	i->header_isvalid = 0;
 	memset(&i->header, 0, sizeof(i->header));
diff --git a/src/modules/mediaplayer/MpMprisInterface.cpp b/src/modules/mediaplayer/MpMprisInterface.cpp
index 30367487f..60bcea8de 100644
--- a/src/modules/mediaplayer/MpMprisInterface.cpp
+++ b/src/modules/mediaplayer/MpMprisInterface.cpp
@@ -67,8 +67,7 @@ MpMprisInterface::MpMprisInterface()
 }
 
 MpMprisInterface::~MpMprisInterface()
-{
-}
+    = default;
 
 int MpMprisInterface::detect(bool)
 {
diff --git a/src/modules/mediaplayer/MpXmmsInterface.cpp b/src/modules/mediaplayer/MpXmmsInterface.cpp
index ef7c119c2..43e213aa3 100644
--- a/src/modules/mediaplayer/MpXmmsInterface.cpp
+++ b/src/modules/mediaplayer/MpXmmsInterface.cpp
@@ -54,7 +54,7 @@ static const char * xmms_lib_names[] = {
 	"/usr/lib/libxmms.so.1",
 	"/usr/local/lib/libxmms.so",
 	"/usr/local/lib/libxmms.so.1",
-	0
+	nullptr
 };
 
 static const char * audacious_lib_names[] = {
@@ -64,13 +64,13 @@ static const char * audacious_lib_names[] = {
 	"/usr/lib/libaudacious.so.4",
 	"/usr/local/lib/libaudacious.so",
 	"/usr/local/lib/libaudacious.so.4",
-	0
+	nullptr
 };
 
 KviXmmsInterface::KviXmmsInterface()
     : MpInterface()
 {
-	m_pPlayerLibrary = 0;
+	m_pPlayerLibrary = nullptr;
 	m_szPlayerLibraryName = "libxmms.so";
 	m_pLibraryPaths = xmms_lib_names;
 }
@@ -81,7 +81,7 @@ KviXmmsInterface::~KviXmmsInterface()
 	{
 		m_pPlayerLibrary->unload();
 		delete m_pPlayerLibrary;
-		m_pPlayerLibrary = 0;
+		m_pPlayerLibrary = nullptr;
 	}
 }
 
@@ -93,8 +93,7 @@ KviAudaciousClassicInterface::KviAudaciousClassicInterface()
 }
 
 KviAudaciousClassicInterface::~KviAudaciousClassicInterface()
-{
-}
+    = default;
 
 bool KviXmmsInterface::loadPlayerLibrary()
 {
@@ -111,7 +110,7 @@ bool KviXmmsInterface::loadPlayerLibrary()
 			return true;
 		}
 		delete m_pPlayerLibrary;
-		m_pPlayerLibrary = 0;
+		m_pPlayerLibrary = nullptr;
 		lib_name++;
 	}
 	return false;
@@ -125,7 +124,7 @@ void * KviXmmsInterface::lookupSymbol(const char * szSymbolName)
 		{
 			QString szTmp = QString(__tr2qs_ctx("Can't load the player library (%1)", "mediaplayer")).arg(m_szPlayerLibraryName);
 			setLastError(szTmp);
-			return 0;
+			return nullptr;
 		}
 	}
 	void * symptr = (void *)m_pPlayerLibrary->resolve(szSymbolName);
diff --git a/src/modules/mediaplayer/libkvimediaplayer.cpp b/src/modules/mediaplayer/libkvimediaplayer.cpp
index a1a15acea..cc39006c0 100644
--- a/src/modules/mediaplayer/libkvimediaplayer.cpp
+++ b/src/modules/mediaplayer/libkvimediaplayer.cpp
@@ -36,16 +36,16 @@
 #include "kvi_out.h"
 #include <QUrl>
 
-static KviPointerList<MpInterfaceDescriptor> * g_pDescriptorList = 0;
+static KviPointerList<MpInterfaceDescriptor> * g_pDescriptorList = nullptr;
 
-static MpInterface * g_pMPInterface = 0;
+static MpInterface * g_pMPInterface = nullptr;
 
-static MpInterface * auto_detect_player(KviWindow * pOut = 0)
+static MpInterface * auto_detect_player(KviWindow * pOut = nullptr)
 {
 	int iBest = 0;
-	MpInterface * pBest = 0;
+	MpInterface * pBest = nullptr;
 	MpInterfaceDescriptor * d;
-	MpInterfaceDescriptor * pDBest = 0;
+	MpInterfaceDescriptor * pDBest = nullptr;
 	for(d = g_pDescriptorList->first(); d; d = g_pDescriptorList->next())
 	{
 		MpInterface * i = d->instance();
@@ -426,7 +426,7 @@ MP_KVS_SIMPLE_COMMAND(pause, pause)
 
 MP_KVS_COMMAND(detect)
 {
-	g_pMPInterface = auto_detect_player(c->hasSwitch('q', "quiet") ? 0 : c->window());
+	g_pMPInterface = auto_detect_player(c->hasSwitch('q', "quiet") ? nullptr : c->window());
 	return true;
 }
 
@@ -1629,7 +1629,7 @@ static bool mediaplayer_module_init(KviModule * m)
 	g_pDescriptorList->append(MP_CREATE_DESCRIPTOR(MpAmipInterface));
 	g_pDescriptorList->append(MP_CREATE_DESCRIPTOR(KviWinampInterface));
 #endif
-	g_pMPInterface = 0;
+	g_pMPInterface = nullptr;
 
 	if(KVI_OPTION_STRING(KviOption_stringPreferredMediaPlayer) == "auto")
 	{
@@ -1736,7 +1736,7 @@ static bool mediaplayer_module_ctrl(KviModule *, const char * operation, void *
 	}
 	if(kvi_strEqualCI(operation, "detectMediaPlayer"))
 	{
-		auto_detect_player(0);
+		auto_detect_player(nullptr);
 		return true;
 	}
 	return false;
diff --git a/src/modules/mircimport/libkvimircimport.cpp b/src/modules/mircimport/libkvimircimport.cpp
index b9ffc8862..037177609 100644
--- a/src/modules/mircimport/libkvimircimport.cpp
+++ b/src/modules/mircimport/libkvimircimport.cpp
@@ -38,8 +38,8 @@
 #include <QDir>
 #include <QPushButton>
 
-KviMircServersIniImport * g_pMircServersIniImport = 0;
-KviRemoteMircServersIniImport * g_pRemoteMircServersIniImport = 0;
+KviMircServersIniImport * g_pMircServersIniImport = nullptr;
+KviRemoteMircServersIniImport * g_pRemoteMircServersIniImport = nullptr;
 
 KviMircServersIniImport::KviMircServersIniImport(KviModuleExtensionDescriptor * d)
     : KviMexServerImport(d)
@@ -48,7 +48,7 @@ KviMircServersIniImport::KviMircServersIniImport(KviModuleExtensionDescriptor *
 
 KviMircServersIniImport::~KviMircServersIniImport()
 {
-	g_pMircServersIniImport = 0;
+	g_pMircServersIniImport = nullptr;
 }
 
 int KviMircServersIniImport::doImport(const QString & filename)
@@ -117,7 +117,7 @@ int KviMircServersIniImport::doImport(const QString & filename)
 	else
 	{
 		QString szTmp = QString(__tr2qs("%1 doesn't look like a servers.ini file.\nImport failed.")).arg(filename);
-		QMessageBox::warning(0, __tr2qs("File Import - KVIrc"), szTmp);
+		QMessageBox::warning(nullptr, __tr2qs("File Import - KVIrc"), szTmp);
 	}
 	return iCount;
 }
@@ -126,7 +126,7 @@ void KviMircServersIniImport::start()
 {
 	//KviCString buffer;
 	QString buffer;
-	if(!KviFileDialog::askForOpenFileName(buffer, __tr("Select a File - KVIrc"), 0, KVI_FILTER_INI, false, true, g_pMainWindow))
+	if(!KviFileDialog::askForOpenFileName(buffer, __tr("Select a File - KVIrc"), nullptr, KVI_FILTER_INI, false, true, g_pMainWindow))
 		return;
 
 	doImport(buffer);
@@ -141,14 +141,14 @@ void KviMircServersIniImport::die()
 #define KVI_WWWMIRCCOUK_SERVERSINI "http://www.mirc.co.uk/servers.ini"
 
 KviRemoteMircServerImportWizard::KviRemoteMircServerImportWizard(KviRemoteMircServersIniImport * f)
-    : KviTalWizard(0)
+    : KviTalWizard(nullptr)
 {
 	QString capt = __tr2qs("Remote mIRC servers.ini - Import Wizard");
 	setWindowTitle(capt);
 
 	setModal(true);
 
-	m_pRequest = 0;
+	m_pRequest = nullptr;
 	m_pFilter = f;
 
 	QLabel * l = new QLabel(this);
@@ -228,7 +228,7 @@ void KviRemoteMircServerImportWizard::start()
 	if(!m_pRequest->get(KviUrl(url), KviHttpRequest::StoreToFile, m_szTmpFileName))
 	{
 		delete m_pRequest;
-		m_pRequest = 0;
+		m_pRequest = nullptr;
 		m_pOutput->setText(__tr2qs("Failed to start the server list transfer :("));
 		finishButton()->setEnabled(true);
 	}
@@ -265,7 +265,7 @@ void KviRemoteMircServerImportWizard::getListTerminated(bool bSuccess)
 		m_pOutput->setText(m_pRequest->lastError());
 
 	delete m_pRequest;
-	m_pRequest = 0;
+	m_pRequest = nullptr;
 	cancelButton()->setEnabled(false);
 	finishButton()->setEnabled(true);
 }
@@ -273,14 +273,14 @@ void KviRemoteMircServerImportWizard::getListTerminated(bool bSuccess)
 KviRemoteMircServersIniImport::KviRemoteMircServersIniImport(KviModuleExtensionDescriptor * d)
     : KviMircServersIniImport(d)
 {
-	m_pWizard = 0;
+	m_pWizard = nullptr;
 }
 
 KviRemoteMircServersIniImport::~KviRemoteMircServersIniImport()
 {
 	if(m_pWizard)
 		delete m_pWizard;
-	g_pRemoteMircServersIniImport = 0;
+	g_pRemoteMircServersIniImport = nullptr;
 }
 
 void KviRemoteMircServersIniImport::start()
@@ -315,14 +315,14 @@ static KviModuleExtension * mircimport_remote_filter_alloc(KviModuleExtensionAll
 static bool mircimport_module_init(KviModule * m)
 {
 	QString szPath;
-	QPixmap * pix = 0;
+	QPixmap * pix = nullptr;
 	if(g_pApp->findImage(szPath, "kvi_mircimport.png"))
 	{
 		pix = new QPixmap(szPath);
 		if(pix->isNull())
 		{
 			delete pix;
-			pix = 0;
+			pix = nullptr;
 		}
 	}
 
@@ -353,8 +353,8 @@ static bool mircimport_module_cleanup(KviModule *)
 		delete g_pMircServersIniImport;
 	if(g_pRemoteMircServersIniImport)
 		delete g_pRemoteMircServersIniImport;
-	g_pMircServersIniImport = 0;
-	g_pRemoteMircServersIniImport = 0;
+	g_pMircServersIniImport = nullptr;
+	g_pRemoteMircServersIniImport = nullptr;
 
 	return true;
 }
diff --git a/src/modules/my/Idle.cpp b/src/modules/my/Idle.cpp
index bdb6f8fbb..1acd57b06 100644
--- a/src/modules/my/Idle.cpp
+++ b/src/modules/my/Idle.cpp
@@ -24,7 +24,7 @@
 #include <QDateTime>
 #include <QTimer>
 
-static IdlePlatform * platform = 0;
+static IdlePlatform * platform = nullptr;
 static int platform_ref = 0;
 
 Idle::Idle()
@@ -56,7 +56,7 @@ Idle::~Idle()
 		if(platform_ref == 0)
 		{
 			delete platform;
-			platform = 0;
+			platform = nullptr;
 		}
 	}
 	delete d;
diff --git a/src/modules/my/Idle_x11.cpp b/src/modules/my/Idle_x11.cpp
index 593843362..2913369e0 100644
--- a/src/modules/my/Idle_x11.cpp
+++ b/src/modules/my/Idle_x11.cpp
@@ -36,7 +36,7 @@ int IdlePlatform::secondsIdle() const { return 0; }
 #include <X11/Xutil.h>
 #include <X11/extensions/scrnsaver.h>
 
-static XErrorHandler old_handler = 0;
+static XErrorHandler old_handler = nullptr;
 extern "C" int xerrhandler(Display * dpy, XErrorEvent * err)
 {
 	if(err->error_code == BadDrawable)
@@ -53,7 +53,7 @@ public:
 	Private()
 	{
 		// make coverity happy
-		ss_info = 0;
+		ss_info = nullptr;
 	}
 };
 
@@ -69,7 +69,7 @@ IdlePlatform::~IdlePlatform()
 	if(old_handler)
 	{
 		XSetErrorHandler(old_handler);
-		old_handler = 0;
+		old_handler = nullptr;
 	}
 	delete d;
 }
diff --git a/src/modules/my/libkvimy.cpp b/src/modules/my/libkvimy.cpp
index de1aa3e78..43ea72c1c 100644
--- a/src/modules/my/libkvimy.cpp
+++ b/src/modules/my/libkvimy.cpp
@@ -394,7 +394,7 @@ static bool my_kvs_fnc_network(KviKvsModuleFunctionCall * c)
 
 static bool my_module_init(KviModule * m)
 {
-	g_pIdle = 0;
+	g_pIdle = nullptr;
 	KVSM_REGISTER_FUNCTION(m, "nick", my_kvs_fnc_nick);
 	KVSM_REGISTER_FUNCTION(m, "user", my_kvs_fnc_user);
 	KVSM_REGISTER_FUNCTION(m, "host", my_kvs_fnc_host);
@@ -415,7 +415,7 @@ static bool my_module_cleanup(KviModule *)
 {
 	if(g_pIdle)
 		delete g_pIdle;
-	g_pIdle = 0;
+	g_pIdle = nullptr;
 	return true;
 }
 
diff --git a/src/modules/notifier/NotifierMessage.cpp b/src/modules/notifier/NotifierMessage.cpp
index 8154c23ef..fed24e816 100644
--- a/src/modules/notifier/NotifierMessage.cpp
+++ b/src/modules/notifier/NotifierMessage.cpp
@@ -34,8 +34,8 @@
 
 NotifierMessage::NotifierMessage(QPixmap * pPixmap, const QString & szText)
 {
-	m_pLabel0 = 0;
-	m_pLabel1 = 0;
+	m_pLabel0 = nullptr;
+	m_pLabel1 = nullptr;
 
 	m_szText = szText;
 	m_pPixmap = pPixmap;
@@ -80,7 +80,7 @@ void NotifierMessage::updateGui()
 	}
 	else
 	{
-		m_pLabel0 = 0;
+		m_pLabel0 = nullptr;
 	}
 
 	m_pLabel1 = new QLabel(this);
diff --git a/src/modules/notifier/NotifierWindow.cpp b/src/modules/notifier/NotifierWindow.cpp
index b0f4e703d..4ce8ea027 100644
--- a/src/modules/notifier/NotifierWindow.cpp
+++ b/src/modules/notifier/NotifierWindow.cpp
@@ -52,7 +52,7 @@
 extern NotifierWindow * g_pNotifierWindow;
 
 NotifierWindow::NotifierWindow()
-    : QWidget(0,
+    : QWidget(nullptr,
 #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
           Qt::FramelessWindowHint | Qt::Tool | Qt::WindowStaysOnTopHint)
 #else
@@ -69,11 +69,11 @@ NotifierWindow::NotifierWindow()
 
 	m_eState = Hidden;
 	m_dOpacity = 0.0;
-	m_pShowHideTimer = 0;
-	m_pBlinkTimer = 0;
+	m_pShowHideTimer = nullptr;
+	m_pBlinkTimer = nullptr;
 	m_tAutoHideAt = 0;
 	m_tStartedAt = 0;
-	m_pAutoHideTimer = 0;
+	m_pAutoHideTimer = nullptr;
 
 	m_pWndBorder = new NotifierWindowBorder();
 
@@ -94,8 +94,8 @@ NotifierWindow::NotifierWindow()
 	m_bDiagonalResizing = false;
 	m_bResizing = false;
 
-	m_pContextPopup = 0;
-	m_pDisablePopup = 0;
+	m_pContextPopup = nullptr;
+	m_pDisablePopup = nullptr;
 
 	m_bDragging = false;
 
@@ -123,7 +123,7 @@ NotifierWindow::NotifierWindow()
 	m_pProgressBar->setMaximumWidth(8);
 	m_pProgressBar->installEventFilter(this);
 
-	m_pLineEdit = new KviThemedLineEdit(this, 0, "notifier_lineedit");
+	m_pLineEdit = new KviThemedLineEdit(this, nullptr, "notifier_lineedit");
 	QPalette palette = m_pLineEdit->palette();
 	palette.setColor(m_pLineEdit->backgroundRole(), Qt::transparent);
 	m_pLineEdit->setPalette(palette);
@@ -173,14 +173,14 @@ void NotifierWindow::addMessage(KviWindow * pWnd, const QString & szImageId, con
 	QString szMessage = szText;
 	szMessage.replace(QRegExp("\r([^\r])*\r([^\r])+\r"), "\\2");
 	if(szImageId.isEmpty())
-		pIcon = 0;
+		pIcon = nullptr;
 	else
 		pIcon = g_pIconManager->getImage(szImageId);
 
-	NotifierMessage * pMessage = new NotifierMessage(pIcon ? new QPixmap(*pIcon) : 0, szMessage);
+	NotifierMessage * pMessage = new NotifierMessage(pIcon ? new QPixmap(*pIcon) : nullptr, szMessage);
 
 	//search for an existing tab
-	NotifierWindowTab *pTab = 0, *pTmp = 0;
+	NotifierWindowTab *pTab = nullptr, *pTmp = nullptr;
 	for(int i = 0; i < m_pWndTabs->count(); ++i)
 	{
 		pTmp = (NotifierWindowTab *)m_pWndTabs->widget(i);
@@ -238,7 +238,7 @@ void NotifierWindow::stopShowHideTimer()
 	if(!m_pShowHideTimer)
 		return;
 	delete m_pShowHideTimer;
-	m_pShowHideTimer = 0;
+	m_pShowHideTimer = nullptr;
 }
 
 void NotifierWindow::stopBlinkTimer()
@@ -246,7 +246,7 @@ void NotifierWindow::stopBlinkTimer()
 	if(!m_pBlinkTimer)
 		return;
 	delete m_pBlinkTimer;
-	m_pBlinkTimer = 0;
+	m_pBlinkTimer = nullptr;
 }
 
 void NotifierWindow::stopAutoHideTimer()
@@ -254,7 +254,7 @@ void NotifierWindow::stopAutoHideTimer()
 	if(!m_pAutoHideTimer)
 		return;
 	delete m_pAutoHideTimer;
-	m_pAutoHideTimer = 0;
+	m_pAutoHideTimer = nullptr;
 	m_pProgressBar->setValue(0);
 }
 
diff --git a/src/modules/notifier/NotifierWindowBorder.cpp b/src/modules/notifier/NotifierWindowBorder.cpp
index 5f566b55d..6b749ad55 100644
--- a/src/modules/notifier/NotifierWindowBorder.cpp
+++ b/src/modules/notifier/NotifierWindowBorder.cpp
@@ -36,8 +36,7 @@ NotifierWindowBorder::NotifierWindowBorder(QSize s)
 }
 
 NotifierWindowBorder::~NotifierWindowBorder()
-{
-}
+    = default;
 
 void NotifierWindowBorder::loadImages()
 {
diff --git a/src/modules/notifier/libkvinotifier.cpp b/src/modules/notifier/libkvinotifier.cpp
index 4fb6d0199..fa21755df 100644
--- a/src/modules/notifier/libkvinotifier.cpp
+++ b/src/modules/notifier/libkvinotifier.cpp
@@ -38,7 +38,7 @@
 
 #include <QSplitter>
 
-NotifierWindow * g_pNotifierWindow = 0;
+NotifierWindow * g_pNotifierWindow = nullptr;
 kvi_time_t g_tNotifierDisabledUntil = 0;
 
 /*
@@ -279,7 +279,7 @@ static bool notifier_module_cleanup(KviModule *)
 	if(g_pNotifierWindow)
 	{
 		delete g_pNotifierWindow;
-		g_pNotifierWindow = 0;
+		g_pNotifierWindow = nullptr;
 	}
 	return true;
 }
diff --git a/src/modules/objects/KvsObject_button.cpp b/src/modules/objects/KvsObject_button.cpp
index b3bdfe825..12078282b 100644
--- a/src/modules/objects/KvsObject_button.cpp
+++ b/src/modules/objects/KvsObject_button.cpp
@@ -157,6 +157,6 @@ KVSO_CLASS_FUNCTION(button, clickEvent)
 // slots
 void KvsObject_button::slotClicked()
 {
-	KviKvsVariantList * params = 0;
+	KviKvsVariantList * params = nullptr;
 	callFunction(this, "clickEvent", params);
 }
diff --git a/src/modules/objects/KvsObject_colorDialog.cpp b/src/modules/objects/KvsObject_colorDialog.cpp
index a13f29c20..43dcc3918 100644
--- a/src/modules/objects/KvsObject_colorDialog.cpp
+++ b/src/modules/objects/KvsObject_colorDialog.cpp
@@ -170,12 +170,12 @@ KVSO_CLASS_FUNCTION(colorDialog, setOptions)
 	if(!widget())
 		return true;
 	int colorDialogOption, sum = 0;
-	for(QStringList::Iterator it = szOptions.begin(); it != szOptions.end(); ++it)
+	for(auto & szOption : szOptions)
 	{
 		colorDialogOption = 0;
 		for(unsigned int j = 0; j < option_num; j++)
 		{
-			if(KviQString::equalCI((*it), option_tbl[j]))
+			if(KviQString::equalCI(szOption, option_tbl[j]))
 			{
 				colorDialogOption = option_cod[j];
 				break;
@@ -184,7 +184,7 @@ KVSO_CLASS_FUNCTION(colorDialog, setOptions)
 		if(colorDialogOption)
 			sum = sum | colorDialogOption;
 		else
-			c->warning(__tr2qs_ctx("Unknown szOptions '%Q'", "objects"), &(*it));
+			c->warning(__tr2qs_ctx("Unknown szOptions '%Q'", "objects"), &szOption);
 	}
 	((QColorDialog *)widget())->setOptions(QColorDialog::ColorDialogOptions(sum));
 	return true;
diff --git a/src/modules/objects/KvsObject_dateTimeEdit.cpp b/src/modules/objects/KvsObject_dateTimeEdit.cpp
index f4c7044ea..73eab6c59 100644
--- a/src/modules/objects/KvsObject_dateTimeEdit.cpp
+++ b/src/modules/objects/KvsObject_dateTimeEdit.cpp
@@ -167,7 +167,7 @@ KVSO_CLASS_FUNCTION(dateTimeEdit, setTime)
 // slots
 void KvsObject_dateTimeEdit::slotDateTimeChanged(const QDateTime &)
 {
-	KviKvsVariantList * params = 0;
+	KviKvsVariantList * params = nullptr;
 	callFunction(this, "dateTimeChangedEvent", params);
 }
 
@@ -186,7 +186,7 @@ KVSO_CLASS_FUNCTION(dateTimeEdit, timeChangedEvent)
 // slots
 void KvsObject_dateTimeEdit::slotTimeChanged(const QTime &)
 {
-	KviKvsVariantList * params = 0;
+	KviKvsVariantList * params = nullptr;
 	callFunction(this, "timeChangedEvent", params);
 }
 
@@ -199,6 +199,6 @@ KVSO_CLASS_FUNCTION(dateTimeEdit, dateChangedEvent)
 // slots
 void KvsObject_dateTimeEdit::slotDateChanged(const QDate &)
 {
-	KviKvsVariantList * params = 0;
+	KviKvsVariantList * params = nullptr;
 	callFunction(this, "dateChangedEvent", params);
 }
diff --git a/src/modules/objects/KvsObject_dockWindow.cpp b/src/modules/objects/KvsObject_dockWindow.cpp
index 66fe4a5f4..c90cfa27c 100644
--- a/src/modules/objects/KvsObject_dockWindow.cpp
+++ b/src/modules/objects/KvsObject_dockWindow.cpp
@@ -88,7 +88,7 @@ KVSO_CLASS_FUNCTION(dockWindow, addWidget)
 	KVSO_PARAMETERS_BEGIN(c)
 	KVSO_PARAMETER("widget", KVS_PT_HOBJECT, 0, hWidget)
 	KVSO_PARAMETERS_END(c)
-	if(hWidget == (kvs_hobject_t)0)
+	if(hWidget == (kvs_hobject_t) nullptr)
 	{
 		// null widget ?
 		c->warning(__tr2qs_ctx("Can't add a null object", "objects"));
diff --git a/src/modules/objects/KvsObject_ftp.cpp b/src/modules/objects/KvsObject_ftp.cpp
index 183edcdb0..54bd9a990 100644
--- a/src/modules/objects/KvsObject_ftp.cpp
+++ b/src/modules/objects/KvsObject_ftp.cpp
@@ -291,7 +291,7 @@ void KvsObject_ftp::slotCommandFinished(int iId, bool bError)
 	lParams.append(new KviKvsVariant(bError));
 	if(bError)
 		lParams.append(new KviKvsVariant(m_pFtp->errorString()));
-	callFunction(this, "commandFinishedEvent", 0, &lParams);
+	callFunction(this, "commandFinishedEvent", nullptr, &lParams);
 }
 
 void KvsObject_ftp::slotCommandStarted(int)
@@ -303,7 +303,7 @@ void KvsObject_ftp::slotDataTransferProgress(qint64 done, qint64 total)
 	KviKvsVariantList lParams;
 	lParams.append(new KviKvsVariant((kvs_int_t)done));
 	lParams.append(new KviKvsVariant((kvs_int_t)total));
-	callFunction(this, "dataTransferProgressEvent", 0, &lParams);
+	callFunction(this, "dataTransferProgressEvent", nullptr, &lParams);
 }
 
 KVSO_CLASS_FUNCTION(ftp, dataTransferProgressEvent)
@@ -320,7 +320,7 @@ void KvsObject_ftp::slotListInfo(const QUrlInfo & i)
 {
 	KviKvsVariantList lParams;
 	lParams.append(new KviKvsVariant(i.name()));
-	callFunction(this, "listInfoEvent", 0, &lParams);
+	callFunction(this, "listInfoEvent", nullptr, &lParams);
 }
 
 KVSO_CLASS_FUNCTION(ftp, listInfoEvent)
@@ -354,7 +354,7 @@ void KvsObject_ftp::slotStateChanged(int state)
 		szState = "Closing";
 	KviKvsVariantList lParams;
 	lParams.append(new KviKvsVariant(szState));
-	callFunction(this, "stateChangedEvent", 0, &lParams);
+	callFunction(this, "stateChangedEvent", nullptr, &lParams);
 }
 
 KVSO_CLASS_FUNCTION(ftp, stateChangedEvent)
diff --git a/src/modules/objects/KvsObject_hBox.cpp b/src/modules/objects/KvsObject_hBox.cpp
index 7ee0e4f59..de7325f34 100644
--- a/src/modules/objects/KvsObject_hBox.cpp
+++ b/src/modules/objects/KvsObject_hBox.cpp
@@ -176,13 +176,13 @@ KVSO_CLASS_FUNCTION(hBox, setAlignment)
 		return true;
 	}
 	int align, sum = 0;
-	for(QStringList::Iterator it = alignment.begin(); it != alignment.end(); ++it)
+	for(auto & it : alignment)
 	{
 
 		align = 0;
 		for(unsigned int j = 0; j < align_num; j++)
 		{
-			if(KviQString::equalCI((*it), align_tbl[j]))
+			if(KviQString::equalCI(it, align_tbl[j]))
 			{
 				align = align_cod[j];
 				break;
@@ -191,7 +191,7 @@ KVSO_CLASS_FUNCTION(hBox, setAlignment)
 		if(align)
 			sum = sum | align;
 		else
-			c->warning(__tr2qs_ctx("Unknown alignment '%Q'", "objects"), &(*it));
+			c->warning(__tr2qs_ctx("Unknown alignment '%Q'", "objects"), &it);
 	}
 	((KviTalHBox *)widget())->setAlignment(((QWidget *)(pObject->object())), (Qt::Alignment)sum);
 	return true;
diff --git a/src/modules/objects/KvsObject_http.cpp b/src/modules/objects/KvsObject_http.cpp
index 2840b08d3..1340a89db 100644
--- a/src/modules/objects/KvsObject_http.cpp
+++ b/src/modules/objects/KvsObject_http.cpp
@@ -291,7 +291,7 @@ bool KvsObject_http::functionGet(KviKvsObjectFunctionCall * c)
 	KVSO_PARAMETER("local_filename", KVS_PT_STRING, KVS_PF_OPTIONAL, szDest)
 	KVSO_PARAMETERS_END(c)
 
-	QFile * pFile = 0;
+	QFile * pFile = nullptr;
 	if(!szDest.isEmpty())
 	{
 		pFile = new QFile(szDest);
@@ -324,7 +324,7 @@ bool KvsObject_http::functionPost(KviKvsObjectFunctionCall * c)
 	KVSO_PARAMETER("post_data", KVS_PT_STRING, 0, szData)
 	KVSO_PARAMETER("local_filename", KVS_PT_STRING, 0, szDest)
 	KVSO_PARAMETERS_END(c)
-	QFile * pFile = 0;
+	QFile * pFile = nullptr;
 	if(!szDest.isEmpty())
 	{
 		pFile = new QFile(szDest);
@@ -409,7 +409,7 @@ void KvsObject_http::slotRequestFinished(int id, bool error)
 	KviKvsVariantList lParams;
 	lParams.append(new KviKvsVariant((kvs_int_t)id));
 	lParams.append(new KviKvsVariant(error));
-	callFunction(this, "requestFinishedEvent", 0, &lParams);
+	callFunction(this, "requestFinishedEvent", nullptr, &lParams);
 }
 
 bool KvsObject_http::functionRequestStartedEvent(KviKvsObjectFunctionCall * c)
@@ -421,7 +421,7 @@ void KvsObject_http::slotRequestStarted(int id)
 {
 	KviKvsVariantList lParams;
 	lParams.append(new KviKvsVariant((kvs_int_t)id));
-	callFunction(this, "requestStartedEvent", 0, &lParams);
+	callFunction(this, "requestStartedEvent", nullptr, &lParams);
 }
 
 void KvsObject_http::slotDataReadProgress(int done, int total)
@@ -429,7 +429,7 @@ void KvsObject_http::slotDataReadProgress(int done, int total)
 	KviKvsVariantList lParams;
 	lParams.append(new KviKvsVariant((kvs_int_t)done));
 	lParams.append(new KviKvsVariant((kvs_int_t)total));
-	callFunction(this, "dataReadProgressEvent", 0, &lParams);
+	callFunction(this, "dataReadProgressEvent", nullptr, &lParams);
 }
 bool KvsObject_http::functionDataReadProgressEvent(KviKvsObjectFunctionCall * c)
 {
@@ -441,7 +441,7 @@ void KvsObject_http::slotDataSendProgress(int done, int total)
 	KviKvsVariantList lParams;
 	lParams.append(new KviKvsVariant((kvs_int_t)done));
 	lParams.append(new KviKvsVariant((kvs_int_t)total));
-	callFunction(this, "dataSendProgressEvent", 0, &lParams);
+	callFunction(this, "dataSendProgressEvent", nullptr, &lParams);
 }
 bool KvsObject_http::functionDataSendProgressEvent(KviKvsObjectFunctionCall * c)
 {
@@ -457,7 +457,7 @@ void KvsObject_http::slotDone(bool error)
 {
 	KviKvsVariantList lParams;
 	lParams.append(new KviKvsVariant(error));
-	callFunction(this, "doneEvent", 0, &lParams);
+	callFunction(this, "doneEvent", nullptr, &lParams);
 }
 
 bool KvsObject_http::functionResponseHeaderReceivedEvent(KviKvsObjectFunctionCall * c)
@@ -474,7 +474,7 @@ void KvsObject_http::redirect(QString & file, const QHttpResponseHeader & r)
 {
 	QUrl url(r.value("location"));
 	m_pHttp->setHost(url.host());
-	QFile * pFile = 0;
+	QFile * pFile = nullptr;
 	pFile = new QFile(file);
 	pFile->open(QIODevice::WriteOnly);
 	int id = m_pHttp->get(url.path(), pFile);
@@ -512,7 +512,7 @@ void KvsObject_http::slotResponseHeaderReceived(const QHttpResponseHeader & r)
 	}
 	KviKvsVariantList lParams;
 	lParams.append(new KviKvsVariant(szResponse));
-	callFunction(this, "responseHeaderReceivedEvent", 0, &lParams);
+	callFunction(this, "responseHeaderReceivedEvent", nullptr, &lParams);
 }
 void KvsObject_http::slotReadyRead(const QHttpResponseHeader & r)
 {
@@ -540,7 +540,7 @@ void KvsObject_http::slotReadyRead(const QHttpResponseHeader & r)
 	}
 	KviKvsVariantList lParams;
 	lParams.append(new KviKvsVariant(szResponse));
-	callFunction(this, "readyreadEvent", 0, &lParams);
+	callFunction(this, "readyreadEvent", nullptr, &lParams);
 }
 
 void KvsObject_http::slotStateChanged(int state)
@@ -563,7 +563,7 @@ void KvsObject_http::slotStateChanged(int state)
 		szState = "Closing";
 	KviKvsVariantList lParams;
 	lParams.append(new KviKvsVariant(szState));
-	callFunction(this, "stateChangedEvent", 0, &lParams);
+	callFunction(this, "stateChangedEvent", nullptr, &lParams);
 }
 bool KvsObject_http::functionStateChangedEvent(KviKvsObjectFunctionCall * c)
 {
@@ -581,7 +581,7 @@ bool KvsObject_http::functionIgnoreSslErrors(KviKvsObjectFunctionCall *)
 }
 void KvsObject_http::slotSslErrors(QList<QSslError> sslerrors)
 {
-	KviKvsArray * pArray = 0;
+	KviKvsArray * pArray = nullptr;
 	pArray = new KviKvsArray();
 	for(int i = 0; i < sslerrors.count(); i++)
 	{
@@ -589,7 +589,7 @@ void KvsObject_http::slotSslErrors(QList<QSslError> sslerrors)
 	}
 	KviKvsVariantList lParams;
 	lParams.append(new KviKvsVariant(pArray));
-	callFunction(this, "sslErrorEvent", 0, &lParams);
+	callFunction(this, "sslErrorEvent", nullptr, &lParams);
 }
 
 bool KvsObject_http::functionSslErrorsEvent(KviKvsObjectFunctionCall * c)
diff --git a/src/modules/objects/KvsObject_label.cpp b/src/modules/objects/KvsObject_label.cpp
index 3c3baff78..6d9ebf848 100644
--- a/src/modules/objects/KvsObject_label.cpp
+++ b/src/modules/objects/KvsObject_label.cpp
@@ -245,13 +245,13 @@ KVSO_CLASS_FUNCTION(label, setAlignment)
 	KVSO_PARAMETER("alignment", KVS_PT_STRINGLIST, KVS_PF_OPTIONAL, alignment)
 	KVSO_PARAMETERS_END(c)
 	int align, sum = 0;
-	for(QStringList::Iterator it = alignment.begin(); it != alignment.end(); ++it)
+	for(auto & it : alignment)
 	{
 
 		align = 0;
 		for(unsigned int j = 0; j < align_num; j++)
 		{
-			if(KviQString::equalCI((*it), align_tbl[j]))
+			if(KviQString::equalCI(it, align_tbl[j]))
 			{
 				align = align_cod[j];
 				break;
@@ -260,7 +260,7 @@ KVSO_CLASS_FUNCTION(label, setAlignment)
 		if(align)
 			sum = sum | align;
 		else
-			c->warning(__tr2qs_ctx("Unknown alignment '%Q'", "objects"), &(*it));
+			c->warning(__tr2qs_ctx("Unknown alignment '%Q'", "objects"), &it);
 	}
 	((QLabel *)widget())->setAlignment((Qt::Alignment)sum);
 	return true;
@@ -300,12 +300,12 @@ KVSO_CLASS_FUNCTION(label, setFrameStyle)
 	if(!widget())
 		return true;
 	int framestyle, sum = 0;
-	for(QStringList::Iterator it = style.begin(); it != style.end(); ++it)
+	for(auto & it : style)
 	{
 		framestyle = 0;
 		for(unsigned int j = 0; j < align_num; j++)
 		{
-			if(KviQString::equalCI((*it), frame_tbl[j]))
+			if(KviQString::equalCI(it, frame_tbl[j]))
 			{
 				framestyle = frame_cod[j];
 				break;
@@ -314,7 +314,7 @@ KVSO_CLASS_FUNCTION(label, setFrameStyle)
 		if(framestyle)
 			sum = sum | framestyle;
 		else
-			c->warning(__tr2qs_ctx("Unknown style '%Q'", "objects"), &(*it));
+			c->warning(__tr2qs_ctx("Unknown style '%Q'", "objects"), &it);
 	}
 	((QLabel *)widget())->setFrameStyle(sum);
 	return true;
diff --git a/src/modules/objects/KvsObject_lineEdit.cpp b/src/modules/objects/KvsObject_lineEdit.cpp
index a843a6928..db302cc8c 100644
--- a/src/modules/objects/KvsObject_lineEdit.cpp
+++ b/src/modules/objects/KvsObject_lineEdit.cpp
@@ -225,14 +225,14 @@ KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_lineEdit, setInputValidator)
 KVSO_END_REGISTERCLASS(KvsObject_lineEdit)
 
 KVSO_BEGIN_CONSTRUCTOR(KvsObject_lineEdit, KvsObject_widget)
-m_pCompleter = 0;
+m_pCompleter = nullptr;
 KVSO_END_CONSTRUCTOR(KvsObject_lineEdit)
 
 KVSO_BEGIN_DESTRUCTOR(KvsObject_lineEdit)
 if(m_pCompleter)
 {
 	delete m_pCompleter;
-	m_pCompleter = 0;
+	m_pCompleter = nullptr;
 }
 KVSO_END_CONSTRUCTOR(KvsObject_lineEdit)
 
@@ -496,7 +496,7 @@ KVSO_CLASS_FUNCTION(lineEdit, enableCompleter)
 KVSO_CLASS_FUNCTION(lineEdit, disableCompleter)
 {
 	CHECK_INTERNAL_POINTER(widget())
-	((QLineEdit *)widget())->setCompleter(0);
+	((QLineEdit *)widget())->setCompleter(nullptr);
 	return true;
 }
 KVSO_CLASS_FUNCTION(lineEdit, unsetCompleter)
@@ -504,9 +504,9 @@ KVSO_CLASS_FUNCTION(lineEdit, unsetCompleter)
 	CHECK_INTERNAL_POINTER(widget())
 	if(m_pCompleter)
 	{
-		((QLineEdit *)widget())->setCompleter(0);
+		((QLineEdit *)widget())->setCompleter(nullptr);
 		delete m_pCompleter;
-		m_pCompleter = 0;
+		m_pCompleter = nullptr;
 	}
 	return true;
 }
@@ -519,7 +519,7 @@ KVSO_CLASS_FUNCTION(lineEdit, returnPressedEvent)
 
 void KvsObject_lineEdit::slotreturnPressed()
 {
-	KviKvsVariantList * params = 0;
+	KviKvsVariantList * params = nullptr;
 	callFunction(this, "returnPressedEvent", params);
 }
 
@@ -531,7 +531,7 @@ KVSO_CLASS_FUNCTION(lineEdit, lostFocusEvent)
 
 void KvsObject_lineEdit::slotlostFocus()
 {
-	KviKvsVariantList * params = 0;
+	KviKvsVariantList * params = nullptr;
 	callFunction(this, "lostFocusEvent", params);
 }
 
diff --git a/src/modules/objects/KvsObject_list.cpp b/src/modules/objects/KvsObject_list.cpp
index f5996d173..25ccf5dfc 100644
--- a/src/modules/objects/KvsObject_list.cpp
+++ b/src/modules/objects/KvsObject_list.cpp
@@ -146,7 +146,7 @@ KVSO_END_CONSTRUCTOR(KvsObject_list)
 
 KVSO_BEGIN_DESTRUCTOR(KvsObject_list)
 delete m_pDataList;
-m_pDataList = 0;
+m_pDataList = nullptr;
 KVSO_END_CONSTRUCTOR(KvsObject_list)
 
 KVSO_CLASS_FUNCTION(list, current)
@@ -168,35 +168,35 @@ KVSO_CLASS_FUNCTION(list, current)
 KVSO_CLASS_FUNCTION(list, eof)
 {
 	CHECK_INTERNAL_POINTER(m_pDataList)
-	c->returnValue()->setBoolean(m_pDataList->current() != 0);
+	c->returnValue()->setBoolean(m_pDataList->current() != nullptr);
 	return true;
 }
 
 KVSO_CLASS_FUNCTION(list, moveLast)
 {
 	CHECK_INTERNAL_POINTER(m_pDataList)
-	c->returnValue()->setBoolean(m_pDataList->last() != 0);
+	c->returnValue()->setBoolean(m_pDataList->last() != nullptr);
 	return true;
 }
 
 KVSO_CLASS_FUNCTION(list, movePrev)
 {
 	CHECK_INTERNAL_POINTER(m_pDataList)
-	c->returnValue()->setBoolean(m_pDataList->prev() != 0);
+	c->returnValue()->setBoolean(m_pDataList->prev() != nullptr);
 	return true;
 }
 
 KVSO_CLASS_FUNCTION(list, moveNext)
 {
 	CHECK_INTERNAL_POINTER(m_pDataList)
-	c->returnValue()->setBoolean(m_pDataList->next() != 0);
+	c->returnValue()->setBoolean(m_pDataList->next() != nullptr);
 	return true;
 }
 
 KVSO_CLASS_FUNCTION(list, moveFirst)
 {
 	CHECK_INTERNAL_POINTER(m_pDataList)
-	c->returnValue()->setBoolean(m_pDataList->first() != 0);
+	c->returnValue()->setBoolean(m_pDataList->first() != nullptr);
 	return true;
 }
 
diff --git a/src/modules/objects/KvsObject_listWidget.cpp b/src/modules/objects/KvsObject_listWidget.cpp
index 80115a989..807eed373 100644
--- a/src/modules/objects/KvsObject_listWidget.cpp
+++ b/src/modules/objects/KvsObject_listWidget.cpp
@@ -349,7 +349,7 @@ KVSO_CLASS_FUNCTION(listWidget, setIcon)
 	if(!pItem)
 		return true;
 
-	QPixmap * pix = 0;
+	QPixmap * pix = nullptr;
 	if(vPixmap->isEmpty())
 	{
 		pItem->setIcon(QIcon());
@@ -696,26 +696,26 @@ KVSO_CLASS_FUNCTION(listWidget, itemEnteredEvent)
 void KvsObject_listWidget::currentItemChanged(QListWidgetItem * currentItem, QListWidgetItem *)
 {
 	if(!currentItem)
-		callFunction(this, "currentItemChangedEvent", 0, 0);
+		callFunction(this, "currentItemChangedEvent", nullptr, nullptr);
 	else
 	{
 		KviKvsVariantList params(new KviKvsVariant(currentItem->text()));
-		callFunction(this, "currentItemChangedEvent", 0, &params);
+		callFunction(this, "currentItemChangedEvent", nullptr, &params);
 	}
 }
 void KvsObject_listWidget::selectionChanged()
 {
-	callFunction(this, "selectionChangedEvent", 0, 0);
+	callFunction(this, "selectionChangedEvent", nullptr, nullptr);
 }
 
 void KvsObject_listWidget::slotItemEntered(QListWidgetItem * item)
 {
 	KviKvsVariantList params(new KviKvsVariant((kvs_int_t)((QListWidget *)widget())->row(item)));
-	callFunction(this, "itemEnteredEvent", 0, &params);
+	callFunction(this, "itemEnteredEvent", nullptr, &params);
 }
 
 void KvsObject_listWidget::slotItemChanged(QListWidgetItem * item)
 {
 	KviKvsVariantList params(new KviKvsVariant((kvs_int_t)((QListWidget *)widget())->row(item)));
-	callFunction(this, "itemChangedEvent", 0, &params);
+	callFunction(this, "itemChangedEvent", nullptr, &params);
 }
diff --git a/src/modules/objects/KvsObject_painter.cpp b/src/modules/objects/KvsObject_painter.cpp
index 1ab46746c..bc16dc8a7 100644
--- a/src/modules/objects/KvsObject_painter.cpp
+++ b/src/modules/objects/KvsObject_painter.cpp
@@ -611,10 +611,10 @@ KVSO_BEGIN_CONSTRUCTOR(KvsObject_painter, KviKvsObject)
 
 m_pPainter = new QPainter();
 bDonotdeleteinternalqpainter = false;
-m_pPrinter = 0;
-m_pDeviceObject = 0;
-m_pPainterPath = 0;
-m_pGradient = 0;
+m_pPrinter = nullptr;
+m_pDeviceObject = nullptr;
+m_pPainterPath = nullptr;
+m_pGradient = nullptr;
 
 KVSO_END_CONSTRUCTOR(KvsObject_painter)
 
@@ -622,16 +622,16 @@ KVSO_BEGIN_DESTRUCTOR(KvsObject_painter)
 
 if(m_pPainterPath)
 	delete m_pPainterPath;
-m_pPainterPath = 0;
+m_pPainterPath = nullptr;
 if(m_pGradient)
 	delete m_pGradient;
-m_pGradient = 0;
+m_pGradient = nullptr;
 if(m_pPainter && !bDonotdeleteinternalqpainter)
 	delete m_pPainter;
-m_pPainter = 0;
+m_pPainter = nullptr;
 if(m_pPrinter)
 	delete m_pPrinter;
-m_pPrinter = 0;
+m_pPrinter = nullptr;
 
 KVSO_END_CONSTRUCTOR(KvsObject_painter)
 
@@ -1193,7 +1193,7 @@ KVSO_CLASS_FUNCTION(painter, begin)
 			}
 			else
 			{
-				QPrintDialog printDialog(m_pPrinter, 0);
+				QPrintDialog printDialog(m_pPrinter, nullptr);
 				if(printDialog.exec() == QDialog::Accepted)
 				{
 					qDebug("papersize %d", m_pPrinter->paperSize());
@@ -1202,7 +1202,7 @@ KVSO_CLASS_FUNCTION(painter, begin)
 				}
 				else
 				{
-					m_pPrinter = 0;
+					m_pPrinter = nullptr;
 					return true;
 				}
 			}
@@ -1267,9 +1267,9 @@ void KvsObject_painter::detachDevice()
 	if(m_pPrinter)
 	{
 		delete m_pPrinter;
-		m_pPrinter = 0;
+		m_pPrinter = nullptr;
 	}
-	m_pDeviceObject = 0;
+	m_pDeviceObject = nullptr;
 }
 
 KVSO_CLASS_FUNCTION(painter, end)
@@ -1282,7 +1282,7 @@ KVSO_CLASS_FUNCTION(painter, end)
 		if(m_pPrinter)
 		{
 			delete m_pPrinter;
-			m_pPrinter = 0;
+			m_pPrinter = nullptr;
 		}
 	}
 	else
@@ -1323,12 +1323,12 @@ KVSO_CLASS_FUNCTION(painter, drawText)
 	int align, sum = 0;
 	if(szAlignList.count())
 	{
-		for(QStringList::Iterator it = szAlignList.begin(); it != szAlignList.end(); ++it)
+		for(auto & it : szAlignList)
 		{
 			align = 0;
 			for(unsigned int j = 0; j < align_num; j++)
 			{
-				if(KviQString::equalCI((*it), align_tbl[j]))
+				if(KviQString::equalCI(it, align_tbl[j]))
 				{
 					align = align_cod[j];
 					break;
@@ -1337,7 +1337,7 @@ KVSO_CLASS_FUNCTION(painter, drawText)
 			if(align)
 				sum = sum | align;
 			else
-				c->warning(__tr2qs_ctx("Unknown alignment '%Q'", "objects"), &(*it));
+				c->warning(__tr2qs_ctx("Unknown alignment '%Q'", "objects"), &it);
 		}
 	}
 	QRect rect;
@@ -1964,7 +1964,7 @@ KVSO_CLASS_FUNCTION(painter, clearGradient)
 	Q_UNUSED(c);
 	if(!m_pGradient)
 		delete m_pGradient;
-	m_pGradient = 0;
+	m_pGradient = nullptr;
 	return true;
 }
 
@@ -2151,7 +2151,7 @@ KVSO_CLASS_FUNCTION(painter, resetPath)
 	if(m_pPainterPath)
 	{
 		delete m_pPainterPath;
-		m_pPainterPath = 0;
+		m_pPainterPath = nullptr;
 	}
 	return true;
 }
diff --git a/src/modules/objects/KvsObject_pixmap.cpp b/src/modules/objects/KvsObject_pixmap.cpp
index 8505b606f..fd618fcea 100644
--- a/src/modules/objects/KvsObject_pixmap.cpp
+++ b/src/modules/objects/KvsObject_pixmap.cpp
@@ -107,10 +107,10 @@ KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_pixmap, frameChangedEvent)
 KVSO_END_REGISTERCLASS(KvsObject_pixmap)
 
 KVSO_BEGIN_CONSTRUCTOR(KvsObject_pixmap, KviKvsObject)
-m_pAnimatedPixmap = 0;
+m_pAnimatedPixmap = nullptr;
 m_currentType = Image;
-m_pPixmap = 0;
-m_pImage = 0;
+m_pPixmap = nullptr;
+m_pImage = nullptr;
 KVSO_END_CONSTRUCTOR(KvsObject_pixmap)
 
 KVSO_BEGIN_DESTRUCTOR(KvsObject_pixmap)
@@ -181,17 +181,17 @@ KVSO_CLASS_FUNCTION(pixmap, fill)
 				m_pPixmap = new QPixmap();
 			*m_pPixmap = QPixmap::fromImage(*m_pImage);
 			delete m_pImage;
-			m_pImage = 0;
+			m_pImage = nullptr;
 		}
 		else
 		{
-			m_pPixmap = 0;
+			m_pPixmap = nullptr;
 		}
 	}
 	else if(m_currentType == AnimatedPixmap)
 	{
 		delete m_pAnimatedPixmap;
-		m_pAnimatedPixmap = 0;
+		m_pAnimatedPixmap = nullptr;
 	}
 	m_currentType = Pixmap;
 	if(!m_pPixmap)
@@ -213,7 +213,7 @@ KVSO_CLASS_FUNCTION(pixmap, resize)
 		if(m_pImage)
 		{
 			delete m_pImage;
-			m_pImage = 0;
+			m_pImage = nullptr;
 		}
 	}
 	else if(m_currentType == AnimatedPixmap)
@@ -221,7 +221,7 @@ KVSO_CLASS_FUNCTION(pixmap, resize)
 		if(m_pAnimatedPixmap)
 		{
 			delete m_pAnimatedPixmap;
-			m_pAnimatedPixmap = 0;
+			m_pAnimatedPixmap = nullptr;
 		}
 	}
 	else if(m_pPixmap)
@@ -339,7 +339,7 @@ KVSO_CLASS_FUNCTION(pixmap, pixel)
 		m_pImage = new QImage();
 		*m_pImage = m_pPixmap->toImage();
 		delete m_pPixmap;
-		m_pPixmap = 0;
+		m_pPixmap = nullptr;
 	}
 	m_currentType = Image;
 	QRgb rgb = m_pImage->pixel(iX, iY);
@@ -521,12 +521,12 @@ KVSO_CLASS_FUNCTION(pixmap, loadAnimation)
 	if(m_pAnimatedPixmap)
 	{
 		delete m_pAnimatedPixmap;
-		m_pAnimatedPixmap = 0;
+		m_pAnimatedPixmap = nullptr;
 	}
 	if(m_pPixmap)
 	{
 		delete m_pPixmap;
-		m_pPixmap = 0;
+		m_pPixmap = nullptr;
 	}
 	m_pAnimatedPixmap = new KviAnimatedPixmap(szFile);
 	connect(m_pAnimatedPixmap, SIGNAL(frameChanged()), this, SLOT(frameChanged()));
@@ -658,7 +658,7 @@ KVSO_CLASS_FUNCTION(pixmap, loadFromMemoryBuffer)
 	if(m_pAnimatedPixmap)
 	{
 		delete m_pAnimatedPixmap;
-		m_pAnimatedPixmap = 0;
+		m_pAnimatedPixmap = nullptr;
 	}
 	if(!m_pPixmap)
 		m_pPixmap = new QPixmap();
@@ -680,7 +680,7 @@ KVSO_CLASS_FUNCTION(pixmap, grabWidget)
 	if(m_pAnimatedPixmap)
 	{
 		delete m_pAnimatedPixmap;
-		m_pAnimatedPixmap = 0;
+		m_pAnimatedPixmap = nullptr;
 	}
 	if(!m_pPixmap)
 		m_pPixmap = new QPixmap();
@@ -744,6 +744,6 @@ KVSO_CLASS_FUNCTION(pixmap, frameChangedEvent)
 // slots
 void KvsObject_pixmap::frameChanged()
 {
-	KviKvsVariantList * params = 0;
+	KviKvsVariantList * params = nullptr;
 	callFunction(this, "frameChangedEvent", params);
 }
diff --git a/src/modules/objects/KvsObject_popupMenu.cpp b/src/modules/objects/KvsObject_popupMenu.cpp
index 9a5531835..f2075ab7c 100644
--- a/src/modules/objects/KvsObject_popupMenu.cpp
+++ b/src/modules/objects/KvsObject_popupMenu.cpp
@@ -232,8 +232,8 @@ KVSO_CLASS_FUNCTION(popupMenu, insertItem)
 	KVSO_PARAMETER("icon_id", KVS_PT_STRING, KVS_PF_OPTIONAL, szIcon)
 	KVSO_PARAMETERS_END(c)
 
-	QPixmap * pix = 0;
-	QAction * pAction = 0;
+	QPixmap * pix = nullptr;
+	QAction * pAction = nullptr;
 	if(!szIcon.isEmpty())
 	{
 		pix = g_pIconManager->getImage(szIcon);
diff --git a/src/modules/objects/KvsObject_process.cpp b/src/modules/objects/KvsObject_process.cpp
index 73a8ed92a..706454f37 100644
--- a/src/modules/objects/KvsObject_process.cpp
+++ b/src/modules/objects/KvsObject_process.cpp
@@ -308,12 +308,12 @@ KVSO_CLASS_FUNCTION(process, normalExit)
 
 void KvsObject_process::slotReadStdout()
 {
-	KviKvsVariantList * params = 0;
+	KviKvsVariantList * params = nullptr;
 	callFunction(this, "readyReadStdoutEvent", params);
 }
 
 void KvsObject_process::slotReadStderr()
 {
-	KviKvsVariantList * params = 0;
+	KviKvsVariantList * params = nullptr;
 	callFunction(this, "readyReadStderrEvent", params);
 }
diff --git a/src/modules/objects/KvsObject_socket.cpp b/src/modules/objects/KvsObject_socket.cpp
index 0d386d3cb..e72a369b4 100644
--- a/src/modules/objects/KvsObject_socket.cpp
+++ b/src/modules/objects/KvsObject_socket.cpp
@@ -664,13 +664,13 @@ void KvsObject_socket::slotReadyRead()
 
 void KvsObject_socket::slotConnected()
 {
-	KviKvsVariantList * lParams = 0;
+	KviKvsVariantList * lParams = nullptr;
 	callFunction(this, "connectedEvent", lParams);
 }
 
 void KvsObject_socket::slotDisconnected()
 {
-	KviKvsVariantList * lParams = 0;
+	KviKvsVariantList * lParams = nullptr;
 	callFunction(this, "disconnectedEvent", lParams);
 }
 
@@ -684,7 +684,7 @@ void KvsObject_socket::slotError(QAbstractSocket::SocketError socketError)
 
 void KvsObject_socket::slotHostFound()
 {
-	KviKvsVariantList * lParams = 0;
+	KviKvsVariantList * lParams = nullptr;
 	callFunction(this, "hostFoundEvent", lParams);
 }
 
diff --git a/src/modules/objects/KvsObject_sql.cpp b/src/modules/objects/KvsObject_sql.cpp
index e4de050f1..7fd68c240 100644
--- a/src/modules/objects/KvsObject_sql.cpp
+++ b/src/modules/objects/KvsObject_sql.cpp
@@ -133,13 +133,13 @@ KVSO_END_REGISTERCLASS(KvsObject_sql)
 
 KVSO_BEGIN_CONSTRUCTOR(KvsObject_sql, KviKvsObject)
 
-m_pCurrentSQlQuery = 0;
+m_pCurrentSQlQuery = nullptr;
 KVSO_END_CONSTRUCTOR(KvsObject_sql)
 
 KVSO_BEGIN_DESTRUCTOR(KvsObject_sql)
 if(m_pCurrentSQlQuery)
 	delete m_pCurrentSQlQuery;
-m_pCurrentSQlQuery = 0;
+m_pCurrentSQlQuery = nullptr;
 KVSO_END_DESTRUCTOR(KvsObject_sql)
 
 KVSO_CLASS_FUNCTION(sql, setConnection)
@@ -179,7 +179,7 @@ KVSO_CLASS_FUNCTION(sql, setConnection)
 		m_pCurrentSQlQuery = new QSqlQuery(db);
 	}
 	else
-		m_pCurrentSQlQuery = 0;
+		m_pCurrentSQlQuery = nullptr;
 	c->returnValue()->setBoolean(bOk);
 	return true;
 }
@@ -303,7 +303,7 @@ KVSO_CLASS_FUNCTION(sql, closeConnection)
 		if(m_pCurrentSQlQuery)
 		{
 			delete m_pCurrentSQlQuery;
-			m_pCurrentSQlQuery = 0;
+			m_pCurrentSQlQuery = nullptr;
 		}
 		QSqlDatabase::removeDatabase(szConnectionName);
 		return true;
@@ -311,7 +311,7 @@ KVSO_CLASS_FUNCTION(sql, closeConnection)
 	if(m_pCurrentSQlQuery)
 	{
 		delete m_pCurrentSQlQuery;
-		m_pCurrentSQlQuery = 0;
+		m_pCurrentSQlQuery = nullptr;
 	}
 	QSqlDatabase::removeDatabase(mSzConnectionName);
 	return true;
@@ -465,7 +465,7 @@ KVSO_CLASS_FUNCTION(sql, queryRecord)
 	QSqlRecord record = m_pCurrentSQlQuery->record();
 	for(int i = 0; i < record.count(); i++)
 	{
-		KviKvsVariant * pValue = 0;
+		KviKvsVariant * pValue = nullptr;
 		QVariant value = record.value(i);
 		if(value.type() == QVariant::LongLong)
 			pValue = new KviKvsVariant((kvs_int_t)value.toLongLong());
@@ -475,7 +475,7 @@ KVSO_CLASS_FUNCTION(sql, queryRecord)
 		{
 			KviKvsObjectClass * pClass = KviKvsKernel::instance()->objectController()->lookupClass("memoryBuffer");
 			KviKvsVariantList params(new KviKvsVariant(QString()));
-			KviKvsObject * pObject = pClass->allocateInstance(0, "", c->context(), &params);
+			KviKvsObject * pObject = pClass->allocateInstance(nullptr, "", c->context(), &params);
 			*((KvsObject_memoryBuffer *)pObject)->pBuffer() = value.toByteArray();
 			pValue = new KviKvsVariant(pObject->handle());
 		}
diff --git a/src/modules/objects/KvsObject_tabWidget.cpp b/src/modules/objects/KvsObject_tabWidget.cpp
index 018ed70b1..1029ecc62 100644
--- a/src/modules/objects/KvsObject_tabWidget.cpp
+++ b/src/modules/objects/KvsObject_tabWidget.cpp
@@ -250,7 +250,7 @@ KVSO_CLASS_FUNCTION(tabWidget, widgetAt)
 	KVSO_PARAMETER("index", KVS_PT_INTEGER, 0, iIndex)
 	KVSO_PARAMETERS_END(c)
 	if(iIndex >= tabsList.count() || iIndex < 0)
-		c->returnValue()->setHObject((kvs_hobject_t)0);
+		c->returnValue()->setHObject((kvs_hobject_t) nullptr);
 	else
 		c->returnValue()->setHObject(tabsList.at(iIndex));
 	return true;
diff --git a/src/modules/objects/KvsObject_tableWidget.cpp b/src/modules/objects/KvsObject_tableWidget.cpp
index 63e9cd49e..901994049 100644
--- a/src/modules/objects/KvsObject_tableWidget.cpp
+++ b/src/modules/objects/KvsObject_tableWidget.cpp
@@ -477,7 +477,7 @@ KVSO_CLASS_FUNCTION(tableWidget, setIcon)
 	KVSO_PARAMETER("col", KVS_PT_UNSIGNEDINTEGER, 0, uCol)
 	KVSO_PARAMETER("icon", KVS_PT_VARIANT, 0, vPixmap)
 	KVSO_PARAMETERS_END(c)
-	QPixmap * pix = 0;
+	QPixmap * pix = nullptr;
 	if(vPixmap->isHObject())
 	{
 		vPixmap->asHObject(obHpixmap);
@@ -809,7 +809,7 @@ KVSO_CLASS_FUNCTION(tableWidget, setItemFlags)
 void KvsObject_tableWidget::slotItemEntered(QTableWidgetItem * i)
 {
 	KviKvsVariantList params(new KviKvsVariant((kvs_int_t)i->row()), new KviKvsVariant((kvs_int_t)i->column()));
-	callFunction(this, "itemEnteredEvent", 0, &params);
+	callFunction(this, "itemEnteredEvent", nullptr, &params);
 }
 
 KVSO_CLASS_FUNCTION(tableWidget, itemEnteredEvent)
@@ -821,7 +821,7 @@ KVSO_CLASS_FUNCTION(tableWidget, itemEnteredEvent)
 void KvsObject_tableWidget::cellActivated(int iRow, int iCol)
 {
 	KviKvsVariantList params(new KviKvsVariant((kvs_int_t)iRow), new KviKvsVariant((kvs_int_t)iCol));
-	callFunction(this, "cellActivatedEvent", 0, &params);
+	callFunction(this, "cellActivatedEvent", nullptr, &params);
 }
 
 KVSO_CLASS_FUNCTION(tableWidget, cellActivatedEvent)
@@ -833,7 +833,7 @@ KVSO_CLASS_FUNCTION(tableWidget, cellActivatedEvent)
 void KvsObject_tableWidget::cellDoubleClicked(int iRow, int iCol)
 {
 	KviKvsVariantList params(new KviKvsVariant((kvs_int_t)iRow), new KviKvsVariant((kvs_int_t)iCol));
-	callFunction(this, "cellDoubleClickedEvent", 0, &params);
+	callFunction(this, "cellDoubleClickedEvent", nullptr, &params);
 }
 
 KVSO_CLASS_FUNCTION(tableWidget, cellDoubleClickedEvent)
@@ -846,7 +846,7 @@ bool KvsObject_tableWidget::paint(QPainter * p, const QStyleOptionViewItem & opt
 	p->save();
 	KviKvsObjectClass * pClass = KviKvsKernel::instance()->objectController()->lookupClass("painter");
 	KviKvsVariantList params;
-	KviKvsObject * pObject = pClass->allocateInstance(0, "internalpainter", m_pContext, &params);
+	KviKvsObject * pObject = pClass->allocateInstance(nullptr, "internalpainter", m_pContext, &params);
 	((KvsObject_painter *)pObject)->setInternalPainter(p);
 	p->setClipRect(option.rect);
 	p->translate(option.rect.x(), option.rect.y());
@@ -872,8 +872,7 @@ KviCellItemDelegate::KviCellItemDelegate(QAbstractItemView * pWidget, KvsObject_
 }
 
 KviCellItemDelegate::~KviCellItemDelegate()
-{
-}
+    = default;
 
 void KviCellItemDelegate::paint(QPainter * pPainter, const QStyleOptionViewItem & option, const QModelIndex & index) const
 {
diff --git a/src/modules/objects/KvsObject_textBrowser.cpp b/src/modules/objects/KvsObject_textBrowser.cpp
index be89766f2..97263b046 100644
--- a/src/modules/objects/KvsObject_textBrowser.cpp
+++ b/src/modules/objects/KvsObject_textBrowser.cpp
@@ -138,7 +138,7 @@ KVSO_CLASS_FUNCTION(textBrowser, reload)
 void KvsObject_textBrowser::anchorClicked(const QUrl & url)
 {
 	KviKvsVariantList parms(new KviKvsVariant(url.path()));
-	callFunction(this, "linkClickedEvent", 0, &parms);
+	callFunction(this, "linkClickedEvent", nullptr, &parms);
 }
 
 KVSO_CLASS_FUNCTION(textBrowser, linkClickedEvent)
diff --git a/src/modules/objects/KvsObject_toolButton.cpp b/src/modules/objects/KvsObject_toolButton.cpp
index 6ada08c2d..fa0be17eb 100644
--- a/src/modules/objects/KvsObject_toolButton.cpp
+++ b/src/modules/objects/KvsObject_toolButton.cpp
@@ -334,6 +334,6 @@ KVSO_CLASS_FUNCTION(toolButton, clickEvent)
 
 void KvsObject_toolButton::slotClicked()
 {
-	KviKvsVariantList * params = 0;
+	KviKvsVariantList * params = nullptr;
 	callFunction(this, "clickEvent", params);
 }
diff --git a/src/modules/objects/KvsObject_trayIcon.cpp b/src/modules/objects/KvsObject_trayIcon.cpp
index 2b0211c76..127be0065 100644
--- a/src/modules/objects/KvsObject_trayIcon.cpp
+++ b/src/modules/objects/KvsObject_trayIcon.cpp
@@ -105,7 +105,7 @@ KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_trayIcon, messageClickedEvent)
 KVSO_END_REGISTERCLASS(KvsObject_trayIcon)
 
 KVSO_BEGIN_CONSTRUCTOR(KvsObject_trayIcon, KviKvsObject)
-m_pTrayIcon = new QSystemTrayIcon(0);
+m_pTrayIcon = new QSystemTrayIcon(nullptr);
 connect(m_pTrayIcon, SIGNAL(activated(QSystemTrayIcon::ActivationReason)), this, SLOT(slotActivated(QSystemTrayIcon::ActivationReason)));
 connect(m_pTrayIcon, SIGNAL(messageClicked()), this, SLOT(slotMessageClicked()));
 
@@ -221,8 +221,8 @@ KVSO_CLASS_FUNCTION(trayIcon, messageClickedEvent)
 }
 void KvsObject_trayIcon::slotMessageClicked()
 {
-	KviKvsVariantList * lParams = 0;
-	callFunction(this, "messageClickedEvent", 0, lParams);
+	KviKvsVariantList * lParams = nullptr;
+	callFunction(this, "messageClickedEvent", nullptr, lParams);
 }
 
 void KvsObject_trayIcon::slotActivated(QSystemTrayIcon::ActivationReason reason)
@@ -240,5 +240,5 @@ void KvsObject_trayIcon::slotActivated(QSystemTrayIcon::ActivationReason reason)
 		szReason = "MiddleClick";
 	KviKvsVariantList lParams;
 	lParams.append(new KviKvsVariant(szReason));
-	callFunction(this, "activatedEvent", 0, &lParams);
+	callFunction(this, "activatedEvent", nullptr, &lParams);
 }
diff --git a/src/modules/objects/KvsObject_treeWidget.cpp b/src/modules/objects/KvsObject_treeWidget.cpp
index d8be9006e..113b300f8 100644
--- a/src/modules/objects/KvsObject_treeWidget.cpp
+++ b/src/modules/objects/KvsObject_treeWidget.cpp
@@ -254,7 +254,7 @@ KVSO_CLASS_FUNCTION(treeWidget, topLevelItem)
 	KVSO_PARAMETERS_END(c)
 	QTreeWidgetItem * pItem = ((QTreeWidget *)widget())->topLevelItem(iIdx);
 	if(!pItem)
-		c->returnValue()->setHObject((kvs_hobject_t)0);
+		c->returnValue()->setHObject((kvs_hobject_t) nullptr);
 	else
 		c->returnValue()->setHObject(KvsObject_treeWidgetItem::itemToHandle(pItem));
 	return true;
@@ -271,7 +271,7 @@ KVSO_CLASS_FUNCTION(treeWidget, itemAt)
 	QPoint pPoint = ((QTreeWidget *)widget())->viewport()->mapFromGlobal(QPoint(iXpos, iYpos));
 	QTreeWidgetItem * pItem = ((QTreeWidget *)widget())->itemAt(pPoint);
 	if(!pItem)
-		c->returnValue()->setHObject((kvs_hobject_t)0);
+		c->returnValue()->setHObject((kvs_hobject_t) nullptr);
 	else
 		c->returnValue()->setHObject(KvsObject_treeWidgetItem::itemToHandle(pItem));
 	return true;
@@ -335,7 +335,7 @@ KVSO_CLASS_FUNCTION(treeWidget, selectedItems)
 			pArray->set(i, new KviKvsVariant(KvsObject_treeWidgetItem::itemToHandle((QTreeWidgetItem *)list.at(i))));
 	}
 	else
-		c->returnValue()->setHObject((kvs_hobject_t)0);
+		c->returnValue()->setHObject((kvs_hobject_t) nullptr);
 	return true;
 }
 
@@ -344,7 +344,7 @@ KVSO_CLASS_FUNCTION(treeWidget, firstChild)
 	if(widget())
 		c->returnValue()->setHObject(KvsObject_treeWidgetItem::itemToHandle((QTreeWidgetItem *)((QTreeWidget *)widget())->topLevelItem(0)));
 	else
-		c->returnValue()->setHObject((kvs_hobject_t)0);
+		c->returnValue()->setHObject((kvs_hobject_t) nullptr);
 	return true;
 }
 
@@ -353,7 +353,7 @@ KVSO_CLASS_FUNCTION(treeWidget, currentItem)
 	if(widget())
 		c->returnValue()->setHObject(KvsObject_treeWidgetItem::itemToHandle((QTreeWidgetItem *)((QTreeWidget *)widget())->currentItem()));
 	else
-		c->returnValue()->setHObject((kvs_hobject_t)0);
+		c->returnValue()->setHObject((kvs_hobject_t) nullptr);
 	return true;
 }
 /*
@@ -484,7 +484,7 @@ void KvsObject_treeWidget::slotClicked(QTreeWidgetItem * i, int col)
 	KviKvsVariant * column = new KviKvsVariant((kvs_int_t)col);
 
 	KviKvsVariantList params(new KviKvsVariant(KvsObject_treeWidgetItem::itemToHandle(i)), column);
-	callFunction(this, "itemClickedEvent", 0, &params);
+	callFunction(this, "itemClickedEvent", nullptr, &params);
 }
 
 KVSO_CLASS_FUNCTION(treeWidget, selectionChangedEvent)
@@ -499,12 +499,12 @@ void KvsObject_treeWidget::slotSelectionChanged()
 	{
 		QTreeWidgetItem * it = (QTreeWidgetItem *)((QTreeWidget *)widget())->currentItem();
 		KviKvsVariantList params(new KviKvsVariant(KvsObject_treeWidgetItem::itemToHandle(it)));
-		callFunction(this, "selectionChangedEvent", 0, &params);
+		callFunction(this, "selectionChangedEvent", nullptr, &params);
 	}
 	else
 	{
-		KviKvsVariantList params(new KviKvsVariant((kvs_hobject_t)0));
-		callFunction(this, "selectionChangedEvent", 0, &params);
+		KviKvsVariantList params(new KviKvsVariant((kvs_hobject_t) nullptr));
+		callFunction(this, "selectionChangedEvent", nullptr, &params);
 	}
 }
 
@@ -517,7 +517,7 @@ KVSO_CLASS_FUNCTION(treeWidget, currentChangedEvent)
 void KvsObject_treeWidget::slotCurrentChanged(QTreeWidgetItem * i, QTreeWidgetItem * prev)
 {
 	KviKvsVariantList params(new KviKvsVariant(KvsObject_treeWidgetItem::itemToHandle(i)), new KviKvsVariant(KvsObject_treeWidgetItem::itemToHandle(prev)));
-	callFunction(this, "currentChangedEvent", 0, &params);
+	callFunction(this, "currentChangedEvent", nullptr, &params);
 }
 
 KVSO_CLASS_FUNCTION(treeWidget, itemActivatedEvent)
@@ -530,7 +530,7 @@ void KvsObject_treeWidget::slotItemActivated(QTreeWidgetItem * i, int col)
 {
 	KviKvsVariant * column = new KviKvsVariant((kvs_int_t)col);
 	KviKvsVariantList params(new KviKvsVariant(KvsObject_treeWidgetItem::itemToHandle(i)), column);
-	callFunction(this, "itemActivatedEvent", 0, &params);
+	callFunction(this, "itemActivatedEvent", nullptr, &params);
 }
 
 KVSO_CLASS_FUNCTION(treeWidget, onItemEvent)
@@ -544,7 +544,7 @@ void KvsObject_treeWidget::slotOnItemEntered(QTreeWidgetItem * i, int col)
 	KviKvsVariant * column = new KviKvsVariant((kvs_int_t)col);
 
 	KviKvsVariantList params(new KviKvsVariant(KvsObject_treeWidgetItem::itemToHandle(i)), column);
-	callFunction(this, "onItemEvent", 0, &params);
+	callFunction(this, "onItemEvent", nullptr, &params);
 }
 
 KVSO_CLASS_FUNCTION(treeWidget, itemExpandedEvent)
@@ -556,7 +556,7 @@ KVSO_CLASS_FUNCTION(treeWidget, itemExpandedEvent)
 void KvsObject_treeWidget::slotItemExpanded(QTreeWidgetItem * i)
 {
 	KviKvsVariantList params(new KviKvsVariant(KvsObject_treeWidgetItem::itemToHandle(i)));
-	callFunction(this, "itemExpandedEvent", 0, &params);
+	callFunction(this, "itemExpandedEvent", nullptr, &params);
 }
 
 KVSO_CLASS_FUNCTION(treeWidget, itemCollapsedEvent)
@@ -568,7 +568,7 @@ KVSO_CLASS_FUNCTION(treeWidget, itemCollapsedEvent)
 void KvsObject_treeWidget::slotItemCollapsed(QTreeWidgetItem * i)
 {
 	KviKvsVariantList params(new KviKvsVariant(KvsObject_treeWidgetItem::itemToHandle(i)));
-	callFunction(this, "itemCollapsedEvent", 0, &params);
+	callFunction(this, "itemCollapsedEvent", nullptr, &params);
 }
 
 KVSO_CLASS_FUNCTION(treeWidget, itemChangedEvent)
@@ -581,14 +581,14 @@ void KvsObject_treeWidget::slotItemChanged(QTreeWidgetItem * item, int col)
 {
 	KviKvsVariant * column = new KviKvsVariant((kvs_int_t)col);
 	KviKvsVariantList params(new KviKvsVariant(KvsObject_treeWidgetItem::itemToHandle(item)), column);
-	callFunction(this, "itemChangedEvent", 0, &params);
+	callFunction(this, "itemChangedEvent", nullptr, &params);
 }
 
 void KvsObject_treeWidget::fileDropped(QString & szFile, QTreeWidgetItem * item)
 {
 	KviKvsVariant * file = new KviKvsVariant(szFile);
 	KviKvsVariantList params(new KviKvsVariant(KvsObject_treeWidgetItem::itemToHandle(item)), file);
-	callFunction(this, "fileDroppedEvent", 0, &params);
+	callFunction(this, "fileDroppedEvent", nullptr, &params);
 }
 
 KviKvsTreeWidget::KviKvsTreeWidget(QWidget * par, const char *, KvsObject_treeWidget * parent)
@@ -603,8 +603,7 @@ KviKvsTreeWidget::KviKvsTreeWidget(QWidget * par, const char *, KvsObject_treeWi
 }
 
 KviKvsTreeWidget::~KviKvsTreeWidget()
-{
-}
+    = default;
 
 void KviKvsTreeWidget::dragEnterEvent(QDragEnterEvent * e)
 {
diff --git a/src/modules/objects/KvsObject_treeWidgeteItem.cpp b/src/modules/objects/KvsObject_treeWidgeteItem.cpp
index ad4a37e26..508b1cf01 100644
--- a/src/modules/objects/KvsObject_treeWidgeteItem.cpp
+++ b/src/modules/objects/KvsObject_treeWidgeteItem.cpp
@@ -145,7 +145,7 @@ KVSO_END_REGISTERCLASS(KvsObject_treeWidgetItem)
 
 KVSO_BEGIN_CONSTRUCTOR(KvsObject_treeWidgetItem, KviKvsObject)
 
-m_pTreeWidgetItem = 0;
+m_pTreeWidgetItem = nullptr;
 
 KVSO_END_CONSTRUCTOR(KvsObject_treeWidgetItem)
 
@@ -183,9 +183,9 @@ bool KvsObject_treeWidgetItem::init(KviKvsRunTimeContext * pContext, KviKvsVaria
 
 void KvsObject_treeWidgetItem::childDestroyed()
 {
-	if(m_pTreeWidgetItem == 0)
+	if(m_pTreeWidgetItem == nullptr)
 		return;
-	m_pTreeWidgetItem = 0;
+	m_pTreeWidgetItem = nullptr;
 	die();
 }
 
@@ -208,11 +208,11 @@ KviKvsStandardTreeWidgetItem::~KviKvsStandardTreeWidgetItem()
 kvs_hobject_t KvsObject_treeWidgetItem::itemToHandle(QTreeWidgetItem * it)
 {
 	if(!it)
-		return (kvs_hobject_t)0;
+		return (kvs_hobject_t) nullptr;
 	KvsObject_treeWidgetItem * pObject;
 	pObject = ((KviKvsStandardTreeWidgetItem *)it)->masterObject();
 	if(!pObject)
-		return (kvs_hobject_t)0;
+		return (kvs_hobject_t) nullptr;
 	return pObject->handle();
 }
 
@@ -393,7 +393,7 @@ KVSO_CLASS_FUNCTION(treeWidgetItem, setPixmap)
 	KVSO_PARAMETER("column", KVS_PT_UNSIGNEDINTEGER, 0, uCol)
 	KVSO_PARAMETER("pixmap", KVS_PT_VARIANT, 0, vPixmap)
 	KVSO_PARAMETERS_END(c)
-	QPixmap * pix = 0;
+	QPixmap * pix = nullptr;
 	if(vPixmap->isEmpty())
 	{
 		m_pTreeWidgetItem->setIcon(uCol, QIcon());
diff --git a/src/modules/objects/KvsObject_vBox.cpp b/src/modules/objects/KvsObject_vBox.cpp
index a8a17d282..76f750fc1 100644
--- a/src/modules/objects/KvsObject_vBox.cpp
+++ b/src/modules/objects/KvsObject_vBox.cpp
@@ -192,13 +192,13 @@ KVSO_CLASS_FUNCTION(vBox, setAlignment)
 	}
 
 	int align, sum = 0;
-	for(QStringList::Iterator it = alignment.begin(); it != alignment.end(); ++it)
+	for(auto & it : alignment)
 	{
 
 		align = 0;
 		for(unsigned int j = 0; j < align_num; j++)
 		{
-			if(KviQString::equalCI((*it), align_tbl[j]))
+			if(KviQString::equalCI(it, align_tbl[j]))
 			{
 				align = align_cod[j];
 				break;
@@ -207,7 +207,7 @@ KVSO_CLASS_FUNCTION(vBox, setAlignment)
 		if(align)
 			sum = sum | align;
 		else
-			c->warning(__tr2qs_ctx("Unknown alignment: '%Q'", "objects"), &(*it));
+			c->warning(__tr2qs_ctx("Unknown alignment: '%Q'", "objects"), &it);
 	}
 	if(widget())
 		((KviTalHBox *)widget())->setAlignment(((QWidget *)(pObject->object())), (Qt::Alignment)sum);
diff --git a/src/modules/objects/KvsObject_webView.cpp b/src/modules/objects/KvsObject_webView.cpp
index 41a774b80..89d07f0fe 100644
--- a/src/modules/objects/KvsObject_webView.cpp
+++ b/src/modules/objects/KvsObject_webView.cpp
@@ -65,9 +65,9 @@ void KviKvsDownloadHandler::slotReplyFinished()
 	m_pParentScript->callFunction(m_pParentScript, "downloadCompletedEvent", &params);
 	m_pFile->close();
 	delete m_pFile;
-	m_pFile = 0;
+	m_pFile = nullptr;
 	m_pReply->deleteLater();
-	m_pReply = 0;
+	m_pReply = nullptr;
 	this->deleteLater();
 }
 
@@ -77,12 +77,12 @@ KviKvsDownloadHandler::~KviKvsDownloadHandler()
 	{
 		m_pFile->close();
 		delete m_pFile;
-		m_pFile = 0;
+		m_pFile = nullptr;
 	}
 	if(m_pReply)
 	{
 		delete m_pReply;
-		m_pReply = 0;
+		m_pReply = nullptr;
 	}
 }
 void KviKvsDownloadHandler::slotReadyRead()
@@ -449,7 +449,7 @@ QWebFrame * KvsObject_webView::findFrame(QWebFrame * pCurFrame, QString & szFram
 				return pCurFrame;
 		}
 	}
-	return 0;
+	return nullptr;
 }
 
 KVSO_CLASS_FUNCTION(webView, setLinkDelegationPolicy)
@@ -518,7 +518,7 @@ KVSO_CLASS_FUNCTION(webView, makePreview)
 	painter.end();
 	KviKvsObjectClass * pClass = KviKvsKernel::instance()->objectController()->lookupClass("pixmap");
 	KviKvsVariantList params;
-	KviKvsObject * pObject = pClass->allocateInstance(0, "internalpixmap", c->context(), &params);
+	KviKvsObject * pObject = pClass->allocateInstance(nullptr, "internalpixmap", c->context(), &params);
 	((KvsObject_pixmap *)pObject)->setInternalImage(pImage);
 	c->returnValue()->setHObject(pObject->handle());
 	return true;
@@ -821,12 +821,12 @@ KVSO_CLASS_FUNCTION(webView, findText)
 	KVSO_PARAMETERS_END(c)
 	int findflag = 0;
 	int sum = 0;
-	for(QStringList::Iterator it = szFindFlag.begin(); it != szFindFlag.end(); ++it)
+	for(auto & it : szFindFlag)
 	{
 		findflag = 0;
 		for(unsigned int j = 0; j < findflag_num; j++)
 		{
-			if(KviQString::equalCI((*it), findflag_tbl[j]))
+			if(KviQString::equalCI(it, findflag_tbl[j]))
 			{
 				findflag = findflag_cod[j];
 				break;
@@ -835,7 +835,7 @@ KVSO_CLASS_FUNCTION(webView, findText)
 		if(findflag)
 			sum = sum | findflag;
 		else
-			c->warning(__tr2qs_ctx("Unknown findflag  '%Q'", "objects"), &(*it));
+			c->warning(__tr2qs_ctx("Unknown findflag  '%Q'", "objects"), &it);
 	}
 	((QWebView *)widget())->findText(szName, (QWebPage::FindFlags)findflag);
 	return true;
@@ -1169,7 +1169,7 @@ KVSO_CLASS_FUNCTION(webView, appendWebViewActionToMenu)
 		c->warning(__tr2qs_ctx("Can't add a non-popupmenu object", "objects"));
 		return true;
 	}
-	QAction * pAction = 0;
+	QAction * pAction = nullptr;
 	for(unsigned int i = 0; i < actions_num; i++)
 	{
 		if(KviQString::equalCI(szActionName, actions_tbl[i]))
@@ -1311,7 +1311,7 @@ void KvsObject_webView::slotLoadFinished(bool bOk)
 
 void KvsObject_webView::slotLoadStarted()
 {
-	KviKvsVariantList * lParams = 0;
+	KviKvsVariantList * lParams = nullptr;
 	callFunction(this, "loadStartedEvent", lParams);
 }
 
@@ -1413,6 +1413,5 @@ bool KviKvsWebView::event(QEvent * e)
 	return QWebView::event(e);
 }
 KviKvsWebView::~KviKvsWebView()
-{
-}
+    = default;
 #endif // COMPILE_WEBKIT_SUPPORT
diff --git a/src/modules/objects/KvsObject_widget.cpp b/src/modules/objects/KvsObject_widget.cpp
index c6fcfaca8..8f60a145e 100644
--- a/src/modules/objects/KvsObject_widget.cpp
+++ b/src/modules/objects/KvsObject_widget.cpp
@@ -66,8 +66,7 @@ KviKvsWidget::KviKvsWidget(KvsObject_widget * object, QWidget * par)
 }
 
 KviKvsWidget::~KviKvsWidget()
-{
-}
+    = default;
 
 QSize KviKvsWidget::sizeHint() const
 {
@@ -750,7 +749,7 @@ bool KvsObject_widget::eventFilter(QObject * o, QEvent * e)
 				QRect rect = ((QPaintEvent *)e)->rect();
 				KviKvsObjectClass * pClass = KviKvsKernel::instance()->objectController()->lookupClass("painter");
 				KviKvsVariantList params;
-				KviKvsObject * pObject = pClass->allocateInstance(0, "internalpainter", m_pContext, &params);
+				KviKvsObject * pObject = pClass->allocateInstance(nullptr, "internalpainter", m_pContext, &params);
 				QPainter p(widget());
 				((KvsObject_painter *)pObject)->setInternalPainter(&p);
 				p.setClipRect(rect);
@@ -870,7 +869,7 @@ bool KvsObject_widget::eventFilter(QObject * o, QEvent * e)
 				}
 
 				KviKvsVariantList params(new KviKvsVariant(tmp));
-				callFunction(this, "keyPressEvent", 0, &params);
+				callFunction(this, "keyPressEvent", nullptr, &params);
 			}
 			break;
 			case QEvent::MouseButtonPress:
@@ -926,7 +925,7 @@ bool KvsObject_widget::eventFilter(QObject * o, QEvent * e)
 				lParams.append(new KviKvsVariant((kvs_int_t)aparam));
 				lParams.append(new KviKvsVariant((kvs_int_t)((QMouseEvent *)e)->pos().x()));
 				lParams.append(new KviKvsVariant((kvs_int_t)((QMouseEvent *)e)->pos().y()));
-				if(!callFunction(this, "mouseDoubleClickEvent", 0, &lParams))
+				if(!callFunction(this, "mouseDoubleClickEvent", nullptr, &lParams))
 					brokenhandler = true; // ignore results of a broken event handler
 			}
 
@@ -936,16 +935,16 @@ bool KvsObject_widget::eventFilter(QObject * o, QEvent * e)
 				KviKvsVariantList lParams;
 				lParams.append(new KviKvsVariant((kvs_int_t)((QMouseEvent *)e)->pos().x()));
 				lParams.append(new KviKvsVariant((kvs_int_t)((QMouseEvent *)e)->pos().y()));
-				if(!callFunction(this, "mouseMoveEvent", 0, &lParams))
+				if(!callFunction(this, "mouseMoveEvent", nullptr, &lParams))
 					brokenhandler = true; // ignore results of a broken event handler
 			}
 			break;
 			case QEvent::FocusIn:
-				if(!callFunction(this, "focusInEvent", &oReturnBuffer, 0))
+				if(!callFunction(this, "focusInEvent", &oReturnBuffer, nullptr))
 					brokenhandler = true;
 				break;
 			case QEvent::FocusOut:
-				if(!callFunction(this, "focusOutEvent", &oReturnBuffer, 0))
+				if(!callFunction(this, "focusOutEvent", &oReturnBuffer, nullptr))
 					brokenhandler = true;
 				break;
 			case QEvent::Resize:
@@ -958,27 +957,27 @@ bool KvsObject_widget::eventFilter(QObject * o, QEvent * e)
 				break;
 			}
 			case QEvent::Move:
-				if(!callFunction(this, "moveEvent", &oReturnBuffer, 0))
+				if(!callFunction(this, "moveEvent", &oReturnBuffer, nullptr))
 					brokenhandler = true;
 				break;
 			case QEvent::Close:
-				if(!callFunction(this, "closeEvent", &oReturnBuffer, 0))
+				if(!callFunction(this, "closeEvent", &oReturnBuffer, nullptr))
 					brokenhandler = true;
 				break;
 			case QEvent::Enter:
-				if(!callFunction(this, "mouseEnterEvent", &oReturnBuffer, 0))
+				if(!callFunction(this, "mouseEnterEvent", &oReturnBuffer, nullptr))
 					brokenhandler = true;
 				break;
 			case QEvent::Leave:
-				if(!callFunction(this, "mouseLeaveEvent", &oReturnBuffer, 0))
+				if(!callFunction(this, "mouseLeaveEvent", &oReturnBuffer, nullptr))
 					brokenhandler = true;
 				break;
 			case QEvent::Show:
-				if(!callFunction(this, "showEvent", &oReturnBuffer, 0))
+				if(!callFunction(this, "showEvent", &oReturnBuffer, nullptr))
 					brokenhandler = true;
 				break;
 			case QEvent::Hide:
-				if(!callFunction(this, "hideEvent", &oReturnBuffer, 0))
+				if(!callFunction(this, "hideEvent", &oReturnBuffer, nullptr))
 					ret = false;
 				break;
 			default:
@@ -1434,7 +1433,7 @@ KVSO_CLASS_FUNCTION(widget, parentWidget)
 	if(parentScriptWidget())
 		c->returnValue()->setHObject(parentObject()->handle());
 	else
-		c->returnValue()->setHObject((kvs_hobject_t)0);
+		c->returnValue()->setHObject((kvs_hobject_t) nullptr);
 	return true;
 }
 
@@ -1733,10 +1732,10 @@ KVSO_CLASS_FUNCTION(widget, setWFlags)
 	KVSO_PARAMETERS_BEGIN(c)
 	KVSO_PARAMETER("widget_flags", KVS_PT_STRINGLIST, KVS_PF_OPTIONAL, wflags)
 	KVSO_PARAMETERS_END(c)
-	Qt::WindowFlags flag, sum = 0;
+	Qt::WindowFlags flag, sum = nullptr;
 	for(auto & it : wflags)
 	{
-		flag = 0;
+		flag = nullptr;
 		for(size_t j{}; j < widgettypes_num; j++)
 		{
 			if(KviQString::equalCI(it, widgettypes_tbl[j]))
@@ -1843,7 +1842,7 @@ KVSO_CLASS_FUNCTION(widget, setParent)
 
 	if(!ob)
 	{
-		widget()->setParent(0);
+		widget()->setParent(nullptr);
 		return true;
 	}
 	else if(!ob->object()->isWidgetType())
@@ -2066,7 +2065,7 @@ KVSO_CLASS_FUNCTION(widget, grab)
 	*pPixmap = QPixmap::grabWidget(((QWidget *)(ob->object())));
 	KviKvsObjectClass * pClass = KviKvsKernel::instance()->objectController()->lookupClass("pixmap");
 	KviKvsVariantList params;
-	KviKvsObject * pObject = pClass->allocateInstance(0, "internalpixmap", c->context(), &params);
+	KviKvsObject * pObject = pClass->allocateInstance(nullptr, "internalpixmap", c->context(), &params);
 	((KvsObject_pixmap *)pObject)->setInternalPixmap(pPixmap);
 	c->returnValue()->setHObject(pObject->handle());
 	return true;
diff --git a/src/modules/objects/KvsObject_window.cpp b/src/modules/objects/KvsObject_window.cpp
index 34ede2ed8..43fb2aea3 100644
--- a/src/modules/objects/KvsObject_window.cpp
+++ b/src/modules/objects/KvsObject_window.cpp
@@ -34,13 +34,12 @@
 KviKvsScriptWindowWindow::KviKvsScriptWindowWindow(const QString & szName)
     : KviWindow(KviWindow::ScriptObject, szName)
 {
-	m_pCentralWidget = 0;
-	m_pIcon = 0;
+	m_pCentralWidget = nullptr;
+	m_pIcon = nullptr;
 }
 
 KviKvsScriptWindowWindow::~KviKvsScriptWindowWindow()
-{
-}
+    = default;
 
 void KviKvsScriptWindowWindow::setCentralWidget(KvsObject_widget * o, QWidget * w)
 {
@@ -56,14 +55,14 @@ void KviKvsScriptWindowWindow::resizeEvent(QResizeEvent *)
 
 void KviKvsScriptWindowWindow::centralWidgetObjectDestroyed()
 {
-	m_pCentralWidget = 0;
-	m_pCentralWidgetObject = 0;
+	m_pCentralWidget = nullptr;
+	m_pCentralWidgetObject = nullptr;
 }
 
 void KviKvsScriptWindowWindow::centralWidgetDestroyed()
 {
-	m_pCentralWidget = 0;
-	m_pCentralWidgetObject = 0;
+	m_pCentralWidget = nullptr;
+	m_pCentralWidgetObject = nullptr;
 }
 
 QPixmap * KviKvsScriptWindowWindow::myIconPtr()
diff --git a/src/modules/objects/KvsObject_wizard.cpp b/src/modules/objects/KvsObject_wizard.cpp
index 509ae7ecd..f708ffcd1 100644
--- a/src/modules/objects/KvsObject_wizard.cpp
+++ b/src/modules/objects/KvsObject_wizard.cpp
@@ -315,14 +315,14 @@ KVSO_CLASS_FUNCTION(wizard, setFinishBtnText)
 }
 bool KvsObject_wizard::accept()
 {
-	KviKvsVariantList * pParams = 0;
-	callFunction(this, "acceptEvent", 0, pParams);
+	KviKvsVariantList * pParams = nullptr;
+	callFunction(this, "acceptEvent", nullptr, pParams);
 	return true;
 }
 bool KvsObject_wizard::reject()
 {
-	KviKvsVariantList * pParams = 0;
-	callFunction(this, "rejectEvent", 0, pParams);
+	KviKvsVariantList * pParams = nullptr;
+	callFunction(this, "rejectEvent", nullptr, pParams);
 	return true;
 }
 KVSO_CLASS_FUNCTION(wizard, nextClickedEvent)
@@ -333,7 +333,7 @@ KVSO_CLASS_FUNCTION(wizard, nextClickedEvent)
 
 void KvsObject_wizard::nextClicked()
 {
-	KviKvsVariantList * params = 0;
+	KviKvsVariantList * params = nullptr;
 	callFunction(this, "nextClickedEvent", params);
 }
 KVSO_CLASS_FUNCTION(wizard, backClickedEvent)
@@ -344,7 +344,7 @@ KVSO_CLASS_FUNCTION(wizard, backClickedEvent)
 
 void KvsObject_wizard::backClicked()
 {
-	KviKvsVariantList * params = 0;
+	KviKvsVariantList * params = nullptr;
 	callFunction(this, "backClickedEvent", params);
 }
 KviKvsMdmWizard::KviKvsMdmWizard(QWidget * par, const char * name, KvsObject_wizard * parent)
@@ -374,5 +374,4 @@ void KviKvsMdmWizard::slotBackClicked()
 	m_pParentScript->backClicked();
 }
 KviKvsMdmWizard::~KviKvsMdmWizard()
-{
-}
+    = default;
diff --git a/src/modules/objects/KvsObject_workspace.cpp b/src/modules/objects/KvsObject_workspace.cpp
index c0413f703..9d984c5c3 100644
--- a/src/modules/objects/KvsObject_workspace.cpp
+++ b/src/modules/objects/KvsObject_workspace.cpp
@@ -190,7 +190,7 @@ if(pWidgetDict)
 {
 	pWidgetDict->clear();
 	delete pWidgetDict;
-	pWidgetDict = 0;
+	pWidgetDict = nullptr;
 }
 KVSO_END_CONSTRUCTOR(KvsObject_workspace)
 
@@ -300,7 +300,7 @@ KVSO_CLASS_FUNCTION(workspace, activeWindow)
 		}
 	}
 	else
-		c->returnValue()->setHObject((kvs_hobject_t)0);
+		c->returnValue()->setHObject((kvs_hobject_t) nullptr);
 	return true;
 }
 
diff --git a/src/modules/objects/KvsObject_wrapper.cpp b/src/modules/objects/KvsObject_wrapper.cpp
index 585014d5e..e3c23c1aa 100644
--- a/src/modules/objects/KvsObject_wrapper.cpp
+++ b/src/modules/objects/KvsObject_wrapper.cpp
@@ -172,14 +172,14 @@ bool KvsObject_wrapper::init(KviKvsRunTimeContext * pContext, KviKvsVariantList
 	if(!pParams)
 		return false;
 
-	QWidget * pWidget = NULL;
+	QWidget * pWidget = nullptr;
 	unsigned int i = 0;
 
 	while(i < pParams->count())
 	{
 		QString szClass;
 		QString szName;
-		QString s = 0;
+		QString s = nullptr;
 
 		pParams->at(i)->asString(s);
 		i++;
@@ -283,7 +283,7 @@ QWidget * KvsObject_wrapper::findTopLevelWidgetToWrap(const QString & szClass, c
 {
 	QWidgetList list = g_pApp->topLevelWidgets();
 	if(list.isEmpty())
-		return NULL;
+		return nullptr;
 
 	Q_FOREACH(QWidget * w, list)
 	{
@@ -305,14 +305,14 @@ QWidget * KvsObject_wrapper::findTopLevelWidgetToWrap(const QString & szClass, c
 		}
 	}
 
-	return NULL;
+	return nullptr;
 }
 
 QWidget * KvsObject_wrapper::findWidgetToWrap(const QString & szClass, const QString & szName, QWidget * pParent, bool bRecursive)
 {
 	QList<QObject *> list = pParent->children();
 	if(list.isEmpty())
-		return NULL;
+		return nullptr;
 
 	Q_FOREACH(QObject * obj, list)
 	{
@@ -340,5 +340,5 @@ QWidget * KvsObject_wrapper::findWidgetToWrap(const QString & szClass, const QSt
 		}
 	}
 
-	return NULL;
+	return nullptr;
 }
diff --git a/src/modules/objects/KvsObject_xmlreader.cpp b/src/modules/objects/KvsObject_xmlreader.cpp
index 6cdd96b54..b7ebafe9f 100644
--- a/src/modules/objects/KvsObject_xmlreader.cpp
+++ b/src/modules/objects/KvsObject_xmlreader.cpp
@@ -130,9 +130,7 @@ public:
 	{
 		m_pReader = pReader;
 	}
-	~KviXmlHandler()
-	{
-	}
+	~KviXmlHandler() override = default;
 
 private:
 	bool kvsCodeFailure()
@@ -162,7 +160,7 @@ private:
 	}
 
 public:
-	virtual bool startDocument()
+	bool startDocument() override
 	{
 		KviKvsVariant ret;
 		if(!m_pReader->callFunction(m_pReader, "onDocumentStart", &ret))
@@ -170,7 +168,7 @@ public:
 		return handleKvsCallReturnValue(&ret);
 	}
 
-	virtual bool endDocument()
+	bool endDocument() override
 	{
 		KviKvsVariant ret;
 		if(!m_pReader->callFunction(m_pReader, "onDocumentEnd", &ret))
@@ -178,7 +176,7 @@ public:
 		return handleKvsCallReturnValue(&ret);
 	}
 
-	virtual bool startElement(const QString & szNamespaceUri, const QString & szLocalName, const QString & szQualifiedName, const QXmlAttributes & attrs)
+	bool startElement(const QString & szNamespaceUri, const QString & szLocalName, const QString & szQualifiedName, const QXmlAttributes & attrs) override
 	{
 		KviKvsVariant ret;
 		KviKvsVariantList par;
@@ -196,7 +194,7 @@ public:
 		return handleKvsCallReturnValue(&ret);
 	}
 
-	virtual bool endElement(const QString & szNamespaceUri, const QString & szLocalName, const QString & szQualifiedName)
+	bool endElement(const QString & szNamespaceUri, const QString & szLocalName, const QString & szQualifiedName) override
 	{
 		KviKvsVariant ret;
 		KviKvsVariantList par;
@@ -209,7 +207,7 @@ public:
 		return handleKvsCallReturnValue(&ret);
 	}
 
-	virtual bool characters(const QString & szChars)
+	bool characters(const QString & szChars) override
 	{
 		KviKvsVariant ret;
 		KviKvsVariantList par;
@@ -220,7 +218,7 @@ public:
 		return handleKvsCallReturnValue(&ret);
 	}
 
-	virtual bool warning(const QXmlParseException & exception)
+	bool warning(const QXmlParseException & exception) override
 	{
 		// recoverable
 		QString szMsg;
@@ -235,7 +233,7 @@ public:
 		return handleKvsCallReturnValue(&ret);
 	}
 
-	virtual bool error(const QXmlParseException & exception)
+	bool error(const QXmlParseException & exception) override
 	{
 		// recoverable
 		QString szMsg;
@@ -250,7 +248,7 @@ public:
 		return handleKvsCallReturnValue(&ret);
 	}
 
-	virtual bool fatalError(const QXmlParseException & exception)
+	bool fatalError(const QXmlParseException & exception) override
 	{
 		QString szMsg;
 		decodeException(szMsg, true, exception);
@@ -258,7 +256,7 @@ public:
 		return true;
 	}
 
-	virtual QString errorString() const
+	QString errorString() const override
 	{
 		return m_szErrorString;
 	}
diff --git a/src/modules/objects/libkviobjects.cpp b/src/modules/objects/libkviobjects.cpp
index 99c348974..8d741cf65 100644
--- a/src/modules/objects/libkviobjects.cpp
+++ b/src/modules/objects/libkviobjects.cpp
@@ -518,9 +518,8 @@ static bool objects_kvs_fnc_classes(KviKvsModuleFunctionCall * c)
 	QDir d(szPath);
 	QStringList sl;
 	sl = d.entryList(QDir::Files);
-	for(QStringList::Iterator it2 = sl.begin(); it2 != sl.end(); ++it2)
+	for(auto szName : sl)
 	{
-		QString szName = *it2;
 		szName.replace("--", "::");
 		if(szName != ".." && szName != ".")
 			classdict->insert(szName.left(szName.length() - 4), &bFake);
diff --git a/src/modules/objects/qtftp/qftp.cpp b/src/modules/objects/qtftp/qftp.cpp
index 626aaae70..565172619 100644
--- a/src/modules/objects/qtftp/qftp.cpp
+++ b/src/modules/objects/qtftp/qftp.cpp
@@ -69,7 +69,7 @@ class QFtpCommand
 {
 public:
 	QFtpCommand(QFtp::Command cmd, QStringList raw, const QByteArray & ba);
-	QFtpCommand(QFtp::Command cmd, QStringList raw, QIODevice * dev = 0);
+	QFtpCommand(QFtp::Command cmd, QStringList raw, QIODevice * dev = nullptr);
 	~QFtpCommand();
 
 	int id;
@@ -78,8 +78,7 @@ public:
 
 	// If is_ba is true, ba is used; ba is never 0.
 	// Otherwise dev is used; dev can be 0 or not.
-	union
-	{
+	union {
 		QByteArray * ba;
 		QIODevice * dev;
 	} data;
@@ -116,7 +115,7 @@ QFtpCommand::~QFtpCommand()
  *
  *********************************************************************/
 QFtpDTP::QFtpDTP(QFtpPI * p, QObject * parent) : QObject(parent),
-                                                 socket(0),
+                                                 socket(nullptr),
                                                  listener(this),
                                                  pi(p),
                                                  callWriteData(false)
@@ -152,7 +151,7 @@ void QFtpDTP::connectToHost(const QString & host, quint16 port)
 	if(socket)
 	{
 		delete socket;
-		socket = 0;
+		socket = nullptr;
 	}
 	socket = new QTcpSocket(this);
 #ifndef QT_NO_BEARERMANAGEMENT
@@ -277,7 +276,7 @@ void QFtpDTP::writeData()
 		}
 
 		// do we continue uploading?
-		callWriteData = data.dev != 0;
+		callWriteData = data.dev != nullptr;
 	}
 }
 
@@ -658,7 +657,7 @@ void QFtpDTP::setupSocket()
 void QFtpDTP::clearData()
 {
 	is_ba = false;
-	data.dev = 0;
+	data.dev = nullptr;
 }
 
 /**********************************************************************
@@ -670,7 +669,7 @@ QFtpPI::QFtpPI(QObject * parent) : QObject(parent),
                                    rawCommand(false),
                                    transferConnectionExtended(true),
                                    dtp(this),
-                                   commandSocket(0),
+                                   commandSocket(nullptr),
                                    state(Begin), abortState(None),
                                    currentCmd(QString()),
                                    waitForDtpToConnect(false),
@@ -2068,10 +2067,10 @@ QFtp::Command QFtp::currentCommand() const
 QIODevice * QFtp::currentDevice() const
 {
 	if(d->pending.isEmpty())
-		return 0;
+		return nullptr;
 	QFtpCommand * c = d->pending.first();
 	if(c->is_ba)
-		return 0;
+		return nullptr;
 	return c->data.dev;
 }
 
diff --git a/src/modules/objects/qtftp/qftp.h b/src/modules/objects/qtftp/qftp.h
index 68c14e46d..f9b6ff1df 100644
--- a/src/modules/objects/qtftp/qftp.h
+++ b/src/modules/objects/qtftp/qftp.h
@@ -143,7 +143,8 @@ public:
 public Q_SLOTS:
 	void abort();
 
-	Q_SIGNALS : void stateChanged(int);
+Q_SIGNALS:
+	void stateChanged(int);
 	void listInfo(const QUrlInfo &);
 	void readyRead();
 	void dataTransferProgress(qint64, qint64);
@@ -239,8 +240,7 @@ private:
 
 	// If is_ba is true, ba is used; ba is never 0.
 	// Otherwise dev is used; dev can be 0 or not.
-	union
-	{
+	union {
 		QByteArray * ba;
 		QIODevice * dev;
 	} data;
diff --git a/src/modules/objects/qtftp/qurlinfo.cpp b/src/modules/objects/qtftp/qurlinfo.cpp
index 9e7849354..2df6adfdb 100644
--- a/src/modules/objects/qtftp/qurlinfo.cpp
+++ b/src/modules/objects/qtftp/qurlinfo.cpp
@@ -126,7 +126,7 @@ public:
 
 QUrlInfo::QUrlInfo()
 {
-	d = 0;
+	d = nullptr;
 }
 
 /*!
@@ -142,7 +142,7 @@ QUrlInfo::QUrlInfo(const QUrlInfo & ui)
 	}
 	else
 	{
-		d = 0;
+		d = nullptr;
 	}
 }
 
@@ -442,7 +442,7 @@ QUrlInfo & QUrlInfo::operator=(const QUrlInfo & ui)
 	else
 	{
 		delete d;
-		d = 0;
+		d = nullptr;
 	}
 	return *this;
 }
@@ -684,7 +684,7 @@ bool QUrlInfo::equal(const QUrlInfo & i1, const QUrlInfo & i2,
 bool QUrlInfo::operator==(const QUrlInfo & other) const
 {
 	if(!d)
-		return other.d == 0;
+		return other.d == nullptr;
 	if(!other.d)
 		return false;
 
@@ -710,7 +710,7 @@ bool QUrlInfo::operator==(const QUrlInfo & other) const
 */
 bool QUrlInfo::isValid() const
 {
-	return d != 0;
+	return d != nullptr;
 }
 
 QT_END_NAMESPACE
diff --git a/src/modules/objects/qthttp/qhttp.cpp b/src/modules/objects/qthttp/qhttp.cpp
index 8dd437451..dbecaa42e 100644
--- a/src/modules/objects/qthttp/qhttp.cpp
+++ b/src/modules/objects/qthttp/qhttp.cpp
@@ -76,8 +76,7 @@ public:
 		id = idCounter.fetchAndAddRelaxed(1);
 	}
 	virtual ~QHttpRequest()
-	{
-	}
+	    = default;
 
 	virtual void start(QHttp *) = 0;
 	virtual bool hasRequestHeader();
@@ -99,10 +98,10 @@ public:
 	Q_DECLARE_PUBLIC(QHttp)
 
 	inline QHttpPrivate(QHttp * parent)
-	    : socket(0), reconnectAttempts(2),
+	    : socket(nullptr), reconnectAttempts(2),
 	      deleteSocket(0), state(QHttp::Unconnected),
 	      error(QHttp::NoError), port(0), mode(QHttp::ConnectionModeHttp),
-	      toDevice(0), postDevice(0), bytesDone(0), chunkedSize(-1),
+	      toDevice(nullptr), postDevice(nullptr), bytesDone(0), chunkedSize(-1),
 	      repost(false), pendingPost(false), q_ptr(parent)
 	{
 	}
@@ -216,26 +215,25 @@ public:
 		data.ba = d;
 	}
 
-	~QHttpNormalRequest()
+	~QHttpNormalRequest() override
 	{
 		if(is_ba)
 			delete data.ba;
 	}
 
-	void start(QHttp *);
-	bool hasRequestHeader();
-	QHttpRequestHeader requestHeader();
+	void start(QHttp *) override;
+	bool hasRequestHeader() override;
+	QHttpRequestHeader requestHeader() override;
 	inline void setRequestHeader(const QHttpRequestHeader & h) { header = h; }
 
-	QIODevice * sourceDevice();
-	QIODevice * destinationDevice();
+	QIODevice * sourceDevice() override;
+	QIODevice * destinationDevice() override;
 
 protected:
 	QHttpRequestHeader header;
 
 private:
-	union
-	{
+	union {
 		QByteArray * ba;
 		QIODevice * dev;
 	} data;
@@ -246,7 +244,7 @@ private:
 void QHttpNormalRequest::start(QHttp * http)
 {
 	if(!http->d->socket)
-		http->d->setSock(0);
+		http->d->setSock(nullptr);
 	http->d->header = header;
 
 	if(is_ba)
@@ -255,7 +253,7 @@ void QHttpNormalRequest::start(QHttp * http)
 		if(http->d->buffer.size() >= 0)
 			http->d->header.setContentLength(http->d->buffer.size());
 
-		http->d->postDevice = 0;
+		http->d->postDevice = nullptr;
 	}
 	else
 	{
@@ -269,14 +267,14 @@ void QHttpNormalRequest::start(QHttp * http)
 		}
 		else
 		{
-			http->d->postDevice = 0;
+			http->d->postDevice = nullptr;
 		}
 	}
 
 	if(to && (to->isOpen() || to->open(QIODevice::WriteOnly)))
 		http->d->toDevice = to;
 	else
-		http->d->toDevice = 0;
+		http->d->toDevice = nullptr;
 
 	http->d->reconnectAttempts = 2;
 	http->d->_q_slotSendRequest();
@@ -295,7 +293,7 @@ QHttpRequestHeader QHttpNormalRequest::requestHeader()
 QIODevice * QHttpNormalRequest::sourceDevice()
 {
 	if(is_ba)
-		return 0;
+		return nullptr;
 	return data.dev;
 }
 
@@ -325,11 +323,9 @@ public:
 	{
 	}
 
-	~QHttpPGHRequest()
-	{
-	}
+	~QHttpPGHRequest() override = default;
 
-	void start(QHttp *);
+	void start(QHttp *) override;
 };
 
 void QHttpPGHRequest::start(QHttp * http)
@@ -355,15 +351,15 @@ public:
 	{
 	}
 
-	void start(QHttp *);
+	void start(QHttp *) override;
 
-	QIODevice * sourceDevice()
+	QIODevice * sourceDevice() override
 	{
-		return 0;
+		return nullptr;
 	}
-	QIODevice * destinationDevice()
+	QIODevice * destinationDevice() override
 	{
-		return 0;
+		return nullptr;
 	}
 
 private:
@@ -404,15 +400,15 @@ public:
 	{
 	}
 
-	void start(QHttp *);
+	void start(QHttp *) override;
 
-	QIODevice * sourceDevice()
+	QIODevice * sourceDevice() override
 	{
-		return 0;
+		return nullptr;
 	}
-	QIODevice * destinationDevice()
+	QIODevice * destinationDevice() override
 	{
-		return 0;
+		return nullptr;
 	}
 
 private:
@@ -443,7 +439,7 @@ public:
 		this->proxy = proxy;
 	}
 
-	inline void start(QHttp * http)
+	inline void start(QHttp * http) override
 	{
 		http->d->proxy = proxy;
 		QString user = proxy.user();
@@ -455,13 +451,13 @@ public:
 		http->d->finishedWithSuccess();
 	}
 
-	inline QIODevice * sourceDevice()
+	inline QIODevice * sourceDevice() override
 	{
-		return 0;
+		return nullptr;
 	}
-	inline QIODevice * destinationDevice()
+	inline QIODevice * destinationDevice() override
 	{
-		return 0;
+		return nullptr;
 	}
 
 private:
@@ -483,15 +479,15 @@ public:
 	{
 	}
 
-	void start(QHttp *);
+	void start(QHttp *) override;
 
-	QIODevice * sourceDevice()
+	QIODevice * sourceDevice() override
 	{
-		return 0;
+		return nullptr;
 	}
-	QIODevice * destinationDevice()
+	QIODevice * destinationDevice() override
 	{
-		return 0;
+		return nullptr;
 	}
 
 private:
@@ -516,15 +512,15 @@ public:
 	QHttpCloseRequest()
 	{
 	}
-	void start(QHttp *);
+	void start(QHttp *) override;
 
-	QIODevice * sourceDevice()
+	QIODevice * sourceDevice() override
 	{
-		return 0;
+		return nullptr;
 	}
-	QIODevice * destinationDevice()
+	QIODevice * destinationDevice() override
 	{
-		return 0;
+		return nullptr;
 	}
 };
 
@@ -537,7 +533,7 @@ class QHttpHeaderPrivate
 {
 	Q_DECLARE_PUBLIC(QHttpHeader)
 public:
-	inline virtual ~QHttpHeaderPrivate() {}
+	inline virtual ~QHttpHeaderPrivate() = default;
 
 	QList<QPair<QString, QString>> values;
 	bool valid;
@@ -663,8 +659,7 @@ QHttpHeader::QHttpHeader(QHttpHeaderPrivate & dd, const QHttpHeader & header)
     Destructor.
 */
 QHttpHeader::~QHttpHeader()
-{
-}
+    = default;
 
 /*!
     Assigns \a h and returns a reference to this http header.
@@ -1964,7 +1959,7 @@ qint64 QHttp::bytesAvailable() const
 */
 qint64 QHttp::read(char * data, qint64 maxlen)
 {
-	if(data == 0 && maxlen != 0)
+	if(data == nullptr && maxlen != 0)
 	{
 		qWarning("QHttp::read: Null pointer error");
 		return -1;
@@ -2060,7 +2055,7 @@ QHttpResponseHeader QHttp::lastResponse() const
 QIODevice * QHttp::currentSourceDevice() const
 {
 	if(d->pending.isEmpty())
-		return 0;
+		return nullptr;
 	return d->pending.first()->sourceDevice();
 }
 
@@ -2077,7 +2072,7 @@ QIODevice * QHttp::currentSourceDevice() const
 QIODevice * QHttp::currentDestinationDevice() const
 {
 	if(d->pending.isEmpty())
-		return 0;
+		return nullptr;
 	return d->pending.first()->destinationDevice();
 }
 
@@ -2286,7 +2281,7 @@ int QHttp::get(const QString & path, QIODevice * to)
 {
 	QHttpRequestHeader header(QLatin1String("GET"), path);
 	header.setValue(QLatin1String("Connection"), QLatin1String("Keep-Alive"));
-	return d->addRequest(new QHttpPGHRequest(header, (QIODevice *)0, to));
+	return d->addRequest(new QHttpPGHRequest(header, (QIODevice *)nullptr, to));
 }
 
 /*!
@@ -2360,7 +2355,7 @@ int QHttp::head(const QString & path)
 {
 	QHttpRequestHeader header(QLatin1String("HEAD"), path);
 	header.setValue(QLatin1String("Connection"), QLatin1String("Keep-Alive"));
-	return d->addRequest(new QHttpPGHRequest(header, (QIODevice *)0, 0));
+	return d->addRequest(new QHttpPGHRequest(header, (QIODevice *)nullptr, nullptr));
 }
 
 /*!
@@ -2689,7 +2684,7 @@ void QHttpPrivate::_q_slotClosed()
 		finishedWithError(QLatin1String(QT_TRANSLATE_NOOP("QHttp", "Server closed connection unexpectedly")), QHttp::UnexpectedClose);
 	}
 
-	postDevice = 0;
+	postDevice = nullptr;
 	if(state != QHttp::Closing)
 		setState(QHttp::Closing);
 	QMetaObject::invokeMethod(q, "_q_slotDoFinished", Qt::QueuedConnection);
@@ -2742,7 +2737,7 @@ void QHttpPrivate::_q_slotConnected()
 void QHttpPrivate::_q_slotError(QAbstractSocket::SocketError err)
 {
 	Q_Q(QHttp);
-	postDevice = 0;
+	postDevice = nullptr;
 
 	if(state == QHttp::Connecting || state == QHttp::Reading || state == QHttp::Sending)
 	{
@@ -2831,7 +2826,7 @@ void QHttpPrivate::postMoreData()
 		}
 		if(postDevice->atEnd())
 		{
-			postDevice = 0;
+			postDevice = nullptr;
 		}
 
 		socket->write(arr, n);
@@ -3024,7 +3019,7 @@ void QHttpPrivate::_q_slotReadyRead()
 	else
 	{
 		qint64 n = socket->bytesAvailable();
-		QByteArray * arr = 0;
+		QByteArray * arr = nullptr;
 		if(chunkedSize != -1)
 		{
 			// transfer-encoding is chunked
@@ -3139,7 +3134,7 @@ void QHttpPrivate::_q_slotReadyRead()
 				qint64 bytesWritten;
 				bytesWritten = toDevice->write(*arr, n);
 				delete arr;
-				arr = 0;
+				arr = nullptr;
 				// if writing to the device does not succeed, quit with error
 				if(bytesWritten == -1 || bytesWritten < n)
 				{
@@ -3162,7 +3157,7 @@ void QHttpPrivate::_q_slotReadyRead()
 				char * ptr = rba.reserve(arr->size());
 				memcpy(ptr, arr->data(), arr->size());
 				delete arr;
-				arr = 0;
+				arr = nullptr;
 #if defined(QHTTP_DEBUG)
 				qDebug("QHttp::_q_slotReadyRead(): read %lld bytes (%lld bytes done)", n, bytesDone + q->bytesAvailable());
 #endif
@@ -3263,7 +3258,7 @@ void QHttpPrivate::closeConn()
 	if(state == QHttp::Closing || state == QHttp::Unconnected)
 		return;
 
-	postDevice = 0;
+	postDevice = nullptr;
 	setState(QHttp::Closing);
 
 	// Already closed ?
@@ -3289,7 +3284,7 @@ void QHttpPrivate::setSock(QTcpSocket * sock)
 		delete socket;
 
 	// use the new QTcpSocket socket, or create one if socket is 0.
-	deleteSocket = (sock == 0);
+	deleteSocket = (sock == nullptr);
 	socket = sock;
 	if(!socket)
 	{
diff --git a/src/modules/objects/qthttp/qhttp.h b/src/modules/objects/qthttp/qhttp.h
index f40361656..3e622e943 100644
--- a/src/modules/objects/qthttp/qhttp.h
+++ b/src/modules/objects/qthttp/qhttp.h
@@ -252,7 +252,8 @@ public Q_SLOTS:
 	void ignoreSslErrors();
 #endif
 
-	Q_SIGNALS : void stateChanged(int);
+Q_SIGNALS:
+	void stateChanged(int);
 	void responseHeaderReceived(const QHttpResponseHeader & resp);
 	void readyRead(const QHttpResponseHeader & resp);
 
diff --git a/src/modules/objects/qthttp/qhttpauthenticator.cpp b/src/modules/objects/qthttp/qhttpauthenticator.cpp
index afe462a98..c6063c6c4 100644
--- a/src/modules/objects/qthttp/qhttpauthenticator.cpp
+++ b/src/modules/objects/qthttp/qhttpauthenticator.cpp
@@ -132,7 +132,7 @@ static QByteArray qNtlmPhase3(QHttpAuthenticatorPrivate * ctx, const QByteArray
   Constructs an empty authentication object
 */
 QHttpAuthenticator::QHttpAuthenticator()
-    : d(0)
+    : d(nullptr)
 {
 }
 
@@ -388,9 +388,8 @@ void QHttpAuthenticatorPrivate::parseHttpResponse(const QList<QPair<QByteArray,
     */
 
 	QByteArray headerVal;
-	for(int i = 0; i < values.size(); ++i)
+	for(const auto & current : values)
 	{
-		const QPair<QByteArray, QByteArray> & current = values.at(i);
 		if(current.first.toLower() != search)
 			continue;
 		QByteArray str = current.second.toLower();
@@ -443,7 +442,7 @@ void QHttpAuthenticatorPrivate::parseHttpResponse(const QList<QPair<QByteArray,
 QByteArray QHttpAuthenticatorPrivate::calculateResponse(const QByteArray & requestMethod, const QByteArray & path)
 {
 	QByteArray response;
-	const char * methodString = 0;
+	const char * methodString = nullptr;
 	switch(method)
 	{
 		case QHttpAuthenticatorPrivate::None:
@@ -1219,7 +1218,7 @@ QByteArray qEncodeHmacMd5(QByteArray & key, const QByteArray & message)
 static QByteArray qCreatev2Hash(const QHttpAuthenticatorPrivate * ctx,
     QNtlmPhase3Block * phase3)
 {
-	Q_ASSERT(phase3 != 0);
+	Q_ASSERT(phase3 != nullptr);
 	// since v2 Hash is need for both NTLMv2 and LMv2 it is calculated
 	// only once and stored and reused
 	if(phase3->v2Hash.size() == 0)
@@ -1277,7 +1276,7 @@ static QByteArray qEncodeNtlmv2Response(const QHttpAuthenticatorPrivate * ctx,
     const QNtlmPhase2Block & ch,
     QNtlmPhase3Block * phase3)
 {
-	Q_ASSERT(phase3 != 0);
+	Q_ASSERT(phase3 != nullptr);
 	// return value stored in phase3
 	qCreatev2Hash(ctx, phase3);
 
@@ -1352,7 +1351,7 @@ static QByteArray qEncodeLmv2Response(const QHttpAuthenticatorPrivate * ctx,
     const QNtlmPhase2Block & ch,
     QNtlmPhase3Block * phase3)
 {
-	Q_ASSERT(phase3 != 0);
+	Q_ASSERT(phase3 != nullptr);
 	// return value stored in phase3
 	qCreatev2Hash(ctx, phase3);
 
diff --git a/src/modules/options/OptionsDialog.cpp b/src/modules/options/OptionsDialog.cpp
index e8e349c36..2d2f54dcf 100644
--- a/src/modules/options/OptionsDialog.cpp
+++ b/src/modules/options/OptionsDialog.cpp
@@ -70,14 +70,13 @@ OptionsDialogFrontWidget::OptionsDialogFrontWidget(QWidget * parent, const QStri
 }
 
 OptionsDialogFrontWidget::~OptionsDialogFrontWidget()
-{
-}
+    = default;
 
 OptionsDialogTreeWidgetItem::OptionsDialogTreeWidgetItem(QTreeWidget * parent, OptionsWidgetInstanceEntry * e)
     : QTreeWidgetItem()
 {
 	m_pInstanceEntry = e;
-	m_pOptionsWidget = 0;
+	m_pOptionsWidget = nullptr;
 	setText(0, e->szName);
 	setIcon(0, *(g_pIconManager->getSmallIcon(e->eIcon)));
 	parent->insertTopLevelItem(0, this);
@@ -87,15 +86,14 @@ OptionsDialogTreeWidgetItem::OptionsDialogTreeWidgetItem(QTreeWidgetItem * paren
     : QTreeWidgetItem()
 {
 	m_pInstanceEntry = e;
-	m_pOptionsWidget = 0;
+	m_pOptionsWidget = nullptr;
 	setText(0, e->szName);
 	setIcon(0, *(g_pIconManager->getSmallIcon(e->eIcon)));
 	parent->insertChild(0, this);
 }
 
 OptionsDialogTreeWidgetItem::~OptionsDialogTreeWidgetItem()
-{
-}
+    = default;
 
 OptionsDialog::OptionsDialog(QWidget * par, const QString & szGroup, bool bModal)
     : QDialog(par)
@@ -184,7 +182,7 @@ OptionsDialog::OptionsDialog(QWidget * par, const QString & szGroup, bool bModal
 	m_pTreeWidget->setRootIsDecorated(true);
 	m_pTreeWidget->setSortingEnabled(false);
 	m_pTreeWidget->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
-	m_pTreeWidget->setCurrentItem(NULL);
+	m_pTreeWidget->setCurrentItem(nullptr);
 
 	connect(m_pTreeWidget, SIGNAL(currentItemChanged(QTreeWidgetItem *, QTreeWidgetItem *)), this, SLOT(treeWidgetItemSelectionChanged(QTreeWidgetItem *, QTreeWidgetItem *)));
 
@@ -259,7 +257,7 @@ OptionsDialog::OptionsDialog(QWidget * par, const QString & szGroup, bool bModal
 	g1->setRowStretch(0, 1);
 	g1->setColumnStretch(1, 1);
 
-	fillTreeWidget(0, g_pOptionsInstanceManager->instanceEntryTree(), szGroup);
+	fillTreeWidget(nullptr, g_pOptionsInstanceManager->instanceEntryTree(), szGroup);
 
 	if(!parent())
 	{
@@ -633,7 +631,7 @@ void OptionsDialog::apply(bool bDialogAboutToClose)
 		it = (OptionsDialogTreeWidgetItem *)m_pTreeWidget->currentItem();
 		if(it)
 		{
-			treeWidgetItemSelectionChanged(it, 0);
+			treeWidgetItemSelectionChanged(it, nullptr);
 			if(curTab > 0 && it->m_pOptionsWidget)
 				if(it->m_pOptionsWidget->tabWidget())
 					it->m_pOptionsWidget->tabWidget()->setCurrentIndex(curTab);
@@ -677,7 +675,7 @@ void OptionsDialog::recursiveCommit(OptionsDialogTreeWidgetItem * it)
 	{
 		it->m_pOptionsWidget->commit();
 		delete it->m_pOptionsWidget;
-		it->m_pOptionsWidget = 0;
+		it->m_pOptionsWidget = nullptr;
 	}
 	//refreshTreeWidget(); // <-- this tends to jump into infinite recursion
 }
diff --git a/src/modules/options/OptionsInstanceManager.cpp b/src/modules/options/OptionsInstanceManager.cpp
index 2ed928724..f7ece29cf 100644
--- a/src/modules/options/OptionsInstanceManager.cpp
+++ b/src/modules/options/OptionsInstanceManager.cpp
@@ -651,7 +651,7 @@ static const char * g_szName_OptionsWidget_windowListClassic = KVI_OPTIONS_WIDGE
 static const char * g_szClassName_OptionsWidget_windowListClassic = "OptionsWidget_windowListClassic";
 
 OptionsInstanceManager::OptionsInstanceManager()
-    : QObject(0)
+    : QObject(nullptr)
 {
 
 	//qDebug("Instantiating");
@@ -662,7 +662,7 @@ OptionsInstanceManager::OptionsInstanceManager()
 	OptionsWidgetInstanceEntry * e0;
 	e0 = new OptionsWidgetInstanceEntry;
 	e0->createProc = &classOptionsWidget_connection_createInstanceProc;
-	e0->pWidget = 0;
+	e0->pWidget = nullptr;
 	e0->szClassName = g_szClassName_OptionsWidget_connection;
 	e0->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_connection;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_connection
@@ -701,7 +701,7 @@ OptionsInstanceManager::OptionsInstanceManager()
 	OptionsWidgetInstanceEntry * e1;
 	e1 = new OptionsWidgetInstanceEntry;
 	e1->createProc = &classOptionsWidget_connectionAdvanced_createInstanceProc;
-	e1->pWidget = 0;
+	e1->pWidget = nullptr;
 	e1->szClassName = g_szClassName_OptionsWidget_connectionAdvanced;
 	e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_connectionAdvanced;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_connectionAdvanced
@@ -740,7 +740,7 @@ OptionsInstanceManager::OptionsInstanceManager()
 	OptionsWidgetInstanceEntry * e2;
 	e2 = new OptionsWidgetInstanceEntry;
 	e2->createProc = &classOptionsWidget_connectionSsl_createInstanceProc;
-	e2->pWidget = 0;
+	e2->pWidget = nullptr;
 	e2->szClassName = g_szClassName_OptionsWidget_connectionSsl;
 	e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_connectionSsl;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_connectionSsl
@@ -772,11 +772,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e2->szNameNoLocale = g_szName_OptionsWidget_connectionSsl;
 	e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_connectionSsl, "options");
 	e1->pChildList->append(e2);
-	e2->pChildList = 0;
+	e2->pChildList = nullptr;
 
 	e2 = new OptionsWidgetInstanceEntry;
 	e2->createProc = &classOptionsWidget_connectionSocket_createInstanceProc;
-	e2->pWidget = 0;
+	e2->pWidget = nullptr;
 	e2->szClassName = g_szClassName_OptionsWidget_connectionSocket;
 	e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_connectionSocket;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_connectionSocket
@@ -808,11 +808,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e2->szNameNoLocale = g_szName_OptionsWidget_connectionSocket;
 	e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_connectionSocket, "options");
 	e1->pChildList->append(e2);
-	e2->pChildList = 0;
+	e2->pChildList = nullptr;
 
 	e2 = new OptionsWidgetInstanceEntry;
 	e2->createProc = &classOptionsWidget_identService_createInstanceProc;
-	e2->pWidget = 0;
+	e2->pWidget = nullptr;
 	e2->szClassName = g_szClassName_OptionsWidget_identService;
 	e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_identService;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_identService
@@ -844,11 +844,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e2->szNameNoLocale = g_szName_OptionsWidget_identService;
 	e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_identService, "options");
 	e1->pChildList->append(e2);
-	e2->pChildList = 0;
+	e2->pChildList = nullptr;
 
 	e1 = new OptionsWidgetInstanceEntry;
 	e1->createProc = &classOptionsWidget_proxy_createInstanceProc;
-	e1->pWidget = 0;
+	e1->pWidget = nullptr;
 	e1->szClassName = g_szClassName_OptionsWidget_proxy;
 	e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_proxy;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_proxy
@@ -880,11 +880,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e1->szNameNoLocale = g_szName_OptionsWidget_proxy;
 	e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_proxy, "options");
 	e0->pChildList->append(e1);
-	e1->pChildList = 0;
+	e1->pChildList = nullptr;
 
 	e0 = new OptionsWidgetInstanceEntry;
 	e0->createProc = &classOptionsWidget_dcc_createInstanceProc;
-	e0->pWidget = 0;
+	e0->pWidget = nullptr;
 	e0->szClassName = g_szClassName_OptionsWidget_dcc;
 	e0->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_dcc;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_dcc
@@ -922,7 +922,7 @@ OptionsInstanceManager::OptionsInstanceManager()
 
 	e1 = new OptionsWidgetInstanceEntry;
 	e1->createProc = &classOptionsWidget_dccGeneral_createInstanceProc;
-	e1->pWidget = 0;
+	e1->pWidget = nullptr;
 	e1->szClassName = g_szClassName_OptionsWidget_dccGeneral;
 	e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_dccGeneral;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_dccGeneral
@@ -954,11 +954,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e1->szNameNoLocale = g_szName_OptionsWidget_dccGeneral;
 	e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_dccGeneral, "options");
 	e0->pChildList->append(e1);
-	e1->pChildList = 0;
+	e1->pChildList = nullptr;
 
 	e1 = new OptionsWidgetInstanceEntry;
 	e1->createProc = &classOptionsWidget_dccAdvanced_createInstanceProc;
-	e1->pWidget = 0;
+	e1->pWidget = nullptr;
 	e1->szClassName = g_szClassName_OptionsWidget_dccAdvanced;
 	e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_dccAdvanced;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_dccAdvanced
@@ -990,11 +990,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e1->szNameNoLocale = g_szName_OptionsWidget_dccAdvanced;
 	e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_dccAdvanced, "options");
 	e0->pChildList->append(e1);
-	e1->pChildList = 0;
+	e1->pChildList = nullptr;
 
 	e1 = new OptionsWidgetInstanceEntry;
 	e1->createProc = &classOptionsWidget_dccSend_createInstanceProc;
-	e1->pWidget = 0;
+	e1->pWidget = nullptr;
 	e1->szClassName = g_szClassName_OptionsWidget_dccSend;
 	e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_dccSend;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_dccSend
@@ -1032,7 +1032,7 @@ OptionsInstanceManager::OptionsInstanceManager()
 
 	e2 = new OptionsWidgetInstanceEntry;
 	e2->createProc = &classOptionsWidget_dccSendGeneral_createInstanceProc;
-	e2->pWidget = 0;
+	e2->pWidget = nullptr;
 	e2->szClassName = g_szClassName_OptionsWidget_dccSendGeneral;
 	e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_dccSendGeneral;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_dccSendGeneral
@@ -1064,11 +1064,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e2->szNameNoLocale = g_szName_OptionsWidget_dccSendGeneral;
 	e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_dccSendGeneral, "options");
 	e1->pChildList->append(e2);
-	e2->pChildList = 0;
+	e2->pChildList = nullptr;
 
 	e2 = new OptionsWidgetInstanceEntry;
 	e2->createProc = &classOptionsWidget_dccSendAdvanced_createInstanceProc;
-	e2->pWidget = 0;
+	e2->pWidget = nullptr;
 	e2->szClassName = g_szClassName_OptionsWidget_dccSendAdvanced;
 	e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_dccSendAdvanced;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_dccSendAdvanced
@@ -1100,11 +1100,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e2->szNameNoLocale = g_szName_OptionsWidget_dccSendAdvanced;
 	e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_dccSendAdvanced, "options");
 	e1->pChildList->append(e2);
-	e2->pChildList = 0;
+	e2->pChildList = nullptr;
 
 	e1 = new OptionsWidgetInstanceEntry;
 	e1->createProc = &classOptionsWidget_dccChat_createInstanceProc;
-	e1->pWidget = 0;
+	e1->pWidget = nullptr;
 	e1->szClassName = g_szClassName_OptionsWidget_dccChat;
 	e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_dccChat;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_dccChat
@@ -1136,11 +1136,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e1->szNameNoLocale = g_szName_OptionsWidget_dccChat;
 	e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_dccChat, "options");
 	e0->pChildList->append(e1);
-	e1->pChildList = 0;
+	e1->pChildList = nullptr;
 
 	e1 = new OptionsWidgetInstanceEntry;
 	e1->createProc = &classOptionsWidget_dccVoice_createInstanceProc;
-	e1->pWidget = 0;
+	e1->pWidget = nullptr;
 	e1->szClassName = g_szClassName_OptionsWidget_dccVoice;
 	e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_dccVoice;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_dccVoice
@@ -1172,11 +1172,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e1->szNameNoLocale = g_szName_OptionsWidget_dccVoice;
 	e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_dccVoice, "options");
 	e0->pChildList->append(e1);
-	e1->pChildList = 0;
+	e1->pChildList = nullptr;
 
 	e0 = new OptionsWidgetInstanceEntry;
 	e0->createProc = &classOptionsWidget_general_createInstanceProc;
-	e0->pWidget = 0;
+	e0->pWidget = nullptr;
 	e0->szClassName = g_szClassName_OptionsWidget_general;
 	e0->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_general;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_general
@@ -1214,7 +1214,7 @@ OptionsInstanceManager::OptionsInstanceManager()
 
 	e1 = new OptionsWidgetInstanceEntry;
 	e1->createProc = &classOptionsWidget_mediaTypes_createInstanceProc;
-	e1->pWidget = 0;
+	e1->pWidget = nullptr;
 	e1->szClassName = g_szClassName_OptionsWidget_mediaTypes;
 	e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_mediaTypes;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_mediaTypes
@@ -1246,11 +1246,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e1->szNameNoLocale = g_szName_OptionsWidget_mediaTypes;
 	e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_mediaTypes, "options");
 	e0->pChildList->append(e1);
-	e1->pChildList = 0;
+	e1->pChildList = nullptr;
 
 	e1 = new OptionsWidgetInstanceEntry;
 	e1->createProc = &classOptionsWidget_sound_createInstanceProc;
-	e1->pWidget = 0;
+	e1->pWidget = nullptr;
 	e1->szClassName = g_szClassName_OptionsWidget_sound;
 	e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_sound;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_sound
@@ -1288,7 +1288,7 @@ OptionsInstanceManager::OptionsInstanceManager()
 
 	e2 = new OptionsWidgetInstanceEntry;
 	e2->createProc = &classOptionsWidget_soundGeneral_createInstanceProc;
-	e2->pWidget = 0;
+	e2->pWidget = nullptr;
 	e2->szClassName = g_szClassName_OptionsWidget_soundGeneral;
 	e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_soundGeneral;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_soundGeneral
@@ -1320,11 +1320,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e2->szNameNoLocale = g_szName_OptionsWidget_soundGeneral;
 	e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_soundGeneral, "options");
 	e1->pChildList->append(e2);
-	e2->pChildList = 0;
+	e2->pChildList = nullptr;
 
 	e2 = new OptionsWidgetInstanceEntry;
 	e2->createProc = &classOptionsWidget_sounds_createInstanceProc;
-	e2->pWidget = 0;
+	e2->pWidget = nullptr;
 	e2->szClassName = g_szClassName_OptionsWidget_sounds;
 	e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_sounds;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_sounds
@@ -1356,11 +1356,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e2->szNameNoLocale = g_szName_OptionsWidget_sounds;
 	e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_sounds, "options");
 	e1->pChildList->append(e2);
-	e2->pChildList = 0;
+	e2->pChildList = nullptr;
 
 	e1 = new OptionsWidgetInstanceEntry;
 	e1->createProc = &classOptionsWidget_textEncoding_createInstanceProc;
-	e1->pWidget = 0;
+	e1->pWidget = nullptr;
 	e1->szClassName = g_szClassName_OptionsWidget_textEncoding;
 	e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_textEncoding;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_textEncoding
@@ -1392,11 +1392,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e1->szNameNoLocale = g_szName_OptionsWidget_textEncoding;
 	e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_textEncoding, "options");
 	e0->pChildList->append(e1);
-	e1->pChildList = 0;
+	e1->pChildList = nullptr;
 
 	e1 = new OptionsWidgetInstanceEntry;
 	e1->createProc = &classOptionsWidget_uparser_createInstanceProc;
-	e1->pWidget = 0;
+	e1->pWidget = nullptr;
 	e1->szClassName = g_szClassName_OptionsWidget_uparser;
 	e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_uparser;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_uparser
@@ -1428,11 +1428,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e1->szNameNoLocale = g_szName_OptionsWidget_uparser;
 	e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_uparser, "options");
 	e0->pChildList->append(e1);
-	e1->pChildList = 0;
+	e1->pChildList = nullptr;
 
 	e1 = new OptionsWidgetInstanceEntry;
 	e1->createProc = &classOptionsWidget_urlHandlers_createInstanceProc;
-	e1->pWidget = 0;
+	e1->pWidget = nullptr;
 	e1->szClassName = g_szClassName_OptionsWidget_urlHandlers;
 	e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_urlHandlers;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_urlHandlers
@@ -1464,11 +1464,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e1->szNameNoLocale = g_szName_OptionsWidget_urlHandlers;
 	e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_urlHandlers, "options");
 	e0->pChildList->append(e1);
-	e1->pChildList = 0;
+	e1->pChildList = nullptr;
 
 	e0 = new OptionsWidgetInstanceEntry;
 	e0->createProc = &classOptionsWidget_identity_createInstanceProc;
-	e0->pWidget = 0;
+	e0->pWidget = nullptr;
 	e0->szClassName = g_szClassName_OptionsWidget_identity;
 	e0->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_identity;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_identity
@@ -1506,7 +1506,7 @@ OptionsInstanceManager::OptionsInstanceManager()
 
 	e1 = new OptionsWidgetInstanceEntry;
 	e1->createProc = &classKviIdentityGeneralOptionsWidget_createInstanceProc;
-	e1->pWidget = 0;
+	e1->pWidget = nullptr;
 	e1->szClassName = g_szClassName_KviIdentityGeneralOptionsWidget;
 	e1->eIcon = KVI_OPTIONS_WIDGET_ICON_KviIdentityGeneralOptionsWidget;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_KviIdentityGeneralOptionsWidget
@@ -1538,11 +1538,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e1->szNameNoLocale = g_szName_KviIdentityGeneralOptionsWidget;
 	e1->szName = __tr2qs_ctx_no_xgettext(g_szName_KviIdentityGeneralOptionsWidget, "options");
 	e0->pChildList->append(e1);
-	e1->pChildList = 0;
+	e1->pChildList = nullptr;
 
 	e1 = new OptionsWidgetInstanceEntry;
 	e1->createProc = &classOptionsWidget_identityAvatar_createInstanceProc;
-	e1->pWidget = 0;
+	e1->pWidget = nullptr;
 	e1->szClassName = g_szClassName_OptionsWidget_identityAvatar;
 	e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_identityAvatar;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_identityAvatar
@@ -1574,11 +1574,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e1->szNameNoLocale = g_szName_OptionsWidget_identityAvatar;
 	e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_identityAvatar, "options");
 	e0->pChildList->append(e1);
-	e1->pChildList = 0;
+	e1->pChildList = nullptr;
 
 	e1 = new OptionsWidgetInstanceEntry;
 	e1->createProc = &classOptionsWidget_identityAdvanced_createInstanceProc;
-	e1->pWidget = 0;
+	e1->pWidget = nullptr;
 	e1->szClassName = g_szClassName_OptionsWidget_identityAdvanced;
 	e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_identityAdvanced;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_identityAdvanced
@@ -1610,11 +1610,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e1->szNameNoLocale = g_szName_OptionsWidget_identityAdvanced;
 	e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_identityAdvanced, "options");
 	e0->pChildList->append(e1);
-	e1->pChildList = 0;
+	e1->pChildList = nullptr;
 
 	e1 = new OptionsWidgetInstanceEntry;
 	e1->createProc = &classOptionsWidget_identityProfile_createInstanceProc;
-	e1->pWidget = 0;
+	e1->pWidget = nullptr;
 	e1->szClassName = g_szClassName_OptionsWidget_identityProfile;
 	e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_identityProfile;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_identityProfile
@@ -1646,11 +1646,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e1->szNameNoLocale = g_szName_OptionsWidget_identityProfile;
 	e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_identityProfile, "options");
 	e0->pChildList->append(e1);
-	e1->pChildList = 0;
+	e1->pChildList = nullptr;
 
 	e0 = new OptionsWidgetInstanceEntry;
 	e0->createProc = &classOptionsWidget_inputLook_createInstanceProc;
-	e0->pWidget = 0;
+	e0->pWidget = nullptr;
 	e0->szClassName = g_szClassName_OptionsWidget_inputLook;
 	e0->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_inputLook;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_inputLook
@@ -1682,11 +1682,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e0->szNameNoLocale = g_szName_OptionsWidget_inputLook;
 	e0->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_inputLook, "options");
 	m_pInstanceTree->append(e0);
-	e0->pChildList = 0;
+	e0->pChildList = nullptr;
 
 	e0 = new OptionsWidgetInstanceEntry;
 	e0->createProc = &classOptionsWidget_interfaceFeatures_createInstanceProc;
-	e0->pWidget = 0;
+	e0->pWidget = nullptr;
 	e0->szClassName = g_szClassName_OptionsWidget_interfaceFeatures;
 	e0->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_interfaceFeatures;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_interfaceFeatures
@@ -1724,7 +1724,7 @@ OptionsInstanceManager::OptionsInstanceManager()
 
 	e1 = new OptionsWidgetInstanceEntry;
 	e1->createProc = &classOptionsWidget_inputFeatures_createInstanceProc;
-	e1->pWidget = 0;
+	e1->pWidget = nullptr;
 	e1->szClassName = g_szClassName_OptionsWidget_inputFeatures;
 	e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_inputFeatures;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_inputFeatures
@@ -1756,11 +1756,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e1->szNameNoLocale = g_szName_OptionsWidget_inputFeatures;
 	e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_inputFeatures, "options");
 	e0->pChildList->append(e1);
-	e1->pChildList = 0;
+	e1->pChildList = nullptr;
 
 	e1 = new OptionsWidgetInstanceEntry;
 	e1->createProc = &classOptionsWidget_notifier_createInstanceProc;
-	e1->pWidget = 0;
+	e1->pWidget = nullptr;
 	e1->szClassName = g_szClassName_OptionsWidget_notifier;
 	e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_notifier;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_notifier
@@ -1792,11 +1792,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e1->szNameNoLocale = g_szName_OptionsWidget_notifier;
 	e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_notifier, "options");
 	e0->pChildList->append(e1);
-	e1->pChildList = 0;
+	e1->pChildList = nullptr;
 
 	e1 = new OptionsWidgetInstanceEntry;
 	e1->createProc = &classOptionsWidget_tray_createInstanceProc;
-	e1->pWidget = 0;
+	e1->pWidget = nullptr;
 	e1->szClassName = g_szClassName_OptionsWidget_tray;
 	e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_tray;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_tray
@@ -1828,11 +1828,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e1->szNameNoLocale = g_szName_OptionsWidget_tray;
 	e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_tray, "options");
 	e0->pChildList->append(e1);
-	e1->pChildList = 0;
+	e1->pChildList = nullptr;
 
 	e0 = new OptionsWidgetInstanceEntry;
 	e0->createProc = &classOptionsWidget_irc_createInstanceProc;
-	e0->pWidget = 0;
+	e0->pWidget = nullptr;
 	e0->szClassName = g_szClassName_OptionsWidget_irc;
 	e0->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_irc;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_irc
@@ -1870,7 +1870,7 @@ OptionsInstanceManager::OptionsInstanceManager()
 
 	e1 = new OptionsWidgetInstanceEntry;
 	e1->createProc = &classOptionsWidget_channel_createInstanceProc;
-	e1->pWidget = 0;
+	e1->pWidget = nullptr;
 	e1->szClassName = g_szClassName_OptionsWidget_channel;
 	e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_channel;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_channel
@@ -1908,7 +1908,7 @@ OptionsInstanceManager::OptionsInstanceManager()
 
 	e2 = new OptionsWidgetInstanceEntry;
 	e2->createProc = &classOptionsWidget_channelGeneral_createInstanceProc;
-	e2->pWidget = 0;
+	e2->pWidget = nullptr;
 	e2->szClassName = g_szClassName_OptionsWidget_channelGeneral;
 	e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_channelGeneral;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_channelGeneral
@@ -1940,11 +1940,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e2->szNameNoLocale = g_szName_OptionsWidget_channelGeneral;
 	e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_channelGeneral, "options");
 	e1->pChildList->append(e2);
-	e2->pChildList = 0;
+	e2->pChildList = nullptr;
 
 	e2 = new OptionsWidgetInstanceEntry;
 	e2->createProc = &classOptionsWidget_channelAdvanced_createInstanceProc;
-	e2->pWidget = 0;
+	e2->pWidget = nullptr;
 	e2->szClassName = g_szClassName_OptionsWidget_channelAdvanced;
 	e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_channelAdvanced;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_channelAdvanced
@@ -1976,11 +1976,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e2->szNameNoLocale = g_szName_OptionsWidget_channelAdvanced;
 	e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_channelAdvanced, "options");
 	e1->pChildList->append(e2);
-	e2->pChildList = 0;
+	e2->pChildList = nullptr;
 
 	e1 = new OptionsWidgetInstanceEntry;
 	e1->createProc = &classOptionsWidget_ircGeneral_createInstanceProc;
-	e1->pWidget = 0;
+	e1->pWidget = nullptr;
 	e1->szClassName = g_szClassName_OptionsWidget_ircGeneral;
 	e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_ircGeneral;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_ircGeneral
@@ -2012,11 +2012,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e1->szNameNoLocale = g_szName_OptionsWidget_ircGeneral;
 	e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_ircGeneral, "options");
 	e0->pChildList->append(e1);
-	e1->pChildList = 0;
+	e1->pChildList = nullptr;
 
 	e1 = new OptionsWidgetInstanceEntry;
 	e1->createProc = &classOptionsWidget_ircAdvanced_createInstanceProc;
-	e1->pWidget = 0;
+	e1->pWidget = nullptr;
 	e1->szClassName = g_szClassName_OptionsWidget_ircAdvanced;
 	e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_ircAdvanced;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_ircAdvanced
@@ -2048,11 +2048,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e1->szNameNoLocale = g_szName_OptionsWidget_ircAdvanced;
 	e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_ircAdvanced, "options");
 	e0->pChildList->append(e1);
-	e1->pChildList = 0;
+	e1->pChildList = nullptr;
 
 	e1 = new OptionsWidgetInstanceEntry;
 	e1->createProc = &classOptionsWidget_ircOutput_createInstanceProc;
-	e1->pWidget = 0;
+	e1->pWidget = nullptr;
 	e1->szClassName = g_szClassName_OptionsWidget_ircOutput;
 	e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_ircOutput;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_ircOutput
@@ -2084,11 +2084,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e1->szNameNoLocale = g_szName_OptionsWidget_ircOutput;
 	e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_ircOutput, "options");
 	e0->pChildList->append(e1);
-	e1->pChildList = 0;
+	e1->pChildList = nullptr;
 
 	e1 = new OptionsWidgetInstanceEntry;
 	e1->createProc = &classOptionsWidget_protection_createInstanceProc;
-	e1->pWidget = 0;
+	e1->pWidget = nullptr;
 	e1->szClassName = g_szClassName_OptionsWidget_protection;
 	e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_protection;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_protection
@@ -2126,7 +2126,7 @@ OptionsInstanceManager::OptionsInstanceManager()
 
 	e2 = new OptionsWidgetInstanceEntry;
 	e2->createProc = &classOptionsWidget_antispam_createInstanceProc;
-	e2->pWidget = 0;
+	e2->pWidget = nullptr;
 	e2->szClassName = g_szClassName_OptionsWidget_antispam;
 	e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_antispam;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_antispam
@@ -2158,11 +2158,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e2->szNameNoLocale = g_szName_OptionsWidget_antispam;
 	e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_antispam, "options");
 	e1->pChildList->append(e2);
-	e2->pChildList = 0;
+	e2->pChildList = nullptr;
 
 	e2 = new OptionsWidgetInstanceEntry;
 	e2->createProc = &classOptionsWidget_ctcpFloodProtection_createInstanceProc;
-	e2->pWidget = 0;
+	e2->pWidget = nullptr;
 	e2->szClassName = g_szClassName_OptionsWidget_ctcpFloodProtection;
 	e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_ctcpFloodProtection;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_ctcpFloodProtection
@@ -2194,11 +2194,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e2->szNameNoLocale = g_szName_OptionsWidget_ctcpFloodProtection;
 	e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_ctcpFloodProtection, "options");
 	e1->pChildList->append(e2);
-	e2->pChildList = 0;
+	e2->pChildList = nullptr;
 
 	e2 = new OptionsWidgetInstanceEntry;
 	e2->createProc = &classOptionsWidget_ignore_createInstanceProc;
-	e2->pWidget = 0;
+	e2->pWidget = nullptr;
 	e2->szClassName = g_szClassName_OptionsWidget_ignore;
 	e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_ignore;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_ignore
@@ -2230,11 +2230,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e2->szNameNoLocale = g_szName_OptionsWidget_ignore;
 	e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_ignore, "options");
 	e1->pChildList->append(e2);
-	e2->pChildList = 0;
+	e2->pChildList = nullptr;
 
 	e1 = new OptionsWidgetInstanceEntry;
 	e1->createProc = &classOptionsWidget_query_createInstanceProc;
-	e1->pWidget = 0;
+	e1->pWidget = nullptr;
 	e1->szClassName = g_szClassName_OptionsWidget_query;
 	e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_query;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_query
@@ -2266,11 +2266,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e1->szNameNoLocale = g_szName_OptionsWidget_query;
 	e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_query, "options");
 	e0->pChildList->append(e1);
-	e1->pChildList = 0;
+	e1->pChildList = nullptr;
 
 	e1 = new OptionsWidgetInstanceEntry;
 	e1->createProc = &classOptionsWidget_tools_createInstanceProc;
-	e1->pWidget = 0;
+	e1->pWidget = nullptr;
 	e1->szClassName = g_szClassName_OptionsWidget_tools;
 	e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_tools;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_tools
@@ -2308,7 +2308,7 @@ OptionsInstanceManager::OptionsInstanceManager()
 
 	e2 = new OptionsWidgetInstanceEntry;
 	e2->createProc = &classOptionsWidget_alertsAndHighlighting_createInstanceProc;
-	e2->pWidget = 0;
+	e2->pWidget = nullptr;
 	e2->szClassName = g_szClassName_OptionsWidget_alertsAndHighlighting;
 	e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_alertsAndHighlighting;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_alertsAndHighlighting
@@ -2347,7 +2347,7 @@ OptionsInstanceManager::OptionsInstanceManager()
 	OptionsWidgetInstanceEntry * e3;
 	e3 = new OptionsWidgetInstanceEntry;
 	e3->createProc = &classOptionsWidget_highlighting_createInstanceProc;
-	e3->pWidget = 0;
+	e3->pWidget = nullptr;
 	e3->szClassName = g_szClassName_OptionsWidget_highlighting;
 	e3->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_highlighting;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_highlighting
@@ -2379,11 +2379,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e3->szNameNoLocale = g_szName_OptionsWidget_highlighting;
 	e3->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_highlighting, "options");
 	e2->pChildList->append(e3);
-	e3->pChildList = 0;
+	e3->pChildList = nullptr;
 
 	e3 = new OptionsWidgetInstanceEntry;
 	e3->createProc = &classOptionsWidget_alerts_createInstanceProc;
-	e3->pWidget = 0;
+	e3->pWidget = nullptr;
 	e3->szClassName = g_szClassName_OptionsWidget_alerts;
 	e3->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_alerts;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_alerts
@@ -2415,11 +2415,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e3->szNameNoLocale = g_szName_OptionsWidget_alerts;
 	e3->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_alerts, "options");
 	e2->pChildList->append(e3);
-	e3->pChildList = 0;
+	e3->pChildList = nullptr;
 
 	e2 = new OptionsWidgetInstanceEntry;
 	e2->createProc = &classOptionsWidget_avatar_createInstanceProc;
-	e2->pWidget = 0;
+	e2->pWidget = nullptr;
 	e2->szClassName = g_szClassName_OptionsWidget_avatar;
 	e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_avatar;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_avatar
@@ -2451,11 +2451,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e2->szNameNoLocale = g_szName_OptionsWidget_avatar;
 	e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_avatar, "options");
 	e1->pChildList->append(e2);
-	e2->pChildList = 0;
+	e2->pChildList = nullptr;
 
 	e2 = new OptionsWidgetInstanceEntry;
 	e2->createProc = &classOptionsWidget_away_createInstanceProc;
-	e2->pWidget = 0;
+	e2->pWidget = nullptr;
 	e2->szClassName = g_szClassName_OptionsWidget_away;
 	e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_away;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_away
@@ -2487,11 +2487,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e2->szNameNoLocale = g_szName_OptionsWidget_away;
 	e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_away, "options");
 	e1->pChildList->append(e2);
-	e2->pChildList = 0;
+	e2->pChildList = nullptr;
 
 	e2 = new OptionsWidgetInstanceEntry;
 	e2->createProc = &classOptionsWidget_ctcp_createInstanceProc;
-	e2->pWidget = 0;
+	e2->pWidget = nullptr;
 	e2->szClassName = g_szClassName_OptionsWidget_ctcp;
 	e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_ctcp;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_ctcp
@@ -2523,11 +2523,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e2->szNameNoLocale = g_szName_OptionsWidget_ctcp;
 	e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_ctcp, "options");
 	e1->pChildList->append(e2);
-	e2->pChildList = 0;
+	e2->pChildList = nullptr;
 
 	e2 = new OptionsWidgetInstanceEntry;
 	e2->createProc = &classOptionsWidget_lag_createInstanceProc;
-	e2->pWidget = 0;
+	e2->pWidget = nullptr;
 	e2->szClassName = g_szClassName_OptionsWidget_lag;
 	e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_lag;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_lag
@@ -2559,11 +2559,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e2->szNameNoLocale = g_szName_OptionsWidget_lag;
 	e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_lag, "options");
 	e1->pChildList->append(e2);
-	e2->pChildList = 0;
+	e2->pChildList = nullptr;
 
 	e2 = new OptionsWidgetInstanceEntry;
 	e2->createProc = &classOptionsWidget_logging_createInstanceProc;
-	e2->pWidget = 0;
+	e2->pWidget = nullptr;
 	e2->szClassName = g_szClassName_OptionsWidget_logging;
 	e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_logging;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_logging
@@ -2595,11 +2595,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e2->szNameNoLocale = g_szName_OptionsWidget_logging;
 	e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_logging, "options");
 	e1->pChildList->append(e2);
-	e2->pChildList = 0;
+	e2->pChildList = nullptr;
 
 	e2 = new OptionsWidgetInstanceEntry;
 	e2->createProc = &classOptionsWidget_nickServ_createInstanceProc;
-	e2->pWidget = 0;
+	e2->pWidget = nullptr;
 	e2->szClassName = g_szClassName_OptionsWidget_nickServ;
 	e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_nickServ;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_nickServ
@@ -2631,11 +2631,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e2->szNameNoLocale = g_szName_OptionsWidget_nickServ;
 	e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_nickServ, "options");
 	e1->pChildList->append(e2);
-	e2->pChildList = 0;
+	e2->pChildList = nullptr;
 
 	e2 = new OptionsWidgetInstanceEntry;
 	e2->createProc = &classOptionsWidget_notify_createInstanceProc;
-	e2->pWidget = 0;
+	e2->pWidget = nullptr;
 	e2->szClassName = g_szClassName_OptionsWidget_notify;
 	e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_notify;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_notify
@@ -2667,11 +2667,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e2->szNameNoLocale = g_szName_OptionsWidget_notify;
 	e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_notify, "options");
 	e1->pChildList->append(e2);
-	e2->pChildList = 0;
+	e2->pChildList = nullptr;
 
 	e2 = new OptionsWidgetInstanceEntry;
 	e2->createProc = &classOptionsWidget_textIcons_createInstanceProc;
-	e2->pWidget = 0;
+	e2->pWidget = nullptr;
 	e2->szClassName = g_szClassName_OptionsWidget_textIcons;
 	e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_textIcons;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_textIcons
@@ -2703,11 +2703,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e2->szNameNoLocale = g_szName_OptionsWidget_textIcons;
 	e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_textIcons, "options");
 	e1->pChildList->append(e2);
-	e2->pChildList = 0;
+	e2->pChildList = nullptr;
 
 	e0 = new OptionsWidgetInstanceEntry;
 	e0->createProc = &classOptionsWidget_ircViewTheme_createInstanceProc;
-	e0->pWidget = 0;
+	e0->pWidget = nullptr;
 	e0->szClassName = g_szClassName_OptionsWidget_ircViewTheme;
 	e0->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_ircViewTheme;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_ircViewTheme
@@ -2745,7 +2745,7 @@ OptionsInstanceManager::OptionsInstanceManager()
 
 	e1 = new OptionsWidgetInstanceEntry;
 	e1->createProc = &classOptionsWidget_ircViewLook_createInstanceProc;
-	e1->pWidget = 0;
+	e1->pWidget = nullptr;
 	e1->szClassName = g_szClassName_OptionsWidget_ircViewLook;
 	e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_ircViewLook;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_ircViewLook
@@ -2777,11 +2777,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e1->szNameNoLocale = g_szName_OptionsWidget_ircViewLook;
 	e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_ircViewLook, "options");
 	e0->pChildList->append(e1);
-	e1->pChildList = 0;
+	e1->pChildList = nullptr;
 
 	e1 = new OptionsWidgetInstanceEntry;
 	e1->createProc = &classOptionsWidget_ircViewFeatures_createInstanceProc;
-	e1->pWidget = 0;
+	e1->pWidget = nullptr;
 	e1->szClassName = g_szClassName_OptionsWidget_ircViewFeatures;
 	e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_ircViewFeatures;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_ircViewFeatures
@@ -2813,11 +2813,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e1->szNameNoLocale = g_szName_OptionsWidget_ircViewFeatures;
 	e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_ircViewFeatures, "options");
 	e0->pChildList->append(e1);
-	e1->pChildList = 0;
+	e1->pChildList = nullptr;
 
 	e1 = new OptionsWidgetInstanceEntry;
 	e1->createProc = &classOptionsWidget_ircViewMarker_createInstanceProc;
-	e1->pWidget = 0;
+	e1->pWidget = nullptr;
 	e1->szClassName = g_szClassName_OptionsWidget_ircViewMarker;
 	e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_ircViewMarker;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_ircViewMarker
@@ -2849,11 +2849,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e1->szNameNoLocale = g_szName_OptionsWidget_ircViewMarker;
 	e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_ircViewMarker, "options");
 	e0->pChildList->append(e1);
-	e1->pChildList = 0;
+	e1->pChildList = nullptr;
 
 	e0 = new OptionsWidgetInstanceEntry;
 	e0->createProc = &classOptionsWidget_message_createInstanceProc;
-	e0->pWidget = 0;
+	e0->pWidget = nullptr;
 	e0->szClassName = g_szClassName_OptionsWidget_message;
 	e0->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_message;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_message
@@ -2891,7 +2891,7 @@ OptionsInstanceManager::OptionsInstanceManager()
 
 	e1 = new OptionsWidgetInstanceEntry;
 	e1->createProc = &classOptionsWidget_privmsg_createInstanceProc;
-	e1->pWidget = 0;
+	e1->pWidget = nullptr;
 	e1->szClassName = g_szClassName_OptionsWidget_privmsg;
 	e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_privmsg;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_privmsg
@@ -2923,11 +2923,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e1->szNameNoLocale = g_szName_OptionsWidget_privmsg;
 	e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_privmsg, "options");
 	e0->pChildList->append(e1);
-	e1->pChildList = 0;
+	e1->pChildList = nullptr;
 
 	e1 = new OptionsWidgetInstanceEntry;
 	e1->createProc = &classOptionsWidget_timestamp_createInstanceProc;
-	e1->pWidget = 0;
+	e1->pWidget = nullptr;
 	e1->szClassName = g_szClassName_OptionsWidget_timestamp;
 	e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_timestamp;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_timestamp
@@ -2959,11 +2959,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e1->szNameNoLocale = g_szName_OptionsWidget_timestamp;
 	e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_timestamp, "options");
 	e0->pChildList->append(e1);
-	e1->pChildList = 0;
+	e1->pChildList = nullptr;
 
 	e1 = new OptionsWidgetInstanceEntry;
 	e1->createProc = &classOptionsWidget_messageColors_createInstanceProc;
-	e1->pWidget = 0;
+	e1->pWidget = nullptr;
 	e1->szClassName = g_szClassName_OptionsWidget_messageColors;
 	e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_messageColors;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_messageColors
@@ -2995,11 +2995,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e1->szNameNoLocale = g_szName_OptionsWidget_messageColors;
 	e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_messageColors, "options");
 	e0->pChildList->append(e1);
-	e1->pChildList = 0;
+	e1->pChildList = nullptr;
 
 	e1 = new OptionsWidgetInstanceEntry;
 	e1->createProc = &classOptionsWidget_standardColors_createInstanceProc;
-	e1->pWidget = 0;
+	e1->pWidget = nullptr;
 	e1->szClassName = g_szClassName_OptionsWidget_standardColors;
 	e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_standardColors;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_standardColors
@@ -3031,11 +3031,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e1->szNameNoLocale = g_szName_OptionsWidget_standardColors;
 	e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_standardColors, "options");
 	e0->pChildList->append(e1);
-	e1->pChildList = 0;
+	e1->pChildList = nullptr;
 
 	e0 = new OptionsWidgetInstanceEntry;
 	e0->createProc = &classOptionsWidget_notifierLook_createInstanceProc;
-	e0->pWidget = 0;
+	e0->pWidget = nullptr;
 	e0->szClassName = g_szClassName_OptionsWidget_notifierLook;
 	e0->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_notifierLook;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_notifierLook
@@ -3067,11 +3067,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e0->szNameNoLocale = g_szName_OptionsWidget_notifierLook;
 	e0->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_notifierLook, "options");
 	m_pInstanceTree->append(e0);
-	e0->pChildList = 0;
+	e0->pChildList = nullptr;
 
 	e0 = new OptionsWidgetInstanceEntry;
 	e0->createProc = &classOptionsWidget_servers_createInstanceProc;
-	e0->pWidget = 0;
+	e0->pWidget = nullptr;
 	e0->szClassName = g_szClassName_OptionsWidget_servers;
 	e0->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_servers;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_servers
@@ -3103,11 +3103,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e0->szNameNoLocale = g_szName_OptionsWidget_servers;
 	e0->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_servers, "options");
 	m_pInstanceTree->append(e0);
-	e0->pChildList = 0;
+	e0->pChildList = nullptr;
 
 	e0 = new OptionsWidgetInstanceEntry;
 	e0->createProc = &classOptionsWidget_theme_createInstanceProc;
-	e0->pWidget = 0;
+	e0->pWidget = nullptr;
 	e0->szClassName = g_szClassName_OptionsWidget_theme;
 	e0->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_theme;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_theme
@@ -3139,11 +3139,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e0->szNameNoLocale = g_szName_OptionsWidget_theme;
 	e0->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_theme, "options");
 	m_pInstanceTree->append(e0);
-	e0->pChildList = 0;
+	e0->pChildList = nullptr;
 
 	e0 = new OptionsWidgetInstanceEntry;
 	e0->createProc = &classOptionsWidget_themeTransparency_createInstanceProc;
-	e0->pWidget = 0;
+	e0->pWidget = nullptr;
 	e0->szClassName = g_szClassName_OptionsWidget_themeTransparency;
 	e0->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_themeTransparency;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_themeTransparency
@@ -3175,11 +3175,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e0->szNameNoLocale = g_szName_OptionsWidget_themeTransparency;
 	e0->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_themeTransparency, "options");
 	m_pInstanceTree->append(e0);
-	e0->pChildList = 0;
+	e0->pChildList = nullptr;
 
 	e0 = new OptionsWidgetInstanceEntry;
 	e0->createProc = &classOptionsWidget_themeToolBarApplets_createInstanceProc;
-	e0->pWidget = 0;
+	e0->pWidget = nullptr;
 	e0->szClassName = g_szClassName_OptionsWidget_themeToolBarApplets;
 	e0->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_themeToolBarApplets;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_themeToolBarApplets
@@ -3211,11 +3211,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e0->szNameNoLocale = g_szName_OptionsWidget_themeToolBarApplets;
 	e0->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_themeToolBarApplets, "options");
 	m_pInstanceTree->append(e0);
-	e0->pChildList = 0;
+	e0->pChildList = nullptr;
 
 	e0 = new OptionsWidgetInstanceEntry;
 	e0->createProc = &classOptionsWidget_topicLabel_createInstanceProc;
-	e0->pWidget = 0;
+	e0->pWidget = nullptr;
 	e0->szClassName = g_szClassName_OptionsWidget_topicLabel;
 	e0->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_topicLabel;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_topicLabel
@@ -3247,11 +3247,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e0->szNameNoLocale = g_szName_OptionsWidget_topicLabel;
 	e0->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_topicLabel, "options");
 	m_pInstanceTree->append(e0);
-	e0->pChildList = 0;
+	e0->pChildList = nullptr;
 
 	e0 = new OptionsWidgetInstanceEntry;
 	e0->createProc = &classOptionsWidget_userList_createInstanceProc;
-	e0->pWidget = 0;
+	e0->pWidget = nullptr;
 	e0->szClassName = g_szClassName_OptionsWidget_userList;
 	e0->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_userList;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_userList
@@ -3289,7 +3289,7 @@ OptionsInstanceManager::OptionsInstanceManager()
 
 	e1 = new OptionsWidgetInstanceEntry;
 	e1->createProc = &classOptionsWidget_userListBackground_createInstanceProc;
-	e1->pWidget = 0;
+	e1->pWidget = nullptr;
 	e1->szClassName = g_szClassName_OptionsWidget_userListBackground;
 	e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_userListBackground;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_userListBackground
@@ -3321,11 +3321,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e1->szNameNoLocale = g_szName_OptionsWidget_userListBackground;
 	e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_userListBackground, "options");
 	e0->pChildList->append(e1);
-	e1->pChildList = 0;
+	e1->pChildList = nullptr;
 
 	e1 = new OptionsWidgetInstanceEntry;
 	e1->createProc = &classOptionsWidget_userListForeground_createInstanceProc;
-	e1->pWidget = 0;
+	e1->pWidget = nullptr;
 	e1->szClassName = g_szClassName_OptionsWidget_userListForeground;
 	e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_userListForeground;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_userListForeground
@@ -3357,11 +3357,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e1->szNameNoLocale = g_szName_OptionsWidget_userListForeground;
 	e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_userListForeground, "options");
 	e0->pChildList->append(e1);
-	e1->pChildList = 0;
+	e1->pChildList = nullptr;
 
 	e1 = new OptionsWidgetInstanceEntry;
 	e1->createProc = &classOptionsWidget_userListGrid_createInstanceProc;
-	e1->pWidget = 0;
+	e1->pWidget = nullptr;
 	e1->szClassName = g_szClassName_OptionsWidget_userListGrid;
 	e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_userListGrid;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_userListGrid
@@ -3393,11 +3393,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e1->szNameNoLocale = g_szName_OptionsWidget_userListGrid;
 	e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_userListGrid, "options");
 	e0->pChildList->append(e1);
-	e1->pChildList = 0;
+	e1->pChildList = nullptr;
 
 	e1 = new OptionsWidgetInstanceEntry;
 	e1->createProc = &classOptionsWidget_userListFeatures_createInstanceProc;
-	e1->pWidget = 0;
+	e1->pWidget = nullptr;
 	e1->szClassName = g_szClassName_OptionsWidget_userListFeatures;
 	e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_userListFeatures;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_userListFeatures
@@ -3429,11 +3429,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e1->szNameNoLocale = g_szName_OptionsWidget_userListFeatures;
 	e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_userListFeatures, "options");
 	e0->pChildList->append(e1);
-	e1->pChildList = 0;
+	e1->pChildList = nullptr;
 
 	e0 = new OptionsWidgetInstanceEntry;
 	e0->createProc = &classOptionsWidget_windowList_createInstanceProc;
-	e0->pWidget = 0;
+	e0->pWidget = nullptr;
 	e0->szClassName = g_szClassName_OptionsWidget_windowList;
 	e0->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_windowList;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_windowList
@@ -3471,7 +3471,7 @@ OptionsInstanceManager::OptionsInstanceManager()
 
 	e1 = new OptionsWidgetInstanceEntry;
 	e1->createProc = &classOptionsWidget_windowListTree_createInstanceProc;
-	e1->pWidget = 0;
+	e1->pWidget = nullptr;
 	e1->szClassName = g_szClassName_OptionsWidget_windowListTree;
 	e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_windowListTree;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_windowListTree
@@ -3509,7 +3509,7 @@ OptionsInstanceManager::OptionsInstanceManager()
 
 	e2 = new OptionsWidgetInstanceEntry;
 	e2->createProc = &classOptionsWidget_windowListTreeForeground_createInstanceProc;
-	e2->pWidget = 0;
+	e2->pWidget = nullptr;
 	e2->szClassName = g_szClassName_OptionsWidget_windowListTreeForeground;
 	e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_windowListTreeForeground;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_windowListTreeForeground
@@ -3541,11 +3541,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e2->szNameNoLocale = g_szName_OptionsWidget_windowListTreeForeground;
 	e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_windowListTreeForeground, "options");
 	e1->pChildList->append(e2);
-	e2->pChildList = 0;
+	e2->pChildList = nullptr;
 
 	e2 = new OptionsWidgetInstanceEntry;
 	e2->createProc = &classOptionsWidget_windowListTreeBackground_createInstanceProc;
-	e2->pWidget = 0;
+	e2->pWidget = nullptr;
 	e2->szClassName = g_szClassName_OptionsWidget_windowListTreeBackground;
 	e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_windowListTreeBackground;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_windowListTreeBackground
@@ -3577,11 +3577,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e2->szNameNoLocale = g_szName_OptionsWidget_windowListTreeBackground;
 	e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_windowListTreeBackground, "options");
 	e1->pChildList->append(e2);
-	e2->pChildList = 0;
+	e2->pChildList = nullptr;
 
 	e2 = new OptionsWidgetInstanceEntry;
 	e2->createProc = &classOptionsWidget_windowListTreeFeatures_createInstanceProc;
-	e2->pWidget = 0;
+	e2->pWidget = nullptr;
 	e2->szClassName = g_szClassName_OptionsWidget_windowListTreeFeatures;
 	e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_windowListTreeFeatures;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_windowListTreeFeatures
@@ -3613,11 +3613,11 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e2->szNameNoLocale = g_szName_OptionsWidget_windowListTreeFeatures;
 	e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_windowListTreeFeatures, "options");
 	e1->pChildList->append(e2);
-	e2->pChildList = 0;
+	e2->pChildList = nullptr;
 
 	e1 = new OptionsWidgetInstanceEntry;
 	e1->createProc = &classOptionsWidget_windowListClassic_createInstanceProc;
-	e1->pWidget = 0;
+	e1->pWidget = nullptr;
 	e1->szClassName = g_szClassName_OptionsWidget_windowListClassic;
 	e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_windowListClassic;
 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_windowListClassic
@@ -3649,7 +3649,7 @@ OptionsInstanceManager::OptionsInstanceManager()
 	e1->szNameNoLocale = g_szName_OptionsWidget_windowListClassic;
 	e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_windowListClassic, "options");
 	e0->pChildList->append(e1);
-	e1->pChildList = 0;
+	e1->pChildList = nullptr;
 }
 
 void OptionsInstanceManager::deleteInstanceTree(KviPointerList<OptionsWidgetInstanceEntry> * pList)
@@ -3664,7 +3664,7 @@ void OptionsInstanceManager::deleteInstanceTree(KviPointerList<OptionsWidgetInst
 				{
 					disconnect(pEntry->pWidget, SIGNAL(destroyed()), this, SLOT(widgetDestroyed()));
 					delete pEntry->pWidget->parent();
-					pEntry->pWidget = 0;
+					pEntry->pWidget = nullptr;
 				}
 				else
 				{
@@ -3687,14 +3687,14 @@ OptionsInstanceManager::~OptionsInstanceManager()
 void OptionsInstanceManager::cleanup(KviModule *)
 {
 	deleteInstanceTree(m_pInstanceTree);
-	m_pInstanceTree = 0;
+	m_pInstanceTree = nullptr;
 }
 
 void OptionsInstanceManager::widgetDestroyed()
 {
 	OptionsWidgetInstanceEntry * pEntry = findInstanceEntry(sender(), m_pInstanceTree);
 	if(pEntry)
-		pEntry->pWidget = 0;
+		pEntry->pWidget = nullptr;
 	if(g_iOptionWidgetInstances > 0)
 		g_iOptionWidgetInstances--;
 }
@@ -3702,7 +3702,7 @@ void OptionsInstanceManager::widgetDestroyed()
 KviOptionsWidget * OptionsInstanceManager::getInstance(OptionsWidgetInstanceEntry * pEntry, QWidget * pPar)
 {
 	if(!pEntry)
-		return NULL;
+		return nullptr;
 
 #if 0
 	if(pEntry->pWidget)
@@ -3786,7 +3786,7 @@ OptionsWidgetInstanceEntry * OptionsInstanceManager::findInstanceEntry(const QOb
 			}
 		}
 	}
-	return 0;
+	return nullptr;
 }
 
 OptionsWidgetInstanceEntry * OptionsInstanceManager::findInstanceEntry(const char * pcName, KviPointerList<OptionsWidgetInstanceEntry> * pList)
@@ -3805,7 +3805,7 @@ OptionsWidgetInstanceEntry * OptionsInstanceManager::findInstanceEntry(const cha
 			}
 		}
 	}
-	return 0;
+	return nullptr;
 }
 
 OptionsWidgetInstanceEntry * OptionsInstanceManager::findInstanceEntry(const char * pcName)
diff --git a/src/modules/options/OptionsWidgetContainer.cpp b/src/modules/options/OptionsWidgetContainer.cpp
index 5b891fb8e..04afa1040 100644
--- a/src/modules/options/OptionsWidgetContainer.cpp
+++ b/src/modules/options/OptionsWidgetContainer.cpp
@@ -48,7 +48,7 @@ OptionsWidgetContainer::OptionsWidgetContainer(QWidget * par, bool bModal)
 
 	setObjectName("container");
 
-	m_pOptionsWidget = NULL;
+	m_pOptionsWidget = nullptr;
 
 	if(bModal)
 		setWindowModality(par ? Qt::WindowModal : Qt::ApplicationModal);
@@ -76,7 +76,7 @@ void OptionsWidgetContainer::setNextToLeft(QWidget * pWidget)
 
 void OptionsWidgetContainer::optionsWidgetDestroyed()
 {
-	m_pOptionsWidget = NULL;
+	m_pOptionsWidget = nullptr;
 }
 
 void OptionsWidgetContainer::childEvent(QChildEvent * e)
@@ -89,7 +89,7 @@ void OptionsWidgetContainer::childEvent(QChildEvent * e)
 		if(e->child() == static_cast<QObject *>(m_pOptionsWidget))
 		{
 			QObject::disconnect(m_pOptionsWidget, SIGNAL(destroyed()), this, SLOT(optionsWidgetDestroyed()));
-			m_pOptionsWidget = NULL;
+			m_pOptionsWidget = nullptr;
 		}
 	}
 
diff --git a/src/modules/options/OptionsWidget_alertsAndHighlighting.cpp b/src/modules/options/OptionsWidget_alertsAndHighlighting.cpp
index 2d69b9c71..67002ba08 100644
--- a/src/modules/options/OptionsWidget_alertsAndHighlighting.cpp
+++ b/src/modules/options/OptionsWidget_alertsAndHighlighting.cpp
@@ -41,8 +41,7 @@ OptionsWidget_alertsAndHighlighting::OptionsWidget_alertsAndHighlighting(QWidget
 }
 
 OptionsWidget_alertsAndHighlighting::~OptionsWidget_alertsAndHighlighting()
-{
-}
+    = default;
 
 OptionsWidget_highlighting::OptionsWidget_highlighting(QWidget * parent)
     : KviOptionsWidget(parent)
@@ -98,8 +97,7 @@ OptionsWidget_highlighting::OptionsWidget_highlighting(QWidget * parent)
 }
 
 OptionsWidget_highlighting::~OptionsWidget_highlighting()
-{
-}
+    = default;
 
 void OptionsWidget_highlighting::commit()
 {
@@ -140,7 +138,6 @@ OptionsWidget_alerts::OptionsWidget_alerts(QWidget * parent)
 }
 
 OptionsWidget_alerts::~OptionsWidget_alerts()
-{
-}
+    = default;
 
 #endif //_OPTW_HIGHLIGHTING_CPP_
diff --git a/src/modules/options/OptionsWidget_antiSpam.cpp b/src/modules/options/OptionsWidget_antiSpam.cpp
index 8ce261fe4..71d42873b 100644
--- a/src/modules/options/OptionsWidget_antiSpam.cpp
+++ b/src/modules/options/OptionsWidget_antiSpam.cpp
@@ -51,8 +51,7 @@ OptionsWidget_antispam::OptionsWidget_antispam(QWidget * parent)
 }
 
 OptionsWidget_antispam::~OptionsWidget_antispam()
-{
-}
+    = default;
 
 void OptionsWidget_antispam::reenableStuff(bool)
 {
diff --git a/src/modules/options/OptionsWidget_avatar.cpp b/src/modules/options/OptionsWidget_avatar.cpp
index 3766e6498..4bf45ff99 100644
--- a/src/modules/options/OptionsWidget_avatar.cpp
+++ b/src/modules/options/OptionsWidget_avatar.cpp
@@ -114,5 +114,4 @@ OptionsWidget_avatar::OptionsWidget_avatar(QWidget * parent)
 }
 
 OptionsWidget_avatar::~OptionsWidget_avatar()
-{
-}
+    = default;
diff --git a/src/modules/options/OptionsWidget_away.cpp b/src/modules/options/OptionsWidget_away.cpp
index 8f1879d12..2912b8c44 100644
--- a/src/modules/options/OptionsWidget_away.cpp
+++ b/src/modules/options/OptionsWidget_away.cpp
@@ -56,8 +56,7 @@ OptionsWidget_away::OptionsWidget_away(QWidget * parent)
 }
 
 OptionsWidget_away::~OptionsWidget_away()
-{
-}
+    = default;
 
 void OptionsWidget_away::enableCustomAwayText(bool)
 {
diff --git a/src/modules/options/OptionsWidget_channel.cpp b/src/modules/options/OptionsWidget_channel.cpp
index 22da578b1..a79f63d56 100644
--- a/src/modules/options/OptionsWidget_channel.cpp
+++ b/src/modules/options/OptionsWidget_channel.cpp
@@ -41,8 +41,7 @@ OptionsWidget_channel::OptionsWidget_channel(QWidget * pParent)
 }
 
 OptionsWidget_channel::~OptionsWidget_channel()
-{
-}
+    = default;
 
 OptionsWidget_channelGeneral::OptionsWidget_channelGeneral(QWidget * pParent)
     : KviOptionsWidget(pParent)
@@ -90,8 +89,7 @@ OptionsWidget_channelGeneral::OptionsWidget_channelGeneral(QWidget * pParent)
 }
 
 OptionsWidget_channelGeneral::~OptionsWidget_channelGeneral()
-{
-}
+    = default;
 
 OptionsWidget_channelAdvanced::OptionsWidget_channelAdvanced(QWidget * pParent)
     : KviOptionsWidget(pParent)
@@ -165,8 +163,7 @@ OptionsWidget_channelAdvanced::OptionsWidget_channelAdvanced(QWidget * pParent)
 }
 
 OptionsWidget_channelAdvanced::~OptionsWidget_channelAdvanced()
-{
-}
+    = default;
 
 void OptionsWidget_channelAdvanced::commit()
 {
diff --git a/src/modules/options/OptionsWidget_connection.cpp b/src/modules/options/OptionsWidget_connection.cpp
index 8f3335d76..ca27b9a92 100644
--- a/src/modules/options/OptionsWidget_connection.cpp
+++ b/src/modules/options/OptionsWidget_connection.cpp
@@ -92,8 +92,7 @@ OptionsWidget_connection::OptionsWidget_connection(QWidget * parent)
 }
 
 OptionsWidget_connection::~OptionsWidget_connection()
-{
-}
+    = default;
 
 OptionsWidget_connectionSsl::OptionsWidget_connectionSsl(QWidget * parent)
     : KviOptionsWidget(parent)
@@ -138,8 +137,7 @@ OptionsWidget_connectionSsl::OptionsWidget_connectionSsl(QWidget * parent)
 }
 
 OptionsWidget_connectionSsl::~OptionsWidget_connectionSsl()
-{
-}
+    = default;
 
 OptionsWidget_connectionSocket::OptionsWidget_connectionSocket(QWidget * parent)
     : KviOptionsWidget(parent)
@@ -188,8 +186,7 @@ OptionsWidget_connectionSocket::OptionsWidget_connectionSocket(QWidget * parent)
 }
 
 OptionsWidget_connectionSocket::~OptionsWidget_connectionSocket()
-{
-}
+    = default;
 
 OptionsWidget_identService::OptionsWidget_identService(QWidget * parent)
     : KviOptionsWidget(parent)
@@ -278,8 +275,7 @@ OptionsWidget_identService::OptionsWidget_identService(QWidget * parent)
 }
 
 OptionsWidget_identService::~OptionsWidget_identService()
-{
-}
+    = default;
 
 void OptionsWidget_identService::commit()
 {
@@ -306,5 +302,4 @@ OptionsWidget_connectionAdvanced::OptionsWidget_connectionAdvanced(QWidget * par
 }
 
 OptionsWidget_connectionAdvanced::~OptionsWidget_connectionAdvanced()
-{
-}
+    = default;
diff --git a/src/modules/options/OptionsWidget_ctcp.cpp b/src/modules/options/OptionsWidget_ctcp.cpp
index 634551ad8..29f71dd40 100644
--- a/src/modules/options/OptionsWidget_ctcp.cpp
+++ b/src/modules/options/OptionsWidget_ctcp.cpp
@@ -74,5 +74,4 @@ OptionsWidget_ctcp::OptionsWidget_ctcp(QWidget * parent)
 }
 
 OptionsWidget_ctcp::~OptionsWidget_ctcp()
-{
-}
+    = default;
diff --git a/src/modules/options/OptionsWidget_ctcpFloodProtection.cpp b/src/modules/options/OptionsWidget_ctcpFloodProtection.cpp
index d4972b4ca..8f625c57a 100644
--- a/src/modules/options/OptionsWidget_ctcpFloodProtection.cpp
+++ b/src/modules/options/OptionsWidget_ctcpFloodProtection.cpp
@@ -107,5 +107,4 @@ OptionsWidget_ctcpFloodProtection::OptionsWidget_ctcpFloodProtection(QWidget * p
 }
 
 OptionsWidget_ctcpFloodProtection::~OptionsWidget_ctcpFloodProtection()
-{
-}
+    = default;
diff --git a/src/modules/options/OptionsWidget_dcc.cpp b/src/modules/options/OptionsWidget_dcc.cpp
index 0f4773476..a89dd79d6 100644
--- a/src/modules/options/OptionsWidget_dcc.cpp
+++ b/src/modules/options/OptionsWidget_dcc.cpp
@@ -35,8 +35,7 @@ OptionsWidget_dcc::OptionsWidget_dcc(QWidget * pParent)
 }
 
 OptionsWidget_dcc::~OptionsWidget_dcc()
-{
-}
+    = default;
 
 OptionsWidget_dccGeneral::OptionsWidget_dccGeneral(QWidget * parent)
     : KviOptionsWidget(parent)
@@ -54,8 +53,7 @@ OptionsWidget_dccGeneral::OptionsWidget_dccGeneral(QWidget * parent)
 }
 
 OptionsWidget_dccGeneral::~OptionsWidget_dccGeneral()
-{
-}
+    = default;
 
 OptionsWidget_dccAdvanced::OptionsWidget_dccAdvanced(QWidget * parent)
     : KviOptionsWidget(parent)
@@ -155,8 +153,7 @@ OptionsWidget_dccAdvanced::OptionsWidget_dccAdvanced(QWidget * parent)
 }
 
 OptionsWidget_dccAdvanced::~OptionsWidget_dccAdvanced()
-{
-}
+    = default;
 
 OptionsWidget_dccSend::OptionsWidget_dccSend(QWidget * parent)
     : KviOptionsWidget(parent)
@@ -165,8 +162,7 @@ OptionsWidget_dccSend::OptionsWidget_dccSend(QWidget * parent)
 }
 
 OptionsWidget_dccSend::~OptionsWidget_dccSend()
-{
-}
+    = default;
 
 OptionsWidget_dccSendGeneral::OptionsWidget_dccSendGeneral(QWidget * parent)
     : KviOptionsWidget(parent)
@@ -223,8 +219,7 @@ OptionsWidget_dccSendGeneral::OptionsWidget_dccSendGeneral(QWidget * parent)
 }
 
 OptionsWidget_dccSendGeneral::~OptionsWidget_dccSendGeneral()
-{
-}
+    = default;
 
 OptionsWidget_dccSendAdvanced::OptionsWidget_dccSendAdvanced(QWidget * parent)
     : KviOptionsWidget(parent)
@@ -326,8 +321,7 @@ OptionsWidget_dccSendAdvanced::OptionsWidget_dccSendAdvanced(QWidget * parent)
 }
 
 OptionsWidget_dccSendAdvanced::~OptionsWidget_dccSendAdvanced()
-{
-}
+    = default;
 
 OptionsWidget_dccChat::OptionsWidget_dccChat(QWidget * parent)
     : KviOptionsWidget(parent)
@@ -375,8 +369,7 @@ OptionsWidget_dccChat::OptionsWidget_dccChat(QWidget * parent)
 }
 
 OptionsWidget_dccChat::~OptionsWidget_dccChat()
-{
-}
+    = default;
 
 OptionsWidget_dccVoice::OptionsWidget_dccVoice(QWidget * p) : KviOptionsWidget(p)
 {
@@ -419,5 +412,4 @@ OptionsWidget_dccVoice::OptionsWidget_dccVoice(QWidget * p) : KviOptionsWidget(p
 }
 
 OptionsWidget_dccVoice::~OptionsWidget_dccVoice()
-{
-}
+    = default;
diff --git a/src/modules/options/OptionsWidget_general.cpp b/src/modules/options/OptionsWidget_general.cpp
index 1ead7ce6d..0414981cb 100644
--- a/src/modules/options/OptionsWidget_general.cpp
+++ b/src/modules/options/OptionsWidget_general.cpp
@@ -45,5 +45,4 @@ OptionsWidget_general::OptionsWidget_general(QWidget * parent)
 }
 
 OptionsWidget_general::~OptionsWidget_general()
-{
-}
+    = default;
diff --git a/src/modules/options/OptionsWidget_identity.cpp b/src/modules/options/OptionsWidget_identity.cpp
index 62159e7fb..599f447bb 100644
--- a/src/modules/options/OptionsWidget_identity.cpp
+++ b/src/modules/options/OptionsWidget_identity.cpp
@@ -105,8 +105,7 @@ NickAlternativesDialog::NickAlternativesDialog(QWidget * par, const QString & n1
 }
 
 NickAlternativesDialog::~NickAlternativesDialog()
-{
-}
+    = default;
 
 void NickAlternativesDialog::fill(QString & n1, QString & n2, QString & n3)
 {
@@ -250,8 +249,7 @@ AvatarSelectionDialog::AvatarSelectionDialog(QWidget * par, const QString & szIn
 }
 
 AvatarSelectionDialog::~AvatarSelectionDialog()
-{
-}
+    = default;
 
 void AvatarSelectionDialog::okClicked()
 {
@@ -285,8 +283,7 @@ OptionsWidget_identity::OptionsWidget_identity(QWidget * parent)
 }
 
 OptionsWidget_identity::~OptionsWidget_identity()
-{
-}
+    = default;
 
 KviIdentityGeneralOptionsWidget::KviIdentityGeneralOptionsWidget(QWidget * parent)
     : KviOptionsWidget(parent)
@@ -413,8 +410,7 @@ KviIdentityGeneralOptionsWidget::KviIdentityGeneralOptionsWidget(QWidget * paren
 }
 
 KviIdentityGeneralOptionsWidget::~KviIdentityGeneralOptionsWidget()
-{
-}
+    = default;
 
 void KviIdentityGeneralOptionsWidget::setNickAlternatives()
 {
@@ -665,9 +661,9 @@ void OptionsWidget_identityAvatar::chooseAvatar()
 OptionsWidget_identityAdvanced::OptionsWidget_identityAdvanced(QWidget * parent)
     : KviOptionsWidget(parent)
 {
-	m_pISelector = 0;
-	m_pWSelector = 0;
-	m_pSSelector = 0;
+	m_pISelector = nullptr;
+	m_pWSelector = nullptr;
+	m_pSSelector = nullptr;
 
 	m_sModeStr = KVI_OPTION_STRING(KviOption_stringDefaultUserMode);
 	m_bI = m_sModeStr.contains('i');
@@ -701,8 +697,7 @@ OptionsWidget_identityAdvanced::OptionsWidget_identityAdvanced(QWidget * parent)
 }
 
 OptionsWidget_identityAdvanced::~OptionsWidget_identityAdvanced()
-{
-}
+    = default;
 
 void OptionsWidget_identityAdvanced::commit()
 {
@@ -721,7 +716,7 @@ OptionsWidget_identityProfile::OptionsWidget_identityProfile(QWidget * pParent)
     : KviOptionsWidget(pParent)
 {
 	setObjectName("identity_profiles_option_widget");
-	m_pEditor = 0;
+	m_pEditor = nullptr;
 	m_iCurrentEditedProfile = -1;
 
 	createLayout();
@@ -795,8 +790,7 @@ OptionsWidget_identityProfile::OptionsWidget_identityProfile(QWidget * pParent)
 }
 
 OptionsWidget_identityProfile::~OptionsWidget_identityProfile()
-{
-}
+    = default;
 
 void OptionsWidget_identityProfile::toggleControls()
 {
@@ -982,8 +976,7 @@ IdentityProfileEditor::IdentityProfileEditor(QWidget * pParent)
 }
 
 IdentityProfileEditor::~IdentityProfileEditor()
-{
-}
+    = default;
 
 bool IdentityProfileEditor::editProfile(KviIdentityProfile * pProfile)
 {
diff --git a/src/modules/options/OptionsWidget_ignore.cpp b/src/modules/options/OptionsWidget_ignore.cpp
index 4715426a1..a12038b15 100644
--- a/src/modules/options/OptionsWidget_ignore.cpp
+++ b/src/modules/options/OptionsWidget_ignore.cpp
@@ -50,8 +50,7 @@ OptionsWidget_ignore::OptionsWidget_ignore(QWidget * parent)
 }
 
 OptionsWidget_ignore::~OptionsWidget_ignore()
-{
-}
+    = default;
 
 void OptionsWidget_ignore::enableVerbose(bool)
 {
diff --git a/src/modules/options/OptionsWidget_input.cpp b/src/modules/options/OptionsWidget_input.cpp
index c4431b68a..804d8fafb 100644
--- a/src/modules/options/OptionsWidget_input.cpp
+++ b/src/modules/options/OptionsWidget_input.cpp
@@ -97,8 +97,7 @@ OptionsWidget_inputLook::OptionsWidget_inputLook(QWidget * parent)
 }
 
 OptionsWidget_inputLook::~OptionsWidget_inputLook()
-{
-}
+    = default;
 
 void OptionsWidget_inputLook::commit()
 {
@@ -166,5 +165,4 @@ OptionsWidget_inputFeatures::OptionsWidget_inputFeatures(QWidget * parent)
 }
 
 OptionsWidget_inputFeatures::~OptionsWidget_inputFeatures()
-{
-}
+    = default;
diff --git a/src/modules/options/OptionsWidget_interfaceFeatures.cpp b/src/modules/options/OptionsWidget_interfaceFeatures.cpp
index e486ed284..90596731a 100644
--- a/src/modules/options/OptionsWidget_interfaceFeatures.cpp
+++ b/src/modules/options/OptionsWidget_interfaceFeatures.cpp
@@ -72,5 +72,4 @@ OptionsWidget_interfaceFeatures::OptionsWidget_interfaceFeatures(QWidget * paren
 }
 
 OptionsWidget_interfaceFeatures::~OptionsWidget_interfaceFeatures()
-{
-}
+    = default;
diff --git a/src/modules/options/OptionsWidget_irc.cpp b/src/modules/options/OptionsWidget_irc.cpp
index 7f68bb442..c49c8659b 100644
--- a/src/modules/options/OptionsWidget_irc.cpp
+++ b/src/modules/options/OptionsWidget_irc.cpp
@@ -36,8 +36,7 @@ OptionsWidget_irc::OptionsWidget_irc(QWidget * parent)
 }
 
 OptionsWidget_irc::~OptionsWidget_irc()
-{
-}
+    = default;
 
 OptionsWidget_ircGeneral::OptionsWidget_ircGeneral(QWidget * parent)
     : KviOptionsWidget(parent)
@@ -50,8 +49,7 @@ OptionsWidget_ircGeneral::OptionsWidget_ircGeneral(QWidget * parent)
 }
 
 OptionsWidget_ircGeneral::~OptionsWidget_ircGeneral()
-{
-}
+    = default;
 
 OptionsWidget_ircAdvanced::OptionsWidget_ircAdvanced(QWidget * parent)
     : KviOptionsWidget(parent)
@@ -77,5 +75,4 @@ OptionsWidget_ircAdvanced::OptionsWidget_ircAdvanced(QWidget * parent)
 }
 
 OptionsWidget_ircAdvanced::~OptionsWidget_ircAdvanced()
-{
-}
+    = default;
diff --git a/src/modules/options/OptionsWidget_ircOutput.cpp b/src/modules/options/OptionsWidget_ircOutput.cpp
index 9cff3d256..86bbf5088 100644
--- a/src/modules/options/OptionsWidget_ircOutput.cpp
+++ b/src/modules/options/OptionsWidget_ircOutput.cpp
@@ -89,8 +89,7 @@ OptionsWidget_ircOutput::OptionsWidget_ircOutput(QWidget * pParent)
 }
 
 OptionsWidget_ircOutput::~OptionsWidget_ircOutput()
-{
-}
+    = default;
 
 void OptionsWidget_ircOutput::commit()
 {
diff --git a/src/modules/options/OptionsWidget_ircView.cpp b/src/modules/options/OptionsWidget_ircView.cpp
index deb2461a1..85319908e 100644
--- a/src/modules/options/OptionsWidget_ircView.cpp
+++ b/src/modules/options/OptionsWidget_ircView.cpp
@@ -36,8 +36,7 @@ OptionsWidget_ircViewTheme::OptionsWidget_ircViewTheme(QWidget * pParent)
 }
 
 OptionsWidget_ircViewTheme::~OptionsWidget_ircViewTheme()
-{
-}
+    = default;
 
 OptionsWidget_ircViewLook::OptionsWidget_ircViewLook(QWidget * parent)
     : KviOptionsWidget(parent)
@@ -102,8 +101,7 @@ OptionsWidget_ircViewLook::OptionsWidget_ircViewLook(QWidget * parent)
 }
 
 OptionsWidget_ircViewLook::~OptionsWidget_ircViewLook()
-{
-}
+    = default;
 
 void OptionsWidget_ircViewLook::commit()
 {
@@ -166,8 +164,7 @@ OptionsWidget_ircViewFeatures::OptionsWidget_ircViewFeatures(QWidget * parent)
 }
 
 OptionsWidget_ircViewFeatures::~OptionsWidget_ircViewFeatures()
-{
-}
+    = default;
 
 OptionsWidget_ircViewMarker::OptionsWidget_ircViewMarker(QWidget * parent)
     : KviOptionsWidget(parent)
@@ -198,8 +195,7 @@ OptionsWidget_ircViewMarker::OptionsWidget_ircViewMarker(QWidget * parent)
 }
 
 OptionsWidget_ircViewMarker::~OptionsWidget_ircViewMarker()
-{
-}
+    = default;
 
 void OptionsWidget_ircViewMarker::commit()
 {
diff --git a/src/modules/options/OptionsWidget_lag.cpp b/src/modules/options/OptionsWidget_lag.cpp
index 6bb33548c..a58439e70 100644
--- a/src/modules/options/OptionsWidget_lag.cpp
+++ b/src/modules/options/OptionsWidget_lag.cpp
@@ -71,5 +71,4 @@ OptionsWidget_lag::OptionsWidget_lag(QWidget * parent)
 }
 
 OptionsWidget_lag::~OptionsWidget_lag()
-{
-}
+    = default;
diff --git a/src/modules/options/OptionsWidget_logging.cpp b/src/modules/options/OptionsWidget_logging.cpp
index ab372b4ee..5ece8dadd 100644
--- a/src/modules/options/OptionsWidget_logging.cpp
+++ b/src/modules/options/OptionsWidget_logging.cpp
@@ -69,5 +69,4 @@ OptionsWidget_logging::OptionsWidget_logging(QWidget * parent)
 }
 
 OptionsWidget_logging::~OptionsWidget_logging()
-{
-}
+    = default;
diff --git a/src/modules/options/OptionsWidget_mediaTypes.cpp b/src/modules/options/OptionsWidget_mediaTypes.cpp
index 19fe5dd5c..4115e5fff 100644
--- a/src/modules/options/OptionsWidget_mediaTypes.cpp
+++ b/src/modules/options/OptionsWidget_mediaTypes.cpp
@@ -53,8 +53,7 @@ MediaTypeTreeWidgetItem::MediaTypeTreeWidgetItem(QTreeWidget * w, KviMediaType *
 }
 
 MediaTypeTreeWidgetItem::~MediaTypeTreeWidgetItem()
-{
-}
+    = default;
 
 void MediaTypeTreeWidgetItem::copyData(KviMediaType * t)
 {
@@ -146,14 +145,13 @@ OptionsWidget_mediaTypes::OptionsWidget_mediaTypes(QWidget * parent)
 	layout()->setColumnStretch(2, 1);
 	layout()->setRowStretch(0, 1);
 
-	m_pLastItem = 0;
+	m_pLastItem = nullptr;
 
 	fillTreeWidget();
 }
 
 OptionsWidget_mediaTypes::~OptionsWidget_mediaTypes()
-{
-}
+    = default;
 
 void OptionsWidget_mediaTypes::fillTreeWidget()
 {
@@ -241,7 +239,7 @@ void OptionsWidget_mediaTypes::delMediaType()
 	if(m_pLastItem)
 	{
 		MediaTypeTreeWidgetItem * it = m_pLastItem;
-		m_pLastItem = 0;
+		m_pLastItem = nullptr;
 		delete it;
 	}
 }
diff --git a/src/modules/options/OptionsWidget_message.cpp b/src/modules/options/OptionsWidget_message.cpp
index 881700613..f28eea533 100644
--- a/src/modules/options/OptionsWidget_message.cpp
+++ b/src/modules/options/OptionsWidget_message.cpp
@@ -55,8 +55,7 @@ OptionsWidget_message::OptionsWidget_message(QWidget * pParent)
 }
 
 OptionsWidget_message::~OptionsWidget_message()
-{
-}
+    = default;
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
@@ -123,8 +122,7 @@ void OptionsWidget_privmsg::enableDisableSmartColorSelector(bool)
 }
 
 OptionsWidget_privmsg::~OptionsWidget_privmsg()
-{
-}
+    = default;
 
 OptionsWidget_timestamp::OptionsWidget_timestamp(QWidget * pParent)
     : KviOptionsWidget(pParent)
@@ -154,8 +152,7 @@ OptionsWidget_timestamp::OptionsWidget_timestamp(QWidget * pParent)
 }
 
 OptionsWidget_timestamp::~OptionsWidget_timestamp()
-{
-}
+    = default;
 
 void OptionsWidget_timestamp::enableDisableTimestampSelector(bool)
 {
@@ -191,8 +188,7 @@ OptionsWidget_standardColors::OptionsWidget_standardColors(QWidget * parent)
 }
 
 OptionsWidget_standardColors::~OptionsWidget_standardColors()
-{
-}
+    = default;
 
 void OptionsWidget_standardColors::resetToDefaults()
 {
@@ -326,8 +322,7 @@ MessageColorListWidgetItem::MessageColorListWidgetItem(KviTalListWidget * b, int
 }
 
 MessageColorListWidgetItem::~MessageColorListWidgetItem()
-{
-}
+    = default;
 
 void MessageColorListWidgetItemDelegate::paint(QPainter * p, const QStyleOptionViewItem & opt, const QModelIndex & index) const
 {
@@ -372,7 +367,7 @@ OptionsWidget_messageColors::OptionsWidget_messageColors(QWidget * parent)
 	createLayout();
 
 	int i;
-	m_pLastItem = 0;
+	m_pLastItem = nullptr;
 
 	m_pListView = new MessageListWidget(this);
 	m_pListViewItemDelegate = new MessageListWidgetItemDelegate(m_pListView);
@@ -525,7 +520,7 @@ void OptionsWidget_messageColors::itemChanged()
 	if(m_pLastItem)
 		saveLastItem();
 
-	m_pLastItem = 0; // do NOT save in this routine
+	m_pLastItem = nullptr; // do NOT save in this routine
 
 	m_pForeListWidget->setEnabled(it);
 	m_pBackListWidget->setEnabled(it);
diff --git a/src/modules/options/OptionsWidget_nickserv.cpp b/src/modules/options/OptionsWidget_nickserv.cpp
index ebffe0fc5..383a371c1 100644
--- a/src/modules/options/OptionsWidget_nickserv.cpp
+++ b/src/modules/options/OptionsWidget_nickserv.cpp
@@ -115,7 +115,7 @@ NickServRuleEditor::NickServRuleEditor(QWidget * par, bool bUseServerMaskField)
 	}
 	else
 	{
-		m_pServerMaskEdit = 0;
+		m_pServerMaskEdit = nullptr;
 	}
 
 	l = new QLabel(__tr2qs_ctx("Hint: Move the mouse cursor over the fields to get help", "options"), this);
@@ -143,8 +143,7 @@ NickServRuleEditor::NickServRuleEditor(QWidget * par, bool bUseServerMaskField)
 }
 
 NickServRuleEditor::~NickServRuleEditor()
-{
-}
+    = default;
 
 bool NickServRuleEditor::validate()
 {
@@ -298,8 +297,7 @@ OptionsWidget_nickServ::OptionsWidget_nickServ(QWidget * parent)
 }
 
 OptionsWidget_nickServ::~OptionsWidget_nickServ()
-{
-}
+    = default;
 
 void OptionsWidget_nickServ::editNickServRule()
 {
diff --git a/src/modules/options/OptionsWidget_notifier.cpp b/src/modules/options/OptionsWidget_notifier.cpp
index 70caf034f..95892df8e 100644
--- a/src/modules/options/OptionsWidget_notifier.cpp
+++ b/src/modules/options/OptionsWidget_notifier.cpp
@@ -95,8 +95,7 @@ OptionsWidget_notifierLook::OptionsWidget_notifierLook(QWidget * parent)
 }
 
 OptionsWidget_notifierLook::~OptionsWidget_notifierLook()
-{
-}
+    = default;
 
 void OptionsWidget_notifierLook::commit()
 {
@@ -252,8 +251,7 @@ OptionsWidget_notifier::OptionsWidget_notifier(QWidget * parent)
 }
 
 OptionsWidget_notifier::~OptionsWidget_notifier()
-{
-}
+    = default;
 
 #ifdef COMPILE_KDE_SUPPORT
 void OptionsWidget_notifier::toggleNotifierProtocol(bool)
diff --git a/src/modules/options/OptionsWidget_notify.cpp b/src/modules/options/OptionsWidget_notify.cpp
index 461632fe6..c321ecba1 100644
--- a/src/modules/options/OptionsWidget_notify.cpp
+++ b/src/modules/options/OptionsWidget_notify.cpp
@@ -85,5 +85,4 @@ OptionsWidget_notify::OptionsWidget_notify(QWidget * parent)
 }
 
 OptionsWidget_notify::~OptionsWidget_notify()
-{
-}
+    = default;
diff --git a/src/modules/options/OptionsWidget_protection.cpp b/src/modules/options/OptionsWidget_protection.cpp
index ce325813a..2c3f4cabd 100644
--- a/src/modules/options/OptionsWidget_protection.cpp
+++ b/src/modules/options/OptionsWidget_protection.cpp
@@ -39,5 +39,4 @@ OptionsWidget_protection::OptionsWidget_protection(QWidget * parent)
 }
 
 OptionsWidget_protection::~OptionsWidget_protection()
-{
-}
+    = default;
diff --git a/src/modules/options/OptionsWidget_proxy.cpp b/src/modules/options/OptionsWidget_proxy.cpp
index 8bebd95f2..c9fbafb5d 100644
--- a/src/modules/options/OptionsWidget_proxy.cpp
+++ b/src/modules/options/OptionsWidget_proxy.cpp
@@ -134,7 +134,7 @@ OptionsWidget_proxy::OptionsWidget_proxy(QWidget * parent)
 #ifndef COMPILE_IPV6_SUPPORT
 	m_pIPv6Check->setEnabled(false);
 #endif
-	m_pLastEditedItem = 0;
+	m_pLastEditedItem = nullptr;
 
 	fillProxyList();
 
@@ -145,8 +145,7 @@ OptionsWidget_proxy::OptionsWidget_proxy(QWidget * parent)
 }
 
 OptionsWidget_proxy::~OptionsWidget_proxy()
-{
-}
+    = default;
 
 void OptionsWidget_proxy::enableDisableUseProxySelector()
 {
@@ -177,7 +176,7 @@ void OptionsWidget_proxy::fillProxyList()
 		}
 	}
 	if(!(g_pProxyDataBase->currentProxy()))
-		currentItemChanged(0, 0);
+		currentItemChanged(nullptr, nullptr);
 
 	enableDisableUseProxySelector();
 }
@@ -357,7 +356,7 @@ void OptionsWidget_proxy::removeCurrent()
 	if(m_pLastEditedItem)
 	{
 		QTreeWidgetItem * tmp = m_pLastEditedItem;
-		m_pLastEditedItem = 0;
+		m_pLastEditedItem = nullptr;
 		delete tmp;
 
 		QTreeWidgetItem * it = (QTreeWidgetItem *)m_pTreeWidget->topLevelItem(0);
@@ -367,7 +366,7 @@ void OptionsWidget_proxy::removeCurrent()
 		}
 		else
 		{
-			currentItemChanged(0, 0);
+			currentItemChanged(nullptr, nullptr);
 		}
 	}
 }
diff --git a/src/modules/options/OptionsWidget_query.cpp b/src/modules/options/OptionsWidget_query.cpp
index 1174184d2..de0fa5a4d 100644
--- a/src/modules/options/OptionsWidget_query.cpp
+++ b/src/modules/options/OptionsWidget_query.cpp
@@ -116,5 +116,4 @@ OptionsWidget_query::OptionsWidget_query(QWidget * parent)
 }
 
 OptionsWidget_query::~OptionsWidget_query()
-{
-}
+    = default;
diff --git a/src/modules/options/OptionsWidget_servers.cpp b/src/modules/options/OptionsWidget_servers.cpp
index 11b85ba22..64a96a712 100644
--- a/src/modules/options/OptionsWidget_servers.cpp
+++ b/src/modules/options/OptionsWidget_servers.cpp
@@ -77,28 +77,28 @@ IrcNetworkDetailsWidget::IrcNetworkDetailsWidget(QWidget * par, KviIrcNetwork *
 	setModal(true);
 	setObjectName("network_details");
 
-	m_pOnConnectEditor = NULL;
-	m_pOnLoginEditor = NULL;
+	m_pOnConnectEditor = nullptr;
+	m_pOnLoginEditor = nullptr;
 
-	m_pUserEditor = NULL;
-	m_pPassEditor = NULL;
-	m_pNickEditor = NULL;
-	m_pAlternativeNickEditor = NULL;
-	m_pRealEditor = NULL;
-	m_pDescEditor = NULL;
+	m_pUserEditor = nullptr;
+	m_pPassEditor = nullptr;
+	m_pNickEditor = nullptr;
+	m_pAlternativeNickEditor = nullptr;
+	m_pRealEditor = nullptr;
+	m_pDescEditor = nullptr;
 
-	m_pEncodingEditor = NULL;
-	m_pTextEncodingEditor = NULL;
+	m_pEncodingEditor = nullptr;
+	m_pTextEncodingEditor = nullptr;
 
-	m_pAutoConnectCheck = NULL;
+	m_pAutoConnectCheck = nullptr;
 
-	m_pNickServTreeWidget = NULL;
-	m_pNickServCheck = NULL;
-	m_pAddRuleButton = NULL;
-	m_pDelRuleButton = NULL;
-	m_pEditRuleButton = NULL;
+	m_pNickServTreeWidget = nullptr;
+	m_pNickServCheck = nullptr;
+	m_pAddRuleButton = nullptr;
+	m_pDelRuleButton = nullptr;
+	m_pEditRuleButton = nullptr;
 
-	m_pChannelListSelector = NULL;
+	m_pChannelListSelector = nullptr;
 
 	QGridLayout * g = new QGridLayout(this);
 
@@ -482,7 +482,7 @@ void IrcNetworkDetailsWidget::fillData(KviIrcNetwork * n)
 		m_pChannelListSelector->commit();
 
 	if(m_lstChannels.isEmpty())
-		n->setAutoJoinChannelList(0);
+		n->setAutoJoinChannelList(nullptr);
 	else
 		n->setAutoJoinChannelList(new QStringList(m_lstChannels));
 
@@ -501,7 +501,7 @@ void IrcNetworkDetailsWidget::fillData(KviIrcNetwork * n)
 			n->setNickServRuleSet(rs);
 		}
 		else
-			n->setNickServRuleSet(0);
+			n->setNickServRuleSet(nullptr);
 	}
 
 	if(m_pOnConnectEditor)
@@ -1225,7 +1225,7 @@ void IrcServerDetailsWidget::fillData(KviIrcServer * s)
 	if(m_pChannelListSelector)
 		m_pChannelListSelector->commit();
 	if(m_lstChannels.isEmpty())
-		s->setAutoJoinChannelList(0);
+		s->setAutoJoinChannelList(nullptr);
 	else
 		s->setAutoJoinChannelList(new QStringList(m_lstChannels));
 
@@ -1250,7 +1250,7 @@ IrcServerOptionsTreeWidgetItem::IrcServerOptionsTreeWidgetItem(QTreeWidget * par
     : QTreeWidgetItem(parent)
 {
 	setIcon(0, QIcon(pm));
-	m_pServerData = 0;
+	m_pServerData = nullptr;
 	m_pNetworkData = new KviIrcNetwork(*n);
 	setText(0, n->name());
 	setText(1, n->description());
@@ -1263,7 +1263,7 @@ IrcServerOptionsTreeWidgetItem::IrcServerOptionsTreeWidgetItem(QTreeWidgetItem *
 	m_pServerData = new KviIrcServer(*s);
 	setText(0, s->hostName());
 	setText(1, s->description());
-	m_pNetworkData = 0;
+	m_pNetworkData = nullptr;
 }
 
 IrcServerOptionsTreeWidgetItem::~IrcServerOptionsTreeWidgetItem()
@@ -1303,9 +1303,9 @@ OptionsWidget_servers::OptionsWidget_servers(QWidget * parent)
 	connect(m_pImportPopup, SIGNAL(aboutToShow()), this, SLOT(importPopupAboutToShow()));
 	connect(m_pImportPopup, SIGNAL(triggered(QAction *)), this, SLOT(importPopupActivated(QAction *)));
 
-	m_pServerDetailsDialog = 0;
-	m_pNetworkDetailsDialog = 0;
-	m_pImportFilter = 0;
+	m_pServerDetailsDialog = nullptr;
+	m_pNetworkDetailsDialog = nullptr;
+	m_pImportFilter = nullptr;
 
 	m_pFilterLabel = new QLabel(__tr2qs_ctx("Filter:", "options"), this);
 	addWidgetToLayout(m_pFilterLabel, 0, 0, 0, 0);
@@ -1433,7 +1433,7 @@ OptionsWidget_servers::OptionsWidget_servers(QWidget * parent)
 
 	KviTalToolTip::add(tb, __tr2qs_ctx("This button shows a list of recently used servers.<br>It allows you to quickly find them in the list.", "options"));
 
-	m_pShowThisDialogAtStartupSelector = NULL;
+	m_pShowThisDialogAtStartupSelector = nullptr;
 
 	// The "Show this dialog at startup" option is shown only when the server options widget is shown as standalone dialog
 	if(parent->inherits("OptionsWidgetContainer"))
@@ -1498,12 +1498,12 @@ OptionsWidget_servers::OptionsWidget_servers(QWidget * parent)
 	}
 	else
 	{
-		m_pConnectCurrent = NULL;
+		m_pConnectCurrent = nullptr;
 	}
 
-	m_pLastEditedItem = 0;
+	m_pLastEditedItem = nullptr;
 
-	m_pClipboard = 0;
+	m_pClipboard = nullptr;
 
 	m_bShowingFavoritesOnly = KVI_OPTION_BOOL(KviOption_boolShowFavoriteServersOnly);
 
@@ -1519,9 +1519,9 @@ OptionsWidget_servers::~OptionsWidget_servers()
 {
 	if(m_pImportFilter)
 	{
-		disconnect(m_pImportFilter, 0, this, 0);
+		disconnect(m_pImportFilter, nullptr, this, nullptr);
 		m_pImportFilter->die();
-		m_pImportFilter = 0;
+		m_pImportFilter = nullptr;
 	}
 
 	if(m_pClipboard)
@@ -1539,7 +1539,7 @@ void OptionsWidget_servers::slotShowThisDialogAtStartupSelectorDestroyed()
 	KVI_ASSERT(m_pShowThisDialogAtStartupSelector);
 
 	removeSelector(m_pShowThisDialogAtStartupSelector);
-	m_pShowThisDialogAtStartupSelector = NULL;
+	m_pShowThisDialogAtStartupSelector = nullptr;
 }
 
 void OptionsWidget_servers::recentServersPopupAboutToShow()
@@ -1585,7 +1585,7 @@ void OptionsWidget_servers::selectBestServerByUrl(const QString & szUrl)
 	int uCount = m_pTreeWidget->topLevelItemCount();
 	int uIdx = 0;
 
-	IrcServerOptionsTreeWidgetItem * pBestCandidate = NULL;
+	IrcServerOptionsTreeWidgetItem * pBestCandidate = nullptr;
 	kvi_u32_t uBestCandidateScore = 0;
 
 	while(uIdx < uCount)
@@ -1658,7 +1658,7 @@ void OptionsWidget_servers::fillServerList()
 {
 	IrcServerOptionsTreeWidgetItem * net;
 	IrcServerOptionsTreeWidgetItem * srv;
-	IrcServerOptionsTreeWidgetItem * cur = 0;
+	IrcServerOptionsTreeWidgetItem * cur = nullptr;
 
 	KviPointerHashTableIterator<QString, KviIrcNetwork> it(*(g_pServerDataBase->recordDict()));
 
@@ -1961,9 +1961,9 @@ void OptionsWidget_servers::importPopupActivated(QAction * pAction)
 
 	if(m_pImportFilter)
 	{
-		disconnect(m_pImportFilter, 0, this, 0);
+		disconnect(m_pImportFilter, nullptr, this, nullptr);
 		m_pImportFilter->die();
-		m_pImportFilter = 0;
+		m_pImportFilter = nullptr;
 	}
 
 	bool bOk = false;
@@ -1971,7 +1971,7 @@ void OptionsWidget_servers::importPopupActivated(QAction * pAction)
 	if(!bOk)
 		return;
 
-	m_pImportFilter = (KviMexServerImport *)KviModuleExtensionManager::instance()->allocateExtension("serverimport", id, 0);
+	m_pImportFilter = (KviMexServerImport *)KviModuleExtensionManager::instance()->allocateExtension("serverimport", id, nullptr);
 
 	if(!m_pImportFilter)
 	{
@@ -1987,7 +1987,7 @@ void OptionsWidget_servers::importPopupActivated(QAction * pAction)
 
 void OptionsWidget_servers::importerDead()
 {
-	m_pImportFilter = 0;
+	m_pImportFilter = nullptr;
 }
 
 void OptionsWidget_servers::importServer(const KviIrcServer & s, const QString & network)
@@ -2203,7 +2203,7 @@ IrcServerOptionsTreeWidgetItem * OptionsWidget_servers::findNetItem(const QStrin
 		if(KviQString::equalCI(it->text(0), netname))
 			return it;
 	}
-	return 0;
+	return nullptr;
 }
 
 void OptionsWidget_servers::clearList()
@@ -2216,13 +2216,13 @@ void OptionsWidget_servers::clearList()
 
 	if(QMessageBox::question(this,
 	       __tr2qs_ctx("Confirm Clearing Server List - KVIrc", "options"), txt,
-	       __tr2qs_ctx("Yes", "options"), __tr2qs_ctx("No", "options"), 0, 1)
+	       __tr2qs_ctx("Yes", "options"), __tr2qs_ctx("No", "options"), nullptr, 1)
 	    != 0)
 		return;
 
 	m_pTreeWidget->clear();
-	m_pLastEditedItem = 0;
-	currentItemChanged(0, 0);
+	m_pLastEditedItem = nullptr;
+	currentItemChanged(nullptr, nullptr);
 }
 
 void OptionsWidget_servers::detailsClicked()
@@ -2249,7 +2249,7 @@ void OptionsWidget_servers::detailsClicked()
 		}
 
 		delete m_pServerDetailsDialog;
-		m_pServerDetailsDialog = 0;
+		m_pServerDetailsDialog = nullptr;
 		return;
 	}
 	if(m_pLastEditedItem->m_pNetworkData)
@@ -2272,6 +2272,6 @@ void OptionsWidget_servers::detailsClicked()
 		}
 
 		delete m_pNetworkDetailsDialog;
-		m_pNetworkDetailsDialog = 0;
+		m_pNetworkDetailsDialog = nullptr;
 	}
 }
diff --git a/src/modules/options/OptionsWidget_sound.cpp b/src/modules/options/OptionsWidget_sound.cpp
index e22cdbf7f..e5c72ef1f 100644
--- a/src/modules/options/OptionsWidget_sound.cpp
+++ b/src/modules/options/OptionsWidget_sound.cpp
@@ -45,8 +45,7 @@ OptionsWidget_sound::OptionsWidget_sound(QWidget * pParent)
 }
 
 OptionsWidget_sound::~OptionsWidget_sound()
-{
-}
+    = default;
 
 OptionsWidget_soundGeneral::OptionsWidget_soundGeneral(QWidget * parent)
     : KviOptionsWidget(parent)
@@ -142,8 +141,7 @@ OptionsWidget_soundGeneral::OptionsWidget_soundGeneral(QWidget * parent)
 }
 
 OptionsWidget_soundGeneral::~OptionsWidget_soundGeneral()
-{
-}
+    = default;
 
 void OptionsWidget_soundGeneral::showEvent(QShowEvent *)
 {
@@ -197,7 +195,7 @@ void OptionsWidget_soundGeneral::soundAutoDetect()
 
 	g_pApp->setOverrideCursor(Qt::WaitCursor);
 
-	m->ctrl("detectSoundSystem", 0);
+	m->ctrl("detectSoundSystem", nullptr);
 	soundFillBox();
 
 	g_pApp->restoreOverrideCursor();
@@ -211,7 +209,7 @@ void OptionsWidget_soundGeneral::mediaAutoDetect()
 
 	g_pApp->setOverrideCursor(Qt::WaitCursor);
 
-	m->ctrl("detectMediaPlayer", 0);
+	m->ctrl("detectMediaPlayer", nullptr);
 	mediaFillBox();
 
 	g_pApp->restoreOverrideCursor();
@@ -350,5 +348,4 @@ OptionsWidget_sounds::OptionsWidget_sounds(QWidget * parent)
 }
 
 OptionsWidget_sounds::~OptionsWidget_sounds()
-{
-}
+    = default;
diff --git a/src/modules/options/OptionsWidget_textEncoding.cpp b/src/modules/options/OptionsWidget_textEncoding.cpp
index f0084e6e3..dd33758d8 100644
--- a/src/modules/options/OptionsWidget_textEncoding.cpp
+++ b/src/modules/options/OptionsWidget_textEncoding.cpp
@@ -117,9 +117,8 @@ OptionsWidget_textEncoding::OptionsWidget_textEncoding(QWidget * parent)
 	i = 0;
 	int iMatch = 0;
 
-	for(QStringList::Iterator it = list.begin(); it != list.end(); ++it)
+	for(auto szTmp : list)
 	{
-		QString szTmp = *it;
 		szTmp.replace("kvirc_", "");
 		szTmp.replace(".mo", "");
 		m_pForcedLocaleCombo->insertItem(m_pForcedLocaleCombo->count(), szTmp);
@@ -139,7 +138,7 @@ OptionsWidget_textEncoding::OptionsWidget_textEncoding(QWidget * parent)
 		gbox = addGroupBox(0, 2, 0, 2, Qt::Horizontal, __tr2qs_ctx("Spell Checker Dictionaries", "options"));
 
 		KviKvsVariant availableDictionaries;
-		KviKvsScript::evaluate("$spellchecker.availableDictionaries", NULL, NULL, &availableDictionaries);
+		KviKvsScript::evaluate("$spellchecker.availableDictionaries", nullptr, nullptr, &availableDictionaries);
 		const KviPointerHashTable<QString, KviKvsVariant> * hashTable = availableDictionaries.hash()->dict();
 		KviPointerHashTableIterator<QString, KviKvsVariant> iter(*hashTable);
 		QMap<QString, QString> dictMap;
@@ -184,8 +183,7 @@ OptionsWidget_textEncoding::OptionsWidget_textEncoding(QWidget * parent)
 }
 
 OptionsWidget_textEncoding::~OptionsWidget_textEncoding()
-{
-}
+    = default;
 
 void OptionsWidget_textEncoding::commit()
 {
@@ -240,6 +238,6 @@ void OptionsWidget_textEncoding::commit()
 		}
 	}
 	KVI_OPTION_STRINGLIST(KviOption_stringlistSpellCheckerDictionaries) = wantedDictionaries;
-	KviKvsScript::run("spellchecker.reloadDictionaries", NULL);
+	KviKvsScript::run("spellchecker.reloadDictionaries", nullptr);
 #endif
 }
diff --git a/src/modules/options/OptionsWidget_textIcons.cpp b/src/modules/options/OptionsWidget_textIcons.cpp
index e07d6923e..4114c036d 100644
--- a/src/modules/options/OptionsWidget_textIcons.cpp
+++ b/src/modules/options/OptionsWidget_textIcons.cpp
@@ -70,9 +70,9 @@ void TextIconTableItem::setId(int id)
 OptionsWidget_textIcons::OptionsWidget_textIcons(QWidget * parent)
     : KviOptionsWidget(parent)
 {
-	m_pPopup = 0;
+	m_pPopup = nullptr;
 	m_iLastEditedRow = -1;
-	m_pCurrentIconButton = 0;
+	m_pCurrentIconButton = nullptr;
 	setObjectName("texticons_options_widget");
 	createLayout();
 
@@ -112,8 +112,7 @@ OptionsWidget_textIcons::OptionsWidget_textIcons(QWidget * parent)
 }
 
 OptionsWidget_textIcons::~OptionsWidget_textIcons()
-{
-}
+    = default;
 
 void OptionsWidget_textIcons::fillTable()
 {
@@ -169,7 +168,7 @@ void OptionsWidget_textIcons::iconSelected(KviIconManager::SmallIcon eIcon)
 	m_pCurrentItem->icon()->setId(eIcon);
 	m_pCurrentItem->setIcon(QIcon(*m_pCurrentItem->icon()->pixmap()));
 
-	KviTalHBox * pBox = new KviTalHBox(0);
+	KviTalHBox * pBox = new KviTalHBox(nullptr);
 	pBox->setSpacing(0);
 	pBox->setMargin(0);
 
@@ -230,10 +229,10 @@ void OptionsWidget_textIcons::currentItemChanged(QTableWidgetItem * cur, QTableW
 	{
 		QWidget * pOldWidget = m_pTable->cellWidget(prev->row(), 1);
 		if(pOldWidget)
-			m_pTable->setCellWidget(prev->row(), 1, NULL);
+			m_pTable->setCellWidget(prev->row(), 1, nullptr);
 	}
 
-	m_pCurrentItem = NULL;
+	m_pCurrentItem = nullptr;
 
 	if(!cur)
 		return;
@@ -244,7 +243,7 @@ void OptionsWidget_textIcons::currentItemChanged(QTableWidgetItem * cur, QTableW
 
 	m_pCurrentItem = (TextIconTableItem *)cur;
 
-	KviTalHBox * pBox = new KviTalHBox(0);
+	KviTalHBox * pBox = new KviTalHBox(nullptr);
 	pBox->setSpacing(0);
 	pBox->setMargin(0);
 
@@ -266,7 +265,7 @@ void OptionsWidget_textIcons::addClicked()
 {
 	m_pTable->setRowCount(m_pTable->rowCount() + 1);
 	m_pTable->setItem(m_pTable->rowCount() - 1, 0, new QTableWidgetItem(__tr2qs_ctx("unnamed", "options")));
-	m_pTable->setItem(m_pTable->rowCount() - 1, 1, new TextIconTableItem(m_pTable, 0));
+	m_pTable->setItem(m_pTable->rowCount() - 1, 1, new TextIconTableItem(m_pTable, nullptr));
 	m_pTable->scrollToBottom();
 	m_pDel->setEnabled(true);
 }
diff --git a/src/modules/options/OptionsWidget_theme.cpp b/src/modules/options/OptionsWidget_theme.cpp
index 41dfbf985..d2637267e 100644
--- a/src/modules/options/OptionsWidget_theme.cpp
+++ b/src/modules/options/OptionsWidget_theme.cpp
@@ -48,8 +48,7 @@ OptionsWidget_theme::OptionsWidget_theme(QWidget * parent)
 }
 
 OptionsWidget_theme::~OptionsWidget_theme()
-{
-}
+    = default;
 
 OptionsWidget_themeTransparency::OptionsWidget_themeTransparency(QWidget * parent)
     : KviOptionsWidget(parent)
@@ -142,8 +141,7 @@ OptionsWidget_themeTransparency::OptionsWidget_themeTransparency(QWidget * paren
 }
 
 OptionsWidget_themeTransparency::~OptionsWidget_themeTransparency()
-{
-}
+    = default;
 
 void OptionsWidget_themeTransparency::enableGlobalBackgroundPixmapSelector(bool)
 {
@@ -173,5 +171,4 @@ OptionsWidget_themeToolBarApplets::OptionsWidget_themeToolBarApplets(QWidget * p
 }
 
 OptionsWidget_themeToolBarApplets::~OptionsWidget_themeToolBarApplets()
-{
-}
+    = default;
diff --git a/src/modules/options/OptionsWidget_tools.cpp b/src/modules/options/OptionsWidget_tools.cpp
index 9717b7c77..b96344a55 100644
--- a/src/modules/options/OptionsWidget_tools.cpp
+++ b/src/modules/options/OptionsWidget_tools.cpp
@@ -44,5 +44,4 @@ OptionsWidget_tools::OptionsWidget_tools(QWidget * parent)
 }
 
 OptionsWidget_tools::~OptionsWidget_tools()
-{
-}
+    = default;
diff --git a/src/modules/options/OptionsWidget_topicLabel.cpp b/src/modules/options/OptionsWidget_topicLabel.cpp
index 137a3c252..1083bcb43 100644
--- a/src/modules/options/OptionsWidget_topicLabel.cpp
+++ b/src/modules/options/OptionsWidget_topicLabel.cpp
@@ -41,5 +41,4 @@ OptionsWidget_topicLabel::OptionsWidget_topicLabel(QWidget * p) : KviOptionsWidg
 }
 
 OptionsWidget_topicLabel::~OptionsWidget_topicLabel()
-{
-}
+    = default;
diff --git a/src/modules/options/OptionsWidget_tray.cpp b/src/modules/options/OptionsWidget_tray.cpp
index 30dc4b660..139cf2587 100644
--- a/src/modules/options/OptionsWidget_tray.cpp
+++ b/src/modules/options/OptionsWidget_tray.cpp
@@ -73,8 +73,7 @@ OptionsWidget_tray::OptionsWidget_tray(QWidget * parent)
 }
 
 OptionsWidget_tray::~OptionsWidget_tray()
-{
-}
+    = default;
 
 void OptionsWidget_tray::setEnabled(bool)
 {
diff --git a/src/modules/options/OptionsWidget_uparser.cpp b/src/modules/options/OptionsWidget_uparser.cpp
index ad71fec76..e6882cadf 100644
--- a/src/modules/options/OptionsWidget_uparser.cpp
+++ b/src/modules/options/OptionsWidget_uparser.cpp
@@ -69,5 +69,4 @@ OptionsWidget_uparser::OptionsWidget_uparser(QWidget * parent)
 }
 
 OptionsWidget_uparser::~OptionsWidget_uparser()
-{
-}
+    = default;
diff --git a/src/modules/options/OptionsWidget_urlHandlers.cpp b/src/modules/options/OptionsWidget_urlHandlers.cpp
index fdc87f9f5..3319d8ff8 100644
--- a/src/modules/options/OptionsWidget_urlHandlers.cpp
+++ b/src/modules/options/OptionsWidget_urlHandlers.cpp
@@ -95,8 +95,7 @@ OptionsWidget_urlHandlers::OptionsWidget_urlHandlers(QWidget * parent)
 }
 
 OptionsWidget_urlHandlers::~OptionsWidget_urlHandlers()
-{
-}
+    = default;
 
 void OptionsWidget_urlHandlers::toggleEditors(bool bToggled)
 {
diff --git a/src/modules/options/OptionsWidget_userList.cpp b/src/modules/options/OptionsWidget_userList.cpp
index 47bb8e81f..c0595f92a 100644
--- a/src/modules/options/OptionsWidget_userList.cpp
+++ b/src/modules/options/OptionsWidget_userList.cpp
@@ -37,8 +37,7 @@ OptionsWidget_userList::OptionsWidget_userList(QWidget * parent)
 }
 
 OptionsWidget_userList::~OptionsWidget_userList()
-{
-}
+    = default;
 
 OptionsWidget_userListForeground::OptionsWidget_userListForeground(QWidget * parent)
     : KviOptionsWidget(parent, "userlistlook_foreground_options_widget")
@@ -79,8 +78,7 @@ OptionsWidget_userListForeground::OptionsWidget_userListForeground(QWidget * par
 }
 
 OptionsWidget_userListForeground::~OptionsWidget_userListForeground()
-{
-}
+    = default;
 
 OptionsWidget_userListGrid::OptionsWidget_userListGrid(QWidget * parent)
     : KviOptionsWidget(parent)
@@ -111,8 +109,7 @@ OptionsWidget_userListGrid::OptionsWidget_userListGrid(QWidget * parent)
 }
 
 OptionsWidget_userListGrid::~OptionsWidget_userListGrid()
-{
-}
+    = default;
 
 void OptionsWidget_userListGrid::commit()
 {
@@ -184,8 +181,7 @@ OptionsWidget_userListBackground::OptionsWidget_userListBackground(QWidget * par
 }
 
 OptionsWidget_userListBackground::~OptionsWidget_userListBackground()
-{
-}
+    = default;
 
 void OptionsWidget_userListBackground::commit()
 {
@@ -243,5 +239,4 @@ OptionsWidget_userListFeatures::OptionsWidget_userListFeatures(QWidget * parent)
 }
 
 OptionsWidget_userListFeatures::~OptionsWidget_userListFeatures()
-{
-}
+    = default;
diff --git a/src/modules/options/OptionsWidget_windowList.cpp b/src/modules/options/OptionsWidget_windowList.cpp
index 41e76b7dd..92d76a024 100644
--- a/src/modules/options/OptionsWidget_windowList.cpp
+++ b/src/modules/options/OptionsWidget_windowList.cpp
@@ -56,8 +56,7 @@ OptionsWidget_windowList::OptionsWidget_windowList(QWidget * parent)
 }
 
 OptionsWidget_windowList::~OptionsWidget_windowList()
-{
-}
+    = default;
 
 OptionsWidget_windowListTree::OptionsWidget_windowListTree(QWidget * parent)
     : KviOptionsWidget(parent)
@@ -66,8 +65,7 @@ OptionsWidget_windowListTree::OptionsWidget_windowListTree(QWidget * parent)
 }
 
 OptionsWidget_windowListTree::~OptionsWidget_windowListTree()
-{
-}
+    = default;
 
 OptionsWidget_windowListTreeForeground::OptionsWidget_windowListTreeForeground(QWidget * parent)
     : KviOptionsWidget(parent)
@@ -93,8 +91,7 @@ OptionsWidget_windowListTreeForeground::OptionsWidget_windowListTreeForeground(Q
 }
 
 OptionsWidget_windowListTreeForeground::~OptionsWidget_windowListTreeForeground()
-{
-}
+    = default;
 
 OptionsWidget_windowListTreeBackground::OptionsWidget_windowListTreeBackground(QWidget * parent)
     : KviOptionsWidget(parent)
@@ -161,8 +158,7 @@ OptionsWidget_windowListTreeBackground::OptionsWidget_windowListTreeBackground(Q
 }
 
 OptionsWidget_windowListTreeBackground::~OptionsWidget_windowListTreeBackground()
-{
-}
+    = default;
 
 void OptionsWidget_windowListTreeBackground::commit()
 {
@@ -213,8 +209,7 @@ OptionsWidget_windowListTreeFeatures::OptionsWidget_windowListTreeFeatures(QWidg
 }
 
 OptionsWidget_windowListTreeFeatures::~OptionsWidget_windowListTreeFeatures()
-{
-}
+    = default;
 
 OptionsWidget_windowListClassic::OptionsWidget_windowListClassic(QWidget * parent)
     : KviOptionsWidget(parent)
@@ -246,5 +241,4 @@ OptionsWidget_windowListClassic::OptionsWidget_windowListClassic(QWidget * paren
 }
 
 OptionsWidget_windowListClassic::~OptionsWidget_windowListClassic()
-{
-}
+    = default;
diff --git a/src/modules/options/libkvioptions.cpp b/src/modules/options/libkvioptions.cpp
index ff958f594..0461eea58 100644
--- a/src/modules/options/libkvioptions.cpp
+++ b/src/modules/options/libkvioptions.cpp
@@ -38,9 +38,9 @@
 
 #include <QSplitter>
 
-KviPointerHashTable<QString, OptionsDialog> * g_pOptionsDialogDict = 0;
+KviPointerHashTable<QString, OptionsDialog> * g_pOptionsDialogDict = nullptr;
 
-OptionsInstanceManager * g_pOptionsInstanceManager = 0;
+OptionsInstanceManager * g_pOptionsInstanceManager = nullptr;
 
 extern int g_iOptionWidgetInstances;
 
@@ -111,7 +111,7 @@ static bool options_kvs_cmd_dialog(KviKvsModuleCommandCall * c)
 		{
 			if(d->parent())
 			{
-				d->setParent(0);
+				d->setParent(nullptr);
 				d->setGeometry(0, 0, d->width(), d->height());
 			}
 		}
@@ -349,11 +349,11 @@ static bool options_module_cleanup(KviModule * m)
 	for(d = l.first(); d; d = l.next())
 		delete d;
 	delete g_pOptionsDialogDict;
-	g_pOptionsDialogDict = 0;
+	g_pOptionsDialogDict = nullptr;
 
 	g_pOptionsInstanceManager->cleanup(m);
 	delete g_pOptionsInstanceManager;
-	g_pOptionsInstanceManager = 0;
+	g_pOptionsInstanceManager = nullptr;
 
 	return true;
 }
diff --git a/src/modules/perl/libkviperl.cpp b/src/modules/perl/libkviperl.cpp
index 70fe63521..2284e7214 100644
--- a/src/modules/perl/libkviperl.cpp
+++ b/src/modules/perl/libkviperl.cpp
@@ -34,7 +34,7 @@
 #ifdef COMPILE_PERL_SUPPORT
 #include "../perlcore/perlcoreinterface.h"
 
-static KviModule * g_pPerlCoreModule = 0;
+static KviModule * g_pPerlCoreModule = nullptr;
 #endif // COMPILE_PERL_SUPPORT
 
 #ifdef COMPILE_PERL_SUPPORT
@@ -457,8 +457,8 @@ static bool perl_kvs_cmd_begin(KviKvsModuleCommandCall * c)
 
 	if(!ex.lWarnings.isEmpty())
 	{
-		for(QStringList::Iterator it = ex.lWarnings.begin(); it != ex.lWarnings.end(); ++it)
-			c->warning(*it);
+		for(auto & lWarning : ex.lWarnings)
+			c->warning(lWarning);
 	}
 
 	if(!ex.bExitOk)
diff --git a/src/modules/perlcore/libkviperlcore.cpp b/src/modules/perlcore/libkviperlcore.cpp
index 5b84aa7f3..3f96bacc5 100644
--- a/src/modules/perlcore/libkviperlcore.cpp
+++ b/src/modules/perlcore/libkviperlcore.cpp
@@ -73,7 +73,7 @@
 
 #include "KviKvsRunTimeContext.h"
 
-static KviKvsRunTimeContext * g_pCurrentKvsContext = 0;
+static KviKvsRunTimeContext * g_pCurrentKvsContext = nullptr;
 static bool g_bExecuteQuiet = false;
 static KviCString g_szLastReturnValue("");
 static QStringList g_lWarningList;
@@ -125,7 +125,7 @@ protected:
 KviPerlInterpreter::KviPerlInterpreter(const QString & szContextName)
 {
 	m_szContextName = szContextName;
-	m_pInterpreter = 0;
+	m_pInterpreter = nullptr;
 }
 
 KviPerlInterpreter::~KviPerlInterpreter()
@@ -177,7 +177,7 @@ bool KviPerlInterpreter::init()
 	PERL_SET_CONTEXT(m_pInterpreter);
 	PL_perl_destruct_level = 1;
 	perl_construct(m_pInterpreter);
-	perl_parse(m_pInterpreter, xs_init, 4, (char **)daArgs, NULL);
+	perl_parse(m_pInterpreter, xs_init, 4, (char **)daArgs, nullptr);
 	QString szInitCode;
 
 	// this part of the code seems to be unnecessary
@@ -221,7 +221,7 @@ void KviPerlInterpreter::done()
 	PL_perl_destruct_level = 1;
 	perl_destruct(m_pInterpreter);
 	perl_free(m_pInterpreter);
-	m_pInterpreter = 0;
+	m_pInterpreter = nullptr;
 }
 
 QString KviPerlInterpreter::svToQString(SV * sv)
@@ -268,9 +268,8 @@ bool KviPerlInterpreter::execute(
 		// set the args in the _ arry
 		av_unshift(pArgs, (I32)args.count());
 		int idx = 0;
-		for(QStringList::Iterator it = args.begin(); it != args.end(); ++it)
+		for(auto tmp : args)
 		{
-			QString tmp = *it;
 			const char * val = tmp.toUtf8().data();
 			if(val)
 			{
@@ -320,7 +319,7 @@ bool KviPerlInterpreter::execute(
 	return true;
 }
 
-static KviPointerHashTable<QString, KviPerlInterpreter> * g_pInterpreters = 0;
+static KviPointerHashTable<QString, KviPerlInterpreter> * g_pInterpreters = nullptr;
 
 static KviPerlInterpreter * perlcore_get_interpreter(const QString & szContextName)
 {
@@ -331,7 +330,7 @@ static KviPerlInterpreter * perlcore_get_interpreter(const QString & szContextNa
 	if(!i->init())
 	{
 		delete i;
-		return 0;
+		return nullptr;
 	}
 	g_pInterpreters->replace(szContextName, i);
 	return i;
@@ -411,7 +410,7 @@ static bool perlcore_module_init(KviModule *)
 	g_pInterpreters->setAutoDelete(false);
 	int daArgc = 4;
 	const char * daArgs[] = { "yo", "-e", "0", "-w" };
-	char ** daEnv = NULL;
+	char ** daEnv = nullptr;
 	PERL_SYS_INIT3(&daArgc, (char ***)&daArgs, &daEnv);
 	return true;
 #else  // !COMPILE_PERL_SUPPORT
@@ -424,7 +423,7 @@ static bool perlcore_module_cleanup(KviModule *)
 #ifdef COMPILE_PERL_SUPPORT
 	perlcore_destroy_all_interpreters();
 	delete g_pInterpreters;
-	g_pInterpreters = 0;
+	g_pInterpreters = nullptr;
 // ifdef workaround for #842
 #ifndef COMPILE_ON_MAC
 	PERL_SYS_TERM();
diff --git a/src/modules/perlcore/ppport.h b/src/modules/perlcore/ppport.h
index 187afa347..69310ffab 100644
--- a/src/modules/perlcore/ppport.h
+++ b/src/modules/perlcore/ppport.h
@@ -503,7 +503,7 @@ __DATA__*/
 #endif
 #endif
 #ifndef PoisonWith
-#define PoisonWith(d, n, t, b) (void) memset((char *)(d), (U8)(b), (n) * sizeof(t))
+#define PoisonWith(d, n, t, b) (void)memset((char *)(d), (U8)(b), (n) * sizeof(t))
 #endif
 #ifndef PoisonNew
 #define PoisonNew(d, n, t) PoisonWith(d, n, t, 0xAB)
@@ -631,7 +631,7 @@ typedef NVTYPE NV;
 #else
 #if defined(VOIDFLAGS) && (VOIDFLAGS) && (defined(sun) || defined(__sun__)) && !defined(__GNUC__)
 #define STMT_START if(1)
-#define STMT_END else(void)0
+#define STMT_END else(void) 0
 #else
 #define STMT_START do
 #define STMT_END while(0)
@@ -1018,8 +1018,8 @@ extern yy_parser DPPP_(dummy_PL_parser);
                                                    (flags) & ~G_METHOD)                       \
                                              : perl_call_sv(sv, flags))
 #else
-#define call_sv(sv, flags) ((flags)&G_METHOD ? Perl_call_method(aTHX_(char *)SvPV_nolen_const(sv), \
-                                                   (flags) & ~G_METHOD)                            \
+#define call_sv(sv, flags) ((flags)&G_METHOD ? Perl_call_method(aTHX_(char *) SvPV_nolen_const(sv), \
+                                                   (flags) & ~G_METHOD)                             \
                                              : Perl_call_sv(aTHX_ sv, flags))
 #endif
 #endif
diff --git a/src/modules/popup/libkvipopup.cpp b/src/modules/popup/libkvipopup.cpp
index 6338d6411..f28f42722 100644
--- a/src/modules/popup/libkvipopup.cpp
+++ b/src/modules/popup/libkvipopup.cpp
@@ -825,7 +825,7 @@ static bool popup_kvs_cmd_show(KviKvsModuleCommandCall * c)
 	if(!pMenu)
 	{
 		delete pPopupParams;
-		pPopupParams = 0;
+		pPopupParams = nullptr;
 		c->error(__tr2qs_ctx("Popup %Q is not defined", "kvs"), &szPopupName);
 		return false;
 	}
@@ -833,7 +833,7 @@ static bool popup_kvs_cmd_show(KviKvsModuleCommandCall * c)
 	if(pMenu->isSoftLocked())
 	{
 		delete pPopupParams;
-		pPopupParams = 0;
+		pPopupParams = nullptr;
 		c->error(__tr2qs_ctx("A popup menu can't be popped up twice", "kvs"));
 		return false;
 	}
diff --git a/src/modules/popupeditor/PopupEditorWindow.cpp b/src/modules/popupeditor/PopupEditorWindow.cpp
index 6faee9739..015372c1f 100644
--- a/src/modules/popupeditor/PopupEditorWindow.cpp
+++ b/src/modules/popupeditor/PopupEditorWindow.cpp
@@ -355,7 +355,7 @@ not_this_one:
 			return found;
 	}
 
-	return 0;
+	return nullptr;
 }
 
 void SinglePopupEditor::testModeMenuItemClicked(KviKvsPopupMenuItem * it)
@@ -583,14 +583,14 @@ PopupTreeWidgetItem * SinglePopupEditor::newItem(PopupTreeWidgetItem * par, Popu
 PopupTreeWidgetItem * SinglePopupEditor::newItemBelow(PopupTreeWidgetItem * it, PopupTreeWidgetItem::Type t)
 {
 	if(!it)
-		return newItem(0, 0, t);
+		return newItem(nullptr, nullptr, t);
 	return newItem((PopupTreeWidgetItem *)it->parent(), it, t);
 }
 
 PopupTreeWidgetItem * SinglePopupEditor::newItemAbove(PopupTreeWidgetItem * it, PopupTreeWidgetItem::Type t)
 {
 	if(!it)
-		return newItem(0, 0, t);
+		return newItem(nullptr, nullptr, t);
 	return newItem((PopupTreeWidgetItem *)it->parent(), (PopupTreeWidgetItem *)m_pTreeWidget->itemAbove(it), t);
 }
 
@@ -608,7 +608,7 @@ PopupTreeWidgetItem * SinglePopupEditor::newItemInside(PopupTreeWidgetItem * it,
 
 void SinglePopupEditor::contextNewPrologue()
 {
-	PopupTreeWidgetItem * it = m_pLastSelectedItem ? (PopupTreeWidgetItem *)m_pLastSelectedItem->parent() : 0;
+	PopupTreeWidgetItem * it = m_pLastSelectedItem ? (PopupTreeWidgetItem *)m_pLastSelectedItem->parent() : nullptr;
 	//	if(!findPrologue(it))
 	//	{
 	m_pTreeWidget->setCurrentItem(newItem(it, it, PopupTreeWidgetItem::Prologue));
@@ -617,7 +617,7 @@ void SinglePopupEditor::contextNewPrologue()
 
 void SinglePopupEditor::contextNewEpilogue()
 {
-	PopupTreeWidgetItem * it = m_pLastSelectedItem ? (PopupTreeWidgetItem *)m_pLastSelectedItem->parent() : 0;
+	PopupTreeWidgetItem * it = m_pLastSelectedItem ? (PopupTreeWidgetItem *)m_pLastSelectedItem->parent() : nullptr;
 	//	if(!findEpilogue(it))
 	//	{
 	PopupTreeWidgetItem * after = it ? (PopupTreeWidgetItem *)it->child(0) : (PopupTreeWidgetItem *)m_pTreeWidget->topLevelItem(0);
@@ -672,7 +672,7 @@ void SinglePopupEditor::contextPasteBelow()
 {
 	if(!m_pClipboard)
 		return;
-	PopupTreeWidgetItem * par = m_pLastSelectedItem ? (PopupTreeWidgetItem *)m_pLastSelectedItem->parent() : 0;
+	PopupTreeWidgetItem * par = m_pLastSelectedItem ? (PopupTreeWidgetItem *)m_pLastSelectedItem->parent() : nullptr;
 	populateMenu(m_pClipboard, par, m_pLastSelectedItem);
 }
 
@@ -680,8 +680,8 @@ void SinglePopupEditor::contextPasteAbove()
 {
 	if(!m_pClipboard)
 		return;
-	PopupTreeWidgetItem * par = m_pLastSelectedItem ? (PopupTreeWidgetItem *)m_pLastSelectedItem->parent() : 0;
-	PopupTreeWidgetItem * above = m_pLastSelectedItem ? (PopupTreeWidgetItem *)m_pTreeWidget->itemAbove(m_pLastSelectedItem) : 0;
+	PopupTreeWidgetItem * par = m_pLastSelectedItem ? (PopupTreeWidgetItem *)m_pLastSelectedItem->parent() : nullptr;
+	PopupTreeWidgetItem * above = m_pLastSelectedItem ? (PopupTreeWidgetItem *)m_pTreeWidget->itemAbove(m_pLastSelectedItem) : nullptr;
 	populateMenu(m_pClipboard, par, above);
 }
 
@@ -698,7 +698,7 @@ void SinglePopupEditor::contextPasteInside()
 		}
 		m_pLastSelectedItem->setExpanded(true);
 	}
-	populateMenu(m_pClipboard, m_pLastSelectedItem, 0);
+	populateMenu(m_pClipboard, m_pLastSelectedItem, nullptr);
 }
 
 void SinglePopupEditor::saveLastSelectedItem()
@@ -852,7 +852,7 @@ void SinglePopupEditor::selectionChanged()
 
 	if(m_pTreeWidget->selectedItems().empty())
 	{
-		it = 0;
+		it = nullptr;
 	}
 	else
 	{
@@ -1012,7 +1012,7 @@ void SinglePopupEditor::populateMenu(KviKvsPopupMenu * pop, PopupTreeWidgetItem
 				theItem->setItemText(item->kvsText() ? item->kvsText()->code() : QString());
 				theItem->setCondition(item->kvsCondition() ? item->kvsCondition()->code() : QString());
 				theItem->setId(item->name());
-				populateMenu(((KviKvsPopupMenuItemMenu *)item)->menu(), theItem, 0);
+				populateMenu(((KviKvsPopupMenuItemMenu *)item)->menu(), theItem, nullptr);
 				break;
 			default:
 				break;
@@ -1045,7 +1045,7 @@ void SinglePopupEditor::edit(MenuTreeWidgetItem * it)
 	if(it)
 	{
 		m_pNameEditor->setText(it->m_pPopup->popupName());
-		populateMenu(it->m_pPopup, 0, 0);
+		populateMenu(it->m_pPopup, nullptr, nullptr);
 	}
 	else
 	{
@@ -1121,12 +1121,11 @@ PopupEditorWidget::PopupEditorWidget(QWidget * par)
 	spl->setStretchFactor(0, 20);
 	spl->setStretchFactor(1, 80);
 
-	currentItemChanged(0, 0);
+	currentItemChanged(nullptr, nullptr);
 }
 
 PopupEditorWidget::~PopupEditorWidget()
-{
-}
+    = default;
 
 void PopupEditorWidget::oneTimeSetup()
 {
@@ -1178,7 +1177,7 @@ void PopupEditorWidget::popupRefresh(const QString & szName)
 			if(ch == m_pLastEditedItem)
 			{
 				if(
-				    QMessageBox::warning(0, __tr2qs_ctx("Confirm Overwriting Current - KVIrc", "editor"),
+				    QMessageBox::warning(nullptr, __tr2qs_ctx("Confirm Overwriting Current - KVIrc", "editor"),
 				        __tr2qs_ctx("An external script has changed the popup you are currently editing. Do you want to accept the external changes?", "editor"),
 				        QMessageBox::Yes, QMessageBox::No | QMessageBox::Default | QMessageBox::Escape)
 				    != QMessageBox::Yes)
@@ -1326,14 +1325,14 @@ void PopupEditorWidget::removeCurrentPopup()
 		m_pLastEditedItem = nullptr;
 		delete it;
 		if(!m_pLastEditedItem)
-			currentItemChanged(0, 0);
+			currentItemChanged(nullptr, nullptr);
 	}
 }
 
 void PopupEditorWidget::newPopup()
 {
 	QString newName;
-	getUniquePopupName(0, newName);
+	getUniquePopupName(nullptr, newName);
 	MenuTreeWidgetItem * it = new MenuTreeWidgetItem(m_pTreeWidget, new KviKvsPopupMenu(newName));
 	m_pTreeWidget->setCurrentItem(it);
 }
@@ -1445,7 +1444,7 @@ void PopupEditorWidget::getUniquePopupName(MenuTreeWidgetItem * item, QString &
 }
 
 PopupEditorWindow::PopupEditorWindow()
-    : KviWindow(KviWindow::ScriptEditor, "popupeditor", 0)
+    : KviWindow(KviWindow::ScriptEditor, "popupeditor", nullptr)
 {
 	g_pPopupEditorWindow = this;
 
diff --git a/src/modules/popupeditor/libkvipopupeditor.cpp b/src/modules/popupeditor/libkvipopupeditor.cpp
index 720ce5143..171d03097 100644
--- a/src/modules/popupeditor/libkvipopupeditor.cpp
+++ b/src/modules/popupeditor/libkvipopupeditor.cpp
@@ -28,7 +28,7 @@
 #include "KviLocale.h"
 #include "KviMainWindow.h"
 
-PopupEditorWindow * g_pPopupEditorWindow = 0;
+PopupEditorWindow * g_pPopupEditorWindow = nullptr;
 
 /*
 	@doc: popupeditor.open
@@ -59,20 +59,20 @@ static bool popupeditor_kvs_cmd_open(KviKvsModuleCommandCall *)
 static bool popupeditor_module_init(KviModule * m)
 {
 	KVSM_REGISTER_SIMPLE_COMMAND(m, "open", popupeditor_kvs_cmd_open);
-	g_pPopupEditorWindow = 0;
+	g_pPopupEditorWindow = nullptr;
 	return true;
 }
 
 static bool popupeditor_module_can_unload(KviModule *)
 {
-	return (g_pPopupEditorWindow == 0);
+	return (g_pPopupEditorWindow == nullptr);
 }
 
 static bool popupeditor_module_cleanup(KviModule *)
 {
 	if(g_pPopupEditorWindow && g_pMainWindow)
 		g_pMainWindow->closeWindow(g_pPopupEditorWindow);
-	g_pPopupEditorWindow = 0;
+	g_pPopupEditorWindow = nullptr;
 	return true;
 }
 
diff --git a/src/modules/pythoncore/kvircmodule.cpp b/src/modules/pythoncore/kvircmodule.cpp
index f35589143..235e3545a 100644
--- a/src/modules/pythoncore/kvircmodule.cpp
+++ b/src/modules/pythoncore/kvircmodule.cpp
@@ -76,11 +76,11 @@ static PyObject * PyKVIrc_echo(PyObject * pSelf, PyObject * pArgs)
 	if(QThread::currentThread() != g_pApp->thread())
 	{
 		qDebug("[pythoncore][ERROR] KVIrc module functions must be called from the main KVIrc thread");
-		return 0; // Sorry, we're NOT thread safe
+		return nullptr; // Sorry, we're NOT thread safe
 	}
 
 	if(!PyArg_ParseTuple(pArgs, "s|is", &pcText, &iColorSet, &pcWinId))
-		return 0;
+		return nullptr;
 
 	if(pcText)
 	{
@@ -113,11 +113,11 @@ static PyObject * PyKVIrc_say(PyObject * pSelf, PyObject * pArgs)
 	if(QThread::currentThread() != g_pApp->thread())
 	{
 		qDebug("[pythoncore][ERROR] KVIrc module functions must be called from the main KVIrc thread");
-		return 0; // Sorry, we're NOT thread safe
+		return nullptr; // Sorry, we're NOT thread safe
 	}
 
 	if(!PyArg_ParseTuple(pArgs, "s|s", &pcText, &pcWinId))
-		return 0;
+		return nullptr;
 
 	if(pcText)
 	{
@@ -151,11 +151,11 @@ static PyObject * PyKVIrc_warning(PyObject * pSelf, PyObject * pArgs)
 	if(QThread::currentThread() != g_pApp->thread())
 	{
 		qDebug("[pythoncore][ERROR] KVIrc module functions must be called from the main KVIrc thread");
-		return 0; // Sorry, we're NOT thread safe
+		return nullptr; // Sorry, we're NOT thread safe
 	}
 
 	if(!PyArg_ParseTuple(pArgs, "s", &pcText))
-		return 0;
+		return nullptr;
 
 	if(pcText && !g_bExecuteQuiet)
 	{
@@ -175,11 +175,11 @@ static PyObject * PyKVIrc_getLocal(PyObject * pSelf, PyObject * pArgs)
 	if(QThread::currentThread() != g_pApp->thread())
 	{
 		qDebug("[pythoncore][ERROR] KVIrc module functions must be called from the main KVIrc thread");
-		return 0; // Sorry, we're NOT thread safe
+		return nullptr; // Sorry, we're NOT thread safe
 	}
 
 	if(!PyArg_ParseTuple(pArgs, "s", &szVarName))
-		return 0;
+		return nullptr;
 
 	if(g_pCurrentKvsContext)
 	{
@@ -194,7 +194,7 @@ static PyObject * PyKVIrc_getLocal(PyObject * pSelf, PyObject * pArgs)
 			return Py_BuildValue("s", "");
 		}
 	}
-	return 0;
+	return nullptr;
 }
 
 static PyObject * PyKVIrc_setLocal(PyObject * pSelf, PyObject * pArgs)
@@ -206,11 +206,11 @@ static PyObject * PyKVIrc_setLocal(PyObject * pSelf, PyObject * pArgs)
 	if(QThread::currentThread() != g_pApp->thread())
 	{
 		qDebug("[pythoncore][ERROR] KVIrc module functions must be called from the main KVIrc thread");
-		return 0; // Sorry, we're NOT thread safe
+		return nullptr; // Sorry, we're NOT thread safe
 	}
 
 	if(!PyArg_ParseTuple(pArgs, "ss", &szVarName, &szVarValue))
-		return 0;
+		return nullptr;
 
 	if(g_pCurrentKvsContext)
 	{
@@ -225,7 +225,7 @@ static PyObject * PyKVIrc_setLocal(PyObject * pSelf, PyObject * pArgs)
 		}
 		return Py_BuildValue("i", 1);
 	}
-	return 0;
+	return nullptr;
 }
 
 static PyObject * PyKVIrc_getGlobal(PyObject * pSelf, PyObject * pArgs)
@@ -237,11 +237,11 @@ static PyObject * PyKVIrc_getGlobal(PyObject * pSelf, PyObject * pArgs)
 	if(QThread::currentThread() != g_pApp->thread())
 	{
 		qDebug("[pythoncore][ERROR] KVIrc module functions must be called from the main KVIrc thread");
-		return 0; // Sorry, we're NOT thread safe
+		return nullptr; // Sorry, we're NOT thread safe
 	}
 
 	if(!PyArg_ParseTuple(pArgs, "s", &szVarName))
-		return 0;
+		return nullptr;
 
 	if(g_pCurrentKvsContext)
 	{
@@ -256,7 +256,7 @@ static PyObject * PyKVIrc_getGlobal(PyObject * pSelf, PyObject * pArgs)
 			return Py_BuildValue("s", "");
 		}
 	}
-	return 0;
+	return nullptr;
 }
 
 static PyObject * PyKVIrc_setGlobal(PyObject * pSelf, PyObject * pArgs)
@@ -268,11 +268,11 @@ static PyObject * PyKVIrc_setGlobal(PyObject * pSelf, PyObject * pArgs)
 	if(QThread::currentThread() != g_pApp->thread())
 	{
 		qDebug("[pythoncore][ERROR] KVIrc module functions must be called from the main KVIrc thread");
-		return 0; // Sorry, we're NOT thread safe
+		return nullptr; // Sorry, we're NOT thread safe
 	}
 
 	if(!PyArg_ParseTuple(pArgs, "ss", &szVarName, &szVarValue))
-		return 0;
+		return nullptr;
 
 	if(g_pCurrentKvsContext)
 	{
@@ -287,7 +287,7 @@ static PyObject * PyKVIrc_setGlobal(PyObject * pSelf, PyObject * pArgs)
 		}
 		return Py_BuildValue("i", 1);
 	}
-	return 0;
+	return nullptr;
 }
 
 static PyObject * PyKVIrc_eval(PyObject * pSelf, PyObject * pArgs)
@@ -300,11 +300,11 @@ static PyObject * PyKVIrc_eval(PyObject * pSelf, PyObject * pArgs)
 	if(QThread::currentThread() != g_pApp->thread())
 	{
 		qDebug("[pythoncore][ERROR] KVIrc module functions must be called from the main KVIrc thread");
-		return 0; // Sorry, we're NOT thread safe
+		return nullptr; // Sorry, we're NOT thread safe
 	}
 
 	if(!PyArg_ParseTuple(pArgs, "s", &pcCode))
-		return 0;
+		return nullptr;
 
 	if(pcCode)
 	{
@@ -319,7 +319,7 @@ static PyObject * PyKVIrc_eval(PyObject * pSelf, PyObject * pArgs)
 		{
 			KviKvsVariant ret;
 			QString szRet;
-			if(KviKvsScript::run(QString::fromUtf8(pcCode), pWnd, 0, &ret))
+			if(KviKvsScript::run(QString::fromUtf8(pcCode), pWnd, nullptr, &ret))
 			{
 				ret.asString(szRet);
 				pcRetVal = szRet.toUtf8().data();
@@ -338,11 +338,11 @@ static PyObject * PyKVIrc_internalWarning(PyObject * pSelf, PyObject * pArgs)
 	if(QThread::currentThread() != g_pApp->thread())
 	{
 		qDebug("[pythoncore][ERROR] KVIrc module functions must be called from the main KVIrc thread");
-		return 0; // Sorry, we're NOT thread safe
+		return nullptr; // Sorry, we're NOT thread safe
 	}
 
 	if(!PyArg_ParseTuple(pArgs, "s", &pcText))
-		return 0;
+		return nullptr;
 
 	if(pcText && !g_bExecuteQuiet)
 		g_lWarningList.append(QString(pcText));
@@ -358,11 +358,11 @@ static PyObject * PyKVIrc_error(PyObject * pSelf, PyObject * pArgs)
 	if(QThread::currentThread() != g_pApp->thread())
 	{
 		qDebug("[pythoncore][ERROR] KVIrc module functions must be called from the main KVIrc thread");
-		return 0; // Sorry, we're NOT thread safe
+		return nullptr; // Sorry, we're NOT thread safe
 	}
 
 	if(!PyArg_ParseTuple(pArgs, "s", &pcText))
-		return 0;
+		return nullptr;
 
 	if(pcText)
 		g_lError.append(pcText);
diff --git a/src/modules/raweditor/RawEditorWindow.cpp b/src/modules/raweditor/RawEditorWindow.cpp
index ba40666ad..8de305fc2 100644
--- a/src/modules/raweditor/RawEditorWindow.cpp
+++ b/src/modules/raweditor/RawEditorWindow.cpp
@@ -103,7 +103,7 @@ RawEditorWidget::RawEditorWidget(QWidget * par)
 	m_pEditor = KviScriptEditor::createInstance(box);
 
 	m_bOneTimeSetupDone = false;
-	m_pLastEditedItem = 0;
+	m_pLastEditedItem = nullptr;
 }
 
 RawEditorWidget::~RawEditorWidget()
@@ -252,7 +252,7 @@ void RawEditorWidget::addHandlerForCurrentRaw()
 	RawTreeWidgetItem * it = (RawTreeWidgetItem *)m_pTreeWidget->currentItem();
 	if(it)
 	{
-		if(it->parent() == 0)
+		if(it->parent() == nullptr)
 		{
 			QString buffer = __tr2qs_ctx("default", "editor");
 			getUniqueHandlerName((RawTreeWidgetItem *)it, buffer);
@@ -273,7 +273,7 @@ void RawEditorWidget::removeCurrentHandler()
 	{
 		QTreeWidgetItem * it = m_pLastEditedItem;
 		RawTreeWidgetItem * parent = (RawTreeWidgetItem *)it->parent();
-		m_pLastEditedItem = 0;
+		m_pLastEditedItem = nullptr;
 		delete it;
 		m_pEditor->setEnabled(false);
 		m_pNameEditor->setEnabled(false);
@@ -363,7 +363,7 @@ void RawEditorWidget::currentItemChanged(QTreeWidgetItem * it, QTreeWidgetItem *
 	}
 	else
 	{
-		m_pLastEditedItem = 0;
+		m_pLastEditedItem = nullptr;
 		m_pNameEditor->setEnabled(false);
 		m_pNameEditor->setText("");
 		m_pEditor->setEnabled(false);
@@ -474,7 +474,7 @@ void RawEditorWidget::exportAllEvents()
 }
 
 RawEditorWindow::RawEditorWindow()
-    : KviWindow(KviWindow::ScriptEditor, "raweditor", 0)
+    : KviWindow(KviWindow::ScriptEditor, "raweditor", nullptr)
 {
 	g_pRawEditorWindow = this;
 
@@ -505,7 +505,7 @@ RawEditorWindow::RawEditorWindow()
 
 RawEditorWindow::~RawEditorWindow()
 {
-	g_pRawEditorWindow = 0;
+	g_pRawEditorWindow = nullptr;
 }
 
 void RawEditorWindow::okClicked()
diff --git a/src/modules/raweditor/libkviraweditor.cpp b/src/modules/raweditor/libkviraweditor.cpp
index acfc7ea86..5670771d4 100644
--- a/src/modules/raweditor/libkviraweditor.cpp
+++ b/src/modules/raweditor/libkviraweditor.cpp
@@ -28,7 +28,7 @@
 #include "KviLocale.h"
 #include "KviMainWindow.h"
 
-RawEditorWindow * g_pRawEditorWindow = 0;
+RawEditorWindow * g_pRawEditorWindow = nullptr;
 
 /*
 	@doc: raweditor.open
@@ -58,20 +58,20 @@ static bool raweditor_kvs_cmd_open(KviKvsModuleCommandCall *)
 static bool raweditor_module_init(KviModule * m)
 {
 	KVSM_REGISTER_SIMPLE_COMMAND(m, "open", raweditor_kvs_cmd_open);
-	g_pRawEditorWindow = 0;
+	g_pRawEditorWindow = nullptr;
 	return true;
 }
 
 static bool raweditor_module_can_unload(KviModule *)
 {
-	return (g_pRawEditorWindow == 0);
+	return (g_pRawEditorWindow == nullptr);
 }
 
 static bool raweditor_module_cleanup(KviModule *)
 {
 	if(g_pRawEditorWindow && g_pMainWindow)
 		g_pMainWindow->closeWindow(g_pRawEditorWindow);
-	g_pRawEditorWindow = 0;
+	g_pRawEditorWindow = nullptr;
 	return true;
 }
 
diff --git a/src/modules/reguser/RegisteredUserEntryDialog.cpp b/src/modules/reguser/RegisteredUserEntryDialog.cpp
index 1eb24c37d..3244fbee6 100644
--- a/src/modules/reguser/RegisteredUserEntryDialog.cpp
+++ b/src/modules/reguser/RegisteredUserEntryDialog.cpp
@@ -124,8 +124,7 @@ RegisteredUserPropertiesDialog::RegisteredUserPropertiesDialog(QWidget * p, KviP
 }
 
 RegisteredUserPropertiesDialog::~RegisteredUserPropertiesDialog()
-{
-}
+    = default;
 
 void RegisteredUserPropertiesDialog::closeEvent(QCloseEvent * e)
 {
@@ -271,8 +270,7 @@ RegisteredUserMaskDialog::RegisteredUserMaskDialog(QWidget * p, KviIrcMask * m)
 }
 
 RegisteredUserMaskDialog::~RegisteredUserMaskDialog()
-{
-}
+    = default;
 
 void RegisteredUserMaskDialog::closeEvent(QCloseEvent * e)
 {
@@ -394,7 +392,7 @@ RegisteredUserEntryDialog::RegisteredUserEntryDialog(QWidget * p, KviRegisteredU
 	f->setFrameStyle(QFrame::HLine | QFrame::Sunken);
 	g->addWidget(f, 2, 0, 1, 3);
 
-	m_pAvatar = 0;
+	m_pAvatar = nullptr;
 	if(r)
 	{
 		const QString av = r->getProperty("avatar");
diff --git a/src/modules/reguser/RegisteredUsersDialog.cpp b/src/modules/reguser/RegisteredUsersDialog.cpp
index 30b5860b1..df8cef49f 100644
--- a/src/modules/reguser/RegisteredUsersDialog.cpp
+++ b/src/modules/reguser/RegisteredUsersDialog.cpp
@@ -148,8 +148,7 @@ RegisteredUsersDialogItem::RegisteredUsersDialogItem(QTreeWidgetItem * par, KviR
 }
 
 RegisteredUsersDialogItem::~RegisteredUsersDialogItem()
-{
-}
+    = default;
 
 QString RegisteredUsersDialogItem::key(int, bool) const
 {
@@ -346,10 +345,10 @@ RegisteredUsersDialog::~RegisteredUsersDialog()
 		KVI_OPTION_RECT(KviOption_rectRegisteredUsersDialogGeometry) = geometry();
 #endif
 
-	g_pRegisteredUsersDialog = 0;
+	g_pRegisteredUsersDialog = nullptr;
 
 	delete g_pLocalRegisteredUserDataBase;
-	g_pLocalRegisteredUserDataBase = 0;
+	g_pLocalRegisteredUserDataBase = nullptr;
 }
 
 void RegisteredUsersDialog::itemPressed(QTreeWidgetItem * it, int c)
@@ -584,7 +583,7 @@ void RegisteredUsersDialog::cancelClicked()
 
 void RegisteredUsersDialog::addClicked()
 {
-	RegisteredUserEntryDialog * dlg = new RegisteredUserEntryDialog(this, 0);
+	RegisteredUserEntryDialog * dlg = new RegisteredUserEntryDialog(this, nullptr);
 	int ret = dlg->exec();
 	delete dlg;
 
@@ -669,7 +668,7 @@ void RegisteredUsersDialog::editItem(RegisteredUsersDialogItem * i)
 {
 	KviRegisteredUser * u = i->user();
 
-	i->setUser(0);
+	i->setUser(nullptr);
 
 	QString szName = u->name();
 
@@ -747,7 +746,7 @@ void RegisteredUsersDialog::exportClicked()
 
 	QString buffer;
 
-	if(!KviFileDialog::askForSaveFileName(buffer, __tr2qs_ctx("Enter a Filename - KVIrc", "register"), 0, 0, true, true, true, this))
+	if(!KviFileDialog::askForSaveFileName(buffer, __tr2qs_ctx("Enter a Filename - KVIrc", "register"), nullptr, nullptr, true, true, true, this))
 		return;
 
 	if(!g_pRegisteredUsersDialog)
diff --git a/src/modules/reguser/libkvireguser.cpp b/src/modules/reguser/libkvireguser.cpp
index 16ac88c82..392ffa2e7 100644
--- a/src/modules/reguser/libkvireguser.cpp
+++ b/src/modules/reguser/libkvireguser.cpp
@@ -50,9 +50,9 @@
 
 extern KVIRC_API KviRegisteredUserDataBase * g_pRegisteredUserDataBase;
 
-KviPointerList<RegistrationWizard> * g_pRegistrationWizardList = 0;
+KviPointerList<RegistrationWizard> * g_pRegistrationWizardList = nullptr;
 
-RegisteredUsersDialog * g_pRegisteredUsersDialog = 0;
+RegisteredUsersDialog * g_pRegisteredUsersDialog = nullptr;
 
 /*
 	@doc: reguser
@@ -115,7 +115,7 @@ static bool reguser_kvs_cmd_edit(KviKvsModuleCommandCall * c)
 		{
 			if(g_pRegisteredUsersDialog->parent())
 			{
-				g_pRegisteredUsersDialog->setParent(0);
+				g_pRegisteredUsersDialog->setParent(nullptr);
 			}
 		}
 		else
@@ -130,7 +130,7 @@ static bool reguser_kvs_cmd_edit(KviKvsModuleCommandCall * c)
 	{
 		if(c->hasSwitch('t', "toplevel"))
 		{
-			g_pRegisteredUsersDialog = new RegisteredUsersDialog(0);
+			g_pRegisteredUsersDialog = new RegisteredUsersDialog(nullptr);
 		}
 		else
 		{
@@ -205,7 +205,7 @@ static bool reguser_kvs_cmd_add(KviKvsModuleCommandCall * c)
 		c->switches()->getAsStringIfExisting('g', "group", group);
 		u->setGroup(group);
 	}
-	if(u == 0)
+	if(u == nullptr)
 	{
 		if(c->hasSwitch('f', "force"))
 		{
@@ -224,7 +224,7 @@ static bool reguser_kvs_cmd_add(KviKvsModuleCommandCall * c)
 		{
 			KviIrcMask * m = new KviIrcMask(szMask);
 			u = g_pRegisteredUserDataBase->addMask(u, m);
-			if(u != 0)
+			if(u != nullptr)
 			{
 				if(!c->hasSwitch('q', "quiet"))
 					c->warning(__tr2qs_ctx("Mask %Q is already used to identify user %s", "register"), &szMask, u->name().toUtf8().data());
@@ -365,7 +365,7 @@ static bool reguser_kvs_cmd_addmask(KviKvsModuleCommandCall * c)
 
 	u = g_pRegisteredUserDataBase->addMask(u, mk);
 
-	if(u != 0)
+	if(u != nullptr)
 		c->warning(__tr2qs_ctx("Mask %Q already used to identify user %Q", "register"), &szMask, &(u->name()));
 	return true;
 }
@@ -1217,7 +1217,7 @@ static bool reguser_kvs_cmd_wizard(KviKvsModuleCommandCall * c)
 
 static bool reguser_module_init(KviModule * m)
 {
-	g_pLocalRegisteredUserDataBase = 0;
+	g_pLocalRegisteredUserDataBase = nullptr;
 	g_pRegistrationWizardList = new KviPointerList<RegistrationWizard>;
 	g_pRegistrationWizardList->setAutoDelete(true);
 
@@ -1248,12 +1248,12 @@ static bool reguser_module_cleanup(KviModule *)
 {
 	if(g_pRegisteredUsersDialog)
 		delete g_pRegisteredUsersDialog;
-	g_pRegisteredUsersDialog = 0;
+	g_pRegisteredUsersDialog = nullptr;
 
 	while(RegistrationWizard * w = g_pRegistrationWizardList->first())
 		delete w;
 	delete g_pRegistrationWizardList;
-	g_pRegistrationWizardList = 0;
+	g_pRegistrationWizardList = nullptr;
 
 	// FIXME: UNREGISTER THE METAOBJECTS
 	return true;
@@ -1261,7 +1261,7 @@ static bool reguser_module_cleanup(KviModule *)
 
 static bool reguser_module_can_unload(KviModule *)
 {
-	return ((g_pRegistrationWizardList->isEmpty()) && (g_pRegisteredUsersDialog == 0));
+	return ((g_pRegistrationWizardList->isEmpty()) && (g_pRegisteredUsersDialog == nullptr));
 }
 
 KVIRC_MODULE(
diff --git a/src/modules/rijndael/Rijndael.cpp b/src/modules/rijndael/Rijndael.cpp
index b60ef9182..b8b0fc6d9 100644
--- a/src/modules/rijndael/Rijndael.cpp
+++ b/src/modules/rijndael/Rijndael.cpp
@@ -989,9 +989,9 @@ void Rijndael::updateInitVector(UINT8 * initVector)
 	else
 	{
 		// zero init vector
-		for(int i = 0; i < MAX_IV_SIZE; i++)
+		for(unsigned char & i : m_initVector)
 		{
-			m_initVector[i] = 0;
+			i = 0;
 		}
 	}
 }
@@ -1070,7 +1070,7 @@ int Rijndael::blockEncrypt(const UINT8 * input, int inputLen, UINT8 * outBuffer,
 	if(m_direction != Encrypt)
 		return RIJNDAEL_BAD_DIRECTION;
 
-	if(input == 0 || inputLen <= 0)
+	if(input == nullptr || inputLen <= 0)
 		return 0;
 
 	numBlocks = inputLen / 128;
@@ -1163,7 +1163,7 @@ int Rijndael::padEncrypt(const UINT8 * input, int inputOctets, UINT8 * outBuffer
 	if(m_direction != Encrypt)
 		return RIJNDAEL_NOT_INITIALIZED;
 
-	if(input == 0 || inputOctets <= 0)
+	if(input == nullptr || inputOctets <= 0)
 		return 0;
 
 	numBlocks = inputOctets / 16;
@@ -1230,7 +1230,7 @@ int Rijndael::blockDecrypt(const UINT8 * input, int inputLen, UINT8 * outBuffer,
 	if((m_mode != CFB1) && (m_direction == Encrypt))
 		return RIJNDAEL_BAD_DIRECTION;
 
-	if(input == 0 || inputLen <= 0)
+	if(input == nullptr || inputLen <= 0)
 		return 0;
 
 	numBlocks = inputLen / 128;
@@ -1339,7 +1339,7 @@ int Rijndael::padDecrypt(const UINT8 * input, int inputOctets, UINT8 * outBuffer
 	if(m_direction != Decrypt)
 		return RIJNDAEL_BAD_DIRECTION;
 
-	if(input == 0 || inputOctets <= 0)
+	if(input == nullptr || inputOctets <= 0)
 		return 0;
 
 	if((inputOctets % 16) != 0)
diff --git a/src/modules/rijndael/UglyBase64.cpp b/src/modules/rijndael/UglyBase64.cpp
index ec1248222..8c075d6e3 100644
--- a/src/modules/rijndael/UglyBase64.cpp
+++ b/src/modules/rijndael/UglyBase64.cpp
@@ -53,8 +53,8 @@ namespace UglyBase64
 		if(!didinit)
 		{
 			// initialize base64unmap
-			for(int i = 0; i < 255; ++i)
-				base64unmap[i] = 0;
+			for(char & i : base64unmap)
+				i = 0;
 			for(int i = 0; i < 64; ++i)
 				base64unmap[fake_base64[i]] = i;
 			didinit = true;
diff --git a/src/modules/rijndael/libkvirijndael.cpp b/src/modules/rijndael/libkvirijndael.cpp
index ef57e5431..a9fcfdb64 100644
--- a/src/modules/rijndael/libkvirijndael.cpp
+++ b/src/modules/rijndael/libkvirijndael.cpp
@@ -65,14 +65,14 @@
 #include "KviPointerList.h"
 #include "KviCryptEngineDescription.h"
 
-static KviPointerList<KviCryptEngine> * g_pEngineList = 0;
+static KviPointerList<KviCryptEngine> * g_pEngineList = nullptr;
 
 KviRijndaelEngine::KviRijndaelEngine()
     : KviCryptEngine()
 {
 	g_pEngineList->append(this);
-	m_pEncryptCipher = 0;
-	m_pDecryptCipher = 0;
+	m_pEncryptCipher = nullptr;
+	m_pDecryptCipher = nullptr;
 }
 
 KviRijndaelEngine::~KviRijndaelEngine()
@@ -89,12 +89,12 @@ bool KviRijndaelEngine::init(const char * encKey, int encKeyLen, const char * de
 	if(m_pEncryptCipher)
 	{
 		delete m_pEncryptCipher;
-		m_pEncryptCipher = 0;
+		m_pEncryptCipher = nullptr;
 	}
 	if(m_pDecryptCipher)
 	{
 		delete m_pDecryptCipher;
-		m_pDecryptCipher = 0;
+		m_pDecryptCipher = nullptr;
 	}
 
 	if(encKey && (encKeyLen > 0))
@@ -172,7 +172,7 @@ bool KviRijndaelEngine::init(const char * encKey, int encKeyLen, const char * de
 	if(retVal != RIJNDAEL_SUCCESS)
 	{
 		delete m_pEncryptCipher;
-		m_pEncryptCipher = 0;
+		m_pEncryptCipher = nullptr;
 		setLastErrorFromRijndaelErrorCode(retVal);
 		return false;
 	}
@@ -186,9 +186,9 @@ bool KviRijndaelEngine::init(const char * encKey, int encKeyLen, const char * de
 	if(retVal != RIJNDAEL_SUCCESS)
 	{
 		delete m_pEncryptCipher;
-		m_pEncryptCipher = 0;
+		m_pEncryptCipher = nullptr;
 		delete m_pDecryptCipher;
-		m_pDecryptCipher = 0;
+		m_pDecryptCipher = nullptr;
 		setLastErrorFromRijndaelErrorCode(retVal);
 		return false;
 	}
@@ -239,7 +239,7 @@ KviCryptEngine::EncryptResult KviRijndaelEngine::encrypt(const char * plainText,
 	}
 	int len = (int)kvi_strLen(plainText);
 	char * buf = (char *)KviMemory::allocate(len + 16); // needed for the eventual padding
-	unsigned char * iv = 0;
+	unsigned char * iv = nullptr;
 	if(m_bEncryptMode == CBC)
 	{
 		iv = (unsigned char *)KviMemory::allocate(MAX_IV_SIZE);
@@ -312,7 +312,7 @@ KviCryptEngine::DecryptResult KviRijndaelEngine::decrypt(const char * inBuffer,
 		return KviCryptEngine::DecryptError;
 
 	char * buf = (char *)KviMemory::allocate(len + 1);
-	unsigned char * iv = 0;
+	unsigned char * iv = nullptr;
 	if(m_bEncryptMode == CBC)
 	{
 		// extract the IV from the cyphered string
@@ -360,7 +360,7 @@ bool KviRijndaelHexEngine::asciiToBinary(const char * inBuffer, int * len, char
 	}
 	else
 	{
-		if(len > 0)
+		if(len > nullptr)
 		{
 			*outBuffer = (char *)KviMemory::allocate(*len);
 			KviMemory::move(*outBuffer, tmpBuf, *len);
@@ -388,7 +388,7 @@ bool KviRijndaelBase64Engine::asciiToBinary(const char * inBuffer, int * len, ch
 	}
 	else
 	{
-		if(len > 0)
+		if(len > nullptr)
 		{
 			*outBuffer = (char *)KviMemory::allocate(*len);
 			KviMemory::move(*outBuffer, tmpBuf, *len);
@@ -610,7 +610,7 @@ bool KviMircryptionEngine::doEncryptECB(KviCString & plain, KviCString & encoded
 
 bool KviMircryptionEngine::doDecryptECB(KviCString & encoded, KviCString & plain)
 {
-	unsigned char * buf = 0;
+	unsigned char * buf = nullptr;
 	int len;
 	UglyBase64::decode(encoded, &buf, &len);
 
@@ -803,7 +803,7 @@ static bool rijndael_module_cleanup(KviModule * m)
 	while(g_pEngineList->first())
 		delete g_pEngineList->first();
 	delete g_pEngineList;
-	g_pEngineList = 0;
+	g_pEngineList = nullptr;
 	m->unregisterCryptEngines();
 	return true;
 #else
diff --git a/src/modules/rot13/libkvirot13.cpp b/src/modules/rot13/libkvirot13.cpp
index f57858980..1e0a0a96b 100644
--- a/src/modules/rot13/libkvirot13.cpp
+++ b/src/modules/rot13/libkvirot13.cpp
@@ -47,7 +47,7 @@
 #include "KviPointerList.h"
 #include "KviCryptEngineDescription.h"
 
-static KviPointerList<KviCryptEngine> * g_pEngineList = 0;
+static KviPointerList<KviCryptEngine> * g_pEngineList = nullptr;
 
 KviRot13Engine::KviRot13Engine()
     : KviCryptEngine()
@@ -133,7 +133,7 @@ static bool rot13_module_cleanup(KviModule * m)
 	while(g_pEngineList->first())
 		delete g_pEngineList->first();
 	delete g_pEngineList;
-	g_pEngineList = 0;
+	g_pEngineList = nullptr;
 	m->unregisterCryptEngines();
 	return true;
 #else
diff --git a/src/modules/setup/SetupWizard.cpp b/src/modules/setup/SetupWizard.cpp
index 153af8767..61f5813d6 100644
--- a/src/modules/setup/SetupWizard.cpp
+++ b/src/modules/setup/SetupWizard.cpp
@@ -126,11 +126,10 @@ SetupPage::SetupPage(SetupWizard * w)
 }
 
 SetupPage::~SetupPage()
-{
-}
+    = default;
 
 SetupWizard::SetupWizard()
-    : KviTalWizard(0)
+    : KviTalWizard(nullptr)
 {
 	setWindowTitle(__tr2qs("Setup Wizard - KVIrc"));
 
@@ -205,7 +204,7 @@ SetupWizard::SetupWizard()
 
 	setHelpEnabled(m_pLicense, false);
 #else
-	m_pLicense = 0;
+	m_pLicense = nullptr;
 #endif
 	/////////////////////////////////////////////////////////////////////////////////////////////////////////////
 	// Directories
diff --git a/src/modules/sharedfile/libkvisharedfile.cpp b/src/modules/sharedfile/libkvisharedfile.cpp
index ba60faf9a..199c25fce 100644
--- a/src/modules/sharedfile/libkvisharedfile.cpp
+++ b/src/modules/sharedfile/libkvisharedfile.cpp
@@ -221,7 +221,7 @@ static bool sharedfile_kvs_cmd_list(KviKvsModuleCommandCall * c)
 			    o->userMask().toUtf8().data());
 			if(o->expireTime() > 0)
 			{
-				int secs = ((int)(o->expireTime())) - ((int)(time(0)));
+				int secs = ((int)(o->expireTime())) - ((int)(time(nullptr)));
 				int hour = secs / 3600;
 				secs = secs % 3600;
 				int mins = secs / 60;
diff --git a/src/modules/sharedfileswindow/SharedFilesWindow.cpp b/src/modules/sharedfileswindow/SharedFilesWindow.cpp
index acbf3b8d6..9628daf0e 100644
--- a/src/modules/sharedfileswindow/SharedFilesWindow.cpp
+++ b/src/modules/sharedfileswindow/SharedFilesWindow.cpp
@@ -126,8 +126,7 @@ SharedFileEditDialog::SharedFileEditDialog(QWidget * par, KviSharedFile * f)
 }
 
 SharedFileEditDialog::~SharedFileEditDialog()
-{
-}
+    = default;
 
 void SharedFileEditDialog::browse()
 {
@@ -205,11 +204,10 @@ SharedFilesTreeWidgetItem::SharedFilesTreeWidgetItem(QTreeWidget * lv, KviShared
 }
 
 SharedFilesTreeWidgetItem::~SharedFilesTreeWidgetItem()
-{
-}
+    = default;
 
 SharedFilesWindow::SharedFilesWindow()
-    : KviWindow(KviWindow::Tool, "shared files window", 0)
+    : KviWindow(KviWindow::Tool, "shared files window", nullptr)
 {
 	g_pSharedFilesWindow = this;
 	m_pSplitter = new KviTalSplitter(Qt::Horizontal, this);
@@ -253,7 +251,7 @@ SharedFilesWindow::SharedFilesWindow()
 
 SharedFilesWindow::~SharedFilesWindow()
 {
-	g_pSharedFilesWindow = 0;
+	g_pSharedFilesWindow = nullptr;
 }
 
 void SharedFilesWindow::enableButtons()
@@ -274,7 +272,7 @@ void SharedFilesWindow::removeClicked()
 
 void SharedFilesWindow::addClicked()
 {
-	SharedFileEditDialog dlg(0);
+	SharedFileEditDialog dlg(nullptr);
 	if(dlg.exec() != QDialog::Accepted)
 		return;
 
@@ -290,7 +288,7 @@ void SharedFilesWindow::editClicked()
 	if(!it)
 		return;
 
-	SharedFileEditDialog dlg(0, it->readOnlySharedFilePointer());
+	SharedFileEditDialog dlg(nullptr, it->readOnlySharedFilePointer());
 	if(dlg.exec() != QDialog::Accepted)
 		return;
 
diff --git a/src/modules/sharedfileswindow/libkvisharedfileswindow.cpp b/src/modules/sharedfileswindow/libkvisharedfileswindow.cpp
index 5a4891b45..c471e1db3 100644
--- a/src/modules/sharedfileswindow/libkvisharedfileswindow.cpp
+++ b/src/modules/sharedfileswindow/libkvisharedfileswindow.cpp
@@ -34,7 +34,7 @@
 
 #define KVI_SHARED_FILES_WINDOW_EXTENSION_NAME "Shared files window extension"
 
-SharedFilesWindow * g_pSharedFilesWindow = 0;
+SharedFilesWindow * g_pSharedFilesWindow = nullptr;
 
 /*
 	@doc: sharedfileswindow.open
@@ -84,7 +84,7 @@ static bool sharedfileswindow_module_cleanup(KviModule *)
 {
 	if(g_pSharedFilesWindow && g_pMainWindow)
 		g_pMainWindow->closeWindow(g_pSharedFilesWindow);
-	g_pSharedFilesWindow = 0;
+	g_pSharedFilesWindow = nullptr;
 	return true;
 }
 
diff --git a/src/modules/snd/libkvisnd.cpp b/src/modules/snd/libkvisnd.cpp
index a3af9bea0..6ad3b5edb 100644
--- a/src/modules/snd/libkvisnd.cpp
+++ b/src/modules/snd/libkvisnd.cpp
@@ -78,7 +78,7 @@
 #endif //COMPILE_OSS_SUPPORT
 #endif
 
-static KviSoundPlayer * g_pSoundPlayer = 0;
+static KviSoundPlayer * g_pSoundPlayer = nullptr;
 
 KviSoundPlayer::KviSoundPlayer()
     : QObject()
@@ -87,10 +87,10 @@ KviSoundPlayer::KviSoundPlayer()
 	m_pThreadList->setAutoDelete(true);
 
 #ifdef COMPILE_PHONON_SUPPORT
-	m_pPhononPlayer = NULL;
+	m_pPhononPlayer = nullptr;
 #endif //!COMPILE_PHONON_SUPPORT
 
-	m_pLastUsedSoundPlayerEntry = NULL;
+	m_pLastUsedSoundPlayerEntry = nullptr;
 
 	m_pSoundSystemDict = new KviPointerHashTable<QString, KviSoundPlayerEntry>(17, false);
 	m_pSoundSystemDict->setAutoDelete(true);
@@ -137,7 +137,7 @@ KviSoundPlayer::~KviSoundPlayer()
 		delete m_pPhononPlayer;
 #endif //COMPILE_PHONON_SUPPORT
 
-	g_pSoundPlayer = 0;
+	g_pSoundPlayer = nullptr;
 }
 
 void KviSoundPlayer::stopAllSoundThreads()
@@ -159,7 +159,7 @@ void KviSoundPlayer::cleanupAfterLastPlayerEntry()
 	SoundSystemCleanupRoutine r = m_pLastUsedSoundPlayerEntry->cleanupRoutine();
 	if(r)
 		(this->*r)();
-	m_pLastUsedSoundPlayerEntry = NULL;
+	m_pLastUsedSoundPlayerEntry = nullptr;
 }
 
 void KviSoundPlayer::getAvailableSoundSystems(QStringList * l)
@@ -281,7 +281,7 @@ void KviSoundPlayer::cleanupPhonon()
 	if(!m_pPhononPlayer)
 		return;
 	delete m_pPhononPlayer; // must be stopped
-	m_pPhononPlayer = NULL;
+	m_pPhononPlayer = nullptr;
 }
 #endif //!COMPILE_PHONON_SUPPORT
 
@@ -455,8 +455,7 @@ KviOssAudiofileSoundThread::KviOssAudiofileSoundThread(const QString & szFileNam
 }
 
 KviOssAudiofileSoundThread::~KviOssAudiofileSoundThread()
-{
-}
+    = default;
 
 void KviOssAudiofileSoundThread::play()
 {
@@ -468,7 +467,7 @@ void KviOssAudiofileSoundThread::play()
 	float frameSize;
 	void * buffer;
 
-	file = afOpenFile(m_szFileName.toUtf8().data(), "r", NULL);
+	file = afOpenFile(m_szFileName.toUtf8().data(), "r", nullptr);
 	if(!file)
 	{
 		qDebug("libaudiofile could not open the file %s", m_szFileName.toUtf8().data());
@@ -552,8 +551,7 @@ KviOssSoundThread::KviOssSoundThread(const QString & szFileName)
 }
 
 KviOssSoundThread::~KviOssSoundThread()
-{
-}
+    = default;
 
 void KviOssSoundThread::play()
 {
@@ -806,7 +804,7 @@ static bool snd_module_init(KviModule * m)
 static bool snd_module_cleanup(KviModule *)
 {
 	delete g_pSoundPlayer;
-	g_pSoundPlayer = 0;
+	g_pSoundPlayer = nullptr;
 	return true;
 }
 
diff --git a/src/modules/socketspy/libkvisocketspy.cpp b/src/modules/socketspy/libkvisocketspy.cpp
index 81995cc5f..9ecaa2863 100644
--- a/src/modules/socketspy/libkvisocketspy.cpp
+++ b/src/modules/socketspy/libkvisocketspy.cpp
@@ -30,7 +30,7 @@
 
 #include <QSplitter>
 
-KviPointerList<SocketSpyWindow> * g_pSocketSpyWindowList = 0;
+KviPointerList<SocketSpyWindow> * g_pSocketSpyWindowList = nullptr;
 
 /*
 	@doc: socketspy.open
@@ -71,7 +71,7 @@ static bool socketspy_module_cleanup(KviModule *)
 	while(g_pSocketSpyWindowList->first())
 		g_pSocketSpyWindowList->first()->die();
 	delete g_pSocketSpyWindowList;
-	g_pSocketSpyWindowList = 0;
+	g_pSocketSpyWindowList = nullptr;
 	return true;
 }
 
diff --git a/src/modules/spaste/SlowPasteController.cpp b/src/modules/spaste/SlowPasteController.cpp
index 99ec083a0..4f432b0a6 100644
--- a/src/modules/spaste/SlowPasteController.cpp
+++ b/src/modules/spaste/SlowPasteController.cpp
@@ -39,7 +39,7 @@
 extern KviPointerList<SlowPasteController> * g_pControllerList;
 
 SlowPasteController::SlowPasteController(KviWindow * w, int id)
-    : m_pClipBuff(NULL), m_pFile(NULL), m_pId(id), m_pWindow(w)
+    : m_pClipBuff(nullptr), m_pFile(nullptr), m_pId(id), m_pWindow(w)
 {
 	g_pControllerList->append(this);
 	//m_pWindow = w;
@@ -73,7 +73,7 @@ bool SlowPasteController::pasteFileInit(QString & fileName)
 	if(!m_pFile->open(QIODevice::ReadOnly))
 		return false;
 	//avoid double connection
-	disconnect(m_pTimer, SIGNAL(timeout()), 0, 0);
+	disconnect(m_pTimer, SIGNAL(timeout()), nullptr, nullptr);
 	connect(m_pTimer, SIGNAL(timeout()), this, SLOT(pasteFile()));
 	//avoid timer reset if always active
 	if(!m_pTimer->isActive())
@@ -95,7 +95,7 @@ bool SlowPasteController::pasteClipboardInit(void)
 		m_pClipBuff = new QStringList(tmp.isEmpty() ? QStringList() : tmp.split("\n", QString::KeepEmptyParts));
 	}
 	//avoid double connection
-	disconnect(m_pTimer, SIGNAL(timeout()), 0, 0);
+	disconnect(m_pTimer, SIGNAL(timeout()), nullptr, nullptr);
 	connect(m_pTimer, SIGNAL(timeout()), this, SLOT(pasteClipboard()));
 	//avoid timer reset if always active
 	if(!m_pTimer->isActive())
diff --git a/src/modules/spaste/libkvispaste.cpp b/src/modules/spaste/libkvispaste.cpp
index c47f9bfa8..233ae97d1 100644
--- a/src/modules/spaste/libkvispaste.cpp
+++ b/src/modules/spaste/libkvispaste.cpp
@@ -42,7 +42,7 @@
 #include <unistd.h>
 #endif
 
-KviPointerList<SlowPasteController> * g_pControllerList = 0;
+KviPointerList<SlowPasteController> * g_pControllerList = nullptr;
 int ctrlId = 0;
 
 static SlowPasteController * spaste_find_controller(KviWindow * w)
@@ -52,7 +52,7 @@ static SlowPasteController * spaste_find_controller(KviWindow * w)
 		if(spc->window() == w)
 			return spc;
 	}
-	return 0;
+	return nullptr;
 }
 
 static KviWindow * spaste_kvs_find_window(QString & win, KviKvsModuleCommandCall * c)
@@ -65,12 +65,12 @@ static KviWindow * spaste_kvs_find_window(QString & win, KviKvsModuleCommandCall
 	if(!w)
 	{
 		c->warning(__tr("Window with ID '%Q' not found"), &win);
-		return 0;
+		return nullptr;
 	}
 	if((w->type() == KviWindow::Channel) || (w->type() == KviWindow::Query) || (w->type() == KviWindow::DccChat))
 		return w;
 	c->warning(__tr2qs("The specified window (%Q) is not a channel/query/DCC chat"), &win);
-	return 0;
+	return nullptr;
 }
 
 /*
@@ -231,7 +231,7 @@ static bool spaste_kvs_cmd_stop(KviKvsModuleCommandCall * c)
 		}
 		else
 		{
-			while((item = it.current()) != 0)
+			while((item = it.current()) != nullptr)
 			{
 				++it;
 				if(KviQString::equalCS(item->window()->id(), c->window()->id()))
@@ -242,7 +242,7 @@ static bool spaste_kvs_cmd_stop(KviKvsModuleCommandCall * c)
 	else
 	{
 		//Delete the spaste with the given id
-		while((item = it.current()) != 0)
+		while((item = it.current()) != nullptr)
 		{
 			++it;
 			if(item->getId() == (kvs_int_t)iId)
@@ -277,7 +277,7 @@ static bool spaste_kvs_cmd_list(KviKvsModuleCommandCall * c)
 	KviPointerListIterator<SlowPasteController> it(*g_pControllerList);
 	SlowPasteController * item;
 
-	while((item = it.current()) != 0)
+	while((item = it.current()) != nullptr)
 	{
 		++it;
 		QString szWinId = item->window()->id();
@@ -332,7 +332,7 @@ static bool spaste_module_cleanup(KviModule *)
 	while(g_pControllerList->first())
 		delete g_pControllerList->first();
 	delete g_pControllerList;
-	g_pControllerList = 0;
+	g_pControllerList = nullptr;
 
 	return true;
 }
diff --git a/src/modules/spellchecker/libkvispellchecker.cpp b/src/modules/spellchecker/libkvispellchecker.cpp
index 55cb3f19c..d87e641ea 100644
--- a/src/modules/spellchecker/libkvispellchecker.cpp
+++ b/src/modules/spellchecker/libkvispellchecker.cpp
@@ -28,8 +28,8 @@
 #include <enchant.h>
 #include <enchant-provider.h>
 
-static EnchantBroker * g_pEnchantBroker = NULL;
-static KviPointerList<EnchantDict> * g_pEnchantDicts = NULL;
+static EnchantBroker * g_pEnchantBroker = nullptr;
+static KviPointerList<EnchantDict> * g_pEnchantDicts = nullptr;
 
 /*
 	@doc: spellchecker.available_dictionaries
@@ -208,9 +208,9 @@ static bool spellchecker_module_cleanup(KviModule *)
 		enchant_broker_free_dict(g_pEnchantBroker, g_pEnchantDicts->takeFirst());
 
 	delete g_pEnchantDicts;
-	g_pEnchantDicts = NULL;
+	g_pEnchantDicts = nullptr;
 	enchant_broker_free(g_pEnchantBroker);
-	g_pEnchantBroker = NULL;
+	g_pEnchantBroker = nullptr;
 	return true;
 }
 
diff --git a/src/modules/str/libkvistr.cpp b/src/modules/str/libkvistr.cpp
index 8e5b1eead..1825d2e0a 100644
--- a/src/modules/str/libkvistr.cpp
+++ b/src/modules/str/libkvistr.cpp
@@ -928,14 +928,14 @@ static bool str_kvs_fnc_urlencode(KviKvsModuleFunctionCall * c)
 		" ", "#", "$", "/", ":",
 		"<", "=", ">", "?", "@",
 		"[", "\\", "]", "^", "`",
-		"{", "|", "}", 0
+		"{", "|", "}", nullptr
 	};
 
 	const char * const newStr[] = {
 		"%20", "%23", "%24", "%2F", "%3A",
 		"%3C", "%3D", "%3E", "%3F", "%40",
 		"%5B", "%5C", "%5D", "%5E", "%60",
-		"%7B", "%7C", "%7D", 0
+		"%7B", "%7C", "%7D", nullptr
 	};
 
 	while(toReplace[idx])
@@ -1409,7 +1409,7 @@ static bool str_kvs_fnc_digest(KviKvsModuleFunctionCall * c)
 	}
 
 	EVP_MD_CTX_init(&mdctx);
-	EVP_DigestInit_ex(&mdctx, md, NULL);
+	EVP_DigestInit_ex(&mdctx, md, nullptr);
 	EVP_DigestUpdate(&mdctx, szString.toUtf8().data(), szString.toUtf8().length());
 	EVP_DigestFinal_ex(&mdctx, md_value, &md_len);
 	EVP_MD_CTX_cleanup(&mdctx);
@@ -2285,9 +2285,9 @@ static bool str_kvs_fnc_evpSign(KviKvsModuleFunctionCall * c)
 
 	KviSSL::globalSSLInit();
 	EVP_MD_CTX md_ctx;
-	EVP_PKEY * pKey = 0;
+	EVP_PKEY * pKey = nullptr;
 	unsigned int len = 0;
-	unsigned char * sig = 0;
+	unsigned char * sig = nullptr;
 
 	if(szCert.isEmpty())
 	{
@@ -2308,7 +2308,7 @@ static bool str_kvs_fnc_evpSign(KviKvsModuleFunctionCall * c)
 		}
 
 		szPass = KVI_OPTION_STRING(KviOption_stringSSLPrivateKeyPass).toUtf8();
-		PEM_read_PrivateKey(f, &pKey, NULL, szPass.data());
+		PEM_read_PrivateKey(f, &pKey, nullptr, szPass.data());
 
 		fclose(f);
 
@@ -2324,7 +2324,7 @@ static bool str_kvs_fnc_evpSign(KviKvsModuleFunctionCall * c)
 		// get from parameter (with optional password)
 		BIO * in;
 		in = BIO_new_mem_buf((unsigned char *)szCert.data(), szCert.size());
-		PEM_read_bio_PrivateKey(in, &pKey, NULL, szPass.data());
+		PEM_read_bio_PrivateKey(in, &pKey, nullptr, szPass.data());
 		BIO_free(in);
 
 		if(!pKey)
@@ -2422,8 +2422,8 @@ static bool str_kvs_fnc_evpVerify(KviKvsModuleFunctionCall * c)
 	const char * message = szMessage.data();
 
 	EVP_MD_CTX md_ctx;
-	EVP_PKEY * pKey = 0;
-	X509 * cert = 0;
+	EVP_PKEY * pKey = nullptr;
+	X509 * cert = nullptr;
 	int err = -1;
 
 	if(szCert.isEmpty())
@@ -2445,7 +2445,7 @@ static bool str_kvs_fnc_evpVerify(KviKvsModuleFunctionCall * c)
 		}
 
 		szPass = KVI_OPTION_STRING(KviOption_stringSSLCertificatePass).toUtf8();
-		PEM_read_X509(f, &cert, NULL, szPass.data());
+		PEM_read_X509(f, &cert, nullptr, szPass.data());
 
 		fclose(f);
 
@@ -2466,7 +2466,7 @@ static bool str_kvs_fnc_evpVerify(KviKvsModuleFunctionCall * c)
 	{
 		// get from parameter (with optional password)
 		BIO * in = BIO_new_mem_buf((unsigned char *)szCert.data(), szCert.size());
-		PEM_read_bio_X509(in, &cert, 0, szPass.data());
+		PEM_read_bio_X509(in, &cert, nullptr, szPass.data());
 
 		if(cert)
 		{
@@ -2475,7 +2475,7 @@ static bool str_kvs_fnc_evpVerify(KviKvsModuleFunctionCall * c)
 		}
 		else
 		{
-			pKey = PEM_read_bio_PUBKEY(in, NULL, 0, szPass.data());
+			pKey = PEM_read_bio_PUBKEY(in, nullptr, nullptr, szPass.data());
 		}
 
 		BIO_free(in);
diff --git a/src/modules/system/Plugin.cpp b/src/modules/system/Plugin.cpp
index 29c5db05b..3d579c083 100644
--- a/src/modules/system/Plugin.cpp
+++ b/src/modules/system/Plugin.cpp
@@ -123,7 +123,7 @@ Plugin * Plugin::load(const QString & szFileName)
 	if(!pLibrary->load())
 	{
 		delete pLibrary;
-		return 0;
+		return nullptr;
 	}
 
 	Plugin * pPlugin = new Plugin(pLibrary, KviFileUtils::extractFileName(szFileName));
@@ -279,7 +279,7 @@ bool PluginManager::pluginCall(KviKvsModuleFunctionCall * c)
 		pArgvBuffer = (char *)malloc(iSize);
 
 		i = 2;
-		char * x = 0;
+		char * x = nullptr;
 		x = pArgvBuffer;
 		while(i < (iArgc + 2))
 		{
@@ -296,8 +296,8 @@ bool PluginManager::pluginCall(KviKvsModuleFunctionCall * c)
 	else
 	{
 		//Avoid using unfilled variables
-		ppArgv = 0;
-		pArgvBuffer = 0;
+		ppArgv = nullptr;
+		pArgvBuffer = nullptr;
 		iArgc = 0;
 	}
 
@@ -414,7 +414,7 @@ bool PluginManager::loadPlugin(const QString & szPluginPath)
 {
 	if(isPluginLoaded(szPluginPath))
 	{
-		return getPlugin(szPluginPath) != 0;
+		return getPlugin(szPluginPath) != nullptr;
 	}
 	else
 	{
diff --git a/src/modules/system/libkvisystem.cpp b/src/modules/system/libkvisystem.cpp
index 9404b5a26..44258827d 100644
--- a/src/modules/system/libkvisystem.cpp
+++ b/src/modules/system/libkvisystem.cpp
@@ -514,9 +514,9 @@ static bool system_kvs_fnc_dbus(KviKvsModuleFunctionCall * c)
 
 	QList<QVariant> ds;
 
-	for(QStringList::Iterator it = parms.begin(); it != parms.end(); ++it)
+	for(auto & parm : parms)
 	{
-		KviCString tmp = *it;
+		KviCString tmp = parm;
 
 		if(tmp.isEmpty())
 		{
@@ -605,9 +605,9 @@ static bool system_kvs_fnc_dbus(KviKvsModuleFunctionCall * c)
 				QStringList csl(v.toStringList());
 				KviKvsArray * arry = new KviKvsArray();
 				int idx = 0;
-				for(QStringList::Iterator iter = csl.begin(); iter != csl.end(); ++iter)
+				for(auto & iter : csl)
 				{
-					arry->set(idx, new KviKvsVariant(*iter));
+					arry->set(idx, new KviKvsVariant(iter));
 					idx++;
 				}
 				c->returnValue()->setArray(arry);
diff --git a/src/modules/term/libkviterm.cpp b/src/modules/term/libkviterm.cpp
index f08890bd1..d17ec09ea 100644
--- a/src/modules/term/libkviterm.cpp
+++ b/src/modules/term/libkviterm.cpp
@@ -38,7 +38,7 @@ KviPointerList<TermWidget> * g_pTermWidgetList = 0;
 KviPointerList<TermWindow> * g_pTermWindowList = 0;
 #endif
 
-KviModule * g_pTermModule = 0;
+KviModule * g_pTermModule = nullptr;
 
 /*
 	@doc: term.open
diff --git a/src/modules/texticons/libkvitexticons.cpp b/src/modules/texticons/libkvitexticons.cpp
index abf0ec610..55f15374b 100644
--- a/src/modules/texticons/libkvitexticons.cpp
+++ b/src/modules/texticons/libkvitexticons.cpp
@@ -47,7 +47,7 @@
 static bool texticons_kvs_fnc_get(KviKvsModuleFunctionCall * c)
 {
 	QString szIcon;
-	KviTextIcon * pIcon = 0;
+	KviTextIcon * pIcon = nullptr;
 	KVSM_PARAMETERS_BEGIN(c)
 	KVSM_PARAMETER("iconName", KVS_PT_NONEMPTYSTRING, KVS_PF_OPTIONAL, szIcon)
 	KVSM_PARAMETERS_END(c)
@@ -107,7 +107,7 @@ static bool texticons_kvs_fnc_get(KviKvsModuleFunctionCall * c)
 static bool texticons_kvs_cmd_set(KviKvsModuleCommandCall * c)
 {
 	QString szName, szIcon;
-	KviTextIcon * pIcon = 0;
+	KviTextIcon * pIcon = nullptr;
 	KVSM_PARAMETERS_BEGIN(c)
 	KVSM_PARAMETER("iconName", KVS_PT_NONEMPTYSTRING, 0, szName)
 	KVSM_PARAMETER("iconIdOrFile", KVS_PT_STRING, KVS_PF_OPTIONAL, szIcon)
diff --git a/src/modules/theme/PackThemeDialog.cpp b/src/modules/theme/PackThemeDialog.cpp
index 65c56984b..4af6d1326 100644
--- a/src/modules/theme/PackThemeDialog.cpp
+++ b/src/modules/theme/PackThemeDialog.cpp
@@ -144,7 +144,7 @@ void PackThemeDataWidget::parseThemes(KviPointerList<KviThemeInfo> * pThemeInfoL
 	QString szPackageAuthor;
 	QString szPackageDescription;
 	QString szPackageVersion;
-	KviThemeInfo * pThemeInfo = 0;
+	KviThemeInfo * pThemeInfo = nullptr;
 	bool bPackagePathSet = false;
 
 	QString szPackagePath = QDir::homePath();
@@ -242,8 +242,7 @@ void PackThemeDataWidget::parseThemes(KviPointerList<KviThemeInfo> * pThemeInfoL
 }
 
 PackThemeDataWidget::~PackThemeDataWidget()
-{
-}
+    = default;
 
 PackThemeInfoWidget::PackThemeInfoWidget(PackThemeDialog * pParent)
     : QWizardPage(pParent)
@@ -312,8 +311,7 @@ void PackThemeInfoWidget::initializePage()
 }
 
 PackThemeInfoWidget::~PackThemeInfoWidget()
-{
-}
+    = default;
 
 PackThemeImageWidget::PackThemeImageWidget(PackThemeDialog * pParent)
     : QWizardPage(pParent)
@@ -340,8 +338,7 @@ PackThemeImageWidget::PackThemeImageWidget(PackThemeDialog * pParent)
 }
 
 PackThemeImageWidget::~PackThemeImageWidget()
-{
-}
+    = default;
 
 void PackThemeImageWidget::imageSelectionChanged(const QString & szImagePath)
 {
@@ -393,8 +390,7 @@ PackThemeSaveWidget::PackThemeSaveWidget(PackThemeDialog * pParent)
 }
 
 PackThemeSaveWidget::~PackThemeSaveWidget()
-{
-}
+    = default;
 
 void PackThemeSaveWidget::initializePage()
 {
@@ -410,8 +406,7 @@ void PackThemeSaveWidget::initializePage()
 #endif
 
 PackThemeDialog::~PackThemeDialog()
-{
-}
+    = default;
 
 void PackThemeDialog::accept()
 {
diff --git a/src/modules/theme/SaveThemeDialog.cpp b/src/modules/theme/SaveThemeDialog.cpp
index e94ba10e0..eda0f371e 100644
--- a/src/modules/theme/SaveThemeDialog.cpp
+++ b/src/modules/theme/SaveThemeDialog.cpp
@@ -207,8 +207,7 @@ SaveThemeDialog::SaveThemeDialog(QWidget * pParent)
 }
 
 SaveThemeDialog::~SaveThemeDialog()
-{
-}
+    = default;
 
 void SaveThemeDialog::imageSelectionChanged(const QString & szImagePath)
 {
diff --git a/src/modules/theme/ThemeFunctions.cpp b/src/modules/theme/ThemeFunctions.cpp
index b2b8aa22d..0f9b92de4 100644
--- a/src/modules/theme/ThemeFunctions.cpp
+++ b/src/modules/theme/ThemeFunctions.cpp
@@ -91,9 +91,9 @@ namespace ThemeFunctions
 			return notAValidThemePackage(szError);
 
 		// make sure the default fields exist
-		for(int i = 0; i < 6; i++)
+		for(auto & check_field : check_fields)
 		{
-			pValue = pInfoFields->find(check_fields[i]);
+			pValue = pInfoFields->find(check_field);
 			if(!pValue)
 				return notAValidThemePackage(szError);
 		}
@@ -115,7 +115,7 @@ namespace ThemeFunctions
 		// load its picture
 		pByteArray = r.binaryInfoFields()->find("Image");
 		if(pByteArray)
-			pix.loadFromData(*pByteArray, 0, 0);
+			pix.loadFromData(*pByteArray, nullptr, nullptr);
 
 		if(pix.isNull())
 		{
@@ -182,7 +182,7 @@ namespace ThemeFunctions
 			QPixmap pixScreenshot;
 			pByteArray = r.binaryInfoFields()->find(szTmp);
 			if(pByteArray)
-				pixScreenshot.loadFromData(*pByteArray, 0, 0);
+				pixScreenshot.loadFromData(*pByteArray, nullptr, nullptr);
 
 			if(szThemeName.isEmpty() || szThemeVersion.isEmpty() || szThemeSubdirectory.isEmpty() || szThemeEngineVersion.isEmpty())
 				bValid = false;
@@ -442,7 +442,7 @@ namespace ThemeFunctions
 		if(!out.isNull())
 		{
 			QByteArray * pba = new QByteArray();
-			QBuffer buffer(pba, 0);
+			QBuffer buffer(pba, nullptr);
 			buffer.open(QIODevice::WriteOnly);
 			out.save(&buffer, "PNG");
 			buffer.close();
@@ -493,7 +493,7 @@ namespace ThemeFunctions
 				szTmp = QString("Theme%1Screenshot").arg(iIdx);
 				QByteArray * pba = new QByteArray();
 
-				QBuffer bufferz(pba, 0);
+				QBuffer bufferz(pba, nullptr);
 				bufferz.open(QIODevice::WriteOnly);
 				pixScreenshot.save(&bufferz, "PNG");
 				bufferz.close();
diff --git a/src/modules/theme/ThemeManagementDialog.cpp b/src/modules/theme/ThemeManagementDialog.cpp
index 1358961b6..14e36ba28 100644
--- a/src/modules/theme/ThemeManagementDialog.cpp
+++ b/src/modules/theme/ThemeManagementDialog.cpp
@@ -109,14 +109,14 @@ ThemeListWidgetItem::~ThemeListWidgetItem()
 	delete m_pThemeInfo;
 }
 
-ThemeManagementDialog * ThemeManagementDialog::m_pInstance = 0;
+ThemeManagementDialog * ThemeManagementDialog::m_pInstance = nullptr;
 
 ThemeManagementDialog::ThemeManagementDialog(QWidget * parent)
     : QWidget(parent)
 {
-	m_pItemDelegate = NULL;
+	m_pItemDelegate = nullptr;
 #ifdef COMPILE_WEBKIT_SUPPORT
-	m_pWebThemeInterfaceDialog = NULL;
+	m_pWebThemeInterfaceDialog = nullptr;
 #endif
 	setObjectName("theme_options_widget");
 	setWindowTitle(__tr2qs_ctx("Manage Themes - KVIrc", "theme"));
@@ -252,12 +252,12 @@ ThemeManagementDialog::~ThemeManagementDialog()
 	if(m_pItemDelegate)
 		delete m_pItemDelegate;
 	g_rectManagementDialogGeometry = QRect(pos().x(), pos().y(), size().width(), size().height());
-	m_pInstance = 0;
+	m_pInstance = nullptr;
 #ifdef COMPILE_WEBKIT_SUPPORT
 	if(m_pWebThemeInterfaceDialog)
 	{
 		m_pWebThemeInterfaceDialog->deleteLater();
-		m_pWebThemeInterfaceDialog = NULL;
+		m_pWebThemeInterfaceDialog = nullptr;
 	}
 #endif //COMPILE_WEBKIT_SUPPORT
 }
@@ -265,7 +265,7 @@ ThemeManagementDialog::~ThemeManagementDialog()
 void ThemeManagementDialog::closeClicked()
 {
 	deleteLater();
-	m_pInstance = 0;
+	m_pInstance = nullptr;
 }
 
 void ThemeManagementDialog::display(bool bTopLevel)
@@ -276,7 +276,7 @@ void ThemeManagementDialog::display(bool bTopLevel)
 		{
 			if(m_pInstance->parent())
 			{
-				m_pInstance->setParent(0);
+				m_pInstance->setParent(nullptr);
 			}
 		}
 		else
@@ -291,7 +291,7 @@ void ThemeManagementDialog::display(bool bTopLevel)
 	{
 		if(bTopLevel)
 		{
-			m_pInstance = new ThemeManagementDialog(0);
+			m_pInstance = new ThemeManagementDialog(nullptr);
 		}
 		else
 		{
@@ -308,7 +308,7 @@ void ThemeManagementDialog::cleanup()
 	if(!m_pInstance)
 		return;
 	delete m_pInstance;
-	m_pInstance = 0;
+	m_pInstance = nullptr;
 }
 
 void ThemeManagementDialog::packTheme()
@@ -329,7 +329,7 @@ void ThemeManagementDialog::packTheme()
 void ThemeManagementDialog::contextMenuRequested(const QPoint & pos)
 {
 	ThemeListWidgetItem * pItem = dynamic_cast<ThemeListWidgetItem *>(m_pListWidget->itemAt(pos));
-	if(pItem != 0)
+	if(pItem != nullptr)
 	{
 		m_pListWidget->setCurrentItem(pItem);
 		m_pContextPopup->clear();
@@ -453,7 +453,7 @@ void ThemeManagementDialog::getMoreThemes()
 void ThemeManagementDialog::webThemeInterfaceDialogDestroyed()
 {
 #ifdef COMPILE_WEBKIT_SUPPORT
-	m_pWebThemeInterfaceDialog = NULL;
+	m_pWebThemeInterfaceDialog = nullptr;
 #endif
 	fillThemeBox();
 }
diff --git a/src/modules/theme/WebThemeInterfaceDialog.cpp b/src/modules/theme/WebThemeInterfaceDialog.cpp
index a1bf456f2..8e03fbf49 100644
--- a/src/modules/theme/WebThemeInterfaceDialog.cpp
+++ b/src/modules/theme/WebThemeInterfaceDialog.cpp
@@ -52,8 +52,7 @@ WebThemeInterfaceDialog::WebThemeInterfaceDialog(QWidget * par)
 	        .arg(QString::fromUtf8(KviLocale::instance()->localeName().ptr())));
 }
 WebThemeInterfaceDialog::~WebThemeInterfaceDialog()
-{
-}
+    = default;
 
 bool WebThemeInterfaceDialog::installPackage(const QString & szPath, QString & szError)
 {
diff --git a/src/modules/tip/libkvitip.cpp b/src/modules/tip/libkvitip.cpp
index d17c843a4..f913ca14d 100644
--- a/src/modules/tip/libkvitip.cpp
+++ b/src/modules/tip/libkvitip.cpp
@@ -37,7 +37,7 @@
 #include <QDesktopWidget>
 #include <QCloseEvent>
 
-TipWindow * g_pTipWindow = 0;
+TipWindow * g_pTipWindow = nullptr;
 
 TipFrame::TipFrame(QWidget * par)
     : QFrame(par)
@@ -62,7 +62,7 @@ TipFrame::TipFrame(QWidget * par)
 
 TipFrame::~TipFrame()
 {
-	g_pTipWindow = 0;
+	g_pTipWindow = nullptr;
 }
 
 void TipFrame::setText(const QString & text)
@@ -75,7 +75,7 @@ void TipFrame::setText(const QString & text)
 TipWindow::TipWindow()
 {
 	setObjectName("kvirc_tip_window");
-	m_pConfig = 0;
+	m_pConfig = nullptr;
 
 	m_pTipFrame = new TipFrame(this);
 	QPushButton * pb = new QPushButton("<<", this);
@@ -147,7 +147,7 @@ void TipWindow::closeConfig()
 	g_pApp->getLocalKvircDirectory(buffer, KviApplication::ConfigPlugins, m_szConfigFileName);
 	m_pConfig->setSavePath(buffer);
 	delete m_pConfig;
-	m_pConfig = 0;
+	m_pConfig = nullptr;
 }
 
 void TipWindow::nextTip()
@@ -277,7 +277,7 @@ static bool tip_module_cleanup(KviModule *)
 
 static bool tip_module_can_unload(KviModule *)
 {
-	return (g_pTipWindow == 0);
+	return (g_pTipWindow == nullptr);
 }
 
 KVIRC_MODULE(
diff --git a/src/modules/toolbareditor/CustomizeToolBarsDialog.cpp b/src/modules/toolbareditor/CustomizeToolBarsDialog.cpp
index 0e9a7b93b..d7fac04f6 100644
--- a/src/modules/toolbareditor/CustomizeToolBarsDialog.cpp
+++ b/src/modules/toolbareditor/CustomizeToolBarsDialog.cpp
@@ -55,7 +55,7 @@
 #include <QDesktopWidget>
 #include <QMimeData>
 
-CustomizeToolBarsDialog * CustomizeToolBarsDialog::m_pInstance = 0;
+CustomizeToolBarsDialog * CustomizeToolBarsDialog::m_pInstance = nullptr;
 extern QRect g_rectToolBarEditorDialogGeometry;
 
 TrashcanLabel::TrashcanLabel(QWidget * p)
@@ -68,7 +68,7 @@ TrashcanLabel::TrashcanLabel(QWidget * p)
 	setAlignment(Qt::AlignCenter);
 	setMinimumSize(40, 40);
 	m_uFlashCount = 0;
-	m_pFlashTimer = 0;
+	m_pFlashTimer = nullptr;
 	m_clrOriginal = palette().color(backgroundRole());
 	setAutoFillBackground(true); //needed for flashing
 	connect(KviActionManager::instance(), SIGNAL(removeActionsHintRequest()), this, SLOT(flash()));
@@ -113,7 +113,7 @@ void TrashcanLabel::heartbeat()
 	{
 		m_pFlashTimer->stop();
 		delete m_pFlashTimer;
-		m_pFlashTimer = 0;
+		m_pFlashTimer = nullptr;
 	}
 }
 
@@ -204,8 +204,7 @@ CustomToolBarPropertiesDialog::CustomToolBarPropertiesDialog(QWidget * p, const
 }
 
 CustomToolBarPropertiesDialog::~CustomToolBarPropertiesDialog()
-{
-}
+    = default;
 
 void CustomToolBarPropertiesDialog::iconSelected(const QString & szIconId)
 {
@@ -363,7 +362,7 @@ CustomizeToolBarsDialog::~CustomizeToolBarsDialog()
 	g_rectToolBarEditorDialogGeometry = QRect(pos().x(), pos().y(), size().width(), size().height());
 
 	KviActionManager::instance()->customizeToolBarsDialogDestroyed();
-	m_pInstance = 0;
+	m_pInstance = nullptr;
 }
 
 void CustomizeToolBarsDialog::currentToolBarChanged()
@@ -543,7 +542,7 @@ void CustomizeToolBarsDialog::cleanup()
 	if(!m_pInstance)
 		return;
 	delete m_pInstance;
-	m_pInstance = 0;
+	m_pInstance = nullptr;
 }
 
 void CustomizeToolBarsDialog::display(bool bTopLevel)
@@ -554,7 +553,7 @@ void CustomizeToolBarsDialog::display(bool bTopLevel)
 		{
 			if(m_pInstance->parent())
 			{
-				m_pInstance->setParent(0);
+				m_pInstance->setParent(nullptr);
 			}
 		}
 		else
@@ -569,7 +568,7 @@ void CustomizeToolBarsDialog::display(bool bTopLevel)
 	{
 		if(bTopLevel)
 		{
-			m_pInstance = new CustomizeToolBarsDialog(0);
+			m_pInstance = new CustomizeToolBarsDialog(nullptr);
 		}
 		else
 		{
diff --git a/src/modules/torrent/StatusBarApplet.cpp b/src/modules/torrent/StatusBarApplet.cpp
index 9bedd257c..908a75f19 100644
--- a/src/modules/torrent/StatusBarApplet.cpp
+++ b/src/modules/torrent/StatusBarApplet.cpp
@@ -45,8 +45,7 @@ StatusBarApplet::StatusBarApplet(KviStatusBar * parent, KviStatusBarAppletDescri
 }
 
 StatusBarApplet::~StatusBarApplet()
-{
-}
+    = default;
 
 static KviStatusBarApplet * CreateTorrentClientApplet(KviStatusBar * bar, KviStatusBarAppletDescriptor * desc)
 {
diff --git a/src/modules/torrent/TorrentInterface.cpp b/src/modules/torrent/TorrentInterface.cpp
index 4752ca9c0..ba6f053a2 100644
--- a/src/modules/torrent/TorrentInterface.cpp
+++ b/src/modules/torrent/TorrentInterface.cpp
@@ -28,4 +28,4 @@
 
 #include "KviLocale.h"
 
-TorrentInterface * TorrentInterface::m_selected = 0;
+TorrentInterface * TorrentInterface::m_selected = nullptr;
diff --git a/src/modules/torrent/libkvitorrent.cpp b/src/modules/torrent/libkvitorrent.cpp
index 46365584e..7b1dca983 100644
--- a/src/modules/torrent/libkvitorrent.cpp
+++ b/src/modules/torrent/libkvitorrent.cpp
@@ -32,16 +32,16 @@
 #include "KviLocale.h"
 #include "kvi_out.h"
 
-static KviPointerList<TorrentInterfaceDescriptor> * g_pDescriptorList = 0;
+static KviPointerList<TorrentInterfaceDescriptor> * g_pDescriptorList = nullptr;
 
-static TorrentInterface * auto_detect_torrent_client(KviWindow * pOut = 0)
+static TorrentInterface * auto_detect_torrent_client(KviWindow * pOut = nullptr)
 {
 	int iBest = 0;
-	TorrentInterface * pBest = 0;
+	TorrentInterface * pBest = nullptr;
 	TorrentInterfaceDescriptor * d;
-	TorrentInterfaceDescriptor * pDBest = 0;
+	TorrentInterfaceDescriptor * pDBest = nullptr;
 
-	for(d = g_pDescriptorList->first(); d != 0; d = g_pDescriptorList->next())
+	for(d = g_pDescriptorList->first(); d != nullptr; d = g_pDescriptorList->next())
 	{
 		// instance gets deleted by descriptor later
 		TorrentInterface * i = d->instance();
@@ -296,7 +296,7 @@ static TorrentInterface * auto_detect_torrent_client(KviWindow * pOut = 0)
 
 TC_KVS_COMMAND(detect)
 {
-	TorrentInterface::select(auto_detect_torrent_client(c->hasSwitch('q', "quiet") ? 0 : c->window()));
+	TorrentInterface::select(auto_detect_torrent_client(c->hasSwitch('q', "quiet") ? nullptr : c->window()));
 	return true;
 }
 
@@ -873,7 +873,7 @@ static bool torrent_module_init(KviModule * m)
 	g_pDescriptorList->append(new KTorrentDbusInterfaceDescriptor);
 #endif // COMPILE_KDE_SUPPORT
 
-	TorrentInterface::select(0);
+	TorrentInterface::select(nullptr);
 
 	if(g_pMainWindow->mainStatusBar())
 		StatusBarApplet::selfRegister(g_pMainWindow->mainStatusBar());
diff --git a/src/modules/trayicon/libkvitrayicon.cpp b/src/modules/trayicon/libkvitrayicon.cpp
index f08cb0a5d..b9b2b77f1 100644
--- a/src/modules/trayicon/libkvitrayicon.cpp
+++ b/src/modules/trayicon/libkvitrayicon.cpp
@@ -71,7 +71,7 @@ KviTrayIconWidget::KviTrayIconWidget()
     : QSystemTrayIcon(g_pMainWindow), m_CurrentPixmap(ICON_SIZE, ICON_SIZE), m_Tip(g_pMainWindow, "dock_tooltip")
 {
 	g_pTrayIcon = this;
-	m_pContextPopup = new QMenu(0);
+	m_pContextPopup = new QMenu(nullptr);
 	setContextMenu(m_pContextPopup);
 
 	m_iConsoles = 0;
@@ -87,7 +87,7 @@ KviTrayIconWidget::KviTrayIconWidget()
 
 	g_pMainWindow->setTrayIcon(this);
 
-	m_pAwayPopup = new QMenu(0);
+	m_pAwayPopup = new QMenu(nullptr);
 
 #ifndef COMPILE_ON_MAC
 	m_pTitleLabel = new QLabel(__tr2qs("<b><center>KVIrc Tray Options</center></b>"), m_pContextPopup);
@@ -128,7 +128,7 @@ KviTrayIconWidget::KviTrayIconWidget()
 KviTrayIconWidget::~KviTrayIconWidget()
 {
 	g_pTrayIcon = nullptr;
-	g_pMainWindow->setTrayIcon(0);
+	g_pMainWindow->setTrayIcon(nullptr);
 	delete m_pAwayPopup;
 #ifndef COMPILE_ON_MAC
 	delete m_pTitleLabel;
@@ -238,7 +238,7 @@ bool KviTrayIconWidget::event(QEvent * e)
 			}
 		}
 
-		srand(time(0));
+		srand(time(nullptr));
 
 		// We use the bad way to generate random numbers :)))))
 
diff --git a/src/modules/upnp/Manager.cpp b/src/modules/upnp/Manager.cpp
index db3e8d503..12b828edd 100644
--- a/src/modules/upnp/Manager.cpp
+++ b/src/modules/upnp/Manager.cpp
@@ -43,11 +43,11 @@ namespace UPnP
 {
 
 	// Set the static variable
-	Manager * Manager::m_pInstance(0);
+	Manager * Manager::m_pInstance(nullptr);
 
 	// The constructor
 	Manager::Manager()
-	    : m_pActiveIgdControlPoint(0), m_bBroadcastFailed(false), m_bBroadcastFoundIt(false), m_pSsdpConnection(0), m_pSsdpTimer(0)
+	    : m_pActiveIgdControlPoint(nullptr), m_bBroadcastFailed(false), m_bBroadcastFoundIt(false), m_pSsdpConnection(nullptr), m_pSsdpTimer(nullptr)
 	{
 	}
 
@@ -56,7 +56,7 @@ namespace UPnP
 	{
 		delete m_pSsdpTimer;
 		delete m_pSsdpConnection;
-		m_pInstance = 0; // Unregister the instance
+		m_pInstance = nullptr; // Unregister the instance
 	}
 
 	// Initialize the manager, detect all devices
@@ -85,7 +85,7 @@ namespace UPnP
 	Manager * Manager::instance()
 	{
 		// Create when it's required
-		if(m_pInstance == 0)
+		if(m_pInstance == nullptr)
 		{
 			m_pInstance = new Manager();
 			m_pInstance->initialize();
@@ -98,26 +98,26 @@ namespace UPnP
 	QString Manager::getExternalIpAddress() const
 	{
 		// Do not expose activeIgd_;
-		return (m_pActiveIgdControlPoint != 0 ? m_pActiveIgdControlPoint->getExternalIpAddress() : QString());
+		return (m_pActiveIgdControlPoint != nullptr ? m_pActiveIgdControlPoint->getExternalIpAddress() : QString());
 	}
 
 	// Return true if a controlable gateway is available
 	bool Manager::isGatewayAvailable()
 	{
-		return (m_pActiveIgdControlPoint != 0 && m_pActiveIgdControlPoint->isGatewayAvailable());
+		return (m_pActiveIgdControlPoint != nullptr && m_pActiveIgdControlPoint->isGatewayAvailable());
 	}
 
 	// Add a port mapping
 	void Manager::addPortMapping(const QString & protocol, const QString & remoteHost, int externalPort, const QString & internalClient, int internalPort, const QString & description, bool enabled, int leaseDuration)
 	{
-		if(m_pActiveIgdControlPoint != 0)
+		if(m_pActiveIgdControlPoint != nullptr)
 			m_pActiveIgdControlPoint->addPortMapping(protocol, remoteHost, externalPort, internalClient, internalPort, description, enabled, leaseDuration);
 	}
 
 	// Delete a port mapping
 	void Manager::deletePortMapping(const QString & protocol, const QString & remoteHost, int externalPort)
 	{
-		if(m_pActiveIgdControlPoint != 0)
+		if(m_pActiveIgdControlPoint != nullptr)
 			m_pActiveIgdControlPoint->deletePortMapping(protocol, remoteHost, externalPort);
 	}
 
@@ -143,7 +143,7 @@ namespace UPnP
 		IgdControlPoint * controlPoint = new IgdControlPoint(hostname, port, rootUrl);
 		m_lIgdControlPoints.append(controlPoint);
 
-		if(m_pActiveIgdControlPoint == 0)
+		if(m_pActiveIgdControlPoint == nullptr)
 		{
 			m_pActiveIgdControlPoint = controlPoint;
 			m_pActiveIgdControlPoint->initialize();
diff --git a/src/modules/upnp/RootService.cpp b/src/modules/upnp/RootService.cpp
index 81cd7b23a..901599bc5 100644
--- a/src/modules/upnp/RootService.cpp
+++ b/src/modules/upnp/RootService.cpp
@@ -145,8 +145,7 @@ namespace UPnP
 
 	// The destructor
 	RootService::~RootService()
-	{
-	}
+	    = default;
 
 	// Recursively add all devices and embedded devices to the deviceServices_ map
 	void RootService::addDeviceServices(const QDomNode & device)
diff --git a/src/modules/upnp/Service.cpp b/src/modules/upnp/Service.cpp
index e0547bfc2..872393874 100644
--- a/src/modules/upnp/Service.cpp
+++ b/src/modules/upnp/Service.cpp
@@ -73,7 +73,7 @@ namespace UPnP
 	// TODO: rename to callMethod / callSoapMethod
 	int Service::callAction(const QString & actionName, const QString & prefix)
 	{
-		return callActionInternal(actionName, 0, prefix);
+		return callActionInternal(actionName, nullptr, prefix);
 	}
 
 	// Makes a UPnP action request
@@ -112,7 +112,7 @@ namespace UPnP
 		    + prefix + ":" + actionName + " xmlns:" + prefix + "=\"" + m_szServiceType + "\">\n";
 
 		// Do we have any arguments?
-		if(arguments != 0)
+		if(arguments != nullptr)
 		{
 			// Add the arguments
 			QMap<QString, QString>::const_iterator it;
@@ -233,7 +233,8 @@ namespace UPnP
 		QByteArray response = reply->readAll();
 		QDomDocument xml;
 
-		qDebug() << "Response:\n" << response << "\n---\n";
+		qDebug() << "Response:\n"
+		         << response << "\n---\n";
 
 		// Parse the XML
 		QString errorMessage;
diff --git a/src/modules/upnp/SsdpConnection.cpp b/src/modules/upnp/SsdpConnection.cpp
index 11a316ce6..adfa21ace 100644
--- a/src/modules/upnp/SsdpConnection.cpp
+++ b/src/modules/upnp/SsdpConnection.cpp
@@ -52,7 +52,7 @@ namespace UPnP
 
 	SsdpConnection::~SsdpConnection()
 	{
-		if(m_pSocket != 0)
+		if(m_pSocket != nullptr)
 		{
 			m_pSocket->close();
 			delete m_pSocket;
diff --git a/src/modules/upnp/WanConnectionService.cpp b/src/modules/upnp/WanConnectionService.cpp
index 8fa5f1753..efbe87b73 100644
--- a/src/modules/upnp/WanConnectionService.cpp
+++ b/src/modules/upnp/WanConnectionService.cpp
@@ -45,8 +45,7 @@ namespace UPnP
 
 	// The destructor
 	WanConnectionService::~WanConnectionService()
-	{
-	}
+	    = default;
 
 	// Add a port mapping
 	void WanConnectionService::addPortMapping(const QString & protocol, const QString & remoteHost, int externalPort,
diff --git a/src/modules/upnp/igdcontrolpoint.cpp b/src/modules/upnp/igdcontrolpoint.cpp
index 686d576ca..0c2adce1e 100644
--- a/src/modules/upnp/igdcontrolpoint.cpp
+++ b/src/modules/upnp/igdcontrolpoint.cpp
@@ -46,7 +46,7 @@ namespace UPnP
 
 	// The constructor
 	IgdControlPoint::IgdControlPoint(const QString & hostname, int port, const QString & rootUrl)
-	    : QObject(), m_bGatewayAvailable(false), m_iIgdPort(0), m_pRootService(0), m_pWanConnectionService(0)
+	    : QObject(), m_bGatewayAvailable(false), m_iIgdPort(0), m_pRootService(nullptr), m_pWanConnectionService(nullptr)
 	{
 		qDebug() << "CREATED UPnP::IgdControlPoint: created control point"
 		         << " url='" << hostname << ":" << port << "/" << rootUrl << "'." << endl;
@@ -75,7 +75,7 @@ namespace UPnP
 	QString IgdControlPoint::getExternalIpAddress() const
 	{
 		// Do not expose  wanConnectionService_;
-		if(m_pWanConnectionService != 0)
+		if(m_pWanConnectionService != nullptr)
 		{
 			return m_pWanConnectionService->getExternalIpAddress();
 		}
@@ -145,7 +145,7 @@ namespace UPnP
 	void IgdControlPoint::addPortMapping(const QString & protocol, const QString & remoteHost, int externalPort, const QString & internalClient, int internalPort, const QString & description, bool enabled, int leaseDuration)
 	{
 		// Do not expose  wanConnectionService_;
-		if(m_pWanConnectionService != 0)
+		if(m_pWanConnectionService != nullptr)
 		{
 			m_pWanConnectionService->addPortMapping(protocol, remoteHost, externalPort, internalClient, internalPort, description, enabled, leaseDuration);
 		}
@@ -155,7 +155,7 @@ namespace UPnP
 	void IgdControlPoint::deletePortMapping(const QString & protocol, const QString & remoteHost, int externalPort)
 	{
 		// Do not expose  wanConnectionService_;
-		if(m_pWanConnectionService != 0)
+		if(m_pWanConnectionService != nullptr)
 		{
 			m_pWanConnectionService->deletePortMapping(protocol, remoteHost, externalPort);
 		}
diff --git a/src/modules/upnp/libkviupnp.cpp b/src/modules/upnp/libkviupnp.cpp
index 880b1b70c..58eae67d3 100644
--- a/src/modules/upnp/libkviupnp.cpp
+++ b/src/modules/upnp/libkviupnp.cpp
@@ -31,7 +31,7 @@
 
 // Please use our common variable naming conventions and coding style :)
 // Let's be so:)
-UPnP::Manager * g_pManager = 0;
+UPnP::Manager * g_pManager = nullptr;
 
 /*
 	@doc: upnp.getExternalIpAddress
@@ -179,7 +179,7 @@ static bool upnp_kvs_cmd_refresh(KviKvsModuleCommandCall *)
 {
 	if(g_pManager)
 		delete g_pManager;
-	g_pManager = 0;
+	g_pManager = nullptr;
 
 	g_pManager = UPnP::Manager::instance();
 
@@ -190,7 +190,7 @@ static bool upnp_module_init(KviModule * m)
 {
 	if(g_pManager)
 		delete g_pManager;
-	g_pManager = 0;
+	g_pManager = nullptr;
 
 	g_pManager = UPnP::Manager::instance();
 
@@ -206,7 +206,7 @@ static bool upnp_module_init(KviModule * m)
 static bool upnp_module_cleanup(KviModule *)
 {
 	delete g_pManager;
-	g_pManager = 0;
+	g_pManager = nullptr;
 	return true;
 }
 
diff --git a/src/modules/url/libkviurl.cpp b/src/modules/url/libkviurl.cpp
index 25eff493d..1fb53202a 100644
--- a/src/modules/url/libkviurl.cpp
+++ b/src/modules/url/libkviurl.cpp
@@ -245,7 +245,7 @@ void UrlDialog::remove()
 {
 	if(!m_pUrlList->currentItem())
 	{
-		QMessageBox::warning(0, __tr2qs("Entry Selection - KVIrc"), __tr2qs("Must select a URL entry from the list to remove it."), QMessageBox::Ok, QMessageBox::NoButton, QMessageBox::NoButton);
+		QMessageBox::warning(nullptr, __tr2qs("Entry Selection - KVIrc"), __tr2qs("Must select a URL entry from the list to remove it."), QMessageBox::Ok, QMessageBox::NoButton, QMessageBox::NoButton);
 		return;
 	}
 
@@ -299,11 +299,11 @@ void UrlDialog::dblclk_url(QTreeWidgetItem * item, int)
 void UrlDialog::popup(QTreeWidgetItem * item, const QPoint & point)
 {
 	m_szUrl = item->text(0);
-	QMenu p("menu", 0);
+	QMenu p("menu", nullptr);
 	p.addAction(__tr2qs("&Remove"), this, SLOT(remove()));
 	// 	p.addAction(__tr2qs("&Find Text"),this,SLOT(findtext()));
 	p.addSeparator();
-	m_pListPopup = new QMenu("list", 0);
+	m_pListPopup = new QMenu("list", nullptr);
 
 	for(KviWindow * w = g_pMainWindow->windowList()->first(); w; w = g_pMainWindow->windowList()->next())
 	{
@@ -319,7 +319,7 @@ void UrlDialog::popup(QTreeWidgetItem * item, const QPoint & point)
 
 void UrlDialog::contextMenu(const QPoint & point)
 {
-	QMenu p("contextmenu", 0);
+	QMenu p("contextmenu", nullptr);
 	p.addAction(__tr2qs("Configure"), this, SLOT(config()));
 	p.exec(point);
 }
@@ -339,7 +339,7 @@ void UrlDialog::sayToWin(QAction * act)
 	}
 	else
 	{
-		QMessageBox::warning(0, __tr2qs("Window Not Found - KVIrc"), __tr2qs("Window not found."), QMessageBox::Ok, QMessageBox::NoButton, QMessageBox::NoButton);
+		QMessageBox::warning(nullptr, __tr2qs("Window Not Found - KVIrc"), __tr2qs("Window not found."), QMessageBox::Ok, QMessageBox::NoButton, QMessageBox::NoButton);
 	}
 }
 
@@ -394,7 +394,7 @@ UrlDialog::~UrlDialog()
 	if (m_pMenuBar) delete m_pMenuBar;
 	m_pMenuBar = 0;*/
 	UrlDlgList * tmpitem = findFrame();
-	tmpitem->dlg = 0;
+	tmpitem->dlg = nullptr;
 }
 
 // ----------------------------- CLASS URLDIALOG -------------------------end //
@@ -469,9 +469,9 @@ void ConfigDialog::closeEvent(QCloseEvent *)
 
 ConfigDialog::~ConfigDialog()
 {
-	for(int i = 0; i < cbnum; i++)
-		delete cb[i];
-	g_pConfigDialog = 0;
+	for(auto & i : cb)
+		delete i;
+	g_pConfigDialog = nullptr;
 }
 
 // --------------------------- CLASS CONFIGDIALOG ------------------------end //
@@ -540,7 +540,7 @@ void BanFrame::removeBan()
 
 	if(!m_pBanList->currentItem()->isSelected())
 	{
-		QMessageBox::warning(0, __tr2qs("Entry Selection - KVIrc"), __tr2qs("Must select a ban entry from the list to remove it."), QMessageBox::Ok, QMessageBox::NoButton, QMessageBox::NoButton);
+		QMessageBox::warning(nullptr, __tr2qs("Entry Selection - KVIrc"), __tr2qs("Must select a ban entry from the list to remove it."), QMessageBox::Ok, QMessageBox::NoButton, QMessageBox::NoButton);
 		return;
 	}
 	QString item(m_pBanList->currentItem()->text());
@@ -565,8 +565,7 @@ void BanFrame::saveBans(KviConfigurationFile * cfg)
 }
 
 BanFrame::~BanFrame()
-{
-}
+    = default;
 
 // ---------------------------- CLASS URLTOOLBAR -------------------------end //
 
@@ -735,7 +734,7 @@ UrlDlgList * findFrame()
 	if(!tmpitem)
 	{
 		UrlDlgList * udl = new UrlDlgList();
-		udl->dlg = 0;
+		udl->dlg = nullptr;
 		udl->menu_id = -1;
 		g_pUrlDlgList->append(udl);
 		tmpitem = g_pUrlDlgList->current();
@@ -887,7 +886,7 @@ static bool url_module_init(KviModule * m)
 	loadBanList();
 
 	UrlDlgList * udl = new UrlDlgList();
-	udl->dlg = 0;
+	udl->dlg = nullptr;
 	g_pUrlDlgList->append(udl);
 
 	return true;
@@ -906,12 +905,12 @@ static bool url_module_cleanup(KviModule *)
 	}
 
 	delete g_pList;
-	g_pList = 0;
+	g_pList = nullptr;
 	delete g_pBanList;
-	g_pBanList = 0;
+	g_pBanList = nullptr;
 
 	delete g_pUrlDlgList;
-	g_pUrlDlgList = 0;
+	g_pUrlDlgList = nullptr;
 
 	return true;
 }
diff --git a/src/modules/window/UserWindow.cpp b/src/modules/window/UserWindow.cpp
index ccb607f44..742b846f4 100644
--- a/src/modules/window/UserWindow.cpp
+++ b/src/modules/window/UserWindow.cpp
@@ -43,9 +43,9 @@ UserWindow::UserWindow(const char * pcName, QString & szIcon, KviConsoleWindow *
 	m_pIrcView = new KviIrcView(this, this);
 
 	if(iCreationFlags & HasInput)
-		m_pInput = new KviInput(this, 0);
+		m_pInput = new KviInput(this, nullptr);
 	else
-		m_pInput = 0;
+		m_pInput = nullptr;
 
 	if(context())
 		context()->registerContextWindow(this);
diff --git a/src/modules/window/libkviwindow.cpp b/src/modules/window/libkviwindow.cpp
index 092c7ba34..005d0dcaf 100644
--- a/src/modules/window/libkviwindow.cpp
+++ b/src/modules/window/libkviwindow.cpp
@@ -52,7 +52,7 @@ extern KVIRC_API KviCryptEngineManager * g_pCryptEngineManager;
 
 // KviApplication.cpp
 extern KVIRC_API KviPointerHashTable<QString, KviWindow> * g_pGlobalWindowDict;
-KviPointerList<UserWindow> * g_pUserWindowList = 0;
+KviPointerList<UserWindow> * g_pUserWindowList = nullptr;
 
 // $window.caption $window.x $window.y $window.width $window.height $window.isActive $window.type
 // $window.input.text $window.input.cursorpos $window.input.textlen
@@ -1039,7 +1039,7 @@ static bool window_kvs_fnc_open(KviKvsModuleFunctionCall * c)
 	if(szFlags.contains('i'))
 		iFlags |= UserWindow::HasInput;
 
-	KviConsoleWindow * pConsole = 0;
+	KviConsoleWindow * pConsole = nullptr;
 	if(c->parameterList()->count() >= 3)
 	{
 		pConsole = g_pApp->findConsole(uCtx);
@@ -1325,7 +1325,7 @@ static bool window_kvs_cmd_savePropertiesAsDefault(KviKvsModuleCommandCall * c)
 #ifdef COMPILE_CRYPT_SUPPORT
 static bool initializeCryptEngine(KviCryptEngine * eng, KviCString & szEncryptKey, KviCString & szDecryptKey, QString & szError)
 {
-	char * encKey = 0;
+	char * encKey = nullptr;
 	int encKeyLen = 0;
 
 	char * tmpKey;
@@ -1342,7 +1342,7 @@ static bool initializeCryptEngine(KviCryptEngine * eng, KviCString & szEncryptKe
 		return false;
 	}
 
-	char * decKey = 0;
+	char * decKey = nullptr;
 	int decKeyLen = 0;
 
 	decKeyLen = szDecryptKey.hexToBuffer(&tmpKey, false);
@@ -1437,7 +1437,7 @@ static bool window_kvs_cmd_setCryptEngine(KviKvsModuleCommandCall * c)
 
 	if(szEngine.isEmpty())
 	{
-		pWnd->setCryptSessionInfo(0);
+		pWnd->setCryptSessionInfo(nullptr);
 	}
 	else
 	{