cleanups: remove more dead code odd spaces

39 files changed, 112 insertions, 664 deletions

diff --git a/src/kvilib/ext/KviConfigurationFile.cpp b/src/kvilib/ext/KviConfigurationFile.cpp
index 02c42f813..2b7600e7c 100644
--- a/src/kvilib/ext/KviConfigurationFile.cpp
+++ b/src/kvilib/ext/KviConfigurationFile.cpp
@@ -96,7 +96,6 @@ void KviConfigurationFile::clearKey(const QString & szKey)
 bool KviConfigurationFile::load()
 {
 	// this is really faster than the old version :)
-
 	// open the file
 	KviFile f(m_szFileName);
 	if(!f.open(QFile::ReadOnly))
@@ -333,84 +332,6 @@ bool KviConfigurationFile::load()
 	return true;
 }
 
-/*
-
-bool KviConfigurationFile::load()
-{
-	QFile f(m_szFileName);
-	if(!f.open(IO_ReadOnly))return false;
-
-
-	KviConfigurationFileGroup * p_group = 0;
-
-	KviCString dataLine;
-	bool bContinue;
-
-	do {
-		bContinue = kvi_readLine(&f,dataLine);
-		dataLine.trimmed();
-		if(dataLine.hasData())
-		{
-			switch(*(dataLine.ptr()))
-			{
-				case '#':
-					// just skip it, it is a comment
-				break;
-				case '[':
-				{
-					//set the group
-					dataLine.cutLeft(1);
-					dataLine.cutRight(1);
-					dataLine.hexDecode();
-					if(dataLine.hasData())
-					{
-						QString szUtf8 = QString::fromUtf8(dataLine.ptr());
-						p_group = m_pDict->find(szUtf8);
-
-						if(!p_group)
-						{
-							p_group = new KviConfigurationFileGroup(17,false);
-							p_group->setAutoDelete(true);
-							m_pDict->insert(szUtf8,p_group);
-						}
-					}
-				}
-				break;
-				default:
-				{
-					//data entry...split in two...
-					KviCString name=dataLine.getToken('=');
-					name.stripRightWhiteSpace(); // strip any whitespace added externally
-					name.hexDecode();
-					if(name.hasData())
-					{
-						dataLine.stripLeftWhiteSpace(); // strip any whitespace added externally
-						dataLine.hexDecode();
-						//insert (replace items if needed)
-						QString *p_data=new QString(QString::fromUtf8(dataLine.ptr()));
-						if(!p_group)
-						{
-							// ops...we're missing a group
-							// use the default one
-							p_group = new KviConfigurationFileGroup(17,false);
-							p_group->setAutoDelete(true);
-							m_pDict->insert(KVI_CONFIG_DEFAULT_GROUP,p_group);
-						}
-						QString szName = QString::fromUtf8(name.ptr());
-						p_group->replace(szName,p_data);
-					}
-				}
-				break;
-			}
-		}
-	} while (bContinue);
-
-	f.close();
-	return true;
-}
-
-*/
-
 bool KviConfigurationFile::ensureWritable()
 {
 	if(m_bReadOnly)
@@ -869,30 +790,6 @@ unsigned short int KviConfigurationFile::readUShortEntry(const QString & szKey,
 	return bOk ? usVal : usDefault;
 }
 
-/*
-////////////////////////////////// unsigned long
-
-Unused code
-void KviConfigurationFile::writeEntry(const char *szKey,unsigned long lValue)
-{
-	m_bDirty = true;
-	KviCStringDict * p_group = getCurrentGroup();
-	KviCString *p_data = new KviCString();
-	p_data->setNum(lValue);
-	p_group->replace(szKey,p_data);
-}
-
-unsigned long KviConfigurationFile::readULongEntry(const char *szKey,unsigned long lDefault)
-{
-	KviCStringDict * p_group = getCurrentGroup();
-	KviCString * p_str = p_group->find(szKey);
-	if(!p_str)return lDefault;
-	bool bOk;
-	unsigned long lVal=p_str->toULong(&bOk);
-	return bOk ? lVal : lDefault;
-}
-*/
-
 ////////////////////////////////// int
 
 void KviConfigurationFile::writeEntry(const QString & szKey, int iValue)
diff --git a/src/kvilib/ext/KviNickColors.cpp b/src/kvilib/ext/KviNickColors.cpp
index c43749c7f..3a1b28c1d 100644
--- a/src/kvilib/ext/KviNickColors.cpp
+++ b/src/kvilib/ext/KviNickColors.cpp
@@ -101,7 +101,7 @@ namespace KviNickColors
 				if(!g_nickColors[i][numc] && !comb[numc])
 				{
 					//exact match
-					// 					qDebug("Exact match %s",g_nickColors[i]);
+					//qDebug("Exact match %s",g_nickColors[i]);
 					KviMemory::free(comb);
 					return i;
 				}
@@ -119,7 +119,7 @@ namespace KviNickColors
 		}
 		KviMemory::free(comb);
 		//no exact match
-		// 		qDebug("Best match %s",g_nickColors[iBestMatch]);
+		//qDebug("Best match %s",g_nickColors[iBestMatch]);
 		return iBestMatch;
 	}
 }
diff --git a/src/kvilib/ext/KviOggTheoraDecoder.cpp b/src/kvilib/ext/KviOggTheoraDecoder.cpp
index 8c28514de..9ba2abc35 100644
--- a/src/kvilib/ext/KviOggTheoraDecoder.cpp
+++ b/src/kvilib/ext/KviOggTheoraDecoder.cpp
@@ -47,7 +47,6 @@
 
 using namespace KviOggIrcText;
 
-//------------------------------------------------------------------------------
 #define OC_CLAMP255(_x) ((unsigned char)((((_x) < 0) - 1) & ((_x) | -((_x) > 255))))
 
 KviOggTheoraDecoder::KviOggTheoraDecoder(KviDataBuffer * videoSignal, KviDataBuffer * textSignal)
@@ -105,7 +104,7 @@ KviOggTheoraDecoder::~KviOggTheoraDecoder()
 
 void KviOggTheoraDecoder::addData(KviDataBuffer * stream)
 {
-	// 	qDebug("adddata signal %p stream size %d",m_pVideoSignal, stream->size() );
+	//qDebug("adddata signal %p stream size %d",m_pVideoSignal, stream->size() );
 	if(stream->size() == 0)
 		return;
 	/* Ogg file open; parse the headers */
@@ -126,7 +125,7 @@ void KviOggTheoraDecoder::addData(KviDataBuffer * stream)
 			if(!ogg_page_bos(&og))
 			{
 				/* don't leak the page; get it into the appropriate stream */
-				// 				qDebug("queue_page && return");
+				//qDebug("queue_page && return");
 				queue_page(&og);
 				stateflag = 1;
 				return;
@@ -153,7 +152,7 @@ void KviOggTheoraDecoder::addData(KviDataBuffer * stream)
 			}
 			else
 			{
-				// 				qDebug("is other");
+				//qDebug("is other");
 				/* whatever it is, we don't care about it */
 				ogg_stream_clear(&test);
 			}
@@ -161,7 +160,7 @@ void KviOggTheoraDecoder::addData(KviDataBuffer * stream)
 		/* fall through to non-bos page parsing */
 	}
 
-	// 	qDebug("checkpoint 2, theora_p=%d ",theora_p);
+	//qDebug("checkpoint 2, theora_p=%d ",theora_p);
 	/* we're expecting more header packets. */
 	if((theora_p && theora_p < 3))
 	{
@@ -198,7 +197,7 @@ void KviOggTheoraDecoder::addData(KviDataBuffer * stream)
 		}
 	}
 
-	// 	qDebug("checkpoint 3");
+	//qDebug("checkpoint 3");
 	/* and now we have it all.  initialize decoders */
 	if(theora_p && !thda)
 	{
@@ -271,7 +270,7 @@ void KviOggTheoraDecoder::addData(KviDataBuffer * stream)
 			while(ogg_sync_pageout(&oy, &og) > 0)
 				queue_page(&og);
 		}
-		// 		qDebug("loop4 theora_p=%d videobuf_ready=%d",theora_p, videobuf_ready);
+		//qDebug("loop4 theora_p=%d videobuf_ready=%d",theora_p, videobuf_ready);
 		// theora is one in, one out...
 
 		if(ogg_stream_packetout(&to, &op) > 0)
@@ -281,7 +280,7 @@ void KviOggTheoraDecoder::addData(KviDataBuffer * stream)
 		}
 		else
 		{
-			// 			qDebug("ogg_stream_packetout <=0");
+			//qDebug("ogg_stream_packetout <=0");
 			//need more data :)
 			return;
 		}
@@ -303,7 +302,7 @@ void KviOggTheoraDecoder::addData(KviDataBuffer * stream)
 
 /* helper: push a page into the appropriate steam */
 /* this can be done blindly; a stream won't accept a page
-                that doesn't belong to it */
+   that doesn't belong to it */
 int KviOggTheoraDecoder::queue_page(ogg_page * page)
 {
 	if(theora_p)
@@ -343,7 +342,7 @@ void KviOggTheoraDecoder::video_write(void)
 
 	int size = sizeof(char) * geometry.pic_w * geometry.pic_h * ARGB32_BPP;
 
-	// 	qDebug("VIDEO WRITE size=%d",size);
+	//qDebug("VIDEO WRITE size=%d",size);
 	m_pVideoSignal->clear();
 	m_pVideoSignal->append(RGBbuffer, size);
 }
diff --git a/src/kvilib/ext/KviOggTheoraEncoder.cpp b/src/kvilib/ext/KviOggTheoraEncoder.cpp
index 27f613200..85038890b 100644
--- a/src/kvilib/ext/KviOggTheoraEncoder.cpp
+++ b/src/kvilib/ext/KviOggTheoraEncoder.cpp
@@ -212,7 +212,6 @@ KviOggTheoraEncoder::~KviOggTheoraEncoder()
 	th_encode_free(td);
 
 	// clear out state
-
 	ogg_stream_clear(&to);
 	th_comment_clear(&tc);
 
@@ -231,7 +230,7 @@ void KviOggTheoraEncoder::addVideoFrame(QRgb * rgb32, int)
 		videoYuv = new quint8[geometry.pic_w * geometry.pic_h * YUV444_BPP];
 
 	rgb32toyuv444(rgb32, videoYuv, geometry.pic_w, geometry.pic_h);
-	//	qDebug("addFrame p%p size%d yuv%p",rgb32,videoSize,videoYuv);
+	//qDebug("addFrame p%p size%d yuv%p",rgb32,videoSize,videoYuv);
 
 	ogg_page videopage;
 
@@ -263,7 +262,6 @@ void KviOggTheoraEncoder::addTextFrame(unsigned char * textPkt, int textSize)
 	ogg_stream_pageout(&zo, &textpage);
 
 	// no pages?  Must be end of stream.
-	// 	if(!textflag) return;
 
 	m_pStream->append(textpage.header, textpage.header_len);
 	m_pStream->append(textpage.body, textpage.body_len);
