cleanup: remove more ancient commneted code

14 files changed, 11 insertions, 919 deletions

diff --git a/src/modules/sharedfileswindow/SharedFilesWindow.cpp b/src/modules/sharedfileswindow/SharedFilesWindow.cpp
index abb4c3e0e..8389607f9 100644
--- a/src/modules/sharedfileswindow/SharedFilesWindow.cpp
+++ b/src/modules/sharedfileswindow/SharedFilesWindow.cpp
@@ -62,14 +62,12 @@ SharedFileEditDialog::SharedFileEditDialog(QWidget * par, KviSharedFile * f)
 
 	m_pShareNameEdit = new QLineEdit(this);
 	g->addWidget(m_pShareNameEdit, 0, 1, 1, 3);
-	//g->addMultiCellWidget( m_pShareNameEdit, 0, 0, 1, 3 );
 
 	l = new QLabel(__tr2qs_ctx("File path:", "sharedfileswindow"), this);
 	g->addWidget(l, 1, 0);
 
 	m_pFilePathEdit = new QLineEdit(this);
 	g->addWidget(m_pFilePathEdit, 1, 1, 1, 2);
-	//g->addMultiCellWidget( m_pFilePathEdit, 1, 1, 1, 2 );
 
 	m_pBrowseButton = new QPushButton(__tr2qs_ctx("&Browse...", "sharedfileswindow"), this);
 	g->addWidget(m_pBrowseButton, 1, 3);
@@ -80,14 +78,12 @@ SharedFileEditDialog::SharedFileEditDialog(QWidget * par, KviSharedFile * f)
 
 	m_pUserMaskEdit = new QLineEdit(this);
 	g->addWidget(m_pUserMaskEdit, 2, 1, 1, 3);
-	//	g->addMultiCellWidget( m_pUserMaskEdit, 2, 2, 1, 3 );
 
 	m_pExpireCheckBox = new QCheckBox(__tr2qs_ctx("Expire at:", "sharedfileswindow"), this);
 	g->addWidget(m_pExpireCheckBox, 3, 0);
 
 	m_pExpireDateTimeEdit = new QDateTimeEdit(this);
 	g->addWidget(m_pExpireDateTimeEdit, 3, 1, 1, 3);
-	//g->addMultiCellWidget(m_pExpireDateTimeEdit, 3, 3, 1, 3 );
 
 	connect(m_pExpireCheckBox, SIGNAL(toggled(bool)), m_pExpireDateTimeEdit, SLOT(setEnabled(bool)));
 
@@ -338,340 +334,6 @@ void SharedFilesWindow::sharedFileRemoved(KviSharedFile * f)
 	enableButtons();
 }
 
