cleanup: remove more ancient commented code p3

52 files changed, 58 insertions, 1157 deletions

diff --git a/src/kvirc/kernel/KviTextIconManager.cpp b/src/kvirc/kernel/KviTextIconManager.cpp
index 512cd83df..a05f1d2e3 100644
--- a/src/kvirc/kernel/KviTextIconManager.cpp
+++ b/src/kvirc/kernel/KviTextIconManager.cpp
@@ -189,25 +189,6 @@ void KviTextIconManager::load()
 	int iUpd = 0;
 	QString szPath;
 
-	/*
-	Gone: texticons not supported in themes. Otherwise saving them is problematic (where they should be saved?)
-	bool bCheckUserDefinedTheme = false;
-
-	if(!KVI_OPTION_STRING(KviOption_stringIconThemeSubdir).isEmpty())
-	{
-		g_pApp->getLocalKvircDirectory(szPath,KviApplication::Themes,KVI_OPTION_STRING(KviOption_stringIconThemeSubdir));
-		szPath += KVI_PATH_SEPARATOR_CHAR;
-		szPath += KVI_CONFIGFILE_TEXTICONS;
-		bCheckUserDefinedTheme = QFile::exists(szPath);
-	}
-
-	if(bCheckUserDefinedTheme)
-	{
-		load(szPath,false);
-		return;
-	}
-	*/
-
 	if(g_pApp->getReadOnlyConfigPath(szTmp, KVI_CONFIGFILE_TEXTICONS))
 		iUpd = load(szTmp, false);
 
@@ -241,21 +222,8 @@ void KviTextIconManager::applyOptions()
 void KviTextIconManager::save()
 {
 	QString szPath;
-	/*
-	Gone: texticons not supported in themes. Otherwise saving them is problematic (where they should be saved?)
-	if(!KVI_OPTION_STRING(KviOption_stringIconThemeSubdir).isEmpty())
-	{
-		g_pApp->getLocalKvircDirectory(szPath,KviApplication::Themes,KVI_OPTION_STRING(KviOption_stringIconThemeSubdir));
-		// getLocalKvircDirectory will not create the last component if it doesn't exist
-		KviFileUtils::makeDir(szPath);
-		szPath += KVI_PATH_SEPARATOR_CHAR;
-		szPath += KVI_CONFIGFILE_TEXTICONS;
-	} else {
-	*/
 	g_pApp->getLocalKvircDirectory(szPath, KviApplication::Config, KVI_CONFIGFILE_TEXTICONS);
-	/*
-	}
-	*/
+
 	//qDebug("Saving text icons to %s",szPath.toUtf8().data());
 	save(szPath);
 }
diff --git a/src/kvirc/kvs/KviKvsRunTimeContext.cpp b/src/kvirc/kvs/KviKvsRunTimeContext.cpp
index 3b611048c..1b9ade6d3 100644
--- a/src/kvirc/kvs/KviKvsRunTimeContext.cpp
+++ b/src/kvirc/kvs/KviKvsRunTimeContext.cpp
@@ -50,8 +50,6 @@ KviKvsExtendedRunTimeData::~KviKvsExtendedRunTimeData()
 
 void KviKvsExtendedRunTimeData::setPopupId(QString * pPopupId)
 {
-	/*	if(m_pPopupId)
-		delete m_pPopupId;*/
 	m_pPopupId = pPopupId;
 };
 
diff --git a/src/kvirc/kvs/KviKvsVariant.cpp b/src/kvirc/kvs/KviKvsVariant.cpp
index e29c18203..f3b4458f3 100644
--- a/src/kvirc/kvs/KviKvsVariant.cpp
+++ b/src/kvirc/kvs/KviKvsVariant.cpp
@@ -763,10 +763,6 @@ bool KviKvsVariant::asInteger(kvs_int_t & iVal) const
 			iVal = m_pData->m_u.bBoolean ? 1 : 0;
 			return true;
 			break;
-		//case KviKvsVariantData::HObject: <-- light casts from objects to integer are not valid
-		//	iVal = m_pData->m_u.hObject ? 1 : 0;
-		//	return true;
-		//break;
 		default: /* make gcc happy */
 			break;
 	}
diff --git a/src/kvirc/kvs/event/KviKvsEventHandler.cpp b/src/kvirc/kvs/event/KviKvsEventHandler.cpp
index d2fd494a5..37f14aca3 100644
--- a/src/kvirc/kvs/event/KviKvsEventHandler.cpp
+++ b/src/kvirc/kvs/event/KviKvsEventHandler.cpp
@@ -58,14 +58,3 @@ KviKvsModuleEventHandler::~KviKvsModuleEventHandler()
 {
 	delete m_pProc;
 }
-
-/*
-KviKvsOldModuleEventHandler::KviKvsOldModuleEventHandler(KviModuleEventParseProc p,KviModule * m)
-: KviKvsEventHandler(KviKvsEventHandler::OldModule), m_pModule(m), m_proc(p)
-{
-}
-
-KviKvsOldModuleEventHandler::~KviKvsOldModuleEventHandler()
-{
-}
-*/
diff --git a/src/kvirc/kvs/event/KviKvsEventManager.cpp b/src/kvirc/kvs/event/KviKvsEventManager.cpp
index 7f72aa96c..4d4b790f5 100644
--- a/src/kvirc/kvs/event/KviKvsEventManager.cpp
+++ b/src/kvirc/kvs/event/KviKvsEventManager.cpp
@@ -254,18 +254,6 @@ bool KviKvsEventManager::removeModuleAppHandler(unsigned int uEvIdx, KviKvsModul
 				return true;
 			}
 		}
-		// COMPAT
-		/*
-		} else if(h->type() == KviKvsEventHandler::OldModule)
-		{
-			if(((KviKvsOldModuleEventHandler *)h)->module() == i)
-			{
-				m_appEventTable[uEvIdx].removeHandler(h);
-				return true;
-			}
-		}
-		*/
-		// END COMPAT
 	}
 	return false;
 }
@@ -289,17 +277,6 @@ void KviKvsEventManager::removeAllModuleAppHandlers(KviKvsModuleInterface * pIfa
 					l.append(h);
 				}
 			}
-			// COMPAT
-			/*
-			} else if(h->type() == KviKvsEventHandler::OldModule)
-			{
-				if(((KviKvsOldModuleEventHandler *)h)->module() == pIface)
-				{
-					l.append(h);
-				}
-			}
-			*/
-			// END COMPAT
 		}
 		for(h = l.first(); h; h = l.next())
 			i.removeHandler(h);
@@ -325,17 +302,6 @@ void KviKvsEventManager::removeAllModuleRawHandlers(KviKvsModuleInterface * pIfa
 					l.append(h);
 				}
 			}
-			// COMPAT
-			/*
-			} else if(h->type() == KviKvsEventHandler::OldModule)
-			{
-				if(((KviKvsOldModuleEventHandler *)h)->module() == pIface)
-				{
-					l.append(h);
-				}
-			}
-			*/
-			// END COMPAT
 		}
 		for(h = l.first(); h; h = l.next())
 			i->removeRef(h);
@@ -404,23 +370,6 @@ bool KviKvsEventManager::removeModuleRawHandler(unsigned int uRawIdx, KviKvsModu
 				return true;
 			}
 		}
-		// COMPAT
-		/*
-		} else if(h->type() == KviKvsEventHandler::OldModule)
-		{
-			if(((KviKvsOldModuleEventHandler *)h)->module() == i)
-			{
-				m_rawEventTable[uRawIdx]->removeRef(h);
-				if(m_rawEventTable[uRawIdx]->isEmpty())
-				{
-					delete m_rawEventTable[uRawIdx];
-					m_rawEventTable[uRawIdx] = 0;
-				}
-				return true;
-			}
-		}
-		*/
-		// END COMPAT
 	}
 	return false;
 }
diff --git a/src/kvirc/kvs/object/KviKvsObject.cpp b/src/kvirc/kvs/object/KviKvsObject.cpp
index cdbfbb01a..c25508347 100644
--- a/src/kvirc/kvs/object/KviKvsObject.cpp
+++ b/src/kvirc/kvs/object/KviKvsObject.cpp
@@ -47,7 +47,7 @@
 
 #include <time.h>
 
-/*
+	/*
 		@doc: objects
 		@title:
 			Object scripting
@@ -518,7 +518,7 @@
 			by all the modern kernels and used in inter-process communication).[br]
 	*/
 
-/*
+	/*
 		@doc: object
 		@keyterms:
 			object class, object, class
@@ -662,22 +662,10 @@ KviKvsObject::KviKvsObject(KviKvsObjectClass * pClass, KviKvsObject * pParent, c
 		pParent->registerChild(this);
 
 	KviKvsKernel::instance()->objectController()->registerObject(this);
-
-	//	qDebug("Hello world!");
-	//	[root@localhost cvs3]# kvirc
-	//	Hello world!
-	//	[root@localhost cvs3]# date
-	//	Tue Sep  5 21:53:54 CEST 2000
-	//	[root@localhost cvs3]#
-
-	//  Ported to KVS on 29.04.2005
 }
 
 KviKvsObject::~KviKvsObject()
 {
-	//KVI_TRACE_FUNCTION;
-	//KVI_TRACE("Destroying kvs object %x, child of %x",this,parentObject());
-
 	if(!m_bDestructorCalled)
 	{
 		// Destructor not called yet.. something is wrong.
@@ -978,7 +966,6 @@ int KviKvsObject::emitSignal(const QString & sigName, KviKvsObjectFunctionCall *
 			else
 			{
 				// else destroyed in the call! (already disconnected)
-
 				pOuterCall->warning(
 				    __tr2qs_ctx("Slot target object destroyed while emitting signal '%Q' from object '%Q::%Q'", "kvs"),
 				    &(sigName),
@@ -1718,7 +1705,6 @@ void KviKvsObject::delayedDie()
 
 void KviKvsObject::setObject(QObject * o, bool bIsOwned)
 {
-	//__range_invalid(m_pObject);
 	m_bObjectOwner = bIsOwned;
 	m_pObject = o;
 	o->installEventFilter(this);
@@ -1793,14 +1779,6 @@ bool KviKvsObject::callFunction(
 	KviKvsObjectFunctionCall fc(pContext, pParams, pRetVal);
 
 	return h->call(this, &fc);
-
-	// Not only gcc spits out compiler errors:
-	// 25.09.2001, at this point in file
-
-	// c:\programmi\microsoft visual studio\myprojects\kvirc3\src\kvirc\uparser\kvi_scriptobject.cpp(1234) : fatal error C1001: INTERNAL COMPILER ERROR
-	//    (compiler file 'E:\8168\vc98\p2\src\P2\main.c', line 494)
-	//    Please choose the Technical Support command on the Visual C++
-	//    Help menu, or open the Technical Support help file for more information
 }
 
 void KviKvsObject::registerPrivateImplementation(const QString & szFunctionName, const QString & szCode)
diff --git a/src/kvirc/kvs/parser/KviKvsParser_command.cpp b/src/kvirc/kvs/parser/KviKvsParser_command.cpp
index 081da36b8..34668ce21 100644
--- a/src/kvirc/kvs/parser/KviKvsParser_command.cpp
+++ b/src/kvirc/kvs/parser/KviKvsParser_command.cpp
@@ -274,17 +274,6 @@ KviKvsTreeNodeCommand * KviKvsParser::parseCommand()
 						delete pRebindData;
 					return nullptr;
 				}
-				// actually we need empty callbacks (for alias() at least)
-				// the single command implementations should take care of checking it
-				/*else {
-
-					warning(pIdentifier,__tr2qs_ctx("Callback command called with an empty callback instruction","kvs"));
-					error(KVSP_curCharPointer,__tr2qs_ctx("Callback commands must have a callback instruction","kvs"));
-					if(sw)delete sw;
-					delete dl;
-					return 0;
-
-				}*/
 			}
 			else
 			{
diff --git a/src/kvirc/kvs/parser/KviKvsParser_expression.cpp b/src/kvirc/kvs/parser/KviKvsParser_expression.cpp
index a1030a6c8..804fdade6 100644
--- a/src/kvirc/kvs/parser/KviKvsParser_expression.cpp
+++ b/src/kvirc/kvs/parser/KviKvsParser_expression.cpp
@@ -525,7 +525,6 @@ KviKvsTreeNodeExpression * KviKvsParser::parseExpression(char terminator)
 	curTopOperator->setLeft(left);
 
 	// ok.. parse the right side
-
 	// Now curTopOperator has the left subtree (one node) set
 	// and it points to the TOP (=ROOT) node
 	// Evaluate the rest
@@ -598,41 +597,4 @@ KviKvsTreeNodeExpression * KviKvsParser::parseExpression(char terminator)
 	KVSP_ASSERT(false);
 
 	return nullptr; //newer here
-
-	/*
-
-
-	KviKvsTreeNodeExpression * right = parseExpression(terminator);
-	if(!right)
-	{
-		delete op;
-		return 0;
-	}
-
-	// left * a + b
-
-	//      *
-	// left      +
-	//         a    b
-
-*/
-	/*
-	// now.. the left side is a single operand for sure
-	// the right side might be a single operand or a sequence of operations
-	if(right->isOperator())
-	{
-		// if the operator has lower precedence than op then
-		if(right->precedence() < op->precedence())
-		{
-			right->attachHighPrecedenceOperator(op);
-			return right;
-		}
-	}
-*/
-	/*
-	// a single operand or a greater precedence operator
-	op->setRight(right);
-
-	return op;
-	*/
 }