diff --git a/src/kvilib/ext/KviParameterList.cpp b/src/kvilib/ext/KviParameterList.cpp
index 03c73e419..8800ecc2d 100644
--- a/src/kvilib/ext/KviParameterList.cpp
+++ b/src/kvilib/ext/KviParameterList.cpp
@@ -246,18 +246,3 @@ QSize KviParameterList::getSize(bool * bOk)
 		*bOk = true;
 	return QSize(val[0], val[1]);
 }
-
-//#ifdef COMPILE_ON_WINDOWS
-//
-//	#include "KviMemory.h"
-//
-//	void * KviParameterList::operator new(size_t tSize)
-//	{
-//		return KviMemory::allocate(tSize);
-//	}
-//
-//	void KviParameterList::operator delete(void * p)
-//	{
-//		KviMemory::free(p);
-//	}
-//#endif
diff --git a/src/kvilib/ext/KviRegisteredUser.cpp b/src/kvilib/ext/KviRegisteredUser.cpp
index 6cffad003..176abd604 100644
--- a/src/kvilib/ext/KviRegisteredUser.cpp
+++ b/src/kvilib/ext/KviRegisteredUser.cpp
@@ -185,9 +185,6 @@ bool KviRegisteredUser::getBoolProperty(const QString & name, bool def)
 			return true;
 		if(KviQString::equalCI(*pValue, "yes"))
 			return true;
-		//if(KviQString::equalCI(*pValue,"yeah"))return true;
-		//if(KviQString::equalCI(*pValue,"sure"))return true;
-		//if(KviQString::equalCI(*pValue,"sureashell"))return true;
 	}
 	return def;
 }
diff --git a/src/kvilib/ext/KviRegisteredUserDataBase.cpp b/src/kvilib/ext/KviRegisteredUserDataBase.cpp
index 534907ce8..90ddba217 100644
--- a/src/kvilib/ext/KviRegisteredUserDataBase.cpp
+++ b/src/kvilib/ext/KviRegisteredUserDataBase.cpp
@@ -399,26 +399,6 @@ bool KviRegisteredUserDataBase::removeMaskByPointer(KviIrcMask * mask)
 	return false;
 }
 
-/*
-KviRegisteredUser * KviRegisteredUserDataBase::findMatchingUser(const KviIrcMask &mask)
-{
-	// first lookup the nickname in the maskDict
-	KviRegisteredUserMaskList * l = m_pMaskDict->find(mask.nick());
-	if(l)
-	{
-		for(KviRegisteredUserMask *m = l->first();m;m = l->next())
-		{
-			if(m->mask()->matchesFixed(0,mask.user(),mask.host()))return m->user();
-		}
-	}
-	// not found....lookup the wild ones
-	for(KviRegisteredUserMask * m = m_pWildMaskList->first();m;m = m_pWildMaskList->next())
-	{
-		if(m->mask()->matchesFixed(mask))return m->user();
-	}
-	return 0; // no match at all
-}
-*/
 KviRegisteredUser * KviRegisteredUserDataBase::findMatchingUser(const QString & nick, const QString & user, const QString & host)
 {
 	KviRegisteredUserMask * m = findMatchingMask(nick, user, host);
@@ -480,14 +460,7 @@ KviRegisteredUserMask * KviRegisteredUserDataBase::findExactMask(const KviIrcMas
 	}
 	return nullptr; // no match at all
 }
-/*
-bool KviRegisteredUserDataBase::isIgnoredUser(const QString & nick,const QString & user,const QString & host)
-{
-	KviRegisteredUser * u = findMatchingUser(nick,user,host);
-	if(u)return u->getBoolProperty("IGNORE");
-	else return false;
-}
-*/
+
 void KviRegisteredUserDataBase::load(const QString & filename)
 {
 	QString szCurrent;
diff --git a/src/kvilib/ext/KviRuntimeInfo.cpp b/src/kvilib/ext/KviRuntimeInfo.cpp
index 41838c04e..03c91eb86 100644
--- a/src/kvilib/ext/KviRuntimeInfo.cpp
+++ b/src/kvilib/ext/KviRuntimeInfo.cpp
@@ -574,7 +574,6 @@ static QString queryWinInfo(QueryInfo info)
 									szVersion += "Professional ";
 							}
 						}
-
 						// Test for the server type.
 						else if(osvi.wProductType == VER_NT_SERVER || osvi.wProductType == VER_NT_DOMAIN_CONTROLLER)
 						{
@@ -597,7 +596,6 @@ static QString queryWinInfo(QueryInfo info)
 									else
 										szVersion += "Standard x64 Edition ";
 								}
-
 								else
 								{
 									if(osvi.wSuiteMask & VER_SUITE_DATACENTER)
diff --git a/src/kvilib/ext/KviSharedFilesManager.cpp b/src/kvilib/ext/KviSharedFilesManager.cpp
index 5c070b529..f0c33b8ad 100644
--- a/src/kvilib/ext/KviSharedFilesManager.cpp
+++ b/src/kvilib/ext/KviSharedFilesManager.cpp
@@ -99,7 +99,6 @@ void KviSharedFilesManager::cleanup()
 	time_t curTime = time(nullptr);
 
 	bool bOtherStuffToCleanup = false;
-	//bool bChanged = false;
 
 	KviPointerList<QString> lDying;
 	lDying.setAutoDelete(true);
@@ -115,7 +114,6 @@ void KviSharedFilesManager::cleanup()
 				if(((int)o->expireTime()) <= ((int)curTime))
 				{
 					tmp.append(o);
-					//bChanged = true;
 				}
 				else
 				{
@@ -139,7 +137,6 @@ void KviSharedFilesManager::cleanup()
 
 	if(!bOtherStuffToCleanup)
 		m_pCleanupTimer->stop();
-	//if(bChanged)emit sharedFilesChanged();
 }
 
 void KviSharedFilesManager::clear()
diff --git a/src/kvilib/file/KviFileUtils.cpp b/src/kvilib/file/KviFileUtils.cpp
index ed1fef7f1..fecbe0b64 100644
--- a/src/kvilib/file/KviFileUtils.cpp
+++ b/src/kvilib/file/KviFileUtils.cpp
@@ -39,63 +39,6 @@ namespace KviFileUtils
 {
 	static char cHexChars[16] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F' };
 
-	/*
-	WORKING CODE BUT UNUSED FOR NOW
-	bool readLine(QFile * f,QString &szBuffer,bool bClearBuffer)
-	{
-		// FIXME: Should this assume UTF8 encoding ?
-		char tmp_buf[256];
-		int cur_len = 0;
-		//char *cur_ptr = tmp_buf;
-		if(bClearBuffer)szBuffer = "";
-		int ch = f->getch();
-
-		while((ch != -1)&&(ch != '\n')&&(ch != 0))
-		{
-			tmp_buf[cur_len] = ch;
-			cur_len++;
-			if(cur_len > 255)
-			{
-				if(tmp_buf[255] == '\r')cur_len--; //Ignore CR...
-				int lastlen = szBuffer.length();
-				szBuffer.resize(lastlen + cur_len);
-				QChar *p1 = szBuffer.unicode() + lastlen;
-				char * p2 = tmp_buf;
-				for(int i=0;i<cur_len;i++)*p1++ = *p2++;
-				cur_len = 0;
-			}
-			ch = f->getch();
-		}
-		if(ch == 0)
-		{
-			qDebug("Warning : %s is not an ascii file",f->name().latin1());
-		}
-		if(cur_len > 0)
-		{
-			if(tmp_buf[cur_len - 1] == '\r')cur_len--; //Ignore CR...
-			int lastlen = szBuffer.length();
-			szBuffer.resize(lastlen + cur_len);
-			QChar *p1 = szBuffer.unicode() + lastlen;
-			char * p2 = tmp_buf;
-			for(int i=0;i<cur_len;i++)*p1++ = *p2++;
-		}
-		return (ch == '\n'); //more data to read else a broken file or EOF
-	}
-
-	bool loadFileStripCR(const QString &szPath,QString &szBuffer)
-	{
-		QFile f(szPath);
-		if(!f.open(IO_ReadOnly))return false;
-		szBuffer = "";
-		while(readLine(&f,szBuffer,false))
-		{
-			szBuffer.append('\n'); // readLine returned true...last char was a newline
-		}
-		// readLine returned false, no ending newline encountered
-		return true;
-	}
-	*/
-
 	bool makeDir(const QString & szPath)
 	{
 		QDir d;
@@ -501,7 +444,6 @@ namespace KviFileUtils
 	static QStringList getFileListingInternal(const QString & szPath, const QString & szPrefix)
 	{
 		//qDebug("Scan %s",szPath.toUtf8().data());
-
 		QStringList sl;
 
 		QDir d(szPath);
diff --git a/src/kvilib/file/KviPackageReader.cpp b/src/kvilib/file/KviPackageReader.cpp
index ed16432c3..ce358d38c 100644
--- a/src/kvilib/file/KviPackageReader.cpp
+++ b/src/kvilib/file/KviPackageReader.cpp
@@ -49,7 +49,6 @@ KviPackageReader::~KviPackageReader()
 bool KviPackageReader::readHeaderInternal(KviFile * pFile, const QString &)
 {
 	// read the PackageHeader
-
 	// Magic
 	char magic[4];
 
@@ -79,7 +78,6 @@ bool KviPackageReader::readHeaderInternal(KviFile * pFile, const QString &)
 	// we ignore them at the moment
 
 	// read PackageInfo
-
 	// InfoFieldCount
 	kvi_u32_t uCount;
 	if(!pFile->load(uCount))
@@ -204,7 +202,7 @@ bool KviPackageReader::unpackFile(KviFile * pFile, const QString & szUnpackPath)
 #ifdef COMPILE_ZLIB_SUPPORT
 	if(uFlags & KVI_PACKAGE_DATAFIELD_FLAG_FILE_DEFLATE)
 	{
-		//	qDebug ("loading compressed data");
+		//qDebug ("loading compressed data");
 		int iRemainingSize = uSize;
 		unsigned char ibuffer[BUFFER_SIZE];
 		unsigned char obuffer[BUFFER_SIZE];
@@ -287,7 +285,6 @@ bool KviPackageReader::unpackFile(KviFile * pFile, const QString & szUnpackPath)
 				}
 			}
 		}
-
 		// flush pending output
 		zstr.next_out = obuffer;
 		zstr.avail_out = BUFFER_SIZE;
@@ -312,7 +309,7 @@ bool KviPackageReader::unpackFile(KviFile * pFile, const QString & szUnpackPath)
 				else
 				{
 					//THIS HAPPENS FOR ZERO SIZE FILES
-					qDebug("hum.... internal, rEWq (ret = %d) (avail_out = %d)", ret, zstr.avail_out);
+					qDebug("Hum... internal, rEWq (ret = %d) (avail_out = %d)", ret, zstr.avail_out);
 
 					inflateEnd(&zstr);
 					setLastError(__tr2qs("Compression library internal error"));
@@ -335,7 +332,7 @@ bool KviPackageReader::unpackFile(KviFile * pFile, const QString & szUnpackPath)
 	else
 	{
 #endif
-		//	qDebug("Load uncompressed data");
+		//qDebug("Load uncompressed data");
 		unsigned char buffer[BUFFER_SIZE];
 		int iTotalFileSize = 0;
 		int iRemainingData = uSize;
@@ -343,7 +340,7 @@ bool KviPackageReader::unpackFile(KviFile * pFile, const QString & szUnpackPath)
 		if(iToRead > BUFFER_SIZE)
 			iToRead = BUFFER_SIZE;
 		int iReaded = 1;
-		//	qDebug("iReaded %i and iToRead %i and index %i",iReaded,iToRead,pFile->pos());
+		//qDebug("iReaded %i and iToRead %i and index %i",iReaded,iToRead,pFile->pos());
 		while((iReaded > 0) && (iToRead > 0))
 		{
 			iReaded = pFile->read((char *)buffer, iToRead);
@@ -359,7 +356,7 @@ bool KviPackageReader::unpackFile(KviFile * pFile, const QString & szUnpackPath)
 					if(!updateProgress(pFile->pos(), szPrg))
 						return false; // aborted
 				}
-				//	qDebug("write file with size %i and name %s",iReaded,dest.fileName().toUtf8().data());
+				//qDebug("write file with size %i and name %s",iReaded,dest.fileName().toUtf8().data());
 				if(dest.write((char *)buffer, iReaded) != iReaded)
 					return writeError();
 			}
@@ -368,7 +365,7 @@ bool KviPackageReader::unpackFile(KviFile * pFile, const QString & szUnpackPath)
 			if(iToRead > BUFFER_SIZE)
 				iToRead = BUFFER_SIZE;
 		}
-//	qDebug("finish to read %i and index %i",iReaded,pFile->pos());
+//qDebug("finish to read %i and index %i",iReaded,pFile->pos());
 #ifdef COMPILE_ZLIB_SUPPORT
 	}
 #endif
diff --git a/src/kvilib/file/KviPackageWriter.cpp b/src/kvilib/file/KviPackageWriter.cpp
index 07529204b..1102d2481 100644
--- a/src/kvilib/file/KviPackageWriter.cpp
+++ b/src/kvilib/file/KviPackageWriter.cpp
@@ -37,9 +37,9 @@
 #include <zlib.h>
 #endif
 
-//
+//////////////////////////////////////////////////////////////////////////////////////
 // See KviPackageIOEngine.cpp for the description of the KVIrc package file
-//
+//////////////////////////////////////////////////////////////////////////////////////
 
 class KviPackageWriterDataField
 {
@@ -278,7 +278,6 @@ bool KviPackageWriter::packFile(KviFile * pFile, KviPackageWriterDataField * pDa
 				}
 			}
 		}
-
 		// flush pending output
 		zstr.next_out = obuffer;
 		zstr.avail_out = BUFFER_SIZE;
@@ -387,7 +386,6 @@ bool KviPackageWriter::packInternal(const QString & szFileName, kvi_u32_t)
 	}
 
 	// write the PackageHeader
