removed useless tal_treewidget

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

44 files changed, 268 insertions, 307 deletions

diff --git a/src/kvilib/tal/kvi_tal_treewidget.h b/src/kvilib/tal/kvi_tal_treewidget.h
deleted file mode 100644
index 68addb105..000000000
--- a/src/kvilib/tal/kvi_tal_treewidget.h
+++ /dev/null
@@ -1,39 +0,0 @@
-#ifndef _KVI_TAL_TREEWIDGET_H_
-#define _KVI_TAL_TREEWIDGET_H_
-
-//=============================================================================
-//
-//   File : kvi_tal_treewidget.h
-//   Creation date : Mon May 05 2008 11:25:08 by Alessandro Carbone
-//
-//   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2008 Alessandro Carbone (elfonol at gmail dot com)
-//
-//   This program is FREE software. You can redistribute it and/or
-//   modify it under the terms of the GNU General Public License
-//   as published by the Free Software Foundation; either version 2
-//   of the License, or (at your opinion) any later version.
-//
-//   This program is distributed in the HOPE that it will be USEFUL,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-//   See the GNU General Public License for more details.
-//
-//   You should have received a copy of the GNU General Public License
-//   along with this program. If not, write to the Free Software Foundation,
-//   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-//
-//=============================================================================
-
-/**
-* \file kvi_tal_treewidget.h
-* \author Szymon Stefanek
-* \brief Toolkit Abstraction Layer class
-*/
-
-#include <QTreeWidget>
-
-#define KviTalTreeWidget QTreeWidget
-#define KviTalTreeWidgetItem QTreeWidgetItem
-
-#endif // _KVI_TAL_TREEWIDGET_H_
diff --git a/src/kvirc/ui/kvi_maskeditor.cpp b/src/kvirc/ui/kvi_maskeditor.cpp
index 581ba9167..96f84d4c5 100644
--- a/src/kvirc/ui/kvi_maskeditor.cpp
+++ b/src/kvirc/ui/kvi_maskeditor.cpp
@@ -36,8 +36,8 @@
 #include <QLabel>
 #include <QValidator>
 