diff --git a/src/kvirc/ui/KviConsoleWindow.cpp b/src/kvirc/ui/KviConsoleWindow.cpp
index 26bc8832c..fef55ad54 100644
--- a/src/kvirc/ui/KviConsoleWindow.cpp
+++ b/src/kvirc/ui/KviConsoleWindow.cpp
@@ -813,41 +813,7 @@ void KviConsoleWindow::outputPrivmsg(KviWindow * wnd,
 		szNick.prepend(KviControlCodes::Color);
 		szNick.append(KviControlCodes::Color);
 	}
-	/*	if(KVI_OPTION_BOOL(KviOption_boolUseUserListColorsAsNickColors) && bIsChan)
-	{
-		if(((KviChannelWindow*)wnd)->userListView())
-		{
-			KviUserListEntry *e = ((KviChannelWindow*)wnd)->userListView()->findEntry(nick);
-			if(e)
-			{
-				int sum = 0;
-				int i = nick.length();
-				const QChar * aux = nick.unicode();
-				// FIXME: Shouldn't this be case insensitive ?
-				while(i > 0)
-				{
-					sum += aux->unicode();
-					aux++;
-					i--;
-				}
-				int color;
-				if(e->flags() == 0)
-				{
-					color = KVI_COLOR_EXT_USER_NORMAL;
-				} else {
-					color = (e->flags() & KVI_USERFLAG_CHANOWNER) ? \
-						KVI_COLOR_EXT_USER_OWNER : ((e->flags() & KVI_USERFLAG_CHANADMIN) ? \
-						KVI_COLOR_EXT_USER_ADMIN : ((e->flags() & KVI_USERFLAG_OP) ? \
-						KVI_COLOR_EXT_USER_OP : ((e->flags() & KVI_USERFLAG_HALFOP) ? \
-						KVI_COLOR_EXT_USER_HALFOP : ((e->flags() & KVI_USERFLAG_VOICE) ? \
-						KVI_COLOR_EXT_USER_VOICE : KVI_COLOR_EXT_USER_USEROP))));
-				}
-				szNick.prepend(QString("%1").arg(color));
-				szNick.prepend(KVI_TEXT_COLOR);
-				szNick.append(KVI_TEXT_COLOR);
-			}
-		}
-	}*/
+
 	if(KVI_OPTION_BOOL(KviOption_boolBoldedNicks))
 	{
 		szNick.prepend(KviControlCodes::Bold);
diff --git a/src/kvirc/ui/KviOptionsWidget.cpp b/src/kvirc/ui/KviOptionsWidget.cpp
index f6a4ae4d0..732ad477f 100644
--- a/src/kvirc/ui/KviOptionsWidget.cpp
+++ b/src/kvirc/ui/KviOptionsWidget.cpp
@@ -626,25 +626,6 @@ KviFontSelector * KviOptionsWidget::addFontSelector(QWidget * pParent, const QSt
 	return d;
 }
 
-//#define DECLARE_COMMIT_FUNCTION(__fnc,__class,__classString)
-//	void KviOptionsWidget::__fnc()
-//	{
-//		QObjectList * l = queryList(__classString);
-//		if(!l)return;
-//		QObjectListIt it(*l);
-//		while(it.current())
-//		{
-//			((__class *)it.current())->commit();
-//			++it;
-//		}
-//		delete l;
-//	}
-
-//DECLARE_COMMIT_FUNCTION(commitBoolSelectors,KviBoolSelector,"KviBoolSelector")
-//DECLARE_COMMIT_FUNCTION(commitUIntSelectors,KviUIntSelector,"KviUIntSelector")
-//DECLARE_COMMIT_FUNCTION(commitStringSelectors,KviStringSelector,"KviStringSelector")
-//DECLARE_COMMIT_FUNCTION(commitPixmapSelectors,KviPixmapSelector,"KviPixmapSelector")
-
 void KviOptionsWidget::addRowSpacer(int x1, int y1, int x2, int y2)
 {
 	QWidget * w = new QWidget(this);
@@ -701,27 +682,8 @@ KviTalGroupBox * KviOptionsWidget::addGroupBox(int x1, int y1, int x2, int y2, Q
 	return g;
 }
 
-/*
-void KviOptionsWidget::addAdvancedButton(int x1,int y1,int x2,int y2)
-{
-	QWidget * w = topLevelWidget();
-	if(!w)return;
-	if(!w->inherits("KviGeneralOptionsDialog"))
-		return;
-
-	QPushButton * b = new QPushButton(__tr2qs("Advanced..."),this);
-	connect(b,SIGNAL(clicked()),this,SLOT(switchToAdvancedPage()));
-	addWidgetToLayout(b,x1,y1,x2,y2);
-}
-*/
-
 void KviOptionsWidget::commitSelectors()
 {
-	//	if(m_iSelectors & KVI_OPTIONSELECTOR_TYPE_BOOL)commitBoolSelectors();
-	//	if(m_iSelectors & KVI_OPTIONSELECTOR_TYPE_UINT)commitUIntSelectors();
-	//	if(m_iSelectors & KVI_OPTIONSELECTOR_TYPE_STRING)commitStringSelectors();
-	//	if(m_iSelectors & KVI_OPTIONSELECTOR_TYPE_PIXMAP)commitPixmapSelectors();
-	//	m_iSelectors = 0;
 	for(KviSelectorInterface * i = m_pSelectorInterfaceList->first(); i; i = m_pSelectorInterfaceList->next())
 	{
 		i->commit();
@@ -732,7 +694,6 @@ void KviOptionsWidget::commitOptionsReset()
 {
 	if(m_iResetFlags)
 		g_pApp->optionResetUpdate(m_iResetFlags);
-	//m_iResetFlags = 0;
 }
 
 void KviOptionsWidget::commit()
@@ -740,11 +701,3 @@ void KviOptionsWidget::commit()
 	commitSelectors();
 	commitOptionsReset();
 }
-
-//void KviOptionsWidget::switchToAdvancedPage()
-//{
-// FIXME: what happens if we're toplevel ????
-// (so nobody listens to this signal....)
-
-//	emit wantToSwitchToAdvancedPage(this);
-//}
diff --git a/src/kvirc/ui/KviUserListView.cpp b/src/kvirc/ui/KviUserListView.cpp
index 3dec27f14..d01e0fd64 100644
--- a/src/kvirc/ui/KviUserListView.cpp
+++ b/src/kvirc/ui/KviUserListView.cpp
@@ -339,14 +339,6 @@ void KviUserListView::updateScrollBarRange()
 
 void KviUserListView::applyOptions()
 {
-	/*	if(!KVI_OPTION_BOOL(KviOption_boolDisableUserListLabel)){
-		m_pUsersLabel->hide();
-		m_pViewArea->setGeometry(0,0,width(),height());
-	}
-	if(KVI_OPTION_BOOL(KviOption_boolDisableUserListLabel)){
-		m_pUsersLabel->show();
-		updateUsersLabel();
-	}*/
 	setFont(KVI_OPTION_FONT(KviOption_fontUserListView));
 	QFontMetrics fm(font());
 
@@ -528,28 +520,6 @@ bool KviUserListView::completeNickStandard(const QString & szBegin, const QStrin
 				}
 				return true;
 			}
-			/*
-			 * This part of code has been commented out to fix #236
-			 * This code takes some absurt assterion about the first character of nicknames
-			 * and their order in the userlist.
-
-			else if(iResult < 0)
-			{
-				// No match...begin is lower than the current entry
-				if(pEntry->m_iFlags == 0) return false;
-				else {
-					int iFlags = pEntry->m_iFlags;
-					// skip the current flag
-					while(pEntry)
-					{
-						if(pEntry->m_iFlags != iFlags)
-							break;
-						pEntry = pEntry->m_pNext;
-					}
-					continue;
-				}
-			}
-			*/
 		}
 		pEntry = pEntry->m_pNext;
 	}
@@ -560,7 +530,6 @@ bool KviUserListView::completeNickStandard(const QString & szBegin, const QStrin
 void KviUserListView::insertUserEntry(const QString & szNnick, KviUserListEntry * pUserEntry)
 {
 	// Complex insertion task :)
-
 	m_pEntryDict->insert(szNnick, pUserEntry);
 	m_iTotalHeight += pUserEntry->m_iHeight;
 
@@ -687,11 +656,11 @@ void KviUserListView::insertUserEntry(const QString & szNnick, KviUserListEntry
 									pEntry = pEntry->m_pNext;
 								}
 							} // else is userop, ops, halfops, and voiced are skipped
-						}     // else it is voiced, ops and halfops are skipped
-					}         // else it is halfop,  ops are skipped
-				}             // else it is op, chan admins are skipped
-			}                 // else it is chan admin, chan owners are skipped
-		}                     // else it is chan owner, so nothing to skip: they are first in the list
+						}         // else it is voiced, ops and halfops are skipped
+					}                 // else it is halfop,  ops are skipped
+				}                         // else it is op, chan admins are skipped
+			}                                 // else it is chan admin, chan owners are skipped
+		}                                         // else it is chan owner, so nothing to skip: they are first in the list
 
 		// now strcmp within the current user-flag group...
 		while(pEntry && (KviQString::cmpCI(pEntry->m_szNick, pUserEntry->m_szNick,
diff --git a/src/kvirc/ui/KviWebPackageManagementDialog.cpp b/src/kvirc/ui/KviWebPackageManagementDialog.cpp
index dbdda58c9..5ace54b15 100644
--- a/src/kvirc/ui/KviWebPackageManagementDialog.cpp
+++ b/src/kvirc/ui/KviWebPackageManagementDialog.cpp
@@ -125,10 +125,7 @@ void KviWebPackageManagementDialog::slotLoadFinished(bool bOk)
 
 	// main frame
 	QWebFrame * pFrame = m_pWebView->page()->mainFrame();
-	/*QWebElement style=pFrame->documentElement().findFirst("style");
-	QString szCss=style.toPlainText();
-	szCss.append("div.item_entry:hover {background-color: rgba(0,0,0,0.9)}");
-	style.setPlainText(szCss);*/
+
 	// search for all item_entry div
 	QWebElementCollection elementscollection = pFrame->documentElement().findAll("div.item_entry");
 
diff --git a/src/kvirc/ui/KviWindowStack.cpp b/src/kvirc/ui/KviWindowStack.cpp
index ab7fef1cd..745d9597a 100644
--- a/src/kvirc/ui/KviWindowStack.cpp
+++ b/src/kvirc/ui/KviWindowStack.cpp
@@ -75,7 +75,6 @@ KviWindowStack::~KviWindowStack()
 
 void KviWindowStack::currentWindowChanged(int iIdx)
 {
-	//if(g_pMainWindow->isActiveWindow())
 	g_pMainWindow->windowActivated((iIdx >= 0) ? (KviWindow *)widget(iIdx) : nullptr);
 }
 
diff --git a/src/modules/aliaseditor/AliasEditorWindow.cpp b/src/modules/aliaseditor/AliasEditorWindow.cpp
index 3092f3bff..7870564c3 100644
--- a/src/modules/aliaseditor/AliasEditorWindow.cpp
+++ b/src/modules/aliaseditor/AliasEditorWindow.cpp
@@ -922,6 +922,7 @@ void AliasEditorWidget::appendSelectedAliasItems(KviPointerList<AliasEditorTreeW
 		}
 	}
 }
+
 void AliasEditorWidget::appendSelectedAliasItemsRecursive(KviPointerList<AliasEditorTreeWidgetItem> * l, QTreeWidgetItem * pStartFrom)
 {
 	for(int i = 0; i < pStartFrom->childCount(); i++)
@@ -939,10 +940,9 @@ void AliasEditorWidget::appendSelectedItems(KviPointerList<AliasEditorTreeWidget
 	for(int i = 0; i < list.count(); i++)
 	{
 		l->append((AliasEditorTreeWidgetItem *)list.at(i));
-		/* if (!((AliasEditorTreeWidgetItem *)list.at(i))->isAlias())
-			appendSelectedAliasItemsRecursive(l,list.at(i));*/
 	}
 }
+
 void AliasEditorWidget::appendSelectedItemsRecursive(KviPointerList<AliasEditorTreeWidgetItem> * l, QTreeWidgetItem * pStartFrom)
 {
 	for(int i = 0; i < pStartFrom->childCount(); i++)
@@ -1178,6 +1178,7 @@ void AliasEditorWidget::activateItem(QTreeWidgetItem * it)
 	openParentItems(it);
 	m_pTreeWidget->setCurrentItem(it);
 }
+
 void AliasEditorWidget::newAlias()
 {
 	QString szNewName = askForAliasName(__tr2qs_ctx("Enter a Filename - KVIrc", "editor"), __tr2qs_ctx("Please enter the new name for the alias.", "editor"), "myfunction");
diff --git a/src/modules/channelsjoin/ChannelsJoinDialog.cpp b/src/modules/channelsjoin/ChannelsJoinDialog.cpp
index 6055c8703..64290ea3e 100644
--- a/src/modules/channelsjoin/ChannelsJoinDialog.cpp
+++ b/src/modules/channelsjoin/ChannelsJoinDialog.cpp
@@ -70,7 +70,6 @@ ChannelsJoinDialog::ChannelsJoinDialog(const char * name)
 	m_pTreeWidget->setRootIsDecorated(true);
 	m_pTreeWidget->setSelectionMode(QAbstractItemView::SingleSelection);
 	g->addWidget(m_pTreeWidget, 0, 0, 1, 2);
-	//connect(m_pTreeWidget,SIGNAL(itemDoubleClicked(QTreeWidgetItem *,int)),this,SLOT(itemDoubleClicked(QTreeWidgetItem *,int)));
 
 	m_pGroupBox = new KviTalGroupBox(Qt::Horizontal, __tr2qs("Channel"), this);
 	QString szMsg = __tr2qs("Name");
@@ -118,18 +117,6 @@ ChannelsJoinDialog::ChannelsJoinDialog(const char * name)
 
 	g->addWidget(cancelButton, 3, 1, Qt::AlignRight);
 
-	/*
-	KviTalHBox * hb = new KviTalHBox(this);
-	hb->setSpacing(4);
-
-	QPushButton * namesButton = new QPushButton("/names", hb);
-	connect(namesButton,SIGNAL(clicked()),this,SLOT(namesClicked()));
-	QPushButton * whoButton = new QPushButton("/who", hb);
-	connect(whoButton,SIGNAL(clicked()),this,SLOT(whoClicked()));
-
-	g->addWidget(hb,2,0);
-*/
-
 	g->setRowStretch(0, 1);
 	g->setColumnStretch(0, 1);
 
@@ -139,7 +126,6 @@ ChannelsJoinDialog::ChannelsJoinDialog(const char * name)
 		g_rectChannelsJoinGeometry.setY(5);
 
 	resize(g_rectChannelsJoinGeometry.width(), g_rectChannelsJoinGeometry.height());
-	//move(g_rectChannelsJoinGeometry.x(),g_rectChannelsJoinGeometry.y());
 
 	QRect rect = g_pApp->desktop()->screenGeometry(g_pMainWindow);
 	move(rect.x() + ((rect.width() - g_rectChannelsJoinGeometry.width()) / 2), rect.y() + ((rect.height() - g_rectChannelsJoinGeometry.height()) / 2));
@@ -467,22 +453,6 @@ void ChannelsJoinDialog::clearClicked()
 	fillListView();
 }
 
-/*
-void ChannelsJoinDialog::whoClicked()
-{
-	KviCString tmp = m_pChannelEdit->text();
-	if(!tmp.isEmpty())doCmd("who", tmp.ptr());
-}
-
-void ChannelsJoinDialog::namesClicked()
-{
-	KviCString tmp = m_pChannelEdit->text();
-	//FIXME: I must be a nice guy and implement /names in the core...
-	if(!tmp.isEmpty())doCmd("raw names", tmp.ptr());
-}
-
-*/
-
 void ChannelsJoinDialog::editReturnPressed()
 {
 	joinClicked();
diff --git a/src/modules/classeditor/ClassEditorWindow.cpp b/src/modules/classeditor/ClassEditorWindow.cpp
index 2dc0cc425..cee1e3d8c 100644
--- a/src/modules/classeditor/ClassEditorWindow.cpp
+++ b/src/modules/classeditor/ClassEditorWindow.cpp
@@ -459,30 +459,6 @@ void ClassEditorWidget::createFullClass(KviKvsObjectClass * pClass, ClassEditorT
 	}
 }
 
-/*
-void ClassEditorWidget::classRefresh(const QString & szName)
-{
-	if(m_bSaving)
-		return;
-	ClassEditorTreeWidgetItem * item;
-	KviKvsScript * class = KviKvsClassManager::instance()->classDict()->find(szName);
-	item = createFullItem(szName);
-	if(item!=m_pLastEditedItem)
-	{
-		item->setBuffer(class->code());
-		return;
-	}
-	if(
-		QMessageBox::warning(0,__tr2qs_ctx("Confirm Overwriting Current - KVIrc","editor"),
-				__tr2qs_ctx("An external script has changed the class you are currently editing. Do you want to accept the external changes?","editor"),
-				QMessageBox::Yes,QMessageBox::No|QMessageBox::Default|QMessageBox::Escape) != QMessageBox::Yes
-		)
-		return;
-	item->setBuffer(class->code());
-	m_pEditor->setText(class->code());
-}
-*/
-
 bool ClassEditorWidget::hasSelectedItems()
 {
 	return m_pTreeWidget->selectedItems().count() ? 1 : 0;
@@ -1057,12 +1033,6 @@ void ClassEditorWidget::slotReplaceAll(const QString & szFind, const QString & s
 {
 	m_pEditor->setFindText(szReplace);
 	searchReplace(szFind, true, szReplace);
-	/*
-	for (int i=0;i<m_pTreeWidget->topLevelItemCount();i++)
-	{
-		recursiveSearchReplace(szFind,(ClassEditorTreeWidgetItem *)m_pTreeWidget->topLevelItem(i),true,szReplace);
-	}
-	*/
 }
 
 void ClassEditorWidget::exportClassBuffer(QString & szBuffer, ClassEditorTreeWidgetItem * pItem)
diff --git a/src/modules/codetester/CodeTesterWindow.cpp b/src/modules/codetester/CodeTesterWindow.cpp
index 30018012c..239ba71f2 100644
--- a/src/modules/codetester/CodeTesterWindow.cpp
+++ b/src/modules/codetester/CodeTesterWindow.cpp
@@ -50,7 +50,7 @@ CodeTesterWidget::CodeTesterWidget(QWidget * par)
 	QGridLayout * g = new QGridLayout(this);
 	m_pEditor = KviScriptEditor::createInstance(this);
 	g->addWidget(m_pEditor, 0, 0, 1, 4);
-	//g->addMultiCellWidget(m_pEditor,0,0,0,3);
+
 	m_pExecuteButton = new QPushButton(__tr2qs_ctx("&Execute", "editor"), this);
 	g->addWidget(m_pExecuteButton, 1, 3);
 	connect(m_pExecuteButton, SIGNAL(clicked()), this, SLOT(execute()));
@@ -114,26 +114,8 @@ void CodeTesterWindow::getConfigGroupName(QString & szName)
 
 void CodeTesterWindow::saveProperties(KviConfigurationFile *) //cfg
 {
-	/*
-#ifdef COMPILE_SCRIPTTOOLBAR
-	cfg->writeEntry("Sizes",m_pEditor->sizes());
-	cfg->writeEntry("LastRaw",m_pEditor->lastEditedRaw().ptr());
-	//qDebug("LAST EDITED=%s",m_pEditor->lastEditedRaw().ptr());
-#endif // COMPILE_SCRIPTTOOLBAR
-*/
 }
 
 void CodeTesterWindow::loadProperties(KviConfigurationFile *) //cfg
 {
-	/*
-#ifdef COMPILE_SCRIPTTOOLBAR
-	QValueList<int> def;
-	def.append(20);
-	def.append(80);
-	m_pEditor->setSizes(cfg->readIntListEntry("Sizes",def));
-	KviCString tmp = cfg->readEntry("LastRaw","");
-	m_pEditor->editRaw(tmp);
-	//qDebug("LAST EDITED WAS %s",tmp.ptr());
-#endif // COMPILE_SCRIPTTOOLBAR
-*/
 }
diff --git a/src/modules/dcc/DccFileTransfer.cpp b/src/modules/dcc/DccFileTransfer.cpp
index 981c84008..866e3a8df 100644
--- a/src/modules/dcc/DccFileTransfer.cpp
+++ b/src/modules/dcc/DccFileTransfer.cpp
@@ -2205,14 +2205,7 @@ bool DccFileTransfer::event(QEvent * e)
 					    &(m_pDescriptor->szNick), &(m_pDescriptor->szIp), &(m_pDescriptor->szPort),
 					    &(m_pDescriptor->szLocalFileName));
 				}
-				/*
-				// Also add an optional message to the notifier, unless it is an AVATAR download!
-				if(KVI_OPTION_BOOL(KviOption_boolNotifiDccDownloadSuccessInNotifier))
-				{
-					QString szMsg = __tr2qs_ctx("");
-					g_pApp->notifierMessage(0,KVI_SMALLICON_DCCMSG,szMsg,KVI_OPTION_UINT(KviOption_uintNotifierAutoHideTime));
-				}
-				*/
+
 				if(m_pDescriptor->bRecvFile)
 					g_pApp->fileDownloadTerminated(true, m_pDescriptor->szFileName.toUtf8().data(), m_pDescriptor->szLocalFileName.toUtf8().data(), m_pDescriptor->szNick.toUtf8().data());
 				m_szStatusString = __tr2qs_ctx("Transfer completed", "dcc");
@@ -2247,8 +2240,6 @@ bool DccFileTransfer::event(QEvent * e)
 				break;
 		}
 	}