-/*
-void SharedFilesWindow::tipRequest(KviDynamicToolTip * tip,const QPoint &pnt)
-{
-
-	KviSharedFilesItem * it = (KviSharedFilesItem *)m_pTreeWidget->itemAt(pnt);
-	if(!it)return;
-	QString txt = it->transfer()->tipText();
-	tip->tip(m_pTreeWidget->itemRect(it),txt);
-
-}
-*/
-/*
-void SharedFilesWindow::fillTransferView()
-{
-	KviPointerList<KviSharedFiles> * l = KviSharedFilesManager::instance()->transferList();
-	if(!l)return;
-	KviSharedFilesItem * it;
-	for(KviSharedFiles * t = l->first();t;t = l->next())
-	{
-		it = new KviSharedFilesItem(m_pTreeWidget,t);
-		t->setDisplayItem(it);
-	}
-}
-
-KviSharedFilesItem * SharedFilesWindow::findItem(KviSharedFiles * t)
-{
-	KviSharedFilesItem * it = (KviSharedFilesItem *)m_pTreeWidget->firstChild();
-	while(it)
-	{
-		if(it->transfer() == t)return it;
-		it = (KviSharedFilesItem *)(it->nextSibling());
-	}
-	return 0;
-}
-
-void SharedFilesWindow::transferRegistered(KviSharedFiles * t)
-{
-	KviSharedFilesItem * it = new KviSharedFilesItem(m_pTreeWidget,t);
-	//t->setDisplayItem(it);
-}
-
-void SharedFilesWindow::transferUnregistering(KviSharedFiles * t)
-{
-	KviSharedFilesItem * it = findItem(t);
-	//t->setDisplayItem(0);
-	if(it)delete it;
-}
-
-void SharedFilesWindow::rightButtonPressed(QTreeWidgetItem *it,const QPoint &pnt,int col)
-{
-	if(!m_pContextPopup)m_pContextPopup = new QMenu(this);
-	if(!m_pLocalFilePopup)m_pLocalFilePopup = new QMenu(this);
-	if(!m_pOpenFilePopup)
-	{
-		m_pOpenFilePopup= new QMenu(this);
-		connect(m_pOpenFilePopup,SIGNAL(activated(int)),this,SLOT(openFilePopupActivated(int)));
-	}
-
-	m_pContextPopup->clear();
-
-	int id;
-
-
-	if(it)
-	{
-		KviSharedFilesItem * i = (KviSharedFilesItem *)it;
-		if(i->transfer())
-		{
-
-			QString szFile = i->transfer()->localFileName();
-			if(!szFile.isEmpty())
-			{
-				m_pLocalFilePopup->clear();
-
-				QString tmp = "<b>file:/";
-				tmp += szFile;
-				tmp += "</b><br>";
-
-				QFileInfo fi(szFile);
-				if(fi.exists())
-				{
-					tmp += "<nobr>";
-					tmp += __tr2qs_ctx("Size: %1 bytes","filetransferwindow").arg(fi.size());
-					tmp += "</nobr><br>";
-				}
-
-#ifdef COMPILE_KDE_SUPPORT
-				tmp += "<nobr>Mime: ";
-				tmp += KMimeType::findByPath(szFile)->name();
-				tmp += "</nobr>";
-#endif //COMPILE_KDE_SUPPORT
-
-				QLabel * l = new QLabel(tmp,m_pLocalFilePopup);
-				QPalette p;
-				m_pLabel->setStyleSheet("background-color: " + p.color(QPalette::Normal, QPalette::Mid).name());
-				m_pLocalFilePopup->addAction(l);
-
-#ifdef COMPILE_KDE_SUPPORT
-				QString mimetype = KMimeType::findByPath(szFile)->name();
-				KServiceTypeProfile::OfferList offers = KServiceTypeProfile::offers(mimetype,"Application");
-
-				m_pOpenFilePopup->clear();
-
-				int id;
-				int idx = 0;
-
-				for(KServiceTypeProfile::OfferList::Iterator itOffers = offers.begin();
-	   				itOffers != offers.end(); ++itOffers)
-				{
-					id = m_pOpenFilePopup->addAction((*itOffers).service()->pixmap(KIcon::Small),(*itOffers).service()->name());
-					m_pOpenFilePopup->setItemParameter(id,idx);
-					idx++;
-				}
-
-				m_pOpenFilePopup->addSeparator();
-
-				id = m_pOpenFilePopup->addAction(__tr2qs_ctx("Default application","filetransferwindow"),this,SLOT(openLocalFile()));
-				m_pOpenFilePopup->setItemParameter(id,-1);
-				id = m_pOpenFilePopup->addAction(__tr2qs_ctx("&Other...","filetransferwindow"),this,SLOT(openLocalFileWith()));
-				m_pOpenFilePopup->setItemParameter(id,-1);
-
-				m_pLocalFilePopup->addAction(__tr2qs_ctx("Open with","filetransferwindow"),m_pOpenFilePopup);
-				m_pLocalFilePopup->addSeparator();
-				m_pLocalFilePopup->addAction(__tr2qs_ctx("Open folder","filetransferwindow"),this,SLOT(openLocalFileFolder()));
-				m_pLocalFilePopup->addAction(__tr2qs_ctx("Reach in terminal","filetransferwindow"),this,SLOT(openLocalFileTerminal()));
-				m_pLocalFilePopup->addSeparator();
-#endif //COMPILE_KDE_SUPPORT
-				m_pLocalFilePopup->addAction(__tr2qs_ctx("Copy path to clipboard","filetransferwindow"),this,SLOT(copyLocalFileToClipboard()));
-
-				m_pContextPopup->addAction(__tr2qs_ctx("Local file","filetransferwindow"),m_pLocalFilePopup);
-			}
-
-			i->transfer()->fillContextPopup(m_pContextPopup,col);
-			m_pContextPopup->addSeparator();
-		}
-	}
-
-
-	bool bHaveTerminated = false;
-	KviSharedFilesItem * item = (KviSharedFilesItem *)m_pTreeWidget->firstChild();
-	while(item)
-	{
-		if(item->transfer()->terminated())
-		{
-			bHaveTerminated = true;
-			break;
-		}
-		item = (KviSharedFilesItem *)item->nextSibling();
-	}
-
-	id = m_pContextPopup->addAction(__tr2qs_ctx("Clear terminated","filetransferwindow"),this,SLOT(clearTerminated()));
-	m_pContextPopup->setItemEnabled(id,bHaveTerminated);
-
-	id = m_pContextPopup->addAction(__tr2qs_ctx("Clear all","filetransferwindow"),this,SLOT(clearAll()));
-	m_pContextPopup->setItemEnabled(id,it);
-
-	m_pContextPopup->popup(pnt);
-}
-
-
-KviSharedFiles * SharedFilesWindow::selectedTransfer()
-{
-	QTreeWidgetItem * it = m_pTreeWidget->selectedItem();
-	if(!it)return 0;
-	KviSharedFilesItem * i = (KviSharedFilesItem *)it;
-	return i->transfer();
-}
-
-void SharedFilesWindow::openFilePopupActivated(int id)
-{
-#ifdef COMPILE_KDE_SUPPORT
-	int ip = m_pOpenFilePopup->itemParameter(id);
-	if(ip < 0)return;
-	QString txt = m_pOpenFilePopup->text(id);
-
-	KviSharedFiles * t = selectedTransfer();
-	if(!t)return;
-	QString tmp = t->localFileName();
-	if(tmp.isEmpty())return;
-
-	QString mimetype = KMimeType::findByPath(tmp)->name();
-	KServiceTypeProfile::OfferList offers = KServiceTypeProfile::offers(mimetype,"Application");
-
-	for(KServiceTypeProfile::OfferList::Iterator itOffers = offers.begin();
-			itOffers != offers.end(); ++itOffers)
-	{
-		if(txt == (*itOffers).service()->name())
-		{
-			KURL::List lst;
-			KURL url;
-			url.setPath(tmp);
-			lst.append(url);
-			KRun::run(*((*itOffers).service()), lst);
-			break;
-		}
-	}
-#endif //COMPILE_KDE_SUPPORT
-}
-
-void SharedFilesWindow::openLocalFileTerminal()
-{
-#ifdef COMPILE_KDE_SUPPORT
-	KviSharedFiles * t = selectedTransfer();
-	if(!t)return;
-	QString tmp = t->localFileName();
-	if(tmp.isEmpty())return;
-
-	int idx = tmp.findRev("/");
-	if(idx == -1)return;
-	tmp = tmp.left(idx);
-
-	tmp.prepend("konsole --workdir=\"");
-	tmp.append("\"");
-
-	KRun::runCommand(tmp);
-#endif //COMPILE_KDE_SUPPORT
-}
-
-void SharedFilesWindow::openLocalFile()
-{
-#ifdef COMPILE_KDE_SUPPORT
-	KviSharedFiles * t = selectedTransfer();
-	if(!t)return;
-	QString tmp = t->localFileName();
-	if(tmp.isEmpty())return;
-
-	QString mimetype = KMimeType::findByPath(tmp)->name();
-	KService::Ptr offer = KServiceTypeProfile::preferredService(mimetype,"Application");
-	if(!offer)
-	{
-		openLocalFileWith();
-		return;
-	}
-
-	KURL::List lst;
-	KURL url;
-	url.setPath(tmp);
-	lst.append(url);
-	KRun::run(*offer, lst);
-#endif //COMPILE_KDE_SUPPORT
-}
-
-void SharedFilesWindow::openLocalFileWith()
-{
-#ifdef COMPILE_KDE_SUPPORT
-	KviSharedFiles * t = selectedTransfer();
-	if(!t)return;
-	QString tmp = t->localFileName();
-	if(tmp.isEmpty())return;
-
-	KURL::List lst;
-	KURL url;
-	url.setPath(tmp);
-	lst.append(url);
-	KRun::displayOpenWithDialog(lst);
-#endif //COMPILE_KDE_SUPPORT
-}
-
-void SharedFilesWindow::copyLocalFileToClipboard()
-{
-	KviSharedFiles * t = selectedTransfer();
-	if(!t)return;
-	QString tmp = t->localFileName();
-	if(tmp.isEmpty())return;
-	QApplication::clipboard()->setSelectionMode(false);
-	QApplication::clipboard()->setText(tmp);
-	QApplication::clipboard()->setSelectionMode(true);
-	QApplication::clipboard()->setText(tmp);
-}
-
-void SharedFilesWindow::openLocalFileFolder()
-{
-#ifdef COMPILE_KDE_SUPPORT
-	KviSharedFiles * t = selectedTransfer();
-	if(!t)return;
-	QString tmp = t->localFileName();
-	if(tmp.isEmpty())return;
-
-	int idx = tmp.findRev("/");
-	if(idx == -1)return;
-	tmp = tmp.left(idx);
-
-	QString mimetype = KMimeType::findByPath(tmp)->name(); // inode/directory
-	KService::Ptr offer = KServiceTypeProfile::preferredService(mimetype,"Application");
-	if(!offer)return;
-
-	KURL::List lst;
-	KURL url;
-	url.setPath(tmp);
-	lst.append(url);
-	KRun::run(*offer, lst);
-#endif //COMPILE_KDE_SUPPORT
-}
-
-void SharedFilesWindow::heartbeat()
-{
-	if(m_pTreeWidget->childCount() < 1)return;
-
-	QTreeWidgetItem * i1;
-	QTreeWidgetItem * i2;
-
-	i1 = m_pTreeWidget->itemAt(QPoint(1,1));
-	if(!i1)
-	{
-		m_pTreeWidget->viewport()->update();
-		return;
-	}
-	i2 = m_pTreeWidget->itemAt(QPoint(1,m_pTreeWidget->viewport()->height() - 2));
-	if(i2)i2 = i2->nextSibling();
-
-	while(i1 && (i1 != i2))
-	{
-		if(((KviSharedFilesItem *)i1)->transfer()->active())
-		{
-			m_pTreeWidget->repaintItem(i1);
-		}
-		i1 = i1->nextSibling();
-	}
-}
-
-void SharedFilesWindow::clearAll()
-{
-	if(QMessageBox::information(this,__tr2qs_ctx("Clear all transfers","filetransferwindow"),
-				__tr2qs_ctx("Remove all the transfers including the running ones ?","filetransferwindow"),
-				__tr2qs_ctx("Yes","filetransferwindow"),__tr2qs_ctx("No","filetransferwindow")) != 0)return;
-
-	KviSharedFilesManager::instance()->killAllTransfers();
-}
-
-void SharedFilesWindow::clearTerminated()
-{
-	KviSharedFilesManager::instance()->killTerminatedTransfers();
-}
-*/
 void SharedFilesWindow::getBaseLogFileName(QString & buffer)
 {
 	buffer.sprintf("SHAREDFILES");
@@ -684,9 +346,7 @@ QPixmap * SharedFilesWindow::myIconPtr()
 
 void SharedFilesWindow::resizeEvent(QResizeEvent *)
 {
-	//int h = m_pInput->heightHint();
 	m_pSplitter->setGeometry(0, 0, width(), height());
-	//m_pInput->setGeometry(0,height() - h,width(),h);
 }
 
 QSize SharedFilesWindow::sizeHint() const
@@ -703,32 +363,3 @@ void SharedFilesWindow::die()
 {
 	close();
 }
-
-//#warning "Load & save properties of this kind of window"
-
-//void SharedFilesWindow::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 SharedFilesWindow::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);
-//}
diff --git a/src/modules/system/Plugin.cpp b/src/modules/system/Plugin.cpp
index 3d579c083..5b0e1c3f0 100644
--- a/src/modules/system/Plugin.cpp
+++ b/src/modules/system/Plugin.cpp
@@ -33,6 +33,7 @@
 
 #include <QDir>
 #include <QFileInfo>
+
 /*
 	@doc: easyplugins
 	@type:
diff --git a/src/modules/system/libkvisystem.cpp b/src/modules/system/libkvisystem.cpp
index 44258827d..cb533cc7d 100644
--- a/src/modules/system/libkvisystem.cpp
+++ b/src/modules/system/libkvisystem.cpp
@@ -747,6 +747,7 @@ static bool system_kvs_fnc_plugin_call(KviKvsModuleFunctionCall * c)
 			system.runcmd "ping $0"
 		[/example]
 */
+
 // implements https://github.com/kvirc/KVIrc/issues/459
 static bool system_kvs_cmd_runcmd(KviKvsModuleCommandCall * c)
 {
diff --git a/src/modules/term/TermWindow.cpp b/src/modules/term/TermWindow.cpp
index 8ea32d0e7..18d4416e6 100644
--- a/src/modules/term/TermWindow.cpp
+++ b/src/modules/term/TermWindow.cpp
@@ -42,8 +42,6 @@ TermWindow::TermWindow(const char * name)
 	g_pTermWindowList->append(this);
 	m_pTermWidget = 0;
 	m_pTermWidget = new TermWidget(this);
-	// Ensure proper focusing
-	//	setFocusHandler(m_pTermWidget->konsoleWidget(),this);
 }
 
 TermWindow::~TermWindow()
diff --git a/src/modules/theme/PackThemeDialog.cpp b/src/modules/theme/PackThemeDialog.cpp
index 4af6d1326..f7e2b14b0 100644
--- a/src/modules/theme/PackThemeDialog.cpp
+++ b/src/modules/theme/PackThemeDialog.cpp
@@ -50,9 +50,6 @@
 #include <QPainter>
 #include <QImage>
 #include <QBuffer>
-//#include <QComboBox>
-//#include <QToolTip>
-//#include <QPushButton>
 
 PackThemeDialog::PackThemeDialog(QWidget * pParent, KviPointerList<KviThemeInfo> * pThemeInfoList)
     : QWizard(pParent)
@@ -333,8 +330,6 @@ PackThemeImageWidget::PackThemeImageWidget(PackThemeDialog * pParent)
 	pLayout->addWidget(m_pImageSelector);
 	// Store data in the fields
 	registerField("packageImagePath*", m_pImageSelector);
-
-	//m_pImageSelectionPage = pPage;
 }
 
 PackThemeImageWidget::~PackThemeImageWidget()
