more QT4 port

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

32 files changed, 544 insertions, 331 deletions

diff --git a/src/kvilib/core/kvi_string.cpp b/src/kvilib/core/kvi_string.cpp
index 4c54c66f7..e664401be 100644
--- a/src/kvilib/core/kvi_string.cpp
+++ b/src/kvilib/core/kvi_string.cpp
@@ -2825,7 +2825,7 @@ int KviStr::findLastIdx(const char *str,bool caseS) const
 	}
 }
 
-KviStr & KviStr::stripWhiteSpace()
+KviStr & KviStr::trimmed()
 {
 	// 0123456789
 	//    abcd   0
diff --git a/src/kvilib/core/kvi_string.h b/src/kvilib/core/kvi_string.h
index b4b878507..47f151faa 100644
--- a/src/kvilib/core/kvi_string.h
+++ b/src/kvilib/core/kvi_string.h
@@ -324,7 +324,7 @@ public:
 	KviStr & stripRightWhiteSpace();
 	// Stips inital and final WHITESPACE characters (see man isspace),<br>
 	// and returns a reference to this string.
-	KviStr & stripWhiteSpace();
+	KviStr & trimmed();
 
 	// Strips spaces and tabs only
 	KviStr & stripSpace();
diff --git a/src/kvilib/ext/kvi_cmdformatter.cpp b/src/kvilib/ext/kvi_cmdformatter.cpp
index c5a8a9e05..23c0fcc2b 100644
--- a/src/kvilib/ext/kvi_cmdformatter.cpp
+++ b/src/kvilib/ext/kvi_cmdformatter.cpp
@@ -41,7 +41,7 @@ namespace KviCommandFormatter
 			} else {
 				// we pretend this line to be empty
 				KviStr tmp = *(*array);
-				tmp.stripWhiteSpace();
+				tmp.trimmed();
 				if(tmp.hasData())return false;
 				*(*array) = ""; // set it to empty also in the main buffer
 			}