-	//#warning "Remove this!"
-	//	if(e->type() == QEvent::Close)qDebug("Close event received");
 	return KviFileTransfer::event(e);
 }
 
@@ -2360,18 +2351,6 @@ bool DccFileTransfer::resumeAccepted(const char * filename, const char * port, c
 
 	listenOrConnect();
 
-	/*
-	int ret = m_pMarshal->dccConnect(m_pDescriptor->szIp.toUtf8().data(),
-					m_pDescriptor->szPort.toUtf8().data(),m_pDescriptor->bDoTimeout);
-
-	if(ret != KviError::Success)handleMarshalError(ret);
-	else {
-		m_szStatusString = __tr2qs_ctx("Contacting host %1 on port %2","dcc").arg(m_pDescriptor->szIp, m_pDescriptor->szPort);
-		outputAndLog(m_szStatusString);
-		displayUpdate();
-	}
-	*/
-
 	return true;
 }
 
diff --git a/src/modules/dcc/DccVideoWindow.cpp b/src/modules/dcc/DccVideoWindow.cpp
index 3cedf19af..ea19273fb 100644
--- a/src/modules/dcc/DccVideoWindow.cpp
+++ b/src/modules/dcc/DccVideoWindow.cpp
@@ -291,17 +291,6 @@ bool DccVideoThread::handleIncomingData(KviDccThreadIncomingData * data, bool bC
 void DccVideoThread::restartRecording(int iDevice, int iInput, int)
 {
 	m_bRecording = false;
-	/*
-	if(!g_pVideoDevicePool)
-		g_pVideoDevicePool = Kopete::AV::VideoDevicePool::self();
-
-	g_pVideoDevicePool->stopCapturing();
-	if (EXIT_SUCCESS != g_pVideoDevicePool->open(iDevice)) return;
-	g_pVideoDevicePool->setImageSize(320, 240);
-	if(iInput >= 0)
-		g_pVideoDevicePool->selectInput(iInput);
-	g_pVideoDevicePool->startCapturing();
-*/
 	m_bRecording = true;
 }
 
@@ -311,9 +300,6 @@ void DccVideoThread::startRecording()
 	if(m_bRecording)
 		return; // already started
 
-	//ensure capturing
-	//	g_pVideoDevicePool->startCapturing();
-
 	//qDebug("Posting event");
 	KviThreadDataEvent<int> * e = new KviThreadDataEvent<int>(KVI_DCC_THREAD_EVENT_ACTION);
 	e->setData(new int(KVI_DCC_VIDEO_THREAD_ACTION_START_RECORDING));
@@ -938,16 +924,12 @@ bool DccVideoWindow::event(QEvent * e)
 				switch(*act)
 				{
 					case KVI_DCC_VIDEO_THREAD_ACTION_START_RECORDING:
-						// 						m_pRecordingLabel->setEnabled(true);
 						break;
 					case KVI_DCC_VIDEO_THREAD_ACTION_STOP_RECORDING:
-						// 						m_pRecordingLabel->setEnabled(false);
 						break;
 					case KVI_DCC_VIDEO_THREAD_ACTION_START_PLAYING:
-						// 						m_pPlayingLabel->setEnabled(true);
 						break;
 					case KVI_DCC_VIDEO_THREAD_ACTION_STOP_PLAYING:
-						// 						m_pPlayingLabel->setEnabled(false);
 						break;
 					case KVI_DCC_VIDEO_THREAD_ACTION_GRAB_FRAME:
 						m_pCameraView->render(m_pCameraImage);
@@ -993,19 +975,7 @@ void DccVideoWindow::connected()
 	output(KVI_OUT_DCCMSG, __tr2qs_ctx("Actual codec used is '%s'", "dcc"), opt->pCodec->name());
 
 	m_pSlaveThread = new DccVideoThread(this, m_pMarshal->releaseSocket(), opt);
-	/*
-#ifndef COMPILE_DISABLE_DCC_VIDEO
-	if(g_pVideoDevicePool)
-	{
-		g_pVideoDevicePool->fillDeviceQComboBox(m_pCDevices);
-		g_pVideoDevicePool->fillInputQComboBox(m_pCInputs);
-		g_pVideoDevicePool->fillStandardQComboBox(m_pCStandards);
 
-		connect(g_pVideoDevicePool, SIGNAL(deviceRegistered(const QString &) ), SLOT(deviceRegistered(const QString &)) );
-		connect(g_pVideoDevicePool, SIGNAL(deviceUnregistered(const QString &) ), SLOT(deviceUnregistered(const QString &)) );
-	}
-#endif
-*/
 	m_pSlaveThread->start();
 }
 
diff --git a/src/modules/dcc/DccVoiceWindow.cpp b/src/modules/dcc/DccVoiceWindow.cpp
index 056723ca2..be04e9e83 100644
--- a/src/modules/dcc/DccVoiceWindow.cpp
+++ b/src/modules/dcc/DccVoiceWindow.cpp
@@ -722,8 +722,6 @@ DccVoiceWindow::DccVoiceWindow(DccDescriptor * dcc, const char * name)
 
 	vbox2->setSpacing(1);
 
-	//#warning "The volume slider should be enabled only when receiving data"
-	//m_pVolumeSlider = new QSlider(-100, 0, 10, 0, Qt::Vertical, m_pHBox, "dcc_voice_volume_slider");
 	m_pVolumeSlider = new QSlider(Qt::Vertical, m_pHBox);
 	m_pVolumeSlider->setObjectName("dcc_voice_volume_slider");
 	m_pVolumeSlider->setMinimum(-100);
@@ -752,8 +750,6 @@ DccVoiceWindow::DccVoiceWindow(DccDescriptor * dcc, const char * name)
 	m_pHBox->setMargin(2);
 	m_pHBox->setSpacing(1);
 
-	//setFocusHandler(m_pIrcView,this);
-
 	m_pMarshal = new DccMarshal(this);
 	connect(m_pMarshal, SIGNAL(error(KviError::Code)), this, SLOT(handleMarshalError(KviError::Code)));
 	connect(m_pMarshal, SIGNAL(connected()), this, SLOT(connected()));
@@ -777,8 +773,6 @@ DccVoiceWindow::~DccVoiceWindow()
 	KviThreadManager::killPendingEvents(this);
 
 	delete m_pUpdateTimer;
-	//	delete m_pDescriptor;
-	//	delete m_pMarshal;
 }
 
 void DccVoiceWindow::startConnection()