-
 	// Magic
 	char magic[4];
 	magic[0] = 'K';
@@ -408,7 +406,6 @@ bool KviPackageWriter::packInternal(const QString & szFileName, kvi_u32_t)
 		return writeError();
 
 	// write PackageInfo
-
 	// InfoFieldCount
 	kvi_u32_t uCount = stringInfoFields()->count() + binaryInfoFields()->count();
 	if(!f.save(uCount))
diff --git a/src/kvilib/irc/KviAvatarCache.cpp b/src/kvilib/irc/KviAvatarCache.cpp
index 3b1ed37a8..9d3c374ab 100644
--- a/src/kvilib/irc/KviAvatarCache.cpp
+++ b/src/kvilib/irc/KviAvatarCache.cpp
@@ -208,7 +208,6 @@ void KviAvatarCache::cleanup()
 
 	// here we use the cache entries in another way
 	// szAvatar is the KEY instead of the avatar name
-
 	while((e = it.current()))
 	{
 		KviAvatarCacheEntry * current = ll.first();
diff --git a/src/kvilib/irc/KviControlCodes.cpp b/src/kvilib/irc/KviControlCodes.cpp
index acaf6f2a5..a08530891 100644
--- a/src/kvilib/irc/KviControlCodes.cpp
+++ b/src/kvilib/irc/KviControlCodes.cpp
@@ -86,7 +86,7 @@ namespace KviControlCodes
 	const kvi_wchar_t * getColorBytesW(const kvi_wchar_t * pwData, unsigned char * pcByte1, unsigned char * pcByte2)
 	{
 		//
-		// Scans the pwData for a mIrc color code XX,XX
+		// Scans the pwData for a mIRC color code XX,XX
 		// and fills the color values in the two bytes
 		//
 
diff --git a/src/kvilib/irc/KviIrcNetwork.cpp b/src/kvilib/irc/KviIrcNetwork.cpp
index ef80ce02c..a138cdf64 100644
--- a/src/kvilib/irc/KviIrcNetwork.cpp
+++ b/src/kvilib/irc/KviIrcNetwork.cpp
@@ -147,7 +147,6 @@ KviIrcServer * KviIrcNetwork::findServer(const KviIrcServer * pServer)
 		else
 		{
 			// failback on the "check everything" method
-
 			if(KviQString::equalCI(s->hostName(), pServer->hostName())
 			    && (s->port() == pServer->port()) && (s->useSSL()
 			                                             == pServer->useSSL())
diff --git a/src/kvilib/locale/KviMessageCatalogue.cpp b/src/kvilib/locale/KviMessageCatalogue.cpp
index 19219750d..40f959965 100644
--- a/src/kvilib/locale/KviMessageCatalogue.cpp
+++ b/src/kvilib/locale/KviMessageCatalogue.cpp
@@ -62,12 +62,6 @@
 
 #include <stdio.h>
 
-/*
-#if HAVE_LIMITS_H || _LIBC
-	#include <limits.h>
-#endif
-*/
-
 // The magic number of the GNU message catalog format.
 #define KVI_LOCALE_MAGIC 0x950412de
 #define KVI_LOCALE_MAGIC_SWAPPED 0xde120495
diff --git a/src/kvilib/net/KviDnsResolver.cpp b/src/kvilib/net/KviDnsResolver.cpp
index 365b88fc3..5a7f8248c 100644
--- a/src/kvilib/net/KviDnsResolver.cpp
+++ b/src/kvilib/net/KviDnsResolver.cpp
@@ -251,7 +251,6 @@ void KviDnsResolverThread::run()
 
 	int retVal;
 
-	//#ifdef HAVE_GETNAMEINFO
 	struct sockaddr_in ipv4Addr;
 
 #ifdef COMPILE_IPV6_SUPPORT
@@ -266,7 +265,6 @@ void KviDnsResolverThread::run()
 		bIsIPv6Ip = KviNetUtils::stringIpToBinaryIp_V6(m_szQuery, (struct in6_addr *)&(ipv6Addr.sin6_addr));
 #endif
 
-//#ifdef HAVE_GETNAMEINFO
 
 #ifdef COMPILE_IPV6_SUPPORT
 	if(bIsIPv4Ip || bIsIPv6Ip)
@@ -306,11 +304,6 @@ void KviDnsResolverThread::run()
 	}
 	else
 	{
-		//#endif //HAVE_GETNAMEINFO
-
-		//#ifdef COMPILE_IPV6_SUPPORT
-		//		struct in6_addr in6Addr;
-		//#endif
 		struct addrinfo * pRet = nullptr;
 		struct addrinfo * pNext;
 		struct addrinfo hints;
@@ -381,9 +374,7 @@ void KviDnsResolverThread::run()
 		}
 		if(pRet)
 			freeaddrinfo(pRet);
-		//#ifdef HAVE_GETNAMEINFO
 	}
-//#endif //HAVE_GETNAMEINFO
 
 #endif // !COMPILE_ON_WINDOWS
 
@@ -409,8 +400,6 @@ KviDnsResolver::~KviDnsResolver()
 		delete m_pSlaveThread; // will eventually terminate it (but it will also block us!!!)
 	}
 
-	//QApplication::removePostedEvents(this); // the Qt doc says that we shouldn't need this
-
 	if(m_pDnsResult)
 		delete m_pDnsResult;
 	if(m_pAuxData)
@@ -429,7 +418,6 @@ bool KviDnsResolver::lookup(const QString & szQuery, QueryType type)
 	m_pSlaveThread->setQuery(szQuery.trimmed(), type);
 	m_pSlaveThread->start();
 	m_state = Busy;
-	//m_state = bStarted ? Busy : Failure;
 	return true;
 }
 
diff --git a/src/kvilib/net/KviHttpRequest.cpp b/src/kvilib/net/KviHttpRequest.cpp
index e707cb761..9f6c9cd17 100644
--- a/src/kvilib/net/KviHttpRequest.cpp
+++ b/src/kvilib/net/KviHttpRequest.cpp
@@ -219,8 +219,6 @@ void KviHttpRequest::closeSocket()
 	// This can be called from a socket handler slot
 	m_p->pSocket->deleteLater();
 
-	//delete m_p->pSocket;
-
 	m_p->pSocket = nullptr;
 }
 
@@ -334,7 +332,6 @@ void KviHttpRequest::slotSocketConnected()
 	emit requestSent(sl);
 
 	// now wait for the response
-
 	// FIXME: Handle read timeouts!
 }
 
@@ -352,7 +349,6 @@ void KviHttpRequest::slotSocketReadDataReady()
 	}
 
 	// FIXME: Avoid double-buffering here!
-
 	KviDataBuffer oBuffer(iBytes);
 
 	int iRead = m_p->pSocket->read((char *)(oBuffer.data()), iBytes);
@@ -366,8 +362,6 @@ void KviHttpRequest::slotSocketReadDataReady()
 		}
 
 		// FIXME
-		// well... otherwise just wait.
-		// FIXME ?
 		oBuffer.resize(iRead);
 	}
 
@@ -449,20 +443,6 @@ bool KviHttpRequest::doConnect()
 
 	m_p->pConnectTimeoutTimer->start(m_uConnectionTimeout * 1000);
 
-	/*
-	m_pThread = new KviHttpRequestThread(
-			this,
-			m_connectionUrl.host(),
-			m_szIp,
-			uPort,
-			m_connectionUrl.path(),
-			m_uContentOffset,
-			(m_eProcessingType == HeadersOnly) ? KviHttpRequestThread::Head : (m_szPostData.isEmpty() ? KviHttpRequestThread::Get : KviHttpRequestThread::Post),
-			m_szPostData,
-			m_connectionUrl.protocol()=="https"
-		);
-	*/
-
 	return true;
 }
 
@@ -479,34 +459,6 @@ void KviHttpRequest::emitLines(KviDataBuffer * pDataBuffer)
 	}
 }
 