@@ -139,7 +139,7 @@ namespace KviCommandFormatter
 
 	void bufferFromBlock(KviStr &buffer)
 	{
-		buffer.stripWhiteSpace();
+		buffer.trimmed();
 
 		if((*(buffer.ptr()) == '{') && buffer.lastCharIs('}'))
 		{
@@ -150,7 +150,7 @@ namespace KviCommandFormatter
 
 		unindent(buffer);
 
-		buffer.stripWhiteSpace();
+		buffer.trimmed();
 	}
 
 	void bufferFromBlock(QString &buffer)
diff --git a/src/kvilib/ext/kvi_config.cpp b/src/kvilib/ext/kvi_config.cpp
index a698a9f78..e355c58f0 100644
--- a/src/kvilib/ext/kvi_config.cpp
+++ b/src/kvilib/ext/kvi_config.cpp
@@ -373,7 +373,7 @@ bool KviConfig::load()
 
 	do {
 		bContinue = kvi_readLine(&f,dataLine);
-		dataLine.stripWhiteSpace();
+		dataLine.trimmed();
 		if(dataLine.hasData())
 		{
 			switch(*(dataLine.ptr()))
diff --git a/src/kvilib/ext/kvi_proxydb.cpp b/src/kvilib/ext/kvi_proxydb.cpp
index f85bd825e..97c8f1a41 100644
--- a/src/kvilib/ext/kvi_proxydb.cpp
+++ b/src/kvilib/ext/kvi_proxydb.cpp
@@ -78,8 +78,8 @@ void KviProxy::getSupportedProtocolNames(QStringList & buf)
 
 void KviProxy::normalizeUserAndPass()
 {
-	m_szUser.stripWhiteSpace();
-	m_szPass.stripWhiteSpace();
+	m_szUser.trimmed();
+	m_szPass.trimmed();
 }
 
 KviProxyDataBase::KviProxyDataBase()
diff --git a/src/kvilib/net/kvi_http.cpp b/src/kvilib/net/kvi_http.cpp
index fa0df705d..9f2e51e50 100644
--- a/src/kvilib/net/kvi_http.cpp
+++ b/src/kvilib/net/kvi_http.cpp
@@ -463,7 +463,7 @@ bool KviHttpRequest::processHeader(KviStr &szHeader)
 		szHeader = "";
 	}
 
-	szResponse.stripWhiteSpace();
+	szResponse.trimmed();
 
 	bool bValid = false;
 
@@ -474,7 +474,7 @@ bool KviHttpRequest::processHeader(KviStr &szHeader)
 	{
 		KviStr szR = szResponse;
 		szR.cutToFirst(' ');
-		szR.stripWhiteSpace();
+		szR.trimmed();
 		int idx = szR.findFirstIdx(' ');
 		KviStr szNumber;
 		if(idx != -1)szNumber = szR.left(idx);
@@ -524,7 +524,7 @@ bool KviHttpRequest::processHeader(KviStr &szHeader)
 		{
 			KviStr szName = s->left(idx);
 			s->cutLeft(idx + 1);
-			s->stripWhiteSpace();
+			s->trimmed();
 			hdr.replace(szName.ptr(),new KviStr(*s));
 			//debug("FOUND HEADER (%s)=(%s)",szName.ptr(),s->ptr());
 		}
diff --git a/src/kvilib/net/kvi_url.cpp b/src/kvilib/net/kvi_url.cpp
index a6216f254..39e91a114 100644
--- a/src/kvilib/net/kvi_url.cpp
+++ b/src/kvilib/net/kvi_url.cpp
@@ -60,7 +60,7 @@ void KviUrl::parse()
 	m_szUser = "";
 	m_szPass = "";
 
-	m_szUrl.stripWhiteSpace();
+	m_szUrl.trimmed();
 
 	KviStr u = m_szUrl;
 
@@ -75,7 +75,7 @@ void KviUrl::parse()
 		m_szProtocol = u.left(i);
 		u.cutLeft(i + 2);
 		u.stripLeft('/');
-		u.stripWhiteSpace();
+		u.trimmed();
 		
 		// fix the default ports
 		if(kvi_strEqualCI(m_szProtocol,"https"))uDefaultPort = 443;
@@ -95,7 +95,7 @@ void KviUrl::parse()
 	if(i != -1)
 	{
 		KviStr szUserPass = u.left(i);
-		szUserPass.stripWhiteSpace();
+		szUserPass.trimmed();
 		u.cutLeft(i + 1);
 
 		i = szUserPass.findFirstIdx(':');
@@ -104,7 +104,7 @@ void KviUrl::parse()
 			m_szUser = szUserPass.left(i);
 			szUserPass.cutLeft(i + 1);
 			m_szPass = szUserPass;
-			m_szPass.stripWhiteSpace();
+			m_szPass.trimmed();
 		} else {
 			m_szUser = szUserPass;
 		}
@@ -123,7 +123,7 @@ void KviUrl::parse()
 			// has a port part
 			m_szHost = h.left(i);
 			h.cutLeft(i + 1);
-			h.stripWhiteSpace();
+			h.trimmed();
 			bool bOk;
 			m_uPort = h.toUInt(&bOk);
 			if(!bOk)m_uPort = uDefaultPort;
@@ -136,8 +136,8 @@ void KviUrl::parse()
 		m_szHost = u;
 	}
 
-	m_szHost.stripWhiteSpace();
-	m_szPath.stripWhiteSpace();
+	m_szHost.trimmed();
+	m_szPath.trimmed();
 	if(!m_szPath.firstCharIs('/'))m_szPath.prepend('/');
 }
 
diff --git a/src/kvilib/system/kvi_locale.cpp b/src/kvilib/system/kvi_locale.cpp
index a2c16118b..1b1fcb511 100644
--- a/src/kvilib/system/kvi_locale.cpp
+++ b/src/kvilib/system/kvi_locale.cpp
@@ -572,7 +572,7 @@ bool KviMessageCatalogue::load(const QString& name)
 		{
 			szHeader.cutLeft(idx + 8);
 			szHeader.cutFromFirst('\n');
-			szHeader.stripWhiteSpace();
+			szHeader.trimmed();
 			m_pTextCodec = KviLocale::codecForName(szHeader.ptr());
 			if(!m_pTextCodec)
 			{
@@ -901,7 +901,7 @@ namespace KviLocale
 		if(g_szLang.isEmpty())g_szLang = kvi_getenv("LC_MESSAGES");
 		if(g_szLang.isEmpty())g_szLang = kvi_getenv("LANG");
 		if(g_szLang.isEmpty())g_szLang = "en";
-		g_szLang.stripWhiteSpace();
+		g_szLang.trimmed();
 
 		// the main catalogue is supposed to be kvirc_<language>.mo
 		g_pMainCatalogue = new KviMessageCatalogue();
diff --git a/src/kvirc/kernel/kvi_ircsocket.cpp b/src/kvirc/kernel/kvi_ircsocket.cpp
index 8d84b5a36..fe2054579 100644
--- a/src/kvirc/kernel/kvi_ircsocket.cpp
+++ b/src/kvirc/kernel/kvi_ircsocket.cpp
@@ -1145,7 +1145,7 @@ void KviIrcSocket::proxyHandleHttpFinalReply(const char * buffer,int bufLen)
 	KviStr tmp = buffer;
 	// FIXME: #warning "We could even show the proxy output here...!"
 	tmp.cutFromFirst('\n');
-	tmp.stripWhiteSpace();
+	tmp.trimmed();
 
 	if(kvi_strEqualCIN(tmp.ptr(),"HTTP",4))
 	{
diff --git a/src/kvirc/kvs/kvi_kvs_coresimplecommands_gl.cpp b/src/kvirc/kvs/kvi_kvs_coresimplecommands_gl.cpp
index 00f14c3b5..dc8ed8e9b 100644
--- a/src/kvirc/kvs/kvi_kvs_coresimplecommands_gl.cpp
+++ b/src/kvirc/kvs/kvi_kvs_coresimplecommands_gl.cpp
@@ -115,11 +115,11 @@ namespace KviKvsCoreSimpleCommands
 			KVSCSC_PARAMETER("topic",KVS_PT_STRING,KVS_PF_OPTIONAL | KVS_PF_APPENDREMAINING,szTopic)
 		KVSCSC_PARAMETERS_END
 
-		szTopic.stripWhiteSpace();
+		szTopic.trimmed();
 		if(szTopic.endsWith(";"))
 		{
 			szTopic.truncate(szTopic.length() - 1);
-			szTopic.stripWhiteSpace();
+			szTopic.trimmed();
 		}
 
 		QString szCommand;
diff --git a/src/kvirc/kvs/kvi_kvs_kernel.cpp b/src/kvirc/kvs/kvi_kvs_kernel.cpp
index 3f0775088..e775484e0 100644
--- a/src/kvirc/kvs/kvi_kvs_kernel.cpp
+++ b/src/kvirc/kvs/kvi_kvs_kernel.cpp
@@ -140,7 +140,7 @@ void KviKvsKernel::completeCommand(const QString &szCommandBegin,KviPointerList<
 
 void KviKvsKernel::completeModuleCommand(const QString &szModuleName,const QString &szCommandBegin,KviPointerList<QString> * pMatches)
 {
-	KviModule * pModule = g_pModuleManager->getModule(szModuleName.latin1());
+	KviModule * pModule = g_pModuleManager->getModule(szModuleName.toLatin1());
 	if(!pModule)return;
 
 	KviPointerList<QString> lModuleMatches;
@@ -202,7 +202,7 @@ void KviKvsKernel::completeFunction(const QString &szFunctionBegin,KviPointerLis
 
 void KviKvsKernel::completeModuleFunction(const QString &szModuleName,const QString &szCommandBegin,KviPointerList<QString> * pMatches)
 {
-	KviModule * pModule = g_pModuleManager->getModule(szModuleName.latin1());
+	KviModule * pModule = g_pModuleManager->getModule(szModuleName.toLatin1());
 	if(!pModule)return;
 
 	KviPointerList<QString> lModuleMatches;
diff --git a/src/kvirc/kvs/kvi_kvs_moduleinterface.cpp b/src/kvirc/kvs/kvi_kvs_moduleinterface.cpp
index 82c2b8eeb..948bac1b0 100644
--- a/src/kvirc/kvs/kvi_kvs_moduleinterface.cpp
+++ b/src/kvirc/kvs/kvi_kvs_moduleinterface.cpp
@@ -41,7 +41,7 @@ bool KviKvsModuleCallbackCommandCall::getParameterCode(unsigned int uParamIdx,QS
 	const QChar * pEnd = d->endingLocation();
 	if(!(pBegin && pEnd))return false;
 	szParamBuffer.setUnicode(pBegin,pEnd - pBegin);
-	szParamBuffer.stripWhiteSpace();
+	szParamBuffer.trimmed();
 	return true;
 }
 
diff --git a/src/kvirc/kvs/kvi_kvs_parser.cpp b/src/kvirc/kvs/kvi_kvs_parser.cpp
index aff0a5925..a22ac927f 100644
--- a/src/kvirc/kvs/kvi_kvs_parser.cpp
+++ b/src/kvirc/kvs/kvi_kvs_parser.cpp
@@ -2964,7 +2964,7 @@ KviPointerList<QString> * KviKvsParser::parseCommaSeparatedParameterListNoTree()
 				}
 				delete p;
 				QString * s = new QString(pBegin,KVSP_curCharPointer - pBegin);
-				s->stripWhiteSpace();
+				s->trimmed();
 				l->append(s);
 				
 				switch(KVSP_curCharUnicode)
diff --git a/src/kvirc/kvs/kvi_kvs_parser_specialcommands.cpp b/src/kvirc/kvs/kvi_kvs_parser_specialcommands.cpp
index a80cc5e71..8c4baa351 100644
--- a/src/kvirc/kvs/kvi_kvs_parser_specialcommands.cpp
+++ b/src/kvirc/kvs/kvi_kvs_parser_specialcommands.cpp
@@ -1969,7 +1969,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandHelp()
 	if(!KVSP_curCharIsEndOfBuffer)KVSP_skipChar;
 	
 	QString tmp(pBegin,KVSP_curCharPointer - pBegin);
-	tmp.stripWhiteSpace();
+	tmp.trimmed();
 
 	const QString szHelpName("help");
 
diff --git a/src/kvirc/kvs/kvi_kvs_popupmenu.cpp b/src/kvirc/kvs/kvi_kvs_popupmenu.cpp
index 092046c18..538c90fc5 100644
--- a/src/kvirc/kvs/kvi_kvs_popupmenu.cpp
+++ b/src/kvirc/kvs/kvi_kvs_popupmenu.cpp
@@ -1140,7 +1140,7 @@ void KviKvsPopupMenu::generateDefPopupCore(QString &buffer)
 	{
 		buffer.append("prologue\n");
 		tmp = s->code();
-		tmp.stripWhiteSpace();
+		tmp.trimmed();
 		KviCommandFormatter::blockFromBuffer(tmp);
 		buffer.append(tmp);
 		buffer.append('\n');
@@ -1193,7 +1193,7 @@ void KviKvsPopupMenu::generateDefPopupCore(QString &buffer)
 	{
 		buffer.append("epilogue\n");
 		tmp = s->code();
-		tmp.stripWhiteSpace();
+		tmp.trimmed();
 		KviCommandFormatter::blockFromBuffer(tmp);
 		buffer.append(tmp);
 		buffer.append('\n');
diff --git a/src/kvirc/sparser/kvi_sp_ctcp.cpp b/src/kvirc/sparser/kvi_sp_ctcp.cpp
index ea9e62bbe..5eada0dbe 100644
--- a/src/kvirc/sparser/kvi_sp_ctcp.cpp
+++ b/src/kvirc/sparser/kvi_sp_ctcp.cpp
@@ -1241,7 +1241,7 @@ void KviServerParser::parseCtcpRequestClientinfo(KviCtcpMessage *msg)
 		{
 			KviStr szTag;
 			msg->pData = extractCtcpParameter(msg->pData,szTag,false);
-			szTag.stripWhiteSpace();
+			szTag.trimmed();
 			szTag.toUpper();
 			if(szTag.isEmpty())
 			{
@@ -1334,7 +1334,7 @@ void KviServerParser::parseCtcpRequestPage(KviCtcpMessage *msg)
 	{
 		if(!KVI_OPTION_BOOL(KviOption_boolIgnoreCtcpPage))
 		{
-			KVI_OPTION_STRING(KviOption_stringCtcpPageReply).stripWhiteSpace();
+			KVI_OPTION_STRING(KviOption_stringCtcpPageReply).trimmed();
 			if(KVI_OPTION_STRING(KviOption_stringCtcpPageReply).isEmpty())
 			{
 				KVI_OPTION_STRING(KviOption_stringCtcpPageReply) = KVI_DEFAULT_CTCP_PAGE_REPLY;
@@ -1477,9 +1477,9 @@ void KviServerParser::parseCtcpRequestAvatar(KviCtcpMessage *msg)
 	if(!KVI_OPTION_BOOL(KviOption_boolIgnoreCtcpAvatar))
 	{
 		QString szGenderTag=" ";
-		if(KVI_OPTION_STRING(KviOption_stringCtcpUserInfoGender).startsWith("m",false)){
+		if(KVI_OPTION_STRING(KviOption_stringCtcpUserInfoGender).startsWith("m",Qt::CaseInsensitive)){
 			szGenderTag.append("M");
-		} else if(KVI_OPTION_STRING(KviOption_stringCtcpUserInfoGender).startsWith("f",false)){
+		} else if(KVI_OPTION_STRING(KviOption_stringCtcpUserInfoGender).startsWith("f",Qt::CaseInsensitive)){
 			szGenderTag.append("F");
 		} else {
 			szGenderTag.append("?");
@@ -1546,7 +1546,7 @@ void KviServerParser::parseCtcpReplyAvatar(KviCtcpMessage *msg)
 
 	decoded = extractCtcpParameter(decoded.toUtf8().data(),szRemoteFile,true);
 	decoded = extractCtcpParameter(decoded.toUtf8().data(),szGender,true);
-	szRemoteFile.stripWhiteSpace();
+	szRemoteFile.trimmed();
 
 	bool bPrivate = IS_ME(msg->msg,msg->szTarget);
 
@@ -1812,7 +1812,7 @@ void KviServerParser::parseCtcpReplyUserinfo(KviCtcpMessage *msg)
 
 	if(bNeedToUpdateUserlist)
 	{
-		if(KviQString::equalCS(g_pActiveWindow->className(),QString("KviChannel")))
+		if(KviQString::equalCS(g_pActiveWindow->metaObject()->className(),QString("KviChannel")))
 		{
 			((KviChannel*)g_pActiveWindow)->userListView()->updateArea();
 		}
diff --git a/src/kvirc/sparser/kvi_sp_numeric.cpp b/src/kvirc/sparser/kvi_sp_numeric.cpp
index 466204ec5..e3af2668b 100644
--- a/src/kvirc/sparser/kvi_sp_numeric.cpp
+++ b/src/kvirc/sparser/kvi_sp_numeric.cpp
@@ -806,14 +806,14 @@ void KviServerParser::parseLoginNicknameProblem(KviIrcMessage *msg)
 	{
 		case 0:
 			// used a server specific nickname
-			KVI_OPTION_STRING(KviOption_stringNickname1).stripWhiteSpace();
+			KVI_OPTION_STRING(KviOption_stringNickname1).trimmed();
 			if(KVI_OPTION_STRING(KviOption_stringNickname1).isEmpty())
 				KVI_OPTION_STRING(KviOption_stringNickname1) = KVI_DEFAULT_NICKNAME1;
 			nextNick = KVI_OPTION_STRING(KviOption_stringNickname1);
 			uNickCnt = 1;
 		case 1:
 			// used the first nickname of the identity
-			KVI_OPTION_STRING(KviOption_stringNickname2).stripWhiteSpace();
+			KVI_OPTION_STRING(KviOption_stringNickname2).trimmed();
 			if(KVI_OPTION_STRING(KviOption_stringNickname2).isEmpty())
 				KVI_OPTION_STRING(KviOption_stringNickname2) = KVI_DEFAULT_NICKNAME2;
 			nextNick = KVI_OPTION_STRING(KviOption_stringNickname2);
@@ -821,7 +821,7 @@ void KviServerParser::parseLoginNicknameProblem(KviIrcMessage *msg)
 		break;
 		case 2:
 			// used the second nickname of the identity
-			KVI_OPTION_STRING(KviOption_stringNickname3).stripWhiteSpace();
+			KVI_OPTION_STRING(KviOption_stringNickname3).trimmed();
 			if(KVI_OPTION_STRING(KviOption_stringNickname3).isEmpty())
 				KVI_OPTION_STRING(KviOption_stringNickname3) = KVI_DEFAULT_NICKNAME3;
 			nextNick = KVI_OPTION_STRING(KviOption_stringNickname3);
@@ -832,7 +832,7 @@ void KviServerParser::parseLoginNicknameProblem(KviIrcMessage *msg)
 			// used all the nicknames of the identity
 			// fall back to a random string...
 			nextNick = msg->safeParam(1);
-			nextNick.stripWhiteSpace();
+			nextNick.trimmed();
 			if(nextNick.isEmpty())nextNick = KVI_DEFAULT_NICKNAME1;
 			nextNick = nextNick.left(7);
 			QString num;
@@ -1056,7 +1056,7 @@ void KviServerParser::parseNumericWhoisUser(KviIrcMessage *msg)
 		e->setHost(szHost);
 		e->setRealName(szReal);
 		if(e->gender()!=KviIrcUserEntry::Unknown) {
-			if(KviQString::equalCS(g_pActiveWindow->className(),QString("KviChannel")))
+			if(KviQString::equalCS(g_pActiveWindow->metaObject()->className(),QString("KviChannel")))
 			{
 				((KviChannel*)g_pActiveWindow)->userListView()->updateArea();
 			}
@@ -1143,7 +1143,7 @@ void KviServerParser::parseNumericWhoisChannels(KviIrcMessage *msg)
 		KviWindow * pOut = KVI_OPTION_BOOL(KviOption_boolWhoisRepliesToActiveWindow) ?
 			msg->console()->activeWindow() : (KviWindow *)(msg->console());
 			
-		QStringList sl = QStringList::split(" ",szChans);
+		QStringList sl = szChans.split(" ",QString::SkipEmptyParts);
 		QString szChanList;
 
 		for(QStringList::Iterator it = sl.begin();it != sl.end();++it)
diff --git a/src/kvirc/sparser/kvi_sparser.cpp b/src/kvirc/sparser/kvi_sparser.cpp
index d2fa16e48..e94d2cb38 100644
--- a/src/kvirc/sparser/kvi_sparser.cpp
+++ b/src/kvirc/sparser/kvi_sparser.cpp
@@ -38,8 +38,9 @@ KviServerParser * g_pServerParser = 0;
 
 
 KviServerParser::KviServerParser()
-: QObject(0,"server_parser")
+: QObject(0)
 {
+	setObjectName("server_parser");
 }
 
 KviServerParser::~KviServerParser()
diff --git a/src/kvirc/ui/kvi_actiondrawer.cpp b/src/kvirc/ui/kvi_actiondrawer.cpp
index c1eb5fcd6..6c6e93ef4 100644
--- a/src/kvirc/ui/kvi_actiondrawer.cpp
+++ b/src/kvirc/ui/kvi_actiondrawer.cpp
@@ -60,51 +60,11 @@ KviActionDrawerPageListWidgetItem::KviActionDrawerPageListWidgetItem(KviTalListW
 
 KviActionDrawerPageListWidgetItem::~KviActionDrawerPageListWidgetItem()
 {
-//delete m_pIcon;
-//	delete m_pText;
-}
-/*
-QString KviActionDrawerPageListWidgetItem::key(int,bool) const
-{
-	return m_szKey;
-}
-
-void KviActionDrawerPageListWidgetItem::setup()
-{
-	KviTalListViewItem::setup();
-	int iWidth = m_pListWidget->visibleWidth();
-	if(iWidth < LVI_MINIMUM_CELL_WIDTH)iWidth = LVI_MINIMUM_CELL_WIDTH;
-	iWidth -= LVI_BORDER + LVI_ICON_SIZE + LVI_SPACING + LVI_BORDER;
-	m_pText->setWidth(iWidth);
-	int iHeight = m_pText->height() + (2 * LVI_BORDER);
-	if(iHeight < (LVI_ICON_SIZE + (2 * LVI_BORDER)))iHeight = LVI_ICON_SIZE + (2 * LVI_BORDER);
-	setHeight(iHeight);
-}
 
-void KviActionDrawerPageListWidgetItem::paintCell(QPainter * p,const QColorGroup & cg,int column,int width,int align)
-{
-	KviTalListViewItem::paintCell(p,cg,column,width,align);
-	//p->fillRect(QRect(0,0,width,height()),isSelected() ? cg.highlight() : cg.base());
-	p->drawPixmap(LVI_BORDER,LVI_BORDER,*m_pIcon);
-	int afterIcon = LVI_BORDER + LVI_ICON_SIZE + LVI_SPACING;
-	int www = m_pListWidget->visibleWidth() - (afterIcon + LVI_BORDER);
-	m_pText->setWidth(www);
-	if(isSelected())
-	{
-		QColorGroup cg2(cg);
-		cg2.setColor(QColorGroup::HighlightedText,cg.text());
-		m_pText->draw(p,afterIcon,LVI_BORDER,QRect(afterIcon,LVI_BORDER,www,height() - (LVI_BORDER * 2)),cg2);
-	} else {
-		m_pText->draw(p,afterIcon,LVI_BORDER,QRect(afterIcon,LVI_BORDER,www,height() - (LVI_BORDER * 2)),cg);
-	}
 }
-*/
 KviActionDrawerPageListWidget::KviActionDrawerPageListWidget(KviActionDrawerPage * pParent)
 : KviTalListWidget(pParent)
 {
-	/*QPixmap * p = g_pIconManager->getImage("kvi_actiondrawer.png");
-	if(p)setBackgroundOverlayPixmap(p,Qt::AlignRight | Qt::AlignBottom);
-*/
 	KviTalIconAndRichTextItemDelegate *itemDelegate=new KviTalIconAndRichTextItemDelegate(this);

 	setItemDelegate(itemDelegate);

 	setSelectionMode(QAbstractItemView::SingleSelection);

@@ -123,8 +83,8 @@ KviActionDrawerPageListWidget::KviActionDrawerPageListWidget(KviActionDrawerPage
 //	setSelectionMode(Single);[{['
 
 	//header()->hide();
-	int iWidth = viewport()->width();
-	if(iWidth < LVI_MINIMUM_CELL_WIDTH)iWidth = LVI_MINIMUM_CELL_WIDTH;
+//	int iWidth = viewport()->width();
+//	if(iWidth < LVI_MINIMUM_CELL_WIDTH)iWidth = LVI_MINIMUM_CELL_WIDTH;
 //	setHeaderLabel("");
 //	addColumn("",iWidth);
 //	setSorting(0,true);
diff --git a/src/kvirc/ui/kvi_ctcppagedialog.cpp b/src/kvirc/ui/kvi_ctcppagedialog.cpp
index 9e21b64de..32684bd10 100644
--- a/src/kvirc/ui/kvi_ctcppagedialog.cpp
+++ b/src/kvirc/ui/kvi_ctcppagedialog.cpp
@@ -32,6 +32,7 @@
 #include <QLabel>
 #include <QPixmap>
 #include <QDesktopWidget>
+#include <QSpacerItem>
 
 // kvi_app.cpp
 extern KVIRC_API KviCtcpPageDialog * g_pCtcpPageDialog;
@@ -51,7 +52,8 @@ KviCtcpPageDialog::KviCtcpPageDialog()
 	g->addWidget(m_pTabBar,1,0);
 
 	g->setRowStretch(0,1);
-	g->addRowSpacing(2,15);
+	g->addItem(new QSpacerItem(0, 15), 2, 0); 
+	//g->addRowSpacing(2,15);
 
 	m_pCloseButton = new QPushButton(__tr2qs("Close"),this);
 	connect(m_pCloseButton,SIGNAL(clicked()),this,SLOT(die()));
diff --git a/src/kvirc/ui/kvi_htmldialog.h b/src/kvirc/ui/kvi_htmldialog.h
index bacadb188..ec9d48436 100644
--- a/src/kvirc/ui/kvi_htmldialog.h
+++ b/src/kvirc/ui/kvi_htmldialog.h
@@ -49,7 +49,7 @@ public:
 	{

 		if (!m_pDoc) m_pDoc=new QTextDocument();

 		QUrl url;

-		url.setFileName(key);

+		url.setPath(key);

 		m_pDoc->addResource(2,url,pix);

 	}

 

@@ -93,8 +93,8 @@ public:
 	~KviTextBrowser(){};

 	virtual QVariant loadResource ( int type, const QUrl & name ) 

 	{

-		QString p=m_pHt->htmlResource.value(name.fileName());

-		debug("resource %s type %d and page %s",name.fileName().toUtf8().data(),type,p.toUtf8().data());

+		QString p=m_pHt->htmlResource.value(name.path());

+		debug("resource %s type %d and page %s",name.path().toUtf8().data(),type,p.toUtf8().data());

 		if (!p.isEmpty()) return QVariant(p);

 		else return QVariant();

 		

diff --git a/src/kvirc/ui/kvi_input.cpp b/src/kvirc/ui/kvi_input.cpp
index 3ec6b716d..f3e848961 100644
--- a/src/kvirc/ui/kvi_input.cpp
+++ b/src/kvirc/ui/kvi_input.cpp
@@ -2329,15 +2329,12 @@ KviInput::KviInput(KviWindow *par,KviUserListView * view)
 	m_pIconButton->setAutoRaise(true);
 	m_pHistoryButton->setAutoRaise(true);
 	m_pHideToolsButton->setAutoRaise(true);
-pLayout->addWidget(m_pHideToolsButton,0);	
-pLayout->addWidget(m_pButtonContainer,0);
+	
+	pLayout->addWidget(m_pHideToolsButton,0);	
+	pLayout->addWidget(m_pButtonContainer,0);
 	pLayout->addWidget(m_pInputEditor,10000);
 
 	
-/*	pLayout->setStretchFactor(m_pInputEditor,100000);
-	pLayout->setStretchFactor(
-	pLayout->setStretchFactor(
-	*/
 }
 
 KviInput::~KviInput()
diff --git a/src/kvirc/ui/kvi_taskbar.cpp b/src/kvirc/ui/kvi_taskbar.cpp
index 2aba8b250..7894238f8 100644
--- a/src/kvirc/ui/kvi_taskbar.cpp
+++ b/src/kvirc/ui/kvi_taskbar.cpp
@@ -56,9 +56,11 @@
 #include <QCursor>
 #include <QPaintEvent>
 #include <QEvent>
+#include <QTreeWidget>
 
-// FIXME: Qt4 #include <QHeaderView>
-#include <q3header.h>
+// FIXME: Qt4 
+#include <QHeaderView>
+//#include <q3header.h>
 
 
 #ifdef COMPILE_PSEUDO_TRANSPARENCY
@@ -183,12 +185,13 @@ KviTaskBarItem::~KviTaskBarItem()
 
 
 KviTaskBarButton::KviTaskBarButton(QWidget * par,KviWindow * wnd,const char * name)
-: QPushButton(par,name) , KviTaskBarItem(wnd)
+: QPushButton(par) , KviTaskBarItem(wnd)
 {
+	setObjectName(name);
 	m_bActive         = false;
 	m_pTip            = new KviDynamicToolTip(this);
 	connect(m_pTip,SIGNAL(tipRequest(KviDynamicToolTip *,const QPoint &)),this,SLOT(tipRequest(KviDynamicToolTip *,const QPoint &)));
-	setToggleButton (true);
+	setCheckable (true);
 	setFlat ( KVI_OPTION_BOOL(KviOption_boolUseFlatClassicTaskbarButtons) );
 }
 
@@ -211,7 +214,7 @@ void KviTaskBarButton::mousePressEvent(QMouseEvent *e)
 {
 	if(e->button() & Qt::LeftButton)
 	{
-		if(e->state() & Qt::ShiftButton)
+		if(e->modifiers() & Qt::ShiftModifier)
 		{
 			m_pWindow->delayedClose();
 		} else {
@@ -241,7 +244,7 @@ void KviTaskBarButton::setActive(bool bActive)
 		}
 		m_bActive      = false;
 	}
-	setOn(bActive);
+	setChecked(bActive);
 	update();
 }
 
@@ -250,7 +253,7 @@ void KviTaskBarButton::paintEvent(QPaintEvent * e)
 	QPainter p(this);
 	QStyleOption opt;
 	opt.initFrom(this);
-	if(isOn())
+	if(isChecked())
 		opt.state = QStyle::State_On | QStyle::State_Active;
 	style()->drawPrimitive(QStyle::PE_PanelButtonTool,&opt,&p,this);
 	drawButtonLabel(&p);
@@ -268,7 +271,7 @@ void KviTaskBarButton::drawButtonLabel(QPainter * painter)
 	if(KVI_OPTION_BOOL(KviOption_boolUseTaskBarIrcContextIndicator))
 	{
 		iHeight -= KVI_TASKBARBUTTON_CONTEXTINDICATORHEIGHT;
-		QColor base = colorGroup().background();
+		QColor base = palette().background().color();
 		if(m_pWindow->console())
 		{
 			QColor cntx = KVI_OPTION_ICCOLOR(m_pWindow->console()->ircContextId() % KVI_NUM_ICCOLOR_OPTIONS);
@@ -276,7 +279,7 @@ void KviTaskBarButton::drawButtonLabel(QPainter * painter)
 				(base.blue() + cntx.blue()) >> 1);
 			pPainter->fillRect(2,iHeight,iWidth - 4,KVI_TASKBARBUTTON_CONTEXTINDICATORHEIGHT - 2,base);
 		} else {
-			pPainter->fillRect(2,iHeight,iWidth - 4,KVI_TASKBARBUTTON_CONTEXTINDICATORHEIGHT - 2,colorGroup().brush(QColorGroup::Background));
+			pPainter->fillRect(2,iHeight,iWidth - 4,KVI_TASKBARBUTTON_CONTEXTINDICATORHEIGHT - 2,palette().brush(QPalette::Background));
 		}
 	}
 
@@ -363,25 +366,25 @@ void KviTaskBarButton::drawButtonLabel(QPainter * painter)
 		QString tmp = QChar('(');
 		tmp += szText;
 		tmp += QChar(')');
-		pPainter->drawText(cRect,Qt::AlignLeft | Qt::AlignTop,tmp,-1,&bRect);
+		pPainter->drawText(cRect,Qt::AlignLeft | Qt::AlignTop,tmp,&bRect);
 	} else {
-		pPainter->drawText(cRect,Qt::AlignLeft | Qt::AlignTop,szText,-1,&bRect);
+		pPainter->drawText(cRect,Qt::AlignLeft | Qt::AlignTop,szText,&bRect);
 	}
 
 	if(bRect.width() > cRect.width())
 	{
 		pPainter->setClipRect(cRect.right(),cRect.y(),10,cRect.height());
 		QColor base = pPainter->pen().color();
-		QColor bg   = colorGroup().color(QColorGroup::Background);
+		QColor bg   = palette().color(QPalette::Background);
 		base.setRgb((base.red() + bg.red()) / 2,(base.green() + bg.green()) / 2,(base.blue() + bg.blue()) / 2);
 		pPainter->setPen(base);
 		cRect.setWidth(cRect.width() + 10);
-		pPainter->drawText(cRect,Qt::AlignLeft | Qt::AlignTop,szText,-1);
+		pPainter->drawText(cRect,Qt::AlignLeft | Qt::AlignTop,szText);
 		pPainter->setClipRect(cRect.right(),cRect.y(),5,cRect.height());
 		base.setRgb((base.red() + bg.red()) / 2,(base.green() + bg.green()) / 2,(base.blue() + bg.blue()) / 2);
 		pPainter->setPen(base);
 		cRect.setWidth(cRect.width() + 10);
-		pPainter->drawText(cRect,Qt::AlignLeft | Qt::AlignTop,szText,-1);
+		pPainter->drawText(cRect,Qt::AlignLeft | Qt::AlignTop,szText);
 	}
 }
 
@@ -730,25 +733,75 @@ bool KviClassicTaskBar::setIterationPointer(KviTaskBarItem * it)
 //
 
 
-KviTreeTaskBarItem::KviTreeTaskBarItem(KviTalListView * par,KviWindow * wnd)
-: KviTalListViewItem(par) , KviTaskBarItem(wnd)
+KviTreeTaskBarItem::KviTreeTaskBarItem(KviTalTreeWidget * par,KviWindow * wnd)
+: KviTalTreeWidgetItem(par) , KviTaskBarItem(wnd)
 {
 	m_iStepNumber=0;
 	m_bIncreasing=0;
 	m_pInternal=new KviTreeTaskBarItemInternal(this);
-	m_pAnimTimer=new QTimer();
-	QObject::connect( m_pAnimTimer, SIGNAL(timeout()), m_pInternal, SLOT(timerShot()));
+		QString szText;
+	switch(wnd->type())
+	{
+		case KVI_WINDOW_TYPE_CONSOLE:
+		{
+			KviTaskBarBase::getTextForConsole(szText,(KviConsole *)m_pWindow);
+		}
+		break;
+		case KVI_WINDOW_TYPE_CHANNEL:
+		case KVI_WINDOW_TYPE_DEADCHANNEL:
+			szText = ((KviChannel *)m_pWindow)->nameWithUserFlag();
+		break;
+		case KVI_WINDOW_TYPE_QUERY:
+		case KVI_WINDOW_TYPE_DEADQUERY:
+			szText = m_pWindow->windowName();
+		break;
+		default:
+			szText = m_pWindow->plainTextCaption();
+		break;
+	}
+	debug("Text %s",szText.toUtf8().data());
+
+	setText(0,szText);
+//	m_pAnimTimer=new QTimer();
+//	QObject::connect( m_pAnimTimer, SIGNAL(timeout()), m_pInternal, SLOT(timerShot()));
+
 	applyOptions();
 }
 
 KviTreeTaskBarItem::KviTreeTaskBarItem(KviTreeTaskBarItem * par,KviWindow * wnd)
-: KviTalListViewItem(par) , KviTaskBarItem(wnd)
+: KviTalTreeWidgetItem(par) , KviTaskBarItem(wnd)
 {
 	m_iStepNumber=0;
 	m_bIncreasing=0;
 	m_pInternal=new KviTreeTaskBarItemInternal(this);
-	m_pAnimTimer=new QTimer();
-	QObject::connect( m_pAnimTimer, SIGNAL(timeout()), m_pInternal, SLOT(timerShot()));
+//	m_pAnimTimer=new QTimer();
+//	QObject::connect( m_pAnimTimer, SIGNAL(timeout()), m_pInternal, SLOT(timerShot()));
+	QString szText;
+	switch(wnd->type())
+	{
+		case KVI_WINDOW_TYPE_CONSOLE:
+		{
+			KviTaskBarBase::getTextForConsole(szText,(KviConsole *)m_pWindow);
+		}
+		break;
+		case KVI_WINDOW_TYPE_CHANNEL:
+		case KVI_WINDOW_TYPE_DEADCHANNEL:
+			szText = ((KviChannel *)m_pWindow)->nameWithUserFlag();
+		break;
+		case KVI_WINDOW_TYPE_QUERY:
+		case KVI_WINDOW_TYPE_DEADQUERY:
+			szText = m_pWindow->windowName();
+		break;
+		default:
+			szText = m_pWindow->plainTextCaption();
+		break;
+	}
+	debug("Text %s",szText.toUtf8().data());
+
+	setText(0,szText);
+
+
+
 	applyOptions();
 }
 
@@ -760,9 +813,9 @@ int KviTreeTaskBarItem::calculateColor(int col1,int col2)
 
 KviTreeTaskBarItem::~KviTreeTaskBarItem()
 {
-	KviTalListView* pView=(KviTalListView *)listView();
+	KviTalTreeWidget* pView=(KviTalTreeWidget *)treeWidget();
 	if(pView)
-		if(((KviTreeTaskBarListView*)(pView))->m_pPrevItem==this) ((KviTreeTaskBarListView*)(listView()))->m_pPrevItem=0;
+		if(((KviTreeTaskBarTreeWidget*)(pView))->m_pPrevItem==this) ((KviTreeTaskBarTreeWidget*)(treeWidget()))->m_pPrevItem=0;
 	delete m_pAnimTimer;
 	delete m_pInternal;
 }
@@ -777,7 +830,7 @@ void KviTreeTaskBarItem::applyOptions()
 void KviTreeTaskBarItem::captionChanged()
 {
 	// FIXME: can we do better ?
-	repaint();
+	((KviTreeTaskBarTreeWidget*)treeWidget())->updateItem(this);
 }
 
 void KviTreeTaskBarItem::unhighlight()
@@ -785,7 +838,7 @@ void KviTreeTaskBarItem::unhighlight()
 	if(m_iHighlightLevel < 1)return;
 	m_iHighlightLevel = 0;
 	if(g_pFrame->dockExtension())g_pFrame->dockExtension()->refresh();
-	repaint();
+	((KviTreeTaskBarTreeWidget*)treeWidget())->updateItem(this);
 }
 
 void KviTreeTaskBarItem::highlight(int iLevel)
@@ -795,14 +848,14 @@ void KviTreeTaskBarItem::highlight(int iLevel)
 	m_iHighlightLevel = iLevel;
 	if(g_pFrame->dockExtension())g_pFrame->dockExtension()->refresh();
 	if(isSelected())return;
-	repaint(); // repaint(false) ?
+	((KviTreeTaskBarTreeWidget*)treeWidget())->updateItem(this);
 }
 
 void KviTreeTaskBarItem::setProgress(int progress)
 {
 	if(progress == m_iProgress)return;
 	m_iProgress = progress;
-	repaint(); // repaint(false) ?
+	((KviTreeTaskBarTreeWidget*)treeWidget())->updateItem(this);
 }
 
 void KviTreeTaskBarItem::setActive(bool bActive)
@@ -812,7 +865,7 @@ void KviTreeTaskBarItem::setActive(bool bActive)
 //		m_bHighlighted = false;
 //		m_bAltColor    = false;
 		m_iHighlightLevel = 0;
-		// was not selected: the listView will repaint it
+		// was not selected: the TreeWidget will repaint it
 	} else {
 		if(isSelected())
 		{
@@ -824,11 +877,11 @@ void KviTreeTaskBarItem::setActive(bool bActive)
 		}
 	}
 }
-
+/*
 void KviTreeTaskBarItem::paintBranches(QPainter *p,const QColorGroup &,int w,int y,int h)
 {
 	SET_ANTI_ALIASING(*p);
-	((KviTreeTaskBarListView *)listView())->paintEmptyArea(p,QRect(0,y,w,totalHeight() - height()));
+	//((KviTreeTaskBarTreeWidget *)TreeWidget())->paintEmptyArea(p,QRect(0,y,w,totalHeight() - height()));
 }
 
 void KviTreeTaskBarItem::paintCell(QPainter *painter,const QColorGroup &cg,int column,int width,int)
@@ -847,7 +900,7 @@ void KviTreeTaskBarItem::paintCell(QPainter *painter,const QColorGroup &cg,int c
 #ifdef COMPILE_PSEUDO_TRANSPARENCY
 			if(g_pShadedChildGlobalDesktopBackground)
 			{
-				QPoint pnt = listView()->viewport()->mapToGlobal(QPoint(int(painter->worldMatrix().dx()),int(painter->worldMatrix().dy())));
+				QPoint pnt = treeWidget()->viewport()->mapToGlobal(QPoint(int(painter->worldMatrix().dx()),int(painter->worldMatrix().dy())));
 				p.drawTiledPixmap(0,0,width,height(),*g_pShadedChildGlobalDesktopBackground,pnt.x(),pnt.y());
 			} else {
 #endif
@@ -858,11 +911,11 @@ void KviTreeTaskBarItem::paintCell(QPainter *painter,const QColorGroup &cg,int c
 			QPixmap * pix = KVI_OPTION_PIXMAP(KviOption_pixmapTreeTaskBarBackground).pixmap();
 			if(pix)
 			{
-				QPoint pnt = listView()->viewportToContents(QPoint(int(painter->worldMatrix().dx()),int(painter->worldMatrix().dy())));
+				QPoint pnt = treeWidget()->viewportToContents(QPoint(int(painter->worldMatrix().dx()),int(painter->worldMatrix().dy())));
 				//p.drawTiledPixmap(0,0,width,height(),*pix,pnt.x(),pnt.y());
 //				debug("%i %i",pnt.x(),pnt.y());
 				p.translate(-pnt.x(),-pnt.y());
-				KviPixmapUtils::drawPixmapWithPainter(&p,pix,KVI_OPTION_UINT(KviOption_uintTreeTaskBarPixmapAlign),QRect(pnt.x(),pnt.y(),width,height()),listView()->width(),listView()->height());
+				KviPixmapUtils::drawPixmapWithPainter(&p,pix,KVI_OPTION_UINT(KviOption_uintTreeTaskBarPixmapAlign),QRect(pnt.x(),pnt.y(),width,height()),TreeWidget()->width(),treeWidget()->height());
 				p.translate(pnt.x(),pnt.y());
 			}
 		} else {
@@ -877,7 +930,7 @@ void KviTreeTaskBarItem::paintCell(QPainter *painter,const QColorGroup &cg,int c
 	}
 
 	int h = height();
-	int im = listView()->itemMargin();
+	int im = treeWidget()->itemMargin();
 	int yPixmap = (h - 16) >> 1;
 
 	QString szText;
@@ -998,7 +1051,7 @@ void KviTreeTaskBarItem::paintCell(QPainter *painter,const QColorGroup &cg,int c
 	painter->drawPixmap(0,0,*pMemBuffer,0,0,width,height());
 	//bitBlt(painter->pixmap(),0,0,pMemBuffer,0,0,width,height(),Qt::CopyROP,false);
 }
-
+*/
 QString KviTreeTaskBarItem::key(int,bool) const
 {
 	QString ret = m_pWindow->typeString();
@@ -1021,7 +1074,7 @@ void KviTreeTaskBarItem::timerShot()
 		m_pAnimTimer->stop();
 		m_iStepNumber=0; //make shure, that we cannot get out of range
 	}
-	repaint();
+	((KviTreeTaskBarTreeWidget*)treeWidget())->updateItem(this);
 }
 
 void KviTreeTaskBarItem::mouseEnter()
@@ -1044,30 +1097,30 @@ void KviTreeTaskBarItem::mouseLeave()
 
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// KviTreeTaskBarListView
+// KviTreeTaskBarTreeWidget
 //
 
 
-KviTreeTaskBarListView::KviTreeTaskBarListView(QWidget * par)
-: KviTalListView(par)
+KviTreeTaskBarTreeWidget::KviTreeTaskBarTreeWidget(QWidget * par)
+: KviTalTreeWidget(par)
 {
 	//setSorting(0);
-	setShowSortIndicator(true);
-	setItemMargin(2);
+	setSortingEnabled(true);
+	//setItemMargin(2);
 	setFrameShape(NoFrame);
 	viewport()->setMouseTracking(TRUE);
 	m_pPrevItem=0;
-	setHScrollBarMode(KviTalListView::AlwaysOff);
+	//setHScrollBarMode(KviTalTreeWidget::AlwaysOff);
 }
 
-KviTreeTaskBarListView::~KviTreeTaskBarListView()
+KviTreeTaskBarTreeWidget::~KviTreeTaskBarTreeWidget()
 {
 }
 
-void KviTreeTaskBarListView::contentsMouseMoveEvent ( QMouseEvent * e ) 
+void KviTreeTaskBarTreeWidget::contentsMouseMoveEvent ( QMouseEvent * e ) 
 {
 	if(!e) return;
-	KviTreeTaskBarItem* pCur=(KviTreeTaskBarItem*)(itemAt(contentsToViewport(e->pos())));
+	KviTreeTaskBarItem* pCur=(KviTreeTaskBarItem*)(itemAt(e->pos()));
 	if(pCur!=m_pPrevItem)
 	{
 		if(m_pPrevItem)m_pPrevItem->mouseLeave();
@@ -1078,7 +1131,7 @@ void KviTreeTaskBarListView::contentsMouseMoveEvent ( QMouseEvent * e )
 		setCursor(Qt::ArrowCursor);
 	}
 }
-void KviTreeTaskBarListView::leaveEvent(QEvent *)
+void KviTreeTaskBarTreeWidget::leaveEvent(QEvent *)
 {
 	if(m_pPrevItem) m_pPrevItem->mouseLeave();
 	m_pPrevItem=0;
@@ -1086,9 +1139,9 @@ void KviTreeTaskBarListView::leaveEvent(QEvent *)
 }
 
 
-void KviTreeTaskBarListView::contentsMousePressEvent(QMouseEvent *e)
+void KviTreeTaskBarTreeWidget::contentsMousePressEvent(QMouseEvent *e)
 {
-	KviTalListViewItem * it = (KviTalListViewItem *)itemAt(contentsToViewport(e->pos()));
+	KviTalTreeWidgetItem * it = (KviTalTreeWidgetItem *)itemAt(e->pos());
 	if(it)
 	{
 		if(e->button() & Qt::LeftButton)emit leftMousePress(it);
@@ -1104,29 +1157,29 @@ void KviTreeTaskBarListView::contentsMousePressEvent(QMouseEvent *e)
 	}
 }
 
-void KviTreeTaskBarListView::sort()
+void KviTreeTaskBarTreeWidget::sort()
 {
-	setSorting(0,TRUE);
+	//setSorting(0,TRUE);
 }
 
-void KviTreeTaskBarListView::reverseSort()
+void KviTreeTaskBarTreeWidget::reverseSort()
 {
-	setSorting(0,FALSE);
+	//setSorting(0,FALSE);
 }
 
-void KviTreeTaskBarListView::resizeEvent(QResizeEvent *e)
+void KviTreeTaskBarTreeWidget::resizeEvent(QResizeEvent *e)
 {
-	KviTalListView::resizeEvent(e);
+	KviTalTreeWidget::resizeEvent(e);
 	setColumnWidth(0,viewport()->width());
-	resizeContents(viewport()->width(),contentsHeight());
+	//resizeContents(viewport()->width(),contentsHeight());
 }
 
-//void KviTreeTaskBarListView::paintEmptyAreaInternal(QPainter * p,const QRect &viewportRect,const QRect &painterRect)
+//void KviTreeTaskBarTreeWidget::paintEmptyAreaInternal(QPainter * p,const QRect &viewportRect,const QRect &painterRect)
 //{
 //
 //}
-
-void KviTreeTaskBarListView::paintEmptyArea(QPainter * p,const QRect &rct)
+/*
+void KviTreeTaskBarTreeWidget::paintEmptyArea(QPainter * p,const QRect &rct)
 {
 	SET_ANTI_ALIASING(*p);
 #ifdef COMPILE_PSEUDO_TRANSPARENCY
@@ -1149,7 +1202,7 @@ void KviTreeTaskBarListView::paintEmptyArea(QPainter * p,const QRect &rct)
 		KviPixmapUtils::drawPixmapWithPainter(p,pix,KVI_OPTION_UINT(KviOption_uintTreeTaskBarPixmapAlign),rct,viewport()->width(),viewport()->height(),pnt.x(),pnt.y());
 	}
 }
-
+*/
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // KviTreeTaskBar
 //
@@ -1157,42 +1210,57 @@ void KviTreeTaskBarListView::paintEmptyArea(QPainter * p,const QRect &rct)
 KviTreeTaskBar::KviTreeTaskBar()
 : KviTaskBarBase()
 {
-	m_pListView = new KviTreeTaskBarListView(this);
-	m_pListView->addColumn(__tr2qs("Window List"),135);
-	m_pListView->setAllColumnsShowFocus(true);
-	m_pListView->setMultiSelection(false);
-	setWidget(m_pListView);
+	m_pTreeWidget = new KviTreeTaskBarTreeWidget(this);
+	m_pTreeWidget->setHeaderLabel(__tr2qs("Window List"));
+	m_pTreeWidget->setColumnWidth(0,135);
+//	m_pTreeWidget->addColumn(__tr2qs("Window List"),135);
+	m_pTreeWidget->setAllColumnsShowFocus(true);
+//	m_pTreeWidget->setMultiSelection(false);
+	setWidget(m_pTreeWidget);
 
 	// FIXME: this code is useless ?
 	if(KVI_OPTION_UINT(KviOption_uintTreeTaskBarMinimumWidth) < 48)
 		KVI_OPTION_UINT(KviOption_uintTreeTaskBarMinimumWidth) = 48;
-	int iMin = m_pListView->minimumSize().width() + 4;
+	int iMin = m_pTreeWidget->minimumSize().width() + 4;
 	if(((unsigned int)iMin) < KVI_OPTION_UINT(KviOption_uintTreeTaskBarMinimumWidth))
 		iMin = KVI_OPTION_UINT(KviOption_uintTreeTaskBarMinimumWidth);
 	setMinimumWidth(iMin);
 
 	// this is surely useful :)
-	m_pListView->setMinimumWidth(4);
+	m_pTreeWidget->setMinimumWidth(4);
 
 	//setMaximumWidth(KVI_OPTION_UINT(KviOption_uintTreeTaskBarMaximumWidth));
-	//m_pListView->setMinimumWidth(KVI_OPTION_UINT(KviOption_uintTreeTaskBarMinimumWidth));
-	//m_pListView->setMaximumWidth(KVI_OPTION_UINT(KviOption_uintTreeTaskBarMaximumWidth));
-	m_pListView->setFocusPolicy(Qt::NoFocus);
-	m_pListView->setStaticBackground(true);
-	m_pListView->viewport()->setAutoFillBackground(false);
+	//m_pTreeWidget->setMinimumWidth(KVI_OPTION_UINT(KviOption_uintTreeTaskBarMinimumWidth));
+	//m_pTreeWidget->setMaximumWidth(KVI_OPTION_UINT(KviOption_uintTreeTaskBarMaximumWidth));
+	m_pTreeWidget->setFocusPolicy(Qt::NoFocus);
+//	m_pTreeWidget->setStaticBackground(true);
+	//m_pTreeWidget->viewport()->setAutoFillBackground(false);
+	//m_pTreeWidget->setAutoFillBackground(false);
+
+QPalette p( m_pTreeWidget->palette() );

+

+p.setBrush( QPalette::Base, Qt::NoBrush );

+

+m_pTreeWidget->setPalette( p ); 
+ p= m_pTreeWidget->viewport()->palette() ;

+

+p.setBrush( QPalette::Base, Qt::NoBrush );

+

+m_pTreeWidget->viewport()->setPalette( p ); 
+
 
 	if(!KVI_OPTION_BOOL(KviOption_boolShowTreeTaskbarHeader))
 	{
-		m_pListView->header()->hide();
+		m_pTreeWidget->header()->hide();
 	}
 	
-	m_pListView->header()->setResizeEnabled(true);
+//	m_pTreeWidget->header()->setResizeEnabled(true);
 
 	setMaximumWidth(600);
 
-	m_pListView->viewport()->installEventFilter(this);
+	m_pTreeWidget->viewport()->installEventFilter(this);
 
-	m_pToolTip = new KviDynamicToolTip(m_pListView->viewport(),"tree_taskbar_tooltip");
+	m_pToolTip = new KviDynamicToolTip(m_pTreeWidget->viewport(),"tree_taskbar_tooltip");
 	connect(m_pToolTip,SIGNAL(tipRequest(KviDynamicToolTip *,const QPoint &)),this,SLOT(tipRequest(KviDynamicToolTip *,const QPoint &)));
 }
 
@@ -1203,7 +1271,7 @@ KviTreeTaskBar::~KviTreeTaskBar()
 void KviTreeTaskBar::updatePseudoTransparency()
 {
 #ifdef COMPILE_PSEUDO_TRANSPARENCY
-	m_pListView->viewport()->update();
+	m_pTreeWidget->viewport()->update();
 #endif
 }
 
@@ -1216,33 +1284,35 @@ void KviTreeTaskBar::moveEvent(QMoveEvent *)
 
 void KviTreeTaskBar::tipRequest(KviDynamicToolTip *,const QPoint &pnt)
 {
+	/*
 	if(KVI_OPTION_BOOL(KviOption_boolShowTaskBarToolTips))
 	{
-		KviTalListViewItem * it = (KviTalListViewItem *)m_pListView->itemAt(pnt);
+		KviTalTreeWidgetItem * it = (KviTalTreeWidgetItem *)m_pTreeWidget->itemAt(pnt);
 		if(it)
 		{
 			QString szText;
 			((KviTreeTaskBarItem *)it)->m_pWindow->getTaskBarTipText(szText);
-			m_pToolTip->tip(m_pListView->itemRect(it),szText);
+			m_pToolTip->tip(m_pTreeWidget->itemRect(it),szText);
 		}
 	}
+	*/
 }
 
 bool KviTreeTaskBar::eventFilter(QObject * o,QEvent *e)
 {
-	if(o == m_pListView->viewport())
+	if(o == m_pTreeWidget->viewport())
 	{
 		if(e->type() == QEvent::MouseButtonPress)
 		{
 			QMouseEvent * ev = (QMouseEvent *)e;
-			KviTreeTaskBarItem * it = (KviTreeTaskBarItem *)m_pListView->itemAt(ev->pos());
+			KviTreeTaskBarItem * it = (KviTreeTaskBarItem *)m_pTreeWidget->itemAt(ev->pos());
 			if(!it)return false;
 			KviWindow * wnd = it->kviWindow();
 			if(wnd)
 			{
 				if(ev->button() & Qt::LeftButton)
 				{
-					if(ev->state() & Qt::ShiftButton)
+					if(ev->modifiers() & Qt::ShiftModifier)
 					{
 						wnd->delayedClose();
 					} else {
@@ -1267,13 +1337,13 @@ KviTaskBarItem * KviTreeTaskBar::addItem(KviWindow * wnd)
 	{
 		if(wnd->type() != KVI_WINDOW_TYPE_CONSOLE)
 		{
-			((KviTreeTaskBarItem *)(wnd->console()->m_pTaskBarItem))->setOpen(true);
+			((KviTreeTaskBarItem *)(wnd->console()->m_pTaskBarItem))->setExpanded(true);
 			return new KviTreeTaskBarItem(((KviTreeTaskBarItem *)(wnd->console()->m_pTaskBarItem)),wnd);
 		}
 	}
 
 	// console , or a window that has no irc context
-	return new KviTreeTaskBarItem(m_pListView,wnd);
+	return new KviTreeTaskBarItem(m_pTreeWidget,wnd);
 }
 
 bool KviTreeTaskBar::removeItem(KviTaskBarItem * it)
@@ -1286,17 +1356,17 @@ void KviTreeTaskBar::setActiveItem(KviTaskBarItem * it)
 {
 	if(it)
 	{
-		KviTreeTaskBarItem * cur = (KviTreeTaskBarItem *)m_pListView->currentItem();
+		KviTreeTaskBarItem * cur = (KviTreeTaskBarItem *)m_pTreeWidget->currentItem();
 		if(cur && (cur != (KviTreeTaskBarItem *)it))
 		{
 			cur->setActive(false);
 		}
 		if(((KviTreeTaskBarItem *)it)->parent())
 		{
-			if(!((KviTreeTaskBarItem *)it)->parent()->isOpen())((KviTreeTaskBarItem *)it)->parent()->setOpen(true);
+			if(!((KviTreeTaskBarItem *)it)->parent()->isExpanded())((KviTreeTaskBarItem *)it)->parent()->setExpanded(true);
 		}
 		((KviTreeTaskBarItem *)it)->setActive(true);
-		m_pListView->setSelected(((KviTreeTaskBarItem *)it),true); // this MUST go after it->setActive()
+		((KviTreeTaskBarItem *)it)->setSelected(true); // this MUST go after it->setActive()
 		if(g_pFrame->dockExtension())g_pFrame->dockExtension()->refresh();
 	}
 }
@@ -1305,18 +1375,20 @@ void KviTreeTaskBar::updateActivityMeter()
 {
 	if(KVI_OPTION_BOOL(KviOption_boolUseTaskBarActivityMeter))
 	{
-		m_pListView->viewport()->update();
+		m_pTreeWidget->viewport()->update();
 	}
 }
 
 KviTaskBarItem * KviTreeTaskBar::firstItem()
 {
-	m_pCurrentItem = (KviTreeTaskBarItem *)m_pListView->firstChild();
+	m_pCurrentItem = (KviTreeTaskBarItem *)m_pTreeWidget->topLevelItem(0);
 	return m_pCurrentItem;
 }
 
 KviTaskBarItem * KviTreeTaskBar::nextItem()
 {
+	return 0;
+	/*
 	if(!m_pCurrentItem)return 0;
 
 	if(m_pCurrentItem->firstChild())
@@ -1338,10 +1410,13 @@ KviTaskBarItem * KviTreeTaskBar::nextItem()
 		}
 	}
 	return m_pCurrentItem;
+	*/
 }
 
 KviTaskBarItem * KviTreeTaskBar::prevItem()
 {	
+	return 0;
+	/*
 	KviTreeTaskBarItem * it;
 
 	if(!m_pCurrentItem)return 0;
@@ -1363,7 +1438,7 @@ KviTaskBarItem * KviTreeTaskBar::prevItem()
 
 	} else {
 		// a toplevel one
-		it = (KviTreeTaskBarItem *)m_pListView->firstChild();
+		it = (KviTreeTaskBarItem *)m_pTreeWidget->firstChild();
 		while(it)
 		{
 			if(((KviTreeTaskBarItem *)it->nextSibling()) == m_pCurrentItem)break;
@@ -1381,12 +1456,15 @@ KviTaskBarItem * KviTreeTaskBar::prevItem()
 
 	m_pCurrentItem = it;
 	return it;
+	*/
 }
 
 KviTaskBarItem * KviTreeTaskBar::lastItem()
 {
 	// first find last toplevel item
-	m_pCurrentItem = (KviTreeTaskBarItem *)m_pListView->firstChild();
+	return 0;
+	/*
+	m_pCurrentItem = (KviTreeTaskBarItem *)m_pTreeWidget->firstChild();
 	for(;;)
 	{
 		if(m_pCurrentItem->nextSibling())
@@ -1398,25 +1476,26 @@ KviTaskBarItem * KviTreeTaskBar::lastItem()
 		} else return m_pCurrentItem;
 	}
 	return 0;
+	*/
 }
 
 bool KviTreeTaskBar::setIterationPointer(KviTaskBarItem * it)
 {
 	m_pCurrentItem = (KviTreeTaskBarItem *)it;
 	if(!it)return true;
-	if(((KviTalListView *)m_pListView) == ((KviTreeTaskBarItem *)it)->listView())return true;
+	if(((KviTalTreeWidget *)m_pTreeWidget) == ((KviTreeTaskBarItem *)it)->treeWidget())return true;
 	m_pCurrentItem = 0;
 	return false;
 }
 
 void KviTreeTaskBar::applyOptions()
 {
-	m_pListView->update();
+	m_pTreeWidget->update();
 	if(!KVI_OPTION_BOOL(KviOption_boolShowTreeTaskbarHeader))
 	{
-		m_pListView->header()->hide();
+		m_pTreeWidget->header()->hide();
 	} else {
-		m_pListView->header()->show();
+		m_pTreeWidget->header()->show();
 	}
 }
 
diff --git a/src/kvirc/ui/kvi_taskbar.h b/src/kvirc/ui/kvi_taskbar.h
index 80321fabf..8536ce425 100644
--- a/src/kvirc/ui/kvi_taskbar.h
+++ b/src/kvirc/ui/kvi_taskbar.h
@@ -27,7 +27,7 @@
 #include "kvi_settings.h"
 #include "kvi_pointerlist.h"
 #include "kvi_tal_tooltip.h"
-#include "kvi_tal_listview.h"
+#include "kvi_tal_treewidget.h"
 
 #include <QPushButton>
 #include <QFrame>
@@ -180,13 +180,13 @@ protected slots:
 class KviTreeTaskBar;
 class KviTreeTaskBarItemInternal;
 
-class KVIRC_API KviTreeTaskBarItem : public KviTalListViewItem , public KviTaskBarItem
+class KVIRC_API KviTreeTaskBarItem : public KviTalTreeWidgetItem , public KviTaskBarItem
 {
 	friend class KviTreeTaskBar;
-	friend class KviTreeTaskBarListView;
+	friend class KviTreeTaskBarTreeWidget;
 	friend class KviTreeTaskBarItemInternal;
 public:
-	KviTreeTaskBarItem(KviTalListView * par,KviWindow * wnd);
+	KviTreeTaskBarItem(KviTalTreeWidget * par,KviWindow * wnd);
 	KviTreeTaskBarItem(KviTreeTaskBarItem * par,KviWindow * wnd);
 	~KviTreeTaskBarItem();
 protected:
@@ -199,8 +199,8 @@ protected:
 	int m_iBlueDiff;
 public:
 	virtual QString key(int column,bool) const;
-	virtual void paintCell(QPainter *p,const QColorGroup &cg,int column,int width,int alignment);
-	virtual void paintBranches(QPainter *p,const QColorGroup &cg,int w,int y,int h);
+//	virtual void paintCell(QPainter *p,const QColorGroup &cg,int column,int width,int alignment);
+//	virtual void paintBranches(QPainter *p,const QColorGroup &cg,int w,int y,int h);
 	virtual void captionChanged();
 	virtual void highlight(int iLevel = 1);
 	virtual void unhighlight();
@@ -227,23 +227,27 @@ public slots:
 	void timerShot() { m_pItem->timerShot();};	
 };
 
-class KVIRC_API KviTreeTaskBarListView : public KviTalListView
+class KVIRC_API KviTreeTaskBarTreeWidget : public KviTalTreeWidget
 {
 	friend class KviTreeTaskBarItem;
 	Q_OBJECT
 	KviTreeTaskBarItem* m_pPrevItem;
 public:
-	KviTreeTaskBarListView(QWidget * par);
-	~KviTreeTaskBarListView();
+	KviTreeTaskBarTreeWidget(QWidget * par);
+	~KviTreeTaskBarTreeWidget();
+	void updateItem(KviTreeTaskBarItem *item)
+	{
+		update(indexFromItem(item,0));
+	};
 protected:
 	virtual void contentsMousePressEvent(QMouseEvent *e);
-	virtual void paintEmptyArea(QPainter * p,const QRect &rct);
+//	virtual void paintEmptyArea(QPainter * p,const QRect &rct);
 	virtual void resizeEvent(QResizeEvent *e);
 	virtual void contentsMouseMoveEvent ( QMouseEvent * e );
 	virtual void leaveEvent(QEvent *);
 signals:
-	void leftMousePress(KviTalListViewItem * it);
-	void rightMousePress(KviTalListViewItem * it);
+	void leftMousePress(KviTalTreeWidgetItem * it);
+	void rightMousePress(KviTalTreeWidgetItem * it);
 public slots:
 	void sort();
 	void reverseSort();
@@ -257,7 +261,7 @@ public:
 	KviTreeTaskBar();
 	~KviTreeTaskBar();
 private:
-	KviTreeTaskBarListView * m_pListView;
+	KviTreeTaskBarTreeWidget * m_pTreeWidget;
 	KviTreeTaskBarItem * m_pCurrentItem;
 	KviDynamicToolTip  * m_pToolTip;
 public:
diff --git a/src/kvirc/ui/kvi_topicw.cpp b/src/kvirc/ui/kvi_topicw.cpp
index 3b8de4d3b..99531d1ea 100644
--- a/src/kvirc/ui/kvi_topicw.cpp
+++ b/src/kvirc/ui/kvi_topicw.cpp
@@ -75,13 +75,14 @@ int KviListBoxTopicItem::width ( const KviTalListBox * lb ) const
 
 void KviListBoxTopicItem::paint ( QPainter * p )
 {
-	KviTopicWidget::paintColoredText(p,text(),listBox()->colorGroup(),height(listBox()));
+	KviTopicWidget::paintColoredText(p,text(),listBox()->palette(),height(listBox()));
 }
 
 
 KviTopicWidget::KviTopicWidget(QWidget * par,const char * name)
-: QFrame(par,name)
+: QFrame(par)
 {
+	setObjectName(name);
 	setFrameStyle(QFrame::Sunken | QFrame::StyledPanel);
 	setFont(KVI_OPTION_FONT(KviOption_fontLabel));
 	m_pHistory = 0;
@@ -312,9 +313,9 @@ void KviTopicWidget::paintColoredText(QPainter *p, QString text,const QPalette&
 	
 			if(curFore == KVI_LABEL_DEF_FORE)
 			{
-				p->setPen(cg.text());
+				p->setPen(cg.text().color());
 			} else {
-				if(curFore > 16)p->setPen(cg.background());
+				if(curFore > 16)p->setPen(cg.background().color());
 				else p->setPen(KVI_OPTION_MIRCCOLOR(curFore));
 			}
 		
@@ -330,9 +331,9 @@ void KviTopicWidget::paintColoredText(QPainter *p, QString text,const QPalette&
 				}
 			}
 
-			p->drawText(curX,baseline,szText,0,len);
+			p->drawText(curX,baseline,szText.left(len));
 	
-			if(curBold)p->drawText(curX+1,baseline,szText,0,len);
+			if(curBold)p->drawText(curX+1,baseline,szText.left(len));
 			if(curUnderline)
 			{
 				p->drawLine(curX,baseline + 1,curX+wdth,baseline + 1);
@@ -403,7 +404,144 @@ void KviTopicWidget::paintColoredText(QPainter *p, QString text,const QPalette&
 		}
 	}
 }
+void KviTopicWidget::paintColoredText(QPainter *p, QString text,const QPalette& cg,const QRect & rect)
+{
+	QFontMetrics fm(p->font());
+	
+	int height=rect.height();
+	int width=rect.width();
+	
+	bool curBold      = false;
+	bool curUnderline = false;
+	unsigned char curFore      = KVI_LABEL_DEF_FORE; //default fore
+	unsigned char curBack      = KVI_LABEL_DEF_BACK; //default back
+	int baseline = ((height + fm.ascent() - fm.descent() + 1) >> 1);
+
+	int curX = rect.x() + 2; //2 is the margin
+
+	unsigned int idx = 0;
+
+	while((idx < text.length()) && (curX < width))
+	{
+		unsigned short c = text[(int)idx].unicode();
+
+		unsigned int start = idx;
+
+		while((idx < text.length()) &&
+				(c != KVI_TEXT_COLOR) &&
+				(c != KVI_TEXT_BOLD) &&
+				(c != KVI_TEXT_UNDERLINE) &&
+				(c != KVI_TEXT_REVERSE) &&
+				(c != KVI_TEXT_RESET) &&
+				(c != KVI_TEXT_ICON)
+			)
+		{
+			idx++;
+			c = text[(int)idx].unicode();
+		}
+
+		int len = idx - start;
+		int wdth;
+
+		if(len > 0)
+		{
+			QString szText = text.mid(start,len);
+
+			wdth = fm.width(szText);
+	
+			if(curFore == KVI_LABEL_DEF_FORE)
+			{
+				p->setPen(cg.text().color());
+			} else {
+				if(curFore > 16)p->setPen(cg.background().color());
+				else p->setPen(KVI_OPTION_MIRCCOLOR(curFore));
+			}
+		
+			if(curBack != KVI_LABEL_DEF_BACK)
+			{
+				if(curBack > 16)
+				{
+					p->fillRect(curX,rect.y() + 2,wdth,height - 4,
+						cg.text());
+				} else {
+					p->fillRect(curX,rect.y() + 2,wdth,height - 4,
+						KVI_OPTION_MIRCCOLOR(curBack));
+				}
+			}
 
+			p->drawText(curX,baseline,szText.left(len));
+	
+			if(curBold)p->drawText(curX+1,baseline,szText.left(len));
+			if(curUnderline)
+			{
+				p->drawLine(curX,baseline + 1,curX+wdth,baseline + 1);
+			}
+		} else {
+			wdth = 0;
+		}
+
+
+		curX += wdth;
+
+		switch(c)
+		{
+			case KVI_TEXT_BOLD: curBold = !curBold; ++idx; break;
+			case KVI_TEXT_UNDERLINE: curUnderline = !curUnderline; ++idx; break;
+			case KVI_TEXT_REVERSE:
+				{
+					char auxBack = curBack;
+					curBack = curFore;
+					curFore = auxBack;
+				}
+				++idx;
+			break;
+			case KVI_TEXT_RESET:
+				curFore = KVI_LABEL_DEF_FORE;
+				curBack = KVI_LABEL_DEF_BACK;
+				curBold = false;
+				curUnderline = false;
+				++idx;
+			break;
+			case KVI_TEXT_COLOR:
+			{
+				++idx;
+				unsigned char fore;
+				unsigned char back;
+				idx = getUnicodeColorBytes(text,idx,&fore,&back);
+				if(fore != KVI_NOCHANGE)
+				{
+					curFore = fore;
+					if(back != KVI_NOCHANGE)curBack = back;
+				} else {
+					// only a CTRL+K
+					curBack = KVI_LABEL_DEF_BACK;
+					curFore = KVI_LABEL_DEF_FORE;
+				}
+			}
+			break;
+			case KVI_TEXT_ICON:
+			{
+				++idx;
+
+				unsigned int icoStart = idx;
+				while((idx < text.length()) && (text[(int)idx].unicode() > 32))idx++;
+
+				KviStr lookupString = text.mid(icoStart,idx - icoStart);
+
+				KviTextIcon * icon = g_pTextIconManager->lookupTextIcon(lookupString.ptr());
+				if(icon)
+				{
+					QPixmap * pigzmap = icon->pixmap();
+					p->drawPixmap(curX,(baseline + 2) - pigzmap->height(),*(pigzmap));
+					curX += pigzmap->width();
+				} else {
+					idx = icoStart;
+				}
+			}
+			break;
+		}
+	}
+}
 void KviTopicWidget::paintEvent(QPaintEvent * e)
 {
 	QPainter pa(this);
@@ -429,10 +567,10 @@ void KviTopicWidget::drawContents(QPainter *p)
 #ifdef COMPILE_PSEUDO_TRANSPARENCY
 	}
 #endif
-	QColorGroup colorGroup;
+	QPalette colorGroup;
 	//colorGroup()
-	colorGroup.setColor(QColorGroup::Text,KVI_OPTION_COLOR(KviOption_colorLabelForeground));
-	colorGroup.setColor(QColorGroup::Background,KVI_OPTION_COLOR(KviOption_colorLabelBackground));
+	colorGroup.setColor(QPalette::Text,KVI_OPTION_COLOR(KviOption_colorLabelForeground));
+	colorGroup.setColor(QPalette::Background,KVI_OPTION_COLOR(KviOption_colorLabelBackground));
 	paintColoredText(p,m_szTopic,colorGroup);
 }
 
@@ -452,7 +590,7 @@ void KviTopicWidget::setTopic(const QString & topic)
 	{
 		if(g_pRecentTopicList->count() >= KVI_RECENT_TOPIC_ENTRIES)
 		{
-			g_pRecentTopicList->remove(g_pRecentTopicList->begin());
+			g_pRecentTopicList->erase(g_pRecentTopicList->begin());
 		}
 		g_pRecentTopicList->append(m_szTopic);
 	}
@@ -573,14 +711,14 @@ void KviTopicWidget::mouseDoubleClickEvent(QMouseEvent *)
 		m_pInput->installEventFilter(this);
 
 		m_pHistory = new QPushButton(this);
-		m_pHistory->setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TIME)));
+		m_pHistory->setIcon(QIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TIME))));
 		m_pHistory->setGeometry(width() - (height() << 2)+height(),0,height(),height());
 		KviTalToolTip::add(m_pHistory,__tr2qs("History"));
 		m_pHistory->show();
 		connect(m_pHistory,SIGNAL(clicked()),this,SLOT(historyClicked()));
 		
 		m_pAccept = new QPushButton(this);
-		m_pAccept->setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ACCEPT)));
+		m_pAccept->setIcon(QIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ACCEPT))));
 		m_pAccept->setGeometry(width() - (height() << 1),0,height(),height());
 		m_pAccept->setEnabled(bCanEdit);
 		m_pAccept->show();
@@ -588,7 +726,7 @@ void KviTopicWidget::mouseDoubleClickEvent(QMouseEvent *)
 		connect(m_pAccept,SIGNAL(clicked()),this,SLOT(acceptClicked()));
 		
 		m_pDiscard = new QPushButton(this);
-		m_pDiscard->setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DISCARD)));
+		m_pDiscard->setIcon(QIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DISCARD))));
 		m_pDiscard->setGeometry(width() - height(),0,height(),height());
 		KviTalToolTip::add(m_pDiscard,__tr2qs("Discard Changes"));
 		m_pDiscard->show();
@@ -642,7 +780,7 @@ bool KviTopicWidget::eventFilter(QObject *object,QEvent *e)
 		case QEvent::MouseButtonRelease:
 			if ( m_pCompletionBox->rect().contains( ((QMouseEvent*)e)->pos() ) ) {
 				QMouseEvent tmp( QEvent::MouseButtonDblClick,
-						((QMouseEvent*)e)->pos(), ((QMouseEvent*)e)->button(), ((QMouseEvent*)e)->state() ) ;
+						((QMouseEvent*)e)->pos(), ((QMouseEvent*)e)->button(), ((QMouseEvent*)e)->modifiers() ) ;
 				// will hide popup
 				QApplication::sendEvent( object, &tmp );
 				return TRUE;
@@ -655,7 +793,7 @@ bool KviTopicWidget::eventFilter(QObject *object,QEvent *e)
 			switch( ((QKeyEvent *)e)->key() ) {
 			case Qt::Key_Up:
 			case Qt::Key_Down:
-				if ( !(((QKeyEvent *)e)->state() & Qt::AltButton) )
+				if ( !(((QKeyEvent *)e)->modifiers() & Qt::AltModifier) )
 				break;
 			case Qt::Key_F4:
 			case Qt::Key_Escape:
diff --git a/src/kvirc/ui/kvi_topicw.h b/src/kvirc/ui/kvi_topicw.h
index 0f1d02ed9..e5c6aead3 100644
--- a/src/kvirc/ui/kvi_topicw.h
+++ b/src/kvirc/ui/kvi_topicw.h
@@ -103,6 +103,7 @@ public:
 	void applyOptions();
 	
 	static void paintColoredText(QPainter *p, QString text,const QPalette& cg, int h=-1, int w=-1);
+	static void paintColoredText(QPainter *p, QString text,const QPalette& cg, const QRect &rect);
 protected slots:
 	void acceptClicked();
 	void discardClicked();
diff --git a/src/modules/ident/libkviident.cpp b/src/modules/ident/libkviident.cpp
index 6734e292a..7fff2cb42 100644
--- a/src/modules/ident/libkviident.cpp
+++ b/src/modules/ident/libkviident.cpp
@@ -450,7 +450,7 @@ ipv6_failure:
 					// Ok...parse the request
 					KviStr szReq = r->m_szData.left(idx);
 					r->m_szData.cutLeft(idx + 1);
-					szReq.stripWhiteSpace();
+					szReq.trimmed();
 	
 					if(szReq.hasData())
 					{
diff --git a/src/modules/list/listwindow.cpp b/src/modules/list/listwindow.cpp
index 4bf68f1c9..ea6db1bb5 100644
--- a/src/modules/list/listwindow.cpp
+++ b/src/modules/list/listwindow.cpp
@@ -46,6 +46,7 @@
 #include "kvi_msgbox.h"
 #include "kvi_fileextensions.h"
 #include "kvi_tal_hbox.h"
+#include "kvi_tal_tooltip.h"
 
 #include <QTimer>
 #include <QPainter>
@@ -60,7 +61,7 @@ extern KviPointerList<KviListWindow> * g_pListWindowList;
 //extern KVIRC_API const char * getColorBytes(const char *data_ptr,unsigned char *byte_1,unsigned char *byte_2);
 
 
-KviChannelListViewItemData::KviChannelListViewItemData(const QString &szChan,const QString &szUsers,const QString &szTopic)
+KviChannelTreeWidgetItemData::KviChannelTreeWidgetItemData(const QString &szChan,const QString &szUsers,const QString &szTopic)
 {
 	m_szChan = szChan;
 	m_szUsers = szUsers;
@@ -70,24 +71,24 @@ KviChannelListViewItemData::KviChannelListViewItemData(const QString &szChan,con
 	while(m_szUsersKey.length() < 6)m_szUsersKey.prepend("0");
 }
 
-KviChannelListViewItemData::~KviChannelListViewItemData()
+KviChannelTreeWidgetItemData::~KviChannelTreeWidgetItemData()
 {
 }
 
 
-KviChannelListViewItem::KviChannelListViewItem(KviTalListView * v,KviChannelListViewItemData * pData)
-: KviTalListViewItem(v)
+KviChannelTreeWidgetItem::KviChannelTreeWidgetItem(KviTalTreeWidget * v,KviChannelTreeWidgetItemData * pData)
+: KviTalTreeWidgetItem(v)
 {
 	m_pData = pData;
 }
 
 
-KviChannelListViewItem::~KviChannelListViewItem()
+KviChannelTreeWidgetItem::~KviChannelTreeWidgetItem()
 {
 	delete m_pData;
 }
 
-int KviChannelListViewItem::width ( const QFontMetrics & fm, const KviTalListView * lv, int column ) const
+int KviChannelTreeWidgetItem::width ( const QFontMetrics & fm, const KviTalTreeWidget * lv, int column ) const
 {
 	debug("width request");
 	QString szText;
@@ -105,43 +106,48 @@ int KviChannelListViewItem::width ( const QFontMetrics & fm, const KviTalListVie
 #define KVI_LABEL_DEF_BACK 100
 #define KVI_LABEL_DEF_FORE 101
 
-void KviChannelListViewItem::paintCell(QPainter * p,const QColorGroup &cg,int column,int width,int align)
+void KviChannelTreeWidgetItemDelegate::paint( QPainter * p, const QStyleOptionViewItem & option, const QModelIndex & index ) const

 {
 	QString szText;
-
-	switch(column)
+	QPalette cg;
+	KviChannelTreeWidgetItem *item=static_cast<KviChannelTreeWidgetItem *>(index.internalPointer());
+	switch(index.column())
 	{
-		case 0:  szText = m_pData->m_szChan;   break;
-		case 1:  szText = m_pData->m_szUsers;  break;
-		default: szText = m_pData->m_szTopic;  break;
+		case 0:  szText = item->channelData()->m_szChan;   break;
+		case 1:  szText = item->channelData()->m_szUsers;  break;
+		default: szText = item->channelData()->m_szTopic;  break;
 	}
 
-	KviTalListView* lv = (KviTalListView *)listView();
-	int marg = lv->itemMargin();
+	KviTalTreeWidget* lv = (KviTalTreeWidget *)item->treeWidget();
+	// FIXME
+	int marg = 5;//lv->itemMargin();
 	int r = marg;
 
-	p->fillRect( 0, 0, width, height(), cg.brush(lv->viewport()->backgroundRole()) );
+	p->fillRect( option.rect.x(), option.rect.y(), option.rect.width(), option.rect.height(), cg.brush(lv->viewport()->backgroundRole()) );
+	int width=option.rect.width();
 
-	if ( isSelected() &&
-		(column == 0 || lv->allColumnsShowFocus()) ) {
-		p->fillRect( r - marg, 0, width - r + marg, height(),
-		cg.brush( QColorGroup::Highlight ) );
+	if ((option.state & QStyle::State_Selected) && (index.column() == 0 || lv->allColumnsShowFocus()) ) {
+		p->fillRect( r - marg, 0, width - r + marg, option.rect.height(),
+		cg.brush( QPalette::Highlight ) );
 		
-		if ( isEnabled() || !lv )
-			p->setPen( cg.highlightedText() );
-		else if ( !isEnabled() && lv)
-			p->setPen( lv->palette().disabled().highlightedText() );
+		if ( (option.state & QStyle::State_Enabled) || !lv )
+			p->setPen( cg.highlightedText().color() );
+		else if ( !(option.state & QStyle::State_Enabled) && lv)
+			// FIXME
+			// p->setPen( lv->palette().currentColorGroup().inactive().highlightedText() );
+			p->setPen( lv->palette().highlightedText().color() );
 	} else {
-		if ( isEnabled() || !lv )
-			p->setPen( cg.text() );
-		else if ( !isEnabled() && lv)
-			p->setPen( lv->palette().disabled().text() );
+		if ( (option.state & QStyle::State_Enabled) || !lv )
+			p->setPen( cg.text().color() );
+		else if ( !(option.state & QStyle::State_Enabled) && lv)
+			//p->setPen( lv->palette().disabled().text() );
+			p->setPen(lv->palette().text().color());
 	}
 	
-	KviTopicWidget::paintColoredText(p,szText,cg,height(),width);
+	KviTopicWidget::paintColoredText(p,szText,cg,option.rect);
 }
 
-QString KviChannelListViewItem::key(int col,bool) const
+QString KviChannelTreeWidgetItem::key(int col,bool) const
 {
 	switch(col)
 	{
@@ -167,53 +173,62 @@ KviListWindow::KviListWindow(KviFrame * lpFrm,KviConsole * lpConsole)
 
 	m_pFlushTimer = 0;
 
-	m_pItemList = new KviPointerList<KviChannelListViewItemData>;
+	m_pItemList = new KviPointerList<KviChannelTreeWidgetItemData>;
 	m_pItemList->setAutoDelete(false);
 
-	m_pSplitter = new QSplitter(Qt::Horizontal,this,"splitter");
-	m_pTopSplitter = new QSplitter(Qt::Horizontal,this,"top_splitter");
-	m_pVertSplitter = new QSplitter(Qt::Vertical,m_pSplitter,"vsplitter");
+	m_pSplitter = new QSplitter(Qt::Horizontal,this);
+	m_pSplitter->setObjectName("splitter");
+	m_pTopSplitter = new QSplitter(Qt::Horizontal,this);
+	m_pTopSplitter->setObjectName("top_splitter");
+	m_pVertSplitter = new QSplitter(Qt::Vertical,m_pSplitter);
+	m_pVertSplitter->setObjectName("vsplitter");
 
 	KviTalHBox * box = new KviTalHBox(m_pTopSplitter);
+	box->setSpacing(1);
+	box->setMargin(0);
 	m_pOpenButton = new KviStyledToolButton(box);
-	m_pOpenButton->setPixmap(*(g_pIconManager->getBigIcon(KVI_BIGICON_OPEN)));
+	m_pOpenButton->setIcon(QIcon(*(g_pIconManager->getBigIcon(KVI_BIGICON_OPEN))));
 	connect(m_pOpenButton,SIGNAL(clicked()),this,SLOT(importList()));	
 
 	m_pSaveButton = new KviStyledToolButton(box);
-	m_pSaveButton->setPixmap(*(g_pIconManager->getBigIcon(KVI_BIGICON_SAVE)));
+	m_pSaveButton->setIcon(QIcon(*(g_pIconManager->getBigIcon(KVI_BIGICON_SAVE))));
 	connect(m_pSaveButton,SIGNAL(clicked()),this,SLOT(exportList()));	
 
 	m_pRequestButton = new KviStyledToolButton(box,"request_button");
-	m_pRequestButton->setUsesBigPixmap(false);
-	m_pRequestButton->setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_LIST)));
+	m_pRequestButton->setIconSize(QSize(16,16));
+	m_pRequestButton->setIcon(QIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_LIST))));
 	connect(m_pRequestButton,SIGNAL(clicked()),this,SLOT(requestList()));	
-	QToolTip::add(m_pRequestButton,__tr2qs("Request List"));
+	KviTalToolTip::add(m_pRequestButton,__tr2qs("Request List"));
 	
 	m_pStopListDownloadButton = new KviStyledToolButton(box,"stoplistdownload_button");
-	m_pStopListDownloadButton->setUsesBigPixmap(false);
-	m_pStopListDownloadButton->setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_NICKNAMEPROBLEM)));
+	m_pStopListDownloadButton->setIconSize(QSize(16,16));
+	m_pStopListDownloadButton->setIcon(QIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_NICKNAMEPROBLEM))));
 	connect(m_pStopListDownloadButton,SIGNAL(clicked()),this,SLOT(stoplistdownload()));