@@ -986,7 +980,7 @@ void DccVoiceWindow::connected()
 	output(KVI_OUT_DCCMSG, __tr2qs_ctx("Actual codec used is '%s'", "dcc"), opt->pCodec->name());
 
 	opt->bForceHalfDuplex = KVI_OPTION_BOOL(KviOption_boolDccVoiceForceHalfDuplex);
-	//	opt->bForceDummyReadTrigger = false;
+
 	opt->iPreBufferSize = KVI_OPTION_UINT(KviOption_uintDccVoicePreBufferSize);
 	opt->szSoundDevice = KVI_OPTION_STRING(KviOption_stringDccVoiceSoundDevice).toUtf8().data();
 	opt->iSampleRate = m_pDescriptor->iSampleRate;
@@ -1042,7 +1036,6 @@ int DccVoiceWindow::getMixerVolume(void) const
 	}
 
 	left = (ret & 0x00ff);
-	//	right = (ret & 0xff00) >> 8;
 
 	::close(fd);
 
diff --git a/src/modules/dcc/libkvidcc.cpp b/src/modules/dcc/libkvidcc.cpp
index 095e3b9f2..f130b9048 100644
--- a/src/modules/dcc/libkvidcc.cpp
+++ b/src/modules/dcc/libkvidcc.cpp
@@ -452,7 +452,6 @@ static bool dcc_kvs_cmd_chat(KviKvsModuleCommandCall * c)
 		d->bSendRequest = !c->switches()->find('n', "no-ctcp");
 	}
 
-	//c->window()->output(0,"%Q %Q %Q",&(d->szIp),&(d->szPort),&(d->szListenIp));
 	d->triggerCreationEvent();
 	g_pDccBroker->executeChat(nullptr, d);
 
diff --git a/src/modules/dcc/requests.cpp b/src/modules/dcc/requests.cpp
index a1734c2ef..2d1f8d595 100644
--- a/src/modules/dcc/requests.cpp
+++ b/src/modules/dcc/requests.cpp
@@ -890,7 +890,6 @@ static void dccModuleParseDccGet(KviDccRequest * dcc)
 	}
 
 	//#warning "IF NOT IGNORE DCC GET!"
-
 	//#warning "CREATE IT MINIMIZED ETC..."
 	//#warning "MAYBE USE A DIALOG TO ACCEPT THE REQUEST ?"
 	//#warning "DO NOT ACCEPT /etc/* requests..."
@@ -1108,19 +1107,6 @@ static void dccModuleParseDccVideo(KviDccRequest * dcc)
 		}
 	}
 
-	// 	bool bOk;
-
-	// 	int iSampleRate = dcc->szParam4.toInt(&bOk);
-	// 	if(!bOk)
-	// 	{
-	// 		if(!dcc->ctcpMsg->msg->haltOutput())
-	// 		{
-	// 			dcc->ctcpMsg->msg->console()->output(KVI_OUT_DCCMSG,
-	// 				__tr2qs_ctx("The above request appears to be broken: Invalid sample-rate '%s', defaulting to 8000","dcc"),dcc->szParam4.ptr());
-	// 		}
-	// 		iSampleRate = 8000;
-	// 	}
-
 	DccDescriptor * d = new DccDescriptor(dcc->pConsole);
 	d->szNick = dcc->ctcpMsg->pSource->nick();
 	d->szUser = dcc->ctcpMsg->pSource->user();
@@ -1162,15 +1148,6 @@ static void dccModuleParseDccCanvas(KviDccRequest * dcc)
 	if(!dcc_module_normalize_target_data(dcc, dcc->szParam2, dcc->szParam3))
 		return;
 
-//  Actually unused parameter
-//	if(!(kvi_strEqualCI("canvas",dcc->szParam1.ptr())))
-//	{
-//		if(!dcc->ctcpMsg->msg->haltOutput())
-//		{
-//			dcc->ctcpMsg->msg->console()->output(KVI_OUT_DCCMSG,
-//				__tr("The above request is broken: the second parameter is '%s' and shoud be 'chat'; trying to continue"),dcc->szParam1.ptr());
-//		}
-//	}
 #ifdef COMPILE_DCC_CANVAS
 	DccDescriptor * d = new DccDescriptor(dcc->pConsole);
 	d->szNick = dcc->ctcpMsg->pSource->nick();
diff --git a/src/modules/dialog/libkvidialog.cpp b/src/modules/dialog/libkvidialog.cpp
index bd36697f6..10fd12f3d 100644
--- a/src/modules/dialog/libkvidialog.cpp
+++ b/src/modules/dialog/libkvidialog.cpp
@@ -855,51 +855,6 @@ static bool dialog_kvs_fnc_yesno(KviKvsModuleFunctionCall * c)
 }
 
 /*
-
-static int g_iLocalEventLoops = 0;
-
-static bool dialog_module_cmd_unload(KviModule *m,KviCommand *c)
-{
-	// We use local loops in this module: we must FORBID explicit unloading of the
-	// module while local even loops are running
-	ENTER_STACK_FRAME(c,"dialog_module_cmd_unload");
-	c->warning(__tr("The dialog module can't be explicitly unloaded: a modal dialog is currently open"));
-	return c->leaveStackFrame();
-}
-
-static void dialog_module_entering_local_loop(KviModule * m)
-{
-	// Replace unload
-	g_iLocalEventLoops++;
-	if(g_iLocalEventLoops == 1)m->registerCommand("unload",dialog_module_cmd_unload);
-}
-
-static void dialog_module_exiting_local_loop(KviModule * m)
-{
-	g_pModuleManager->registerDefaultCommands(m);
-	g_iLocalEventLoops--;
-}
-
-static bool dialog_module_fnc_textline(KviModule *m,KviCommand *c,KviParameterList * parms,KviCString &buffer)
-{
-	ENTER_STACK_FRAME(c,"dialog_module_fnc_textline");
-
-	KviCString caption = parms->safeFirstParam();
-	KviCString info    = parms->safeNextParam();
-	KviCString initial = parms->safeNextParam();
-
-	dialog_module_entering_local_loop(m);
-	QMessageBox::information(0,caption.ptr(),info.ptr(),QMessageBox::Ok);
-	dialog_module_exiting_local_loop(m);
-
-	// It might be that the current window is no longer available!!!
-
-	return c->leaveStackFrame();
-}
-
-*/
-
-/*
 	@doc: noblockingdialogs
 	@type:
 		generic
diff --git a/src/modules/editor/ScriptEditorImplementation.cpp b/src/modules/editor/ScriptEditorImplementation.cpp
index 2a6d1cd73..a05ca3d84 100644
--- a/src/modules/editor/ScriptEditorImplementation.cpp
+++ b/src/modules/editor/ScriptEditorImplementation.cpp
@@ -442,104 +442,15 @@ QString ScriptEditorWidget::textUnderCursor() const
 		szWord.remove(0, 1);
 	return szWord;
 }
-/*
-void ScriptEditorWidget::mouseReleaseEvent(QMouseEvent * e)
-{
-
-	return;
-		QRect r = cursorRect();
-		QTextCursor cur = cursorForPosition(e->pos());
-	//	cur.select(
-
-
-	//completelistbox->hide();
-	if (e->button() == Qt::RightButton)
-	{
-		QString szBuffer;
-		/\*
-		int iPara = paragraphAt(e->pos());
-		int iIndex=charAt(e->pos(),&iPara);
-		szBuffer = this->text(iPara);
-		getWordOnCursor(szBuffer,iIndex);
-		*\/
-		QRect r = cursorRect();
-		QTextCursor cur = cursorForPosition(e->pos());
-		cur.select(QTextCursor::WordUnderCursor);
-		szBuffer = cur.selectedText();
-		QString szTmp = szBuffer;
-		KviPointerList<QString> * pList;
-		if(szTmp.left(1) == "$")
-		{
-			szTmp.remove(0,1);
-			pList = KviKvsKernel::instance()->completeCommandAllocateResult(szTmp);
-			if (pList->count() != 1)
-				szBuffer = "";
-			else
-				szBuffer = *(pList->at(0));
-		} else {
-			pList = KviKvsKernel::instance()->completeCommandAllocateResult(szTmp);
-			if (pList->count() != 1)
-				szBuffer = "";
-			else
-				szBuffer = *(pList->at(0));
-		}
-
-		for (unsigned int i=0; i < pList->count(); i++)
-			QString str = *(pList->at(i));
-
-		KviKvsKernel::instance()->freeCompletionResult(pList);
-		m_szHelp = szBuffer;
-	}
 
-	QTextEdit::mouseReleaseEvent(e);
-}
-*/
 bool ScriptEditorWidget::contextSensitiveHelp() const
 {
-	/*
-	QString szBuffer;
-	int iPara, iIndex;
-	getCursorPosition(&iPara,&iIndex);
-	szBuffer = text(iPara);
-	getWordOnCursor(szBuffer,iIndex);
-	*/
 
 	QRect r = cursorRect();
 	QTextCursor cur = cursorForPosition(QPoint(r.x(), r.y()));
 	cur.select(QTextCursor::WordUnderCursor);
 	QString szText = cur.selectedText();
 	QString szTmp = szText;
-	/*
-	KviPointerList<QString> * pList;
-	if(szTmp.left(1) == "$")
-	{
-		szTmp.remove(0,1);
-		pList = g_pUserParser->completeFunctionAllocateResult(szTmp);
-	} else {
-		pList = g_pUserParser->completeCommandAllocateResult(szTmp);
-	}
-	qDebug("command or func %s",szTmp.toUtf8().data());
-
-	bool bOk = false;
-	if(pList)
-	{
-		for(QString * s = pList->first(); s; s = pList->next())
-		{
-			if(KviQString::equalCI(*s,szBuffer))
-			{
-				pList->last();
-				bOk = true;
-			}
-		}
-	}
-
-	g_pUserParser->freeCompletionResult(pList);
-	if(!bOk)return false;
-
-	QString szParse = QString("timer -s (help,0){ help -s %Q; }").arg(szBuffer);
-	qDebug("parsing %s",szParse.toLatin1());
-	KviKvsScript::run(szParse,(KviWindow*)g_pApp->activeConsole());
-	*/
 
 	return true;
 }
diff --git a/src/modules/eventeditor/EventEditorWindow.cpp b/src/modules/eventeditor/EventEditorWindow.cpp
index 1012de596..63e9c531a 100644
--- a/src/modules/eventeditor/EventEditorWindow.cpp
+++ b/src/modules/eventeditor/EventEditorWindow.cpp
@@ -591,26 +591,8 @@ void EventEditorWindow::getConfigGroupName(QString & szName)
 
 void EventEditorWindow::saveProperties(KviConfigurationFile *) //cfg
 {
-	/*
-#ifdef COMPILE_SCRIPTTOOLBAR
-	cfg->writeEntry("Sizes",m_pEditor->sizes());
-	cfg->writeEntry("LastEvent",m_pEditor->lastEditedEvent().ptr());
-	//qDebug("LAST EDITED=%s",m_pEditor->lastEditedEvent().ptr());
-#endif // COMPILE_SCRIPTTOOLBAR
-*/
 }
 
 void EventEditorWindow::loadProperties(KviConfigurationFile *) //cfg
 {
-	/*
-#ifdef COMPILE_SCRIPTTOOLBAR
-	QValueList<int> def;
-	def.append(20);
-	def.append(80);
-	m_pEditor->setSizes(cfg->readIntListEntry("Sizes",def));
-	KviCString tmp = cfg->readEntry("LastEvent","");
-	m_pEditor->editEvent(tmp);
-	//qDebug("LAST EDITED WAS %s",tmp.ptr());
-#endif // COMPILE_SCRIPTTOOLBAR
-*/
 }