-//    header += "Accept: ";
-//    QString acceptHeader = metaData("accept");
-//    if (!acceptHeader.isEmpty())
-//      header += acceptHeader;
-//    else
-//      header += DEFAULT_ACCEPT_HEADER;
-//    header += "\r\n";
-//
-//#ifdef DO_GZIP
-//    if (m_request.allowCompressedPage)
-//      header += "Accept-Encoding: x-gzip, x-deflate, gzip, deflate, identity\r\n";
-//#endif
-//
-//    if (!m_request.charsets.isEmpty())
-//      header += "Accept-Charset: " + m_request.charsets + "\r\n";
-//
-//    if (!m_request.languages.isEmpty())
-//      header += "Accept-Language: " + m_request.languages + "\r\n";
-//
-//
-//    /* support for virtual hosts and required by HTTP 1.1 */
-//    header += "Host: ";
-//      header += "Pragma: no-cache\r\n"; /* for HTTP/1.0 caches */
-//      header += "Cache-control: no-cache\r\n"; /* for HTTP >=1.1 caches */
-
-//        header += "Referer: "; //Don't try to correct spelling!
-//        header += m_request.referrer;
-//        header += "\r\n";
 bool KviHttpRequest::openFile()
 {
 	if(m_eProcessingType != StoreToFile)
@@ -687,48 +639,47 @@ bool KviHttpRequest::processHeader(KviCString & szHeader)
 
 	// check the status
 
-	//				case 200: // OK
-	//				case 206: // Partial content
-
-	//				case 100: // Continue ??
-	//				case 101: // Switching protocols ???
-	//				case 201: // Created
-	//				case 202: // Accepted
-	//				case 203: // Non-Authoritative Information
-	//				case 204: // No content
-	//				case 205: // Reset content
-	//				case 300: // Multiple choices
-	//				case 301: // Moved permanently
-	//				case 302: // Found
-	//				case 303: // See Other
-	//				case 304: // Not modified
-	//				case 305: // Use Proxy
-	//				case 306: // ???
-	//				case 307: // Temporary Redirect
-	//				case 400: // Bad request
-	//				case 401: // Unauthorized
-	//				case 402: // Payment Required
-	//				case 403: // Forbidden
-	//				case 404: // Not found
-	//				case 405: // Method not allowed
-	//				case 406: // Not acceptable
-	//				case 407: // Proxy authentication required
-	//				case 408: // Request timeout
-	//				case 409: // Conflict
-	//				case 410: // Gone
-	//				case 411: // Length required
-	//				case 412: // Precondition failed
-	//				case 413: // Request entity too large
-	//				case 414: // Request-URI Too Long
-	//				case 415: // Unsupported media type
-	//				case 416: // Requested range not satisfiable
-	//				case 417: // Expectation Failed
-	//				case 500: // Internal server error
-	//				case 501: // Not implemented
-	//				case 502: // Bad gateway
-	//				case 503: // Service unavailable
-	//				case 504: // Gateway timeout
-	//				case 505: // HTTP Version not supported
+	// case 200: // OK
+	// case 206: // Partial content
+	// case 100: // Continue
+	// case 101: // Switching protocols
+	// case 201: // Created
+	// case 202: // Accepted
+	// case 203: // Non-Authoritative Information
+	// case 204: // No content
+	// case 205: // Reset content
+	// case 300: // Multiple choices
+	// case 301: // Moved permanently
+	// case 302: // Found
+	// case 303: // See Other
+	// case 304: // Not modified
+	// case 305: // Use Proxy
+	// case 306: // Switch Proxy
+	// case 307: // Temporary Redirect
+	// case 400: // Bad request
+	// case 401: // Unauthorized
+	// case 402: // Payment Required
+	// case 403: // Forbidden
+	// case 404: // Not found
+	// case 405: // Method not allowed
+	// case 406: // Not acceptable
+	// case 407: // Proxy authentication required
+	// case 408: // Request timeout
+	// case 409: // Conflict
+	// case 410: // Gone
+	// case 411: // Length required
+	// case 412: // Precondition failed
+	// case 413: // Request entity too large
+	// case 414: // Request-URI Too Long
+	// case 415: // Unsupported media type
+	// case 416: // Requested range not satisfiable
+	// case 417: // Expectation Failed
+	// case 500: // Internal server error
+	// case 501: // Not implemented
+	// case 502: // Bad gateway
+	// case 503: // Service unavailable
+	// case 504: // Gateway timeout
+	// case 505: // HTTP Version not supported
 
 	if(
 	    (uStatus != 200) && // OK
@@ -868,7 +819,6 @@ void KviHttpRequest::processData(KviDataBuffer * data)
 		}
 
 		m_uReceivedSize = m_p->pBuffer->size();
-
 		// here the header is complete and the eventual remaining data is in m_p->pBuffer. data has been already used.
 	}
 	else
diff --git a/src/kvilib/net/KviSSL.cpp b/src/kvilib/net/KviSSL.cpp
index 514886d05..75b45bc05 100644
--- a/src/kvilib/net/KviSSL.cpp
+++ b/src/kvilib/net/KviSSL.cpp
@@ -390,7 +390,7 @@ static int cb(char * buf, int size, int, void * u)
 	if(len >= size)
 		return 0;
 	KviMemory::move(buf, p->ptr(), len + 1);
-	//	qDebug("PASS REQYESTED: %s",p->ptr());
+	//qDebug("PASS REQYESTED: %s",p->ptr());
 	return len;
 }
 
@@ -411,7 +411,7 @@ KviSSL::Result KviSSL::useCertificateFile(QString cert, QString pass)
 	if(!f)
 		return FileIoError;
 
