more qt4 porting (misc + removing qt3 listview)

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@2281 17fca916-40b9-46aa-a4ea-0a15b648b75c

13 files changed, 155 insertions, 122 deletions

diff --git a/src/modules/addon/managementdialog.cpp b/src/modules/addon/managementdialog.cpp
index 22b99bb37..ac2b6fb06 100644
--- a/src/modules/addon/managementdialog.cpp
+++ b/src/modules/addon/managementdialog.cpp
@@ -91,7 +91,7 @@ KviScriptManagementDialog::KviScriptManagementDialog(QWidget * p)
 {

 	setWindowTitle(__tr2qs("Manage Script-Based Addons"));

 	setObjectName("Addon manager");

-	setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ADDONS)));

+	setWindowIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ADDONS)));

 	setModal(true);

 	m_pInstance = this;

 	QGridLayout * g = new QGridLayout(this);

diff --git a/src/modules/addon/packaddondialog.h b/src/modules/addon/packaddondialog.h
index 98c9f3d59..ba7654dfe 100644
--- a/src/modules/addon/packaddondialog.h
+++ b/src/modules/addon/packaddondialog.h
@@ -66,7 +66,7 @@ public:
 	QString authorName(){return m_pAuthorNameEdit->text();};
 	QString packageName(){return m_pPackageNameEdit->text();};
 	QString packageVersion(){return m_pPackageVersionEdit->text();};
-	QString packageDescription(){return m_pPackageDescriptionEdit->text();};
+	QString packageDescription(){return m_pPackageDescriptionEdit->toPlainText();};
 protected:
 	QLineEdit      * m_pAuthorNameEdit;
 	QLineEdit      * m_pPackageNameEdit;
diff --git a/src/modules/dcc/voice.cpp b/src/modules/dcc/voice.cpp
index 2200ada0a..27f872c56 100644
--- a/src/modules/dcc/voice.cpp
+++ b/src/modules/dcc/voice.cpp
@@ -674,10 +674,10 @@ KviDccVoice::KviDccVoice(KviFrame *pFrm,KviDccDescriptor * dcc,const char * name
 	//#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);

-	m_pVolumeSlider->setMaximum(0);

-	m_pVolumeSlider->setPageStep(10);

+	m_pVolumeSlider->setObjectName("dcc_voice_volume_slider");
+	m_pVolumeSlider->setMinimum(-100);
+	m_pVolumeSlider->setMaximum(0);
+	m_pVolumeSlider->setPageStep(10);
 	m_pVolumeSlider->setValue(0);
 
 	m_pVolumeSlider->setValue(getMixerVolume());
@@ -1016,7 +1016,7 @@ void KviDccVoice::setMixerVolume(int vol)
 
 	QString s;
 	s.sprintf(__tr_ctx("Volume: %i","dcc"), -vol);
-	QToolTip::add(m_pVolumeSlider, s);
+	m_pVolumeSlider->setToolTip(s);
 #endif
 }
 
diff --git a/src/modules/eventeditor/eventeditor.cpp b/src/modules/eventeditor/eventeditor.cpp
index 84bbcf83e..85718ff84 100644
--- a/src/modules/eventeditor/eventeditor.cpp
+++ b/src/modules/eventeditor/eventeditor.cpp
@@ -52,7 +52,7 @@ extern KviEventEditorWindow * g_pEventEditorWindow;
 
 const QPixmap * KviEventListViewItem::pixmap(int col) const
 {
-	return g_pIconManager->getSmallIcon(firstChild() ? KVI_SMALLICON_EVENT : KVI_SMALLICON_EVENTNOHANDLERS);
+	return g_pIconManager->getSmallIcon(childCount() ? KVI_SMALLICON_EVENT : KVI_SMALLICON_EVENTNOHANDLERS);
 }
 
 const QPixmap * KviEventHandlerListViewItem::pixmap(int col) const
@@ -62,8 +62,10 @@ const QPixmap * KviEventHandlerListViewItem::pixmap(int col) const
 
 
 KviEventEditor::KviEventEditor(QWidget * par)
-: QWidget(par,"event_editor")
+: QWidget(par)
 {
+	setObjectName("event_editor");
+
 	QGridLayout * l = new QGridLayout(this);
 
 	QSplitter * spl = new QSplitter(Qt::Horizontal,this);
@@ -72,18 +74,22 @@ KviEventEditor::KviEventEditor(QWidget * par)
 	l->addWidget(spl,0,0);
 
 	KviTalVBox * boxi = new KviTalVBox(spl);
-	m_pListView = new KviTalListView(boxi);
-	m_pListView->addColumn(__tr2qs("Event"));
-	m_pListView->setMultiSelection(false);
-	m_pListView->setShowSortIndicator(true);
+	m_pListView = new QTreeWidget(boxi);
+
+	m_pListView->setColumnCount(1);
+	m_pListView->setHeaderLabel(__tr2qs("Event"));
+	m_pListView->setSelectionMode(QAbstractItemView::ExtendedSelection);
+	m_pListView->setSortingEnabled(true);
 	m_pListView->setRootIsDecorated(true);
+	m_pListView->setAnimated(true);
 
 	QPushButton * pb = new QPushButton(__tr2qs("&Export All To..."),boxi);
 	connect(pb,SIGNAL(clicked()),this,SLOT(exportAllEvents()));
 
 	KviTalVBox * box = new KviTalVBox(spl);
 	m_pNameEditor = new QLineEdit(box);
-	QToolTip::add(m_pNameEditor,__tr2qs("Edit the event handler name."));
+	m_pNameEditor->setToolTip(__tr2qs("Edit the event handler name."));
+
 	m_pEditor = KviScriptEditor::createInstance(box);
 	m_pEditor->setFocus();
 
@@ -118,19 +124,19 @@ void KviEventEditor::oneTimeSetup()
 					((KviKvsScriptEventHandler *)s)->code(),((KviKvsScriptEventHandler *)s)->isEnabled());
 				}
 			}