diff --git a/src/modules/filetransferwindow/FileTransferWindow.cpp b/src/modules/filetransferwindow/FileTransferWindow.cpp
index 9d3a7adab..0988993c2 100644
--- a/src/modules/filetransferwindow/FileTransferWindow.cpp
+++ b/src/modules/filetransferwindow/FileTransferWindow.cpp
@@ -381,13 +381,11 @@ FileTransferItem * FileTransferWindow::findItem(KviFileTransfer * t)
 void FileTransferWindow::transferRegistered(KviFileTransfer * t)
 {
 	new FileTransferItem(m_pTableWidget, t);
-	//t->setDisplayItem(it);
 }
 
 void FileTransferWindow::transferUnregistering(KviFileTransfer * t)
 {
 	FileTransferItem * it = findItem(t);
-	//t->setDisplayItem(0);
 	if(it)
 	{
 		delete it;
@@ -863,35 +861,6 @@ void FileTransferWindow::die()
 	close();
 }
 
-//#warning "Load & save properties of this kind of window"
-
-//void FileTransferWindow::saveProperties()
-//{
-//	KviWindowProperty p;
-//	p.rect = externalGeometry();
-//	p.isDocked = isAttacched();
-//	QValueList<int> l(m_pSplitter->sizes());
-//	if(l.count() >= 1)p.splitWidth1 = *(l.at(0));
-//	if(l.count() >= 2)p.splitWidth2 = *(l.at(1));
-//	p.timestamp = m_pView->timestamp();
-//	p.imagesVisible = m_pView->imagesVisible();
-//	p.isMaximized = isAttacched() && isMaximized();
-//	p.topSplitWidth1 = 0;
-//	p.topSplitWidth2 = 0;
-//	p.topSplitWidth3 = 0;
-//	g_pOptions->m_pWinPropertiesList->setProperty(caption(),&p);
-//}
-//
-//void FileTransferWindow::setProperties(KviWindowProperty *p)
-//{
-//	QValueList<int> l;
-//	l.append(p->splitWidth1);
-//	l.append(p->splitWidth2);
-//	m_pVertSplitter->setSizes(l);
-//	m_pIrcView->setTimestamp(p->timestamp);
-//	m_pIrcView->setShowImages(p->imagesVisible);
-//}
-
 void FileTransferWindow::applyOptions()
 {
 	m_pIrcView->applyOptions();
diff --git a/src/modules/help/HelpWindow.cpp b/src/modules/help/HelpWindow.cpp
index 0f1803eca..155815c50 100644
--- a/src/modules/help/HelpWindow.cpp
+++ b/src/modules/help/HelpWindow.cpp
@@ -118,9 +118,6 @@ void HelpWindow::initialSetup()
 {
 	m_pIndexSearch->setFocus();
 
-	/*	if(!g_bIndexingDone)
-	{
-		g_bIndexingDone=true;*/
 	QString szDoclist, szDict;
 
 	g_pApp->getLocalKvircDirectory(szDoclist, KviApplication::Help, "help.doclist." KVI_SOURCES_DATE);
diff --git a/src/modules/http/HttpFileTransfer.cpp b/src/modules/http/HttpFileTransfer.cpp
index 33ccd583e..970b1c8d9 100644
--- a/src/modules/http/HttpFileTransfer.cpp
+++ b/src/modules/http/HttpFileTransfer.cpp
@@ -231,18 +231,7 @@ void HttpFileTransfer::displayPaint(QPainter * p, int column, QRect rect)
 			int iLeftHalf = (iW - 2) / 2;
 			int iRightHalf = iW - (iLeftHalf + 1);
 			int iLineSpacing = fm.lineSpacing() + 2;
-			/*
-			txt = __tr2qs_ctx("Spd:","dcc");
-			txt += " ";
-			if(iInstantSpeed >= 0)
-			{
-				QString tmpisp;
-				KviNetUtils::formatNetworkBandwidthString(tmpisp,iAvgSpeed);
-				txt += tmpisp;
-			} else {
-				txt += "? B/s";
-			}
-			*/
+
 			txt = __tr2qs_ctx("Avg:", "dcc");
 			txt += " ";
 			if(iAvgSpeed >= 0)
diff --git a/src/modules/language/detector.cpp b/src/modules/language/detector.cpp
index c9ece345a..19017c6b7 100644
--- a/src/modules/language/detector.cpp
+++ b/src/modules/language/detector.cpp
@@ -18580,7 +18580,7 @@ static double score_for_ngram(DetectorDescriptor * d, const unsigned char * ngra
 	while(g->szNGram)
 	{
 		if(strcmp((const char *)ngram, (const char *)g->szNGram) == 0)
-		{ /*printf("GOT NGRAM %s SCORE %f\n",ngram,g->dScore);*/
+		{
 			return g->dScore;
 		}
 		g++;
@@ -18591,8 +18591,7 @@ static double score_for_ngram(DetectorDescriptor * d, const unsigned char * ngra
 static double compute_descriptor_score(const unsigned char * data, DetectorDescriptor * d)
 {
 	double dRet = 0.0;
-	//unsigned char x[256];
-	//memset(x,0,256)
+
 	const unsigned char * p = data;
 	while(*p)
 	{
@@ -18601,34 +18600,7 @@ static double compute_descriptor_score(const unsigned char * data, DetectorDescr
 			dRet += d->single_char_data[z];
 		p++;
 	}
-	//unsigned int x[256];
-	//int i;
-	//for(i=0;i<256;i++)x[i] = 0;
-	//unsigned int total = 0;
-	//while(*p)
-	//{
-	//	unsigned char z = (unsigned char)tolower((char)*p);
-	//	if(valid_char_jump_table[z])
-	//	{
-	//		x[z]++;
-	//		total++;
-	//	}
-	//	p++;
-	//}
-	//for(i=0;i<256;i++)
-	//{
-	//	if(valid_char_jump_table[i])
-	//	{
-	//		double dPercent = ((double)x[i]) / ((double)total);
-	//		double dDiff = dPercent - d->single_char_data[i];
-	//		if(dDiff < 0.0)dDiff = -dDiff;
-	//		if(dPercent > d->single_char_data[i])dDiff *= d->single_char_data[i] == 0.0 ? 3.0 : 1.5;
-	//		if(i > 127)dDiff *= 1.5;
-	//		if(i > 192)dDiff *= 1.5;
-	//		dRet -= ((double)total) * dDiff;
-	//		//printf("CHAR %d FILE %f REF %f DIFF %f SCORE %f\n",i,dPercent,d->single_char_data[i],dDiff,((double)total) * dDiff);
-	//	}
-	//}
+
 	// now by hash...this is hard
 	p = data;
 	unsigned char buffer[1024]; // we handle words up to 1024 chars
diff --git a/src/modules/list/ListWindow.cpp b/src/modules/list/ListWindow.cpp
index 4fb2bc2f8..0dc0af318 100644
--- a/src/modules/list/ListWindow.cpp
+++ b/src/modules/list/ListWindow.cpp
@@ -579,36 +579,6 @@ void ListWindow::itemDoubleClicked(QTreeWidgetItem * it, int)
 	m_pConsole->connection()->sendFmtData("join %s", dat.data());
 }
 
-//
-//#warning "Load & save properties of this kind of window"
-
-//void ListWindow::saveProperties()
-//{
-//	KviWindowProperty p;
-//	p.rect = externalGeometry();
-//	p.isDocked = isAttacched();
-//	QValueList<int> l(m_pSplitter->sizes());
-//	if(l.count() >= 1)p.splitWidth1 = *(l.at(0));
-//	if(l.count() >= 2)p.splitWidth2 = *(l.at(1));
-//	p.timestamp = m_pView->timestamp();
-//	p.imagesVisible = m_pView->imagesVisible();
-//	p.isMaximized = isAttacched() && isMaximized();
-//	p.topSplitWidth1 = 0;
-//	p.topSplitWidth2 = 0;
-//	p.topSplitWidth3 = 0;
-//	g_pOptions->m_pWinPropertiesList->setProperty(caption(),&p);
-//}
-//
-//void ListWindow::setProperties(KviWindowProperty *p)
-//{
-//	QValueList<int> l;
-//	l.append(p->splitWidth1);
-//	l.append(p->splitWidth2);
-//	m_pVertSplitter->setSizes(l);
-//	m_pIrcView->setTimestamp(p->timestamp);
-//	m_pIrcView->setShowImages(p->imagesVisible);
-//}
-
 void ListWindow::applyOptions()
 {
 	m_pTreeWidget->applyOptions();
diff --git a/src/modules/mediaplayer/libkvimediaplayer.cpp b/src/modules/mediaplayer/libkvimediaplayer.cpp
index cc39006c0..336aa0cd3 100644
--- a/src/modules/mediaplayer/libkvimediaplayer.cpp
+++ b/src/modules/mediaplayer/libkvimediaplayer.cpp
@@ -1697,17 +1697,7 @@ static bool mediaplayer_module_init(KviModule * m)
 	MP_KVS_REGFNC(getRepeat, "getRepeat");
 	MP_KVS_REGFNC(getShuffle, "getShuffle");
 	MP_KVS_REGFNC(getVol, "getVol");
-	/*
-	// Crissi
-	m->registerFunction( "getmp3tag_date", mediaplayer_fnc_getmp3tag_date );
-	m->registerFunction( "getmp3tag_version", mediaplayer_fnc_getmp3tag_version );
-	m->registerFunction( "getmp3tag_layer", mediaplayer_fnc_getmp3tag_layer );
-	m->registerFunction( "getmp3tag_crc", mediaplayer_fnc_getmp3tag_crc );
-	m->registerFunction( "getmp3tag_copyright", mediaplayer_fnc_getmp3tag_copyright );
-	m->registerFunction( "getmp3tag_original", mediaplayer_fnc_getmp3tag_original );
-	m->registerFunction( "getmp3tag_emphasis", mediaplayer_fnc_getmp3tag_emphasis );
-	m->registerFunction( "getmp3tag_tracknumber", mediaplayer_fnc_getmp3tag_tracknumber );
-*/
+
 	return true;
 }
 
diff --git a/src/modules/mediaplayer/winamp.cpp b/src/modules/mediaplayer/winamp.cpp
index f43952557..bf8b29138 100644
--- a/src/modules/mediaplayer/winamp.cpp
+++ b/src/modules/mediaplayer/winamp.cpp
@@ -59,13 +59,6 @@ winampGeneralPurposePlugin plugin = {
 	quit,
 };
 
-/*
-BOOL WINAPI _DllMainCRTStartup(HANDLE hInst, ULONG ul_reason_for_call, LPVOID lpReserved)
-{
-	return true;
-}
-*/
-
 #define KVIRC_WM_USER 63112
 
 #define KVIRC_WM_USER_GETTITLE 5000
diff --git a/src/modules/mircimport/libkvimircimport.cpp b/src/modules/mircimport/libkvimircimport.cpp
index 037177609..ffe688ede 100644
--- a/src/modules/mircimport/libkvimircimport.cpp
+++ b/src/modules/mircimport/libkvimircimport.cpp
@@ -364,21 +364,6 @@ static bool mircimport_module_can_unload(KviModule *)
 	return ((!g_pMircServersIniImport) && (!g_pRemoteMircServersIniImport));
 }
 
-/*
-KVIMODULEEXPORTFUNC KviIrcServerImport * mircimport_module_createIrcServerImport(const char *filterName)
-{
-	if(kvi_strEqualCI(filterName,__tr("Import from servers.ini")))
-	{
-		if(!g_pMircServersIniImport)g_pMircServersIniImport = new KviMircServersIniImport();
-		return g_pMircServersIniImport;
-	} else {
-		if(!g_pRemoteMircServersIniImport)g_pRemoteMircServersIniImport = new KviRemoteMircServersIniImport("http://www.mirc.co.uk/servers.ini");
-		return g_pRemoteMircServersIniImport;
-	}
-	return 0;
-}
-*/
-
 KVIRC_MODULE(
     "mIRCimport",                                                   // module name
     "4.0.0",                                                        // module version
diff --git a/src/modules/objects/KvsObject_file.cpp b/src/modules/objects/KvsObject_file.cpp
index 098ef7d99..d0f773b85 100644
--- a/src/modules/objects/KvsObject_file.cpp
+++ b/src/modules/objects/KvsObject_file.cpp
@@ -360,7 +360,7 @@ KVSO_CLASS_FUNCTION(file, readByte)
 	char ch;
 	if(!m_pFile->getChar(&ch))
 		c->warning(__tr2qs_ctx("Read error occurred!", "objects")); // c->error ?
-	//QString szChar = QChar(ch);
+
 	c->returnValue()->setInteger((kvs_int_t)ch);
 	return true;
 }
@@ -406,14 +406,14 @@ KVSO_CLASS_FUNCTION(file, readBlock)
 			c->warning(__tr2qs_ctx("Buffer parameter is not a memorybuffer object", "objects"));
 			return true;
 		}
-		//m_pFile->flush();
+
 		((KvsObject_memoryBuffer *)pObject)->pBuffer()->append(m_pFile->read(uLen));
 		return true;
 	}
 	else
 	{
 		char * buff = new char[uLen + 1];
-		//m_pFile->flush(); // advice from QFile man page (to avoid trash)
+
 		int rlen = m_pFile->read(buff, uLen);
 		buff[rlen] = '\0';
 		QString szBlock(buff);
@@ -537,7 +537,7 @@ KVSO_CLASS_FUNCTION(file, writeBlock)
 				const char * pData = ((KvsObject_memoryBuffer *)pObject)->pBuffer()->data();
 				int rlen = m_pFile->write(pData, uLen);
 				c->returnValue()->setInteger(rlen);
-				//m_pFile->flush();
+
 			}
 			else
 			{
@@ -557,7 +557,6 @@ KVSO_CLASS_FUNCTION(file, writeBlock)
 			const char * block = szBlock.toUtf8().data();
 			int rlen = m_pFile->write(block, uLen);
 			c->returnValue()->setInteger(rlen);
-			//m_pFile->flush();
 		}
 	}
 	return true;
@@ -568,7 +567,7 @@ KVSO_CLASS_FUNCTION(file, readLine)
 	CHECK_INTERNAL_POINTER(m_pFile)
 	CHECK_FILE_IS_OPEN
 	QString buffer;
-	//bool ok=KviFileUtils::readLine(m_pFile,buffer);
+
 	buffer = m_pFile->readLine();
 	c->returnValue()->setString(buffer);
 	return true;
diff --git a/src/modules/objects/KvsObject_pixmap.cpp b/src/modules/objects/KvsObject_pixmap.cpp
index fd618fcea..f4bf3e50a 100644
--- a/src/modules/objects/KvsObject_pixmap.cpp
+++ b/src/modules/objects/KvsObject_pixmap.cpp
@@ -566,18 +566,6 @@ KVSO_CLASS_FUNCTION(pixmap, load)
 	m_currentType = Image;
 	m_pImage->load(szFile);
 	return true;
-	/*
- *	FIXME UNUSED CODE
-	if (m_currentType==Image && m_pImage)
-		delete m_pImage;
-	else if (m_currentType==AnimatedPixmap && m_pAnimatedPixmap)
-		delete m_pAnimatedPixmap;
-	if(!m_pPixmap) m_pPixmap=new QPixmap();
-	m_currentType=Pixmap;
-	m_pPixmap->load(szFile);
-	qDebug("alpha %i",m_pPixmap->hasAlpha());
-	return true;
-*/
 }
 
 KVSO_CLASS_FUNCTION(pixmap, save)
@@ -687,20 +675,6 @@ KVSO_CLASS_FUNCTION(pixmap, grabWidget)
 	*m_pPixmap = QPixmap::grabWidget(((KvsObject_widget *)pObject)->widget());
 	return true;
 
-	/*	FIXME UNUSED CODE
-	QString szFileName;
-	KVSO_PARAMETERS_BEGIN(c)
-			KVSO_PARAMETER("file_name",KVS_PT_STRING,0,szFileName)
-	KVSO_PARAMETERS_END(c)
-	QPrinter printer;//(QPrinter::HighResolution);
-	printer.setOutputFormat(QPrinter::PdfFormat);
-	printer.setPaperSize(QPrinter::A4);
-	printer.setOutputFileName(szFileName);
-
-	QPixmap pixmap=QPixmap::grabWidget(((QTableWidget *)widget()));
-	QPainter painter(&printer);
-	painter.drawPixmap(QPoint(0,0), pixmap, pixmap.rect());
-*/
 }
 
 KVSO_CLASS_FUNCTION(pixmap, height)
@@ -711,8 +685,6 @@ KVSO_CLASS_FUNCTION(pixmap, height)
 		c->returnValue()->setInteger(m_pPixmap->height());
 	else
 		c->returnValue()->setInteger(0);
-	//else if(m_pAnimatedPixmap) c->returnValue()->setInteger(m_pAnimatedPixmap->size().height());
-	//else c->returnValue()->setInteger(m_pPixmap->height());
 	return true;
 }
 
@@ -724,17 +696,9 @@ KVSO_CLASS_FUNCTION(pixmap, width)
 		c->returnValue()->setInteger(m_pPixmap->width());
 	else
 		c->returnValue()->setInteger(0);
-	//else if(m_pAnimatedPixmap) c->returnValue()->setInteger(m_pAnimatedPixmap->size().height());
-	//else c->returnValue()->setInteger(m_pPixmap->height());
 	return true;
 }
 