-	//	qDebug("READING CERTIFICATE %s",cert.Utf8().data());
+	//qDebug("READING CERTIFICATE %s",cert.Utf8().data());
 	if(PEM_read_X509(f, &x509, cb, &m_szPass))
 	{
 		if(!SSL_CTX_use_certificate(m_pSSLCtx, x509))
@@ -445,7 +445,7 @@ KviSSL::Result KviSSL::usePrivateKeyFile(QString key, QString pass)
 	if(!f)
 		return FileIoError;
 
-	//	qDebug("READING KEY %s",key.toUtf8().data());
+	//qDebug("READING KEY %s",key.toUtf8().data());
 	if(PEM_read_PrivateKey(f, &k, cb, &m_szPass))
 	{
 		if(!SSL_CTX_use_PrivateKey(m_pSSLCtx, k))
@@ -534,12 +534,10 @@ KviSSL::Result KviSSL::connectOrAcceptError(int ret)
 
 int KviSSL::read(char * buffer, int len)
 {
-	//	if(!m_pSSL)return -1;
 	return SSL_read(m_pSSL, buffer, len);
 }
 int KviSSL::write(const char * buffer, int len)
 {
-	//	if(!m_pSSL)return -1;
 	return SSL_write(m_pSSL, buffer, len);
 }
 
@@ -696,8 +694,8 @@ int KviSSLCertificate::fingerprintDigestId()
 	int NID = OBJ_obj2nid(m_pX509->sig_alg->algorithm);
 	if(NID == NID_undef)
 	{
-		// unknown digest function: it means the signature can't be verified: the certificate can't be trusted
-		return 0;
+		return 0; // unknown digest function: it means the signature can't be verified: the certificate can't be trusted
+
 	}
 
 	const EVP_MD * mdType = nullptr;
@@ -705,8 +703,7 @@ int KviSSLCertificate::fingerprintDigestId()
 
 	if(mdType == nullptr)
 	{
-		// Unknown digest
-		return 0;
+		return 0; // Unknown digest
 	}
 
 	return mdType->type;
@@ -729,8 +726,7 @@ const char * KviSSLCertificate::fingerprintContents(QString digestName)
 	const char * pDigestName;
 	if(digestName.isEmpty())
 	{
-		// use the one used to create the signature
-		pDigestName = OBJ_nid2sn(fingerprintDigestId());
+		pDigestName = OBJ_nid2sn(fingerprintDigestId()); // use the one used to create the signature
 	}
 	else
 	{
@@ -756,8 +752,7 @@ int KviSSLCertificate::getFingerprint(unsigned char * bufferData, unsigned int *
 
 	if(mdType == nullptr)
 	{
-		// Unknown digest
-		return -98;
+		return -98; // Unknown digest
 	}
 
 	if(!X509_digest(m_pX509, mdType, bufferData, bufferLen))
@@ -824,25 +819,6 @@ const char * KviSSLCertificate::dictEntry(KviPointerHashTable<const char *, KviC
 	return t->ptr();
 }
 
-/*
-void KviSSLCertificate::getPKeyType(int type,KviCString &buffer)
-{
-	switch(type)
-	{
-#ifndef NO_RSA
-		case EVP_PKEY_RSA:   buffer = "RSA";     break;
-#endif
-#ifndef NO_DSA
-		case EVP_PKEY_DSA:   buffer = "DSA";     break;
-#endif
-#ifndef NO_DH
-		case EVP_PKEY_DH:    buffer = "DH";      break;
-#endif
-		case EVP_PKEY_NONE:  buffer = "NONE";    break;
-	}
-}
-*/
-
 void KviSSLCertificate::extractPubKeyInfo()
 {
 	EVP_PKEY * p = X509_get_pubkey(m_pX509);
@@ -872,8 +848,6 @@ void KviSSLCertificate::extractSignature()
 {
 	static char hexdigits[] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F' };
 
-	//getPKeyType(X509_get_signature_type(m_pX509),m_szSignatureType);
-
 	int i = OBJ_obj2nid(m_pX509->sig_alg->algorithm);
 	m_szSignatureType = (i == NID_undef) ? __tr("Unknown") : OBJ_nid2ln(i);
 
@@ -888,13 +862,6 @@ void KviSSLCertificate::extractSignature()
 	}
 }
 
-/*
-const char * KviSSLCertificate::verify()
-{
-
-}
-*/
-
 #if OPENSSL_VERSION_NUMBER >= 0x10000000L
 KviSSLCipherInfo::KviSSLCipherInfo(const SSL_CIPHER * c, const SSL * s)
 #else
diff --git a/src/kvilib/system/KviThread.cpp b/src/kvilib/system/KviThread.cpp
index 4b9e3060b..d4273c43f 100644
--- a/src/kvilib/system/KviThread.cpp
+++ b/src/kvilib/system/KviThread.cpp
@@ -464,11 +464,11 @@ KviThread::KviThread()
 
 KviThread::~KviThread()
 {
-	//	qDebug(">> KviThread::~KviThread() : (this = %d)",this);
+	//qDebug(">> KviThread::~KviThread() : (this = %d)",this);
 	wait();
 	delete m_pRunningMutex;
 	g_pThreadManager->unregisterSlaveThread(this);
-	//	qDebug("<< KviThread::~KviThread() : (this = %d)",this);
+	//qDebug("<< KviThread::~KviThread() : (this = %d)",this);
 }
 
 void KviThread::setRunning(bool bRunning)
@@ -515,7 +515,7 @@ bool KviThread::start()
 void KviThread::wait()
 {
 	// We're on the master side here...and we're waiting the slave to exit
-	//	qDebug(">> KviThread::wait() (this=%d)",this);
+	//qDebug(">> KviThread::wait() (this=%d)",this);
 	while(isStartingUp())
 		usleep(500); // sleep 500 microseconds
 	                 //	qDebug("!! KviThread::wait() (this=%d)",this);
@@ -525,7 +525,7 @@ void KviThread::wait()
 		usleep(500); // sleep 500 microseconds
 	}
 	g_pThreadManager->threadLeftWaitState();
-	//	qDebug("<< KviThread::wait() (this=%d)",this);
+	//qDebug("<< KviThread::wait() (this=%d)",this);
 }
 
 void KviThread::exit()
@@ -538,13 +538,13 @@ void KviThread::exit()
 void KviThread::internalThreadRun_doNotTouchThis()
 {
 	// we're on the slave thread here!
-	//	qDebug(">> KviThread::internalRun (this=%d)",this);
+	//qDebug(">> KviThread::internalRun (this=%d)",this);
 	setRunning(true);
 	setStartingUp(false);
 	kvi_threadInitialize();
 	run();
 	setRunning(false);
-	//	qDebug("<< KviThread::internalRun (this=%d",this);
+	//qDebug("<< KviThread::internalRun (this=%d",this);
 }
 
 void KviThread::usleep(unsigned long usec)
@@ -595,9 +595,9 @@ KviSensitiveThread::KviSensitiveThread()
 
 KviSensitiveThread::~KviSensitiveThread()
 {
-	//	qDebug("Entering KviSensitiveThread::~KviSensitiveThread (this=%d)",this);
+	//qDebug("Entering KviSensitiveThread::~KviSensitiveThread (this=%d)",this);
 	terminate();
-	//	qDebug("KviSensitiveThread::~KviSensitiveThread : terminate called (This=%d)",this);
+	//qDebug("KviSensitiveThread::~KviSensitiveThread : terminate called (This=%d)",this);
 	m_pLocalEventQueueMutex->lock();
 	m_pLocalEventQueue->setAutoDelete(true);
 	delete m_pLocalEventQueue;
@@ -605,12 +605,12 @@ KviSensitiveThread::~KviSensitiveThread()
 	m_pLocalEventQueueMutex->unlock();
 	delete m_pLocalEventQueueMutex;
 	m_pLocalEventQueueMutex = nullptr;
-	//	qDebug("Exiting KviSensitiveThread::~KviSensitiveThread (this=%d)",this);
+	//qDebug("Exiting KviSensitiveThread::~KviSensitiveThread (this=%d)",this);
 }
 
 void KviSensitiveThread::enqueueEvent(KviThreadEvent * e)
 {
-	//	qDebug(">>> KviSensitiveThread::enqueueEvent() (this=%d)",this);
+	//qDebug(">>> KviSensitiveThread::enqueueEvent() (this=%d)",this);
 	m_pLocalEventQueueMutex->lock();
 	if(!m_pLocalEventQueue)
 	{
@@ -621,27 +621,27 @@ void KviSensitiveThread::enqueueEvent(KviThreadEvent * e)
 	}
 	m_pLocalEventQueue->append(e);
 	m_pLocalEventQueueMutex->unlock();
-	//	qDebug("<<< KviSensitiveThread::enqueueEvent() (this=%d)",this);
+	//qDebug("<<< KviSensitiveThread::enqueueEvent() (this=%d)",this);
 }
 
 KviThreadEvent * KviSensitiveThread::dequeueEvent()
 {
-	//	qDebug(">>> KviSensitiveThread::dequeueEvent() (this=%d)",this);
+	//qDebug(">>> KviSensitiveThread::dequeueEvent() (this=%d)",this);
 	KviThreadEvent * ret;
 	m_pLocalEventQueueMutex->lock();
 	ret = m_pLocalEventQueue->first();
 	if(ret)
 		m_pLocalEventQueue->removeFirst();
 	m_pLocalEventQueueMutex->unlock();
-	//	qDebug("<<< KviSensitiveThread::dequeueEvent() (this=%d)",this);
+	//qDebug("<<< KviSensitiveThread::dequeueEvent() (this=%d)",this);
 	return ret;
 }
 
 void KviSensitiveThread::terminate()
 {
-	//	qDebug("Entering KviSensitiveThread::terminate (this=%d)",this);
+	//qDebug("Entering KviSensitiveThread::terminate (this=%d)",this);
 	enqueueEvent(new KviThreadEvent(KVI_THREAD_EVENT_TERMINATE));
-	//	qDebug("KviSensitiveThread::terminate() : event enqueued waiting (this=%d)",this);
+	//qDebug("KviSensitiveThread::terminate() : event enqueued waiting (this=%d)",this);
 	wait();
-	//	qDebug("Exiting KviSensitiveThread::terminate (this=%d)",this);
+	//qDebug("Exiting KviSensitiveThread::terminate (this=%d)",this);
 }
diff --git a/src/kvilib/tal/KviTalListWidget.cpp b/src/kvilib/tal/KviTalListWidget.cpp
index 85a615d1a..c7e1f8ada 100644
--- a/src/kvilib/tal/KviTalListWidget.cpp
+++ b/src/kvilib/tal/KviTalListWidget.cpp
@@ -90,12 +90,6 @@ KviTalListWidgetText::KviTalListWidgetText(const QString & text)
 {
 	setText(text);
 }
-/*
-KviTalListWidgetText::KviTalListWidgetText(KviTalListWidget* listbox, const QString &text, KviTalListWidgetItem *after)
-: KviTalListWidgetItem(listbox, after)
-{
-	setText(text);
-}*/
 
 KviTalListWidgetText::~KviTalListWidgetText()
     = default;
@@ -137,12 +131,6 @@ KviTalListWidgetPixmap::KviTalListWidgetPixmap(const QPixmap & pixmap)
 	pm = pixmap;
 }
 
-// KviTalListWidgetPixmap::KviTalListWidgetPixmap(KviTalListWidget* listbox, const QPixmap &pixmap, KviTalListWidgetItem *after)
-// : KviTalListWidgetItem(listbox, after)
-// {
-// 	pm = pixmap;
-// }
-
 KviTalListWidgetPixmap::~KviTalListWidgetPixmap()
     = default;
 
@@ -161,13 +149,6 @@ KviTalListWidgetPixmap::KviTalListWidgetPixmap(const QPixmap & pix, const QStrin
 	setText(text);
 }
 
-// KviTalListWidgetPixmap::KviTalListWidgetPixmap(KviTalListWidget* listbox, const QPixmap & pix, const QString& text,KviTalListWidgetItem *after)
-// : KviTalListWidgetItem(listbox, after)
-// {
-// 	pm = pix;
-// 	setText(text);
-// }
-
 void KviTalListWidgetPixmap::paint(QPainter * painter)
 {
 	int itemHeight = height(listWidget());
diff --git a/src/kvilib/tal/KviTalToolTip.cpp b/src/kvilib/tal/KviTalToolTip.cpp
index 89dbea20c..c96d6d365 100644
--- a/src/kvilib/tal/KviTalToolTip.cpp
+++ b/src/kvilib/tal/KviTalToolTip.cpp
@@ -52,7 +52,7 @@ bool KviTalToolTipHelper::eventFilter(QObject *, QEvent * pEvent)
 {
 	if((pEvent->type() == QEvent::ToolTip) && m_pToolTip)
 	{
-		//		qDebug("TOOL TIP EVENT WITH POSITION %d,%d",((QHelpEvent *)pEvent)->pos().x(),((QHelpEvent *)pEvent)->pos().y());
+		// qDebug("TOOL TIP EVENT WITH POSITION %d,%d",((QHelpEvent *)pEvent)->pos().x(),((QHelpEvent *)pEvent)->pos().y());
 		m_pToolTip->maybeTip(((QHelpEvent *)pEvent)->pos());
 		return true;
 	}
@@ -92,7 +92,7 @@ void KviTalToolTip::remove(QWidget * widget)
 
 void KviTalToolTip::tip(const QRect & rect, const QString & text)
 {
-	//	qDebug("TOOL TIP AT %d,%d",rect.topLeft().x(),rect.topLeft().y());
+	// qDebug("TOOL TIP AT %d,%d",rect.topLeft().x(),rect.topLeft().y());
 	QPoint pnt = m_pParent->mapToGlobal(rect.topLeft());
 	pnt.setX(pnt.x() + 16);
 	pnt.setY(pnt.y() + 16);
diff --git a/src/kvirc/kernel/KviActionManager.cpp b/src/kvirc/kernel/KviActionManager.cpp
index cf20bcaff..82fda3e37 100644
--- a/src/kvirc/kernel/KviActionManager.cpp
+++ b/src/kvirc/kernel/KviActionManager.cpp
@@ -77,7 +77,6 @@ KviActionManager::~KviActionManager()
 	// the customizeToolBars dialog has been already
 	// destroyed since the module manager has already
 	// killed all the modules at this point...
-	//KviActionDialog::cleanup();
 
 	KviPointerHashTableIterator<QString, KviAction> it(*m_pActions);
 	while(KviAction * a = it.current())
diff --git a/src/kvirc/kernel/KviApplication.cpp b/src/kvirc/kernel/KviApplication.cpp
index 6d7c2f81d..7e767a7a5 100644
--- a/src/kvirc/kernel/KviApplication.cpp
+++ b/src/kvirc/kernel/KviApplication.cpp
@@ -491,7 +491,6 @@ void KviApplication::setup()
 void KviApplication::frameDestructorCallback()
 {
 	// here we should kill anything that depends on g_pMainWindow, g_pActiveWindow and related being non zero...
-
 	// kill all the objects, while we have windows...
 	if(KviKvsKernel::instance())
 	{
@@ -615,7 +614,6 @@ KviApplication::~KviApplication()
 #endif
 
 	KviLocale::done();
-
 	// goodbye cruel world...
 }
 
diff --git a/src/kvirc/kernel/KviApplication_filesystem.cpp b/src/kvirc/kernel/KviApplication_filesystem.cpp
index 451bf41aa..120cbeea1 100644
--- a/src/kvirc/kernel/KviApplication_filesystem.cpp
+++ b/src/kvirc/kernel/KviApplication_filesystem.cpp
@@ -611,13 +611,6 @@ bool KviApplication::findSmallIcon(QString & szRetPath, const QString & filename
 	// this is a bit optimized for the small builtin icons
 	// looks up less places.
 
-	//if(kvi_isAbsolutePath(filename))
-	//{
-	// BUG!.. we should never
-	//szRetPath=filename;
-	//return KviFileUtils::fileExists(filename);
-	//}
-
 	// if we have a theme, look it up as first
 	if(!KVI_OPTION_STRING(KviOption_stringIconThemeSubdir).isEmpty())
 	{
@@ -717,6 +710,6 @@ bool KviApplication::getReadOnlyConfigPath(QString & buffer, const char * config
 		}
 		else
 			buffer = tmp; // get the defaults this time
-	}                     // else file exists...
+	}                             // else file exists...
 	return true;
 }
diff --git a/src/kvirc/kernel/KviApplication_setup.cpp b/src/kvirc/kernel/KviApplication_setup.cpp
index 938b5072a..0ff6d9aea 100644
--- a/src/kvirc/kernel/KviApplication_setup.cpp
+++ b/src/kvirc/kernel/KviApplication_setup.cpp
@@ -805,9 +805,6 @@ void KviApplication::setupBegin()
 #endif
 	}
 
-	// Now save it
-	//Let it be done by setup function
-	//	saveKvircDirectory();
 }
 
 void KviApplication::setupFinish()
diff --git a/src/kvirc/kernel/KviDefaultScript.cpp b/src/kvirc/kernel/KviDefaultScript.cpp
index 7af06a512..482799d34 100644
--- a/src/kvirc/kernel/KviDefaultScript.cpp
+++ b/src/kvirc/kernel/KviDefaultScript.cpp
@@ -154,7 +154,6 @@ void KviDefaultScriptManager::restoreInternal()
 		if(m_pDialog->m_pData->isChecked())
 			KviActionManager::instance()->killAllKvsUserActions();
 		// No need to load here since we haven't a default actions script yet
-		//g_pApp->loadDefaultScript("action");
 		m_szAction = oConfig.readEntry("ActionVersion");
 	}
 
@@ -163,7 +162,6 @@ void KviDefaultScriptManager::restoreInternal()
 		if(m_pDialog->m_pData->isChecked())
 			KviKvs::clearScriptAddons();
 		// No need to load here since we haven't a default actions script yet
-		//g_pApp->loadDefaultScript("addons");
 		m_szAddon = oConfig.readEntry("AddonVersion");
 	}
 
@@ -203,7 +201,6 @@ void KviDefaultScriptManager::restoreInternal()
 		if(m_pDialog->m_pData->isChecked())
 			KviKvs::clearRawEvents();
 		// No need to load here since we haven't a default raw events script yet
-		//g_pApp->loadDefaultScript("raws");
 		m_szRaw = oConfig.readEntry("RawVersion");
 	}
 