@@ -417,9 +412,6 @@ void PackThemeDialog::accept()
 
 bool PackThemeDialog::packTheme()
 {
-	//m_pImageSelector->commit();
-	//m_pPathSelector->commit();
-
 	// Get data from registered fields
 	m_szAuthor = field("packageAuthor").toString();
 	m_szName = field("packageName").toString();
diff --git a/src/modules/theme/ThemeManagementDialog.cpp b/src/modules/theme/ThemeManagementDialog.cpp
index 6eda5f88f..d37fbcf52 100644
--- a/src/modules/theme/ThemeManagementDialog.cpp
+++ b/src/modules/theme/ThemeManagementDialog.cpp
@@ -190,7 +190,6 @@ ThemeManagementDialog::ThemeManagementDialog(QWidget * parent)
 	connect(m_pListWidget, SIGNAL(itemDoubleClicked(QListWidgetItem *)), this, SLOT(applyTheme(QListWidgetItem *)));
 
 	//FIXME tooltip
-	//connect(m_pListWidget,SIGNAL(tipRequest(QListWidgetItem *,const QPoint &)),this,SLOT(tipRequest(QListWidgetItem *,const QPoint &)));
 	connect(m_pListWidget, SIGNAL(customContextMenuRequested(const QPoint &)),
 	    this, SLOT(contextMenuRequested(const QPoint &)));
 	connect(m_pListWidget, SIGNAL(itemSelectionChanged()), this, SLOT(enableDisableButtons()));
@@ -201,34 +200,25 @@ ThemeManagementDialog::ThemeManagementDialog(QWidget * parent)
 	pSep->setMinimumHeight(8);
 	pVBox->addWidget(pSep);
 
-	//g->addWidget(pSep,2,0);
-
 	m_pCurrentInstalledThemeLabel = new QLabel(this);
 	m_pCurrentInstalledThemeLabel->setText(__tr2qs_ctx("<b><u>Current Installed Theme:</u> ", "theme") + " " + KVI_OPTION_STRING(KviOption_stringIconThemeSubdir) + "</b>");
-	//	g->addWidget(pLabel,2,0);
+
 	pVBox->addWidget(m_pCurrentInstalledThemeLabel);
 
 	pSep = new QFrame(this);
 	pSep->setFrameStyle(QFrame::HLine | QFrame::Sunken);
 	pSep->setMinimumWidth(400);
 
-	//	g->addWidget(pSep,3,0);
 	pVBox->addWidget(pSep);
 
-	//	g->addWidget(m_pListWidget,4,0);
 	pVBox->addWidget(m_pListWidget);
 
-	//	KviDynamicToolTip * tip = new KviDynamicToolTip(m_pListWidget);
-	//	connect(tip,SIGNAL(tipRequest(KviDynamicToolTip *,const QPoint &)),this,SLOT(tipRequest(KviDynamicToolTip *,const QPoint &)));
-
 	QPushButton * b = new QPushButton(__tr2qs("Close"), this);
 	b->setMaximumSize(b->sizeHint().width(), b->sizeHint().height());
 	connect(b, SIGNAL(clicked()), this, SLOT(closeClicked()));
-	//	g->addWidget(b,5,0);
+
 	pVBox->addWidget(b);
 
-	//	g->setMargin(1);
-	//	g->setSpacing(1);
 	pVBox->setAlignment(b, Qt::AlignRight);
 	fillThemeBox();
 	m_pContextPopup = new QMenu(this);
@@ -366,7 +356,6 @@ void ThemeManagementDialog::applyCurrentTheme()
 	KviThemeInfo out;
 
 	//qDebug("Apply theme item %x, info %x, %s : %s at location %d",(long)it,(long)it->themeInfo(),it->themeInfo()->directory().toUtf8().data(),it->themeInfo()->subdirectory().toUtf8().data(),it->themeInfo()->location());
-
 	if(!KviTheme::apply(it->themeInfo()->subdirectory(), it->themeInfo()->location(), out))
 	{
 		QString szErr = out.lastError();
@@ -473,14 +462,12 @@ void ThemeManagementDialog::fillThemeBox(bool bBuiltin)
 	for(int i = 0; i < slThemes.count(); i++)
 	{
 		//qDebug("Installed theme %s builtin %d",slThemes.at(i).toUtf8().data(),bBuiltin);
-
 		KviThemeInfo * inf = new KviThemeInfo();
 		if(inf->load(slThemes.at(i), bBuiltin ? KviThemeInfo::Builtin : KviThemeInfo::User))
 		{
 			ThemeListWidgetItem * it = new ThemeListWidgetItem(m_pListWidget, inf);
 
 			//qDebug("Item %x, info %x, info2 %x, %s : %s at location %d",(long)it,(long)inf,(long)it->themeInfo(),it->themeInfo()->directory().toUtf8().data(),it->themeInfo()->subdirectory().toUtf8().data(),it->themeInfo()->location());
-
 			QPixmap pixmap = inf->smallScreenshot();
 			if(!pixmap.isNull())
 				it->setIcon(pixmap.scaled(300, 280, Qt::KeepAspectRatio));
diff --git a/src/modules/theme/libkvitheme.cpp b/src/modules/theme/libkvitheme.cpp
index 68c7c3eb5..7428dc202 100644
--- a/src/modules/theme/libkvitheme.cpp
+++ b/src/modules/theme/libkvitheme.cpp
@@ -106,6 +106,7 @@ static bool theme_kvs_cmd_install(KviKvsModuleCommandCall * c)
 		If no switch is present then KVIrc tries to determine automatically the
 		type of theme (user, builtin or external).
 */
+
 static bool theme_kvs_cmd_apply(KviKvsModuleCommandCall * c)
 {
 	QString szTheme;
diff --git a/src/modules/toolbareditor/CustomizeToolBarsDialog.cpp b/src/modules/toolbareditor/CustomizeToolBarsDialog.cpp
index d7fac04f6..f547d14bc 100644
--- a/src/modules/toolbareditor/CustomizeToolBarsDialog.cpp
+++ b/src/modules/toolbareditor/CustomizeToolBarsDialog.cpp
@@ -348,7 +348,7 @@ CustomizeToolBarsDialog::CustomizeToolBarsDialog(QWidget * p)
 	{
 		g_rectToolBarEditorDialogGeometry.setY(5);
 	}
-	//setGeometry(KVI_OPTION_RECT(KviOption_rectRegisteredUsersDialogGeometry));
+
 	resize(g_rectToolBarEditorDialogGeometry.width(),
 	    g_rectToolBarEditorDialogGeometry.height());
 	move(g_rectToolBarEditorDialogGeometry.x(),
diff --git a/src/modules/torrent/KTorrentDbusInterface.cpp b/src/modules/torrent/KTorrentDbusInterface.cpp
index 26c5a2766..32118095f 100644
--- a/src/modules/torrent/KTorrentDbusInterface.cpp
+++ b/src/modules/torrent/KTorrentDbusInterface.cpp
@@ -43,12 +43,6 @@ TORR_IMPLEMENT_DESCRIPTOR(
 
 KTorrentDbusInterface::KTorrentDbusInterface()
 {
-	// 		printf("KTorrentDbusInterface\n");
-
-	// 		QTimer *timer = new QTimer(this);
-	// 		connect(timer, SIGNAL(timeout()), this, SLOT(slotTimer()));
-	// 		timer->start(250, false);
-
 	// make sure we have a list of files,
 	// otherwise functions dealing would
 	// fail if called the first time
@@ -57,7 +51,6 @@ KTorrentDbusInterface::KTorrentDbusInterface()
 
 KTorrentDbusInterface::~KTorrentDbusInterface()
 {
-	// 		printf("~KTorrentDbusInterface\n");
 }
 
 bool KTorrentDbusInterface::findRunningApp()
@@ -110,192 +103,48 @@ bool KTorrentDbusInterface::stopAll()
 	return true;
 }
 
-/*
-	void KTorrentDbusInterface::slotTimer()
-	{
-		if (!findRunningApp())
-			return;
-
-		m_ti.clear();
-
-		QList<int> ret;
-		if (!qvalueListIntRetIntDCOPCall("KTorrent", "getTorrentNumbers(int)", ret, 0))
-			ERROR_RET_VOID
-
-		for (int i=0; i<ret.size(); i++)
-		{
-			KviQCStringList info;
-			if (!qcstringListRetIntDCOPCall("KTorrent", "getTorrentInfo(int)", info, ret[i]))
-				ERROR_RET_VOID
-
-			if (info.size() == 0)
-				continue;
-
-			TorrentInfo item;
-			if (!makeTorrentInfo(item, info))
-				return;
-
-			item.num = ret[i];
-			m_ti.append(item);
-		}
-
-		qHeapSort(m_ti);
-	}
-
-	bool makeSize(float &sz, const QString &s, const QString &u)
-	{
-		bool ok;
-		sz = s.toFloat(&ok);
-		if (!ok)
-			return false;
-
-		if (u == "B")
-			;
-		else
-		if (u == "KiB")
-			sz = sz * 1024.0;
-		else
-		if (u == "MiB")
-			sz = sz * 1024.0 * 1024.0;
-		else
-		if (u == "GiB")
-			sz = sz * 1024.0 * 1024.0 * 1024.0;
-		else
-			return false;
-
-		return true;
-	}
-*/
 bool KTorrentDbusInterface::start(int)
 {
-	/*
-		CHECK_RANGE_BOOL(i, m_ti.size())
-
-		qDebug("starting %s [%d]", (const char*)m_ti[i].name, m_ti[i].num);
-		if (!voidRetIntDCOPCall("KTorrent", "start(int)", m_ti[i].num))
-			ERROR_RET_BOOL
-*/
 	return true;
 }
 
 bool KTorrentDbusInterface::stop(int)
 {
-	/*
-		CHECK_RANGE_BOOL(i, m_ti.size())
-
-		qDebug("stopping %s [%d]", (const char*)m_ti[i].name, m_ti[i].num);
-		if (!voidRetIntBoolDCOPCall("KTorrent", "stop(int, bool)", m_ti[i].num, true))
-			ERROR_RET_BOOL
-*/
 	return true;
 }
 
 bool KTorrentDbusInterface::announce(int)
 {
-	/*
-		CHECK_RANGE_BOOL(i, m_ti.size())
-
-		qDebug("announcing %s [%d]", (const char*)m_ti[i].name, m_ti[i].num);
-		if (!voidRetIntDCOPCall("KTorrent", "announce(int)", m_ti[i].num))
-			ERROR_RET_BOOL
-*/
 	return true;
 }
 
 QString KTorrentDbusInterface::state(int)
 {
-	/*
-		CHECK_RANGE_STRING(i, m_ti.size())
-
-		return m_ti[i].state;
-*/
 	return QString();
 }
 
 QString KTorrentDbusInterface::name(int)
 {
-	/*
-		CHECK_RANGE_STRING(i, m_ti.size())
-
-		return m_ti[i].name;
-	*/
 	return QString();
 }
 
 int KTorrentDbusInterface::fileCount(int)
 {
-	/*
-		CHECK_RANGE_INT(i, m_ti.size())
-
-		int ret;
-		if (!intRetIntDCOPCall("KTorrent", "getFileCount(int)", ret, m_ti[i].num))
-			ERROR_RET_NUM
-
-		return ret;
-	*/
 	return 0;
 }
 
 QString KTorrentDbusInterface::fileName(int, int)
 {
-	/*
-		CHECK_RANGE_STRING(i, m_ti.size())
-
-		QCStringList ret;
-		if (!qcstringListRetIntDCOPCall("KTorrent", "getFileNames(int)", ret, m_ti[i].num))
-			ERROR_RET_STRING
-
-		CHECK_RANGE_STRING(file, ret.size())
-
-		return ret[file];
-	*/
 	return QString();
 }
 
 QString KTorrentDbusInterface::filePriority(int, int)
 {
-	/*
-		CHECK_RANGE_STRING(i, m_ti.size())
-
-		QValueList<int> ret;
-		if (!qvalueListIntRetIntDCOPCall("KTorrent", "getFilePriorities(int)",ret, m_ti[i].num))
-			ERROR_RET_STRING
-
-		CHECK_RANGE_STRING(file, ret.size())
-
-		qDebug("prio: %d", ret[file]);
-		switch (ret[file])
-		{
-			case 1: return "low";
-			case 2: return "normal";
-			case 3: return "high";
-		}
-
-		ERROR_RET_STRING
-	*/
 	return QString();
 }
 
 bool KTorrentDbusInterface::setFilePriority(int, int, const QString &)
 {
-	/*
-		CHECK_RANGE_BOOL(i, m_ti.size())
-
-		int prion;
-		if (prio == "low")
-			prion = 1;
-		else
-		if (prio == "normal")
-			prion = 2;
-		else
-		if (prio == "high")
-			prion = 1;
-		else
-			ERROR_RET_BOOL
-
-		if (!voidRetIntIntIntDCOPCall("KTorrent", "setFilePriority(int,int,int)", m_ti[i].num, file, prion))
-			ERROR_RET_BOOL
-*/
 	return true;
 }
 
@@ -307,192 +156,41 @@ int KTorrentDbusInterface::count()
 
 float KTorrentDbusInterface::speedUp()
 {
-	/*
-		KviQCStringList ret;
-		if (!qcstringListRetVoidDCOPCall("KTorrent", "getInfo()", ret))
-			ERROR_RET_NUM
-
-		QStringList tmp = QStringList::split(" ", ret[2]);
-		if (tmp.size() != 8)
-			ERROR_RET_NUM
-
-		bool ok;
-		float f = tmp[6].toFloat(&ok);
-		if (!ok)
-			ERROR_RET_NUM
-
-		return f;
-	*/
 	return 0.0;
 }
 
 float KTorrentDbusInterface::speedDown()
 {
-	/*
-		KviQCStringList ret;
-		if (!qcstringListRetVoidDCOPCall("KTorrent", "getInfo()", ret))
-			ERROR_RET_NUM
-
-		QStringList tmp = QStringList::split(" ", ret[2]);
-		if (tmp.size() != 8)
-			ERROR_RET_NUM
-
-		bool ok;
-		float f = tmp[2].toFloat(&ok);
-		if (!ok)
-			ERROR_RET_NUM
-
-		return f;
-	*/
 	return 0.0;
 }
 
 float KTorrentDbusInterface::trafficUp()
 {
-	/*
-		KviQCStringList ret;
-		if (!qcstringListRetVoidDCOPCall("KTorrent", "getInfo()", ret))
-			ERROR_RET_NUM
-
-		QStringList tmp = QStringList::split(" ", ret[1]);
-		if (tmp.size() != 8)
-			ERROR_RET_NUM
-
-		float f;
-		if (!makeSize(f, tmp[6], tmp[7]))
-			ERROR_RET_NUM
-
-		return f;
-	*/
 	return 0.0;
 }
 
 float KTorrentDbusInterface::trafficDown()
 {
-	/*
-		KviQCStringList ret;
-		if (!qcstringListRetVoidDCOPCall("KTorrent", "getInfo()", ret))
-			ERROR_RET_NUM
-
-		QStringList tmp = QStringList::split(" ", ret[1]);
-		if (tmp.size() != 8)
-			ERROR_RET_NUM
-
-		float f;
-		if (!makeSize(f, tmp[2], tmp[3]))
-			ERROR_RET_NUM
-
-		return f;
-	*/
 	return 0.0;
 }
-/*
-	bool KTorrentDbusInterface::makeTorrentInfo(TorrentInfo &ti, const KviQCStringList &ret)
-	{
-		if (ret.size() != 10)
-			ERROR_RET_BOOL
-
-		ti.name = ret[0];
-		if (ret[1] == "Seeding")
-			ti.state = "Seeding";
-		else
-		if (ret[1] == "Stalled")
-			ti.state = "Stalled";
-		else
-		if (ret[1] == "Downloading")
-			ti.state = "Downloading";
-		else
-			ti.state = "Stopped";
-
-
-		QStringList tmp;
-		tmp = QStringList::split(" ", ret[2]);
-		if (tmp.size()!=2 || !makeSize(ti.trafficDown, tmp[0], tmp[1]))
-			ERROR_RET_BOOL
-
-		tmp = QStringList::split(" ", ret[3]);
-		if (tmp.size()!=2 || !makeSize(ti.size, tmp[0], tmp[1]))
-			ERROR_RET_BOOL
-
-		tmp = QStringList::split(" ", ret[4]);
-		if (tmp.size()!=2 || !makeSize(ti.trafficUp, tmp[0], tmp[1]))
-			ERROR_RET_BOOL
-
-
-		bool ok;
-		tmp = QStringList::split(" ", ret[5]);
-		if (tmp.size()!=2)
-			ERROR_RET_BOOL
-		ti.speedDown = tmp[0].toFloat(&ok);
-		if (!ok)
-			ERROR_RET_BOOL
-
-		tmp = QStringList::split(" ", ret[6]);
-		if (tmp.size()!=2)
-			ERROR_RET_BOOL
-		ti.speedUp = tmp[0].toFloat(&ok);
-		if (!ok)
-			ERROR_RET_BOOL
-
-
-		// torrent name, status, downloaded, size, uploaded, down spd, up spd, none, peers, % complete
-		ti.peers = ret[8].toInt(&ok);
-		if (!ok)
-			ERROR_RET_BOOL
-
-		tmp = QStringList::split(" ", ret[9]);
-		if (tmp.size()!=2)
-			ERROR_RET_BOOL
-		ti.percent = tmp[0].toFloat(&ok);
-		if (!ok)
-			ERROR_RET_BOOL
 
-		return true;
-	}
-*/
 int KTorrentDbusInterface::maxUploadSpeed()
 {
-	/*
-		int ret;
-		if (!intRetVoidDCOPCall("KTorrent", "maxUploadRate()", ret))
-		{
-			ERROR_MSG
-			return -1;
-		}
-		return ret;
-	*/
 	return -1;
 }
 
 int KTorrentDbusInterface::maxDownloadSpeed()
 {
-	/*
-		int ret;
-		if (!intRetVoidDCOPCall("KTorrent", "maxDownloadRate()", ret))
-		{
-			ERROR_MSG
-			return -1;
-		}
-		return ret;
-	*/
 	return -1;
 }
 
 bool KTorrentDbusInterface::setMaxUploadSpeed(int)
 {
-	/*
-		if (!voidRetIntDCOPCall("KTorrent", "setMaxUploadSpeed(int)", kbytes_per_sec))
-			ERROR_RET_BOOL
-	*/
 	return true;
 }
 
 bool KTorrentDbusInterface::setMaxDownloadSpeed(int)
 {
-	/*
-		if (!voidRetIntDCOPCall("KTorrent", "setMaxDownloadSpeed(int)", kbytes_per_sec))
-			ERROR_RET_BOOL
-	*/
 	return true;
 }
 
diff --git a/src/modules/trayicon/libkvitrayicon.cpp b/src/modules/trayicon/libkvitrayicon.cpp
index b9b2b77f1..a29ca74d2 100644
--- a/src/modules/trayicon/libkvitrayicon.cpp
+++ b/src/modules/trayicon/libkvitrayicon.cpp
@@ -251,13 +251,6 @@ bool KviTrayIconWidget::event(QEvent * e)
 	return false;
 }
 
-//int KviTrayIconWidget::message(int,void *)
-//{
-//	qDebug("Message");
-//	update();
-//	return 0;
-//}
-
 void KviTrayIconWidget::doAway(bool)
 {
 	int id;
diff --git a/src/modules/upnp/RootService.cpp b/src/modules/upnp/RootService.cpp
index 901599bc5..e1cab77ee 100644
--- a/src/modules/upnp/RootService.cpp
+++ b/src/modules/upnp/RootService.cpp
@@ -42,101 +42,6 @@
 
 namespace UPnP
 {
-
-	// Example message result:
-	//
-	//   <root xmlns="urn:schemas-upnp-org:device-1-0" >
-	//     <specVersion>
-	//       <major>1</major>
-	//       <minor>0</minor>
-	//     </specVersion>
-	//     <URLBase>http://10.0.0.138</URLBase>
-	//     <device>
-	//       <deviceType>urn:schemas-upnp-org:device:InternetGatewayDevice:1</deviceType>
-	//       <friendlyName>SpeedTouch 510 (0313QZ6S2)</friendlyName>
-	//       <manufacturer>THOMSON multimedia</manufacturer>
-	//       <manufacturerURL>http://www.thomson-multimedia.com</manufacturerURL>
-	//       <modelDescription>DSL Internet Gateway</modelDescription>
-	//       <modelName>SpeedTouch</modelName>
-	//       <modelNumber>510</modelNumber>
-	//       <modelURL>http://www.speedtouch.com</modelURL>
-	//       <serialNumber>0313QZ6S2</serialNumber>
-	//       <UDN>uuid:UPnP-SpeedTouch510-1_00-90-D0-8E-A1-6F</UDN>
-	//       <presentationURL>/index.htm</presentationURL>
-	//       <serviceList>
-	//         <service>
-	//           <serviceType>urn:schemas-upnp-org:service:Layer3Forwarding:1</serviceType>
-	//           <serviceId>urn:upnp-org:serviceId:layer3f</serviceId>
-	//           <controlURL>/upnp/control/layer3f</controlURL>
-	//           <eventSubURL>/upnp/event/layer3f</eventSubURL>
-	//           <SCPDURL>/Layer3Forwarding.xml</SCPDURL>
-	//         </service>
-	//       </serviceList>
-	//       <deviceList>
-	//         <device>
-	//           <deviceType>urn:schemas-upnp-org:device:LANDevice:1</deviceType>
-	//           <friendlyName>LANDevice</friendlyName>
-	//           <manufacturer>THOMSON multimedia</manufacturer>
-	//           <modelName>SpeedTouch</modelName>
-	//           <serialNumber>0313QZ6S2</serialNumber>
-	//           <UDN>uuid:UPnP-SpeedTouch510-1_00-90-D0-8E-A1-6F_LD</UDN>
-	//           <serviceList>
-	//             <service>
-	//               <serviceType>urn:schemas-upnp-org:service:LANHostConfigManagement:1</serviceType>
-	//               <serviceId>urn:upnp-org:serviceId:lanhcm</serviceId>
-	//               <controlURL>/upnp/control/lanhcm</controlURL>
-	//               <eventSubURL>/upnp/event/lanhcm</eventSubURL>
-	//               <SCPDURL>/LANHostConfigManagement.xml</SCPDURL>
-	//             </service>
-	//           </serviceList>
-	//         </device>
-	//         <device>
-	//           <deviceType>urn:schemas-upnp-org:device:WANDevice:1</deviceType>
-	//           <friendlyName>WANDevice</friendlyName>
-	//           <manufacturer>THOMSON multimedia</manufacturer>
-	//           <modelName>SpeedTouch</modelName>
-	//           <serialNumber>0313QZ6S2</serialNumber>
-	//           <UDN>uuid:UPnP-SpeedTouch510-1_00-90-D0-8E-A1-6F_WD</UDN>
-	//           <serviceList>
-	//             <service>
-	//               <serviceType>urn:schemas-upnp-org:service:WANCommonInterfaceConfig:1</serviceType>
-	//               <serviceId>urn:upnp-org:serviceId:wancic</serviceId>
-	//               <controlURL>/upnp/control/wancic</controlURL>
-	//               <eventSubURL>/upnp/event/wancic</eventSubURL>
-	//               <SCPDURL>/WANCommonInterfaceConfig.xml</SCPDURL>
-	//             </service>
-	//           </serviceList>
-	//           <deviceList>
-	//             <device>
-	//               <deviceType>urn:schemas-upnp-org:device:WANConnectionDevice:1</deviceType>
-	//               <friendlyName>WANConnectionDevice</friendlyName>
-	//               <manufacturer>THOMSON multimedia</manufacturer>
-	//               <modelName>SpeedTouch</modelName>
-	//               <serialNumber>0313QZ6S2</serialNumber>
-	//               <UDN>uuid:UPnP-SpeedTouch510-1_00-90-D0-8E-A1-6F_WCDpppoa</UDN>
-	//               <serviceList>
-	//                 <service>
-	//                   <serviceType>urn:schemas-upnp-org:service:WANDSLLinkConfig:1</serviceType>
-	//                   <serviceId>urn:upnp-org:serviceId:wandsllc:pppoa</serviceId>
-	//                   <controlURL>/upnp/control/wandsllcpppoa</controlURL>
-	//                   <eventSubURL>/upnp/event/wandsllcpppoa</eventSubURL>
-	//                   <SCPDURL>/WANDSLLinkConfig.xml</SCPDURL>
-	//                 </service>
-	//                 <service>
-	//                   <serviceType>urn:schemas-upnp-org:service:WANPPPConnection:1</serviceType>
-	//                   <serviceId>urn:upnp-org:serviceId:wanpppc:pppoa</serviceId>
-	//                   <controlURL>/upnp/control/wanpppcpppoa</controlURL>
-	//                   <eventSubURL>/upnp/event/wanpppcpppoa</eventSubURL>
-	//                   <SCPDURL>/WANPPPConnection.xml</SCPDURL>
-	//                 </service>
-	//               </serviceList>
-	//             </device>
-	//           </deviceList>
-	//         </device>
-	//       </deviceList>
-	//     </device>
-	//   </root>
-
 	// The contructor
 	RootService::RootService(const QString & hostname, int port, const QString & rootUrl)
 	    : Service(hostname, port, rootUrl), m_szHostname(hostname), m_iPort(port)
diff --git a/src/modules/upnp/Service.cpp b/src/modules/upnp/Service.cpp
index 872393874..f7e7f4baa 100644
--- a/src/modules/upnp/Service.cpp
+++ b/src/modules/upnp/Service.cpp
@@ -39,7 +39,7 @@
 
 #include "KviNetworkAccessManager.h"
 
-// This implementation was created with the help of the following documentation:
+//   This implementation was created with the help of the following documentation:
 //   http://www.upnp.org/standardizeddcps/documents/UPnP_IGD_1.0.zip
 //   http://zacbowling.com/upnp/
 //   http://www.knoxscape.com/Upnp/NAT.htm
@@ -242,17 +242,6 @@ namespace UPnP
 
 		if(!error)
 		{
-			//extract the xml prefix used by the device; should be "s"
-
-			//this is the reply of my Zyxel:
-			// <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" >
-			//  <SOAP-ENV:Body>
-			//   <u:GetDefaultConnectionServiceResponse xmlns:u="urn:schemas-upnp-org:service:Layer3Forwarding:1" >
-			//    <NewDefaultConnectionService>WANIPConnection</NewDefaultConnectionService>
-			//   </u:GetDefaultConnectionServiceResponse>
-			//  </SOAP-ENV:Body>
-			// </SOAP-ENV:Envelope>
-
 			QString baseNamespace = xml.documentElement().tagName();
 
 			if(baseNamespace.length() > 0)
diff --git a/src/modules/url/libkviurl.cpp b/src/modules/url/libkviurl.cpp
index 1fb53202a..be22b7c95 100644
--- a/src/modules/url/libkviurl.cpp
+++ b/src/modules/url/libkviurl.cpp
@@ -144,42 +144,19 @@ UrlDialog::UrlDialog(KviPointerList<KviUrl> *)
 	m_pUrlList = new UrlDialogTreeWidget(this);
 
 	m_pMenuBar = new KviTalMenuBar(this, "URL menu");
-	//m_pUrlList = new KviListView(this,"list");
-	KviConfigurationFile cfg(szConfigPath, KviConfigurationFile::Read);
-	/*
-    QMenu *pop;
 
-    pop = new QMenu(this);
-	pop->addAction(__tr2qs("&Configure"),this,SLOT(config()));
-// 	pop->addAction(__tr2qs("&Help"),this,SLOT(help()));
-	pop->addAction(__tr2qs("Clo&se"),this,SLOT(close_slot()));
-	pop->setTitle(__tr2qs("&Module"));
-	m_pMenuBar->addMenu(pop);
+	KviConfigurationFile cfg(szConfigPath, KviConfigurationFile::Read);
 
-    pop = new QMenu(this);
-	pop->addAction(__tr2qs("&Load"),this,SLOT(loadList()));
-	pop->addAction(__tr2qs("&Save"),this,SLOT(saveList()));
-	pop->addAction(__tr2qs("&Clear"),this,SLOT(clear()));
-	pop->setTitle(__tr2qs("&List"));
-	m_pMenuBar->addMenu(pop);
-*/
 	m_pUrlList->header()->setSortIndicatorShown(true);
 	m_pUrlList->setColumnCount(4);
 
 	QStringList labels;
 	labels << __tr2qs("URL") << __tr2qs("Window") << __tr2qs("Count") << __tr2qs("Timestamp");
 	m_pUrlList->setHeaderLabels(labels);
-	/*
-	cfg.setGroup("colsWidth");
-	m_pUrlList->setColumnWidth(0,cfg.readIntEntry("Url",170));
-	m_pUrlList->setColumnWidth(1,cfg.readIntEntry("Window",130));
-	m_pUrlList->setColumnWidth(2,cfg.readIntEntry("Count",70));
-	m_pUrlList->setColumnWidth(3,cfg.readIntEntry("Timestamp",70));
-*/
+
 	connect(m_pUrlList, SIGNAL(itemDoubleClicked(QTreeWidgetItem *, int)), SLOT(dblclk_url(QTreeWidgetItem *, int)));
 	connect(m_pUrlList, SIGNAL(rightButtonPressed(QTreeWidgetItem *, const QPoint &)), SLOT(popup(QTreeWidgetItem *, const QPoint &)));
 	connect(m_pUrlList, SIGNAL(contextMenuRequested(const QPoint &)), SLOT(contextMenu(const QPoint &)));
-	//	setFocusHandlerNoChildren(m_pUrlList);
 	m_pUrlList->setFocusPolicy(Qt::StrongFocus);
 	m_pUrlList->setFocus();
 }
@@ -192,8 +169,6 @@ void UrlDialog::config()
 
 void UrlDialog::help()
 {
-	//#warning "help"
-	//	m_pFrm->requestHelpOn("doc_plugin_url.kvihelp");
 }
 
 void UrlDialog::saveList()
@@ -216,26 +191,6 @@ void UrlDialog::clear()
 	}
 }
 
-/*
-void UrlDialog::saveProperties()
-{
-
-	KviWindowProperty p;
-	p.rect = externalGeometry();
-	p.isDocked = isAttached();
-	p.splitWidth1 = 0;
-	p.splitWidth2 = 0;
-	p.timestamp = 0;
-	p.imagesVisible = 0;
-	KviWindow * w = m_pFrm->activeWindow();
-	p.isMaximized = isAttached() && w ? w->isMaximized() : isMaximized();
-	p.topSplitWidth1 = 0;
-	p.topSplitWidth2 = 0;
-	p.topSplitWidth3 = 0;
-	g_pOptions->m_pWinPropertiesList->setProperty(caption(),&p);
-}
-*/
-
 void UrlDialog::close_slot()
 {
 	close();
@@ -255,7 +210,6 @@ void UrlDialog::remove()
 		{
 			g_pList->removeRef(tmp);
 			delete m_pUrlList->currentItem();
-			//m_pUrlList->takeTopLevelItem(m_pUrlList->currentItem());
 			return;
 		}
 	}
@@ -263,28 +217,6 @@ void UrlDialog::remove()
 
 void UrlDialog::findtext()
 {
-	//#warning "find text"
-	/*
-	if (!m_pUrlList->currentItem()) {
-		kvirc_plugin_warning_box(__tr("Select an URL"));
-		return;
-	}
-	for(KviUrl *tmp=g_pList->first();tmp;tmp=g_pList->next())
-	{
-		if (tmp->url == KviCString(m_pUrlList->currentItem()->text(0))) {
-			g_pList->find(tmp);
-			KviCString ft="findtext %";
-			ft.replaceAll('%',tmp->url.ptr());
-			KviWindow *wnd = m_pFrm->findWindow(tmp->window.ptr());
-			if (wnd) {
-				if (kvirc_plugin_execute_command(wnd,ft.ptr())) {
-					if (wnd->mdiParent()) m_pFrm->m_pWindowStack->setTopChild(wnd->mdiParent(),true);
-				}
-			} else kvirc_plugin_warning_box(__tr("Window not found"));
-		}
-
-	}
-*/
 }
 
 void UrlDialog::dblclk_url(QTreeWidgetItem * item, int)
@@ -301,7 +233,7 @@ void UrlDialog::popup(QTreeWidgetItem * item, const QPoint & point)
 	m_szUrl = item->text(0);
 	QMenu p("menu", nullptr);
 	p.addAction(__tr2qs("&Remove"), this, SLOT(remove()));
-	// 	p.addAction(__tr2qs("&Find Text"),this,SLOT(findtext()));
+
 	p.addSeparator();
 	m_pListPopup = new QMenu("list", nullptr);
 
@@ -377,22 +309,8 @@ void UrlDialog::resizeEvent(QResizeEvent *)
 
 UrlDialog::~UrlDialog()
 {
-	/*
-	KviConfigurationFile cfg(szConfigPath,KviConfigurationFile::Write);
-	cfg.setGroup("ConfigDialog");
-	if (cfg.readBoolEntry("SaveColumnWidthOnClose",false)) {
-		cfg.setGroup("ColsWidth");
-		cfg.writeEntry("Url",m_pUrlList->columnWidth(0));
-		cfg.writeEntry("Window",m_pUrlList->columnWidth(1));
-		cfg.writeEntry("Count",m_pUrlList->columnWidth(2));
-		cfg.writeEntry("Timestamp",m_pUrlList->columnWidth(3));
-	}
-*/
+
 	delete m_pUrlList;
-	/*	if (m_pListPopup) delete m_pListPopup;
-	m_pListPopup = 0;
-	if (m_pMenuBar) delete m_pMenuBar;
-	m_pMenuBar = 0;*/
 	UrlDlgList * tmpitem = findFrame();
 	tmpitem->dlg = nullptr;
 }
diff --git a/src/modules/window/libkviwindow.cpp b/src/modules/window/libkviwindow.cpp
index 89819329c..231989f93 100644
--- a/src/modules/window/libkviwindow.cpp
+++ b/src/modules/window/libkviwindow.cpp
@@ -1572,28 +1572,6 @@ static bool window_module_init(KviModule * m)
 	KVSM_REGISTER_SIMPLE_COMMAND(m, "insertInInputText", window_kvs_cmd_insertInInputText);
 	KVSM_REGISTER_SIMPLE_COMMAND(m, "savePropertiesAsDefault", window_kvs_cmd_savePropertiesAsDefault);
 
-	// saveOutput (view()->saveBuffer())
-	/*
-	m->registerFunction("geometry",window_module_fnc_geometry);
-	m->registerCommand("setGeometry",window_module_cmd_setGeometry);
-
-	m->registerFunction("isActive",window_module_fnc_isActive);
-
-
-	// Output stuff
-	m->registerFunction("outputBufferSize",window_module_fnc_outputBufferSize);
-	m->registerCommand("setOutputBufferSize",window_module_cmd_setOutputBufferSize);
-
-	m->registerFunction("outputShowsImages",window_module_fnc_outputShowsImages);
-	m->registerCommand("setOutputShowsImages",window_module_cmd_setOutputShowsImages);
-
-	m->registerFunction("outputTimestamp",window_module_fnc_outputTimestamp);
-	m->registerCommand("setOutputTimestamp",window_module_cmd_setOutputTimestamp);
-
-	m->registerFunction("hasOutputBackgroundPixmap",window_module_fnc_hasOutputBackgroundPixmap);
-	m->registerCommand("setOutputBackgroundPixmap",window_module_cmd_setOutputBackgroundPixmap);
-
-*/
 	return true;
 }