-/*QPixmap * KvsObject_pixmap::getPixmap()
-{
-	if (!m_pAnimatedPixmap && !m_pPixmap) return new QPixmap();
-	else if(m_pAnimatedPixmap) return m_pAnimatedPixmap->pixmap();
-	else return m_pPixmap;
-}*/
 KVSO_CLASS_FUNCTION(pixmap, frameChangedEvent)
 {
 	emitSignal("frameChanged", c);
diff --git a/src/modules/objects/KvsObject_socket.cpp b/src/modules/objects/KvsObject_socket.cpp
index e72a369b4..2b378e57f 100644
--- a/src/modules/objects/KvsObject_socket.cpp
+++ b/src/modules/objects/KvsObject_socket.cpp
@@ -562,18 +562,6 @@ KVSO_CLASS_FUNCTION(socket, functionConnect)
 	return true;
 }
 
-/*
-KVSO_CLASS_FUNCTION(socket,functionsetReadBufferSize)
-{
-	kvs_int_t iBufferSize;
-	KVSO_PARAMETERS_BEGIN(c)
-		KVSO_PARAMETER("buffer_size",KVS_PT_INTEGER,0,iBufferSize)
-	KVSO_PARAMETERS_END(c)
-	m_pSocket->setReadBufferSize(iBufferSize);
-	return true;
-}
-*/
-
 KVSO_CLASS_FUNCTION(socket, listen)
 {
 	kvs_uint_t uLocalPort;
diff --git a/src/modules/objects/KvsObject_tableWidget.cpp b/src/modules/objects/KvsObject_tableWidget.cpp
index 901994049..74cd1187d 100644
--- a/src/modules/objects/KvsObject_tableWidget.cpp
+++ b/src/modules/objects/KvsObject_tableWidget.cpp
@@ -240,11 +240,7 @@ KVSO_BEGIN_CONSTRUCTOR(KvsObject_tableWidget, KvsObject_widget)
 KVSO_END_CONSTRUCTOR(KvsObject_tableWidget)
 
 KVSO_BEGIN_DESTRUCTOR(KvsObject_tableWidget)
-/*if (m_pCellItemDelegate)
-{
-	delete m_pCellItemDelegate;
-	m_pCellItemDelegate=0;
-}*/
+
 KVSO_END_DESTRUCTOR(KvsObject_tableWidget)
 
 bool KvsObject_tableWidget::init(KviKvsRunTimeContext * c, KviKvsVariantList *)
diff --git a/src/modules/objects/KvsObject_toolButton.cpp b/src/modules/objects/KvsObject_toolButton.cpp
index fa0be17eb..176e55f53 100644
--- a/src/modules/objects/KvsObject_toolButton.cpp
+++ b/src/modules/objects/KvsObject_toolButton.cpp
@@ -31,6 +31,7 @@
 #include "KviIconManager.h"
 
 #include <QMenu>
+
 /*
 	@doc:	toolbutton
 	@keyterms:
@@ -282,24 +283,7 @@ KVSO_CLASS_FUNCTION(toolButton, openPopup)
 	((QToolButton *)widget())->showMenu();
 	return true;
 }
-/*
-KVSO_CLASS_FUNCTION(toolButton,setPopupDelay)
-{
-	kvs_int_t uDelay;
-	KVSO_PARAMETERS_BEGIN(c)
-		KVSO_PARAMETER("delay",KVS_PT_UNSIGNEDINTEGER,0,uDelay)
-	KVSO_PARAMETERS_END(c)
-	if (widget())
-		  ((QToolButton *)widget())->setPopupDelay(uDelay);
-	return true;
-}
-KVSO_CLASS_FUNCTION(toolButton,popupDelay)
-{
-	if (widget())
-		c->returnValue()->setInteger(((QToolButton *)widget())->popupDelay());
-	return true;
-}
-*/
+
 KVSO_CLASS_FUNCTION(toolButton, setTextPosition)
 {
 	CHECK_INTERNAL_POINTER(widget())
diff --git a/src/modules/objects/KvsObject_treeWidget.cpp b/src/modules/objects/KvsObject_treeWidget.cpp
index 113b300f8..afaf389ca 100644
--- a/src/modules/objects/KvsObject_treeWidget.cpp
+++ b/src/modules/objects/KvsObject_treeWidget.cpp
@@ -356,19 +356,7 @@ KVSO_CLASS_FUNCTION(treeWidget, currentItem)
 		c->returnValue()->setHObject((kvs_hobject_t) nullptr);
 	return true;
 }
-/*
-KVSO_CLASS_FUNCTION(treeWidget,setColumnText)
-{
-	kvs_int_t uCol;
-	QString szText;
-	KVSO_PARAMETERS_BEGIN(c)
-		KVSO_PARAMETER("column",KVS_PT_UNSIGNEDINTEGER,0,uCol)
-		KVSO_PARAMETER("text",KVS_PT_STRING,0,szText)
-		KVSO_PARAMETERS_END(c)
-	if (widget())((QTreeWidget *)widget())->setColumnText(uCol,szText);
-    return true;
-}
-*/
+
 KVSO_CLASS_FUNCTION(treeWidget, setColumnCount)
 {
 	kvs_uint_t uCol;
diff --git a/src/modules/objects/KvsObject_webView.cpp b/src/modules/objects/KvsObject_webView.cpp
index 89d07f0fe..0a0a24354 100644
--- a/src/modules/objects/KvsObject_webView.cpp
+++ b/src/modules/objects/KvsObject_webView.cpp
@@ -623,24 +623,7 @@ KVSO_CLASS_FUNCTION(webView, removeFromDocument)
 	element.removeFromDocument();
 	return true;
 }
-/*KVSO_CLASS_FUNCTION(webView,cloneElement)
-{
-	kvs_int_t iEleId;
-	KVSO_PARAMETERS_BEGIN(c)
-		KVSO_PARAMETER("element_identifier",KVS_PT_INTEGER,0,iEleId)
-	KVSO_PARAMETERS_END(c)
-	QWebElement element=getElement(iEleId);
-	if (element.isNull())
-	{
-		c->warning(__tr2qs_ctx("Document element with ID %d doesn't exist","objects"),iEleId);
-		return true;
-	}
-	element.removeFromDocument();
-	int id=insertElement(element.clone(),true);
-	c->returnValue()->setInteger((kvs_int_t) id);
-	return true;
-}
-*/
+
 KVSO_CLASS_FUNCTION(webView, appendInside)
 {
 	kvs_int_t iEleId;
@@ -1294,13 +1277,7 @@ void KvsObject_webView::slotOnMouseOut(QString szParam)
 	callFunction(this, "jsMouseOutEvent", &params);
 }
 
-/*KVSO_CLASS_FUNCTION(webView,jsWindowObjectClearedEvent)
-{
-	emitSignal("jsWindowObjectCleared",c,c->params());
-	return true;
-}*/
 // slots
-
 void KvsObject_webView::slotLoadFinished(bool bOk)
 {
 	if(bOk)
@@ -1327,12 +1304,6 @@ void KvsObject_webView::slotLinkClicked(const QUrl & url)
 	KviKvsVariantList params(new KviKvsVariant(szUrl));
 	callFunction(this, "linkClickedEvent", &params);
 }
-/*void KvsObject_webView::javaScriptWindowObjectCleared(const QUrl &url)
-{
-	//KviKvsVariantList *lParams=0;
-	//callFunction(this,"jsWindowObjectClearedEvent",lParams);
-	addToJavaScriptWindowObject
-}*/
 
 void KvsObject_webView::slotDownloadRequest(const QNetworkRequest & r)
 {
diff --git a/src/modules/objects/KvsObject_widget.cpp b/src/modules/objects/KvsObject_widget.cpp
index 8f60a145e..5b81be377 100644
--- a/src/modules/objects/KvsObject_widget.cpp
+++ b/src/modules/objects/KvsObject_widget.cpp
@@ -992,16 +992,7 @@ bool KvsObject_widget::eventFilter(QObject * o, QEvent * e)
 			return ret;
 		}
 	}
-	/*
-	if(o->parent())
-	{
-		qDebug("Propagation to parent");
-		return KviKvsObject::eventFilter(o->parent(),e);
-	} else {
-		qDebug("Propagation to object");
-	*/
 	return KviKvsObject::eventFilter(o, e);
-	//}
 }
 
 KVSO_CLASS_FUNCTION(widget, show)