-KviMaskItem::KviMaskItem(KviTalTreeWidget* parent,KviMaskEntry* entry)
-:KviTalTreeWidgetItem(parent), m_Mask(*entry)
+KviMaskItem::KviMaskItem(QTreeWidget* parent,KviMaskEntry* entry)
+:QTreeWidgetItem(parent), m_Mask(*entry)
 {
 	QDateTime date;
 	date.setTime_t(mask()->uSetAt);
@@ -50,7 +50,7 @@ KviMaskItem::~KviMaskItem()
 {
 }
 
-int KviMaskItem::compare ( KviTalTreeWidgetItem * i, int col, bool) const
+int KviMaskItem::compare ( QTreeWidgetItem * i, int col, bool) const
 {
 	if(col==2)
 	{
@@ -184,7 +184,7 @@ KviMaskEditor::KviMaskEditor(QWidget * par,KviWindowToolPageButton* button,KviPo
 	g->addWidget(l,1,1);
 	g->addWidget(l,2,0,1,2);
 
-	m_pMaskBox = new KviTalTreeWidget(this);
+	m_pMaskBox = new QTreeWidget(this);
 	m_pMaskBox->setFocusPolicy(Qt::ClickFocus);
 	m_pMaskBox->setFocusProxy(this);
 	m_pMaskBox->setFrameStyle(QFrame::StyledPanel|QFrame::Sunken);
@@ -306,7 +306,7 @@ void KviMaskEditor::removeMask(KviMaskEntry *e)
 	}
 }
 
-void KviMaskEditor::itemDoubleClicked( KviTalTreeWidgetItem * pItem, int )
+void KviMaskEditor::itemDoubleClicked( QTreeWidgetItem * pItem, int )
 {
 	if(pItem)
 	{
diff --git a/src/kvirc/ui/kvi_maskeditor.h b/src/kvirc/ui/kvi_maskeditor.h
index f2657bb12..9b307a065 100644
--- a/src/kvirc/ui/kvi_maskeditor.h
+++ b/src/kvirc/ui/kvi_maskeditor.h
@@ -28,7 +28,7 @@
 #include "kvi_pointerlist.h"
 #include "kvi_string.h"
 #include "kvi_toolwindows_container.h"
-#include "kvi_tal_treewidget.h"
+#include <QTreeWidget>
 
 #include <QPushButton>
 #include <QDialog>
@@ -45,14 +45,14 @@ typedef struct _KviMaskEntry
 	unsigned int uSetAt;
 } KviMaskEntry;
 
-class KviMaskItem: public KviTalTreeWidgetItem
+class KviMaskItem: public QTreeWidgetItem
 {
 public:
-	KviMaskItem(KviTalTreeWidget* parent,KviMaskEntry* entry);
+	KviMaskItem(QTreeWidget* parent,KviMaskEntry* entry);
 	~KviMaskItem();
 
 	KviMaskEntry* mask() { return &m_Mask; };
-	virtual int compare ( KviTalTreeWidgetItem * i, int col, bool ascending ) const;
+	virtual int compare ( QTreeWidgetItem * i, int col, bool ascending ) const;
 protected:
 	KviMaskEntry m_Mask;
 
@@ -83,7 +83,7 @@ public:
 		char flag,const char * nam);
 	~KviMaskEditor();
 protected:
-	KviTalTreeWidget      * m_pMaskBox;
+	QTreeWidget      * m_pMaskBox;
 	QPushButton           * m_pRemoveMask;
 	QPushButton           * m_pAddButton;
 	QLineEdit             * m_pSearch;
diff --git a/src/kvirc/ui/kvi_selectors.cpp b/src/kvirc/ui/kvi_selectors.cpp
index c32775911..ba971b716 100644
--- a/src/kvirc/ui/kvi_selectors.cpp
+++ b/src/kvirc/ui/kvi_selectors.cpp
@@ -781,8 +781,8 @@ void KviSoundSelector::setEnabled(bool bEnabled)
 	m_pPlayButton->setEnabled(bEnabled);
 }
 
-KviChanTreeViewItem::KviChanTreeViewItem(KviTalTreeWidget* pList,QString szChan,QString szPass)
-:KviTalTreeWidgetItem(pList)
+KviChanTreeViewItem::KviChanTreeViewItem(QTreeWidget* pList,QString szChan,QString szPass)
+:QTreeWidgetItem(pList)
 {
 	m_szPass=szPass;
 	QString mask;
@@ -795,7 +795,7 @@ KviChannelListSelector::KviChannelListSelector(QWidget * par,const QString & txt
 : KviTalVBox(par), KviSelectorInterface()
 {
 	m_pLabel = new QLabel(txt,this);
-	m_pTreeWidget = new KviTalTreeWidget(this);
+	m_pTreeWidget = new QTreeWidget(this);
 	m_pTreeWidget->setRootIsDecorated(false);
 	m_pTreeWidget->setColumnCount(2);
 	QStringList columnLabels;
@@ -845,7 +845,7 @@ void KviChannelListSelector::commit()
 	{
 		pItem=(KviChanTreeViewItem*)m_pTreeWidget->topLevelItem(i);
 		m_pOption->append(pItem->text(0)+":"+pItem->pass());
-	//KviTalTreeWidgetItemIterator it( m_pTreeWidget);
+	//QTreeWidgetItemIterator it( m_pTreeWidget);
 	//while ( it.current() ) {
 	//	pItem = (KviChanTreeViewItem*)( it.current() );
 //		m_pOption->append(pItem->text(0)+":"+pItem->pass());
@@ -884,14 +884,14 @@ void KviChannelListSelector::addClicked()
 
 void KviChannelListSelector::removeClicked()
 {
-	KviPointerList<KviTalTreeWidgetItem> lst;
+	KviPointerList<QTreeWidgetItem> lst;
 	QList<QTreeWidgetItem *> items=m_pTreeWidget->selectedItems () ;
-	//KviTalTreeWidgetItemIterator it( m_pTreeWidget, KviTalTreeWidgetItemIterator::Selected );
+	//QTreeWidgetItemIterator it( m_pTreeWidget, QTreeWidgetItemIterator::Selected );
 	//while ( it.current() ) {
 	for (int i=0;i<items.count();i++)
 	{
-		lst.append((KviTalTreeWidgetItem *)items.at(i));
-	//	lst.append((KviTalTreeWidgetItem *)it.current() );
+		lst.append((QTreeWidgetItem *)items.at(i));
+	//	lst.append((QTreeWidgetItem *)it.current() );
 	//	++it;
 	}
 	lst.setAutoDelete(TRUE);
diff --git a/src/kvirc/ui/kvi_selectors.h b/src/kvirc/ui/kvi_selectors.h
index f36dd007f..7c6815844 100644
--- a/src/kvirc/ui/kvi_selectors.h
+++ b/src/kvirc/ui/kvi_selectors.h
@@ -33,7 +33,7 @@
 #include "kvi_tal_vbox.h"
 #include "kvi_tal_scrollview.h"
 #include "kvi_tal_listwidget.h"
-#include "kvi_tal_treewidget.h"
+#include <QTreeWidget>
 
 #include <QCheckBox>
 #include <QLineEdit>
@@ -366,12 +366,12 @@ public:
 	virtual void setEnabled(bool bEnabled);
 };
 
-class KVIRC_API KviChanTreeViewItem : public KviTalTreeWidgetItem
+class KVIRC_API KviChanTreeViewItem : public QTreeWidgetItem
 {
 private:
 	QString m_szPass;
 public:
-	KviChanTreeViewItem(KviTalTreeWidget* pList,QString szChan,QString szPass);
+	KviChanTreeViewItem(QTreeWidget* pList,QString szChan,QString szPass);
 	~KviChanTreeViewItem() {};
 
 	const QString& pass() { return m_szPass; }
@@ -385,7 +385,7 @@ public:
 	~KviChannelListSelector();
 private:
 	QLabel       * m_pLabel;
-	KviTalTreeWidget    * m_pTreeWidget;
+	QTreeWidget    * m_pTreeWidget;
 	QLineEdit    * m_pChanLineEdit;
 	QLineEdit    * m_pPassLineEdit;
 	QPushButton  * m_pAddButton;
diff --git a/src/modules/actioneditor/actioneditor.cpp b/src/modules/actioneditor/actioneditor.cpp
index 3767a7f31..b05e1e408 100644
--- a/src/modules/actioneditor/actioneditor.cpp
+++ b/src/modules/actioneditor/actioneditor.cpp
@@ -67,8 +67,8 @@ static QString g_szLastEditedAction;
 #define LVI_SPACING 8
 #define LVI_MINIMUM_CELL_WIDTH (LVI_MINIMUM_TEXT_WIDTH + LVI_BORDER + LVI_ICON_SIZE + LVI_SPACING + LVI_BORDER)
 
-KviActionEditorTreeWidgetItem::KviActionEditorTreeWidgetItem(KviTalTreeWidget * v,KviActionData * a)
-: KviTalTreeWidgetItem(v)
+KviActionEditorTreeWidgetItem::KviActionEditorTreeWidgetItem(QTreeWidget * v,KviActionData * a)
+: QTreeWidgetItem(v)
 {
 	m_pActionData = a;
 	m_pTreeWidget = v;
@@ -580,7 +580,7 @@ void KviSingleActionEditor::commit()
 
 
 KviActionEditorTreeView::KviActionEditorTreeView(QWidget * pParent)
-: KviTalTreeWidget(pParent)
+: QTreeWidget(pParent)
 {
 	setColumnCount (1);
 	setHeaderLabel(__tr2qs_ctx("Action","editor"));
@@ -599,7 +599,7 @@ KviActionEditorTreeView::~KviActionEditorTreeView()
 
 void KviActionEditorTreeView::resizeEvent(QResizeEvent * e)
 {
-	KviTalTreeWidget::resizeEvent(e);
+	QTreeWidget::resizeEvent(e);
 	int iWidth = viewport()->width();
 	if(iWidth < LVI_MINIMUM_CELL_WIDTH)iWidth = LVI_MINIMUM_CELL_WIDTH;
 	setColumnWidth(0,iWidth);
diff --git a/src/modules/actioneditor/actioneditor.h b/src/modules/actioneditor/actioneditor.h
index ccca3872e..3c3be4bbd 100644
--- a/src/modules/actioneditor/actioneditor.h
+++ b/src/modules/actioneditor/actioneditor.h
@@ -25,7 +25,7 @@
 //=============================================================================
 
 #include "kvi_window.h"
-#include "kvi_tal_treewidget.h"
+#include <QTreeWidget>
 
 #include <QWidget>
 #include <QTextDocument>
@@ -75,17 +75,17 @@ public:
 };
 
 
-class KviActionEditorTreeWidgetItem : public KviTalTreeWidgetItem
+class KviActionEditorTreeWidgetItem : public QTreeWidgetItem
 {
 public:
-	KviActionEditorTreeWidgetItem(KviTalTreeWidget * v,KviActionData * a);
+	KviActionEditorTreeWidgetItem(QTreeWidget * v,KviActionData * a);
 	~KviActionEditorTreeWidgetItem();
 protected:
 	KviActionData * m_pActionData;
 	//QSimpleRichText * m_pText;
 	QTextDocument * m_pText;
 	QPixmap * m_pIcon;
-	KviTalTreeWidget * m_pTreeWidget;
+	QTreeWidget * m_pTreeWidget;
 	QString m_szKey;
 public:
 	KviActionData * actionData(){ return m_pActionData; };
@@ -97,7 +97,7 @@ public:
 };
 
 
-class KviActionEditorTreeView : public KviTalTreeWidget
+class KviActionEditorTreeView : public QTreeWidget
 {
 	Q_OBJECT
 public:
diff --git a/src/modules/channelsjoin/channelsjoinwindow.cpp b/src/modules/channelsjoin/channelsjoinwindow.cpp
index d46b80e2b..509c92a6c 100644
--- a/src/modules/channelsjoin/channelsjoinwindow.cpp
+++ b/src/modules/channelsjoin/channelsjoinwindow.cpp
@@ -33,7 +33,7 @@
 #include "kvi_console.h"
 #include "kvi_regchan.h"
 #include "kvi_kvs_script.h"
-#include "kvi_tal_treewidget.h"
+#include <QTreeWidget>
 #include "kvi_tal_groupbox.h"
 
 #include <QLabel>
@@ -63,7 +63,7 @@ KviChannelsJoinWindow::KviChannelsJoinWindow(QWidget * par, const char * name)
 
 	QGridLayout * g = new QGridLayout(this);
 
-	m_pTreeWidget = new KviTalTreeWidget(this);
+	m_pTreeWidget = new QTreeWidget(this);
 	m_pTreeWidget->setHeaderLabel(__tr2qs("Channel"));
 	m_pTreeWidget->setRootIsDecorated(true);
 	m_pTreeWidget->setSelectionMode(QAbstractItemView::SingleSelection);
@@ -159,10 +159,10 @@ void KviChannelsJoinWindow::fillListView()
 
 	m_pTreeWidget->header()->hide();
 
-	KviTalTreeWidgetItem * par = new KviTalTreeWidgetItem(m_pTreeWidget);
+	QTreeWidgetItem * par = new QTreeWidgetItem(m_pTreeWidget);
 	par->setText(0,__tr2qs("Recent Channels"));
 	par->setExpanded(true);
-	KviTalTreeWidgetItem * chld;
+	QTreeWidgetItem * chld;
 
 	if(m_pConsole)
 	{
@@ -171,14 +171,14 @@ void KviChannelsJoinWindow::fillListView()
 		{
 			for(QStringList::Iterator it = pList->begin(); it != pList->end(); ++it)
 			{
-				chld = new KviTalTreeWidgetItem(par);
+				chld = new QTreeWidgetItem(par);
 				chld->setText(0,*it);
 				chld->setIcon(0,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CHANNEL)));
 			}
 		}
 	}
 
-	par = new KviTalTreeWidgetItem(m_pTreeWidget);
+	par = new QTreeWidgetItem(m_pTreeWidget);
 	par->setText(0,__tr2qs("Registered Channels"));
 	par->setExpanded(true);
 
@@ -188,7 +188,7 @@ void KviChannelsJoinWindow::fillListView()
 		KviPointerHashTableIterator<const char *,KviRegisteredChannelList> it(*d);
 		while(it.current())
 		{
-			chld = new KviTalTreeWidgetItem(par);
+			chld = new QTreeWidgetItem(par);
 			chld->setText(0,it.currentKey());
 			chld->setIcon(0,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CHANNEL)));
 			++it;
diff --git a/src/modules/channelsjoin/channelsjoinwindow.h b/src/modules/channelsjoin/channelsjoinwindow.h
index 02cda0b4b..1e2eba7a5 100644
--- a/src/modules/channelsjoin/channelsjoinwindow.h
+++ b/src/modules/channelsjoin/channelsjoinwindow.h
@@ -32,7 +32,7 @@
 
 #include "kvi_window.h"
 #include "kvi_string.h"
-#include "kvi_tal_treewidget.h"
+#include <QTreeWidget>
 
 #include <QDialog>
 
@@ -64,7 +64,7 @@ public:
 	~KviChannelsJoinWindow();
 protected:
 	QLineEdit        * m_pChannelEdit;
-	KviTalTreeWidget * m_pTreeWidget;
+	QTreeWidget * m_pTreeWidget;
 	KviTalGroupBox   * m_pGroupBox;
 	QLineEdit        * m_pPass;
 	QCheckBox        * m_pShowAtStartupCheck;
diff --git a/src/modules/links/linkswindow.cpp b/src/modules/links/linkswindow.cpp
index e6cc0336f..ce033b02c 100644
--- a/src/modules/links/linkswindow.cpp
+++ b/src/modules/links/linkswindow.cpp
@@ -184,8 +184,8 @@ void KviLinksWindow::endOfLinks()
 	outputNoFmt(KVI_OUT_SYSTEMMESSAGE,__tr2qs("Received end of links."));
 	outputNoFmt(KVI_OUT_SYSTEMMESSAGE,"======================");
 
-	KviTalTreeWidgetItem * it   = 0;
-	KviTalTreeWidgetItem * root = 0;
+	QTreeWidgetItem * it   = 0;
+	QTreeWidgetItem * root = 0;
 
 	int totalHosts  = 0;
 	int totalHops   = 0;
@@ -205,7 +205,7 @@ void KviLinksWindow::endOfLinks()
 		totalHosts++;
 		if(l->hops == 0)
 		{
-			root = new KviTalTreeWidgetItem(m_pListView);
+			root = new QTreeWidgetItem(m_pListView);
 			root->setText(0,QString(l->host.ptr()));
 			root->setText(1,QString("0"));
 			root->setText(2,QString(l->description.ptr()));
@@ -236,19 +236,19 @@ void KviLinksWindow::endOfLinks()
 				KviStr tmp2(KviStr::Format,"%d",l->hops);
 				if(root)
 				{
-					it = new KviTalTreeWidgetItem(root);
+					it = new QTreeWidgetItem(root);
 					it->setText(0,QString(l->host.ptr()));
 					it->setText(1,QString(tmp2.ptr()));
 					it->setText(2,tmp);
 				} else {
 					outputNoFmt(KVI_OUT_SYSTEMERROR,__tr2qs("Warning: No root link was sent by the server, the stats may be invalid."));
-					it = new KviTalTreeWidgetItem(m_pListView);
+					it = new QTreeWidgetItem(m_pListView);
 					it->setText(0,QString(l->host.ptr()));
 					it->setText(1,QString(tmp2.ptr()));
 					it->setText(2,tmp);
 				}
 			} else {
-				it = (KviTalTreeWidgetItem*) it->parent();
+				it = (QTreeWidgetItem*) it->parent();
 				if(it)
 				{
 					int links = it->childCount() + 1;
@@ -310,17 +310,17 @@ void KviLinksWindow::endOfLinks()
 	m_pListView->repaint();
 }
 
-KviTalTreeWidgetItem * KviLinksWindow::insertLink(KviLink *l)
+QTreeWidgetItem * KviLinksWindow::insertLink(KviLink *l)
 {
 	__range_valid(l->hops > 0);
-	KviTalTreeWidgetItem * i = getItemByHost(l->parent.ptr(),0);
-	KviTalTreeWidgetItem * it = 0;
+	QTreeWidgetItem * i = getItemByHost(l->parent.ptr(),0);
+	QTreeWidgetItem * it = 0;
 	if(!i)
 	{
 		return 0;
 	} else {
 		KviStr hops(KviStr::Format,"%d",l->hops);
-		it = new KviTalTreeWidgetItem(i);
+		it = new QTreeWidgetItem(i);
 		it->setText(0,QString(l->host.ptr()));
 		it->setText(1,QString(hops.ptr()));
 		it->setText(2,QString(l->description.ptr()));
@@ -329,7 +329,7 @@ KviTalTreeWidgetItem * KviLinksWindow::insertLink(KviLink *l)
 	return it;
 }
 
-KviTalTreeWidgetItem * KviLinksWindow::getItemByHost(const char *host,KviTalTreeWidgetItem * par)
+QTreeWidgetItem * KviLinksWindow::getItemByHost(const char *host,QTreeWidgetItem * par)
 {
 	KviStr tmp;
 	if(par)
@@ -338,7 +338,7 @@ KviTalTreeWidgetItem * KviLinksWindow::getItemByHost(const char *host,KviTalTree
 		{
 			tmp = par->child(i)->text(0);
 			if(kvi_strEqualCI(tmp.ptr(),host))return par->child(i);
-			KviTalTreeWidgetItem * ch = getItemByHost(host,par->child(i));
+			QTreeWidgetItem * ch = getItemByHost(host,par->child(i));
 			if(ch)return ch;
 		}
 	} else {
@@ -346,7 +346,7 @@ KviTalTreeWidgetItem * KviLinksWindow::getItemByHost(const char *host,KviTalTree
 		{
 			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));
+			QTreeWidgetItem * ch = getItemByHost(host,m_pListView->topLevelItem(i));
 			if(ch)return ch;
 		}
 	}
@@ -462,7 +462,7 @@ void KviLinksWindow::applyOptions()
 }
 
 KviLinksListView::KviLinksListView(QWidget * par)
-: KviTalTreeWidget(par)
+: QTreeWidget(par)
 {
 	header()->setSortIndicatorShown(true);
 	setColumnCount(3);
diff --git a/src/modules/links/linkswindow.h b/src/modules/links/linkswindow.h
index 2e2231c6f..729bf641e 100644
--- a/src/modules/links/linkswindow.h
+++ b/src/modules/links/linkswindow.h
@@ -30,7 +30,7 @@
 #include "kvi_sparser.h"
 #include "kvi_console.h"
 #include "kvi_irccontext.h"
-#include "kvi_tal_treewidget.h"
+#include <QTreeWidget>
 #include "kvi_tal_popupmenu.h"
 
 #include <QToolButton>
@@ -46,7 +46,7 @@ typedef struct _KviLink
 	KviStr description;
 } KviLink;
 
-class KviLinksListView : public KviTalTreeWidget
+class KviLinksListView : public QTreeWidget
 {
 	Q_OBJECT
 public:
@@ -93,8 +93,8 @@ public:
 private:
 	void reset();
 	void endOfLinks();
-	KviTalTreeWidgetItem * insertLink(KviLink * l);
-	KviTalTreeWidgetItem * getItemByHost(const char *host,KviTalTreeWidgetItem * par);
+	QTreeWidgetItem * insertLink(KviLink * l);
+	QTreeWidgetItem * getItemByHost(const char *host,QTreeWidgetItem * par);
 };
 
 #endif //_KVI_LINKSWINDOW_H_
diff --git a/src/modules/list/listwindow.cpp b/src/modules/list/listwindow.cpp
index 00eb0eea0..7f996201c 100644
--- a/src/modules/list/listwindow.cpp
+++ b/src/modules/list/listwindow.cpp
@@ -66,8 +66,8 @@ KviChannelTreeWidgetItemData::~KviChannelTreeWidgetItemData()
 }
 
 
-KviChannelTreeWidgetItem::KviChannelTreeWidgetItem(KviTalTreeWidget * v,KviChannelTreeWidgetItemData * pData)
-: KviTalTreeWidgetItem(v)
+KviChannelTreeWidgetItem::KviChannelTreeWidgetItem(QTreeWidget * v,KviChannelTreeWidgetItemData * pData)
+: QTreeWidgetItem(v)
 {
 	setText(0, pData->m_szChan);
 	setText(1, pData->m_szUsers);
@@ -78,14 +78,14 @@ KviChannelTreeWidgetItem::~KviChannelTreeWidgetItem()
 {
 }
 
-int KviChannelTreeWidgetItem::width(const QFontMetrics & fm, const KviTalTreeWidget *, int iColumn) const
+int KviChannelTreeWidgetItem::width(const QFontMetrics & fm, const QTreeWidget *, int iColumn) const
 {
 	if(iColumn == 2)
 		return fm.width(KviMircCntrl::stripControlBytes(text(iColumn)));
 	else return fm.width(text(iColumn));
 }
 
-bool KviChannelTreeWidgetItem::operator<(const KviTalTreeWidgetItem & other) const
+bool KviChannelTreeWidgetItem::operator<(const QTreeWidgetItem & other) const
 {
 	int iSortCol = treeWidget()->sortColumn();
 	switch(iSortCol)
@@ -106,7 +106,7 @@ bool KviChannelTreeWidgetItem::operator<(const KviTalTreeWidgetItem & other) con
 	}
 }
 
-KviChannelTreeWidgetItemDelegate::KviChannelTreeWidgetItemDelegate(KviTalTreeWidget * pWidget)
+KviChannelTreeWidgetItemDelegate::KviChannelTreeWidgetItemDelegate(QTreeWidget * pWidget)
 : QItemDelegate(pWidget)
 {
 }
@@ -201,7 +201,7 @@ KviListWindow::KviListWindow(KviFrame * lpFrm, KviConsole * lpConsole)
 
 	m_pInfoLabel = new KviThemedLabel(m_pTopSplitter,"info_label");
 
-	m_pTreeWidget  = new KviTalTreeWidget(m_pVertSplitter);
+	m_pTreeWidget  = new QTreeWidget(m_pVertSplitter);
 	m_pTreeWidget->setSelectionBehavior(QAbstractItemView::SelectRows);
 	m_pTreeWidget->setSelectionMode(QAbstractItemView::SingleSelection);
 	m_pTreeWidget->setItemDelegate(new KviChannelTreeWidgetItemDelegate(m_pTreeWidget));
@@ -461,7 +461,7 @@ void KviListWindow::flush()
 	m_pTreeWidget->viewport()->update();
 }
 
-void KviListWindow::itemDoubleClicked(KviTalTreeWidgetItem * it, int)
+void KviListWindow::itemDoubleClicked(QTreeWidgetItem * it, int)
 {
 	QString szText = it->text(0);
 
diff --git a/src/modules/list/listwindow.h b/src/modules/list/listwindow.h
index 45a229a6d..89566a3a1 100644
--- a/src/modules/list/listwindow.h
+++ b/src/modules/list/listwindow.h
@@ -31,7 +31,7 @@
 #include "kvi_sparser.h"
 #include "kvi_console.h"
 #include "kvi_irccontext.h"
-#include "kvi_tal_treewidget.h"
+#include <QTreeWidget>
 #include "kvi_tal_popupmenu.h"
 
 #include <QToolButton>
@@ -43,7 +43,7 @@ class KviThemedLabel;
 class KviChannelTreeWidgetItemDelegate : public QItemDelegate
 {
 public:
-	KviChannelTreeWidgetItemDelegate(KviTalTreeWidget * pWidget = 0);
+	KviChannelTreeWidgetItemDelegate(QTreeWidget * pWidget = 0);
 	~KviChannelTreeWidgetItemDelegate();
 	void paint(QPainter * pPainter, const QStyleOptionViewItem & option, const QModelIndex & index ) const;
 };
@@ -62,15 +62,15 @@ protected:
 	QString m_szTopic;
 };
 
-class KviChannelTreeWidgetItem : public KviTalTreeWidgetItem
+class KviChannelTreeWidgetItem : public QTreeWidgetItem
 {
 	friend class KviListWindow;
 public:
-	KviChannelTreeWidgetItem(KviTalTreeWidget * pWidget, KviChannelTreeWidgetItemData * pData);
+	KviChannelTreeWidgetItem(QTreeWidget * pWidget, KviChannelTreeWidgetItemData * pData);
 	~KviChannelTreeWidgetItem();
 public:
-	int width (const QFontMetrics & fm, const KviTalTreeWidget * pWidget, int iColumn) const;
-	bool operator<(const KviTalTreeWidgetItem & other) const;
+	int width (const QFontMetrics & fm, const QTreeWidget * pWidget, int iColumn) const;
+	bool operator<(const QTreeWidgetItem & other) const;
 };
 
 class KviListWindow : public KviWindow, public KviExternalServerDataParser
@@ -82,7 +82,7 @@ public:
 protected:
 	QSplitter                                    * m_pVertSplitter;
 	QSplitter                                    * m_pTopSplitter;
-	KviTalTreeWidget                             * m_pTreeWidget;
+	QTreeWidget                             * m_pTreeWidget;
 	QLineEdit                                    * m_pParamsEdit;
 	QToolButton                                  * m_pRequestButton;
 	QToolButton                                  * m_pStopListDownloadButton;
diff --git a/src/modules/logview/logviewmdiwindow.cpp b/src/modules/logview/logviewmdiwindow.cpp
index ec9cf82a5..194743da2 100644
--- a/src/modules/logview/logviewmdiwindow.cpp
+++ b/src/modules/logview/logviewmdiwindow.cpp
@@ -320,7 +320,7 @@ void KviLogViewMDIWindow::cacheFileList()
 	}
 }
 
-void KviLogViewMDIWindow::itemSelected(KviTalTreeWidgetItem * it,KviTalTreeWidgetItem *)
+void KviLogViewMDIWindow::itemSelected(QTreeWidgetItem * it,QTreeWidgetItem *)
 {
 	//A parent node
 	m_pIrcView->clearBuffer();
@@ -466,7 +466,7 @@ void KviLogFile::getText(QString & text,const QString& logDir){
 }
 
 KviLogViewListView::KviLogViewListView(QWidget * par)
-: KviTalTreeWidget(par)
+: QTreeWidget(par)
 {
 	header()->setSortIndicatorShown(true);
 	setColumnCount(1);
diff --git a/src/modules/logview/logviewmdiwindow.h b/src/modules/logview/logviewmdiwindow.h
index a47903a12..9cc1d368e 100644
--- a/src/modules/logview/logviewmdiwindow.h
+++ b/src/modules/logview/logviewmdiwindow.h
@@ -29,7 +29,7 @@
 #include "kvi_window.h"
 #include "kvi_moduleextension.h"
 #include "kvi_tal_vbox.h"
-#include "kvi_tal_treewidget.h"
+#include <QTreeWidget>
 #include "kvi_pointerlist.h"
 
 #include <QTabWidget>
@@ -73,7 +73,7 @@ private:
 	QDate        m_date;
 };
 
-class KviLogViewListView : public KviTalTreeWidget
+class KviLogViewListView : public QTreeWidget
 {
 	Q_OBJECT
 public:
diff --git a/src/modules/logview/logviewwidget.cpp b/src/modules/logview/logviewwidget.cpp
index 462f764be..a06a5d4e1 100644
--- a/src/modules/logview/logviewwidget.cpp
+++ b/src/modules/logview/logviewwidget.cpp
@@ -40,25 +40,25 @@
 	#include <zlib.h>
 #endif
 
-KviLogListViewItem::KviLogListViewItem(KviTalTreeWidgetItem * par, KviLogFile::KviLogTypes type, KviLogFile * fileData)
-: KviTalTreeWidgetItem(par), m_type(type), m_pFileData(fileData)
+KviLogListViewItem::KviLogListViewItem(QTreeWidgetItem * par, KviLogFile::KviLogTypes type, KviLogFile * fileData)
+: QTreeWidgetItem(par), m_type(type), m_pFileData(fileData)
 {
 	setText(0,m_pFileData ? m_pFileData->name() : QString());
 }
 
-KviLogListViewItem::KviLogListViewItem(KviTalTreeWidget * par, KviLogFile::KviLogTypes type, KviLogFile * fileData)
-: KviTalTreeWidgetItem(par), m_type(type), m_pFileData(fileData)
+KviLogListViewItem::KviLogListViewItem(QTreeWidget * par, KviLogFile::KviLogTypes type, KviLogFile * fileData)
+: QTreeWidgetItem(par), m_type(type), m_pFileData(fileData)
 {
 	setText(0,m_pFileData ? m_pFileData->name() : QString());
 }
 
-KviLogListViewItemFolder::KviLogListViewItemFolder(KviTalTreeWidgetItem * par, const QString& label)
+KviLogListViewItemFolder::KviLogListViewItemFolder(QTreeWidgetItem * par, const QString& label)
 : KviLogListViewItem(par,KviLogFile::Other,0)
 {
 	setText(0,label);
 }
 
-KviLogListViewItemType::KviLogListViewItemType(KviTalTreeWidget * par, KviLogFile::KviLogTypes type)
+KviLogListViewItemType::KviLogListViewItemType(QTreeWidget * par, KviLogFile::KviLogTypes type)
 : KviLogListViewItem(par,type,0)
 {
 	QIcon icon;
@@ -92,7 +92,7 @@ KviLogListViewItemType::KviLogListViewItemType(KviTalTreeWidget * par, KviLogFil
 	setText(0, text);
 }
 
-KviLogListViewLog::KviLogListViewLog(KviTalTreeWidgetItem * par, KviLogFile::KviLogTypes type, KviLogFile * fileData)
+KviLogListViewLog::KviLogListViewLog(QTreeWidgetItem * par, KviLogFile::KviLogTypes type, KviLogFile * fileData)
 : KviLogListViewItem(par,type,fileData)
 {
 	setText(0, m_pFileData->date().toString("dd.MM.yyyy"));
diff --git a/src/modules/logview/logviewwidget.h b/src/modules/logview/logviewwidget.h
index bb865c274..8029fb014 100644
--- a/src/modules/logview/logviewwidget.h
+++ b/src/modules/logview/logviewwidget.h
@@ -29,15 +29,15 @@
 
 #include "kvi_window.h"
 #include "kvi_scripteditor.h"
-#include "kvi_tal_treewidget.h"
+#include <QTreeWidget>
 
 class KviScriptEditor;
 
-class KviLogListViewItem : public KviTalTreeWidgetItem
+class KviLogListViewItem : public QTreeWidgetItem
 {
 public:
-	KviLogListViewItem(KviTalTreeWidgetItem * par, KviLogFile::KviLogTypes type, KviLogFile * fileData);
-	KviLogListViewItem(KviTalTreeWidget * par, KviLogFile::KviLogTypes type, KviLogFile * fileData);
+	KviLogListViewItem(QTreeWidgetItem * par, KviLogFile::KviLogTypes type, KviLogFile * fileData);
+	KviLogListViewItem(QTreeWidget * par, KviLogFile::KviLogTypes type, KviLogFile * fileData);
 	~KviLogListViewItem() {};
 public:
 	KviLogFile::KviLogTypes m_type;
@@ -48,7 +48,7 @@ public:
 class KviLogListViewItemFolder : public KviLogListViewItem
 {
 public:
-	KviLogListViewItemFolder(KviTalTreeWidgetItem * par, const QString& label);
+	KviLogListViewItemFolder(QTreeWidgetItem * par, const QString& label);
 	~KviLogListViewItemFolder() {};
 public:
 };
@@ -56,7 +56,7 @@ public:
 class KviLogListViewItemType : public KviLogListViewItem
 {
 public:
-	KviLogListViewItemType(KviTalTreeWidget * par, KviLogFile::KviLogTypes type);
+	KviLogListViewItemType(QTreeWidget * par, KviLogFile::KviLogTypes type);
 	~KviLogListViewItemType() {};
 };
 
@@ -64,7 +64,7 @@ public:
 class KviLogListViewLog : public KviLogListViewItem
 {
 public:
-	KviLogListViewLog(KviTalTreeWidgetItem * par, KviLogFile::KviLogTypes type, KviLogFile * fileData);
+	KviLogListViewLog(QTreeWidgetItem * par, KviLogFile::KviLogTypes type, KviLogFile * fileData);
 	~KviLogListViewLog() {};
 	virtual QString fileName() const { return m_pFileData->fileName(); };
 protected:
diff --git a/src/modules/objects/class_treewidget.h b/src/modules/objects/class_treewidget.h
index 8e6313733..28affa42e 100644
--- a/src/modules/objects/class_treewidget.h
+++ b/src/modules/objects/class_treewidget.h
@@ -82,7 +82,7 @@ protected slots:
 	void slotItemChanged(QTreeWidgetItem *,int);
 };
 
-class KviKvsTreeWidget : public KviTalTreeWidget
+class KviKvsTreeWidget : public QTreeWidget
 {
 	Q_OBJECT
 public:
diff --git a/src/modules/objects/class_treewidgetitem.cpp b/src/modules/objects/class_treewidgetitem.cpp
index d37098890..0b2dfe16c 100644
--- a/src/modules/objects/class_treewidgetitem.cpp
+++ b/src/modules/objects/class_treewidgetitem.cpp
@@ -174,7 +174,7 @@ bool KviKvsObject_treewidgetitem::init(KviKvsRunTimeContext * pContext,KviKvsVar
 		 m_pTreeWidgetItem = new KviKvsStandardTreeWidgetItem(this,((KviKvsObject_treewidgetitem *)parentObject())->m_pTreeWidgetItem);
 	} else {
 		if(parentObject()->inheritsClass("listview"))
-			m_pTreeWidgetItem = new KviKvsStandardTreeWidgetItem(this,((KviTalTreeWidget *)parentScriptWidget()));
+			m_pTreeWidgetItem = new KviKvsStandardTreeWidgetItem(this,((QTreeWidget *)parentScriptWidget()));
 		else {
                         pContext->error(__tr2qs_ctx("The parent of the listwidgetitem must be either another listwidgetitem or a listwidget","objects"));
 			return false;
@@ -190,13 +190,13 @@ void KviKvsObject_treewidgetitem::childDestroyed()
 	die();
 }
 
-KviKvsStandardTreeWidgetItem::KviKvsStandardTreeWidgetItem(KviKvsObject_treewidgetitem * ob,KviTalTreeWidget * par)
-:KviTalTreeWidgetItem(par), m_pMasterObject(ob)
+KviKvsStandardTreeWidgetItem::KviKvsStandardTreeWidgetItem(KviKvsObject_treewidgetitem * ob,QTreeWidget * par)
+:QTreeWidgetItem(par), m_pMasterObject(ob)
 {
 }
 
-KviKvsStandardTreeWidgetItem::KviKvsStandardTreeWidgetItem(KviKvsObject_treewidgetitem * ob,KviTalTreeWidgetItem * par)
-:KviTalTreeWidgetItem(par), m_pMasterObject(ob)
+KviKvsStandardTreeWidgetItem::KviKvsStandardTreeWidgetItem(KviKvsObject_treewidgetitem * ob,QTreeWidgetItem * par)
+:QTreeWidgetItem(par), m_pMasterObject(ob)
 {
 }
 
@@ -205,7 +205,7 @@ KviKvsStandardTreeWidgetItem::~KviKvsStandardTreeWidgetItem()
 	if(m_pMasterObject)m_pMasterObject->childDestroyed();
 }
 
-kvs_hobject_t KviKvsObject_treewidgetitem::itemToHandle(KviTalTreeWidgetItem * it)
+kvs_hobject_t KviKvsObject_treewidgetitem::itemToHandle(QTreeWidgetItem * it)
 {
 	if(!it)return (kvs_hobject_t)0;
 	KviKvsObject_treewidgetitem * pObject;
@@ -230,7 +230,7 @@ KVSO_CLASS_FUNCTION(treewidgetitem,setText)
 KVSO_CLASS_FUNCTION(treewidgetitem,firstChild)
 {
 	if(m_pTreeWidgetItem)
-		c->returnValue()->setHObject(itemToHandle((KviTalTreeWidgetItem*)m_pTreeWidgetItem->child(0)));
+		c->returnValue()->setHObject(itemToHandle((QTreeWidgetItem*)m_pTreeWidgetItem->child(0)));
 	else
 		c->returnValue()->setHObject((kvs_hobject_t)0);
 	return true;
@@ -342,7 +342,7 @@ KVSO_CLASS_FUNCTION(treewidgetitem,setChecked)
 	KVSO_PARAMETERS_END(c)
 	if(!m_pTreeWidgetItem)return true;
 	//if(m_pTreeWidgetItem->rtti() != 1)return true; // not a QCheckListItem
-	((KviTalTreeWidgetItem *)m_pTreeWidgetItem)->setCheckState(0,bChecked?Qt::Checked:Qt::Unchecked);
+	((QTreeWidgetItem *)m_pTreeWidgetItem)->setCheckState(0,bChecked?Qt::Checked:Qt::Unchecked);
 	return true;
 }
 
@@ -359,7 +359,7 @@ KVSO_CLASS_FUNCTION(treewidgetitem,isChecked)
 		return true;
 	}
 	*/
-	c->returnValue()->setBoolean(((KviTalTreeWidgetItem *)m_pTreeWidgetItem)->checkState(0)==Qt::Checked?1:0);
+	c->returnValue()->setBoolean(((QTreeWidgetItem *)m_pTreeWidgetItem)->checkState(0)==Qt::Checked?1:0);
 	return true;
 }
 /*
@@ -373,10 +373,10 @@ KVSO_CLASS_FUNCTION(treewidgetitem,setCheckable)
 	if(bCheckable)
 	{
 		if(m_pTreeWidgetItem->rtti() == 1)return true; // a QCheckListItem already
-		KviTalTreeWidgetItem * pParent = m_pTreeWidgetItem->parent();
-		KviTalTreeWidget * pLV = (KviTalTreeWidget *)m_pTreeWidgetItem->listView();
+		QTreeWidgetItem * pParent = m_pTreeWidgetItem->parent();
+		QTreeWidget * pLV = (QTreeWidget *)m_pTreeWidgetItem->listView();
 		// swap the items, so we don't die now
-		KviTalTreeWidgetItem * pThis = m_pTreeWidgetItem;
+		QTreeWidgetItem * pThis = m_pTreeWidgetItem;
 		m_pTreeWidgetItem = 0;
 		delete pThis;
 		if(pParent)
@@ -385,10 +385,10 @@ KVSO_CLASS_FUNCTION(treewidgetitem,setCheckable)
 			m_pTreeWidgetItem = new KviKvsCheckTreeWidgetItem(this,pLV);
 	} else {
 		if(m_pTreeWidgetItem->rtti() != 1)return true; // not a QCheckListItem yet
-		KviTalTreeWidgetItem * pParent = m_pTreeWidgetItem->parent();
-		KviTalTreeWidget * pLV = (KviTalTreeWidget *)m_pTreeWidgetItem->listView();
+		QTreeWidgetItem * pParent = m_pTreeWidgetItem->parent();
+		QTreeWidget * pLV = (QTreeWidget *)m_pTreeWidgetItem->listView();
 		// swap the items, so we don't die now
-		KviTalTreeWidgetItem * pThis = m_pTreeWidgetItem;
+		QTreeWidgetItem * pThis = m_pTreeWidgetItem;
 		m_pTreeWidgetItem = 0;
 		delete pThis;
 		if(pParent)
diff --git a/src/modules/objects/class_treewidgetitem.h b/src/modules/objects/class_treewidgetitem.h
index 733d54314..fa9754caa 100644
--- a/src/modules/objects/class_treewidgetitem.h
+++ b/src/modules/objects/class_treewidgetitem.h
@@ -29,7 +29,7 @@
 #include "class_widget.h"
 #include "object_macros.h"
 
-#include "kvi_tal_treewidget.h"
+#include <QTreeWidget>
 
 class KviKvsObject_treewidgetitem : public KviKvsObject
 {
@@ -37,7 +37,7 @@ public:
 	KVSO_DECLARE_OBJECT(KviKvsObject_treewidgetitem)
 	void childDestroyed();
 protected:
-	KviTalTreeWidgetItem * m_pTreeWidgetItem;
+	QTreeWidgetItem * m_pTreeWidgetItem;
 protected:
 	virtual bool init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams);
 protected:
@@ -59,15 +59,15 @@ protected:
 	bool setFlags(KviKvsObjectFunctionCall *c);
 
 public:
-	static kvs_hobject_t itemToHandle(KviTalTreeWidgetItem * it);
+	static kvs_hobject_t itemToHandle(QTreeWidgetItem * it);
 };
 
 
-class KviKvsStandardTreeWidgetItem : public KviTalTreeWidgetItem
+class KviKvsStandardTreeWidgetItem : public QTreeWidgetItem
 {
 public:
-	KviKvsStandardTreeWidgetItem(KviKvsObject_treewidgetitem * ob,KviTalTreeWidget * par);
-	KviKvsStandardTreeWidgetItem(KviKvsObject_treewidgetitem * ob,KviTalTreeWidgetItem * par);
+	KviKvsStandardTreeWidgetItem(KviKvsObject_treewidgetitem * ob,QTreeWidget * par);
+	KviKvsStandardTreeWidgetItem(KviKvsObject_treewidgetitem * ob,QTreeWidgetItem * par);
 	virtual ~KviKvsStandardTreeWidgetItem();
 protected:
 	KviKvsObject_treewidgetitem * m_pMasterObject;
@@ -79,8 +79,8 @@ public:
 class KviKvsCheckTreeWidgetItem : public KviTalCheckListItem
 {
 public:
-	KviKvsCheckTreeWidgetItem(KviKvsObject_treewidgetitem * ob,KviTalTreeWidget * par);
-	KviKvsCheckTreeWidgetItem(KviKvsObject_treewidgetitem * ob,KviTalTreeWidgetItem * par);
+	KviKvsCheckTreeWidgetItem(KviKvsObject_treewidgetitem * ob,QTreeWidget * par);
+	KviKvsCheckTreeWidgetItem(KviKvsObject_treewidgetitem * ob,QTreeWidgetItem * par);
 	virtual ~KviKvsCheckTreeWidgetItem();
 protected:
 	KviKvsObject_treewidgetitem * m_pMasterObject;
diff --git a/src/modules/options/dialog.cpp b/src/modules/options/dialog.cpp
index d972a66c0..fbcad8dc8 100644
--- a/src/modules/options/dialog.cpp
+++ b/src/modules/options/dialog.cpp
@@ -74,8 +74,8 @@ KviGeneralOptionsFrontWidget::~KviGeneralOptionsFrontWidget()
 }
 
 
-KviOptionsTreeWidgetItem::KviOptionsTreeWidgetItem(KviTalTreeWidget *parent,KviOptionsWidgetInstanceEntry * e)
-:KviTalTreeWidgetItem()
+KviOptionsTreeWidgetItem::KviOptionsTreeWidgetItem(QTreeWidget *parent,KviOptionsWidgetInstanceEntry * e)
+:QTreeWidgetItem()
 {
 	m_pInstanceEntry = e;
 	m_pOptionsWidget = 0;
@@ -84,8 +84,8 @@ KviOptionsTreeWidgetItem::KviOptionsTreeWidgetItem(KviTalTreeWidget *parent,KviO
 	parent->insertTopLevelItem(0, this);
 }
 
-KviOptionsTreeWidgetItem::KviOptionsTreeWidgetItem(KviTalTreeWidgetItem *parent,KviOptionsWidgetInstanceEntry * e)
-:KviTalTreeWidgetItem()
+KviOptionsTreeWidgetItem::KviOptionsTreeWidgetItem(QTreeWidgetItem *parent,KviOptionsWidgetInstanceEntry * e)
+:QTreeWidgetItem()
 {
 	m_pInstanceEntry = e;
 	m_pOptionsWidget = 0;
@@ -173,7 +173,7 @@ KviOptionsDialog::KviOptionsDialog(QWidget * par,const QString &szGroup)
 	vbox->setMargin(3);
 
 	// Controlling list view
-	m_pTreeWidget = new KviTalTreeWidget(vbox);
+	m_pTreeWidget = new QTreeWidget(vbox);
 
 	m_pTreeWidget->header()->hide();
 	m_pTreeWidget->setRootIsDecorated(true);
@@ -476,7 +476,7 @@ void KviOptionsDialog::searchClicked()
 		search(szTxt);
 }
 
-void KviOptionsDialog::fillTreeWidget(KviTalTreeWidgetItem * p,KviPointerList<KviOptionsWidgetInstanceEntry> * l,const QString &szGroup,bool bNotContainedOnly)
+void KviOptionsDialog::fillTreeWidget(QTreeWidgetItem * p,KviPointerList<KviOptionsWidgetInstanceEntry> * l,const QString &szGroup,bool bNotContainedOnly)
 {
 	if(!l)return;
 
@@ -534,12 +534,12 @@ void KviOptionsDialog::fillTreeWidget(KviTalTreeWidgetItem * p,KviPointerList<Kv
 	}
 }
 
-void KviOptionsDialog::treeWidgetItemSelectionChanged(KviTalTreeWidgetItem* it, KviTalTreeWidgetItem *)
+void KviOptionsDialog::treeWidgetItemSelectionChanged(QTreeWidgetItem* it, QTreeWidgetItem *)
 {
 	if(it)
 	{
 		QString str = it->text(0);
-		KviTalTreeWidgetItem * par = it->parent();
+		QTreeWidgetItem * par = it->parent();
 
 		while(par)
 		{
diff --git a/src/modules/options/dialog.h b/src/modules/options/dialog.h
index 719a9ecd4..b9c173db6 100644
--- a/src/modules/options/dialog.h
+++ b/src/modules/options/dialog.h
@@ -28,7 +28,7 @@
 #include "instances.h"
 
 #include "kvi_optionswidget.h"
-#include "kvi_tal_treewidget.h"
+#include <QTreeWidget>
 
 #include <QDialog>
 #include <QStringList>
@@ -49,11 +49,11 @@ public:
 	~KviGeneralOptionsFrontWidget();
 };
 
-class KviOptionsTreeWidgetItem : public KviTalTreeWidgetItem
+class KviOptionsTreeWidgetItem : public QTreeWidgetItem
 {
 public:
-	KviOptionsTreeWidgetItem(KviTalTreeWidget *parent,KviOptionsWidgetInstanceEntry * e);
-	KviOptionsTreeWidgetItem(KviTalTreeWidgetItem *parent,KviOptionsWidgetInstanceEntry * e);
+	KviOptionsTreeWidgetItem(QTreeWidget *parent,KviOptionsWidgetInstanceEntry * e);
+	KviOptionsTreeWidgetItem(QTreeWidgetItem *parent,KviOptionsWidgetInstanceEntry * e);
 	~KviOptionsTreeWidgetItem();
 public:
 	KviOptionsWidgetInstanceEntry * m_pInstanceEntry;
@@ -67,7 +67,7 @@ public:
 	KviOptionsDialog(QWidget * par,const QString &szGroup);
 	~KviOptionsDialog();
 private:
-	KviTalTreeWidget             * m_pTreeWidget;
+	QTreeWidget             * m_pTreeWidget;
 	QLabel                       * m_pCategoryLabel;
 	QStackedWidget               * m_pWidgetStack;
 	KviGeneralOptionsFrontWidget * m_pFrontWidget;
@@ -76,8 +76,8 @@ private:
 	QToolButton                  * m_pSearchButton;
 private:
 	void recursiveCommit(KviOptionsTreeWidgetItem *it);
-	void fillTreeWidget(KviTalTreeWidgetItem * p,KviPointerList<KviOptionsWidgetInstanceEntry> * l,const QString &szGroup,bool bNotContainedOnly = false);
-	//KviOptionsTreeWidgetItem * showHiddenChildren(KviTalTreeWidgetItem * p,KviPointerList<KviOptionsWidgetInstanceEntry> * l);
+	void fillTreeWidget(QTreeWidgetItem * p,KviPointerList<KviOptionsWidgetInstanceEntry> * l,const QString &szGroup,bool bNotContainedOnly = false);
+	//KviOptionsTreeWidgetItem * showHiddenChildren(QTreeWidgetItem * p,KviPointerList<KviOptionsWidgetInstanceEntry> * l);
 	//KviOptionsTreeWidgetItem * findItemByPage(KviOptionsTreeWidgetItem *it,KviOptionsWidget * pPage);
 private slots:
 	void treeWidgetItemSelectionChanged(QTreeWidgetItem* it, QTreeWidgetItem *prev);
diff --git a/src/modules/options/optw_identity.cpp b/src/modules/options/optw_identity.cpp
index b567ffe31..f4d21fd7a 100644
--- a/src/modules/options/optw_identity.cpp
+++ b/src/modules/options/optw_identity.cpp
@@ -39,7 +39,7 @@
 #include "kvi_identityprofile.h"
 #include "kvi_tal_tooltip.h"
 #include "kvi_tal_hbox.h"
-#include "kvi_tal_treewidget.h"
+#include <QTreeWidget>
 
 #include <QCheckBox>
 #include <QLineEdit>
@@ -685,7 +685,7 @@ KviIdentityProfileOptionsWidget::KviIdentityProfileOptionsWidget(QWidget * pPare
 	connect(m_pProfilesCheck,SIGNAL(toggled(bool)),this,SLOT(toggleControls()));
 
 	// Profiles list
-	m_pTreeWidget = new KviTalTreeWidget(this);
+	m_pTreeWidget = new QTreeWidget(this);
 	m_pTreeWidget->setSelectionMode(QAbstractItemView::SingleSelection);
 	m_pTreeWidget->setAllColumnsShowFocus(true);
 
@@ -724,11 +724,11 @@ KviIdentityProfileOptionsWidget::KviIdentityProfileOptionsWidget(QWidget * pPare
 	// Fill in the treewidget
 	if(pSet && pSet->profiles())
 	{
-		KviTalTreeWidgetItem * pItem;
+		QTreeWidgetItem * pItem;
 		KviPointerList<KviIdentityProfile> * pList = pSet->profiles();
 		for(KviIdentityProfile * pProfile = pList->first(); pProfile; pProfile = pList->next())
 		{
-			pItem = new KviTalTreeWidgetItem(m_pTreeWidget);
+			pItem = new QTreeWidgetItem(m_pTreeWidget);
 			pItem->setText(0,pProfile->name());
 			pItem->setText(1,pProfile->network());
 			pItem->setText(2,pProfile->nick());
@@ -763,7 +763,7 @@ void KviIdentityProfileOptionsWidget::addProfileEntry()
 
 	if(editor.editProfile(&profile))
 	{
-		KviTalTreeWidgetItem * pItem = new KviTalTreeWidgetItem(m_pTreeWidget);
+		QTreeWidgetItem * pItem = new QTreeWidgetItem(m_pTreeWidget);
 		pItem->setText(0,profile.name());
 		pItem->setText(1,profile.network());
 		pItem->setText(2,profile.nick());
@@ -775,7 +775,7 @@ void KviIdentityProfileOptionsWidget::addProfileEntry()
 
 void KviIdentityProfileOptionsWidget::editProfileEntry()
 {
-	KviTalTreeWidgetItem * pItem = (KviTalTreeWidgetItem *)m_pTreeWidget->currentItem();
+	QTreeWidgetItem * pItem = (QTreeWidgetItem *)m_pTreeWidget->currentItem();
 	if(!pItem)
 		return;
 
@@ -802,7 +802,7 @@ void KviIdentityProfileOptionsWidget::editProfileEntry()
 
 void KviIdentityProfileOptionsWidget::delProfileEntry()
 {
-	KviTalTreeWidgetItem * pItem = (KviTalTreeWidgetItem *)m_pTreeWidget->currentItem();
+	QTreeWidgetItem * pItem = (QTreeWidgetItem *)m_pTreeWidget->currentItem();
 	if(!pItem)
 		return;
 
@@ -816,10 +816,10 @@ void KviIdentityProfileOptionsWidget::commit()
 	if(m_pTreeWidget->topLevelItemCount())
 	{
 		KviIdentityProfileSet::instance()->setEnabled(m_pProfilesCheck->isChecked());
-		KviTalTreeWidgetItem * pItem;
+		QTreeWidgetItem * pItem;
 		for(int i=0; i < m_pTreeWidget->topLevelItemCount(); i++)
 		{
-			pItem = (KviTalTreeWidgetItem *)m_pTreeWidget->topLevelItem(i);
+			pItem = (QTreeWidgetItem *)m_pTreeWidget->topLevelItem(i);
 
 			KviIdentityProfile * pProfile = new KviIdentityProfile();
 			pProfile->setName(pItem->text(0));
diff --git a/src/modules/options/optw_identity.h b/src/modules/options/optw_identity.h
index 47650c9f7..e83bb635d 100644
--- a/src/modules/options/optw_identity.h
+++ b/src/modules/options/optw_identity.h
@@ -39,7 +39,7 @@ class QLineEdit;
 class QPushButton;
 class QComboBox;
 class KviHttpRequest;
-class KviTalTreeWidget;
+class QTreeWidget;
 class KviIdentityProfile;
 
 class KviNickAlternativesDialog : public QDialog
@@ -236,7 +236,7 @@ public:
 	KviIdentityProfileOptionsWidget(QWidget * pParent);
 	~KviIdentityProfileOptionsWidget();
 protected:
-	KviTalTreeWidget * m_pTreeWidget;
+	QTreeWidget * m_pTreeWidget;
 	QCheckBox        * m_pProfilesCheck;
 	QPushButton      * m_pBtnAddProfile;
 	QPushButton      * m_pBtnEditProfile;
diff --git a/src/modules/options/optw_mediatypes.cpp b/src/modules/options/optw_mediatypes.cpp
index 149c7d317..a095364e4 100644
--- a/src/modules/options/optw_mediatypes.cpp
+++ b/src/modules/options/optw_mediatypes.cpp
@@ -46,8 +46,8 @@ static void copyMediaType(KviMediaType * dst,const KviMediaType * src)
 	dst->szIcon                  = src->szIcon;
 }
 
-KviMediaTypeTreeWidgetItem::KviMediaTypeTreeWidgetItem(KviTalTreeWidget * w,KviMediaType * t)
-: KviTalTreeWidgetItem(w)
+KviMediaTypeTreeWidgetItem::KviMediaTypeTreeWidgetItem(QTreeWidget * w,KviMediaType * t)
+: QTreeWidgetItem(w)
 {
 	copyData(t);
 }
@@ -71,7 +71,7 @@ KviMediaTypesOptionsWidget::KviMediaTypesOptionsWidget(QWidget * parent)
 
 	createLayout();
 
-	m_pTreeWidget = new KviTalTreeWidget(this);
+	m_pTreeWidget = new QTreeWidget(this);
 	m_pTreeWidget->setColumnCount(3);
 	QStringList columnLabels;
 	columnLabels.append(__tr2qs_ctx("Pattern","options"));
diff --git a/src/modules/options/optw_mediatypes.h b/src/modules/options/optw_mediatypes.h
index 88f7a38d0..85448e617 100644
--- a/src/modules/options/optw_mediatypes.h
+++ b/src/modules/options/optw_mediatypes.h
@@ -26,16 +26,16 @@
 
 #include "kvi_optionswidget.h"
 #include "kvi_mediatype.h"
-#include "kvi_tal_treewidget.h"
+#include <QTreeWidget>
 
 #include <QLineEdit>
 #include <QPushButton>
 
 
-class KviMediaTypeTreeWidgetItem : public KviTalTreeWidgetItem
+class KviMediaTypeTreeWidgetItem : public QTreeWidgetItem
 {
 public:
-	KviMediaTypeTreeWidgetItem(KviTalTreeWidget * w,KviMediaType * t);
+	KviMediaTypeTreeWidgetItem(QTreeWidget * w,KviMediaType * t);
 	~KviMediaTypeTreeWidgetItem();
 private:
 	KviMediaType m_data;
@@ -58,7 +58,7 @@ public:
 	KviMediaTypesOptionsWidget(QWidget * parent);
 	~KviMediaTypesOptionsWidget();
 private:
-	KviTalTreeWidget  * m_pTreeWidget;
+	QTreeWidget  * m_pTreeWidget;
 	QLineEdit   * m_pDescription;
 	QLineEdit   * m_pIanaType;
 	QLineEdit   * m_pFileMask;
diff --git a/src/modules/options/optw_messages.h b/src/modules/options/optw_messages.h
index ac237733b..352d1f9cd 100644
--- a/src/modules/options/optw_messages.h
+++ b/src/modules/options/optw_messages.h
@@ -26,7 +26,7 @@
 
 #include "kvi_optionswidget.h"
 #include "kvi_msgtype.h"
-#include "kvi_tal_treewidget.h"
+#include <QTreeWidget>
 #include "kvi_tal_listwidget.h"
 #include "kvi_tal_popupmenu.h"
 
diff --git a/src/modules/options/optw_nickserv.cpp b/src/modules/options/optw_nickserv.cpp
index dfa6b7994..88e504f98 100644
--- a/src/modules/options/optw_nickserv.cpp
+++ b/src/modules/options/optw_nickserv.cpp
@@ -30,7 +30,7 @@
 #include "kvi_nickserv.h"
 #include "kvi_ircmask.h"
 #include "kvi_tal_tooltip.h"
-#include "kvi_tal_treewidget.h"
+#include <QTreeWidget>
 
 #include <QLayout>
 #include <QLineEdit>
@@ -235,7 +235,7 @@ KviNickServOptionsWidget::KviNickServOptionsWidget(QWidget * parent)
 	KviTalToolTip::add(m_pNickServCheck,__tr2qs_ctx("This check enables the automatic identification with NickServ","options"));
 	m_pNickServCheck->setChecked(bNickServEnabled);
 
-	m_pNickServTreeWidget = new KviTalTreeWidget(this);
+	m_pNickServTreeWidget = new QTreeWidget(this);
 	m_pNickServTreeWidget->setSelectionMode(QAbstractItemView::SingleSelection);
 	m_pNickServTreeWidget->setAllColumnsShowFocus(true);
 	QStringList columnLabels;
@@ -277,11 +277,11 @@ KviNickServOptionsWidget::KviNickServOptionsWidget(QWidget * parent)
 
 	if(rs && rs->rules())
 	{
-		KviTalTreeWidgetItem *it;
+		QTreeWidgetItem *it;
 		KviPointerList<KviNickServRule> * ll = rs->rules();
 		for(KviNickServRule * rule = ll->first();rule;rule = ll->next())
 		{
-			it = new KviTalTreeWidgetItem(m_pNickServTreeWidget);
+			it = new QTreeWidgetItem(m_pNickServTreeWidget);
 			it->setText(0,rule->registeredNick());
 			it->setText(1,rule->serverMask());
 			it->setText(2,rule->nickServMask());
@@ -301,7 +301,7 @@ KviNickServOptionsWidget::~KviNickServOptionsWidget()
 
 void KviNickServOptionsWidget::editNickServRule()
 {
-	KviTalTreeWidgetItem * it = (KviTalTreeWidgetItem *)m_pNickServTreeWidget->currentItem();
+	QTreeWidgetItem * it = (QTreeWidgetItem *)m_pNickServTreeWidget->currentItem();
 	if(!it)return;
 	KviNickServRule r(it->text(0),it->text(2),it->text(3),it->text(4),it->text(1));
 	KviNickServRuleEditor ed(this,true);
@@ -321,7 +321,7 @@ void KviNickServOptionsWidget::addNickServRule()
 	KviNickServRuleEditor ed(this,true);
 	if(ed.editRule(&r))
 	{
-		KviTalTreeWidgetItem* it = new KviTalTreeWidgetItem(m_pNickServTreeWidget);
+		QTreeWidgetItem* it = new QTreeWidgetItem(m_pNickServTreeWidget);
 		it->setText(0,r.registeredNick());
 		it->setText(1,r.serverMask());
 		it->setText(2,r.nickServMask());
@@ -332,7 +332,7 @@ void KviNickServOptionsWidget::addNickServRule()
 
 void KviNickServOptionsWidget::delNickServRule()
 {
-	KviTalTreeWidgetItem * it = (KviTalTreeWidgetItem *)m_pNickServTreeWidget->currentItem();
+	QTreeWidgetItem * it = (QTreeWidgetItem *)m_pNickServTreeWidget->currentItem();
 	if(!it)return;
 	delete it;
 	enableDisableNickServControls();
@@ -354,11 +354,11 @@ void KviNickServOptionsWidget::commit()
 	if(m_pNickServTreeWidget->topLevelItemCount())
 	{
 		g_pNickServRuleSet->setEnabled(m_pNickServCheck->isChecked());
-		KviTalTreeWidgetItem * it;// = m_pNickServTreeWidget->firstChild();
+		QTreeWidgetItem * it;// = m_pNickServTreeWidget->firstChild();
 		for (int i=0;i<m_pNickServTreeWidget->topLevelItemCount();i++)
 //		while(it)
 		{
-			it=(KviTalTreeWidgetItem *)m_pNickServTreeWidget->topLevelItem(i);
+			it=(QTreeWidgetItem *)m_pNickServTreeWidget->topLevelItem(i);
 			g_pNickServRuleSet->addRule(KviNickServRule::createInstance(it->text(0),it->text(2),it->text(3),it->text(4),it->text(1)));
 			//it = it->nextSibling();
 		}
diff --git a/src/modules/options/optw_nickserv.h b/src/modules/options/optw_nickserv.h
index 5764652f0..0d7f82558 100644
--- a/src/modules/options/optw_nickserv.h
+++ b/src/modules/options/optw_nickserv.h
@@ -35,7 +35,7 @@
 class QLineEdit;
 class QPushButton;
 class KviNickServRule;
-class KviTalTreeWidget;
+class QTreeWidget;
 
 #define KVI_OPTIONS_WIDGET_ICON_KviNickServOptionsWidget KVI_SMALLICON_NICKSERV
 #define KVI_OPTIONS_WIDGET_NAME_KviNickServOptionsWidget __tr2qs_no_lookup("NickServ")
@@ -72,7 +72,7 @@ public:
 	KviNickServOptionsWidget(QWidget * parent);
 	~KviNickServOptionsWidget();
 protected:
-	KviTalTreeWidget * m_pNickServTreeWidget;
+	QTreeWidget * m_pNickServTreeWidget;
 	QCheckBox        * m_pNickServCheck;
 	QPushButton      * m_pAddRuleButton;
 	QPushButton      * m_pDelRuleButton;
diff --git a/src/modules/options/optw_proxy.cpp b/src/modules/options/optw_proxy.cpp
index bc7da652b..91a8dc33e 100644
--- a/src/modules/options/optw_proxy.cpp
+++ b/src/modules/options/optw_proxy.cpp
@@ -43,8 +43,8 @@
 #include <QToolButton>
 
 
-KviProxyOptionsTreeWidgetItem::KviProxyOptionsTreeWidgetItem(KviTalTreeWidget *parent,const QPixmap &pm,KviProxy * prx)
-: KviTalTreeWidgetItem(parent)
+KviProxyOptionsTreeWidgetItem::KviProxyOptionsTreeWidgetItem(QTreeWidget *parent,const QPixmap &pm,KviProxy * prx)
+: QTreeWidgetItem(parent)
 {
 	debug("Creating item");
 	setText(0,prx->m_szHostname);
@@ -65,7 +65,7 @@ KviProxyOptionsWidget::KviProxyOptionsWidget(QWidget * parent)
 
 	addBoolSelector(0,0,1,0,__tr2qs_ctx("Use proxy","options"),KviOption_boolUseProxyHost);
 
-	m_pTreeWidget = new KviTalTreeWidget(this);
+	m_pTreeWidget = new QTreeWidget(this);
 	addWidgetToLayout(m_pTreeWidget,0,1,0,1);
 	m_pTreeWidget->setHeaderLabel(__tr2qs_ctx("Proxy","options"));
 	m_pTreeWidget->setRootIsDecorated(true);
@@ -320,7 +320,7 @@ void KviProxyOptionsWidget::commit()
 
 void KviProxyOptionsWidget::customContextMenuRequested(const QPoint &pos)
 {
-	KviTalTreeWidgetItem *it=(KviTalTreeWidgetItem *)m_pTreeWidget->itemAt(pos);
+	QTreeWidgetItem *it=(QTreeWidgetItem *)m_pTreeWidget->itemAt(pos);
 	m_pContextPopup->clear();
 	m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_PROXY)),__tr2qs_ctx("&New Proxy","options"),this,SLOT(newProxy()));
 	m_pContextPopup->setItemEnabled(m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CUT)),__tr2qs_ctx("Re&move Proxy","options"),this,SLOT(removeCurrent())),it);
@@ -343,11 +343,11 @@ void KviProxyOptionsWidget::removeCurrent()
 		//delete m_pLastEditedItem;
 		//m_pLastEditedItem = 0;
 
-		KviTalTreeWidgetItem * tmp = m_pLastEditedItem;
+		QTreeWidgetItem * tmp = m_pLastEditedItem;
 		m_pLastEditedItem = 0;
 		delete tmp;
 
-		KviTalTreeWidgetItem * it = (KviTalTreeWidgetItem *)m_pTreeWidget->topLevelItem(0);
+		QTreeWidgetItem * it = (QTreeWidgetItem *)m_pTreeWidget->topLevelItem(0);
 		if(it)
 		{
 			it->setSelected(true);
diff --git a/src/modules/options/optw_proxy.h b/src/modules/options/optw_proxy.h
index 3b84ff44c..5875676a9 100644
--- a/src/modules/options/optw_proxy.h
+++ b/src/modules/options/optw_proxy.h
@@ -25,7 +25,7 @@
 //=============================================================================
 
 #include "kvi_optionswidget.h"
-#include "kvi_tal_treewidget.h"
+#include <QTreeWidget>
 
 #include <QCheckBox>
 
@@ -39,10 +39,10 @@ class KviProxyDataBase;
 
 extern KVIRC_API KviProxyDataBase * g_pProxyDataBase;
 
-class KviProxyOptionsTreeWidgetItem : public KviTalTreeWidgetItem
+class KviProxyOptionsTreeWidgetItem : public QTreeWidgetItem
 {
 public:
-	KviProxyOptionsTreeWidgetItem(KviTalTreeWidget *parent,const QPixmap &pm,KviProxy * prx);
+	KviProxyOptionsTreeWidgetItem(QTreeWidget *parent,const QPixmap &pm,KviProxy * prx);
 	~KviProxyOptionsTreeWidgetItem();
 public:
 	KviProxy * m_pProxyData;
@@ -62,7 +62,7 @@ public:
 	KviProxyOptionsWidget(QWidget * parent);
 	~KviProxyOptionsWidget();
 protected:
-	KviTalTreeWidget    * m_pTreeWidget;
+	QTreeWidget    * m_pTreeWidget;
 	QLabel       * m_pProxyLabel;
 	QLineEdit    * m_pProxyEdit;
 	QLabel       * m_pIpLabel;
diff --git a/src/modules/options/optw_servers.cpp b/src/modules/options/optw_servers.cpp
index bbf672ac7..7ee6db4ed 100644
--- a/src/modules/options/optw_servers.cpp
+++ b/src/modules/options/optw_servers.cpp
@@ -283,7 +283,7 @@ KviNetworkDetailsWidget::KviNetworkDetailsWidget(QWidget * par,KviNetwork * n)
 				__tr2qs_ctx("This check enables the automatic identification with NickServ","options"));
 	m_pNickServCheck->setChecked(bNickServEnabled);
 
-	m_pNickServTreeWidget = new KviTalTreeWidget(tab);
+	m_pNickServTreeWidget = new QTreeWidget(tab);
 	m_pNickServTreeWidget->setSelectionMode(QAbstractItemView::SingleSelection);
 	m_pNickServTreeWidget->setAllColumnsShowFocus(true);
 	m_pNickServTreeWidget->setColumnCount(4);
@@ -324,7 +324,7 @@ KviNetworkDetailsWidget::KviNetworkDetailsWidget(QWidget * par,KviNetwork * n)
 		KviPointerList<KviNickServRule> * ll = rs->rules();
 		for(KviNickServRule * rule = ll->first();rule;rule = ll->next())
 		{
-			KviTalTreeWidgetItem* it = new KviTalTreeWidgetItem(m_pNickServTreeWidget);
+			QTreeWidgetItem* it = new QTreeWidgetItem(m_pNickServTreeWidget);
 			it->setText(0,rule->registeredNick());
 			it->setText(1,rule->nickServMask());
 			it->setText(2,rule->messageRegexp());
@@ -364,7 +364,7 @@ KviNetworkDetailsWidget::~KviNetworkDetailsWidget()
 
 void KviNetworkDetailsWidget::editNickServRule()
 {
-	KviTalTreeWidgetItem * it = (KviTalTreeWidgetItem *) m_pNickServTreeWidget->currentItem();
+	QTreeWidgetItem * it = (QTreeWidgetItem *) m_pNickServTreeWidget->currentItem();
 	if(!it)return;
 	KviNickServRule r(it->text(0),it->text(1),it->text(2),it->text(3));
 	KviNickServRuleEditor ed(this,false);
@@ -383,7 +383,7 @@ void KviNetworkDetailsWidget::addNickServRule()
 	KviNickServRuleEditor ed(this,false);
 	if(ed.editRule(&r))
 	{
-		KviTalTreeWidgetItem *it = new KviTalTreeWidgetItem(m_pNickServTreeWidget);
+		QTreeWidgetItem *it = new QTreeWidgetItem(m_pNickServTreeWidget);
 		it->setText(0,r.registeredNick());
 		it->setText(1,r.nickServMask());
 		it->setText(2,r.messageRegexp());
@@ -393,7 +393,7 @@ void KviNetworkDetailsWidget::addNickServRule()
 
 void KviNetworkDetailsWidget::delNickServRule()
 {
-	KviTalTreeWidgetItem * it = (KviTalTreeWidgetItem *)m_pNickServTreeWidget->currentItem();
+	QTreeWidgetItem * it = (QTreeWidgetItem *)m_pNickServTreeWidget->currentItem();
 	if(!it)return;
 	delete it;
 	enableDisableNickServControls();
@@ -448,10 +448,10 @@ void KviNetworkDetailsWidget::fillData(KviNetwork * n)
 		{
 			KviNickServRuleSet * rs = KviNickServRuleSet::createInstance();
 			rs->setEnabled(m_pNickServCheck->isChecked());
-			KviTalTreeWidgetItem * it;
+			QTreeWidgetItem * it;
 			for (int i=0;i<m_pNickServTreeWidget->topLevelItemCount();i++)
 			{
-				it=(KviTalTreeWidgetItem *) m_pNickServTreeWidget->topLevelItem(i);
+				it=(QTreeWidgetItem *) m_pNickServTreeWidget->topLevelItem(i);
 				rs->addRule(KviNickServRule::createInstance(it->text(0),it->text(1),it->text(2),it->text(3)));
 			}
 			n->setNickServRuleSet(rs);
@@ -1019,8 +1019,8 @@ void KviServerDetailsWidget::useDefaultInitUModeToggled(bool b)
 // kvi_app.cpp
 extern KVIRC_API KviServerDataBase * g_pServerDataBase;
 
-KviServerOptionsTreeWidgetItem::KviServerOptionsTreeWidgetItem(KviTalTreeWidget *parent,const QPixmap &pm,const KviNetwork *n)
-    : KviTalTreeWidgetItem(parent)
+KviServerOptionsTreeWidgetItem::KviServerOptionsTreeWidgetItem(QTreeWidget *parent,const QPixmap &pm,const KviNetwork *n)
+    : QTreeWidgetItem(parent)
 {
 	setIcon(0,QIcon(pm));
 	m_pServerData = 0;
@@ -1029,8 +1029,8 @@ KviServerOptionsTreeWidgetItem::KviServerOptionsTreeWidgetItem(KviTalTreeWidget
 	setText(1,n->description());
 }
 
-KviServerOptionsTreeWidgetItem::KviServerOptionsTreeWidgetItem(KviTalTreeWidgetItem *parent,const QPixmap &pm,const KviServer *s)
-    : KviTalTreeWidgetItem(parent)
+KviServerOptionsTreeWidgetItem::KviServerOptionsTreeWidgetItem(QTreeWidgetItem *parent,const QPixmap &pm,const KviServer *s)
+    : QTreeWidgetItem(parent)
 {
 	setIcon(0,QIcon(pm));
 	m_pServerData = new KviServer(*s);
@@ -1078,7 +1078,7 @@ KviServerOptionsWidget::KviServerOptionsWidget(QWidget * parent)
 	m_pNetworkDetailsDialog = 0;
 	m_pImportFilter = 0;
 
-	m_pTreeWidget = new KviTalTreeWidget(this);
+	m_pTreeWidget = new QTreeWidget(this);
 	addWidgetToLayout(m_pTreeWidget,0,0,0,0);
 	m_pTreeWidget->setColumnCount(2);
 	m_pTreeWidget->setMinimumWidth(500);
@@ -1257,17 +1257,17 @@ void KviServerOptionsWidget::recentServersPopupClicked(int id)
 	kvi_u32_t uPort = port.toUInt(&bOk);
 	// we have the port too
 
-	KviTalTreeWidgetItem * pFoundNet = 0;
-	KviTalTreeWidgetItem * pFoundSrv = 0;
+	QTreeWidgetItem * pFoundNet = 0;
+	QTreeWidgetItem * pFoundSrv = 0;
 
-	KviTalTreeWidgetItem * net;
+	QTreeWidgetItem * net;
 	for(int i=0;i<m_pTreeWidget->topLevelItemCount();i++)
 	{
-		net=(KviTalTreeWidgetItem *) m_pTreeWidget->topLevelItem(i);
-		KviTalTreeWidgetItem * srv;
+		net=(QTreeWidgetItem *) m_pTreeWidget->topLevelItem(i);
+		QTreeWidgetItem * srv;
 		for (int j=0;j<net->childCount();j++)
 		{
-			srv=(KviTalTreeWidgetItem *)net->child(i);
+			srv=(QTreeWidgetItem *)net->child(i);
 			KviStr tmp = ((KviServerOptionsTreeWidgetItem *)srv)->m_pServerData->hostName();
 			if(kvi_strEqualCI(tmp.ptr(),data.ptr()))
 			{
@@ -1458,7 +1458,7 @@ void KviServerOptionsWidget::commit()
 void KviServerOptionsWidget::customContextMenuRequested(const QPoint &pnt)
 {
 	int id;
-	KviTalTreeWidgetItem *it=(KviTalTreeWidgetItem *) m_pTreeWidget->itemAt(pnt);
+	QTreeWidgetItem *it=(QTreeWidgetItem *) m_pTreeWidget->itemAt(pnt);
 	bool bServer = (it && ((KviServerOptionsTreeWidgetItem *)it)->m_pServerData);
 	m_pContextPopup->clear();
 	m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_WORLD)),__tr2qs_ctx("New Network","options"),this,SLOT(newNetwork()));
diff --git a/src/modules/options/optw_servers.h b/src/modules/options/optw_servers.h
index 331f52343..9ba0046d4 100644
--- a/src/modules/options/optw_servers.h
+++ b/src/modules/options/optw_servers.h
@@ -26,7 +26,7 @@
 //=============================================================================
 
 #include "kvi_optionswidget.h"
-#include "kvi_tal_treewidget.h"
+#include <QTreeWidget>
 
 #include <QDialog>
 #include <QButtonGroup>
@@ -50,11 +50,11 @@ class KviNetworkData;
 class KviMexServerImport;
 
 
-class KviServerOptionsTreeWidgetItem : public KviTalTreeWidgetItem
+class KviServerOptionsTreeWidgetItem : public QTreeWidgetItem
 {
 public:
-	KviServerOptionsTreeWidgetItem(KviTalTreeWidget *parent,const QPixmap &pm,const KviNetwork *n);
-	KviServerOptionsTreeWidgetItem(KviTalTreeWidgetItem *parent,const QPixmap &pm,const KviServer *s);
+	KviServerOptionsTreeWidgetItem(QTreeWidget *parent,const QPixmap &pm,const KviNetwork *n);
+	KviServerOptionsTreeWidgetItem(QTreeWidgetItem *parent,const QPixmap &pm,const KviServer *s);
 	~KviServerOptionsTreeWidgetItem();
 public:
 	KviServer * m_pServerData;
@@ -85,7 +85,7 @@ protected:
 
 	QCheckBox             * m_pAutoConnectCheck;
 
-	KviTalTreeWidget        * m_pNickServTreeWidget;
+	QTreeWidget        * m_pNickServTreeWidget;
 	QCheckBox             * m_pNickServCheck;
 	QPushButton           * m_pAddRuleButton;
 	QPushButton           * m_pDelRuleButton;
@@ -160,7 +160,7 @@ public:
 	KviServerOptionsWidget(QWidget * parent);
 	~KviServerOptionsWidget();
 protected:
-	KviTalTreeWidget                    * m_pTreeWidget;
+	QTreeWidget                    * m_pTreeWidget;
 	QLabel                       * m_pSrvNetLabel;
 	QLineEdit                    * m_pSrvNetEdit;
 	//QLabel                       * m_pPortLabel;
diff --git a/src/modules/popupeditor/popupeditor.cpp b/src/modules/popupeditor/popupeditor.cpp
index 2fe983fce..04054086a 100644
--- a/src/modules/popupeditor/popupeditor.cpp
+++ b/src/modules/popupeditor/popupeditor.cpp
@@ -58,15 +58,15 @@ extern KviPopupEditorWindow * g_pPopupEditorWindow;
 
 
 //KviPopupEntryItem
-KviPopupTreeWidgetItem::KviPopupTreeWidgetItem(KviTalTreeWidget * pTreeWidget,KviPopupTreeWidgetItem * after,Type t)
-: KviTalTreeWidgetItem(pTreeWidget, after)
+KviPopupTreeWidgetItem::KviPopupTreeWidgetItem(QTreeWidget * pTreeWidget,KviPopupTreeWidgetItem * after,Type t)
+: QTreeWidgetItem(pTreeWidget, after)
 {
 	m_type = t;
 	init();
 }
 
 KviPopupTreeWidgetItem::KviPopupTreeWidgetItem(KviPopupTreeWidgetItem * parent,KviPopupTreeWidgetItem * after,Type t)
-: KviTalTreeWidgetItem(parent, after)
+: QTreeWidgetItem(parent, after)
 {
 	m_type = t;
 	init();
@@ -168,9 +168,9 @@ void KviPopupTreeWidgetItem::setIcon(const QString & szIcon)
 			{
 				QPixmap * pix = g_pIconManager->getImage(szIcon);
 				if(pix)
-					KviTalTreeWidgetItem::setIcon(0,QIcon(*pix));
+					QTreeWidgetItem::setIcon(0,QIcon(*pix));
 				else
-					KviTalTreeWidgetItem::setIcon(0,QIcon());
+					QTreeWidgetItem::setIcon(0,QIcon());
 			}
 		break;
 		default:
@@ -204,7 +204,7 @@ KviSinglePopupEditor::KviSinglePopupEditor(QWidget * par)
 	spl->setObjectName("popupeditor");
 	spl->setOpaqueResize(false);
 
-	m_pTreeWidget = new KviTalTreeWidget(spl);
+	m_pTreeWidget = new QTreeWidget(spl);
 	m_pTreeWidget->setColumnCount(2);
 	QStringList labels;
 	labels << __tr2qs_ctx("Item","editor") << __tr2qs_ctx("Type","editor");
@@ -798,13 +798,13 @@ void KviSinglePopupEditor::selectionChanged()
 	bool bTextEditorEnabled = false;
 	bool bNameEditorEnabled = false;
 
-	KviTalTreeWidgetItem * it;
+	QTreeWidgetItem * it;
 
 	if(m_pTreeWidget->selectedItems().empty())
 	{
 		it=0;
 	} else {
-		it= (KviTalTreeWidgetItem*)m_pTreeWidget->selectedItems().first();
+		it= (QTreeWidgetItem*)m_pTreeWidget->selectedItems().first();
 	}
 
 	if(it)
@@ -981,8 +981,8 @@ void KviSinglePopupEditor::edit(KviMenuTreeWidgetItem * it)
 }
 
 
-KviMenuTreeWidgetItem::KviMenuTreeWidgetItem(KviTalTreeWidget * par,KviKvsPopupMenu * popup)
-: KviTalTreeWidgetItem(par)
+KviMenuTreeWidgetItem::KviMenuTreeWidgetItem(QTreeWidget * par,KviKvsPopupMenu * popup)
+: QTreeWidgetItem(par)
 {
 	setIcon(0,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_POPUP)));
 	setText(0,popup->popupName());
@@ -1011,7 +1011,7 @@ KviPopupEditor::KviPopupEditor(QWidget * par)
 
 	KviTalVBox * box = new KviTalVBox(spl);
 
-	m_pTreeWidget = new KviTalTreeWidget(box);
+	m_pTreeWidget = new QTreeWidget(box);
 	m_pTreeWidget->setHeaderLabel(__tr2qs_ctx("Popup","editor"));
 	m_pTreeWidget->setSelectionMode(QAbstractItemView::ExtendedSelection);
 	m_pTreeWidget->header()->setSortIndicatorShown(true);
diff --git a/src/modules/popupeditor/popupeditor.h b/src/modules/popupeditor/popupeditor.h
index 97c80f952..8854c3748 100644
--- a/src/modules/popupeditor/popupeditor.h
+++ b/src/modules/popupeditor/popupeditor.h
@@ -26,7 +26,7 @@
 
 #include "kvi_window.h"
 #include "kvi_string.h"
-#include "kvi_tal_treewidget.h"
+#include <QTreeWidget>
 #include "kvi_tal_popupmenu.h"
 
 #include <QWidget>
@@ -39,12 +39,12 @@ class KviScriptEditor;
 class KviMenuTreeWidgetItem;
 
 // KviPopupTreeWidgetItem
-class KviPopupTreeWidgetItem : public KviTalTreeWidgetItem
+class KviPopupTreeWidgetItem : public QTreeWidgetItem
 {
 public:
 	enum Type { Item , Menu , Separator , Label , Epilogue , Prologue , ExtMenu };
 public:
-	KviPopupTreeWidgetItem(KviTalTreeWidget * pTreeWidget,KviPopupTreeWidgetItem * after,Type t);
+	KviPopupTreeWidgetItem(QTreeWidget * pTreeWidget,KviPopupTreeWidgetItem * after,Type t);
 	KviPopupTreeWidgetItem(KviPopupTreeWidgetItem * parent,KviPopupTreeWidgetItem * after,Type t);
 public:
 	Type                   m_type;
@@ -75,7 +75,7 @@ protected:
 	KviKvsPopupMenu      * m_pClipboard;
 	KviKvsPopupMenu      * m_pTestPopup;
 	KviPopupTreeWidgetItem * m_pLastSelectedItem;
-	KviTalTreeWidget     * m_pTreeWidget;
+	QTreeWidget     * m_pTreeWidget;
 	QLineEdit            * m_pNameEditor;
 	KviScriptEditor      * m_pEditor;
 	QLineEdit            * m_pTextEditor;
@@ -131,10 +131,10 @@ protected slots:
 
 
 
-class KviMenuTreeWidgetItem : public KviTalTreeWidgetItem
+class KviMenuTreeWidgetItem : public QTreeWidgetItem
 {
 public:
-	KviMenuTreeWidgetItem(KviTalTreeWidget * par,KviKvsPopupMenu * popup);
+	KviMenuTreeWidgetItem(QTreeWidget * par,KviKvsPopupMenu * popup);
 	~KviMenuTreeWidgetItem();
 public:
 	KviKvsPopupMenu * m_pPopup;
@@ -153,7 +153,7 @@ public:
 	~KviPopupEditor();
 public:
 	KviSinglePopupEditor * m_pEditor;
-	KviTalTreeWidget     * m_pTreeWidget;
+	QTreeWidget     * m_pTreeWidget;
 	KviMenuTreeWidgetItem  * m_pLastEditedItem;
 	bool                   m_bOneTimeSetupDone;
 	KviTalPopupMenu      * m_pContextPopup;
diff --git a/src/modules/raweditor/raweditor.cpp b/src/modules/raweditor/raweditor.cpp
index fb0067c9f..42bd2a487 100644
--- a/src/modules/raweditor/raweditor.cpp
+++ b/src/modules/raweditor/raweditor.cpp
@@ -52,8 +52,8 @@
 extern KviRawEditorWindow * g_pRawEditorWindow;
 
 
-KviRawTreeWidgetItem::KviRawTreeWidgetItem(KviTalTreeWidget *par,int idx,bool bEnabled)
-: KviTalTreeWidgetItem(par)
+KviRawTreeWidgetItem::KviRawTreeWidgetItem(QTreeWidget *par,int idx,bool bEnabled)
+: QTreeWidgetItem(par)
 {
 	m_iIdx = idx;
  	m_szName.setNum(idx);
@@ -149,8 +149,8 @@ void KviRawEditor::oneTimeSetup()
 
 void KviRawEditor::customContextMenuRequested(const QPoint &pos)
 {
-	KviTalTreeWidgetItem *it;
-	it=(KviTalTreeWidgetItem *)m_pTreeWidget->itemAt(pos);
+	QTreeWidgetItem *it;
+	it=(QTreeWidgetItem *)m_pTreeWidget->itemAt(pos);
 	__range_valid(m_bOneTimeSetupDone);
 	m_pContextPopup->clear();
 	if(it)
@@ -253,14 +253,14 @@ void KviRawEditor::addHandlerForCurrentRaw()
 {
 	__range_valid(m_pOneTimeSetupDone);
 
-	KviTalTreeWidgetItem * it = (KviTalTreeWidgetItem *) m_pTreeWidget->currentItem();
+	QTreeWidgetItem * it = (QTreeWidgetItem *) m_pTreeWidget->currentItem();
 	if(it)
 	{
 		if(it->parent() == 0)
 		{
 			QString buffer = __tr2qs_ctx("default","editor");
 			getUniqueHandlerName((KviRawTreeWidgetItem *)it,buffer);
-			KviTalTreeWidgetItem * ch = new KviRawHandlerTreeWidgetItem(it,buffer,"",true);
+			QTreeWidgetItem * ch = new KviRawHandlerTreeWidgetItem(it,buffer,"",true);
 			it->setExpanded(true);
 			ch->setSelected(true);
 		}
@@ -272,7 +272,7 @@ void KviRawEditor::removeCurrentHandler()
 	__range_valid(m_pOneTimeSetupDone);
 	if(m_pLastEditedItem)
 	{
-		KviTalTreeWidgetItem * it = m_pLastEditedItem;
+		QTreeWidgetItem * it = m_pLastEditedItem;
 		KviRawTreeWidgetItem * parent=(KviRawTreeWidgetItem *)it->parent();
 		m_pLastEditedItem = 0;
 		delete it;
@@ -299,17 +299,17 @@ void KviRawEditor::commit()
 
 	saveLastEditedItem();
 	KviKvsEventManager::instance()->removeAllScriptRawHandlers();
-	KviTalTreeWidgetItem * it;
+	QTreeWidgetItem * it;
 	for(int i=0;i<m_pTreeWidget->topLevelItemCount();i++)
 	{
-		it=(KviTalTreeWidgetItem *)m_pTreeWidget->topLevelItem(i);
+		it=(QTreeWidgetItem *)m_pTreeWidget->topLevelItem(i);
 		if(it->childCount())
 		{
 			QString szContext;
-			KviTalTreeWidgetItem * ch;
+			QTreeWidgetItem * ch;
 			for (int j=0;j<it->childCount();j++)
 			{
-				ch=(KviTalTreeWidgetItem *)it->child(j);
+				ch=(QTreeWidgetItem *)it->child(j);
 				debug("Commit handler %s",((KviRawHandlerTreeWidgetItem *)ch)->m_szBuffer.toUtf8().data());
 				//int a=(KviRawTreeWidgetItem *)it)->m_iIdx;
 				KviQString::sprintf(szContext,"RawEvent%d::%Q",&(((KviRawTreeWidgetItem *)it)->m_iIdx),&(((KviRawHandlerTreeWidgetItem *)ch)->m_szName));
diff --git a/src/modules/raweditor/raweditor.h b/src/modules/raweditor/raweditor.h
index 390040830..1a9133f4a 100644
--- a/src/modules/raweditor/raweditor.h
+++ b/src/modules/raweditor/raweditor.h
@@ -26,7 +26,7 @@
 
 #include "kvi_window.h"
 #include "kvi_qstring.h"
-#include "kvi_tal_treewidget.h"
+#include <QTreeWidget>
 #include "kvi_iconmanager.h"
 
 #include <QWidget>
@@ -35,25 +35,25 @@
 class KviScriptEditor;
 class KviTalPopupMenu;
 
-class KviRawTreeWidget : public KviTalTreeWidget
+class KviRawTreeWidget : public QTreeWidget
 {
 	public:
 	KviRawTreeWidget(QWidget *par)
-		: KviTalTreeWidget(par){};
-	void updateItem(KviTalTreeWidgetItem *item)
+		: QTreeWidget(par){};
+	void updateItem(QTreeWidgetItem *item)
 	{
 		update(indexFromItem(item,0));
 	};
 	~KviRawTreeWidget() {};
 };
 
-class KviRawTreeWidgetItem : public KviTalTreeWidgetItem
+class KviRawTreeWidgetItem : public QTreeWidgetItem
 {
 public:
 	int m_iIdx;
 	QString m_szName;
 public:
-	KviRawTreeWidgetItem(KviTalTreeWidget * par,int idx,bool bEnabled);
+	KviRawTreeWidgetItem(QTreeWidget * par,int idx,bool bEnabled);
 	~KviRawTreeWidgetItem() {};
 public:
 	void setEnabled(bool bEnabled)
@@ -65,11 +65,11 @@ public:
 	virtual QString text(int) const { return m_szName; };
 };
 
-class KviRawHandlerTreeWidgetItem : public KviTalTreeWidgetItem
+class KviRawHandlerTreeWidgetItem : public QTreeWidgetItem
 {
 public:
-	KviRawHandlerTreeWidgetItem(KviTalTreeWidgetItem * par,const QString & name,const QString & buffer,bool bEnabled)
-	: KviTalTreeWidgetItem(par), m_szName(name) , m_szBuffer(buffer) , m_bEnabled(bEnabled)
+	KviRawHandlerTreeWidgetItem(QTreeWidgetItem * par,const QString & name,const QString & buffer,bool bEnabled)
+	: QTreeWidgetItem(par), m_szName(name) , m_szBuffer(buffer) , m_bEnabled(bEnabled)
 	{
 		setText(0,name);
 		setEnabled(bEnabled);
diff --git a/src/modules/reguser/dialog.cpp b/src/modules/reguser/dialog.cpp
index 4e973b9e1..79d978a2e 100644
--- a/src/modules/reguser/dialog.cpp
+++ b/src/modules/reguser/dialog.cpp
@@ -73,7 +73,7 @@
 extern KviRegisteredUsersDialog * g_pRegisteredUsersDialog;
 
 KviRegisteredUsersListView::KviRegisteredUsersListView(QWidget * par)
-: KviTalTreeWidget(par)
+: QTreeWidget(par)
 {
 	setColumnCount(2);
 
@@ -104,10 +104,10 @@ void KviRegisteredUsersListView::mousePressEvent (QMouseEvent *e)
 		QTreeWidgetItem *i= itemAt(e->pos());
 		if (i) emit rightButtonPressed(i,QCursor::pos());
 	}
-	KviTalTreeWidget::mousePressEvent(e);
+	QTreeWidget::mousePressEvent(e);
 }
 
-KviRegisteredUsersDialogItem::KviRegisteredUsersDialogItem(KviTalTreeWidgetItem * par,KviRegisteredUser * u)
+KviRegisteredUsersDialogItem::KviRegisteredUsersDialogItem(QTreeWidgetItem * par,KviRegisteredUser * u)
 : KviRegisteredUsersDialogItemBase(User,par), m_pUser(u)
 {
 	QString szTmp;
@@ -331,7 +331,7 @@ KviRegisteredUsersDialog::~KviRegisteredUsersDialog()
 	g_pLocalRegisteredUserDataBase = 0;
 }
 
-void KviRegisteredUsersDialog::itemPressed(KviTalTreeWidgetItem *it,int c)
+void KviRegisteredUsersDialog::itemPressed(QTreeWidgetItem *it,int c)
 {
 	if(!it)return;
 	KviRegisteredUsersDialogItemBase* b=(KviRegisteredUsersDialogItemBase*)it;
@@ -377,7 +377,7 @@ void KviRegisteredUsersDialog::itemPressed(KviTalTreeWidgetItem *it,int c)
 	}
 }
 
-void KviRegisteredUsersDialog::itemDoubleClicked(KviTalTreeWidgetItem *it, int)
+void KviRegisteredUsersDialog::itemDoubleClicked(QTreeWidgetItem *it, int)
 {
 	if(!it)return;
 	KviRegisteredUsersDialogItemBase* b=(KviRegisteredUsersDialogItemBase*)it;
@@ -630,7 +630,7 @@ void KviRegisteredUsersDialog::editItem(KviRegisteredUsersDialogItem * i)
 		int count = m_pListView->topLevelItemCount();
 		for(int c=0;c<count;c++)
 		{
-			KviTalTreeWidgetItem * i = m_pListView->topLevelItem(c);
+			QTreeWidgetItem * i = m_pListView->topLevelItem(c);
 			QString szTmp = i->text(0);
 			if(KviQString::equalCI(szTmp,szName))
 			{
diff --git a/src/modules/reguser/dialog.h b/src/modules/reguser/dialog.h
index cfe033d2c..f497e32c9 100644
--- a/src/modules/reguser/dialog.h
+++ b/src/modules/reguser/dialog.h
@@ -28,7 +28,7 @@
 #include "kvi_regusersdb.h"
 #include "kvi_selectors.h"
 #include "kvi_pointerhashtable.h"
-#include "kvi_tal_treewidget.h"
+#include <QTreeWidget>
 #include "kvi_tal_listwidget.h"
 #include "kvi_tal_popupmenu.h"
 
@@ -39,7 +39,7 @@
 #include <QMultiHash>
 #include <QTextDocument>
 
-class  KviRegisteredUsersListView : public KviTalTreeWidget
+class  KviRegisteredUsersListView : public QTreeWidget
 {
 	Q_OBJECT
 public:
@@ -62,17 +62,17 @@ public:
 
 };
 
-class KviRegisteredUsersDialogItemBase : public KviTalTreeWidgetItem
+class KviRegisteredUsersDialogItemBase : public QTreeWidgetItem
 {
 public:
 	enum Types { User,Group };
 protected:
 	KviRegisteredUsersDialogItemBase(Types type,KviRegisteredUsersListView * par)
-	:KviTalTreeWidgetItem(par),m_iType(type)
+	:QTreeWidgetItem(par),m_iType(type)
 	{
 	};
-	KviRegisteredUsersDialogItemBase(Types type,KviTalTreeWidgetItem * par)
-	:KviTalTreeWidgetItem(par),m_iType(type)
+	KviRegisteredUsersDialogItemBase(Types type,QTreeWidgetItem * par)
+	:QTreeWidgetItem(par),m_iType(type)
 	{
 	};
 	~KviRegisteredUsersDialogItemBase()
@@ -108,7 +108,7 @@ protected:
 	KviRegisteredUser * m_pUser;
 	QTextDocument       m_pText;
 public:
-	KviRegisteredUsersDialogItem(KviTalTreeWidgetItem * par,KviRegisteredUser * u);
+	KviRegisteredUsersDialogItem(QTreeWidgetItem * par,KviRegisteredUser * u);
 	~KviRegisteredUsersDialogItem();
 public:
 	KviRegisteredUser * user(){ return m_pUser; };
diff --git a/src/modules/reguser/edituser.h b/src/modules/reguser/edituser.h
index cb80da1cc..1f4eb7155 100644
--- a/src/modules/reguser/edituser.h
+++ b/src/modules/reguser/edituser.h
@@ -28,7 +28,7 @@
 #include "kvi_regusersdb.h"
 #include "kvi_selectors.h"
 #include "kvi_pointerhashtable.h"
-#include "kvi_tal_treewidget.h"
+#include <QTreeWidget>
 #include "kvi_tal_popupmenu.h"
 #include <kvi_tal_tabdialog.h>
 
diff --git a/src/modules/sharedfileswindow/sharedfileswindow.cpp b/src/modules/sharedfileswindow/sharedfileswindow.cpp
index 084caa907..b0a05320f 100644
--- a/src/modules/sharedfileswindow/sharedfileswindow.cpp
+++ b/src/modules/sharedfileswindow/sharedfileswindow.cpp
@@ -185,8 +185,8 @@ void KviSharedFileEditDialog::okClicked()
 }
 
 
-KviSharedFilesTreeWidgetItem::KviSharedFilesTreeWidgetItem(KviTalTreeWidget * lv,KviSharedFile * f)
-: KviTalTreeWidgetItem(lv)
+KviSharedFilesTreeWidgetItem::KviSharedFilesTreeWidgetItem(QTreeWidget * lv,KviSharedFile * f)
+: QTreeWidgetItem(lv)
 {
 	setText(0,f->name());
 	setText(1,f->absFilePath());
@@ -216,7 +216,7 @@ KviSharedFilesWindow::KviSharedFilesWindow(KviModuleExtensionDescriptor * d,KviF
 
 	KviTalVBox * vbox = new KviTalVBox(m_pSplitter);
 
-	m_pTreeWidget  = new KviTalTreeWidget(vbox);
+	m_pTreeWidget  = new QTreeWidget(vbox);
 	//m_pTreeWidget->header()->hide();
 	m_pTreeWidget->setAllColumnsShowFocus(true);
 	QStringList columsLabels;
@@ -257,7 +257,7 @@ KviSharedFilesWindow::~KviSharedFilesWindow()
 
 void KviSharedFilesWindow::enableButtons()
 {
-	KviTalTreeWidgetItem * it = (KviTalTreeWidgetItem *)m_pTreeWidget->currentItem();
+	QTreeWidgetItem * it = (QTreeWidgetItem *)m_pTreeWidget->currentItem();
 	m_pEditButton->setEnabled(it);
 	m_pRemoveButton->setEnabled(it);
 }
@@ -324,11 +324,11 @@ void KviSharedFilesWindow::sharedFileAdded(KviSharedFile * f)
 
 void KviSharedFilesWindow::sharedFileRemoved(KviSharedFile * f)
 {
-	KviTalTreeWidgetItem * it;
+	QTreeWidgetItem * it;
 	for (int i=0;i<m_pTreeWidget->topLevelItemCount();i++)
 //	while(it)
 	{
-		it=(KviTalTreeWidgetItem *) m_pTreeWidget->topLevelItem(i);
+		it=(QTreeWidgetItem *) m_pTreeWidget->topLevelItem(i);
 		if(((KviSharedFilesTreeWidgetItem *)it)->readOnlySharedFilePointer() == f)
 		{
 			delete ((KviSharedFilesTreeWidgetItem *)it);
@@ -389,7 +389,7 @@ void KviSharedFilesWindow::transferUnregistering(KviSharedFiles * t)
 	if(it)delete it;
 }
 
-void KviSharedFilesWindow::rightButtonPressed(KviTalTreeWidgetItem *it,const QPoint &pnt,int col)
+void KviSharedFilesWindow::rightButtonPressed(QTreeWidgetItem *it,const QPoint &pnt,int col)
 {
 	if(!m_pContextPopup)m_pContextPopup = new KviTalPopupMenu(this);
 	if(!m_pLocalFilePopup)m_pLocalFilePopup = new KviTalPopupMenu(this);
@@ -503,7 +503,7 @@ void KviSharedFilesWindow::rightButtonPressed(KviTalTreeWidgetItem *it,const QPo
 
 KviSharedFiles * KviSharedFilesWindow::selectedTransfer()
 {
-	KviTalTreeWidgetItem * it = m_pTreeWidget->selectedItem();
+	QTreeWidgetItem * it = m_pTreeWidget->selectedItem();
 	if(!it)return 0;
 	KviSharedFilesItem * i = (KviSharedFilesItem *)it;
 	return i->transfer();
@@ -639,8 +639,8 @@ void KviSharedFilesWindow::heartbeat()
 {
 	if(m_pTreeWidget->childCount() < 1)return;
 
-	KviTalTreeWidgetItem * i1;
-	KviTalTreeWidgetItem * i2;
+	QTreeWidgetItem * i1;
+	QTreeWidgetItem * i2;
 
 	i1 = m_pTreeWidget->itemAt(QPoint(1,1));
 	if(!i1)
diff --git a/src/modules/sharedfileswindow/sharedfileswindow.h b/src/modules/sharedfileswindow/sharedfileswindow.h
index d45d69de8..7ea97b770 100644
--- a/src/modules/sharedfileswindow/sharedfileswindow.h
+++ b/src/modules/sharedfileswindow/sharedfileswindow.h
@@ -30,7 +30,7 @@
 #include "kvi_console.h"
 #include "kvi_moduleextension.h"
 #include "kvi_sharedfiles.h"
-#include "kvi_tal_treewidget.h"
+#include <QTreeWidget>
 
 #include <QDialog>
 #include <QCheckBox>
@@ -41,10 +41,10 @@ class QLabel;
 class QLineEdit;
 class QPushButton;
 
-class KviSharedFilesTreeWidgetItem : public KviTalTreeWidgetItem
+class KviSharedFilesTreeWidgetItem : public QTreeWidgetItem
 {
 public:
-	KviSharedFilesTreeWidgetItem(KviTalTreeWidget * lv,KviSharedFile * f);
+	KviSharedFilesTreeWidgetItem(QTreeWidget * lv,KviSharedFile * f);
 	~KviSharedFilesTreeWidgetItem();
 protected:
 	KviSharedFile * m_pSharedFilePointer; // THIS IS READ ONLY!
@@ -84,7 +84,7 @@ public:
 protected:
 	QSplitter           * m_pVertSplitter;
 
-	KviTalTreeWidget           * m_pTreeWidget;
+	QTreeWidget           * m_pTreeWidget;
 
 	QPushButton         * m_pRemoveButton;
 	QPushButton         * m_pEditButton;
diff --git a/src/modules/url/libkviurl.cpp b/src/modules/url/libkviurl.cpp
index 52122527f..dbecfb781 100644
--- a/src/modules/url/libkviurl.cpp
+++ b/src/modules/url/libkviurl.cpp
@@ -84,7 +84,7 @@ static KviModuleExtension * url_extension_alloc(KviModuleExtensionAllocStruct *)
 }
 
 KviUrlDialogTreeWidget::KviUrlDialogTreeWidget(QWidget * par)
-: KviTalTreeWidget(par)
+: QTreeWidget(par)
 {
 }
 
@@ -95,7 +95,7 @@ void KviUrlDialogTreeWidget::mousePressEvent (QMouseEvent *e)
 		QTreeWidgetItem *i= itemAt(e->pos());
 		if (i) emit rightButtonPressed(i,QCursor::pos());
 	}
-	KviTalTreeWidget::mousePressEvent(e);
+	QTreeWidget::mousePressEvent(e);
 }
 
 KviUrlAction::KviUrlAction(QObject * pParent)
@@ -271,14 +271,14 @@ void UrlDialog::findtext()
 */
 }
 
-void UrlDialog::dblclk_url(KviTalTreeWidgetItem *item, int)
+void UrlDialog::dblclk_url(QTreeWidgetItem *item, int)
 {
 	QString cmd="openurl ";
 	cmd.append(item->text(0));
 	KviKvsScript::run(cmd,this);
 }
 
-void UrlDialog::popup(KviTalTreeWidgetItem *item, const QPoint &point)
+void UrlDialog::popup(QTreeWidgetItem *item, const QPoint &point)
 {
 	m_szUrl = item->text(0);
 	KviTalPopupMenu p(0,"menu");
@@ -321,7 +321,7 @@ QPixmap *UrlDialog::myIconPtr()
 
 void UrlDialog::addUrl(QString url, QString window, QString count, QString timestamp)
 {
-	KviTalTreeWidgetItem *UrlItem = new KviTalTreeWidgetItem(m_pUrlList);
+	QTreeWidgetItem *UrlItem = new QTreeWidgetItem(m_pUrlList);
 
 	UrlItem->setText(0, url);
 	UrlItem->setText(1, window);
@@ -751,7 +751,7 @@ int check_url(KviWindow *w,const QString &szUrl) // return 0 if no occurence of
 			int count=tmpitem->dlg->m_pUrlList->topLevelItemCount();
 			for(int i=0;i<count;i++)
 			{
-				KviTalTreeWidgetItem* it=tmpitem->dlg->m_pUrlList->topLevelItem(i);
+				QTreeWidgetItem* it=tmpitem->dlg->m_pUrlList->topLevelItem(i);
 				if (it->text(0) == szUrl) {
 					int tmpCount = it->text(2).toInt();
 					tmpCount++;
diff --git a/src/modules/url/libkviurl.h b/src/modules/url/libkviurl.h
index d6cbf3078..ad3e6c0ff 100644
--- a/src/modules/url/libkviurl.h
+++ b/src/modules/url/libkviurl.h
@@ -31,7 +31,7 @@
 #include "kvi_tal_menubar.h"
 #include "kvi_mextoolbar.h"
 #include "kvi_kvs_action.h"
-#include "kvi_tal_treewidget.h"
+#include <QTreeWidget>
 
 #include <QDialog>
 #include <QLayout>
@@ -53,7 +53,7 @@ typedef struct _KviUrl
 	QString timestamp;
 } KviUrl;
 
-class KviUrlDialogTreeWidget : public KviTalTreeWidget
+class KviUrlDialogTreeWidget : public QTreeWidget
 {
 	Q_OBJECT
 public: