improved hungarian notation;

added missing tooltips;
removed uselss definition of KviQCString


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

54 files changed, 313 insertions, 338 deletions

diff --git a/doc/hackers.guide.txt b/doc/hackers.guide.txt
index 8634837cc..64722b401 100644
--- a/doc/hackers.guide.txt
+++ b/doc/hackers.guide.txt
@@ -901,13 +901,6 @@ For the moment, in random order:
 
 - Widgets have been abstracted in kvilib/tal.
 
-- Qt 4.x has no QCString anymore. It uses QByteArray instead. From my own
-  point of view this is ugly since the name is misleading and QByteArray
-  is forced to mantain the null terminator which is not needed
-  in normal "byte array" operations...but well, we have to live with it.
-  kvilib has kvi_qcstring.h that defines the KviQCString MACRO.
-  It expands to QByteArray under Qt 4.x.
-
 - Avoid any use of Q3Support features.
 
 - Do not use the "char * c = KviQString::toUtf8(string).data();" construct.
diff --git a/src/kvilib/core/kvi_qcstring.h b/src/kvilib/core/kvi_qcstring.h
deleted file mode 100644
index 36f04dcee..000000000
--- a/src/kvilib/core/kvi_qcstring.h
+++ /dev/null
@@ -1,40 +0,0 @@
-#ifndef _KVI_QCSTRING_H_
-#define _KVI_QCSTRING_H_
-//=============================================================================
-//
-//   File : kvi_qcstring.h
-//   Creation date : Thu Jan 18 2007 00:34:33 CEST by Szymon Stefanek
-//
-//   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2007-2008 Szymon Stefanek (pragma at kvirc dot net)
-//
-//   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_qcstring.h
-* \author Szymon Stefanek
-* \brief KviQCString
-*
-* \def KviQCString Defines KviQCString as QByteArray. See doc/hackers.guide.txt
-*/
-
-#include "kvi_settings.h"
-
-#include <QByteArray>
-#define KviQCString QByteArray
-
-#endif //_KVI_QCSTRING_H_
diff --git a/src/kvilib/core/kvi_qstring.h b/src/kvilib/core/kvi_qstring.h
index a37c99e33..f811813f2 100644
--- a/src/kvilib/core/kvi_qstring.h
+++ b/src/kvilib/core/kvi_qstring.h
@@ -33,9 +33,9 @@
 #include "kvi_settings.h"
 #include "kvi_inttypes.h"
 #include "kvi_stdarg.h"
-#include "kvi_qcstring.h"
 
 #include <QString>
+#include <QByteArray>
 
 /**
 * \namespace KviQString
@@ -306,18 +306,18 @@ namespace KviQString
 	/**
 	* \brief Return a UTF-8 formatted string
 	* \param s The source string
-	* \return KviQCString
+	* \return QByteArray
 	* \warning: DO NOT USE CONSTRUCTS LIKE char * c = KviQString::toUtf8(something).data();
 	* They are dangerous since with many compilers the returned string
 	* gets destroyed at the end of the instruction and the c pointer gets
 	* thus invalidated.
 	* Use
-	* KviQCString tmp = KviQString::toUtf8(something);
+	* QByteArray tmp = KviQString::toUtf8(something);
 	* char * c = tmp.data();
 	* instead. Yes, I know that it sucks, but it's the only way to
 	* transit to Qt 4.x more or less cleanly...
 	*/
-	inline KviQCString toUtf8(const QString & s)
+	inline QByteArray toUtf8(const QString & s)
 	{
 		return s.toUtf8();
 	}
@@ -325,9 +325,9 @@ namespace KviQString
 	/**
 	* \brief Return the local 8-bit representation of the string
 	* \param s The source string
-	* \return KviQCString
+	* \return QByteArray
 	*/
-	inline KviQCString toLocal8Bit(const QString & s)
+	inline QByteArray toLocal8Bit(const QString & s)
 	{
 		return s.toLocal8Bit();
 	}