diff --git a/src/modules/options/OptionsDialog.cpp b/src/modules/options/OptionsDialog.cpp
index 2d2f54dcf..4249e2f54 100644
--- a/src/modules/options/OptionsDialog.cpp
+++ b/src/modules/options/OptionsDialog.cpp
@@ -556,42 +556,6 @@ void OptionsDialog::treeWidgetItemSelectionChanged(QTreeWidgetItem * it, QTreeWi
 	}
 }
 
-/*
-OptionsDialogTreeWidgetItem * OptionsDialog::findItemByPage(OptionsDialogTreeWidgetItem *it,KviOptionsWidget * pPage)
-{
-	if(!it)return 0;
-	if(it->m_pOptionsWidget == pPage)return it;
-
-	OptionsDialogTreeWidgetItem *i;
-
-	int ccount = it->childCount();
-
-	for(int j=0;j<ccount;j++)
-	{
-		OptionsDialogTreeWidgetItem * i = (OptionsDialogTreeWidgetItem *)it->child(j);
-
-		i = findItemByPage(i,pPage);
-		if(i)return i;
-	}
-
-	// not found in the children tree.. look in the next sibling
-	for(int j=0;j<ccount;j++)
-	{
-		OptionsDialogTreeWidgetItem * pChild = (OptionsDialogTreeWidgetItem *)pItem->child(j);
-
-		i = findItemByPage(i,pPage);
-		if(i)return i;
-	}
-
-	i = (OptionsDialogTreeWidgetItem *)(it->nextSibling());
-	if(i)
-	{
-		i = findItemByPage(i,pPage);
-		if(i)return i;
-	}
-	return 0;
-}
-*/
 void OptionsDialog::pageWantsToSwitchToAdvancedPage(KviOptionsWidget *)
 {
 	// unused
diff --git a/src/modules/options/OptionsWidget_textEncoding.cpp b/src/modules/options/OptionsWidget_textEncoding.cpp
index dd33758d8..e621a0fbf 100644
--- a/src/modules/options/OptionsWidget_textEncoding.cpp
+++ b/src/modules/options/OptionsWidget_textEncoding.cpp
@@ -225,8 +225,6 @@ void OptionsWidget_textEncoding::commit()
 			QMessageBox::critical(this, "KVIrc", __tr2qs_ctx("Unable to write language information to", "options") + "\n" + szLangFile, __tr2qs_ctx("OK", "options"));
 		}
 	}
-/*	if(!KviQString::equalCI(m_pForcedLocaleCombo->text(idx),m_szLanguage))
-		QMessageBox::information(0,"KVIrc",__tr2qs_ctx("You need to restart KVIrc to apply a language changing","options"),QMessageBox::Ok);*/
 
 #ifdef COMPILE_ENCHANT_SUPPORT
 	QStringList wantedDictionaries;
diff --git a/src/modules/popupeditor/PopupEditorWindow.cpp b/src/modules/popupeditor/PopupEditorWindow.cpp
index ceb79403a..324ffb498 100644
--- a/src/modules/popupeditor/PopupEditorWindow.cpp
+++ b/src/modules/popupeditor/PopupEditorWindow.cpp
@@ -1480,26 +1480,8 @@ void PopupEditorWindow::getConfigGroupName(QString & szName)
 
 void PopupEditorWindow::saveProperties(KviConfigurationFile *) //cfg
 {
-	/*
-#ifdef COMPILE_SCRIPTTOOLBAR
-	cfg->writeEntry("Sizes",m_pEditor->sizes());
-	cfg->writeEntry("LastPopup",m_pEditor->lastEditedPopup().ptr());
-	//qDebug("LAST EDITED=%s",m_pEditor->lastEditedPopup().ptr());
-#endif // COMPILE_SCRIPTTOOLBAR
-*/
 }
 
 void PopupEditorWindow::loadProperties(KviConfigurationFile *) // cfg
 {
-	/*
-#ifdef COMPILE_SCRIPTTOOLBAR
-	QValueList<int> def;
-	def.append(20);
-	def.append(80);
-	m_pEditor->setSizes(cfg->readIntListEntry("Sizes",def));
-	KviCString tmp = cfg->readEntry("LastPopup","");
-	m_pEditor->editPopup(tmp);
-	//qDebug("LAST EDITED WAS %s",tmp.ptr());
-#endif // COMPILE_SCRIPTTOOLBAR
-*/
 }
diff --git a/src/modules/raweditor/RawEditorWindow.cpp b/src/modules/raweditor/RawEditorWindow.cpp
index e4b074682..63d290b60 100644
--- a/src/modules/raweditor/RawEditorWindow.cpp
+++ b/src/modules/raweditor/RawEditorWindow.cpp
@@ -532,26 +532,8 @@ void RawEditorWindow::getConfigGroupName(QString & szName)
 
 void RawEditorWindow::saveProperties(KviConfigurationFile *)
 {
-	/*
-	#ifdef COMPILE_SCRIPTTOOLBAR
-		cfg->writeEntry("Sizes",m_pEditor->sizes());
-		cfg->writeEntry("LastRaw",m_pEditor->lastEditedRaw().ptr());
-		//qDebug("LAST EDITED=%s",m_pEditor->lastEditedRaw().ptr());
-	#endif // COMPILE_SCRIPTTOOLBAR
-	*/
 }
 
 void RawEditorWindow::loadProperties(KviConfigurationFile *)
 {
-	/*
-	#ifdef COMPILE_SCRIPTTOOLBAR
-		QValueList<int> def;
-		def.append(20);
-		def.append(80);
-		m_pEditor->setSizes(cfg->readIntListEntry("Sizes",def));
-		KviCString tmp = cfg->readEntry("LastRaw","");
-		m_pEditor->editRaw(tmp);
-		//qDebug("LAST EDITED WAS %s",tmp.ptr());
-	#endif // COMPILE_SCRIPTTOOLBAR
-	*/
 }
diff --git a/src/modules/reguser/libkvireguser.cpp b/src/modules/reguser/libkvireguser.cpp
index 392ffa2e7..cadd9e916 100644
--- a/src/modules/reguser/libkvireguser.cpp
+++ b/src/modules/reguser/libkvireguser.cpp
@@ -955,58 +955,6 @@ static bool reguser_kvs_fnc_exactMatch(KviKvsModuleFunctionCall * c)
 	return true;
 }
 
-///*
-//	@doc: reguser.matches
-//	@type:
-//		function
-//	@title:
-//		$reguser.matches
-//	@short:
-//		Returns entries in the registered user database
-//	@syntax:
-//		$reguser.matches(<user_mask>)
-//	@description:
-//		Returns a comma separated list of registered user masks that match <user_mask>.[br]
-//		User mask must be in the format <nick>!<user>@<host>, where <user> and
-//		<host> may contain '*' wildcards.[br]
-//		If no registered mask matches the <user_mask> an empty string is returned.[br]
-//	@seealso:
-//		[module:reguser]reguser module documentation[/module]
-//*/
-
-//static void search_reguser_list(KviRegisteredUserList * l,KviWindow * w,const char * mask,KviCString & buffer)
-//{
-//	for(KviRegisteredUser * u = l->first();u;u = l->next())
-//	{
-//		if(u->matches(mask))
-//		{
-//			if(buffer.hasData())buffer.append(',');
-//			buffer.append(u->mask());
-//		}
-//	}
-//}
-
-//static bool reguser_module_fnc_matches(KviModule *m,KviCommand *c,KviParameterList * parms,KviCString &buffer)
-//{
-//	ENTER_STACK_FRAME(c,"reguser.matches");
-//
-//	KviCString list;
-//
-//	const KviPointerHashTable<const char *,KviRegisteredUserList> * d = g_pRegisteredUserDataBase->nickDict();
-//	KviPointerHashTableIterator<const char *,KviRegisteredUserList> it(*d);
-//	while(KviRegisteredUserList * l = it.current())
-//	{
-//		search_reguser_list(l,c->window(),parms->safeFirstParam(),list);
-//		++it;
-//	}
-//
-//	search_reguser_list(g_pRegisteredUserDataBase->wildList(),c->window(),parms->safeFirstParam(),list);
-//
-//	buffer.append(list);
-//
-//	return c->leaveStackFrame();
-//}
-
 /*
 	@doc: reguser.mask
 	@type:
diff --git a/src/modules/rijndael/libkvirijndael.cpp b/src/modules/rijndael/libkvirijndael.cpp
index a9fcfdb64..1f8067948 100644
--- a/src/modules/rijndael/libkvirijndael.cpp
+++ b/src/modules/rijndael/libkvirijndael.cpp
@@ -554,32 +554,6 @@ KviCryptEngine::DecryptResult KviMircryptionEngine::decrypt(const char * inBuffe
 	if(m_bDecryptCBC)
 		return doDecryptCBC(szIn, plainText) ? KviCryptEngine::DecryptOkWasEncrypted : KviCryptEngine::DecryptError;
 	return doDecryptECB(szIn, plainText) ? KviCryptEngine::DecryptOkWasEncrypted : KviCryptEngine::DecryptError;
-
-	/*
-		int len1 = kvi_strLen(MCPS2_STARTTAG);
-		int len2 = kvi_strLen(MCPS2_ENDTAG);
-		while(szIn.len() > 0)
-		{
-			int idx = szIn.findFirstIdx(MCPS2_STARTTAG);
-			if(idx == -1)
-			{
-				// no more encrypted stuff
-				plainText += szIn;
-				return true;
-			}
-			if(idx > 0) // a non encrypted block
-				plainText += szIn.left(idx);
-			szIn.cutLeft(idx + len1);
-
-			idx = szIn.findFirstIdx(MCPS2_ENDTAG);
-			if(idx != -1)
-			{
-				KviCString toDecrypt = szIn.left(idx);
-				if(!doDecrypt(toDecrypt,plainText))return false;
-			}
-			szIn.cutLeft(idx + len2);
-		}
-		*/
 }
 
 bool KviMircryptionEngine::doEncryptECB(KviCString & plain, KviCString & encoded)
@@ -595,8 +569,6 @@ bool KviMircryptionEngine::doEncryptECB(KviCString & plain, KviCString & encoded
 			*padB++ = 0;
 	}
 
-	//byteswap_buffer((unsigned char *)plain.ptr(),plain.len());
-
 	unsigned char * out = (unsigned char *)KviMemory::allocate(plain.len()); // we use this to avoid endiannes problems
 
 	BlowFish bf((unsigned char *)m_szEncryptKey.ptr(), m_szEncryptKey.len());
@@ -703,9 +675,10 @@ static KviCryptEngine * allocMircryptionEngine()
 
 #endif
 
-// =======================================
+///////////////////////////////////////////////////////////////////////////////
 // module routines
-// =======================================
+///////////////////////////////////////////////////////////////////////////////
+
 static bool rijndael_module_init(KviModule * m)
 {
 #ifdef COMPILE_CRYPT_SUPPORT
@@ -820,9 +793,6 @@ static bool rijndael_module_can_unload(KviModule *)
 #endif
 }
 
-// =======================================
-// plugin definition structure
-// =======================================
 KVIRC_MODULE(
     "Rijndael crypt engine",
     "4.0.0",
diff --git a/src/modules/system/libkvisystem.cpp b/src/modules/system/libkvisystem.cpp
index cb533cc7d..0b370b953 100644
--- a/src/modules/system/libkvisystem.cpp
+++ b/src/modules/system/libkvisystem.cpp
@@ -209,15 +209,9 @@ static bool system_kvs_fnc_getenv(KviKvsModuleFunctionCall * c)
 	KVSM_PARAMETERS_END(c)
 
 	QByteArray szVar = szVariable.toLocal8Bit();
-	/*#ifdef COMPILE_ON_WINDOWS
-	QString env= getenv(szVar.data());
-	QString def= __tr2qs("No environment variable found, please don't use the %% in the request");
-	c->returnValue()->setString(env.isEmpty() ? QString::fromLocal8Bit(env) : QString::fromLocal8Bit(def));
-#else
-*/
+
 	char * b = KviEnvironment::getVariable(szVar.data());
 	c->returnValue()->setString(b ? QString::fromLocal8Bit(b) : QString());
-	//#endif
 	return true;
 }
 
@@ -831,6 +825,7 @@ static bool system_kvs_cmd_runcmd(KviKvsModuleCommandCall * c)
 		1 (no conversion), 2 (short), 4 (32 bit int) and 8 (64 bit int).
 		If omitted, bytecount is assumed to be 4.
 */