-	QToolTip::add(m_pStopListDownloadButton,__tr2qs("Stop list download"));
+	KviTalToolTip::add(m_pStopListDownloadButton,__tr2qs("Stop list download"));
 
 	m_pParamsEdit = new QLineEdit(box);
 	box->setStretchFactor(m_pParamsEdit,1);
-	QToolTip::add(m_pParamsEdit,__tr2qs("<center><b>/LIST command parameters:</b><br>Many servers accept special parameters that " \
+	KviTalToolTip::add(m_pParamsEdit,__tr2qs("<center><b>/LIST command parameters:</b><br>Many servers accept special parameters that " \
 						"allow you to filter the returned entries.<br>" \
 						"Commonly, masked channel names (*kvirc*) are accepted as parameters, as well as strings " \
 						"like <b>c&lt;n</b> or <b>c&gt;n</b> where <b>n</b> is the minimum or maximum of users on the channel.</center>"));
 
 	m_pInfoLabel = new KviThemedLabel(m_pTopSplitter,"info_label");
 
-	m_pListView  = new KviTalListView(m_pVertSplitter);
-	m_pListView->addColumn(__tr2qs("Channel"));
-	m_pListView->addColumn(__tr2qs("Users"));
-	m_pListView->addColumn(__tr2qs("Topic"));
-	m_pListView->setAllColumnsShowFocus(TRUE);
-	m_pListView->setColumnWidthMode(2,KviTalListView::Maximum);
-	m_pListView->setColumnWidthMode(3,KviTalListView::Maximum);
-	m_pListView->setSorting(100);
-	
-	connect(m_pListView,SIGNAL(doubleClicked(KviTalListViewItem *)),this,SLOT(itemDoubleClicked(KviTalListViewItem *)));
+	m_pTreeWidget  = new KviTalTreeWidget(m_pVertSplitter);
+	m_pTreeWidget->setItemDelegate(new KviChannelTreeWidgetItemDelegate(m_pTreeWidget));
+	QStringList columnLabels;
+	columnLabels.append(__tr2qs("Channel"));
+	columnLabels.append(__tr2qs("Users"));
+	columnLabels.append(__tr2qs("Topic"));
+	m_pTreeWidget->setColumnCount(3);
+	m_pTreeWidget->setHeaderLabels(columnLabels);
+	m_pTreeWidget->setAllColumnsShowFocus(TRUE);
+	//m_pTreeWidget->setColumnWidthMode(2,KviTalTreeWidget::Maximum);
+	//m_pTreeWidget->setColumnWidthMode(3,KviTalTreeWidget::Maximum);
+	//m_pTreeWidget->setSorting(100);
+	m_pTreeWidget->sortItems(0,Qt::AscendingOrder);
+	connect(m_pTreeWidget,SIGNAL(itemDoubleClicked(KviTalTreeWidgetItem *)),this,SLOT(itemDoubleClicked(KviTalTreeWidgetItem *)));
 
 	m_pIrcView = new KviIrcView(m_pVertSplitter,lpFrm,this);
 
@@ -306,15 +321,15 @@ void KviListWindow::fillCaptionBuffers()
 	KviQString::sprintf(m_szHtmlActiveCaption,
 		__tr2qs("<nobr><font color=\"%s\"><b>Channel List</b></font> " \
 			"<font color=\"%s\">[IRC Context %u]</font></nobr>"),
-		KVI_OPTION_COLOR(KviOption_colorCaptionTextActive).name().ascii(),
-		KVI_OPTION_COLOR(KviOption_colorCaptionTextActive2).name().ascii(),
+		KVI_OPTION_COLOR(KviOption_colorCaptionTextActive).name().toAscii(),
+		KVI_OPTION_COLOR(KviOption_colorCaptionTextActive2).name().toAscii(),
 		m_pConsole->ircContextId());
 
 	KviQString::sprintf(m_szHtmlInactiveCaption,
 		__tr2qs("<nobr><font color=\"%s\"><b>Channel list</b></font> " \
 			"<font color=\"%s\">[IRC Context %u]</font></nobr>"),
-		KVI_OPTION_COLOR(KviOption_colorCaptionTextInactive).name().ascii(),
-		KVI_OPTION_COLOR(KviOption_colorCaptionTextInactive2).name().ascii(),
+		KVI_OPTION_COLOR(KviOption_colorCaptionTextInactive).name().toAscii(),
+		KVI_OPTION_COLOR(KviOption_colorCaptionTextInactive2).name().toAscii(),
 		m_pConsole->ircContextId());
 }
 
@@ -325,7 +340,7 @@ void KviListWindow::die()
 
 void KviListWindow::exportList()
 {
-	if(!m_pListView->firstChild())
+	if(!m_pTreeWidget->topLevelItemCount())
 	{
 		KviMessageBox::warning(__tr2qs("You cannot export an empty list"));
 		return;
@@ -344,21 +359,24 @@ void KviListWindow::exportList()
 		__tr2qs("Configuration files (*.kvc)"),false,
 		false,true,this))
 	{
-		if(QFileInfo(szFile).extension()!="kvc")
+		if(QFileInfo(szFile).completeSuffix()!="kvc")
 			szFile.append(".kvc");
 		KviConfig cfg(szFile,KviConfig::Write);
 		cfg.clear();
-		KviTalListViewItemIterator it(m_pListView);
-
-		while(it.current())
+		//KviTalTreeWidgetItemIterator it(m_pTreeWidget);
+		
+		//while(it.current())
+		KviChannelTreeWidgetItem *it;
+		for (int i=0;i<m_pTreeWidget->topLevelItemCount();i++)
 		{
-			KviChannelListViewItemData* pData= ((KviChannelListViewItem*) ( it.current() ))->m_pData;
+			it=(KviChannelTreeWidgetItem *)m_pTreeWidget->topLevelItem(i);
+			KviChannelTreeWidgetItemData* pData= it->m_pData;
 			cfg.setGroup(pData->m_szChan);
 			// Write properties
 			cfg.writeEntry("topic",pData->m_szTopic);
 			cfg.writeEntry("users",pData->m_szUsers);
 //			cfg.writeEntry("usersKey",pData->m_szUsersKey);
-			++it;
+		//	++it;
 		}
 	}
 }