-			it->setOpen(true);
+			it->setExpanded(true);
 		}
 	}
 
 
 	m_pContextPopup = new KviTalPopupMenu(this);
 
-	connect(m_pListView,SIGNAL(selectionChanged(KviTalListViewItem *)),this,SLOT(selectionChanged(KviTalListViewItem *)));
-	connect(m_pListView,SIGNAL(rightButtonPressed(KviTalListViewItem *,const QPoint &,int)),
-		this,SLOT(itemPressed(KviTalListViewItem *,const QPoint &,int)));
+	connect(m_pListView,SIGNAL(selectionChanged(QTreeWidgetItem *)),this,SLOT(selectionChanged(QTreeWidgetItem *)));
+	connect(m_pListView,SIGNAL(rightButtonPressed(QTreeWidgetItem *,const QPoint &,int)),
+		this,SLOT(itemPressed(QTreeWidgetItem *,const QPoint &,int)));
 }
 
-void KviEventEditor::itemPressed(KviTalListViewItem *it,const QPoint &pnt,int col)
+void KviEventEditor::itemPressed(QTreeWidgetItem *it,const QPoint &pnt,int col)
 {
 	__range_valid(m_bOneTimeSetupDone);
 
@@ -184,9 +190,10 @@ void KviEventEditor::getUniqueHandlerName(KviEventListViewItem *it,QString &buff
 	{
 		bFound = false;
 
-		for(KviEventHandlerListViewItem * ch = (KviEventHandlerListViewItem *)(it->firstChild());ch;ch = (KviEventHandlerListViewItem *)ch->nextSibling())
+		for(int i=0;i<it->childCount();i++)
+		//for(KviEventHandlerListViewItem * ch = (KviEventHandlerListViewItem *)(it->firstChild());ch;ch = (KviEventHandlerListViewItem *)ch->nextSibling())
 		{
-			if(KviQString::equalCI(newName,ch->m_szName))
+			if(KviQString::equalCI(newName,((KviEventHandlerListViewItem *)it->child(i))->m_szName))
 			{
 				bFound = true;
 				KviQString::sprintf(newName,"%Q_%d",&buffer,idx);
@@ -203,16 +210,17 @@ void KviEventEditor::addHandlerForCurrentEvent()
 {
 	__range_valid(m_pOneTimeSetupDone);
 
-	KviTalListViewItem * it = m_pListView->selectedItem();
-	if(it)
+	if(!m_pListView->selectedItems().isEmpty())
 	{
+		QTreeWidgetItem * it = m_pListView->selectedItems().first();
+
 		if(it->parent() == 0)
 		{
 			QString buffer = __tr2qs("default");
 			getUniqueHandlerName((KviEventListViewItem *)it,buffer);
-			KviTalListViewItem * ch = new KviEventHandlerListViewItem(it,buffer,"",true);
-			it->setOpen(true);
-			m_pListView->setSelected(ch,true);
+			QTreeWidgetItem * ch = new KviEventHandlerListViewItem(it,buffer,"",true);
+			it->setExpanded(true);
+			ch->setSelected(true);
 		}
 	}
 }
@@ -222,7 +230,7 @@ void KviEventEditor::removeCurrentHandler()
 	__range_valid(m_pOneTimeSetupDone);
 	if(m_pLastEditedItem)
 	{
-		KviTalListViewItem * it = m_pLastEditedItem;
+		QTreeWidgetItem * it = m_pLastEditedItem;
 		m_pLastEditedItem = 0;
 		delete it;
 		m_pEditor->setEnabled(false);
@@ -236,7 +244,7 @@ void KviEventEditor::toggleCurrentHandlerEnabled()
 	if(m_pLastEditedItem)
 	{
 		m_pLastEditedItem->m_bEnabled = !(m_pLastEditedItem->m_bEnabled);
-		m_pListView->repaintItem(m_pLastEditedItem);
+		m_pListView->repaint(m_pListView->visualItemRect(m_pLastEditedItem));
 		selectionChanged(m_pLastEditedItem);
 	}
 }
@@ -247,14 +255,22 @@ void KviEventEditor::commit()
 
 	saveLastEditedItem();
 	KviKvsEventManager::instance()->removeAllScriptAppHandlers();
-	for(KviTalListViewItem * it = m_pListView->firstChild();it;it = it->nextSibling())
+
+	int count=m_pListView->topLevelItemCount();
+	for (int i=0;i<count;i++)
+	//for(QTreeWidgetItem * it = m_pListView->firstChild();it;it = it->nextSibling())
 	{
-		if(it->firstChild())
+		QTreeWidgetItem * it = m_pListView->topLevelItem(i);
+		int ccount = it->childCount();
+		if(ccount > 0)
 		{
 			QString szContext;
-		
-			for(KviTalListViewItem * ch = it->firstChild();ch;ch = ch->nextSibling())
+
+			for(int j=0;j<ccount;j++)
+			//for(QTreeWidgetItem * ch = it->firstChild();ch;ch = ch->nextSibling())
 			{
+				QTreeWidgetItem * ch = it->child(j);
+
 				KviQString::sprintf(szContext,"%Q::%Q",&(((KviEventListViewItem *)it)->m_szName),&(((KviEventHandlerListViewItem *)ch)->m_szName));
 
 				KviKvsScriptEventHandler * s = KviKvsScriptEventHandler::createInstance( // msvc workaround
@@ -263,7 +279,7 @@ void KviEventEditor::commit()
 						((KviEventHandlerListViewItem *)ch)->m_szBuffer,
 						((KviEventHandlerListViewItem *)ch)->m_bEnabled
 					);
-			
+
 				KviKvsEventManager::instance()->addAppHandler(((KviEventListViewItem *)it)->m_uEventIdx,s);
 			}
 		}
@@ -290,7 +306,7 @@ void KviEventEditor::saveLastEditedItem()
 	m_pLastEditedItem->m_szBuffer = tmp;
 }
 
-void KviEventEditor::selectionChanged(KviTalListViewItem * it)
+void KviEventEditor::selectionChanged(QTreeWidgetItem * it)
 {
 	__range_valid(m_bOneTimeSetupDone);
 	saveLastEditedItem();
@@ -330,7 +346,7 @@ void KviEventEditor::getExportEventBuffer(QString &buffer,KviEventHandlerListVie
 	QString szBuf = it->m_szBuffer;
 
 	KviCommandFormatter::blockFromBuffer(szBuf);
-	
+
 	buffer = "event(";
 	buffer += ((KviEventListViewItem *)(it->parent()))->m_szName;
 	buffer += ",";
@@ -355,20 +371,20 @@ void KviEventEditor::exportCurrentHandler()
 	saveLastEditedItem();
 	if(!m_pLastEditedItem)return;
 
-	QString szName = QDir::homeDirPath();
+	QString szName = QDir::homePath();
 	if(!szName.endsWith(QString(KVI_PATH_SEPARATOR)))szName += KVI_PATH_SEPARATOR;
 	szName += ((KviEventListViewItem *)(m_pLastEditedItem->parent()))->m_szName;
 	szName += ".";
 	szName += m_pLastEditedItem->m_szName;
 	szName += ".kvs";
-	
+
 	QString szFile;
-	
+
 	if(!KviFileDialog::askForSaveFileName(szFile,__tr2qs("Choose a Filename - KVIrc"),szName,"*.kvs",true,true,true))return;
 
 	QString szOut;
 	getExportEventBuffer(szOut,m_pLastEditedItem);
-	
+
 	if(!KviFileUtils::writeFile(szFile,szOut))
 	{
 		QMessageBox::warning(this,__tr2qs("Write Failed - KVIrc"),__tr2qs("Unable to write to the event file."),__tr2qs("&OK"));
@@ -379,30 +395,32 @@ void KviEventEditor::exportAllEvents()
 {
 	saveLastEditedItem();
 
-	KviEventListViewItem * it = (KviEventListViewItem *)m_pListView->firstChild();
-
 	QString out;
 
-	while(it)
+	int count=m_pListView->topLevelItemCount();
+	for (int i=0;i<count;i++)
 	{
-		KviEventHandlerListViewItem * item = (KviEventHandlerListViewItem *)it->firstChild();
-		while(item)
+		KviEventListViewItem * it = (KviEventListViewItem *)m_pListView->topLevelItem(i);
+
+		int ccount = it->childCount();
+
+		for(int j=0;j<ccount;j++)
 		{
+			KviEventHandlerListViewItem * item = (KviEventHandlerListViewItem *) it->child(j);
+
 			QString tmp;
 			getExportEventBuffer(tmp,item);
 			out += tmp;
 			out += "\n";
-			item = (KviEventHandlerListViewItem *)item->nextSibling();
 		}
-		it = (KviEventListViewItem *)it->nextSibling();
 	}
 
-	QString szName = QDir::homeDirPath();
+	QString szName = QDir::homePath();
 	if(!szName.endsWith(QString(KVI_PATH_SEPARATOR)))szName += KVI_PATH_SEPARATOR;
 	szName += "events.kvs";
-	
+
 	QString szFile;
-	
+
 	if(!KviFileDialog::askForSaveFileName(szFile,__tr2qs("Choose a Filename - KVIrc"),szName,QString::null,true,true))return;
 
 	if(!KviFileUtils::writeFile(szFile,out))
@@ -437,7 +455,7 @@ KviEventEditorWindow::KviEventEditorWindow(KviFrame * lpFrm)
 	btn->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DISCARD)));
 	g->addWidget(btn,0,3);
 
-	g->setColStretch(0,1);
+	g->setColumnStretch(0,1);
 }
 
 KviEventEditorWindow::~KviEventEditorWindow()
diff --git a/src/modules/eventeditor/eventeditor.h b/src/modules/eventeditor/eventeditor.h
index 682386854..9afdd22f1 100644
--- a/src/modules/eventeditor/eventeditor.h
+++ b/src/modules/eventeditor/eventeditor.h
@@ -24,38 +24,39 @@
 
 #include "kvi_window.h"
 #include "kvi_string.h"
-#include "kvi_tal_listview.h"
+//#include "kvi_tal_listview.h"
 
 #include <QWidget>
 #include <QLineEdit>
+#include <QTreeWidget>
 
 class KviScriptEditor;
 class KviTalPopupMenu;
 
-class KviEventListViewItem : public KviTalListViewItem
+class KviEventListViewItem : public QTreeWidgetItem
 {
 public:
 	unsigned int m_uEventIdx;
 	QString m_szName;
 	QString m_szParams;
 public:
-	KviEventListViewItem(KviTalListView * par,unsigned int uEvIdx,const QString &name,const QString &params)
-	: KviTalListViewItem(par), m_uEventIdx(uEvIdx), m_szName(name), m_szParams(params) {};
+	KviEventListViewItem(QTreeWidget * par,unsigned int uEvIdx,const QString &name,const QString &params)
+	: QTreeWidgetItem(par), m_uEventIdx(uEvIdx), m_szName(name), m_szParams(params) {};
 	~KviEventListViewItem() {};
 public:
 	virtual QString text(int col) const { return m_szName; };
 	virtual const QPixmap * pixmap(int col) const;
 };
 
-class KviEventHandlerListViewItem : public KviTalListViewItem
+class KviEventHandlerListViewItem : public QTreeWidgetItem
 {
 public:
 	QString m_szName;
 	QString m_szBuffer;
 	bool   m_bEnabled;
 public:
-	KviEventHandlerListViewItem(KviTalListViewItem * par,const QString &name,const QString &buffer,bool bEnabled)
-	: KviTalListViewItem(par), m_szName(name) , m_szBuffer(buffer) , m_bEnabled(bEnabled) {};
+	KviEventHandlerListViewItem(QTreeWidgetItem * par,const QString &name,const QString &buffer,bool bEnabled)
+	: QTreeWidgetItem(par), m_szName(name) , m_szBuffer(buffer) , m_bEnabled(bEnabled) {};
 	~KviEventHandlerListViewItem() {};
 public:
 	virtual QString text(int col) const { return m_szName; };
@@ -70,7 +71,7 @@ public:
 	~KviEventEditor();
 public:
 	KviScriptEditor * m_pEditor;
-	KviTalListView       * m_pListView;
+	QTreeWidget       * m_pListView;
 	QLineEdit       * m_pNameEditor;
 	KviTalPopupMenu      * m_pContextPopup;
 	KviEventHandlerListViewItem * m_pLastEditedItem;
@@ -81,8 +82,8 @@ public:
 	void getUniqueHandlerName(KviEventListViewItem *it,QString &buffer);
 	void getExportEventBuffer(QString &szBuffer,KviEventHandlerListViewItem * it);
 protected slots:
-	void selectionChanged(KviTalListViewItem *it);
-	void itemPressed(KviTalListViewItem *it,const QPoint &pnt,int col);
+	void selectionChanged(QTreeWidgetItem *it);
+	void itemPressed(QTreeWidgetItem *it,const QPoint &pnt,int col);
 	void toggleCurrentHandlerEnabled();
 	void removeCurrentHandler();
 	void addHandlerForCurrentEvent();
diff --git a/src/modules/help/helpwidget.cpp b/src/modules/help/helpwidget.cpp
index 176e9aa1d..261f63afe 100644
--- a/src/modules/help/helpwidget.cpp
+++ b/src/modules/help/helpwidget.cpp
@@ -58,19 +58,16 @@ KviHelpWidget::KviHelpWidget(QWidget * par,KviFrame * lpFrm,bool bIsStandalone)
 	m_pBtnIndex = new QToolButton(m_pToolBar);
 	m_pBtnIndex->setIcon(*g_pIconManager->getBigIcon(KVI_BIGICON_HELPINDEX));
 	connect(m_pBtnIndex,SIGNAL(clicked()),this,SLOT(showIndex()));
-	//m_pBtnIndex->setUsesBigPixmap(true);
 
 	m_pBtnBackward = new QToolButton(m_pToolBar);
 	m_pBtnBackward->setIcon(*g_pIconManager->getBigIcon(KVI_BIGICON_HELPBACK));
 	connect(m_pBtnBackward,SIGNAL(clicked()),m_pTextBrowser,SLOT(backward()));
 	m_pBtnBackward->setEnabled(false);
-	//m_pBtnBackward->setUsesBigPixmap(true);
 
 	m_pBtnForward = new QToolButton(m_pToolBar);
 	m_pBtnForward->setIcon(*g_pIconManager->getBigIcon(KVI_BIGICON_HELPFORWARD));
 	connect(m_pBtnForward,SIGNAL(clicked()),m_pTextBrowser,SLOT(forward()));
 	m_pBtnForward->setEnabled(false);
-	//m_pBtnForward->setUsesBigPixmap(true);
 
 	QWidget* pSpacer=new QWidget(m_pToolBar);
 
@@ -79,7 +76,6 @@ KviHelpWidget::KviHelpWidget(QWidget * par,KviFrame * lpFrm,bool bIsStandalone)
 		QToolButton * b = new QToolButton(m_pToolBar);
 		b->setIcon(*g_pIconManager->getBigIcon(KVI_BIGICON_HELPCLOSE));
 		connect(b,SIGNAL(clicked()),this,SLOT(doClose()));
-		//b->setUsesBigPixmap(true);
 	}
 
 	m_pToolBar->setStretchFactor(pSpacer,1);
diff --git a/src/modules/help/helpwindow.cpp b/src/modules/help/helpwindow.cpp
index ceae44f98..a23946bf1 100644
--- a/src/modules/help/helpwindow.cpp
+++ b/src/modules/help/helpwindow.cpp
@@ -270,7 +270,7 @@ void KviHelpWindow::indexSelected ( QListWidgetItem *item )
 void KviHelpWindow::searchSelected ( QListWidgetItem *item )
 {
 	if (!item) return;
-	int i=g_pDocIndex->titlesList().findIndex(item->text());
+	int i=g_pDocIndex->titlesList().indexOf(item->text());
 	textBrowser()->setSource(QUrl::fromLocalFile(g_pDocIndex->documentList()[ i ]));
 }
 
diff --git a/src/modules/help/index.cpp b/src/modules/help/index.cpp
index 2ab2dbe3c..a9a028876 100755
--- a/src/modules/help/index.cpp
+++ b/src/modules/help/index.cpp
@@ -477,8 +477,8 @@ bool Index::searchForPattern( const QStringList &patterns, const QStringList &wo
 		qWarning( warn.toUtf8().data() );
 		return FALSE;
 	}
-	else debug("Open file %s",fileName.utf8().data());
-	debug("Patterns %s and words %s",patterns.join(",").utf8().data(),words.join(",").utf8().data());
+	else debug("Open file %s",fileName.toUtf8().data());
+	debug("Patterns %s and words %s",patterns.join(",").toUtf8().data(),words.join(",").toUtf8().data());
 	wordNum = 3;
 	miniDict.clear();
 
@@ -545,7 +545,7 @@ bool Index::searchForPattern( const QStringList &patterns, const QStringList &wo
 			aIt = a.begin();
 
 			while ( aIt != a.end() ) {
-				if ( b.find( *aIt + 1 ) != b.end() ) {
+				if ( b.indexOf( *aIt + 1 ) != b.at(b.count()-1) ) {
 					(*aIt)++;
 					++aIt;
 				} else {
diff --git a/src/modules/help/libkvihelp.cpp b/src/modules/help/libkvihelp.cpp
index fb26650a7..8ab14e65c 100644
--- a/src/modules/help/libkvihelp.cpp
+++ b/src/modules/help/libkvihelp.cpp
@@ -28,7 +28,7 @@
 #include "kvi_sourcesdate.h"
 #include "kvi_app.h"
 #include "kvi_frame.h"
-

+
 #include <QDir>
 #include <QFileInfo>
 #include <QSplitter>
@@ -136,15 +136,15 @@ static bool help_kvs_cmd_search(KviKvsModuleCommandCall * c)
 static bool help_kvs_cmd_open(KviKvsModuleCommandCall * c)
 {
 	QString doc, szHelpDir;
-        QDir dirHelp;

+        QDir dirHelp;
 
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("document",KVS_PT_STRING,KVS_PF_OPTIONAL,doc)
 	KVSM_PARAMETERS_END(c)
 
-	g_pApp->getGlobalKvircDirectory(szHelpDir,KviApp::Help);

-        dirHelp = QDir(szHelpDir);

-

+	g_pApp->getGlobalKvircDirectory(szHelpDir,KviApp::Help);
+        dirHelp = QDir(szHelpDir);
+
 	if(doc.isEmpty()){
 		doc = dirHelp.absoluteFilePath("index.html");
 		qDebug ("No file, use default at path %s",doc.toUtf8().data());
@@ -170,7 +170,8 @@ static bool help_kvs_cmd_open(KviKvsModuleCommandCall * c)
 
 	if(!c->switches()->find('n',"new"))
 	{
-		KviHelpWidget * w = (KviHelpWidget *)c->window()->frame()->child("help_widget","KviHelpWidget");
+		KviHelpWidget * w = (KviHelpWidget *)c->window()->frame()->findChild<KviHelpWidget *>("help_widget");
+
 		if(w)
 		{
 			w->textBrowser()->setSource(QUrl::fromLocalFile(f->absoluteFilePath()));
diff --git a/src/modules/language/libkvilanguage.cpp b/src/modules/language/libkvilanguage.cpp
index be668504e..09c75bee6 100644
--- a/src/modules/language/libkvilanguage.cpp
+++ b/src/modules/language/libkvilanguage.cpp
@@ -81,7 +81,7 @@ static bool language_kvs_cmd_detect(KviKvsModuleFunctionCall * c)
 		error = "err_notext";
 		matchcount = 0;
 	} else {
-		detect_language_and_encoding(text.utf8().data(),&r,0);
+		detect_language_and_encoding(text.toUtf8().data(),&r,0);
 
 		for(int i=0;i<matchcount;i++)
 		{
diff --git a/src/modules/links/linkswindow.cpp b/src/modules/links/linkswindow.cpp
index 1c98af4c6..cb095c16d 100644
--- a/src/modules/links/linkswindow.cpp
+++ b/src/modules/links/linkswindow.cpp
@@ -46,35 +46,40 @@ KviLinksWindow::KviLinksWindow(KviFrame * lpFrm,KviConsole * lpConsole)
 {
 	g_pLinksWindowList->append(this);
 
-	m_pTopSplitter = new QSplitter(Qt::Horizontal,this,"top_splitter");
+	m_pTopSplitter = new QSplitter(Qt::Horizontal,this);
+	m_pTopSplitter->setObjectName("top_splitter");
 
 	// The button box on the left
 	KviTalHBox * box = new KviTalHBox(m_pTopSplitter);
 
-	m_pRequestButton = new QToolButton(box,"request_button");
-	m_pRequestButton->setUsesBigPixmap(false);
-	m_pRequestButton->setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_LINKS)));
+	m_pRequestButton = new QToolButton(box);
+	m_pRequestButton->setObjectName("request_button");
+	m_pRequestButton->setIconSize(QSize(16,16));
+	m_pRequestButton->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_LINKS)));
 	connect(m_pRequestButton,SIGNAL(clicked()),this,SLOT(requestLinks()));
-	QToolTip::add(m_pRequestButton,__tr2qs("Request Links"));
+	m_pRequestButton->setToolTip(__tr2qs("Request Links"));
 
-	QLabel * l = new QLabel(box,"");
+	QLabel * l = new QLabel(box);
 	box->setStretchFactor(l,1);
 	m_pInfoLabel = new KviThemedLabel(m_pTopSplitter,"info_label");
 
 	connect(lpConsole->context(),SIGNAL(stateChanged()),
 		this,SLOT(connectionStateChange()));
 
-	m_pSplitter = new QSplitter(Qt::Horizontal,this,"splitter");
-	m_pVertSplitter = new QSplitter(Qt::Vertical,m_pSplitter,"vsplitter");
+	m_pSplitter = new QSplitter(Qt::Horizontal,this);
+	m_pSplitter->setObjectName("splitter");
+
+	m_pVertSplitter = new QSplitter(Qt::Vertical,m_pSplitter);
+	m_pVertSplitter->setObjectName("vsplitter");
+
+	m_pListView  = new KviTalTreeWidget(m_pVertSplitter);
+	m_pListView->setColumnCount(3);
+	m_pListView->setHeaderLabels(QStringList() << __tr2qs("Link") << __tr2qs("Hops") << __tr2qs("Description"));
 
-	m_pListView  = new KviTalListView(m_pVertSplitter);
-	m_pListView->addColumn(__tr2qs("Link"));
-	m_pListView->addColumn(__tr2qs("Hops"));
-	m_pListView->addColumn(__tr2qs("Description"));
 	m_pListView->setRootIsDecorated(true);
 	m_pListView->setAllColumnsShowFocus(true);
-	connect(m_pListView,SIGNAL(rightButtonPressed(KviTalListViewItem *,const QPoint &,int)),
-			this,SLOT(showHostPopup(KviTalListViewItem *,const QPoint &,int)));
+	connect(m_pListView,SIGNAL(rightButtonPressed(KviTalTreeWidgetItem *,const QPoint &,int)),
+			this,SLOT(showHostPopup(KviTalTreeWidgetItem *,const QPoint &,int)));
 
 	m_pIrcView = new KviIrcView(m_pVertSplitter,lpFrm,this);
 
@@ -156,17 +161,17 @@ void KviLinksWindow::fillCaptionBuffers()
 	KviQString::sprintf(m_szHtmlActiveCaption,
 		__tr2qs("<nobr><font color=\"%s\"><b>Links for %Q</b></font> " \
 			"<font color=\"%s\">[IRC Context %u]</font></nobr>"),
-		KVI_OPTION_COLOR(KviOption_colorCaptionTextActive).name().ascii(),
+		KVI_OPTION_COLOR(KviOption_colorCaptionTextActive).name().toUtf8().data(),
 		&m_szRootServer,
-		KVI_OPTION_COLOR(KviOption_colorCaptionTextActive2).name().ascii(),
+		KVI_OPTION_COLOR(KviOption_colorCaptionTextActive2).name().toUtf8().data(),
 		m_pConsole->context()->id());
 
 	KviQString::sprintf(m_szHtmlInactiveCaption,
 		__tr2qs("<nobr><font color=\"%s\"><b>Links for %Q</b></font> " \
 			"<font color=\"%s\">[IRC Context %u]</font></nobr>"),
-		KVI_OPTION_COLOR(KviOption_colorCaptionTextInactive).name().ascii(),
+		KVI_OPTION_COLOR(KviOption_colorCaptionTextInactive).name().toUtf8().data(),
 		&m_szRootServer,
-		KVI_OPTION_COLOR(KviOption_colorCaptionTextInactive2).name().ascii(),
+		KVI_OPTION_COLOR(KviOption_colorCaptionTextInactive2).name().toUtf8().data(),
 		m_pConsole->context()->id());
 }
 
@@ -189,14 +194,14 @@ void KviLinksWindow::endOfLinks()
 	m_pRequestButton->setEnabled(true);
 
 	m_pListView->clear();
-	m_pListView->setSorting(-1);
+	//m_pListView->setSorting(-1);
 
 	outputNoFmt(KVI_OUT_SYSTEMMESSAGE,"======================");
 	outputNoFmt(KVI_OUT_SYSTEMMESSAGE,__tr2qs("Received end of links."));
 	outputNoFmt(KVI_OUT_SYSTEMMESSAGE,"======================");
 
-	KviTalListViewItem * it   = 0;
-	KviTalListViewItem * root = 0;
+	KviTalTreeWidgetItem * it   = 0;
+	KviTalTreeWidgetItem * root = 0;
 
 	int totalHosts  = 0;
 	int totalHops   = 0;
@@ -214,7 +219,7 @@ void KviLinksWindow::endOfLinks()
 	m_pListView->setUpdatesEnabled(false);
 	for(KviLink *l=m_pLinkList->first();l;l=m_pLinkList->next()){
 		totalHosts++;
-		if(l->hops == 0)root = new KviTalListViewItem(m_pListView,QString(l->host.ptr()),"0",QString(l->description.ptr()));
+		if(l->hops == 0)root = new KviTalTreeWidgetItem(m_pListView,QString(l->host.ptr()),QString("0"),QString(l->description.ptr()));
 		else {
 			totalHops += l->hops;
 			if(l->hops < 4){
@@ -239,13 +244,13 @@ void KviLinksWindow::endOfLinks()
 				QString tmp;
 				KviQString::sprintf(tmp,__tr2qs("%s: Parent link %s"),l->description.ptr(),l->parent.ptr());
 				KviStr tmp2(KviStr::Format,"%d",l->hops);
-				if(root)it = new KviTalListViewItem(m_pListView,root,QString(l->host.ptr()),QString(tmp2.ptr()),tmp);
+				if(root)it = new KviTalTreeWidgetItem(root,QString(l->host.ptr()),QString(tmp2.ptr()),tmp);
 				else {
 					outputNoFmt(KVI_OUT_SYSTEMERROR,__tr2qs("Warning: No root link was sent by the server, the stats may be invalid."));
-					it = new KviTalListViewItem(m_pListView,QString(l->host.ptr()),QString(tmp2.ptr()),tmp);
+					it = new KviTalTreeWidgetItem(m_pListView,QString(l->host.ptr()),QString(tmp2.ptr()),tmp);
 				}
 			} else {
-				it = it->parent();
+				it = (KviTalTreeWidgetItem*) it->parent();
 				if(it)
 				{
 					int links = it->childCount() + 1;
@@ -306,35 +311,45 @@ void KviLinksWindow::endOfLinks()
 	m_pListView->repaint();
 }
 
-KviTalListViewItem * KviLinksWindow::insertLink(KviLink *l)
+KviTalTreeWidgetItem * KviLinksWindow::insertLink(KviLink *l)
 {
 	__range_valid(l->hops > 0);
-	KviTalListViewItem * i = getItemByHost(l->parent.ptr(),0);
-	KviTalListViewItem * it = 0;
+	KviTalTreeWidgetItem * i = getItemByHost(l->parent.ptr(),0);
+	KviTalTreeWidgetItem * it = 0;
 	if(!i)return 0;
 	else {
 		KviStr hops(KviStr::Format,"%d",l->hops);
-		it = new KviTalListViewItem(i,QString(l->host.ptr()),QString(hops.ptr()),QString(l->description.ptr()));
-		i->setOpen(true);
+		it = new KviTalTreeWidgetItem(i,QString(l->host.ptr()),QString(hops.ptr()),QString(l->description.ptr()));
+		i->setExpanded(true);
 	}
 	return it;
 }
 
-KviTalListViewItem * KviLinksWindow::getItemByHost(const char *host,KviTalListViewItem * par)
+KviTalTreeWidgetItem * KviLinksWindow::getItemByHost(const char *host,KviTalTreeWidgetItem * par)
 {
-	KviTalListViewItem * i = (par ? par->firstChild() : m_pListView->firstChild());
-	if(!i)return 0;
-	while(i){
-		KviStr tmp = i->text(0);
-		if(kvi_strEqualCI(tmp.ptr(),host))return i;
-		KviTalListViewItem * ch = getItemByHost(host,i);
-		if(ch)return ch;
-		i = i->nextSibling();
+	KviStr tmp;
+	if(par)
+	{
+		for(int i=0;i<par->childCount();i++)
+		{
+			tmp = par->child(i)->text(0);
+			if(kvi_strEqualCI(tmp.ptr(),host))return par->child(i);
+			KviTalTreeWidgetItem * ch = getItemByHost(host,par->child(i));
+			if(ch)return ch;
+		}
+	} else {
+		for(int i=0;i<m_pListView->topLevelItemCount();i++)
+		{
+			tmp = m_pListView->topLevelItem(i)->text(0);
+			if(kvi_strEqualCI(tmp.ptr(),host))return m_pListView->topLevelItem(i);
+			KviTalTreeWidgetItem * ch = getItemByHost(host,m_pListView->topLevelItem(i));
+			if(ch)return ch;
+		}
 	}
 	return 0;
 }
 
-void KviLinksWindow::showHostPopup(KviTalListViewItem *i,const QPoint &p,int)
+void KviLinksWindow::showHostPopup(KviTalTreeWidgetItem *i,const QPoint &p,int)
 {
 	if(!i)return;
 	KviStr host=i->text(0);
diff --git a/src/modules/links/linkswindow.h b/src/modules/links/linkswindow.h
index 3befc875d..c4a8b89eb 100644
--- a/src/modules/links/linkswindow.h
+++ b/src/modules/links/linkswindow.h
@@ -28,7 +28,7 @@
 #include "kvi_sparser.h"
 #include "kvi_console.h"
 #include "kvi_irccontext.h"
-#include "kvi_tal_listview.h"
+#include "kvi_tal_treewidget.h"
 #include "kvi_tal_popupmenu.h"
 
 #include <QToolButton>
@@ -54,7 +54,7 @@ public:
 protected:
 	QSplitter      * m_pVertSplitter;
 	QSplitter      * m_pTopSplitter;
-	KviTalListView      * m_pListView;
+	KviTalTreeWidget      * m_pListView;
 	KviPointerList<KviLink> * m_pLinkList;
 	KviTalPopupMenu     * m_pHostPopup;
 	QString          m_szRootServer;
@@ -73,7 +73,7 @@ protected:
 //	virtual void setProperties(KviWindowProperty *p);
 //	virtual void saveProperties();
 protected slots:
-	void showHostPopup(KviTalListViewItem *i,const QPoint &p,int c);
+	void showHostPopup(KviTalTreeWidgetItem *i,const QPoint &p,int c);
 	void hostPopupClicked(int id);
 	void requestLinks();
 	void connectionStateChange();
@@ -82,8 +82,8 @@ public:
 private:
 	void reset();
 	void endOfLinks();
-	KviTalListViewItem * insertLink(KviLink * l);
-	KviTalListViewItem * getItemByHost(const char *host,KviTalListViewItem * par);
+	KviTalTreeWidgetItem * insertLink(KviLink * l);
+	KviTalTreeWidgetItem * getItemByHost(const char *host,KviTalTreeWidgetItem * par);
 };
 
 #endif //_KVI_LINKSWINDOW_H_
diff --git a/src/modules/list/listwindow.cpp b/src/modules/list/listwindow.cpp
index c9bb4a790..6bcbf5ddf 100644
--- a/src/modules/list/listwindow.cpp
+++ b/src/modules/list/listwindow.cpp
@@ -193,13 +193,15 @@ KviListWindow::KviListWindow(KviFrame * lpFrm,KviConsole * lpConsole)
 	m_pSaveButton->setIcon(QIcon(*(g_pIconManager->getBigIcon(KVI_BIGICON_SAVE))));
 	connect(m_pSaveButton,SIGNAL(clicked()),this,SLOT(exportList()));
 
-	m_pRequestButton = new QToolButton(box,"request_button");
+	m_pRequestButton = new QToolButton(box);
+	m_pRequestButton->setObjectName("request_button");
 	m_pRequestButton->setIconSize(QSize(16,16));
 	m_pRequestButton->setIcon(QIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_LIST))));
 	connect(m_pRequestButton,SIGNAL(clicked()),this,SLOT(requestList()));
 	KviTalToolTip::add(m_pRequestButton,__tr2qs("Request List"));
 
-	m_pStopListDownloadButton = new QToolButton(box,"stoplistdownload_button");
+	m_pStopListDownloadButton = new QToolButton(box);
+	m_pStopListDownloadButton->setObjectName("stoplistdownload_button");
 	m_pStopListDownloadButton->setIconSize(QSize(16,16));
 	m_pStopListDownloadButton->setIcon(QIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_NICKNAMEPROBLEM))));
 	connect(m_pStopListDownloadButton,SIGNAL(clicked()),this,SLOT(stoplistdownload()));