diff --git a/src/kvirc/kernel/KviIconManager.cpp b/src/kvirc/kernel/KviIconManager.cpp
index 89dd35efa..2ca64f743 100644
--- a/src/kvirc/kernel/KviIconManager.cpp
+++ b/src/kvirc/kernel/KviIconManager.cpp
@@ -1907,12 +1907,6 @@ KviAvatar * KviIconManager::getAvatar(const QString & szLocalPath, const QString
 		szN = szName;
 	}
 
-	// avatars bigger than 1024x768 just sux: they can't be seen on tooltips anyway
-	//KviCachedPixmap * p = KVI_OPTION_BOOL(KviOption_boolScaleAvatarsOnLoad) ? getPixmapWithCacheScaleOnLoad(szP,
-	//	KVI_OPTION_UINT(KviOption_uintScaleAvatarsOnLoadWidth)
-	//	,KVI_OPTION_UINT(KviOption_uintScaleAvatarsOnLoadHeight)) : getPixmapWithCache(szP);
-	//if(!p)return 0;
-
 	KviAvatar * pResult = nullptr;
 
 	if(KviFileUtils::fileExists(szP))
diff --git a/src/kvirc/sparser/KviAntiSpam.cpp b/src/kvirc/sparser/KviAntiSpam.cpp
index faa16bc90..05fc6690d 100644
--- a/src/kvirc/sparser/KviAntiSpam.cpp
+++ b/src/kvirc/sparser/KviAntiSpam.cpp
@@ -27,34 +27,6 @@
 #include "KviAntiSpam.h"
 #include "KviOptions.h"
 
-//[05:10:48] <Nataly19> :2http://www.extrababes.com5Go ahead punk, make my day !
-//[05:11:04] <treeman>  :-ææ¸`ææ¸`ææ¸ -= for mp3's go to http://members.xoom.com/treemansmp3/start.htm
-//						=- `ææ¸`ææ¸`ææ-
-//[05:10:51] <Suzi48498>:P*** **** squirms like CRAZY when **** licks between her ...
-//[05:12:11] <dea_>     :Hi my name is **** and I just posted pics of myself and
-//						other hot girls on my website at http://133.16.114.32/~guest/
-//						tell me what you think!
-//[15:18:37] <JuL|aN^bZ> Join #Teens4eva...Have Fun PPl!!!
-//[15:19:37] <jkhnbn> Ciao, vai sul sito  www.sitromba.3000.it ci sono un casino di
-//						immagini e video porno gratisssssssssssssssss!!!!!
-//[15:19:46] <emjot``> zapraszam na kanal #poke super zabawa i opa za free !!!!!
-//[15:23:20] <AlExXxX> IMPORTANTE: Se cerchi foto e video HARD andate quì:
-//						http://216.221.175.58/cgi-bin/affiliate/ad.cgi?id=m4rines [automsg]
-//[15:23:36] <Jane> hi..join #hard sex channel --Venom ScRipT³-- SToRM iN THe DaRK!!
-//[15:23:47] <lovghgh> VISIT>> http://go.to/mp3andwarez/ << VISIT[15:23:47] <lovghgh> VISIT>> http://go.to/mp3andwarez/ << VISIT
-//[15:23:56] <PIMPOLO> HO le prove certe che si puo' far soldi dovendo solo ricevere sms pubblicitari sul cellulare.
-//						Mi sono arrivati sms pubblicitari!!! Ti interessa ? ISCRIVITI CLICCANDO DIRETTAMENTE SU QUESTO SITO:
-//						http://www.smscash.it/index.php3?pagid=reg&p_form=P&p_pres=0&cpre=95620&p_desc=1 (Messaggio Automatico) IR©Simpson
-
-// Yes...it is really annoying when I join a channel and
-// i am flooded with all that messages.
-// On large-newbie-high-traffic channels I get lagged
-// with the Query windows popping up with all that stuff.
-// What I can do ? Ignore queries ?
-// mmmmh
-//
-// kvi_mayBeSpam : try to guess if text may be a spam message.
-// Ideas:
 // - A spam message is generally a single PRIVMSG <mynick> :<text>
 //		so this function should be (and is) called when
 //		a PRIVMSG is received from a person that has no QUERY
@@ -66,15 +38,6 @@
 //
 // In this way we can get rid of a good 70% of spam msgs.
 
-// Just a minor change. This allows to easily add more "banned" words.
-// Maybe there should be a config dialog for that ? Some people like to get
-// porno pics, but don't like mp3's for example ... ;-)))
-// -- Kristoff
-
-// Ok...made this completely configurable....
-// The default spam words get "installed" by the default script
-// 09-01-2001: Pragma
-
 /*
 	@doc: antispam
 	@title:
@@ -107,7 +70,6 @@ bool kvi_mayBeSpam(KviCString * msg, KviCString & spamWord)
 	for(auto & it : KVI_OPTION_STRINGLIST(KviOption_stringlistSpamWords))
 	{
 		// FIXME : This is SLOOOOOOOOW (QString -> ascii translation!!)
-
 		const char * aux = it.toLatin1();
 		if(aux)
 		{
diff --git a/src/kvirc/sparser/KviIrcMessage.cpp b/src/kvirc/sparser/KviIrcMessage.cpp
index 94a4be2e5..e22c6f659 100644
--- a/src/kvirc/sparser/KviIrcMessage.cpp
+++ b/src/kvirc/sparser/KviIrcMessage.cpp
@@ -38,9 +38,6 @@ KviIrcMessage::KviIrcMessage(const char * message, KviIrcConnection * pConnectio
 	m_pParams = new KviPointerList<KviCString>;
 	m_pParams->setAutoDelete(true);
 
-	//m_pcParams = new KviPointerList<QCString>;
-	//m_pcParams->setAutoDelete(true);
-
 	while(*m_ptr == ' ')
 		++m_ptr;
 	const char * allParams = m_ptr; // just to be sure
@@ -125,7 +122,6 @@ KviIrcMessage::KviIrcMessage(const char * message, KviIrcConnection * pConnectio
 		m_iNumericCommand = -1;
 		m_szCommand.toUpper();
 	}
-	//m_SafeTrailingString=QCString(m_pParams->last()->ptr());
 }
 
 KviIrcMessage::~KviIrcMessage()
diff --git a/src/kvirc/sparser/KviIrcServerParser_ctcp.cpp b/src/kvirc/sparser/KviIrcServerParser_ctcp.cpp
index 6d5a8d7dd..a588ccae6 100644
--- a/src/kvirc/sparser/KviIrcServerParser_ctcp.cpp
+++ b/src/kvirc/sparser/KviIrcServerParser_ctcp.cpp
@@ -369,14 +369,16 @@ extern KVIRC_API KviCtcpPageDialog * g_pCtcpPageDialog;
 		[b]Syntax: <0x01>DCC <type> <type dependent parameters><0x01>[/b][br]
 		The DCC tag is used to initiate a Direct Client Connection.
 		The known DCC types are:[br]
+		[pre]
 			CHAT[br]
 			SEND[br]
+			SSEND[br]
 			TSEND[br]
 			GET[br]
 			TGET[br]
 			ACCEPT[br]
 			RESUME[br]
-
+		[/pre]
 */
 
 void KviIrcServerParser::encodeCtcpParameter(const char * param, KviCString & buffer, bool bSpaceBreaks)