@@ -384,7 +402,7 @@ void KviListWindow::importList()
 		{
 			cfg.setGroup(it.currentKey());
 			m_pItemList->append( 
-					new KviChannelListViewItemData(
+					new KviChannelTreeWidgetItemData(
 						it.currentKey(),
 						cfg.readQStringEntry("users","0"),
 						cfg.readQStringEntry("topic","")
@@ -429,7 +447,7 @@ void KviListWindow::startOfList()
 	m_pItemList->clear();
 	m_pItemList->setAutoDelete(false);
 
-	m_pListView->clear();
+	m_pTreeWidget->clear();
 
 	m_pRequestButton->setEnabled(false);
 }
@@ -447,7 +465,7 @@ void KviListWindow::processData(KviIrcMessage *msg)
 	QString sz2 = msg->connection()->decodeText(msg->safeParam(2));
 
 	m_pItemList->append(
-		new KviChannelListViewItemData(
+		new KviChannelTreeWidgetItemData(
 			msg->connection()->decodeText(msg->safeParam(1)),
 			msg->connection()->decodeText(msg->safeParam(2)),
 			msg->connection()->decodeText(msg->safeTrailing()))
@@ -462,19 +480,19 @@ void KviListWindow::processData(KviIrcMessage *msg)
 
 void KviListWindow::flush()
 {
-	m_pListView->setUpdatesEnabled(true); /* for v_scroolbar */
-	while(KviChannelListViewItemData * d = m_pItemList->first())
+	m_pTreeWidget->setUpdatesEnabled(true); /* for v_scroolbar */
+	while(KviChannelTreeWidgetItemData * d = m_pItemList->first())
 	{
-		(void)new KviChannelListViewItem(m_pListView,d);
+		(void)new KviChannelTreeWidgetItem(m_pTreeWidget,d);
 		m_pItemList->removeFirst();
 	}
-	m_pListView->setUpdatesEnabled(true);
-	m_pListView->viewport()->update();
+	m_pTreeWidget->setUpdatesEnabled(true);
+	m_pTreeWidget->viewport()->update();
 }
 
-void KviListWindow::itemDoubleClicked(KviTalListViewItem *it)
+void KviListWindow::itemDoubleClicked(KviTalTreeWidgetItem *it)
 {
-	QString sz = ((KviChannelListViewItem *)it)->channel();
+	QString sz = ((KviChannelTreeWidgetItem *)it)->channel();
 	if(sz.isEmpty())return;
 	if(!connection())return;
 	KviQCString dat = connection()->encodeText(sz);
diff --git a/src/modules/list/listwindow.h b/src/modules/list/listwindow.h
index bb4266cf0..92092702b 100644
--- a/src/modules/list/listwindow.h
+++ b/src/modules/list/listwindow.h
@@ -31,21 +31,33 @@
 #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>
+#include "kvi_styled_controls.h"
 #include <QLineEdit>
+#include <QItemDelegate>
 
 class KviThemedLabel;
 
-class KviChannelListViewItemData
+
+class KviChannelTreeWidgetItemDelegate : public QItemDelegate
+{
+public:
+	KviChannelTreeWidgetItemDelegate(KviTalTreeWidget * pWidget=0)
+		: QItemDelegate(pWidget) {};
+	~KviChannelTreeWidgetItemDelegate(){};
+	void paint( QPainter * painter, const QStyleOptionViewItem & option, const QModelIndex & index ) const;
+	
+};
+class KviChannelTreeWidgetItemData
 {
-	friend class KviChannelListViewItem;
+	friend class KviChannelTreeWidgetItem;
 	friend class KviListWindow;
+	friend class KviChannelTreeWidgetItemDelegate;
 public:
-	KviChannelListViewItemData(const QString &szChan,const QString &szUsers,const QString &szTopic);
-	~KviChannelListViewItemData();
+	KviChannelTreeWidgetItemData(const QString &szChan,const QString &szUsers,const QString &szTopic);
+	~KviChannelTreeWidgetItemData();
 protected:
 	QString m_szChan;
 	QString m_szUsers;
@@ -53,19 +65,20 @@ protected:
 	QString m_szUsersKey;
 };
 
-class KviChannelListViewItem : public KviTalListViewItem
+class KviChannelTreeWidgetItem : public KviTalTreeWidgetItem
 {
 	friend class KviListWindow;
 public:
-	KviChannelListViewItem(KviTalListView * v,KviChannelListViewItemData * pData);
-	~KviChannelListViewItem();
+	KviChannelTreeWidgetItem(KviTalTreeWidget * v,KviChannelTreeWidgetItemData * pData);
+	~KviChannelTreeWidgetItem();
 protected:
-	KviChannelListViewItemData * m_pData;
+	KviChannelTreeWidgetItemData * m_pData;
 public:
 	const QString & channel(){ return m_pData->m_szChan; };
-	int width ( const QFontMetrics & fm, const KviTalListView * lv, int column ) const;
+	const KviChannelTreeWidgetItemData * channelData(){ return m_pData;}
+	int width ( const QFontMetrics & fm, const KviTalTreeWidget * lv, int column ) const;
 protected:
-	virtual void paintCell(QPainter * p,const QColorGroup &cg,int col,int wdth,int align);
+//	virtual void paintCell(QPainter * p,const QColorGroup &cg,int col,int wdth,int align);
 	virtual QString key(int col,bool) const;
 };
 
@@ -79,15 +92,15 @@ public:
 protected:
 	QSplitter                              * m_pVertSplitter;
 	QSplitter                              * m_pTopSplitter;
-	KviTalListView                         * m_pListView;
+	KviTalTreeWidget                         * m_pTreeWidget;
 	QLineEdit                              * m_pParamsEdit;
-	QToolButton                            * m_pRequestButton;
-	QToolButton							   * m_pStopListDownloadButton;
-	QToolButton							   * m_pOpenButton;
-	QToolButton							   * m_pSaveButton;
+	KviStyledToolButton                            * m_pRequestButton;
+	KviStyledToolButton							   * m_pStopListDownloadButton;
+	KviStyledToolButton							   * m_pOpenButton;
+	KviStyledToolButton							   * m_pSaveButton;
 	KviThemedLabel                         * m_pInfoLabel;
 	QTimer                                 * m_pFlushTimer;
-	KviPointerList<KviChannelListViewItemData> * m_pItemList;
+	KviPointerList<KviChannelTreeWidgetItemData> * m_pItemList;
 public: // Methods
 	virtual void control(int msg);
 	virtual void processData(KviIrcMessage * msg);
@@ -100,7 +113,7 @@ protected:
 	virtual void getBaseLogFileName(KviStr &buffer);
 protected slots:
 	void flush();
-	void itemDoubleClicked(KviTalListViewItem *it);
+	void itemDoubleClicked(KviTalTreeWidgetItem *it);
 	void requestList();
 	void stoplistdownload();
 	void connectionStateChange();
diff --git a/src/modules/logview/logview_QT4_vc05.vcproj b/src/modules/logview/logview_QT4_vc05.vcproj
index fe583a8aa..e4d8b8e73 100644
--- a/src/modules/logview/logview_QT4_vc05.vcproj
+++ b/src/modules/logview/logview_QT4_vc05.vcproj
@@ -42,7 +42,7 @@
 				Name="VCCLCompilerTool"

 				Optimization="0"

 				AdditionalIncludeDirectories="&quot;$(ProjectDir)\..\..\kvirc\module&quot;;&quot;$(ProjectDir)\..\..\kvilib\config&quot;;&quot;$(QTDIR)\include&quot;;&quot;$(ProjectDir)\..\..\kvilib\core&quot;;&quot;$(ProjectDir)\..\..\kvilib\system&quot;;&quot;$(ProjectDir)\..\..\kvirc\uparser&quot;;&quot;$(ProjectDir)\..\..\kvilib\ext&quot;;&quot;$(ProjectDir)\..\..\kvirc\kvs&quot;;&quot;$(ProjectDir)\..\..\kvirc\ui&quot;;&quot;$(ProjectDir)\..\..\kvirc\kernel&quot;;&quot;$(ProjectDir)\..\..\kvilib\tal&quot;;&quot;$(ProjectDir)\..\..\kvilib\irc&quot;;&quot;$(ProjectDir)\..\..\kvilib\file&quot;;&quot;$(ZLIBINCDIR)&quot;;&quot;$(QTDIR)\include\Qt3Support&quot;;&quot;$(QTDIR)\include\QtCore\&quot;;&quot;$(QTDIR)\include\QtGui&quot;;&quot;$(QTDIR)\include\Qt&quot;;&quot;$(QTDIR)\include\QtNetwork&quot;;&quot;$(QTDIR)\include\QtXml&quot;;"

-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LOGVIEW_EXPORTS;_CRT_SECURE_NO_DEPRECATE;QT3_SUPPORT;"

+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LOGVIEW_EXPORTS;_CRT_SECURE_NO_DEPRECATE;"

 				MinimalRebuild="true"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="1"

diff --git a/src/modules/popupeditor/popupeditor.cpp b/src/modules/popupeditor/popupeditor.cpp
index de3666264..90867ff79 100644
--- a/src/modules/popupeditor/popupeditor.cpp
+++ b/src/modules/popupeditor/popupeditor.cpp
@@ -717,46 +717,46 @@ void KviSinglePopupEditor::saveLastSelectedItem()
 
 void KviSinglePopupEditor::addItemToMenu(KviKvsPopupMenu * p,KviPopupListViewItem *it)
 {
-	it->m_szId.stripWhiteSpace();
+	it->m_szId.trimmed();
 	switch(it->m_type)
 	{
 		case KviPopupListViewItem::Prologue:
-			it->m_szCode.stripWhiteSpace();
+			it->m_szCode.trimmed();
 			p->addPrologue(it->m_szId,it->m_szCode);
 		break;
 		case KviPopupListViewItem::Epilogue:
-			it->m_szCode.stripWhiteSpace();
+			it->m_szCode.trimmed();
 			p->addEpilogue(it->m_szId,it->m_szCode);
 		break;
 		case KviPopupListViewItem::Separator:
-			it->m_szCondition.stripWhiteSpace();
+			it->m_szCondition.trimmed();
 			p->addSeparator(it->m_szId,it->m_szCondition);
 		break;
 		case KviPopupListViewItem::Label:
-			it->m_szText.stripWhiteSpace();
-			it->m_szCondition.stripWhiteSpace();
-			it->m_szIcon.stripWhiteSpace();
+			it->m_szText.trimmed();
+			it->m_szCondition.trimmed();
+			it->m_szIcon.trimmed();
 			p->addLabel(it->m_szId,it->m_szText,it->m_szIcon,it->m_szCondition);
 		break;
 		case KviPopupListViewItem::Item:
-			it->m_szText.stripWhiteSpace();
-			it->m_szIcon.stripWhiteSpace();
-			it->m_szCondition.stripWhiteSpace();
-			it->m_szCode.stripWhiteSpace();
+			it->m_szText.trimmed();
+			it->m_szIcon.trimmed();
+			it->m_szCondition.trimmed();
+			it->m_szCode.trimmed();
 			p->addItem(it->m_szId,it->m_szCode,it->m_szText,it->m_szIcon,it->m_szCondition);
 		break;
 		case KviPopupListViewItem::ExtMenu:
-			it->m_szText.stripWhiteSpace();
-			it->m_szIcon.stripWhiteSpace();
-			it->m_szCondition.stripWhiteSpace();
-			it->m_szCode.stripWhiteSpace();// <-- this is the ext name in fact
+			it->m_szText.trimmed();
+			it->m_szIcon.trimmed();
+			it->m_szCondition.trimmed();
+			it->m_szCode.trimmed();// <-- this is the ext name in fact
 			p->addExtPopup(it->m_szId,it->m_szCode,it->m_szText,it->m_szIcon,it->m_szCondition);
 		break;
 		case KviPopupListViewItem::Menu:
 		{
-			it->m_szText.stripWhiteSpace();
-			it->m_szIcon.stripWhiteSpace();
-			it->m_szCondition.stripWhiteSpace();
+			it->m_szText.trimmed();
+			it->m_szIcon.trimmed();
+			it->m_szCondition.trimmed();
 			KviKvsPopupMenu * menu = p->addPopup(it->m_szId,it->m_szText,it->m_szIcon,it->m_szCondition);
 			for(KviPopupListViewItem * item = (KviPopupListViewItem *)it->firstChild();item;item = (KviPopupListViewItem *)item->nextSibling())
 			{
@@ -774,7 +774,7 @@ KviKvsPopupMenu * KviSinglePopupEditor::getMenu()
 	saveLastSelectedItem();
 
 	QString tmp = m_pNameEditor->text();
-	tmp.stripWhiteSpace();
+	tmp.trimmed();
 
 	KviKvsPopupMenu * p = new KviKvsPopupMenu(tmp);
 	for(KviPopupListViewItem * it = (KviPopupListViewItem *)m_pListView->firstChild();it;it = (KviPopupListViewItem *)it->nextSibling())
diff --git a/src/modules/reguser/reguser_QT4_vc05.vcproj b/src/modules/reguser/reguser_QT4_vc05.vcproj
index f202d1a73..931398534 100644
--- a/src/modules/reguser/reguser_QT4_vc05.vcproj
+++ b/src/modules/reguser/reguser_QT4_vc05.vcproj
@@ -42,7 +42,7 @@
 				Name="VCCLCompilerTool"

 				Optimization="0"

 				AdditionalIncludeDirectories="&quot;$(ProjectDir)\..\..\kvirc\module&quot;;&quot;$(ProjectDir)\..\..\kvilib\config&quot;;&quot;$(QTDIR)\include&quot;;&quot;$(ProjectDir)\..\..\kvilib\core&quot;;&quot;$(ProjectDir)\..\..\kvilib\system&quot;;&quot;$(ProjectDir)\..\..\kvirc\uparser&quot;;&quot;$(ProjectDir)\..\..\kvilib\ext&quot;;&quot;$(ProjectDir)\..\..\kvirc\kvs&quot;;&quot;$(ProjectDir)\..\..\kvirc\ui&quot;;&quot;$(ProjectDir)\..\..\kvirc\kernel&quot;;&quot;$(ProjectDir)\..\..\kvilib\tal&quot;;&quot;$(ProjectDir)\..\..\kvilib\irc&quot;;&quot;$(ProjectDir)\..\..\kvilib\file&quot;;&quot;$(QTDIR)\include\Qt3Support&quot;;&quot;$(QTDIR)\include\QtCore\&quot;;&quot;$(QTDIR)\include\QtGui&quot;;&quot;$(QTDIR)\include\Qt&quot;;&quot;$(QTDIR)\include\QtNetwork&quot;;&quot;$(QTDIR)\include\QtXml&quot;;"

-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;REGUSER_EXPORTS;_CRT_SECURE_NO_DEPRECATE;QT3_SUPPORT;"

+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;REGUSER_EXPORTS;_CRT_SECURE_NO_DEPRECATE;"

 				MinimalRebuild="true"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="1"