+
 static bool system_kvs_fnc_ntohi(KviKvsModuleFunctionCall * c)
 {
 	kvs_int_t iValue;
@@ -886,6 +881,7 @@ static bool system_kvs_fnc_ntohi(KviKvsModuleFunctionCall * c)
 		1 (no conversion), 2 (short), 4 (32 bit int) and 8 (64 bit int).
 		If omitted, bytecount is assumed to be 4.
 */
+
 static bool system_kvs_fnc_htoni(KviKvsModuleFunctionCall * c)
 {
 	kvs_int_t iValue;
diff --git a/src/modules/theme/ThemeManagementDialog.cpp b/src/modules/theme/ThemeManagementDialog.cpp
index d37fbcf52..3b4fe8ed9 100644
--- a/src/modules/theme/ThemeManagementDialog.cpp
+++ b/src/modules/theme/ThemeManagementDialog.cpp
@@ -519,34 +519,4 @@ void ThemeManagementDialog::closeEvent(QCloseEvent * e)
 
 void ThemeManagementDialog::tipRequest(QListWidgetItem *, const QPoint &)
 {
-	// FIXME
-	/*
-	//ThemeListWidgetItem * it = (ThemeListWidgetItem *)(m_pListWidget->itemAt(pnt));
-
-	//if(!it)return;
-
-	KviThemeInfo * pThemeInfo = ((ThemeListWidgetItem *)it)->themeInfo();
-
-	QString szThemeDescription;
-
-	ThemeFunctions::getThemeHtmlDescription(
-		szThemeDescription,
-		pThemeInfo->name(),
-		pThemeInfo->version(),
-		pThemeInfo->description(),
-		pThemeInfo->subdirectory(),
-		pThemeInfo->application(),
-		pThemeInfo->author(),
-		pThemeInfo->date(),
-		pThemeInfo->themeEngineVersion(),
-		pThemeInfo->mediumScreenshot(),
-		0
-	);
-	QLabel *wid=new QLabel(0);
-	wid->setWindowFlags(Qt::Popup);
-	wid->setText("Prova del tooltip");
-	wid->move(pnt);
-	wid->show();
-//	pTip->tip(m_pListWidget->visualItemRect(it),szThemeDescription);
-*/
 }
diff --git a/src/modules/toolbar/libkvitoolbar.cpp b/src/modules/toolbar/libkvitoolbar.cpp
index 8db7f97ed..2611858b6 100644
--- a/src/modules/toolbar/libkvitoolbar.cpp
+++ b/src/modules/toolbar/libkvitoolbar.cpp
@@ -77,12 +77,6 @@ static bool toolbar_kvs_cmd_create(KviKvsModuleCommandCall * c)
 	KVSM_PARAMETER("icon_id", KVS_PT_NONEMPTYSTRING, KVS_PF_OPTIONAL, szIconId)
 	KVSM_PARAMETERS_END(c)
 
-	/*	if(!c->getParameterCode(1,szLabel))
-	{
-		c->error(__tr2qs("Internal error: call a head-shrinker"));
-		return false;
-	}
-*/
 	if(szLabel.isEmpty())
 		szLabel = "$tr(Unnamed)";
 
diff --git a/src/modules/torrent/libkvitorrent.cpp b/src/modules/torrent/libkvitorrent.cpp
index 7b1dca983..36f3cc0e6 100644
--- a/src/modules/torrent/libkvitorrent.cpp
+++ b/src/modules/torrent/libkvitorrent.cpp
@@ -65,34 +65,6 @@ static TorrentInterface * auto_detect_torrent_client(KviWindow * pOut = nullptr)
 		}
 	}
 
-	/*	if(iBest < 90)
-	{
-		if(pOut)
-			pOut->outputNoFmt(KVI_OUT_MULTIMEDIA,__tr2qs_ctx("Not sure about the results, trying a second, more aggressive detection pass","torrent"));
-		// no sure player found... try again with a destructive test
-		for(d = g_pDescriptorList->first();d;d = g_pDescriptorList->next())
-		{
-			MpInterface * i = d->instance();
-			if(i)
-			{
-				int iScore = i->detect(true);
-				if(iScore > iBest)
-				{
-					iBest = iScore;
-					pBest = i;
-					pDBest = d;
-				}
-				if(pOut)
-				{
-					QString szOut;
-					QString szNam = d->name();
-					KviQString::sprintf(szOut,__tr2qs_ctx("Trying media player interface \"%Q\": score %d","torrent"),&(szNam),iScore);
-					pOut->output(KVI_OUT_MULTIMEDIA,szOut);
-				}
-			}
-		}
-	}
-*/
 	if(pDBest)
 	{
 		KVI_OPTION_STRING(KviOption_stringPreferredTorrentClient) = pDBest->name();
@@ -317,6 +289,7 @@ TC_KVS_COMMAND(detect)
 	@seealso:
 		[module:torrent]torrent module documentation[/module]
 */
+
 TC_KVS_INTRET_FUNCTION(maxUploadSpeed, maxUploadSpeed)
 
 /*
@@ -336,6 +309,7 @@ TC_KVS_INTRET_FUNCTION(maxUploadSpeed, maxUploadSpeed)
 	@seealso:
 		[module:torrent]torrent module documentation[/module]
 */
+
 TC_KVS_INTRET_FUNCTION(maxDownloadSpeed, maxDownloadSpeed)
 
 /*
@@ -355,6 +329,7 @@ TC_KVS_INTRET_FUNCTION(maxDownloadSpeed, maxDownloadSpeed)
 	@seealso:
 		[module:torrent]torrent module documentation[/module]
 */
+
 TC_KVS_INT_COMMAND(setMaxUploadSpeed, setMaxUploadSpeed, "kbytes_per_sec")
 
 /*
@@ -374,6 +349,7 @@ TC_KVS_INT_COMMAND(setMaxUploadSpeed, setMaxUploadSpeed, "kbytes_per_sec")
 	@seealso:
 		[module:torrent]torrent module documentation[/module]
 */
+
 TC_KVS_INT_COMMAND(setMaxDownloadSpeed, setMaxDownloadSpeed, "kbytes_per_sec")
 
 /*
@@ -393,6 +369,7 @@ TC_KVS_INT_COMMAND(setMaxDownloadSpeed, setMaxDownloadSpeed, "kbytes_per_sec")
 	@seealso:
 		[module:torrent]torrent module documentation[/module]
 */
+
 TC_KVS_FLOATRET_FUNCTION(speedUp, speedUp)
 
 /*
@@ -412,6 +389,7 @@ TC_KVS_FLOATRET_FUNCTION(speedUp, speedUp)
 	@seealso:
 		[module:torrent]torrent module documentation[/module]
 */
+
 TC_KVS_FLOATRET_FUNCTION(speedDown, speedDown)
 
 /*
@@ -431,6 +409,7 @@ TC_KVS_FLOATRET_FUNCTION(speedDown, speedDown)
 	@seealso:
 		[module:torrent]torrent module documentation[/module]
 */
+
 TC_KVS_FLOATRET_FUNCTION(trafficUp, trafficUp)
 
 /*
@@ -450,6 +429,7 @@ TC_KVS_FLOATRET_FUNCTION(trafficUp, trafficUp)
 	@seealso:
 		[module:torrent]torrent module documentation[/module]
 */
+
 TC_KVS_FLOATRET_FUNCTION(trafficDown, trafficDown)
 
 /*
@@ -469,6 +449,7 @@ TC_KVS_FLOATRET_FUNCTION(trafficDown, trafficDown)
 	@seealso:
 		[module:torrent]torrent module documentation[/module]
 */
+
 TC_KVS_INTRET_FUNCTION(count, count)
 
 /*
@@ -488,6 +469,7 @@ TC_KVS_INTRET_FUNCTION(count, count)
 	@seealso:
 		[module:torrent]torrent module documentation[/module]
 */
+
 TC_KVS_STRINGRET_INT_FUNCTION(name, name, "torrent_number")
 
 /*
@@ -509,6 +491,7 @@ TC_KVS_STRINGRET_INT_FUNCTION(name, name, "torrent_number")
 		[cmd]torrent.stop[/cmd], [cmd]torrent.stopAll[/cmd],
 		[cmd]torrent.startAll[/cmd]
 */
+
 TC_KVS_INT_COMMAND(start, start, "torrent_number")
 
 /*
@@ -530,6 +513,7 @@ TC_KVS_INT_COMMAND(start, start, "torrent_number")
 		[cmd]torrent.stopAll[/cmd], [cmd]torrent.startAll[/cmd],
 		[cmd]torrent.start[/cmd]
 */
+
 TC_KVS_INT_COMMAND(stop, stop, "torrent_number")
 
 /*
@@ -549,6 +533,7 @@ TC_KVS_INT_COMMAND(stop, stop, "torrent_number")
 	@seealso:
 		[module:torrent]torrent module documentation[/module]
 */
+
 TC_KVS_INT_COMMAND(announce, announce, "torrent_number")
 
 /*
@@ -568,6 +553,7 @@ TC_KVS_INT_COMMAND(announce, announce, "torrent_number")
 	@seealso:
 		[module:torrent]torrent module documentation[/module]
 */
+
 TC_KVS_INTRET_INT_FUNCTION(fileCount, fileCount, "torrent_number")
 
 /*
@@ -587,6 +573,7 @@ TC_KVS_INTRET_INT_FUNCTION(fileCount, fileCount, "torrent_number")
 	@seealso:
 		[module:torrent]torrent module documentation[/module]
 */
+
 TC_KVS_STRINGRET_INT_INT_FUNCTION(fileName, fileName, "torrent_number", "file_number")
 
 /*
@@ -606,6 +593,7 @@ TC_KVS_STRINGRET_INT_INT_FUNCTION(fileName, fileName, "torrent_number", "file_nu
 	@seealso:
 		[module:torrent]torrent module documentation[/module]
 */
+
 TC_KVS_STRINGRET_INT_INT_FUNCTION(filePriority, filePriority, "torrent_number", "file_number")
 
 /*
@@ -625,6 +613,7 @@ TC_KVS_STRINGRET_INT_INT_FUNCTION(filePriority, filePriority, "torrent_number",
 	@seealso:
 		[module:torrent]torrent module documentation[/module]
 */
+
 TC_KVS_INT_INT_STRING_COMMAND(setFilePriority, setFilePriority, "torrent_number", "file_number", "priority")
 
 /*
@@ -741,6 +730,7 @@ TC_KVS_COMMAND(setClient)
 		[module:torrent]torrent module documentation[/module],
 		[cmd]torrent.detect[/cmd], [cmd]torrent.setClient[/cmd]
 */
+
 TC_KVS_FUNCTION(client)
 {
 	c->returnValue()->setString(KVI_OPTION_STRING(KviOption_stringPreferredTorrentClient));
@@ -766,6 +756,7 @@ TC_KVS_FUNCTION(client)
 		[cmd]torrent.detect[/cmd], [cmd]torrent.setClient[/cmd],
 		[cmd]torrent.client[/cmd]
 */
+
 TC_KVS_FUNCTION(clientList)
 {
 	KviKvsArray * pArray = new KviKvsArray();
@@ -795,6 +786,7 @@ TC_KVS_FUNCTION(clientList)
 	@seealso:
 		[module:torrent]torrent module documentation[/module]
 */
+
 TC_KVS_STRINGRET_INT_FUNCTION(state, state, "torrent_number")
 
 /*
@@ -907,22 +899,6 @@ static bool torrent_module_can_unload(KviModule *)
 
 static bool torrent_module_ctrl(KviModule *, const char *, void *) // KviModule * m,const char * operation,void * param)
 {
-	/*	if(kvi_strEqualCI(operation,"getAvailableMediaPlayers"))
-	{
-		// we expect param to be a pointer to QStringList
-		QStringList * l = (QStringList *)param;
-		for(MpInterfaceDescriptor * d = g_pDescriptorList->first();d;d = g_pDescriptorList->next())
-		{
-			l->append(d->name());
-		}
-		return true;
-	}
-	if(kvi_strEqualCI(operation,"detectMediaPlayer"))
-	{
-		auto_detect_player(0);
-		return true;
-	}
-*/
 	return false;
 }
 
diff --git a/src/modules/window/libkviwindow.cpp b/src/modules/window/libkviwindow.cpp
index 231989f93..ea690f02a 100644
--- a/src/modules/window/libkviwindow.cpp
+++ b/src/modules/window/libkviwindow.cpp
@@ -1264,34 +1264,6 @@ static bool window_kvs_cmd_setBackground(KviKvsModuleCommandCall * c)
 			c->warning(__tr2qs("The window with ID '%s' doesn't exist"), szWnd.toUtf8().data());
 		return true;
 	}
-
-	/*
-	QPixmap *pix=0;
-	pix = g_pIconManager->getImage(szBackground);
-	if (!pix){
-		KviScriptObject * ob = g_pScriptObjectController->lookupObject(szBackground);
-		if(!ob){
-			if(!c->hasSwitch('q',"quiet")) c->warning(__tr2qs("Background not found %Q "),&szBackground);
-			return true;
-			}
-		if(!ob->inherits("KviScriptPixmapObject")){
-			c->warning(__tr("Pixmap objects required!"));
-			return true;
-		}
-		QVariant pix1= ob->property("pixmap");
-		if (!pix1.asPixmap().isNull()){
-			c->warning(__tr("Pixmap is null"));
-			return true;
-		}
-		pWnd->view()->setPrivateBackgroundPixmap(pix1.asPixmap());
-		return true;
-		}
-	if(pWnd)
-		pWnd->view()->setPrivateBackgroundPixmap(*pix);
-	*/
-
-	//FIXME: This is broken
-
 	return true;
 }
 
@@ -1405,6 +1377,7 @@ static bool initializeCryptEngine(KviCryptEngine * eng, KviCString & szEncryptKe
 	@seealso:
 		[fnc]$asciiToHex[/fnc], [fnc]$features[/fnc]
 */
+
 static bool window_kvs_cmd_setCryptEngine(KviKvsModuleCommandCall * c)
 {
 	QString szWnd;