@@ -461,10 +463,8 @@ void KviIrcServerParser::encodeCtcpParameter(const char * param, KviCString & bu
 
 void KviIrcServerParser::encodeCtcpParameter(const char * parametr, QString & resultBuffer, bool bSpaceBreaks)
 {
-	//
 	// This one encodes a single ctcp parameter with the simplest
 	// subset of rules and places it in the supplied buffer
-	//
 	QByteArray buffer;
 	const char * param = parametr;
 	if(!param)
@@ -528,7 +528,6 @@ void KviIrcServerParser::encodeCtcpParameter(const char * parametr, QString & re
 
 const char * KviIrcServerParser::decodeCtcpEscape(const char * msg_ptr, KviCString & buffer)
 {
-	//
 	// This one decodes an octal sequence
 	// and returns the pointer "just after it".
 	// It should be called when *msg_ptr points
@@ -536,7 +535,6 @@ const char * KviIrcServerParser::decodeCtcpEscape(const char * msg_ptr, KviCStri
 	// The decoded escape is appended to the buffer
 	//
 	// We're also assuming that *msg_ptr is not null here
-	//
 	if((*msg_ptr >= '0') && (*msg_ptr < '8'))
 	{
 		// a digit follows the backslash */
@@ -551,7 +549,7 @@ const char * KviIrcServerParser::decodeCtcpEscape(const char * msg_ptr, KviCStri
 				c = ((c << 3) + (*msg_ptr - '0'));
 				msg_ptr++;
 			} // else broken message, but let's be flexible
-		}     // else it is broken, but let's be flexible
+		}         // else it is broken, but let's be flexible
 		buffer.append(c);
 		return msg_ptr;
 	}
@@ -568,10 +566,8 @@ const char * KviIrcServerParser::decodeCtcpEscape(const char * msg_ptr, KviCStri
 		return ++msg_ptr;
 	}
 
-	//
 	// null escape: just append the following
 	// character (thus discarding its semantics)
-	//
 
 	buffer.append(msg_ptr);
 	return ++msg_ptr;
@@ -579,7 +575,6 @@ const char * KviIrcServerParser::decodeCtcpEscape(const char * msg_ptr, KviCStri
 
 const char * KviIrcServerParser::decodeCtcpEscape(const char * msg_ptr, QByteArray & buffer)
 {
-	//
 	// This one decodes an octal sequence
 	// and returns the pointer "just after it".
 	// It should be called when *msg_ptr points
@@ -587,7 +582,6 @@ const char * KviIrcServerParser::decodeCtcpEscape(const char * msg_ptr, QByteArr
 	// The decoded escape is appended to the buffer
 	//
 	// We're also assuming that *msg_ptr is not null here
-	//
 	if((*msg_ptr >= '0') && (*msg_ptr < '8'))
 	{
 		// a digit follows the backslash */
@@ -617,10 +611,9 @@ const char * KviIrcServerParser::decodeCtcpEscape(const char * msg_ptr, QByteArr
 		buffer += '\n';
 		return ++msg_ptr;
 	}
-	//
+
 	// null escape: just append the following
 	// character (thus discarding its semantics)
-	//
 
 	buffer += *msg_ptr;
 	return ++msg_ptr;
@@ -628,7 +621,6 @@ const char * KviIrcServerParser::decodeCtcpEscape(const char * msg_ptr, QByteArr
 
 const char * KviIrcServerParser::extractCtcpParameter(const char * msg_ptr, KviCString & buffer, bool bSpaceBreaks, bool bSafeOnly)
 {
-	//
 	// This one extracts the "next" ctcp parameter in msg_ptr
 	// and puts it in the supplied buffer.
 	// It is assumed that the leading and trailing CTCP
@@ -637,7 +629,6 @@ const char * KviIrcServerParser::extractCtcpParameter(const char * msg_ptr, KviC
 	// bSpaceBreaks should be set to false if (and only if) the
 	// extracted parameter is the last in a positional parameter
 	// based CTCP message.
-	//
 
 	if(!msg_ptr)
 		return nullptr;
@@ -729,7 +720,6 @@ const char * KviIrcServerParser::extractCtcpParameter(const char * msg_ptr, KviC
 
 const char * KviIrcServerParser::extractCtcpParameter(const char * p_msg_ptr, QString & resultBuffer, bool bSpaceBreaks, bool bSafeOnly)
 {
-	//
 	// This one extracts the "next" ctcp parameter in p_msg_ptr
 	// and puts it in the supplied buffer.
 	// It is assumed that the leading and trailing CTCP
@@ -738,7 +728,6 @@ const char * KviIrcServerParser::extractCtcpParameter(const char * p_msg_ptr, QS
 	// bSpaceBreaks should be set to false if (and only if) the
 	// extracted parameter is the last in a positional parameter
 	// based CTCP message.
-	//
 
 	QByteArray buffer;
 	const char * msg_ptr = p_msg_ptr;
@@ -1150,9 +1139,6 @@ void KviIrcServerParser::parseCtcpReplyPing(KviCtcpMessage * msg)
 
 		unsigned int uDiffSecs = tv.tv_sec - uSecs;
 
-		//unsigned int uDiffMSecs = ((((unsigned int)tv.tv_usec) - uMSecs) / 1000) % 1000;
-		//if ((uMSecs  / 1000000) <= uDiffSecs) uDiffSecs -= (uMSecs  / 1000000)
-
 		while(uMSecs > 1000000)
 			uMSecs /= 10; // precision too high?
 		if(((unsigned int)tv.tv_usec) < uMSecs)
@@ -1194,7 +1180,6 @@ void KviIrcServerParser::parseCtcpRequestVersion(KviCtcpMessage * msg)
 #else
 			szVersion.append(QString(" - %1 (%2)").arg(KviRuntimeInfo::name(), KviRuntimeInfo::release()));
 #endif
-			//szVersion.append(QString(" - QT Version: %1 - %2").arg(qVersion(), __tr2qs("http://www.kvirc.net/")));
 			if(!KVI_OPTION_STRING(KviOption_stringCtcpVersionPostfix).isEmpty())
 			{
 				QString sz = KVI_OPTION_STRING(KviOption_stringCtcpVersionPostfix);
@@ -1583,7 +1568,6 @@ void KviIrcServerParser::parseCtcpRequestAction(KviCtcpMessage * msg)
 }
 
 // FIXME: #warning "UTSNAME ?...AND OTHER INFO ?...SYSTEM IDLE TIME ?...KVIRC IDLE TIME ?"
-
 void KviIrcServerParser::parseCtcpRequestAvatar(KviCtcpMessage * msg)
 {
 	// AVATAR
@@ -1851,19 +1835,6 @@ void KviIrcServerParser::parseCtcpRequestDcc(KviCtcpMessage * msg)
 		}
 	}
 
-	/*if(KVI_OPTION_BOOL(KviOption_boolIgnoreCtcpDcc))
-	{
-		if(!msg->msg->haltOutput())
-		{
-			msg->msg->console()->output(KVI_OUT_DCCREQUEST,
-				__tr2qs("Ignoring DCC %S request from \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q %S)"),
-				&p.szType,&(msg->pSource->nick()),
-				&(msg->pSource->user()),&(msg->pSource->host()),
-				&msg->szTag,&aux);
-		}
-		return;
-	}*/
-
 	bool bIsFlood = checkCtcpFlood(msg);
 
 	if(bIsFlood && ((kvi_strEqualCI(p.szType.ptr(), "SEND")) || (kvi_strEqualCI(p.szType.ptr(), "RSEND")) || (kvi_strEqualCI(p.szType.ptr(), "TSEND")) || (kvi_strEqualCI(p.szType.ptr(), "TRSEND"))))
diff --git a/src/kvirc/sparser/KviIrcServerParser_literalHandlers.cpp b/src/kvirc/sparser/KviIrcServerParser_literalHandlers.cpp
index 24e953df2..a7920f6d1 100644
--- a/src/kvirc/sparser/KviIrcServerParser_literalHandlers.cpp
+++ b/src/kvirc/sparser/KviIrcServerParser_literalHandlers.cpp
@@ -1959,13 +1959,6 @@ void KviIrcServerParser::parseLiteralMode(KviIrcMessage * msg)
 	QString szNick, szUser, szHost;
 	msg->decodeAndSplitPrefix(szNick, szUser, szHost);
 
-	//	if(!source.hasHost())
-	//	{
-	//		// This is a server or a channel service
-	//		KviCString snick = source.nick();
-	//		if(snick.contains('.'))source.setHost(source.nick()); // this is a server
-	//	}
-
 	QString szTarget = msg->connection()->decodeText(msg->safeParam(0));
 	KviCString modefl(msg->safeParam(1));
 
@@ -1999,8 +1992,6 @@ void KviIrcServerParser::parseChannelMode(const QString & szNick, const QString
 {
 	bool bSet = true;
 
-	// bIsMultiMode: +snt
-	// bIsMultiSingleMode: +ooo
 	bool bIsMultiMode = false;
 	bool bIsMultiSingleMode = false;
 	bool bShowAsCompact = false;
@@ -2415,7 +2406,7 @@ void KviIrcServerParser::parseChannelMode(const QString & szNick, const QString
 				else if(msg->connection()->serverInfo()->supportedParameterModes().contains(*aux)
 				    || (msg->connection()->serverInfo()->supportedParameterWhenSetModes().contains(*aux) && bSet))
 				{
-					/*
+				/*
 				 * Examples:
 				 * flood mode with parameter like "[5m#M4]:5", see bug #505
 				 * Channel join throttling like "4:5", see bug #731
@@ -2443,7 +2434,7 @@ void KviIrcServerParser::parseChannelMode(const QString & szNick, const QString
 				}
 				else if(msg->connection()->serverInfo()->isSupportedModeFlag(*aux))
 				{
-					/*
+				/*
 				 * A custom mode prefix, like inspircd's  +y => !
 				 * We need to correctly echo it, and be sure it doesn't
 				 * get confused as a channel mode
diff --git a/src/kvirc/sparser/KviIrcServerParser_numericHandlers.cpp b/src/kvirc/sparser/KviIrcServerParser_numericHandlers.cpp
index 45aa7f5b4..1987c5ed3 100644
--- a/src/kvirc/sparser/KviIrcServerParser_numericHandlers.cpp
+++ b/src/kvirc/sparser/KviIrcServerParser_numericHandlers.cpp
@@ -329,7 +329,6 @@ void KviIrcServerParser::parseNumeric005(KviIrcMessage * msg)
 					msg->console()->outputNoFmt(KVI_OUT_SERVERINFO, __tr2qs("This server supports the CODEPAGE command, it will be used"));
 				}
 
-				//msg->connection()->sendFmtData("CODEPAGE %s",msg->console()->textCodec()->name());
 			}
 			else if(kvi_strEqualCIN("CHANMODES=", p, 10))
 			{
@@ -368,10 +367,6 @@ void KviIrcServerParser::parseNumeric005(KviIrcMessage * msg)
 					msg->console()->outputNoFmt(KVI_OUT_SERVERINFO, __tr2qs("This server supports the CODEPAGE command, it will be used"));
 				}
 
-				/*if( tmp.contains(msg->console()->textCodec()->name(),false) || tmp.contains("*",false) )
-				{
-					msg->connection()->sendFmtData("CODEPAGE %s",msg->console()->textCodec()->name());
-				}*/
 			}
 			else if(kvi_strEqualCIN("WHOX", p, 4))
 			{
@@ -407,10 +402,6 @@ void KviIrcServerParser::parseNumeric005(KviIrcMessage * msg)
 		if(!msg->haltOutput())
 			msg->console()->outputNoFmt(KVI_OUT_SERVERINFO, inf);
 	}
-	// } else {
-	// 	// RPL_BOUNCE prolly
-	// 	if(!msg->haltOutput())msg->console()->outputNoFmt(KVI_OUT_SERVERINFO,msg->safeTrailing());
-	// }
 }
 
 void KviIrcServerParser::parseNumericSnomask(KviIrcMessage * msg)
@@ -502,7 +493,6 @@ void KviIrcServerParser::parseNumericNames(KviIrcMessage * msg)
 	// [=|*|@] is the type of the channel:
 	// = --> public  * --> private   @ --> secret
 	// ...but we ignore it
-	//QString szChan = msg->connection()->decodeText(msg->cSafeParam(2)->data()); // <-- QByteArray::data() is implicitly unsafe: it CAN return 0
 	QString szChan = msg->connection()->decodeText(msg->safeParam(2));
 	KviChannelWindow * chan = msg->connection()->findChannel(szChan);
 	// and run to the first nickname
@@ -2712,7 +2702,6 @@ void KviIrcServerParser::parseNumericHiddenHost(KviIrcMessage * msg)
 void KviIrcServerParser::parseNumericNoSuchServer(KviIrcMessage * msg)
 {
 	//ERR_NOSUCHSERVER     402
-
 	//this can be an "awhois -i" reply for a nickname that's not connected
 	QString szNick = msg->connection()->decodeText(msg->safeParam(1));
 
diff --git a/src/kvirc/ui/KviConsoleWindow.cpp b/src/kvirc/ui/KviConsoleWindow.cpp
index 143195085..26bc8832c 100644
--- a/src/kvirc/ui/KviConsoleWindow.cpp
+++ b/src/kvirc/ui/KviConsoleWindow.cpp
@@ -1311,8 +1311,6 @@ void KviConsoleWindow::getWindowListTipText(QString & buffer)
 		buffer += html_eofbold;
 		buffer += html_br;
 
-		//buffer += html_spaceparopen;
-
 		QString tspan = KviTimeUtils::formatTimeInterval((unsigned int)(kvi_secondsSince(connection()->statistics()->connectionStartTime())),
 		    KviTimeUtils::NoLeadingEmptyIntervals | KviTimeUtils::NoLeadingZeroes);
 
@@ -1322,7 +1320,6 @@ void KviConsoleWindow::getWindowListTipText(QString & buffer)
 		buffer += html_bold;
 		buffer += tspan;
 		buffer += html_eofbold;
-		//buffer += html_spaceparclosed;
 
 		buffer += "</td></tr><tr><td bgcolor=\"#F0F0F0\"><font color=\"#000000\">";
 
diff --git a/src/kvirc/ui/KviHistoryWindow.cpp b/src/kvirc/ui/KviHistoryWindow.cpp
index 86ad584ad..0975aa3ab 100644
--- a/src/kvirc/ui/KviHistoryWindow.cpp
+++ b/src/kvirc/ui/KviHistoryWindow.cpp
@@ -97,40 +97,6 @@ hideme:
 	doHide();
 }
 
-/*
-bool KviHistoryWindow::findTypedSeq()
-{
-	int cnt = count();
-	int max = 0;
-	int mit = -1;
-	bool bFullMax = false;
-	for(int i=0;i<cnt;i++)
-	{
-		KviCString szIt = text(i);
-		int j;
-		for(j=0;j<szIt.len();j++)
-		{
-			if(tolower(*(szIt.ptr() + j)) != tolower(*(m_szTypedSeq.ptr() + j)))break;
-		}
-		if(j < max)
-		{
-			goto got_mit;
-		} else {
-			if(j >= max)
-			{
-				bFullMax = (j == szIt.len());
-				max = j;
-				mit = i;
-			}
-		}
-	}
-got_mit:
-	setCurrentItem(mit);
-	m_szCurFullSeq = text(mit);
-	return bFullMax;
-}
-*/
-
 void KviHistoryWindow::keyPressEvent(QKeyEvent * e)
 {
 	switch(e->key())
@@ -147,55 +113,9 @@ void KviHistoryWindow::keyPressEvent(QKeyEvent * e)
 			doHide();
 			return;
 			break;
-			/*
-		case Qt::Key_Backspace:
-			if(m_szTypedSeq.hasData())
-			{
-				m_szTypedSeq.cutRight(1);
-				findTypedSeq();
-			} else {
-				doHide();
-				if(m_pOwner)g_pApp->sendEvent(m_pOwner,e);
-			}
-			return;
-		break;
-		case Qt::Key_Space:
-			doHide();
-			if(findTypedSeq())
-			{
-				KviCString szItem = m_szTypedSeq;
-				szItem.append(' ');
-				if(m_pOwner)m_pOwner->insertText(szItem);
-			} else {
-				if(m_pOwner)g_pApp->sendEvent(m_pOwner,e);
-			}
-			return;
-		break;
-		case Qt::Key_Tab:
-			doHide();
-			findTypedSeq();
-			KviCString szItem = m_szCurFullSeq;
-			szItem.append(KVI_TEXT_ICON);
-			if(m_pOwner)m_pOwner->insertText(szItem);
-			return;
-		break;
-	*/
-	}
 
-	/*
-	int as = e->ascii();
-	if((as >= 'a' && as <= 'z') || (as >= 'A' && as <= 'Z') || (as >= '0' && as <= '9')
-		|| (as == '?') || (as == '$') || (as == '.') || (as == ',') || (as == '!') || (as =='&'))
-	{
-		m_szTypedSeq.append((char)as);
-		findTypedSeq();
-	} else {
-	*/
 	if(m_pOwner)
 		g_pApp->sendEvent(m_pOwner, e);
-	/*
-	}
-	*/
 }
 
 void KviHistoryWindow::ownerDead()
@@ -266,7 +186,6 @@ void KviHistoryWindowWidget::popup(KviInput * pOwner)
 {
 	m_pWindow->popup(pOwner);
 	m_pWindow->setFixedSize(width(), height());
-	//move(QCursor::pos());
 	show();
 }
 
diff --git a/src/kvirc/ui/KviImageDialog.cpp b/src/kvirc/ui/KviImageDialog.cpp
index 50283afe5..b85bade20 100644
--- a/src/kvirc/ui/KviImageDialog.cpp
+++ b/src/kvirc/ui/KviImageDialog.cpp
@@ -148,9 +148,6 @@ KviImageDialog::KviImageDialog(QWidget * par,
 	g->addWidget(l, 1, 0, 1, 3);
 
 	m_pListBox = new KviTalListWidget(this);
-	//not supported by listwidget.. we'd need treewidget here
-	// 	m_pListBox->setColumnMode(KviTalListWidget::FitToWidth);
-	// 	m_pListBox->setRowMode(KviTalListWidget::Variable);
 
 	m_pTip = new KviDynamicToolTip(m_pListBox->viewport());
 
diff --git a/src/kvirc/ui/KviInput.cpp b/src/kvirc/ui/KviInput.cpp
index 2da13bd97..42e0fd9bc 100644
--- a/src/kvirc/ui/KviInput.cpp
+++ b/src/kvirc/ui/KviInput.cpp
@@ -96,14 +96,12 @@ KviInput::KviInput(KviWindow * pPar, KviUserListView * pView)
 	m_pButtonContainer->setMargin(0);
 
 	m_pButtonContainer->setSizePolicy(QSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum));
-	//if(m_pButtonContainer->layout())
-	// m_pButtonContainer->layout()->setSizeConstraint(QLayout::SetMinimumSize);
 
 	m_pHistoryButton = new QToolButton(m_pButtonContainer);
 	m_pHistoryButton->setObjectName("historybutton");
 
 	m_pHistoryButton->setIconSize(QSize(22, 22));
-	//m_pHistoryButton->setUpdatesEnabled(true); ???
+
 	QIcon is1;
 	if(KVI_OPTION_BOOL(KviOption_boolEnableInputHistory)) //G&N mar 2005
 	{
diff --git a/src/kvirc/ui/KviInputEditor.cpp b/src/kvirc/ui/KviInputEditor.cpp
index 7ee0fa697..6a44e7a43 100644
--- a/src/kvirc/ui/KviInputEditor.cpp
+++ b/src/kvirc/ui/KviInputEditor.cpp
@@ -1920,24 +1920,24 @@ void KviInputEditor::installShortcuts()
 	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_SEND_KVS,this,SLOT(sendKvs()),nullptr,Qt::WidgetShortcut);
+	//KviShortcut::create(KVI_SHORTCUTS_INPUT_SEND_KVS_2,this,SLOT(sendKvs()),nullptr,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_RETURN,this,SLOT(returnHit()),nullptr,Qt::WidgetShortcut);
+	//KviShortcut::create(KVI_SHORTCUTS_INPUT_RETURN_2,this,SLOT(returnHit()),nullptr,Qt::WidgetShortcut);
+	//KviShortcut::create(KVI_SHORTCUTS_INPUT_BACKSPACE,this,SLOT(backspaceHit()),nullptr,Qt::WidgetShortcut);
+	//KviShortcut::create(KVI_SHORTCUTS_INPUT_BACKSPACE_2,this,SLOT(backspaceHit()),nullptr,Qt::WidgetShortcut);
+	//KviShortcut::create(KVI_SHORTCUTS_INPUT_DELETE,this,SLOT(deleteHit()),nullptr,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
+	// this is currently ambiguous, 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()), nullptr, Qt::WidgetShortcut);
 }
@@ -2010,8 +2010,7 @@ void KviInputEditor::keyPressEvent(QKeyEvent * e)
 		{
 			case Qt::Key_J:
 			{
-				//avoid Ctrl+J from inserting a linefeed
-				break;
+				break; //avoid Ctrl+J from inserting a linefeed
 			}
 			default:
 				if(!m_bReadOnly)
@@ -2275,8 +2274,7 @@ void KviInputEditor::completion(bool bShift)
 
 			if(bInCommand && !bIsCommand)
 			{
-				// escape crazy things like Nick\nquit
-				completionEscapeUnsafeToken(szMatch);
+				completionEscapeUnsafeToken(szMatch); // escape crazy things like Nick\nquit
 			}
 		}
 		else
@@ -2351,8 +2349,7 @@ void KviInputEditor::standardNickCompletionInsertCompletedText(const QString & s
 	}
 	if(bInCommand)
 	{
-		// escape crazy things like Nick\nquit
-		completionEscapeUnsafeToken(szBuffer);
+		completionEscapeUnsafeToken(szBuffer); // escape crazy things like Nick\nquit
 	}
 	replaceWordBeforeCursor(szReplacedWord, szBuffer, false);
 }
@@ -3229,8 +3226,7 @@ void KviInputEditor::homeInternalSelection()
 
 	if((m_iSelectionBegin == -1) && (m_iSelectionEnd == -1))
 	{
-		// There is no selection
-		m_iSelectionEnd = m_iCursorPosition;
+		m_iSelectionEnd = m_iCursorPosition; // There is no selection
 	}
 	else
 	{
@@ -3256,13 +3252,11 @@ void KviInputEditor::endInternalSelection()
 {
 	if((m_iSelectionBegin == -1) && (m_iSelectionEnd == -1))
 	{
-		// There is no selection
-		m_iSelectionBegin = m_iCursorPosition;
+		m_iSelectionBegin = m_iCursorPosition; // There is no selection
 	}
 	else
 	{
-		// There is selection
-		m_iSelectionBegin = m_iSelectionEnd;
+		m_iSelectionBegin = m_iSelectionEnd; // There is no selection
 	}
 
 	m_iSelectionEnd = m_szTextBuffer.length();
diff --git a/src/kvirc/ui/KviStatusBarApplet.cpp b/src/kvirc/ui/KviStatusBarApplet.cpp
index 65af067d5..d8f5921f4 100644
--- a/src/kvirc/ui/KviStatusBarApplet.cpp
+++ b/src/kvirc/ui/KviStatusBarApplet.cpp
@@ -731,8 +731,6 @@ void KviStatusBarUpdateIndicator::checkVersion()
 	KviUrl url(szUrl);
 
 	m_pHttpRequest = new KviHttpRequest();
-	//connect(m_pHttpRequest,SIGNAL(resolvingHost(const QString &)),this,SLOT(hostResolved(const QString &)));
-	//connect(m_pHttpRequest,SIGNAL(connectionEstablished()),this,SLOT(connectionEstablished()));
 	connect(m_pHttpRequest, SIGNAL(receivedResponse(const QString &)), this, SLOT(responseReceived(const QString &)));
 	connect(m_pHttpRequest, SIGNAL(binaryData(const KviDataBuffer &)), this, SLOT(binaryDataReceived(const KviDataBuffer &)));
 	connect(m_pHttpRequest, SIGNAL(terminated(bool)), this, SLOT(requestCompleted(bool)));