diff --git a/src/kvilib/core/kvi_string.cpp b/src/kvilib/core/kvi_string.cpp
index cfb3a64c8..a561c891b 100644
--- a/src/kvilib/core/kvi_string.cpp
+++ b/src/kvilib/core/kvi_string.cpp
@@ -747,7 +747,7 @@ int kvi_vsnprintf(char *buffer,int len,const char *fmt,kvi_va_list list)
 			case 'Q': // QString! (this should almost never happen)
 			{
 				QString * s = kvi_va_arg(list,QString *);
-				KviQCString cs = KviQString::toUtf8(*s);
+				QByteArray cs = KviQString::toUtf8(*s);
 				const char * t = cs.data();
 				if(!t)continue; // nothing to do
 				//check for space...
@@ -812,7 +812,7 @@ int kvi_irc_vsnprintf(char *buffer,const char *fmt,kvi_va_list list,bool *bTrunc
 			case 'Q': // QString! (this should almost never happen)
 			{
 				QString * s = kvi_va_arg(list,QString *);
-				KviQCString cs = KviQString::toUtf8(*s);
+				QByteArray cs = KviQString::toUtf8(*s);
 				const char * t = cs.data();
 				if(!t)continue; // nothing to do
 				while(*t)
@@ -1037,7 +1037,7 @@ KviStr::KviStr(const char *str)
 	}
 }
 
-KviStr::KviStr(const KviQCString &str)
+KviStr::KviStr(const QByteArray &str)
 {
 	//Deep copy constructor
 	if(str.data())
@@ -1116,7 +1116,7 @@ KviStr::KviStr(const KviStr &str)
 
 KviStr::KviStr(const QString &str)
 {
-	KviQCString sz = KviQString::toUtf8(str);
+	QByteArray sz = KviQString::toUtf8(str);
 	if(sz.length() > 0)
 	{
 		m_len = sz.length();
@@ -1195,7 +1195,7 @@ KviStr & KviStr::operator=(const KviStr &str)
 	return (*this);
 }
 
-KviStr & KviStr::operator=(const KviQCString &str)
+KviStr & KviStr::operator=(const QByteArray &str)
 {
 	m_len = str.length();
 	m_ptr = (char *)kvi_realloc(m_ptr,m_len+1);
@@ -1491,7 +1491,7 @@ KviStr & KviStr::setStr(const char *str,int len)
 
 KviStr & KviStr::operator=(const QString &str)
 {
-	KviQCString sz = KviQString::toUtf8(str);
+	QByteArray sz = KviQString::toUtf8(str);
 	if(sz.length() > 0){
 		m_len = sz.length();
 		m_ptr = (char *)kvi_realloc(m_ptr,m_len+1);
@@ -1540,7 +1540,7 @@ void KviStr::append(const char *str)
 
 void KviStr::append(const QString &str)
 {
-	KviQCString sz = KviQString::toUtf8(str);
+	QByteArray sz = KviQString::toUtf8(str);
 	if(sz.length() < 1)return;
 	m_ptr = (char *)kvi_realloc(m_ptr,m_len+sz.length()+1);
 	kvi_fastmove((m_ptr+m_len),sz.data(),sz.length()+1);
diff --git a/src/kvilib/core/kvi_string.h b/src/kvilib/core/kvi_string.h
index ec7bb443b..9f61ad288 100644
--- a/src/kvilib/core/kvi_string.h
+++ b/src/kvilib/core/kvi_string.h
@@ -36,9 +36,8 @@
 
 #include <QtGlobal>
 #include <QString>
+#include <QByteArray>
 
-
-#include "kvi_qcstring.h"
 #include "kvi_inttypes.h"
 #include "kvi_heapobject.h"
 #include "kvi_stdarg.h"
@@ -149,7 +148,7 @@ public:
 	// Safe even if the QString is null.
 	KviStr(const QString &str);
 
-	KviStr(const KviQCString &str);
+	KviStr(const QByteArray &str);
 
 	// Fill sonstructor.
 	// Creates a string long fillLen characters filled with character c.<br>
@@ -258,7 +257,7 @@ public:
 	KviStr & operator=(const char *str);         // str can be NULL here
 	KviStr & operator=(char c);                  // 2 bytes allocated ,m_len = 1
 	KviStr & operator=(const QString &str);
-	KviStr & operator=(const KviQCString &str);
+	KviStr & operator=(const QByteArray &str);
 
 	// Append operators
 	KviStr & operator+=(const KviStr &str)      { append(str); return (*this);          };
diff --git a/src/kvilib/ext/kvi_stringconversion.cpp b/src/kvilib/ext/kvi_stringconversion.cpp
index 6adae7a27..5ad211960 100644
--- a/src/kvilib/ext/kvi_stringconversion.cpp
+++ b/src/kvilib/ext/kvi_stringconversion.cpp
@@ -35,7 +35,6 @@ QString g_szLocalDir;
 
 namespace KviStringConversion
 {
-
 	void init(const QString& szGlobalDir,const QString& szLocalDir)
 	{
 		g_szGlobalDir=szGlobalDir;
@@ -147,7 +146,7 @@ namespace KviStringConversion
 
 	bool fromString(const QString & szValue,QRect &buffer)
 	{
-		KviQCString tmp = KviQString::toUtf8(szValue);
+		QByteArray tmp = KviQString::toUtf8(szValue);
 		const char * c = tmp.data();
 		if(!c)return false;
 		int l,t,w,h;
@@ -194,7 +193,7 @@ namespace KviStringConversion
 	{
 		int iId,iLog,iLevel;
 		unsigned int uFore,uBack;
-		KviQCString tmp = KviQString::toUtf8(szValue);
+		QByteArray tmp = KviQString::toUtf8(szValue);
 		char * cx = tmp.data();
 		if(!cx)return false;
 		if(sscanf(cx,"%d,%u,%u,%d,%d",&iId,&uFore,&uBack,&iLog,&iLevel) != 5)return false;
diff --git a/src/kvilib/file/kvi_file.cpp b/src/kvilib/file/kvi_file.cpp
index 9775c1552..6c451c04a 100644
--- a/src/kvilib/file/kvi_file.cpp
+++ b/src/kvilib/file/kvi_file.cpp
@@ -69,7 +69,7 @@ bool KviFile::load(QByteArray &bData)
 
 bool KviFile::save(const QString &szData)
 {
-	KviQCString c = KviQString::toUtf8(szData);
+	QByteArray c = KviQString::toUtf8(szData);
 	if(!save((kvi_u32_t)(c.length())))return false;
 	return (writeBlock(c.data(),c.length()) == ((unsigned int)(c.length())));
 }
@@ -78,7 +78,7 @@ bool KviFile::load(QString &szData)
 {
 	kvi_u32_t iLen;
 	if(!load(iLen))return false;
-	KviQCString tmp;
+	QByteArray tmp;
 	tmp.resize(iLen + 1);
 	if(readBlock((char *)(tmp.data()),iLen) != iLen)return false;
 	*(tmp.data() + iLen) = 0;
diff --git a/src/kvilib/file/kvi_file.h b/src/kvilib/file/kvi_file.h
index 38508cb52..ac24494b5 100644
--- a/src/kvilib/file/kvi_file.h
+++ b/src/kvilib/file/kvi_file.h
@@ -31,9 +31,10 @@
 #include "kvi_string.h"
 #include "kvi_pointerlist.h"
 #include "kvi_inttypes.h"
-#include "kvi_qcstring.h"
 
 #include <QFile>
+#include <QByteArray>
+
 #include <time.h>
 
 #define kvi_file_offset_t qlonglong
diff --git a/src/kvilib/file/kvi_fileutils.cpp b/src/kvilib/file/kvi_fileutils.cpp
index 469b2eed0..1d8a2753a 100644
--- a/src/kvilib/file/kvi_fileutils.cpp
+++ b/src/kvilib/file/kvi_fileutils.cpp
@@ -280,7 +280,7 @@ namespace KviFileUtils
 	{
 		KviFile f(szPath);
 		if(!f.openForWriting(bAppend))return false;
-		KviQCString szTmp = KviQString::toUtf8(szData);
+		QByteArray szTmp = KviQString::toUtf8(szData);
 		if(!szTmp.data())return true;
 		if(f.writeBlock(szTmp.data(),szTmp.length()) != ((unsigned int)(szTmp.length())))return false;
 		return true;
@@ -296,7 +296,7 @@ namespace KviFileUtils
 	{
 		KviFile f(szPath);
 		if(!f.openForWriting(bAppend))return false;
-		KviQCString szTmp = QTextCodec::codecForLocale()->fromUnicode(szData);
+		QByteArray szTmp = QTextCodec::codecForLocale()->fromUnicode(szData);
 		if(!szTmp.data())return true;
 		if(f.writeBlock(szTmp.data(),szTmp.length()) != ((unsigned int)(szTmp.length())))return false;
 		return true;
diff --git a/src/kvilib/file/kvi_packagefile.cpp b/src/kvilib/file/kvi_packagefile.cpp
index 04d3636f2..eb607b23b 100644
--- a/src/kvilib/file/kvi_packagefile.cpp
+++ b/src/kvilib/file/kvi_packagefile.cpp
@@ -299,7 +299,7 @@ bool KviPackageWriter::packFile(KviFile * pFile,DataField * pDataField)
 
 	if(!pFile->save(uFlags))return writeError();
 
-	KviQCString szTargetFileName = KviQString::toUtf8(pDataField->m_szFileTargetName);
+	QByteArray szTargetFileName = KviQString::toUtf8(pDataField->m_szFileTargetName);
 
 	// Path
 	if(!pFile->save(szTargetFileName))return writeError();
diff --git a/src/kvilib/file/kvi_packagefile.h b/src/kvilib/file/kvi_packagefile.h
index c8729e04e..b7a6bba24 100644
--- a/src/kvilib/file/kvi_packagefile.h
+++ b/src/kvilib/file/kvi_packagefile.h
@@ -38,10 +38,10 @@
 #include "kvi_settings.h"
 #include "kvi_qstring.h"
 #include "kvi_pointerhashtable.h"
-#include "kvi_qcstring.h" // QByteArray anyway
 #include "kvi_pointerlist.h"
 
 #include <QObject>
+#include <QByteArray>
 
 class QProgressDialog;
 class QLabel;
diff --git a/src/kvilib/system/kvi_locale.cpp b/src/kvilib/system/kvi_locale.cpp
index e0cd97d50..45457a88a 100644
--- a/src/kvilib/system/kvi_locale.cpp
+++ b/src/kvilib/system/kvi_locale.cpp
@@ -36,9 +36,9 @@
 #include <QTextCodec>
 #include <QDir>
 #include <QLocale>
+#include <QByteArray>
 
 #include "kvi_string.h"
-#include "kvi_qcstring.h"
 #include "kvi_env.h"
 #include "kvi_fileutils.h"
 #include "kvi_file.h"
@@ -258,7 +258,7 @@ static bool g_utf8_validate (const char   *str,
 class KviSmartTextCodec : public QTextCodec
 {
 protected:
-	KviQCString  m_szName;
+	QByteArray  m_szName;
 	QTextCodec * m_pRecvCodec;
 	QTextCodec * m_pSendCodec;
 public:
diff --git a/src/kvirc/kernel/kvi_ircconnection.cpp b/src/kvirc/kernel/kvi_ircconnection.cpp
index 6e87a099c..6913fdf3e 100644
--- a/src/kvirc/kernel/kvi_ircconnection.cpp
+++ b/src/kvirc/kernel/kvi_ircconnection.cpp
@@ -247,7 +247,7 @@ void KviIrcConnection::setupTextCodec()
  * We're asking the connection itself to encode/decode text: use server specific encoding,
  * instead of the "user text" encoding used in channels
  */
-KviQCString KviIrcConnection::encodeText(const QString & szText)
+QByteArray KviIrcConnection::encodeText(const QString & szText)
 {
 	if(!m_pSrvCodec)
 		return szText.toUtf8();
@@ -1100,9 +1100,9 @@ void KviIrcConnection::loginToIrcServer()
 
 	// FIXME: The server's encoding!
 	setupTextCodec();
-	KviQCString szNick = encodeText(m_pUserInfo->nickName()); // never empty
-	KviQCString szUser = encodeText(m_pUserInfo->userName()); // never empty
-	KviQCString szReal = encodeText(m_pUserInfo->realName()); // may be empty
+	QByteArray szNick = encodeText(m_pUserInfo->nickName()); // never empty
+	QByteArray szUser = encodeText(m_pUserInfo->userName()); // never empty
+	QByteArray szReal = encodeText(m_pUserInfo->realName()); // may be empty
 
 	if(!szReal.data())szReal = "";
 
diff --git a/src/kvirc/kernel/kvi_ircconnection.h b/src/kvirc/kernel/kvi_ircconnection.h
index af11fae4f..54f01c07f 100644
--- a/src/kvirc/kernel/kvi_ircconnection.h
+++ b/src/kvirc/kernel/kvi_ircconnection.h
@@ -32,13 +32,13 @@
 
 #include "kvi_settings.h"
 #include "kvi_qstring.h"
-#include "kvi_qcstring.h"
 #include "kvi_pointerlist.h"
 #include "kvi_time.h"
 #include "kvi_ircconnectionuserinfo.h"
 #include "kvi_ircconnectionserverinfo.h"
 
 #include <QObject>
+#include <QByteArray>
 
 class QTimer;
 class QTextCodec;
@@ -646,9 +646,9 @@ public:
 	* You should first attempt to encode the text by using the window codec
 	* (if you belong to a window).
 	* \param szText The text to encode
-	* \return KviQCString
+	* \return QByteArray
 	*/
-	KviQCString encodeText(const QString & szText);
+	QByteArray encodeText(const QString & szText);
 protected:
 	//
 	// Notify list management
diff --git a/src/kvirc/kernel/kvi_irccontext.cpp b/src/kvirc/kernel/kvi_irccontext.cpp
index e0d2bdbf2..40826bbd4 100644
--- a/src/kvirc/kernel/kvi_irccontext.cpp
+++ b/src/kvirc/kernel/kvi_irccontext.cpp
@@ -51,13 +51,13 @@
 #include "kvi_kvs_script.h"
 #include "kvi_netutils.h"
 #include "kvi_ircurl.h"
-#include "kvi_qcstring.h"
 #include "kvi_useridentity.h"
 
 #define __KVI_DEBUG__
 #include "kvi_debug.h"
 
 #include <QTimer>
+#include <QByteArray>
 
 // the irc context identifiers start from 1
 static unsigned int g_uNextIrcContextId = 1;
@@ -855,7 +855,7 @@ void KviIrcContext::terminateConnectionRequest(bool bForce,const QString &szQuit
 					ret.asString(buffer);
 				else
 					buffer = szQuit;
-				KviQCString dat = connection()->encodeText(buffer);
+				QByteArray dat = connection()->encodeText(buffer);
 				bWasSentQuit = false;
 				connection()->stateData()->setSentQuit();
 				connection()->sendFmtData("QUIT :%s",dat.data() ? dat.data() : ""); // here theoretically we COULD get disconnected
diff --git a/src/kvirc/kernel/kvi_notifylist.cpp b/src/kvirc/kernel/kvi_notifylist.cpp
index 10bb196b8..403103c43 100644
--- a/src/kvirc/kernel/kvi_notifylist.cpp
+++ b/src/kvirc/kernel/kvi_notifylist.cpp
@@ -45,9 +45,9 @@
 #include "kvi_qstring.h"
 #include "kvi_lagmeter.h"
 #include "kvi_kvs_eventtriggers.h"
-#include "kvi_qcstring.h"
 
 #include <QStringList>
+#include <QByteArray>
 
 // FIXME: #warning "Finish this doc!"
 
@@ -502,7 +502,7 @@ void KviIsOnNotifyListManager::sendIsOn()
 {
 	if(_OUTPUT_PARANOIC)
 		m_pConsole->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs("Notify list: Checking for: %Q"),&m_szIsOnString);
-	KviQCString szDec = m_pConnection->encodeText(m_szIsOnString);
+	QByteArray szDec = m_pConnection->encodeText(m_szIsOnString);
 	m_pConnection->sendFmtData("ISON %s",szDec.data());
 	if(m_pConnection->lagMeter())
 		m_pConnection->lagMeter()->lagCheckRegister("@notify_ison",40); // not that reliable
@@ -774,7 +774,7 @@ void KviIsOnNotifyListManager::sendUserhost()
 {
 	if(_OUTPUT_PARANOIC)
 		m_pConsole->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs("Notify list: Checking userhost for: %Q"),&m_szUserhostString);
-	KviQCString ccc = m_pConnection->encodeText(m_szUserhostString);
+	QByteArray ccc = m_pConnection->encodeText(m_szUserhostString);
 	m_pConnection->sendFmtData("USERHOST %s",ccc.data());
 	if(m_pConnection->lagMeter())
 		m_pConnection->lagMeter()->lagCheckRegister("@notify_userhost",50);
@@ -971,7 +971,7 @@ void KviStupidNotifyListManager::sendIsOn()
 	}
 	if(_OUTPUT_PARANOIC)
 		m_pConsole->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs("Notify list: Checking for: %Q"),&m_szLastIsOnMsg);
-	KviQCString dat = m_pConnection->encodeText(m_szLastIsOnMsg);
+	QByteArray dat = m_pConnection->encodeText(m_szLastIsOnMsg);
 	m_pConnection->sendFmtData("ISON%s",dat.data());
 
 	if(m_pConnection->lagMeter())
@@ -1135,7 +1135,7 @@ void KviWatchNotifyListManager::start()
 		{
 			if((watchStr.length() + nk.length() + 2) > 501)
 			{
-				KviQCString dat = m_pConnection->encodeText(watchStr);
+				QByteArray dat = m_pConnection->encodeText(watchStr);
 				m_pConnection->sendFmtData("WATCH%s",dat.data());
 				if(_OUTPUT_VERBOSE)
 					m_pConsole->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs("Notify list: Adding watch entries for %Q"),&watchStr);
@@ -1148,7 +1148,7 @@ void KviWatchNotifyListManager::start()
 
 	if(!watchStr.isEmpty())
 	{
-		KviQCString dat = m_pConnection->encodeText(watchStr);
+		QByteArray dat = m_pConnection->encodeText(watchStr);
 		m_pConnection->sendFmtData("WATCH%s",dat.data());
 		if(_OUTPUT_VERBOSE)
 			m_pConsole->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs("Notify list: Adding watch entries for %Q"),&watchStr);
diff --git a/src/kvirc/kernel/kvi_userinput.cpp b/src/kvirc/kernel/kvi_userinput.cpp
index 02c1e3ca1..af27d8c5c 100644
--- a/src/kvirc/kernel/kvi_userinput.cpp
+++ b/src/kvirc/kernel/kvi_userinput.cpp
@@ -129,7 +129,7 @@ namespace KviUserInput
 				case KVI_WINDOW_TYPE_CONSOLE:
 					if(pWindow->connection())
 					{
-						KviQCString data = pWindow->connection()->encodeText(buf);
+						QByteArray data = pWindow->connection()->encodeText(buf);
 
 						if(((KviConsole *)pWindow)->connection()->sendData(data.data()))
 						{
diff --git a/src/kvirc/kvs/kvi_kvs_corecallbackcommands.cpp b/src/kvirc/kvs/kvi_kvs_corecallbackcommands.cpp
index c50351fe5..373d04b1e 100644
--- a/src/kvirc/kvs/kvi_kvs_corecallbackcommands.cpp
+++ b/src/kvirc/kvs/kvi_kvs_corecallbackcommands.cpp
@@ -350,7 +350,7 @@ namespace KviKvsCoreCallbackCommands
 
 		KVSCCC_REQUIRE_CONNECTION
 
-		KviQCString szN = KVSCCC_pConnection->encodeText(szNick);
+		QByteArray szN = KVSCCC_pConnection->encodeText(szNick);
 
 		KviAsyncWhoisInfo * info = new KviAsyncWhoisInfo();
 		info->pCallback = new KviKvsScript(*KVSCCC_pCallback);
diff --git a/src/kvirc/kvs/kvi_kvs_corefunctions_gl.cpp b/src/kvirc/kvs/kvi_kvs_corefunctions_gl.cpp
index 3c5c918f9..d09201f4c 100644
--- a/src/kvirc/kvs/kvi_kvs_corefunctions_gl.cpp
+++ b/src/kvirc/kvs/kvi_kvs_corefunctions_gl.cpp
@@ -154,7 +154,7 @@ namespace KviKvsCoreFunctions
 		KviStr tmp1(szHex);
 		char * buf;
 		int len = tmp1.hexToBuffer(&buf,true);
-		KVSCF_pRetBuffer->setString(QString(KviQCString(buf,len+1)));
+		KVSCF_pRetBuffer->setString(QString(QByteArray(buf,len+1)));
 		KviStr::freeBuffer(buf);
 		return true;
 	}
diff --git a/src/kvirc/kvs/kvi_kvs_coresimplecommands.cpp b/src/kvirc/kvs/kvi_kvs_coresimplecommands.cpp
index ff86616ca..fd5a3fbd8 100644
--- a/src/kvirc/kvs/kvi_kvs_coresimplecommands.cpp
+++ b/src/kvirc/kvs/kvi_kvs_coresimplecommands.cpp
@@ -154,14 +154,14 @@ namespace KviKvsCoreSimpleCommands
 
 		QStringList sl = szTokens.split(QRegExp("[, ]+"),QString::SkipEmptyParts);
 		
-		KviQCString szFlags;
-		KviQCString szTarget = KVSCSC_pConnection->encodeText(KVSCSC_pWindow->windowName());
-		KviQCString szMessage;
+		QByteArray szFlags;
+		QByteArray szTarget = KVSCSC_pConnection->encodeText(KVSCSC_pWindow->windowName());
+		QByteArray szMessage;
 
 		int i = 0;
 		for(QStringList::Iterator it = sl.begin();it != sl.end();++it)
 		{
-			KviQCString szTxt = KVSCSC_pConnection->encodeText(*it);
+			QByteArray szTxt = KVSCSC_pConnection->encodeText(*it);
 			if(!szTxt.isEmpty())
 			{
 				szFlags += flag;
@@ -222,8 +222,8 @@ namespace KviKvsCoreSimpleCommands
 
 		KVSCSC_REQUIRE_CONNECTION
 
-		KviQCString txt = KVSCSC_pConnection->encodeText(szText);
-		KviQCString cmd = KVSCSC_pConnection->encodeText(((KviKvsTreeNodeCommand *)(KVSCSC_pContext->defaultReportLocation()))->commandName());
+		QByteArray txt = KVSCSC_pConnection->encodeText(szText);
+		QByteArray cmd = KVSCSC_pConnection->encodeText(((KviKvsTreeNodeCommand *)(KVSCSC_pContext->defaultReportLocation()))->commandName());
 
 		if(!KVSCSC_pConnection->sendFmtData("%s %s",cmd.data(),txt.data() ? txt.data() : ""))
 			return KVSCSC_pContext->warningNoIrcConnection();
diff --git a/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp b/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp
index 62cfed392..18d91fe09 100644
--- a/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp
+++ b/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp
@@ -132,7 +132,7 @@ namespace KviKvsCoreSimpleCommands
 				++it;
 			}
 		} else  {
-			KviQCString szR = KVSCSC_pConnection->encodeText(szReason);
+			QByteArray szR = KVSCSC_pConnection->encodeText(szReason);
 			if(!(KVSCSC_pConnection->sendFmtData("AWAY :%s",szR.data())))
 				return KVSCSC_pContext->warningNoIrcConnection();
 		}
@@ -519,8 +519,8 @@ namespace KviKvsCoreSimpleCommands
 			KviQString::appendFormatted(szCtcpData," %d.%d",tv.tv_sec,tv.tv_usec);
 		}
 
-		KviQCString szT = KVSCSC_pConnection->encodeText(szTarget);
-		KviQCString szD = KVSCSC_pConnection->encodeText(szCtcpData);
+		QByteArray szT = KVSCSC_pConnection->encodeText(szTarget);
+		QByteArray szD = KVSCSC_pConnection->encodeText(szCtcpData);
 
 		if(!(KVSCSC_pConnection->sendFmtData("%s %s :%c%s%c",
 				KVSCSC_pSwitches->find('n',"notice") ? "NOTICE" : "PRIVMSG",szT.data(),0x01,szD.data(),0x01)))
diff --git a/src/kvirc/kvs/kvi_kvs_coresimplecommands_gl.cpp b/src/kvirc/kvs/kvi_kvs_coresimplecommands_gl.cpp
index 60d1f695f..ecd10cbb7 100644
--- a/src/kvirc/kvs/kvi_kvs_coresimplecommands_gl.cpp
+++ b/src/kvirc/kvs/kvi_kvs_coresimplecommands_gl.cpp
@@ -283,7 +283,7 @@ namespace KviKvsCoreSimpleCommands
 		pActive->console()->output(KVI_WINDOW_TYPE_SOCKETSPY,__tr2qs_ctx("The following string was injected by the user:","kvs"));
 
 		// Encode the text for the socket
-		KviQCString szT = KVSCSC_pConnection->encodeText(szText);
+		QByteArray szT = KVSCSC_pConnection->encodeText(szText);
 
 		// Send the converted text to the socket
 		KVSCSC_pConnection->incomingMessage(szT.constData());
@@ -365,14 +365,14 @@ namespace KviKvsCoreSimpleCommands
 		}
 
 		szChans = slChans.join(",");
-		KviQCString szEncodedChans = KVSCSC_pConnection->encodeText(szChans);
+		QByteArray szEncodedChans = KVSCSC_pConnection->encodeText(szChans);
 
 		if(szKeys.isEmpty())
 		{
 			if(!(KVSCSC_pConnection->sendFmtData("JOIN %s",szEncodedChans.data())))
 				return KVSCSC_pContext->warningNoIrcConnection();
 		} else {
-			KviQCString szEncodedKeys  = KVSCSC_pConnection->encodeText(szKeys);
+			QByteArray szEncodedKeys  = KVSCSC_pConnection->encodeText(szKeys);
 			if(!(KVSCSC_pConnection->sendFmtData("JOIN %s %s",szEncodedChans.data(),szEncodedKeys.data())))
 				return KVSCSC_pContext->warningNoIrcConnection();
 		}
@@ -419,9 +419,9 @@ namespace KviKvsCoreSimpleCommands
 			return false;
 		}
 
-		KviQCString szC = KVSCSC_pConnection->encodeText(KVSCSC_pWindow->target());
-		KviQCString szU = KVSCSC_pConnection->encodeText(szUser);
-		KviQCString szR = KVSCSC_pConnection->encodeText(szReason);
+		QByteArray szC = KVSCSC_pConnection->encodeText(KVSCSC_pWindow->target());
+		QByteArray szU = KVSCSC_pConnection->encodeText(szUser);
+		QByteArray szR = KVSCSC_pConnection->encodeText(szReason);
 
 		if(szR.isEmpty())
 		{
diff --git a/src/kvirc/kvs/kvi_kvs_coresimplecommands_mr.cpp b/src/kvirc/kvs/kvi_kvs_coresimplecommands_mr.cpp
index 4be81f95f..fa2bcb02b 100644
--- a/src/kvirc/kvs/kvi_kvs_coresimplecommands_mr.cpp
+++ b/src/kvirc/kvs/kvi_kvs_coresimplecommands_mr.cpp
@@ -129,7 +129,7 @@ namespace KviKvsCoreSimpleCommands
 
 		KVSCSC_REQUIRE_CONNECTION
 
-		KviQCString szTxt = KVSCSC_pConnection->encodeText(szText);
+		QByteArray szTxt = KVSCSC_pConnection->encodeText(szText);
 
 		if(!szTxt.isEmpty())
 		{
@@ -216,7 +216,7 @@ namespace KviKvsCoreSimpleCommands
 
 		KVSCSC_REQUIRE_CONNECTION
 
-		KviQCString szData = KVSCSC_pConnection->encodeText(szNick);
+		QByteArray szData = KVSCSC_pConnection->encodeText(szNick);
 		if(!szData.data())szData = "";
 
 		if(!KVSCSC_pConnection->sendFmtData("NICK %s",szData.data()))
@@ -267,8 +267,8 @@ namespace KviKvsCoreSimpleCommands
 		KviWindow * w = KVSCSC_pConnection->findChannel(szTarget);
 		if(!w)w = KVSCSC_pConnection->findQuery(szTarget);
 
-		KviQCString szT = KVSCSC_pConnection->encodeText(szTarget);
-		KviQCString szD = w ? w->encodeText(szText) : KVSCSC_pConnection->encodeText(szText);
+		QByteArray szT = KVSCSC_pConnection->encodeText(szTarget);
+		QByteArray szD = w ? w->encodeText(szText) : KVSCSC_pConnection->encodeText(szText);
 		if(!szT.data())szT = ""; // encoding problems ?
 		if(!szD.data())szD = ""; // encoding problems ?
 
@@ -714,13 +714,13 @@ namespace KviKvsCoreSimpleCommands
 			}
 		}
 
-		KviQCString szEncodedChans = KVSCSC_pConnection->encodeText(szChans);
+		QByteArray szEncodedChans = KVSCSC_pConnection->encodeText(szChans);
 
 		QStringList sl = szChans.split(",",QString::SkipEmptyParts);
 
 		if(!szMsg.isEmpty())
 		{
-			KviQCString szText;
+			QByteArray szText;
 			if(sl.count() == 1)
 			{
 				// single chan , use channel encoding if possible
@@ -945,8 +945,8 @@ namespace KviKvsCoreSimpleCommands
 		if(!KVSCSC_pSwitches->find('q',"quiet") && w)
 			w->ownMessage(szText);
 		else {
-			KviQCString szT = KVSCSC_pConnection->encodeText(szTarget);
-			KviQCString szD = w ? w->encodeText(szText) : KVSCSC_pConnection->encodeText(szText);
+			QByteArray szT = KVSCSC_pConnection->encodeText(szTarget);
+			QByteArray szD = w ? w->encodeText(szText) : KVSCSC_pConnection->encodeText(szText);
 			if(!szT.data())szT = ""; // encoding problems ?
 			if(!szD.data())szD = ""; // encoding problems ?
 
@@ -1174,7 +1174,7 @@ namespace KviKvsCoreSimpleCommands
 
 		KVSCSC_REQUIRE_CONNECTION
 
-		KviQCString szData = KVSCSC_pConnection->encodeText(szRawCommand);
+		QByteArray szData = KVSCSC_pConnection->encodeText(szRawCommand);
 		if(!szData.data())szData = "";
 
 		if(!KVSCSC_pConnection->sendData(szData.data()))
diff --git a/src/kvirc/kvs/kvi_kvs_coresimplecommands_sz.cpp b/src/kvirc/kvs/kvi_kvs_coresimplecommands_sz.cpp
index 5244cb933..0c6b7516e 100644
--- a/src/kvirc/kvs/kvi_kvs_coresimplecommands_sz.cpp
+++ b/src/kvirc/kvs/kvi_kvs_coresimplecommands_sz.cpp
@@ -609,8 +609,8 @@ namespace KviKvsCoreSimpleCommands
 			}
 		}
 
-		KviQCString szC = KVSCSC_pConnection->encodeText(szChannel);
-		KviQCString szT = KVSCSC_pConnection->encodeText(szTopic);
+		QByteArray szC = KVSCSC_pConnection->encodeText(szChannel);
+		QByteArray szT = KVSCSC_pConnection->encodeText(szTopic);
 		if(szTopic.isEmpty())
 		{
 			if(!KVSCSC_pConnection->sendFmtData("TOPIC %s",szC.data()))
@@ -907,7 +907,7 @@ namespace KviKvsCoreSimpleCommands
 			}
 		}
 
-		KviQCString szC = KVSCSC_pConnection->encodeText(szChannel);
+		QByteArray szC = KVSCSC_pConnection->encodeText(szChannel);
 
 		if(!KVSCSC_pConnection->sendFmtData("WHO %s",szC.data()))
 			return KVSCSC_pContext->warningNoIrcConnection();
@@ -955,7 +955,7 @@ namespace KviKvsCoreSimpleCommands
 			KVSCSC_PARAMETER("nickname",KVS_PT_NONEMPTYSTRING,KVS_PF_APPENDREMAINING,szNick)
 		KVSCSC_PARAMETERS_END
 
-		KviQCString szData = KVSCSC_pContext->connection()->encodeText(szNick);
+		QByteArray szData = KVSCSC_pContext->connection()->encodeText(szNick);
 
 		if(!KVSCSC_pContext->connection())return KVSCSC_pContext->warningNoIrcConnection();
 		if(!KVSCSC_pContext->connection()->sendFmtData("WHOIS %s",szData.data()))return KVSCSC_pContext->warningNoIrcConnection();
@@ -995,7 +995,7 @@ namespace KviKvsCoreSimpleCommands
 			KVSCSC_PARAMETER("nickname",KVS_PT_NONEMPTYSTRING,KVS_PF_APPENDREMAINING,szNick)
 		KVSCSC_PARAMETERS_END
 
-		KviQCString szData = KVSCSC_pContext->connection()->encodeText(szNick);
+		QByteArray szData = KVSCSC_pContext->connection()->encodeText(szNick);
 
 		if(!KVSCSC_pContext->connection())return KVSCSC_pContext->warningNoIrcConnection();
 		if(!KVSCSC_pContext->connection()->sendFmtData("WHOWAS %s",szData.data()))return KVSCSC_pContext->warningNoIrcConnection();
diff --git a/src/kvirc/kvs/kvi_kvs_parameterprocessor.cpp b/src/kvirc/kvs/kvi_kvs_parameterprocessor.cpp
index 72cbc332a..1dddcb896 100644
--- a/src/kvirc/kvs/kvi_kvs_parameterprocessor.cpp
+++ b/src/kvirc/kvs/kvi_kvs_parameterprocessor.cpp
@@ -72,7 +72,7 @@ namespace KviKvsParameterProcessor
 			break;
 			case KVS_PT_CSTRING:
 			case KVS_PT_NONEMPTYCSTRING:
-				*((KviQCString *)(pFmtArray->pContainer)) = 0;
+				*((QByteArray *)(pFmtArray->pContainer)) = 0;
 			break;
 			case KVS_PT_STRINGLIST:
 				((QStringList *)(pFmtArray->pContainer))->clear();
@@ -240,14 +240,14 @@ namespace KviKvsParameterProcessor
 						v = pVariantList->next();
 						while(v)
 						{
-							*((KviQCString *)(pFmtArray->pContainer)) += ' ';
+							*((QByteArray *)(pFmtArray->pContainer)) += ' ';
 							v->appendAsString(tmp);
 							v = pVariantList->next();
 						}
-						*((KviQCString *)(pFmtArray->pContainer)) = tmp.toUtf8();
+						*((QByteArray *)(pFmtArray->pContainer)) = tmp.toUtf8();
 						return true;
 					}
-					*((KviQCString *)(pFmtArray->pContainer)) = tmp.toUtf8();
+					*((QByteArray *)(pFmtArray->pContainer)) = tmp.toUtf8();
 				}
 				break;
 				case KVS_PT_NONEMPTYCSTRING:
@@ -260,15 +260,15 @@ namespace KviKvsParameterProcessor
 						v = pVariantList->next();
 						while(v)
 						{
-							*((KviQCString *)(pFmtArray->pContainer)) += ' ';
+							*((QByteArray *)(pFmtArray->pContainer)) += ' ';
 							v->appendAsString(tmp);
 							v = pVariantList->next();
 						}
-						*((KviQCString *)(pFmtArray->pContainer)) = tmp.toUtf8();
+						*((QByteArray *)(pFmtArray->pContainer)) = tmp.toUtf8();
 						bDoReturn = true;
 					}
-					*((KviQCString *)(pFmtArray->pContainer)) = tmp.toUtf8();
-					if(((KviQCString *)(pFmtArray->pContainer))->isEmpty())
+					*((QByteArray *)(pFmtArray->pContainer)) = tmp.toUtf8();
+					if(((QByteArray *)(pFmtArray->pContainer))->isEmpty())
 					{
 						QString szError;
 						KviQString::sprintf(szError,__tr2qs_ctx("Invalid data type for parameter \"%s\"","kvs"),pFmtArray->szName);
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_aliassimplecommand.cpp b/src/kvirc/kvs/kvi_kvs_treenode_aliassimplecommand.cpp
index 23f91a464..88cca8f9f 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_aliassimplecommand.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_aliassimplecommand.cpp
@@ -31,9 +31,10 @@
 #include "kvi_irccontext.h"
 #include "kvi_window.h"
 #include "kvi_ircconnection.h"
-#include "kvi_qcstring.h"
 #include "kvi_out.h"
 
+#include <QByteArray>
+
 
 KviKvsTreeNodeAliasSimpleCommand::KviKvsTreeNodeAliasSimpleCommand(const QChar * pLocation, const QString & szCmdName, KviKvsTreeNodeDataList * params)
 : KviKvsTreeNodeSimpleCommand(pLocation,szCmdName,params)
@@ -81,7 +82,7 @@ bool KviKvsTreeNodeAliasSimpleCommand::execute(KviKvsRunTimeContext * c)
 				szAll.prepend(" ");
 			szAll.prepend(m_szCmdName);
 
-			KviQCString szData;
+			QByteArray szData;
 
 			if(!c->window()->context())
 				goto no_way_to_send_as_raw;
diff --git a/src/kvirc/sparser/kvi_sp_ctcp.cpp b/src/kvirc/sparser/kvi_sp_ctcp.cpp
index c7817a7f3..7d4cafd2a 100644
--- a/src/kvirc/sparser/kvi_sp_ctcp.cpp
+++ b/src/kvirc/sparser/kvi_sp_ctcp.cpp
@@ -461,7 +461,7 @@ void KviServerParser::encodeCtcpParameter(const char * parametr,QString &resultB
 	// This one encodes a single ctcp parameter with the simplest
 	// subset of rules and places it in the supplied buffer
 	//
-	KviQCString buffer;
+	QByteArray buffer;
 	register const char* param=parametr;
 	if(!param)
 	{
@@ -575,7 +575,7 @@ const char * KviServerParser::decodeCtcpEscape(const char * msg_ptr,KviStr &buff
 }
 
 
-const char * KviServerParser::decodeCtcpEscape(const char * msg_ptr,KviQCString &buffer)
+const char * KviServerParser::decodeCtcpEscape(const char * msg_ptr,QByteArray &buffer)
 {
 	//
 	// This one decodes an octal sequence
@@ -724,7 +724,7 @@ const char * KviServerParser::extractCtcpParameter(const char * p_msg_ptr,QStrin
 	// based CTCP message.
 	//
 
-	KviQCString buffer;
+	QByteArray buffer;
 	register const char* msg_ptr=p_msg_ptr;
 	int bInString = 0;
 	if(!msg_ptr) return 0;
@@ -946,7 +946,7 @@ bool KviServerParser::checkCtcpFlood(KviCtcpMessage *msg)
 
 void KviServerParser::replyCtcp(KviCtcpMessage *msg,const QString &data)
 {
-	KviQCString szNick = msg->msg->connection()->encodeText(msg->pSource->nick());
+	QByteArray szNick = msg->msg->connection()->encodeText(msg->pSource->nick());
 	msg->msg->connection()->sendFmtData(
 			"NOTICE %s :%c%s %s%c",
 			szNick.data(),
diff --git a/src/kvirc/sparser/kvi_sp_literal.cpp b/src/kvirc/sparser/kvi_sp_literal.cpp
index b59eecd3a..858b2e829 100644
--- a/src/kvirc/sparser/kvi_sp_literal.cpp
+++ b/src/kvirc/sparser/kvi_sp_literal.cpp
@@ -58,7 +58,6 @@
 #include "kvi_lagmeter.h"
 #include "kvi_ircserver.h"
 #include "kvi_kvs_eventtriggers.h"
-#include "kvi_qcstring.h"
 #include "kvi_network.h"
 #include "kvi_settings.h"
 
@@ -73,6 +72,7 @@
 //#include "kvi_iconmanager.h"
 #include <QDateTime>
 #include <QTextDocument>
+#include <QByteArray>
 
 extern KviNickServRuleSet * g_pNickServRuleSet;
 
@@ -647,10 +647,10 @@ void KviServerParser::parseLiteralKick(KviIrcMessage *msg)
 		{
 			if(_OUTPUT_VERBOSE)
 				console->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs("Attempting to rejoin \r!c\r%Q\r..."),&szChan);
-			KviQCString szC = msg->connection()->encodeText(szChan);
+			QByteArray szC = msg->connection()->encodeText(szChan);
 			if(!szPass.isEmpty())
 			{
-				KviQCString szP = msg->connection()->encodeText(szPass);
+				QByteArray szP = msg->connection()->encodeText(szPass);
 				msg->connection()->sendFmtData("JOIN %s %s",szC.data(),szP.data());
 			} else msg->connection()->sendFmtData("JOIN %s",szC.data());
 		}
diff --git a/src/kvirc/sparser/kvi_sp_numeric.cpp b/src/kvirc/sparser/kvi_sp_numeric.cpp
index 985d00926..75638e340 100644
--- a/src/kvirc/sparser/kvi_sp_numeric.cpp
+++ b/src/kvirc/sparser/kvi_sp_numeric.cpp
@@ -26,6 +26,7 @@
 
 
 #include "kvi_sparser.h"
+
 #include "kvi_window.h"
 #include "kvi_query.h"
 #include "kvi_out.h"
@@ -50,7 +51,6 @@
 #include "kvi_ircconnectiontarget.h"
 #include "kvi_time.h"
 #include "kvi_lagmeter.h"
-#include "kvi_qcstring.h"
 #include "kvi_kvs_eventtriggers.h"
 #include "kvi_kvs_script.h"
 #include "kvi_kvs_variantlist.h"
@@ -60,6 +60,7 @@
 #include <QDateTime>
 #include <QTextCodec>
 #include <QRegExp>
+#include <QByteArray>
 
 // #define IS_CHANNEL_TYPE_FLAG(_str) ((*(_str) == '#') || (*(_str) == '&') || (*(_str) == '!'))
 #define IS_CHANNEL_TYPE_FLAG(_qchar) (msg->connection()->serverInfo()->supportedChannelTypes().indexOf(_qchar) != -1)
@@ -399,7 +400,7 @@ void KviServerParser::parseNumericNames(KviIrcMessage *msg)
 	// [=|*|@] is the type of the channel:
 	// = --> public  * --> private   @ --> secret
 	// ...but we ignore it
-	//QString szChan = msg->connection()->decodeText(msg->cSafeParam(2)->data()); // <-- KviQCString::data() is implicitly unsafe: it CAN return 0
+	//QString szChan = msg->connection()->decodeText(msg->cSafeParam(2)->data()); // <-- QByteArray::data() is implicitly unsafe: it CAN return 0
 	QString szChan = msg->connection()->decodeText(msg->safeParam(2));
 	KviChannel * chan = msg->connection()->findChannel(szChan);
 	// and run to the first nickname
@@ -719,7 +720,7 @@ void KviServerParser::parseNumericWhoReply(KviIrcMessage *msg)
 			{
 				if(KVI_OPTION_BOOL(KviOption_boolRequestMissingAvatars))
 				{
-					KviQCString d = msg->connection()->encodeText(szNick);
+					QByteArray d = msg->connection()->encodeText(szNick);
 					msg->connection()->sendFmtData("%s %s :%c%s%c","PRIVMSG",d.data(),0x01,"AVATAR",0x01);
 				}
 			}
@@ -902,7 +903,7 @@ void KviServerParser::parseLoginNicknameProblem(KviIrcMessage *msg)
 				&szActual,msg->numeric(),&szWText,&szNextNick);
 	}
 
-	KviQCString d = msg->connection()->encodeText(szNextNick);
+	QByteArray d = msg->connection()->encodeText(szNextNick);
 	msg->connection()->sendFmtData("NICK %s",d.data());
 }
 
@@ -1680,7 +1681,7 @@ void KviServerParser::parseNumericBackFromAway(KviIrcMessage * msg)
 	{
 		if(_OUTPUT_PARANOIC)
 			msg->console()->output(KVI_OUT_AWAY,__tr2qs("Restoring pre-away nickname (%Q)"),&szNickBeforeAway);
-		KviQCString szDat = msg->connection()->encodeText(szNickBeforeAway);
+		QByteArray szDat = msg->connection()->encodeText(szNickBeforeAway);
 		msg->connection()->sendFmtData("NICK %s",szDat.data());
 	}
 
@@ -1718,7 +1719,7 @@ void KviServerParser::parseNumericAway(KviIrcMessage * msg)
 
 		if(_OUTPUT_PARANOIC)
 			msg->console()->output(KVI_OUT_AWAY,__tr2qs("Setting away nickname (%Q)"),&szNewNick);
-		KviQCString dat = msg->connection()->encodeText(szNewNick);
+		QByteArray dat = msg->connection()->encodeText(szNewNick);
 		msg->connection()->sendFmtData("NICK %s",dat.data());
 	}
 }
diff --git a/src/kvirc/sparser/kvi_sparser.h b/src/kvirc/sparser/kvi_sparser.h
index a817796e6..46f5b6d4d 100644
--- a/src/kvirc/sparser/kvi_sparser.h
+++ b/src/kvirc/sparser/kvi_sparser.h
@@ -29,11 +29,11 @@
 #include "kvi_settings.h"
 #include "kvi_pointerlist.h"
 #include "kvi_qstring.h"
-#include "kvi_qcstring.h"
 #include "kvi_console.h"
 #include "kvi_ircmessage.h"
 
 #include <QObject>
+#include <QByteArray>
 
 #include <time.h>
 
@@ -253,7 +253,7 @@ public:
 	static void encodeCtcpParameter(const char * param,KviStr &buffer,bool bSpaceBreaks = true);
 	static void encodeCtcpParameter(const char * param,QString &buffer,bool bSpaceBreaks = true);
 	static const char * decodeCtcpEscape(const char * msg_ptr,KviStr &buffer);
-	static const char * decodeCtcpEscape(const char * msg_ptr,KviQCString &buffer);
+	static const char * decodeCtcpEscape(const char * msg_ptr,QByteArray &buffer);
 	static const char * extractCtcpParameter(const char * msg_ptr,KviStr &buffer,bool bSpaceBreaks = true);
 	static const char * extractCtcpParameter(const char * msg_ptr,QString &buffer,bool bSpaceBreaks = true);
 };
diff --git a/src/kvirc/ui/kvi_channel.cpp b/src/kvirc/ui/kvi_channel.cpp
index 5fdf3bb22..70383280e 100644
--- a/src/kvirc/ui/kvi_channel.cpp
+++ b/src/kvirc/ui/kvi_channel.cpp
@@ -442,7 +442,7 @@ void KviChannel::setMode(const char * mode)
 	if(!connection())
 		return;
 
-	KviQCString tmp = connection()->encodeText(m_szName);
+	QByteArray tmp = connection()->encodeText(m_szName);
 	connection()->sendFmtData("MODE %s %s",tmp.data(),mode);
 }
 
@@ -503,7 +503,7 @@ void KviChannel::toggleEditor(KviMaskEditor ** ppEd, KviWindowToolPageButton **
 		{
 			if(connection())
 			{
-				KviQCString szName = connection()->encodeText(m_szName);
+				QByteArray szName = connection()->encodeText(m_szName);
 				connection()->sendFmtData("MODE %s %c",szName.data(),cFlag);
 			}
 		}
@@ -538,7 +538,7 @@ void KviChannel::removeMasks(KviMaskEditor * ed, KviPointerList<KviMaskEntry> *
 		{
 			if(connection())
 			{
-				KviQCString szName = connection()->encodeText(m_szName);
+				QByteArray szName = connection()->encodeText(m_szName);
 				connection()->sendFmtData("MODE %s -%s %s",szName.data(),szFlags.toUtf8().data(),connection()->encodeText(szMasks).data());
 			}
 
@@ -552,7 +552,7 @@ void KviChannel::removeMasks(KviMaskEditor * ed, KviPointerList<KviMaskEntry> *
 	{
 		if(connection())
 		{
-			KviQCString szName = connection()->encodeText(m_szName);
+			QByteArray szName = connection()->encodeText(m_szName);
 			connection()->sendFmtData("MODE %s -%s %s",szName.data(),szFlags.toUtf8().data(),connection()->encodeText(szMasks).data());
 		}
 	}
@@ -1079,11 +1079,11 @@ void KviChannel::ownMessage(const QString & szBuffer)
 
 	//my full mask as seen by other users
 	QString MyFullMask = connection()->userInfo()->nickName() + "!" + connection()->userInfo()->userName() + "@" + connection()->userInfo()->hostName();
-	KviQCString szMyFullMask = connection()->encodeText(MyFullMask);
+	QByteArray szMyFullMask = connection()->encodeText(MyFullMask);
 	//target name
-	KviQCString szName = connection()->encodeText(windowName());
+	QByteArray szName = connection()->encodeText(windowName());
 	//message
-	KviQCString szData = encodeText(szBuffer);
+	QByteArray szData = encodeText(szBuffer);
 	const char * d = szData.data();
 	/* max length of a PRIVMSG text. Max buffer length for our send is 512 byte, but we have to
 	* remember that the server will prepend to the message our full mask and truncate the resulting
@@ -1157,7 +1157,7 @@ void KviChannel::ownMessage(const QString & szBuffer)
 		 * Due to encoding stuff, this is frikin'time eater
 		 */
 		QTextEncoder * p_Encoder = makeEncoder(); // our temp encoder
-		KviQCString szTmp;		// used to calculate the length of an encoded message
+		QByteArray szTmp;		// used to calculate the length of an encoded message
 		int iPos;			// contains the index where to truncate szTmpBuffer
 		int iC;				// cycles counter (debugging/profiling purpose)
 		float fPosDiff;			// optimization internal; aggressivity factor
@@ -1254,7 +1254,7 @@ void KviChannel::ownAction(const QString & szBuffer)
 	}
 
 	QString szName = m_szName;
-	KviQCString szData = encodeText(szTmpBuffer);
+	QByteArray szData = encodeText(szTmpBuffer);
 	const char * d = szData.data();
 
 	if(!d)
@@ -1523,8 +1523,8 @@ void KviChannel::topicSelected(const QString & szTopic)
 	if(!connection())
 		return;
 
-	KviQCString szEncoded = encodeText(szTopic);
-	KviQCString szName = connection()->encodeText(m_szName);
+	QByteArray szEncoded = encodeText(szTopic);
+	QByteArray szName = connection()->encodeText(m_szName);
 	connection()->sendFmtData("TOPIC %s :%s",szName.data(),szEncoded.length() ? szEncoded.data() : "");
 }
 
@@ -1547,9 +1547,9 @@ void KviChannel::closeEvent(QCloseEvent * e)
 			if(KviKvsScript::evaluate(szTmp,this,0,&vRet))
 				vRet.asString(szTmp);
 
-			KviQCString dat = encodeText(szTmp);
+			QByteArray dat = encodeText(szTmp);
 			partMessageSent();
-			KviQCString szName = connection()->encodeText(m_szName);
+			QByteArray szName = connection()->encodeText(m_szName);
 			connection()->sendFmtData("PART %s :%s",szName.data(),dat.data() ? dat.data() : "");
 			// be sure to not reference ourselves here.. we could be disconnected!
 		} else {
diff --git a/src/kvirc/ui/kvi_ipeditor.cpp b/src/kvirc/ui/kvi_ipeditor.cpp
index c633b15e5..15512d4bc 100644
--- a/src/kvirc/ui/kvi_ipeditor.cpp
+++ b/src/kvirc/ui/kvi_ipeditor.cpp
@@ -23,7 +23,6 @@
 //=============================================================================
 
 #include "kvi_ipeditor.h"
-#include "kvi_qcstring.h"
 
 #include <QApplication>
 #include <QLineEdit>
@@ -31,6 +30,7 @@
 #include <QFrame>
 #include <QEvent>
 #include <QKeyEvent>
+#include <QByteArray>
 
 #include <ctype.h>
 
@@ -113,7 +113,7 @@ bool KviIpEditor::setAddress(const QString &ipAddr)
 	//       is valid before effectively setting the fields
 	clear();
 
-	KviQCString ip = ipAddr.toAscii(); // ip addresses are digits & latin letters abcdef (IPv6)
+	QByteArray ip = ipAddr.toAscii(); // ip addresses are digits & latin letters abcdef (IPv6)
 
 	ip = ip.trimmed();
 	const char * c = ip.data();
@@ -127,7 +127,7 @@ bool KviIpEditor::setAddress(const QString &ipAddr)
 			const char *anchor = c;
 			while(isdigit(*c))c++;
 			if(c == anchor)return false; // Invalid empty field
-			KviQCString str(anchor,(c - anchor) + 1);
+			QByteArray str(anchor,(c - anchor) + 1);
 			bool bOk;
 			int num = str.toInt(&bOk);
 			if(!bOk)return false; // should never happen , but just to be sure
@@ -143,7 +143,7 @@ bool KviIpEditor::setAddress(const QString &ipAddr)
 		{
 			const char *anchor = c;
 			while(isdigit(*c) || ((tolower(*c) >= 'a') && (tolower(*c) <= 'f')) || ((tolower(*c) >= 'A') && (tolower(*c) <= 'F')))c++;
-			KviQCString str(anchor,(c - anchor) + 1);
+			QByteArray str(anchor,(c - anchor) + 1);
 			if(str.length() > 4)return false; // Too long
 			m_pEdit[i]->setText(str.data());
 			if(i < 7){
diff --git a/src/kvirc/ui/kvi_ircview.cpp b/src/kvirc/ui/kvi_ircview.cpp
index 65cea258b..498e0e258 100644
--- a/src/kvirc/ui/kvi_ircview.cpp
+++ b/src/kvirc/ui/kvi_ircview.cpp
@@ -96,12 +96,9 @@
 #include "kvi_ircconnection.h"
 #include "kvi_mdimanager.h"
 #include "kvi_userinput.h"
-#include "kvi_qcstring.h"
 #include "kvi_tal_popupmenu.h"
 #include "kvi_animatedpixmap.h"
 
-// FIXME: #warning "There should be an option to preserve control codes in copied text (clipboard) (mIrc = CTRL+Copy->with colors)"
-
 #include <QBitmap>
 #include <QPainter>
 #include <QRegExp>
@@ -113,6 +110,7 @@
 #include <QCursor>
 #include <QScrollBar>
 #include <QFontDialog>
+#include <QByteArray>
 
 #include <time.h>
 
@@ -444,7 +442,7 @@ bool KviIrcView::saveBuffer(const char *filename)
 	if(!f.open(QIODevice::WriteOnly|QIODevice::Truncate))return false;
 	QString tmp;
 	getTextBuffer(tmp);
-	KviQCString tmpx = KviQString::toUtf8(tmp);
+	QByteArray tmpx = KviQString::toUtf8(tmp);
 	f.write(tmpx.data(),tmpx.length());
 	f.close();
 	return true;
diff --git a/src/kvirc/ui/kvi_ircview_loghandling.cpp b/src/kvirc/ui/kvi_ircview_loghandling.cpp
index 0851e068b..4604a7607 100644
--- a/src/kvirc/ui/kvi_ircview_loghandling.cpp
+++ b/src/kvirc/ui/kvi_ircview_loghandling.cpp
@@ -218,7 +218,7 @@ bool KviIrcView::startLogging(const QString& fname,bool bPrependCurBuffer)
 
 void KviIrcView::add2Log(const QString &szBuffer,int iMsgType)
 {
-	KviQCString szTmp;
+	QByteArray szTmp;
 	QString szToWrite;
 	if(KVI_OPTION_BOOL(KviOption_boolStripMsgTypeInLogs))
 	{
diff --git a/src/kvirc/ui/kvi_modew.cpp b/src/kvirc/ui/kvi_modew.cpp
index 2bcb478fe..29f1adfaf 100644
--- a/src/kvirc/ui/kvi_modew.cpp
+++ b/src/kvirc/ui/kvi_modew.cpp
@@ -28,13 +28,13 @@
 #include "kvi_options.h"
 #include "kvi_ircconnectionserverinfo.h"
 #include "kvi_ircconnectionuserinfo.h"
-#include "kvi_qcstring.h"
 #include "kvi_tal_hbox.h"
 
 #include <QFrame>
 #include <QLineEdit>
 #include <QEvent>
 #include <QResizeEvent>
+#include <QByteArray>
 
 KviModeWidget::KviModeWidget(QWidget * par,KviChannel* chan,const char * name)
 :QFrame(par)
@@ -144,7 +144,7 @@ void KviModeWidget::editorReturnPressed()
 	if(!szNewModes.isEmpty()) mode+=QString("+"+szNewModes);
 	if(!mode.isEmpty())
 	{
-		KviQCString chan = m_pChannel->connection()->encodeText(m_pChannel->target());
+		QByteArray chan = m_pChannel->connection()->encodeText(m_pChannel->target());
 		m_pChannel->connection()->sendFmtData("MODE %s %s",chan.data(),mode.toUtf8().data());
 	}
 	reset();
diff --git a/src/kvirc/ui/kvi_query.cpp b/src/kvirc/ui/kvi_query.cpp
index cfde41c08..8123e97a2 100644
--- a/src/kvirc/ui/kvi_query.cpp
+++ b/src/kvirc/ui/kvi_query.cpp
@@ -45,7 +45,6 @@
 #include "kvi_ircuserdb.h"
 #include "kvi_mirccntrl.h"
 #include "kvi_toolwindows_container.h"
-#include "kvi_qcstring.h"
 #include "kvi_kvs_eventtriggers.h"
 #include "kvi_tal_hbox.h"
 
@@ -65,6 +64,7 @@
 #include <QPixmap>
 #include <QSplitter>
 #include <QList>
+#include <QByteArray>
 
 KviQuery::KviQuery(KviFrame * lpFrm, KviConsole * lpConsole, const QString & szNick)
 : KviWindow(KVI_WINDOW_TYPE_QUERY,lpFrm,szNick,lpConsole)
@@ -583,11 +583,11 @@ void KviQuery::ownMessage(const QString & szBuffer)
 
 	//my full mask as seen by other users
 	QString szTmpMask = connection()->userInfo()->nickName() + "!" + connection()->userInfo()->userName() + "@" + connection()->userInfo()->hostName();
-	KviQCString szMyFullMask = connection()->encodeText(szTmpMask);
+	QByteArray szMyFullMask = connection()->encodeText(szTmpMask);
 	//target name
-	KviQCString szName = connection()->encodeText(windowName());
+	QByteArray szName = connection()->encodeText(windowName());
 	//message
-	KviQCString szData = encodeText(szBuffer);
+	QByteArray szData = encodeText(szBuffer);
 	const char * d = szData.data();
 	/* max length of a PRIVMSG text. Max buffer length for our sszEnd is 512 byte, but we have to
 	* remember that the server will prepszEnd to the message our full mask and truncate the resulting
@@ -663,7 +663,7 @@ void KviQuery::ownMessage(const QString & szBuffer)
 		 * Due to encoding stuff, this is frikin'time eater
 		 */
 		QTextEncoder * p_Encoder = makeEncoder(); // our temp encoder
-		KviQCString szTmp;		// used to calculate the length of an encoded message
+		QByteArray szTmp;		// used to calculate the length of an encoded message
 		int iPos;			// contains the index where to truncate szTmpBuffer
 		int iC;				// cycles counter (debugging/profiling purpose)
 		float fPosDiff;			// optimization internal; aggressivity factor
@@ -766,7 +766,7 @@ void KviQuery::ownAction(const QString & szBuffer)
 			szTmpBuffer = szBuffer;
 		}
 
-		KviQCString szBuffer = encodeText(szTmpBuffer);
+		QByteArray szBuffer = encodeText(szTmpBuffer);
 
 		QString sz = windowName();
 		if(sz.isEmpty())
diff --git a/src/kvirc/ui/kvi_scripteditor.cpp b/src/kvirc/ui/kvi_scripteditor.cpp
index eccd9e992..021ac7e65 100644
--- a/src/kvirc/ui/kvi_scripteditor.cpp
+++ b/src/kvirc/ui/kvi_scripteditor.cpp
@@ -41,16 +41,16 @@ KviScriptEditor::~KviScriptEditor()
 
 void KviScriptEditor::setText(const char * txt)
 {
-	setText(KviQCString(txt));
+	setText(QByteArray(txt));
 }
 
-void KviScriptEditor::setText(const KviQCString &)
+void KviScriptEditor::setText(const QByteArray &)
 {
 }
 
 void KviScriptEditor::setText(const QString &txt)
 {
-	setText(KviQCString(txt.toUtf8()));
+	setText(QByteArray(txt.toUtf8()));
 }
 
 void KviScriptEditor::setFindText(const QString &)
@@ -64,7 +64,7 @@ void KviScriptEditor::setFindLineeditReadOnly(bool)
 {
 }
 
-void KviScriptEditor::getText(KviQCString &)
+void KviScriptEditor::getText(QByteArray &)
 {
 }
 
@@ -83,7 +83,7 @@ int KviScriptEditor::getCursor()
 }
 void KviScriptEditor::getText(QString &txt)
 {
-	KviQCString tmp;
+	QByteArray tmp;
 	getText(tmp);
 	txt = QString::fromUtf8(tmp.data());
 }
diff --git a/src/kvirc/ui/kvi_scripteditor.h b/src/kvirc/ui/kvi_scripteditor.h
index 7def74b0a..0bc4988dd 100644
--- a/src/kvirc/ui/kvi_scripteditor.h
+++ b/src/kvirc/ui/kvi_scripteditor.h
@@ -25,10 +25,10 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_qcstring.h"
 
 #include <QWidget>
 #include <QLineEdit>
+#include <QByteArray>
 
 //
 // This is the basic interface of a script editor widget
@@ -51,9 +51,9 @@ protected:
 	QLineEdit * m_pFindLineedit;
 public:
 	virtual void setText(const char * txt);
-	virtual void setText(const KviQCString &txt);
+	virtual void setText(const QByteArray &txt);
 	virtual void setText(const QString &txt);
-	virtual void getText(KviQCString &txt);
+	virtual void getText(QByteArray &txt);
 	virtual void getText(QString &txt);
 	virtual void setInfoText(const QString &text);
 	virtual void setFindText(const QString &text);
diff --git a/src/kvirc/ui/kvi_window.h b/src/kvirc/ui/kvi_window.h
index bce4ba51e..f6bac98d3 100644
--- a/src/kvirc/ui/kvi_window.h
+++ b/src/kvirc/ui/kvi_window.h
@@ -33,7 +33,6 @@
 #include "kvi_app.h"
 #include "kvi_string.h"
 #include "kvi_qstring.h"
-#include "kvi_qcstring.h"
 #include "kvi_settings.h"
 #include "kvi_irccontext.h"
 #include "kvi_ircconnection.h"
@@ -51,6 +50,7 @@
 #include <QWidget>
 #include <QToolButton>
 #include <QTextEncoder>
+#include <QByteArray>
 
 class QPushButton;
 class QPixmap;
@@ -250,7 +250,7 @@ public:
 	// this must return a default text codec suitable for this window
 	virtual QTextCodec * defaultTextCodec();
 	// encode the text from szSource by using m_uTextEncoding
-	inline KviQCString encodeText(const QString &szText);
+	inline QByteArray encodeText(const QString &szText);
 	inline QString decodeText(const char * szText);
 	//return a text encoder
 	QTextEncoder * makeEncoder();
@@ -391,7 +391,7 @@ protected:
 	extern KVIRC_API KviWindow * g_pActiveWindow;
 #endif
 
-inline KviQCString KviWindow::encodeText(const QString &szText)
+inline QByteArray KviWindow::encodeText(const QString &szText)
 {
 	if(m_pTextCodec) {
 		return m_pTextCodec->fromUnicode(szText);
diff --git a/src/modules/avatar/libkviavatar.cpp b/src/modules/avatar/libkviavatar.cpp
index 5f16c9517..e03a898c6 100644
--- a/src/modules/avatar/libkviavatar.cpp
+++ b/src/modules/avatar/libkviavatar.cpp
@@ -43,7 +43,6 @@
 #include "kvi_sharedfiles.h"
 #include "kvi_out.h"
 #include "kvi_ircmask.h"
-#include "kvi_qcstring.h"
 #include "kvi_tal_hbox.h"
 
 #include <QLineEdit>
@@ -53,6 +52,7 @@
 #include <QLabel>
 #include <QLayout>
 #include <QCloseEvent>
+#include <QByteArray>
 
 static KviPointerList<KviAsyncAvatarSelectionDialog> * g_pAvatarSelectionDialogList = 0;
 extern KVIRC_API KviSharedFilesManager * g_pSharedFilesManager;
@@ -411,11 +411,11 @@ static bool avatar_kvs_cmd_notify(KviKvsModuleCommandCall * c)
 	if(!c->switches()->find('q',"quiet"))
 		c->window()->output(KVI_OUT_AVATAR,__tr2qs("Notifying avatar '%Q' to %Q"),&avatar,&szTarget);
 
-	KviQCString encodedTarget = c->window()->connection()->encodeText(szTarget);
+	QByteArray encodedTarget = c->window()->connection()->encodeText(szTarget);
 
 	if(!avatar.isEmpty())
 	{
-		KviQCString encodedAvatar = c->window()->connection()->encodeText(avatar);
+		QByteArray encodedAvatar = c->window()->connection()->encodeText(avatar);
 
 		if(o)
 		{
@@ -547,7 +547,7 @@ static bool avatar_kvs_cmd_query(KviKvsModuleCommandCall * c)
 
 	KVSM_REQUIRE_CONNECTION(c)
 
-	KviQCString target = c->window()->connection()->encodeText(szName);
+	QByteArray target = c->window()->connection()->encodeText(szName);
 	c->window()->connection()->sendFmtData("PRIVMSG %s :%cAVATAR%c",target.data(),0x01,0x01);
 
 	return true;
diff --git a/src/modules/dcc/chat.cpp b/src/modules/dcc/chat.cpp
index 3f8a4e11a..a5ff51837 100644
--- a/src/modules/dcc/chat.cpp
+++ b/src/modules/dcc/chat.cpp
@@ -32,6 +32,7 @@
 #endif
 
 #define _KVI_DEBUG_CHECK_RANGE_
+
 #include "kvi_debug.h"
 #include "kvi_options.h"
 #include "kvi_input.h"
@@ -54,13 +55,13 @@
 #include "kvi_ircconnection.h"
 #include "kvi_ircconnectionuserinfo.h"
 #include "kvi_kvs_eventtriggers.h"
-#include "kvi_qcstring.h"
-#include "kvi_tal_vbox.h"
 #include "kvi_mirccntrl.h"
+#include "kvi_tal_vbox.h"
 
 #include <QSplitter>
 #include <QEvent>
 #include <QResizeEvent>
+#include <QByteArray>
 
 #ifdef COMPILE_CRYPT_SUPPORT
 	#include "kvi_crypt.h"
@@ -303,7 +304,7 @@ void KviDccChat::ownMessage(const QString &text)
 		return;
 	}
 
-	KviQCString szData = encodeText(text);
+	QByteArray szData = encodeText(text);
 	const char * d = szData.data();
 	if(!d)return;
 
@@ -387,7 +388,7 @@ void KviDccChat::ownAction(const QString &text)
 			szTmpBuffer = text;
 		}
 
-		KviQCString szData = encodeText(szTmpBuffer);
+		QByteArray szData = encodeText(szTmpBuffer);
 		const char * d = szData.data();
 		if(!d)return;
 		KviStr buf(KviStr::Format,"%cACTION %s%c\r\n",0x01,d,0x01);
diff --git a/src/modules/editor/scripteditor.cpp b/src/modules/editor/scripteditor.cpp
index a20c0a7a3..dd45d2c06 100644
--- a/src/modules/editor/scripteditor.cpp
+++ b/src/modules/editor/scripteditor.cpp
@@ -874,17 +874,17 @@ void KviScriptEditorImplementation::saveToFile()
 
 void KviScriptEditorImplementation::setText(const char * txt)
 {
-	setText(KviQCString(txt));
+	setText(QByteArray(txt));
 }
 
-void KviScriptEditorImplementation::setText(const KviQCString & szText)
+void KviScriptEditorImplementation::setText(const QByteArray & szText)
 {
         m_pEditor->setPlainText(szText.data());
 	m_pEditor->document()->setModified(false);
 	updateRowColLabel();
 }
 
-void KviScriptEditorImplementation::getText(KviQCString & szText)
+void KviScriptEditorImplementation::getText(QByteArray & szText)
 {
 	szText = m_pEditor->toPlainText().toUtf8();
 }
diff --git a/src/modules/editor/scripteditor.h b/src/modules/editor/scripteditor.h
index 2e5ee6c2b..7a66f1074 100644
--- a/src/modules/editor/scripteditor.h
+++ b/src/modules/editor/scripteditor.h
@@ -28,7 +28,6 @@
 #include "kvi_scripteditor.h"
 #include "kvi_pointerlist.h"
 #include "kvi_selectors.h"
-#include "kvi_qcstring.h"
 #include "kvi_tal_textedit.h"
 #include "kvi_tal_popupmenu.h"
 
@@ -40,6 +39,7 @@
 #include <QListWidget>
 #include <QCheckBox>
 #include <QSyntaxHighlighter>
+#include <QByteArray>
 
 class QTimer;
 
@@ -153,9 +153,9 @@ protected:
 public:
 	virtual void setText(const char * txt);
 	virtual void setText(const QString & szText);
-	virtual void setText(const KviQCString & szText);
+	virtual void setText(const QByteArray & szText);
 	virtual void getText(QString & szText);
-	virtual void getText(KviQCString & szText);
+	virtual void getText(QByteArray & szText);
 	virtual void setFindText(const QString & szText);
 	virtual void setEnabled(bool bEnabled);
 	virtual void setFocus();
diff --git a/src/modules/file/libkvifile.cpp b/src/modules/file/libkvifile.cpp
index 7e6ebb23b..2fa8d56ef 100644
--- a/src/modules/file/libkvifile.cpp
+++ b/src/modules/file/libkvifile.cpp
@@ -28,7 +28,6 @@
 #include "kvi_malloc.h"
 #include "kvi_app.h"
 #include "kvi_options.h"
-#include "kvi_qcstring.h"
 #include "kvi_kvs_arraycast.h"
 #include "kvi_file.h"
 
@@ -36,6 +35,7 @@
 #include <QDir>
 #include <QTextStream>
 #include <QTextCodec>
+#include <QByteArray>
 
 /*
 	@doc: file.copy
@@ -919,7 +919,7 @@ static bool file_kvs_cmd_writeLines(KviKvsModuleCommandCall * c)
 	while(u < a.array()->size())
 	{
 		KviKvsVariant * v = a.array()->at(u);
-		KviQCString dat;
+		QByteArray dat;
 		if(v)
 		{
 			QString szDat;
diff --git a/src/modules/list/libkvilist.cpp b/src/modules/list/libkvilist.cpp
index ebd9a1f91..a1d4c76c8 100644
--- a/src/modules/list/libkvilist.cpp
+++ b/src/modules/list/libkvilist.cpp
@@ -48,19 +48,19 @@ KviPointerList<KviListWindow> * g_pListWindowList = 0;
 		The channel list window is opened automatically when a channel list
 		is requested from the server.
 */
-
 static bool list_kvs_cmd_open(KviKvsModuleCommandCall * c)
 {
 
-	if(!c->window()->console())return c->context()->errorNoIrcContext();
+	if(!c->window()->console()) return c->context()->errorNoIrcContext();
 
 	if(!(c->window()->context()->listWindow()))
 	{
-		KviListWindow *w = new KviListWindow(c->window()->frame(),c->window()->console());
+		KviListWindow * w = new KviListWindow(c->window()->frame(),c->window()->console());
 		c->window()->frame()->addWindow(w);
 	} else {
 		c->warning(__tr2qs("List window already open for this IRC context"));
 	}
+
 	return true;
 }
 
diff --git a/src/modules/list/listwindow.cpp b/src/modules/list/listwindow.cpp
index c52b5b31a..c2ea43a42 100644
--- a/src/modules/list/listwindow.cpp
+++ b/src/modules/list/listwindow.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Thu Oct 7 2001 13:27:55 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2001-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2001-2009 Szymon Stefanek (pragma at kvirc dot net)
 //
 //   This program is FREE software. You can redistribute it and/or
 //   modify it under the lists of the GNU General Public License
@@ -37,7 +37,6 @@
 #include "kvi_ircconnection.h"
 #include "kvi_ircconnection.h"
 #include "kvi_qstring.h"
-#include "kvi_qcstring.h"
 #include "kvi_topicw.h"
 #include "kvi_config.h"
 #include "kvi_filedialog.h"
@@ -52,10 +51,11 @@
 #include <QSplitter>
 #include <QToolTip>
 #include <QDateTime>
+#include <QByteArray>
 
 extern KviPointerList<KviListWindow> * g_pListWindowList;
 
-KviChannelTreeWidgetItemData::KviChannelTreeWidgetItemData(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;
@@ -75,35 +75,34 @@ KviChannelTreeWidgetItem::KviChannelTreeWidgetItem(KviTalTreeWidget * v,KviChann
 	setText(2, pData->m_szTopic);
 }
 
-
 KviChannelTreeWidgetItem::~KviChannelTreeWidgetItem()
 {
 }
 
-int KviChannelTreeWidgetItem::width ( const QFontMetrics & fm, const KviTalTreeWidget * , int column ) const
+int KviChannelTreeWidgetItem::width(const QFontMetrics & fm, const KviTalTreeWidget *, int iColumn) const
 {
-	if(column==2)
-		return fm.width(KviMircCntrl::stripControlBytes(text(column)));
-	else return fm.width(text(column));
+	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 KviTalTreeWidgetItem & other) const
 {
-	int sortCol = treeWidget()->sortColumn();
-	switch (sortCol)
+	int iSortCol = treeWidget()->sortColumn();
+	switch(iSortCol)
 	{
 		case 0:
 			//channel
-			return text(sortCol).toUpper() < other.text(sortCol).toUpper();
+			return text(iSortCol).toUpper() < other.text(iSortCol).toUpper();
 			break;
 		case 1:
 			//users
-			return text(sortCol).toInt() < other.text(sortCol).toInt();
+			return text(iSortCol).toInt() < other.text(iSortCol).toInt();
 			break;
 		case 2:
 		default:
 			//topic
-			return KviMircCntrl::stripControlBytes(text(sortCol)).toUpper() < KviMircCntrl::stripControlBytes(other.text(sortCol)).toUpper();
+			return KviMircCntrl::stripControlBytes(text(iSortCol)).toUpper() < KviMircCntrl::stripControlBytes(other.text(iSortCol)).toUpper();
 			break;
 	}
 }
@@ -111,15 +110,24 @@ bool KviChannelTreeWidgetItem::operator< ( const KviTalTreeWidgetItem & other )
 #define KVI_LABEL_DEF_BACK 100
 #define KVI_LABEL_DEF_FORE 101
 
-void KviChannelTreeWidgetItemDelegate::paint( QPainter * p, const QStyleOptionViewItem & option, const QModelIndex & index ) const
+KviChannelTreeWidgetItemDelegate::KviChannelTreeWidgetItemDelegate(KviTalTreeWidget * pWidget)
+: QItemDelegate(pWidget)
+{
+}
+
+KviChannelTreeWidgetItemDelegate::~KviChannelTreeWidgetItemDelegate()
+{
+}
+
+void KviChannelTreeWidgetItemDelegate::paint(QPainter * p, const QStyleOptionViewItem & option, const QModelIndex & index) const
 {
 	if (option.state & QStyle::State_Selected)
 		p->fillRect(option.rect, option.palette.brush( QPalette::Highlight ) );
 
 	//reset the color
-	p->setPen( option.palette.text().color() );
+	p->setPen(option.palette.text().color());
 
-	switch (index.column())
+	switch(index.column())
 	{
 		case 0:
 			//channel
@@ -137,8 +145,9 @@ void KviChannelTreeWidgetItemDelegate::paint( QPainter * p, const QStyleOptionVi
 	}
 }
 
-KviListWindow::KviListWindow(KviFrame * lpFrm,KviConsole * lpConsole)
-: KviWindow(KVI_WINDOW_TYPE_LIST,lpFrm,"list",lpConsole) , KviExternalServerDataParser()
+
+KviListWindow::KviListWindow(KviFrame * lpFrm, KviConsole * lpConsole)
+: KviWindow(KVI_WINDOW_TYPE_LIST,lpFrm,"list",lpConsole), KviExternalServerDataParser()
 {
 	g_pListWindowList->append(this);
 
@@ -154,37 +163,45 @@ KviListWindow::KviListWindow(KviFrame * lpFrm,KviConsole * lpConsole)
 	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 QToolButton(box);
+	KviTalHBox * pBox = new KviTalHBox(m_pTopSplitter);
+	pBox->setSpacing(1);
+	pBox->setMargin(0);
+
+	m_pOpenButton = new QToolButton(pBox);
+	m_pOpenButton->setObjectName("import_list");
+	m_pOpenButton->setIconSize(QSize(16,16));
 	m_pOpenButton->setIcon(QIcon(*(g_pIconManager->getBigIcon(KVI_BIGICON_OPEN))));
+	KviTalToolTip::add(m_pOpenButton,__tr2qs("Import List"));
 	connect(m_pOpenButton,SIGNAL(clicked()),this,SLOT(importList()));
 
-	m_pSaveButton = new QToolButton(box);
+	m_pSaveButton = new QToolButton(pBox);
+	m_pSaveButton->setObjectName("export_list");
+	m_pSaveButton->setIconSize(QSize(16,16));
 	m_pSaveButton->setIcon(QIcon(*(g_pIconManager->getBigIcon(KVI_BIGICON_SAVE))));
+	KviTalToolTip::add(m_pSaveButton,__tr2qs("Export List"));
 	connect(m_pSaveButton,SIGNAL(clicked()),this,SLOT(exportList()));
 
-	m_pRequestButton = new QToolButton(box);
+	m_pRequestButton = new QToolButton(pBox);
 	m_pRequestButton->setObjectName("request_button");
 	m_pRequestButton->setIconSize(QSize(16,16));
 	m_pRequestButton->setIcon(QIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_LIST))));
-	connect(m_pRequestButton,SIGNAL(clicked()),this,SLOT(requestList()));
 	KviTalToolTip::add(m_pRequestButton,__tr2qs("Request List"));
+	connect(m_pRequestButton,SIGNAL(clicked()),this,SLOT(requestList()));
 
-	m_pStopListDownloadButton = new QToolButton(box);
+	m_pStopListDownloadButton = new QToolButton(pBox);
 	m_pStopListDownloadButton->setObjectName("stoplistdownload_button");
 	m_pStopListDownloadButton->setIconSize(QSize(16,16));
 	m_pStopListDownloadButton->setIcon(QIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_NICKNAMEPROBLEM))));
-	connect(m_pStopListDownloadButton,SIGNAL(clicked()),this,SLOT(stoplistdownload()));
 	KviTalToolTip::add(m_pStopListDownloadButton,__tr2qs("Stop list download"));
+	connect(m_pStopListDownloadButton,SIGNAL(clicked()),this,SLOT(stoplistdownload()));
 
-	m_pParamsEdit = new QLineEdit(box);
-	box->setStretchFactor(m_pParamsEdit,1);
+	m_pParamsEdit = new QLineEdit(pBox);
+	pBox->setStretchFactor(m_pParamsEdit,1);
 	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>"));
+		"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");
 
@@ -201,15 +218,12 @@ KviListWindow::KviListWindow(KviFrame * lpFrm,KviConsole * lpConsole)
 	m_pTreeWidget->setAllColumnsShowFocus(TRUE);
 	m_pTreeWidget->setSortingEnabled(TRUE);
 	m_pTreeWidget->sortItems(0,Qt::AscendingOrder);
-
 	connect(m_pTreeWidget,SIGNAL(itemDoubleClicked(QTreeWidgetItem *, int)),this,SLOT(itemDoubleClicked(QTreeWidgetItem *, int)));
 
 	m_pIrcView = new KviIrcView(m_pVertSplitter,lpFrm,this);
 
 	m_pConsole->context()->setListWindowPointer(this);
-
-	connect(m_pConsole->context(),SIGNAL(stateChanged()),
-		this,SLOT(connectionStateChange()));
+	connect(m_pConsole->context(),SIGNAL(stateChanged()),this,SLOT(connectionStateChange()));
 
 	connectionStateChange();
 }
@@ -218,14 +232,16 @@ KviListWindow::~KviListWindow()
 {
 	g_pListWindowList->removeRef(this);
 	m_pConsole->context()->setListWindowPointer(0);
-	if(m_pFlushTimer)delete m_pFlushTimer;
+
+	if(m_pFlushTimer)
+		delete m_pFlushTimer;
 	m_pItemList->setAutoDelete(true);
 	delete m_pItemList;
 }
 
-void KviListWindow::getBaseLogFileName(QString &buffer)
+void KviListWindow::getBaseLogFileName(QString & szBuffer)
 {
-	buffer.sprintf("LIST_%d",context()->id());
+	szBuffer.sprintf("LIST_%d",context()->id());
 }
 
 void KviListWindow::requestList()
@@ -233,8 +249,10 @@ void KviListWindow::requestList()
 	if(m_pConsole->isConnected())
 	{
 		KviStr parms = m_pParamsEdit->text();
-		if(parms.isEmpty())m_pConsole->connection()->sendFmtData("list");
+		if(parms.isEmpty())
+			m_pConsole->connection()->sendFmtData("list");
 		else m_pConsole->connection()->sendFmtData("list %s",m_pConsole->connection()->encodeText(parms.ptr()).data());
+
 		outputNoFmt(KVI_OUT_SYSTEMMESSAGE,__tr2qs("Sent list request, waiting for reply..."));
 		m_pRequestButton->setEnabled(false);
 	} else {
@@ -259,12 +277,12 @@ void KviListWindow::connectionStateChange()
 	m_pRequestButton->setEnabled(st == KviIrcContext::Connected);
 	if(st == KviIrcContext::Connected)
 	{
-		QString tmp;
-		KviQString::sprintf(tmp,
+		QString szTmp;
+		KviQString::sprintf(szTmp,
 				__tr2qs("Connected to %s (%s)"),
 				m_pConsole->connection()->currentServerName().toUtf8().data(),
 				m_pConsole->currentNetworkName().toUtf8().data());
-		m_pInfoLabel->setText(tmp);
+		m_pInfoLabel->setText(szTmp);
 	} else {
 		m_pInfoLabel->setText(__tr2qs("List cannot be requested: Not connected to a server"));
 	}
@@ -277,9 +295,9 @@ QPixmap * KviListWindow::myIconPtr()
 
 void KviListWindow::resizeEvent(QResizeEvent *)
 {
-	int hght = m_pTopSplitter->sizeHint().height();
-	m_pTopSplitter->setGeometry(0,0,width(),hght);
-	m_pSplitter->setGeometry(0,hght,width(),height() - hght);
+	int iHeight = m_pTopSplitter->sizeHint().height();
+	m_pTopSplitter->setGeometry(0,0,width(),iHeight);
+	m_pSplitter->setGeometry(0,iHeight,width(),height() - iHeight);
 }
 
 QSize KviListWindow::sizeHint() const
@@ -328,19 +346,19 @@ void KviListWindow::exportList()
 	} else {
 		szFile = __tr2qs("Channel list");
 	}
-	if(KviFileDialog::askForSaveFileName(szFile,__tr2qs("Choose filename"),szFile,
-		__tr2qs("Configuration files (*.kvc)"),false,
-		false,true,this))
+
+	if(KviFileDialog::askForSaveFileName(szFile,__tr2qs("Choose filename"),szFile,__tr2qs("Configuration files (*.kvc)"),false,false,true,this))
 	{
-		if(QFileInfo(szFile).completeSuffix()!="kvc")
+		if(QFileInfo(szFile).completeSuffix() != "kvc")
 			szFile.append(".kvc");
+
 		KviConfig cfg(szFile,KviConfig::Write);
 		cfg.clear();
 
-		KviChannelTreeWidgetItem *it;
-		for (int i=0;i<m_pTreeWidget->topLevelItemCount();i++)
+		KviChannelTreeWidgetItem * it;
+		for(int i=0; i < m_pTreeWidget->topLevelItemCount(); i++)
 		{
-			it=(KviChannelTreeWidgetItem *)m_pTreeWidget->topLevelItem(i);
+			it = (KviChannelTreeWidgetItem *)m_pTreeWidget->topLevelItem(i);
 			cfg.setGroup(it->text(0));
 			// Write properties
 			cfg.writeEntry("topic",it->text(2));
@@ -351,10 +369,9 @@ void KviListWindow::exportList()
 
 void KviListWindow::importList()
 {
-
 	QString szFile;
-	if(KviFileDialog::askForOpenFileName(szFile,__tr2qs("Choose filename"),QString(),KVI_FILTER_CONFIG,false,
-		false,this))
+
+	if(KviFileDialog::askForOpenFileName(szFile,__tr2qs("Choose filename"),QString(),KVI_FILTER_CONFIG,false,false,this))
 	{
 		if(m_pConsole->isConnected())
 		{
@@ -382,13 +399,19 @@ void KviListWindow::importList()
 	}
 }
 
-void KviListWindow::control(int message)
+void KviListWindow::control(int iMsg)
 {
-	switch(message)
+	switch(iMsg)
 	{
-		case EXTERNAL_SERVER_DATA_PARSER_CONTROL_RESET:       reset();       break;
-		case EXTERNAL_SERVER_DATA_PARSER_CONTROL_STARTOFDATA: startOfList(); break;
-		case EXTERNAL_SERVER_DATA_PARSER_CONTROL_ENDOFDATA:   endOfList();   break;
+		case EXTERNAL_SERVER_DATA_PARSER_CONTROL_RESET:
+			reset();
+		break;
+		case EXTERNAL_SERVER_DATA_PARSER_CONTROL_STARTOFDATA:
+			startOfList();
+		break;
+		case EXTERNAL_SERVER_DATA_PARSER_CONTROL_ENDOFDATA:
+			endOfList();
+		break;
 	}
 }
 
@@ -420,7 +443,7 @@ void KviListWindow::startOfList()
 	m_pRequestButton->setEnabled(false);
 }
 
-void KviListWindow::processData(KviIrcMessage *msg)
+void KviListWindow::processData(KviIrcMessage * pMsg)
 {
 	if(!m_pFlushTimer)
 	{
@@ -430,19 +453,17 @@ void KviListWindow::processData(KviIrcMessage *msg)
 		m_pRequestButton->setEnabled(false);
 	}
 
-	QString sz2 = msg->connection()->decodeText(msg->safeParam(2));
-
 	m_pItemList->append(
 		new KviChannelTreeWidgetItemData(
-			msg->connection()->decodeText(msg->safeParam(1)),
-			msg->connection()->decodeText(msg->safeParam(2)),
-			msg->connection()->decodeText(msg->safeTrailing()))
+			pMsg->connection()->decodeText(pMsg->safeParam(1)),
+			pMsg->connection()->decodeText(pMsg->safeParam(2)),
+			pMsg->connection()->decodeText(pMsg->safeTrailing()))
 	);
 
 	if(_OUTPUT_VERBOSE)
 	{
-		QString zzz = msg->connection()->decodeText(msg->allParams());
-		output(KVI_OUT_LIST,__tr2qs("Processing list: %Q"),&zzz);
+		QString szTmp = pMsg->connection()->decodeText(pMsg->allParams());
+		output(KVI_OUT_LIST,__tr2qs("Processing list: %Q"),&szTmp);
 	}
 }
 
@@ -458,13 +479,16 @@ void KviListWindow::flush()
 	m_pTreeWidget->viewport()->update();
 }
 
-void KviListWindow::itemDoubleClicked(KviTalTreeWidgetItem *it, int)
+void KviListWindow::itemDoubleClicked(KviTalTreeWidgetItem * it, int)
 {
-	QString sz = it->text(0);
-	if(sz.isEmpty())return;
-	if(!connection())return;
-	KviQCString dat = connection()->encodeText(sz);
-	if(!dat.data())return;
+	QString szText = it->text(0);
+
+	if(szText.isEmpty()) return;
+	if(!connection()) return;
+
+	QByteArray dat = connection()->encodeText(szText);
+	if(!dat.data()) return;
+
 	m_pConsole->connection()->sendFmtData("join %s",dat.data());
 }
 
diff --git a/src/modules/list/listwindow.h b/src/modules/list/listwindow.h
index a28f8cadc..45a229a6d 100644
--- a/src/modules/list/listwindow.h
+++ b/src/modules/list/listwindow.h
@@ -40,23 +40,21 @@
 
 class KviThemedLabel;
 
-
 class KviChannelTreeWidgetItemDelegate : public QItemDelegate
 {
 public:
-	KviChannelTreeWidgetItemDelegate(KviTalTreeWidget * pWidget=0)
-		: QItemDelegate(pWidget) {};
-	~KviChannelTreeWidgetItemDelegate(){};
-	void paint( QPainter * painter, const QStyleOptionViewItem & option, const QModelIndex & index ) const;
-
+	KviChannelTreeWidgetItemDelegate(KviTalTreeWidget * pWidget = 0);
+	~KviChannelTreeWidgetItemDelegate();
+	void paint(QPainter * pPainter, const QStyleOptionViewItem & option, const QModelIndex & index ) const;
 };
+
 class KviChannelTreeWidgetItemData
 {
 	friend class KviChannelTreeWidgetItem;
 	friend class KviListWindow;
 	friend class KviChannelTreeWidgetItemDelegate;
 public:
-	KviChannelTreeWidgetItemData(const QString &szChan,const QString &szUsers,const QString &szTopic);
+	KviChannelTreeWidgetItemData(const QString & szChan, const QString & szUsers, const QString & szTopic);
 	~KviChannelTreeWidgetItemData();
 protected:
 	QString m_szChan;
@@ -68,52 +66,50 @@ class KviChannelTreeWidgetItem : public KviTalTreeWidgetItem
 {
 	friend class KviListWindow;
 public:
-	KviChannelTreeWidgetItem(KviTalTreeWidget * v,KviChannelTreeWidgetItemData * pData);
+	KviChannelTreeWidgetItem(KviTalTreeWidget * pWidget, KviChannelTreeWidgetItemData * pData);
 	~KviChannelTreeWidgetItem();
 public:
-	int width ( const QFontMetrics & fm, const KviTalTreeWidget * lv, int column ) const;
-	bool operator< ( const KviTalTreeWidgetItem & other ) const;
+	int width (const QFontMetrics & fm, const KviTalTreeWidget * pWidget, int iColumn) const;
+	bool operator<(const KviTalTreeWidgetItem & other) const;
 };
 
-
 class KviListWindow : public KviWindow, public KviExternalServerDataParser
 {
 	Q_OBJECT
 public:
-	KviListWindow(KviFrame * lpFrm,KviConsole * lpConsole);
+	KviListWindow(KviFrame * lpFrm, KviConsole * lpConsole);
 	~KviListWindow();
 protected:
-	QSplitter          * m_pVertSplitter;
-	QSplitter          * m_pTopSplitter;
-	KviTalTreeWidget   * m_pTreeWidget;
-	QLineEdit          * m_pParamsEdit;
-	QToolButton        * m_pRequestButton;
-	QToolButton        * m_pStopListDownloadButton;
-	QToolButton        * m_pOpenButton;
-	QToolButton        * m_pSaveButton;
-	KviThemedLabel     * m_pInfoLabel;
-	QTimer             * m_pFlushTimer;
+	QSplitter                                    * m_pVertSplitter;
+	QSplitter                                    * m_pTopSplitter;
+	KviTalTreeWidget                             * m_pTreeWidget;
+	QLineEdit                                    * m_pParamsEdit;
+	QToolButton                                  * m_pRequestButton;
+	QToolButton                                  * m_pStopListDownloadButton;
+	QToolButton                                  * m_pOpenButton;
+	QToolButton                                  * m_pSaveButton;
+	KviThemedLabel                               * m_pInfoLabel;
+	QTimer                                       * m_pFlushTimer;
 	KviPointerList<KviChannelTreeWidgetItemData> * m_pItemList;
 public: // Methods
-	virtual void control(int msg);
-	virtual void processData(KviIrcMessage * msg);
+	virtual void control(int iMsg);
+	virtual void processData(KviIrcMessage * pMsg);
 	virtual void die();
+	virtual QSize sizeHint() const;
 protected:
 	virtual QPixmap * myIconPtr();
 	virtual void fillCaptionBuffers();
 	virtual void applyOptions();
-	virtual void resizeEvent(QResizeEvent *e);
-	virtual void getBaseLogFileName(QString &buffer);
+	virtual void resizeEvent(QResizeEvent * e);
+	virtual void getBaseLogFileName(QString & szBuffer);
 protected slots:
 	void flush();
-	void itemDoubleClicked(QTreeWidgetItem *it, int);
+	void itemDoubleClicked(QTreeWidgetItem * it, int);
 	void requestList();
 	void stoplistdownload();
 	void connectionStateChange();
 	void exportList();
 	void importList();
-public:
-	virtual QSize sizeHint() const;
 private:
 	void reset();
 	void endOfList();
diff --git a/src/modules/logview/logviewmdiwindow.cpp b/src/modules/logview/logviewmdiwindow.cpp
index dc61f2038..fff5c1cb3 100644
--- a/src/modules/logview/logviewmdiwindow.cpp
+++ b/src/modules/logview/logviewmdiwindow.cpp
@@ -33,7 +33,6 @@
 #include "kvi_frame.h"
 #include "kvi_ircview.h"
 #include "kvi_qstring.h"
-#include "kvi_qcstring.h"
 #include "kvi_app.h"
 #include "kvi_fileutils.h"
 #include "kvi_tal_popupmenu.h"
@@ -55,6 +54,7 @@
 #include <QLabel>
 #include <QShortcut>
 #include <QMouseEvent>
+#include <QByteArray>
 
 #ifdef COMPILE_ZLIB_SUPPORT
 	#include <zlib.h>
@@ -451,7 +451,7 @@ void KviLogFile::getText(QString & text,const QString& logDir){
 		{
 			char buff[1025];
 			int len;
-			KviQCString data;
+			QByteArray data;
 			//QCString data;
 			len=gzread(file,buff,1024);
 			while(len>0)
diff --git a/src/modules/mediaplayer/mp_interface.cpp b/src/modules/mediaplayer/mp_interface.cpp
index 452283478..fb108ee49 100644
--- a/src/modules/mediaplayer/mp_interface.cpp
+++ b/src/modules/mediaplayer/mp_interface.cpp
@@ -114,25 +114,25 @@ QString KviMediaPlayerInterface::amipEval(const QString &)
 QString KviMediaPlayerInterface::artist()
 {
 	SCAN_MP3_FILE
-	return pCodec->toUnicode(KviQCString(mp3.id3.artist));
+	return pCodec->toUnicode(QByteArray(mp3.id3.artist));
 }
 
 QString KviMediaPlayerInterface::title()
 {
 	SCAN_MP3_FILE
-	return pCodec->toUnicode(KviQCString(mp3.id3.title));
+	return pCodec->toUnicode(QByteArray(mp3.id3.title));
 }
 
 QString KviMediaPlayerInterface::genre()
 {
 	SCAN_MP3_FILE
-	return pCodec->toUnicode(KviQCString(get_typegenre(mp3.id3.genre[0])));
+	return pCodec->toUnicode(QByteArray(get_typegenre(mp3.id3.genre[0])));
 }
 
 QString KviMediaPlayerInterface::comment()
 {
 	SCAN_MP3_FILE
-	return pCodec->toUnicode(KviQCString(mp3.id3.comment));
+	return pCodec->toUnicode(QByteArray(mp3.id3.comment));
 }
 
 QString KviMediaPlayerInterface::year()
@@ -144,7 +144,7 @@ QString KviMediaPlayerInterface::year()
 QString KviMediaPlayerInterface::album()
 {
 	SCAN_MP3_FILE
-	return pCodec->toUnicode(KviQCString(mp3.id3.album));
+	return pCodec->toUnicode(QByteArray(mp3.id3.album));
 }
 
 bool KviMediaPlayerInterface::playMrl(const QString &)
diff --git a/src/modules/mediaplayer/mp_xmmsinterface.cpp b/src/modules/mediaplayer/mp_xmmsinterface.cpp
index c6f0c5574..37d13f1b2 100644
--- a/src/modules/mediaplayer/mp_xmmsinterface.cpp
+++ b/src/modules/mediaplayer/mp_xmmsinterface.cpp
@@ -279,7 +279,7 @@ KviMediaPlayerInterface::PlayerStatus KviXmmsInterface::status()
 bool KviXmmsInterface::playMrl(const QString &mrl)
 {
 	void (*sym)(int,char *) = (void (*)(int,char *))lookupSymbol("xmms_remote_playlist_add_url_string");
-	KviQCString tmp = mrl.toLocal8Bit();
+	QByteArray tmp = mrl.toLocal8Bit();
 	if(!tmp.isEmpty())
 	{
 		if(sym)
diff --git a/src/modules/objects/class_socket.cpp b/src/modules/objects/class_socket.cpp
index ffbb0d6e0..e2453afdb 100644
--- a/src/modules/objects/class_socket.cpp
+++ b/src/modules/objects/class_socket.cpp
@@ -22,10 +22,13 @@
 //
 //=============================================================================
 
-#include "kvi_settings.h"
-#include "kvi_qstring.h"
+#include "class_socket.h"
 #include "class_memorybuffer.h"
 #include "class_file.h"
+
+#include "kvi_settings.h"
+#include "kvi_qstring.h"
+
 #define _KVI_DEBUG_CHECK_RANGE_
 #include "kvi_debug.h"
 
@@ -40,9 +43,8 @@
 #include "kvi_malloc.h"
 #include "kvi_memmove.h"
 #include "kvi_databuffer.h"
-#include "kvi_qcstring.h"
 
-#include "class_socket.h"
+#include <QByteArray>
 
 //#include <stdlib.h>
 
@@ -531,7 +533,7 @@ KVSO_CLASS_FUNCTION(socket,write)
 		pVariantData->asString(szData);
 		if(!KviFileUtils::fileExists(szData))
 		{
-			KviQCString szData8 = szData.toUtf8();
+			QByteArray szData8 = szData.toUtf8();
 			if(szData8.length() > 0)
 			{
 					m_pOutBuffer->append((const unsigned char*)szData8.data(),szData8.length());
diff --git a/src/modules/objects/class_xmlreader.cpp b/src/modules/objects/class_xmlreader.cpp
index f49ea7e64..4e2a1605d 100644
--- a/src/modules/objects/class_xmlreader.cpp
+++ b/src/modules/objects/class_xmlreader.cpp
@@ -347,7 +347,7 @@ KVSO_CLASS_FUNCTION(xmlreader,parse)
 		// We have a problem here.. most kvirc functions already interpret the data
 		// read from files. We should have binary data handling features to get this to work correctly.
 		// The following snippet of code tries to provide a best-effort workaround.
-		KviQCString utf8data = KviQString::toUtf8(szString);
+		QByteArray utf8data = KviQString::toUtf8(szString);
 		QByteArray data = utf8data;
 		data.truncate(utf8data.length()); // don't include the null terminator in data
 		source.setData(data);
diff --git a/src/modules/perlcore/libkviperlcore.cpp b/src/modules/perlcore/libkviperlcore.cpp
index 2909d388a..29c3ce32d 100644
--- a/src/modules/perlcore/libkviperlcore.cpp
+++ b/src/modules/perlcore/libkviperlcore.cpp
@@ -31,9 +31,10 @@
 #include "kvi_kvs_script.h"
 #include "kvi_kvs_variant.h"
 #include "kvi_userinput.h"
-#include "kvi_qcstring.h"
 #include "kvi_pointerhashtable.h"
 
+#include <QByteArray>
+
 #ifdef DEBUG
 	#undef DEBUG
 #endif
@@ -239,7 +240,7 @@ bool KviPerlInterpreter::execute(
 
 	g_lWarningList.clear();
 
-	KviQCString szUtf8 = szCode.toUtf8();
+	QByteArray szUtf8 = szCode.toUtf8();
 	PERL_SET_CONTEXT(m_pInterpreter);
 
 	// clear the _ array
diff --git a/src/modules/system/libkvisystem.cpp b/src/modules/system/libkvisystem.cpp
index 364079740..fd27085b8 100644
--- a/src/modules/system/libkvisystem.cpp
+++ b/src/modules/system/libkvisystem.cpp
@@ -30,14 +30,13 @@
 #include "kvi_string.h"
 #include "kvi_thread.h"
 #include "kvi_locale.h"
-#include "kvi_qcstring.h"
 #include "kvi_app.h"
 #include "kvi_env.h"
 #include "kvi_osinfo.h"
-#include "kvi_qcstring.h"
 #include "kvi_modulemanager.h"
 
 #include <QClipboard>
+#include <QByteArray>
 
 #if !defined(COMPILE_ON_WINDOWS) && !defined(COMPILE_ON_MINGW)
 	#include <sys/utsname.h>
@@ -206,7 +205,7 @@ static bool system_kvs_fnc_getenv(KviKvsModuleFunctionCall *c)
 		KVSM_PARAMETER("variable",KVS_PT_NONEMPTYSTRING,0,szVariable)
 	KVSM_PARAMETERS_END(c)
 
-	KviQCString szVar = szVariable.toLocal8Bit();
+	QByteArray szVar = szVariable.toLocal8Bit();
 /*#ifdef COMPILE_ON_WINDOWS
 	QString env= getenv(szVar.data());
 	QString def= __tr2qs("No environment variable found, please don't use the %% in the request");
@@ -428,7 +427,7 @@ static bool system_kvs_fnc_hostname(KviKvsModuleFunctionCall *c)
 		The parameters MUST be in the form "type=value"
 		where "type" is the C++ type of the parameter and value
 		is the string rappresentation of the parameter data. Currently
-		KVIrc supports only QString,KviQCString,bool,int and uint data types.[br]
+		KVIrc supports only QString,QByteArray,bool,int and uint data types.[br]
 		The returned value is the string rappresentation of the returned
 		data if the return type is known, otherwise it is the name of the data type returned.
 		[br]
@@ -500,9 +499,9 @@ static bool system_kvs_fnc_dbus(KviKvsModuleFunctionCall *c)
 		{
 			QString ddd = tmp.ptr();
 			ds << ddd;
-		} else if(kvi_strEqualCI("KviQCString",szType.ptr()))
+		} else if(kvi_strEqualCI("QByteArray",szType.ptr()))
 		{
-			KviQCString qcs = tmp.ptr();
+			QByteArray qcs = tmp.ptr();
 			ds << qcs;
 		} else if(kvi_strEqualCI("bool",szType.ptr()))
 		{
@@ -610,8 +609,8 @@ static bool system_kvs_cmd_setenv(KviKvsModuleCommandCall * c)
 		KVSM_PARAMETER("value",KVS_PT_STRING,KVS_PF_OPTIONAL,szValue)
 	KVSM_PARAMETERS_END(c)
 
-	KviQCString szVar = szVariable.toLocal8Bit();
-	KviQCString szVal = szValue.toLocal8Bit();
+	QByteArray szVar = szVariable.toLocal8Bit();
+	QByteArray szVal = szValue.toLocal8Bit();
 
 	if(szVal.isEmpty())kvi_unsetenv(szVar.data());
 	else
@@ -707,7 +706,7 @@ static bool system_kvs_cmd_runcmd(KviKvsModuleCommandCall *c)
 	// check for empty szCommand
 	if(!szCommand.isEmpty())
 	{
-		KviQCString szCmd = szCommand.toLocal8Bit();
+		QByteArray szCmd = szCommand.toLocal8Bit();
 #ifdef COMPILE_KDE_SUPPORT          // We have invokeTerminal().
 		KToolInvocation::invokeTerminal(szCmd.data());
 #else                               // No invokeTerminal() for us, we'll use a