Beginning of 'the big rename & cleanup'. File names should match class names, when possible. Move classes to one per file. Move C functions to namespaces, if possible. Kill some abbreviations...

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

918 files changed, 4311 insertions, 4505 deletions

diff --git a/src/kvilib/CMakeLists.txt b/src/kvilib/CMakeLists.txt
index 77db1bb55..88006c468 100644
--- a/src/kvilib/CMakeLists.txt
+++ b/src/kvilib/CMakeLists.txt
@@ -14,16 +14,16 @@ INCLUDE_DIRECTORIES(
 # Please note that the sources have alphabetic order here
 
 SET(kvilib_MOC_HDRS
-	ext/kvi_animatedpixmap.h
-	ext/kvi_animatedpixmapcache.h
-	ext/kvi_crypt.h
-	ext/kvi_regusersdb.h
-	ext/kvi_sharedfiles.h
-	irc/kvi_ircuserdb.h
+	ext/KviAnimatedPixmap.h
+	ext/KviAnimatedPixmapCache.h
+	ext/KviCryptEngine.h
+	ext/KviRegisteredUserDataBase.h
+	ext/KviSharedFilesManager.h
+	irc/KviIrcUserDataBase.h
 	net/kvi_dns.h
 	net/kvi_http.h
-	system/kvi_locale.h
-	system/kvi_thread.h
+	system/KviLocale.h
+	system/KviThread.h
 	tal/kvi_tal_application.h
 	tal/kvi_tal_filedialog.h
 	tal/kvi_tal_groupbox.h
@@ -42,7 +42,7 @@ SET(kvilib_MOC_HDRS
 
 IF(COMPILE_DBUS_SUPPORT)
 	LIST(APPEND kvilib_MOC_HDRS
-		ext/kvi_dbusadaptor.h
+		ext/KviDbusAdaptor.h
 	)
 ENDIF()
 
@@ -57,46 +57,45 @@ ENDIF()
 SET(kvilib_SRCS
 	config/kvi_buildinfo.cpp
 	core/kvi_error.cpp
-	core/kvi_heapobject.cpp
+	core/KviHeapObject.cpp
 	core/kvi_hstrEqualCIN.cpp
-	core/kvi_malloc.cpp
+	core/KviMemory.cpp
 	core/kvi_memmove.cpp
-	core/kvi_qstring.cpp
-	core/kvi_string.cpp
-	ext/kvi_cmdformatter.cpp
-	ext/kvi_config.cpp
-	ext/kvi_crypt.cpp
-	ext/kvi_databuffer.cpp
-	ext/kvi_dbusadaptor.cpp
-	ext/kvi_debugcontext.cpp
-	ext/kvi_garbage.cpp
-	ext/kvi_mediatype.cpp
-	ext/kvi_miscutils.cpp
-	ext/kvi_msgtype.cpp
-	ext/kvi_osinfo.cpp
-	ext/kvi_pixmap.cpp
-	ext/kvi_animatedpixmap.cpp
-	ext/kvi_animatedpixmapcache.cpp
-	ext/kvi_nickcolors.cpp
-	ext/kvi_proxydb.cpp
-	ext/kvi_regchan.cpp
-	ext/kvi_regusersdb.cpp
-	ext/kvi_sharedfiles.cpp
-	ext/kvi_stringconversion.cpp
-	file/kvi_file.cpp
-	file/kvi_fileutils.cpp
-	file/kvi_packagefile.cpp
-	irc/kvi_avatar.cpp
-	irc/kvi_avatarcache.cpp
-	irc/kvi_identityprofile.cpp
-	irc/kvi_ircmask.cpp
-	irc/kvi_ircserver.cpp
-	irc/kvi_ircserverdb.cpp
-	irc/kvi_ircuserdb.cpp
-	irc/kvi_mirccntrl.cpp
-	irc/kvi_network.cpp
-	irc/kvi_nickserv.cpp
-	irc/kvi_useridentity.cpp
+	core/KviQString.cpp
+	core/KviCString.cpp
+	ext/KviCommandFormatter.cpp
+	ext/KviConfigurationFile.cpp
+	ext/KviCryptEngine.cpp
+	ext/KviDataBuffer.cpp
+	ext/KviDbusAdaptor.cpp
+	ext/KviDebugContext.cpp
+	ext/KviMediaType.cpp
+	ext/KviMiscUtils.cpp
+	ext/KviMessageTypeSettings.cpp
+	ext/KviOsInfo.cpp
+	ext/KviPixmap.cpp
+	ext/KviAnimatedPixmap.cpp
+	ext/KviAnimatedPixmapCache.cpp
+	ext/KviNickColors.cpp
+	ext/KviProxyDataBase.cpp
+	ext/KviRegisteredChannel.cpp
+	ext/KviRegisteredUserDataBase.cpp
+	ext/KviSharedFilesManager.cpp
+	ext/KviStringConversion.cpp
+	file/KviFile.cpp
+	file/KviFileUtils.cpp
+	file/KviPackageFile.cpp
+	irc/KviAvatar.cpp
+	irc/KviAvatarCache.cpp
+	irc/KviIdentityProfile.cpp
+	irc/KviIrcMask.cpp
+	irc/KviIrcServer.cpp
+	irc/KviIrcServerDataBase.cpp
+	irc/KviIrcUserDataBase.cpp
+	irc/KviMircCntrl.cpp
+	irc/KviNetwork.cpp
+	irc/KviNickServRuleSet.cpp
+	irc/KviUserIdentity.cpp
 	net/kvi_dns.cpp
 	net/kvi_http.cpp
 	net/kvi_netutils.cpp
@@ -104,10 +103,10 @@ SET(kvilib_SRCS
 	net/kvi_socket.cpp
 	net/kvi_ssl.cpp
 	net/kvi_url.cpp
-	system/kvi_env.cpp
-	system/kvi_locale.cpp
-	system/kvi_thread.cpp
-	system/kvi_time.cpp
+	system/KviEnvironment.cpp
+	system/KviLocale.cpp
+	system/KviThread.cpp
+	system/KviTimeUtils.cpp
 	tal/kvi_tal_application.cpp
 	tal/kvi_tal_filedialog.cpp
 	tal/kvi_tal_groupbox.cpp
@@ -138,7 +137,7 @@ ENDIF()
 
 IF(NOT DEFINED COMPILE_DISABLE_OGG_THEORA)
 	LIST(APPEND kvilib_SRCS
-		ext/kvi_oggtheora.cpp
+		ext/KviTheoraDecoder.cpp
 	)
 ENDIF()
 
diff --git a/src/kvilib/config/kvi_confignames.h b/src/kvilib/config/kvi_confignames.h
index 8e227f0bc..65a90cb48 100644
--- a/src/kvilib/config/kvi_confignames.h
+++ b/src/kvilib/config/kvi_confignames.h
@@ -7,7 +7,7 @@
 //   Creation date : Wed Oct 18 2000 14:16:22 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
diff --git a/src/kvilib/config/kvi_debug.h b/src/kvilib/config/kvi_debug.h
index 7e6b2e051..1b03dfdae 100644
--- a/src/kvilib/config/kvi_debug.h
+++ b/src/kvilib/config/kvi_debug.h
@@ -7,7 +7,7 @@
 //   Creation date : Fri Mar 19 1999 03:10:39 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 1999-2009 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 1999-2010 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
@@ -108,7 +108,7 @@
 				} \
 			} while(0)
 
-	#include "kvi_debugcontext.h"
+	#include "KviDebugContext.h"
 
 	// The following two macros are used to create unique variable names
 	// by the means of the __LINE__ builtin macro.
diff --git a/src/kvilib/config/kvi_defaults.h b/src/kvilib/config/kvi_defaults.h
index 94bd7af79..46e28cbcc 100644
--- a/src/kvilib/config/kvi_defaults.h
+++ b/src/kvilib/config/kvi_defaults.h
@@ -7,7 +7,7 @@
 //   Creation date : Wed Jun 21 2000 13:23:13 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
diff --git a/src/kvilib/config/kvi_settings.h b/src/kvilib/config/kvi_settings.h
index 73e076cbd..d2024c386 100644
--- a/src/kvilib/config/kvi_settings.h
+++ b/src/kvilib/config/kvi_settings.h
@@ -7,7 +7,7 @@
 //   Creation date : Fri Mar 19 1999 05:21:13 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 1999-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 1999-2010 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
diff --git a/src/kvilib/config/kvi_sourcesdate.h b/src/kvilib/config/kvi_sourcesdate.h
index b510f6969..dfe7de615 100644
--- a/src/kvilib/config/kvi_sourcesdate.h
+++ b/src/kvilib/config/kvi_sourcesdate.h
@@ -6,7 +6,7 @@
 //   Creation date : Sun Mar 5 2006 23:22:22 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2006-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2006-2010 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
diff --git a/src/kvilib/core/kvi_string.cpp b/src/kvilib/core/KviCString.cpp
index 256731bd0..fb24e87d5 100644
--- a/src/kvilib/core/kvi_string.cpp
+++ b/src/kvilib/core/KviCString.cpp
@@ -25,12 +25,12 @@
 #include "kvi_debug.h"
 
 #define _KVI_STRING_CPP_
-#include "kvi_string.h"
+#include "KviCString.h"
 
 #include "kvi_memmove.h"
-#include "kvi_malloc.h"
 
-#include "kvi_qstring.h"
+#include "KviMemory.h"
+#include "KviQString.h"
 
 static char hexdigits[16] = { '0','1','2','3','4','5','6','7','8','9','a','b','c','d','e','f' };
 
@@ -53,7 +53,7 @@ WORKING CODE, COMMENTED OUT BECAUSE NOT USED AND GENERATES WARNINGS
 
 // %w = kvi_wchar_t string (can't be null)
 
-// %S = Latin1 KviStr pointer (#ifdef WSTRINGCONFIG_USE_KVISTR) : can't be NULL!
+// %S = Latin1 KviCString pointer (#ifdef WSTRINGCONFIG_USE_KVISTR) : can't be NULL!
 // %W = KviWStr pointer : can't be NULL!
 // %Q = QString pointer : can't be NULL!
 
@@ -96,7 +96,7 @@ WORKING CODE, COMMENTED OUT BECAUSE NOT USED AND GENERATES WARNINGS
 			break; \
 			case 'S': \
 			{ \
-				KviStr * pString = kvi_va_arg(list,KviStr *); \
+				KviCString * pString = kvi_va_arg(list,KviCString *); \
 				char * argString = pString->ptr(); \
 				if(len <= ((int)(pString->len())))return (-1); \
 				while(*argString)*p++ = *argString++; \
@@ -631,27 +631,27 @@ bool kvi_matchWildExprWithTerminator(register const char *m1,register const char
 
 
 
-const char * kvi_extractToken(KviStr &str,const char *aux_ptr,char sep)
+const char * kvi_extractToken(KviCString &str,const char *aux_ptr,char sep)
 {
 	KVI_ASSERT(aux_ptr);
 	while(*aux_ptr && (*aux_ptr == sep))aux_ptr++;
 	const char *p=aux_ptr;
 	while(*p && (*p != sep))p++;
 	str.m_len=p-aux_ptr;
-	str.m_ptr = (char *)kvi_realloc(str.m_ptr,str.m_len+1);
+	str.m_ptr = (char *)KviMemory::reallocate(str.m_ptr,str.m_len+1);
 	kvi_fastmove(str.m_ptr,aux_ptr,str.m_len);
 	*(str.m_ptr+str.m_len)='\0';
 	while(*p && (*p == sep))p++;
 	return p;
 }
 
-const char * kvi_extractUpTo(KviStr &str,const char *aux_ptr,char sep)
+const char * kvi_extractUpTo(KviCString &str,const char *aux_ptr,char sep)
 {
 	KVI_ASSERT(aux_ptr);
 	const char *p=aux_ptr;
 	while(*p && (*p != sep))p++;
 	str.m_len=p-aux_ptr;
-	str.m_ptr = (char *)kvi_realloc(str.m_ptr,str.m_len+1);
+	str.m_ptr = (char *)KviMemory::reallocate(str.m_ptr,str.m_len+1);
 	kvi_fastmove(str.m_ptr,aux_ptr,str.m_len);
 	*(str.m_ptr+str.m_len)='\0';
 	return p;
@@ -1029,70 +1029,70 @@ int kvi_strMatchRevCS(const char *str1, const char *str2, int index)
 	}
 }
 
-KviStr::KviStr()
+KviCString::KviCString()
 {
-	m_ptr = (char *)kvi_malloc(1);
+	m_ptr = (char *)KviMemory::allocate(1);
 	*m_ptr = '\0';
 	m_len = 0;
 }
 
-KviStr::KviStr(const char *str)
+KviCString::KviCString(const char *str)
 {
 	//Deep copy constructor
 	if(str){
 		//Deep copy
 		m_len = (int)strlen(str);
-		m_ptr = (char *)kvi_malloc(m_len+1);
+		m_ptr = (char *)KviMemory::allocate(m_len+1);
 		kvi_fastmove(m_ptr,str,m_len+1);
 	} else {
-		m_ptr = (char *)kvi_malloc(1);
+		m_ptr = (char *)KviMemory::allocate(1);
 		*m_ptr = '\0';
 		m_len = 0;
 	}
 }
 
-KviStr::KviStr(const QByteArray &str)
+KviCString::KviCString(const QByteArray &str)
 {
 	//Deep copy constructor
 	if(str.data())
 	{
 		//Deep copy
 		m_len = str.length();
-		m_ptr = (char *)kvi_malloc(m_len+1);
+		m_ptr = (char *)KviMemory::allocate(m_len+1);
 		kvi_fastmove(m_ptr,str,m_len+1);
 	} else {
-		m_ptr = (char *)kvi_malloc(1);
+		m_ptr = (char *)KviMemory::allocate(1);
 		*m_ptr = '\0';
 		m_len = 0;
 	}
 }
 
 
-KviStr::KviStr(const char *str,int len)
+KviCString::KviCString(const char *str,int len)
 {
 	KVI_ASSERT(str);
 	//KVI_ASSERT(len <= ((int)strlen(str))); <-- we trust the user here (and a strlen() call may run AFTER len if data is not null terminated)
 	KVI_ASSERT(len >= 0);
 	m_len = len;
-	m_ptr = (char *)kvi_malloc(m_len+1);
+	m_ptr = (char *)KviMemory::allocate(m_len+1);
 	kvi_fastmove(m_ptr,str,m_len);
 	*(m_ptr+m_len) = '\0';
 }
 
-KviStr::KviStr(const char *bg,const char *end)
+KviCString::KviCString(const char *bg,const char *end)
 {
 	KVI_ASSERT(bg);
 	KVI_ASSERT(end);
 	KVI_ASSERT(bg <= end);
 	m_len = end-bg;
-	m_ptr = (char *)kvi_malloc(m_len +1);
+	m_ptr = (char *)KviMemory::allocate(m_len +1);
 	kvi_fastmove(m_ptr,bg,m_len);
 	*(m_ptr + m_len)='\0';
 }
 
-KviStr::KviStr(KviFormatConstructorTag,const char *fmt,...)
+KviCString::KviCString(KviFormatConstructorTag,const char *fmt,...)
 {
-	m_ptr=(char *)kvi_malloc(256);
+	m_ptr=(char *)KviMemory::allocate(256);
 	//First try
 	kvi_va_list list;
 	kvi_va_start(list,fmt);
@@ -1107,7 +1107,7 @@ KviStr::KviStr(KviFormatConstructorTag,const char *fmt,...)
 		do{ //we failed, so retry with 256 more chars
 			dummy+=256;
 			//realloc
-			m_ptr=(char *)kvi_realloc(m_ptr,dummy);
+			m_ptr=(char *)KviMemory::reallocate(m_ptr,dummy);
 			//print...
 			kvi_va_start(list,fmt);
 			m_len=kvi_vsnprintf(m_ptr,dummy,fmt,list);
@@ -1117,63 +1117,63 @@ KviStr::KviStr(KviFormatConstructorTag,const char *fmt,...)
 	//done...
 	//now m_len is the length of the written string not including the terminator...
 	//perfect! :)
-	m_ptr=(char *)kvi_realloc(m_ptr,m_len+1);
+	m_ptr=(char *)KviMemory::reallocate(m_ptr,m_len+1);
 }
 
-KviStr::KviStr(const KviStr &str)
+KviCString::KviCString(const KviCString &str)
 {
 	KVI_ASSERT(str.m_ptr);
 	m_len = str.m_len;
-	m_ptr = (char *)kvi_malloc(m_len+1);
+	m_ptr = (char *)KviMemory::allocate(m_len+1);
 	kvi_fastmove(m_ptr,str.m_ptr,m_len+1);
 }
 
-KviStr::KviStr(const QString &str)
+KviCString::KviCString(const QString &str)
 {
 	QByteArray sz = KviQString::toUtf8(str);
 	if(sz.length() > 0)
 	{
 		m_len = sz.length();
-		m_ptr = (char *)kvi_malloc(m_len+1);
+		m_ptr = (char *)KviMemory::allocate(m_len+1);
 		kvi_fastmove(m_ptr,sz.data(),m_len+1);
 	} else {
-		m_ptr = (char *)kvi_malloc(1);
+		m_ptr = (char *)KviMemory::allocate(1);
 		*m_ptr = '\0';
 		m_len = 0;
 	}
 }
 
-KviStr::KviStr(char c,int fillLen)
+KviCString::KviCString(char c,int fillLen)
 {
 	KVI_ASSERT(fillLen >= 0);
 	m_len = fillLen;
-	m_ptr = (char *)kvi_malloc(m_len+1);
+	m_ptr = (char *)KviMemory::allocate(m_len+1);
 	register char *p=m_ptr;
 	while(fillLen--)*p++=c;
 	*p='\0';
 }
 
 
-KviStr::KviStr(const kvi_wchar_t * unicode)
+KviCString::KviCString(const kvi_wchar_t * unicode)
 {
 	if(!unicode)
 	{
 		m_len = 0;
-		m_ptr = (char *)kvi_malloc(1);
+		m_ptr = (char *)KviMemory::allocate(1);
 		*m_ptr = 0;
 	} else {
 		m_len = kvi_wstrlen(unicode);
-		m_ptr = (char *)kvi_malloc(m_len + 1);
+		m_ptr = (char *)KviMemory::allocate(m_len + 1);
 		register char * p = m_ptr;
 		while(*unicode)*p++ = *unicode++;
 		*p = 0;
 	}
 }
 
-KviStr::KviStr(const kvi_wchar_t * unicode,int len)
+KviCString::KviCString(const kvi_wchar_t * unicode,int len)
 {
 	m_len = len;
-	m_ptr = (char *)kvi_malloc(m_len + 1);
+	m_ptr = (char *)KviMemory::allocate(m_len + 1);
 	register char * p = m_ptr;
 	char * end = p + len;
 	while(p != end)
@@ -1186,62 +1186,62 @@ KviStr::KviStr(const kvi_wchar_t * unicode,int len)
 
 
 
-KviStr::~KviStr()
+KviCString::~KviCString()
 {
-	kvi_free(m_ptr);
+	KviMemory::free(m_ptr);
 }
 
-void KviStr::setLength(int iLen)
+void KviCString::setLength(int iLen)
 {
 	KVI_ASSERT(iLen >= 0);
 	m_len = iLen;
-	m_ptr = (char *)kvi_realloc(m_ptr,m_len+1);
+	m_ptr = (char *)KviMemory::reallocate(m_ptr,m_len+1);
 	*(m_ptr + m_len) = '\0';
 }
 
-KviStr & KviStr::operator=(const KviStr &str)
+KviCString & KviCString::operator=(const KviCString &str)
 {
 	KVI_ASSERT(str.m_ptr);
 	KVI_ASSERT(str.m_ptr != m_ptr);
 	m_len = str.m_len;
-	m_ptr = (char *)kvi_realloc(m_ptr,m_len+1);
+	m_ptr = (char *)KviMemory::reallocate(m_ptr,m_len+1);
 	kvi_fastmove(m_ptr,str.m_ptr,m_len+1);
 	return (*this);
 }
 
-KviStr & KviStr::operator=(const QByteArray &str)
+KviCString & KviCString::operator=(const QByteArray &str)
 {
 	m_len = str.length();
-	m_ptr = (char *)kvi_realloc(m_ptr,m_len+1);
+	m_ptr = (char *)KviMemory::reallocate(m_ptr,m_len+1);
 	if(str.data())kvi_fastmove(m_ptr,str.data(),m_len+1);
 	else *m_ptr = 0;
 	return (*this);
 }
 
-KviStr & KviStr::operator=(const char *str)
+KviCString & KviCString::operator=(const char *str)
 {
 	//KVI_ASSERT(str);
 	if(str){
 		m_len = (int)strlen(str);
-		m_ptr = (char *)kvi_realloc(m_ptr,m_len+1);
+		m_ptr = (char *)KviMemory::reallocate(m_ptr,m_len+1);
 		kvi_memmove(m_ptr,str,m_len+1);
 	} else {
-		m_ptr = (char *)kvi_realloc(m_ptr,1);
+		m_ptr = (char *)KviMemory::reallocate(m_ptr,1);
 		*m_ptr = '\0';
 		m_len = 0;
 	}
 	return (*this);
 }
 
-void KviStr::clear()
+void KviCString::clear()
 {
-	m_ptr = (char *)kvi_realloc(m_ptr,1);
+	m_ptr = (char *)KviMemory::reallocate(m_ptr,1);
 	*m_ptr = '\0';
 	m_len = 0;
 }
 
 
-bool KviStr::hasNonWhiteSpaceData() const
+bool KviCString::hasNonWhiteSpaceData() const
 {
 	const char * aux = m_ptr;
 	while(*aux)
@@ -1252,11 +1252,11 @@ bool KviStr::hasNonWhiteSpaceData() const
 	return false;
 }
 
-void KviStr::bufferToHex(const char *buffer,int len)
+void KviCString::bufferToHex(const char *buffer,int len)
 {
 	KVI_ASSERT(buffer);
 	m_len = (len * 2);
-	m_ptr = (char *)kvi_realloc(m_ptr,m_len + 1);
+	m_ptr = (char *)KviMemory::reallocate(m_ptr,m_len + 1);
 	char * aux = m_ptr;
 	while(len)
 	{
@@ -1289,12 +1289,12 @@ static inline char get_decimal_from_hex_digit_char(char dgt)
 	return c;
 }
 
-int KviStr::hexToBuffer(char ** buffer,bool bNullToNewlines)
+int KviCString::hexToBuffer(char ** buffer,bool bNullToNewlines)
 {
 	int len;
 	if(m_len % 2)len = (m_len / 2) + 1;
 	else len = (m_len / 2);
-	*buffer = (char *)kvi_malloc(len);
+	*buffer = (char *)KviMemory::allocate(len);
 
 	char * ptr = *buffer;
 
@@ -1315,13 +1315,13 @@ int KviStr::hexToBuffer(char ** buffer,bool bNullToNewlines)
 }
 */
 
-int KviStr::hexToBuffer(char ** buffer,bool bNullToNewlines)
+int KviCString::hexToBuffer(char ** buffer,bool bNullToNewlines)
 {
 	*buffer = 0;
 	if((m_len == 0) || (m_len & 1))return -1; // this is an error
 	int len = (m_len / 2);
 	if(len < 1)return -1;
-	*buffer = (char *)kvi_malloc(len);
+	*buffer = (char *)KviMemory::allocate(len);
 
 	char * ptr = *buffer;
 	char * aux = m_ptr;
@@ -1333,7 +1333,7 @@ int KviStr::hexToBuffer(char ** buffer,bool bNullToNewlines)
 		*ptr = get_decimal_from_hex_digit_char(*aux) * 16;
 		if(*ptr == -1)
 		{
-			kvi_free(*buffer);
+			KviMemory::free(*buffer);
 			*buffer = 0;
 			return -1;
 		}
@@ -1341,7 +1341,7 @@ int KviStr::hexToBuffer(char ** buffer,bool bNullToNewlines)
 		aux2 = get_decimal_from_hex_digit_char(*aux);
 		if(aux2 == -1)
 		{
-			kvi_free(*buffer);
+			KviMemory::free(*buffer);
 			*buffer = 0;
 			return -1;
 		}
@@ -1356,12 +1356,12 @@ int KviStr::hexToBuffer(char ** buffer,bool bNullToNewlines)
 static const char * base64_chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
 
 
-void KviStr::bufferToBase64(const char * buffer,int len)
+void KviCString::bufferToBase64(const char * buffer,int len)
 {
 	m_len = (len / 3) << 2;
 	if(len % 3)m_len += 4;
 
-	m_ptr = (char *)kvi_realloc(m_ptr,m_len + 1);
+	m_ptr = (char *)KviMemory::reallocate(m_ptr,m_len + 1);
 
 	unsigned char aux1,aux2,aux3;
 	char * aux_ptr = m_ptr;
@@ -1410,12 +1410,12 @@ static unsigned char get_base64_idx(char base64)
 }
 
 
-int KviStr::base64ToBuffer(char ** buffer,bool)
+int KviCString::base64ToBuffer(char ** buffer,bool)
 {
 	*buffer = 0;
 	if((m_len == 0) || (m_len & 3))return -1; // this is an error
 	int len = (m_len >> 2) * 3;
-	*buffer = (char *)kvi_malloc(len);
+	*buffer = (char *)KviMemory::allocate(len);
 
 	char * auxBuf = *buffer;
 
@@ -1430,7 +1430,7 @@ int KviStr::base64ToBuffer(char ** buffer,bool)
 		{
 			// ops... there was a padding and we still have chars after it
 			// this is an error
-			kvi_free(*buffer);
+			KviMemory::free(*buffer);
 			*buffer = 0;
 			return -1;
 		}
@@ -1441,14 +1441,14 @@ int KviStr::base64ToBuffer(char ** buffer,bool)
 		if((aux3 > 64) || (aux4 > 64))
 		{
 			// error
-			kvi_free(*buffer);
+			KviMemory::free(*buffer);
 			*buffer = 0;
 			return -1;
 		}
 		if((aux1 | aux2) > 63)
 		{
 			// again error...impossible padding
-			kvi_free(*buffer);
+			KviMemory::free(*buffer);
 			*buffer = 0;
 			return -1;
 		}
@@ -1469,7 +1469,7 @@ int KviStr::base64ToBuffer(char ** buffer,bool)
 			if(aux3 == 64)
 			{
 				// error... impossible padding
-				kvi_free(*buffer);
+				KviMemory::free(*buffer);
 				*buffer = 0;
 				return -1;
 			} else {
@@ -1481,11 +1481,11 @@ int KviStr::base64ToBuffer(char ** buffer,bool)
 		}
 	}
 
-	if(newLen != len)*buffer = (char *)kvi_realloc(*buffer,newLen);
+	if(newLen != len)*buffer = (char *)KviMemory::reallocate(*buffer,newLen);
 	return newLen;
 }
 
-KviStr & KviStr::setStr(const char *str,int len)
+KviCString & KviCString::setStr(const char *str,int len)
 {
 	if(!str)
 	{
@@ -1495,85 +1495,85 @@ KviStr & KviStr::setStr(const char *str,int len)
 	int alen = (int)strlen(str);
 	if((len < 0) || (len > alen))m_len = alen;
 	else m_len = len;
-	m_ptr = (char *)kvi_realloc(m_ptr,m_len+1);
+	m_ptr = (char *)KviMemory::reallocate(m_ptr,m_len+1);
 	kvi_memmove(m_ptr,str,m_len);
 	*(m_ptr+m_len) = '\0';
 	return (*this);
 }
 
-KviStr & KviStr::operator=(const QString &str)
+KviCString & KviCString::operator=(const QString &str)
 {
 	QByteArray sz = KviQString::toUtf8(str);
 	if(sz.length() > 0){
 		m_len = sz.length();
-		m_ptr = (char *)kvi_realloc(m_ptr,m_len+1);
+		m_ptr = (char *)KviMemory::reallocate(m_ptr,m_len+1);
 		kvi_fastmove(m_ptr,sz.data(),m_len+1);
 	} else {
-		m_ptr = (char *)kvi_realloc(m_ptr,1);
+		m_ptr = (char *)KviMemory::reallocate(m_ptr,1);
 		*m_ptr = '\0';
 		m_len = 0;
 	}
 	return (*this);
 }
 
-KviStr & KviStr::operator=(char c)
+KviCString & KviCString::operator=(char c)
 {
 	m_len = 1;
-	m_ptr = (char *)kvi_realloc(m_ptr,2);
+	m_ptr = (char *)KviMemory::reallocate(m_ptr,2);
 	*m_ptr = c;
 	*(m_ptr+1)='\0';
 	return (*this);
 }
 
-void KviStr::append(char c)
+void KviCString::append(char c)
 {
-	m_ptr = (char *)kvi_realloc(m_ptr,m_len+2);
+	m_ptr = (char *)KviMemory::reallocate(m_ptr,m_len+2);
 	*(m_ptr+m_len)=c;
 	m_len++;
 	*(m_ptr+m_len)='\0';
 }
 
-void KviStr::append(const KviStr &str)
+void KviCString::append(const KviCString &str)
 {
 	KVI_ASSERT(str.m_ptr);
-	m_ptr = (char *)kvi_realloc(m_ptr,m_len+str.m_len+1);
+	m_ptr = (char *)KviMemory::reallocate(m_ptr,m_len+str.m_len+1);
 	kvi_fastmove((m_ptr+m_len),str.m_ptr,str.m_len+1);
 	m_len += str.m_len;
 }
 
-void KviStr::append(const char *str)
+void KviCString::append(const char *str)
 {
 	if(!str)return;
 	int len = (int)strlen(str);
-	m_ptr = (char *)kvi_realloc(m_ptr,m_len+len+1);
+	m_ptr = (char *)KviMemory::reallocate(m_ptr,m_len+len+1);
 	kvi_fastmove((m_ptr+m_len),str,len+1);
 	m_len += len;
 }
 
-void KviStr::append(const QString &str)
+void KviCString::append(const QString &str)
 {
 	QByteArray sz = KviQString::toUtf8(str);
 	if(sz.length() < 1)return;
-	m_ptr = (char *)kvi_realloc(m_ptr,m_len+sz.length()+1);
+	m_ptr = (char *)KviMemory::reallocate(m_ptr,m_len+sz.length()+1);
 	kvi_fastmove((m_ptr+m_len),sz.data(),sz.length()+1);
 	m_len += sz.length();
 }
 
-void KviStr::append(const char *str,int len)
+void KviCString::append(const char *str,int len)
 {
 	KVI_ASSERT(str);
 //	KVI_ASSERT(len <= ((int)strlen(str)));
 	KVI_ASSERT(len >= 0);
-	m_ptr = (char *)kvi_realloc(m_ptr,m_len+len+1);
+	m_ptr = (char *)KviMemory::reallocate(m_ptr,m_len+len+1);
 	kvi_fastmove((m_ptr+m_len),str,len);
 	m_len += len;
 	*(m_ptr + m_len)='\0';
 }
 
-void KviStr::append(KviFormatConstructorTag,const char *fmt,...)
+void KviCString::append(KviFormatConstructorTag,const char *fmt,...)
 {
 	int auxLen;
-	m_ptr=(char *)kvi_realloc(m_ptr,m_len + 256);
+	m_ptr=(char *)KviMemory::reallocate(m_ptr,m_len + 256);
 	//First try
 	kvi_va_list list;
 	kvi_va_start(list,fmt);
@@ -1588,7 +1588,7 @@ void KviStr::append(KviFormatConstructorTag,const char *fmt,...)
 		do{ //we failed, so retry with 256 more chars
 			dummy+=256;
 			//realloc
-			m_ptr=(char *)kvi_realloc(m_ptr,m_len + dummy);
+			m_ptr=(char *)KviMemory::reallocate(m_ptr,m_len + dummy);
 			//print...
 			kvi_va_start(list,fmt);
 			auxLen=kvi_vsnprintf(m_ptr + m_len,dummy,fmt,list);
@@ -1599,46 +1599,46 @@ void KviStr::append(KviFormatConstructorTag,const char *fmt,...)
 	//done...
 	//now m_len is the length of the written string not including the terminator...
 	//perfect! :)
-	m_ptr=(char *)kvi_realloc(m_ptr,m_len+1);
+	m_ptr=(char *)KviMemory::reallocate(m_ptr,m_len+1);
 }
 
-void KviStr::extractFromString(const char *begin,const char *end)
+void KviCString::extractFromString(const char *begin,const char *end)
 {
 	KVI_ASSERT(begin);
 	KVI_ASSERT(end);
 	KVI_ASSERT(end >= begin);
 	m_len = end-begin;
-	m_ptr = (char *)kvi_realloc(m_ptr,m_len+1);
+	m_ptr = (char *)KviMemory::reallocate(m_ptr,m_len+1);
 	kvi_fastmove(m_ptr,begin,m_len);
 	*(m_ptr + m_len)='\0';
 }
 
-void KviStr::prepend(const KviStr &str)
+void KviCString::prepend(const KviCString &str)
 {
 	KVI_ASSERT(str.m_ptr);
 	KVI_ASSERT(str.m_ptr != m_ptr);
-	m_ptr = (char *)kvi_realloc(m_ptr,m_len+str.m_len+1);
+	m_ptr = (char *)KviMemory::reallocate(m_ptr,m_len+str.m_len+1);
 	kvi_memmove((m_ptr+str.m_len),m_ptr,m_len+1); //move self
 	kvi_fastmove(m_ptr,str.m_ptr,str.m_len);
 	m_len += str.m_len;
 }
 
-void KviStr::prepend(const char *str)
+void KviCString::prepend(const char *str)
 {
 	if(!str)return;
 	int len = (int)strlen(str);
-	m_ptr = (char *)kvi_realloc(m_ptr,m_len+len+1);
+	m_ptr = (char *)KviMemory::reallocate(m_ptr,m_len+len+1);
 	kvi_memmove((m_ptr+len),m_ptr,m_len+1); //move self
 	kvi_fastmove(m_ptr,str,len);
 	m_len += len;
 }
 
-void KviStr::prepend(const char *str,int len)
+void KviCString::prepend(const char *str,int len)
 {
 	KVI_ASSERT(str);
 	KVI_ASSERT(len <= ((int)strlen(str)));
 	KVI_ASSERT(len >= 0);
-	m_ptr = (char *)kvi_realloc(m_ptr,m_len+len+1);
+	m_ptr = (char *)KviMemory::reallocate(m_ptr,m_len+len+1);
 	kvi_memmove((m_ptr+len),m_ptr,m_len+1); //move self
 	kvi_fastmove(m_ptr,str,len);
 	m_len += len;
@@ -1680,7 +1680,7 @@ unsigned char iso88591_toUpper_map[256]=
 	0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff
 };
 
-void KviStr::toUpperISO88591()
+void KviCString::toUpperISO88591()
 {
 	register char *p=m_ptr;
 	while(*p)
@@ -1690,7 +1690,7 @@ void KviStr::toUpperISO88591()
 	}
 }
 
-void KviStr::toUpper()
+void KviCString::toUpper()
 {
 	register char *p=m_ptr;
 	while(*p)
@@ -1736,7 +1736,7 @@ unsigned char iso88591_toLower_map[256]=
 	0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff
 };
 
-void KviStr::toLowerISO88591()
+void KviCString::toLowerISO88591()
 {
 	register char *p=m_ptr;
 	while(*p)
@@ -1747,7 +1747,7 @@ void KviStr::toLowerISO88591()
 }
 
 
-void KviStr::toLower()
+void KviCString::toLower()
 {
 	register char *p=m_ptr;
 	while(*p)
@@ -1757,94 +1757,94 @@ void KviStr::toLower()
 	}
 }
 
-KviStr KviStr::upper() const
+KviCString KviCString::upper() const
 {
-	KviStr tmp(*this);
+	KviCString tmp(*this);
 	tmp.toUpper();
 	return tmp;
 }
 
-KviStr KviStr::upperISO88591() const
+KviCString KviCString::upperISO88591() const
 {
-	KviStr tmp(*this);
+	KviCString tmp(*this);
 	tmp.toUpperISO88591();
 	return tmp;
 }
 
-KviStr KviStr::lower() const
+KviCString KviCString::lower() const
 {
-	KviStr tmp(*this);
+	KviCString tmp(*this);
 	tmp.toLower();
 	return tmp;
 }
 
-KviStr KviStr::lowerISO88591() const
+KviCString KviCString::lowerISO88591() const
 {
-	KviStr tmp(*this);
+	KviCString tmp(*this);
 	tmp.toLowerISO88591();
 	return tmp;
 }
 
-KviStr KviStr::left(int maxLen) const
+KviCString KviCString::left(int maxLen) const
 {
 	if(maxLen <= 0)
 	{
-		KviStr empty;
+		KviCString empty;
 		return empty;
 	}
 	if(maxLen > m_len)maxLen=m_len;
-	KviStr str(m_ptr,maxLen);
+	KviCString str(m_ptr,maxLen);
 	return str;
 }
 
-KviStr KviStr::right(int maxLen) const
+KviCString KviCString::right(int maxLen) const
 {
 	if(maxLen <= 0)
 	{
-		KviStr empty;
+		KviCString empty;
 		return empty;
 	}
 	if(maxLen > m_len)maxLen=m_len;
-	KviStr str((m_ptr+(m_len-maxLen)),maxLen);
+	KviCString str((m_ptr+(m_len-maxLen)),maxLen);
 	return str;
 }
 
-KviStr KviStr::middle(int idx,int maxLen) const
+KviCString KviCString::middle(int idx,int maxLen) const
 {
 	KVI_ASSERT(maxLen >= 0);
 	KVI_ASSERT(idx >= 0);
 	if((maxLen <= 0) || (idx < 0)){ //max len negative...invalid params
-		KviStr ret;
+		KviCString ret;
 		return ret;
 	}
 	if((maxLen + idx) <= m_len){ //valid params
-		KviStr str(m_ptr+idx,maxLen);
+		KviCString str(m_ptr+idx,maxLen);
 		return str;
 	}
 	if(idx < m_len){ //string shorter than requested
-		KviStr str(m_ptr+idx);
+		KviCString str(m_ptr+idx);
 		return str;
 	}
 	// idx out of bounds
-	KviStr ret;
+	KviCString ret;
 	return ret;
 }
 
-KviStr ** KviStr::splitToArray(char sep,int max,int * realCount) const
+KviCString ** KviCString::splitToArray(char sep,int max,int * realCount) const
 {
-	KviStr ** strings = (KviStr **)kvi_malloc(sizeof(KviStr *));
+	KviCString ** strings = (KviCString **)KviMemory::allocate(sizeof(KviCString *));
 	int number = 0;
 	char * ptr = m_ptr;
 	char * last = ptr;
 	while((max > 0) && *ptr)
 	{
-		strings = (KviStr **)kvi_realloc((void *)strings,sizeof(KviStr *) * (number + 2));
+		strings = (KviCString **)KviMemory::reallocate((void *)strings,sizeof(KviCString *) * (number + 2));
 		if(max > 1)
 		{
 			while(*ptr && (*ptr != sep))ptr++;
-			strings[number] = new KviStr(last,ptr - last);
+			strings[number] = new KviCString(last,ptr - last);
 		} else {
-			strings[number] = new KviStr(ptr);
+			strings[number] = new KviCString(ptr);
 		}
 		number++;
 		max--;
@@ -1861,10 +1861,10 @@ KviStr ** KviStr::splitToArray(char sep,int max,int * realCount) const
 /*
 	WORKING BUT UNUSED
 
-KviStr ** KviStr::splitToArray(const char * sep,int max,int * realCount) const
+KviCString ** KviCString::splitToArray(const char * sep,int max,int * realCount) const
 {
-	KviStr ** strings = (KviStr **)kvi_malloc(sizeof(KviStr *));
-	KviStr tmp = *this;
+	KviCString ** strings = (KviCString **)KviMemory::allocate(sizeof(KviCString *));
+	KviCString tmp = *this;
 	int idx = tmp.findFirstIdx(sep);
 	int number = 0;
 	int seplen = kvi_strLen(sep);
@@ -1872,8 +1872,8 @@ KviStr ** KviStr::splitToArray(const char * sep,int max,int * realCount) const
 
 	while(idx != -1)
 	{
-		strings = (KviStr **)kvi_realloc(sizeof(KviStr *) * (number + 2));
-		strings[number] = new KviStr(tmp.ptr(),idx);
+		strings = (KviCString **)KviMemory::reallocate(sizeof(KviCString *) * (number + 2));
+		strings[number] = new KviCString(tmp.ptr(),idx);
 		tmp.cutLeft(idx + seplen);
 		number++;
 		idx = tmp.findFirstIdx(sep);
@@ -1881,8 +1881,8 @@ KviStr ** KviStr::splitToArray(const char * sep,int max,int * realCount) const
 
 	if(tmp.hasData())
 	{
-		strings = (KviStr **)kvi_realloc(sizeof(KviStr *) * (number + 2));
-		strings[number] = new KviStr(tmp);
+		strings = (KviCString **)KviMemory::reallocate(sizeof(KviCString *) * (number + 2));
+		strings[number] = new KviCString(tmp);
 		number++;
 	}
 
@@ -1891,25 +1891,25 @@ KviStr ** KviStr::splitToArray(const char * sep,int max,int * realCount) const
 	return strings;
 }
 */
-void KviStr::freeArray(KviStr ** strings)
+void KviCString::freeArray(KviCString ** strings)
 {
 	if(!strings)return;
-	KviStr ** aux = strings;
+	KviCString ** aux = strings;
 	while(*aux)
 	{
-		delete (*aux); // delete (KviStr *)
+		delete (*aux); // delete (KviCString *)
 		aux++;
 	}
-	kvi_free(strings);
+	KviMemory::free(strings);
 }
 
-void KviStr::freeBuffer(char * buffer)
+void KviCString::freeBuffer(char * buffer)
 {
 	if(!buffer)return;
-	kvi_free(buffer);
+	KviMemory::free(buffer);
 }
 
-void KviStr::joinFromArray(KviStr ** strings,const char * sep,bool bLastSep)
+void KviCString::joinFromArray(KviCString ** strings,const char * sep,bool bLastSep)
 {
 	setLen(0);
 	if(!strings)return;
@@ -1927,12 +1927,12 @@ void KviStr::joinFromArray(KviStr ** strings,const char * sep,bool bLastSep)
 	}
 }
 
-KviStr & KviStr::insert(int idx,const char *data)
+KviCString & KviCString::insert(int idx,const char *data)
 {
 	KVI_ASSERT(data);
 	if(idx <= m_len){
 		int len = (int)strlen(data);
-		m_ptr = (char *)kvi_realloc(m_ptr,m_len+len+1);
+		m_ptr = (char *)KviMemory::reallocate(m_ptr,m_len+len+1);
 		kvi_memmove(m_ptr+idx+len,m_ptr+idx,(m_len - idx)+1);
 		kvi_fastmove(m_ptr+idx,data,len);
 		m_len+=len;
@@ -1940,10 +1940,10 @@ KviStr & KviStr::insert(int idx,const char *data)
 	return (*this);
 }
 
-KviStr & KviStr::insert(int idx,char c)
+KviCString & KviCString::insert(int idx,char c)
 {
 	if(idx <= m_len){
-		m_ptr = (char *)kvi_realloc(m_ptr,m_len+2);
+		m_ptr = (char *)KviMemory::reallocate(m_ptr,m_len+2);
 		kvi_memmove(m_ptr+idx+1,m_ptr+idx,(m_len - idx)+1);
 		m_len++;
 		*(m_ptr + idx) = c;
@@ -1953,7 +1953,7 @@ KviStr & KviStr::insert(int idx,char c)
 
 // FIXME: #warning "Double check the following two functions !!!"
 
-KviStr & KviStr::hexEncodeWithTable(const unsigned char table[256])
+KviCString & KviCString::hexEncodeWithTable(const unsigned char table[256])
 {
 	char * aux = m_ptr;
 	char * begin = m_ptr;
@@ -1966,7 +1966,7 @@ KviStr & KviStr::hexEncodeWithTable(const unsigned char table[256])
 		if(table[*((unsigned char *)aux)] || (*aux == '%'))
 		{
 			int len = aux - begin;
-			n = (char *)kvi_realloc(n,curSize + len + 3);
+			n = (char *)KviMemory::reallocate(n,curSize + len + 3);
 			kvi_memmove(n + curSize,begin,len);
 			curSize += len;
 
@@ -1984,20 +1984,20 @@ KviStr & KviStr::hexEncodeWithTable(const unsigned char table[256])
 	}
 
 	int len = aux - begin;
-	n = (char *)kvi_realloc(n,curSize + len + 1);
+	n = (char *)KviMemory::reallocate(n,curSize + len + 1);
 	kvi_memmove(n + curSize,begin,len);
 	curSize += len;
 
 	n[curSize] = '\0';
 
-	kvi_free((void *)m_ptr);
+	KviMemory::free((void *)m_ptr);
 	m_ptr = n;
 	m_len = curSize;
 
 	return (*this);
 }
 
-KviStr & KviStr::hexEncodeWhiteSpace()
+KviCString & KviCString::hexEncodeWhiteSpace()
 {
 	static unsigned char ascii_jump_table[256]=
 	{
@@ -2054,7 +2054,7 @@ KviStr & KviStr::hexEncodeWhiteSpace()
 	return hexEncodeWithTable(ascii_jump_table);
 }
 
-KviStr & KviStr::hexDecode(const char * pFrom)
+KviCString & KviCString::hexDecode(const char * pFrom)
 {
 	// WARNING: pFrom can be also m_ptr here!
 	const char * aux = pFrom;
@@ -2069,7 +2069,7 @@ KviStr & KviStr::hexDecode(const char * pFrom)
 		{
 			// move last block
 			int len = aux - begin;
-			n = (char *)kvi_realloc(n,curSize + len + 1);
+			n = (char *)KviMemory::reallocate(n,curSize + len + 1);
 			kvi_memmove(n + curSize,begin,len);
 			curSize += len;
 
@@ -2103,22 +2103,22 @@ KviStr & KviStr::hexDecode(const char * pFrom)
 	}
 
 	int len = aux - begin;
-	n = (char *)kvi_realloc(n,curSize + len + 2);
+	n = (char *)KviMemory::reallocate(n,curSize + len + 2);
 	kvi_memmove(n + curSize,begin,len);
 	curSize += len;
 	n[curSize] = '\0';
 
-	kvi_free((void *)m_ptr);
+	KviMemory::free((void *)m_ptr);
 	m_ptr = n;
 	m_len = curSize;
 
 	return (*this);
 }
 
-KviStr & KviStr::replaceAll(const char c,const char *str)
+KviCString & KviCString::replaceAll(const char c,const char *str)
 {
 	int idx = findFirstIdx(c);
-	KviStr tmp;
+	KviCString tmp;
 	while(idx >= 0){
 		if(idx > 0)tmp += left(idx);
 		cutLeft(idx+1);
@@ -2128,16 +2128,16 @@ KviStr & KviStr::replaceAll(const char c,const char *str)
 	tmp.append(*this);
 	// Now copy
 	m_len = tmp.m_len;
-	m_ptr = (char *)kvi_realloc(m_ptr,m_len+1);
+	m_ptr = (char *)KviMemory::reallocate(m_ptr,m_len+1);
 	kvi_fastmove(m_ptr,tmp.m_ptr,m_len+1);
 	return (*this);
 }
 
-KviStr & KviStr::replaceAll(const char *toFind,const char *str,bool bCaseS)
+KviCString & KviCString::replaceAll(const char *toFind,const char *str,bool bCaseS)
 {
 	int len = (int)strlen(toFind);
 	int idx = findFirstIdx(toFind,bCaseS);
-	KviStr tmp;
+	KviCString tmp;
 	while(idx >= 0)
 	{
 		if(idx > 0)tmp += left(idx);
@@ -2148,12 +2148,12 @@ KviStr & KviStr::replaceAll(const char *toFind,const char *str,bool bCaseS)
 	tmp.append(*this);
 	// Now copy
 	m_len = tmp.m_len;
-	m_ptr = (char *)kvi_realloc(m_ptr,m_len+1);
+	m_ptr = (char *)KviMemory::reallocate(m_ptr,m_len+1);
 	kvi_fastmove(m_ptr,tmp.m_ptr,m_len+1);
 	return (*this);
 }
 
-KviStr & KviStr::transliterate(const char * szToFind,const char * szReplacement)
+KviCString & KviCString::transliterate(const char * szToFind,const char * szReplacement)
 {
 	while(*szToFind && *szReplacement)
 	{
@@ -2170,7 +2170,7 @@ KviStr & KviStr::transliterate(const char * szToFind,const char * szReplacement)
 }
 
 
-int KviStr::occurences(char c,bool caseS) const
+int KviCString::occurences(char c,bool caseS) const
 {
 	register char *p = m_ptr;
 	int cnt=0;
@@ -2189,7 +2189,7 @@ int KviStr::occurences(char c,bool caseS) const
 	return cnt;
 }
 
-int KviStr::occurences(const char *str,bool caseS) const
+int KviCString::occurences(const char *str,bool caseS) const
 {
 	KVI_ASSERT(str);
 	register char *p = m_ptr;
@@ -2214,7 +2214,7 @@ int KviStr::occurences(const char *str,bool caseS) const
 	return cnt;
 }
 
-bool KviStr::contains(char c,bool caseS) const
+bool KviCString::contains(char c,bool caseS) const
 {
 	register char *p = m_ptr;
 	if(caseS)
@@ -2235,7 +2235,7 @@ bool KviStr::contains(char c,bool caseS) const
 	return false;
 }
 
-bool KviStr::contains(const char *str,bool caseS) const
+bool KviCString::contains(const char *str,bool caseS) const
 {
 	KVI_ASSERT(str);
 	register char *p = m_ptr;
@@ -2265,7 +2265,7 @@ bool KviStr::contains(const char *str,bool caseS) const
 }
 
 
-KviStr & KviStr::setNum(long num)
+KviCString & KviCString::setNum(long num)
 {
 	char numberBuffer[30];
 	bool bNegative = false;
@@ -2315,11 +2315,11 @@ KviStr & KviStr::setNum(long num)
 	m_len = pNumBuf - numberBuffer; //length of the number string
 	if(bNegative){
 		m_len++;
-		m_ptr = (char *)kvi_realloc(m_ptr,m_len+1);
+		m_ptr = (char *)KviMemory::reallocate(m_ptr,m_len+1);
 		p=m_ptr;
 		*p++='-';
 	} else {
-		m_ptr = (char *)kvi_realloc(m_ptr,m_len+1);
+		m_ptr = (char *)KviMemory::reallocate(m_ptr,m_len+1);
 		p=m_ptr;
 	}
 	do { *p++ = *--pNumBuf; } while(pNumBuf != numberBuffer);
@@ -2327,7 +2327,7 @@ KviStr & KviStr::setNum(long num)
 	return (*this);
 }
 
-KviStr & KviStr::setNum(unsigned long num)
+KviCString & KviCString::setNum(unsigned long num)
 {
 	char numberBuffer[30];
 	unsigned long tmp;
@@ -2342,14 +2342,14 @@ KviStr & KviStr::setNum(unsigned long num)
 
 	//copy now....
 	m_len = pNumBuf - numberBuffer; //length of the number string
-	m_ptr = (char *)kvi_realloc(m_ptr,m_len+1);
+	m_ptr = (char *)KviMemory::reallocate(m_ptr,m_len+1);
 	p=m_ptr;
 	do { *p++ = *--pNumBuf; } while(pNumBuf != numberBuffer);
 	*(m_ptr + m_len)='\0';
 	return (*this);
 }
 
-long long KviStr::toLongLong(bool *bOk) const
+long long KviCString::toLongLong(bool *bOk) const
 {
 	long long result = 0;
 	if(bOk)*bOk = false;
@@ -2376,7 +2376,7 @@ long long KviStr::toLongLong(bool *bOk) const
 	return 0;
 }
 
-unsigned long long KviStr::toULongLong(bool *bOk) const
+unsigned long long KviCString::toULongLong(bool *bOk) const
 {
 	unsigned long long result = 0;
 	if(bOk)*bOk = false;
@@ -2395,7 +2395,7 @@ unsigned long long KviStr::toULongLong(bool *bOk) const
 	return 0;
 }
 
-long KviStr::toLong(bool *bOk) const
+long KviCString::toLong(bool *bOk) const
 {
 	long result = 0;
 	if(bOk)*bOk = false;
@@ -2422,7 +2422,7 @@ long KviStr::toLong(bool *bOk) const
 	return 0;
 }
 
-unsigned long KviStr::toULong(bool *bOk) const
+unsigned long KviCString::toULong(bool *bOk) const
 {
 	unsigned long result = 0;
 	if(bOk)*bOk = false;
@@ -2441,7 +2441,7 @@ unsigned long KviStr::toULong(bool *bOk) const
 	return 0;
 }
 
-long KviStr::toLongExt(bool *bOk,int base)
+long KviCString::toLongExt(bool *bOk,int base)
 {
 	if(m_len == 0){
 		if(bOk)*bOk = false;
@@ -2466,7 +2466,7 @@ long KviStr::toLongExt(bool *bOk,int base)
 //
 //working code, but unused in kvirc
 //
-//unsigned long KviStr::toULongExt(bool *bOk = 0,int base = 0)
+//unsigned long KviCString::toULongExt(bool *bOk = 0,int base = 0)
 //{
 //	if(m_len == 0){
 //		if(bOk)*bOk = false;
@@ -2480,37 +2480,37 @@ long KviStr::toLongExt(bool *bOk,int base)
 //	return result;
 //}
 
-KviStr & KviStr::cutLeft(int len)
+KviCString & KviCString::cutLeft(int len)
 {
 	KVI_ASSERT(len >= 0);
 	if(len <= m_len){
 		m_len -= len;
 		kvi_memmove(m_ptr,m_ptr+len,m_len+1);
-		m_ptr = (char *)kvi_realloc(m_ptr,m_len+1);
+		m_ptr = (char *)KviMemory::reallocate(m_ptr,m_len+1);
 	} else {
-		m_ptr = (char *)kvi_realloc(m_ptr,1);
+		m_ptr = (char *)KviMemory::reallocate(m_ptr,1);
 		*m_ptr = '\0';
 		m_len = 0;
 	}
 	return (*this);
 }
 
-KviStr & KviStr::cutRight(int len)
+KviCString & KviCString::cutRight(int len)
 {
 	KVI_ASSERT(len >= 0);
 	if(len <= m_len){
 		m_len -= len;
-		m_ptr = (char *)kvi_realloc(m_ptr,m_len+1);
+		m_ptr = (char *)KviMemory::reallocate(m_ptr,m_len+1);
 		*(m_ptr +m_len)='\0';
 	} else {
-		m_ptr = (char *)kvi_realloc(m_ptr,1);
+		m_ptr = (char *)KviMemory::reallocate(m_ptr,1);
 		*m_ptr = '\0';
 		m_len = 0;
 	}
 	return (*this);
 }
 
-KviStr & KviStr::cut(int idx,int len)
+KviCString & KviCString::cut(int idx,int len)
 {
 	KVI_ASSERT(idx >= 0);
 	KVI_ASSERT(len >= 0);
@@ -2525,54 +2525,54 @@ KviStr & KviStr::cut(int idx,int len)
 		char * p2 = p1+len;
 		kvi_memmove(p1,p2,(m_len - (len+idx)) +1);
 		m_len -= len;
-		m_ptr = (char *)kvi_realloc(m_ptr,m_len+1);
+		m_ptr = (char *)KviMemory::reallocate(m_ptr,m_len+1);
 	}
 	return (*this);
 }
 
-KviStr & KviStr::cutToFirst(char c,bool bIncluded)
+KviCString & KviCString::cutToFirst(char c,bool bIncluded)
 {
 	int idx = findFirstIdx(c);
 	if(idx != -1)cutLeft(bIncluded ? idx + 1 : idx);
 	return (*this);
 }
 
-KviStr KviStr::leftToFirst(char c,bool bIncluded) const
+KviCString KviCString::leftToFirst(char c,bool bIncluded) const
 {
 	int idx = findFirstIdx(c);
-	if(idx == -1)return KviStr(*this);
-	return KviStr(m_ptr,bIncluded ? idx + 1 : idx);
+	if(idx == -1)return KviCString(*this);
+	return KviCString(m_ptr,bIncluded ? idx + 1 : idx);
 }
 
 
-KviStr KviStr::leftToLast(char c,bool bIncluded) const
+KviCString KviCString::leftToLast(char c,bool bIncluded) const
 {
 	int idx = findLastIdx(c);
-	return KviStr(m_ptr,bIncluded ? idx + 1 : idx);
+	return KviCString(m_ptr,bIncluded ? idx + 1 : idx);
 }
 
-KviStr & KviStr::cutFromFirst(char c,bool bIncluded)
+KviCString & KviCString::cutFromFirst(char c,bool bIncluded)
 {
 	int idx = findFirstIdx(c);
 	if(idx != -1)cutRight(bIncluded ? (m_len - idx) : (m_len - (idx + 1)));
 	return (*this);
 }
 
-KviStr & KviStr::cutToLast(char c,bool bIncluded)
+KviCString & KviCString::cutToLast(char c,bool bIncluded)
 {
 	int idx = findLastIdx(c);
 	if(idx != -1)cutLeft(bIncluded ? idx + 1 : idx);
 	return (*this);
 }
 
-KviStr & KviStr::cutFromLast(char c,bool bIncluded)
+KviCString & KviCString::cutFromLast(char c,bool bIncluded)
 {
 	int idx = findLastIdx(c);
 	if(idx != -1)cutRight(bIncluded ? (m_len - idx) : (m_len - (idx + 1)));
 	return (*this);
 }
 
-KviStr & KviStr::cutToFirst(const char *c,bool bIncluded)
+KviCString & KviCString::cutToFirst(const char *c,bool bIncluded)
 {
 	int len = (int)strlen(c);
 	int idx = findFirstIdx(c);
@@ -2580,7 +2580,7 @@ KviStr & KviStr::cutToFirst(const char *c,bool bIncluded)
 	return (*this);
 }
 
-KviStr & KviStr::cutFromFirst(const char *c,bool bIncluded)
+KviCString & KviCString::cutFromFirst(const char *c,bool bIncluded)
 {
 	int len = (int)strlen(c);
 	int idx = findFirstIdx(c);
@@ -2588,7 +2588,7 @@ KviStr & KviStr::cutFromFirst(const char *c,bool bIncluded)
 	return (*this);
 }
 
-KviStr & KviStr::cutToLast(const char *c,bool bIncluded)
+KviCString & KviCString::cutToLast(const char *c,bool bIncluded)
 {
 	int len = (int)strlen(c);
 	int idx = findLastIdx(c);
@@ -2596,7 +2596,7 @@ KviStr & KviStr::cutToLast(const char *c,bool bIncluded)
 	return (*this);
 }
 
-KviStr & KviStr::cutFromLast(const char *c,bool bIncluded)
+KviCString & KviCString::cutFromLast(const char *c,bool bIncluded)
 {
 	int len = (int)strlen(c);
 	int idx = findLastIdx(c);
@@ -2604,37 +2604,37 @@ KviStr & KviStr::cutFromLast(const char *c,bool bIncluded)
 	return (*this);
 }
 
-KviStr & KviStr::setLen(int len)
+KviCString & KviCString::setLen(int len)
 {
 	KVI_ASSERT(len >= 0);
-	m_ptr = (char *)kvi_realloc(m_ptr,len+1);
+	m_ptr = (char *)KviMemory::reallocate(m_ptr,len+1);
 	*(m_ptr+len)='\0';
 	m_len = len;
 	return (*this);
 }
 
-KviStr & KviStr::stripLeftWhiteSpace()
+KviCString & KviCString::stripLeftWhiteSpace()
 {
 	register char *p=m_ptr;
 	while(isspace(*p))p++;
 	m_len -= (p-m_ptr);
 	kvi_memmove(m_ptr,p,m_len+1);
-	m_ptr = (char *)kvi_realloc(m_ptr,m_len+1);
+	m_ptr = (char *)KviMemory::reallocate(m_ptr,m_len+1);
 	return (*this);
 }
 
-KviStr & KviStr::stripLeft(char c)
+KviCString & KviCString::stripLeft(char c)
 {
 	KVI_ASSERT(c != '\0');
 	register char *p=m_ptr;
 	while(*p == c)p++;
 	m_len -= (p-m_ptr);
 	kvi_memmove(m_ptr,p,m_len+1);
-	m_ptr = (char *)kvi_realloc(m_ptr,m_len+1);
+	m_ptr = (char *)KviMemory::reallocate(m_ptr,m_len+1);
 	return (*this);
 }
 
-bool KviStr::getToken(KviStr & str,char sep)
+bool KviCString::getToken(KviCString & str,char sep)
 {
 	KVI_ASSERT(str.m_ptr);
 	KVI_ASSERT(str.m_ptr != m_ptr);
@@ -2645,7 +2645,7 @@ bool KviStr::getToken(KviStr & str,char sep)
 	//abcd xyz
 	//^   ^
 	str.m_len = p-m_ptr;
-	str.m_ptr = (char *)kvi_realloc(str.m_ptr,str.m_len+1);
+	str.m_ptr = (char *)KviMemory::reallocate(str.m_ptr,str.m_len+1);
 	kvi_fastmove(str.m_ptr,m_ptr,str.m_len);
 	*(str.m_ptr + str.m_len)='\0';
 	while(*p && (*p == sep))p++;
@@ -2653,7 +2653,7 @@ bool KviStr::getToken(KviStr & str,char sep)
 	return (m_len != 0);
 }
 
-bool KviStr::getLine(KviStr &str)
+bool KviCString::getLine(KviCString &str)
 {
 	KVI_ASSERT(str.m_ptr);
 	KVI_ASSERT(str.m_ptr != m_ptr);
@@ -2665,7 +2665,7 @@ bool KviStr::getLine(KviStr &str)
 	//abcd xyz
 	//^   ^
 	str.m_len = p-m_ptr;
-	str.m_ptr = (char *)kvi_realloc(str.m_ptr,str.m_len+1);
+	str.m_ptr = (char *)KviMemory::reallocate(str.m_ptr,str.m_len+1);
 	kvi_fastmove(str.m_ptr,m_ptr,str.m_len);
 	*(str.m_ptr + str.m_len)='\0';
 	p++;
@@ -2673,22 +2673,22 @@ bool KviStr::getLine(KviStr &str)
 	return true;
 }
 
-KviStr KviStr::getToken(char sep)
+KviCString KviCString::getToken(char sep)
 {
 	register char *p=m_ptr;
 	while(*p && (*p != sep))p++;
-	KviStr ret(m_ptr,p);
+	KviCString ret(m_ptr,p);
 	while(*p && (*p == sep))p++;
 	cutLeft(p-m_ptr);
 	return ret;
 }
 
-KviStr & KviStr::vsprintf(const char *fmt,kvi_va_list list)
+KviCString & KviCString::vsprintf(const char *fmt,kvi_va_list list)
 {
 	kvi_va_list save;
 	kvi_va_copy(save,list);
 
-	m_ptr=(char *)kvi_realloc(m_ptr,256);
+	m_ptr=(char *)KviMemory::reallocate(m_ptr,256);
 	//First try
 	//print...with max 256 chars
 	m_len=kvi_vsnprintf(m_ptr,256,fmt,list);
@@ -2701,7 +2701,7 @@ KviStr & KviStr::vsprintf(const char *fmt,kvi_va_list list)
 		do { //we failed, so retry with 256 more chars
 			dummy+=256;
 			//realloc
-			m_ptr=(char *)kvi_realloc(m_ptr,dummy);
+			m_ptr=(char *)KviMemory::reallocate(m_ptr,dummy);
 			//print...
 			kvi_va_copy(list,save);
 			m_len=kvi_vsnprintf(m_ptr,dummy,fmt,list);
@@ -2710,13 +2710,13 @@ KviStr & KviStr::vsprintf(const char *fmt,kvi_va_list list)
 	//done...
 	//now m_len is the length of the written string not including the terminator...
 	//perfect! :)
-	m_ptr=(char *)kvi_realloc(m_ptr,m_len+1);
+	m_ptr=(char *)KviMemory::reallocate(m_ptr,m_len+1);
 	return (*this);
 }
 
-KviStr & KviStr::sprintf(const char *fmt,...)
+KviCString & KviCString::sprintf(const char *fmt,...)
 {
-	m_ptr=(char *)kvi_realloc(m_ptr,256);
+	m_ptr=(char *)KviMemory::reallocate(m_ptr,256);
 	//First try
 	kvi_va_list list;
 	kvi_va_start(list,fmt);
@@ -2731,7 +2731,7 @@ KviStr & KviStr::sprintf(const char *fmt,...)
 		do{ //we failed, so retry with 256 more chars
 			dummy+=256;
 			//realloc
-			m_ptr=(char *)kvi_realloc(m_ptr,dummy);
+			m_ptr=(char *)KviMemory::reallocate(m_ptr,dummy);
 			//print...
 			kvi_va_start(list,fmt);
 			m_len=kvi_vsnprintf(m_ptr,dummy,fmt,list);
@@ -2741,11 +2741,11 @@ KviStr & KviStr::sprintf(const char *fmt,...)
 	//done...
 	//now m_len is the length of the written string not including the terminator...
 	//perfect! :)
-	m_ptr=(char *)kvi_realloc(m_ptr,m_len+1);
+	m_ptr=(char *)KviMemory::reallocate(m_ptr,m_len+1);
 	return (*this);
 }
 
-int KviStr::find(const char *str,int idx,bool caseS) const
+int KviCString::find(const char *str,int idx,bool caseS) const
 {
 	if(idx >= m_len)return -1;
 	register char *p=m_ptr + idx;
@@ -2770,7 +2770,7 @@ int KviStr::find(const char *str,int idx,bool caseS) const
 	}
 }
 
-int KviStr::find(char c,int idx) const
+int KviCString::find(char c,int idx) const
 {
 	if(idx >= m_len)return -1;
 	register char *p=m_ptr + idx;
@@ -2779,7 +2779,7 @@ int KviStr::find(char c,int idx) const
 }
 
 
-int KviStr::findRev(const char *str,int idx,bool caseS) const
+int KviCString::findRev(const char *str,int idx,bool caseS) const
 {
 	if((m_len + idx) < 0)return -1;
 	register char *p=m_ptr + m_len + idx;
@@ -2806,27 +2806,27 @@ int KviStr::findRev(const char *str,int idx,bool caseS) const
 	}
 }
 
-int KviStr::findFirstIdx(char c) const
+int KviCString::findFirstIdx(char c) const
 {
 	register char *p=m_ptr;
 	while(*p && (*p != c))p++;
 	return (*p ? p-m_ptr : -1);
 }
 
-int KviStr::findFirstIdx(const char *str,bool caseS) const
+int KviCString::findFirstIdx(const char *str,bool caseS) const
 {
 	// This function can't be used to search inside
 	// multibyte encoded strings... convert your
 	// code to QString and use QString::findRev().
-	// We must throw away KviStr at all in this case...
+	// We must throw away KviCString at all in this case...
 
 	// return QString(m_ptr).find(QString(str),0,caseS);;
 
-	// Both this KviStr and the const char * str are assumed
+	// Both this KviCString and the const char * str are assumed
 	// to be in the proper (and same) encoding.
-	// If KviStr is in encoding A then QString(m_ptr) might
+	// If KviCString is in encoding A then QString(m_ptr) might
 	// or not be decoded correctly.
-	// Also if KviStr is in UTF-8 (for example), then
+	// Also if KviCString is in UTF-8 (for example), then
 	// a position in QString() does not map to the position in the char array
 	// since a single UNICODE char may use one or more bytes...
 
@@ -2854,7 +2854,7 @@ int KviStr::findFirstIdx(const char *str,bool caseS) const
 	}
 }
 
-int KviStr::findLastIdx(char c) const
+int KviCString::findLastIdx(char c) const
 {
 	//Empty string ?
 	if(m_len < 1)return -1;
@@ -2866,12 +2866,12 @@ int KviStr::findLastIdx(char c) const
 	return ((*p == c)? p-m_ptr : -1);
 }
 
-int KviStr::findLastIdx(const char *str,bool caseS) const
+int KviCString::findLastIdx(const char *str,bool caseS) const
 {
 	// This function can't be used to search inside
 	// multibyte encoded strings... convert your
 	// code to QString and use QString::findRev().
-	// We must throw away KviStr at all in this case...
+	// We must throw away KviCString at all in this case...
 
 	// return QString(m_ptr).findRev(QString(str),-1,caseS);
 
@@ -2915,7 +2915,7 @@ int KviStr::findLastIdx(const char *str,bool caseS) const
 	}
 }
 
-KviStr & KviStr::trimmed()
+KviCString & KviCString::trimmed()
 {
 	// 0123456789
 	//    abcd   0
@@ -2934,17 +2934,17 @@ KviStr & KviStr::trimmed()
 		// left   right
 		m_len = (right - left)+1;
 		kvi_memmove(m_ptr,left,m_len);
-		m_ptr = (char *)kvi_realloc(m_ptr,m_len+1);
+		m_ptr = (char *)KviMemory::reallocate(m_ptr,m_len+1);
 		*(m_ptr+m_len)='\0';
 	} else {
-		m_ptr = (char *)kvi_realloc(m_ptr,1);
+		m_ptr = (char *)KviMemory::reallocate(m_ptr,1);
 		*m_ptr = '\0';
 		m_len = 0;
 	}
 	return (*this);
 }
 
-KviStr & KviStr::stripRightWhiteSpace()
+KviCString & KviCString::stripRightWhiteSpace()
 {
 	if(*m_ptr)
 	{
@@ -2955,14 +2955,14 @@ KviStr & KviStr::stripRightWhiteSpace()
 		if(right != start)
 		{
 			m_len = (right - m_ptr) + 1;
-			m_ptr = (char *)kvi_realloc(m_ptr,m_len+1);
+			m_ptr = (char *)KviMemory::reallocate(m_ptr,m_len+1);
 			*(m_ptr+m_len)='\0';
 		}
 	}
 	return (*this);
 }
 
-KviStr & KviStr::stripRight(char c)
+KviCString & KviCString::stripRight(char c)
 {
 	if(*m_ptr)
 	{
@@ -2972,14 +2972,14 @@ KviStr & KviStr::stripRight(char c)
 		if(right != start)
 		{
 			m_len = (right - m_ptr) + 1;
-			m_ptr = (char *)kvi_realloc(m_ptr,m_len+1);
+			m_ptr = (char *)KviMemory::reallocate(m_ptr,m_len+1);
 			*(m_ptr+m_len)='\0';
 		}
 	}
 	return (*this);
 }
 
-KviStr & KviStr::stripSpace()
+KviCString & KviCString::stripSpace()
 {
 	// 0123456789
 	//    abcd   0
@@ -2998,17 +2998,17 @@ KviStr & KviStr::stripSpace()
 		// left   right
 		m_len = (right - left)+1;
 		kvi_memmove(m_ptr,left,m_len);
-		m_ptr = (char *)kvi_realloc(m_ptr,m_len+1);
+		m_ptr = (char *)KviMemory::reallocate(m_ptr,m_len+1);
 		*(m_ptr+m_len)='\0';
 	} else {
-		m_ptr = (char *)kvi_realloc(m_ptr,1);
+		m_ptr = (char *)KviMemory::reallocate(m_ptr,1);
 		*m_ptr = '\0';
 		m_len = 0;
 	}
 	return (*this);
 }
 
-bool KviStr::isNum() const
+bool KviCString::isNum() const
 {
 	register char *p=m_ptr;
 	while(isspace(*p))p++;
@@ -3019,7 +3019,7 @@ bool KviStr::isNum() const
 	return (*p=='\0');
 }
 
-bool KviStr::isUnsignedNum() const
+bool KviCString::isUnsignedNum() const
 {
 	register char *p=m_ptr;
 	while(isspace(*p))p++;
@@ -3029,15 +3029,15 @@ bool KviStr::isUnsignedNum() const
 	return (*p=='\0');
 }
 
-static KviStr g_szApplicationWideEmptyString;
+static KviCString g_szApplicationWideEmptyString;
 
-KviStr & KviStr::emptyString()
+KviCString & KviCString::emptyString()
 {
 	return g_szApplicationWideEmptyString;
 }
 
 
-bool KviStr::ext_contains(register const char * data,const char * item,bool caseS)
+bool KviCString::ext_contains(register const char * data,const char * item,bool caseS)
 {
 	if(item && data)
 	{
@@ -3070,10 +3070,10 @@ bool KviStr::ext_contains(register const char * data,const char * item,bool case
 }
 
 
-//void KviStr::pointerToBitString(const void * ptr)
+//void KviCString::pointerToBitString(const void * ptr)
 //{
 //	m_len = (sizeof(void *) * 8);
-//	m_ptr = kvi_realloc(m_ptr,m_len + 1);
+//	m_ptr = KviMemory::reallocate(m_ptr,m_len + 1);
 //	for(int i=0;i < m_len;i++)
 //	{
 //		m_ptr[i] = (ptr & 1) ? '1' : '0';
@@ -3082,7 +3082,7 @@ bool KviStr::ext_contains(register const char * data,const char * item,bool case
 //	m_ptr[i] = '\0';
 //}
 //
-//void * KviStr::bitStringToPointer()
+//void * KviCString::bitStringToPointer()
 //{
 //	if(m_len != (sizeof(void *) * 8))return 0;
 //	const char * aux = m_ptr;
diff --git a/src/kvilib/core/kvi_string.h b/src/kvilib/core/KviCString.h
index 3c56a6e14..c226d295c 100644
--- a/src/kvilib/core/kvi_string.h
+++ b/src/kvilib/core/KviCString.h
@@ -2,7 +2,7 @@
 #define _KVI_STRING_H_
 //=============================================================================
 //
-//   File : kvi_string.h
+//   File : KviCString.h
 //   Creation date : Fri Mar 19 1999 03:06:26 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -39,7 +39,7 @@
 #include <QByteArray>
 
 #include "kvi_inttypes.h"
-#include "kvi_heapobject.h"
+#include "KviHeapObject.h"
 #include "kvi_stdarg.h"
 
 
@@ -109,7 +109,7 @@ __KVI_EXTERN KVILIB_API int kvi_wvsnprintf(kvi_wchar_t * buffer,kvi_wslen_t len,
 //
 //=============================================================================
 
-class KVILIB_API KviStr : public KviHeapObject
+class KVILIB_API KviCString : public KviHeapObject
 {
 public:
 	// No particular reason for these two names...
@@ -122,44 +122,44 @@ public:
 	//=============================================================================
 
 	// Empty string == "", len = 0, 1 byte allocated
-	KviStr();
+	KviCString();
 
 	// Deep copy of the NULL TERMINATED string (NULL str SAFE)
-	KviStr(const char *str);
+	KviCString(const char *str);
 
 	// Copy len characters from string str (NOT NULL str SAFE, str MUST be at least len chars long)
-	KviStr(const char *str,int len);
+	KviCString(const char *str,int len);
 
 	// bg and end are pointers to a SINGLE string.<br>
 	// A string is extracted starting from bg and ending at end (not included).<br>
-	KviStr(const char *bg,const char *end);
+	KviCString(const char *bg,const char *end);
 
 	// Format constructor.<br>
 	// tag is....yes....a dummy number used to resolve ambiguities.<br>
 	// It is SAFE: will fail only if we run out of memory,<br>
 	// but can handle only %s %d %u and %c.
-	KviStr(KviFormatConstructorTag tag,const char *fmt,...);
+	KviCString(KviFormatConstructorTag tag,const char *fmt,...);
 
 	// Carbon copy :)...fast
-	KviStr(const KviStr &str);
+	KviCString(const KviCString &str);
 
 	// Compat with QT...<br>
 	// WARNING : With QT2.x it WILL loose UNICODE data.<br>
 	// Safe even if the QString is null.
-	KviStr(const QString &str);
+	KviCString(const QString &str);
 
-	KviStr(const QByteArray &str);
+	KviCString(const QByteArray &str);
 
 	// Fill sonstructor.
 	// Creates a string long fillLen characters filled with character c.<br>
-	KviStr(char c,int fillLen = 1);
+	KviCString(char c,int fillLen = 1);
 
-	KviStr(const kvi_wchar_t * unicode);
+	KviCString(const kvi_wchar_t * unicode);
 
-	KviStr(const kvi_wchar_t * unicode,int len);
+	KviCString(const kvi_wchar_t * unicode,int len);
 
 	// just free(m_ptr)
-	~KviStr();
+	~KviCString();
 public:
 	//yes...public..but think it as private...:)
 	char *m_ptr; // pointer to allocated buffer, do not change this!
@@ -199,41 +199,41 @@ public:
 	bool firstCharIs(char ch) const { return (*m_ptr == ch);                                     };
 
 	// upper and lower case copies
-	KviStr upper() const;
-	KviStr lower() const;
-	KviStr upperISO88591() const;
-	KviStr lowerISO88591() const;
+	KviCString upper() const;
+	KviCString lower() const;
+	KviCString upperISO88591() const;
+	KviCString lowerISO88591() const;
 
 	// left, right & co.
 	// all parameters are safety-checked
-	KviStr left(int maxLen) const;
-	KviStr right(int maxLen) const ;
-	KviStr middle(int idx,int maxLen) const;
+	KviCString left(int maxLen) const;
+	KviCString right(int maxLen) const ;
+	KviCString middle(int idx,int maxLen) const;
 
-	KviStr leftToFirst(char c,bool bIncluded = false) const;
-	KviStr leftToLast(char c,bool bIncluded = false) const;
-//	KviStr leftToFirst(const char * str); const;
+	KviCString leftToFirst(char c,bool bIncluded = false) const;
+	KviCString leftToLast(char c,bool bIncluded = false) const;
+//	KviCString leftToFirst(const char * str); const;
 
 	//=============================================================================
 	// Non-const interface (write stuff)
 	//=============================================================================
 
 	// Null terminator is NOT included in len
-	KviStr & setLen(int len);
+	KviCString & setLen(int len);
 	// str must not be 0, but len can be anything (it is checked)
-	KviStr & setStr(const char *str,int len = -1);
+	KviCString & setStr(const char *str,int len = -1);
 	// Like the special constructor that gets the same args.
 	void extractFromString(const char *begin,const char *end);
 
 
 	// Safe sprintf. This one will never write past the end of the string
 	// It can handle only %s %d %u and %c format flags.
-	KviStr & sprintf(const char *fmt,...);
+	KviCString & sprintf(const char *fmt,...);
 	
-	KviStr & vsprintf(const char *fmt,kvi_va_list list);
+	KviCString & vsprintf(const char *fmt,kvi_va_list list);
 
 	// append functions
-	void append(const KviStr &str);
+	void append(const KviCString &str);
 	void append(const QString &str);
 	void append(char c);
 	void append(const char *str);                                     // str CAN be 0
@@ -241,7 +241,7 @@ public:
 	void append(KviFormatConstructorTag dummy,const char *fmt,...);
 
 	// prepend stuff, same as above
-	void prepend(const KviStr &str);
+	void prepend(const KviCString &str);
 	void prepend(const char *str);                                    // str CAN be 0
 	void prepend(const char *str,int len);                            // str CAN NOT be 0, and MUST be at least len chars long
 
@@ -255,21 +255,21 @@ public:
 	void toLower();
 
 	// Assignment
-	KviStr & operator=(const KviStr &str);       // deep copy
-	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 QByteArray &str);
+	KviCString & operator=(const KviCString &str);       // deep copy
+	KviCString & operator=(const char *str);         // str can be NULL here
+	KviCString & operator=(char c);                  // 2 bytes allocated,m_len = 1
+	KviCString & operator=(const QString &str);
+	KviCString & operator=(const QByteArray &str);
 
 	// Append operators
-	KviStr & operator+=(const KviStr &str)      { append(str); return (*this);          };
-	KviStr & operator+=(const char *str)        { append(str); return (*this);          };
-	KviStr & operator+=(char c)                 { append(c);   return (*this);          };
-	KviStr & operator+=(const QString &str)     { append(str); return (*this);          };
+	KviCString & operator+=(const KviCString &str)      { append(str); return (*this);          };
+	KviCString & operator+=(const char *str)        { append(str); return (*this);          };
+	KviCString & operator+=(char c)                 { append(c);   return (*this);          };
+	KviCString & operator+=(const QString &str)     { append(str); return (*this);          };
 
 	// Comparison
-	bool equalsCI(const KviStr &other) const { if(m_len != other.m_len)return false; return kvi_strEqualCI(m_ptr,other.m_ptr); };
-	bool equalsCS(const KviStr &other) const { if(m_len != other.m_len)return false; return kvi_strEqualCS(m_ptr,other.m_ptr); };
+	bool equalsCI(const KviCString &other) const { if(m_len != other.m_len)return false; return kvi_strEqualCI(m_ptr,other.m_ptr); };
+	bool equalsCS(const KviCString &other) const { if(m_len != other.m_len)return false; return kvi_strEqualCS(m_ptr,other.m_ptr); };
 	bool equalsCI(const char * other) const { return kvi_strEqualCI(m_ptr,other); };
 	bool equalsCS(const char * other) const { return kvi_strEqualCS(m_ptr,other); };
 	bool equalsCIN(const char * other,int len) const { return kvi_strEqualCIN(m_ptr,other,len); };
@@ -299,40 +299,40 @@ public:
 	//=============================================================================
 
 	// cut
-	KviStr & cutLeft(int len);             // kills the first len characters
-	KviStr & cutRight(int len);            // kills the last len characters
-	KviStr & cut(int idx,int len);
-	KviStr & cutToFirst(char c,bool bIncluded = true); // cuts the left part of the string up to the first character c or does nothing if the char c is not in the string
-	KviStr & cutToLast(char c,bool bIncluded = true);
-	KviStr & cutFromFirst(char c,bool bIncluded = true);
-	KviStr & cutFromLast(char c,bool bIncluded = true);
-	KviStr & cutToFirst(const char *c,bool bIncluded = true); // cuts the left part of the string up to the first character c or does nothing if the char c is not in the string
-	KviStr & cutToLast(const char *c,bool bIncluded = true);
-	KviStr & cutFromFirst(const char *c,bool bIncluded = true);
-	KviStr & cutFromLast(const char *c,bool bIncluded = true);
+	KviCString & cutLeft(int len);             // kills the first len characters
+	KviCString & cutRight(int len);            // kills the last len characters
+	KviCString & cut(int idx,int len);
+	KviCString & cutToFirst(char c,bool bIncluded = true); // cuts the left part of the string up to the first character c or does nothing if the char c is not in the string
+	KviCString & cutToLast(char c,bool bIncluded = true);
+	KviCString & cutFromFirst(char c,bool bIncluded = true);
+	KviCString & cutFromLast(char c,bool bIncluded = true);
+	KviCString & cutToFirst(const char *c,bool bIncluded = true); // cuts the left part of the string up to the first character c or does nothing if the char c is not in the string
+	KviCString & cutToLast(const char *c,bool bIncluded = true);
+	KviCString & cutFromFirst(const char *c,bool bIncluded = true);
+	KviCString & cutFromLast(const char *c,bool bIncluded = true);
 	// & paste
-	KviStr & insert(int idx,const char *data);
-	KviStr & insert(int idx,char c);
+	KviCString & insert(int idx,const char *data);
+	KviCString & insert(int idx,char c);
 	//Replaces all occurences of char c with the string str
-	KviStr & replaceAll(const char c,const char *str);
+	KviCString & replaceAll(const char c,const char *str);
 	//same as above but with a string
-	KviStr & replaceAll(const char *toFind,const char *str,bool bCaseS = true);
+	KviCString & replaceAll(const char *toFind,const char *str,bool bCaseS = true);
 
-	KviStr & transliterate(const char * szToFind,const char * szReplacement);
+	KviCString & transliterate(const char * szToFind,const char * szReplacement);
 
 	// Strips whitespace characters from beginning of this string.
-	KviStr & stripLeftWhiteSpace();
-	KviStr & stripRightWhiteSpace();
+	KviCString & stripLeftWhiteSpace();
+	KviCString & stripRightWhiteSpace();
 	// Stips inital and final WHITESPACE characters (see man isspace),<br>
 	// and returns a reference to this string.
-	KviStr & trimmed();
+	KviCString & trimmed();
 
 	// Strips spaces and tabs only
-	KviStr & stripSpace();
+	KviCString & stripSpace();
 	// Strips all occurences of the character c from the beginning of the string.<br>
 	// Note that c can not be '\0' :)
-	KviStr & stripLeft(char c);
-	KviStr & stripRight(char c);
+	KviCString & stripLeft(char c);
+	KviCString & stripRight(char c);
 
 	//=============================================================================
 	// Tokenize
@@ -342,24 +342,24 @@ public:
 	// and returns true if there are more tokens to extract<br>
 	// Does not strip initial separators!!<br>
 	// str can NOT be this string.
-	bool getToken(KviStr &str,char sep);
+	bool getToken(KviCString &str,char sep);
 	// Does not strip initial separators!<br>
 	// Can assign also to this string.
-	KviStr getToken(char sep);
+	KviCString getToken(char sep);
 	// Extracts a line from the string.<br>
 	// Returns false if there was no data to extract
-	bool getLine(KviStr &str);
+	bool getLine(KviCString &str);
 
 	// splits this string in a null-terminated array of strings
 	// separated by sep.
-	KviStr ** splitToArray(char sep,int max,int * realCount) const;
-	//KviStr ** splitToArray(const char * sep,int max,int * realCount) const;
-	static void freeArray(KviStr ** strings);
+	KviCString ** splitToArray(char sep,int max,int * realCount) const;
+	//KviCString ** splitToArray(const char * sep,int max,int * realCount) const;
+	static void freeArray(KviCString ** strings);
 	// joins the array to this string
 	// if sep is not 0, it is inserted between the strings
 	// if bLastSep is true and sep is non 0, then sep is also appended at the end
 	// of the buffer (after the last string)
-	void joinFromArray(KviStr ** strings,const char * sep = 0,bool bLastSep = false);
+	void joinFromArray(KviCString ** strings,const char * sep = 0,bool bLastSep = false);
 
 	//=============================================================================
 	// Utils
@@ -367,10 +367,10 @@ public:
 
 	// encodes chars that have nonzero in the jumptable
 	// into %HH equivalents
-	KviStr & hexEncodeWithTable(const unsigned char table[256]);
-	KviStr & hexEncodeWhiteSpace();
-	KviStr & hexDecode(const char * pFrom);
-	KviStr & hexDecode(){ return hexDecode(m_ptr); };
+	KviCString & hexEncodeWithTable(const unsigned char table[256]);
+	KviCString & hexEncodeWhiteSpace();
+	KviCString & hexDecode(const char * pFrom);
+	KviCString & hexDecode(){ return hexDecode(m_ptr); };
 
 	//=============================================================================
 	// Contains / occurence count
@@ -426,15 +426,15 @@ public:
 	short toShort(bool *bOk=0) const            { return (short)toLong(bOk);            };
 	unsigned short toUShort(bool *bOk=0) const  { return (unsigned short)toLong(bOk);   };
 
-	KviStr & setNum(long num);
-	KviStr & setNum(unsigned long num);
+	KviCString & setNum(long num);
+	KviCString & setNum(unsigned long num);
 
-	KviStr & setNum(int num)                    { return setNum((long)num);             };
-	KviStr & setNum(unsigned int num)           { return setNum((unsigned long)num);    };
-	KviStr & setNum(short num)                  { return setNum((long)num);             };
-	KviStr & setNum(unsigned short num)         { return setNum((unsigned long)num);    };
-	KviStr & setNum(char num)                   { return setNum((long)num);             };
-	KviStr & setNum(unsigned char num)          { return setNum((unsigned long)num);    };
+	KviCString & setNum(int num)                    { return setNum((long)num);             };
+	KviCString & setNum(unsigned int num)           { return setNum((unsigned long)num);    };
+	KviCString & setNum(short num)                  { return setNum((long)num);             };
+	KviCString & setNum(unsigned short num)         { return setNum((unsigned long)num);    };
+	KviCString & setNum(char num)                   { return setNum((long)num);             };
+	KviCString & setNum(unsigned char num)          { return setNum((unsigned long)num);    };
 
 	// Retuns true if the string contains only digits and an optional '-' character
 	// at the beginning.<be>
@@ -449,7 +449,7 @@ public:
 
 	// returns an empty string...
 	// this if often useful!
-	static KviStr & emptyString();
+	static KviCString & emptyString();
 
 	//=============================================================================
 	// Dead interface
@@ -464,22 +464,22 @@ public:
 	// "External string" helper functions
 	//=============================================================================
 
-	// FIXME: Should it be KviStrExt::contains namespace ?
+	// FIXME: Should it be KviCStringExt::contains namespace ?
 	static bool ext_contains(register const char * data,const char * item,bool caseS = true);
 };
 
-// FIXME: the functions below should end in the KviStr namespace ???
+// FIXME: the functions below should end in the KviCString namespace ???
 
 
 // Cool string parsing function.
 // It will extract the first found token from the string aux_ptr, and return
 // a pointer to the beginning of the next token, or end of the string.
 // It skips the initial sep characters!
-__KVI_EXTERN KVILIB_API const char * kvi_extractToken(KviStr &str,const char *aux_ptr,char sep =' ');
+__KVI_EXTERN KVILIB_API const char * kvi_extractToken(KviCString &str,const char *aux_ptr,char sep =' ');
 // Does not skip the beginning separators!
 // Extracts data from the string up to the next separator character or the end of the string.
 // and returns a pointer to that separator (or string end).
-__KVI_EXTERN KVILIB_API const char * kvi_extractUpTo(KviStr &str,const char *aux_ptr,char sep=' ');
+__KVI_EXTERN KVILIB_API const char * kvi_extractUpTo(KviCString &str,const char *aux_ptr,char sep=' ');
 // Reduced vsnprintf...
 // Handles %s,%c,%d,%u  (%% are TWO percents here and not one.)
 // Returns -1 if the formatted string exceeded the buffer length.
@@ -522,32 +522,32 @@ __KVI_EXTERN KVILIB_API bool kvi_matchStringWithTerminator(register const char *
 // if we call kvi_strsubRevCS("this is an experiment","an", 9) we got a match.
 __KVI_EXTERN KVILIB_API int kvi_strMatchRevCS(const char *str1, const char *str2, int index=-1);
 
-// KviStr comparison non-member operators
-__KVI_EXTERN inline bool operator==(const KviStr &left,const KviStr &right)
+// KviCString comparison non-member operators
+__KVI_EXTERN inline bool operator==(const KviCString &left,const KviCString &right)
 { return (left.m_len == right.m_len) ? kvi_strEqualCS(left.m_ptr,right.m_ptr) : false; }
-__KVI_EXTERN inline bool operator==(const KviStr &left,const char *right)
+__KVI_EXTERN inline bool operator==(const KviCString &left,const char *right)
 { return kvi_strEqualCS(left.m_ptr,right); }
-__KVI_EXTERN inline bool operator==(const char *left,const KviStr &right)
+__KVI_EXTERN inline bool operator==(const char *left,const KviCString &right)
 { return kvi_strEqualCS(left,right.m_ptr); }
-__KVI_EXTERN inline bool operator!=(const KviStr &left,const KviStr &right)
+__KVI_EXTERN inline bool operator!=(const KviCString &left,const KviCString &right)
 { return !kvi_strEqualCS(left.m_ptr,right.m_ptr); }
-__KVI_EXTERN inline bool operator!=(const KviStr &left,const char *right)
+__KVI_EXTERN inline bool operator!=(const KviCString &left,const char *right)
 { return !kvi_strEqualCS(left.m_ptr,right); }
-__KVI_EXTERN inline bool operator!=(const char *left,const KviStr &right)
+__KVI_EXTERN inline bool operator!=(const char *left,const KviCString &right)
 { return !kvi_strEqualCS(left,right.m_ptr); }
 
-__KVI_EXTERN inline KviStr operator+(const KviStr &left,const KviStr &right)
-{ KviStr ret(left); ret += right; return ret; }
-__KVI_EXTERN inline KviStr operator+(const KviStr &left,const char *right)
-{ KviStr ret(left); ret += right; return ret; }
-__KVI_EXTERN inline KviStr operator+(const char *left,const KviStr &right)
-{ KviStr ret(left); ret += right; return ret; }
-__KVI_EXTERN inline KviStr operator+(const KviStr &left,char right)
-{ KviStr ret(left); ret += right; return ret; }
-__KVI_EXTERN inline KviStr operator+(char left,const KviStr &right)
-{ KviStr ret(left); ret += right; return ret; }
+__KVI_EXTERN inline KviCString operator+(const KviCString &left,const KviCString &right)
+{ KviCString ret(left); ret += right; return ret; }
+__KVI_EXTERN inline KviCString operator+(const KviCString &left,const char *right)
+{ KviCString ret(left); ret += right; return ret; }
+__KVI_EXTERN inline KviCString operator+(const char *left,const KviCString &right)
+{ KviCString ret(left); ret += right; return ret; }
+__KVI_EXTERN inline KviCString operator+(const KviCString &left,char right)
+{ KviCString ret(left); ret += right; return ret; }
+__KVI_EXTERN inline KviCString operator+(char left,const KviCString &right)
+{ KviCString ret(left); ret += right; return ret; }
 
-inline int kvi_compare(const KviStr * p1,const KviStr * p2)
+inline int kvi_compare(const KviCString * p1,const KviCString * p2)
 {
 	return kvi_strcmpCI(p1->ptr(),p2->ptr());
 }
diff --git a/src/kvilib/core/kvi_heapobject.cpp b/src/kvilib/core/KviHeapObject.cpp
index ac4d31e63..9db837839 100644
--- a/src/kvilib/core/kvi_heapobject.cpp
+++ b/src/kvilib/core/KviHeapObject.cpp
@@ -1,10 +1,10 @@
 //=============================================================================
 //
-//   File : kvi_heapobject.cpp
+//   File : KviHeapObject.cpp
 //   Creation date : Wed 24 Mar 2004 04:45:17 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2004-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2004-2010 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
@@ -23,38 +23,38 @@
 //=============================================================================
 
 
-#include "kvi_heapobject.h"
-#include "kvi_malloc.h"
+#include "KviHeapObject.h"
+#include "KviMemory.h"
 
 #ifdef COMPILE_ON_WINDOWS
 	void * KviHeapObject::operator new(size_t uSize)
 	{
-		return kvi_malloc(uSize);
+		return KviMemory::allocate(uSize);
 	}
 
 	void KviHeapObject::operator delete(void * pData)
 	{
-		kvi_free(pData);
+		KviMemory::free(pData);
 	}
 
 	void * KviHeapObject::operator new[](size_t uSize)
 	{
-		return kvi_malloc(uSize);
+		return KviMemory::allocate(uSize);
 	}
 
 	void KviHeapObject::operator delete[](void * pData)
 	{
-		kvi_free(pData);
+		KviMemory::free(pData);
 	}
 
 	// these are the debug versions...
 	void * KviHeapObject::operator new(size_t uSize,const char *,int)
 	{
-		return kvi_malloc(uSize);
+		return KviMemory::allocate(uSize);
 	}
 
 	void KviHeapObject::operator delete(void * pData,const char *,int)
 	{
-		kvi_free(pData);
+		KviMemory::free(pData);
 	}
 #endif
diff --git a/src/kvilib/core/kvi_heapobject.h b/src/kvilib/core/KviHeapObject.h
index 357ad02d6..0d8b28547 100644
--- a/src/kvilib/core/kvi_heapobject.h
+++ b/src/kvilib/core/KviHeapObject.h
@@ -2,11 +2,11 @@
 #define _KVI_HEAPOBJECT_H_
 //=============================================================================
 //
-//   File : kvi_heapobject.h
+//   File : KviHeapObject.h
 //   Creation date : Wed 24 Mar 2004 04:45:17 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2004-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2004-2010 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
@@ -25,14 +25,14 @@
 //=============================================================================
 
 /**
-* \file kvi_heapobject.h
+* \file KviHeapObject.h
 * \author Szymon Stefanek
 * \brief Heap Object
 */
 
 #include "kvi_settings.h"
 
-// See kvi_heapobject.cpp for comments on this class
+// See KviHeapObject.cpp for comments on this class
 
 #ifdef COMPILE_ON_WINDOWS
 	/**
diff --git a/src/kvilib/core/kvi_malloc.cpp b/src/kvilib/core/KviMemory.cpp
index e2e0b3ed3..9e0429468 100644
--- a/src/kvilib/core/kvi_malloc.cpp
+++ b/src/kvilib/core/KviMemory.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_malloc.cpp
+//   File : KviMemory.cpp
 //   Creation date : Sun Jun 18 2000 18:26:27 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -25,16 +25,18 @@
 //=============================================================================
 // C memory allocation routines
 // This stuff is rather unused, because in normal compilations
-// kvi_malloc, kvi_free and kvi_realloc are macros (see kvi_malloc.h)
+// KviMemory, kvi_free and kvi_realloc are macros (see KviMemory.h)
 //=============================================================================
 
 
 #define _KVI_MALLOC_CPP_
-#include "kvi_malloc.h"
+#include "KviMemory.h"
 
 #include <stdio.h>
 
 
+namespace KviMemory
+{
 
 #ifdef COMPILE_MEMORY_PROFILE
 
@@ -64,7 +66,7 @@
 	unsigned int     g_uAllocationPeak           = 0;
 	KviMallocEntry * g_pEntries                  = 0;
 
-	void * kvi_malloc(int size)
+	void * allocate(int size)
 	{
 		g_iMallocCalls ++;
 		g_iTotalMemAllocated += size;
@@ -86,10 +88,10 @@
 		return e->pointer;
 	}
 
-	void * kvi_realloc(void * ptr,int size)
+	void * reallocate(void * ptr,int size)
 	{
 		g_iReallocCalls ++;
-		if(ptr == 0)return kvi_malloc(size);
+		if(ptr == 0)return allocate(size);
 		if(g_iMaxRequestSize < size){
 			g_iMaxRequestSize = size;
 			g_pMaxRequestReturnAddress1 = __builtin_return_address(1);
@@ -113,7 +115,7 @@
 		return realloc(ptr,size);
 	}
 
-	void kvi_free(void * ptr)
+	void free(void * ptr)
 	{
 		g_iFreeCalls++;
 		if(ptr == 0){
@@ -181,7 +183,7 @@
 		fprintf(stderr,"|====|====|====|====|====|====|====|====\n");
 	}
 
-#else
+#else //!COMPILE_MEMORY_PROFILE
 
 	#ifdef COMPILE_MEMORY_CHECKS
 
@@ -192,6 +194,8 @@
 		exit(-1);
 	}
 
-	#endif
+	#endif //COMPILE_MEMORY_CHECKS
 
-#endif
+#endif //!COMPILE_MEMORY_PROFILE
+
+}
diff --git a/src/kvilib/core/kvi_malloc.h b/src/kvilib/core/KviMemory.h
index 9a7d111c6..d3515a5ec 100644
--- a/src/kvilib/core/kvi_malloc.h
+++ b/src/kvilib/core/KviMemory.h
@@ -3,7 +3,7 @@
 
 //=============================================================================
 //
-//   File : kvi_malloc.h
+//   File : KviMemory.h
 //   Creation date : Sun Jun 18 2000 18:18:36 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -34,16 +34,19 @@
 #include <stdlib.h>
 
 /**
-* \file kvi_malloc.h
+* \file KviMemory.h
 * \author Szymon Stefanek
 * \brief This file contains an internal implementation of the malloc/free functions
 *
 * If COMPILE_MEMORY_PROFILE is enabled, kvirc will use its internal implementation that includes a memory profiler.
 * If COMPILE_MEMORY_CHECKS is enabled, kvirc will check and report memory exhaustion problems.
-* If none of the previous is enabled, this will just bind the kvi_malloc and kvi_free functions to the proper
+* If none of the previous is enabled, this will just bind the KviMemory and kvi_free functions to the proper
 * functions of the underlaying system.
 */
 
+namespace KviMemory
+{
+
 #ifdef COMPILE_MEMORY_PROFILE
 
 	#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
@@ -56,7 +59,7 @@
 	* \param size number of bytes
 	* \return void *
 	*/
-	extern void * kvi_malloc(int size);
+	void * allocate(int size);
 
 	/**
 	* \brief Changes the size of the memory block pointed to by ptr to size bytes
@@ -65,7 +68,7 @@
 	* \param size number of bytes
 	* \return void *
 	*/
-	extern void * kvi_realloc(void * ptr,int size);
+	void * reallocate(void * ptr,int size);
 
 	/**
 	* \brief Frees the memory space pointed to by ptr
@@ -73,64 +76,60 @@
 	* \param ptr pointer to the memory block
 	* \return void
 	*/
-	extern void   kvi_free(void * ptr);
-
-#else
+	void free(void * ptr);
 
-	#ifndef COMPILE_MEMORY_CHECKS
+#else //!COMPILE_MEMORY_PROFILE
 
-		// These two are the "common" ones
-		#define kvi_malloc(__size_) malloc(__size_)
-		#define kvi_realloc(__ptr_,__size_) realloc((void *)__ptr_,__size_)
 
-	#else
+	#ifdef COMPILE_MEMORY_CHECKS
 
 		#ifdef COMPILE_ON_WINDOWS
 			#error "This stuff should be never compiled on Windows"
 		#endif
 
-		// Want to check all the pointers
-		#define kvi_malloc(__size_) kvi_safe_malloc(__size_)
-		#define kvi_realloc(__ptr_,__size_) kvi_safe_realloc((void *)__ptr_,__size_)
-
-		#ifndef _KVI_MALLOC_CPP_
-			/**
-			* \brief Prints a warning then a memory allocation fails
-			*/
-			extern void outOfMemory();
-		#endif
-
 		/**
-		* \brief Allocates size bytes of memory, checking for failures
-		*
-		* \param size number of bytes
-		* \return void *
+		* \brief Prints a warning about failed memory allocation
 		*/
-		inline void * kvi_safe_malloc(int size)
+		void outOfMemory();
+
+		inline void * allocate(int size)
 		{
 			void * ptr = malloc(size);
-			if(!ptr)outOfMemory();
+			if(!ptr)
+				outOfMemory();
 			return ptr;
 		}
 
-		/**
-		* \brief Changes the size of the memory block pointed to by ptr to size bytes, checking for failures
-		*
-		* \param ptr pointer to the memory block
-		* \param size number of bytes
-		* \return void *
-		*/
-		inline void * kvi_safe_realloc(void * ptr,int size)
+		inline void * reallocate(void * ptr,int size)
 		{
 			ptr = realloc(ptr,size);
-			if(!ptr)outOfMemory();
+			if(!ptr)
+				outOfMemory();
 			return ptr;
 		}
 
-	#endif //COMPILE_MEMORY_CHECKS
+	#else //!COMPILE_MEMORY_CHECKS
+
+		inline void * allocate(int size)
+		{
+			return ::malloc(size);
+		}
+
+		inline void * reallocate(void * ptr,int size)
+		{
+			return ::realloc(ptr,size);
+		}
+
+	#endif //!COMPILE_MEMORY_CHECKS
+
+
+	inline void free(void * ptr)
+	{
+		::free(ptr);
+	}
 
-	#define kvi_free(__ptr_) free((void *)__ptr_)
+#endif //!COMPILE_MEMORY_PROFILE
 
-#endif
+} // namespace KviMemory
 
 #endif //_KVI_MALLOC_H_
diff --git a/src/kvilib/core/kvi_pointerhashtable.h b/src/kvilib/core/KviPointerHashTable.h
index 48039154c..30a4155c5 100644
--- a/src/kvilib/core/kvi_pointerhashtable.h
+++ b/src/kvilib/core/KviPointerHashTable.h
@@ -2,7 +2,7 @@
 #define _KVI_POINTERHASHTABLE_H_
 //============================================================================
 //
-//   File : kvi_pointerhashtable.h
+//   File : KviPointerHashTable.h
 //   Creation date : Sat Jan 12 2008 04:53 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -25,16 +25,16 @@
 //============================================================================
 
 /**
-* \file kvi_pointerhashtable.h
+* \file KviPointerHashTable.h
 * \author Szymon Stefanek
 * \brief Pointer Hash Table
 */
 
 #include "kvi_settings.h"
-#include "kvi_pointerlist.h"
-#include "kvi_string.h"
-#include "kvi_qstring.h"
-#include "kvi_malloc.h"
+#include "KviPointerList.h"
+#include "KviCString.h"
+#include "KviQString.h"
+#include "KviMemory.h"
 #include "kvi_memmove.h"
 #include "kvi_debug.h"
 
@@ -110,7 +110,7 @@ inline void kvi_hash_key_copy(const char * const &szFrom,const char * &szTo,bool
 #else
 		int len = kvi_strLen(szFrom);
 #endif
-		char * dst = (char *)kvi_malloc(len+1);
+		char * dst = (char *)KviMemory::allocate(len+1);
 		kvi_fastmove(dst,szFrom,len+1);
 		szTo = dst;
 	} else {
@@ -124,7 +124,7 @@ inline void kvi_hash_key_copy(const char * const &szFrom,const char * &szTo,bool
 inline void kvi_hash_key_destroy(const char * &szKey,bool bDeepCopy)
 {
 	if(bDeepCopy)
-		kvi_free(szKey);
+		KviMemory::free((char *)szKey);
 }
 
 /**
@@ -137,9 +137,9 @@ inline const char * & kvi_hash_key_default(const char **)
 }
 
 /**
-* \brief Hash function for the KviStr data type
+* \brief Hash function for the KviCString data type
 */
-inline unsigned int kvi_hash_hash(const KviStr &szKey,bool bCaseSensitive)
+inline unsigned int kvi_hash_hash(const KviCString &szKey,bool bCaseSensitive)
 {
 	unsigned int uResult = 0;
 	const char * p = szKey.ptr();
@@ -161,34 +161,34 @@ inline unsigned int kvi_hash_hash(const KviStr &szKey,bool bCaseSensitive)
 }
 
 /**
-* \brief Hash key compare function for the KviStr data type
+* \brief Hash key compare function for the KviCString data type
 */
-inline bool kvi_hash_key_equal(const KviStr &szKey1,const KviStr &szKey2)
+inline bool kvi_hash_key_equal(const KviCString &szKey1,const KviCString &szKey2)
 {
 	return kvi_hash_key_equal(szKey1.ptr(),szKey2.ptr());
 }
 
 /**
-* \brief Hash key copy function for the KviStr data type
+* \brief Hash key copy function for the KviCString data type
 */
-inline void kvi_hash_key_copy(const KviStr &szFrom,KviStr &szTo,bool)
+inline void kvi_hash_key_copy(const KviCString &szFrom,KviCString &szTo,bool)
 {
 	szTo = szFrom;
 }
 
 /**
-* \brief Hash key destruction function for the KviStr data type
+* \brief Hash key destruction function for the KviCString data type
 */
-inline void kvi_hash_key_destroy(KviStr &,bool)
+inline void kvi_hash_key_destroy(KviCString &,bool)
 {
 }
 
 /**
-* \brief Default (empty) hash key for the KviStr data type
+* \brief Default (empty) hash key for the KviCString data type
 */
-inline const KviStr & kvi_hash_key_default(KviStr *)
+inline const KviCString & kvi_hash_key_default(KviCString *)
 {
-	return KviStr::emptyString();
+	return KviCString::emptyString();
 }
 
 /**
@@ -411,7 +411,7 @@ public:
 *
 * Implementations for the most likey Key data types are provided below.
 * KviPointerHashTable will automagically work with const char, QString,
-* KviStr and integer types as keys.
+* KviCString and integer types as keys.
 *
 * For string Key types, the hash table may or may not be case sensitive.
 * For other Key types the case sensitive flag has no meaning and will
diff --git a/src/kvilib/core/kvi_pointerlist.h b/src/kvilib/core/KviPointerList.h
index 6b086703b..9cc1c1083 100644
--- a/src/kvilib/core/kvi_pointerlist.h
+++ b/src/kvilib/core/KviPointerList.h
@@ -2,11 +2,11 @@
 #define _KVI_POINTERLIST_H_
 //===============================================================================
 //
-//   File : kvi_pointerlist.h
+//   File : KviPointerList.h
 //   Creation date : Tue Jul 6 1999 14:52:20 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 1999-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 1999-2010 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
@@ -26,13 +26,13 @@
 //
 //   C++ Template based double linked pointer list class
 //   Original ss_list.h Created on 10 Dec 2001
-//   Copyright (C) 2001-2007 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2001-2010 Szymon Stefanek (pragma at kvirc dot net)
 //   Added to KVIrc on 02 Jan 2008.
 //
 //===============================================================================
 
 /**
-* \file kvi_pointerlist.h
+* \file KviPointerList.h
 * \author Szymon Stefanek
 * \brief C++ Template based double linked pointer list class
 *
@@ -121,12 +121,12 @@ public:
 *
 * \verbatim
 * KviPointerList<T> l;
-* l.append(new KviStr("x"));
-* l.append(new KviStr("y"));
+* l.append(new KviCString("x"));
+* l.append(new KviCString("y"));
 * KviPointerListIterator<T> it(l);
 * it.moveFirst();
 * l.removeFirst();
-* KviStr * tmp = it.data(); <-- this will crash
+* KviCString * tmp = it.data(); <-- this will crash
 * \endverbatim
 *
 * In the rare cases in that you need to remove items
@@ -1229,8 +1229,8 @@ public:
 
 // BROKEN MSVC LINKER
 #ifdef COMPILE_ON_WINDOWS
-	#include "kvi_string.h"
-	template class KVILIB_API KviPointerList<KviStr>;
+	#include "KviCString.h"
+	template class KVILIB_API KviPointerList<KviCString>;
 #endif
 
 #endif //_KVI_POINTERLIST_H_
diff --git a/src/kvilib/core/kvi_qstring.cpp b/src/kvilib/core/KviQString.cpp
index c3fc00577..2764b12ee 100644
--- a/src/kvilib/core/kvi_qstring.cpp
+++ b/src/kvilib/core/KviQString.cpp
@@ -1,10 +1,10 @@
 //=============================================================================
 //
-//   File : kvi_qstring.cpp
+//   File : KviQString.cpp
 //   Creation date : Mon Aug 04 2003 13:36:33 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2003-2010 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
@@ -29,10 +29,10 @@
 //=============================================================================
 
 
-#include "kvi_qstring.h"
-#include "kvi_string.h"
-#include "kvi_malloc.h"
-#include "kvi_locale.h"
+#include "KviQString.h"
+#include "KviCString.h"
+#include "KviMemory.h"
+#include "KviLocale.h"
 
 #include <ctype.h> // for tolower()
 #include <stdio.h> // for sprintf()
@@ -697,7 +697,7 @@ namespace KviQString
 			return;
 		}
 
-		QChar * pBuffer = (QChar *)kvi_malloc(sizeof(QChar) * iAllocSize);
+		QChar * pBuffer = (QChar *)KviMemory::allocate(sizeof(QChar) * iAllocSize);
 		//QChar * p = (QChar *)s.unicode();
 
 		char * pcArgString;
@@ -714,14 +714,14 @@ namespace KviQString
 #define INCREMENT_MEM \
 		{ \
 			iAllocSize += MEMINCREMENT; \
-			pBuffer = (QChar *)kvi_realloc(pBuffer,sizeof(QChar) * iAllocSize); \
+			pBuffer = (QChar *)KviMemory::reallocate(pBuffer,sizeof(QChar) * iAllocSize); \
 			p = pBuffer + iRealLen; \
 		}
 
 #define INCREMENT_MEM_BY(numchars) \
 		{ \
 			iAllocSize += numchars + MEMINCREMENT; \
-			pBuffer = (QChar *)kvi_realloc(pBuffer,sizeof(QChar) * iAllocSize); \
+			pBuffer = (QChar *)KviMemory::reallocate(pBuffer,sizeof(QChar) * iAllocSize); \
 			p = pBuffer + iRealLen; \
 		}
 
@@ -769,9 +769,9 @@ namespace KviQString
 					iRealLen += szStr.length();
 					continue;
 				}
-				case 'S': // KviStr * string
+				case 'S': // KviCString * string
 				{
-					KviStr * szStr = kvi_va_arg(list,KviStr *);
+					KviCString * szStr = kvi_va_arg(list,KviCString *);
 					if(!szStr)
 					{
 						continue;
@@ -965,7 +965,7 @@ namespace KviQString
 		}
 
 		szSrc.setUnicode(pBuffer,iRealLen);
-		kvi_free(pBuffer);
+		KviMemory::free(pBuffer);
 		//szSrc.squeeze();
 	}
 
@@ -1259,7 +1259,7 @@ namespace KviQString
 			QString szRet;
 			return szRet;
 		}
-		QChar * pBuffer = (QChar *)kvi_malloc(sizeof(QChar) * szSrc.length());
+		QChar * pBuffer = (QChar *)KviMemory::allocate(sizeof(QChar) * szSrc.length());
 		QChar * pB = pBuffer;
 		unsigned short usX = pC->unicode();
 		while(usX)
@@ -1273,7 +1273,7 @@ namespace KviQString
 			usX = pC->unicode();
 		}
 		QString szRet(pBuffer,szSrc.length());
-		kvi_free(pBuffer);
+		KviMemory::free(pBuffer);
 		return szRet;
 	}
 
@@ -1285,7 +1285,7 @@ namespace KviQString
 			QString szRet;
 			return szRet;
 		}
-		QChar * pBuffer = (QChar *)kvi_malloc(sizeof(QChar) * szSrc.length());
+		QChar * pBuffer = (QChar *)KviMemory::allocate(sizeof(QChar) * szSrc.length());
 		QChar * pB = pBuffer;
 		unsigned short usX = pC->unicode();
 		while(usX)
@@ -1300,7 +1300,7 @@ namespace KviQString
 			usX = pC->unicode();
 		}
 		QString szRet(pBuffer,szSrc.length());
-		kvi_free(pBuffer);
+		KviMemory::free(pBuffer);
 		return szRet;
 	}
 
diff --git a/src/kvilib/core/kvi_qstring.h b/src/kvilib/core/KviQString.h
index 2ad7511cd..f7d7a0cf4 100644
--- a/src/kvilib/core/kvi_qstring.h
+++ b/src/kvilib/core/KviQString.h
@@ -2,11 +2,11 @@
 #define _KVI_QSTRING_H_
 //=============================================================================
 //
-//   File : kvi_qstring.h
+//   File : KviQString.h
 //   Creation date : Mon Aug 04 2003 13:36:33 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2003-2010 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
diff --git a/src/kvilib/core/kvi_bswap.h b/src/kvilib/core/kvi_bswap.h
index 844077f2a..0f6060481 100644
--- a/src/kvilib/core/kvi_bswap.h
+++ b/src/kvilib/core/kvi_bswap.h
@@ -7,7 +7,7 @@
 //   Creation date : Fri Mar 19 1999 03:15:21 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 1999-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 1999-2010 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
diff --git a/src/kvilib/core/kvi_error.cpp b/src/kvilib/core/kvi_error.cpp
index dacc6bf7b..83e84f4f7 100644
--- a/src/kvilib/core/kvi_error.cpp
+++ b/src/kvilib/core/kvi_error.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Sun Jul 02 2000 18:37:02 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -25,7 +25,7 @@
 
 #define _KVI_ERROR_CPP_
 
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_error.h"
 #include "kvi_settings.h"
 
diff --git a/src/kvilib/core/kvi_error.h b/src/kvilib/core/kvi_error.h
index c507bafb9..a103f34fe 100644
--- a/src/kvilib/core/kvi_error.h
+++ b/src/kvilib/core/kvi_error.h
@@ -6,7 +6,7 @@
 //   Creation date : Sun Jul 02 2000 18:35:56 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -31,7 +31,7 @@
 */
 
 #include "kvi_settings.h"
-#include "kvi_qstring.h"
+#include "KviQString.h"
 
 #define KviError_success 0
 #define KviError_unknownError 1
diff --git a/src/kvilib/core/kvi_hstrEqualCIN.h b/src/kvilib/core/kvi_hstrEqualCIN.h
index b043cdb4e..516b3a3a6 100644
--- a/src/kvilib/core/kvi_hstrEqualCIN.h
+++ b/src/kvilib/core/kvi_hstrEqualCIN.h
@@ -32,7 +32,7 @@
 * \brief Comparison function kvi_hstrEqualCIN
 */
 
-#include "kvi_string.h"
+#include "KviCString.h"
 
 /**
 * \brief Returns true if the string are equals casa insensitive
diff --git a/src/kvilib/core/kvi_inttypes.h b/src/kvilib/core/kvi_inttypes.h
index fe47ae1bf..456fd9bd1 100644
--- a/src/kvilib/core/kvi_inttypes.h
+++ b/src/kvilib/core/kvi_inttypes.h
@@ -6,7 +6,7 @@
 //   Creation date : Wed Sep  4 22:28:00 2002 GMT by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2002-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2002-2010 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
diff --git a/src/kvilib/core/kvi_memmove.cpp b/src/kvilib/core/kvi_memmove.cpp
index 46ba5844e..d7c179fbd 100644
--- a/src/kvilib/core/kvi_memmove.cpp
+++ b/src/kvilib/core/kvi_memmove.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Sun Jun 18 2000 18:27:50 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
diff --git a/src/kvilib/core/kvi_memmove.h b/src/kvilib/core/kvi_memmove.h
index a4f53271a..7a5703ee1 100644
--- a/src/kvilib/core/kvi_memmove.h
+++ b/src/kvilib/core/kvi_memmove.h
@@ -7,7 +7,7 @@
 //   Creation date : Fri Mar 19 1999 03:15:21 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 1999-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 1999-2010 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
diff --git a/src/kvilib/core/kvi_strasm.h b/src/kvilib/core/kvi_strasm.h
index c5e2de11e..a248deca1 100644
--- a/src/kvilib/core/kvi_strasm.h
+++ b/src/kvilib/core/kvi_strasm.h
@@ -7,7 +7,7 @@
 //   Creation date : Sun Jun 18 2000 18:38:26 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
diff --git a/src/kvilib/ext/kvi_animatedpixmap.cpp b/src/kvilib/ext/KviAnimatedPixmap.cpp
index f4496d56c..bbad3d4ca 100644
--- a/src/kvilib/ext/kvi_animatedpixmap.cpp
+++ b/src/kvilib/ext/KviAnimatedPixmap.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_animatedpixmap.cpp
+//   File : KviAnimatedPixmap.cpp
 //   Creation date : Wed Jul 30 2008 01:45:21 CEST by Alexey Uzhva
 //
 //   This file is part of the KVirc irc client distribution
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#include "kvi_animatedpixmap.h"
+#include "KviAnimatedPixmap.h"
 #include "kvi_settings.h"
 
 #include <QImageReader>
diff --git a/src/kvilib/ext/kvi_animatedpixmap.h b/src/kvilib/ext/KviAnimatedPixmap.h
index 699b2c493..a6a364d40 100644
--- a/src/kvilib/ext/kvi_animatedpixmap.h
+++ b/src/kvilib/ext/KviAnimatedPixmap.h
@@ -2,7 +2,7 @@
 #define KVI_ANIMATEDPIXMAP_H_
 //=============================================================================
 //
-//   File : kvi_animatedpixmap.h
+//   File : KviAnimatedPixmap.h
 //   Creation date : Wed Jul 30 2008 01:45:21 CEST by Alexey Uzhva
 //
 //   This file is part of the KVirc irc client distribution
@@ -29,7 +29,7 @@
 #include <QList>
 #include <QTimer>
 #include "kvi_settings.h"
-#include "kvi_animatedpixmapcache.h"
+#include "KviAnimatedPixmapCache.h"
 
 /**
  * This class should not be here, because we already have QMovie
diff --git a/src/kvilib/ext/kvi_animatedpixmapcache.cpp b/src/kvilib/ext/KviAnimatedPixmapCache.cpp
index 2ecbcab05..924f329b5 100644
--- a/src/kvilib/ext/kvi_animatedpixmapcache.cpp
+++ b/src/kvilib/ext/KviAnimatedPixmapCache.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_animatedpixmapcache.cpp
+//   File : KviAnimatedPixmapCache.cpp
 //   Creation date : Thu Jul 31 2008 01:45:21 CEST by Alexey Uzhva
 //
 //   This file is part of the KVirc irc client distribution
@@ -22,8 +22,8 @@
 //
 //=============================================================================
 
-#include "kvi_animatedpixmapcache.h"
-#include "kvi_time.h"
+#include "KviAnimatedPixmapCache.h"
+#include "KviTimeUtils.h"
 
 #include <QImageReader>
 #include <QImage>
diff --git a/src/kvilib/ext/kvi_animatedpixmapcache.h b/src/kvilib/ext/KviAnimatedPixmapCache.h
index e12276c81..89a133db7 100644
--- a/src/kvilib/ext/kvi_animatedpixmapcache.h
+++ b/src/kvilib/ext/KviAnimatedPixmapCache.h
@@ -2,7 +2,7 @@
 #define KVI_ANIMATEDPIXMAPCACHE_H_
 //=============================================================================
 //
-//   File : kvi_animatedpixmapcache.h
+//   File : KviAnimatedPixmapCache.h
 //   Creation date : Thu Jul 31 2008 01:45:21 CEST by Alexey Uzhva
 //
 //   This file is part of the KVirc irc client distribution
diff --git a/src/kvilib/ext/kvi_cmdformatter.cpp b/src/kvilib/ext/KviCommandFormatter.cpp
index f4cfeaf91..f474053fc 100644
--- a/src/kvilib/ext/kvi_cmdformatter.cpp
+++ b/src/kvilib/ext/KviCommandFormatter.cpp
@@ -1,10 +1,10 @@
 //=============================================================================
 //
-//   File : kvi_cmdformatter.cpp
+//   File : KviCommandFormatter.cpp
 //   Creation date : Tue Jun 12 2001 03:08:12 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-2010 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
@@ -23,11 +23,11 @@
 //=============================================================================
 
 
-#include "kvi_cmdformatter.h"
+#include "KviCommandFormatter.h"
 
 namespace KviCommandFormatter
 {
-	bool hasLeadingChars(KviStr ** array,char c)
+	bool hasLeadingChars(KviCString ** array,char c)
 	{
 		if(!(*array))return false; // can't have more leading chars
 		bool bGotIt = false;
@@ -39,7 +39,7 @@ namespace KviCommandFormatter
 				bGotIt = true;
 			} else {
 				// we pretend this line to be empty
-				KviStr tmp = *(*array);
+				KviCString tmp = *(*array);
 				tmp.trimmed();
 				if(tmp.hasData())return false;
 				*(*array) = ""; // set it to empty also in the main buffer
@@ -71,7 +71,7 @@ namespace KviCommandFormatter
 		return bGotIt;
 	}
 
-	void trimLeading(KviStr ** array)
+	void trimLeading(KviCString ** array)
 	{
 		while(*array)
 		{
@@ -89,7 +89,7 @@ namespace KviCommandFormatter
 	}
 
 
-	void addLeading(KviStr ** array,char c)
+	void addLeading(KviCString ** array,char c)
 	{
 		while(*array)
 		{
@@ -107,16 +107,16 @@ namespace KviCommandFormatter
 	}
 
 
-	void unindent(KviStr &buffer)
+	void unindent(KviCString &buffer)
 	{
 		// we can format correctly up to 65536 lines (that's really enough)
 		int realLen;
-		KviStr ** array = buffer.splitToArray('\n',65536,&realLen);
+		KviCString ** array = buffer.splitToArray('\n',65536,&realLen);
 		if(array)
 		{
 			while(hasLeadingChars(array,'\t') || hasLeadingChars(array,' '))trimLeading(array);
 			buffer.joinFromArray(array,"\n",true);
-			KviStr::freeArray(array);
+			KviCString::freeArray(array);
 		}
 	}
 
@@ -136,7 +136,7 @@ namespace KviCommandFormatter
 		}
 	}
 
-	void bufferFromBlock(KviStr &buffer)
+	void bufferFromBlock(KviCString &buffer)
 	{
 		buffer.trimmed();
 
@@ -170,16 +170,16 @@ namespace KviCommandFormatter
 		buffer = buffer.trimmed();
 	}
 
-	void indent(KviStr &buffer)
+	void indent(KviCString &buffer)
 	{
 		// we can format correctly up to 65536 lines (that's really enough)
 		int realLen;
-		KviStr ** array = buffer.splitToArray('\n',65536,&realLen);
+		KviCString ** array = buffer.splitToArray('\n',65536,&realLen);
 		if(array)
 		{
 			addLeading(array,'\t');
 			buffer.joinFromArray(array,"\n",true);
-			KviStr::freeArray(array);
+			KviCString::freeArray(array);
 		}
 	}
 
@@ -198,7 +198,7 @@ namespace KviCommandFormatter
 		}
 	}
 
-	void blockFromBuffer(KviStr &buffer)
+	void blockFromBuffer(KviCString &buffer)
 	{
 		indent(buffer);
 		buffer.prepend("{\n");
diff --git a/src/kvilib/ext/kvi_cmdformatter.h b/src/kvilib/ext/KviCommandFormatter.h
index 5155017af..edc3e20e5 100644
--- a/src/kvilib/ext/kvi_cmdformatter.h
+++ b/src/kvilib/ext/KviCommandFormatter.h
@@ -3,11 +3,11 @@
 
 //=============================================================================
 //
-//   File : kvi_cmdformatter.h
+//   File : KviCommandFormatter.h
 //   Creation date : Tue Jun 12 2001 03:04:05 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-2010 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
@@ -25,39 +25,39 @@
 //
 //=============================================================================
 
-#include "kvi_string.h"
+#include "KviCString.h"
 #include "kvi_settings.h"
 
-#include "kvi_qstring.h"
+#include "KviQString.h"
 #include <QStringList>
 
 namespace KviCommandFormatter
 {
-	extern KVILIB_API bool hasLeadingChars(KviStr * array,char c);
+	extern KVILIB_API bool hasLeadingChars(KviCString * array,char c);
 	extern KVILIB_API bool hasLeadingChars(QStringList &list,const QChar &c);
 
-	extern KVILIB_API void trimLeading(KviStr ** array);
+	extern KVILIB_API void trimLeading(KviCString ** array);
 	extern KVILIB_API void trimLeading(QStringList &list);
 
-	extern KVILIB_API void addLeading(KviStr ** array,char c);
+	extern KVILIB_API void addLeading(KviCString ** array,char c);
 	extern KVILIB_API void addLeading(QStringList &list,const QChar &c);
 
-	extern KVILIB_API void trimBlockBraces(KviStr &buffer);
+	extern KVILIB_API void trimBlockBraces(KviCString &buffer);
 	extern KVILIB_API void trimBlockBraces(QString &buffer);
 
-	extern KVILIB_API void unindent(KviStr &buffer);
+	extern KVILIB_API void unindent(KviCString &buffer);
 	extern KVILIB_API void unindent(QString &buffer);
 
-	extern KVILIB_API void bufferFromBlock(KviStr &buffer);
+	extern KVILIB_API void bufferFromBlock(KviCString &buffer);
 	extern KVILIB_API void bufferFromBlock(QString &buffer);
 
-	extern KVILIB_API void addBlockBraces(KviStr &buffer);
+	extern KVILIB_API void addBlockBraces(KviCString &buffer);
 	extern KVILIB_API void addBlockBraces(QString &buffer);
 
-	extern KVILIB_API void indent(KviStr &buffer);
+	extern KVILIB_API void indent(KviCString &buffer);
 	extern KVILIB_API void indent(QString &buffer);
 
-	extern KVILIB_API void blockFromBuffer(KviStr &buffer);
+	extern KVILIB_API void blockFromBuffer(KviCString &buffer);
 	extern KVILIB_API void blockFromBuffer(QString &buffer);
 }
 
diff --git a/src/kvilib/ext/kvi_config.cpp b/src/kvilib/ext/KviConfigurationFile.cpp
index 49b1d67e0..ef30f93e5 100644
--- a/src/kvilib/ext/kvi_config.cpp
+++ b/src/kvilib/ext/KviConfigurationFile.cpp
@@ -1,10 +1,10 @@
 //=============================================================================
 //
-//   File : kvi_config.cpp
+//   File : KviConfigurationFile.cpp
 //   Creation date : Thu Jan 14 1999 18:03:59 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 1999-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 1999-2010 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
@@ -23,88 +23,88 @@
 //=============================================================================
 
 
-#include "kvi_config.h"
-#include "kvi_fileutils.h"
-#include "kvi_pixmap.h"
-#include "kvi_msgtype.h"
-#include "kvi_stringconversion.h"
+#include "KviConfigurationFile.h"
+#include "KviFileUtils.h"
+#include "KviPixmap.h"
+#include "KviMessageTypeSettings.h"
+#include "KviStringConversion.h"
 #include "kvi_memmove.h"
-#include "kvi_malloc.h"
-#include "kvi_file.h"
+#include "KviMemory.h"
+#include "KviFile.h"
 
 
-KviConfig::KviConfig(const QString &filename,FileMode f,bool bLocal8Bit)
+KviConfigurationFile::KviConfigurationFile(const QString &filename,FileMode f,bool bLocal8Bit)
 {
 	m_bLocal8Bit           = bLocal8Bit;
 	m_szFileName           = filename;
 	m_bDirty               = false;
 	m_szGroup              = KVI_CONFIG_DEFAULT_GROUP;
 	m_bPreserveEmptyGroups = false;
-	m_bReadOnly            = (f == KviConfig::Read);
-	m_pDict                = new KviPointerHashTable<QString,KviConfigGroup>(17,false);
+	m_bReadOnly            = (f == KviConfigurationFile::Read);
+	m_pDict                = new KviPointerHashTable<QString,KviConfigurationFileGroup>(17,false);
 	m_pDict->setAutoDelete(true);
-	if(f != KviConfig::Write)load();
+	if(f != KviConfigurationFile::Write)load();
 }
 
-KviConfig::KviConfig(const char* filename,FileMode f,bool bLocal8Bit)
+KviConfigurationFile::KviConfigurationFile(const char* filename,FileMode f,bool bLocal8Bit)
 {
 	m_bLocal8Bit           = bLocal8Bit;
 	m_szFileName           = QString::fromUtf8(filename);
 	m_bDirty               = false;
 	m_szGroup              = KVI_CONFIG_DEFAULT_GROUP;
 	m_bPreserveEmptyGroups = false;
-	m_bReadOnly            = (f == KviConfig::Read);
-	m_pDict                = new KviPointerHashTable<QString,KviConfigGroup>(17,false);
+	m_bReadOnly            = (f == KviConfigurationFile::Read);
+	m_pDict                = new KviPointerHashTable<QString,KviConfigurationFileGroup>(17,false);
 	m_pDict->setAutoDelete(true);
-	if(f != KviConfig::Write)load();
+	if(f != KviConfigurationFile::Write)load();
 }
 
 
-KviConfig::~KviConfig()
+KviConfigurationFile::~KviConfigurationFile()
 {
 	if(m_bDirty)save();
 	delete m_pDict;
 }
 
-void KviConfig::clear()
+void KviConfigurationFile::clear()
 {
 	delete m_pDict;
-	m_pDict      = new KviPointerHashTable<QString,KviConfigGroup>(17,false);
+	m_pDict      = new KviPointerHashTable<QString,KviConfigurationFileGroup>(17,false);
 	m_pDict->setAutoDelete(true);
 	m_bDirty     = true;
 	m_szGroup    = KVI_CONFIG_DEFAULT_GROUP;
 }
 
-void KviConfig::clearGroup(const QString & szGroup)
+void KviConfigurationFile::clearGroup(const QString & szGroup)
 {
 	m_bDirty = true;
 	m_pDict->remove(szGroup);
 	if(!m_pDict->find(m_szGroup))m_szGroup = KVI_CONFIG_DEFAULT_GROUP; //removed the current one
 }
 
-void KviConfig::clearKey(const QString & szKey)
+void KviConfigurationFile::clearKey(const QString & szKey)
 {
 	m_bDirty = true;
-	KviConfigGroup * p_group = getCurrentGroup();
+	KviConfigurationFileGroup * p_group = getCurrentGroup();
 	p_group->remove(szKey);
 	if(p_group->count() == 0)clearGroup(m_szGroup);
 }
 
 /*
-void KviConfig::getContentsString(KviStr &buffer)
+void KviConfigurationFile::getContentsString(KviCString &buffer)
 {
 	buffer = __tr("Contents of config file ");
 	buffer.append(m_szFileName.ptr());
 	buffer.append('\n');
 	int sections = 0;
 	int keys     = 0;
-	KviPointerHashTableIterator<QString,KviStrDict> it(*m_pDict);
+	KviPointerHashTableIterator<QString,KviCStringDict> it(*m_pDict);
 	while(it.current()){
 		buffer.append(" Section [");
 		buffer.append(it.currentKey());
 		buffer.append("]\n");
 		int sectionKeys = 0;
-		KviPointerHashTableIterator<QString,KviStr> it2(*it.current());
+		KviPointerHashTableIterator<QString,KviCString> it2(*it.current());
 		while(it2.current()){
 			buffer.append("  Key [");
 			buffer.append(it2.currentKey());
@@ -115,13 +115,13 @@ void KviConfig::getContentsString(KviStr &buffer)
 			++sectionKeys;
 			++keys;
 		}
-		KviStr tmp(KviStr::Format,__tr("  Total: %d keys"),sectionKeys);
+		KviCString tmp(KviCString::Format,__tr("  Total: %d keys"),sectionKeys);
 		buffer.append(tmp);
 		buffer.append('\n');
 		++it;
 		++sections;
 	}
-	KviStr tmp(KviStr::Format,__tr("Total: %d keys in %d sections"),keys,sections);
+	KviCString tmp(KviCString::Format,__tr("Total: %d keys in %d sections"),keys,sections);
 	buffer.append(tmp);
 }
 */
@@ -130,7 +130,7 @@ void KviConfig::getContentsString(KviStr &buffer)
 
 #define LOAD_BLOCK_SIZE 32768
 
-bool KviConfig::load()
+bool KviConfigurationFile::load()
 {
 	// this is really faster than the old version :)
 
@@ -138,12 +138,12 @@ bool KviConfig::load()
 	KviFile f(m_szFileName);
 	if(!f.open(QFile::ReadOnly)) return false;
 
-	KviStr tmp;
-	KviConfigGroup * p_group = 0;
+	KviCString tmp;
+	KviConfigurationFileGroup * p_group = 0;
 
 	int iLoadBlockSize = LOAD_BLOCK_SIZE;
 
-	char * buffer = (char *)kvi_malloc(iLoadBlockSize * sizeof(char));
+	char * buffer = (char *)KviMemory::allocate(iLoadBlockSize * sizeof(char));
 
 	int toRead;
 	int readedLen;
@@ -159,7 +159,7 @@ bool KviConfig::load()
 			// ops... a string longer than iLoadBlockSize - 1 chars
 			iLoadBlockSize += LOAD_BLOCK_SIZE;
 			int iOffset = p - buffer;
-			buffer = (char *)kvi_realloc(buffer,iLoadBlockSize * sizeof(char));
+			buffer = (char *)KviMemory::reallocate(buffer,iLoadBlockSize * sizeof(char));
 			p = buffer + iOffset;
 			toRead += LOAD_BLOCK_SIZE;
 		}
@@ -175,7 +175,7 @@ bool KviConfig::load()
 				{
 					// error at all
 					f.close();
-					kvi_free(buffer);
+					KviMemory::free(buffer);
 					return true; // nothing more to parse anyway
 				} else {
 					// just a zero byte read
@@ -183,7 +183,7 @@ bool KviConfig::load()
 					{
 						// there was nothing in the buffer
 						f.close(); // nothing to parse anyway
-						kvi_free(buffer);
+						KviMemory::free(buffer);
 						return true;
 					}
 					// there is something in the buffer but we have readed 0 bytes
@@ -284,7 +284,7 @@ bool KviConfig::load()
 							p_group = m_pDict->find(szGroup);
 							if(!p_group)
 							{
-								p_group = new KviConfigGroup(17,false);
+								p_group = new KviConfigurationFileGroup(17,false);
 								p_group->setAutoDelete(true);
 								m_pDict->insert(szGroup,p_group);
 							}
@@ -319,7 +319,7 @@ bool KviConfig::load()
 								{
 									// ops...we're missing a group
 									// use the default one
-									p_group = new KviConfigGroup(17,false);
+									p_group = new KviConfigurationFileGroup(17,false);
 									p_group->setAutoDelete(true);
 									m_pDict->insert(KVI_CONFIG_DEFAULT_GROUP,p_group);
 								}
@@ -353,21 +353,21 @@ bool KviConfig::load()
 	} while(readedLen == toRead);
 
 	f.close();
-	kvi_free(buffer);
+	KviMemory::free(buffer);
 	return true;
 }
 
 /*
 
-bool KviConfig::load()
+bool KviConfigurationFile::load()
 {
 	QFile f(m_szFileName);
 	if(!f.open(IO_ReadOnly))return false;
 
 
-	KviConfigGroup * p_group = 0;
+	KviConfigurationFileGroup * p_group = 0;
 
-	KviStr dataLine;
+	KviCString dataLine;
 	bool bContinue;
 
 	do {
@@ -393,7 +393,7 @@ bool KviConfig::load()
 
 						if(!p_group)
 						{
-							p_group = new KviConfigGroup(17,false);
+							p_group = new KviConfigurationFileGroup(17,false);
 							p_group->setAutoDelete(true);
 							m_pDict->insert(szUtf8,p_group);
 						}
@@ -403,7 +403,7 @@ bool KviConfig::load()
 				default:
 				{
 					//data entry...split in two...
-					KviStr name=dataLine.getToken('=');
+					KviCString name=dataLine.getToken('=');
 					name.stripRightWhiteSpace(); // strip any whitespace added externally
 					name.hexDecode();
 					if(name.hasData())
@@ -416,7 +416,7 @@ bool KviConfig::load()
 						{
 							// ops...we're missing a group
 							// use the default one
-							p_group = new KviConfigGroup(17,false);
+							p_group = new KviConfigurationFileGroup(17,false);
 							p_group->setAutoDelete(true);
 							m_pDict->insert(KVI_CONFIG_DEFAULT_GROUP,p_group);
 						}
@@ -435,7 +435,7 @@ bool KviConfig::load()
 
 */
 
-bool KviConfig::ensureWritable()
+bool KviConfigurationFile::ensureWritable()
 {
 	if(m_bReadOnly) return false;
 
@@ -447,7 +447,7 @@ bool KviConfig::ensureWritable()
 	return true;
 }
 
-bool KviConfig::save()
+bool KviConfigurationFile::save()
 {
 	static unsigned char encode_table[256]=
 	{
@@ -508,22 +508,22 @@ bool KviConfig::save()
 	if(!f.open(QFile::WriteOnly | QFile::Truncate)) return false;
 	if(f.write("# KVIrc configuration file\n",27) != 27) return false;
 
-	KviPointerHashTableIterator<QString,KviConfigGroup> it(*m_pDict);
+	KviPointerHashTableIterator<QString,KviConfigurationFileGroup> it(*m_pDict);
 	while (it.current())
 	{
 		if((it.current()->count() != 0) || (m_bPreserveEmptyGroups))
 		{
-			KviStr group(m_bLocal8Bit ? KviQString::toLocal8Bit(it.currentKey()) : KviQString::toUtf8(it.currentKey()));
+			KviCString group(m_bLocal8Bit ? KviQString::toLocal8Bit(it.currentKey()) : KviQString::toUtf8(it.currentKey()));
 			group.hexEncodeWithTable(encode_table);
 
 			if(!f.putChar('['))return false;
 			if(f.write(group.ptr(),group.len()) < (unsigned int) group.len())return false;
 			if(f.write("]\n",2) < 2)return false;
 
-			KviConfigGroup * dict = (KviConfigGroup *)it.current();
-			KviConfigGroupIterator it2(*dict);
+			KviConfigurationFileGroup * dict = (KviConfigurationFileGroup *)it.current();
+			KviConfigurationFileGroupIterator it2(*dict);
 
-			KviStr szName,szValue;
+			KviCString szName,szValue;
 			while(QString * p_str = it2.current())
 			{
 				szName = m_bLocal8Bit ? KviQString::toLocal8Bit(it2.currentKey()) : KviQString::toUtf8(it2.currentKey());
@@ -545,7 +545,7 @@ bool KviConfig::save()
 	return true;
 }
 
-void KviConfig::setGroup(const QString & szGroup)
+void KviConfigurationFile::setGroup(const QString & szGroup)
 {
 	m_szGroup = szGroup;
 	if(m_bPreserveEmptyGroups)
@@ -558,44 +558,44 @@ void KviConfig::setGroup(const QString & szGroup)
 	}
 }
 
-bool KviConfig::hasKey(const QString & szKey)
+bool KviConfigurationFile::hasKey(const QString & szKey)
 {
-	KviConfigGroup * p_group = getCurrentGroup();
+	KviConfigurationFileGroup * p_group = getCurrentGroup();
 	return (p_group->find(szKey) != 0);
 }
 
-bool KviConfig::hasGroup(const QString & szGroup)
+bool KviConfigurationFile::hasGroup(const QString & szGroup)
 {
 	return (m_pDict->find(szGroup) != 0);
 }
 
-KviConfigGroup * KviConfig::getCurrentGroup()
+KviConfigurationFileGroup * KviConfigurationFile::getCurrentGroup()
 {
 	if(m_szGroup.isEmpty())m_szGroup = KVI_CONFIG_DEFAULT_GROUP;
-	KviConfigGroup * p_group = m_pDict->find(m_szGroup);
+	KviConfigurationFileGroup * p_group = m_pDict->find(m_szGroup);
 	if(!p_group)
 	{
 		//create the group
-		p_group = new KviConfigGroup(17,false);
+		p_group = new KviConfigurationFileGroup(17,false);
 		p_group->setAutoDelete(true);
 		m_pDict->insert(m_szGroup,p_group);
 	}
 	return p_group;
 }
 
-////////////////////////////////// KviStr
+////////////////////////////////// QString
 
-void KviConfig::writeEntry(const QString & szKey,const QString & szValue)
+void KviConfigurationFile::writeEntry(const QString & szKey,const QString & szValue)
 {
 	m_bDirty = true;
-	KviConfigGroup * p_group = getCurrentGroup();
+	KviConfigurationFileGroup * p_group = getCurrentGroup();
 	QString *p_data=new QString(szValue);
 	p_group->replace(szKey,p_data);
 }
 
-QString KviConfig::readEntry(const QString & szKey, const QString & szDefault)
+QString KviConfigurationFile::readEntry(const QString & szKey, const QString & szDefault)
 {
-	KviConfigGroup * pGroup = getCurrentGroup();
+	KviConfigurationFileGroup * pGroup = getCurrentGroup();
 	QString * pStr = pGroup->find(szKey);
 	if(!pStr)
 	{
@@ -610,28 +610,28 @@ QString KviConfig::readEntry(const QString & szKey, const QString & szDefault)
 
 static QString g_szConfigStringListSeparator(",\\[ITEM],");
 
-QStringList KviConfig::readStringListEntry(const QString & szKey,const QStringList &list)
+QStringList KviConfigurationFile::readStringListEntry(const QString & szKey,const QStringList &list)
 {
-	KviConfigGroup * p_group = getCurrentGroup();
+	KviConfigurationFileGroup * p_group = getCurrentGroup();
 	QString * p_str = p_group->find(szKey);
 	if(!p_str)return list;
 
 	return p_str->split(g_szConfigStringListSeparator);
 }
 
-void KviConfig::writeEntry(const QString & szKey,const QStringList &list)
+void KviConfigurationFile::writeEntry(const QString & szKey,const QStringList &list)
 {
 	m_bDirty = true;
-	KviConfigGroup * p_group = getCurrentGroup();
+	KviConfigurationFileGroup * p_group = getCurrentGroup();
 	QString *p_data=new QString(list.join(g_szConfigStringListSeparator));
 	p_group->replace(szKey,p_data);
 }
 
 ////////////////////////////////// QList<int>
 
-QList<int> KviConfig::readIntListEntry(const QString & szKey,const QList<int> &list)
+QList<int> KviConfigurationFile::readIntListEntry(const QString & szKey,const QList<int> &list)
 {
-	KviConfigGroup * p_group = getCurrentGroup();
+	KviConfigurationFileGroup * p_group = getCurrentGroup();
 	QString * p_str = p_group->find(szKey);
 	if(!p_str)
 	{
@@ -655,15 +655,15 @@ QList<int> KviConfig::readIntListEntry(const QString & szKey,const QList<int> &l
 }
 
 
-void KviConfig::writeEntry(const QString & szKey,const QList<int> &list)
+void KviConfigurationFile::writeEntry(const QString & szKey,const QList<int> &list)
 {
 	m_bDirty = true;
-	KviConfigGroup * p_group = getCurrentGroup();
-	KviStr szData;
+	KviConfigurationFileGroup * p_group = getCurrentGroup();
+	KviCString szData;
 	for(QList<int>::ConstIterator it = list.begin();it != list.end();++it)
 	{
 		if(szData.hasData())szData.append(',');
-		szData.append(KviStr::Format,"%d",*it);
+		szData.append(KviCString::Format,"%d",*it);
 	}
 	//qDebug("Writing option list for group %s and key %s: %s",m_szGroup.latin1(),szKey.latin1(),szData.ptr());
 
@@ -674,18 +674,18 @@ void KviConfig::writeEntry(const QString & szKey,const QList<int> &list)
 
 // FIXME: #warning "Spaces in image names ?"
 
-void KviConfig::writeEntry(const QString & szKey,const KviPixmap &pixmap)
+void KviConfigurationFile::writeEntry(const QString & szKey,const KviPixmap &pixmap)
 {
 	m_bDirty = true;
-	KviConfigGroup * p_group = getCurrentGroup();
+	KviConfigurationFileGroup * p_group = getCurrentGroup();
 	QString *p_data=new QString();
 	KviStringConversion::toString(pixmap,*p_data);
 	p_group->replace(szKey,p_data);
 }
 
-KviPixmap KviConfig::readPixmapEntry(const QString & szKey,const KviPixmap &pixDef)
+KviPixmap KviConfigurationFile::readPixmapEntry(const QString & szKey,const KviPixmap &pixDef)
 {
-	KviConfigGroup * p_group = getCurrentGroup();
+	KviConfigurationFileGroup * p_group = getCurrentGroup();
 	QString * p_str = p_group->find(szKey);
 	if(p_str)
 	{
@@ -696,40 +696,40 @@ KviPixmap KviConfig::readPixmapEntry(const QString & szKey,const KviPixmap &pixD
 	}
 }
 
-////////////////////////////////// KviMsgType
+////////////////////////////////// KviMessageTypeSettings
 
-void KviConfig::writeEntry(const QString & szKey,const KviMsgType &msg)
+void KviConfigurationFile::writeEntry(const QString & szKey,const KviMessageTypeSettings &msg)
 {
 	m_bDirty = true;
-	KviConfigGroup * p_group = getCurrentGroup();
+	KviConfigurationFileGroup * p_group = getCurrentGroup();
 	QString szData;
 	KviStringConversion::toString(msg,szData);
 	p_group->replace(szKey,new QString(szData));
 }
 
-KviMsgType KviConfig::readMsgTypeEntry(const QString & szKey,const KviMsgType &msgDef)
+KviMessageTypeSettings KviConfigurationFile::readMsgTypeEntry(const QString & szKey,const KviMessageTypeSettings &msgDef)
 {
-	KviConfigGroup * p_group = getCurrentGroup();
+	KviConfigurationFileGroup * p_group = getCurrentGroup();
 	QString * p_str = p_group->find(szKey);
 	if(!p_str)return msgDef;
-	KviMsgType ret = msgDef;
+	KviMessageTypeSettings ret = msgDef;
 	KviStringConversion::fromString(*p_str,ret);
 	return ret;
 }
 
 ////////////////////////////////// QColor
 
-void KviConfig::writeEntry(const QString & szKey,const QColor &clr)
+void KviConfigurationFile::writeEntry(const QString & szKey,const QColor &clr)
 {
 	m_bDirty = true;
-	KviConfigGroup * p_group = getCurrentGroup();
-	KviStr szData(KviStr::Format,"%d,%d,%d",clr.red(),clr.green(),clr.blue());
+	KviConfigurationFileGroup * p_group = getCurrentGroup();
+	KviCString szData(KviCString::Format,"%d,%d,%d",clr.red(),clr.green(),clr.blue());
 	p_group->replace(szKey,new QString(szData.ptr()));
 }
 
-QColor KviConfig::readColorEntry(const QString & szKey,const QColor &clr)
+QColor KviConfigurationFile::readColorEntry(const QString & szKey,const QColor &clr)
 {
-	KviConfigGroup * p_group = getCurrentGroup();
+	KviConfigurationFileGroup * p_group = getCurrentGroup();
 	QColor color(clr);
 	QString * pointer_that_IS_initialized = p_group->find(szKey);
 
@@ -737,10 +737,10 @@ QColor KviConfig::readColorEntry(const QString & szKey,const QColor &clr)
 	if(pointer_that_IS_initialized)
 	{
 
-		KviStr str(*pointer_that_IS_initialized);
+		KviCString str(*pointer_that_IS_initialized);
 		str.stripLeftWhiteSpace();
 
-		KviStr red,green,blue;
+		KviCString red,green,blue;
 
 		str.getToken(red,',');
 		str.getToken(green,',');
@@ -762,37 +762,37 @@ QColor KviConfig::readColorEntry(const QString & szKey,const QColor &clr)
 
 ////////////////////////////////// QFont
 
-void KviConfig::getFontProperties(KviStr & buffer,QFont *fnt)
+void KviConfigurationFile::getFontProperties(KviCString & buffer,QFont *fnt)
 {
 	QString tmp;
 	KviStringConversion::toString(*fnt,tmp);
 	buffer = tmp;
 }
 
-void KviConfig::writeEntry(const QString & szKey,QFont &fnt)
+void KviConfigurationFile::writeEntry(const QString & szKey,QFont &fnt)
 {
 	m_bDirty = true;
-	KviConfigGroup * p_group = getCurrentGroup();
+	KviConfigurationFileGroup * p_group = getCurrentGroup();
 	QString *p_data = new QString();
 	KviStringConversion::toString(fnt,*p_data);
 	p_group->replace(szKey,p_data);
 }
 
 
-void KviConfig::setFontProperties(KviStr & str,QFont *fnt)
+void KviConfigurationFile::setFontProperties(KviCString & str,QFont *fnt)
 {
 	KviStringConversion::fromString(str.ptr(),*fnt);
 }
 
-QFont KviConfig::readFontEntry(const QString & szKey,const QFont &fnt)
+QFont KviConfigurationFile::readFontEntry(const QString & szKey,const QFont &fnt)
 {
 	QFont font(fnt);
-	KviConfigGroup * p_group = getCurrentGroup();
+	KviConfigurationFileGroup * p_group = getCurrentGroup();
 	QString * p_str       = p_group->find(szKey);
 	if(p_str)
 	{
 		//FontEntry=Arial,12,9,0,100,italic,underline,strikeout,
-		KviStr str(*p_str);
+		KviCString str(*p_str);
 		str.stripLeftWhiteSpace();
 		setFontProperties(str,&font);
 	}
@@ -801,17 +801,17 @@ QFont KviConfig::readFontEntry(const QString & szKey,const QFont &fnt)
 
 ////////////////////////////////// bool
 
-void KviConfig::writeEntry(const QString & szKey,bool bTrue)
+void KviConfigurationFile::writeEntry(const QString & szKey,bool bTrue)
 {
 	m_bDirty = true;
-	KviConfigGroup * p_group = getCurrentGroup();
+	KviConfigurationFileGroup * p_group = getCurrentGroup();
 	QString *p_data = new QString(bTrue ? "true" : "false");
 	p_group->replace(szKey,p_data);
 }
 
-bool KviConfig::readBoolEntry(const QString & szKey,bool bTrue)
+bool KviConfigurationFile::readBoolEntry(const QString & szKey,bool bTrue)
 {
-	KviConfigGroup * p_group = getCurrentGroup();
+	KviConfigurationFileGroup * p_group = getCurrentGroup();
 	QString * p_str = p_group->find(szKey);
 	if(!p_str)return bTrue;
 	return p_str->toLower() == "true";
@@ -819,18 +819,18 @@ bool KviConfig::readBoolEntry(const QString & szKey,bool bTrue)
 
 ////////////////////////////////// QRect
 
-void KviConfig::writeEntry(const QString & szKey,const QRect &rct)
+void KviConfigurationFile::writeEntry(const QString & szKey,const QRect &rct)
 {
 	m_bDirty = true;
-	KviConfigGroup * p_group = getCurrentGroup();
+	KviConfigurationFileGroup * p_group = getCurrentGroup();
 	QString szBuf;
 	KviStringConversion::toString(rct,szBuf);
 	p_group->replace(szKey,new QString(szBuf));
 }
 
-QRect KviConfig::readRectEntry(const QString & szKey,const QRect &rct)
+QRect KviConfigurationFile::readRectEntry(const QString & szKey,const QRect &rct)
 {
-	KviConfigGroup * p_group = getCurrentGroup();
+	KviConfigurationFileGroup * p_group = getCurrentGroup();
 	QString * str = p_group->find(szKey);
 	if(!str)return rct;
 	QRect ret;
@@ -839,18 +839,18 @@ QRect KviConfig::readRectEntry(const QString & szKey,const QRect &rct)
 
 ////////////////////////////////// unsigned short
 
-void KviConfig::writeEntry(const QString & szKey,unsigned short int usValue)
+void KviConfigurationFile::writeEntry(const QString & szKey,unsigned short int usValue)
 {
 	m_bDirty = true;
-	KviConfigGroup * p_group = getCurrentGroup();
+	KviConfigurationFileGroup * p_group = getCurrentGroup();
 	QString *p_data = new QString();
 	p_data->setNum(usValue);
 	p_group->replace(szKey,p_data);
 }
 
-unsigned short int KviConfig::readUShortEntry(const QString & szKey,unsigned short int usDefault)
+unsigned short int KviConfigurationFile::readUShortEntry(const QString & szKey,unsigned short int usDefault)
 {
-	KviConfigGroup * p_group = getCurrentGroup();
+	KviConfigurationFileGroup * p_group = getCurrentGroup();
 	QString * p_str = p_group->find(szKey);
 	if(!p_str)return usDefault;
 	bool bOk;
@@ -862,19 +862,19 @@ unsigned short int KviConfig::readUShortEntry(const QString & szKey,unsigned sho
 ////////////////////////////////// unsigned long
 
 Unused code
-void KviConfig::writeEntry(const char *szKey,unsigned long lValue)
+void KviConfigurationFile::writeEntry(const char *szKey,unsigned long lValue)
 {
 	m_bDirty = true;
-	KviStrDict * p_group = getCurrentGroup();
-	KviStr *p_data = new KviStr();
+	KviCStringDict * p_group = getCurrentGroup();
+	KviCString *p_data = new KviCString();
 	p_data->setNum(lValue);
 	p_group->replace(szKey,p_data);
 }
 
-unsigned long KviConfig::readULongEntry(const char *szKey,unsigned long lDefault)
+unsigned long KviConfigurationFile::readULongEntry(const char *szKey,unsigned long lDefault)
 {
-	KviStrDict * p_group = getCurrentGroup();
-	KviStr * p_str = p_group->find(szKey);
+	KviCStringDict * p_group = getCurrentGroup();
+	KviCString * p_str = p_group->find(szKey);
 	if(!p_str)return lDefault;
 	bool bOk;
 	unsigned long lVal=p_str->toULong(&bOk);
@@ -884,18 +884,18 @@ unsigned long KviConfig::readULongEntry(const char *szKey,unsigned long lDefault
 
 ////////////////////////////////// int
 
-void KviConfig::writeEntry(const QString & szKey,int iValue)
+void KviConfigurationFile::writeEntry(const QString & szKey,int iValue)
 {
 	m_bDirty = true;
-	KviConfigGroup * p_group = getCurrentGroup();
+	KviConfigurationFileGroup * p_group = getCurrentGroup();
 	QString *p_data = new QString();
 	p_data->setNum(iValue);
 	p_group->replace(szKey,p_data);
 }
 
-int KviConfig::readIntEntry(const QString & szKey,int iDefault)
+int KviConfigurationFile::readIntEntry(const QString & szKey,int iDefault)
 {
-	KviConfigGroup * p_group = getCurrentGroup();
+	KviConfigurationFileGroup * p_group = getCurrentGroup();
 	QString * p_str = p_group->find(szKey);
 	if(!p_str)return iDefault;
 	bool bOk;
@@ -905,18 +905,18 @@ int KviConfig::readIntEntry(const QString & szKey,int iDefault)
 
 ////////////////////////////////// unsigned int
 
-void KviConfig::writeEntry(const QString & szKey,unsigned int iValue)
+void KviConfigurationFile::writeEntry(const QString & szKey,unsigned int iValue)
 {
 	m_bDirty = true;
-	KviConfigGroup * p_group = getCurrentGroup();
+	KviConfigurationFileGroup * p_group = getCurrentGroup();
 	QString *p_data = new QString();
 	p_data->setNum(iValue);
 	p_group->replace(szKey,p_data);
 }
 
-unsigned int KviConfig::readUIntEntry(const QString & szKey,unsigned int iDefault)
+unsigned int KviConfigurationFile::readUIntEntry(const QString & szKey,unsigned int iDefault)
 {
-	KviConfigGroup * p_group = getCurrentGroup();
+	KviConfigurationFileGroup * p_group = getCurrentGroup();
 	QString * p_str = p_group->find(szKey);
 	if(!p_str)return iDefault;
 	bool bOk;
@@ -926,18 +926,18 @@ unsigned int KviConfig::readUIntEntry(const QString & szKey,unsigned int iDefaul
 
 ////////////////////////////////// char
 
-void KviConfig::writeEntry(const QString & szKey,char iValue)
+void KviConfigurationFile::writeEntry(const QString & szKey,char iValue)
 {
 	m_bDirty = true;
-	KviConfigGroup * p_group = getCurrentGroup();
+	KviConfigurationFileGroup * p_group = getCurrentGroup();
 	QString * p_data = new QString();
 	p_data->setNum(iValue);
 	p_group->replace(szKey,p_data);
 }
 
-char KviConfig::readCharEntry(const QString & szKey,char iDefault)
+char KviConfigurationFile::readCharEntry(const QString & szKey,char iDefault)
 {
-	KviConfigGroup * p_group = getCurrentGroup();
+	KviConfigurationFileGroup * p_group = getCurrentGroup();
 	QString * p_str = p_group->find(szKey);
 	if(!p_str)return iDefault;
 	bool bOk;
@@ -947,18 +947,18 @@ char KviConfig::readCharEntry(const QString & szKey,char iDefault)
 
 ////////////////////////////////// unsigned char
 
-void KviConfig::writeEntry(const QString & szKey,unsigned char iValue)
+void KviConfigurationFile::writeEntry(const QString & szKey,unsigned char iValue)
 {
 	m_bDirty = true;
-	KviConfigGroup * p_group = getCurrentGroup();
+	KviConfigurationFileGroup * p_group = getCurrentGroup();
 	QString *p_data = new QString();
 	p_data->setNum(iValue);
 	p_group->replace(szKey,p_data);
 }
 
-unsigned char KviConfig::readUCharEntry(const QString & szKey,unsigned char iDefault)
+unsigned char KviConfigurationFile::readUCharEntry(const QString & szKey,unsigned char iDefault)
 {
-	KviConfigGroup * p_group = getCurrentGroup();
+	KviConfigurationFileGroup * p_group = getCurrentGroup();
 	QString * p_str = p_group->find(szKey);
 	if(!p_str)return iDefault;
 	bool bOk;
@@ -975,14 +975,14 @@ unsigned char KviConfig::readUCharEntry(const QString & szKey,unsigned char iDef
 	// can be instantiated/destroyed from external modules.
 	// (this is a well known bug described in Q122675 of MSDN)
 
-	void * KviConfig::operator new(size_t tSize)
+	void * KviConfigurationFile::operator new(size_t tSize)
 	{
-		return kvi_malloc(tSize);
+		return KviMemory::allocate(tSize);
 	}
 
-	void KviConfig::operator delete(void * p)
+	void KviConfigurationFile::operator delete(void * p)
 	{
-		kvi_free(p);
+		KviMemory::free(p);
 	}
 
 #endif
diff --git a/src/kvilib/ext/kvi_config.h b/src/kvilib/ext/KviConfigurationFile.h
index 6ccb3f2a9..e9aec5e17 100644
--- a/src/kvilib/ext/kvi_config.h
+++ b/src/kvilib/ext/KviConfigurationFile.h
@@ -3,11 +3,11 @@
 
 //=============================================================================
 //
-//   File : kvi_config.h
+//   File : KviConfigurationFile.h
 //   Creation date : Thu Jan 14 1999 18:01:22 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 1999-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 1999-2010 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
@@ -25,10 +25,10 @@
 //
 //=============================================================================
 
-#include "kvi_string.h"
+#include "KviCString.h"
 #include "kvi_settings.h"
-#include "kvi_heapobject.h"
-#include "kvi_pointerhashtable.h"
+#include "KviHeapObject.h"
+#include "KviPointerHashTable.h"
 
 #include <QList>
 #include <QColor>
@@ -39,23 +39,23 @@
 #define KVI_CONFIG_DEFAULT_GROUP "KVIrc"
 
 class KviPixmap;
-class KviMsgType;
+class KviMessageTypeSettings;
 
-typedef KviPointerHashTable<QString,QString> KviConfigGroup;
-typedef KviPointerHashTableIterator<QString,QString> KviConfigGroupIterator;
-typedef KviPointerHashTableIterator<QString,KviConfigGroup> KviConfigIterator;
+typedef KviPointerHashTable<QString,QString> KviConfigurationFileGroup;
+typedef KviPointerHashTableIterator<QString,QString> KviConfigurationFileGroupIterator;
+typedef KviPointerHashTableIterator<QString,KviConfigurationFileGroup> KviConfigurationFileIterator;
 
-class KVILIB_API KviConfig : public KviHeapObject
+class KVILIB_API KviConfigurationFile : public KviHeapObject
 {
 public:
 	enum FileMode { Read = 1, Write = 2, ReadWrite = 3 };
 public:
-	KviConfig(const QString &filename,FileMode f/* = ReadWrite*/,bool bLocal8Bit = false);
-	KviConfig(const char *filename,FileMode f/* = ReadWrite*/,bool bLocal8Bit = false);
-	~KviConfig();
+	KviConfigurationFile(const QString &filename,FileMode f/* = ReadWrite*/,bool bLocal8Bit = false);
+	KviConfigurationFile(const char *filename,FileMode f/* = ReadWrite*/,bool bLocal8Bit = false);
+	~KviConfigurationFile();
 private:
 	bool                         m_bLocal8Bit;
-	KviPointerHashTable<QString,KviConfigGroup>      * m_pDict;
+	KviPointerHashTable<QString,KviConfigurationFileGroup>      * m_pDict;
 	QString                      m_szFileName;
 	bool                         m_bDirty;
 	QString                      m_szStrBuffer;
@@ -65,7 +65,7 @@ private:
 private:
 	bool load();
 	bool save();
-	KviConfigGroup * getCurrentGroup();
+	KviConfigurationFileGroup * getCurrentGroup();
 public:
 	//
 	// Useful when saving...
@@ -73,7 +73,7 @@ public:
 	// and setGroup() is never a config modification.
 	// If the group is not existing it will be effectively
 	// created only at the first attempt to read from it or write to it.
-	// With this flag set to true the KviConfig class will
+	// With this flag set to true the KviConfigurationFile class will
 	// write down also the empty groups, and calls to setGroup()
 	// will create the groups if not existing yet (and set the config data
 	// as modified).
@@ -90,7 +90,7 @@ public:
 	// as default configuration, alter its settings and save it to the
 	// user local configuration directory
 	void setSavePath(const QString & savePath){ m_szFileName = savePath; };
-	KviPointerHashTable<QString,KviConfigGroup> *dict(){ return m_pDict; };
+	KviPointerHashTable<QString,KviConfigurationFileGroup> *dict(){ return m_pDict; };
 
 	void clearDirtyFlag(){ m_bDirty = false; };
 	void clear();
@@ -101,21 +101,21 @@ public:
 	bool hasKey(const QString & szKey);
 	bool hasGroup(const QString & szGroup);
 	void setGroup(const QString & szGroup);
-	//void getContentsString(KviStr &buffer);
+	//void getContentsString(KviCString &buffer);
 	const QString & group(){ return m_szGroup; };
 	void writeEntry(const QString & szKey,const QString & szValue);
 	void writeEntry(const QString & szKey,const char * szValue)
 		{ writeEntry(szKey,QString::fromUtf8(szValue)); };
 	QString readEntry(const QString & szKey,const QString & szDefault = QString());
 	// HACK for KviOptions.. (FIXME)
-	QString readKviStrEntry(const QString &szKey,const KviStr &szDefault)
+	QString readKviCStringEntry(const QString &szKey,const KviCString &szDefault)
 		{ return readEntry(szKey,szDefault.ptr()); };
-	//void writeEntry(const char *szKey,KviStr &szValue);
-	//const char * readEntry(const char *szKey,KviStr &szDefault);
+	//void writeEntry(const char *szKey,KviCString &szValue);
+	//const char * readEntry(const char *szKey,KviCString &szDefault);
 	void writeEntry(const QString & szKey,const KviPixmap &pixmap);
 	KviPixmap readPixmapEntry(const QString & szKey,const KviPixmap &pixDef);
-	void writeEntry(const QString & szKey,const KviMsgType &msg);
-	KviMsgType readMsgTypeEntry(const QString & szKey,const KviMsgType &msgDef);
+	void writeEntry(const QString & szKey,const KviMessageTypeSettings &msg);
+	KviMessageTypeSettings readMsgTypeEntry(const QString & szKey,const KviMessageTypeSettings &msgDef);
 	void writeEntry(const QString & szKey,const QColor &clr);
 	QColor readColorEntry(const QString & szKey,const QColor &clr);
 	void writeEntry(const QString & szKey,QFont &fnt);
@@ -143,8 +143,8 @@ public:
 	void writeEntry(const QString & szKey,unsigned char iValue);
 	unsigned char readUCharEntry(const QString & szKey,unsigned char iDefault);
 
-	static void getFontProperties(KviStr & buffer,QFont *fnt);
-	static void setFontProperties(KviStr & str,QFont *fnt);
+	static void getFontProperties(KviCString & buffer,QFont *fnt);
+	static void setFontProperties(KviCString & str,QFont *fnt);
 
 #ifdef COMPILE_ON_WINDOWS
 	// On windows we need to override new and delete operators
diff --git a/src/kvilib/ext/kvi_crypt.cpp b/src/kvilib/ext/KviCryptEngine.cpp
index 4f6e81177..0069e7a3d 100644
--- a/src/kvilib/ext/kvi_crypt.cpp
+++ b/src/kvilib/ext/KviCryptEngine.cpp
@@ -1,10 +1,10 @@
 //=============================================================================
 //
-//   File : kvi_crypt.cpp
+//   File : KviCryptEngine.cpp
 //   Creation date : Fri Nov 03 2000 02:34:43 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -23,11 +23,11 @@
 //=============================================================================
 
 
-#include "kvi_crypt.h"
-#include "kvi_locale.h"
+#include "KviCryptEngine.h"
+#include "KviLocale.h"
 
 #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
-	#include "kvi_malloc.h"
+	#include "KviMemory.h"
 #endif
 
 /*
@@ -173,13 +173,13 @@
 		return false;
 	}
 
-	KviCryptEngine::EncryptResult KviCryptEngine::encrypt(const char *, KviStr &)
+	KviCryptEngine::EncryptResult KviCryptEngine::encrypt(const char *, KviCString &)
 	{
 //		qDebug("Pure virtual KviCryptEngine::encrypt() called");
 		return EncryptError;
 	}
 
-	KviCryptEngine::DecryptResult KviCryptEngine::decrypt(const char *, KviStr &)
+	KviCryptEngine::DecryptResult KviCryptEngine::decrypt(const char *, KviCString &)
 	{
 //		qDebug("Pure virtual KviCryptEngine::decrypt() called");
 		return DecryptError;
diff --git a/src/kvilib/ext/kvi_crypt.h b/src/kvilib/ext/KviCryptEngine.h
index 4cd679895..5149d5484 100644
--- a/src/kvilib/ext/kvi_crypt.h
+++ b/src/kvilib/ext/KviCryptEngine.h
@@ -3,11 +3,11 @@
 
 //=============================================================================
 //
-//   File : kvi_crypt.h
+//   File : KviCryptEngine.h
 //   Creation date : Fri Nov 03 2000 01:45:21 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -37,10 +37,10 @@
 //
 
 
-#include "kvi_qstring.h"
-#include "kvi_string.h"
-#include "kvi_heapobject.h"
-#include "kvi_pointerhashtable.h"
+#include "KviQString.h"
+#include "KviCString.h"
+#include "KviHeapObject.h"
+#include "KviPointerHashTable.h"
 
 #include <QObject>
 
@@ -86,7 +86,7 @@
 		// but this is not the case of KVIrc.
 		//
 		enum EncryptResult { Encrypted, Encoded, EncryptError };
-		virtual EncryptResult encrypt(const char * plainText,KviStr &outBuffer);
+		virtual EncryptResult encrypt(const char * plainText,KviCString &outBuffer);
 		//
 		// Decrypts the utf8 data in inBuffer and puts the decrypted utf8
 		// stuff in plainText. inBuffer is the thingie
@@ -95,7 +95,7 @@
 		// Should return false in case of error.
 		//
 		enum DecryptResult { DecryptOkWasEncrypted, DecryptOkWasEncoded, DecryptOkWasPlainText, DecryptError };
-		virtual DecryptResult decrypt(const char * inBuffer,KviStr &plainText);
+		virtual DecryptResult decrypt(const char * inBuffer,KviCString &plainText);
 		//
 		// Returns the string containing the description
 		// of the last error or an empty string if there
diff --git a/src/kvilib/ext/kvi_databuffer.cpp b/src/kvilib/ext/KviDataBuffer.cpp
index 3c2f4b605..e47fe9c19 100644
--- a/src/kvilib/ext/kvi_databuffer.cpp
+++ b/src/kvilib/ext/KviDataBuffer.cpp
@@ -1,10 +1,10 @@
 //=============================================================================
 //
-//   File : kvi_databuffer.cpp
+//   File : KviDataBuffer.cpp
 //   Creation date : Thu Aug 23 17:04:24 2001 GMT 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-2010 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
@@ -27,8 +27,8 @@
 
 #include "kvi_debug.h"
 
-#include "kvi_databuffer.h"
-#include "kvi_malloc.h"
+#include "KviDataBuffer.h"
+#include "KviMemory.h"
 #include "kvi_memmove.h"
 
 // FIXME: this could resize in chunks!...this would be damn faster :)
@@ -37,7 +37,7 @@ KviDataBuffer::KviDataBuffer(int uSize,const unsigned char * data)
 {
 	KVI_ASSERT(uSize > 0);
 	m_uSize = uSize;
-	m_pData = (unsigned char *)kvi_malloc(sizeof(unsigned char) * uSize);
+	m_pData = (unsigned char *)KviMemory::allocate(sizeof(unsigned char) * uSize);
 	if(data)kvi_memmove(m_pData,data,uSize);
 }
 
@@ -52,7 +52,7 @@ KviDataBuffer::~KviDataBuffer()
 	if(m_pData)
 	{
 		KVI_ASSERT(m_uSize);
-		kvi_free(m_pData);
+		KviMemory::free(m_pData);
 	}
 }
 
@@ -107,9 +107,9 @@ void KviDataBuffer::remove(int uSize)
 	if(m_uSize > 0)
 	{
 		kvi_memmove(m_pData,m_pData + uSize,m_uSize);
-		m_pData = (unsigned char *)kvi_realloc(m_pData,m_uSize * sizeof(unsigned char));
+		m_pData = (unsigned char *)KviMemory::reallocate(m_pData,m_uSize * sizeof(unsigned char));
 	} else {
-		kvi_free(m_pData);
+		KviMemory::free(m_pData);
 		m_pData = 0;
 	}
 }
@@ -119,9 +119,9 @@ void KviDataBuffer::resize(int uSize)
 	KVI_ASSERT(uSize >= 0);
 	if(uSize > 0)
 	{
-		m_pData = (unsigned char *)kvi_realloc(m_pData,uSize * sizeof(unsigned char));
+		m_pData = (unsigned char *)KviMemory::reallocate(m_pData,uSize * sizeof(unsigned char));
 	} else {
-		kvi_free(m_pData);
+		KviMemory::free(m_pData);
 		m_pData = 0;
 	}
 	m_uSize = uSize;
@@ -129,7 +129,7 @@ void KviDataBuffer::resize(int uSize)
 
 void KviDataBuffer::append(const unsigned char * data,int uSize)
 {
-	m_pData = (unsigned char *)kvi_realloc(m_pData,m_uSize + uSize);
+	m_pData = (unsigned char *)KviMemory::reallocate(m_pData,m_uSize + uSize);
 	kvi_memmove(m_pData + m_uSize,data,uSize);
 	m_uSize += uSize;
 }
diff --git a/src/kvilib/ext/kvi_databuffer.h b/src/kvilib/ext/KviDataBuffer.h
index 4f194bd63..b2bfbbae8 100644
--- a/src/kvilib/ext/kvi_databuffer.h
+++ b/src/kvilib/ext/KviDataBuffer.h
@@ -2,7 +2,7 @@
 #define _KVI_DATABUFFER_H_
 //=============================================================================
 //
-//   File : kvi_databuffer.h
+//   File : KviDataBuffer.h
 //   Creation date : Thu Aug 23 17:04:25 2001 GMT by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -25,7 +25,7 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_heapobject.h"
+#include "KviHeapObject.h"
 
 class KVILIB_API KviDataBuffer : public KviHeapObject
 {
diff --git a/src/kvilib/ext/kvi_dbusadaptor.cpp b/src/kvilib/ext/KviDbusAdaptor.cpp
index 80f10bc9a..6a99d64df 100644
--- a/src/kvilib/ext/kvi_dbusadaptor.cpp
+++ b/src/kvilib/ext/KviDbusAdaptor.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_dbusadaptor.cpp
+//   File : KviDbusAdaptor.cpp
 //   Creation date : Thu May 08 2008 21:41:45 by Voker57
 //
 //   This file is part of the KVirc irc client distribution
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#include "kvi_dbusadaptor.h"
+#include "KviDbusAdaptor.h"
 
 #ifdef COMPILE_DBUS_SUPPORT
 
@@ -33,5 +33,5 @@ KviDbusAdaptor::KviDbusAdaptor(QObject * obj) : QDBusAbstractAdaptor(obj)
 #endif
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "kvi_dbusadaptor.moc"
+#include "KviDbusAdaptor.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/kvilib/ext/kvi_dbusadaptor.h b/src/kvilib/ext/KviDbusAdaptor.h
index 7a7539264..6abf4c664 100644
--- a/src/kvilib/ext/kvi_dbusadaptor.h
+++ b/src/kvilib/ext/KviDbusAdaptor.h
@@ -1,8 +1,8 @@
-#ifndef KVI_DBUSADAPTOR_H
-#define KVI_DBUSADAPTOR_H
+#ifndef _KVI_DBUSADAPTOR_H_
+#define _KVI_DBUSADAPTOR_H_
 //=============================================================================
 //
-//   File : kvi_dbusadaptor.h
+//   File : KviDbusAdaptor.h
 //   Creation date : Thu May 08 2008 21:41:45 by Voker57
 //
 //   This file is part of the KVirc irc client distribution
@@ -41,4 +41,4 @@
 	};
 #endif // COMPILE_DBUS_SUPPORT
 
-#endif
+#endif //!_KVI_DBUSADAPTOR_H_
diff --git a/src/kvilib/ext/kvi_debugcontext.cpp b/src/kvilib/ext/KviDebugContext.cpp
index 160057f2b..bdc0f934a 100644
--- a/src/kvilib/ext/kvi_debugcontext.cpp
+++ b/src/kvilib/ext/KviDebugContext.cpp
@@ -1,20 +1,20 @@
 //=============================================================================
 //
-// File : kvi_debugcontext.cpp
+// File : KviDebugContext.cpp
 // Creation date : Tue 13 Jul 2010 23:27:23
 // Project : KVIrc Irc client
 // Author : Szymon Stefanek <pragma at kvirc dot net>
 //
 //=============================================================================
 
-#include "kvi_debugcontext.h"
+#include "KviDebugContext.h"
 
 #include "kvi_stdarg.h"
-#include "kvi_string.h"
+#include "KviCString.h"
 #include "kvi_debug.h"
 
 
-static KviStr g_szIndentPrefix;
+static KviCString g_szIndentPrefix;
 
 KviDebugContext::KviDebugContext(const char * szContext,...)
 {
@@ -25,9 +25,9 @@ KviDebugContext::KviDebugContext(const char * szContext,...)
 
 	kvi_va_end(list);
 	
-	static KviStr szEnterMark = ">> %s";
+	static KviCString szEnterMark = ">> %s";
 	
-	KviStr szPrefix = g_szIndentPrefix;
+	KviCString szPrefix = g_szIndentPrefix;
 	szPrefix.append(szEnterMark);
 	
 	qDebug(szPrefix.ptr(),m_szContext.ptr());
@@ -42,9 +42,9 @@ KviDebugContext::~KviDebugContext()
 
 	g_szIndentPrefix.cutRight(2);
 
-	static KviStr szExitMark = "<< %s";
+	static KviCString szExitMark = "<< %s";
 
-	KviStr szPrefix = g_szIndentPrefix;
+	KviCString szPrefix = g_szIndentPrefix;
 	szPrefix.append(szExitMark);
 
 	qDebug(szPrefix.ptr(),m_szContext.ptr());
@@ -55,14 +55,14 @@ void KviDebugContext::trace(const char * szFmt,...)
 	kvi_va_list list;
 	kvi_va_start(list,szFmt);
 
-	KviStr szOut;
+	KviCString szOut;
 	szOut.vsprintf(szFmt,list);
 
 	kvi_va_end(list);
 	
-	static KviStr szEnterMark = "-- %s";
+	static KviCString szEnterMark = "-- %s";
 	
-	KviStr szPrefix = g_szIndentPrefix;
+	KviCString szPrefix = g_szIndentPrefix;
 	szPrefix.append(szEnterMark);
 	
 	qDebug(szPrefix.ptr(),szOut.ptr());
diff --git a/src/kvilib/ext/kvi_debugcontext.h b/src/kvilib/ext/KviDebugContext.h
index c5692bd4b..c0877344b 100644
--- a/src/kvilib/ext/kvi_debugcontext.h
+++ b/src/kvilib/ext/KviDebugContext.h
@@ -1,8 +1,8 @@
-#ifndef _kvi_debugcontext_h_
-#define _kvi_debugcontext_h_
+#ifndef _KviDebugContext_h_
+#define _KviDebugContext_h_
 //=============================================================================
 //
-// File : kvi_debugcontext.h
+// File : KviDebugContext.h
 // Creation date : Tue 13 Jul 2010 23:27:23
 // Project : KVIrc Irc client
 // Author : Szymon Stefanek <pragma at kvirc dot net>
@@ -10,7 +10,7 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_string.h"
+#include "KviCString.h"
 
 ///
 /// \class KviDebugContext
@@ -37,7 +37,7 @@ public:
 	static void trace(const char * szFmt,...);
 
 private:
-	KviStr m_szContext;
+	KviCString m_szContext;
 
 private:
 	KviDebugContext(const KviDebugContext &){};
@@ -46,4 +46,4 @@ private:
 }; // class KviDebugContext
 
 
-#endif //!_kvi_debugcontext_h_
+#endif //!_KviDebugContext_h_
diff --git a/src/kvilib/ext/kvi_mediatype.cpp b/src/kvilib/ext/KviMediaType.cpp
index d0dafb3db..7455dd140 100644
--- a/src/kvilib/ext/kvi_mediatype.cpp
+++ b/src/kvilib/ext/KviMediaType.cpp
@@ -1,10 +1,10 @@
 //=============================================================================
 //
-//   File : kvi_mediatype.cpp
+//   File : KviMediaType.cpp
 //   Creation date : Mon Aug 21 2000 17:51:56 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -28,11 +28,11 @@
 
 
 #include "kvi_debug.h"
-#include "kvi_mediatype.h"
-#include "kvi_config.h"
-#include "kvi_fileutils.h"
-#include "kvi_locale.h"
-#include "kvi_file.h"
+#include "KviMediaType.h"
+#include "KviConfigurationFile.h"
+#include "KviFileUtils.h"
+#include "KviLocale.h"
+#include "KviFile.h"
 
 #include "kvi_settings.h"
 
@@ -45,7 +45,7 @@
 
 #if !defined(COMPILE_ON_WINDOWS) && !defined(COMPILE_ON_MINGW)
 	#include <unistd.h>
-	#include "kvi_malloc.h"
+	#include "KviMemory.h"
 #endif
 
 
@@ -69,7 +69,7 @@
 #if !defined(COMPILE_ON_WINDOWS) && !defined(COMPILE_ON_MINGW)
 	#include <dirent.h>
 #else
-	#include "kvi_malloc.h"
+	#include "KviMemory.h"
 #endif
 
 
@@ -238,15 +238,15 @@ KviMediaType * KviMediaManager::findMediaType(const char * filename,bool bCheckM
 	// FIXME: This should be ported at least to QString....
 	KVI_ASSERT(locked());
 
-	KviStr szFullPath = filename;
+	KviCString szFullPath = filename;
 	if(!KviFileUtils::isAbsolutePath(szFullPath.ptr()))
 	{
-		KviStr tmp = QDir::currentPath();
+		KviCString tmp = QDir::currentPath();
 		tmp.ensureLastCharIs('/');
 		szFullPath.prepend(tmp);
 	}
 
-	KviStr szFile = filename;
+	KviCString szFile = filename;
 	szFile.cutToLast('/',true);
 
 
@@ -457,13 +457,13 @@ void KviMediaManager::load(const QString &filename)
 {
 	KVI_ASSERT(locked());
 
-	KviConfig cfg(filename,KviConfig::Read);
+	KviConfigurationFile cfg(filename,KviConfigurationFile::Read);
 	cfg.setGroup("MediaTypes");
 	unsigned int nEntries = cfg.readUIntEntry("NEntries",0);
 	for(unsigned int i = 0; i < nEntries;i++)
 	{
 		KviMediaType * m = new KviMediaType;
-		KviStr tmp(KviStr::Format,"%dFileMask",i);
+		KviCString tmp(KviCString::Format,"%dFileMask",i);
 		m->szFileMask = cfg.readEntry(tmp.ptr(),"");
 		tmp.sprintf("%dMagicBytes",i);
 		m->szMagicBytes = cfg.readEntry(tmp.ptr(),"");
@@ -501,7 +501,7 @@ void KviMediaManager::load(const QString &filename)
 void KviMediaManager::save(const QString &filename)
 {
 	KVI_ASSERT(locked());
-	KviConfig cfg(filename,KviConfig::Write);
+	KviConfigurationFile cfg(filename,KviConfigurationFile::Write);
 
 	cfg.clear();
 	cfg.setGroup("MediaTypes");
@@ -509,7 +509,7 @@ void KviMediaManager::save(const QString &filename)
 	int index = 0;
 	for(KviMediaType * m= m_pMediaTypeList->first();m;m = m_pMediaTypeList->next())
 	{
-		KviStr tmp(KviStr::Format,"%dFileMask",index);
+		KviCString tmp(KviCString::Format,"%dFileMask",index);
 		cfg.writeEntry(tmp.ptr(),m->szFileMask.ptr());
 		tmp.sprintf("%dMagicBytes",index);
 		cfg.writeEntry(tmp.ptr(),m->szMagicBytes.ptr());
diff --git a/src/kvilib/ext/kvi_mediatype.h b/src/kvilib/ext/KviMediaType.h
index 7eb733ad7..3141784f1 100644
--- a/src/kvilib/ext/kvi_mediatype.h
+++ b/src/kvilib/ext/KviMediaType.h
@@ -2,11 +2,11 @@
 #define _KVI_MEDIATYPE_H_
 //=============================================================================
 //
-//   File : kvi_mediatype.h
+//   File : KviMediaType.h
 //   Creation date : Mon Aug 21 2000 17:19:56 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -25,11 +25,11 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_heapobject.h"
-#include "kvi_string.h"
-#include "kvi_thread.h"
+#include "KviHeapObject.h"
+#include "KviCString.h"
+#include "KviThread.h"
 
-#include "kvi_pointerlist.h"
+#include "KviPointerList.h"
 
 
 //
@@ -48,14 +48,14 @@ public:
 	KviMediaType(){};
 	~KviMediaType(){};
 public:
-	KviStr szFileMask;
-	KviStr szMagicBytes;
-	KviStr szIanaType;
-	KviStr szDescription;
-	KviStr szSavePath;
-	KviStr szCommandline;
-	KviStr szRemoteExecCommandline;
-	KviStr szIcon;
+	KviCString szFileMask;
+	KviCString szMagicBytes;
+	KviCString szIanaType;
+	KviCString szDescription;
+	KviCString szSavePath;
+	KviCString szCommandline;
+	KviCString szRemoteExecCommandline;
+	KviCString szIcon;
 };
 
 class KVILIB_API KviMediaManager : public KviMutex
diff --git a/src/kvilib/ext/kvi_msgtype.cpp b/src/kvilib/ext/KviMessageTypeSettings.cpp
index 06803cb3c..801f10c57 100644
--- a/src/kvilib/ext/kvi_msgtype.cpp
+++ b/src/kvilib/ext/KviMessageTypeSettings.cpp
@@ -1,10 +1,10 @@
 //=============================================================================
 //
-//   File : kvi_msgtype.cpp
+//   File : KviMessageTypeSettings.cpp
 //   Creation date : Fri 30 24 2000 13:53:21 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -26,9 +26,9 @@
 #define _KVI_DEBUG_CHECK_RANGE_
 
 #include "kvi_debug.h"
-#include "kvi_msgtype.h"
+#include "KviMessageTypeSettings.h"
 
-KviMsgType::KviMsgType(const char * type,int pixId,unsigned char fore,unsigned char back,bool bLog,int iLevel)
+KviMessageTypeSettings::KviMessageTypeSettings(const char * type,int pixId,unsigned char fore,unsigned char back,bool bLog,int iLevel)
 {
 	m_szType = type;
 	m_iPixId = pixId;
@@ -39,7 +39,7 @@ KviMsgType::KviMsgType(const char * type,int pixId,unsigned char fore,unsigned c
 	m_iLevel = iLevel;
 }
 
-KviMsgType::KviMsgType(const KviMsgType &msg)
+KviMessageTypeSettings::KviMessageTypeSettings(const KviMessageTypeSettings &msg)
 {
 	m_szType = msg.m_szType;
 	m_iPixId = msg.m_iPixId;
@@ -49,13 +49,13 @@ KviMsgType::KviMsgType(const KviMsgType &msg)
 	m_iLevel = msg.m_iLevel;
 }
 
-KviMsgType::~KviMsgType()
+KviMessageTypeSettings::~KviMessageTypeSettings()
 {
 }
 
 
 
-KviMsgType & KviMsgType::operator=(const KviMsgType &msg)
+KviMessageTypeSettings & KviMessageTypeSettings::operator=(const KviMessageTypeSettings &msg)
 {
 	//if(m_szType.ptr() == msg.m_szType.ptr())return (*this); // self assignment (!!!)
 	m_szType = msg.m_szType;
diff --git a/src/kvilib/ext/kvi_msgtype.h b/src/kvilib/ext/KviMessageTypeSettings.h
index 15fd8c1e4..97caaaff5 100644
--- a/src/kvilib/ext/kvi_msgtype.h
+++ b/src/kvilib/ext/KviMessageTypeSettings.h
@@ -2,11 +2,11 @@
 #define _KVI_MSGTYPE_H_
 //=============================================================================
 //
-//   File : kvi_msgtype.h
+//   File : KviMessageTypeSettings.h
 //   Creation date : Fri Jun 30 2000 13:50:11 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -25,7 +25,7 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_string.h"
+#include "KviCString.h"
 
 #define KVI_MSGTYPE_MINLEVEL 0
 #define KVI_MSGTYPE_LEVEL_0 0
@@ -44,12 +44,12 @@
 
 // FIXME: Check the message ranges!!!
 
-class KVILIB_API KviMsgType
+class KVILIB_API KviMessageTypeSettings
 {
 public:
-	KviMsgType(const char * type,int pixId,unsigned char fore,unsigned char back,bool bLog,int iLevel);
-	KviMsgType(const KviMsgType &msg);
-	~KviMsgType();
+	KviMessageTypeSettings(const char * type,int pixId,unsigned char fore,unsigned char back,bool bLog,int iLevel);
+	KviMessageTypeSettings(const KviMessageTypeSettings &msg);
+	~KviMessageTypeSettings();
 public:
 	const char *  m_szType;
 	int           m_iPixId;
@@ -69,7 +69,7 @@ public:
 	bool logEnabled(){ return m_bLogEnabled; };
 	void enableLogging(bool bEnable){ m_bLogEnabled = bEnable; };
 	const char * type(){ return m_szType; };
-	KviMsgType & operator=(const KviMsgType &msg);       // deep copy
+	KviMessageTypeSettings & operator=(const KviMessageTypeSettings &msg);       // deep copy
 };
 
 #endif //_KVI_MSGTYPE_H_
diff --git a/src/kvilib/ext/kvi_miscutils.cpp b/src/kvilib/ext/KviMiscUtils.cpp
index b3ba9b495..6de7d93bb 100644
--- a/src/kvilib/ext/kvi_miscutils.cpp
+++ b/src/kvilib/ext/KviMiscUtils.cpp
@@ -1,10 +1,10 @@
 //=============================================================================
 //
-//   File : kvi_miscutils.cpp
+//   File : KviMiscUtils.cpp
 //   Creation date : Mon 08 Jan 2007 04:07:31 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC Client distribution
-//   Copyright (C) 2007-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2007-2010 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
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#include "kvi_miscutils.h"
+#include "KviMiscUtils.h"
 
 #include <QStringList>
 
diff --git a/src/kvilib/ext/kvi_miscutils.h b/src/kvilib/ext/KviMiscUtils.h
index 1ffb79732..90a7b26c4 100644
--- a/src/kvilib/ext/kvi_miscutils.h
+++ b/src/kvilib/ext/KviMiscUtils.h
@@ -2,11 +2,11 @@
 #define _KVI_MISCUTILS_H_
 //=============================================================================
 //
-//   File : kvi_miscutils.h
+//   File : KviMiscUtils.h
 //   Creation date : Mon 08 Jan 2007 04:07:31 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC Client distribution
-//   Copyright (C) 2007-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2007-2010 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
@@ -25,13 +25,13 @@
 //=============================================================================
 
 /**
-* \file kvi_miscutils.h
+* \file KviMiscUtils.h
 * \author Szymon Stefanek
 * \brief Helper functions
 */
 
 #include "kvi_settings.h"
-#include "kvi_qstring.h"
+#include "KviQString.h"
 
 /**
 * \namespace KviMiscUtils
diff --git a/src/kvilib/ext/kvi_nickcolors.cpp b/src/kvilib/ext/KviNickColors.cpp
index 977016180..6d6f733db 100644
--- a/src/kvilib/ext/kvi_nickcolors.cpp
+++ b/src/kvilib/ext/KviNickColors.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_nickcolors.cpp
+//   File : KviNickColors.cpp
 //   Creation date : Sun Apr 11 2010 15:00:01 CEST by Fabio Bas
 //
 //   This file is part of the KVirc irc client distribution
@@ -22,9 +22,9 @@
 //
 //=============================================================================
 
-#include "kvi_nickcolors.h"
+#include "KviNickColors.h"
 
-#include "kvi_malloc.h"
+#include "KviMemory.h"
 #include <stdio.h>
 
 namespace KviNickColors
@@ -75,7 +75,7 @@ namespace KviNickColors
 	int getSmartColorIntByMircColor(unsigned char iFore,unsigned char iBack)
 	{
 		int iBestMatch=-1;
-		char* comb= (char*)kvi_malloc(6);
+		char* comb= (char*)KviMemory::allocate(6);
 		int numm=0;
 		// TODO handle KVI_TRANSPARENT and KVI_NOCHANGE (ticket #812)
 #if defined(COMPILE_ON_WINDOWS) && !(defined(MINGW))
@@ -101,7 +101,7 @@ namespace KviNickColors
 				{
 					//exact match
 // 					qDebug("Exact match %s",g_nickColors[i]);
-					kvi_free(comb);
+					KviMemory::free(comb);
 					return i;
 				} else {
 					//partial match
@@ -114,7 +114,7 @@ namespace KviNickColors
 				}
 			}
 		}
-		kvi_free(comb);
+		KviMemory::free(comb);
 		//no exact match
 // 		qDebug("Best match %s",g_nickColors[iBestMatch]);
 		return iBestMatch;
diff --git a/src/kvilib/ext/kvi_nickcolors.h b/src/kvilib/ext/KviNickColors.h
index 809a7ba7b..71c950ae5 100644
--- a/src/kvilib/ext/kvi_nickcolors.h
+++ b/src/kvilib/ext/KviNickColors.h
@@ -2,7 +2,7 @@
 #define _KVI_NICKCOLORS_H_
 //=============================================================================
 //
-//   File : kvi_nickcolors.h
+//   File : KviNickColors.h
 //   Creation date : Sun Apr 11 2010 15:00:01 CEST by Fabio Bas
 //
 //   This file is part of the KVirc irc client distribution
diff --git a/src/kvilib/ext/kvi_oggirct.h b/src/kvilib/ext/KviOggIrcText.h
index 86dfd7a64..b7de19668 100644
--- a/src/kvilib/ext/kvi_oggirct.h
+++ b/src/kvilib/ext/KviOggIrcText.h
@@ -2,7 +2,7 @@
 #define KVI_OGGIRCT_H_
 //=============================================================================
 //
-//   File : kvi_oggirct.h
+//   File : KviOggIrcText.h
 //   Creation date : Sat Apr 8 2010 22:10:10 CEST by Fabio Bas
 //
 //   This file is part of the KVirc irc client distribution
@@ -25,7 +25,7 @@
 //=============================================================================
 
 /**
-* \file kvi_oggirct.h
+* \file KviOggIrcText.h
 * \author Fabio Bas
 * \brief Contains the KviOggIrcText namespace;
 */
@@ -99,7 +99,7 @@ namespace KviOggIrcText
 		oggpack_write(&ob, 0, 8);		//version 0
 		oggpack_write(&ob, 1, 8);		//subversion 1
 		int bytes=oggpack_bytes(&ob);
-		op->packet= (unsigned char*) kvi_malloc(bytes);
+		op->packet= (unsigned char*) KviMemory::allocate(bytes);
 		memcpy(op->packet, oggpack_get_buffer(&ob), bytes);
 		op->bytes=bytes;
 		oggpack_writeclear(&ob);
@@ -128,7 +128,7 @@ namespace KviOggIrcText
 
 		_tp_writebuffer(&ob, textPkt, textSize); //pre-encoded text
 		int bytes=oggpack_bytes(&ob);
-		op->packet= (unsigned char *)kvi_malloc(bytes);
+		op->packet= (unsigned char *)KviMemory::allocate(bytes);
 		memcpy(op->packet, oggpack_get_buffer(&ob), bytes);
 		op->bytes=bytes;
 		oggpack_writeclear(&ob);
@@ -153,7 +153,7 @@ namespace KviOggIrcText
 		quint8 ret, version, subversion;
 		ret = oggpack_read(&ob,8);
 		if(ret!=0) return 1;
-		char * buf = (char*) kvi_malloc(4);
+		char * buf = (char*) KviMemory::allocate(4);
 		_tp_readbuffer(&ob, buf, 4);
 		if(strncmp(buf, "irct", 4)!=0) return 1;
 		version = oggpack_read(&ob,8);
@@ -173,7 +173,7 @@ namespace KviOggIrcText
 		oggpack_buffer ob;
 		oggpack_readinit(&ob, op->packet, op->bytes);
 		*textSize = op->bytes;
-		*textPkt=(char*)kvi_malloc(*textSize);
+		*textPkt=(char*)KviMemory::allocate(*textSize);
 		_tp_readbuffer(&ob, *textPkt, *textSize);
 		return 0;
 	}
diff --git a/src/kvilib/ext/kvi_osinfo.cpp b/src/kvilib/ext/KviOsInfo.cpp
index 98b80ccd6..8f50a4bc6 100644
--- a/src/kvilib/ext/kvi_osinfo.cpp
+++ b/src/kvilib/ext/KviOsInfo.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_osinfo.cpp
+//   File : KviOsInfo.cpp
 //   Creation date : Thu Jan 19 2006 13:50:11 GMT by Alexey Uzhva
 //
 //   This toolbar is part of the KVirc irc client distribution
@@ -23,9 +23,9 @@
 //=============================================================================
 
 
-#include "kvi_osinfo.h"
-#include "kvi_locale.h"
-#include "kvi_qstring.h"
+#include "KviOsInfo.h"
+#include "KviLocale.h"
+#include "KviQString.h"
 
 #if !defined(COMPILE_ON_WINDOWS) && !defined(COMPILE_ON_MINGW)
 	#include <sys/utsname.h>
diff --git a/src/kvilib/ext/kvi_osinfo.h b/src/kvilib/ext/KviOsInfo.h
index 8b5f29e11..494da0988 100644
--- a/src/kvilib/ext/kvi_osinfo.h
+++ b/src/kvilib/ext/KviOsInfo.h
@@ -3,7 +3,7 @@
 
 //=============================================================================
 //
-//   File : kvi_osinfo.h
+//   File : KviOsInfo.h
 //   Creation date : Thu Jan 19 2006 13:50:11 GMT by Alexey Uzhva
 //
 //   This toolbar is part of the KVirc irc client distribution
diff --git a/src/kvilib/ext/kvi_parameterlist.cpp b/src/kvilib/ext/KviParameterList.cpp
index 39deb9e7d..989543c91 100644
--- a/src/kvilib/ext/kvi_parameterlist.cpp
+++ b/src/kvilib/ext/KviParameterList.cpp
@@ -1,10 +1,10 @@
 //=============================================================================
 //
-//   File : kvi_parameterlist.cpp
+//   File : KviParameterList.cpp
 //   Creation date : Tue Sep 12 2000 18:14:01 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -22,31 +22,31 @@
 //
 //=============================================================================
 
-#include "kvi_parameterlist.h"
+#include "KviParameterList.h"
 
 KviParameterList::KviParameterList()
-: KviPointerList<KviStr>()
+: KviPointerList<KviCString>()
 {
 	setAutoDelete(true);
 }
 
-KviParameterList::KviParameterList(KviStr *p1)
-: KviPointerList<KviStr>()
+KviParameterList::KviParameterList(KviCString *p1)
+: KviPointerList<KviCString>()
 {
 	setAutoDelete(true);
 	append(p1);
 }
 
-KviParameterList::KviParameterList(KviStr *p1,KviStr *p2)
-: KviPointerList<KviStr>()
+KviParameterList::KviParameterList(KviCString *p1,KviCString *p2)
+: KviPointerList<KviCString>()
 {
 	setAutoDelete(true);
 	append(p1);
 	append(p2);
 }
 
-KviParameterList::KviParameterList(KviStr *p1,KviStr *p2,KviStr *p3)
-: KviPointerList<KviStr>()
+KviParameterList::KviParameterList(KviCString *p1,KviCString *p2,KviCString *p3)
+: KviPointerList<KviCString>()
 {
 	setAutoDelete(true);
 	append(p1);
@@ -54,8 +54,8 @@ KviParameterList::KviParameterList(KviStr *p1,KviStr *p2,KviStr *p3)
 	append(p3);
 }
 
-KviParameterList::KviParameterList(KviStr *p1,KviStr *p2,KviStr *p3,KviStr *p4)
-: KviPointerList<KviStr>()
+KviParameterList::KviParameterList(KviCString *p1,KviCString *p2,KviCString *p3,KviCString *p4)
+: KviPointerList<KviCString>()
 {
 	setAutoDelete(true);
 	append(p1);
@@ -64,8 +64,8 @@ KviParameterList::KviParameterList(KviStr *p1,KviStr *p2,KviStr *p3,KviStr *p4)
 	append(p4);
 }
 
-KviParameterList::KviParameterList(KviStr *p1,KviStr *p2,KviStr *p3,KviStr *p4,KviStr *p5)
-: KviPointerList<KviStr>()
+KviParameterList::KviParameterList(KviCString *p1,KviCString *p2,KviCString *p3,KviCString *p4,KviCString *p5)
+: KviPointerList<KviCString>()
 {
 	setAutoDelete(true);
 	append(p1);
@@ -75,8 +75,8 @@ KviParameterList::KviParameterList(KviStr *p1,KviStr *p2,KviStr *p3,KviStr *p4,K
 	append(p5);
 }
 
-KviParameterList::KviParameterList(KviStr *p1,KviStr *p2,KviStr *p3,KviStr *p4,KviStr *p5,KviStr *p6)
-: KviPointerList<KviStr>()
+KviParameterList::KviParameterList(KviCString *p1,KviCString *p2,KviCString *p3,KviCString *p4,KviCString *p5,KviCString *p6)
+: KviPointerList<KviCString>()
 {
 	setAutoDelete(true);
 	append(p1);
@@ -88,8 +88,8 @@ KviParameterList::KviParameterList(KviStr *p1,KviStr *p2,KviStr *p3,KviStr *p4,K
 }
 
 
-KviParameterList::KviParameterList(KviStr *p1,KviStr *p2,KviStr *p3,KviStr *p4,KviStr *p5,KviStr *p6,KviStr *p7)
-: KviPointerList<KviStr>()
+KviParameterList::KviParameterList(KviCString *p1,KviCString *p2,KviCString *p3,KviCString *p4,KviCString *p5,KviCString *p6,KviCString *p7)
+: KviPointerList<KviCString>()
 {
 	setAutoDelete(true);
 	append(p1);
@@ -102,12 +102,12 @@ KviParameterList::KviParameterList(KviStr *p1,KviStr *p2,KviStr *p3,KviStr *p4,K
 }
 
 KviParameterList::KviParameterList(const char *paramBuffer)
-: KviPointerList<KviStr>()
+: KviPointerList<KviCString>()
 {
 	setAutoDelete(true);
 	while(*paramBuffer)
 	{
-		KviStr * pStr = new KviStr();
+		KviCString * pStr = new KviCString();
 		paramBuffer = kvi_extractToken(*pStr,paramBuffer);
 		append(pStr);
 	}
@@ -117,22 +117,22 @@ KviParameterList::~KviParameterList()
 {
 }
 
-KviStr * KviParameterList::safeFirst()
+KviCString * KviParameterList::safeFirst()
 {
-	KviStr * f= first();
+	KviCString * f= first();
 	return f ? f : &m_szEmpty;
 }
 
-KviStr * KviParameterList::safeNext()
+KviCString * KviParameterList::safeNext()
 {
-	KviStr * f = next();
+	KviCString * f = next();
 	return f ? f : &m_szEmpty;
 }
 
 
 bool KviParameterList::getBool()
 {
-	KviStr * par = current();
+	KviCString * par = current();
 	(void)next();
 	if(par)
 	{
@@ -143,7 +143,7 @@ bool KviParameterList::getBool()
 
 int KviParameterList::getInt(bool * bOk)
 {
-	KviStr * par = current();
+	KviCString * par = current();
 	(void)next();
 	if(par)
 	{
@@ -155,7 +155,7 @@ int KviParameterList::getInt(bool * bOk)
 
 unsigned int KviParameterList::getUInt(bool * bOk)
 {
-	KviStr * par = current();
+	KviCString * par = current();
 	(void)next();
 	if(par)
 	{
@@ -170,7 +170,7 @@ QRect KviParameterList::getRect(bool * bOk)
 	int val[4];
 	for(int i=0;i<4;i++)
 	{
-		KviStr * pszv = current();
+		KviCString * pszv = current();
 		(void)next();
 		if(!pszv)
 		{
@@ -194,7 +194,7 @@ QPoint KviParameterList::getPoint(bool * bOk)
 	int val[2];
 	for(int i=0;i<2;i++)
 	{
-		KviStr * pszv = current();
+		KviCString * pszv = current();
 		(void)next();
 		if(!pszv)
 		{
@@ -218,7 +218,7 @@ QSize KviParameterList::getSize(bool * bOk)
 	int val[2];
 	for(int i=0;i<2;i++)
 	{
-		KviStr * pszv = current();
+		KviCString * pszv = current();
 		(void)next();
 		if(!pszv)
 		{
@@ -239,15 +239,15 @@ QSize KviParameterList::getSize(bool * bOk)
 
 //#ifdef COMPILE_ON_WINDOWS
 //
-//	#include "kvi_malloc.h"
+//	#include "KviMemory.h"
 //
 //	void * KviParameterList::operator new(size_t tSize)
 //	{
-//		return kvi_malloc(tSize);
+//		return KviMemory::allocate(tSize);
 //	}
 //
 //	void KviParameterList::operator delete(void * p)
 //	{
-//		kvi_free(p);
+//		KviMemory::free(p);
 //	}
 //#endif
diff --git a/src/kvilib/ext/kvi_parameterlist.h b/src/kvilib/ext/KviParameterList.h
index 62f8acfec..6517e2207 100644
--- a/src/kvilib/ext/kvi_parameterlist.h
+++ b/src/kvilib/ext/KviParameterList.h
@@ -2,11 +2,11 @@
 #define _KVI_PARAMETERLIST_H_
 //=============================================================================
 //
-//   File : kvi_parameterlist.h
+//   File : KviParameterList.h
 //   Creation date : Tue Sep 12 2000 18:00:01 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -25,29 +25,29 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_heapobject.h"
-#include "kvi_string.h"
-#include "kvi_pointerlist.h"
+#include "KviHeapObject.h"
+#include "KviCString.h"
+#include "KviPointerList.h"
 
 #include <QRect>
 #include <QPoint>
 #include <QSize>
 
-class KVILIB_API KviParameterList : public KviPointerList<KviStr>, public KviHeapObject
+class KVILIB_API KviParameterList : public KviPointerList<KviCString>, public KviHeapObject
 {
 public:
 	KviParameterList();
-	KviParameterList(KviStr *p1);
-	KviParameterList(KviStr *p1,KviStr *p2);
-	KviParameterList(KviStr *p1,KviStr *p2,KviStr *p3);
-	KviParameterList(KviStr *p1,KviStr *p2,KviStr *p3,KviStr *p4);
-	KviParameterList(KviStr *p1,KviStr *p2,KviStr *p3,KviStr *p4,KviStr *p5);
-	KviParameterList(KviStr *p1,KviStr *p2,KviStr *p3,KviStr *p4,KviStr *p5,KviStr *p6);
-	KviParameterList(KviStr *p1,KviStr *p2,KviStr *p3,KviStr *p4,KviStr *p5,KviStr *p6,KviStr *p7);
+	KviParameterList(KviCString *p1);
+	KviParameterList(KviCString *p1,KviCString *p2);
+	KviParameterList(KviCString *p1,KviCString *p2,KviCString *p3);
+	KviParameterList(KviCString *p1,KviCString *p2,KviCString *p3,KviCString *p4);
+	KviParameterList(KviCString *p1,KviCString *p2,KviCString *p3,KviCString *p4,KviCString *p5);
+	KviParameterList(KviCString *p1,KviCString *p2,KviCString *p3,KviCString *p4,KviCString *p5,KviCString *p6);
+	KviParameterList(KviCString *p1,KviCString *p2,KviCString *p3,KviCString *p4,KviCString *p5,KviCString *p6,KviCString *p7);
 	KviParameterList(const char * paramBuffer);
 	virtual ~KviParameterList();
 private:
-	KviStr m_szEmpty;
+	KviCString m_szEmpty;
 public:
 	void         init(){ (void)first(); };
 	// These functions have to be called when the
@@ -61,8 +61,8 @@ public:
 	QRect        getRect(bool * bOk = 0);
 	QPoint       getPoint(bool * bOk = 0);
 	QSize        getSize(bool * bOk = 0);
-	KviStr *     safeFirst();
-	KviStr *     safeNext();
+	KviCString *     safeFirst();
+	KviCString *     safeNext();
 	const char * safeFirstParam(){ return safeFirst()->ptr(); };
 	const char * safeNextParam(){ return safeNext()->ptr(); };
 
diff --git a/src/kvilib/ext/kvi_pixmap.cpp b/src/kvilib/ext/KviPixmap.cpp
index af52b64e5..95e58aa7c 100644
--- a/src/kvilib/ext/kvi_pixmap.cpp
+++ b/src/kvilib/ext/KviPixmap.cpp
@@ -1,10 +1,10 @@
 //=============================================================================
 //
-//   File : kvi_pixmap.cpp
+//   File : KviPixmap.cpp
 //   Creation date : Sat Jun 24 2000 14:00:27 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -26,8 +26,8 @@
 
 
 #include "kvi_debug.h"
-#include "kvi_pixmap.h"
-#include "kvi_qstring.h"
+#include "KviPixmap.h"
+#include "KviQString.h"
 
 #include <QPainter>
 
diff --git a/src/kvilib/ext/kvi_pixmap.h b/src/kvilib/ext/KviPixmap.h
index 665da9748..b87902b7a 100644
--- a/src/kvilib/ext/kvi_pixmap.h
+++ b/src/kvilib/ext/KviPixmap.h
@@ -3,11 +3,11 @@
 
 //=============================================================================
 //
-//   File : kvi_pixmap.h
+//   File : KviPixmap.h
 //   Creation date : Sat Jun 24 2000 13:59:04 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -27,7 +27,7 @@
 
 
 #include "kvi_settings.h"
-#include "kvi_string.h"
+#include "KviCString.h"
 
 #include <QPixmap>
 
diff --git a/src/kvilib/ext/kvi_proxydb.cpp b/src/kvilib/ext/KviProxyDataBase.cpp
index 736ac4fd4..a4cfa7fc8 100644
--- a/src/kvilib/ext/kvi_proxydb.cpp
+++ b/src/kvilib/ext/KviProxyDataBase.cpp
@@ -1,10 +1,10 @@
 //=============================================================================
 //
-//   File : kvi_proxydb.cpp
+//   File : KviProxyDataBase.cpp
 //   Creation date : Sat Jul 22 2000 18:23:23 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -23,9 +23,9 @@
 //=============================================================================
 
 
-#include "kvi_proxydb.h"
-#include "kvi_config.h"
-#include "kvi_qstring.h"
+#include "KviProxyDataBase.h"
+#include "KviConfigurationFile.h"
+#include "KviQString.h"
 
 
 KviProxy::KviProxy()
@@ -135,14 +135,14 @@ void KviProxyDataBase::clear()
 void KviProxyDataBase::load(const QString &filename)
 {
 	clear();
-	KviConfig cfg(filename,KviConfig::Read);
+	KviConfigurationFile cfg(filename,KviConfigurationFile::Read);
 
 	unsigned int nEntries = cfg.readUIntEntry("Entries",0);
 
 	for(unsigned int i=0;i<nEntries;i++)
 	{
 		KviProxy * p = new KviProxy();
-		KviStr tmp(KviStr::Format,"%u_Hostname",i);
+		KviCString tmp(KviCString::Format,"%u_Hostname",i);
 		p->m_szHostname = cfg.readEntry(tmp.ptr(),"proxy.example.net");
 		tmp.sprintf("%u_Port",i);
 		p->m_uPort      = cfg.readUIntEntry(tmp.ptr(),7000);
@@ -154,7 +154,7 @@ void KviProxyDataBase::load(const QString &filename)
 		p->m_szPass    = cfg.readEntry(tmp.ptr(),"");
 
 		tmp.sprintf("%u_Protocol",i);
-		KviStr type    = cfg.readEntry(tmp.ptr(),"SOCKSv4");
+		KviCString type    = cfg.readEntry(tmp.ptr(),"SOCKSv4");
 		p->setNamedProtocol(type.ptr());
 
 		tmp.sprintf("%u_IsIPv6",i);
@@ -169,7 +169,7 @@ void KviProxyDataBase::load(const QString &filename)
 
 void KviProxyDataBase::save(const QString &filename)
 {
-	KviConfig cfg(filename,KviConfig::Write);
+	KviConfigurationFile cfg(filename,KviConfigurationFile::Write);
 
 	cfg.clear();
 
@@ -180,7 +180,7 @@ void KviProxyDataBase::save(const QString &filename)
 
 	for(KviProxy * p=m_pProxyList->first();p;p=m_pProxyList->next())
 	{
-		KviStr tmp(KviStr::Format,"%u_Hostname",i);
+		KviCString tmp(KviCString::Format,"%u_Hostname",i);
 		cfg.writeEntry(tmp.ptr(),p->m_szHostname);
 		tmp.sprintf("%u_Port",i);
 		cfg.writeEntry(tmp.ptr(),p->m_uPort);
@@ -192,7 +192,7 @@ void KviProxyDataBase::save(const QString &filename)
 		cfg.writeEntry(tmp.ptr(),p->m_szPass);
 
 		tmp.sprintf("%u_Protocol",i);
-		KviStr type;
+		KviCString type;
 		switch(p->m_protocol)
 		{
 			case KviProxy::Socks5: type = "SOCKSv5"; break;
diff --git a/src/kvilib/ext/kvi_proxydb.h b/src/kvilib/ext/KviProxyDataBase.h
index 4f3583e04..02a8e4b59 100644
--- a/src/kvilib/ext/kvi_proxydb.h
+++ b/src/kvilib/ext/KviProxyDataBase.h
@@ -2,11 +2,11 @@
 #define _KVI_PROXYDB_H_
 //=============================================================================
 //
-//   File : kvi_proxydb.h
+//   File : KviProxyDataBase.h
 //   Creation date : Sat Jul 22 2000 18:19:01 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -25,9 +25,9 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_string.h"
+#include "KviCString.h"
 #include "kvi_inttypes.h"
-#include "kvi_pointerlist.h"
+#include "KviPointerList.h"
 
 #include <QStringList>
 
diff --git a/src/kvilib/ext/kvi_regchan.cpp b/src/kvilib/ext/KviRegisteredChannel.cpp
index 4dc898917..3af08a961 100644
--- a/src/kvilib/ext/kvi_regchan.cpp
+++ b/src/kvilib/ext/KviRegisteredChannel.cpp
@@ -1,10 +1,10 @@
 //=============================================================================
 //
-//   File : kvi_regchan.cpp
+//   File : KviRegisteredChannel.cpp
 //   Creation date : Sat Jun 29 01:01:16 2002 GMT by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2002-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2002-2010 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
@@ -23,9 +23,9 @@
 //=============================================================================
 
 
-#include "kvi_regchan.h"
-#include "kvi_config.h"
-#include "kvi_qstring.h"
+#include "KviRegisteredChannel.h"
+#include "KviConfigurationFile.h"
+#include "KviQString.h"
 #include "kvi_debug.h"
 
 KviRegisteredChannel::KviRegisteredChannel(const QString &name,const QString &netmask)
@@ -55,21 +55,21 @@ KviRegisteredChannelDataBase::~KviRegisteredChannelDataBase()
 
 void KviRegisteredChannelDataBase::load(const QString &filename)
 {
-	KviConfig cfg(filename,KviConfig::Read);
+	KviConfigurationFile cfg(filename,KviConfigurationFile::Read);
 
 	qDeleteAll(*m_pChannelDict);
 	m_pChannelDict->clear();
 
-	KviConfigIterator it(*(cfg.dict()));
+	KviConfigurationFileIterator it(*(cfg.dict()));
 
-	while(KviConfigGroup * d = it.current())
+	while(KviConfigurationFileGroup * d = it.current())
 	{
 		QString szMask = it.currentKey();
 		QString szChan = KviQString::leftToLast(szMask,QChar('@'),false);
 		KviQString::cutToLast(szMask,QChar('@'),true);
 		KviRegisteredChannel * c = new KviRegisteredChannel(szChan,szMask);
 		add(c);
-		KviConfigGroupIterator sit(*d);
+		KviConfigurationFileGroupIterator sit(*d);
 		while(QString * s = sit.current())
 		{
 			c->setProperty(sit.currentKey(),*s);
@@ -81,7 +81,7 @@ void KviRegisteredChannelDataBase::load(const QString &filename)
 
 void KviRegisteredChannelDataBase::save(const QString &filename)
 {
-	KviConfig cfg(filename,KviConfig::Write);
+	KviConfigurationFile cfg(filename,KviConfigurationFile::Write);
 	cfg.clear();
 	cfg.preserveEmptyGroups(true);
 
diff --git a/src/kvilib/ext/kvi_regchan.h b/src/kvilib/ext/KviRegisteredChannel.h
index 523b3997b..fa84c3d08 100644
--- a/src/kvilib/ext/kvi_regchan.h
+++ b/src/kvilib/ext/KviRegisteredChannel.h
@@ -2,11 +2,11 @@
 #define _KVI_REGCHAN_H_
 //=============================================================================
 //
-//   File : kvi_regchan.h
+//   File : KviRegisteredChannel.h
 //   Creation date : Sat Jun 29 01:01:15 2002 GMT by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2002-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2002-2010 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
@@ -25,9 +25,9 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_heapobject.h"
-#include "kvi_string.h"
-#include "kvi_pointerlist.h"
+#include "KviHeapObject.h"
+#include "KviCString.h"
+#include "KviPointerList.h"
 
 #include <QHash>
 
diff --git a/src/kvilib/ext/kvi_regusersdb.cpp b/src/kvilib/ext/KviRegisteredUserDataBase.cpp
index f687a0182..99d63658a 100644
--- a/src/kvilib/ext/kvi_regusersdb.cpp
+++ b/src/kvilib/ext/KviRegisteredUserDataBase.cpp
@@ -1,10 +1,10 @@
 //================================================================================
 //
-//   File : kvi_regusersdb.cpp
+//   File : KviRegisteredUserDataBase.cpp
 //   Creation date : Sat Sep 09 2000 15:46:12 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -26,9 +26,9 @@
 #define _KVI_REGUSERDB_CPP_
 
 #include "kvi_debug.h"
-#include "kvi_regusersdb.h"
-#include "kvi_config.h"
-#include "kvi_locale.h"
+#include "KviRegisteredUserDataBase.h"
+#include "KviConfigurationFile.h"
+#include "KviLocale.h"
 
 /*
 	@doc: registered_users
@@ -641,9 +641,9 @@ bool KviRegisteredUserDataBase::isIgnoredUser(const QString & nick,const QString
 void KviRegisteredUserDataBase::load(const QString & filename)
 {
 	QString szCurrent;
-	KviConfig cfg(filename,KviConfig::Read);
+	KviConfigurationFile cfg(filename,KviConfigurationFile::Read);
 
-	KviConfigIterator it(*cfg.dict());
+	KviConfigurationFileIterator it(*cfg.dict());
 	while(it.current())
 	{
 		cfg.setGroup(it.currentKey());
@@ -659,7 +659,7 @@ void KviRegisteredUserDataBase::load(const QString & filename)
 			{
 				u->setIgnoreEnabled(cfg.readBoolEntry("IgnoreEnabled",false));
 				u->setIgnoreFlags(cfg.readIntEntry("IgnoreFlags",0));
-				KviConfigGroupIterator sdi(*(it.current()));
+				KviConfigurationFileGroupIterator sdi(*(it.current()));
 				while(sdi.current())
 				{
 					QString tmp = sdi.currentKey();
@@ -687,7 +687,7 @@ void KviRegisteredUserDataBase::load(const QString & filename)
 
 void KviRegisteredUserDataBase::save(const QString & filename)
 {
-	KviConfig cfg(filename,KviConfig::Write);
+	KviConfigurationFile cfg(filename,KviConfigurationFile::Write);
 	cfg.clear();
 	cfg.preserveEmptyGroups(true);
 
diff --git a/src/kvilib/ext/kvi_regusersdb.h b/src/kvilib/ext/KviRegisteredUserDataBase.h
index 6c915f220..967b8eace 100644
--- a/src/kvilib/ext/kvi_regusersdb.h
+++ b/src/kvilib/ext/KviRegisteredUserDataBase.h
@@ -2,11 +2,11 @@
 #define _KVI_REGUSERSDB_H_
 //=================================================================================================
 //
-//   File : kvi_regusersdb.h
+//   File : KviRegisteredUserDataBase.h
 //   Creation date : Sat Sep 09 2000 15:30:56 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -31,13 +31,13 @@
 //
 
 #include "kvi_settings.h"
-#include "kvi_heapobject.h"
-#include "kvi_qstring.h"
-#include "kvi_ircmask.h"
+#include "KviHeapObject.h"
+#include "KviQString.h"
+#include "KviIrcMask.h"
 #include "kvi_debug.h"
 
-#include "kvi_pointerlist.h"
-#include "kvi_pointerhashtable.h"
+#include "KviPointerList.h"
+#include "KviPointerHashTable.h"
 #include <QObject>
 
 class KviRegisteredUserDataBase;
diff --git a/src/kvilib/ext/kvi_sharedfiles.cpp b/src/kvilib/ext/KviSharedFilesManager.cpp
index 031b75604..4bdd4574d 100644
--- a/src/kvilib/ext/kvi_sharedfiles.cpp
+++ b/src/kvilib/ext/KviSharedFilesManager.cpp
@@ -1,10 +1,10 @@
 //=============================================================================
 //
-//   File : kvi_filetrader.cpp
+//   File : KviSharedFilesManager.cpp
 //   Creation date : Wed Aug 27 2000 10:33:11 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -24,10 +24,10 @@
 
 
 
-#include "kvi_sharedfiles.h"
+#include "KviSharedFilesManager.h"
 
-#include "kvi_config.h"
-#include "kvi_fileutils.h"
+#include "KviConfigurationFile.h"
+#include "KviFileUtils.h"
 
 #include <QFileInfo>
 
@@ -337,7 +337,7 @@ bool KviSharedFilesManager::removeSharedFile(const QString &szName,KviSharedFile
 
 void KviSharedFilesManager::load(const QString &filename)
 {
-	KviConfig cfg(filename,KviConfig::Read);
+	KviConfigurationFile cfg(filename,KviConfigurationFile::Read);
 	//cfg.clear();
 	cfg.setGroup("PermanentFileOffers");
 	int num = cfg.readIntEntry("NEntries",0);
@@ -357,7 +357,7 @@ void KviSharedFilesManager::load(const QString &filename)
 
 void KviSharedFilesManager::save(const QString &filename)
 {
-	KviConfig cfg(filename,KviConfig::Write);
+	KviConfigurationFile cfg(filename,KviConfigurationFile::Write);
 	cfg.clear();
 	cfg.setGroup("PermanentFileOffers");
 
diff --git a/src/kvilib/ext/kvi_sharedfiles.h b/src/kvilib/ext/KviSharedFilesManager.h
index 6f205e390..4e230b660 100644
--- a/src/kvilib/ext/kvi_sharedfiles.h
+++ b/src/kvilib/ext/KviSharedFilesManager.h
@@ -2,11 +2,11 @@
 #define _KVI_FILETRADER_H_
 //=============================================================================
 //
-//   File : kvi_filetrader.h
+//   File : KviSharedFilesManager.h
 //   Creation date : Wed Aug 27 2000 10:28:51 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -25,13 +25,13 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_heapobject.h"
-#include "kvi_string.h"
-#include "kvi_ircmask.h"
-#include "kvi_pointerlist.h"
-#include "kvi_qstring.h"
+#include "KviHeapObject.h"
+#include "KviCString.h"
+#include "KviIrcMask.h"
+#include "KviPointerList.h"
+#include "KviQString.h"
 
-#include "kvi_pointerhashtable.h"
+#include "KviPointerHashTable.h"
 
 #include <time.h>
 #include <QTimer>
@@ -105,23 +105,23 @@ signals:
 class KviSharedFile
 {
 	KviSharedFile();
-	KviSharedFile(const KviStr &filePath,const KviStr &userMask);
+	KviSharedFile(const KviCString &filePath,const KviCString &userMask);
 	~KviSharedFile();
 protected:
-	KviStr             m_szFilePath;
-	KviStr             m_szVisibleName;
-	KviStr             m_szMd5Sum;
-	KviStr             m_szUserMask;
+	KviCString             m_szFilePath;
+	KviCString             m_szVisibleName;
+	KviCString             m_szMd5Sum;
+	KviCString             m_szUserMask;
 	unsigned short int m_uWildCount;
 	unsigned short int m_uNonWildCount;
 
 	unsigned int       m_uFileSize;
 	time_t             m_tExpireTime;
 public:
-	void setFilePath(const KviStr &filePath);
-	void setUserMask(const KviStr &userMask);
-	void setVisibleName(const KviStr &visibleName);
-	void setMd5Sum(const KviStr &md5Sum);
+	void setFilePath(const KviCString &filePath);
+	void setUserMask(const KviCString &userMask);
+	void setVisibleName(const KviCString &visibleName);
+	void setMd5Sum(const KviCString &md5Sum);
 	void setFileSize(unsigned int uFileSize);
 	void setExpireTime(time_t expireTime);
 	void doNotExpire(){ setExpireTime((time_t)0); };
diff --git a/src/kvilib/ext/kvi_stringconversion.cpp b/src/kvilib/ext/KviStringConversion.cpp
index fe0d03f07..4f3964e90 100644
--- a/src/kvilib/ext/kvi_stringconversion.cpp
+++ b/src/kvilib/ext/KviStringConversion.cpp
@@ -1,10 +1,10 @@
 //=============================================================================
 //
-//   File : kvi_stringconversion.cpp
+//   File : KviStringConversion.cpp
 //   Creation date : Thu Oct 20 2000 14:12:21 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -25,9 +25,9 @@
 
 
 #define _KVI_STRINGCONVERSION_CPP_
-#include "kvi_stringconversion.h"
+#include "KviStringConversion.h"
 
-#include "kvi_qstring.h"
+#include "KviQString.h"
 #include <stdio.h>
 
 QString g_szGlobalDir;
@@ -184,12 +184,12 @@ namespace KviStringConversion
 		}
 	}
 
-	void toString(const KviMsgType &mValue,QString &buffer)
+	void toString(const KviMessageTypeSettings &mValue,QString &buffer)
 	{
 		buffer.sprintf("%d,%u,%u,%d,%d",mValue.m_iPixId,mValue.m_cForeColor,mValue.m_cBackColor,mValue.m_bLogEnabled,mValue.m_iLevel);
 	}
 
-	bool fromString(const QString & szValue,KviMsgType &buffer)
+	bool fromString(const QString & szValue,KviMessageTypeSettings &buffer)
 	{
 		int iId,iLog,iLevel;
 		unsigned int uFore,uBack;
@@ -197,7 +197,7 @@ namespace KviStringConversion
 		char * cx = tmp.data();
 		if(!cx)return false;
 		if(sscanf(cx,"%d,%u,%u,%d,%d",&iId,&uFore,&uBack,&iLog,&iLevel) != 5)return false;
-		buffer = KviMsgType(buffer.m_szType,iId,uFore,uBack,iLog,iLevel);
+		buffer = KviMessageTypeSettings(buffer.m_szType,iId,uFore,uBack,iLog,iLevel);
 		return true;
 	}
 
@@ -231,8 +231,8 @@ namespace KviStringConversion
 
 	bool fromString(const QString & szValue,QFont &buffer)
 	{
-		KviStr str = szValue;
-		KviStr family,pointSize,styleHint,weight,options;
+		KviCString str = szValue;
+		KviCString family,pointSize,styleHint,weight,options;
 		str.getToken(family,',');
 		str.getToken(pointSize,',');
 		str.getToken(styleHint,',');
diff --git a/src/kvilib/ext/kvi_stringconversion.h b/src/kvilib/ext/KviStringConversion.h
index 2c2ecf443..2ed3c5fe3 100644
--- a/src/kvilib/ext/kvi_stringconversion.h
+++ b/src/kvilib/ext/KviStringConversion.h
@@ -3,11 +3,11 @@
 
 //=============================================================================
 //
-//   File : kvi_stringconversion.h
+//   File : KviStringConversion.h
 //   Creation date : Thu Oct 20 2000 13:27:12 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -26,9 +26,9 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_string.h"
-#include "kvi_pixmap.h"
-#include "kvi_msgtype.h"
+#include "KviCString.h"
+#include "KviPixmap.h"
+#include "KviMessageTypeSettings.h"
 
 #include <QRect>
 #include <QColor>
@@ -75,9 +75,9 @@ namespace KviStringConversion
 	extern KVILIB_API void toString(const QFont &fValue,QString &buffer);
 	extern KVILIB_API bool fromString(const QString &szValue,QFont &buffer);
 
-	// KviMsgType <-> QString
-	extern KVILIB_API void toString(const KviMsgType &mValue,QString &buffer);
-	extern KVILIB_API bool fromString(const QString &szValue,KviMsgType &buffer);
+	// KviMessageTypeSettings <-> QString
+	extern KVILIB_API void toString(const KviMessageTypeSettings &mValue,QString &buffer);
+	extern KVILIB_API bool fromString(const QString &szValue,KviMessageTypeSettings &buffer);
 
 	// QColor <-> QString
 	extern KVILIB_API void toString(const QColor &cValue,QString &buffer);
diff --git a/src/kvilib/ext/kvi_oggtheora.cpp b/src/kvilib/ext/KviTheoraDecoder.cpp
index aeaf38f4e..eba0ac21b 100644
--- a/src/kvilib/ext/kvi_oggtheora.cpp
+++ b/src/kvilib/ext/KviTheoraDecoder.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_oggtheora.cpp
+//   File : KviTheoraDecoder.cpp
 //   Creation date : Sat Nov 21 2009 22:53:21 CEST by Fabio Bas
 //
 //   This file is part of the KVirc irc client distribution
@@ -43,10 +43,10 @@
 #include <sys/time.h>
 #include <math.h>
 
-#include "kvi_oggtheora.h"
-#include "kvi_oggirct.h"
+#include "KviTheoraDecoder.h"
+#include "KviOggIrcText.h"
 
-#include "kvi_databuffer.h"
+#include "KviDataBuffer.h"
 
 using namespace KviOggIrcText;
 
diff --git a/src/kvilib/ext/kvi_oggtheora.h b/src/kvilib/ext/KviTheoraDecoder.h
index 49cf58859..19e15c383 100644
--- a/src/kvilib/ext/kvi_oggtheora.h
+++ b/src/kvilib/ext/KviTheoraDecoder.h
@@ -2,7 +2,7 @@
 #define KVI_OGGTHEORA_H_
 //=============================================================================
 //
-//   File : kvi_oggtheora.h
+//   File : KviTheoraDecoder.h
 //   Creation date : Sat Nov 21 2009 22:53:21 CEST by Fabio Bas
 //
 //   This file is part of the KVirc irc client distribution
@@ -25,7 +25,7 @@
 //=============================================================================
 
 /**
-* \file kvi_oggtheora.h
+* \file KviTheoraDecoder.h
 * \author Fabio Bas
 * \brief Contains the KviTheoraEncoder and KviTheoraDecoder classes;
 */
@@ -33,7 +33,7 @@
 #ifndef COMPILE_DISABLE_OGG_THEORA
 
 #include "kvi_settings.h"
-#include "kvi_malloc.h"
+#include "KviMemory.h"
 
 #include "theora/theoradec.h"
 #include "theora/theoraenc.h"
diff --git a/src/kvilib/ext/avdevice/videodevice.cpp b/src/kvilib/ext/avdevice/videodevice.cpp
index 82d3345ba..fc0ce60e0 100644
--- a/src/kvilib/ext/avdevice/videodevice.cpp
+++ b/src/kvilib/ext/avdevice/videodevice.cpp
@@ -54,7 +54,7 @@
 #include "bayer.h"
 #include "sonix_compress.h"
 
-#include "kvi_locale.h"
+#include "KviLocale.h"
 
 #define CLEAR(x) memset (&(x), 0, sizeof (x))
 
diff --git a/src/kvilib/ext/kvi_garbage.cpp b/src/kvilib/ext/kvi_garbage.cpp
deleted file mode 100644
index c129f14d0..000000000
--- a/src/kvilib/ext/kvi_garbage.cpp
+++ /dev/null
@@ -1,148 +0,0 @@
-//=============================================================================
-//
-//   File : kvi_garbage.cpp
-//   Creation date : Mon Dec  3 16:49:15 2001 GMT by Szymon Stefanek
-//
-//   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2001-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.
-//
-//=============================================================================
-
-
-//#include "kvi_garbage.h"
-/*
-#include <QVariant>
-
-KviGarbageCollector::KviGarbageCollector()
-: QObject(0)
-{
-	m_pGarbageList = 0;
-	m_pCleanupTimer = 0;
-	m_bForceCleanupNow = false;
-}
-
-KviGarbageCollector::~KviGarbageCollector()
-{
-	m_bForceCleanupNow = true;
-	cleanup();
-}
-
-void KviGarbageCollector::collect(QObject * g)
-{
-	if(!m_pGarbageList)
-	{
-		m_pGarbageList = new KviPointerList<QObject>;
-		m_pGarbageList->setAutoDelete(true);
-	}
-	//qDebug("COLLECTING GARBAGE %s",g->className());
-	m_pGarbageList->append(g);
-//	qDebug("Registering garbage object %d (%s:%s)",g,g->className(),g->name());
-	connect(g,SIGNAL(destroyed()),this,SLOT(garbageSuicide()));
-	triggerCleanup(0);
-}
-
-void KviGarbageCollector::garbageSuicide()
-{
-	if(!m_pGarbageList)
-	{
-		qDebug("Ops... garbage suicide while no garbage list");
-		return;
-	}
-	int idx = m_pGarbageList->findRef(sender());
-	if(idx == -1)
-	{
-		qDebug("Ops... unregistered garbage suicide");
-		return;
-	}
-	m_pGarbageList->removeRef(sender());
-	if(m_pGarbageList->isEmpty())
-	{
-		cleanup();
-	}
-}
-
-void KviGarbageCollector::triggerCleanup(int iTimeout)
-{
-	//qDebug("TRIGGERING CLEANUP AFTER %d msecs",iTimeout);
-	if(m_pCleanupTimer)
-	{
-		m_pCleanupTimer->stop();
-	} else {
-		m_pCleanupTimer = new QTimer(this);
-		connect(m_pCleanupTimer,SIGNAL(timeout()),this,SLOT(cleanup()));
-	}
-	m_pCleanupTimer->start(iTimeout);
-}
-
-void KviGarbageCollector::cleanup()
-{
-	//qDebug("CLEANUP CALLED !");
-	if(m_pGarbageList)
-	{
-		//qDebug("SOME GARBAGE TO DELETE");
-		KviPointerList<QObject> dying;
-		dying.setAutoDelete(false);
-		for(QObject * o = m_pGarbageList->first();o;o = m_pGarbageList->next())
-		{
-			//qDebug("CHECKING GARBAGE CLASS %s",o->className());
-			bool bDeleteIt = m_bForceCleanupNow;
-			if(!bDeleteIt)
-			{
-				//qDebug("CLEANUP NOT FORCED");
-				QVariant v = o->property("blockingDelete");
-				if(v.isValid())
-				{
-					//qDebug("HAS A VALID VARIANT!");
-//					qDebug("[Garbage collector]: garbage has a blockingDelete property");
-					bDeleteIt = !(v.toBool());
-//					if(!bDeleteIt)qDebug("And doesn't want to be delete now!");
-				} else bDeleteIt = true; // must be deleted
-			}
-			if(bDeleteIt)dying.append(o);
-		}
-
-		for(QObject * o2 = dying.first();o2;o2 = dying.next())
-		{
-			//qDebug("KILLING GARBAGE CLASS %s",o2->className());
-			disconnect(o2,SIGNAL(destroyed()),this,SLOT(garbageSuicide()));
-			m_pGarbageList->removeRef(o2);
-		}
-
-		if(m_pGarbageList->isEmpty())
-		{
-			delete m_pGarbageList;
-			m_pGarbageList = 0;
-		}
-	}
-
-	if(m_pGarbageList)
-	{
-//		qDebug("[Garbage collector cleanup]: Some stuff left to be deleted, will retry in a while");
-		// something left to be destroyed
-		if(m_bForceCleanupNow)qDebug("[Garbage collector]: Ops...I've left some undeleted stuff!");
-		triggerCleanup(5000); // retry in 5 sec
-	} else {
-//		qDebug("[Garbage collector cleanup]: Completed");
-		// nothing left to delete
-		if(m_pCleanupTimer)
-		{
-			delete m_pCleanupTimer;
-			m_pCleanupTimer = 0;
-		}
-	}
-}
-*/
diff --git a/src/kvilib/ext/kvi_garbage.h b/src/kvilib/ext/kvi_garbage.h
deleted file mode 100644
index 753e5e885..000000000
--- a/src/kvilib/ext/kvi_garbage.h
+++ /dev/null
@@ -1,60 +0,0 @@
-#ifndef _KVI_GARBAGE_H_
-#define _KVI_GARBAGE_H_
-//=============================================================================
-//
-//   File : kvi_garbage.h
-//   Creation date : Mon Dec  3 16:49:13 2001 GMT by Szymon Stefanek
-//
-//   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2001-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.
-//
-//=============================================================================
-
-#include "kvi_settings.h"
-#include "kvi_pointerlist.h"
-
-#include <QObject>
-#include <QTimer>
-
-/**
- * FIXME: this class is an obsolete.
- *
- * We can safelly use QObject::deleteLater() with the same functionality,
- * and much easier.
- */
-
-/*
-class KVILIB_API KviGarbageCollector : public QObject
-{
-	Q_OBJECT
-public:
-	KviGarbageCollector();
-	~KviGarbageCollector();
-protected:
-	KviPointerList<QObject> * m_pGarbageList;
-	QTimer              * m_pCleanupTimer;
-	bool                  m_bForceCleanupNow;
-public:
-	void collect(QObject * g);
-protected:
-	void triggerCleanup(int iTimeout);
-protected slots:
-	void cleanup();
-	void garbageSuicide();
-};
-*/
-#endif //_KVI_GARBAGE_H_
diff --git a/src/kvilib/ext/kvi_xlib.h b/src/kvilib/ext/kvi_xlib.h
index 7048fc673..bf898a652 100644
--- a/src/kvilib/ext/kvi_xlib.h
+++ b/src/kvilib/ext/kvi_xlib.h
@@ -6,7 +6,7 @@
 //   Creation date : Tue Aug 14 18:17:21 2001 GMT 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-2010 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
diff --git a/src/kvilib/file/kvi_file.cpp b/src/kvilib/file/KviFile.cpp
index 5a08a5dfa..841b1ab3e 100644
--- a/src/kvilib/file/kvi_file.cpp
+++ b/src/kvilib/file/KviFile.cpp
@@ -1,10 +1,10 @@
 //=============================================================================
 //
-//   File : kvi_file.cpp
+//   File : KviFile.cpp
 //   Creation date : Mon Dec 17 2001 00:04:12 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2001-2009 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2001-2010 Szymon Stefanek (pragma at kvirc dot net)
 //   Copyright (C) 2010 Elvio Basello (hell at hellvis69 dot netsons dot org)
 //
 //   This program is FREE software. You can redistribute it and/or
@@ -23,9 +23,9 @@
 //
 //=============================================================================
 
-#include "kvi_file.h"
-#include "kvi_byteorder.h"
-#include "kvi_qstring.h"
+#include "KviFile.h"
+#include "KviByteOrder.h"
+#include "KviQString.h"
 
 #include <QByteArray>
 
@@ -51,7 +51,7 @@ bool KviFile::save(kvi_u8_t t)
 bool KviFile::save(kvi_u16_t t)
 {
 #ifndef LOCAL_CPU_LITTLE_ENDIAN
-	t = kvi_localCpuToLittleEndian16(t);
+	t = localCpuToLittleEndian16(t);
 #endif
 	return (write((const char *)(&t),sizeof(kvi_u16_t)) == sizeof(kvi_u16_t));
 }
@@ -59,7 +59,7 @@ bool KviFile::save(kvi_u16_t t)
 bool KviFile::save(kvi_u32_t t)
 {
 #ifndef LOCAL_CPU_LITTLE_ENDIAN
-	t = kvi_localCpuToLittleEndian32(t);
+	t = localCpuToLittleEndian32(t);
 #endif
 	return (write((const char *)(&t),sizeof(kvi_u32_t)) == sizeof(kvi_u32_t));
 }
@@ -67,7 +67,7 @@ bool KviFile::save(kvi_u32_t t)
 bool KviFile::save(kvi_u64_t t)
 {
 #ifndef LOCAL_CPU_LITTLE_ENDIAN
-	t = kvi_localCpuToLittleEndian64(t);
+	t = localCpuToLittleEndian64(t);
 #endif
 	return (write((const char *)(&t),sizeof(kvi_u64_t)) == sizeof(kvi_u64_t));
 }
@@ -85,16 +85,16 @@ bool KviFile::save(const QString & szData)
 	return (write(c.data(),c.length()) == ((unsigned int)(c.length())));
 }
 
-bool KviFile::save(const KviStr & szData)
+bool KviFile::save(const KviCString & szData)
 {
 	if(!save((kvi_u32_t)(szData.len())))return false;
 	return (write(szData.ptr(),szData.len()) == (unsigned int) szData.len());
 }
 
-bool KviFile::save(KviPointerList<KviStr> * pData)
+bool KviFile::save(KviPointerList<KviCString> * pData)
 {
 	if(!save((int)(pData->count())))return false;
-	for(KviStr * s = pData->first();s;s = pData->next())
+	for(KviCString * s = pData->first();s;s = pData->next())
 	{
 		if(!save(*s))return false;
 	}
@@ -110,7 +110,7 @@ bool KviFile::load(kvi_u16_t &t)
 {
 	if(!(read((char *)(&t),sizeof(kvi_u16_t)) == sizeof(kvi_u16_t)))return false;
 #ifndef LOCAL_CPU_LITTLE_ENDIAN
-	t = kvi_littleEndianToLocalCpu16(t);
+	t = littleEndianToLocalCpu16(t);
 #endif
 	return true;
 }
@@ -119,7 +119,7 @@ bool KviFile::load(kvi_u32_t &t)
 {
 	if(!(read((char *)(&t),sizeof(kvi_u32_t)) == sizeof(kvi_u32_t)))return false;
 #ifndef LOCAL_CPU_LITTLE_ENDIAN
-	t = kvi_littleEndianToLocalCpu32(t);
+	t = littleEndianToLocalCpu32(t);
 #endif
 	return true;
 }
@@ -128,7 +128,7 @@ bool KviFile::load(kvi_u64_t &t)
 {
 	if(!(read((char *)(&t),sizeof(kvi_u32_t)) == sizeof(kvi_u32_t)))return false;
 #ifndef LOCAL_CPU_LITTLE_ENDIAN
-	t = kvi_littleEndianToLocalCpu32(t);
+	t = littleEndianToLocalCpu32(t);
 #endif
 	return true;
 }
@@ -154,7 +154,7 @@ bool KviFile::load(QString & szData)
 	return true;
 }
 
-bool KviFile::load(KviStr & szData)
+bool KviFile::load(KviCString & szData)
 {
 	kvi_u32_t iLen;
 	if(!load(iLen))return false;
@@ -162,14 +162,14 @@ bool KviFile::load(KviStr & szData)
 	return (read((char *)(szData.ptr()),iLen) == iLen);
 }
 
-bool KviFile::load(KviPointerList<KviStr> * pData)
+bool KviFile::load(KviPointerList<KviCString> * pData)
 {
 	pData->clear();
 	int iCount;
 	if(!load(iCount))return false;
 	for(int i=0;i<iCount;i++)
 	{
-		KviStr * s = new KviStr();
+		KviCString * s = new KviCString();
 		if(!load(*s))
 		{
 			delete s;
@@ -193,7 +193,7 @@ bool KviFile::skipFirst(char t, unsigned int uMaxDist)
 	return false;
 }
 
-bool KviFile::skipFirst(const KviStr & szT, unsigned int uMaxDist)
+bool KviFile::skipFirst(const KviCString & szT, unsigned int uMaxDist)
 {
 	char * pcPtr = szT.ptr();
 	while(uMaxDist > 0)
diff --git a/src/kvilib/file/kvi_file.h b/src/kvilib/file/KviFile.h
index 8b3c5c82f..34134740c 100644
--- a/src/kvilib/file/kvi_file.h
+++ b/src/kvilib/file/KviFile.h
@@ -3,11 +3,11 @@
 
 //=============================================================================
 //
-//   File : kvi_file.h
+//   File : KviFile.h
 //   Creation date : Mon Dec 17 2001 00:05:04 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-2010 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
@@ -26,15 +26,15 @@
 //=============================================================================
 
 /**
-* \file kvi_file.h
+* \file KviFile.h
 * \author Szymon Stefanek
 * \brief This file handles file operations performed by KVIrc
 */
 
 #include "kvi_settings.h"
-#include "kvi_heapobject.h"
-#include "kvi_string.h"
-#include "kvi_pointerlist.h"
+#include "KviHeapObject.h"
+#include "KviCString.h"
+#include "KviPointerList.h"
 #include "kvi_inttypes.h"
 
 #include <QFile>
@@ -140,7 +140,7 @@ public:
 	* \warning This function saves LITTLE ENDIAN DATA!
 	* \return bool
 	*/
-	bool save(const KviStr & szData);
+	bool save(const KviCString & szData);
 
 	/**
 	* \brief Saves a file
@@ -164,7 +164,7 @@ public:
 	* \warning This function saves LITTLE ENDIAN DATA!
 	* \return bool
 	*/
-	bool save(KviPointerList<KviStr> * pData);
+	bool save(KviPointerList<KviCString> * pData);
 	
 	/**
 	* \brief Loads a file
@@ -236,7 +236,7 @@ public:
 	* \warning This function loads LITTLE ENDIAN DATA!
 	* \return bool
 	*/
-	bool load(KviStr & szData);
+	bool load(KviCString & szData);
 
 	/**
 	* \brief Loads a file
@@ -260,7 +260,7 @@ public:
 	* \warning This function loads LITTLE ENDIAN DATA!
 	* \return bool
 	*/
-	bool load(KviPointerList<KviStr> * pData);
+	bool load(KviPointerList<KviCString> * pData);
 
 	/**
 	* \brief Skips the first occurrence of the given char for a given dimension
@@ -276,7 +276,7 @@ public:
 	* \param uMaxDist The dimension of the search field
 	* \return bool
 	*/
-	bool skipFirst(const KviStr & szT, unsigned int uMaxDist = 0xffffffff);
+	bool skipFirst(const KviCString & szT, unsigned int uMaxDist = 0xffffffff);
 };
 
 #endif //_KVI_FILE_H_
diff --git a/src/kvilib/file/kvi_fileutils.cpp b/src/kvilib/file/KviFileUtils.cpp
index eb1a23e7d..28b8da0bc 100644
--- a/src/kvilib/file/kvi_fileutils.cpp
+++ b/src/kvilib/file/KviFileUtils.cpp
@@ -1,10 +1,10 @@
 //=============================================================================
 //
-//   File : kvi_fileutils.cpp
+//   File : KviFileUtils.cpp
 //   Creation date : Fri Dec 25 1998 18:26:48 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 1998-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 1998-2010 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
@@ -24,10 +24,10 @@
 
 #define _KVI_FILEUTLIS_CPP_
 
-#include "kvi_fileutils.h"
-#include "kvi_qstring.h"
-#include "kvi_file.h"
-#include "kvi_malloc.h"
+#include "KviFileUtils.h"
+#include "KviQString.h"
+#include "KviFile.h"
+#include "KviMemory.h"
 
 #include <QDir>
 #include <QFileInfo>
diff --git a/src/kvilib/file/kvi_fileutils.h b/src/kvilib/file/KviFileUtils.h
index d5223650a..0dafd94eb 100644
--- a/src/kvilib/file/kvi_fileutils.h
+++ b/src/kvilib/file/KviFileUtils.h
@@ -2,11 +2,11 @@
 #define _KVI_FILEUTILS_H_
 //=============================================================================
 //
-//   File : kvi_fileutils.h
+//   File : KviFileUtils.h
 //   Creation date : Fri Dec 25 1998 18:27:04 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 1998-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 1998-2010 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
@@ -25,7 +25,7 @@
 //=============================================================================
 
 /**
-* \file kvi_fileutils.h
+* \file KviFileUtils.h
 * \author Szymon Stefanek
 * \brief File utilities functions
 *
@@ -34,7 +34,7 @@
 */
 
 #include "kvi_settings.h"
-#include "kvi_string.h"
+#include "KviCString.h"
 
 #include <QFile>
 #include <QStringList>
diff --git a/src/kvilib/file/kvi_packagefile.cpp b/src/kvilib/file/KviPackageFile.cpp
index d95ddc53d..7d897fea2 100644
--- a/src/kvilib/file/kvi_packagefile.cpp
+++ b/src/kvilib/file/KviPackageFile.cpp
@@ -1,10 +1,10 @@
 //=============================================================================
 //
-//   File : kvi_packagefile.cpp
+//   File : KviPackageFile.cpp
 //   Creation date : Tue 26 Dec 2006 05:33:33 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC Client distribution
-//   Copyright (C) 2006-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2006-2010 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
@@ -22,11 +22,11 @@
 //
 //=============================================================================
 
-#include "kvi_packagefile.h"
+#include "KviPackageFile.h"
 
-#include "kvi_file.h"
-#include "kvi_fileutils.h"
-#include "kvi_locale.h"
+#include "KviFile.h"
+#include "KviFileUtils.h"
+#include "KviLocale.h"
 #include "kvi_inttypes.h"
 
 #include <QProgressDialog>
diff --git a/src/kvilib/file/kvi_packagefile.h b/src/kvilib/file/KviPackageFile.h
index 4da2a9c8e..a07a5275f 100644
--- a/src/kvilib/file/kvi_packagefile.h
+++ b/src/kvilib/file/KviPackageFile.h
@@ -2,11 +2,11 @@
 #define _KVI_PACKAGEFILE_H_
 //=============================================================================
 //
-//   File : kvi_packagefile.h
+//   File : KviPackageFile.h
 //   Creation date : Tue 26 Dec 2006 05:33:33 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC Client distribution
-//   Copyright (C) 2006-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2006-2010 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
@@ -25,7 +25,7 @@
 //=============================================================================
 
 /**
-* \file kvi_packagefile.h
+* \file KviPackageFile.h
 * \author Szymon Stefanek
 * \brief File packaging utilities
 *
@@ -36,9 +36,9 @@
 */
 
 #include "kvi_settings.h"
-#include "kvi_qstring.h"
-#include "kvi_pointerhashtable.h"
-#include "kvi_pointerlist.h"
+#include "KviQString.h"
+#include "KviPointerHashTable.h"
+#include "KviPointerList.h"
 
 #include <QObject>
 #include <QByteArray>
diff --git a/src/kvilib/irc/kvi_avatar.cpp b/src/kvilib/irc/KviAvatar.cpp
index 56a0d16f0..b17260c58 100644
--- a/src/kvilib/irc/kvi_avatar.cpp
+++ b/src/kvilib/irc/KviAvatar.cpp
@@ -1,10 +1,10 @@
 //=============================================================================
 //
-//   File : kvi_avatar.cpp
+//   File : KviAvatar.cpp
 //   Creation date : Fri Dec 01 2000 13:58:12 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -22,8 +22,8 @@
 //
 //=============================================================================
 
-#include "kvi_avatar.h"
-#include "kvi_qstring.h"
+#include "KviAvatar.h"
+#include "KviQString.h"
 
 #include <QImage>
 #include <QImageReader>
diff --git a/src/kvilib/irc/kvi_avatar.h b/src/kvilib/irc/KviAvatar.h
index 5816bed7f..d7af6e3df 100644
--- a/src/kvilib/irc/kvi_avatar.h
+++ b/src/kvilib/irc/KviAvatar.h
@@ -3,11 +3,11 @@
 
 //=============================================================================
 //
-//   File : kvi_avatar.h
+//   File : KviAvatar.h
 //   Creation date : Fri Dec 01 2000 13:54:04 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -26,14 +26,14 @@
 //=============================================================================
 
 /**
-* \file kvi_avatar.h
+* \file KviAvatar.h
 * \author Szymon Stefanek
 * \brief Avatar handling
 */
 
-#include "kvi_heapobject.h"
+#include "KviHeapObject.h"
 #include "kvi_settings.h"
-#include "kvi_animatedpixmap.h"
+#include "KviAnimatedPixmap.h"
 
 #include <QPixmap>
 #include <QHash>
diff --git a/src/kvilib/irc/kvi_avatarcache.cpp b/src/kvilib/irc/KviAvatarCache.cpp
index 0ce72e863..5080130e0 100644
--- a/src/kvilib/irc/kvi_avatarcache.cpp
+++ b/src/kvilib/irc/KviAvatarCache.cpp
@@ -1,10 +1,10 @@
 //=============================================================================
 //
-//   File : kvi_avatarcache.cpp
+//   File : KviAvatarCache.cpp
 //   Creation date : Sat 27 Dec 2003 21:19:47 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
@@ -22,9 +22,9 @@
 //
 //=============================================================================
 
-#include "kvi_avatarcache.h"
-#include "kvi_pointerlist.h"
-#include "kvi_config.h"
+#include "KviAvatarCache.h"
+#include "KviPointerList.h"
+#include "KviConfigurationFile.h"
 
 // this level triggers a cleanup
 #define MAX_AVATARS_IN_CACHE 100
@@ -125,11 +125,11 @@ void KviAvatarCache::load(const QString &szFileName)
 {
 	m_pAvatarDict->clear();
 
-	KviConfig cfg(szFileName,KviConfig::Read);
+	KviConfigurationFile cfg(szFileName,KviConfigurationFile::Read);
 
 	kvi_time_t tNow = kvi_unixTime();
 
-	KviConfigIterator it(*(cfg.dict()));
+	KviConfigurationFileIterator it(*(cfg.dict()));
 
 	int cnt = 0;
 
@@ -158,8 +158,8 @@ void KviAvatarCache::load(const QString &szFileName)
 
 void KviAvatarCache::save(const QString &szFileName)
 {
-	KviConfig cfg(szFileName,KviConfig::Write);
-//	cfg.clear(); // not needed with KviConfig::Write
+	KviConfigurationFile cfg(szFileName,KviConfigurationFile::Write);
+//	cfg.clear(); // not needed with KviConfigurationFile::Write
 
 	KviPointerHashTableIterator<QString,KviAvatarCacheEntry> it(*m_pAvatarDict);
 
diff --git a/src/kvilib/irc/kvi_avatarcache.h b/src/kvilib/irc/KviAvatarCache.h
index 63e9da056..0b0c50d02 100644
--- a/src/kvilib/irc/kvi_avatarcache.h
+++ b/src/kvilib/irc/KviAvatarCache.h
@@ -2,11 +2,11 @@
 #define _KVI_AVATARCACHE_H_
 //=============================================================================
 //
-//   File : kvi_avatarcache.h
+//   File : KviAvatarCache.h
 //   Creation date : Sat 27 Dec 2003 21:19:47 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
@@ -25,16 +25,16 @@
 //=============================================================================
 
 /**
-* \file kvi_avatarcache.h
+* \file KviAvatarCache.h
 * \author Szymon Stefanek
 * \brief Avatar cache handling
 */
 
 #include "kvi_settings.h"
-#include "kvi_qstring.h"
-#include "kvi_time.h"
-#include "kvi_ircmask.h"
-#include "kvi_pointerhashtable.h"
+#include "KviQString.h"
+#include "KviTimeUtils.h"
+#include "KviIrcMask.h"
+#include "KviPointerHashTable.h"
 
 /**
 * \typedef KviAvatarCacheEntry
diff --git a/src/kvilib/irc/kvi_identityprofile.cpp b/src/kvilib/irc/KviIdentityProfile.cpp
index 84d1eb3e9..17944e313 100644
--- a/src/kvilib/irc/kvi_identityprofile.cpp
+++ b/src/kvilib/irc/KviIdentityProfile.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_identityprofile.cpp
+//   File : KviIdentityProfile.cpp
 //   Creation date : Thu Oct 16 2008 16:37:48 by Elvio Basello
 //
 //   This file is part of the KVirc irc client distribution
@@ -22,8 +22,8 @@
 //
 //=============================================================================
 
-#include "kvi_identityprofile.h"
-#include "kvi_config.h"
+#include "KviIdentityProfile.h"
+#include "KviConfigurationFile.h"
 
 KviIdentityProfileSet * KviIdentityProfileSet::m_pSelf = NULL;
 unsigned int KviIdentityProfileSet::m_uCount = 0;
@@ -47,7 +47,7 @@ void KviIdentityProfile::copyFrom(const KviIdentityProfile & src)
 	m_szRealName = src.m_szRealName;
 }
 
-void KviIdentityProfile::save(KviConfig * pCfg, const QString & szPrefix)
+void KviIdentityProfile::save(KviConfigurationFile * pCfg, const QString & szPrefix)
 {
 	QString szTmp;
 
@@ -65,7 +65,7 @@ void KviIdentityProfile::save(KviConfig * pCfg, const QString & szPrefix)
 	pCfg->writeEntry(szTmp,m_szRealName);
 }
 
-bool KviIdentityProfile::load(KviConfig * pCfg, const QString & szPrefix)
+bool KviIdentityProfile::load(KviConfigurationFile * pCfg, const QString & szPrefix)
 {
 	QString szTmp;
 
@@ -218,7 +218,7 @@ void KviIdentityProfileSet::addProfile(KviIdentityProfile * pProfile)
 void KviIdentityProfileSet::load(const QString & szConfigFile)
 {
 	clear();
-	KviConfig cfg(szConfigFile,KviConfig::Read);
+	KviConfigurationFile cfg(szConfigFile,KviConfigurationFile::Read);
 
 	QString szTmp;
 	KviQString::sprintf(szTmp,"ProfilesNumber");
@@ -230,12 +230,12 @@ void KviIdentityProfileSet::load(const QString & szConfigFile)
 
 void KviIdentityProfileSet::save(const QString & szConfigFile)
 {
-	KviConfig cfg(szConfigFile,KviConfig::Write);
+	KviConfigurationFile cfg(szConfigFile,KviConfigurationFile::Write);
 	cfg.clear();
 	save(&cfg,QString(""));
 }
 
-void KviIdentityProfileSet::save(KviConfig * pCfg, const QString & szPrefix)
+void KviIdentityProfileSet::save(KviConfigurationFile * pCfg, const QString & szPrefix)
 {
 	if(!m_pProfiles)
 		return;
@@ -261,7 +261,7 @@ void KviIdentityProfileSet::save(KviConfig * pCfg, const QString & szPrefix)
 	}
 }
 
-bool KviIdentityProfileSet::loadPrivate(KviConfig * pCfg, const QString & szPrefix, unsigned int uEntries)
+bool KviIdentityProfileSet::loadPrivate(KviConfigurationFile * pCfg, const QString & szPrefix, unsigned int uEntries)
 {
 	if(m_pProfiles) m_pProfiles->clear();
 	else {
diff --git a/src/kvilib/irc/kvi_identityprofile.h b/src/kvilib/irc/KviIdentityProfile.h
index c2b5b6cf5..4651c5f72 100644
--- a/src/kvilib/irc/kvi_identityprofile.h
+++ b/src/kvilib/irc/KviIdentityProfile.h
@@ -2,7 +2,7 @@
 #define _KVI_IDENTITYPROFILES_H_
 //=============================================================================
 //
-//   File : kvi_identityprofile.h
+//   File : KviIdentityProfile.h
 //   Creation date : Thu Oct 16 2008 16:37:48 by Elvio Basello
 //
 //   This file is part of the KVirc irc client distribution
@@ -25,17 +25,17 @@
 //=============================================================================
 
 /**
-* \file kvi_identityprofile.h
+* \file KviIdentityProfile.h
 * \author Elvio Basello
 * \brief Identity profiles handling
 */
 
 #include "kvi_settings.h"
-#include "kvi_qstring.h"
-#include "kvi_heapobject.h"
-#include "kvi_pointerlist.h"
+#include "KviQString.h"
+#include "KviHeapObject.h"
+#include "KviPointerList.h"
 
-class KviConfig;
+class KviConfigurationFile;
 
 /**
 * \class KviIdentityProfile
@@ -154,7 +154,7 @@ public:
 	* \param szPrefix The prefix to use
 	* \return void
 	*/
-	void save(KviConfig * pCfg, const QString & szPrefix);
+	void save(KviConfigurationFile * pCfg, const QString & szPrefix);
 
 	/**
 	* \brief Loads the configuration from file.
@@ -164,7 +164,7 @@ public:
 	* \param szPrefix The prefix to use
 	* \return bool
 	*/
-	bool load(KviConfig * pCfg, const QString & szPrefix);
+	bool load(KviConfigurationFile * pCfg, const QString & szPrefix);
 };
 
 /**
@@ -303,7 +303,7 @@ public:
 	* \param szPrefix The prefix of the rules
 	* \return void
 	*/
-	void save(KviConfig * pCfg, const QString & szPrefix);
+	void save(KviConfigurationFile * pCfg, const QString & szPrefix);
 protected:
 	/**
 	* \brief Loads the configuration of the profiles from file
@@ -312,7 +312,7 @@ protected:
 	* \param uEntries The number of entries
 	* \return bool
 	*/
-	bool loadPrivate(KviConfig * pCfg, const QString & szPrefix, unsigned int uEntries);
+	bool loadPrivate(KviConfigurationFile * pCfg, const QString & szPrefix, unsigned int uEntries);
 };
 
 #endif // _KVI_IDENTITYPROFILES_H_
diff --git a/src/kvilib/irc/kvi_ircmask.cpp b/src/kvilib/irc/KviIrcMask.cpp
index 403da3cb8..d76168afe 100644
--- a/src/kvilib/irc/kvi_ircmask.cpp
+++ b/src/kvilib/irc/KviIrcMask.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Fri Jan 8 1999 20:56:07 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 1999-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 1999-2010 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
@@ -25,7 +25,7 @@
 
 
 #include "kvi_debug.h"
-#include "kvi_ircmask.h"
+#include "KviIrcMask.h"
 
 /*
 	@doc: irc_masks
@@ -102,11 +102,11 @@ const char * KviIrcMask::setMask(const char *szMask,char c)
 	while(*p && (*p != '!'))p++;
 	int len = p - szMask;
 	if(len > 0){
-		m_nick_ptr = (char *)kvi_realloc(m_nick_ptr,len+1);
+		m_nick_ptr = (char *)KviMemory::reallocate(m_nick_ptr,len+1);
 		kvi_memmove((void *)m_nick_ptr,(void *)szMask,len);
 	} else { //Empty nick...set it to "*"
 		len = 1;
-		m_nick_ptr = (char *)kvi_realloc(m_nick_ptr,len+1);
+		m_nick_ptr = (char *)KviMemory::reallocate(m_nick_ptr,len+1);
 		kvi_memmove((void *)m_nick_ptr,(void *)"*",len);
 	}
 	*(m_nick_ptr+len) = '\0'; //With zero length nick it will be just an empty-string
@@ -120,11 +120,11 @@ const char * KviIrcMask::setMask(const char *szMask,char c)
 	while(*p && (*p != '@'))p++;
 	len = p - szMask;
 	if(len > 0){
-		m_user_ptr = (char *)kvi_realloc(m_user_ptr,len+1);
+		m_user_ptr = (char *)KviMemory::reallocate(m_user_ptr,len+1);
 		kvi_memmove((void *)m_user_ptr,(void *)szMask,len);
 	} else {
 		len = 1;
-		m_user_ptr = (char *)kvi_realloc(m_user_ptr,len+1);
+		m_user_ptr = (char *)KviMemory::reallocate(m_user_ptr,len+1);
 		kvi_memmove((void *)m_user_ptr,(void *)"*",len);
 	}
 	*(m_user_ptr+len) = '\0';
@@ -137,11 +137,11 @@ const char * KviIrcMask::setMask(const char *szMask,char c)
 	while(*p && (*p != c))p++;
 	len = p - szMask;
 	if(len > 0){
-		m_host_ptr = (char *)kvi_realloc(m_host_ptr,len+1);
+		m_host_ptr = (char *)KviMemory::reallocate(m_host_ptr,len+1);
 		kvi_memmove((void *)m_host_ptr,(void *)szMask,len);
 	} else {
 		len = 1;
-		m_host_ptr = (char *)kvi_realloc(m_host_ptr,len+1);
+		m_host_ptr = (char *)KviMemory::reallocate(m_host_ptr,len+1);
 		kvi_memmove((void *)m_host_ptr,(void *)"*",len);
 	}
 	*(m_host_ptr+len) = '\0';
@@ -159,11 +159,11 @@ const char * KviIrcMask::setUserhostMask(const char *szMask)
 	// extract it
 	int len = p - szMask;
 	if(len > 0){
-		m_nick_ptr = (char *)kvi_realloc(m_nick_ptr,len+1);
+		m_nick_ptr = (char *)KviMemory::reallocate(m_nick_ptr,len+1);
 		kvi_memmove((void *)m_nick_ptr,(void *)szMask,len);
 	} else { //Empty nick...set it to "*"
 		len = 1;
-		m_nick_ptr = (char *)kvi_realloc(m_nick_ptr,len+1);
+		m_nick_ptr = (char *)KviMemory::reallocate(m_nick_ptr,len+1);
 		kvi_memmove((void *)m_nick_ptr,(void *)"*",len);
 	}
 	*(m_nick_ptr+len) = '\0'; //With zero length nick it will be just an empty-string
@@ -183,11 +183,11 @@ const char * KviIrcMask::setUserhostMask(const char *szMask)
 	while(*p && (*p != '@') && (!isspace(*p)))p++;
 	len = p - szMask;
 	if(len > 0){
-		m_user_ptr = (char *)kvi_realloc(m_user_ptr,len+1);
+		m_user_ptr = (char *)KviMemory::reallocate(m_user_ptr,len+1);
 		kvi_memmove((void *)m_user_ptr,(void *)szMask,len);
 	} else {
 		len = 1;
-		m_user_ptr = (char *)kvi_realloc(m_user_ptr,len+1);
+		m_user_ptr = (char *)KviMemory::reallocate(m_user_ptr,len+1);
 		kvi_memmove((void *)m_user_ptr,(void *)"*",len);
 	}
 	*(m_user_ptr+len) = '\0';
@@ -203,11 +203,11 @@ const char * KviIrcMask::setUserhostMask(const char *szMask)
 	while(*p && (!isspace(*p)))p++;
 	len = p - szMask;
 	if(len > 0){
-		m_host_ptr = (char *)kvi_realloc(m_host_ptr,len+1);
+		m_host_ptr = (char *)KviMemory::reallocate(m_host_ptr,len+1);
 		kvi_memmove((void *)m_host_ptr,(void *)szMask,len);
 	} else {
 		len = 1;
-		m_host_ptr = (char *)kvi_realloc(m_host_ptr,len+1);
+		m_host_ptr = (char *)KviMemory::reallocate(m_host_ptr,len+1);
 		kvi_memmove((void *)m_host_ptr,(void *)"*",len);
 	}
 	*(m_host_ptr+len) = '\0';
diff --git a/src/kvilib/irc/kvi_ircmask.h b/src/kvilib/irc/KviIrcMask.h
index 215995ca0..1e533867e 100644
--- a/src/kvilib/irc/kvi_ircmask.h
+++ b/src/kvilib/irc/KviIrcMask.h
@@ -3,11 +3,11 @@
 
 //=============================================================================
 //
-//   File : kvi_ircmask.h
+//   File : KviIrcMask.h
 //   Creation date : Fri Jan 8 1999 19:50:35 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 1999-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 1999-2010 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
@@ -29,14 +29,14 @@
 //=============================================================================
 
 /**
-* \file kvi_ircmask.h
+* \file KviIrcMask.h
 * \author Szymon Stefanek
 * \brief Irc user mask abstraction
 */
 
 #include "kvi_settings.h"
-#include "kvi_heapobject.h"
-#include "kvi_qstring.h"
+#include "KviHeapObject.h"
+#include "KviQString.h"
 
 /**
 * \class KviIrcMask
diff --git a/src/kvilib/irc/kvi_ircserver.cpp b/src/kvilib/irc/KviIrcServer.cpp
index e0333b781..0456a67e7 100644
--- a/src/kvilib/irc/kvi_ircserver.cpp
+++ b/src/kvilib/irc/KviIrcServer.cpp
@@ -1,10 +1,10 @@
 //=============================================================================
 //
-//   File : kvi_ircserver.cpp
+//   File : KviIrcServer.cpp
 //   Creation date : Mon Jul 10 2000 03:42:59 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2009 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -23,13 +23,13 @@
 //=============================================================================
 
 
-#include "kvi_ircserver.h"
-#include "kvi_malloc.h"
+#include "KviIrcServer.h"
+#include "KviMemory.h"
 
-#include "kvi_config.h"
-#include "kvi_nickserv.h"
-#include "kvi_time.h"
-#include "kvi_proxydb.h"
+#include "KviConfigurationFile.h"
+#include "KviNickServRuleSet.h"
+#include "KviTimeUtils.h"
+#include "KviProxyDataBase.h"
 #include <stdlib.h>
 
 // This is not allowed on windows unless we force the symbol to be undefined
@@ -191,7 +191,7 @@ void KviServer::setAutoJoinChannelList(const QString & szNewChannelList)
 		m_pAutoJoinChannelList = new QStringList(lChans);
 }
 
-bool KviServer::load(KviConfig * cfg, const QString & szPrefix)
+bool KviServer::load(KviConfigurationFile * cfg, const QString & szPrefix)
 {
 	QString szTmp;
 	KviQString::sprintf(szTmp,"%QHostname",&szPrefix);
@@ -257,7 +257,7 @@ bool KviServer::load(KviConfig * cfg, const QString & szPrefix)
 	return true;
 }
 
-void KviServer::save(KviConfig * cfg, const QString & szPrefix)
+void KviServer::save(KviConfigurationFile * cfg, const QString & szPrefix)
 {
 	QString szTmp;
 	KviQString::sprintf(szTmp,"%QHostname",&szPrefix);
diff --git a/src/kvilib/irc/kvi_ircserver.h b/src/kvilib/irc/KviIrcServer.h
index 2b65155db..73d260def 100644
--- a/src/kvilib/irc/kvi_ircserver.h
+++ b/src/kvilib/irc/KviIrcServer.h
@@ -3,11 +3,11 @@
 
 //=============================================================================
 //
-//   File : kvi_ircserver.h
+//   File : KviIrcServer.h
 //   Creation date : Mon Jul 10 2000 03:24:11 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2009 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -26,7 +26,7 @@
 //=============================================================================
 
 /**
-* \file kvi_ircserver.h
+* \file KviIrcServer.h
 * \author Szymon Stefanek
 * \brief Irc server handling
 * \def KVI_IRCSERVER_FLAG_IPV6 Defines if the server uses IPv6
@@ -37,13 +37,13 @@
 */
 
 #include "kvi_settings.h"
-#include "kvi_heapobject.h"
-#include "kvi_qstring.h"
-#include "kvi_pointerlist.h"
+#include "KviHeapObject.h"
+#include "KviQString.h"
+#include "KviPointerList.h"
 
 #include <QStringList>
 
-class KviConfig;
+class KviConfigurationFile;
 class KviNickServRuleSet;
 class KviProxy;
 class KviProxyDataBase;
@@ -565,7 +565,7 @@ public:
 	* \param szPrefix The prefix of the server
 	* \return bool
 	*/
-	bool load(KviConfig * cfg, const QString & szPrefix);
+	bool load(KviConfigurationFile * cfg, const QString & szPrefix);
 
 	/**
 	* \brief Saves the information to the configuration file
@@ -573,7 +573,7 @@ public:
 	* \param szPrefix The prefix of the server
 	* \return void
 	*/
-	void save(KviConfig * cfg, const QString & szPrefix);
+	void save(KviConfigurationFile * cfg, const QString & szPrefix);
 
 	/**
 	* \brief Carbon copy
diff --git a/src/kvilib/irc/kvi_ircserverdb.cpp b/src/kvilib/irc/KviIrcServerDataBase.cpp
index a272eb4a8..163b6e70d 100644
--- a/src/kvilib/irc/kvi_ircserverdb.cpp
+++ b/src/kvilib/irc/KviIrcServerDataBase.cpp
@@ -1,10 +1,10 @@
 //=============================================================================
 //
-//   File : kvi_ircserverdb.cpp
+//   File : KviIrcServerDataBase.cpp
 //   Creation date : Mon Jul 10 2000 14:25:00 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -23,11 +23,11 @@
 //=============================================================================
 
 
-#include "kvi_ircserverdb.h"
-#include "kvi_config.h"
-#include "kvi_locale.h"
+#include "KviIrcServerDataBase.h"
+#include "KviConfigurationFile.h"
+#include "KviLocale.h"
 #include "kvi_netutils.h"
-#include "kvi_nickserv.h"
+#include "KviNickServRuleSet.h"
 
 #include <QApplication>
 #include <QLayout>
@@ -359,14 +359,14 @@ void KviServerDataBase::importFromMircIni(const QString & filename, const QStrin
 	clear();
 	recentServers.clear();
 	QString szDefaultServer;
-	KviConfig mircCfg(szMircIni,KviConfig::Read,true);
+	KviConfigurationFile mircCfg(szMircIni,KviConfigurationFile::Read,true);
 	if(mircCfg.hasGroup("mirc"))
 	{
 		mircCfg.setGroup("mirc");
 		szDefaultServer = mircCfg.readEntry("host");
 	}
 
-	KviConfig cfg(filename,KviConfig::Read,true);
+	KviConfigurationFile cfg(filename,KviConfigurationFile::Read,true);
 	int i = 0;
 
 	QString entry;
@@ -445,9 +445,9 @@ void KviServerDataBase::importFromMircIni(const QString & filename, const QStrin
 void KviServerDataBase::load(const QString & filename)
 {
 	clear();
-	KviConfig cfg(filename,KviConfig::Read);
+	KviConfigurationFile cfg(filename,KviConfigurationFile::Read);
 
-	KviConfigIterator it(*(cfg.dict()));
+	KviConfigurationFileIterator it(*(cfg.dict()));
 
 	QString tmp;
 
@@ -513,7 +513,7 @@ void KviServerDataBase::load(const QString & filename)
 
 void KviServerDataBase::save(const QString &filename)
 {
-	KviConfig cfg(filename,KviConfig::Write);
+	KviConfigurationFile cfg(filename,KviConfigurationFile::Write);
 
 	cfg.clear(); // clear any old entry
 
diff --git a/src/kvilib/irc/kvi_ircserverdb.h b/src/kvilib/irc/KviIrcServerDataBase.h
index 9a4ca2ffe..cf542e130 100644
--- a/src/kvilib/irc/kvi_ircserverdb.h
+++ b/src/kvilib/irc/KviIrcServerDataBase.h
@@ -2,11 +2,11 @@
 #define _KVI_IRCSERVERDB_H_
 //=============================================================================
 //
-//   File : kvi_ircserverdb.h
+//   File : KviIrcServerDataBase.h
 //   Creation date : Mon Jul 10 2000 14:15:42 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -25,16 +25,16 @@
 //=============================================================================
 
 /**
-* \file kvi_ircserverdb.h
+* \file KviIrcServerDataBase.h
 * \author Szymon Stefanek
 * \brief Irc server database handling
 */
 
 #include "kvi_settings.h"
-#include "kvi_qstring.h"
-#include "kvi_ircserver.h"
-#include "kvi_network.h"
-#include "kvi_pointerhashtable.h"
+#include "KviQString.h"
+#include "KviIrcServer.h"
+#include "KviNetwork.h"
+#include "KviPointerHashTable.h"
 
 /**
 * \typedef KviServerDefinition
diff --git a/src/kvilib/irc/kvi_ircuserdb.cpp b/src/kvilib/irc/KviIrcUserDataBase.cpp
index 96d0ac010..7675ddc33 100644
--- a/src/kvilib/irc/kvi_ircuserdb.cpp
+++ b/src/kvilib/irc/KviIrcUserDataBase.cpp
@@ -1,10 +1,10 @@
 //=============================================================================
 //
-//   File : kvi_ircuserdb.cpp
+//   File : KviIrcUserDataBase.cpp
 //   Creation date : Mon Jul 31 2000 21:23:22 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -25,11 +25,11 @@
 
 
 #include "kvi_debug.h"
-#include "kvi_ircuserdb.h"
-#include "kvi_mirccntrl.h"
-#include "kvi_qstring.h"
-#include "kvi_stringconversion.h"
-#include "kvi_nickcolors.h"
+#include "KviIrcUserDataBase.h"
+#include "KviMircCntrl.h"
+#include "KviQString.h"
+#include "KviStringConversion.h"
+#include "KviNickColors.h"
 
 //static int cacheHit = 0;
 //static int cacheMiss = 0;
diff --git a/src/kvilib/irc/kvi_ircuserdb.h b/src/kvilib/irc/KviIrcUserDataBase.h
index f5c139301..39a6fd313 100644
--- a/src/kvilib/irc/kvi_ircuserdb.h
+++ b/src/kvilib/irc/KviIrcUserDataBase.h
@@ -3,11 +3,11 @@
 
 //=============================================================================
 //
-//   File : kvi_ircuserdb.h
+//   File : KviIrcUserDataBase.h
 //   Creation date : Mon Jul 31 2000 20:59:12 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -26,7 +26,7 @@
 //=============================================================================
 
 /**
-* \file kvi_ircuserdb.h
+* \file KviIrcUserDataBase.h
 * \author Szymon Stefanek
 * \brief User DB handling
 *
@@ -43,10 +43,10 @@
 */
 
 #include "kvi_settings.h"
-#include "kvi_pointerhashtable.h"
-#include "kvi_string.h"
-#include "kvi_avatar.h"
-#include "kvi_regusersdb.h"
+#include "KviPointerHashTable.h"
+#include "KviCString.h"
+#include "KviAvatar.h"
+#include "KviRegisteredUserDataBase.h"
 
 class KviIrcUserDataBase;
 
diff --git a/src/kvilib/irc/kvi_mirccntrl.cpp b/src/kvilib/irc/KviMircCntrl.cpp
index 4a85e2fce..f5577d85e 100644
--- a/src/kvilib/irc/kvi_mirccntrl.cpp
+++ b/src/kvilib/irc/KviMircCntrl.cpp
@@ -1,10 +1,10 @@
 //=============================================================================
 //
-//   File : kvi_mirccntrl.cpp
+//   File : KviMircCntrl.cpp
 //   Creation date : Sat Aug 31 17:07:36 2002 GMT by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2002-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2002-2010 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
@@ -24,7 +24,7 @@
 
 #define _KVI_MIRCCNTRL_CPP_
 
-#include "kvi_mirccntrl.h"
+#include "KviMircCntrl.h"
 
 KVILIB_API const char * getColorBytes(const char *data_ptr,unsigned char *byte_1,unsigned char *byte_2)
 {
diff --git a/src/kvilib/irc/kvi_mirccntrl.h b/src/kvilib/irc/KviMircCntrl.h
index c85c52714..bb886d7f3 100644
--- a/src/kvilib/irc/kvi_mirccntrl.h
+++ b/src/kvilib/irc/KviMircCntrl.h
@@ -3,11 +3,11 @@
 
 //=============================================================================
 //
-//   File : kvi_mirccntrl.h
+//   File : KviMircCntrl.h
 //   Creation date : Thu Jun 29 2000 21:06:55 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -32,7 +32,7 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_string.h"
+#include "KviCString.h"
 
 //
 // mIrc color codes
diff --git a/src/kvilib/irc/kvi_network.cpp b/src/kvilib/irc/KviNetwork.cpp
index 806e0faa1..6457b93b0 100644
--- a/src/kvilib/irc/kvi_network.cpp
+++ b/src/kvilib/irc/KviNetwork.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_network.cpp
+//   File : KviNetwork.cpp
 //   Creation date : Wed Aug 27 2008 17:44:56 by Alexey Uzhva
 //
 //   This file is part of the KVirc irc client distribution
@@ -22,9 +22,9 @@
 //
 //=============================================================================
 
-#include "kvi_network.h"
-#include "kvi_ircserver.h"
-#include "kvi_nickserv.h"
+#include "KviNetwork.h"
+#include "KviIrcServer.h"
+#include "KviNickServRuleSet.h"
 
 KviNetwork::KviNetwork(const KviNetwork &src)
 {
diff --git a/src/kvilib/irc/kvi_network.h b/src/kvilib/irc/KviNetwork.h
index b8a3bdc16..bf71a968c 100644
--- a/src/kvilib/irc/kvi_network.h
+++ b/src/kvilib/irc/KviNetwork.h
@@ -2,7 +2,7 @@
 #define KVI_NETWORK_H_
 //=============================================================================
 //
-//   File : kvi_network.cpp
+//   File : KviNetwork.cpp
 //   Creation date : Wed Aug 27 2008 17:44:56 by Alexey Uzhva
 //
 //   This file is part of the KVirc irc client distribution
@@ -25,14 +25,14 @@
 //=============================================================================
 
 /**
-* \file kvi_network.cpp
+* \file KviNetwork.cpp
 * \author Alexey Uzhva
 * \brief Network handling
 */
 
 #include "kvi_settings.h"
-#include "kvi_heapobject.h"
-#include "kvi_pointerlist.h"
+#include "KviHeapObject.h"
+#include "KviPointerList.h"
 
 #include <QString>
 #include <QStringList>
diff --git a/src/kvilib/irc/kvi_nickserv.cpp b/src/kvilib/irc/KviNickServRuleSet.cpp
index f4b9a64cb..641d86581 100644
--- a/src/kvilib/irc/kvi_nickserv.cpp
+++ b/src/kvilib/irc/KviNickServRuleSet.cpp
@@ -1,10 +1,10 @@
 //=============================================================================
 //
-//   File : kvi_nickserv.cpp
+//   File : KviNickServRuleSet.cpp
 //   Creation date : Thu Aug 09 2001 17:44:56 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-2010 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
@@ -24,9 +24,9 @@
 
 
 
-#include "kvi_nickserv.h"
-#include "kvi_config.h"
-#include "kvi_ircmask.h"
+#include "KviNickServRuleSet.h"
+#include "KviConfigurationFile.h"
+#include "KviIrcMask.h"
 
 #include <QRegExp>
 
@@ -84,7 +84,7 @@ KviNickServRuleSet::~KviNickServRuleSet()
 	if(m_pRules)delete m_pRules;
 }
 
-void KviNickServRuleSet::save(KviConfig * cfg,const QString &prefix)
+void KviNickServRuleSet::save(KviConfigurationFile * cfg,const QString &prefix)
 {
 	if(!m_pRules)return; // nothing to save
 	if(m_pRules->isEmpty())return; // should never happen anyway
@@ -105,7 +105,7 @@ void KviNickServRuleSet::save(KviConfig * cfg,const QString &prefix)
 	}
 }
 
-KviNickServRuleSet * KviNickServRuleSet::load(KviConfig * cfg,const QString &prefix)
+KviNickServRuleSet * KviNickServRuleSet::load(KviConfigurationFile * cfg,const QString &prefix)
 {
 	QString tmp;
 	KviQString::sprintf(tmp,"%QNSRules",&prefix);
@@ -120,7 +120,7 @@ KviNickServRuleSet * KviNickServRuleSet::load(KviConfig * cfg,const QString &pre
 void KviNickServRuleSet::load(const QString &szConfigFile)
 {
 	clear();
-	KviConfig cfg(szConfigFile,KviConfig::Read);
+	KviConfigurationFile cfg(szConfigFile,KviConfigurationFile::Read);
 
 	QString tmp;
 	KviQString::sprintf(tmp,"NSRules");
@@ -131,12 +131,12 @@ void KviNickServRuleSet::load(const QString &szConfigFile)
 
 void KviNickServRuleSet::save(const QString &szConfigFile)
 {
-	KviConfig cfg(szConfigFile,KviConfig::Write);
+	KviConfigurationFile cfg(szConfigFile,KviConfigurationFile::Write);
 	cfg.clear();
 	save(&cfg,QString(""));
 }
 
-bool KviNickServRuleSet::loadPrivate(KviConfig * cfg,const QString &prefix,unsigned int nEntries)
+bool KviNickServRuleSet::loadPrivate(KviConfigurationFile * cfg,const QString &prefix,unsigned int nEntries)
 {
 	if(m_pRules)m_pRules->clear();
 	else {
@@ -260,7 +260,7 @@ void KviNickServRule::copyFrom(const KviNickServRule &src)
 	m_szServerMask = src.m_szServerMask;
 }
 
-void KviNickServRule::save(KviConfig * cfg,const QString &prefix)
+void KviNickServRule::save(KviConfigurationFile * cfg,const QString &prefix)
 {
 	QString tmp;
 	KviQString::sprintf(tmp,"%QRegisteredNick",&prefix);
@@ -275,7 +275,7 @@ void KviNickServRule::save(KviConfig * cfg,const QString &prefix)
 	cfg->writeEntry(tmp,m_szServerMask);
 }
 
-bool KviNickServRule::load(KviConfig * cfg,const QString &prefix)
+bool KviNickServRule::load(KviConfigurationFile * cfg,const QString &prefix)
 {
 	QString tmp;
 	KviQString::sprintf(tmp,"%QRegisteredNick",&prefix);
diff --git a/src/kvilib/irc/kvi_nickserv.h b/src/kvilib/irc/KviNickServRuleSet.h
index 5edd020f3..972863cd2 100644
--- a/src/kvilib/irc/kvi_nickserv.h
+++ b/src/kvilib/irc/KviNickServRuleSet.h
@@ -2,11 +2,11 @@
 #define _KVI_NICKSERV_H_
 //=============================================================================
 //
-//   File : kvi_nickserv.h
+//   File : KviNickServRuleSet.h
 //   Creation date : Thu Aug 09 2001 16:43:56 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-2010 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
@@ -25,11 +25,11 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_qstring.h"
-#include "kvi_heapobject.h"
-#include "kvi_pointerlist.h"
+#include "KviQString.h"
+#include "KviHeapObject.h"
+#include "KviPointerList.h"
 
-class KviConfig;
+class KviConfigurationFile;
 class KviIrcMask;
 
 class KVILIB_API KviNickServRule : public KviHeapObject
@@ -74,9 +74,9 @@ public:
 		const QString &szIdentifyCommand,
 		const QString &szServerMask = QString::null);
 
-	void save(KviConfig * cfg,const QString &prefix);
+	void save(KviConfigurationFile * cfg,const QString &prefix);
 	// returns false if the loaded data has no sense
-	bool load(KviConfig * cfg,const QString &prefix);
+	bool load(KviConfigurationFile * cfg,const QString &prefix);
 	void copyFrom(const KviNickServRule &src);
 };
 
@@ -101,11 +101,11 @@ public:
 	void copyFrom(const KviNickServRuleSet &src);
 	void load(const QString &szConfigFile);
 	void save(const QString &szConfigFile);
-	void save(KviConfig * cfg,const QString &prefix);
+	void save(KviConfigurationFile * cfg,const QString &prefix);
 	KviPointerList<KviNickServRule> * rules(){ return m_pRules; };
-	static KviNickServRuleSet * load(KviConfig * cfg,const QString &prefix);
+	static KviNickServRuleSet * load(KviConfigurationFile * cfg,const QString &prefix);
 protected:
-	bool loadPrivate(KviConfig * cfg,const QString &prefix,unsigned int nEntries);
+	bool loadPrivate(KviConfigurationFile * cfg,const QString &prefix,unsigned int nEntries);
 };
 
 
diff --git a/src/kvilib/irc/kvi_useridentity.cpp b/src/kvilib/irc/KviUserIdentity.cpp
index 6d2c93c40..e240d5568 100644
--- a/src/kvilib/irc/kvi_useridentity.cpp
+++ b/src/kvilib/irc/KviUserIdentity.cpp
@@ -1,10 +1,10 @@
 //=============================================================================
 //
-//   File : kvi_useridentity.cpp
+//   File : KviUserIdentity.cpp
 //   Creation date : Sun 21 Jan 2007 04:31:47 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC Client distribution
-//   Copyright (C) 2007-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2007-2010 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
@@ -23,8 +23,8 @@
 //=============================================================================
 
 
-#include "kvi_useridentity.h"
-#include "kvi_locale.h"
+#include "KviUserIdentity.h"
+#include "KviLocale.h"
 #include "kvi_defaults.h"
 
 // FIXME: Put here also the default away message, default away nick, default ctcp replies etc ?
@@ -38,7 +38,7 @@ KviUserIdentity::~KviUserIdentity()
 {
 }
 
-bool KviUserIdentity::load(KviConfig &cfg)
+bool KviUserIdentity::load(KviConfigurationFile &cfg)
 {
 	m_szId = cfg.group();
 	m_szNickName = cfg.readEntry("NickName");
@@ -63,7 +63,7 @@ bool KviUserIdentity::load(KviConfig &cfg)
 	return !(m_szId.isEmpty() || m_szNickName.isEmpty());
 }
 
-bool KviUserIdentity::save(KviConfig &cfg)
+bool KviUserIdentity::save(KviConfigurationFile &cfg)
 {
 	cfg.setGroup(m_szId);
 	cfg.writeEntry("NickName",m_szNickName);
@@ -192,13 +192,13 @@ void KviUserIdentityManager::load(const QString &szFileName)
 {
 	m_pIdentityDict->clear();
 
-	KviConfig cfg(szFileName,KviConfig::Read);
+	KviConfigurationFile cfg(szFileName,KviConfigurationFile::Read);
 
 	cfg.setGroup("KVIrc");
 
 	m_szDefaultIdentity = cfg.readEntry("DefaultIdentity","");
 
-	KviConfigIterator it(*(cfg.dict()));
+	KviConfigurationFileIterator it(*(cfg.dict()));
 	while( (it.current()) )
 	{
 		if(!KviQString::equalCI(it.currentKey(),"KVIrc"))
@@ -217,7 +217,7 @@ void KviUserIdentityManager::load(const QString &szFileName)
 
 void KviUserIdentityManager::save(const QString &szFileName)
 {
-	KviConfig cfg(szFileName,KviConfig::Write);
+	KviConfigurationFile cfg(szFileName,KviConfigurationFile::Write);
 	cfg.clear();
 
 	cfg.setGroup("KVIrc");
diff --git a/src/kvilib/irc/kvi_useridentity.h b/src/kvilib/irc/KviUserIdentity.h
index 07e55fbde..5301e5aca 100644
--- a/src/kvilib/irc/kvi_useridentity.h
+++ b/src/kvilib/irc/KviUserIdentity.h
@@ -2,11 +2,11 @@
 #define _KVI_USERIDENTITY_H_
 //=============================================================================
 //
-//   File : kvi_useridentity.h
+//   File : KviUserIdentity.h
 //   Creation date : Sun 21 Jan 2007 04:31:47 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC Client distribution
-//   Copyright (C) 2007-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2007-2010 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
@@ -25,15 +25,15 @@
 //=============================================================================
 
 /**
-* \file kvi_useridentity.h
+* \file KviUserIdentity.h
 * \author Szymon Stefanek
 * \brief User identity handling
 */
 #include "kvi_settings.h"
-#include "kvi_heapobject.h"
-#include "kvi_pixmap.h"
-#include "kvi_config.h"
-#include "kvi_pointerhashtable.h"
+#include "KviHeapObject.h"
+#include "KviPixmap.h"
+#include "KviConfigurationFile.h"
+#include "KviPointerHashTable.h"
 
 /**
 * \class KviUserIdentity
@@ -335,14 +335,14 @@ protected:
 	* \param cfg The config file where to save
 	* \return bool
 	*/
-	bool save(KviConfig & cfg);
+	bool save(KviConfigurationFile & cfg);
 
 	/**
 	* \brief Loads the user identity
 	* \param cfg The config file where to load
 	* \return bool
 	*/
-	bool load(KviConfig & cfg);
+	bool load(KviConfigurationFile & cfg);
 };
 
 /**
diff --git a/src/kvilib/net/kvi_dns.cpp b/src/kvilib/net/kvi_dns.cpp
index f21035de1..aabace901 100644
--- a/src/kvilib/net/kvi_dns.cpp
+++ b/src/kvilib/net/kvi_dns.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Sat Jul 21 2000 17:19:31 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
diff --git a/src/kvilib/net/kvi_dns.h b/src/kvilib/net/kvi_dns.h
index 421bbed07..9a9825b23 100644
--- a/src/kvilib/net/kvi_dns.h
+++ b/src/kvilib/net/kvi_dns.h
@@ -7,7 +7,7 @@
 //   Creation date : Sat Jul 21 2000 13:59:11 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -26,9 +26,9 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_heapobject.h"
-#include "kvi_thread.h"
-#include "kvi_qstring.h"
+#include "KviHeapObject.h"
+#include "KviThread.h"
+#include "KviQString.h"
 
 
 class KviDnsThread; // not part of the API
diff --git a/src/kvilib/net/kvi_http.cpp b/src/kvilib/net/kvi_http.cpp
index 7fdbcac54..4bbec0d59 100644
--- a/src/kvilib/net/kvi_http.cpp
+++ b/src/kvilib/net/kvi_http.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Sat Aug 17 13:43:32 2002 GMT by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2002-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2002-2010 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
@@ -29,13 +29,13 @@
 //#include <zlib.h>
 
 #include "kvi_http.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_netutils.h"
 #include "kvi_dns.h"
 #include "kvi_error.h"
 #include "kvi_debug.h"
 #include "kvi_socket.h"
-#include "kvi_time.h"
+#include "KviTimeUtils.h"
 
 #ifdef COMPILE_SSL_SUPPORT
 	#include "kvi_ssl.h"
@@ -306,7 +306,7 @@ bool KviHttpRequest::event(QEvent *e)
 						if(m_pBuffer->size() > 0)
 						{
 							// something left in the buffer and has no trailing LF
-							KviStr tmp((const char *)(m_pBuffer->data()),m_pBuffer->size());
+							KviCString tmp((const char *)(m_pBuffer->data()),m_pBuffer->size());
 							emit data(tmp);
 						}
 					break;
@@ -325,7 +325,7 @@ bool KviHttpRequest::event(QEvent *e)
 			break;
 			case KVI_THREAD_EVENT_ERROR:
 			{
-				KviStr * err = ((KviThreadDataEvent<KviStr> *)e)->getData();
+				KviCString * err = ((KviThreadDataEvent<KviCString> *)e)->getData();
 				m_szLastError = __tr2qs_no_xgettext(err->ptr());
 				delete err;
 				resetInternalStatus();
@@ -335,7 +335,7 @@ bool KviHttpRequest::event(QEvent *e)
 			break;
 			case KVI_THREAD_EVENT_MESSAGE:
 			{
-				KviStr * msg = ((KviThreadDataEvent<KviStr> *)e)->getData();
+				KviCString * msg = ((KviThreadDataEvent<KviCString> *)e)->getData();
 				emit status(__tr2qs_no_xgettext(msg->ptr()));
 				delete msg;
 				return true;
@@ -351,7 +351,7 @@ void KviHttpRequest::emitLines(KviDataBuffer * pDataBuffer)
 	int idx = pDataBuffer->find((const unsigned char *)"\n",1);
 	while(idx != -1)
 	{
-		KviStr tmp((const char *)(m_pBuffer->data()),idx);
+		KviCString tmp((const char *)(m_pBuffer->data()),idx);
 		tmp.stripRight('\r');
 		pDataBuffer->remove(idx + 1);
 		idx = pDataBuffer->find((const unsigned char *)"\n",1);
@@ -453,10 +453,10 @@ bool KviHttpRequest::openFile()
 }
 
 
-bool KviHttpRequest::processHeader(KviStr &szHeader)
+bool KviHttpRequest::processHeader(KviCString &szHeader)
 {
 	int idx = szHeader.findFirstIdx("\r\n");
-	KviStr szResponse;
+	KviCString szResponse;
 	if(idx != -1)
 	{
 		szResponse = szHeader.left(idx);
@@ -475,11 +475,11 @@ bool KviHttpRequest::processHeader(KviStr &szHeader)
 	// check the response value
 	if(kvi_strEqualCSN(szResponse.ptr(),"HTTP",4))
 	{
-		KviStr szR = szResponse;
+		KviCString szR = szResponse;
 		szR.cutToFirst(' ');
 		szR.trimmed();
 		int idx = szR.findFirstIdx(' ');
-		KviStr szNumber;
+		KviCString szNumber;
 		if(idx != -1)szNumber = szR.left(idx);
 		else szNumber = szR;
 		bool bOk;
@@ -503,7 +503,7 @@ bool KviHttpRequest::processHeader(KviStr &szHeader)
 	emit status(tmp);
 	emit receivedResponse(szUniResponse);
 
-	KviPointerList<KviStr> hlist;
+	KviPointerList<KviCString> hlist;
 	hlist.setAutoDelete(true);
 
 	idx = szHeader.findFirstIdx("\r\n");
@@ -511,30 +511,30 @@ bool KviHttpRequest::processHeader(KviStr &szHeader)
 	{
 		if(idx > 0)
 		{
-			hlist.append(new KviStr(szHeader.ptr(),idx));
+			hlist.append(new KviCString(szHeader.ptr(),idx));
 			szHeader.cutLeft(idx + 2);
 		}
 		idx = szHeader.findFirstIdx("\r\n");
 	}
-	if(szHeader.hasData())hlist.append(new KviStr(szHeader));
+	if(szHeader.hasData())hlist.append(new KviCString(szHeader));
 
-	KviPointerHashTable<const char *,KviStr> hdr(11,false,true);
+	KviPointerHashTable<const char *,KviCString> hdr(11,false,true);
 	hdr.setAutoDelete(true);
 
-	for(KviStr * s = hlist.first();s;s = hlist.next())
+	for(KviCString * s = hlist.first();s;s = hlist.next())
 	{
 		idx = s->findFirstIdx(":");
 		if(idx != -1)
 		{
-			KviStr szName = s->left(idx);
+			KviCString szName = s->left(idx);
 			s->cutLeft(idx + 1);
 			s->trimmed();
-			hdr.replace(szName.ptr(),new KviStr(*s));
+			hdr.replace(szName.ptr(),new KviCString(*s));
 			//qDebug("FOUND HEADER (%s)=(%s)",szName.ptr(),s->ptr());
 		}
 	}
 
-	KviStr * size = hdr.find("Content-length");
+	KviCString * size = hdr.find("Content-length");
 	if(size)
 	{
 		bool bOk;
@@ -542,13 +542,13 @@ bool KviHttpRequest::processHeader(KviStr &szHeader)
 		if(!bOk)m_uTotalSize = 0;
 	}
 
-	KviStr * contentEncoding = hdr.find("Content-encoding");
+	KviCString * contentEncoding = hdr.find("Content-encoding");
 	if(contentEncoding)
 	{
 		m_bGzip = contentEncoding->equalsCI("gzip");
 	}
 
-	KviStr * transferEncoding = hdr.find("Transfer-Encoding");
+	KviCString * transferEncoding = hdr.find("Transfer-Encoding");
 	if(transferEncoding)
 	{
 		if(kvi_strEqualCI(transferEncoding->ptr(),"chunked"))
@@ -664,7 +664,7 @@ void KviHttpRequest::processData(KviDataBuffer * data)
 			}
 			return;
 		}
-		KviStr szHeader((const char *)(m_pBuffer->data()),idx);
+		KviCString szHeader((const char *)(m_pBuffer->data()),idx);
 		m_pBuffer->remove(idx + 4);
 
 		if(!processHeader(szHeader))return;
@@ -789,7 +789,7 @@ void KviHttpRequest::processData(KviDataBuffer * data)
 						m_pBuffer->remove(2);
 					} else {
 						// got a chunk header
-						KviStr szHeader((const char *)(m_pBuffer->data()),crlf);
+						KviCString szHeader((const char *)(m_pBuffer->data()),crlf);
 						szHeader.cutFromFirst(' ');
 						// now szHeader should contain a hexadecimal chunk length... (why the hell it is hex and not decimal ????)
 						QString szHexHeader = szHeader.ptr();
@@ -917,9 +917,9 @@ bool KviHttpRequestThread::failure(const char *error)
 {
 	if(error)
 	{
-		postEvent(m_pRequest,new KviThreadDataEvent<KviStr>(KVI_THREAD_EVENT_ERROR,new KviStr(error)));
+		postEvent(m_pRequest,new KviThreadDataEvent<KviCString>(KVI_THREAD_EVENT_ERROR,new KviCString(error)));
 	} /*else {
-		postEvent(m_pRequest,new KviThreadDataEvent<KviStr>(KVI_THREAD_EVENT_ERROR,new KviStr(__tr2qs("Aborted"))));
+		postEvent(m_pRequest,new KviThreadDataEvent<KviCString>(KVI_THREAD_EVENT_ERROR,new KviCString(__tr2qs("Aborted"))));
 	}*/
 	return false;
 }
@@ -984,7 +984,7 @@ bool KviHttpRequestThread::selectForWrite(int iTimeoutInSecs)
 bool KviHttpRequestThread::sslFailure()
 {
 #ifdef COMPILE_SSL_SUPPORT
-	KviStr buffer;
+	KviCString buffer;
 	if(m_pSSL->getLastErrorString(buffer))
 	{
 		failure(buffer.ptr());
@@ -1383,7 +1383,7 @@ void KviHttpRequestThread::runInternal()
 
 	// FIXME: Other headers ?
 
-	KviStr szMethod;
+	KviCString szMethod;
 	switch(m_eRequestMethod)
 	{
 		case Head: szMethod = "HEAD"; break;
@@ -1391,7 +1391,7 @@ void KviHttpRequestThread::runInternal()
 		case Get: szMethod = "GET"; break;
 	}
 
-	KviStr szRequest(KviStr::Format,"%s %s HTTP/1.1\r\n" \
+	KviCString szRequest(KviCString::Format,"%s %s HTTP/1.1\r\n" \
 				"Host: %s\r\n" \
 				"Connection: Close\r\n" \
 				"User-Agent: KVIrc-http-slave/1.0.0\r\n" \
@@ -1399,11 +1399,11 @@ void KviHttpRequestThread::runInternal()
 				szMethod.ptr(),KviQString::toUtf8(m_szPath).data(),KviQString::toUtf8(m_szHost).data());
 
 	if(m_uContentOffset > 0)
-		szRequest.append(KviStr::Format,"Range: bytes=%u-\r\n",m_uContentOffset);
+		szRequest.append(KviCString::Format,"Range: bytes=%u-\r\n",m_uContentOffset);
 
 	if(m_eRequestMethod == Post)
 	{
-		szRequest.append(KviStr::Format,"Content-Type: application/x-www-form-urlencoded\r\n" \
+		szRequest.append(KviCString::Format,"Content-Type: application/x-www-form-urlencoded\r\n" \
 				"Content-Length: %u\r\n" \
 				"Cache-control: no-cache\r\n" \
 				"Pragma: no-cache\r\n",m_szPostData.length());
diff --git a/src/kvilib/net/kvi_http.h b/src/kvilib/net/kvi_http.h
index cc662c549..c53d32ce6 100644
--- a/src/kvilib/net/kvi_http.h
+++ b/src/kvilib/net/kvi_http.h
@@ -6,7 +6,7 @@
 //   Creation date : Sat Aug 17 13:43:31 2002 GMT by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2002-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2002-2010 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
@@ -25,15 +25,15 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_heapobject.h"
-#include "kvi_string.h"
-#include "kvi_thread.h"
+#include "KviHeapObject.h"
+#include "KviCString.h"
+#include "KviThread.h"
 #include "kvi_sockettype.h"
-#include "kvi_databuffer.h"
+#include "KviDataBuffer.h"
 #include "kvi_inttypes.h"
 #include "kvi_url.h"
-#include "kvi_pointerhashtable.h"
-#include "kvi_file.h"
+#include "KviPointerHashTable.h"
+#include "KviFile.h"
 
 #include <QObject>
 #include <QStringList>
@@ -100,7 +100,7 @@ protected:
 	bool startDnsLookup();
 	virtual bool event(QEvent *e);
 	void processData(KviDataBuffer * data);
-	bool processHeader(KviStr &szHeader);
+	bool processHeader(KviCString &szHeader);
 	bool openFile();
 	void emitLines(KviDataBuffer * pDataBuffer);
 
@@ -158,9 +158,9 @@ signals:
 
 
 	void status(const QString &message);
-	void data(const KviStr &data);
+	void data(const KviCString &data);
 	void binaryData(const KviDataBuffer &data);
-	void header(KviPointerHashTable<const char *,KviStr> * hdr);
+	void header(KviPointerHashTable<const char *,KviCString> * hdr);
 	void requestSent(const QStringList &request);
 };
 
diff --git a/src/kvilib/net/kvi_netutils.cpp b/src/kvilib/net/kvi_netutils.cpp
index 0618ea64f..304ddb0b3 100644
--- a/src/kvilib/net/kvi_netutils.cpp
+++ b/src/kvilib/net/kvi_netutils.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Sun Jun 18 2000 18:37:27 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -46,7 +46,7 @@
 #endif
 
 #include <sys/types.h>
-#include "kvi_qstring.h"
+#include "KviQString.h"
 
 #ifdef COMPILE_GET_INTERFACE_ADDRESS
 	#include <sys/ioctl.h>
@@ -698,7 +698,7 @@ KviSockaddr::KviSockaddr(const char * szIpAddress,kvi_u32_t uPort,bool bIPv6,boo
 
 	hints.ai_protocol = 0;
 	m_pData = 0;
-	KviStr szPort(KviStr::Format,"%u",uPort);
+	KviCString szPort(KviCString::Format,"%u",uPort);
 	getaddrinfo(szIpAddress,szPort.ptr(),&hints,&m_pData);
 }
 
@@ -716,7 +716,7 @@ KviSockaddr::KviSockaddr(kvi_u32_t uPort,bool bIPv6,bool bUdp) // passive sockad
 	hints.ai_socktype = bUdp ? SOCK_DGRAM : SOCK_STREAM;
 	hints.ai_protocol = 0;
 	m_pData = 0;
-	KviStr szPort(KviStr::Format,"%u",uPort);
+	KviCString szPort(KviCString::Format,"%u",uPort);
 	getaddrinfo(0,szPort.ptr(),&hints,&m_pData);
 }
 
diff --git a/src/kvilib/net/kvi_netutils.h b/src/kvilib/net/kvi_netutils.h
index d86f79b82..ac8c8d5ea 100644
--- a/src/kvilib/net/kvi_netutils.h
+++ b/src/kvilib/net/kvi_netutils.h
@@ -6,7 +6,7 @@
 //   Creation date : Sun Jun 18 2000 18:37:27 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -51,7 +51,7 @@
 	#include <arpa/inet.h>  //inet_ntoa inet_ntop and inet_pton depend on this one.
 #endif
 
-#include "kvi_string.h"
+#include "KviCString.h"
 
 class KVILIB_API KviSockaddr
 {
diff --git a/src/kvilib/net/kvi_sasl.cpp b/src/kvilib/net/kvi_sasl.cpp
index 55cc9ab9e..3a56749a7 100644
--- a/src/kvilib/net/kvi_sasl.cpp
+++ b/src/kvilib/net/kvi_sasl.cpp
@@ -26,7 +26,7 @@
 
 #include "kvi_sasl.h"
 
-#include "kvi_malloc.h"
+#include "KviMemory.h"
 
 #ifdef COMPILE_SSL_SUPPORT
 
@@ -42,12 +42,12 @@
 namespace KviSASL
 {
 
-	bool plainMethod(KviStr & szIn, KviStr & szOut, QByteArray & baNick, QByteArray & baPass)
+	bool plainMethod(KviCString & szIn, KviCString & szOut, QByteArray & baNick, QByteArray & baPass)
 	{
 		if(szIn=="+")
 		{
 			int answerLen = 3 + (2 * baNick.size()) + baPass.size();
-			char * answer = (char *) kvi_malloc(answerLen);
+			char * answer = (char *) KviMemory::allocate(answerLen);
 			char * answer2 = answer;
 
 			memcpy(answer, baNick.data(), baNick.size());
@@ -66,7 +66,7 @@ namespace KviSASL
 			answer++;
 
 			szOut.bufferToBase64(answer2,answerLen);
-			kvi_free(answer2);
+			KviMemory::free(answer2);
 
 			return true;
 		}
@@ -74,7 +74,7 @@ namespace KviSASL
 	}
 
 #ifdef COMPILE_SSL_SUPPORT
-	bool dh_blowfishMethod(KviStr & szIn, KviStr & szOut, QByteArray & baNick, QByteArray & baPass)
+	bool dh_blowfishMethod(KviCString & szIn, KviCString & szOut, QByteArray & baNick, QByteArray & baPass)
 	{
 		/*
 		 * The format of the auth token is quite complex; the server sends us 3 strings:
@@ -131,20 +131,20 @@ namespace KviSASL
 		if(!DH_generate_key(dh))
 			return false;
 
-		secret=(unsigned char *) kvi_malloc(DH_size(dh));
+		secret=(unsigned char *) KviMemory::allocate(DH_size(dh));
 		// note: any memory checking tool (as valgrind) will complain on this call. blame openssl
 		if(-1 == (secretLen = DH_compute_key(secret, BN_bin2bn((unsigned char*) tmpBuf, size, NULL), dh)))
 			return false;
 
 		pKlen=BN_num_bytes(dh->pub_key);
-		pubKey = (unsigned char *) kvi_malloc(pKlen);
+		pubKey = (unsigned char *) KviMemory::allocate(pKlen);
 		BN_bn2bin(dh->pub_key, pubKey);
 
 		//create crypto buffers
 		int passLen = baPass.size() + ((8 -( baPass.size() % 8)) % 8);
 		int passC = 0;
-		unsigned char *passIn = (unsigned char *) kvi_malloc(passLen);
-		unsigned char *passOut = (unsigned char *) kvi_malloc(passLen);
+		unsigned char *passIn = (unsigned char *) KviMemory::allocate(passLen);
+		unsigned char *passOut = (unsigned char *) KviMemory::allocate(passLen);
 
 		memset(passIn, 0, passLen);
 		memset(passOut, 0, passLen);
@@ -181,15 +181,15 @@ namespace KviSASL
 		szOut.bufferToBase64(answer2,answerLen);
 
 		//clean up
-		kvi_free(secret);
-		kvi_free(pubKey);
-		kvi_free(passIn);
-		kvi_free(passOut);
+		KviMemory::free(secret);
+		KviMemory::free(pubKey);
+		KviMemory::free(passIn);
+		KviMemory::free(passOut);
 
 		return true;
 	}
 #else
-	bool dh_blowfishMethod(KviStr & szIn, KviStr & szOut, QByteArray & baNick, QByteArray & baPass)
+	bool dh_blowfishMethod(KviCString & szIn, KviCString & szOut, QByteArray & baNick, QByteArray & baPass)
 	{
 		return false;
 	}
diff --git a/src/kvilib/net/kvi_sasl.h b/src/kvilib/net/kvi_sasl.h
index 9dd660e88..12db86dc3 100644
--- a/src/kvilib/net/kvi_sasl.h
+++ b/src/kvilib/net/kvi_sasl.h
@@ -25,7 +25,7 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_string.h"
+#include "KviCString.h"
 
 /**
 * \namespace KviSASL
@@ -39,22 +39,22 @@ namespace KviSASL
 	/**
 	* \brief Create the auth message for PLAIN authentication
 	* \param szIn The server-provided token
-	* \param szOut A KviStr that will be filled with the authentication message
+	* \param szOut A KviCString that will be filled with the authentication message
 	* \param baNick The username
 	* \param baPass	The password
 	* \return bool 
 	*/
-	extern KVILIB_API bool plainMethod(KviStr & szIn, KviStr & szOut, QByteArray & baNick, QByteArray & baPass);
+	extern KVILIB_API bool plainMethod(KviCString & szIn, KviCString & szOut, QByteArray & baNick, QByteArray & baPass);
 
 	/**
 	* \brief Create the auth message for DH-BLOWFISH authentication
 	* \param szIn The server-provided token
-	* \param szOut A KviStr that will be filled with the authentication message
+	* \param szOut A KviCString that will be filled with the authentication message
 	* \param baNick The username
 	* \param baPass	The password
 	* \return bool
 	*/
-	extern KVILIB_API bool dh_blowfishMethod(KviStr & szIn, KviStr & szOut, QByteArray & baNick, QByteArray & baPass);
+	extern KVILIB_API bool dh_blowfishMethod(KviCString & szIn, KviCString & szOut, QByteArray & baNick, QByteArray & baPass);
 
 };
 
diff --git a/src/kvilib/net/kvi_socket.cpp b/src/kvilib/net/kvi_socket.cpp
index 69fb99518..69052834a 100644
--- a/src/kvilib/net/kvi_socket.cpp
+++ b/src/kvilib/net/kvi_socket.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Thu Sep 20 03:50:24 2001 GMT 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-2010 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
diff --git a/src/kvilib/net/kvi_socket.h b/src/kvilib/net/kvi_socket.h
index a0572cd70..d0f3067d7 100644
--- a/src/kvilib/net/kvi_socket.h
+++ b/src/kvilib/net/kvi_socket.h
@@ -6,7 +6,7 @@
 //   Creation date : Thu Sep 20 03:50:22 2001 GMT 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-2010 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
diff --git a/src/kvilib/net/kvi_sockettype.h b/src/kvilib/net/kvi_sockettype.h
index 213675078..15d69818d 100644
--- a/src/kvilib/net/kvi_sockettype.h
+++ b/src/kvilib/net/kvi_sockettype.h
@@ -6,7 +6,7 @@
 //   Creation date : Thu Sep 20 05:41:46 2001 GMT 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-2010 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
diff --git a/src/kvilib/net/kvi_ssl.cpp b/src/kvilib/net/kvi_ssl.cpp
index 5e6c1661b..b807d12b9 100644
--- a/src/kvilib/net/kvi_ssl.cpp
+++ b/src/kvilib/net/kvi_ssl.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Mon May 27 2002 21:36:12 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2002-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2002-2010 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
@@ -25,13 +25,13 @@
 
 
 #include "kvi_ssl.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 
 #ifdef COMPILE_SSL_SUPPORT
 
-#include "kvi_thread.h"
+#include "KviThread.h"
 #include "kvi_memmove.h"
-#include "kvi_malloc.h"
+#include "KviMemory.h"
 
 #include <openssl/asn1.h>
 #include <openssl/err.h>
@@ -294,12 +294,12 @@ KviSSL::~KviSSL()
 
 	void * KviSSL::operator new(size_t tSize)
 	{
-		return kvi_malloc(tSize);
+		return KviMemory::allocate(tSize);
 	}
 
 	void KviSSL::operator delete(void * p)
 	{
-		kvi_free(p);
+		KviMemory::free(p);
 	}
 
 #endif
@@ -375,7 +375,7 @@ bool KviSSL::initSocket(kvi_socket_t fd)
 
 static int cb(char *buf, int size, int, void *u)
 {
-	KviStr * p = (KviStr *)u;
+	KviCString * p = (KviCString *)u;
 	int len = p->len();
 	if(len >= size)return 0;
 	kvi_memmove(buf,p->ptr(),len + 1);
@@ -444,7 +444,7 @@ unsigned long KviSSL::getLastError(bool bPeek)
 	return bPeek ? ERR_peek_error() : ERR_get_error();
 }
 
-bool KviSSL::getLastErrorString(KviStr &buffer,bool bPeek)
+bool KviSSL::getLastErrorString(KviCString &buffer,bool bPeek)
 {
 	unsigned long uErr = getLastError(bPeek);
 	if(uErr != 0)
@@ -552,9 +552,9 @@ KviSSLCipherInfo * KviSSL::getCurrentCipherInfo()
 
 KviSSLCertificate::KviSSLCertificate(X509 * x509)
 {
-	m_pSubject = new KviPointerHashTable<const char *,KviStr>(17);
+	m_pSubject = new KviPointerHashTable<const char *,KviCString>(17);
 	m_pSubject->setAutoDelete(true);
-	m_pIssuer = new KviPointerHashTable<const char *,KviStr>(17);
+	m_pIssuer = new KviPointerHashTable<const char *,KviCString>(17);
 	m_pIssuer->setAutoDelete(true);
 	m_pX509 = 0;
 	setX509(x509);
@@ -573,7 +573,7 @@ const char * KviSSLCertificate::getX509Base64()
 	BIO* mem = BIO_new(BIO_s_mem());
 	PEM_write_bio_X509(mem, m_pX509);
 	int iLen = BIO_get_mem_data(mem, &bptr);
-	char * szTmp = (char *) kvi_malloc(iLen+1);
+	char * szTmp = (char *) KviMemory::allocate(iLen+1);
 	kvi_fastmove(szTmp, bptr, iLen);
 	*(szTmp+iLen) = '\0';
 	BIO_free_all(mem);
@@ -590,12 +590,12 @@ const char * KviSSLCertificate::getX509Base64()
 
 	void * KviSSLCertificate::operator new(size_t tSize)
 	{
-		return kvi_malloc(tSize);
+		return KviMemory::allocate(tSize);
 	}
 
 	void KviSSLCertificate::operator delete(void * p)
 	{
-		kvi_free(p);
+		KviMemory::free(p);
 	}
 
 #endif
@@ -722,11 +722,11 @@ void KviSSLCertificate::extractIssuer()
 	splitX509String(m_pIssuer,t);
 }
 
-void KviSSLCertificate::splitX509String(KviPointerHashTable<const char *,KviStr> * dict,const char * t)
+void KviSSLCertificate::splitX509String(KviPointerHashTable<const char *,KviCString> * dict,const char * t)
 {
-	KviStr buf = t;
+	KviCString buf = t;
 	int cnt;
-	KviStr ** arr = buf.splitToArray('/',50,&cnt);
+	KviCString ** arr = buf.splitToArray('/',50,&cnt);
 	if(arr)
 	{
 		if(cnt > 0)
@@ -736,31 +736,31 @@ void KviSSLCertificate::splitX509String(KviPointerHashTable<const char *,KviStr>
 				int idx = arr[i]->findFirstIdx('=');
 				if(idx != -1)
 				{
-					KviStr szTok = arr[i]->left(idx);
+					KviCString szTok = arr[i]->left(idx);
 					arr[i]->cutLeft(idx + 1);
 					if(szTok.hasData() && arr[i]->hasData())
 					{
-						dict->replace(szTok.ptr(),new KviStr(arr[i]->ptr()));
+						dict->replace(szTok.ptr(),new KviCString(arr[i]->ptr()));
 					}
 				}
 			}
 		}
 
-		KviStr::freeArray(arr);
+		KviCString::freeArray(arr);
 	}
 }
 
 
-const char * KviSSLCertificate::dictEntry(KviPointerHashTable<const char *,KviStr> * dict,const char * entry)
+const char * KviSSLCertificate::dictEntry(KviPointerHashTable<const char *,KviCString> * dict,const char * entry)
 {
-	KviStr * t = dict->find(entry);
+	KviCString * t = dict->find(entry);
 	if(!t)return __tr("Unknown");
 	return t->ptr();
 }
 
 
 /*
-void KviSSLCertificate::getPKeyType(int type,KviStr &buffer)
+void KviSSLCertificate::getPKeyType(int type,KviCString &buffer)
 {
 	switch(type)
 	{
@@ -853,12 +853,12 @@ KviSSLCipherInfo::~KviSSLCipherInfo()
 
 	void * KviSSLCipherInfo::operator new(size_t tSize)
 	{
-		return kvi_malloc(tSize);
+		return KviMemory::allocate(tSize);
 	}
 
 	void KviSSLCipherInfo::operator delete(void * p)
 	{
-		kvi_free(p);
+		KviMemory::free(p);
 	}
 
 #endif
diff --git a/src/kvilib/net/kvi_ssl.h b/src/kvilib/net/kvi_ssl.h
index 5289f1bfe..66413d627 100644
--- a/src/kvilib/net/kvi_ssl.h
+++ b/src/kvilib/net/kvi_ssl.h
@@ -6,7 +6,7 @@
 //   Creation date : Mon May 27 2002 21:36:12 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2002-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2002-2010 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
@@ -28,10 +28,10 @@
 
 #ifdef COMPILE_SSL_SUPPORT
 
-#include "kvi_string.h"
+#include "KviCString.h"
 #include "kvi_sockettype.h"
 
-#include "kvi_pointerhashtable.h"
+#include "KviPointerHashTable.h"
 
 #include <openssl/ssl.h>
 
@@ -43,22 +43,22 @@ public:
 	~KviSSLCertificate();
 protected:
 	X509 * m_pX509;
-	KviPointerHashTable<const char *,KviStr> * m_pSubject;
-	KviPointerHashTable<const char *,KviStr> * m_pIssuer;
+	KviPointerHashTable<const char *,KviCString> * m_pSubject;
+	KviPointerHashTable<const char *,KviCString> * m_pIssuer;
 	int                  m_iPubKeyBits;
-	KviStr               m_szPubKeyType;
+	KviCString               m_szPubKeyType;
 	int                  m_iSerialNumber;
 	int                  m_iVersion;
-	KviStr               m_szSignatureType;
-	KviStr               m_szSignatureContents;
+	KviCString               m_szSignatureType;
+	KviCString               m_szSignatureContents;
 private:
 	void extractSubject();
 	void extractIssuer();
 	void extractPubKeyInfo();
 	void extractSerialNumber();
 	void extractSignature();
-	const char * dictEntry(KviPointerHashTable<const char *,KviStr> * dict,const char * entry);
-	void splitX509String(KviPointerHashTable<const char *,KviStr> * dict,const char * t);
+	const char * dictEntry(KviPointerHashTable<const char *,KviCString> * dict,const char * entry);
+	void splitX509String(KviPointerHashTable<const char *,KviCString> * dict,const char * t);
 	int getFingerprint(unsigned char * bufferData, unsigned int * bufferLen, const char * digestName);
 public:
 	void setX509(X509 * x509);
@@ -114,11 +114,11 @@ public:
 #endif
 	~KviSSLCipherInfo();
 protected:
-	KviStr       m_szVersion;
+	KviCString       m_szVersion;
 	int          m_iNumBits;
 	int          m_iNumBitsUsed;
-	KviStr       m_szName;
-	KviStr       m_szDescription;
+	KviCString       m_szName;
+	KviCString       m_szDescription;
 public:
 	const char * name(){ return m_szName.ptr(); };
 	const char * description(){ return m_szDescription.ptr(); };
@@ -153,7 +153,7 @@ public:
 public:
 	SSL        * m_pSSL;
 	SSL_CTX    * m_pSSLCtx;
-	KviStr       m_szPass;
+	KviCString       m_szPass;
 public:
 	static void globalInit();
 	static void globalDestroy();
@@ -169,7 +169,7 @@ public:
 	int write(const char * buffer,int len);
 	// SSL ERRORS
 	unsigned long getLastError(bool bPeek = false);
-	bool getLastErrorString(KviStr &buffer,bool bPeek = false);
+	bool getLastErrorString(KviCString &buffer,bool bPeek = false);
 	// Protocol error
 	KviSSL::Result getProtocolError(int ret);
 	KviSSLCertificate * getPeerCertificate();
diff --git a/src/kvilib/net/kvi_url.cpp b/src/kvilib/net/kvi_url.cpp
index 211a97d32..f644d8fe1 100644
--- a/src/kvilib/net/kvi_url.cpp
+++ b/src/kvilib/net/kvi_url.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Sat Aug 17 14:09:18 2002 GMT by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2002-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2002-2010 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
diff --git a/src/kvilib/net/kvi_url.h b/src/kvilib/net/kvi_url.h
index c752be28f..813af9645 100644
--- a/src/kvilib/net/kvi_url.h
+++ b/src/kvilib/net/kvi_url.h
@@ -6,7 +6,7 @@
 //   Creation date : Sat Aug 17 14:09:16 2002 GMT by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2002-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2002-2010 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
@@ -24,8 +24,8 @@
 //
 //=============================================================================
 
-#include "kvi_string.h"
-#include "kvi_heapobject.h"
+#include "KviCString.h"
+#include "KviHeapObject.h"
 #include "kvi_inttypes.h"
 
 class KVILIB_API KviUrl : public KviHeapObject
diff --git a/src/kvilib/system/kvi_byteorder.h b/src/kvilib/system/KviByteOrder.h
index b6b75b140..c7d1b56d6 100644
--- a/src/kvilib/system/kvi_byteorder.h
+++ b/src/kvilib/system/KviByteOrder.h
@@ -3,11 +3,11 @@
 
 //=============================================================================
 //
-//   File : kvi_byteorder.h
+//   File : KviByteOrder.h
 //   Creation date : Mon Dec 25 2006 19:56:16 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2006-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2006-2010 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
@@ -29,6 +29,8 @@
 #include "kvi_bswap.h"
 #include "kvi_inttypes.h"
 
+namespace KviByteOrder
+{
 
 //
 // Byte Orders Reminder
@@ -43,22 +45,74 @@
 //
 
 #ifdef BIG_ENDIAN_MACHINE_BYTE_ORDER
-	#define kvi_localCpuToLittleEndian16(u) kvi_swap16((kvi_u16_t)(u))
-	#define kvi_localCpuToLittleEndian32(u) kvi_swap32((kvi_u32_t)(u))
-	#define kvi_localCpuToLittleEndian64(u) kvi_swap64((kvi_u64_t)(u))
-	#define kvi_littleEndianToLocalCpu16(u) kvi_swap16((kvi_u16_t)(u))
-	#define kvi_littleEndianToLocalCpu32(u) kvi_swap32((kvi_u32_t)(u))
-	#define kvi_littleEndianToLocalCpu64(u) kvi_swap64((kvi_u64_t)(u))
+
+	inline kvi_u16_t localCpuToLittleEndian16(kvi_u16_t u)
+	{
+		return kvi_swap16(u);
+	}
+	
+	inline kvi_u32_t localCpuToLittleEndian32(kvi_u32_t u)
+	{
+		return kvi_swap32(u);
+	}
+
+	inline kvi_u64_t localCpuToLittleEndian64(kvi_u64_t u)
+	{
+		return kvi_swap64(u);
+	}
+
+	inline kvi_u16_t littleEndianToLocalCpu16(kvi_u16_t u)
+	{
+		return kvi_swap16(u);
+	}
+
+	inline kvi_u32_t littleEndianToLocalCpu32(kvi_u32_t u)
+	{
+		return kvi_swap32(u);
+	}
+
+	inline kvi_u64_t littleEndianToLocalCpu64(kvi_u64_t u)
+	{
+		return kvi_swap64(u);
+	}
+
 #else
 	// We ASSUME that the local cpu is little endian.. if it isn't.. well :)
-	#define LOCAL_CPU_LITTLE_ENDIAN
-	#define kvi_localCpuToLittleEndian16(u) (u)
-	#define kvi_localCpuToLittleEndian32(u) (u)
-	#define kvi_localCpuToLittleEndian64(u) (u)
-	#define kvi_littleEndianToLocalCpu16(u) (u)
-	#define kvi_littleEndianToLocalCpu32(u) (u)
-	#define kvi_littleEndianToLocalCpu64(u) (u)
+	#define LOCAL_CPU_LITTLE_ENDIAN 1
+
+	inline kvi_u16_t localCpuToLittleEndian16(kvi_u16_t u)
+	{
+		return u;
+	}
+	
+	inline kvi_u32_t localCpuToLittleEndian32(kvi_u32_t u)
+	{
+		return u;
+	}
+
+	inline kvi_u64_t localCpuToLittleEndian64(kvi_u64_t u)
+	{
+		return u;
+	}
+
+	inline kvi_u16_t littleEndianToLocalCpu16(kvi_u16_t u)
+	{
+		return u;
+	}
+
+	inline kvi_u32_t littleEndianToLocalCpu32(kvi_u32_t u)
+	{
+		return u;
+	}
+
+	inline kvi_u64_t littleEndianToLocalCpu64(kvi_u64_t u)
+	{
+		return u;
+	}
+
 #endif
 
+} // namespace KviByteOrder
+
 
 #endif // !_KVI_BYTEORDER_H_
diff --git a/src/kvilib/system/kvi_env.cpp b/src/kvilib/system/KviEnvironment.cpp
index 406a42d24..0e80a3940 100644
--- a/src/kvilib/system/kvi_env.cpp
+++ b/src/kvilib/system/KviEnvironment.cpp
@@ -1,10 +1,10 @@
 //=============================================================================
 //
-//   File : kvi_env.cpp
+//   File : KviEnvironment.cpp
 //   Creation date : Sat May 05 2002 02:15:21 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2002-2008 Szymon Stefanek (pragma@kvirc.net)
+//   Copyright (C) 2002-2010 Szymon Stefanek (pragma@kvirc.net)
 //
 //   This program is FREE software. You can redistribute it and/or
 //   modify it under the terms of the GNU General Public License
@@ -24,24 +24,27 @@
 
 #define _KVI_ENV_CPP_
 
-#include "kvi_env.h"
-#include "kvi_string.h"
-#include "kvi_malloc.h"
+#include "KviEnvironment.h"
+#include "KviCString.h"
+#include "KviMemory.h"
 #include "kvi_memmove.h"
 
+namespace KviEnvironment
+{
+
 #if !defined(COMPILE_ON_WINDOWS) && ! defined(COMPILE_ON_MINGW)
 
 #ifdef HAVE_SETENV
-bool kvi_setenv(const char * name,const char * value)
+bool setVariable(const char * name,const char * value)
 {
 	return (setenv(name,value,1) == 0);
 #else
 	#ifdef HAVE_PUTENV
-bool kvi_setenv(const char * name,const char * value)
+bool setVariable(const char * name,const char * value)
 {
 		int iLen1 = kvi_strLen(name);
 		int iLen2 = kvi_strLen(value);
-		char * buf = (char *)kvi_malloc(iLen1 + iLen2 + 2);
+		char * buf = (char *)KviMemory::allocate(iLen1 + iLen2 + 2);
 		kvi_memmove(buf,name,iLen1);
 		*(buf + iLen1) = '=';
 		kvi_memmove(buf + iLen1 + 1,value,iLen2);
@@ -49,12 +52,12 @@ bool kvi_setenv(const char * name,const char * value)
 		int iRet = putenv(buf);
 		if(iRet != 0)
 		{
-			kvi_free(buf);
+			KviMemory::free(buf);
 			return false;
 		}
 		return true;
 	#else
-bool kvi_setenv(const char *,const char *)
+bool setVariable(const char *,const char *)
 {
 		// no setenv, no putenv.. what the hell of system is this ?
 		return false;
@@ -63,36 +66,38 @@ bool kvi_setenv(const char *,const char *)
 }
 
 #ifdef HAVE_UNSETENV
-void kvi_unsetenv(const char * name)
+void unsetVariable(const char * name)
 {
 	unsetenv(name);
 #else
 	#ifdef HAVE_PUTENV
-void kvi_unsetenv(const char * name)
+void unsetVariable(const char * name)
 {
 		int iLen1 = kvi_strLen(name);
-		char * buf = (char *)kvi_malloc(iLen1 + 1);
+		char * buf = (char *)KviMemory::allocate(iLen1 + 1);
 		kvi_memmove(buf,name,iLen1);
 		*(buf + iLen1) = '\0';
 		int iRet = putenv(buf);
 		if(iRet != 0)
 		{
-			kvi_free(buf);
+			KviMemory::free(buf);
 		} else {
 			// hmmm
-			if(kvi_getenv(name) == 0)
+			if(getVariable(name) == 0)
 			{
 				// ok, the string is not in the environment
 				// we can free it
-				kvi_free(buf);
+				KviMemory::free(buf);
 			} // else this system sux
 		}
 	#else
-void kvi_unsetenv(const char *)
+void unsetVariable(const char *)
 {
 		// no setenv, no putenv.. what the hell of system is this ?
 	#endif
 #endif
 }
 
+}
+
 #endif //COMPILE_ON_WINDOWS
diff --git a/src/kvilib/system/KviEnvironment.h b/src/kvilib/system/KviEnvironment.h
new file mode 100644
index 000000000..95c242f88
--- /dev/null
+++ b/src/kvilib/system/KviEnvironment.h
@@ -0,0 +1,80 @@
+#ifndef _KVI_ENV_H_
+#define _KVI_ENV_H_
+
+//=============================================================================
+//
+//   File : KviEnvironment.h
+//   Creation date : Sat May 05 2002 02:15:21 CEST by Szymon Stefanek
+//
+//   This file is part of the KVirc irc client distribution
+//   Copyright (C) 2002-2010 Szymon Stefanek (pragma@kvirc.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 KviEnvironment.h
+* \author Szymon Stefanek
+* \brief Environment function wrappers
+*/
+
+#include "kvi_settings.h"
+
+#include <stdlib.h>
+
+namespace KviEnvironment
+{
+
+	/**
+	* \brief Gets environment variable
+	* \param name The name of the variable to get
+	* \return char *
+	*/
+	inline char * getVariable(const char * name)
+	{
+		return getenv(name);
+	}
+
+#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
+	inline void setVariable(const char * szName,const char * szValue)
+	{
+		SetEnvironmentVariable(szName,szValue);
+	}
+	
+	inline void unsetVariable(const char * name)
+	{
+		SetEnvironmentVariable(name,NULL);
+	}
+#else
+	/**
+	* \brief Sets environment variable
+	* \param name The name of the variable to set
+	* \param value The value of the variable
+	* \return bool
+	*/
+	KVILIB_API bool setVariable(const char * name, const char * value);
+
+	/**
+	* \brief Unsets environment variable
+	* \param name The name of the variable to set
+	* \return void
+	*/
+	KVILIB_API void unsetVariable(const char * name);
+#endif
+
+}
+
+#endif //_KVI_ENV_H_
diff --git a/src/kvilib/system/kvi_locale.cpp b/src/kvilib/system/KviLocale.cpp
index db97446c4..5fff1d47c 100644
--- a/src/kvilib/system/kvi_locale.cpp
+++ b/src/kvilib/system/KviLocale.cpp
@@ -1,10 +1,10 @@
 //=============================================================================
 //
-//   File : kvi_locale.cpp
+//   File : KviLocale.cpp
 //   Creation date : Fri Mar 19 1999 19:08:41 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 1999-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 1999-2010 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
@@ -26,11 +26,11 @@
 
 //#define _KVI_DEBUG_CHECK_RANGE_
 #include "kvi_debug.h"
-#include "kvi_malloc.h"
+#include "KviMemory.h"
 #include "kvi_bswap.h"
 
 #define _KVI_LOCALE_CPP_
-#include "kvi_locale.h"
+#include "KviLocale.h"
 
 #include <QtGlobal>
 #include <QTextCodec>
@@ -38,15 +38,15 @@
 #include <QLocale>
 #include <QByteArray>
 
-#include "kvi_string.h"
-#include "kvi_env.h"
-#include "kvi_fileutils.h"
-#include "kvi_file.h"
+#include "KviCString.h"
+#include "KviEnvironment.h"
+#include "KviFileUtils.h"
+#include "KviFile.h"
 
 
 KVILIB_API KviMessageCatalogue           * g_pMainCatalogue       = 0;
 
-static KviStr                              g_szLang;
+static KviCString                              g_szLang;
 static KviTranslator                     * g_pTranslator          = 0;
 static KviPointerHashTable<const char *,KviMessageCatalogue> * g_pCatalogueDict       = 0;
 static QTextCodec                        * g_pUtf8TextCodec       = 0;
@@ -474,13 +474,13 @@ bool KviMessageCatalogue::load(const QString& name)
 	f.seek(0);
 
 	unsigned int fSize = f.size();
-	char * buffer = (char *)kvi_malloc(fSize);
+	char * buffer = (char *)KviMemory::allocate(fSize);
 
 	// FIXME: maybe read it in blocks eh ?
 	if(f.read(buffer,fSize) < (int)fSize)
 	{
 		qDebug("KviLocale: Error while reading the translation file %s",KviQString::toUtf8(szCatalogueFile).data());
-		kvi_free(buffer);
+		KviMemory::free(buffer);
 		f.close();
 		return false;
 	}
@@ -489,7 +489,7 @@ bool KviMessageCatalogue::load(const QString& name)
 	if(fSize < (24 + (sizeof(GnuMoStringDescriptor) * numberOfStrings)))
 	{
 		qDebug("KviLocale: Broken translation file %s (too small for all descriptors)",KviQString::toUtf8(szCatalogueFile).data());
-		kvi_free(buffer);
+		KviMemory::free(buffer);
 		f.close();
 		return false;
 	}
@@ -504,7 +504,7 @@ bool KviMessageCatalogue::load(const QString& name)
 	if(fSize < (unsigned int)expectedFileSize)
 	{
 		qDebug("KviLocale: Broken translation file %s (too small for all the message strings)",KviQString::toUtf8(szCatalogueFile).data());
-		kvi_free(buffer);
+		KviMemory::free(buffer);
 		f.close();
 		return false;
 	}
@@ -517,7 +517,7 @@ bool KviMessageCatalogue::load(const QString& name)
 	m_pMessages = new KviPointerHashTable<const char *,KviTranslationEntry>(dictSize,true,false); // dictSize, case sensitive, don't copy keys
 	m_pMessages->setAutoDelete(true);
 
-	KviStr szHeader;
+	KviCString szHeader;
 
 	for(int i=0;i < numberOfStrings;i++)
 	{
@@ -546,7 +546,7 @@ bool KviMessageCatalogue::load(const QString& name)
 		m_pMessages->insert(e->m_szKey.ptr(),e);
 	}
 
-	kvi_free(buffer);
+	KviMemory::free(buffer);
 	f.close();
 
 	m_pTextCodec = 0;
@@ -799,7 +799,7 @@ namespace KviLocale
 
 	QTextCodec * codecForName(const char * szName)
 	{
-		KviStr szTmp = szName;
+		KviCString szTmp = szName;
 
 		int idx = szTmp.findFirstIdx('[');
 		if(idx != -1)
@@ -846,7 +846,7 @@ namespace KviLocale
 		return QTextCodec::codecForName(szName);
 	}
 
-	const KviStr & localeName()
+	const KviCString & localeName()
 	{
 		return g_szLang;
 	}
@@ -881,7 +881,7 @@ namespace KviLocale
 
 	bool findCatalogue(QString &szBuffer,const QString& name,const QString& szLocaleDir)
 	{
-		KviStr szLocale = g_szLang;
+		KviCString szLocale = g_szLang;
 
 		QString szLocDir = szLocaleDir;
 		KviQString::ensureLastCharIs(szLocDir,KVI_PATH_SEPARATOR_CHAR);
@@ -948,9 +948,9 @@ namespace KviLocale
 			KviFileUtils::readFile(szLangFile,szTmp);
 			g_szLang=szTmp;
 		}
-		if(g_szLang.isEmpty())g_szLang = kvi_getenv("KVIRC_LANG");
-		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 = KviEnvironment::getVariable("KVIRC_LANG");
+		if(g_szLang.isEmpty())g_szLang = KviEnvironment::getVariable("LC_MESSAGES");
+		if(g_szLang.isEmpty())g_szLang = KviEnvironment::getVariable("LANG");
 		if(g_szLang.isEmpty())g_szLang = QLocale::system().name();
 		if(g_szLang.isEmpty())g_szLang = "en";
 		g_szLang.trimmed();
@@ -976,7 +976,7 @@ namespace KviLocale
 				g_pTranslator = new KviTranslator(app,"kvirc_translator");
 				app->installTranslator(g_pTranslator);
 			} else {
-				KviStr szTmp = g_szLang;
+				KviCString szTmp = g_szLang;
 				szTmp.cutFromFirst('.');
 				szTmp.cutFromFirst('_');
 				szTmp.cutFromFirst('@');
diff --git a/src/kvilib/system/kvi_locale.h b/src/kvilib/system/KviLocale.h
index 2d91002b7..86bbdd301 100644
--- a/src/kvilib/system/kvi_locale.h
+++ b/src/kvilib/system/KviLocale.h
@@ -3,11 +3,11 @@
 
 //=============================================================================
 //
-//   File : kvi_locale.h
+//   File : KviLocale.h
 //   Creation date : Sat Jan 16 1999 18:15:01 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 1999-2009 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 1999-2010 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
@@ -27,9 +27,9 @@
 
 
 #include "kvi_settings.h"
-#include "kvi_qstring.h"
-#include "kvi_string.h"
-#include "kvi_pointerhashtable.h"
+#include "KviQString.h"
+#include "KviCString.h"
+#include "KviPointerHashTable.h"
 
 #include <QApplication>
 
@@ -53,7 +53,7 @@ namespace KviLocale
 	KVILIB_API uint encodingGroups();
 	KVILIB_API const char * encodingGroup(int iIdx);
 	KVILIB_API QTextCodec * codecForName(const char * szName);
-	KVILIB_API const KviStr & localeName();
+	KVILIB_API const KviCString & localeName();
 	KVILIB_API bool findCatalogue(QString &szBuffer,const QString& name,const QString& szLocaleDir);
 	KVILIB_API bool loadCatalogue(const QString& name,const QString& szLocaleDir);
 	KVILIB_API KviMessageCatalogue * getLoadedCatalogue(const QString& name);
@@ -68,8 +68,8 @@ namespace KviLocale
 class KviTranslationEntry
 {
 public:
-	KviStr    m_szKey;
-	KviStr    m_szEncodedTranslation;
+	KviCString    m_szKey;
+	KviCString    m_szEncodedTranslation;
 	QString * m_pQTranslation;
 public:
 	KviTranslationEntry(char * keyptr,int keylen,char * trptr,int trlen)
diff --git a/src/kvilib/system/kvi_thread.cpp b/src/kvilib/system/KviThread.cpp
index bb5d37d40..17506a1b0 100644
--- a/src/kvilib/system/kvi_thread.cpp
+++ b/src/kvilib/system/KviThread.cpp
@@ -1,10 +1,10 @@
 //=============================================================================
 //
-//   File : kvi_thread.cpp
+//   File : KviThread.cpp
 //   Creation date : Tue Jul 6 1999 16:04:45 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 1999-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 1999-2010 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
@@ -28,7 +28,7 @@
 	#define _GNU_SOURCE
 #endif
 
-#include "kvi_thread.h"
+#include "KviThread.h"
 
 #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
 	#include <io.h> // for _pipe()
@@ -41,7 +41,7 @@
 #include <errno.h>
 
 
-#include "kvi_string.h"
+#include "KviCString.h"
 #include "kvi_settings.h"
 #include "kvi_error.h"
 
diff --git a/src/kvilib/system/kvi_thread.h b/src/kvilib/system/KviThread.h
index 0cad423d3..cfb13ade0 100644
--- a/src/kvilib/system/kvi_thread.h
+++ b/src/kvilib/system/KviThread.h
@@ -2,11 +2,11 @@
 #define _KVI_THREAD_H_
 //=============================================================================
 //
-//   File : kvi_thread.h
+//   File : KviThread.h
 //   Creation date : Mon May 17 1999 04:26:41 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 1999-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 1999-2010 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
@@ -25,12 +25,12 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_heapobject.h"
-#include "kvi_string.h"
+#include "KviHeapObject.h"
+#include "KviCString.h"
 
 #include <QObject>
 #include <QSocketNotifier>
-#include "kvi_pointerlist.h"
+#include "KviPointerList.h"
 #include <QEvent>
 
 
@@ -247,7 +247,7 @@ private:
 // The following are KviThreadDataEvent<int>
 #define KVI_THREAD_EVENT_STATECHANGE 150
 
-// The following are KviThreadDataEvent<KviStr>
+// The following are KviThreadDataEvent<KviCString>
 #define KVI_THREAD_EVENT_MESSAGE 200
 #define KVI_THREAD_EVENT_WARNING 201
 #define KVI_THREAD_EVENT_ERROR 202
diff --git a/src/kvilib/system/kvi_time.cpp b/src/kvilib/system/KviTimeUtils.cpp
index da3cd30d6..979b4ad25 100644
--- a/src/kvilib/system/kvi_time.cpp
+++ b/src/kvilib/system/KviTimeUtils.cpp
@@ -1,10 +1,10 @@
 //=============================================================================
 //
-//   File : kvi_time.cpp
+//   File : KviTimeUtils.cpp
 //   Creation date : Tue Sep 25 17:35:13 2001 GMT 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-2010 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
@@ -24,9 +24,9 @@
 
 
 
-#include "kvi_time.h"
-#include "kvi_qstring.h"
-#include "kvi_locale.h"
+#include "KviTimeUtils.h"
+#include "KviQString.h"
+#include "KviLocale.h"
 
 #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
 	#include <windows.h> // GetSystemTime
diff --git a/src/kvilib/system/kvi_time.h b/src/kvilib/system/KviTimeUtils.h
index c5a7e490b..98c82e4fb 100644
--- a/src/kvilib/system/kvi_time.h
+++ b/src/kvilib/system/KviTimeUtils.h
@@ -2,11 +2,11 @@
 #define _KVI_TIME_H_
 //=============================================================================
 //
-//   File : kvi_time.h
+//   File : KviTimeUtils.h
 //   Creation date : Tue Sep 25 17:28:46 2001 GMT 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-2010 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
@@ -25,7 +25,7 @@
 //=============================================================================
 
 /**
-* \file kvi_time.h
+* \file KviTimeUtils.h
 * \author Szymon Stefanek
 * \brief Time management
 */
@@ -36,6 +36,7 @@
 
 #include <time.h> // for time()
 
+
 #define kvi_unixTime() time(0)
 #define kvi_timeSpan(_time_now,_time_before) ((_time_now) - (_time_before))
 #define kvi_secondsSince(_that_time_t) kvi_timeSpan(kvi_unixTime(),_that_time_t)
diff --git a/src/kvilib/system/kvi_env.h b/src/kvilib/system/kvi_env.h
deleted file mode 100644
index 1be122d4d..000000000
--- a/src/kvilib/system/kvi_env.h
+++ /dev/null
@@ -1,89 +0,0 @@
-#ifndef _KVI_ENV_H_
-#define _KVI_ENV_H_
-
-//=============================================================================
-//
-//   File : kvi_env.h
-//   Creation date : Sat May 05 2002 02:15:21 CEST by Szymon Stefanek
-//
-//   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2002-2008 Szymon Stefanek (pragma@kvirc.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_env.h
-* \author Szymon Stefanek
-* \brief Environment function wrappers
-*
-* \def kvi_setenv(__name,__value) Defines kvi_setenv(__name,__value) as SetEnvironmentVariable(__name,__value) on win32
-* \def kvi_unsetenv(__name) Defines kvi_unsetenv(__name) as SetEnvironmentVariable(__name,NULL) on win32
-*/
-
-#include "kvi_settings.h"
-
-#include <stdlib.h>
-
-/**
-* \brief Gets environment variable
-* \param name The name of the variable to get
-* \return char *
-*/
-inline char * kvi_getenv(const char * name)
-{
-	return getenv(name);
-}
-
-#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
-	#define kvi_setenv(__name,__value) SetEnvironmentVariable(__name,__value)
-	#define kvi_unsetenv(__name) SetEnvironmentVariable(__name,NULL)
-#else
-	#ifdef _KVI_ENV_CPP_
-		/**
-		* \brief Sets environment variable
-		* \param name The name of the variable to set
-		* \param value The value of the variable
-		* \return bool
-		*/
-		KVILIB_API bool kvi_setenv(const char * name, const char * value);
-
-		/**
-		* \brief Unsets environment variable
-		* \param name The name of the variable to set
-		* \return void
-		*/
-		KVILIB_API void kvi_unsetenv(const char * name);
-	#else
-		/**
-		* \brief Sets environment variable
-		* \param name The name of the variable to set
-		* \param value The value of the variable
-		* \return bool
-		*/
-		KVILIB_API extern bool kvi_setenv(const char * name, const char * value);
-
-		/**
-		* \brief Unsets environment variable
-		* \param name The name of the variable to set
-		* \return void
-		*/
-		KVILIB_API extern void kvi_unsetenv(const char * name);
-	#endif
-#endif
-
-
-#endif //_KVI_ENV_H_
diff --git a/src/kvilib/system/kvi_process.h b/src/kvilib/system/kvi_process.h
deleted file mode 100644
index d3d1affc3..000000000
--- a/src/kvilib/system/kvi_process.h
+++ /dev/null
@@ -1,39 +0,0 @@
-#ifndef _KVI_PROCESS_H_
-#define _KVI_PROCESS_H_
-//=============================================================================
-//
-//   File : kvi_process.h
-//   Creation date : Tue Jan 30 2007 04:05:41 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_process.h
-* \author Szymon Stefanek
-* \brief A simple name redefinition
-*
-* \def KviProcess Defines KviProcess as QProcess
-*/
-#include "kvi_settings.h"
-
-#include <QProcess>
-#define KviProcess QProcess
-
-#endif //_KVI_PROCESS_H_
diff --git a/src/kvilib/system/kvi_stdarg.h b/src/kvilib/system/kvi_stdarg.h
index 6d5f5ed86..6421c8db6 100644
--- a/src/kvilib/system/kvi_stdarg.h
+++ b/src/kvilib/system/kvi_stdarg.h
@@ -7,7 +7,7 @@
 //   Creation date : Sat Jan 03 2004 02:08:14 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2004-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2004-2010 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
diff --git a/src/kvilib/tal/kvi_tal_application.cpp b/src/kvilib/tal/kvi_tal_application.cpp
index 55e07658b..5cf1178ae 100644
--- a/src/kvilib/tal/kvi_tal_application.cpp
+++ b/src/kvilib/tal/kvi_tal_application.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Sun Aug 12 2001 04:34:21 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-2010 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
diff --git a/src/kvilib/tal/kvi_tal_application.h b/src/kvilib/tal/kvi_tal_application.h
index 8e7ea7af4..a915d5b79 100644
--- a/src/kvilib/tal/kvi_tal_application.h
+++ b/src/kvilib/tal/kvi_tal_application.h
@@ -6,7 +6,7 @@
 //   Creation date : Sun Jun 18 2000 12:53:08 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
diff --git a/src/kvilib/tal/kvi_tal_filedialog.cpp b/src/kvilib/tal/kvi_tal_filedialog.cpp
index 2fe3c9735..7403e6e60 100644
--- a/src/kvilib/tal/kvi_tal_filedialog.cpp
+++ b/src/kvilib/tal/kvi_tal_filedialog.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Thu Sep 11 2003 04:09:24 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2003-2010 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
diff --git a/src/kvilib/tal/kvi_tal_filedialog.h b/src/kvilib/tal/kvi_tal_filedialog.h
index 4a0961c09..19c51013a 100644
--- a/src/kvilib/tal/kvi_tal_filedialog.h
+++ b/src/kvilib/tal/kvi_tal_filedialog.h
@@ -7,7 +7,7 @@
 //   Creation date : Thu Sep 11 2003 04:41:08 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2003-2010 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
diff --git a/src/kvilib/tal/kvi_tal_groupbox.cpp b/src/kvilib/tal/kvi_tal_groupbox.cpp
index 75f2519be..019632ddb 100644
--- a/src/kvilib/tal/kvi_tal_groupbox.cpp
+++ b/src/kvilib/tal/kvi_tal_groupbox.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Mon Jan 22 2007 11:25:08 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2007-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2007-2010 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
diff --git a/src/kvilib/tal/kvi_tal_groupbox.h b/src/kvilib/tal/kvi_tal_groupbox.h
index cd8a31cdd..b1a01b8e8 100644
--- a/src/kvilib/tal/kvi_tal_groupbox.h
+++ b/src/kvilib/tal/kvi_tal_groupbox.h
@@ -7,7 +7,7 @@
 //   Creation date : Mon Jan 22 2007 11:25:08 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2007-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2007-2010 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
diff --git a/src/kvilib/tal/kvi_tal_mainwindow.cpp b/src/kvilib/tal/kvi_tal_mainwindow.cpp
index 37306a619..779ce060d 100644
--- a/src/kvilib/tal/kvi_tal_mainwindow.cpp
+++ b/src/kvilib/tal/kvi_tal_mainwindow.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Sun Aug 12 2001 04:40:24 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-2010 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
diff --git a/src/kvilib/tal/kvi_tal_mainwindow.h b/src/kvilib/tal/kvi_tal_mainwindow.h
index a5b1ff7dd..834e8101e 100644
--- a/src/kvilib/tal/kvi_tal_mainwindow.h
+++ b/src/kvilib/tal/kvi_tal_mainwindow.h
@@ -6,7 +6,7 @@
 //   Creation date : Sun Aug 12 2001 04:41:08 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-2010 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
diff --git a/src/kvilib/tal/kvi_tal_menubar.cpp b/src/kvilib/tal/kvi_tal_menubar.cpp
index 54d9cd8ba..8580bba6c 100644
--- a/src/kvilib/tal/kvi_tal_menubar.cpp
+++ b/src/kvilib/tal/kvi_tal_menubar.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Sun Aug 12 06:35:18 2001 GMT 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-2010 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
diff --git a/src/kvilib/tal/kvi_tal_menubar.h b/src/kvilib/tal/kvi_tal_menubar.h
index 9f5200553..6415f0aa3 100644
--- a/src/kvilib/tal/kvi_tal_menubar.h
+++ b/src/kvilib/tal/kvi_tal_menubar.h
@@ -6,7 +6,7 @@
 //   Creation date : Sun Aug 12 06:35:15 2001 GMT 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-2010 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
diff --git a/src/kvilib/tal/kvi_tal_popupmenu.h b/src/kvilib/tal/kvi_tal_popupmenu.h
index 644b6fa6d..e218287af 100644
--- a/src/kvilib/tal/kvi_tal_popupmenu.h
+++ b/src/kvilib/tal/kvi_tal_popupmenu.h
@@ -25,7 +25,7 @@
 //
 //=============================================================================
 #include "kvi_settings.h"
-#include "kvi_qstring.h"
+#include "KviQString.h"
 
 #include <QMenu>
 #include <QHash>
diff --git a/src/kvilib/tal/kvi_tal_tablewidget.cpp b/src/kvilib/tal/kvi_tal_tablewidget.cpp
index e14448117..21a6dca96 100644
--- a/src/kvilib/tal/kvi_tal_tablewidget.cpp
+++ b/src/kvilib/tal/kvi_tal_tablewidget.cpp
@@ -25,7 +25,7 @@
 
 #include "kvi_tal_tablewidget.h"
 /*
-#include "kvi_pointerhashtable.h"
+#include "KviPointerHashTable.h"
 
 #include <QPainter>
 #include <QStyle>
diff --git a/src/kvilib/tal/kvi_tal_tablewidget.h b/src/kvilib/tal/kvi_tal_tablewidget.h
index a1a3f0cbd..42a1ed494 100644
--- a/src/kvilib/tal/kvi_tal_tablewidget.h
+++ b/src/kvilib/tal/kvi_tal_tablewidget.h
@@ -26,7 +26,7 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_qstring.h"
+#include "KviQString.h"
 
 #include <QTableWidget>
 #include <QHeaderView>
diff --git a/src/kvilib/tal/kvi_tal_toolbar.cpp b/src/kvilib/tal/kvi_tal_toolbar.cpp
index acb7103ad..1d465ae4d 100644
--- a/src/kvilib/tal/kvi_tal_toolbar.cpp
+++ b/src/kvilib/tal/kvi_tal_toolbar.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Mon Aug 13 05:05:45 2001 GMT 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-2010 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
diff --git a/src/kvilib/tal/kvi_tal_toolbar.h b/src/kvilib/tal/kvi_tal_toolbar.h
index 79f111b3f..70115714f 100644
--- a/src/kvilib/tal/kvi_tal_toolbar.h
+++ b/src/kvilib/tal/kvi_tal_toolbar.h
@@ -6,7 +6,7 @@
 //   Creation date : Mon Aug 13 05:05:44 2001 GMT 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-2010 Szymon Stefanek (pragma at kvirc dot net)
 //   Copyright (C) 2008 Elvio Basello (hellvis69 at netsons dot org)
 //
 //   This program is FREE software. You can redistribute it and/or
diff --git a/src/kvilib/tal/kvi_tal_wizard.cpp b/src/kvilib/tal/kvi_tal_wizard.cpp
index d9d9b0822..e72078395 100644
--- a/src/kvilib/tal/kvi_tal_wizard.cpp
+++ b/src/kvilib/tal/kvi_tal_wizard.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Tue Feb 06 2007 14:35:08 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2007-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2007-2010 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
@@ -24,8 +24,8 @@
 
 #include "kvi_tal_wizard.h"
 #include "kvi_tal_hbox.h"
-#include "kvi_pointerlist.h"
-#include "kvi_locale.h"
+#include "KviPointerList.h"
+#include "KviLocale.h"
 
 #include <QShowEvent>
 #include <QLabel>
diff --git a/src/kvilib/tal/kvi_tal_wizard.h b/src/kvilib/tal/kvi_tal_wizard.h
index 573813cd0..0cba628d5 100644
--- a/src/kvilib/tal/kvi_tal_wizard.h
+++ b/src/kvilib/tal/kvi_tal_wizard.h
@@ -7,7 +7,7 @@
 //   Creation date : Tue Feb 06 2007 14:35:08 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2007-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2007-2010 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
diff --git a/src/kvirc/kernel/kvi_action.cpp b/src/kvirc/kernel/kvi_action.cpp
index 42cc4ec61..427b55385 100644
--- a/src/kvirc/kernel/kvi_action.cpp
+++ b/src/kvirc/kernel/kvi_action.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Sun 21 Nov 2004 03:36:34 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC Client distribution
-//   Copyright (C) 2004-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2004-2010 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
diff --git a/src/kvirc/kernel/kvi_action.h b/src/kvirc/kernel/kvi_action.h
index 5ca659584..e21af1caa 100644
--- a/src/kvirc/kernel/kvi_action.h
+++ b/src/kvirc/kernel/kvi_action.h
@@ -31,7 +31,7 @@
 */
 
 #include "kvi_settings.h"
-#include "kvi_pointerlist.h"
+#include "KviPointerList.h"
 
 #include <QObject>
 
diff --git a/src/kvirc/kernel/kvi_actionmanager.cpp b/src/kvirc/kernel/kvi_actionmanager.cpp
index 77108763a..4b6803b50 100644
--- a/src/kvirc/kernel/kvi_actionmanager.cpp
+++ b/src/kvirc/kernel/kvi_actionmanager.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Sun 21 Nov 2004 03:37:57 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC Client distribution
-//   Copyright (C) 2004-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2004-2010 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
@@ -28,10 +28,10 @@
 #include "kvi_customtoolbar.h"
 #include "kvi_customtoolbarmanager.h"
 #include "kvi_app.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_kvs_useraction.h"
-#include "kvi_config.h"
-#include "kvi_qstring.h"
+#include "KviConfigurationFile.h"
+#include "KviQString.h"
 #include "kvi_frame.h"
 
 KviActionManager * KviActionManager::m_pInstance = 0;
@@ -93,9 +93,9 @@ KviActionManager::~KviActionManager()
 
 void KviActionManager::load(const QString &szFileName)
 {
-	KviConfig cfg(szFileName,KviConfig::Read);
+	KviConfigurationFile cfg(szFileName,KviConfigurationFile::Read);
 
-	KviConfigIterator it(*(cfg.dict()));
+	KviConfigurationFileIterator it(*(cfg.dict()));
 	while(it.current())
 	{
 		cfg.setGroup(it.currentKey());
@@ -108,7 +108,7 @@ void KviActionManager::load(const QString &szFileName)
 
 void KviActionManager::save(const QString &szFileName)
 {
-	KviConfig cfg(szFileName,KviConfig::Write);
+	KviConfigurationFile cfg(szFileName,KviConfigurationFile::Write);
 	cfg.clear();
 
 	KviPointerHashTableIterator<QString,KviAction> it(*m_pActions);
diff --git a/src/kvirc/kernel/kvi_actionmanager.h b/src/kvirc/kernel/kvi_actionmanager.h
index 387d9eae9..ad3dca071 100644
--- a/src/kvirc/kernel/kvi_actionmanager.h
+++ b/src/kvirc/kernel/kvi_actionmanager.h
@@ -6,7 +6,7 @@
 //   Creation date : Sun 21 Nov 2004 03:37:57 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC Client distribution
-//   Copyright (C) 2004-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2004-2010 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
@@ -26,7 +26,7 @@
 
 #include "kvi_settings.h"
 #include "kvi_action.h"
-#include "kvi_pointerhashtable.h"
+#include "KviPointerHashTable.h"
 
 #include <QObject>
 
diff --git a/src/kvirc/kernel/kvi_app.cpp b/src/kvirc/kernel/kvi_app.cpp
index e8646de5d..0ae2e5b13 100644
--- a/src/kvirc/kernel/kvi_app.cpp
+++ b/src/kvirc/kernel/kvi_app.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Sun Jun 18 2000 12:39:45 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -32,49 +32,49 @@
 #include "kvi_iconmanager.h"
 #include "kvi_input.h"
 #include "kvi_input_history.h"
-#include "kvi_config.h"
+#include "KviConfigurationFile.h"
 #include "kvi_colorwin.h"
 #include "kvi_window.h"
-#include "kvi_ircserverdb.h"
-#include "kvi_proxydb.h"
+#include "KviIrcServerDataBase.h"
+#include "KviProxyDataBase.h"
 #include "kvi_menubar.h"
 #include "kvi_options.h"
 #include "kvi_sparser.h"
 #include "kvi_modulemanager.h"
-#include "kvi_mediatype.h"
-#include "kvi_regusersdb.h"
-#include "kvi_thread.h"
-#include "kvi_sharedfiles.h"
+#include "KviMediaType.h"
+#include "KviRegisteredUserDataBase.h"
+#include "KviThread.h"
+#include "KviSharedFilesManager.h"
 #include "kvi_confignames.h"
 #include "kvi_windowlist.h"
 #include "kvi_defaults.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_out.h"
 #include "kvi_splash.h"
-#include "kvi_nickserv.h"
-#include "kvi_identityprofile.h"
+#include "KviNickServRuleSet.h"
+#include "KviIdentityProfile.h"
 #include "kvi_defaultscript.h"
 #include "kvi_xlib.h"
 #include "kvi_texticonmanager.h"
 #include "kvi_texticonwin.h"
 #include "kvi_historywin.h"
 #include "kvi_ctcppagedialog.h"
-#include "kvi_regchan.h"
+#include "KviRegisteredChannel.h"
 #include "kvi_moduleextension.h"
 #include "kvi_internalcmd.h"
 #include "kvi_filetransfer.h"
-#include "kvi_mirccntrl.h"
+#include "KviMircCntrl.h"
 #include "kvi_ircurl.h"
-#include "kvi_avatarcache.h"
+#include "KviAvatarCache.h"
 #include "kvi_actionmanager.h"
 #include "kvi_customtoolbarmanager.h"
-#include "kvi_fileutils.h"
-#include "kvi_time.h"
-#include "kvi_stringconversion.h"
-#include "kvi_useridentity.h"
+#include "KviFileUtils.h"
+#include "KviTimeUtils.h"
+#include "KviStringConversion.h"
+#include "KviUserIdentity.h"
 #include "kvi_ircview.h"
-#include "kvi_env.h"
-#include "kvi_animatedpixmapcache.h"
+#include "KviEnvironment.h"
+#include "KviAnimatedPixmapCache.h"
 #include "kvi_kvs.h"
 #include "kvi_kvs_script.h"
 #include "kvi_kvs_popupmanager.h"
@@ -82,7 +82,7 @@
 #include "kvi_kvs_object_controller.h"
 #include "kvi_kvs_eventtriggers.h"
 #include "kvi_sourcesdate.h"
-#include "kvi_pointerhashtable.h"
+#include "KviPointerHashTable.h"
 #include "kvi_tal_popupmenu.h"
 
 #ifndef COMPILE_NO_IPC
@@ -130,7 +130,7 @@ DO NOT REMOVE THEM EVEN IF THEY ARE DEFINED ALSO IN kvi_app.h
 // Global application pointer
 KVIRC_API KviApp                        * g_pApp                        = 0;
 
-KviConfig                               * g_pWinPropertiesConfig        = 0;
+KviConfigurationFile                               * g_pWinPropertiesConfig        = 0;
 KVIRC_API KviServerDataBase             * g_pServerDataBase             = 0;
 KVIRC_API KviProxyDataBase              * g_pProxyDataBase              = 0;
 
@@ -170,7 +170,7 @@ QPixmap                                 * g_pActivityMeterPixmap        = 0;
 #endif
 
 #ifdef COMPILE_CRYPT_SUPPORT
-	#include "kvi_crypt.h"
+	#include "KviCryptEngine.h"
 	// global crypt engine manager
 	KVIRC_API KviCryptEngineManager * g_pCryptEngineManager = 0;
 #endif
@@ -189,7 +189,7 @@ KviApp::KviApp(int &argc,char ** argv)
 	// Disable the native menubar on MacOSX as in Qt 4.6 it's quite buggy and
 	// *very* often crashes in QMenuBar::macUpdateMenuBar()->QAction::isVisible().
 	// FIXME: Check it with later Qt versions
-	kvi_setenv("QT_MAC_NO_NATIVE_MENUBAR","1");
+	KviEnvironment::setVariable("QT_MAC_NO_NATIVE_MENUBAR","1");
 #endif //COMPILE_ON_MAC
 
 	// Ok...everything begins here
@@ -358,7 +358,7 @@ void KviApp::setup()
 
 	// Load the win properties config
 	getLocalKvircDirectory(szTmp,Config,KVI_CONFIGFILE_WINPROPERTIES);
-	g_pWinPropertiesConfig = new KviConfig(szTmp,KviConfig::ReadWrite);
+	g_pWinPropertiesConfig = new KviConfigurationFile(szTmp,KviConfigurationFile::ReadWrite);
 
 	KVI_SPLASH_SET_PROGRESS(50)
 
@@ -930,7 +930,7 @@ void KviApp::ipcMessage(char * pcMessage)
 		return;
 	if(_OUTPUT_VERBOSE)
 	{
-		KviStr szCmd = pcMessage;
+		KviCString szCmd = pcMessage;
 		if(szCmd.len() > 30)
 			szCmd.cutRight(szCmd.len() - 30);
 		int iIdx = szCmd.findFirstIdx('\n');
@@ -1303,7 +1303,7 @@ void KviApp::loadRecentEntries()
 {
 	QString szTmp;
 	getLocalKvircDirectory(szTmp,Config,KVI_CONFIGFILE_RECENT);
-	KviConfig cfg(szTmp,KviConfig::Read);
+	KviConfigurationFile cfg(szTmp,KviConfigurationFile::Read);
 	*g_pRecentTopicList = cfg.readStringListEntry("RecentTopicList",QStringList());
 	//*g_pBookmarkList = cfg.readStringListEntry("Bookmarks",QStringList());
 }
@@ -1312,7 +1312,7 @@ void KviApp::saveRecentEntries()
 {
 	QString szTmp;
 	getLocalKvircDirectory(szTmp,Config,KVI_CONFIGFILE_RECENT);
-	KviConfig cfg(szTmp,KviConfig::Write);
+	KviConfigurationFile cfg(szTmp,KviConfigurationFile::Write);
 	cfg.writeEntry("RecentTopicList",*g_pRecentTopicList);
 	//cfg.writeEntry("Bookmarks",*g_pBookmarkList);
 }
diff --git a/src/kvirc/kernel/kvi_app.h b/src/kvirc/kernel/kvi_app.h
index 19ec7caa2..c034b0cd3 100644
--- a/src/kvirc/kernel/kvi_app.h
+++ b/src/kvirc/kernel/kvi_app.h
@@ -7,7 +7,7 @@
 //   Creation date : Sun Jun 18 2000 12:40:00 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -26,12 +26,12 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_string.h"
-#include "kvi_qstring.h"
+#include "KviCString.h"
+#include "KviQString.h"
 #include "kvi_tal_application.h"
-#include "kvi_pointerlist.h"
-#include "kvi_time.h"
-#include "kvi_pointerhashtable.h" // ?
+#include "KviPointerList.h"
+#include "KviTimeUtils.h"
+#include "KviPointerHashTable.h" // ?
 
 #include <QFont>
 #include <QStringList>
@@ -56,7 +56,7 @@
 class KviTalPopupMenu;
 class KviTalListBox;
 class KviConsole;
-class KviConfig;
+class KviConfigurationFile;
 class KviRegisteredUser;
 class KviIrcConnection;
 class KviServerDataBase;
@@ -136,7 +136,7 @@ public:
 	// setup stuff (accessed from kvi_main.cpp: consider private othwerise)
 	QString	                                   m_szConfigFile;        // setup
 	bool                                       m_bCreateConfig;      // setup
-	KviStr                                     m_szExecAfterStartup;
+	KviCString                                     m_szExecAfterStartup;
 	bool                                       m_bShowSplashScreen;
 public:
 	// FIXME: "Plugins" and "ConfigPlugins" should become "Modules" and "ConfigModules"
@@ -239,10 +239,10 @@ public:
 	bool findSmallIcon(QString &szRetPath,const QString &filename);
 	// tries to map the full path filename to one of the KVIrc's mapped directories
 	// if it doesn't succeed it just returns the complete filename in szRetPath
-	//bool mapImageFile(KviStr &szRetPath,const char * filename);
+	//bool mapImageFile(KviCString &szRetPath,const char * filename);
 	bool mapImageFile(QString &szRetPath,const QString &filename);
 
-	//void getDefaultDccSaveFilePath(KviStr &path,const char *filename);
+	//void getDefaultDccSaveFilePath(KviCString &path,const char *filename);
 	void completeDirectory(const QString &word,KviPointerList<QString> * matches);
 	//
 	// Returns a config path suitable for reading (at least)
diff --git a/src/kvirc/kernel/kvi_app_fs.cpp b/src/kvirc/kernel/kvi_app_fs.cpp
index 3d40e19f8..c312c0073 100644
--- a/src/kvirc/kernel/kvi_app_fs.cpp
+++ b/src/kvirc/kernel/kvi_app_fs.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Thu Dec 24 1998 04:05:26 by Szymon Stefanek
 //
 //   This file is part of the Kvirc irc client distribution
-//   Copyright (C) 1998-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 1998-2010 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
@@ -25,11 +25,11 @@
 
 #include "kvi_debug.h"
 #include "kvi_app.h"
-#include "kvi_locale.h"
-#include "kvi_fileutils.h"
-#include "kvi_mediatype.h"
-#include "kvi_env.h"
-#include "kvi_time.h"
+#include "KviLocale.h"
+#include "KviFileUtils.h"
+#include "KviMediaType.h"
+#include "KviEnvironment.h"
+#include "KviTimeUtils.h"
 #include "kvi_options.h"
 #include "kvi_defaults.h"
 #include "kvi_iconmanager.h"
@@ -331,7 +331,7 @@ bool KviApp::findImageInImageSearchPath(QString &szRetPath,const QString &filena
 static KviApp::KvircSubdir pics_localsubdirs[2]={ KviApp::Pics, KviApp::Avatars };
 static KviApp::KvircSubdir pics_globalsubdirs[2]={ KviApp::Pics, KviApp::Avatars };
 
-/*bool KviApp::mapImageFile(KviStr &szRetPath,const char * filename)
+/*bool KviApp::mapImageFile(KviCString &szRetPath,const char * filename)
 {
 	QString buff;
 	bool ret=mapImageFile(buff,filename);
diff --git a/src/kvirc/kernel/kvi_app_setup.cpp b/src/kvirc/kernel/kvi_app_setup.cpp
index 8ee06e040..d0889f62b 100644
--- a/src/kvirc/kernel/kvi_app_setup.cpp
+++ b/src/kvirc/kernel/kvi_app_setup.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Fri Apr 2 1999 02:38:05 by Szymon Stefanek
 //
 //   This file is part of the Kvirc irc client distribution
-//   Copyright (C) 1999-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 1999-2010 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
@@ -32,12 +32,12 @@
 #include "kvi_window.h"
 #include "kvi_frame.h"
 #include "kvi_app.h"
-#include "kvi_fileutils.h"
-#include "kvi_locale.h"
+#include "KviFileUtils.h"
+#include "KviLocale.h"
 #include "kvi_msgbox.h"
 #include "kvi_sourcesdate.h"
 #include "kvi_iconmanager.h"
-#include "kvi_config.h"
+#include "KviConfigurationFile.h"
 
 #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
 	#include <shlwapi.h>
@@ -315,8 +315,8 @@ bool KviApp::checkUriAssociations(const char * pcProto)
 	pcBuffer = (char*)malloc(len*sizeof(char));
 	HKEY hKey;
 
-	KviStr szStoredKey = pcProto;
-	KviStr szKey = szStoredKey;
+	KviCString szStoredKey = pcProto;
+	KviCString szKey = szStoredKey;
 
 	len = QUERY_BUFFER;
 	if(RegOpenKeyEx(HKEY_CLASSES_ROOT,szKey,0,KEY_READ,&hKey) != ERROR_SUCCESS)
@@ -423,8 +423,8 @@ void KviApp::setupUriAssociations(const char * pcProto)
 	HKEY hKey;
 	DWORD err;
 
-	KviStr szStoredKey = pcProto;
-	KviStr szKey = szStoredKey;
+	KviCString szStoredKey = pcProto;
+	KviCString szKey = szStoredKey;
 
 	QByteArray tmp;
 	QString szAppPath = applicationFilePath();
@@ -671,7 +671,7 @@ bool KviApp::findLocalKvircDirectory()
 	}
 
 	//If the file exists, read the first non empty line.
-	KviConfig cfgx(szF,KviConfig::Read);
+	KviConfigurationFile cfgx(szF,KviConfigurationFile::Read);
 
 	cfgx.setGroup("Main");
 	m_szLocalKvircDir = cfgx.readEntry("LocalKvircDirectory","");
@@ -848,7 +848,7 @@ void KviApp::saveKvircDirectory()
 	}
 	//FIXME: LOCALE BROKEN!!!
 
-	KviConfig cfgx(szF,KviConfig::Write);
+	KviConfigurationFile cfgx(szF,KviConfigurationFile::Write);
 
 	cfgx.setGroup("Main");
 	cfgx.writeEntry("LocalKvircDirectory",m_szLocalKvircDir);
diff --git a/src/kvirc/kernel/kvi_asynchronousconnectiondata.cpp b/src/kvirc/kernel/kvi_asynchronousconnectiondata.cpp
index 4dc5966d5..9a208fd23 100644
--- a/src/kvirc/kernel/kvi_asynchronousconnectiondata.cpp
+++ b/src/kvirc/kernel/kvi_asynchronousconnectiondata.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Sun 04 Jul 2004 16:22:25 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2004-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2004-2010 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
diff --git a/src/kvirc/kernel/kvi_asynchronousconnectiondata.h b/src/kvirc/kernel/kvi_asynchronousconnectiondata.h
index f6cfa64d8..c4ede9212 100644
--- a/src/kvirc/kernel/kvi_asynchronousconnectiondata.h
+++ b/src/kvirc/kernel/kvi_asynchronousconnectiondata.h
@@ -6,7 +6,7 @@
 //   Creation date : Sun 04 Jul 2004 16:22:25 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2004-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2004-2010 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
@@ -26,9 +26,9 @@
 
 
 #include "kvi_settings.h"
-#include "kvi_qstring.h"
-#include "kvi_heapobject.h"
-#include "kvi_ircserver.h"
+#include "KviQString.h"
+#include "KviHeapObject.h"
+#include "KviIrcServer.h"
 
 class KviAsynchronousConnectionData : public KviHeapObject
 {
diff --git a/src/kvirc/kernel/kvi_coreactionnames.h b/src/kvirc/kernel/kvi_coreactionnames.h
index 1b0f39e47..b333a3872 100644
--- a/src/kvirc/kernel/kvi_coreactionnames.h
+++ b/src/kvirc/kernel/kvi_coreactionnames.h
@@ -6,7 +6,7 @@
 //   Creation date : Mon 22 Nov 2004 02:30:47 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC Client distribution
-//   Copyright (C) 2004-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2004-2010 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
diff --git a/src/kvirc/kernel/kvi_coreactions.cpp b/src/kvirc/kernel/kvi_coreactions.cpp
index ec8cd50d0..8ce351051 100644
--- a/src/kvirc/kernel/kvi_coreactions.cpp
+++ b/src/kvirc/kernel/kvi_coreactions.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Mon 22 Nov 2004 02:30:47 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC Client distribution
-//   Copyright (C) 2004-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2004-2010 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
@@ -27,7 +27,7 @@
 #include "kvi_coreactions.h"
 #include "kvi_shortcuts.h"
 #include "kvi_frame.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_irccontext.h"
 #include "kvi_iconmanager.h"
 #include "kvi_app.h"
@@ -37,7 +37,7 @@
 #include "kvi_kvs_action.h"
 #include "kvi_mdimanager.h"
 #include "kvi_irctoolbar.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_ircurl.h"
 #include "kvi_ircconnection.h"
 #include "kvi_ircconnectionuserinfo.h"
@@ -891,7 +891,7 @@ void KviConnectToServerAction::popupActivated(int id)
 		{
 			KviKvsScript::run("option stringlistRecentServers",c);
 		} else {
-			KviStr szCommand;
+			KviCString szCommand;
 			QString szText = szItemText;
 			if(KviIrcUrl::parse(szText.toUtf8().data(),szCommand,KVI_IRCURL_CONTEXT_FIRSTFREE))
 			{
diff --git a/src/kvirc/kernel/kvi_coreactions.h b/src/kvirc/kernel/kvi_coreactions.h
index 272970e7d..9fc78b40d 100644
--- a/src/kvirc/kernel/kvi_coreactions.h
+++ b/src/kvirc/kernel/kvi_coreactions.h
@@ -6,7 +6,7 @@
 //   Creation date : Mon 22 Nov 2004 02:30:47 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC Client distribution
-//   Copyright (C) 2004-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2004-2010 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
@@ -27,7 +27,7 @@
 #include "kvi_settings.h"
 #include "kvi_action.h"
 #include "kvi_kvs_action.h"
-#include "kvi_pointerlist.h"
+#include "KviPointerList.h"
 
 class KviConnectAction : public KviAction
 {
diff --git a/src/kvirc/kernel/kvi_customtoolbardescriptor.cpp b/src/kvirc/kernel/kvi_customtoolbardescriptor.cpp
index 1847d2f3a..0d6245d1b 100644
--- a/src/kvirc/kernel/kvi_customtoolbardescriptor.cpp
+++ b/src/kvirc/kernel/kvi_customtoolbardescriptor.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Sun 05 Dec 2004 18:20:58 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2004-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2004-2010 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
@@ -26,11 +26,11 @@
 
 #include "kvi_customtoolbardescriptor.h"
 #include "kvi_customtoolbar.h"
-#include "kvi_config.h"
+#include "KviConfigurationFile.h"
 #include "kvi_action.h"
 #include "kvi_actionmanager.h"
 #include "kvi_app.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_kvs_script.h"
 #include "kvi_window.h"
 
@@ -181,7 +181,7 @@ void KviCustomToolBarDescriptor::clear()
 	}
 }
 
-bool KviCustomToolBarDescriptor::load(KviConfig * cfg)
+bool KviCustomToolBarDescriptor::load(KviConfigurationFile * cfg)
 {
 	m_pActions->clear();
 	m_szId = cfg->group();
@@ -202,7 +202,7 @@ bool KviCustomToolBarDescriptor::load(KviConfig * cfg)
 	return true;
 }
 
-void KviCustomToolBarDescriptor::save(KviConfig * cfg)
+void KviCustomToolBarDescriptor::save(KviConfigurationFile * cfg)
 {
 	cfg->setGroup(m_szId);
 	cfg->writeEntry("Label",m_pLabelScript->code());
diff --git a/src/kvirc/kernel/kvi_customtoolbardescriptor.h b/src/kvirc/kernel/kvi_customtoolbardescriptor.h
index 15b4c5b9d..a10545402 100644
--- a/src/kvirc/kernel/kvi_customtoolbardescriptor.h
+++ b/src/kvirc/kernel/kvi_customtoolbardescriptor.h
@@ -6,7 +6,7 @@
 //   Creation date : Sun 05 Dec 2004 18:20:58 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2004-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2004-2010 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
@@ -25,11 +25,11 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_qstring.h"
-#include "kvi_pointerlist.h"
+#include "KviQString.h"
+#include "KviPointerList.h"
 
 class KviCustomToolBar;
-class KviConfig;
+class KviConfigurationFile;
 class KviKvsScript;
 
 
@@ -69,8 +69,8 @@ public:
 protected:
 	void createLabelScript(const QString &szNewLabelCode);
 	void fillToolBar();
-	bool load(KviConfig * cfg);
-	void save(KviConfig * cfg);
+	bool load(KviConfigurationFile * cfg);
+	void save(KviConfigurationFile * cfg);
 	void registerToolBar(KviCustomToolBar * t);
 	void unregisterToolBar(KviCustomToolBar * t);
 };
diff --git a/src/kvirc/kernel/kvi_customtoolbarmanager.cpp b/src/kvirc/kernel/kvi_customtoolbarmanager.cpp
index 2e14f57f9..e827ec9d8 100644
--- a/src/kvirc/kernel/kvi_customtoolbarmanager.cpp
+++ b/src/kvirc/kernel/kvi_customtoolbarmanager.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Sun 05 Dec 2004 18:20:18 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2004-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2004-2010 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
@@ -26,8 +26,8 @@
 
 #include "kvi_customtoolbarmanager.h"
 #include "kvi_customtoolbardescriptor.h"
-#include "kvi_config.h"
-#include "kvi_locale.h"
+#include "KviConfigurationFile.h"
+#include "KviLocale.h"
 
 KviCustomToolBarManager * KviCustomToolBarManager::m_pInstance = 0;
 
@@ -184,9 +184,9 @@ void KviCustomToolBarManager::updateVisibleToolBars()
 
 void KviCustomToolBarManager::load(const QString &szFileName)
 {
-	KviConfig cfg(szFileName,KviConfig::Read);
+	KviConfigurationFile cfg(szFileName,KviConfigurationFile::Read);
 
-	KviConfigIterator it(*(cfg.dict()));
+	KviConfigurationFileIterator it(*(cfg.dict()));
 	while(it.current())
 	{
 		cfg.setGroup(it.currentKey());
@@ -200,7 +200,7 @@ void KviCustomToolBarManager::load(const QString &szFileName)
 
 void KviCustomToolBarManager::save(const QString &szFileName)
 {
-	KviConfig cfg(szFileName,KviConfig::Write);
+	KviConfigurationFile cfg(szFileName,KviConfigurationFile::Write);
 	KviPointerHashTableIterator<QString,KviCustomToolBarDescriptor> it(*m_pDescriptors);
 	while(KviCustomToolBarDescriptor * d = it.current())
 	{
diff --git a/src/kvirc/kernel/kvi_customtoolbarmanager.h b/src/kvirc/kernel/kvi_customtoolbarmanager.h
index 5b8d6f665..bc3c76c46 100644
--- a/src/kvirc/kernel/kvi_customtoolbarmanager.h
+++ b/src/kvirc/kernel/kvi_customtoolbarmanager.h
@@ -6,7 +6,7 @@
 //   Creation date : Sun 05 Dec 2004 18:20:18 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2004-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2004-2010 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
@@ -25,7 +25,7 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_pointerhashtable.h"
+#include "KviPointerHashTable.h"
 
 #ifdef COMPILE_ON_WINDOWS
 	#include "kvi_customtoolbardescriptor.h"
diff --git a/src/kvirc/kernel/kvi_defaultscript.cpp b/src/kvirc/kernel/kvi_defaultscript.cpp
index c34efbd82..38cd1bd1b 100644
--- a/src/kvirc/kernel/kvi_defaultscript.cpp
+++ b/src/kvirc/kernel/kvi_defaultscript.cpp
@@ -26,9 +26,9 @@
 
 #include "kvi_app.h"
 #include "kvi_kvs.h"
-#include "kvi_config.h"
-#include "kvi_locale.h"
-#include "kvi_miscutils.h"
+#include "KviConfigurationFile.h"
+#include "KviLocale.h"
+#include "KviMiscUtils.h"
 #include "kvi_actionmanager.h"
 #include "kvi_iconmanager.h"
 #include "kvi_customtoolbarmanager.h"
@@ -84,7 +84,7 @@ bool KviDefaultScriptManager::isDefscriptUpToDate()
 {
 	QString szConfig, szTmp;
 	g_pApp->getGlobalKvircDirectory(szConfig,KviApp::DefScript,"default.kvc");
-	KviConfig * pCfg = new KviConfig(szConfig,KviConfig::Read);
+	KviConfigurationFile * pCfg = new KviConfigurationFile(szConfig,KviConfigurationFile::Read);
 
 	szTmp = pCfg->readEntry("Date");
 	QDate cfgDate = QDate::fromString(szTmp,"yyyy-MM-dd");
@@ -125,7 +125,7 @@ void KviDefaultScriptManager::restoreInternal()
 {
 	QString szConfig, szTmp;
 	g_pApp->getGlobalKvircDirectory(szConfig,KviApp::DefScript,"default.kvc");
-	KviConfig * pCfg = new KviConfig(szConfig,KviConfig::Read);
+	KviConfigurationFile * pCfg = new KviConfigurationFile(szConfig,KviConfigurationFile::Read);
 
 	m_szDate = pCfg->readEntry("Date");
 
@@ -211,7 +211,7 @@ bool KviDefaultScriptManager::compareVersions(QString & szConfig, QString * pszE
 	if(pszError)
 		*pszError = "";
 
-	KviConfig * pCfg = new KviConfig(szConfig,KviConfig::Read);
+	KviConfigurationFile * pCfg = new KviConfigurationFile(szConfig,KviConfigurationFile::Read);
 
 	szTmp = "Date";
 	szTmp2 = pCfg->readEntry(szTmp);
@@ -266,7 +266,7 @@ bool KviDefaultScriptManager::compareVersions(QString & szConfig, QString * pszE
 
 void KviDefaultScriptManager::load(const QString & szConfigFile)
 {
-	KviConfig cfg(szConfigFile,KviConfig::Read);
+	KviConfigurationFile cfg(szConfigFile,KviConfigurationFile::Read);
 	loadInternal(&cfg);
 }
 
@@ -274,7 +274,7 @@ void KviDefaultScriptManager::load(const QString & szConfigFile)
 	if(__var.isEmpty()) \
 		__var = __default;
 
-void KviDefaultScriptManager::loadInternal(KviConfig * pCfg)
+void KviDefaultScriptManager::loadInternal(KviConfigurationFile * pCfg)
 {
 	QString szTmp;
 	QString szDate = QDate::currentDate().toString("yyyy-MM-dd");
@@ -322,12 +322,12 @@ void KviDefaultScriptManager::loadInternal(KviConfig * pCfg)
 
 void KviDefaultScriptManager::save(const QString & szConfigFile)
 {
-	KviConfig cfg(szConfigFile,KviConfig::Write);
+	KviConfigurationFile cfg(szConfigFile,KviConfigurationFile::Write);
 	cfg.clear();
 	saveInternal(&cfg);
 }
 
-void KviDefaultScriptManager::saveInternal(KviConfig * pCfg)
+void KviDefaultScriptManager::saveInternal(KviConfigurationFile * pCfg)
 {
 	QString szTmp;
 
diff --git a/src/kvirc/kernel/kvi_defaultscript.h b/src/kvirc/kernel/kvi_defaultscript.h
index 318b43b3d..c7c59aaee 100644
--- a/src/kvirc/kernel/kvi_defaultscript.h
+++ b/src/kvirc/kernel/kvi_defaultscript.h
@@ -37,7 +37,7 @@
 
 class QGroupBox;
 class QCheckBox;
-class KviConfig;
+class KviConfigurationFile;
 class KviDefaultScriptDialog;
 
 /**
@@ -150,7 +150,7 @@ private:
 	* \param pCfg The configuration file
 	* \return void
 	*/
-	void loadInternal(KviConfig * pCfg);
+	void loadInternal(KviConfigurationFile * pCfg);
 
 	/**
 	* \brief Saves the configuration of the default script
@@ -159,7 +159,7 @@ private:
 	* \param pCfg The configuration file
 	* \return void
 	*/
-	void saveInternal(KviConfig * pCfg);
+	void saveInternal(KviConfigurationFile * pCfg);
 
 	/**
 	* \brief Compares versions between global and personal data
diff --git a/src/kvirc/kernel/kvi_filetransfer.cpp b/src/kvirc/kernel/kvi_filetransfer.cpp
index eb93dd61f..1bb617cbf 100644
--- a/src/kvirc/kernel/kvi_filetransfer.cpp
+++ b/src/kvirc/kernel/kvi_filetransfer.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Mon Apr 21 22:14:31 2003 GMT by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2003-2010 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
diff --git a/src/kvirc/kernel/kvi_filetransfer.h b/src/kvirc/kernel/kvi_filetransfer.h
index 4b88391be..5ae77cbc2 100644
--- a/src/kvirc/kernel/kvi_filetransfer.h
+++ b/src/kvirc/kernel/kvi_filetransfer.h
@@ -7,7 +7,7 @@
 //   Creation date : Mon Apr 21 22:14:31 2003 GMT by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2003-2010 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
@@ -26,7 +26,7 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_pointerlist.h"
+#include "KviPointerList.h"
 #include "kvi_tal_tablewidget.h"
 
 #include <QObject>
diff --git a/src/kvirc/kernel/kvi_htmlgenerator.cpp b/src/kvirc/kernel/kvi_htmlgenerator.cpp
index 32e42f44d..ee66f0a81 100644
--- a/src/kvirc/kernel/kvi_htmlgenerator.cpp
+++ b/src/kvirc/kernel/kvi_htmlgenerator.cpp
@@ -25,7 +25,7 @@
 #include "kvi_htmlgenerator.h"
 
 #include "kvi_iconmanager.h"
-#include "kvi_mirccntrl.h"
+#include "KviMircCntrl.h"
 #include "kvi_options.h"
 #include "kvi_texticonmanager.h"
 
diff --git a/src/kvirc/kernel/kvi_iconmanager.cpp b/src/kvirc/kernel/kvi_iconmanager.cpp
index 596bffc61..85202719e 100644
--- a/src/kvirc/kernel/kvi_iconmanager.cpp
+++ b/src/kvirc/kernel/kvi_iconmanager.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Sat Jun 24 2000 14:50:11 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -29,8 +29,8 @@
 #include "kvi_app.h"
 #include "kvi_settings.h"
 #include "kvi_defaults.h"
-#include "kvi_locale.h"
-#include "kvi_fileutils.h"
+#include "KviLocale.h"
+#include "KviFileUtils.h"
 #include "kvi_options.h"
 
 #include <QLayout>
@@ -392,19 +392,19 @@ void KviIconWidget::init()
 	int i;
 	for(i = 0;i < 20;i++)
 	{
-		KviStr tmp(KviStr::Format,"%d",i);
+		KviCString tmp(KviCString::Format,"%d",i);
 		QLabel * l = new QLabel(tmp.ptr(),this);
 		g->addWidget(l,0,i + 1);
 	}
 	for(i = 0;i < rows;i++)
 	{
-		KviStr tmp(KviStr::Format,"%d",i * 20);
+		KviCString tmp(KviCString::Format,"%d",i * 20);
 		QLabel * l = new QLabel(tmp.ptr(),this);
 		g->addWidget(l,i + 1,0);
 	}
 	for(i = 0;i < KVI_NUM_SMALL_ICONS;i++)
 	{
-		KviStr tmp(KviStr::Format,"%d",i);
+		KviCString tmp(KviCString::Format,"%d",i);
 		QLabel * l = new QLabel(this);
 		l->setObjectName(tmp.ptr());
 		l->setPixmap(*(g_pIconManager->getSmallIcon(i)));
@@ -430,7 +430,7 @@ bool KviIconWidget::eventFilter(QObject * o,QEvent *e)
 	{
 		if(o->inherits("QLabel"))
 		{
-			KviStr szName = ((QLabel *)o)->objectName();
+			KviCString szName = ((QLabel *)o)->objectName();
 			bool bOk;
 			int iVal = szName.toInt(&bOk);
 			if(bOk)emit selected(iVal);
@@ -932,7 +932,7 @@ void KviIconManager::cacheCleanup()
 		{
 			// unused since 2 minutes
 			// time to cleanup it...
-			l.append(new KviStr(it.currentKey()));
+			l.append(new KviCString(it.currentKey()));
 		}
 		++it;
 	}
@@ -943,7 +943,7 @@ void KviIconManager::cacheCleanup()
 	}
 */
 /*
-	for(KviStr * p =l.first();p;p = l.next())
+	for(KviCString * p =l.first();p;p = l.next())
 	{
 		m_pCachedImages->remove(p->ptr());
 	}
diff --git a/src/kvirc/kernel/kvi_iconmanager.h b/src/kvirc/kernel/kvi_iconmanager.h
index 1469fb73d..35d9f5b07 100644
--- a/src/kvirc/kernel/kvi_iconmanager.h
+++ b/src/kvirc/kernel/kvi_iconmanager.h
@@ -7,7 +7,7 @@
 //   Creation date : Sat Jun 24 2000 14:49:24 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -26,10 +26,10 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_string.h"
-#include "kvi_avatar.h"
-#include "kvi_time.h"
-#include "kvi_pointerhashtable.h"
+#include "KviCString.h"
+#include "KviAvatar.h"
+#include "KviTimeUtils.h"
+#include "KviPointerHashTable.h"
 
 #include <QPixmap>
 #include <QObject>
diff --git a/src/kvirc/kernel/kvi_internalcmd.cpp b/src/kvirc/kernel/kvi_internalcmd.cpp
index c66e9624f..0adb76c33 100644
--- a/src/kvirc/kernel/kvi_internalcmd.cpp
+++ b/src/kvirc/kernel/kvi_internalcmd.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Sun Aug 13 2000 19:22:45 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
diff --git a/src/kvirc/kernel/kvi_internalcmd.h b/src/kvirc/kernel/kvi_internalcmd.h
index fc53e1857..0fa1639fd 100644
--- a/src/kvirc/kernel/kvi_internalcmd.h
+++ b/src/kvirc/kernel/kvi_internalcmd.h
@@ -6,7 +6,7 @@
 //   Creation date : Sun Aug 13 2000 19:21:12 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
diff --git a/src/kvirc/kernel/kvi_ipc.cpp b/src/kvirc/kernel/kvi_ipc.cpp
index 51a3e93fd..b4f59b491 100644
--- a/src/kvirc/kernel/kvi_ipc.cpp
+++ b/src/kvirc/kernel/kvi_ipc.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Tue Apr 10 2001 15:04:45 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-2010 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
@@ -32,7 +32,7 @@
 
 	#include "kvi_memmove.h"
 	#include "kvi_app.h"
-	#include "kvi_qstring.h"
+	#include "KviQString.h"
 
 #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
 
@@ -62,7 +62,7 @@
 		static Atom kvi_atom_ipc_sentinel_window;
 		static Atom kvi_atom_ipc_remote_command;
 		static Atom kvi_atom_ipc_remote_message;
-		static KviStr kvi_sentinel_id;
+		static KviCString kvi_sentinel_id;
 		static bool g_bIpcAtomsLoaded = false;
 
 		static void kvi_ipcLoadAtoms()
@@ -257,7 +257,7 @@
 					int format;
 					unsigned long nItems,after;
 					unsigned char * data = 0;
-					KviStr szData;
+					KviCString szData;
 					if(XGetWindowProperty(kvi_ipc_get_xdisplay(),winId(),kvi_atom_ipc_remote_command,0,1024,FALSE,XA_STRING,
 						&type,&format,&nItems,&after,&data) == Success)
 					{
diff --git a/src/kvirc/kernel/kvi_ipc.h b/src/kvirc/kernel/kvi_ipc.h
index 1c6f10864..508373f01 100644
--- a/src/kvirc/kernel/kvi_ipc.h
+++ b/src/kvirc/kernel/kvi_ipc.h
@@ -6,7 +6,7 @@
 //   Creation date : Tue Apr 10 2001 15:04:45 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-2010 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
@@ -29,7 +29,7 @@
 
 #ifndef COMPILE_NO_IPC
 
-	#include "kvi_string.h"
+	#include "KviCString.h"
 
 	#include <QWidget>
 
diff --git a/src/kvirc/kernel/kvi_ircconnection.cpp b/src/kvirc/kernel/kvi_ircconnection.cpp
index 58e47bca7..3e4aa040b 100644
--- a/src/kvirc/kernel/kvi_ircconnection.cpp
+++ b/src/kvirc/kernel/kvi_ircconnection.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Mon 03 May 2004 01:45:42 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2004-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2004-2010 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
@@ -38,9 +38,9 @@
 #include "kvi_ircconnectionserverinfo.h"
 #include "kvi_irclink.h"
 #include "kvi_ircsocket.h"
-#include "kvi_locale.h"
-#include "kvi_ircserverdb.h"
-#include "kvi_proxydb.h"
+#include "KviLocale.h"
+#include "KviIrcServerDataBase.h"
+#include "KviProxyDataBase.h"
 #include "kvi_error.h"
 #include "kvi_out.h"
 #include "kvi_options.h"
@@ -49,27 +49,27 @@
 #include "kvi_internalcmd.h"
 #include "kvi_frame.h"
 #include "kvi_mexlinkfilter.h"
-#include "kvi_malloc.h"
+#include "KviMemory.h"
 #include "kvi_memmove.h"
 #include "kvi_debug.h"
 #include "kvi_channel.h"
 #include "kvi_query.h"
 #include "kvi_app.h"
-#include "kvi_databuffer.h"
+#include "KviDataBuffer.h"
 #include "kvi_notifylist.h"
 #include "kvi_dns.h"
 #include "kvi_defaults.h"
 #include "kvi_sparser.h"
 #include "kvi_ircdatastreammonitor.h"
-#include "kvi_databuffer.h"
+#include "KviDataBuffer.h"
 #include "kvi_lagmeter.h"
 #include "kvi_kvs_eventtriggers.h"
 #include "kvi_kvs_script.h"
-#include "kvi_mirccntrl.h"
-#include "kvi_useridentity.h"
-#include "kvi_identityprofile.h"
+#include "KviMircCntrl.h"
+#include "KviUserIdentity.h"
+#include "KviIdentityProfile.h"
 #include "kvi_sasl.h"
-#include "kvi_nickcolors.h"
+#include "KviNickColors.h"
 
 #include <QTimer>
 #include <QTextCodec>
@@ -441,7 +441,7 @@ void KviIrcConnection::handleInitialCapAck()
 		endInitialCapNegotiation();
 }
 
-void KviIrcConnection::handleAuthenticate(KviStr & szAuth)
+void KviIrcConnection::handleAuthenticate(KviCString & szAuth)
 {
 	//SASL
 	if(!m_pStateData->isInsideAuthenticate())
@@ -452,7 +452,7 @@ void KviIrcConnection::handleAuthenticate(KviStr & szAuth)
 	if(szAuth=="+")
 	{
 		//PLAIN
-		KviStr szOut;
+		KviCString szOut;
 		if(KviSASL::plainMethod(szAuth,
 					szOut,
 					szNick,
@@ -465,7 +465,7 @@ void KviIrcConnection::handleAuthenticate(KviStr & szAuth)
 		}
 	} else {
 		//DH-BLOWFISH sasl auth
-		KviStr szOut;
+		KviCString szOut;
 		if(KviSASL::dh_blowfishMethod(szAuth,
 					szOut,
 					szNick,
@@ -1525,7 +1525,7 @@ void KviIrcConnection::loginComplete(const QString & szNickName)
 
 	if(!(m_pStateData->commandToExecAfterConnect().isEmpty()))
 	{
-		KviStr tmp = m_pStateData->commandToExecAfterConnect();
+		KviCString tmp = m_pStateData->commandToExecAfterConnect();
 		KviKvsScript::run(tmp.ptr(),m_pConsole);
 	}
 
@@ -1716,7 +1716,7 @@ void KviIrcConnection::heartbeat(kvi_time_t tNow)
 							console()->output(KVI_OUT_VERBOSE,__tr2qs("Updating away state for channel %Q"),&szChanName);
 						if(lagMeter())
 						{
-							KviStr tmp(KviStr::Format,"WHO %s",encodeText(pOldest->windowName()).data());
+							KviCString tmp(KviCString::Format,"WHO %s",encodeText(pOldest->windowName()).data());
 							lagMeter()->lagCheckRegister(tmp.ptr(),70);
 						}
 						pOldest->setSentSyncWhoRequest();
diff --git a/src/kvirc/kernel/kvi_ircconnection.h b/src/kvirc/kernel/kvi_ircconnection.h
index e0836d38b..b0ce0d4b1 100644
--- a/src/kvirc/kernel/kvi_ircconnection.h
+++ b/src/kvirc/kernel/kvi_ircconnection.h
@@ -6,7 +6,7 @@
 //   Creation date : Mon 03 May 2004 01:45:42 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2004-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2004-2010 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
@@ -31,9 +31,9 @@
 */
 
 #include "kvi_settings.h"
-#include "kvi_qstring.h"
-#include "kvi_pointerlist.h"
-#include "kvi_time.h"
+#include "KviQString.h"
+#include "KviPointerList.h"
+#include "KviTimeUtils.h"
 
 #include <QObject>
 #include <QByteArray>
@@ -66,7 +66,7 @@ class KviNotifyListManager;
 class KviDns;
 class KviUserIdentity;
 class KviIdentityProfileSet;
-class KviStr;
+class KviCString;
 
 
 /**
@@ -745,7 +745,7 @@ protected:
 	* \brief Called when AUTHENTICATE answer is received
 	* \return void
 	*/
-	void handleAuthenticate(KviStr & szResponse);
+	void handleAuthenticate(KviCString & szResponse);
 
 	/**
 	* \brief Called when CAP LS answer is received
diff --git a/src/kvirc/kernel/kvi_ircconnectionantictcpflooddata.cpp b/src/kvirc/kernel/kvi_ircconnectionantictcpflooddata.cpp
index 2a9e1a098..b71d97b65 100644
--- a/src/kvirc/kernel/kvi_ircconnectionantictcpflooddata.cpp
+++ b/src/kvirc/kernel/kvi_ircconnectionantictcpflooddata.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Sat 26 Jun 2004 18:09:42 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2004-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2004-2010 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
diff --git a/src/kvirc/kernel/kvi_ircconnectionantictcpflooddata.h b/src/kvirc/kernel/kvi_ircconnectionantictcpflooddata.h
index 5455ad708..7a54e7d7d 100644
--- a/src/kvirc/kernel/kvi_ircconnectionantictcpflooddata.h
+++ b/src/kvirc/kernel/kvi_ircconnectionantictcpflooddata.h
@@ -6,7 +6,7 @@
 //   Creation date : Sat 26 Jun 2004 18:09:42 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2004-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2004-2010 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
@@ -25,7 +25,7 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_time.h"
+#include "KviTimeUtils.h"
 
 class KVIRC_API KviIrcConnectionAntiCtcpFloodData
 {
diff --git a/src/kvirc/kernel/kvi_ircconnectionasynctemplatedata.h b/src/kvirc/kernel/kvi_ircconnectionasynctemplatedata.h
index 0f4604614..83985ad98 100644
--- a/src/kvirc/kernel/kvi_ircconnectionasynctemplatedata.h
+++ b/src/kvirc/kernel/kvi_ircconnectionasynctemplatedata.h
@@ -6,7 +6,7 @@
 //   Creation date : Sat 26 Jun 2004 19:40:20 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2004-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2004-2010 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
diff --git a/src/kvirc/kernel/kvi_ircconnectionasyncwhoisdata.cpp b/src/kvirc/kernel/kvi_ircconnectionasyncwhoisdata.cpp
index 1e2038743..7c3a89864 100644
--- a/src/kvirc/kernel/kvi_ircconnectionasyncwhoisdata.cpp
+++ b/src/kvirc/kernel/kvi_ircconnectionasyncwhoisdata.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Sat 26 Jun 2004 19:40:20 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2004-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2004-2010 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
diff --git a/src/kvirc/kernel/kvi_ircconnectionasyncwhoisdata.h b/src/kvirc/kernel/kvi_ircconnectionasyncwhoisdata.h
index cf10c2253..91e6b4e01 100644
--- a/src/kvirc/kernel/kvi_ircconnectionasyncwhoisdata.h
+++ b/src/kvirc/kernel/kvi_ircconnectionasyncwhoisdata.h
@@ -6,7 +6,7 @@
 //   Creation date : Sat 26 Jun 2004 19:40:20 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2004-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2004-2010 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
@@ -25,8 +25,8 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_qstring.h"
-#include "kvi_pointerlist.h"
+#include "KviQString.h"
+#include "KviPointerList.h"
 #include "kvi_ircconnectionasynctemplatedata.h"
 
 class KviWindow;
diff --git a/src/kvirc/kernel/kvi_ircconnectionnetsplitdetectordata.cpp b/src/kvirc/kernel/kvi_ircconnectionnetsplitdetectordata.cpp
index 19279c53d..388b33384 100644
--- a/src/kvirc/kernel/kvi_ircconnectionnetsplitdetectordata.cpp
+++ b/src/kvirc/kernel/kvi_ircconnectionnetsplitdetectordata.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Sat 26 Jun 2004 18:20:58 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2004-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2004-2010 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
diff --git a/src/kvirc/kernel/kvi_ircconnectionnetsplitdetectordata.h b/src/kvirc/kernel/kvi_ircconnectionnetsplitdetectordata.h
index 354121c13..8ac238828 100644
--- a/src/kvirc/kernel/kvi_ircconnectionnetsplitdetectordata.h
+++ b/src/kvirc/kernel/kvi_ircconnectionnetsplitdetectordata.h
@@ -6,7 +6,7 @@
 //   Creation date : Sat 26 Jun 2004 18:20:58 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2004-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2004-2010 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
@@ -25,8 +25,8 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_qstring.h"
-#include "kvi_time.h"
+#include "KviQString.h"
+#include "KviTimeUtils.h"
 
 class KVIRC_API KviIrcConnectionNetsplitDetectorData
 {
diff --git a/src/kvirc/kernel/kvi_ircconnectionrequestqueue.cpp b/src/kvirc/kernel/kvi_ircconnectionrequestqueue.cpp
index 578544702..365f8d2c4 100644
--- a/src/kvirc/kernel/kvi_ircconnectionrequestqueue.cpp
+++ b/src/kvirc/kernel/kvi_ircconnectionrequestqueue.cpp
@@ -130,7 +130,7 @@ void KviRequestQueue::timerSlot()
 					pChan->connection()->stateData()->setLastSentChannelWhoRequest(kvi_unixTime());
 					if(pChan->connection()->lagMeter())
 					{
-						KviStr tmp;
+						KviCString tmp;
 						tmp.sprintf("WHO %s",encodedChan.data());
 						pChan->connection()->lagMeter()->lagCheckRegister(tmp.ptr(),60);
 					}
diff --git a/src/kvirc/kernel/kvi_ircconnectionserverinfo.cpp b/src/kvirc/kernel/kvi_ircconnectionserverinfo.cpp
index 05418334a..4b30916b8 100644
--- a/src/kvirc/kernel/kvi_ircconnectionserverinfo.cpp
+++ b/src/kvirc/kernel/kvi_ircconnectionserverinfo.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Tue 22 Jun 2004 03:57:32 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2004-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2004-2010 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
@@ -25,9 +25,9 @@
 
 
 #include "kvi_ircconnectionserverinfo.h"
-#include "kvi_locale.h"
-#include "kvi_malloc.h"
-#include "kvi_ircuserdb.h"
+#include "KviLocale.h"
+#include "KviMemory.h"
+#include "KviIrcUserDataBase.h"
 
 KviIrcConnectionServerInfo::KviIrcConnectionServerInfo()
 {
@@ -55,7 +55,7 @@ KviIrcConnectionServerInfo::~KviIrcConnectionServerInfo()
 	if(m_pServInfo)
 		delete m_pServInfo;
 	if(m_pModePrefixTable)
-		kvi_free(m_pModePrefixTable);
+		KviMemory::free(m_pModePrefixTable);
 }
 
 void KviIrcConnectionServerInfo::addSupportedCaps(const QString &szCapList)
@@ -119,13 +119,13 @@ void KviIrcConnectionServerInfo::setSupportedModePrefixes(const QString &szSuppo
 
 void KviIrcConnectionServerInfo::buildModePrefixTable()
 {
-	if(m_pModePrefixTable) kvi_free(m_pModePrefixTable);
+	if(m_pModePrefixTable) KviMemory::free(m_pModePrefixTable);
 	const QChar * cPrefix = KviQString::nullTerminatedArray(m_szSupportedModePrefixes);
 	const QChar * cFlag = KviQString::nullTerminatedArray(m_szSupportedModeFlags);
 	if(!cPrefix || !cFlag)return; // eh ?
 
 	m_uPrefixes=qMin(m_szSupportedModePrefixes.length(),m_szSupportedModePrefixes.length());
-	m_pModePrefixTable=(kvi_u32_t*)kvi_malloc(sizeof(kvi_u32_t)*3*m_uPrefixes);
+	m_pModePrefixTable=(kvi_u32_t*)KviMemory::allocate(sizeof(kvi_u32_t)*3*m_uPrefixes);
 
 	unsigned short uPrefix,uFlag;
 
diff --git a/src/kvirc/kernel/kvi_ircconnectionserverinfo.h b/src/kvirc/kernel/kvi_ircconnectionserverinfo.h
index 31ef4d79a..a11f48243 100644
--- a/src/kvirc/kernel/kvi_ircconnectionserverinfo.h
+++ b/src/kvirc/kernel/kvi_ircconnectionserverinfo.h
@@ -6,7 +6,7 @@
 //   Creation date : Tue 22 Jun 2004 03:57:32 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2004-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2004-2010 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
@@ -25,7 +25,7 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_qstring.h"
+#include "KviQString.h"
 #include "kvi_inttypes.h"
 
 #include <QStringList>
diff --git a/src/kvirc/kernel/kvi_ircconnectionstatedata.cpp b/src/kvirc/kernel/kvi_ircconnectionstatedata.cpp
index e3bb11320..23a172298 100644
--- a/src/kvirc/kernel/kvi_ircconnectionstatedata.cpp
+++ b/src/kvirc/kernel/kvi_ircconnectionstatedata.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Sat 26 Jun 2004 09:31:52 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2004-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2004-2010 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
diff --git a/src/kvirc/kernel/kvi_ircconnectionstatedata.h b/src/kvirc/kernel/kvi_ircconnectionstatedata.h
index c81cbfe66..2fe613b99 100644
--- a/src/kvirc/kernel/kvi_ircconnectionstatedata.h
+++ b/src/kvirc/kernel/kvi_ircconnectionstatedata.h
@@ -6,7 +6,7 @@
 //   Creation date : Sat 26 Jun 2004 09:31:52 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2004-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2004-2010 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
@@ -25,8 +25,8 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_time.h"
-#include "kvi_qstring.h"
+#include "KviTimeUtils.h"
+#include "KviQString.h"
 
 #include <QStringList>
 
diff --git a/src/kvirc/kernel/kvi_ircconnectionstatistics.cpp b/src/kvirc/kernel/kvi_ircconnectionstatistics.cpp
index fe8e47194..d3d2bc94f 100644
--- a/src/kvirc/kernel/kvi_ircconnectionstatistics.cpp
+++ b/src/kvirc/kernel/kvi_ircconnectionstatistics.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Sun 27 Jun 2004 21:13:48 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2004-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2004-2010 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
diff --git a/src/kvirc/kernel/kvi_ircconnectionstatistics.h b/src/kvirc/kernel/kvi_ircconnectionstatistics.h
index 17ba7b528..dad53abe2 100644
--- a/src/kvirc/kernel/kvi_ircconnectionstatistics.h
+++ b/src/kvirc/kernel/kvi_ircconnectionstatistics.h
@@ -6,7 +6,7 @@
 //   Creation date : Sun 27 Jun 2004 21:13:48 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2004-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2004-2010 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
@@ -25,8 +25,8 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_qstring.h"
-#include "kvi_time.h"
+#include "KviQString.h"
+#include "KviTimeUtils.h"
 
 
 class KVIRC_API KviIrcConnectionStatistics
diff --git a/src/kvirc/kernel/kvi_ircconnectiontarget.cpp b/src/kvirc/kernel/kvi_ircconnectiontarget.cpp
index 2bd1bb10b..fdcf9a2e6 100644
--- a/src/kvirc/kernel/kvi_ircconnectiontarget.cpp
+++ b/src/kvirc/kernel/kvi_ircconnectiontarget.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Tue 08 Jun 2004 14:11:59 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2004-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2004-2010 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
@@ -25,9 +25,9 @@
 
 
 #include "kvi_ircconnectiontarget.h"
-#include "kvi_ircserver.h"
-#include "kvi_network.h"
-#include "kvi_proxydb.h"
+#include "KviIrcServer.h"
+#include "KviNetwork.h"
+#include "KviProxyDataBase.h"
 
 KviIrcConnectionTarget::KviIrcConnectionTarget(
 		const KviNetwork * pNetwork,
diff --git a/src/kvirc/kernel/kvi_ircconnectiontarget.h b/src/kvirc/kernel/kvi_ircconnectiontarget.h
index 258d5a5e3..6db18e7b5 100644
--- a/src/kvirc/kernel/kvi_ircconnectiontarget.h
+++ b/src/kvirc/kernel/kvi_ircconnectiontarget.h
@@ -6,7 +6,7 @@
 //   Creation date : Tue 08 Jun 2004 14:11:59 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2004-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2004-2010 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
@@ -25,8 +25,8 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_qstring.h"
-#include "kvi_heapobject.h"
+#include "KviQString.h"
+#include "KviHeapObject.h"
 
 class KviNetwork;
 class KviServer;
diff --git a/src/kvirc/kernel/kvi_ircconnectiontargetresolver.cpp b/src/kvirc/kernel/kvi_ircconnectiontargetresolver.cpp
index f49910661..07fb0a424 100644
--- a/src/kvirc/kernel/kvi_ircconnectiontargetresolver.cpp
+++ b/src/kvirc/kernel/kvi_ircconnectiontargetresolver.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Fri May 11 23:24:18 2002 GMT by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2002-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2002-2010 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
@@ -26,9 +26,9 @@
 
 #include "kvi_ircconnectiontargetresolver.h"
 #include "kvi_dns.h"
-#include "kvi_locale.h"
-#include "kvi_ircserverdb.h"
-#include "kvi_proxydb.h"
+#include "KviLocale.h"
+#include "KviIrcServerDataBase.h"
+#include "KviProxyDataBase.h"
 #include "kvi_error.h"
 #include "kvi_out.h"
 #include "kvi_options.h"
@@ -39,7 +39,7 @@
 #include "kvi_frame.h"
 #include "kvi_mexlinkfilter.h"
 //#include "kvi_garbage.h"
-#include "kvi_malloc.h"
+#include "KviMemory.h"
 #include "kvi_memmove.h"
 #include "kvi_debug.h"
 #include "kvi_ircconnection.h"
diff --git a/src/kvirc/kernel/kvi_ircconnectiontargetresolver.h b/src/kvirc/kernel/kvi_ircconnectiontargetresolver.h
index 9908535d1..b6d140117 100644
--- a/src/kvirc/kernel/kvi_ircconnectiontargetresolver.h
+++ b/src/kvirc/kernel/kvi_ircconnectiontargetresolver.h
@@ -6,7 +6,7 @@
 //   Creation date : Fri 11 May 2004 23:17:42 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2004-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2004-2010 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
@@ -25,7 +25,7 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_qstring.h"
+#include "KviQString.h"
 
 #include <QObject>
 
diff --git a/src/kvirc/kernel/kvi_ircconnectionuserinfo.cpp b/src/kvirc/kernel/kvi_ircconnectionuserinfo.cpp
index f2c3f3297..1732225f8 100644
--- a/src/kvirc/kernel/kvi_ircconnectionuserinfo.cpp
+++ b/src/kvirc/kernel/kvi_ircconnectionuserinfo.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Sun 20 Jun 2004 01:45:42 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2004-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2004-2010 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
diff --git a/src/kvirc/kernel/kvi_ircconnectionuserinfo.h b/src/kvirc/kernel/kvi_ircconnectionuserinfo.h
index 556c79f2c..694c33359 100644
--- a/src/kvirc/kernel/kvi_ircconnectionuserinfo.h
+++ b/src/kvirc/kernel/kvi_ircconnectionuserinfo.h
@@ -6,7 +6,7 @@
 //   Creation date : Sun 20 Jun 2004 01:45:42 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2004-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2004-2010 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
@@ -25,8 +25,8 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_qstring.h"
-#include "kvi_time.h"
+#include "KviQString.h"
+#include "KviTimeUtils.h"
 
 class KVIRC_API KviIrcConnectionUserInfo
 {
diff --git a/src/kvirc/kernel/kvi_irccontext.cpp b/src/kvirc/kernel/kvi_irccontext.cpp
index 15e0fe046..a97589952 100644
--- a/src/kvirc/kernel/kvi_irccontext.cpp
+++ b/src/kvirc/kernel/kvi_irccontext.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Sun 09 May 2004 20:37:46 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2004-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2004-2010 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
@@ -40,19 +40,19 @@
 #include "kvi_ircconnectionrequestqueue.h"
 #include "kvi_irctoolbar.h"
 #include "kvi_out.h"
-#include "kvi_ircserverdb.h"
-#include "kvi_proxydb.h"
+#include "KviIrcServerDataBase.h"
+#include "KviProxyDataBase.h"
 #include "kvi_options.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_ircdatastreammonitor.h"
 #include "kvi_error.h"
-#include "kvi_thread.h" // for KviThread::msleep()
+#include "KviThread.h" // for KviThread::msleep()
 #include "kvi_app.h"
 #include "kvi_kvs_eventtriggers.h"
 #include "kvi_kvs_script.h"
 #include "kvi_netutils.h"
 #include "kvi_ircurl.h"
-#include "kvi_useridentity.h"
+#include "KviUserIdentity.h"
 
 #define __KVI_DEBUG__
 #include "kvi_debug.h"
diff --git a/src/kvirc/kernel/kvi_irccontext.h b/src/kvirc/kernel/kvi_irccontext.h
index c2525ba93..49d354b14 100644
--- a/src/kvirc/kernel/kvi_irccontext.h
+++ b/src/kvirc/kernel/kvi_irccontext.h
@@ -6,7 +6,7 @@
 //   Creation date : Sun 09 May 2004 20:37:46 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2004-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2004-2010 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
@@ -25,7 +25,7 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_pointerlist.h"
+#include "KviPointerList.h"
 #include <QObject>
 
 class KviChannel;
diff --git a/src/kvirc/kernel/kvi_ircdatastreammonitor.cpp b/src/kvirc/kernel/kvi_ircdatastreammonitor.cpp
index d49da558e..2b126ad84 100644
--- a/src/kvirc/kernel/kvi_ircdatastreammonitor.cpp
+++ b/src/kvirc/kernel/kvi_ircdatastreammonitor.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Sun 04 Jul 2004 21:27:22 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2004-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2004-2010 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
diff --git a/src/kvirc/kernel/kvi_ircdatastreammonitor.h b/src/kvirc/kernel/kvi_ircdatastreammonitor.h
index 37e5fc5f1..ebe0df397 100644
--- a/src/kvirc/kernel/kvi_ircdatastreammonitor.h
+++ b/src/kvirc/kernel/kvi_ircdatastreammonitor.h
@@ -6,7 +6,7 @@
 //   Creation date : Sun 04 Jul 2004 21:27:22 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2004-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2004-2010 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
@@ -25,7 +25,7 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_heapobject.h"
+#include "KviHeapObject.h"
 
 class KviIrcContext;
 
diff --git a/src/kvirc/kernel/kvi_irclink.cpp b/src/kvirc/kernel/kvi_irclink.cpp
index d55bbbbee..919941106 100644
--- a/src/kvirc/kernel/kvi_irclink.cpp
+++ b/src/kvirc/kernel/kvi_irclink.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Mon 03 May 2004 01:45:42 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2004-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2004-2010 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
@@ -25,9 +25,9 @@
 
 #include "kvi_irclink.h"
 #include "kvi_dns.h"
-#include "kvi_locale.h"
-#include "kvi_ircserverdb.h"
-#include "kvi_proxydb.h"
+#include "KviLocale.h"
+#include "KviIrcServerDataBase.h"
+#include "KviProxyDataBase.h"
 #include "kvi_error.h"
 #include "kvi_out.h"
 #include "kvi_options.h"
@@ -38,13 +38,13 @@
 #include "kvi_frame.h"
 #include "kvi_mexlinkfilter.h"
 //#include "kvi_garbage.h"
-#include "kvi_malloc.h"
+#include "KviMemory.h"
 #include "kvi_memmove.h"
 #include "kvi_ircconnection.h"
 #include "kvi_ircconnectiontarget.h"
 #include "kvi_ircconnectiontargetresolver.h"
 #include "kvi_ircsocket.h"
-#include "kvi_databuffer.h"
+#include "KviDataBuffer.h"
 #include "kvi_debug.h"
 
 #include <QTimer>
@@ -80,7 +80,7 @@ KviIrcLink::~KviIrcLink()
 	destroySocket();
 
 	if(m_pReadBuffer)
-		kvi_free(m_pReadBuffer);
+		KviMemory::free(m_pReadBuffer);
 }
 
 
@@ -227,7 +227,7 @@ void KviIrcLink::processData(char * buffer, int iLen)
 	register char * p = buffer;
 	char * cBeginOfCurData = buffer;
 	int iBufLen = 0;
-	char * cMessageBuffer = (char *)kvi_malloc(1);
+	char * cMessageBuffer = (char *)KviMemory::allocate(1);
 
 	while(*p)
 	{
@@ -240,16 +240,16 @@ void KviIrcLink::processData(char * buffer, int iLen)
 			if(m_uReadBufferLen > 0)
 			{
 				KVI_ASSERT(m_pReadBuffer);
-				cMessageBuffer = (char *)kvi_realloc(cMessageBuffer,iBufLen + m_uReadBufferLen + 1);
+				cMessageBuffer = (char *)KviMemory::reallocate(cMessageBuffer,iBufLen + m_uReadBufferLen + 1);
 				kvi_memmove(cMessageBuffer,m_pReadBuffer,m_uReadBufferLen);
 				kvi_memmove((void *)(cMessageBuffer + m_uReadBufferLen),cBeginOfCurData,iBufLen);
 				*(cMessageBuffer + iBufLen + m_uReadBufferLen) = '\0';
 				m_uReadBufferLen = 0;
-				kvi_free(m_pReadBuffer);
+				KviMemory::free(m_pReadBuffer);
 				m_pReadBuffer = 0;
 			} else {
 				KVI_ASSERT(!m_pReadBuffer);
-				cMessageBuffer = (char *)kvi_realloc(cMessageBuffer,iBufLen + 1);
+				cMessageBuffer = (char *)KviMemory::reallocate(cMessageBuffer,iBufLen + 1);
 				kvi_memmove(cMessageBuffer,cBeginOfCurData,iBufLen);
 				*(cMessageBuffer + iBufLen) = '\0';
 			}
@@ -279,7 +279,7 @@ void KviIrcLink::processData(char * buffer, int iLen)
 				//
 				// We handle it by simply returning control to readData() which
 				// will return immediately (and safely) control to Qt
-				kvi_free(cMessageBuffer);
+				KviMemory::free(cMessageBuffer);
 				return;
 			}
 
@@ -301,14 +301,14 @@ void KviIrcLink::processData(char * buffer, int iLen)
 		{
 			//and there was more stuff saved... (really slow connection)
 			KVI_ASSERT(m_pReadBuffer);
-			m_pReadBuffer =(char *)kvi_realloc(m_pReadBuffer,m_uReadBufferLen + iBufLen);
+			m_pReadBuffer =(char *)KviMemory::reallocate(m_pReadBuffer,m_uReadBufferLen + iBufLen);
 			kvi_memmove((void *)(m_pReadBuffer+m_uReadBufferLen),cBeginOfCurData,iBufLen);
 			m_uReadBufferLen += iBufLen;
 		} else {
 			//
 			KVI_ASSERT(!m_pReadBuffer);
 			m_uReadBufferLen = iBufLen;
-			m_pReadBuffer =(char *)kvi_malloc(m_uReadBufferLen);
+			m_pReadBuffer =(char *)KviMemory::allocate(m_uReadBufferLen);
 			kvi_memmove(m_pReadBuffer,cBeginOfCurData,m_uReadBufferLen);
 		}
 		//The m_pReadBuffer contains at max 1 irc message...
@@ -316,7 +316,7 @@ void KviIrcLink::processData(char * buffer, int iLen)
 		// FIXME: Is this limit *really* valid on all servers ?
 		if(m_uReadBufferLen > 510) qDebug("WARNING: Receiving an invalid irc message from server.");
 	}
-	kvi_free(cMessageBuffer);
+	KviMemory::free(cMessageBuffer);
 }
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/src/kvirc/kernel/kvi_irclink.h b/src/kvirc/kernel/kvi_irclink.h
index 0b047e2d9..fc58deae9 100644
--- a/src/kvirc/kernel/kvi_irclink.h
+++ b/src/kvirc/kernel/kvi_irclink.h
@@ -6,7 +6,7 @@
 //   Creation date : Mon 03 May 2004 01:45:42 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2004-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2004-2010 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
@@ -31,7 +31,7 @@
 */
 
 #include "kvi_settings.h"
-#include "kvi_qstring.h"
+#include "KviQString.h"
 
 #include <QObject>
 
diff --git a/src/kvirc/kernel/kvi_ircsocket.cpp b/src/kvirc/kernel/kvi_ircsocket.cpp
index dabd9f8dc..68b6f5514 100644
--- a/src/kvirc/kernel/kvi_ircsocket.cpp
+++ b/src/kvirc/kernel/kvi_ircsocket.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Tue Jul 30 19:25:18 2002 GMT by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2002-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2002-2010 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
@@ -24,15 +24,15 @@
 
 
 #include "kvi_ircsocket.h"
-#include "kvi_ircserver.h"
-#include "kvi_proxydb.h"
+#include "KviIrcServer.h"
+#include "KviProxyDataBase.h"
 #include "kvi_netutils.h"
 #include "kvi_settings.h"
 #include "kvi_error.h"
-#include "kvi_locale.h"
-#include "kvi_malloc.h"
+#include "KviLocale.h"
+#include "KviMemory.h"
 #include "kvi_debug.h"
-#include "kvi_string.h"
+#include "KviCString.h"
 #include "kvi_options.h"
 #include "kvi_memmove.h"
 #include "kvi_socket.h"
@@ -40,7 +40,7 @@
 #include "kvi_out.h"
 #include "kvi_irclink.h"
 #include "kvi_ircconnection.h"
-#include "kvi_databuffer.h"
+#include "KviDataBuffer.h"
 
 #ifdef COMPILE_SSL_SUPPORT
 	#include "kvi_sslmaster.h"
@@ -677,16 +677,16 @@ void KviIrcSocket::proxyLoginHttp()
 		outputProxyMessage(__tr2qs("Using HTTP protocol."));
 
 	setState(ProxyFinalHttp);
-	KviStr szTmp(KviStr::Format,"CONNECT %s:%u HTTP/1.0\r\n",m_pIrcServer->hostName().toUtf8().data(),(unsigned int)(m_pIrcServer->port()));
+	KviCString szTmp(KviCString::Format,"CONNECT %s:%u HTTP/1.0\r\n",m_pIrcServer->hostName().toUtf8().data(),(unsigned int)(m_pIrcServer->port()));
 
-	szTmp.append(KviStr::Format,"User-Agent: KVIrc-ProxyClient/4.0\r\n");
+	szTmp.append(KviCString::Format,"User-Agent: KVIrc-ProxyClient/4.0\r\n");
 
 	if(m_pProxy->hasUser())
 	{
-		KviStr szAuth(KviStr::Format,"%s:%s",m_pProxy->user().toUtf8().data(),m_pProxy->pass().toUtf8().data());
-		KviStr szEncoded;
+		KviCString szAuth(KviCString::Format,"%s:%s",m_pProxy->user().toUtf8().data(),m_pProxy->pass().toUtf8().data());
+		KviCString szEncoded;
 		szEncoded.bufferToBase64(szAuth.ptr(),szAuth.len());
-		szTmp.append(KviStr::Format,"Proxy-Authorization: Basic %s\r\n\r\n",szEncoded.ptr());
+		szTmp.append(KviCString::Format,"Proxy-Authorization: Basic %s\r\n\r\n",szEncoded.ptr());
 	} else {
 		szTmp.append("\r\n");
 	}
@@ -729,7 +729,7 @@ void KviIrcSocket::proxyLoginV4()
 	// the protocol does not specify the "userid" format...
 	// so build an userid from the pass and/or username...
 
-	KviStr szUserAndPass = m_pProxy->user();
+	KviCString szUserAndPass = m_pProxy->user();
 	if(m_pProxy->hasPass()){
 		if(szUserAndPass.hasData())
 			szUserAndPass.append(' ');
@@ -954,7 +954,7 @@ void KviIrcSocket::proxySendTargetDataV5()
 		);
 	int iBufLen = bRemoteDns ? 4 + 1 + m_pIrcServer->hostName().toUtf8().length() + 2
 		: (m_pIrcServer->isIPv6() ? 22 : 10);
-	char * pcBufToSend = (char *)kvi_malloc(sizeof(char) * iBufLen);
+	char * pcBufToSend = (char *)KviMemory::allocate(sizeof(char) * iBufLen);
 	pcBufToSend[0] = (unsigned char)5;           //Proto 5
 	pcBufToSend[1] = (unsigned char)1;           //CONNECT
 	pcBufToSend[2] = (unsigned char)0;           //RSV
@@ -999,7 +999,7 @@ void KviIrcSocket::proxySendTargetDataV5()
 	// send it into hyperspace...
 	setState(ProxyFinalV5);
 	sendRawData(pcBufToSend,iBufLen);
-	kvi_free(pcBufToSend);
+	KviMemory::free(pcBufToSend);
 	// and wait for reply...
 }
 
@@ -1206,7 +1206,7 @@ void KviIrcSocket::proxyHandleHttpFinalReply(const char * pcBuffer, int)
 	//
 	// HTTP/1.0 200 Connection established
 
-	KviStr szTmp = pcBuffer;
+	KviCString szTmp = pcBuffer;
 	// FIXME: #warning "We could even show the proxy output here...!"
 	szTmp.cutFromFirst('\n');
 	szTmp.trimmed();
@@ -1292,7 +1292,7 @@ void KviIrcSocket::printSSLCipherInfo()
 
 void KviIrcSocket::raiseSSLError()
 {
-	KviStr szBuffer;
+	KviCString szBuffer;
 	while(m_pSSL->getLastErrorString(szBuffer))
 	{
 		outputSSLError(szBuffer.ptr());
@@ -1514,7 +1514,7 @@ void KviIrcSocket::processData(char * buffer,int)
 	register char *p=buffer;
 	char *beginOfCurData = buffer;
 	int   bufLen = 0;
-	char *messageBuffer = (char *)kvi_malloc(1);
+	char *messageBuffer = (char *)KviMemory::allocate(1);
 
 	// Shut up the socket notifier
 	// in case that we enter in a local loop somewhere
@@ -1536,16 +1536,16 @@ void KviIrcSocket::processData(char * buffer,int)
 			//check for previous unterminated data
 			if(m_uReadBufferLen > 0){
 				KVI_ASSERT(m_pReadBuffer);
-				messageBuffer = (char *)kvi_realloc(messageBuffer,bufLen + m_uReadBufferLen + 1);
+				messageBuffer = (char *)KviMemory::reallocate(messageBuffer,bufLen + m_uReadBufferLen + 1);
 				kvi_memmove(messageBuffer,m_pReadBuffer,m_uReadBufferLen);
 				kvi_memmove((void *)(messageBuffer + m_uReadBufferLen),beginOfCurData,bufLen);
 				*(messageBuffer + bufLen + m_uReadBufferLen) = '\0';
 				m_uReadBufferLen = 0;
-				kvi_free(m_pReadBuffer);
+				KviMemory::free(m_pReadBuffer);
 				m_pReadBuffer = 0;
 			} else {
 				__range_invalid(m_pReadBuffer);
-				messageBuffer = (char *)kvi_realloc(messageBuffer,bufLen + 1);
+				messageBuffer = (char *)KviMemory::reallocate(messageBuffer,bufLen + 1);
 				kvi_memmove(messageBuffer,beginOfCurData,bufLen);
 				*(messageBuffer + bufLen) = '\0';
 			}
@@ -1575,7 +1575,7 @@ void KviIrcSocket::processData(char * buffer,int)
 				//
 				// We handle it by simply returning control to readData() which
 				// will return immediately (and safely) control to Qt
-				kvi_free(messageBuffer);
+				KviMemory::free(messageBuffer);
 				m_bInProcessData = false;
 				return;
 			}
@@ -1597,14 +1597,14 @@ void KviIrcSocket::processData(char * buffer,int)
 		if(m_uReadBufferLen > 0){
 			//and there was more stuff saved... (really slow connection)
 			KVI_ASSERT(m_pReadBuffer);
-			m_pReadBuffer =(char *)kvi_realloc(m_pReadBuffer,m_uReadBufferLen + bufLen);
+			m_pReadBuffer =(char *)KviMemory::reallocate(m_pReadBuffer,m_uReadBufferLen + bufLen);
 			kvi_memmove((void *)(m_pReadBuffer+m_uReadBufferLen),beginOfCurData,bufLen);
 			m_uReadBufferLen += bufLen;
 		} else {
 			//
 			__range_invalid(m_pReadBuffer);
 			m_uReadBufferLen = bufLen;
-			m_pReadBuffer =(char *)kvi_malloc(m_uReadBufferLen);
+			m_pReadBuffer =(char *)KviMemory::allocate(m_uReadBufferLen);
 			kvi_memmove(m_pReadBuffer,beginOfCurData,m_uReadBufferLen);
 		}
 		//The m_pReadBuffer contains at max 1 irc message...
@@ -1612,7 +1612,7 @@ void KviIrcSocket::processData(char * buffer,int)
 		// FIXME: Is this limit *really* valid on all servers ?
 		if(m_uReadBufferLen > 510)qDebug("WARNING : Receiving an invalid irc message from server.");
 	}
-	kvi_free(messageBuffer);
+	KviMemory::free(messageBuffer);
 
 	// re-enable the socket notifier...
 	m_pRsn->setEnabled(true);
@@ -1681,7 +1681,7 @@ void KviIrcSocket::free_msgEntry(KviIrcSocketMsgEntry * e)
 		delete e->pData;
 
 	e->pData = 0;
-	kvi_free(e);
+	KviMemory::free(e);
 }
 
 bool KviIrcSocket::queue_removeMessage()
@@ -1694,7 +1694,7 @@ bool KviIrcSocket::queue_removeMessage()
 
 	KviIrcSocketMsgEntry * pEntry = m_pSendQueueHead;
 	m_pSendQueueHead = pEntry->next_ptr;
-	kvi_free((void *)pEntry);
+	KviMemory::free((void *)pEntry);
 
 	if(m_pSendQueueHead == 0)
 	{
@@ -1931,7 +1931,7 @@ bool KviIrcSocket::sendFmtData(const char *fmt,...)
 {
 	if(m_state != Connected)return false;
 	//new buffer
-	KviIrcSocketMsgEntry *ptr = (KviIrcSocketMsgEntry *)kvi_malloc(sizeof(KviIrcSocketMsgEntry));
+	KviIrcSocketMsgEntry *ptr = (KviIrcSocketMsgEntry *)KviMemory::allocate(sizeof(KviIrcSocketMsgEntry));
 	ptr->pData = new KviDataBuffer(512);
 	kvi_va_list(list);
 	kvi_va_start(list,fmt);
@@ -1957,7 +1957,7 @@ bool KviIrcSocket::sendData(const char *buffer,int buflen)
 {
 	if(m_state != Connected)return false;
 	//new buffer
-	KviIrcSocketMsgEntry *ptr = (KviIrcSocketMsgEntry *)kvi_malloc(sizeof(KviIrcSocketMsgEntry));
+	KviIrcSocketMsgEntry *ptr = (KviIrcSocketMsgEntry *)KviMemory::allocate(sizeof(KviIrcSocketMsgEntry));
 	if(buflen < 0)buflen = strlen(buffer);
 	if(buflen > 510)
 	{
@@ -1982,7 +1982,7 @@ bool KviIrcSocket::sendRawData(const char * pcBuffer, int iBuflen)
 		return false;
 
 	//new buffer
-	KviIrcSocketMsgEntry * pEntry = (KviIrcSocketMsgEntry *)kvi_malloc(sizeof(KviIrcSocketMsgEntry));
+	KviIrcSocketMsgEntry * pEntry = (KviIrcSocketMsgEntry *)KviMemory::allocate(sizeof(KviIrcSocketMsgEntry));
 	pEntry->pData = new KviDataBuffer(iBuflen);
 
 	kvi_memmove(pEntry->pData->data(),pcBuffer,iBuflen);
@@ -2003,7 +2003,7 @@ bool KviIrcSocket::sendPacket(KviDataBuffer * pData)
 		return false;
 	}
 
-	KviIrcSocketMsgEntry * pEntry = (KviIrcSocketMsgEntry *)kvi_malloc(sizeof(KviIrcSocketMsgEntry));
+	KviIrcSocketMsgEntry * pEntry = (KviIrcSocketMsgEntry *)KviMemory::allocate(sizeof(KviIrcSocketMsgEntry));
 	pEntry->pData = pData;
 	queue_insertMessage(pEntry);
 
diff --git a/src/kvirc/kernel/kvi_ircsocket.h b/src/kvirc/kernel/kvi_ircsocket.h
index da2d48a02..a7a185d3e 100644
--- a/src/kvirc/kernel/kvi_ircsocket.h
+++ b/src/kvirc/kernel/kvi_ircsocket.h
@@ -6,7 +6,7 @@
 //   Creation date : Tue Jul 30 19:25:17 2002 GMT by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2002-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2002-2010 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
@@ -31,10 +31,10 @@
 */
 
 #include "kvi_settings.h"
-#include "kvi_string.h"
+#include "KviCString.h"
 #include "kvi_sockettype.h"
-#include "kvi_time.h"
-#include "kvi_pointerlist.h"
+#include "KviTimeUtils.h"
+#include "KviPointerList.h"
 
 #include <QObject>
 
diff --git a/src/kvirc/kernel/kvi_ircurl.cpp b/src/kvirc/kernel/kvi_ircurl.cpp
index 6ec8bfb16..3cbbba160 100644
--- a/src/kvirc/kernel/kvi_ircurl.cpp
+++ b/src/kvirc/kernel/kvi_ircurl.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Sun Mar 04 2001 14:20:12 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-2010 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
@@ -22,15 +22,15 @@
 //
 //=============================================================================
 
-#include "kvi_string.h"
+#include "KviCString.h"
 #include "kvi_inttypes.h"
-#include "kvi_qstring.h"
-#include "kvi_ircserver.h"
+#include "KviQString.h"
+#include "KviIrcServer.h"
 #include "kvi_kvs_script.h"
 #include "kvi_msgbox.h"
 #include "kvi_channel.h"
 #include "kvi_app.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_ircconnectiontarget.h"
 #include "kvi_ircconnection.h"
 #include "kvi_irccontext.h"
@@ -41,15 +41,15 @@
 #include "kvi_ircurl.h"
 
 
-bool KviIrcUrl::parse(const char * url,KviStr &cmdBuffer,int contextSpec)
+bool KviIrcUrl::parse(const char * url,KviCString &cmdBuffer,int contextSpec)
 {
 	// irc[6]://<server>[:<port>][/<channel>[?<pass>]]
-	KviStr szUrl = url;
+	KviCString szUrl = url;
 	//szUrl.replaceAll("$","\\$");
 	//szUrl.replaceAll(";","\\;");
 	bool bIPv6 = false;
 	bool bSSL = false;
-	KviStr szServer;
+	KviCString szServer;
 	kvi_u32_t uPort = 0;
 	bool bGotPort = false;
 	if(kvi_strEqualCIN(szUrl.ptr(),"irc://",6))
@@ -70,7 +70,7 @@ bool KviIrcUrl::parse(const char * url,KviStr &cmdBuffer,int contextSpec)
 		szUrl.cutLeft(8);
 	} else return false;
 
-	KviStr szServerAndPort;
+	KviCString szServerAndPort;
 
 	int idx = szUrl.findFirstIdx('/');
 	if(idx != -1)
@@ -113,8 +113,8 @@ bool KviIrcUrl::parse(const char * url,KviStr &cmdBuffer,int contextSpec)
 
 	if(szUrl.hasData())
 	{
-		KviStr szChannel;
-		KviStr szPass;
+		KviCString szChannel;
+		KviCString szPass;
 
 		idx = szUrl.findFirstIdx('?');
 		if(idx != -1)
@@ -130,13 +130,13 @@ bool KviIrcUrl::parse(const char * url,KviStr &cmdBuffer,int contextSpec)
 		if(!(szChannel.firstCharIs('#') || szChannel.firstCharIs('!') || szChannel.firstCharIs('&')))
 				szChannel.prepend('#');
 
-		if(szPass.isEmpty())cmdBuffer.append(KviStr::Format," -c=\"join %s\" ",szChannel.ptr());
-		else cmdBuffer.append(KviStr::Format," -c=\"join %s %s\" ",szChannel.ptr(),szPass.ptr());
+		if(szPass.isEmpty())cmdBuffer.append(KviCString::Format," -c=\"join %s\" ",szChannel.ptr());
+		else cmdBuffer.append(KviCString::Format," -c=\"join %s %s\" ",szChannel.ptr(),szPass.ptr());
 
 	}
 
 	cmdBuffer.append(szServer);
-	if(bGotPort)cmdBuffer.append(KviStr::Format," %d",uPort);
+	if(bGotPort)cmdBuffer.append(KviCString::Format," %d",uPort);
 
 	cmdBuffer.append(';');
 
diff --git a/src/kvirc/kernel/kvi_ircurl.h b/src/kvirc/kernel/kvi_ircurl.h
index 5e604bc11..e6a8c3647 100644
--- a/src/kvirc/kernel/kvi_ircurl.h
+++ b/src/kvirc/kernel/kvi_ircurl.h
@@ -6,7 +6,7 @@
 //   Creation date : Sun Mar 04 2001 14:22:55 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-2010 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
@@ -25,7 +25,7 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_string.h"
+#include "KviCString.h"
 #include "kvi_inttypes.h"
 
 class KviServer;
@@ -67,7 +67,7 @@ namespace KviIrcUrl
 		DoNotPartChans = 16
 	};
 
-	extern KVIRC_API bool parse(const char * url,KviStr &cmdBuffer,int contextSpec = KVI_IRCURL_CONTEXT_FIRSTFREE);
+	extern KVIRC_API bool parse(const char * url,KviCString &cmdBuffer,int contextSpec = KVI_IRCURL_CONTEXT_FIRSTFREE);
 
 	extern KVIRC_API int  run(const QString& url,int contextSpec = FirstFreeContext,KviConsole* pConsole = 0);
 
diff --git a/src/kvirc/kernel/kvi_lagmeter.cpp b/src/kvirc/kernel/kvi_lagmeter.cpp
index 70577480a..053a77cf6 100644
--- a/src/kvirc/kernel/kvi_lagmeter.cpp
+++ b/src/kvirc/kernel/kvi_lagmeter.cpp
@@ -5,7 +5,7 @@
 //
 //   This file is part of the KVirc irc client distribution
 //   Copyright (C) 1999 Juanjo Álvarez
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -28,16 +28,16 @@
 #include "kvi_lagmeter.h"
 #include "kvi_options.h"
 #include "kvi_kvs_eventtriggers.h"
-#include "kvi_parameterlist.h"
+#include "KviParameterList.h"
 #include "kvi_ircconnection.h"
 #include "kvi_irccontext.h"
 #include "kvi_frame.h"
 #include "kvi_console.h"
-#include "kvi_time.h"
+#include "KviTimeUtils.h"
 #include "kvi_ircconnectionuserinfo.h"
 #include "kvi_ircconnectionserverinfo.h"
 #include "kvi_out.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 
 KviLagMeter::KviLagMeter(KviIrcConnection * c)
 : QObject()
@@ -87,7 +87,7 @@ void KviLagMeter::timerEvent(QTimerEvent *)
 		m_uLastEmittedLag = m_uLag;
 		g_pFrame->childConnectionLagChange(m_pConnection);
 
-		KviStr szLag(KviStr::Format,"%u",m_uLag);
+		KviCString szLag(KviCString::Format,"%u",m_uLag);
 		
 		bool bDeletionSignal = false;
 		m_pDeletionSignal = &bDeletionSignal;
@@ -166,7 +166,7 @@ void KviLagMeter::timerEvent(QTimerEvent *)
 
 		// we have already sent a ping but we got no reply
 		// try with another method... even if this will reset our idle time
-		KviStr tmp(KviStr::Format,"%d%d-yeah-:)",tv.tv_sec,tv.tv_usec);
+		KviCString tmp(KviCString::Format,"%d%d-yeah-:)",tv.tv_sec,tv.tv_usec);
 		lagCheckRegister(tmp.ptr(),100); // almost impossible to fool
 		m_pConnection->sendFmtData("NOTICE %s :%cLAGCHECK %s%c",
 			m_pConnection->encodeText( m_pConnection->userInfo()->nickName() ).data(),
diff --git a/src/kvirc/kernel/kvi_lagmeter.h b/src/kvirc/kernel/kvi_lagmeter.h
index d27b4ce60..9bd87de7a 100644
--- a/src/kvirc/kernel/kvi_lagmeter.h
+++ b/src/kvirc/kernel/kvi_lagmeter.h
@@ -7,7 +7,7 @@
 //
 //   This file is part of the KVirc irc client distribution
 //   Copyright (C) 1999 Juanjo Álvarez
-//   Copyright (C) 2002-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2002-2010 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
@@ -26,8 +26,8 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_string.h"
-#include "kvi_pointerlist.h"
+#include "KviCString.h"
+#include "KviPointerList.h"
 
 #include <QObject>
 
@@ -36,7 +36,7 @@ class KviIrcConnection;
 class KviLagCheck
 {
 public:
-	KviStr szKey;
+	KviCString szKey;
 	long   lSecs;  // since epoch
 	long   lUSecs;
 	unsigned int    uReliability; // [0-100]
diff --git a/src/kvirc/kernel/kvi_main.cpp b/src/kvirc/kernel/kvi_main.cpp
index c1a64b628..a4dddd253 100644
--- a/src/kvirc/kernel/kvi_main.cpp
+++ b/src/kvirc/kernel/kvi_main.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Sun Jun 18 2000 12:38:45 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -25,7 +25,7 @@
 
 
 #include "kvi_app.h"
-#include "kvi_string.h"
+#include "KviCString.h"
 #include "kvi_settings.h"
 #include "kvi_ircurl.h"
 #include "kvi_defaults.h"
@@ -34,7 +34,7 @@
 #include "kvi_buildinfo.h"
 #ifdef COMPILE_DBUS_SUPPORT
 	#ifndef COMPILE_KDE_SUPPORT // 'cause kde adds an interface itself
-		#include "kvi_dbusadaptor.h"
+		#include "KviDbusAdaptor.h"
 	#endif
 #endif
 #ifndef COMPILE_NO_IPC
@@ -63,14 +63,14 @@ typedef struct _ParseArgs
 	bool      bShowPopup;
 	bool      bShowSplashScreen;
 	bool      bExecuteCommandAndClose;
-	KviStr    szExecCommand;
-	KviStr    szExecRemoteCommand;
+	KviCString    szExecCommand;
+	KviCString    szExecRemoteCommand;
 } ParseArgs;
 
 int parseArgs(ParseArgs * a)
 {
-	KviStr szServer;
-	KviStr szPort;
+	KviCString szServer;
+	KviCString szPort;
 	int idx;
 
 	if(a->argc < 2)return KVI_ARGS_RETCODE_OK;
@@ -256,7 +256,7 @@ int parseArgs(ParseArgs * a)
 			p = a->argv[idx];
 			if(kvi_strEqualCIN(p,"irc://",6) || kvi_strEqualCIN(p,"irc6://",7) || kvi_strEqualCIN(p,"ircs://",7) || kvi_strEqualCIN(p,"ircs6://",8))
 			{
-				KviStr tmp = QString::fromLocal8Bit(p);
+				KviCString tmp = QString::fromLocal8Bit(p);
 				a->szExecCommand ="openurl ";
 				tmp.replaceAll("$",""); // the urls can't contain $ signs
 				tmp.replaceAll(";",""); // the urls can't contain ; signs
@@ -272,7 +272,7 @@ int parseArgs(ParseArgs * a)
 			// no dash
 			if(kvi_strEqualCIN(p,"irc://",6) || kvi_strEqualCIN(p,"irc6://",7) || kvi_strEqualCIN(p,"ircs://",7) || kvi_strEqualCIN(p,"ircs6://",8))
 			{
-				KviStr szTmp = QString::fromLocal8Bit(p);
+				KviCString szTmp = QString::fromLocal8Bit(p);
 				if(a->szExecCommand.hasData())a->szExecCommand.append('\n');
 				a->szExecCommand.append("openurl ");
 				szTmp.replaceAll("$",""); // the urls can't contain $ signs
@@ -384,7 +384,7 @@ int main(int argc, char ** argv)
 	#endif
 #endif
 
-	KviStr szRemoteCommand = a.szExecCommand;
+	KviCString szRemoteCommand = a.szExecCommand;
 	if(a.szExecRemoteCommand.hasData())
 	{
 		if(szRemoteCommand.hasData())
@@ -426,7 +426,7 @@ int main(int argc, char ** argv)
 		{
 			if(szRemoteCommand.isEmpty())
 			{
-				KviStr szTmp(KviStr::Format,"Another KVIrc session is already running on this display and with this user id.\nUse %s -f if you want to force a new session.",argv[0]);
+				KviCString szTmp(KviCString::Format,"Another KVIrc session is already running on this display and with this user id.\nUse %s -f if you want to force a new session.",argv[0]);
 				if(a.bShowPopup)
 				{
 					QMessageBox::information(0,"Session - KVIrc",szTmp.ptr(),QMessageBox::Ok);
diff --git a/src/kvirc/kernel/kvi_notifylist.cpp b/src/kvirc/kernel/kvi_notifylist.cpp
index cfa749f1f..1012f5b60 100644
--- a/src/kvirc/kernel/kvi_notifylist.cpp
+++ b/src/kvirc/kernel/kvi_notifylist.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Fri Oct 27 2000 23:41:01 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -29,20 +29,20 @@
 #include "kvi_notifylist.h"
 #include "kvi_console.h"
 #include "kvi_ircsocket.h"
-#include "kvi_regusersdb.h"
+#include "KviRegisteredUserDataBase.h"
 #include "kvi_userlistview.h"
 #include "kvi_channel.h"
 #include "kvi_options.h"
 #include "kvi_window.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_out.h"
 #include "kvi_sparser.h"
-#include "kvi_ircmask.h"
+#include "KviIrcMask.h"
 #include "kvi_numeric.h"
-#include "kvi_parameterlist.h"
+#include "KviParameterList.h"
 #include "kvi_ircconnection.h"
 #include "kvi_app.h"
-#include "kvi_qstring.h"
+#include "KviQString.h"
 #include "kvi_lagmeter.h"
 #include "kvi_kvs_eventtriggers.h"
 
@@ -522,7 +522,7 @@ bool KviIsOnNotifyListManager::handleIsOn(KviIrcMessage *msg)
 	KviPointerList<QString> tmplist;
 	tmplist.setAutoDelete(false);
 
-	KviStr nk;
+	KviCString nk;
 	const char * aux = msg->trailing();
 
 	while(*aux)
@@ -790,7 +790,7 @@ bool KviIsOnNotifyListManager::handleUserhost(KviIrcMessage *msg)
 	KviPointerList<KviIrcMask> tmplist;
 	tmplist.setAutoDelete(true);
 
-	KviStr nk;
+	KviCString nk;
 	const char * aux = msg->trailing();
 
 	while(*aux)
@@ -800,9 +800,9 @@ bool KviIsOnNotifyListManager::handleUserhost(KviIrcMessage *msg)
 		if(nk.hasData())
 		{
 			// split it in a mask
-			KviStr nick;
-			KviStr user;
-			KviStr host;
+			KviCString nick;
+			KviCString user;
+			KviCString host;
 
 			int idx = nk.findFirstIdx('=');
 			if(idx != -1)
@@ -985,7 +985,7 @@ bool KviStupidNotifyListManager::handleIsOn(KviIrcMessage * msg)
 	if(m_pConnection->lagMeter())
 		m_pConnection->lagMeter()->lagCheckComplete("@notify_naive");
 
-	KviStr nk;
+	KviCString nk;
 	const char * aux = msg->trailing();
 	while(*aux)
 	{
diff --git a/src/kvirc/kernel/kvi_notifylist.h b/src/kvirc/kernel/kvi_notifylist.h
index 516b26b8d..f3a2e09ee 100644
--- a/src/kvirc/kernel/kvi_notifylist.h
+++ b/src/kvirc/kernel/kvi_notifylist.h
@@ -7,7 +7,7 @@
 //   Creation date : Fri Oct 27 2000 23:39:09 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -27,9 +27,9 @@
 
 
 #include "kvi_settings.h"
-#include "kvi_qstring.h"
-#include "kvi_pointerlist.h"
-#include "kvi_pointerhashtable.h"
+#include "KviQString.h"
+#include "KviPointerList.h"
+#include "KviPointerHashTable.h"
 
 #include <QObject>
 #include <QTimer>
diff --git a/src/kvirc/kernel/kvi_options.cpp b/src/kvirc/kernel/kvi_options.cpp
index 89469db35..deea9046c 100644
--- a/src/kvirc/kernel/kvi_options.cpp
+++ b/src/kvirc/kernel/kvi_options.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Tue Jun 20 2000 11:42:00 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -28,21 +28,21 @@
 
 #include "kvi_options.h"
 #include "kvi_defaults.h"
-#include "kvi_config.h"
+#include "KviConfigurationFile.h"
 #include "kvi_app.h"
 #include "kvi_iconmanager.h"
-#include "kvi_mirccntrl.h"
-#include "kvi_locale.h"
+#include "KviMircCntrl.h"
+#include "KviLocale.h"
 #include "kvi_confignames.h"
 #include "kvi_window.h"
 #include "kvi_out.h"
-#include "kvi_stringconversion.h"
+#include "KviStringConversion.h"
 #include "kvi_settings.h"
 #include "kvi_splash.h"
 #include "kvi_frame.h"
 #include "kvi_internalcmd.h"
 #include "kvi_theme.h"
-#include "kvi_fileutils.h"
+#include "KviFileUtils.h"
 //#include "kvi_textencoding.h"
 
 #include <QMessageBox>
@@ -703,16 +703,16 @@ KviFontOption g_fontOptionsTable[KVI_NUM_FONT_OPTIONS]=
 };
 
 #define MSGTYPE_OPTION(_name,_text,_icon,_levl) \
-	KviMsgTypeOption( \
+	KviMessageTypeSettingsOption( \
 		KVI_MSGTYPE_OPTIONS_PREFIX _name, \
-		KviMsgType(_text,_icon,KVI_BLACK,KVI_TRANSPARENT,true,_levl), \
+		KviMessageTypeSettings(_text,_icon,KVI_BLACK,KVI_TRANSPARENT,true,_levl), \
 		KviOption_sectFlagMsgType | KviOption_groupTheme \
 	)
 
 #define MSGTYPE_OPTION_SPEC(_name,_text,_icon,_fore,_back,_levl) \
-	KviMsgTypeOption( \
+	KviMessageTypeSettingsOption( \
 		KVI_MSGTYPE_OPTIONS_PREFIX _name, \
-		KviMsgType(_text,_icon,_fore,_back,true,_levl), \
+		KviMessageTypeSettings(_text,_icon,_fore,_back,true,_levl), \
 		KviOption_sectFlagMsgType | KviOption_groupTheme \
 	)
 
@@ -720,7 +720,7 @@ KviFontOption g_fontOptionsTable[KVI_NUM_FONT_OPTIONS]=
 
 // FIXME: #warning "FIX THE ICONS HERE!!!"
 
-KviMsgTypeOption g_msgtypeOptionsTable[KVI_NUM_MSGTYPE_OPTIONS]=
+KviMessageTypeSettingsOption g_msgtypeOptionsTable[KVI_NUM_MSGTYPE_OPTIONS]=
 {
 	MSGTYPE_OPTION("Echo",__tr_no_lookup("Normal text"),KVI_SMALLICON_NONE,KVI_MSGTYPE_LEVEL_1),
 	MSGTYPE_OPTION_SPEC("Selection",__tr_no_lookup("Selection"),KVI_SMALLICON_NONE,KVI_WHITE,KVI_BLACK,KVI_MSGTYPE_LEVEL_1),
@@ -882,7 +882,7 @@ static const char * options_section_table[KVI_NUM_OPTION_SECT_FLAGS] =
 	"Recent",        "Geometry"
 };
 
-static void config_set_section(int flag,KviConfig * cfg)
+static void config_set_section(int flag,KviConfigurationFile * cfg)
 {
 	int index = flag & KviOption_sectMask;
 	if((index < KVI_NUM_OPTION_SECT_FLAGS) && (index >= 0))
@@ -896,7 +896,7 @@ void KviApp::loadOptions()
 	QString buffer;
 	if(getReadOnlyConfigPath(buffer,KVI_CONFIGFILE_MAIN))
 	{
-		KviConfig cfg(buffer,KviConfig::Read);
+		KviConfigurationFile cfg(buffer,KviConfigurationFile::Read);
 
 		int prg = 12;
 		int i;
@@ -945,7 +945,7 @@ void KviApp::saveOptions()
 	saveRecentChannels();
 
 	getLocalKvircDirectory(buffer,Config,KVI_CONFIGFILE_MAIN);
-	KviConfig cfg(buffer,KviConfig::Write);
+	KviConfigurationFile cfg(buffer,KviConfigurationFile::Write);
 
 	if(!cfg.ensureWritable())
 	{
@@ -1042,7 +1042,7 @@ namespace KviTheme
 		szD.append(KVI_PATH_SEPARATOR_CHAR);
 		szD.append(KVI_THEMEDATA_FILE_NAME);
 
-		KviConfig cfg(szD,KviConfig::Write);
+		KviConfigurationFile cfg(szD,KviConfigurationFile::Write);
 
 		cfg.setGroup(KVI_THEMEDATA_CONFIG_GROUP);
 
@@ -1168,7 +1168,7 @@ namespace KviTheme
 		KviQString::ensureLastCharIs(szD,KVI_PATH_SEPARATOR_CHAR);
 		szD.append(KVI_THEMEDATA_FILE_NAME);
 
-		KviConfig cfg(szD,KviConfig::Read);
+		KviConfigurationFile cfg(szD,KviConfigurationFile::Read);
 
 		cfg.setGroup(KVI_THEMEDATA_CONFIG_GROUP);
 
diff --git a/src/kvirc/kernel/kvi_options.h b/src/kvirc/kernel/kvi_options.h
index 68a8b7d9a..3876cd788 100644
--- a/src/kvirc/kernel/kvi_options.h
+++ b/src/kvirc/kernel/kvi_options.h
@@ -7,7 +7,7 @@
 //   Creation date : Tue Jun 20 2000 12:42:07 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -26,9 +26,9 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_string.h"
-#include "kvi_pixmap.h"
-#include "kvi_msgtype.h"
+#include "KviCString.h"
+#include "KviPixmap.h"
+#include "KviMessageTypeSettings.h"
 
 #include <QRect>
 #include <QPixmap>
@@ -60,7 +60,7 @@ DECLARE_OPTION_STRUCT(KviFontOption,QFont)
 DECLARE_OPTION_STRUCT(KviPixmapOption,KviPixmap)
 //DECLARE_OPTION_STRUCT(KviIntOption,int)
 DECLARE_OPTION_STRUCT(KviUIntOption,unsigned int)
-DECLARE_OPTION_STRUCT(KviMsgTypeOption,KviMsgType)
+DECLARE_OPTION_STRUCT(KviMessageTypeSettingsOption,KviMessageTypeSettings)
 DECLARE_OPTION_STRUCT(KviStringListOption,QStringList)
 
 #define KVI_COLOR_EXT_USER_OP 		50
@@ -663,7 +663,7 @@ extern KVIRC_API KviPixmapOption     g_pixmapOptionsTable[KVI_NUM_PIXMAP_OPTIONS
 //	extern KviIntOption        g_intOptionsTable[KVI_NUM_INT_OPTIONS];
 extern KVIRC_API KviUIntOption       g_uintOptionsTable[KVI_NUM_UINT_OPTIONS];
 extern KVIRC_API KviFontOption       g_fontOptionsTable[KVI_NUM_FONT_OPTIONS];
-extern KVIRC_API KviMsgTypeOption    g_msgtypeOptionsTable[KVI_NUM_MSGTYPE_OPTIONS];
+extern KVIRC_API KviMessageTypeSettingsOption    g_msgtypeOptionsTable[KVI_NUM_MSGTYPE_OPTIONS];
 extern KVIRC_API KviColorOption      g_mirccolorOptionsTable[KVI_NUM_MIRCCOLOR_OPTIONS];
 extern KVIRC_API KviColorOption      g_iccolorOptionsTable[KVI_NUM_ICCOLOR_OPTIONS];
 extern KVIRC_API KviStringListOption g_stringlistOptionsTable[KVI_NUM_STRINGLIST_OPTIONS];
diff --git a/src/kvirc/kernel/kvi_out.h b/src/kvirc/kernel/kvi_out.h
index ce0317d77..d702f874e 100644
--- a/src/kvirc/kernel/kvi_out.h
+++ b/src/kvirc/kernel/kvi_out.h
@@ -6,7 +6,7 @@
 //   Creation date : Fri Jun 30 2000 14:13:21 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
diff --git a/src/kvirc/kernel/kvi_sslmaster.cpp b/src/kvirc/kernel/kvi_sslmaster.cpp
index c88bf4843..0acae6285 100644
--- a/src/kvirc/kernel/kvi_sslmaster.cpp
+++ b/src/kvirc/kernel/kvi_sslmaster.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Mon Jun 17 2002 20:34:00 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2002-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2002-2010 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
@@ -29,8 +29,8 @@
 #include "kvi_window.h"
 #include "kvi_options.h"
 #include "kvi_out.h"
-#include "kvi_mirccntrl.h"
-#include "kvi_locale.h"
+#include "KviMircCntrl.h"
+#include "KviLocale.h"
 #include "kvi_kvs_variant.h"
 
 #ifdef COMPILE_ON_WINDOWS
@@ -81,7 +81,7 @@ KVIRC_API void printSSLCertificate(KviWindow * wnd,const char * description,KviS
 	wnd->output(KVI_OUT_SSL,__tr2qs("[SSL]:     Locality: %c%s"),KVI_TEXT_BOLD,c->issuerLocality());
 	wnd->output(KVI_OUT_SSL,__tr2qs("[SSL]:   Public key: %c%s (%d bits)"),KVI_TEXT_BOLD,c->publicKeyType(),c->publicKeyBits());
 	wnd->output(KVI_OUT_SSL,__tr2qs("[SSL]:   Signature type: %c%s"),KVI_TEXT_BOLD,c->signatureType());
-	KviStr tmp = c->signatureContents();
+	KviCString tmp = c->signatureContents();
 	if(tmp.len() > 40)
 	{
 		tmp.cutRight(tmp.len() - 40);
@@ -118,7 +118,7 @@ KVIRC_API KviSSL * allocSSL(KviWindow * wnd,kvi_socket_t sock,KviSSL::Method m,c
 		return 0;
 	}
 
-	if(!contextString)contextString = KviStr::emptyString().ptr();
+	if(!contextString)contextString = KviCString::emptyString().ptr();
 
 	if(KVI_OPTION_BOOL(KviOption_boolUseSSLCertificate))
 	{
@@ -134,7 +134,7 @@ KVIRC_API KviSSL * allocSSL(KviWindow * wnd,kvi_socket_t sock,KviSSL::Method m,c
 			break;
 			default:
 			{
-				KviStr buffer;
+				KviCString buffer;
 				while(s->getLastErrorString(buffer))
 				{
 					if(wnd)wnd->output(KVI_OUT_SSL,__tr2qs("[%s]: [SSL ERROR]: %s"),contextString,buffer.ptr());
@@ -157,7 +157,7 @@ KVIRC_API KviSSL * allocSSL(KviWindow * wnd,kvi_socket_t sock,KviSSL::Method m,c
 			break;
 			default:
 			{
-				KviStr buffer;
+				KviCString buffer;
 				while(s->getLastErrorString(buffer))
 				{
 					if(wnd)wnd->output(KVI_OUT_SSL,__tr2qs("[%s]: [SSL ERROR]: %s"),contextString,buffer.ptr());
diff --git a/src/kvirc/kernel/kvi_sslmaster.h b/src/kvirc/kernel/kvi_sslmaster.h
index e7d3e7e55..1725cfde3 100644
--- a/src/kvirc/kernel/kvi_sslmaster.h
+++ b/src/kvirc/kernel/kvi_sslmaster.h
@@ -6,7 +6,7 @@
 //   Creation date : Mon Jun 17 2002 20:34:00 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2002-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2002-2010 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
diff --git a/src/kvirc/kernel/kvi_texticonmanager.cpp b/src/kvirc/kernel/kvi_texticonmanager.cpp
index 905f82eca..058ec1fc3 100644
--- a/src/kvirc/kernel/kvi_texticonmanager.cpp
+++ b/src/kvirc/kernel/kvi_texticonmanager.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Thu 15 May 2002 12:04:12 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2002-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2002-2010 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
@@ -26,12 +26,12 @@
 
 #include "kvi_iconmanager.h"
 #include "kvi_texticonmanager.h"
-#include "kvi_string.h"
-#include "kvi_pointerlist.h"
-#include "kvi_config.h"
+#include "KviCString.h"
+#include "KviPointerList.h"
+#include "KviConfigurationFile.h"
 #include "kvi_app.h"
 #include "kvi_confignames.h"
-#include "kvi_animatedpixmap.h"
+#include "KviAnimatedPixmap.h"
 #include "kvi_options.h"
 
 #include <QPixmap>
@@ -214,15 +214,15 @@ int KviTextIconManager::load(const QString & szFileName, bool bMerge)
 {
 	if(!bMerge) m_pTextIconDict->clear();
 
-	KviConfig cfg(szFileName,KviConfig::Read);
+	KviConfigurationFile cfg(szFileName,KviConfigurationFile::Read);
 
 	cfg.setGroup("Manager");
 	int iUpd = cfg.readIntEntry("ConfigUpdate",0);
 
-	KviConfigGroup * pDict = cfg.dict()->find("TextIcons");
+	KviConfigurationFileGroup * pDict = cfg.dict()->find("TextIcons");
 	if(pDict)
 	{
-		KviConfigGroupIterator it(*pDict);
+		KviConfigurationFileGroupIterator it(*pDict);
 
 		KviPointerList<QString> names;
 		names.setAutoDelete(true);
@@ -286,7 +286,7 @@ int KviTextIconManager::load(const QString & szFileName, bool bMerge)
 
 void KviTextIconManager::save(const QString & szFileName)
 {
-	KviConfig cfg(szFileName,KviConfig::Write);
+	KviConfigurationFile cfg(szFileName,KviConfigurationFile::Write);
 
 	cfg.setGroup("Manager");
 	cfg.writeEntry("ConfigUpdate",TEXTICONMANAGER_CURRENT_CONFIG_UPDATE);
diff --git a/src/kvirc/kernel/kvi_texticonmanager.h b/src/kvirc/kernel/kvi_texticonmanager.h
index 58f444f05..eeeca2564 100644
--- a/src/kvirc/kernel/kvi_texticonmanager.h
+++ b/src/kvirc/kernel/kvi_texticonmanager.h
@@ -7,7 +7,7 @@
 //   Creation date : Thu 15 May 2002 12:04:12 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2002-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2002-2010 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
@@ -34,8 +34,8 @@
 */
 
 #include "kvi_settings.h"
-#include "kvi_pointerhashtable.h"
-#include "kvi_animatedpixmap.h"
+#include "KviPointerHashTable.h"
+#include "KviAnimatedPixmap.h"
 
 #include <QPixmap>
 
diff --git a/src/kvirc/kernel/kvi_theme.cpp b/src/kvirc/kernel/kvi_theme.cpp
index f221d330d..56adc7e75 100644
--- a/src/kvirc/kernel/kvi_theme.cpp
+++ b/src/kvirc/kernel/kvi_theme.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Mon Jan 08 2007 03:23:00 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)
+//   Copyright (C) 2007-2010 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
@@ -24,10 +24,10 @@
 
 
 #include "kvi_theme.h"
-#include "kvi_fileutils.h"
-#include "kvi_config.h"
-#include "kvi_locale.h"
-#include "kvi_miscutils.h"
+#include "KviFileUtils.h"
+#include "KviConfigurationFile.h"
+#include "KviLocale.h"
+#include "KviMiscUtils.h"
 #include "kvi_sourcesdate.h"
 
 #include <QImage>
@@ -58,7 +58,7 @@ bool KviThemeInfo::load(const QString &szThemeFileName)
 		return false;
 	}
 
-	KviConfig cfg(szThemeFileName,KviConfig::Read);
+	KviConfigurationFile cfg(szThemeFileName,KviConfigurationFile::Read);
 
 	cfg.setGroup(KVI_THEMEINFO_CONFIG_GROUP);
 
@@ -99,7 +99,7 @@ bool KviThemeInfo::load(const QString &szThemeFileName)
 
 bool KviThemeInfo::save(const QString &szThemeFileName)
 {
-	KviConfig inf(szThemeFileName,KviConfig::Write);
+	KviConfigurationFile inf(szThemeFileName,KviConfigurationFile::Write);
 
 	inf.clear();
 
diff --git a/src/kvirc/kernel/kvi_theme.h b/src/kvirc/kernel/kvi_theme.h
index 9107e8805..26119ff4c 100644
--- a/src/kvirc/kernel/kvi_theme.h
+++ b/src/kvirc/kernel/kvi_theme.h
@@ -7,7 +7,7 @@
 //   Creation date : Mon Jan 08 2007 03:23:00 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)
+//   Copyright (C) 2007-2010 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
@@ -26,8 +26,8 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_qstring.h"
-#include "kvi_heapobject.h"
+#include "KviQString.h"
+#include "KviHeapObject.h"
 #include "kvi_fileextensions.h"
 
 #include <QPixmap>
diff --git a/src/kvirc/kernel/kvi_useraction.cpp b/src/kvirc/kernel/kvi_useraction.cpp
index eee60fb94..90a96d082 100644
--- a/src/kvirc/kernel/kvi_useraction.cpp
+++ b/src/kvirc/kernel/kvi_useraction.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Tue Mar 18 2003 13:36:12 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2003-2010 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
diff --git a/src/kvirc/kernel/kvi_useraction.h b/src/kvirc/kernel/kvi_useraction.h
index cfcf54427..a9ebabd5b 100644
--- a/src/kvirc/kernel/kvi_useraction.h
+++ b/src/kvirc/kernel/kvi_useraction.h
@@ -7,7 +7,7 @@
 //   Creation date : Tue Mar 18 2003 13:36:12 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2003-2010 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
diff --git a/src/kvirc/kernel/kvi_userinput.cpp b/src/kvirc/kernel/kvi_userinput.cpp
index e1fbef7b8..b6625ec81 100644
--- a/src/kvirc/kernel/kvi_userinput.cpp
+++ b/src/kvirc/kernel/kvi_userinput.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Sun 25 Sep 2005 05:27:57 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC Client distribution
-//   Copyright (C) 2005-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2005-2010 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
@@ -26,7 +26,7 @@
 #include "kvi_kvs_variantlist.h"
 #include "kvi_console.h"
 #include "kvi_kvs_script.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_ircconnection.h"
 #include "kvi_ircconnectionuserinfo.h"
 #include "kvi_out.h"
diff --git a/src/kvirc/kernel/kvi_userinput.h b/src/kvirc/kernel/kvi_userinput.h
index 28dba4bae..1dc02114f 100644
--- a/src/kvirc/kernel/kvi_userinput.h
+++ b/src/kvirc/kernel/kvi_userinput.h
@@ -6,7 +6,7 @@
 //   Creation date : Sun 25 Sep 2005 05:27:57 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC Client distribution
-//   Copyright (C) 2005-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2005-2010 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
@@ -31,7 +31,7 @@
 */
 
 #include "kvi_settings.h"
-#include "kvi_qstring.h"
+#include "KviQString.h"
 #include "kvi_window.h"
 
 /**
diff --git a/src/kvirc/kvs/kvi_kvs.cpp b/src/kvirc/kvs/kvi_kvs.cpp
index ae54bf877..ef43b12a7 100644
--- a/src/kvirc/kvs/kvi_kvs.cpp
+++ b/src/kvirc/kvs/kvi_kvs.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Wed 1 Oct 2003 01.38 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2003-2010 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
diff --git a/src/kvirc/kvs/kvi_kvs.h b/src/kvirc/kvs/kvi_kvs.h
index 1c34d321d..911af71f6 100644
--- a/src/kvirc/kvs/kvi_kvs.h
+++ b/src/kvirc/kvs/kvi_kvs.h
@@ -6,7 +6,7 @@
 //   Creation date : Wed 1 Oct 2003 01.37 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2003-2010 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
diff --git a/src/kvirc/kvs/kvi_kvs_aliasmanager.cpp b/src/kvirc/kvs/kvi_kvs_aliasmanager.cpp
index fda039c4f..eacbeceb4 100644
--- a/src/kvirc/kvs/kvi_kvs_aliasmanager.cpp
+++ b/src/kvirc/kvs/kvi_kvs_aliasmanager.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Mon 15 Dec 2003 02:11:41 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
@@ -25,7 +25,7 @@
 
 
 #include "kvi_kvs_aliasmanager.h"
-#include "kvi_config.h"
+#include "KviConfigurationFile.h"
 
 KviKvsAliasManager * KviKvsAliasManager::m_pAliasManager = 0;
 
@@ -113,7 +113,7 @@ void KviKvsAliasManager::completeCommand(const QString &word,KviPointerList<QStr
 
 void KviKvsAliasManager::save(const QString & filename)
 {
-	KviConfig cfg(filename,KviConfig::Write);
+	KviConfigurationFile cfg(filename,KviConfigurationFile::Write);
 	cfg.clear();
 
 	KviPointerHashTableIterator<QString,KviKvsScript> it(*m_pAliasDict);
@@ -129,9 +129,9 @@ void KviKvsAliasManager::save(const QString & filename)
 void KviKvsAliasManager::load(const QString & filename)
 {
 	m_pAliasDict->clear();
-	KviConfig cfg(filename,KviConfig::Read);
+	KviConfigurationFile cfg(filename,KviConfigurationFile::Read);
 
-	KviConfigIterator it(*(cfg.dict()));
+	KviConfigurationFileIterator it(*(cfg.dict()));
 
 	KviPointerList<QString> l;
 	l.setAutoDelete(true);
diff --git a/src/kvirc/kvs/kvi_kvs_aliasmanager.h b/src/kvirc/kvs/kvi_kvs_aliasmanager.h
index 833725f6a..ea9c9314a 100644
--- a/src/kvirc/kvs/kvi_kvs_aliasmanager.h
+++ b/src/kvirc/kvs/kvi_kvs_aliasmanager.h
@@ -6,7 +6,7 @@
 //   Creation date : Mon 15 Dec 2003 02:11:41 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
@@ -25,10 +25,10 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_pointerhashtable.h"
+#include "KviPointerHashTable.h"
 
-#include "kvi_pointerlist.h"
-#include "kvi_qstring.h"
+#include "KviPointerList.h"
+#include "KviQString.h"
 
 #include "kvi_kvs_script.h"
 
diff --git a/src/kvirc/kvs/kvi_kvs_array.cpp b/src/kvirc/kvs/kvi_kvs_array.cpp
index 12caedc1e..9a9c07d01 100644
--- a/src/kvirc/kvs/kvi_kvs_array.cpp
+++ b/src/kvirc/kvs/kvi_kvs_array.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Tue 07 Oct 2003 01:07:31 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
@@ -23,7 +23,7 @@
 //=============================================================================
 
 #include "kvi_kvs_array.h"
-#include "kvi_malloc.h"
+#include "KviMemory.h"
 
 #include <stdlib.h>
 
@@ -44,7 +44,7 @@ KviKvsArray::KviKvsArray(const KviKvsArray & array)
 	m_uAllocSize = array.m_uAllocSize;
 	if(m_uAllocSize > 0)
 	{
-		m_pData = (KviKvsVariant **)kvi_malloc((sizeof(KviKvsVariant *)) * m_uAllocSize);
+		m_pData = (KviKvsVariant **)KviMemory::allocate((sizeof(KviKvsVariant *)) * m_uAllocSize);
 		kvs_uint_t u;
 		for(u = 0; u < m_uSize; u++)
 		{
@@ -66,7 +66,7 @@ KviKvsArray::~KviKvsArray()
 			if(m_pData[u])
 				delete m_pData[u];
 		}
-		kvi_free(m_pData);
+		KviMemory::free(m_pData);
 	}
 }
 
@@ -148,9 +148,9 @@ void KviKvsArray::findNewSize()
 		// m_pData is non-zero here since was m_uSize > 0 initally
 		if(m_uSize > 0)
 		{
-			m_pData = (KviKvsVariant **)kvi_realloc(m_pData,(sizeof(KviKvsVariant *)) * m_uAllocSize);
+			m_pData = (KviKvsVariant **)KviMemory::reallocate(m_pData,(sizeof(KviKvsVariant *)) * m_uAllocSize);
 		} else {
-			kvi_free(m_pData);
+			KviMemory::free(m_pData);
 			m_pData = 0;
 		}
 	}
@@ -166,9 +166,9 @@ void KviKvsArray::set(kvs_uint_t uIdx, KviKvsVariant * pVal)
 			m_uAllocSize = uIdx + 1;
 
 		if(m_pData)
-			m_pData = (KviKvsVariant **)kvi_realloc(m_pData,(sizeof(KviKvsVariant *)) * m_uAllocSize);
+			m_pData = (KviKvsVariant **)KviMemory::reallocate(m_pData,(sizeof(KviKvsVariant *)) * m_uAllocSize);
 		else
-			m_pData = (KviKvsVariant **)kvi_malloc((sizeof(KviKvsVariant *)) * m_uAllocSize);
+			m_pData = (KviKvsVariant **)KviMemory::allocate((sizeof(KviKvsVariant *)) * m_uAllocSize);
 
 		for(kvs_uint_t u=m_uSize;u<uIdx;u++)
 			m_pData[u] = 0;
@@ -191,9 +191,9 @@ KviKvsVariant * KviKvsArray::getAt(kvs_uint_t uIdx)
 			m_uAllocSize = uIdx + 1;
 
 		if(m_pData)
-			m_pData = (KviKvsVariant **)kvi_realloc(m_pData,(sizeof(KviKvsVariant *)) * m_uAllocSize);
+			m_pData = (KviKvsVariant **)KviMemory::reallocate(m_pData,(sizeof(KviKvsVariant *)) * m_uAllocSize);
 		else
-			m_pData = (KviKvsVariant **)kvi_malloc((sizeof(KviKvsVariant *)) * m_uAllocSize);
+			m_pData = (KviKvsVariant **)KviMemory::allocate((sizeof(KviKvsVariant *)) * m_uAllocSize);
 
 		for(kvs_uint_t u = m_uSize; u < uIdx; u++)
 			m_pData[u] = 0;
diff --git a/src/kvirc/kvs/kvi_kvs_array.h b/src/kvirc/kvs/kvi_kvs_array.h
index f92b1616b..cded9ddea 100644
--- a/src/kvirc/kvs/kvi_kvs_array.h
+++ b/src/kvirc/kvs/kvi_kvs_array.h
@@ -32,7 +32,7 @@
 
 #include "kvi_settings.h"
 #include "kvi_kvs_variant.h"
-#include "kvi_heapobject.h"
+#include "KviHeapObject.h"
 
 /**
 * \class KviKvsArray
diff --git a/src/kvirc/kvs/kvi_kvs_arraycast.cpp b/src/kvirc/kvs/kvi_kvs_arraycast.cpp
index a8cc71057..99cbf933e 100644
--- a/src/kvirc/kvs/kvi_kvs_arraycast.cpp
+++ b/src/kvirc/kvs/kvi_kvs_arraycast.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Tue 10 May 2005 00:05:50 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2005-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2005-2010 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
diff --git a/src/kvirc/kvs/kvi_kvs_arraycast.h b/src/kvirc/kvs/kvi_kvs_arraycast.h
index 8633f2256..806b1f040 100644
--- a/src/kvirc/kvs/kvi_kvs_arraycast.h
+++ b/src/kvirc/kvs/kvi_kvs_arraycast.h
@@ -6,7 +6,7 @@
 //   Creation date : Tue 10 May 2005 00:05:50 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2005-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2005-2010 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
diff --git a/src/kvirc/kvs/kvi_kvs_asyncdnsoperation.cpp b/src/kvirc/kvs/kvi_kvs_asyncdnsoperation.cpp
index e9c4155b8..d4963d9c2 100644
--- a/src/kvirc/kvs/kvi_kvs_asyncdnsoperation.cpp
+++ b/src/kvirc/kvs/kvi_kvs_asyncdnsoperation.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Sun 10 Jul 2005 04:36:15 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC Client distribution
-//   Copyright (C) 2005-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2005-2010 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
@@ -30,7 +30,7 @@
 #include "kvi_kvs_variant.h"
 #include "kvi_app.h"
 #include "kvi_out.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_error.h"
 #include "kvi_kvs_variantlist.h"
 
diff --git a/src/kvirc/kvs/kvi_kvs_asyncdnsoperation.h b/src/kvirc/kvs/kvi_kvs_asyncdnsoperation.h
index 2ac4f3482..97a4f615f 100644
--- a/src/kvirc/kvs/kvi_kvs_asyncdnsoperation.h
+++ b/src/kvirc/kvs/kvi_kvs_asyncdnsoperation.h
@@ -6,7 +6,7 @@
 //   Creation date : Sun 10 Jul 2005 04:36:15 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC Client distribution
-//   Copyright (C) 2005-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2005-2010 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
@@ -26,7 +26,7 @@
 
 #include "kvi_settings.h"
 #include "kvi_kvs_asyncoperation.h"
-#include "kvi_qstring.h"
+#include "KviQString.h"
 #include "kvi_dns.h"
 
 class KviWindow;
diff --git a/src/kvirc/kvs/kvi_kvs_asyncoperation.cpp b/src/kvirc/kvs/kvi_kvs_asyncoperation.cpp
index bc1fdd09b..635ac758a 100644
--- a/src/kvirc/kvs/kvi_kvs_asyncoperation.cpp
+++ b/src/kvirc/kvs/kvi_kvs_asyncoperation.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Sat 09 Jul 2005 04:54:24 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC Client distribution
-//   Copyright (C) 2005-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2005-2010 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
diff --git a/src/kvirc/kvs/kvi_kvs_asyncoperation.h b/src/kvirc/kvs/kvi_kvs_asyncoperation.h
index 2c9113372..b9288332b 100644
--- a/src/kvirc/kvs/kvi_kvs_asyncoperation.h
+++ b/src/kvirc/kvs/kvi_kvs_asyncoperation.h
@@ -6,7 +6,7 @@
 //   Creation date : Sat 09 Jul 2005 04:54:24 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC Client distribution
-//   Copyright (C) 2005-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2005-2010 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
@@ -25,7 +25,7 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_pointerlist.h"
+#include "KviPointerList.h"
 
 #include <QObject>
 
diff --git a/src/kvirc/kvs/kvi_kvs_callbackobject.cpp b/src/kvirc/kvs/kvi_kvs_callbackobject.cpp
index 010cff221..d6c9bdf96 100644
--- a/src/kvirc/kvs/kvi_kvs_callbackobject.cpp
+++ b/src/kvirc/kvs/kvi_kvs_callbackobject.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Mon 21 Nov 2005 01:46:51 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC Client distribution
-//   Copyright (C) 2005-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2005-2010 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
diff --git a/src/kvirc/kvs/kvi_kvs_callbackobject.h b/src/kvirc/kvs/kvi_kvs_callbackobject.h
index da60ee333..11f13d695 100644
--- a/src/kvirc/kvs/kvi_kvs_callbackobject.h
+++ b/src/kvirc/kvs/kvi_kvs_callbackobject.h
@@ -6,7 +6,7 @@
 //   Creation date : Mon 21 Nov 2005 01:46:51 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC Client distribution
-//   Copyright (C) 2005-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2005-2010 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
@@ -25,10 +25,10 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_heapobject.h"
+#include "KviHeapObject.h"
 
 #include "kvi_window.h"
-#include "kvi_qstring.h"
+#include "KviQString.h"
 #include "kvi_kvs_variantlist.h"
 #include "kvi_kvs_script.h"
 
diff --git a/src/kvirc/kvs/kvi_kvs_corecallbackcommands.cpp b/src/kvirc/kvs/kvi_kvs_corecallbackcommands.cpp
index e0fdb98dc..83c7e8947 100644
--- a/src/kvirc/kvs/kvi_kvs_corecallbackcommands.cpp
+++ b/src/kvirc/kvs/kvi_kvs_corecallbackcommands.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Fri 31 Oct 2003 04:07:58 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
@@ -35,12 +35,12 @@
 #include "kvi_kvs_processmanager.h"
 #include "kvi_kvs_object_controller.h"
 
-#include "kvi_cmdformatter.h"
+#include "KviCommandFormatter.h"
 #include "kvi_ircconnectionasyncwhoisdata.h"
 #include "kvi_ircconnection.h"
 #include "kvi_scriptbutton.h"
 #include "kvi_iconmanager.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 
 #include "kvi_tal_tooltip.h"
 
diff --git a/src/kvirc/kvs/kvi_kvs_corecallbackcommands.h b/src/kvirc/kvs/kvi_kvs_corecallbackcommands.h
index c2b81a300..bee51ddb2 100644
--- a/src/kvirc/kvs/kvi_kvs_corecallbackcommands.h
+++ b/src/kvirc/kvs/kvi_kvs_corecallbackcommands.h
@@ -6,7 +6,7 @@
 //   Creation date : Fri 31 Oct 2003 04:07:58 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
diff --git a/src/kvirc/kvs/kvi_kvs_corefunctions.cpp b/src/kvirc/kvs/kvi_kvs_corefunctions.cpp
index c056cb8ed..50d69e548 100644
--- a/src/kvirc/kvs/kvi_kvs_corefunctions.cpp
+++ b/src/kvirc/kvs/kvi_kvs_corefunctions.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Fri 31 Oct 2003 01:52:04 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
@@ -27,7 +27,7 @@
 #include "kvi_kvs_corefunctions.h"
 #include "kvi_kvs_kernel.h"
 #include "kvi_kvs_object.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 
 namespace KviKvsCoreFunctions
 {
diff --git a/src/kvirc/kvs/kvi_kvs_corefunctions.h b/src/kvirc/kvs/kvi_kvs_corefunctions.h
index a12f8db83..6026ccb89 100644
--- a/src/kvirc/kvs/kvi_kvs_corefunctions.h
+++ b/src/kvirc/kvs/kvi_kvs_corefunctions.h
@@ -6,7 +6,7 @@
 //   Creation date : Fri 31 Oct 2003 01:52:04 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
diff --git a/src/kvirc/kvs/kvi_kvs_corefunctions_af.cpp b/src/kvirc/kvs/kvi_kvs_corefunctions_af.cpp
index fe75473fb..1d0900fdb 100644
--- a/src/kvirc/kvs/kvi_kvs_corefunctions_af.cpp
+++ b/src/kvirc/kvs/kvi_kvs_corefunctions_af.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Fri 31 Oct 2003 01:52:04 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 Szymon Stefanek <pragma at kvirc dot net>
 //   Copyright ©        2010 Kai Wasserbäch <debian@carbon-project.org>
 //
 //   This program is FREE software. You can redistribute it and/or
@@ -28,18 +28,18 @@
 #include "kvi_kvs_corefunctions.h"
 #include "kvi_kvs_kernel.h"
 #include "kvi_kvs_object_controller.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_app.h"
 #include "kvi_channel.h"
 #include "kvi_console.h"
 #include "kvi_ircconnection.h"
 #include "kvi_ircconnectionuserinfo.h"
-#include "kvi_mirccntrl.h"
-#include "kvi_avatar.h"
-#include "kvi_ircuserdb.h"
+#include "KviMircCntrl.h"
+#include "KviAvatar.h"
+#include "KviIrcUserDataBase.h"
 #include "kvi_frame.h"
 #include "kvi_statusbar.h"
-#include "kvi_qstring.h"
+#include "KviQString.h"
 #include "kvi_sslmaster.h"
 #include "kvi_options.h"
 
@@ -190,10 +190,10 @@ namespace KviKvsCoreFunctions
 			KVSCF_PARAMETER("ascii_string",KVS_PT_STRING,0,szAscii)
 		KVSCF_PARAMETERS_END
 
-		KviStr tmp1(szAscii);
+		KviCString tmp1(szAscii);
 		if(tmp1.len() > 0)
 		{
-			KviStr tmp2;
+			KviCString tmp2;
 			tmp2.bufferToBase64(tmp1.ptr(),tmp1.len());
 			KVSCF_pRetBuffer->setString(QString(tmp2.ptr()));
 		} else {
@@ -232,10 +232,10 @@ namespace KviKvsCoreFunctions
 			KVSCF_PARAMETER("ascii_string",KVS_PT_STRING,0,szAscii)
 		KVSCF_PARAMETERS_END
 
-		KviStr tmp1(szAscii);
+		KviCString tmp1(szAscii);
 		if(tmp1.len() > 0)
 		{
-			KviStr tmp2;
+			KviCString tmp2;
 			tmp2.bufferToHex(tmp1.ptr(),tmp1.len());
 			KVSCF_pRetBuffer->setString(QString(tmp2.ptr()));
 		} else {
@@ -398,13 +398,13 @@ namespace KviKvsCoreFunctions
 			KVSCF_PARAMETER("base64_encoded_string",KVS_PT_STRING,0,szBase64)
 		KVSCF_PARAMETERS_END
 
-		KviStr tmp1(szBase64);
+		KviCString tmp1(szBase64);
 		char * buf;
 		int len = tmp1.base64ToBuffer(&buf,true);
 		QString szRet(buf);
 		szRet.truncate(len);
 		KVSCF_pRetBuffer->setString(szRet);
-		KviStr::freeBuffer(buf);
+		KviCString::freeBuffer(buf);
 		return true;
 	}
 
diff --git a/src/kvirc/kvs/kvi_kvs_corefunctions_gl.cpp b/src/kvirc/kvs/kvi_kvs_corefunctions_gl.cpp
index b4b95361a..528b6064f 100644
--- a/src/kvirc/kvs/kvi_kvs_corefunctions_gl.cpp
+++ b/src/kvirc/kvs/kvi_kvs_corefunctions_gl.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Fri 31 Oct 2003 01:52:04 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
@@ -28,15 +28,15 @@
 #include "kvi_kvs_kernel.h"
 #include "kvi_kvs_timermanager.h"
 #include "kvi_kvs_arraycast.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_input.h"
 #include "kvi_app.h"
 #include "kvi_channel.h"
 #include "kvi_console.h"
 #include "kvi_iconmanager.h"
-#include "kvi_mirccntrl.h"
+#include "KviMircCntrl.h"
 #include "kvi_frame.h"
-#include "kvi_time.h"
+#include "KviTimeUtils.h"
 #include "kvi_kvs_eventmanager.h"
 #include "kvi_kvs_eventhandler.h"
 #include "kvi_lagmeter.h"
@@ -156,11 +156,11 @@ namespace KviKvsCoreFunctions
 			KVSCF_PARAMETER("hex_encoded_string",KVS_PT_STRING,0,szHex)
 		KVSCF_PARAMETERS_END
 
-		KviStr tmp1(szHex);
+		KviCString tmp1(szHex);
 		char * buf;
 		int len = tmp1.hexToBuffer(&buf,true);
 		KVSCF_pRetBuffer->setString(QString(QByteArray(buf,len)));
-		KviStr::freeBuffer(buf);
+		KviCString::freeBuffer(buf);
 		return true;
 	}
 
diff --git a/src/kvirc/kvs/kvi_kvs_corefunctions_mr.cpp b/src/kvirc/kvs/kvi_kvs_corefunctions_mr.cpp
index 68ef02e8e..d6ccb050e 100644
--- a/src/kvirc/kvs/kvi_kvs_corefunctions_mr.cpp
+++ b/src/kvirc/kvs/kvi_kvs_corefunctions_mr.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Fri 31 Oct 2003 01:52:04 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
@@ -28,13 +28,13 @@
 #include "kvi_kvs_kernel.h"
 #include "kvi_kvs_arraycast.h"
 #include "kvi_kvs_object_controller.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_ircconnection.h"
-#include "kvi_mirccntrl.h"
+#include "KviMircCntrl.h"
 #include "kvi_options.h"
 #include "kvi_console.h"
-#include "kvi_ircuserdb.h"
-#include "kvi_ircmask.h"
+#include "KviIrcUserDataBase.h"
+#include "KviIrcMask.h"
 #include "kvi_socket.h"
 #include "kvi_app.h"
 #include "kvi_query.h"
diff --git a/src/kvirc/kvs/kvi_kvs_corefunctions_sz.cpp b/src/kvirc/kvs/kvi_kvs_corefunctions_sz.cpp
index c678e1520..0217b3f3c 100644
--- a/src/kvirc/kvs/kvi_kvs_corefunctions_sz.cpp
+++ b/src/kvirc/kvs/kvi_kvs_corefunctions_sz.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Fri 31 Oct 2003 01:52:04 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
@@ -32,15 +32,15 @@
 
 #include "kvi_window.h"
 #include "kvi_out.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_app.h"
 #include "kvi_options.h"
 #include "kvi_channel.h"
 #include "kvi_console.h"
-#include "kvi_time.h"
-#include "kvi_ircuserdb.h"
+#include "KviTimeUtils.h"
+#include "KviIrcUserDataBase.h"
 #include "kvi_modulemanager.h"
-#include "kvi_mirccntrl.h"
+#include "KviMircCntrl.h"
 #include "kvi_sourcesdate.h"
 #include "kvi_socket.h"
 #include "kvi_buildinfo.h"
diff --git a/src/kvirc/kvs/kvi_kvs_coresimplecommands.cpp b/src/kvirc/kvs/kvi_kvs_coresimplecommands.cpp
index 3ae056837..483cc893b 100644
--- a/src/kvirc/kvs/kvi_kvs_coresimplecommands.cpp
+++ b/src/kvirc/kvs/kvi_kvs_coresimplecommands.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Fri 31 Oct 2003 00:04:25 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
@@ -28,7 +28,7 @@
 #include "kvi_kvs_kernel.h"
 #include "kvi_options.h"
 #include "kvi_ircconnection.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_kvs_treenode_command.h"
 
 #include <QRegExp>
diff --git a/src/kvirc/kvs/kvi_kvs_coresimplecommands.h b/src/kvirc/kvs/kvi_kvs_coresimplecommands.h
index fb9df47fe..1987e5e69 100644
--- a/src/kvirc/kvs/kvi_kvs_coresimplecommands.h
+++ b/src/kvirc/kvs/kvi_kvs_coresimplecommands.h
@@ -6,7 +6,7 @@
 //   Creation date : Fri 31 Oct 2003 00:04:25 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
diff --git a/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp b/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp
index 0d5e1c52b..200b622a9 100644
--- a/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp
+++ b/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Fri 31 Oct 2003 00:04:25 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
@@ -27,7 +27,7 @@
 
 #include "kvi_window.h"
 #include "kvi_out.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_app.h"
 #include "kvi_options.h"
 #include "kvi_ircview.h" // this is only for KviIrcView::NoTimestamp
diff --git a/src/kvirc/kvs/kvi_kvs_coresimplecommands_gl.cpp b/src/kvirc/kvs/kvi_kvs_coresimplecommands_gl.cpp
index 69b50695f..0d85bd8ba 100644
--- a/src/kvirc/kvs/kvi_kvs_coresimplecommands_gl.cpp
+++ b/src/kvirc/kvs/kvi_kvs_coresimplecommands_gl.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Fri 31 Oct 2003 00:04:25 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
@@ -26,10 +26,10 @@
 #include "kvi_kvs_timermanager.h"
 #include "kvi_kvs_asyncdnsoperation.h"
 #include "kvi_kvs_script.h"
-#include "kvi_fileutils.h"
+#include "KviFileUtils.h"
 #include "kvi_ircconnection.h"
 #include "kvi_ircconnectionserverinfo.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_out.h"
 
 namespace KviKvsCoreSimpleCommands
diff --git a/src/kvirc/kvs/kvi_kvs_coresimplecommands_mr.cpp b/src/kvirc/kvs/kvi_kvs_coresimplecommands_mr.cpp
index 26a0a0b3e..9be137000 100644
--- a/src/kvirc/kvs/kvi_kvs_coresimplecommands_mr.cpp
+++ b/src/kvirc/kvs/kvi_kvs_coresimplecommands_mr.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Fri 31 Oct 2003 00:04:25 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
@@ -27,12 +27,12 @@
 #include "kvi_window.h"
 #include "kvi_console.h"
 #include "kvi_query.h"
-#include "kvi_ircuserdb.h"
+#include "KviIrcUserDataBase.h"
 #include "kvi_out.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_app.h"
 #include "kvi_options.h"
-#include "kvi_fileutils.h"
+#include "KviFileUtils.h"
 #include "kvi_filedialog.h"
 #include "kvi_ircconnection.h"
 #include "kvi_channel.h"
diff --git a/src/kvirc/kvs/kvi_kvs_coresimplecommands_sz.cpp b/src/kvirc/kvs/kvi_kvs_coresimplecommands_sz.cpp
index 8f824e72d..7acaddded 100644
--- a/src/kvirc/kvs/kvi_kvs_coresimplecommands_sz.cpp
+++ b/src/kvirc/kvs/kvi_kvs_coresimplecommands_sz.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Fri 31 Oct 2003 00:04:25 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
@@ -29,7 +29,7 @@
 
 #include "kvi_ircconnection.h"
 #include "kvi_console.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_app.h"
 #include "kvi_asynchronousconnectiondata.h"
 #include "kvi_frame.h"
diff --git a/src/kvirc/kvs/kvi_kvs_dnsmanager.cpp b/src/kvirc/kvs/kvi_kvs_dnsmanager.cpp
index 8dd59a1ae..440c7f95c 100644
--- a/src/kvirc/kvs/kvi_kvs_dnsmanager.cpp
+++ b/src/kvirc/kvs/kvi_kvs_dnsmanager.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Wed 04 Aug 2004 04:38:31 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2004-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2004-2010 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
@@ -30,8 +30,8 @@
 #include "kvi_iconmanager.h"
 #include "kvi_kvs_script.h"
 #include "kvi_kvs_variantlist.h"
-#include "kvi_string.h"
-#include "kvi_locale.h"
+#include "KviCString.h"
+#include "KviLocale.h"
 #include "kvi_error.h"
 
 KviKvsDnsManager * KviKvsDnsManager::m_pInstance = 0;
diff --git a/src/kvirc/kvs/kvi_kvs_dnsmanager.h b/src/kvirc/kvs/kvi_kvs_dnsmanager.h
index 4aa8496ba..147b24c41 100644
--- a/src/kvirc/kvs/kvi_kvs_dnsmanager.h
+++ b/src/kvirc/kvs/kvi_kvs_dnsmanager.h
@@ -6,7 +6,7 @@
 //   Creation date : Wed 04 Aug 2004 04:38:31 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2004-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2004-2010 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
@@ -25,7 +25,7 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_pointerhashtable.h"
+#include "KviPointerHashTable.h"
 
 #include <QObject>
 #include <QString>
diff --git a/src/kvirc/kvs/kvi_kvs_event.cpp b/src/kvirc/kvs/kvi_kvs_event.cpp
index 418ac3b3f..28591b9b8 100644
--- a/src/kvirc/kvs/kvi_kvs_event.cpp
+++ b/src/kvirc/kvs/kvi_kvs_event.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Mon 23 Feb 2004 03:00:02 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2004-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2004-2010 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
diff --git a/src/kvirc/kvs/kvi_kvs_event.h b/src/kvirc/kvs/kvi_kvs_event.h
index 624dce5c0..4e0851289 100644
--- a/src/kvirc/kvs/kvi_kvs_event.h
+++ b/src/kvirc/kvs/kvi_kvs_event.h
@@ -6,7 +6,7 @@
 //   Creation date : Mon 23 Feb 2004 03:00:02 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2004-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2004-2010 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
@@ -25,8 +25,8 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_qstring.h"
-#include "kvi_pointerlist.h"
+#include "KviQString.h"
+#include "KviPointerList.h"
 
 #include "kvi_kvs_eventhandler.h"
 
diff --git a/src/kvirc/kvs/kvi_kvs_eventhandler.cpp b/src/kvirc/kvs/kvi_kvs_eventhandler.cpp
index 8e32d2ba6..013c9ef49 100644
--- a/src/kvirc/kvs/kvi_kvs_eventhandler.cpp
+++ b/src/kvirc/kvs/kvi_kvs_eventhandler.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Mon 23 Feb 2004 03:04:58 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2004-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2004-2010 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
diff --git a/src/kvirc/kvs/kvi_kvs_eventhandler.h b/src/kvirc/kvs/kvi_kvs_eventhandler.h
index 56b3067cd..5fbd2d314 100644
--- a/src/kvirc/kvs/kvi_kvs_eventhandler.h
+++ b/src/kvirc/kvs/kvi_kvs_eventhandler.h
@@ -6,7 +6,7 @@
 //   Creation date : Mon 23 Feb 2004 03:04:58 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2004-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2004-2010 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
@@ -26,9 +26,9 @@
 
 #include "kvi_settings.h"
 #include "kvi_kvs_script.h"
-#include "kvi_qstring.h"
+#include "KviQString.h"
 #include "kvi_kvs_moduleinterface.h"
-#include "kvi_heapobject.h"
+#include "KviHeapObject.h"
 
 class KVIRC_API KviKvsEventHandler : public KviHeapObject
 {
@@ -65,7 +65,7 @@ public:
 	// Static allocator function.
 	// This MUST be used by the modules to allocate event structures
 	// instead of the new operator.
-	// See kvi_heapobject.cpp for an explaination.
+	// See KviHeapObject.cpp for an explaination.
 	static KviKvsScriptEventHandler * createInstance(const QString &szHandlerName,const QString &szContextName,const QString &szCode,bool bEnabled = true);
 };
 
diff --git a/src/kvirc/kvs/kvi_kvs_eventmanager.cpp b/src/kvirc/kvs/kvi_kvs_eventmanager.cpp
index 1f1e1fb10..d6a48520c 100644
--- a/src/kvirc/kvs/kvi_kvs_eventmanager.cpp
+++ b/src/kvirc/kvs/kvi_kvs_eventmanager.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Thu Aug 17 2000 13:59:12 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2000-2010 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
@@ -23,11 +23,11 @@
 //=============================================================================
 
 #include "kvi_kvs_eventmanager.h"
-#include "kvi_config.h"
+#include "KviConfigurationFile.h"
 #include "kvi_kvs_script.h"
 #include "kvi_kvs_variant.h"
 #include "kvi_options.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_out.h"
 #include "kvi_module.h"
 #include "kvi_window.h"
@@ -524,7 +524,7 @@ bool KviKvsEventManager::triggerHandlers(KviPointerList<KviKvsEventHandler> * pH
 
 void KviKvsEventManager::loadRawEvents(const QString &szFileName)
 {
-	KviConfig cfg(szFileName,KviConfig::Read);
+	KviConfigurationFile cfg(szFileName,KviConfigurationFile::Read);
 	removeAllScriptRawHandlers();
 	int i;
 
@@ -559,7 +559,7 @@ void KviKvsEventManager::loadRawEvents(const QString &szFileName)
 
 void KviKvsEventManager::saveRawEvents(const QString &szFileName)
 {
-	KviConfig cfg(szFileName,KviConfig::Write);
+	KviConfigurationFile cfg(szFileName,KviConfigurationFile::Write);
 	cfg.clear();
 	int i;
 
@@ -593,7 +593,7 @@ void KviKvsEventManager::saveRawEvents(const QString &szFileName)
 
 void KviKvsEventManager::loadAppEvents(const QString &szFileName)
 {
-	KviConfig cfg(szFileName,KviConfig::Read);
+	KviConfigurationFile cfg(szFileName,KviConfigurationFile::Read);
 	removeAllScriptAppHandlers();
 
 	int i;
@@ -631,7 +631,7 @@ void KviKvsEventManager::loadAppEvents(const QString &szFileName)
 
 void KviKvsEventManager::saveAppEvents(const QString &szFileName)
 {
-	KviConfig cfg(szFileName,KviConfig::Write);
+	KviConfigurationFile cfg(szFileName,KviConfigurationFile::Write);
 	cfg.clear();
 	int i;
 	bool bCompat = FALSE;
diff --git a/src/kvirc/kvs/kvi_kvs_eventmanager.h b/src/kvirc/kvs/kvi_kvs_eventmanager.h
index f8953cebe..3df63a14f 100644
--- a/src/kvirc/kvs/kvi_kvs_eventmanager.h
+++ b/src/kvirc/kvs/kvi_kvs_eventmanager.h
@@ -6,7 +6,7 @@
 //   Creation date : Thu Aug 17 2000 13:59:12 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2000-2010 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
@@ -27,7 +27,7 @@
 #include "kvi_settings.h"
 
 #include "kvi_kvs_event.h"
-#include "kvi_pointerlist.h"
+#include "KviPointerList.h"
 #include "kvi_kvs_eventtable.h"
 
 class KviWindow;
diff --git a/src/kvirc/kvs/kvi_kvs_eventtable.cpp b/src/kvirc/kvs/kvi_kvs_eventtable.cpp
index a27c0f67f..4e7d444d1 100644
--- a/src/kvirc/kvs/kvi_kvs_eventtable.cpp
+++ b/src/kvirc/kvs/kvi_kvs_eventtable.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Mon 23 Feb 2004 03:23:18 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2004-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2004-2010 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
diff --git a/src/kvirc/kvs/kvi_kvs_eventtable.h b/src/kvirc/kvs/kvi_kvs_eventtable.h
index 75916f571..1ef45ba53 100644
--- a/src/kvirc/kvs/kvi_kvs_eventtable.h
+++ b/src/kvirc/kvs/kvi_kvs_eventtable.h
@@ -6,7 +6,7 @@
 //   Creation date : Mon 23 Feb 2004 03:23:18 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2004-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2004-2010 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
diff --git a/src/kvirc/kvs/kvi_kvs_eventtriggers.h b/src/kvirc/kvs/kvi_kvs_eventtriggers.h
index f26c09d1a..93d23931d 100644
--- a/src/kvirc/kvs/kvi_kvs_eventtriggers.h
+++ b/src/kvirc/kvs/kvi_kvs_eventtriggers.h
@@ -6,7 +6,7 @@
 //   Creation date : Thu Oct 22 2005 04:57:12 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2005-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2005-2010 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
diff --git a/src/kvirc/kvs/kvi_kvs_hash.h b/src/kvirc/kvs/kvi_kvs_hash.h
index 8538269a6..acf259089 100644
--- a/src/kvirc/kvs/kvi_kvs_hash.h
+++ b/src/kvirc/kvs/kvi_kvs_hash.h
@@ -31,10 +31,10 @@
 */
 
 #include "kvi_settings.h"
-#include "kvi_pointerhashtable.h"
-#include "kvi_qstring.h"
+#include "KviPointerHashTable.h"
+#include "KviQString.h"
 #include "kvi_kvs_variant.h"
-#include "kvi_heapobject.h"
+#include "KviHeapObject.h"
 
 typedef KVIRC_API_TYPEDEF KviPointerHashTableIterator<QString,KviKvsVariant> KviKvsHashIterator;
 
diff --git a/src/kvirc/kvs/kvi_kvs_kernel.cpp b/src/kvirc/kvs/kvi_kvs_kernel.cpp
index 05b3ff9e1..18fac28e8 100644
--- a/src/kvirc/kvs/kvi_kvs_kernel.cpp
+++ b/src/kvirc/kvs/kvi_kvs_kernel.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Tue 30 Sep 2003 05.12 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2003-2010 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
diff --git a/src/kvirc/kvs/kvi_kvs_kernel.h b/src/kvirc/kvs/kvi_kvs_kernel.h
index a0b59be0b..d84bdd2ee 100644
--- a/src/kvirc/kvs/kvi_kvs_kernel.h
+++ b/src/kvirc/kvs/kvi_kvs_kernel.h
@@ -6,7 +6,7 @@
 //   Creation date : Tue 30 Sep 2003 13.46 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2003-2010 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
@@ -27,10 +27,10 @@
 #include "kvi_settings.h"
 
 #include "kvi_kvs_parser.h"
-#include "kvi_pointerlist.h"
-#include "kvi_qstring.h"
+#include "KviPointerList.h"
+#include "KviQString.h"
 
-#include "kvi_pointerhashtable.h"
+#include "KviPointerHashTable.h"
 
 class KviKvsTreeNodeSpecialCommand;
 class KviKvsObjectController;
diff --git a/src/kvirc/kvs/kvi_kvs_moduleinterface.cpp b/src/kvirc/kvs/kvi_kvs_moduleinterface.cpp
index 5ddb85460..a554835c0 100644
--- a/src/kvirc/kvs/kvi_kvs_moduleinterface.cpp
+++ b/src/kvirc/kvs/kvi_kvs_moduleinterface.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Tue 16 Dec 2003 00:27:54 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
@@ -26,7 +26,7 @@
 #include "kvi_kvs_eventmanager.h"
 #include "kvi_module.h"
 #include "kvi_modulemanager.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_kvs_treenode_data.h"
 #include "kvi_kvs_treenode_datalist.h"
 
diff --git a/src/kvirc/kvs/kvi_kvs_moduleinterface.h b/src/kvirc/kvs/kvi_kvs_moduleinterface.h
index a4211bec4..c0f799429 100644
--- a/src/kvirc/kvs/kvi_kvs_moduleinterface.h
+++ b/src/kvirc/kvs/kvi_kvs_moduleinterface.h
@@ -6,7 +6,7 @@
 //   Creation date : Tue 16 Dec 2003 00:27:54 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
@@ -27,14 +27,14 @@
 
 #include "kvi_settings.h"
 
-#include "kvi_pointerhashtable.h"
+#include "KviPointerHashTable.h"
 
 #include "kvi_kvs_runtimecall.h"
 #include "kvi_kvs_parameterprocessor.h"
 #include "kvi_kvs_switchlist.h"
 #include "kvi_kvs_script.h"
-#include "kvi_pointerlist.h"
-#include "kvi_qstring.h"
+#include "KviPointerList.h"
+#include "KviQString.h"
 
 class KviModule;
 class KviKvsTreeNodeDataList;
diff --git a/src/kvirc/kvs/kvi_kvs_object.cpp b/src/kvirc/kvs/kvi_kvs_object.cpp
index df048e713..0cc0247b7 100644
--- a/src/kvirc/kvs/kvi_kvs_object.cpp
+++ b/src/kvirc/kvs/kvi_kvs_object.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Wed 08 Oct 2003 02:31:57 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
@@ -30,12 +30,12 @@
 
 #include "kvi_modulemanager.h"
 #include "kvi_console.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_error.h"
 #include "kvi_out.h"
-#include "kvi_mirccntrl.h"
+#include "KviMircCntrl.h"
 #include "kvi_iconmanager.h"
-#include "kvi_malloc.h"
+#include "KviMemory.h"
 
 #include "kvi_kvs_object_controller.h"
 #include "kvi_kvs_object_functioncall.h"
diff --git a/src/kvirc/kvs/kvi_kvs_object.h b/src/kvirc/kvs/kvi_kvs_object.h
index 90a4b9d92..82c1917ea 100644
--- a/src/kvirc/kvs/kvi_kvs_object.h
+++ b/src/kvirc/kvs/kvi_kvs_object.h
@@ -6,7 +6,7 @@
 //   Creation date : Wed 08 Oct 2003 02:31:57 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
@@ -25,8 +25,8 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_qstring.h"
-#include "kvi_pointerlist.h"
+#include "KviQString.h"
+#include "KviPointerList.h"
 #include "kvi_kvs_runtimecall.h"
 #include "kvi_kvs_parameterprocessor.h"
 #include "kvi_kvs_object_functionhandler.h"
diff --git a/src/kvirc/kvs/kvi_kvs_object_class.cpp b/src/kvirc/kvs/kvi_kvs_object_class.cpp
index 1fcdccffb..ff189ac2b 100644
--- a/src/kvirc/kvs/kvi_kvs_object_class.cpp
+++ b/src/kvirc/kvs/kvi_kvs_object_class.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Sat 23 Apr 2005 20:31:32 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2005-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2005-2010 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
@@ -31,10 +31,10 @@
 #include "kvi_kvs_runtimecontext.h"
 #include "kvi_kvs_variantlist.h"
 #include "kvi_kvs_script.h"
-#include "kvi_fileutils.h"
+#include "KviFileUtils.h"
 #include "kvi_window.h"
-#include "kvi_cmdformatter.h"
-#include "kvi_locale.h"
+#include "KviCommandFormatter.h"
+#include "KviLocale.h"
 
 KviKvsObjectClass::KviKvsObjectClass(
 		KviKvsObjectClass * pParent,
diff --git a/src/kvirc/kvs/kvi_kvs_object_class.h b/src/kvirc/kvs/kvi_kvs_object_class.h
index c5dc20a9f..1a03cd864 100644
--- a/src/kvirc/kvs/kvi_kvs_object_class.h
+++ b/src/kvirc/kvs/kvi_kvs_object_class.h
@@ -6,7 +6,7 @@
 //   Creation date : Sat 23 Apr 2005 20:31:32 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2005-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2005-2010 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
@@ -25,10 +25,10 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_qstring.h"
-#include "kvi_pointerlist.h"
+#include "KviQString.h"
+#include "KviPointerList.h"
 
-#include "kvi_pointerhashtable.h"
+#include "KviPointerHashTable.h"
 
 #include "kvi_kvs_object_functionhandler.h"
 
diff --git a/src/kvirc/kvs/kvi_kvs_object_controller.cpp b/src/kvirc/kvs/kvi_kvs_object_controller.cpp
index 9a51b80f8..5c10d9f87 100644
--- a/src/kvirc/kvs/kvi_kvs_object_controller.cpp
+++ b/src/kvirc/kvs/kvi_kvs_object_controller.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Sun 24 Apr 2005 05:23:04 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2005-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2005-2010 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
@@ -24,7 +24,7 @@
 
 #include "kvi_kvs_object_controller.h"
 #include "kvi_modulemanager.h"
-#include "kvi_fileutils.h"
+#include "KviFileUtils.h"
 #include "kvi_app.h"
 
 #include <QPointer>
diff --git a/src/kvirc/kvs/kvi_kvs_object_controller.h b/src/kvirc/kvs/kvi_kvs_object_controller.h
index 42661b1f4..73a44bff5 100644
--- a/src/kvirc/kvs/kvi_kvs_object_controller.h
+++ b/src/kvirc/kvs/kvi_kvs_object_controller.h
@@ -6,7 +6,7 @@
 //   Creation date : Sun 24 Apr 2005 05:23:04 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2005-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2005-2010 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
@@ -27,11 +27,11 @@
 
 #include "kvi_settings.h"
 
-#include "kvi_qstring.h"
-#include "kvi_pointerlist.h"
+#include "KviQString.h"
+#include "KviPointerList.h"
 
-#include "kvi_pointerhashtable.h"
-#include "kvi_pointerhashtable.h"
+#include "KviPointerHashTable.h"
+#include "KviPointerHashTable.h"
 
 #include "kvi_kvs_object.h"
 #include "kvi_kvs_object_class.h"
diff --git a/src/kvirc/kvs/kvi_kvs_object_functioncall.cpp b/src/kvirc/kvs/kvi_kvs_object_functioncall.cpp
index 6a8dea11b..6efb81257 100644
--- a/src/kvirc/kvs/kvi_kvs_object_functioncall.cpp
+++ b/src/kvirc/kvs/kvi_kvs_object_functioncall.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Sun 24 Apr 2005 04:05:54 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2005-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2005-2010 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
diff --git a/src/kvirc/kvs/kvi_kvs_object_functioncall.h b/src/kvirc/kvs/kvi_kvs_object_functioncall.h
index 189f8952c..48ad38fbf 100644
--- a/src/kvirc/kvs/kvi_kvs_object_functioncall.h
+++ b/src/kvirc/kvs/kvi_kvs_object_functioncall.h
@@ -6,7 +6,7 @@
 //   Creation date : Sun 24 Apr 2005 04:05:54 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2005-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2005-2010 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
diff --git a/src/kvirc/kvs/kvi_kvs_object_functionhandler.cpp b/src/kvirc/kvs/kvi_kvs_object_functionhandler.cpp
index 49e84f1c5..97e247b75 100644
--- a/src/kvirc/kvs/kvi_kvs_object_functionhandler.cpp
+++ b/src/kvirc/kvs/kvi_kvs_object_functionhandler.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Sat 23 Apr 2005 21:53:23 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2005-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2005-2010 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
diff --git a/src/kvirc/kvs/kvi_kvs_object_functionhandler.h b/src/kvirc/kvs/kvi_kvs_object_functionhandler.h
index e5d6626fb..fb2405995 100644
--- a/src/kvirc/kvs/kvi_kvs_object_functionhandler.h
+++ b/src/kvirc/kvs/kvi_kvs_object_functionhandler.h
@@ -6,7 +6,7 @@
 //   Creation date : Sat 23 Apr 2005 21:53:23 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2005-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2005-2010 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
@@ -25,7 +25,7 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_qstring.h"
+#include "KviQString.h"
 
 class KviKvsObjectClass;
 class KviKvsObjectFunctionCall;
diff --git a/src/kvirc/kvs/kvi_kvs_object_functionhandlerimpl.cpp b/src/kvirc/kvs/kvi_kvs_object_functionhandlerimpl.cpp
index 583c84257..75c696d07 100644
--- a/src/kvirc/kvs/kvi_kvs_object_functionhandlerimpl.cpp
+++ b/src/kvirc/kvs/kvi_kvs_object_functionhandlerimpl.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Sun 24 Apr 2005 04:01:14 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2005-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2005-2010 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
diff --git a/src/kvirc/kvs/kvi_kvs_object_functionhandlerimpl.h b/src/kvirc/kvs/kvi_kvs_object_functionhandlerimpl.h
index 542b633e7..f748179ff 100644
--- a/src/kvirc/kvs/kvi_kvs_object_functionhandlerimpl.h
+++ b/src/kvirc/kvs/kvi_kvs_object_functionhandlerimpl.h
@@ -6,7 +6,7 @@
 //   Creation date : Sun 24 Apr 2005 04:01:14 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2005-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2005-2010 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
@@ -29,7 +29,7 @@
 #include "kvi_kvs_object.h"
 #include "kvi_kvs_object_class.h"
 #include "kvi_kvs_object_functionhandler.h"
-#include "kvi_qstring.h"
+#include "KviQString.h"
 
 class KviKvsObjectClass;
 class KviKvsScript;
diff --git a/src/kvirc/kvs/kvi_kvs_parameterprocessor.cpp b/src/kvirc/kvs/kvi_kvs_parameterprocessor.cpp
index e1002dc84..383c207d3 100644
--- a/src/kvirc/kvs/kvi_kvs_parameterprocessor.cpp
+++ b/src/kvirc/kvs/kvi_kvs_parameterprocessor.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Sun 17 Apr 2005 16:47:09 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2005-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2005-2010 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
@@ -30,9 +30,9 @@
 #include "kvi_kvs_arraycast.h"
 #include "kvi_kvs_hash.h"
 #include "kvi_kvs_object.h"
-#include "kvi_qstring.h"
-#include "kvi_locale.h"
-#include "kvi_pointerlist.h"
+#include "KviQString.h"
+#include "KviLocale.h"
+#include "KviPointerList.h"
 
 #include <QStringList>
 
diff --git a/src/kvirc/kvs/kvi_kvs_parameterprocessor.h b/src/kvirc/kvs/kvi_kvs_parameterprocessor.h
index dcfc147c7..4ed50f354 100644
--- a/src/kvirc/kvs/kvi_kvs_parameterprocessor.h
+++ b/src/kvirc/kvs/kvi_kvs_parameterprocessor.h
@@ -6,7 +6,7 @@
 //   Creation date : Sun 17 Apr 2005 16:47:09 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2005-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2005-2010 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
diff --git a/src/kvirc/kvs/kvi_kvs_parser.cpp b/src/kvirc/kvs/kvi_kvs_parser.cpp
index 282332228..d3a3886ec 100644
--- a/src/kvirc/kvs/kvi_kvs_parser.cpp
+++ b/src/kvirc/kvs/kvi_kvs_parser.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Thu 25 Sep 2003 05.12 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2003-2010 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
@@ -28,7 +28,7 @@
 #include "kvi_kvs_kernel.h"
 #include "kvi_kvs_script.h"
 #include "kvi_kvs_parser_macros.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_options.h"
 
 //FIXME: @ == $$-> == $this->
diff --git a/src/kvirc/kvs/kvi_kvs_parser.h b/src/kvirc/kvs/kvi_kvs_parser.h
index f3dd7bf59..16b2be67e 100644
--- a/src/kvirc/kvs/kvi_kvs_parser.h
+++ b/src/kvirc/kvs/kvi_kvs_parser.h
@@ -6,7 +6,7 @@
 //   Creation date : Thu 25 Sep 2003 05.12 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2003-2010 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
@@ -25,9 +25,9 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_qstring.h"
-#include "kvi_pointerlist.h"
-#include "kvi_pointerhashtable.h"
+#include "KviQString.h"
+#include "KviPointerList.h"
+#include "KviPointerHashTable.h"
 
 class KviKvsScript;
 class KviKvsKernel;
diff --git a/src/kvirc/kvs/kvi_kvs_parser_command.cpp b/src/kvirc/kvs/kvi_kvs_parser_command.cpp
index b75bf9f63..dd1d2bcd2 100644
--- a/src/kvirc/kvs/kvi_kvs_parser_command.cpp
+++ b/src/kvirc/kvs/kvi_kvs_parser_command.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Thu 03 Nov 2003 13.23 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2003-2010 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
@@ -27,9 +27,9 @@
 #include "kvi_kvs_report.h"
 #include "kvi_kvs_kernel.h"
 #include "kvi_kvs_parser_macros.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_kvs_script.h"
-#include "kvi_cmdformatter.h"
+#include "KviCommandFormatter.h"
 
 
 KviKvsTreeNodeCommand * KviKvsParser::parseCommand()
diff --git a/src/kvirc/kvs/kvi_kvs_parser_comment.cpp b/src/kvirc/kvs/kvi_kvs_parser_comment.cpp
index e2830d129..e9956fada 100644
--- a/src/kvirc/kvs/kvi_kvs_parser_comment.cpp
+++ b/src/kvirc/kvs/kvi_kvs_parser_comment.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Thu 03 Nov 2003 13.23 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2003-2010 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
@@ -27,7 +27,7 @@
 #include "kvi_kvs_report.h"
 #include "kvi_kvs_kernel.h"
 #include "kvi_kvs_parser_macros.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 
 KviKvsTreeNode * KviKvsParser::parseComment()
 {
diff --git a/src/kvirc/kvs/kvi_kvs_parser_dollar.cpp b/src/kvirc/kvs/kvi_kvs_parser_dollar.cpp
index 30ab05722..2d7420a42 100644
--- a/src/kvirc/kvs/kvi_kvs_parser_dollar.cpp
+++ b/src/kvirc/kvs/kvi_kvs_parser_dollar.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Thu 5 Oct 2003 20.20 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2003-2010 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
@@ -27,7 +27,7 @@
 #include "kvi_kvs_report.h"
 #include "kvi_kvs_kernel.h"
 #include "kvi_kvs_parser_macros.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 
 
 KviKvsTreeNodeData * KviKvsParser::parseDollar(bool bInObjScope)
diff --git a/src/kvirc/kvs/kvi_kvs_parser_expression.cpp b/src/kvirc/kvs/kvi_kvs_parser_expression.cpp
index 58da7d1b9..6a5ab6c03 100644
--- a/src/kvirc/kvs/kvi_kvs_parser_expression.cpp
+++ b/src/kvirc/kvs/kvi_kvs_parser_expression.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Mon 6 Oct 2003 01.31 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2003-2010 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
@@ -27,7 +27,7 @@
 #include "kvi_kvs_report.h"
 #include "kvi_kvs_kernel.h"
 #include "kvi_kvs_parser_macros.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 
 
 //#warning "FIXME: expression eval doc!"
diff --git a/src/kvirc/kvs/kvi_kvs_parser_lside.cpp b/src/kvirc/kvs/kvi_kvs_parser_lside.cpp
index 0d981c8e8..a4674bb51 100644
--- a/src/kvirc/kvs/kvi_kvs_parser_lside.cpp
+++ b/src/kvirc/kvs/kvi_kvs_parser_lside.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Thu 03 Nov 2003 13.11 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2003-2010 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
@@ -27,7 +27,7 @@
 #include "kvi_kvs_report.h"
 #include "kvi_kvs_kernel.h"
 #include "kvi_kvs_parser_macros.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 
 
 /*
diff --git a/src/kvirc/kvs/kvi_kvs_parser_macros.h b/src/kvirc/kvs/kvi_kvs_parser_macros.h
index bb491e682..1e04c37e1 100644
--- a/src/kvirc/kvs/kvi_kvs_parser_macros.h
+++ b/src/kvirc/kvs/kvi_kvs_parser_macros.h
@@ -6,7 +6,7 @@
 //   Creation date : Sun 5 Ocr 2003 20.25 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2003-2010 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
diff --git a/src/kvirc/kvs/kvi_kvs_parser_specialcommands.cpp b/src/kvirc/kvs/kvi_kvs_parser_specialcommands.cpp
index 2ef610d27..2d07f97c7 100644
--- a/src/kvirc/kvs/kvi_kvs_parser_specialcommands.cpp
+++ b/src/kvirc/kvs/kvi_kvs_parser_specialcommands.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Thu 06 Now 2003 14.14 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2003-2010 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
@@ -28,8 +28,8 @@
 #include "kvi_kvs_kernel.h"
 #include "kvi_kvs_parser_macros.h"
 #include "kvi_kvs_object_functionhandler.h"
-#include "kvi_locale.h"
-#include "kvi_cmdformatter.h"
+#include "KviLocale.h"
+#include "KviCommandFormatter.h"
 
 /*
 in fact this is not a fully special command
diff --git a/src/kvirc/kvs/kvi_kvs_popupmanager.cpp b/src/kvirc/kvs/kvi_kvs_popupmanager.cpp
index 45a4a7756..3b63bebae 100644
--- a/src/kvirc/kvs/kvi_kvs_popupmanager.cpp
+++ b/src/kvirc/kvs/kvi_kvs_popupmanager.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Tue 7 Jan 2004 02:11:41 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2004-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2004-2010 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
@@ -23,8 +23,8 @@
 //=============================================================================
 
 #include "kvi_kvs_popupmanager.h"
-#include "kvi_locale.h"
-#include "kvi_config.h"
+#include "KviLocale.h"
+#include "KviConfigurationFile.h"
 
 KviKvsPopupManager * KviKvsPopupManager::m_pInstance = 0;
 
@@ -85,9 +85,9 @@ void KviKvsPopupManager::emitRefresh(const QString &szPopupName)
 void KviKvsPopupManager::load(const QString &szFileName)
 {
 	m_pPopupDict->clear();
-	KviConfig cfg(szFileName,KviConfig::Read);
+	KviConfigurationFile cfg(szFileName,KviConfigurationFile::Read);
 
-	KviConfigIterator it(*(cfg.dict()));
+	KviConfigurationFileIterator it(*(cfg.dict()));
 
 	KviPointerList<QString> l;
 	l.setAutoDelete(true);
@@ -110,7 +110,7 @@ void KviKvsPopupManager::load(const QString &szFileName)
 
 void KviKvsPopupManager::save(const QString &szFileName)
 {
-	KviConfig cfg(szFileName,KviConfig::Write);
+	KviConfigurationFile cfg(szFileName,KviConfigurationFile::Write);
 	cfg.clear();
 
 	KviPointerHashTableIterator<QString,KviKvsPopupMenu> it(*m_pPopupDict);
diff --git a/src/kvirc/kvs/kvi_kvs_popupmanager.h b/src/kvirc/kvs/kvi_kvs_popupmanager.h
index 7661583ff..e2d55eefd 100644
--- a/src/kvirc/kvs/kvi_kvs_popupmanager.h
+++ b/src/kvirc/kvs/kvi_kvs_popupmanager.h
@@ -6,7 +6,7 @@
 //   Creation date : Tue 7 Jan 2004 02:11:41 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2004-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2004-2010 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
diff --git a/src/kvirc/kvs/kvi_kvs_popupmenu.cpp b/src/kvirc/kvs/kvi_kvs_popupmenu.cpp
index 64648c151..080174412 100644
--- a/src/kvirc/kvs/kvi_kvs_popupmenu.cpp
+++ b/src/kvirc/kvs/kvi_kvs_popupmenu.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Wed 07 Jan 2004 05:02:57 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2004-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2004-2010 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
@@ -23,14 +23,14 @@
 //=============================================================================
 
 #include "kvi_kvs_popupmenu.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_iconmanager.h"
 #include "kvi_out.h"
 #include "kvi_app.h"
 #include "kvi_kvs_popupmanager.h"
 #include "kvi_console.h"
-#include "kvi_config.h"
-#include "kvi_cmdformatter.h"
+#include "KviConfigurationFile.h"
+#include "KviCommandFormatter.h"
 #include "kvi_options.h"
 
 // popup names
@@ -909,7 +909,7 @@ void KviKvsPopupMenu::itemClicked(int itemId)
 }
 
 
-void KviKvsPopupMenu::load(const QString &prefix,KviConfig * cfg)
+void KviKvsPopupMenu::load(const QString &prefix,KviConfigurationFile * cfg)
 {
 	doClear();
 
@@ -1045,7 +1045,7 @@ void KviKvsPopupMenu::load(const QString &prefix,KviConfig * cfg)
 
 // FIXME: #warning "NOBODY EDITS THE POPUPS IN THE CONFIG!...A binary config would be faster and work better for sure here"
 
-void KviKvsPopupMenu::save(const QString & prefix,KviConfig * cfg)
+void KviKvsPopupMenu::save(const QString & prefix,KviConfigurationFile * cfg)
 {
 	int idx;
 
diff --git a/src/kvirc/kvs/kvi_kvs_popupmenu.h b/src/kvirc/kvs/kvi_kvs_popupmenu.h
index a49726185..390ddbf8a 100644
--- a/src/kvirc/kvs/kvi_kvs_popupmenu.h
+++ b/src/kvirc/kvs/kvi_kvs_popupmenu.h
@@ -6,7 +6,7 @@
 //   Creation date : Wed 07 Jan 2004 05:02:57 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2004-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2004-2010 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
@@ -25,7 +25,7 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_qstring.h"
+#include "KviQString.h"
 #include "kvi_window.h"
 #include "kvi_kvs_hash.h"
 #include "kvi_kvs_variantlist.h"
@@ -277,8 +277,8 @@ protected:
 	void addItemInternal(KviKvsPopupMenuItem * it);
 	void executePrologues(KviKvsPopupMenuTopLevelData * pData);
 	void executeEpilogues(KviKvsPopupMenuTopLevelData * pData);
-	void load(const QString &prefix,KviConfig * cfg);
-	void save(const QString &prefix,KviConfig * cfg);
+	void load(const QString &prefix,KviConfigurationFile * cfg);
+	void save(const QString &prefix,KviConfigurationFile * cfg);
 private slots:
 	void setupMenuContents();
 protected:
diff --git a/src/kvirc/kvs/kvi_kvs_processmanager.cpp b/src/kvirc/kvs/kvi_kvs_processmanager.cpp
index 6fada4d64..6e1282cba 100644
--- a/src/kvirc/kvs/kvi_kvs_processmanager.cpp
+++ b/src/kvirc/kvs/kvi_kvs_processmanager.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Wed 07 Apr 2004 03:03:52 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2004-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2004-2010 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
@@ -25,8 +25,8 @@
 #include "kvi_kvs_processmanager.h"
 #include "kvi_window.h"
 #include "kvi_out.h"
-#include "kvi_locale.h"
-#include "kvi_parameterlist.h"
+#include "KviLocale.h"
+#include "KviParameterList.h"
 #include "kvi_app.h"
 #include "kvi_console.h"
 #include "kvi_kvs_script.h"
@@ -89,20 +89,20 @@ bool KviKvsProcessAsyncOperation::start()
 		args.append(m_pData->szCommandline);
 	}
 
-	m_pProcess = new KviProcess(this);
+	m_pProcess = new QProcess(this);
 
 	if(m_pData->iFlags & KVI_KVS_PROCESSDESCRIPTOR_TRIGGERSTDOUT)
 	{
 		connect(m_pProcess,SIGNAL(readyReadStandardOutput()),this,SLOT(readStdout()));
 	} else {
-		m_pProcess->closeReadChannel(KviProcess::StandardOutput);
+		m_pProcess->closeReadChannel(QProcess::StandardOutput);
 	}
 
 	if(m_pData->iFlags & KVI_KVS_PROCESSDESCRIPTOR_TRIGGERSTDERR)
 	{
 		connect(m_pProcess,SIGNAL(readyReadStandardError()),this,SLOT(readStderr()));
 	} else {
-		m_pProcess->closeReadChannel(KviProcess::StandardError);
+		m_pProcess->closeReadChannel(QProcess::StandardError);
 	}
 
 	connect(m_pProcess,SIGNAL(finished(int)),this,SLOT(processExited(int)));
@@ -115,7 +115,7 @@ bool KviKvsProcessAsyncOperation::start()
 	szcmd = args.takeFirst();
 	m_pProcess->start(szcmd, args);
 
-	if(m_pProcess->state()==KviProcess::NotRunning)
+	if(m_pProcess->state()==QProcess::NotRunning)
 	{
 		return false;
 	}
@@ -199,7 +199,7 @@ bool KviKvsProcessAsyncOperation::trigger(CallbackEvent e,const QString &szData)
 				params.append(new KviKvsVariant(QString("ping")));
 			break;
 			default:
-				qDebug("Ops... unknown trigger() CallbackEvent parameter in KviProcessDescriptor::trigger()");
+				qDebug("Ops... unknown trigger() CallbackEvent parameter in QProcessDescriptor::trigger()");
 				return false;
 			break;
 		}
@@ -242,7 +242,7 @@ void KviKvsProcessAsyncOperation::readStdout()
 		if(a.size() > 0)
 			m_szStdoutBuffer += QString(a);
 	} else {
-		m_pProcess->setReadChannel(KviProcess::StandardOutput);
+		m_pProcess->setReadChannel(QProcess::StandardOutput);
 		QString l;
 		bool bBreak = false;
 		while((m_pProcess->canReadLine()) && (!bBreak))
@@ -269,7 +269,7 @@ void KviKvsProcessAsyncOperation::readStderr()
 		if(a.size() > 0)
 			m_szStderrBuffer += QString(a);
 	} else {
-		m_pProcess->setReadChannel(KviProcess::StandardError);
+		m_pProcess->setReadChannel(QProcess::StandardError);
 		QString l;
 		bool bBreak = false;
 		while((m_pProcess->canReadLine()) && (!bBreak))
@@ -355,7 +355,7 @@ KviKvsProcessManager::~KviKvsProcessManager()
 void KviKvsProcessManager::init()
 {
 	if(m_pInstance)return;
-	m_pInstance = new KviProcessManager();
+	m_pInstance = new QProcessManager();
 }
 
 void KviKvsProcessManager::done()
diff --git a/src/kvirc/kvs/kvi_kvs_processmanager.h b/src/kvirc/kvs/kvi_kvs_processmanager.h
index 44822fb96..ad279eca8 100644
--- a/src/kvirc/kvs/kvi_kvs_processmanager.h
+++ b/src/kvirc/kvs/kvi_kvs_processmanager.h
@@ -6,7 +6,7 @@
 //   Creation date : Wed 07 Apr 2004 03:03:52 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2004-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2004-2010 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
@@ -26,19 +26,19 @@
 
 #include "kvi_settings.h"
 #include "kvi_kvs_asyncoperation.h"
-#include "kvi_qstring.h"
+#include "KviQString.h"
 #include "kvi_window.h"
 #include "kvi_kvs_variant.h"
 #include "kvi_kvs_runtimecontext.h"
 #include "kvi_kvs_variant.h"
 
-#include "kvi_pointerhashtable.h"
+#include "KviPointerHashTable.h"
 
 #ifdef Unsorted
 	#undef Unsorted
 #endif
 
-#include "kvi_process.h"
+#include "QProcess"
 
 #include <QTimer>
 
@@ -79,7 +79,7 @@ public:
 protected:
 	enum CallbackEvent { EventStarted,EventTerminated,EventStdout,EventStderr,EventPing };
 private:
-	KviProcess                  * m_pProcess;
+	QProcess                  * m_pProcess;
 	KviKvsExtendedRunTimeData   * m_pExtendedRunTimeData;
 	QString                       m_szStdoutBuffer;
 	QString                       m_szStderrBuffer;
diff --git a/src/kvirc/kvs/kvi_kvs_report.cpp b/src/kvirc/kvs/kvi_kvs_report.cpp
index b46cb38d4..66c8b1e4e 100644
--- a/src/kvirc/kvs/kvi_kvs_report.cpp
+++ b/src/kvirc/kvs/kvi_kvs_report.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Thu 25 Sep 2003 05.12 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2003-2010 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
@@ -23,11 +23,11 @@
 //=============================================================================
 
 #include "kvi_kvs_report.h"
-#include "kvi_mirccntrl.h"
+#include "KviMircCntrl.h"
 #include "kvi_window.h"
 #include "kvi_out.h"
 #include "kvi_app.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_debugwindow.h"
 #include "kvi_options.h"
 
diff --git a/src/kvirc/kvs/kvi_kvs_report.h b/src/kvirc/kvs/kvi_kvs_report.h
index 444df4e48..42b394e09 100644
--- a/src/kvirc/kvs/kvi_kvs_report.h
+++ b/src/kvirc/kvs/kvi_kvs_report.h
@@ -6,7 +6,7 @@
 //   Creation date : Thu 25 Sep 2003 05.12 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2003-2010 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
@@ -25,8 +25,8 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_qstring.h"
-#include "kvi_pointerlist.h"
+#include "KviQString.h"
+#include "KviPointerList.h"
 
 class KviWindow;
 
diff --git a/src/kvirc/kvs/kvi_kvs_runtimecall.cpp b/src/kvirc/kvs/kvi_kvs_runtimecall.cpp
index 6e0df7130..afecfc4b6 100644
--- a/src/kvirc/kvs/kvi_kvs_runtimecall.cpp
+++ b/src/kvirc/kvs/kvi_kvs_runtimecall.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Sat 23 Apr 2005 18:19:38 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2005-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2005-2010 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
diff --git a/src/kvirc/kvs/kvi_kvs_runtimecall.h b/src/kvirc/kvs/kvi_kvs_runtimecall.h
index 171fc8d17..b409b1c87 100644
--- a/src/kvirc/kvs/kvi_kvs_runtimecall.h
+++ b/src/kvirc/kvs/kvi_kvs_runtimecall.h
@@ -6,7 +6,7 @@
 //   Creation date : Sat 23 Apr 2005 18:19:38 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2005-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2005-2010 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
diff --git a/src/kvirc/kvs/kvi_kvs_runtimecontext.cpp b/src/kvirc/kvs/kvi_kvs_runtimecontext.cpp
index eb819067e..aba379e92 100644
--- a/src/kvirc/kvs/kvi_kvs_runtimecontext.cpp
+++ b/src/kvirc/kvs/kvi_kvs_runtimecontext.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Tue 07 Oct 2003 01:49:40 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
@@ -28,7 +28,7 @@
 #include "kvi_kvs_report.h"
 #include "kvi_console.h"
 #include "kvi_kvs_treenode_base.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_app.h"
 #include "kvi_kvs_object.h"
 
diff --git a/src/kvirc/kvs/kvi_kvs_runtimecontext.h b/src/kvirc/kvs/kvi_kvs_runtimecontext.h
index 54f46f775..899639cff 100644
--- a/src/kvirc/kvs/kvi_kvs_runtimecontext.h
+++ b/src/kvirc/kvs/kvi_kvs_runtimecontext.h
@@ -6,7 +6,7 @@
 //   Creation date : Tue 07 Oct 2003 01:49:40 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
diff --git a/src/kvirc/kvs/kvi_kvs_rwevaluationresult.cpp b/src/kvirc/kvs/kvi_kvs_rwevaluationresult.cpp
index 6cd8917f9..bb305f285 100644
--- a/src/kvirc/kvs/kvi_kvs_rwevaluationresult.cpp
+++ b/src/kvirc/kvs/kvi_kvs_rwevaluationresult.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Thu 11 Dec 2003 22:51:46 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
diff --git a/src/kvirc/kvs/kvi_kvs_rwevaluationresult.h b/src/kvirc/kvs/kvi_kvs_rwevaluationresult.h
index fd5a71b9d..898c6a51c 100644
--- a/src/kvirc/kvs/kvi_kvs_rwevaluationresult.h
+++ b/src/kvirc/kvs/kvi_kvs_rwevaluationresult.h
@@ -6,7 +6,7 @@
 //   Creation date : Thu 11 Dec 2003 22:51:46 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
diff --git a/src/kvirc/kvs/kvi_kvs_script.cpp b/src/kvirc/kvs/kvi_kvs_script.cpp
index ba81958d8..50e5d45e0 100644
--- a/src/kvirc/kvs/kvi_kvs_script.cpp
+++ b/src/kvirc/kvs/kvi_kvs_script.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Thu 25 Sep 2003 05.12 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2003-2010 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
@@ -30,9 +30,9 @@
 #include "kvi_kvs_variantlist.h"
 #include "kvi_kvs_kernel.h"
 
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_out.h"
-#include "kvi_mirccntrl.h"
+#include "KviMircCntrl.h"
 #include "kvi_window.h"
 #include "kvi_app.h"
 
diff --git a/src/kvirc/kvs/kvi_kvs_script.h b/src/kvirc/kvs/kvi_kvs_script.h
index 6e9ca7524..59a5b41be 100644
--- a/src/kvirc/kvs/kvi_kvs_script.h
+++ b/src/kvirc/kvs/kvi_kvs_script.h
@@ -31,12 +31,12 @@
 */
 
 #include "kvi_settings.h"
-#include "kvi_qstring.h"
+#include "KviQString.h"
 #include "kvi_window.h"
-#include "kvi_pointerlist.h"
+#include "KviPointerList.h"
 #include "kvi_kvs_variant.h"
 #include "kvi_kvs_variantlist.h"
-#include "kvi_heapobject.h"
+#include "KviHeapObject.h"
 
 class KviKvsTreeNodeInstruction;
 class KviKvsExtendedRunTimeData;
diff --git a/src/kvirc/kvs/kvi_kvs_scriptaddonmanager.cpp b/src/kvirc/kvs/kvi_kvs_scriptaddonmanager.cpp
index 768a68543..4a21fa848 100644
--- a/src/kvirc/kvs/kvi_kvs_scriptaddonmanager.cpp
+++ b/src/kvirc/kvs/kvi_kvs_scriptaddonmanager.cpp
@@ -24,10 +24,10 @@
 
 #include "kvi_kvs_scriptaddonmanager.h"
 #include "kvi_kvs_script.h"
-#include "kvi_config.h"
+#include "KviConfigurationFile.h"
 #include "kvi_window.h"
 #include "kvi_iconmanager.h"
-#include "kvi_fileutils.h"
+#include "KviFileUtils.h"
 #include "kvi_app.h"
 
 #include <QFileInfo>
@@ -129,7 +129,7 @@ const QString & KviKvsScriptAddon::helpCallbackCode()
 	return KviQString::Empty;
 }
 
-bool KviKvsScriptAddon::load(KviConfig * cfg,const QString &szName)
+bool KviKvsScriptAddon::load(KviConfigurationFile * cfg,const QString &szName)
 {
 	m_szName = szName;
 	cfg->setGroup(m_szName);
@@ -215,7 +215,7 @@ void KviKvsScriptAddon::allocateScripts(const QString &szVisibleNameCode,const Q
 	m_pUninstallCallback = new KviKvsScript(szTmp,szUninstallCallbackCode,KviKvsScript::InstructionList);
 }
 
-void KviKvsScriptAddon::save(KviConfig * cfg)
+void KviKvsScriptAddon::save(KviConfigurationFile * cfg)
 {
 	cfg->setGroup(m_szName);
 	cfg->writeEntry("Version",m_szVersion);
@@ -298,7 +298,7 @@ void KviKvsScriptAddonManager::save(const QString &szFileName)
 	// we're stored here from now on...
 	m_szFileName = szFileName;
 
-	KviConfig cfg(szFileName,KviConfig::Write);
+	KviConfigurationFile cfg(szFileName,KviConfigurationFile::Write);
 
 	cfg.clear();
 
@@ -321,12 +321,12 @@ void KviKvsScriptAddonManager::delayedLoad()
 	// So finally m_szFileName may be empty here
 	if(m_szFileName.isEmpty())return;
 
-	KviConfig cfg(m_szFileName,KviConfig::Read);
+	KviConfigurationFile cfg(m_szFileName,KviConfigurationFile::Read);
 
-	KviPointerHashTable<QString,KviConfigGroup> * d = cfg.dict();
+	KviPointerHashTable<QString,KviConfigurationFileGroup> * d = cfg.dict();
 	if(!d)return;
 
-	KviPointerHashTableIterator<QString,KviConfigGroup> it(*d);
+	KviPointerHashTableIterator<QString,KviConfigurationFileGroup> it(*d);
 	while(it.current())
 	{
 		QString szName = it.currentKey();
diff --git a/src/kvirc/kvs/kvi_kvs_scriptaddonmanager.h b/src/kvirc/kvs/kvi_kvs_scriptaddonmanager.h
index d9e45e43f..a872f742a 100644
--- a/src/kvirc/kvs/kvi_kvs_scriptaddonmanager.h
+++ b/src/kvirc/kvs/kvi_kvs_scriptaddonmanager.h
@@ -6,7 +6,7 @@
 //   Creation date : Thu 31 Mar 2005 01:21:23 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2005-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2005-2010 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
@@ -25,13 +25,13 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_heapobject.h"
-#include "kvi_qstring.h"
-#include "kvi_pointerhashtable.h"
+#include "KviHeapObject.h"
+#include "KviQString.h"
+#include "KviPointerHashTable.h"
 
 #include <QStringList>
 
-class KviConfig;
+class KviConfigurationFile;
 class KviKvsScript;
 class KviWindow;
 class QPixmap;
@@ -88,8 +88,8 @@ public:
 	void executeConfigureCallback(KviWindow * pWnd);
 	void executeHelpCallback(KviWindow * pWnd);
 protected:
-	bool load(KviConfig * cfg,const QString &szName);
-	void save(KviConfig * cfg);
+	bool load(KviConfigurationFile * cfg,const QString &szName);
+	void save(KviConfigurationFile * cfg);
 	void executeUninstallCallback(KviWindow * pWnd);
 	// this assumes that the script pointers are clean (i.e. not needing to be freed!)
 	void allocateScripts(const QString &sVisibleNameCode,const QString &szDescriptionCode,const QString &szUninstallCallbackCode);
diff --git a/src/kvirc/kvs/kvi_kvs_switchlist.cpp b/src/kvirc/kvs/kvi_kvs_switchlist.cpp
index 7d8e0358f..72ce1e199 100644
--- a/src/kvirc/kvs/kvi_kvs_switchlist.cpp
+++ b/src/kvirc/kvs/kvi_kvs_switchlist.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Mon 27 Oct 2003 03:47:48 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
diff --git a/src/kvirc/kvs/kvi_kvs_switchlist.h b/src/kvirc/kvs/kvi_kvs_switchlist.h
index c1e0367be..4f2d1bebb 100644
--- a/src/kvirc/kvs/kvi_kvs_switchlist.h
+++ b/src/kvirc/kvs/kvi_kvs_switchlist.h
@@ -6,7 +6,7 @@
 //   Creation date : Mon 27 Oct 2003 03:47:48 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
@@ -25,11 +25,11 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_qstring.h"
+#include "KviQString.h"
 #include "kvi_kvs_variant.h"
 
-#include "kvi_pointerhashtable.h"
-#include "kvi_pointerhashtable.h"
+#include "KviPointerHashTable.h"
+#include "KviPointerHashTable.h"
 
 class KVIRC_API KviKvsSwitchList
 {
diff --git a/src/kvirc/kvs/kvi_kvs_timermanager.cpp b/src/kvirc/kvs/kvi_kvs_timermanager.cpp
index 7abfb7c51..b4b5bb804 100644
--- a/src/kvirc/kvs/kvi_kvs_timermanager.cpp
+++ b/src/kvirc/kvs/kvi_kvs_timermanager.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Fri 19 Dec 2003 01:29:22 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
@@ -32,7 +32,7 @@
 #include "kvi_window.h"
 #include "kvi_console.h"
 #include "kvi_options.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_out.h"
 
 
diff --git a/src/kvirc/kvs/kvi_kvs_timermanager.h b/src/kvirc/kvs/kvi_kvs_timermanager.h
index 1affed5e4..e64ee6b25 100644
--- a/src/kvirc/kvs/kvi_kvs_timermanager.h
+++ b/src/kvirc/kvs/kvi_kvs_timermanager.h
@@ -6,7 +6,7 @@
 //   Creation date : Fri 19 Dec 2003 01:29:22 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
@@ -26,11 +26,11 @@
 
 
 #include "kvi_settings.h"
-#include "kvi_qstring.h"
+#include "KviQString.h"
 
-#include "kvi_pointerhashtable.h"
-#include "kvi_pointerhashtable.h"
-#include "kvi_pointerlist.h"
+#include "KviPointerHashTable.h"
+#include "KviPointerHashTable.h"
+#include "KviPointerList.h"
 
 #include <QObject>
 
diff --git a/src/kvirc/kvs/kvi_kvs_treenode.h b/src/kvirc/kvs/kvi_kvs_treenode.h
index b45fe7d64..38498406d 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode.h
+++ b/src/kvirc/kvs/kvi_kvs_treenode.h
@@ -6,7 +6,7 @@
 //   Creation date : Thu 25 Sep 2003 05.12 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2003-2010 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
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_aliasfunctioncall.cpp b/src/kvirc/kvs/kvi_kvs_treenode_aliasfunctioncall.cpp
index 6c7ccbe5a..9af875aef 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_aliasfunctioncall.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_aliasfunctioncall.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Tue 07 Oct 2003 03:21:23 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
@@ -25,8 +25,8 @@
 #include "kvi_kvs_treenode_aliasfunctioncall.h"
 #include "kvi_kvs_variantlist.h"
 #include "kvi_kvs_aliasmanager.h"
-#include "kvi_locale.h"
-#include "kvi_qstring.h"
+#include "KviLocale.h"
+#include "KviQString.h"
 
 KviKvsTreeNodeAliasFunctionCall::KviKvsTreeNodeAliasFunctionCall(const QChar * pLocation, const QString & szAliasName, KviKvsTreeNodeDataList * pParams)
 : KviKvsTreeNodeFunctionCall(pLocation,szAliasName,pParams)
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_aliasfunctioncall.h b/src/kvirc/kvs/kvi_kvs_treenode_aliasfunctioncall.h
index c8683bd6c..105ec5701 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_aliasfunctioncall.h
+++ b/src/kvirc/kvs/kvi_kvs_treenode_aliasfunctioncall.h
@@ -6,7 +6,7 @@
 //   Creation date : Tue 07 Oct 2003 03:21:23 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
@@ -31,7 +31,7 @@
 */
 
 #include "kvi_settings.h"
-#include "kvi_qstring.h"
+#include "KviQString.h"
 #include "kvi_kvs_treenode_functioncall.h"
 #include "kvi_kvs_treenode_datalist.h"
 
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_aliassimplecommand.cpp b/src/kvirc/kvs/kvi_kvs_treenode_aliassimplecommand.cpp
index 0734e48d0..38f709a7d 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_aliassimplecommand.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_aliassimplecommand.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Thu 09 Oct 2003 02:16:42 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
@@ -26,7 +26,7 @@
 #include "kvi_kvs_treenode_datalist.h"
 #include "kvi_kvs_treenode_switchlist.h"
 #include "kvi_kvs_aliasmanager.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_options.h"
 #include "kvi_irccontext.h"
 #include "kvi_window.h"
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_aliassimplecommand.h b/src/kvirc/kvs/kvi_kvs_treenode_aliassimplecommand.h
index 4d7bdada8..b03b40742 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_aliassimplecommand.h
+++ b/src/kvirc/kvs/kvi_kvs_treenode_aliassimplecommand.h
@@ -6,7 +6,7 @@
 //   Creation date : Thu 09 Oct 2003 02:16:42 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
@@ -31,7 +31,7 @@
 */
 
 #include "kvi_settings.h"
-#include "kvi_qstring.h"
+#include "KviQString.h"
 #include "kvi_kvs_treenode_simplecommand.h"
 
 class KviKvsTreeNodeDataList;
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_arraycount.cpp b/src/kvirc/kvs/kvi_kvs_treenode_arraycount.cpp
index 0d820ed1f..c6e26af09 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_arraycount.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_arraycount.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Tue 07 Oct 2003 03:00:52 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
@@ -25,7 +25,7 @@
 #include "kvi_kvs_treenode_arraycount.h"
 #include "kvi_kvs_variant.h"
 #include "kvi_kvs_runtimecontext.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_kvs_object.h"
 
 
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_arraycount.h b/src/kvirc/kvs/kvi_kvs_treenode_arraycount.h
index 38af982b8..61b28fccf 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_arraycount.h
+++ b/src/kvirc/kvs/kvi_kvs_treenode_arraycount.h
@@ -6,7 +6,7 @@
 //   Creation date : Tue 07 Oct 2003 03:00:52 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
@@ -31,7 +31,7 @@
 */
 
 #include "kvi_settings.h"
-#include "kvi_qstring.h"
+#include "KviQString.h"
 #include "kvi_kvs_treenode_indirectdata.h"
 
 class KviKvsRunTimeContext;
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_arrayelement.cpp b/src/kvirc/kvs/kvi_kvs_treenode_arrayelement.cpp
index 2e6abbdac..ff0fc428f 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_arrayelement.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_arrayelement.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Tue 07 Oct 2003 02:58:41 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
@@ -24,7 +24,7 @@
 
 #include "kvi_kvs_treenode_arrayelement.h"
 #include "kvi_kvs_runtimecontext.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_kvs_array.h"
 #include "kvi_kvs_object.h"
 
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_arrayelement.h b/src/kvirc/kvs/kvi_kvs_treenode_arrayelement.h
index c3721c675..9acc98c8d 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_arrayelement.h
+++ b/src/kvirc/kvs/kvi_kvs_treenode_arrayelement.h
@@ -6,7 +6,7 @@
 //   Creation date : Tue 07 Oct 2003 02:58:41 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
@@ -31,7 +31,7 @@
 */
 
 #include "kvi_settings.h"
-#include "kvi_qstring.h"
+#include "KviQString.h"
 #include "kvi_kvs_treenode_expression.h"
 #include "kvi_kvs_treenode_arrayorhashelement.h"
 #include "kvi_kvs_types.h"
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_arrayorhashelement.cpp b/src/kvirc/kvs/kvi_kvs_treenode_arrayorhashelement.cpp
index bc40ded07..30458c6b3 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_arrayorhashelement.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_arrayorhashelement.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Thu 16 Oct 2003 22:56:48 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_arrayorhashelement.h b/src/kvirc/kvs/kvi_kvs_treenode_arrayorhashelement.h
index 9384f24e4..e47f90e0f 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_arrayorhashelement.h
+++ b/src/kvirc/kvs/kvi_kvs_treenode_arrayorhashelement.h
@@ -6,7 +6,7 @@
 //   Creation date : Thu 16 Oct 2003 22:56:48 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
@@ -25,7 +25,7 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_qstring.h"
+#include "KviQString.h"
 #include "kvi_kvs_treenode_indirectdata.h"
 #include "kvi_kvs_variant.h"
 
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_arrayreferenceassert.cpp b/src/kvirc/kvs/kvi_kvs_treenode_arrayreferenceassert.cpp
index 0e2a5c7ff..688d60014 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_arrayreferenceassert.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_arrayreferenceassert.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Thu 16 Oct 2003 23:46:12 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
@@ -26,7 +26,7 @@
 #include "kvi_kvs_rwevaluationresult.h"
 #include "kvi_kvs_runtimecontext.h"
 #include "kvi_kvs_variant.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_kvs_object.h"
 
 KviKvsTreeNodeArrayReferenceAssert::KviKvsTreeNodeArrayReferenceAssert(const QChar * pLocation, KviKvsTreeNodeData * pSource)
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_arrayreferenceassert.h b/src/kvirc/kvs/kvi_kvs_treenode_arrayreferenceassert.h
index cd455d07c..8018b1e97 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_arrayreferenceassert.h
+++ b/src/kvirc/kvs/kvi_kvs_treenode_arrayreferenceassert.h
@@ -6,7 +6,7 @@
 //   Creation date : Thu 16 Oct 2003 23:46:12 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
@@ -31,7 +31,7 @@
 */
 
 #include "kvi_settings.h"
-#include "kvi_qstring.h"
+#include "KviQString.h"
 #include "kvi_kvs_treenode_indirectdata.h"
 
 class KviKvsRunTimeContext;
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_base.cpp b/src/kvirc/kvs/kvi_kvs_treenode_base.cpp
index 7c0febd2e..763d22959 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_base.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_base.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Tue 07 Oct 2003 02:00:28 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_base.h b/src/kvirc/kvs/kvi_kvs_treenode_base.h
index ab6e0e78e..399d0c872 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_base.h
+++ b/src/kvirc/kvs/kvi_kvs_treenode_base.h
@@ -6,7 +6,7 @@
 //   Creation date : Tue 07 Oct 2003 02:00:28 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
@@ -31,7 +31,7 @@
 */
 
 #include "kvi_settings.h"
-#include "kvi_qstring.h"
+#include "KviQString.h"
 
 /**
 * \class KviKvsTreeNode
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_baseobjectfunctioncall.cpp b/src/kvirc/kvs/kvi_kvs_treenode_baseobjectfunctioncall.cpp
index 912cbf4ac..7dff55ba5 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_baseobjectfunctioncall.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_baseobjectfunctioncall.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Tue 07 Oct 2003 03:30:10 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
@@ -23,7 +23,7 @@
 //=============================================================================
 
 #include "kvi_kvs_treenode_baseobjectfunctioncall.h"
-#include "kvi_qstring.h"
+#include "KviQString.h"
 #include "kvi_kvs_object.h"
 #include "kvi_kvs_variant.h"
 
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_baseobjectfunctioncall.h b/src/kvirc/kvs/kvi_kvs_treenode_baseobjectfunctioncall.h
index 242154778..73097a47b 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_baseobjectfunctioncall.h
+++ b/src/kvirc/kvs/kvi_kvs_treenode_baseobjectfunctioncall.h
@@ -6,7 +6,7 @@
 //   Creation date : Tue 07 Oct 2003 03:30:10 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
@@ -25,7 +25,7 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_qstring.h"
+#include "KviQString.h"
 #include "kvi_kvs_treenode_datalist.h"
 #include "kvi_kvs_treenode_objectfunctioncall.h"
 
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_callbackcommand.cpp b/src/kvirc/kvs/kvi_kvs_treenode_callbackcommand.cpp
index 84bcf8822..d0e29b634 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_callbackcommand.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_callbackcommand.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Thu 09 Oct 2003 02:02:42 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_callbackcommand.h b/src/kvirc/kvs/kvi_kvs_treenode_callbackcommand.h
index 31565c38c..090a9a06a 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_callbackcommand.h
+++ b/src/kvirc/kvs/kvi_kvs_treenode_callbackcommand.h
@@ -6,7 +6,7 @@
 //   Creation date : Thu 09 Oct 2003 02:02:42 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
@@ -25,7 +25,7 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_qstring.h"
+#include "KviQString.h"
 #include "kvi_kvs_treenode_commandwithparameters.h"
 
 class KviKvsTreeNodeDataList;
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_command.cpp b/src/kvirc/kvs/kvi_kvs_treenode_command.cpp
index ea93028b8..ef3c4a6ab 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_command.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_command.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Thu 09 Oct 2003 01:49:40 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_command.h b/src/kvirc/kvs/kvi_kvs_treenode_command.h
index b432994b4..84c92cba8 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_command.h
+++ b/src/kvirc/kvs/kvi_kvs_treenode_command.h
@@ -6,7 +6,7 @@
 //   Creation date : Thu 09 Oct 2003 01:49:40 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
@@ -25,7 +25,7 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_qstring.h"
+#include "KviQString.h"
 #include "kvi_kvs_treenode_instruction.h"
 
 class KviKvsParser;
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_commandevaluation.cpp b/src/kvirc/kvs/kvi_kvs_treenode_commandevaluation.cpp
index 87ca31770..16bb379c0 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_commandevaluation.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_commandevaluation.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Wed 05 Nov 2003 04:18:58 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_commandevaluation.h b/src/kvirc/kvs/kvi_kvs_treenode_commandevaluation.h
index 54fc3afa3..c71133134 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_commandevaluation.h
+++ b/src/kvirc/kvs/kvi_kvs_treenode_commandevaluation.h
@@ -6,7 +6,7 @@
 //   Creation date : Wed 05 Nov 2003 04:18:58 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
@@ -25,7 +25,7 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_qstring.h"
+#include "KviQString.h"
 #include "kvi_kvs_treenode_data.h"
 #include "kvi_kvs_treenode_instruction.h"
 
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_commandwithparameters.cpp b/src/kvirc/kvs/kvi_kvs_treenode_commandwithparameters.cpp
index c42475161..04c611077 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_commandwithparameters.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_commandwithparameters.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Thu 09 Oct 2003 01:57:10 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_commandwithparameters.h b/src/kvirc/kvs/kvi_kvs_treenode_commandwithparameters.h
index 63a695c35..a4cf8def4 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_commandwithparameters.h
+++ b/src/kvirc/kvs/kvi_kvs_treenode_commandwithparameters.h
@@ -6,7 +6,7 @@
 //   Creation date : Thu 09 Oct 2003 01:57:10 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
@@ -25,7 +25,7 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_qstring.h"
+#include "KviQString.h"
 #include "kvi_kvs_treenode_command.h"
 
 class KviKvsTreeNodeDataList;
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_compositedata.cpp b/src/kvirc/kvs/kvi_kvs_treenode_compositedata.cpp
index e2a83757b..388cac53d 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_compositedata.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_compositedata.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Tue 07 Oct 2003 02:24:33 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
@@ -23,7 +23,7 @@
 //=============================================================================
 
 #include "kvi_kvs_treenode_compositedata.h"
-#include "kvi_qstring.h"
+#include "KviQString.h"
 
 #define DEBUGME
 
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_compositedata.h b/src/kvirc/kvs/kvi_kvs_treenode_compositedata.h
index 03cefb803..8ad483220 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_compositedata.h
+++ b/src/kvirc/kvs/kvi_kvs_treenode_compositedata.h
@@ -6,7 +6,7 @@
 //   Creation date : Tue 07 Oct 2003 02:24:33 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
@@ -25,7 +25,7 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_pointerlist.h"
+#include "KviPointerList.h"
 #include "kvi_kvs_treenode_data.h"
 
 class KVIRC_API KviKvsTreeNodeCompositeData : public KviKvsTreeNodeData
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_constantdata.cpp b/src/kvirc/kvs/kvi_kvs_treenode_constantdata.cpp
index 3dffdd164..ed8d91276 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_constantdata.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_constantdata.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Tue 07 Oct 2003 02:21:59 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_constantdata.h b/src/kvirc/kvs/kvi_kvs_treenode_constantdata.h
index f8b6930e5..694d6b184 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_constantdata.h
+++ b/src/kvirc/kvs/kvi_kvs_treenode_constantdata.h
@@ -6,7 +6,7 @@
 //   Creation date : Tue 07 Oct 2003 02:21:59 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
@@ -25,7 +25,7 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_qstring.h"
+#include "KviQString.h"
 #include "kvi_kvs_treenode_data.h"
 
 class KVIRC_API KviKvsTreeNodeConstantData : public KviKvsTreeNodeData
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_corecallbackcommand.cpp b/src/kvirc/kvs/kvi_kvs_treenode_corecallbackcommand.cpp
index d7d45f67d..19ff7d447 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_corecallbackcommand.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_corecallbackcommand.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Thu 09 Oct 2003 02:06:26 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_corecallbackcommand.h b/src/kvirc/kvs/kvi_kvs_treenode_corecallbackcommand.h
index b4a9667bf..97816c7fc 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_corecallbackcommand.h
+++ b/src/kvirc/kvs/kvi_kvs_treenode_corecallbackcommand.h
@@ -6,7 +6,7 @@
 //   Creation date : Thu 09 Oct 2003 02:06:26 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
@@ -25,7 +25,7 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_qstring.h"
+#include "KviQString.h"
 #include "kvi_kvs_treenode_callbackcommand.h"
 
 #include "kvi_kvs_kernel.h"
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_corefunctioncall.cpp b/src/kvirc/kvs/kvi_kvs_treenode_corefunctioncall.cpp
index 8f32953e2..5bf7e3d57 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_corefunctioncall.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_corefunctioncall.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Tue 07 Oct 2003 03:23:59 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_corefunctioncall.h b/src/kvirc/kvs/kvi_kvs_treenode_corefunctioncall.h
index 844d02bfd..961541469 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_corefunctioncall.h
+++ b/src/kvirc/kvs/kvi_kvs_treenode_corefunctioncall.h
@@ -6,7 +6,7 @@
 //   Creation date : Tue 07 Oct 2003 03:23:59 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
@@ -25,7 +25,7 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_qstring.h"
+#include "KviQString.h"
 #include "kvi_kvs_kernel.h"
 #include "kvi_kvs_treenode_datalist.h"
 #include "kvi_kvs_treenode_functioncall.h"
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_coresimplecommand.cpp b/src/kvirc/kvs/kvi_kvs_treenode_coresimplecommand.cpp
index bd4522711..3fa2732ee 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_coresimplecommand.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_coresimplecommand.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Thu 09 Oct 2003 02:14:34 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_coresimplecommand.h b/src/kvirc/kvs/kvi_kvs_treenode_coresimplecommand.h
index bbd2b0219..116147981 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_coresimplecommand.h
+++ b/src/kvirc/kvs/kvi_kvs_treenode_coresimplecommand.h
@@ -6,7 +6,7 @@
 //   Creation date : Thu 09 Oct 2003 02:14:34 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
@@ -25,7 +25,7 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_qstring.h"
+#include "KviQString.h"
 #include "kvi_kvs_treenode_simplecommand.h"
 #include "kvi_kvs_kernel.h"
 
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_data.cpp b/src/kvirc/kvs/kvi_kvs_treenode_data.cpp
index 37d28de7e..4fd235b19 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_data.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_data.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Sun 05 Oct 2003 21.52 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2003-2010 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
@@ -23,7 +23,7 @@
 //=============================================================================
 
 #include "kvi_kvs_treenode_data.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 
 
 KviKvsTreeNodeData::KviKvsTreeNodeData(const QChar * pLocation)
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_data.h b/src/kvirc/kvs/kvi_kvs_treenode_data.h
index 1fea7f766..c55353a3f 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_data.h
+++ b/src/kvirc/kvs/kvi_kvs_treenode_data.h
@@ -6,7 +6,7 @@
 //   Creation date : Sun 05 Oct 2003 21.42 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2003-2010 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
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_datalist.cpp b/src/kvirc/kvs/kvi_kvs_treenode_datalist.cpp
index 20ea16a2e..63b200ca0 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_datalist.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_datalist.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Tue 07 Oct 2003 02:03:41 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
@@ -25,7 +25,7 @@
 #include "kvi_kvs_treenode_datalist.h"
 #include "kvi_kvs_runtimecontext.h"
 
-#include "kvi_qstring.h"
+#include "KviQString.h"
 
 KviKvsTreeNodeDataList::KviKvsTreeNodeDataList(const QChar * pLocation)
 : KviKvsTreeNode(pLocation)
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_datalist.h b/src/kvirc/kvs/kvi_kvs_treenode_datalist.h
index d7f559b82..586b00b0b 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_datalist.h
+++ b/src/kvirc/kvs/kvi_kvs_treenode_datalist.h
@@ -6,7 +6,7 @@
 //   Creation date : Tue 07 Oct 2003 02:03:41 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
@@ -25,7 +25,7 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_pointerlist.h"
+#include "KviPointerList.h"
 #include "kvi_kvs_variantlist.h"
 #include "kvi_kvs_treenode_base.h"
 #include "kvi_kvs_treenode_data.h"
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_expression.cpp b/src/kvirc/kvs/kvi_kvs_treenode_expression.cpp
index 60482bda4..a5802c7e2 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_expression.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_expression.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Mon 06 Oct 2003 01.35 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2003-2010 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
@@ -23,7 +23,7 @@
 //=============================================================================
 
 #include "kvi_kvs_treenode_expression.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 
 #include <math.h>
 
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_expression.h b/src/kvirc/kvs/kvi_kvs_treenode_expression.h
index 657822f60..b3877bc78 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_expression.h
+++ b/src/kvirc/kvs/kvi_kvs_treenode_expression.h
@@ -6,7 +6,7 @@
 //   Creation date : Mon 06 Oct 2003 01.33 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2003-2010 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
@@ -24,7 +24,7 @@
 //
 //=============================================================================
 
-#include "kvi_qstring.h"
+#include "KviQString.h"
 #include "kvi_kvs_variant.h"
 #include "kvi_kvs_treenode_data.h"
 
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_expressionreturn.cpp b/src/kvirc/kvs/kvi_kvs_treenode_expressionreturn.cpp
index 1c34540d6..051249a1e 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_expressionreturn.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_expressionreturn.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Fri 30 Jan 2004 01:27:09 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2004-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2004-2010 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
@@ -25,7 +25,7 @@
 #include "kvi_kvs_treenode_expressionreturn.h"
 #include "kvi_kvs_treenode_expression.h"
 #include "kvi_kvs_runtimecontext.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 
 KviKvsTreeNodeExpressionReturn::KviKvsTreeNodeExpressionReturn(const QChar * pLocation,KviKvsTreeNodeExpression * pExpression)
 : KviKvsTreeNodeInstruction(pLocation)
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_expressionreturn.h b/src/kvirc/kvs/kvi_kvs_treenode_expressionreturn.h
index 92513dd04..c00ba9b56 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_expressionreturn.h
+++ b/src/kvirc/kvs/kvi_kvs_treenode_expressionreturn.h
@@ -6,7 +6,7 @@
 //   Creation date : Fri 30 Jan 2004 01:27:09 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2004-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2004-2010 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
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_extendedscopevariable.cpp b/src/kvirc/kvs/kvi_kvs_treenode_extendedscopevariable.cpp
index 4b9fde7c1..a33c513b9 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_extendedscopevariable.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_extendedscopevariable.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Thu 16 Oct 2003 22:41:20 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
@@ -24,7 +24,7 @@
 
 #include "kvi_kvs_treenode_extendedscopevariable.h"
 #include "kvi_kvs_runtimecontext.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 
 KviKvsTreeNodeExtendedScopeVariable::KviKvsTreeNodeExtendedScopeVariable(const QChar * pLocation,const QString &szIdentifier)
 : KviKvsTreeNodeVariable(pLocation,szIdentifier)
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_extendedscopevariable.h b/src/kvirc/kvs/kvi_kvs_treenode_extendedscopevariable.h
index c13cc4d10..f794770e0 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_extendedscopevariable.h
+++ b/src/kvirc/kvs/kvi_kvs_treenode_extendedscopevariable.h
@@ -6,7 +6,7 @@
 //   Creation date : Thu 16 Oct 2003 22:41:20 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
@@ -25,7 +25,7 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_qstring.h"
+#include "KviQString.h"
 #include "kvi_kvs_treenode_variable.h"
 
 class KviKvsRunTimeContext;
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_functioncall.cpp b/src/kvirc/kvs/kvi_kvs_treenode_functioncall.cpp
index 59d349240..fa687ba25 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_functioncall.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_functioncall.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Tue 07 Oct 2003 03:14:44 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_functioncall.h b/src/kvirc/kvs/kvi_kvs_treenode_functioncall.h
index 47ecc1ec2..1574065e7 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_functioncall.h
+++ b/src/kvirc/kvs/kvi_kvs_treenode_functioncall.h
@@ -6,7 +6,7 @@
 //   Creation date : Tue 07 Oct 2003 03:14:44 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_globalvariable.cpp b/src/kvirc/kvs/kvi_kvs_treenode_globalvariable.cpp
index 610cec13a..e613d59f9 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_globalvariable.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_globalvariable.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Thu 16 Oct 2003 22:45:01 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_globalvariable.h b/src/kvirc/kvs/kvi_kvs_treenode_globalvariable.h
index b2aa0f0c6..36fef2aab 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_globalvariable.h
+++ b/src/kvirc/kvs/kvi_kvs_treenode_globalvariable.h
@@ -6,7 +6,7 @@
 //   Creation date : Thu 16 Oct 2003 22:45:01 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
@@ -25,7 +25,7 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_qstring.h"
+#include "KviQString.h"
 #include "kvi_kvs_treenode_variable.h"
 
 class KviKvsRunTimeContext;
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_hashcount.cpp b/src/kvirc/kvs/kvi_kvs_treenode_hashcount.cpp
index 07900e962..f33e0a7ae 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_hashcount.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_hashcount.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Tue 07 Oct 2003 03:05:30 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
@@ -26,7 +26,7 @@
 #include "kvi_kvs_variant.h"
 #include "kvi_kvs_runtimecontext.h"
 #include "kvi_kvs_object.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 
 
 KviKvsTreeNodeHashCount::KviKvsTreeNodeHashCount(const QChar * pLocation,KviKvsTreeNodeData * pSource)
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_hashcount.h b/src/kvirc/kvs/kvi_kvs_treenode_hashcount.h
index 4fe93c87c..e2906f62d 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_hashcount.h
+++ b/src/kvirc/kvs/kvi_kvs_treenode_hashcount.h
@@ -6,7 +6,7 @@
 //   Creation date : Tue 07 Oct 2003 03:05:30 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
@@ -25,7 +25,7 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_qstring.h"
+#include "KviQString.h"
 #include "kvi_kvs_treenode_indirectdata.h"
 
 class KviKvsRunTimeContext;
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_hashelement.cpp b/src/kvirc/kvs/kvi_kvs_treenode_hashelement.cpp
index bd48a63c2..ac90b014d 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_hashelement.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_hashelement.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Tue 07 Oct 2003 03:04:18 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
@@ -24,7 +24,7 @@
 
 #include "kvi_kvs_treenode_hashelement.h"
 #include "kvi_kvs_runtimecontext.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_kvs_hash.h"
 #include "kvi_kvs_object.h"
 
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_hashelement.h b/src/kvirc/kvs/kvi_kvs_treenode_hashelement.h
index 9059df522..98ddcd04a 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_hashelement.h
+++ b/src/kvirc/kvs/kvi_kvs_treenode_hashelement.h
@@ -6,7 +6,7 @@
 //   Creation date : Tue 07 Oct 2003 03:04:18 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
@@ -25,7 +25,7 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_qstring.h"
+#include "KviQString.h"
 #include "kvi_kvs_treenode_data.h"
 #include "kvi_kvs_treenode_arrayorhashelement.h"
 
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_hashreferenceassert.cpp b/src/kvirc/kvs/kvi_kvs_treenode_hashreferenceassert.cpp
index 942de3cb3..cc78049c5 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_hashreferenceassert.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_hashreferenceassert.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Thu 16 Oct 2003 23:43:06 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
@@ -26,7 +26,7 @@
 #include "kvi_kvs_rwevaluationresult.h"
 #include "kvi_kvs_runtimecontext.h"
 #include "kvi_kvs_variant.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 
 KviKvsTreeNodeHashReferenceAssert::KviKvsTreeNodeHashReferenceAssert(const QChar * pLocation,KviKvsTreeNodeData * pSource)
 : KviKvsTreeNodeIndirectData(pLocation,pSource)
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_hashreferenceassert.h b/src/kvirc/kvs/kvi_kvs_treenode_hashreferenceassert.h
index 8e79d8707..e69125fc3 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_hashreferenceassert.h
+++ b/src/kvirc/kvs/kvi_kvs_treenode_hashreferenceassert.h
@@ -6,7 +6,7 @@
 //   Creation date : Thu 16 Oct 2003 23:43:06 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
@@ -25,7 +25,7 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_qstring.h"
+#include "KviQString.h"
 #include "kvi_kvs_treenode_indirectdata.h"
 
 class KviKvsRunTimeContext;
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_indirectdata.cpp b/src/kvirc/kvs/kvi_kvs_treenode_indirectdata.cpp
index 5ca008feb..44ee0640f 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_indirectdata.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_indirectdata.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Thu 16 Oct 2003 22:49:46 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_indirectdata.h b/src/kvirc/kvs/kvi_kvs_treenode_indirectdata.h
index a52a1164c..1b3c49f03 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_indirectdata.h
+++ b/src/kvirc/kvs/kvi_kvs_treenode_indirectdata.h
@@ -6,7 +6,7 @@
 //   Creation date : Thu 16 Oct 2003 22:49:46 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
@@ -25,7 +25,7 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_qstring.h"
+#include "KviQString.h"
 #include "kvi_kvs_treenode_data.h"
 
 class KVIRC_API KviKvsTreeNodeIndirectData : public KviKvsTreeNodeData
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_instruction.cpp b/src/kvirc/kvs/kvi_kvs_treenode_instruction.cpp
index 8cbcaedd7..19cb80bd6 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_instruction.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_instruction.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Mon 06 Sep 2003 03.47 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2003-2010 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
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_instruction.h b/src/kvirc/kvs/kvi_kvs_treenode_instruction.h
index 2f2a1f4d2..b337d830c 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_instruction.h
+++ b/src/kvirc/kvs/kvi_kvs_treenode_instruction.h
@@ -6,7 +6,7 @@
 //   Creation date : Mon 06 Oct 2003 03.46 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2003-2010 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
@@ -30,7 +30,7 @@
 * \brief Treenode instruction handling
 */
 
-#include "kvi_qstring.h"
+#include "KviQString.h"
 #include "kvi_kvs_treenode_base.h"
 
 class KviKvsRunTimeContext;
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_instructionblock.cpp b/src/kvirc/kvs/kvi_kvs_treenode_instructionblock.cpp
index 965ab374f..24e8b50d2 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_instructionblock.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_instructionblock.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Thu 09 Oct 2003 01:44:31 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_instructionblock.h b/src/kvirc/kvs/kvi_kvs_treenode_instructionblock.h
index f0fe6cd39..1bf1f58e3 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_instructionblock.h
+++ b/src/kvirc/kvs/kvi_kvs_treenode_instructionblock.h
@@ -6,7 +6,7 @@
 //   Creation date : Thu 09 Oct 2003 01:44:31 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
@@ -25,8 +25,8 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_qstring.h"
-#include "kvi_pointerlist.h"
+#include "KviQString.h"
+#include "KviPointerList.h"
 
 #include "kvi_kvs_treenode_instruction.h"
 
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_localvariable.cpp b/src/kvirc/kvs/kvi_kvs_treenode_localvariable.cpp
index 1b5eec082..4bab1abfd 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_localvariable.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_localvariable.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Thu 16 Oct 2003 22:41:20 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_localvariable.h b/src/kvirc/kvs/kvi_kvs_treenode_localvariable.h
index 941cc3ccc..a3e352b2f 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_localvariable.h
+++ b/src/kvirc/kvs/kvi_kvs_treenode_localvariable.h
@@ -6,7 +6,7 @@
 //   Creation date : Thu 16 Oct 2003 22:41:20 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
@@ -25,7 +25,7 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_qstring.h"
+#include "KviQString.h"
 #include "kvi_kvs_treenode_variable.h"
 
 class KviKvsRunTimeContext;
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_modulecallbackcommand.cpp b/src/kvirc/kvs/kvi_kvs_treenode_modulecallbackcommand.cpp
index 76dd9503a..0c1bb8b40 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_modulecallbackcommand.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_modulecallbackcommand.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Thu 09 Oct 2003 02:09:10 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
@@ -27,7 +27,7 @@
 #include "kvi_kvs_treenode_switchlist.h"
 
 #include "kvi_modulemanager.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_kvs_moduleinterface.h"
 #include "kvi_kvs_runtimecontext.h"
 
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_modulecallbackcommand.h b/src/kvirc/kvs/kvi_kvs_treenode_modulecallbackcommand.h
index 645be9113..2068fca9e 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_modulecallbackcommand.h
+++ b/src/kvirc/kvs/kvi_kvs_treenode_modulecallbackcommand.h
@@ -6,7 +6,7 @@
 //   Creation date : Thu 09 Oct 2003 02:09:10 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
@@ -25,7 +25,7 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_qstring.h"
+#include "KviQString.h"
 #include "kvi_kvs_treenode_callbackcommand.h"
 
 class KviKvsTreeNodeDataList;
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_modulefunctioncall.cpp b/src/kvirc/kvs/kvi_kvs_treenode_modulefunctioncall.cpp
index 833666801..a4da2952c 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_modulefunctioncall.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_modulefunctioncall.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Tue 07 Oct 2003 03:19:28 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
@@ -26,7 +26,7 @@
 #include "kvi_kvs_treenode_datalist.h"
 
 #include "kvi_modulemanager.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_kvs_moduleinterface.h"
 #include "kvi_kvs_runtimecontext.h"
 
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_modulefunctioncall.h b/src/kvirc/kvs/kvi_kvs_treenode_modulefunctioncall.h
index 0f38f94fb..438ea0020 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_modulefunctioncall.h
+++ b/src/kvirc/kvs/kvi_kvs_treenode_modulefunctioncall.h
@@ -6,7 +6,7 @@
 //   Creation date : Tue 07 Oct 2003 03:19:28 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
@@ -25,7 +25,7 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_qstring.h"
+#include "KviQString.h"
 #include "kvi_kvs_treenode_datalist.h"
 #include "kvi_kvs_treenode_functioncall.h"
 
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_modulesimplecommand.cpp b/src/kvirc/kvs/kvi_kvs_treenode_modulesimplecommand.cpp
index 259eb7099..f13fcdccd 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_modulesimplecommand.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_modulesimplecommand.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Thu 09 Oct 2003 02:18:27 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
@@ -27,7 +27,7 @@
 #include "kvi_kvs_treenode_switchlist.h"
 
 #include "kvi_modulemanager.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_kvs_moduleinterface.h"
 #include "kvi_kvs_runtimecontext.h"
 
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_modulesimplecommand.h b/src/kvirc/kvs/kvi_kvs_treenode_modulesimplecommand.h
index a7b55034f..ac0d0c735 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_modulesimplecommand.h
+++ b/src/kvirc/kvs/kvi_kvs_treenode_modulesimplecommand.h
@@ -6,7 +6,7 @@
 //   Creation date : Thu 09 Oct 2003 02:18:27 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
@@ -25,7 +25,7 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_qstring.h"
+#include "KviQString.h"
 #include "kvi_kvs_treenode_simplecommand.h"
 
 class KviKvsTreeNodeDataList;
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_multipleparameteridentifier.cpp b/src/kvirc/kvs/kvi_kvs_treenode_multipleparameteridentifier.cpp
index cdcd562e9..1403cb33f 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_multipleparameteridentifier.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_multipleparameteridentifier.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Tue 07 Oct 2003 03:49:31 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_multipleparameteridentifier.h b/src/kvirc/kvs/kvi_kvs_treenode_multipleparameteridentifier.h
index 121e8997a..86127138b 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_multipleparameteridentifier.h
+++ b/src/kvirc/kvs/kvi_kvs_treenode_multipleparameteridentifier.h
@@ -6,7 +6,7 @@
 //   Creation date : Tue 07 Oct 2003 03:49:31 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
@@ -25,7 +25,7 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_qstring.h"
+#include "KviQString.h"
 #include "kvi_kvs_treenode_data.h"
 
 class KviKvsRunTimeContext;
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_objectfield.cpp b/src/kvirc/kvs/kvi_kvs_treenode_objectfield.cpp
index 07e7d1c11..99f26435d 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_objectfield.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_objectfield.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Thu 28 Apr 2005 17:12:14 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2005-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2005-2010 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
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_objectfield.h b/src/kvirc/kvs/kvi_kvs_treenode_objectfield.h
index a484689f2..f58952fa8 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_objectfield.h
+++ b/src/kvirc/kvs/kvi_kvs_treenode_objectfield.h
@@ -6,7 +6,7 @@
 //   Creation date : Thu 28 Apr 2005 17:12:14 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2005-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2005-2010 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
@@ -25,7 +25,7 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_qstring.h"
+#include "KviQString.h"
 #include "kvi_kvs_treenode_variable.h"
 
 class KviKvsRunTimeContext;
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_objectfunctioncall.cpp b/src/kvirc/kvs/kvi_kvs_treenode_objectfunctioncall.cpp
index f1c13f6ea..5175387db 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_objectfunctioncall.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_objectfunctioncall.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Tue 07 Oct 2003 03:26:07 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_objectfunctioncall.h b/src/kvirc/kvs/kvi_kvs_treenode_objectfunctioncall.h
index dd4b2fff0..636a5e6ec 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_objectfunctioncall.h
+++ b/src/kvirc/kvs/kvi_kvs_treenode_objectfunctioncall.h
@@ -6,7 +6,7 @@
 //   Creation date : Tue 07 Oct 2003 03:26:07 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
@@ -25,7 +25,7 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_qstring.h"
+#include "KviQString.h"
 #include "kvi_kvs_treenode_datalist.h"
 #include "kvi_kvs_treenode_functioncall.h"
 
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_operation.cpp b/src/kvirc/kvs/kvi_kvs_treenode_operation.cpp
index 53a409cc0..4bf827879 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_operation.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_operation.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Thu 18 Dec 2003 22:36:00 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
@@ -25,7 +25,7 @@
 #include "kvi_kvs_treenode_operation.h"
 #include "kvi_kvs_treenode_data.h"
 #include "kvi_kvs_runtimecontext.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 
 #include <QRegExp>
 
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_operation.h b/src/kvirc/kvs/kvi_kvs_treenode_operation.h
index 16dac9d1a..5cb6aeac0 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_operation.h
+++ b/src/kvirc/kvs/kvi_kvs_treenode_operation.h
@@ -6,7 +6,7 @@
 //   Creation date : Thu 18 Dec 2003 22:36:00 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
@@ -26,7 +26,7 @@
 
 
 #include "kvi_settings.h"
-#include "kvi_qstring.h"
+#include "KviQString.h"
 #include "kvi_kvs_treenode_instruction.h"
 
 class KviKvsTreeNodeData;
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_parameterreturn.cpp b/src/kvirc/kvs/kvi_kvs_treenode_parameterreturn.cpp
index 1b959cfae..53ae7fcc9 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_parameterreturn.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_parameterreturn.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Fri 30 Jan 2004 01:31:01 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2004-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2004-2010 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
@@ -26,7 +26,7 @@
 #include "kvi_kvs_treenode_datalist.h"
 #include "kvi_kvs_runtimecontext.h"
 #include "kvi_kvs_variantlist.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 
 KviKvsTreeNodeParameterReturn::KviKvsTreeNodeParameterReturn(const QChar * pLocation,KviKvsTreeNodeDataList * pDataList)
 : KviKvsTreeNodeInstruction(pLocation)
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_parameterreturn.h b/src/kvirc/kvs/kvi_kvs_treenode_parameterreturn.h
index 85f6b88ff..6dc4071cd 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_parameterreturn.h
+++ b/src/kvirc/kvs/kvi_kvs_treenode_parameterreturn.h
@@ -6,7 +6,7 @@
 //   Creation date : Fri 30 Jan 2004 01:31:01 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2004-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2004-2010 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
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_rebindingswitch.cpp b/src/kvirc/kvs/kvi_kvs_treenode_rebindingswitch.cpp
index a511b28dd..733eb9a71 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_rebindingswitch.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_rebindingswitch.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Mon 15 Aug 2005 13:32:31 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC Client distribution
-//   Copyright (C) 2005-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2005-2010 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
@@ -26,7 +26,7 @@
 #include "kvi_kvs_treenode_data.h"
 #include "kvi_window.h"
 #include "kvi_app.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_kvs_runtimecontext.h"
 
 KviKvsTreeNodeRebindingSwitch::KviKvsTreeNodeRebindingSwitch(const QChar * pLocation,KviKvsTreeNodeData * pTargetWindow,KviKvsTreeNodeCommand * pChildCommand)
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_rebindingswitch.h b/src/kvirc/kvs/kvi_kvs_treenode_rebindingswitch.h
index 6c009407e..b7792aa3e 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_rebindingswitch.h
+++ b/src/kvirc/kvs/kvi_kvs_treenode_rebindingswitch.h
@@ -6,7 +6,7 @@
 //   Creation date : Mon 15 Aug 2005 13:32:31 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC Client distribution
-//   Copyright (C) 2005-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2005-2010 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
@@ -26,7 +26,7 @@
 
 #include "kvi_settings.h"
 #include "kvi_kvs_treenode_command.h"
-#include "kvi_qstring.h"
+#include "KviQString.h"
 
 class KviKvsTreeNodeData;
 class KviKvsRunTimeContext;
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_scopeoperator.cpp b/src/kvirc/kvs/kvi_kvs_treenode_scopeoperator.cpp
index 7d5abfaee..ba97293b5 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_scopeoperator.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_scopeoperator.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Tue 07 Oct 2003 02:33:01 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
@@ -24,7 +24,7 @@
 
 #include "kvi_kvs_treenode_scopeoperator.h"
 
-#include "kvi_qstring.h"
+#include "KviQString.h"
 
 #include "kvi_kvs_variant.h"
 #include "kvi_kvs_runtimecontext.h"
@@ -32,7 +32,7 @@
 #include "kvi_kvs_object.h"
 #include "kvi_kvs_object_controller.h"
 
-#include "kvi_locale.h"
+#include "KviLocale.h"
 
 KviKvsTreeNodeScopeOperator::KviKvsTreeNodeScopeOperator(const QChar * pLocation,KviKvsTreeNodeData * pObject,KviKvsTreeNodeData * pData)
 : KviKvsTreeNodeData(pLocation)
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_scopeoperator.h b/src/kvirc/kvs/kvi_kvs_treenode_scopeoperator.h
index 03407745b..d842861bb 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_scopeoperator.h
+++ b/src/kvirc/kvs/kvi_kvs_treenode_scopeoperator.h
@@ -6,7 +6,7 @@
 //   Creation date : Tue 07 Oct 2003 02:33:01 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_simplecommand.cpp b/src/kvirc/kvs/kvi_kvs_treenode_simplecommand.cpp
index 77f103cb4..97550e37c 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_simplecommand.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_simplecommand.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Thu 09 Oct 2003 02:12:18 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_simplecommand.h b/src/kvirc/kvs/kvi_kvs_treenode_simplecommand.h
index cb643b77b..2c19a60b6 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_simplecommand.h
+++ b/src/kvirc/kvs/kvi_kvs_treenode_simplecommand.h
@@ -6,7 +6,7 @@
 //   Creation date : Thu 09 Oct 2003 02:12:18 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_singleparameteridentifier.cpp b/src/kvirc/kvs/kvi_kvs_treenode_singleparameteridentifier.cpp
index 1f2321c05..60b52dc5f 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_singleparameteridentifier.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_singleparameteridentifier.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Tue 07 Oct 2003 03:47:11 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_singleparameteridentifier.h b/src/kvirc/kvs/kvi_kvs_treenode_singleparameteridentifier.h
index 792d76288..9ee53e8fd 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_singleparameteridentifier.h
+++ b/src/kvirc/kvs/kvi_kvs_treenode_singleparameteridentifier.h
@@ -6,7 +6,7 @@
 //   Creation date : Tue 07 Oct 2003 03:47:11 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommand.cpp b/src/kvirc/kvs/kvi_kvs_treenode_specialcommand.cpp
index cf759399f..3e4d262b1 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommand.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommand.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Thu 09 Oct 2003 02:20:12 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommand.h b/src/kvirc/kvs/kvi_kvs_treenode_specialcommand.h
index 72fe4bda9..4d62c30b8 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommand.h
+++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommand.h
@@ -6,7 +6,7 @@
 //   Creation date : Thu 09 Oct 2003 02:20:12 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
@@ -25,7 +25,7 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_qstring.h"
+#include "KviQString.h"
 #include "kvi_kvs_treenode_command.h"
 
 class KVIRC_API KviKvsTreeNodeSpecialCommand : public KviKvsTreeNodeCommand
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandbreak.cpp b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandbreak.cpp
index bd886b854..59b4395ec 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandbreak.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandbreak.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Thu 06 Nov 2003 12:15:00 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
@@ -24,7 +24,7 @@
 
 #include "kvi_kvs_treenode_specialcommandbreak.h"
 #include "kvi_kvs_runtimecontext.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 
 KviKvsTreeNodeSpecialCommandBreak::KviKvsTreeNodeSpecialCommandBreak(const QChar * pLocation)
 : KviKvsTreeNodeSpecialCommand(pLocation,"break")
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandbreak.h b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandbreak.h
index 903f2d883..6bf36b994 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandbreak.h
+++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandbreak.h
@@ -6,7 +6,7 @@
 //   Creation date : Thu 06 Nov 2003 12:15:00 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
@@ -26,7 +26,7 @@
 
 
 #include "kvi_settings.h"
-#include "kvi_qstring.h"
+#include "KviQString.h"
 #include "kvi_kvs_treenode_specialcommand.h"
 
 class KviKvsRunTimeContext;
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandclass.cpp b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandclass.cpp
index 8d1772413..79161df7d 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandclass.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandclass.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Fri 12 Aug 2005 03:23:31 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC Client distribution
-//   Copyright (C) 2005-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2005-2010 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
@@ -21,7 +21,7 @@
 //   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 //=============================================================================
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_kvs_variantlist.h"
 #include "kvi_kvs_variant.h"
 #include "kvi_kvs_treenode_specialcommandclass.h"
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandclass.h b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandclass.h
index b8bec5945..852b84ea2 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandclass.h
+++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandclass.h
@@ -6,7 +6,7 @@
 //   Creation date : Fri 12 Aug 2005 03:23:31 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC Client distribution
-//   Copyright (C) 2005-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2005-2010 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
@@ -25,7 +25,7 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_qstring.h"
+#include "KviQString.h"
 #include "kvi_kvs_treenode_specialcommand.h"
 #include "kvi_kvs_treenode_base.h"
 #include "kvi_kvs_treenode_datalist.h"
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandcontinue.cpp b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandcontinue.cpp
index ee8d9cb3b..8b5001f04 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandcontinue.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandcontinue.cpp
@@ -24,7 +24,7 @@
 
 #include "kvi_kvs_treenode_specialcommandcontinue.h"
 #include "kvi_kvs_runtimecontext.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 
 KviKvsTreeNodeSpecialCommandContinue::KviKvsTreeNodeSpecialCommandContinue(const QChar * pLocation)
 : KviKvsTreeNodeSpecialCommand(pLocation,"continue")
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandcontinue.h b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandcontinue.h
index 76461bce0..316068137 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandcontinue.h
+++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandcontinue.h
@@ -26,7 +26,7 @@
 
 
 #include "kvi_settings.h"
-#include "kvi_qstring.h"
+#include "KviQString.h"
 #include "kvi_kvs_treenode_specialcommand.h"
 
 class KviKvsRunTimeContext;
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddefpopup.cpp b/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddefpopup.cpp
index 3168c7ef4..6244b1035 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddefpopup.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddefpopup.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Fri 02 Jan 2004 14:09:00 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2004-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2004-2010 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
@@ -26,7 +26,7 @@
 #include "kvi_kvs_treenode_expression.h"
 #include "kvi_kvs_treenode_instruction.h"
 #include "kvi_kvs_runtimecontext.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_kvs_popupmanager.h"
 #include "kvi_kvs_popupmenu.h"
 #include "kvi_kvs_script.h"
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddefpopup.h b/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddefpopup.h
index 0e3e79caf..2224c0e87 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddefpopup.h
+++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddefpopup.h
@@ -6,7 +6,7 @@
 //   Creation date : Fri 02 Jan 2004 13:54:00 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2004-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2004-2010 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
@@ -25,7 +25,7 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_qstring.h"
+#include "KviQString.h"
 #include "kvi_kvs_treenode.h"
 #include "kvi_kvs_treenode_specialcommand.h"
 
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddo.cpp b/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddo.cpp
index f5b1c8faf..38e9b2d17 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddo.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddo.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Thu 06 Nov 2003 14:09:53 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
@@ -27,7 +27,7 @@
 #include "kvi_kvs_treenode_expression.h"
 #include "kvi_kvs_treenode_instruction.h"
 #include "kvi_kvs_runtimecontext.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 
 KviKvsTreeNodeSpecialCommandDo::KviKvsTreeNodeSpecialCommandDo(const QChar * pLocation,KviKvsTreeNodeExpression * e,KviKvsTreeNodeInstruction * i)
 : KviKvsTreeNodeSpecialCommand(pLocation,"do")
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddo.h b/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddo.h
index 4047190f8..937801967 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddo.h
+++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddo.h
@@ -6,7 +6,7 @@
 //   Creation date : Thu 06 Nov 2003 14:09:53 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
@@ -26,7 +26,7 @@
 
 
 #include "kvi_settings.h"
-#include "kvi_qstring.h"
+#include "KviQString.h"
 #include "kvi_kvs_treenode_specialcommand.h"
 
 class KviKvsTreeNodeExpression;
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandfor.cpp b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandfor.cpp
index 53c31238d..23887ad44 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandfor.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandfor.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Fri 07 Nov 2003 11:48:11 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
@@ -26,7 +26,7 @@
 #include "kvi_kvs_treenode_expression.h"
 #include "kvi_kvs_treenode_instruction.h"
 #include "kvi_kvs_runtimecontext.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 
 KviKvsTreeNodeSpecialCommandFor::KviKvsTreeNodeSpecialCommandFor(const QChar * pLocation,KviKvsTreeNodeInstruction * pInit,KviKvsTreeNodeExpression * pCond,KviKvsTreeNodeInstruction * pUpd,KviKvsTreeNodeInstruction * pLoop)
 : KviKvsTreeNodeSpecialCommand(pLocation,"for")
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandfor.h b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandfor.h
index 07c024a74..5ac63e2b2 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandfor.h
+++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandfor.h
@@ -6,7 +6,7 @@
 //   Creation date : Fri 07 Nov 2003 11:48:11 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
@@ -26,7 +26,7 @@
 
 
 #include "kvi_settings.h"
-#include "kvi_qstring.h"
+#include "KviQString.h"
 #include "kvi_kvs_treenode_specialcommand.h"
 
 class KviKvsTreeNodeExpression;
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandforeach.cpp b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandforeach.cpp
index e317e71e9..772062299 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandforeach.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandforeach.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Fri 07 Nov 2003 11:48:11 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
@@ -28,7 +28,7 @@
 #include "kvi_kvs_treenode_instruction.h"
 #include "kvi_kvs_treenode_switchlist.h"
 #include "kvi_kvs_runtimecontext.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 
 KviKvsTreeNodeSpecialCommandForeach::KviKvsTreeNodeSpecialCommandForeach(const QChar * pLocation,KviKvsTreeNodeData * pVar,KviKvsTreeNodeDataList * pArgs,KviKvsTreeNodeInstruction * pLoop)
 : KviKvsTreeNodeSpecialCommand(pLocation,"foreach")
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandforeach.h b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandforeach.h
index 79be97299..253aa834f 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandforeach.h
+++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandforeach.h
@@ -6,7 +6,7 @@
 //   Creation date : Fri 07 Nov 2003 11:48:11 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
@@ -26,7 +26,7 @@
 
 
 #include "kvi_settings.h"
-#include "kvi_qstring.h"
+#include "KviQString.h"
 #include "kvi_kvs_treenode_specialcommand.h"
 
 class KviKvsTreeNodeData;
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandif.cpp b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandif.cpp
index a09188b37..ae2489bc4 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandif.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandif.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Thu 09 Oct 2003 02:40:00 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
@@ -26,7 +26,7 @@
 #include "kvi_kvs_treenode_expression.h"
 #include "kvi_kvs_treenode_instruction.h"
 #include "kvi_kvs_runtimecontext.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 
 KviKvsTreeNodeSpecialCommandIf::KviKvsTreeNodeSpecialCommandIf(const QChar * pLocation,KviKvsTreeNodeExpression * e,KviKvsTreeNodeInstruction * pIf,KviKvsTreeNodeInstruction * pElse)
 : KviKvsTreeNodeSpecialCommand(pLocation,"if")
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandif.h b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandif.h
index a9e9fd984..2bb8df0a4 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandif.h
+++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandif.h
@@ -6,7 +6,7 @@
 //   Creation date : Thu 09 Oct 2003 02:40:00 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
@@ -25,7 +25,7 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_qstring.h"
+#include "KviQString.h"
 #include "kvi_kvs_treenode_specialcommand.h"
 
 class KviKvsTreeNodeExpression;
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandswitch.cpp b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandswitch.cpp
index e17e424e1..48019de0a 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandswitch.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandswitch.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Fri 02 Jan 2004 14:09:00 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2004-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2004-2010 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
@@ -26,7 +26,7 @@
 #include "kvi_kvs_treenode_expression.h"
 #include "kvi_kvs_treenode_instruction.h"
 #include "kvi_kvs_runtimecontext.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 
 #include <QRegExp>
 
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandswitch.h b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandswitch.h
index 70700076f..2e2c6fdbe 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandswitch.h
+++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandswitch.h
@@ -6,7 +6,7 @@
 //   Creation date : Fri 02 Jan 2004 13:54:00 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2004-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2004-2010 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
@@ -25,7 +25,7 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_qstring.h"
+#include "KviQString.h"
 #include "kvi_kvs_treenode.h"
 #include "kvi_kvs_treenode_specialcommand.h"
 
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandunset.cpp b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandunset.cpp
index 33dcd6fb6..499ecdc57 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandunset.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandunset.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Thu 14 Apr 2005 02:44:00 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
@@ -25,7 +25,7 @@
 #include "kvi_kvs_treenode_specialcommandunset.h"
 #include "kvi_kvs_runtimecontext.h"
 #include "kvi_kvs_rwevaluationresult.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 
 KviKvsTreeNodeSpecialCommandUnset::KviKvsTreeNodeSpecialCommandUnset(const QChar * pLocation,KviPointerList<KviKvsTreeNodeVariable> * pVariableList)
 : KviKvsTreeNodeSpecialCommand(pLocation,"unset")
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandunset.h b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandunset.h
index b17a0a904..827d4bd99 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandunset.h
+++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandunset.h
@@ -6,7 +6,7 @@
 //   Creation date : Thu 14 Apr 2005 02:44:00 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2005-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2005-2010 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
@@ -25,7 +25,7 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_qstring.h"
+#include "KviQString.h"
 #include "kvi_kvs_treenode_specialcommand.h"
 #include "kvi_kvs_treenode_variable.h"
 
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandwhile.cpp b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandwhile.cpp
index 3567e76b7..299918cbc 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandwhile.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandwhile.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Thu 06 Nov 2003 11:58:43 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
@@ -26,7 +26,7 @@
 #include "kvi_kvs_treenode_expression.h"
 #include "kvi_kvs_treenode_instruction.h"
 #include "kvi_kvs_runtimecontext.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 
 KviKvsTreeNodeSpecialCommandWhile::KviKvsTreeNodeSpecialCommandWhile(const QChar * pLocation,KviKvsTreeNodeExpression * e,KviKvsTreeNodeInstruction * i)
 : KviKvsTreeNodeSpecialCommand(pLocation,"while")
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandwhile.h b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandwhile.h
index a3eda86ca..3e9045b8d 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandwhile.h
+++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandwhile.h
@@ -6,7 +6,7 @@
 //   Creation date : Thu 06 Nov 2003 11:58:43 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
@@ -26,7 +26,7 @@
 
 
 #include "kvi_settings.h"
-#include "kvi_qstring.h"
+#include "KviQString.h"
 #include "kvi_kvs_treenode_specialcommand.h"
 
 class KviKvsTreeNodeExpression;
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_stringcast.cpp b/src/kvirc/kvs/kvi_kvs_treenode_stringcast.cpp
index bb5c7996f..6093dfab1 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_stringcast.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_stringcast.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Mon 26 Jun 2006 15:17:33 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2006-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2006-2010 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
@@ -23,7 +23,7 @@
 //=============================================================================
 
 #include "kvi_kvs_treenode_stringcast.h"
-#include "kvi_qstring.h"
+#include "KviQString.h"
 
 KviKvsTreeNodeStringCast::KviKvsTreeNodeStringCast(const QChar * pLocation,KviKvsTreeNodeData * pChildData)
 : KviKvsTreeNodeData(pLocation)
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_stringcast.h b/src/kvirc/kvs/kvi_kvs_treenode_stringcast.h
index bb466efb1..2b8b483ec 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_stringcast.h
+++ b/src/kvirc/kvs/kvi_kvs_treenode_stringcast.h
@@ -6,7 +6,7 @@
 //   Creation date : Mon 26 Jun 2006 15:17:33 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2006-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2006-2010 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
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_switchlist.cpp b/src/kvirc/kvs/kvi_kvs_treenode_switchlist.cpp
index f17ea2a5f..2e4fb1934 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_switchlist.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_switchlist.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Tue 07 Oct 2003 02:06:53 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_switchlist.h b/src/kvirc/kvs/kvi_kvs_treenode_switchlist.h
index 5de50a276..1cf8283b1 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_switchlist.h
+++ b/src/kvirc/kvs/kvi_kvs_treenode_switchlist.h
@@ -6,7 +6,7 @@
 //   Creation date : Tue 07 Oct 2003 02:06:53 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
@@ -25,10 +25,10 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_qstring.h"
+#include "KviQString.h"
 
-#include "kvi_pointerhashtable.h"
-#include "kvi_pointerhashtable.h"
+#include "KviPointerHashTable.h"
+#include "KviPointerHashTable.h"
 
 #include "kvi_kvs_treenode_base.h"
 #include "kvi_kvs_treenode_data.h"
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_thisobjectfunctioncall.cpp b/src/kvirc/kvs/kvi_kvs_treenode_thisobjectfunctioncall.cpp
index c2996932f..ba50b1797 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_thisobjectfunctioncall.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_thisobjectfunctioncall.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Tue 07 Oct 2003 03:28:10 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_thisobjectfunctioncall.h b/src/kvirc/kvs/kvi_kvs_treenode_thisobjectfunctioncall.h
index aabde2329..146e49705 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_thisobjectfunctioncall.h
+++ b/src/kvirc/kvs/kvi_kvs_treenode_thisobjectfunctioncall.h
@@ -6,7 +6,7 @@
 //   Creation date : Tue 07 Oct 2003 03:28:10 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
@@ -25,7 +25,7 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_qstring.h"
+#include "KviQString.h"
 #include "kvi_kvs_treenode_datalist.h"
 #include "kvi_kvs_treenode_objectfunctioncall.h"
 
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_variable.cpp b/src/kvirc/kvs/kvi_kvs_treenode_variable.cpp
index c033b148a..9786d2717 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_variable.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_variable.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Thu 16 Oct 2003 22:34:59 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_variable.h b/src/kvirc/kvs/kvi_kvs_treenode_variable.h
index 5d5088e20..ae78be502 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_variable.h
+++ b/src/kvirc/kvs/kvi_kvs_treenode_variable.h
@@ -6,7 +6,7 @@
 //   Creation date : Thu 16 Oct 2003 22:34:59 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
@@ -25,7 +25,7 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_qstring.h"
+#include "KviQString.h"
 #include "kvi_kvs_treenode_data.h"
 #include "kvi_kvs_variant.h"
 
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_voidfunctioncall.cpp b/src/kvirc/kvs/kvi_kvs_treenode_voidfunctioncall.cpp
index 0a57b28c1..3327d86f6 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_voidfunctioncall.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_voidfunctioncall.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Thu 09 Oct 2003 01:47:16 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_voidfunctioncall.h b/src/kvirc/kvs/kvi_kvs_treenode_voidfunctioncall.h
index c205e5c2e..8e6fc9230 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_voidfunctioncall.h
+++ b/src/kvirc/kvs/kvi_kvs_treenode_voidfunctioncall.h
@@ -6,7 +6,7 @@
 //   Creation date : Thu 09 Oct 2003 01:47:16 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
diff --git a/src/kvirc/kvs/kvi_kvs_types.h b/src/kvirc/kvs/kvi_kvs_types.h
index 1ff4b167a..bc6f65dbe 100644
--- a/src/kvirc/kvs/kvi_kvs_types.h
+++ b/src/kvirc/kvs/kvi_kvs_types.h
@@ -6,7 +6,7 @@
 //   Creation date : : Sun 29 May 2005 05.25 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2005-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2005-2010 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
diff --git a/src/kvirc/kvs/kvi_kvs_useraction.cpp b/src/kvirc/kvs/kvi_kvs_useraction.cpp
index aaa31f748..341c50a81 100644
--- a/src/kvirc/kvs/kvi_kvs_useraction.cpp
+++ b/src/kvirc/kvs/kvi_kvs_useraction.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Tue 07 Dec 2004 02:00:24 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2004-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2004-2010 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
@@ -24,12 +24,12 @@
 
 #include "kvi_kvs_useraction.h"
 #include "kvi_kvs_script.h"
-#include "kvi_config.h"
+#include "KviConfigurationFile.h"
 #include "kvi_iconmanager.h"
 #include "kvi_actionmanager.h"
 #include "kvi_kvs_script.h"
 #include "kvi_window.h"
-#include "kvi_cmdformatter.h"
+#include "KviCommandFormatter.h"
 
 KviKvsUserAction::KviKvsUserAction(QObject * pParent,
 		const QString &szName,
@@ -305,7 +305,7 @@ bool KviKvsUserAction::isKviUserActionNeverOverrideThis()
 	return true;
 }
 
-bool KviKvsUserAction::load(KviConfig * cfg)
+bool KviKvsUserAction::load(KviConfigurationFile * cfg)
 {
 	m_szName = cfg->group();
 	if(m_szName.isEmpty())return false;
@@ -343,7 +343,7 @@ bool KviKvsUserAction::load(KviConfig * cfg)
 	return true;
 }
 
-void KviKvsUserAction::save(KviConfig * cfg)
+void KviKvsUserAction::save(KviConfigurationFile * cfg)
 {
 	cfg->setGroup(m_szName);
 	if(m_pVisibleNameScript)cfg->writeEntry("VisibleName",m_pVisibleNameScript->code());
diff --git a/src/kvirc/kvs/kvi_kvs_useraction.h b/src/kvirc/kvs/kvi_kvs_useraction.h
index 80b78881e..a33b0ed5c 100644
--- a/src/kvirc/kvs/kvi_kvs_useraction.h
+++ b/src/kvirc/kvs/kvi_kvs_useraction.h
@@ -6,7 +6,7 @@
 //   Creation date : Tue 07 Dec 2004 02:00:24 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2004-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2004-2010 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
@@ -27,7 +27,7 @@
 #include "kvi_settings.h"
 #include "kvi_kvs_action.h"
 
-class KviConfig;
+class KviConfigurationFile;
 class KviKvsScript;
 
 class KVIRC_API KviKvsUserAction : public KviKvsAction
@@ -53,7 +53,7 @@ public:
 	// Static allocator function.
 	// This MUST be used by the modules to allocate action structures
 	// instead of the new operator.
-	// See kvi_heapobject.cpp for an explaination.
+	// See KviHeapObject.cpp for an explaination.
 	static KviKvsUserAction * createInstance(
 			QObject * pParent,
 			const QString &szName,
@@ -73,8 +73,8 @@ protected:
 	KviKvsScript * m_pVisibleNameScript;
 protected:
 	virtual bool isKviUserActionNeverOverrideThis();
-	bool load(KviConfig * cfg);
-	void save(KviConfig * cfg);
+	bool load(KviConfigurationFile * cfg);
+	void save(KviConfigurationFile * cfg);
 public:
 	virtual const QString & visibleName();
 	virtual const QString & description();
diff --git a/src/kvirc/kvs/kvi_kvs_variant.h b/src/kvirc/kvs/kvi_kvs_variant.h
index cb5ca0fea..94b373150 100644
--- a/src/kvirc/kvs/kvi_kvs_variant.h
+++ b/src/kvirc/kvs/kvi_kvs_variant.h
@@ -31,8 +31,8 @@
 */
 
 #include "kvi_settings.h"
-#include "kvi_qstring.h"
-#include "kvi_heapobject.h"
+#include "KviQString.h"
+#include "KviHeapObject.h"
 #include "kvi_kvs_types.h"
 
 class KviKvsVariant;
diff --git a/src/kvirc/kvs/kvi_kvs_variantlist.cpp b/src/kvirc/kvs/kvi_kvs_variantlist.cpp
index ee2db9ca0..4602f2f6d 100644
--- a/src/kvirc/kvs/kvi_kvs_variantlist.cpp
+++ b/src/kvirc/kvs/kvi_kvs_variantlist.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Sat 11 Oct 2003 02:20:51 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2003-2010 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
diff --git a/src/kvirc/kvs/kvi_kvs_variantlist.h b/src/kvirc/kvs/kvi_kvs_variantlist.h
index 16df64a3d..ba64cd537 100644
--- a/src/kvirc/kvs/kvi_kvs_variantlist.h
+++ b/src/kvirc/kvs/kvi_kvs_variantlist.h
@@ -31,7 +31,7 @@
 */
 
 #include "kvi_settings.h"
-#include "kvi_pointerlist.h"
+#include "KviPointerList.h"
 #include "kvi_kvs_variant.h"
 
 /**
diff --git a/src/kvirc/module/kvi_mexlinkfilter.cpp b/src/kvirc/module/kvi_mexlinkfilter.cpp
index 6d9100e17..ea95f592f 100644
--- a/src/kvirc/module/kvi_mexlinkfilter.cpp
+++ b/src/kvirc/module/kvi_mexlinkfilter.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Wed Apr 11 2003 03:07 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2003-2010 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
diff --git a/src/kvirc/module/kvi_mexlinkfilter.h b/src/kvirc/module/kvi_mexlinkfilter.h
index 7df5c2215..be31ff356 100644
--- a/src/kvirc/module/kvi_mexlinkfilter.h
+++ b/src/kvirc/module/kvi_mexlinkfilter.h
@@ -6,7 +6,7 @@
 //   Creation date : Wed Apr 11 2003 03:07 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2003-2010 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
diff --git a/src/kvirc/module/kvi_mexserverimport.cpp b/src/kvirc/module/kvi_mexserverimport.cpp
index 27fb524d3..138219b73 100644
--- a/src/kvirc/module/kvi_mexserverimport.cpp
+++ b/src/kvirc/module/kvi_mexserverimport.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Wed Apr 9 2003 04:53 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2003-2010 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
diff --git a/src/kvirc/module/kvi_mexserverimport.h b/src/kvirc/module/kvi_mexserverimport.h
index 2eb9306a1..07a458e38 100644
--- a/src/kvirc/module/kvi_mexserverimport.h
+++ b/src/kvirc/module/kvi_mexserverimport.h
@@ -6,7 +6,7 @@
 //   Creation date : Wed Apr 9 2003 04:53 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2003-2010 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
@@ -25,7 +25,7 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_ircserverdb.h"
+#include "KviIrcServerDataBase.h"
 #include "kvi_moduleextension.h"
 
 #include <QObject>
diff --git a/src/kvirc/module/kvi_mextoolbar.cpp b/src/kvirc/module/kvi_mextoolbar.cpp
index cc91d5e8e..4be546352 100644
--- a/src/kvirc/module/kvi_mextoolbar.cpp
+++ b/src/kvirc/module/kvi_mextoolbar.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Thu Sep 12 22:11:47 2002 GMT by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2002-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2002-2010 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
diff --git a/src/kvirc/module/kvi_mextoolbar.h b/src/kvirc/module/kvi_mextoolbar.h
index 2f413bcbe..7f6564a84 100644
--- a/src/kvirc/module/kvi_mextoolbar.h
+++ b/src/kvirc/module/kvi_mextoolbar.h
@@ -6,7 +6,7 @@
 //   Creation date : Thu Sep 12 22:11:45 2002 GMT by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2002-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2002-2010 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
diff --git a/src/kvirc/module/kvi_module.cpp b/src/kvirc/module/kvi_module.cpp
index 45ef1dc4e..02994b5f8 100644
--- a/src/kvirc/module/kvi_module.cpp
+++ b/src/kvirc/module/kvi_module.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Sat Aug 12 2000 20:30:29 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -150,18 +150,18 @@ KviModule::~KviModule()
 	delete m_pLibrary;
 }
 
-KviModuleExtensionDescriptor * KviModule::registerExtension(const KviStr &szType,const KviStr &szName,const QString &szVisibleName,KviModuleExtensionAllocRoutine r)
+KviModuleExtensionDescriptor * KviModule::registerExtension(const KviCString &szType,const KviCString &szName,const QString &szVisibleName,KviModuleExtensionAllocRoutine r)
 {
 	QPixmap pix; // null
 	return g_pModuleExtensionManager->registerExtension(this,szType,szName,szVisibleName,r,pix);
 }
 
-KviModuleExtensionDescriptor * KviModule::registerExtension(const KviStr &szType,const KviStr &szName,const QString &szVisibleName,KviModuleExtensionAllocRoutine r,const QPixmap &icon)
+KviModuleExtensionDescriptor * KviModule::registerExtension(const KviCString &szType,const KviCString &szName,const QString &szVisibleName,KviModuleExtensionAllocRoutine r,const QPixmap &icon)
 {
 	return g_pModuleExtensionManager->registerExtension(this,szType,szName,szVisibleName,r,icon);
 }
 
-KviModuleExtensionDescriptor * KviModule::findExtensionDescriptor(const KviStr &szType,const KviStr &szName)
+KviModuleExtensionDescriptor * KviModule::findExtensionDescriptor(const KviCString &szType,const KviCString &szName)
 {
 	return g_pModuleExtensionManager->findExtensionDescriptor(szType,szName);
 }
diff --git a/src/kvirc/module/kvi_module.h b/src/kvirc/module/kvi_module.h
index 8a62af863..005fd1bc6 100644
--- a/src/kvirc/module/kvi_module.h
+++ b/src/kvirc/module/kvi_module.h
@@ -7,7 +7,7 @@
 //   Creation date : Sat Aug 12 2000 18:34:22 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -26,17 +26,17 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_string.h"
-#include "kvi_parameterlist.h"
+#include "KviCString.h"
+#include "KviParameterList.h"
 #include <QLibrary>
-#include "kvi_pointerlist.h"
+#include "KviPointerList.h"
 #include "kvi_moduleextension.h"
 #include "kvi_kvs_moduleinterface.h"
 
-#include "kvi_pointerhashtable.h"
+#include "KviPointerHashTable.h"
 
 #ifdef COMPILE_CRYPT_SUPPORT
-	#include "kvi_crypt.h"
+	#include "KviCryptEngine.h"
 #endif
 
 
@@ -190,9 +190,9 @@ public:
 	void unregisterCryptEngines();
 #endif
 
-	KviModuleExtensionDescriptor * registerExtension(const KviStr &szType,const KviStr &szName,const QString &szVisibleName,KviModuleExtensionAllocRoutine r);
-	KviModuleExtensionDescriptor * registerExtension(const KviStr &szType,const KviStr &szName,const QString &szVisibleName,KviModuleExtensionAllocRoutine r,const QPixmap &icon);
-	KviModuleExtensionDescriptor * findExtensionDescriptor(const KviStr &szType,const KviStr &szName);
+	KviModuleExtensionDescriptor * registerExtension(const KviCString &szType,const KviCString &szName,const QString &szVisibleName,KviModuleExtensionAllocRoutine r);
+	KviModuleExtensionDescriptor * registerExtension(const KviCString &szType,const KviCString &szName,const QString &szVisibleName,KviModuleExtensionAllocRoutine r,const QPixmap &icon);
+	KviModuleExtensionDescriptor * findExtensionDescriptor(const KviCString &szType,const KviCString &szName);
 	void unregisterAllExtensions();
 };
 
diff --git a/src/kvirc/module/kvi_moduleextension.cpp b/src/kvirc/module/kvi_moduleextension.cpp
index 69d3f2ada..8820d6a23 100644
--- a/src/kvirc/module/kvi_moduleextension.cpp
+++ b/src/kvirc/module/kvi_moduleextension.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Tue Sep 10 01:16:25 2002 GMT by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2002-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2002-2010 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
@@ -33,7 +33,7 @@
 KVIRC_API KviModuleExtensionManager    * g_pModuleExtensionManager    = 0;
 
 
-KviModuleExtensionDescriptor::KviModuleExtensionDescriptor(KviModule * m,const KviStr &szType,const KviStr &szName,const QString &szVisibleName,KviModuleExtensionAllocRoutine r,const QPixmap &pix)
+KviModuleExtensionDescriptor::KviModuleExtensionDescriptor(KviModule * m,const KviCString &szType,const KviCString &szName,const QString &szVisibleName,KviModuleExtensionAllocRoutine r,const QPixmap &pix)
 {
 	m_iId = KviApp::getGloballyUniqueId();
 
@@ -95,13 +95,13 @@ KviModuleExtensionManager::~KviModuleExtensionManager()
 	delete m_pExtensionDict;
 }
 
-KviModuleExtensionDescriptorList * KviModuleExtensionManager::getExtensionList(const KviStr &szType)
+KviModuleExtensionDescriptorList * KviModuleExtensionManager::getExtensionList(const KviCString &szType)
 {
 	g_pModuleManager->loadModulesByCaps(szType.ptr());
 	return m_pExtensionDict->find(szType.ptr());
 }
 
-KviModuleExtensionDescriptor * KviModuleExtensionManager::registerExtension(KviModule * m,const KviStr &szType,const KviStr &szName,const QString &szVisibleName,KviModuleExtensionAllocRoutine r,const QPixmap &icon)
+KviModuleExtensionDescriptor * KviModuleExtensionManager::registerExtension(KviModule * m,const KviCString &szType,const KviCString &szName,const QString &szVisibleName,KviModuleExtensionAllocRoutine r,const QPixmap &icon)
 {
 	KviModuleExtensionDescriptor * d = new KviModuleExtensionDescriptor(m,szType,szName,szVisibleName,r,icon);
 	KviModuleExtensionDescriptorList * l = m_pExtensionDict->find(szType.ptr());
@@ -118,7 +118,7 @@ KviModuleExtensionDescriptor * KviModuleExtensionManager::registerExtension(KviM
 void KviModuleExtensionManager::unregisterExtensionsByModule(KviModule * m)
 {
 	KviPointerHashTableIterator<const char *,KviModuleExtensionDescriptorList> it(*m_pExtensionDict);
-	KviPointerList<KviStr> dying;
+	KviPointerList<KviCString> dying;
 	dying.setAutoDelete(true);
 	while(KviModuleExtensionDescriptorList * l = it.current())
 	{
@@ -135,16 +135,16 @@ void KviModuleExtensionManager::unregisterExtensionsByModule(KviModule * m)
 			l->removeRef(de);
 		}
 
-		if(l->isEmpty())dying.append(new KviStr(it.currentKey()));
+		if(l->isEmpty())dying.append(new KviCString(it.currentKey()));
 		++it;
 	}
-	for(KviStr * li = dying.first();li;li = dying.next())
+	for(KviCString * li = dying.first();li;li = dying.next())
 	{
 		m_pExtensionDict->remove(li->ptr());
 	}
 }
 
-KviModuleExtensionDescriptorList * KviModuleExtensionManager::allocateExtensionGetDescriptorList(const KviStr &szType,const QString &preloadModule)
+KviModuleExtensionDescriptorList * KviModuleExtensionManager::allocateExtensionGetDescriptorList(const KviCString &szType,const QString &preloadModule)
 {
 	if(!preloadModule.isEmpty())
 	{
@@ -163,7 +163,7 @@ KviModuleExtensionDescriptorList * KviModuleExtensionManager::allocateExtensionG
 	return l;
 }
 
-KviModuleExtensionDescriptor * KviModuleExtensionManager::findExtensionDescriptor(const KviStr &szType,const KviStr &szName)
+KviModuleExtensionDescriptor * KviModuleExtensionManager::findExtensionDescriptor(const KviCString &szType,const KviCString &szName)
 {
 	KviModuleExtensionDescriptorList * l = m_pExtensionDict->find(szType.ptr());
 	if(!l)return 0;
@@ -176,7 +176,7 @@ KviModuleExtensionDescriptor * KviModuleExtensionManager::findExtensionDescripto
 	return 0;
 }
 
-KviModuleExtension * KviModuleExtensionManager::allocateExtension(const KviStr &szType,const KviStr &szName,KviWindow * pWnd,KviPointerHashTable<QString,QVariant> * pParams,void * pSpecial,const QString &preloadModule)
+KviModuleExtension * KviModuleExtensionManager::allocateExtension(const KviCString &szType,const KviCString &szName,KviWindow * pWnd,KviPointerHashTable<QString,QVariant> * pParams,void * pSpecial,const QString &preloadModule)
 {
 	KviModuleExtensionDescriptorList * l = allocateExtensionGetDescriptorList(szType,preloadModule);
 	if(!l)return 0;
@@ -203,7 +203,7 @@ KviModuleExtension * KviModuleExtensionManager::allocateExtension(const KviStr &
 }
 
 
-KviModuleExtension * KviModuleExtensionManager::allocateExtension(const KviStr &szType,int id,KviWindow * pWnd,KviPointerHashTable<QString,QVariant> * pParams,void * pSpecial,const QString &preloadModule)
+KviModuleExtension * KviModuleExtensionManager::allocateExtension(const KviCString &szType,int id,KviWindow * pWnd,KviPointerHashTable<QString,QVariant> * pParams,void * pSpecial,const QString &preloadModule)
 {
 	KviModuleExtensionDescriptorList * l = allocateExtensionGetDescriptorList(szType,preloadModule);
 	if(!l)return 0;
diff --git a/src/kvirc/module/kvi_moduleextension.h b/src/kvirc/module/kvi_moduleextension.h
index 89cf039ad..085baaa4d 100644
--- a/src/kvirc/module/kvi_moduleextension.h
+++ b/src/kvirc/module/kvi_moduleextension.h
@@ -6,7 +6,7 @@
 //   Creation date : Tue Sep 10 01:16:24 2002 GMT by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2002-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2002-2010 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
@@ -25,11 +25,11 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_string.h"
-#include "kvi_pointerlist.h"
-#include "kvi_heapobject.h"
-#include "kvi_pointerhashtable.h"
-#include "kvi_pointerhashtable.h"
+#include "KviCString.h"
+#include "KviPointerList.h"
+#include "KviHeapObject.h"
+#include "KviPointerHashTable.h"
+#include "KviPointerHashTable.h"
 
 #include <QPixmap>
 #include <QVariant>
@@ -54,16 +54,16 @@ class KVIRC_API KviModuleExtensionDescriptor
 	friend class KviModuleExtension;
 	friend class KviModuleExtensionManager; // only the manager allocates and deallocates these structures
 protected:
-	KviModuleExtensionDescriptor(KviModule * m,const KviStr &szType,const KviStr &szName,const QString &szVisibleName,KviModuleExtensionAllocRoutine r,const QPixmap &pix);
+	KviModuleExtensionDescriptor(KviModule * m,const KviCString &szType,const KviCString &szName,const QString &szVisibleName,KviModuleExtensionAllocRoutine r,const QPixmap &pix);
 public: // this has to be public because of QPtrList... but should be protected
 	~KviModuleExtensionDescriptor();
 private:
 	int                              m_iId;            // unique id assigned at creation time
-	KviStr                           m_szType;         // name of the service (toolbar, crypt engine...)
-	KviStr                           m_szName;         // name of the extension
+	KviCString                           m_szType;         // name of the service (toolbar, crypt engine...)
+	KviCString                           m_szName;         // name of the extension
 	QString                          m_szVisibleName;  // name that is VISIBLE and possibly translated
-	KviStr                           m_szAuthor;       // Author (visible)
-	KviStr                           m_szDescription;  // Description (visible!)
+	KviCString                           m_szAuthor;       // Author (visible)
+	KviCString                           m_szDescription;  // Description (visible!)
 	int                              m_iFlags;         // Flags (0 if not applicable)
 	QPixmap                        * m_pIcon;          // Icon (may be null!)
 	KviModuleExtensionAllocRoutine   m_allocRoutine;
@@ -76,17 +76,17 @@ public:
 
 	int id(){ return m_iId; };
 	KviModule * module(){ return m_pModule; };
-	const KviStr &type(){ return m_szType; };
-	const KviStr &name(){ return m_szName; };
+	const KviCString &type(){ return m_szType; };
+	const KviCString &name(){ return m_szName; };
 	const QString &visibleName(){ return m_szVisibleName; };
-	const KviStr &author(){ return m_szAuthor; };
-	const KviStr &description(){ return m_szDescription; };
+	const KviCString &author(){ return m_szAuthor; };
+	const KviCString &description(){ return m_szDescription; };
 	const QPixmap * icon(){ return m_pIcon; };
 	int flags(){ return m_iFlags; };
 
-	void setAuthor(const KviStr &szAuthor){ m_szAuthor = szAuthor; };
-	void setDescription(const KviStr &szDescription){ m_szDescription = szDescription; };
-	void setVisibleName(const KviStr &szVisibleName){ m_szVisibleName = szVisibleName; };
+	void setAuthor(const KviCString &szAuthor){ m_szAuthor = szAuthor; };
+	void setDescription(const KviCString &szDescription){ m_szDescription = szDescription; };
+	void setVisibleName(const KviCString &szVisibleName){ m_szVisibleName = szVisibleName; };
 	void setFlags(int iFlags){ m_iFlags = iFlags; };
 	void setIcon(const QPixmap &pix);
 
@@ -112,16 +112,16 @@ protected:
 	KviPointerHashTable<const char *,KviModuleExtensionDescriptorList> * m_pExtensionDict;
 protected:
 	// Only KviModule can call this
-	KviModuleExtensionDescriptor * registerExtension(KviModule * m,const KviStr &szType,const KviStr &szName,const QString &szVisibleName,KviModuleExtensionAllocRoutine r,const QPixmap &icon);
+	KviModuleExtensionDescriptor * registerExtension(KviModule * m,const KviCString &szType,const KviCString &szName,const QString &szVisibleName,KviModuleExtensionAllocRoutine r,const QPixmap &icon);
 	void unregisterExtensionsByModule(KviModule * m);
 public:
-	KviModuleExtensionDescriptor * findExtensionDescriptor(const KviStr &szType,const KviStr &szName);
+	KviModuleExtensionDescriptor * findExtensionDescriptor(const KviCString &szType,const KviCString &szName);
 	static KviModuleExtensionManager * instance(){ return g_pModuleExtensionManager; };
-	KviModuleExtensionDescriptorList * getExtensionList(const KviStr &szType);
-	KviModuleExtension * allocateExtension(const KviStr &szType,const KviStr &szName,KviWindow * pWnd = 0,KviPointerHashTable<QString,QVariant> * pParams = 0,void * pSpecial = 0,const QString &preloadModule = QString());
-	KviModuleExtension * allocateExtension(const KviStr &szType,int id,KviWindow * pWnd = 0,KviPointerHashTable<QString,QVariant> * pParams = 0,void * pSpecial = 0,const QString &preloadModule = QString());
+	KviModuleExtensionDescriptorList * getExtensionList(const KviCString &szType);
+	KviModuleExtension * allocateExtension(const KviCString &szType,const KviCString &szName,KviWindow * pWnd = 0,KviPointerHashTable<QString,QVariant> * pParams = 0,void * pSpecial = 0,const QString &preloadModule = QString());
+	KviModuleExtension * allocateExtension(const KviCString &szType,int id,KviWindow * pWnd = 0,KviPointerHashTable<QString,QVariant> * pParams = 0,void * pSpecial = 0,const QString &preloadModule = QString());
 private:
-	KviModuleExtensionDescriptorList * allocateExtensionGetDescriptorList(const KviStr &szType,const QString &preloadModule);
+	KviModuleExtensionDescriptorList * allocateExtensionGetDescriptorList(const KviCString &szType,const QString &preloadModule);
 };
 
 
diff --git a/src/kvirc/module/kvi_modulemanager.cpp b/src/kvirc/module/kvi_modulemanager.cpp
index 9f3bfc0d1..d26a89bf0 100644
--- a/src/kvirc/module/kvi_modulemanager.cpp
+++ b/src/kvirc/module/kvi_modulemanager.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Sat Aug 12 2000 20:32:11 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -26,12 +26,12 @@
 #define _KVI_MODULEMANAGER_CPP_
 
 #include "kvi_modulemanager.h"
-#include "kvi_fileutils.h"
+#include "KviFileUtils.h"
 #include "kvi_app.h"
 #include "kvi_options.h"
 #include "kvi_frame.h"
 #include "kvi_console.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_out.h"
 
 #include <QDir>
diff --git a/src/kvirc/module/kvi_modulemanager.h b/src/kvirc/module/kvi_modulemanager.h
index d443724fa..ae5227621 100644
--- a/src/kvirc/module/kvi_modulemanager.h
+++ b/src/kvirc/module/kvi_modulemanager.h
@@ -7,7 +7,7 @@
 //   Creation date : Sat Aug 12 2000 20:31:17 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -26,9 +26,9 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_pointerlist.h"
+#include "KviPointerList.h"
 #include "kvi_module.h"
-#include "kvi_pointerhashtable.h"
+#include "KviPointerHashTable.h"
 
 #include <QTimer>
 #include <QObject>
diff --git a/src/kvirc/sparser/kvi_antispam.cpp b/src/kvirc/sparser/kvi_antispam.cpp
index 3d9a09b5b..6179d4366 100644
--- a/src/kvirc/sparser/kvi_antispam.cpp
+++ b/src/kvirc/sparser/kvi_antispam.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Sun Apr 18 1999 05:36:55 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 1999-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 1999-2010 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
@@ -103,7 +103,7 @@
 		[/example]
 */
 
-bool kvi_mayBeSpam(KviStr * msg,KviStr &spamWord)
+bool kvi_mayBeSpam(KviCString * msg,KviCString &spamWord)
 {
 	for(QStringList::Iterator it = KVI_OPTION_STRINGLIST(KviOption_stringlistSpamWords).begin();
 			it != KVI_OPTION_STRINGLIST(KviOption_stringlistSpamWords).end() ; ++it)
diff --git a/src/kvirc/sparser/kvi_antispam.h b/src/kvirc/sparser/kvi_antispam.h
index 4f70a611c..6de93846e 100644
--- a/src/kvirc/sparser/kvi_antispam.h
+++ b/src/kvirc/sparser/kvi_antispam.h
@@ -6,7 +6,7 @@
 //   Creation date : Sun Apr 18 1999 05:36:55 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 1999-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 1999-2010 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
@@ -25,9 +25,9 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_string.h"
+#include "KviCString.h"
 
-extern KVIRC_API bool kvi_mayBeSpam(KviStr * msg,KviStr &spamWord);
+extern KVIRC_API bool kvi_mayBeSpam(KviCString * msg,KviCString &spamWord);
 
 
 #endif // _KVI_ANTISPAM_H_
diff --git a/src/kvirc/sparser/kvi_ircmessage.cpp b/src/kvirc/sparser/kvi_ircmessage.cpp
index babf088fa..29c3674a5 100644
--- a/src/kvirc/sparser/kvi_ircmessage.cpp
+++ b/src/kvirc/sparser/kvi_ircmessage.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Fri Aug  2 23:08:57 2002 GMT by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2002-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2002-2010 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
@@ -37,7 +37,7 @@ KviIrcMessage::KviIrcMessage(const char * message,KviIrcConnection * pConnection
 	const char * aux;
 	m_ptr = message;
 
-	m_pParams = new KviPointerList<KviStr>;
+	m_pParams = new KviPointerList<KviCString>;
 	m_pParams->setAutoDelete(true);
 
 	//m_pcParams = new KviPointerList<QCString>;
@@ -64,14 +64,14 @@ KviIrcMessage::KviIrcMessage(const char * message,KviIrcConnection * pConnection
 			if(*m_ptr == ':')
 			{
 				++m_ptr;
-				m_pParams->append(new KviStr(m_ptr));
+				m_pParams->append(new KviCString(m_ptr));
 				//m_pcParams->append(new QCString(m_ptr));
 				break; // this was the last
 			} else {
 				aux = m_ptr;
 				while(*m_ptr && (*m_ptr != ' '))++m_ptr;
-				m_pParams->append(new KviStr(aux,m_ptr));
-				//m_pcParams->append(new QCString(KviStr(aux,m_ptr).ptr()));
+				m_pParams->append(new KviCString(aux,m_ptr));
+				//m_pcParams->append(new QCString(KviCString(aux,m_ptr).ptr()));
 				while(*m_ptr == ' ')++m_ptr;
 			}
 		}
diff --git a/src/kvirc/sparser/kvi_ircmessage.h b/src/kvirc/sparser/kvi_ircmessage.h
index fc00cef6e..50a772015 100644
--- a/src/kvirc/sparser/kvi_ircmessage.h
+++ b/src/kvirc/sparser/kvi_ircmessage.h
@@ -6,7 +6,7 @@
 //   Creation date : Fri Aug  2 23:08:55 2002 GMT by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2002-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2002-2010 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
@@ -25,9 +25,9 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_pointerlist.h"
-#include "kvi_string.h"
-#include "kvi_qstring.h"
+#include "KviPointerList.h"
+#include "KviCString.h"
+#include "KviQString.h"
 #include "kvi_console.h"
 
 class KviIrcConnection;
@@ -53,9 +53,9 @@ public:
 	~KviIrcMessage();
 private:
 	const char          * m_ptr;                // shallow! never null
-	KviStr                m_szPrefix;           // the extracted prefix string
-	KviStr                m_szCommand;          // the extracted command (may be numeric)
-	KviPointerList<KviStr>  * m_pParams;            // the list of parameters
+	KviCString                m_szPrefix;           // the extracted prefix string
+	KviCString                m_szCommand;          // the extracted command (may be numeric)
+	KviPointerList<KviCString>  * m_pParams;            // the list of parameters
 	KviConsole          * m_pConsole;           // the console we're attacched to
 	KviIrcConnection    * m_pConnection;        // the connection we're attacched to
 	int                   m_iNumericCommand;    // the numeric of the command (0 if non numeric)
@@ -66,10 +66,10 @@ public:
 
 	bool               isNumeric(){ return (m_iNumericCommand >= 0); };
 	const char       * command(){ return m_szCommand.ptr(); };
-	KviStr           * commandPtr(){ return &m_szCommand; };
+	KviCString           * commandPtr(){ return &m_szCommand; };
 	int                numeric(){ return m_iNumericCommand; };
 
-	KviStr           * prefixPtr(){ return &m_szPrefix; };
+	KviCString           * prefixPtr(){ return &m_szPrefix; };
 	const char       * prefix(){ return m_szPrefix.ptr(); };
 	const char       * safePrefix();
 	bool               hasPrefix(){ return m_szPrefix.hasData(); };
@@ -80,19 +80,19 @@ public:
 
 	const char       * param(unsigned int idx){ return (idx < m_pParams->count()) ? m_pParams->at(idx)->ptr() : 0; };
 
-	const char       * safeParam(unsigned int idx){ return (idx < m_pParams->count()) ? m_pParams->at(idx)->ptr() : KviStr::emptyString().ptr(); };
+	const char       * safeParam(unsigned int idx){ return (idx < m_pParams->count()) ? m_pParams->at(idx)->ptr() : KviCString::emptyString().ptr(); };
 
-	KviStr           * paramString(unsigned int idx){ return m_pParams->at(idx); };
+	KviCString           * paramString(unsigned int idx){ return m_pParams->at(idx); };
 
-	const char       * trailing(){ KviStr * tr = m_pParams->last(); return tr ? tr->ptr() : 0; };
-	KviStr           * trailingString(){ return m_pParams->last(); };
-	KviStr           & safeTrailingString(){ KviStr * tr = m_pParams->last(); return tr ? *tr : KviStr::emptyString(); };
-	const char       * safeTrailing(){ KviStr * tr = m_pParams->last(); return tr ? tr->ptr() : KviStr::emptyString().ptr(); };
+	const char       * trailing(){ KviCString * tr = m_pParams->last(); return tr ? tr->ptr() : 0; };
+	KviCString           * trailingString(){ return m_pParams->last(); };
+	KviCString           & safeTrailingString(){ KviCString * tr = m_pParams->last(); return tr ? *tr : KviCString::emptyString(); };
+	const char       * safeTrailing(){ KviCString * tr = m_pParams->last(); return tr ? tr->ptr() : KviCString::emptyString().ptr(); };
 
 	const char       * allParams(){ return m_ptr; };
 
-	KviStr           * firstParam(){ return m_pParams->first(); };
-	KviStr           * nextParam(){ return m_pParams->next(); };
+	KviCString           * firstParam(){ return m_pParams->first(); };
+	KviCString           * nextParam(){ return m_pParams->next(); };
 
 	void               setHaltOutput(){ m_iFlags |= KVI_IRCMSG_FLAG_HALTOUTPUT; };
 	bool               haltOutput(){ return (m_iFlags & KVI_IRCMSG_FLAG_HALTOUTPUT); };
diff --git a/src/kvirc/sparser/kvi_sp_ctcp.cpp b/src/kvirc/sparser/kvi_sp_ctcp.cpp
index 2305bfd23..33bad23a1 100644
--- a/src/kvirc/sparser/kvi_sp_ctcp.cpp
+++ b/src/kvirc/sparser/kvi_sp_ctcp.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Thu Aug 16 2000 13:34:42 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -26,24 +26,24 @@
 // FIXME: #warning "CTCP BEEP == WAKEUP == AWAKE"
 // FIXME: #warning "CTCP AVATARREQ or QUERYAVATAR"
 
-#include "kvi_mirccntrl.h"
-#include "kvi_osinfo.h"
+#include "KviMircCntrl.h"
+#include "KviOsInfo.h"
 #include "kvi_app.h"
 #include "kvi_sparser.h"
 #include "kvi_window.h"
 #include "kvi_out.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_ircsocket.h"
 #include "kvi_channel.h"
 #include "kvi_defaults.h"
 #include "kvi_channel.h"
 #include "kvi_query.h"
-#include "kvi_ircuserdb.h"
+#include "KviIrcUserDataBase.h"
 #include "kvi_iconmanager.h"
 #include "kvi_modulemanager.h"
-#include "kvi_sharedfiles.h"
-#include "kvi_time.h"
-#include "kvi_fileutils.h"
+#include "KviSharedFilesManager.h"
+#include "KviTimeUtils.h"
+#include "KviFileUtils.h"
 #include "kvi_ctcppagedialog.h"
 #include "kvi_useraction.h"
 #include "kvi_options.h"
@@ -54,7 +54,7 @@
 #include "kvi_kvs_eventtriggers.h"
 #include "kvi_kvs_script.h"
 #include "kvi_sourcesdate.h"
-#include "kvi_regusersdb.h"
+#include "KviRegisteredUserDataBase.h"
 #include "kvi_buildinfo.h"
 
 #include <stdlib.h>
@@ -384,7 +384,7 @@ extern KVIRC_API KviCtcpPageDialog * g_pCtcpPageDialog;
 
 
 
-void KviServerParser::encodeCtcpParameter(const char * param,KviStr &buffer,bool bSpaceBreaks)
+void KviServerParser::encodeCtcpParameter(const char * param,KviCString &buffer,bool bSpaceBreaks)
 {
 	//
 	// This one encodes a single ctcp parameter with the simplest
@@ -522,7 +522,7 @@ void KviServerParser::encodeCtcpParameter(const char * parametr,QString &resultB
 
 
 
-const char * KviServerParser::decodeCtcpEscape(const char * msg_ptr,KviStr &buffer)
+const char * KviServerParser::decodeCtcpEscape(const char * msg_ptr,KviCString &buffer)
 {
 	//
 	// This one decodes an octal sequence
@@ -624,7 +624,7 @@ const char * KviServerParser::decodeCtcpEscape(const char * msg_ptr,QByteArray &
 }
 
 
-const char * KviServerParser::extractCtcpParameter(const char * msg_ptr,KviStr &buffer,bool bSpaceBreaks, bool bSafeOnly)
+const char * KviServerParser::extractCtcpParameter(const char * msg_ptr,KviCString &buffer,bool bSpaceBreaks, bool bSafeOnly)
 {
 	//
 	// This one extracts the "next" ctcp parameter in msg_ptr
@@ -1091,7 +1091,7 @@ void KviServerParser::parseCtcpReplyPing(KviCtcpMessage * msg)
 		unsigned int uSecs;
 		unsigned int uMSecs = 0;
 
-		KviStr szTime;
+		KviCString szTime;
 
 		struct timeval tv;
 		kvi_gettimeofday(&tv,0);
@@ -1102,7 +1102,7 @@ void KviServerParser::parseCtcpReplyPing(KviCtcpMessage * msg)
 
 		if(szTime.contains('.'))
 		{
-			KviStr szUSecs = szTime;
+			KviCString szUSecs = szTime;
 			szUSecs.cutToFirst('.');
 			szTime.cutFromFirst('.');
 
@@ -1253,7 +1253,7 @@ void KviServerParser::parseCtcpRequestClientinfo(KviCtcpMessage *msg)
 	{
 		if(!KVI_OPTION_BOOL(KviOption_boolIgnoreCtcpClientinfo))
 		{
-			KviStr szTag;
+			KviCString szTag;
 			msg->pData = extractCtcpParameter(msg->pData,szTag,false);
 			szTag.trimmed();
 			szTag.toUpper();
@@ -1273,7 +1273,7 @@ void KviServerParser::parseCtcpRequestClientinfo(KviCtcpMessage *msg)
 				{
 					if(kvi_strEqualCS(ctcpTagTable[i][0],szTag.ptr()))
 					{
-						KviStr reply(KviStr::Format,"%s: %s",ctcpTagTable[i][0],ctcpTagTable[i][1]);
+						KviCString reply(KviCString::Format,"%s: %s",ctcpTagTable[i][0],ctcpTagTable[i][1]);
 						replyCtcp(msg,reply.ptr());
 						bFound = true;
 					}
@@ -1281,7 +1281,7 @@ void KviServerParser::parseCtcpRequestClientinfo(KviCtcpMessage *msg)
 				if(!bFound)
 				{
 					msg->szTag= "ERRMSG";
-					KviStr reply(KviStr::Format,"Unsupported tag %s",szTag.ptr());
+					KviCString reply(KviCString::Format,"Unsupported tag %s",szTag.ptr());
 					replyCtcp(msg,reply.ptr());
 				}
 			}
@@ -1298,11 +1298,11 @@ void KviServerParser::parseCtcpRequestFinger(KviCtcpMessage *msg)
 	{
 		if(!KVI_OPTION_BOOL(KviOption_boolIgnoreCtcpFinger))
 		{
-			KviStr username = getenv("USER");
+			KviCString username = getenv("USER");
 			if(username.isEmpty())username = getenv("LOGNAME");
 			if(username.isEmpty())username = msg->msg->connection()->userInfo()->userName();
 			// FIXME: #warning "UTSNAME ?...AND OTHER INFO ?...SYSTEM IDLE TIME ?...KVIRC IDLE TIME ?"
-			KviStr reply(KviStr::Format,"%s",username.ptr());
+			KviCString reply(KviCString::Format,"%s",username.ptr());
 			replyCtcp(msg,reply.ptr());
 		} else msg->bIgnored = true;
 	}
@@ -1371,7 +1371,7 @@ void KviServerParser::parseCtcpRequestPage(KviCtcpMessage *msg)
 			if(KVI_OPTION_BOOL(KviOption_boolShowDialogOnCtcpPage))
 			{
 				if(!g_pCtcpPageDialog)g_pCtcpPageDialog = new KviCtcpPageDialog();
-				KviStr szData8;
+				KviCString szData8;
 				szData8 = msg->pData;
 				QString szData = Qt::escape(msg->msg->connection()->decodeText(szData8.ptr()));
 				g_pCtcpPageDialog->addPage(msg->pSource->nick(),msg->pSource->user(),msg->pSource->host(),szData);
@@ -1385,7 +1385,7 @@ void KviServerParser::parseCtcpRequestPage(KviCtcpMessage *msg)
 
 void KviServerParser::parseCtcpRequestAction(KviCtcpMessage *msg)
 {
-	KviStr szData8;
+	KviCString szData8;
 	// CTCP ACTION is a special exception... most clients do not encode/decode it.
 	//msg->pData = extractCtcpParameter(msg->pData,szData8,false);
 	szData8 = msg->pData;
@@ -1493,7 +1493,7 @@ void KviServerParser::parseCtcpRequestAction(KviCtcpMessage *msg)
 				__tr2qs("The following CTCP ACTION has unrecognized target %Q"),
 				&(msg->szTarget));
 		}
-		KviStr buffer1,buffer2;
+		KviCString buffer1,buffer2;
 		pOut->output(type,
 			__tr2qs("CTCP ACTION from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"),
 			&(msg->pSource->nick()),&(msg->pSource->user()),
@@ -1717,7 +1717,7 @@ typedef void (*dccModuleCtcpDccParseRoutine)(KviDccRequest *par);
 void KviServerParser::parseCtcpRequestDcc(KviCtcpMessage *msg)
 {
 	KviDccRequest p;
-	KviStr aux    = msg->pData;
+	KviCString aux    = msg->pData;
 	msg->pData    = extractCtcpParameter(msg->pData,p.szType, true, true);
 	msg->pData    = extractCtcpParameter(msg->pData,p.szParam1);
 	msg->pData    = extractCtcpParameter(msg->pData,p.szParam2);
@@ -1859,7 +1859,7 @@ void KviServerParser::parseCtcpReplyGeneric(KviCtcpMessage *msg)
 void KviServerParser::parseCtcpReplyLagcheck(KviCtcpMessage * msg)
 {
 	// this is an internal CTCP used for checking lag
-	KviStr szTag;
+	KviCString szTag;
 	msg->pData = extractCtcpParameter(msg->pData,szTag,true);
 	if(msg->msg->console()->connection()->lagMeter())
 		msg->msg->console()->connection()->lagMeter()->lagCheckComplete(szTag.ptr());
diff --git a/src/kvirc/sparser/kvi_sp_literal.cpp b/src/kvirc/sparser/kvi_sp_literal.cpp
index daedcc479..b173bd266 100644
--- a/src/kvirc/sparser/kvi_sp_literal.cpp
+++ b/src/kvirc/sparser/kvi_sp_literal.cpp
@@ -29,24 +29,24 @@
 #include "kvi_window.h"
 #include "kvi_console.h"
 #include "kvi_out.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_ircsocket.h"
 #include "kvi_options.h"
-#include "kvi_ircmask.h"
+#include "KviIrcMask.h"
 #include "kvi_channel.h"
 #include "kvi_topicw.h"
 #include "kvi_frame.h"
-#include "kvi_mirccntrl.h"
+#include "KviMircCntrl.h"
 #include "kvi_query.h"
 #include "kvi_userlistview.h"
 #include "kvi_antispam.h"
-#include "kvi_nickserv.h"
-#include "kvi_parameterlist.h"
-#include "kvi_ircuserdb.h"
+#include "KviNickServRuleSet.h"
+#include "KviParameterList.h"
+#include "KviIrcUserDataBase.h"
 #include "kvi_app.h"
-#include "kvi_regusersdb.h"
+#include "KviRegisteredUserDataBase.h"
 #include "kvi_debug.h"
-#include "kvi_time.h"
+#include "KviTimeUtils.h"
 #include "kvi_useraction.h"
 #include "kvi_ircconnection.h"
 #include "kvi_ircconnectionuserinfo.h"
@@ -57,19 +57,19 @@
 #include "kvi_ircconnectionnetsplitdetectordata.h"
 #include "kvi_iconmanager.h"
 #include "kvi_lagmeter.h"
-#include "kvi_ircserver.h"
+#include "KviIrcServer.h"
 #include "kvi_kvs_eventtriggers.h"
-#include "kvi_network.h"
+#include "KviNetwork.h"
 #include "kvi_settings.h"
 
 #ifdef COMPILE_CRYPT_SUPPORT
-	#include "kvi_crypt.h"
+	#include "KviCryptEngine.h"
 	#include "kvi_cryptcontroller.h"
 #endif
 
 #include "kvi_kvs_script.h"
 
-//#include "kvi_regusersdb.h"
+//#include "KviRegisteredUserDataBase.h"
 //#include "kvi_iconmanager.h"
 #include <QDateTime>
 #include <QTextDocument>
@@ -449,8 +449,8 @@ void KviServerParser::parseLiteralQuit(KviIrcMessage *msg)
 
 			if(!bDuplicate)
 			{
-				KviStr sz1(aux,daSpace - aux);
-				KviStr sz2(daSpace + 1);
+				KviCString sz1(aux,daSpace - aux);
+				KviCString sz2(daSpace + 1);
 
 				QString szD1 = msg->connection()->decodeText(sz1.ptr());
 				QString szD2 = msg->connection()->decodeText(sz2.ptr());
@@ -717,7 +717,7 @@ void KviServerParser::parseLiteralPrivmsg(KviIrcMessage *msg)
 
 	PrivmsgIdentifyMsgCapState eCapState = IdentifyMsgCapNotUsed;
 
-	KviStr * pTrailing = msg->trailingString();
+	KviCString * pTrailing = msg->trailingString();
 	if(pTrailing)
 	{
 		if(msg->connection()->stateData()->identifyMsgCapabilityEnabled())
@@ -794,13 +794,13 @@ void KviServerParser::parseLiteralPrivmsg(KviIrcMessage *msg)
 		//						while(((*tmp) == ' ') || ((*tmp) == '\t'))tmp++;
 		//						if(*tmp)
 		//						{
-		//							KviStr file = tmp;
-		//							KviStr filePath;
+		//							KviCString file = tmp;
+		//							KviCString filePath;
 		//							m_pFrm->findMultimediaFileOffert(filePath,file);
 		//							if(filePath.hasData())
 		//							{
 		//								m_pFrm->activeWindow()->output(KVI_OUT_INTERNAL,__tr("%s requests previously offered file %s: sending (%s)"),talker.nick(),file.ptr(),filePath.ptr());
-		//								KviStr cmd(KviStr::Format,"DCC SEND %s %s",talker.nick(),filePath.ptr());
+		//								KviCString cmd(KviCString::Format,"DCC SEND %s %s",talker.nick(),filePath.ptr());
 		//								m_pFrm->m_pUserParser->parseUserCommand(cmd,m_pConsole);
 		//								return;
 
@@ -828,10 +828,10 @@ void KviServerParser::parseLiteralPrivmsg(KviIrcMessage *msg)
 			// spam message...
 			if(KVI_OPTION_BOOL(KviOption_boolUseAntiSpamOnPrivmsg))
 			{
-				KviStr * theMsg = msg->trailingString();
+				KviCString * theMsg = msg->trailingString();
 				if(theMsg)
 				{
-					KviStr spamWord;
+					KviCString spamWord;
 					if(kvi_mayBeSpam(theMsg,spamWord))
 					{
 						// FIXME: OnSpam ?
@@ -889,7 +889,7 @@ void KviServerParser::parseLiteralPrivmsg(KviIrcMessage *msg)
 			query->userAction(szNick,szUser,szHost,KVI_USERACTION_PRIVMSG);
 
 			// decrypt the message if needed
-			KviStr szBuffer;
+			KviCString szBuffer;
 			const char * txtptr;
 			int msgtype;
 
@@ -1034,7 +1034,7 @@ void KviServerParser::parseLiteralPrivmsg(KviIrcMessage *msg)
 		} else {
 			chan->userAction(szNick,szUser,szHost,KVI_USERACTION_PRIVMSG);
 
-			KviStr szBuffer; const char * txtptr; int msgtype;
+			KviCString szBuffer; const char * txtptr; int msgtype;
 			DECRYPT_IF_NEEDED(chan,msg->safeTrailing(),KVI_OUT_CHANPRIVMSG,KVI_OUT_CHANPRIVMSGCRYPTED,szBuffer,txtptr,msgtype)
 
 			QString szMsgText = chan->decodeText(txtptr);
@@ -1079,7 +1079,7 @@ void KviServerParser::parseLiteralNotice(KviIrcMessage *msg)
 
 	// FIXME: "DEDICATED CTCP WINDOW ?"
 
-	KviStr * pTrailing = msg->trailingString();
+	KviCString * pTrailing = msg->trailingString();
 	if(pTrailing)
 	{
 		if(*(pTrailing->ptr()) == 0x01){
@@ -1206,10 +1206,10 @@ void KviServerParser::parseLiteralNotice(KviIrcMessage *msg)
 			// spam message...
 			if(KVI_OPTION_BOOL(KviOption_boolUseAntiSpamOnNotice))
 			{
-				KviStr * theMsg = msg->trailingString(); // FIXME
+				KviCString * theMsg = msg->trailingString(); // FIXME
 				if(theMsg)
 				{
-					KviStr spamWord;
+					KviCString spamWord;
 					if(kvi_mayBeSpam(theMsg,spamWord))
 					{
 						// FIXME: OnSpam ?
@@ -1266,7 +1266,7 @@ void KviServerParser::parseLiteralNotice(KviIrcMessage *msg)
 			// ok, we have the query. Trigger the user action anyway
 			query->userAction(szNick,szUser,szHost,KVI_USERACTION_NOTICE);
 			// decrypt it if needed
-			KviStr szBuffer; const char * txtptr; int msgtype;
+			KviCString szBuffer; const char * txtptr; int msgtype;
 			DECRYPT_IF_NEEDED(query,msg->safeTrailing(),KVI_OUT_QUERYNOTICE,KVI_OUT_QUERYNOTICECRYPTED,szBuffer,txtptr,msgtype)
 			QString szMsgText = query->decodeText(txtptr);
 			// trigger the script event and eventually kill the output
@@ -1380,7 +1380,7 @@ void KviServerParser::parseLiteralNotice(KviIrcMessage *msg)
 		//CHANNEL NOTICE
 		chan->userAction(szNick,szUser,szHost,KVI_USERACTION_NOTICE);
 
-		KviStr szBuffer; const char * txtptr; int msgtype;
+		KviCString szBuffer; const char * txtptr; int msgtype;
 		DECRYPT_IF_NEEDED(chan,msg->safeTrailing(),KVI_OUT_CHANNELNOTICE,KVI_OUT_CHANNELNOTICECRYPTED,szBuffer,txtptr,msgtype)
 		QString szMsgText = chan->decodeText(txtptr);
 
@@ -1694,12 +1694,12 @@ void KviServerParser::parseLiteralMode(KviIrcMessage *msg)
 	//	if(!source.hasHost())
 	//	{
 	//		// This is a server or a channel service
-	//		KviStr snick = source.nick();
+	//		KviCString snick = source.nick();
 	//		if(snick.contains('.'))source.setHost(source.nick()); // this is a server
 	//	}
 
 	QString szTarget = msg->connection()->decodeText(msg->safeParam(0));
-	KviStr modefl(msg->safeParam(1));
+	KviCString modefl(msg->safeParam(1));
 
 	if(IS_ME(msg,szTarget))
 	{
@@ -1721,7 +1721,7 @@ void KviServerParser::parseLiteralMode(KviIrcMessage *msg)
 	}
 }
 
-void KviServerParser::parseChannelMode(const QString &szNick,const QString &szUser,const QString &szHost,KviChannel * chan,KviStr &modefl,KviIrcMessage *msg,int curParam)
+void KviServerParser::parseChannelMode(const QString &szNick,const QString &szUser,const QString &szHost,KviChannel * chan,KviCString &modefl,KviIrcMessage *msg,int curParam)
 {
 	bool bSet = true;
 	// bIsMultiMode: +snt
@@ -2238,6 +2238,6 @@ void KviServerParser::parseLiteralCap(KviIrcMessage *msg)
 void KviServerParser::parseLiteralAuthenticate(KviIrcMessage *msg)
 {
 	// :AUTHENTICATE +
-	KviStr szAuth(msg->safeParam(0));
+	KviCString szAuth(msg->safeParam(0));
 	msg->connection()->handleAuthenticate(szAuth);
 }
diff --git a/src/kvirc/sparser/kvi_sp_numeric.cpp b/src/kvirc/sparser/kvi_sp_numeric.cpp
index b50f4fcc3..1c01fc4ca 100644
--- a/src/kvirc/sparser/kvi_sp_numeric.cpp
+++ b/src/kvirc/sparser/kvi_sp_numeric.cpp
@@ -30,16 +30,16 @@
 #include "kvi_window.h"
 #include "kvi_query.h"
 #include "kvi_out.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_ircsocket.h"
 #include "kvi_options.h"
 #include "kvi_channel.h"
 #include "kvi_topicw.h"
-#include "kvi_ircuserdb.h"
+#include "KviIrcUserDataBase.h"
 #include "kvi_defaults.h"
-#include "kvi_mirccntrl.h"
+#include "KviMircCntrl.h"
 #include "kvi_frame.h"
-#include "kvi_parameterlist.h"
+#include "KviParameterList.h"
 #include "kvi_app.h"
 #include "kvi_notifylist.h"
 #include "kvi_numeric.h"
@@ -49,12 +49,12 @@
 #include "kvi_ircconnectionserverinfo.h"
 #include "kvi_ircconnectionasyncwhoisdata.h"
 #include "kvi_ircconnectiontarget.h"
-#include "kvi_time.h"
+#include "KviTimeUtils.h"
 #include "kvi_lagmeter.h"
 #include "kvi_kvs_eventtriggers.h"
 #include "kvi_kvs_script.h"
 #include "kvi_kvs_variantlist.h"
-#include "kvi_identityprofile.h"
+#include "KviIdentityProfile.h"
 
 #include <QPixmap>
 #include <QDateTime>
@@ -120,17 +120,17 @@ void KviServerParser::parseNumeric004(KviIrcMessage *msg)
 
 	if(uParams < 2)uParams = 2;
 
-	KviStr version   = msg->safeParam(2);
+	KviCString version   = msg->safeParam(2);
 	msg->connection()->serverInfo()->setServerVersion(msg->safeParam(2));
 
-	KviStr umodes;
+	KviCString umodes;
 	// skip version number (great, thanks WEBMASTER INCORPORATED -_-)
 	do
 	{
 		umodes      = msg->safeParam(uModeParam);
 	} while (((umodes.contains('.')) || (umodes.contains('-'))) && uModeParam++ < uParams);
 
-	KviStr chanmodes = msg->safeParam(uModeParam+1);
+	KviCString chanmodes = msg->safeParam(uModeParam+1);
 
 	if(uModeParam > 3)
 	{
@@ -261,9 +261,9 @@ void KviServerParser::parseNumeric005(KviIrcMessage *msg)
 				p+=8;
 				const char * pModes = p;
 				while(*p && (*p != ')'))p++;
-				KviStr szModeFlags(pModes,p-pModes);
+				KviCString szModeFlags(pModes,p-pModes);
 				if(*p)p++;
-				KviStr szModePrefixes = p;
+				KviCString szModePrefixes = p;
 				if(szModePrefixes.hasData() && (szModePrefixes.len() == szModeFlags.len()))
 				{
 					msg->connection()->serverInfo()->setSupportedModePrefixes(szModePrefixes.ptr(),szModeFlags.ptr());
@@ -271,7 +271,7 @@ void KviServerParser::parseNumeric005(KviIrcMessage *msg)
 			} else if(kvi_strEqualCIN("CHANTYPES=",p,10))
 			{
 				p+=10;
-				KviStr tmp = p;
+				KviCString tmp = p;
 				if(tmp.hasData())
 				{
 					msg->connection()->serverInfo()->setSupportedChannelTypes(tmp.ptr());
@@ -573,7 +573,7 @@ void KviServerParser::parseNumericTopicWhoTime(KviIrcMessage *msg)
 	QString szChan = msg->connection()->decodeText(msg->safeParam(1));
 	KviChannel * chan = msg->connection()->findChannel(szChan);
 
-	KviStr tmp = msg->safeParam(3);
+	KviCString tmp = msg->safeParam(3);
 	bool bOk = false;
 	unsigned long t = 0;
 	if(tmp.hasData())t = tmp.toUInt(&bOk);
@@ -637,7 +637,7 @@ void KviServerParser::parseNumericChannelModeIs(KviIrcMessage *msg)
 	QString szSource = msg->connection()->decodeText(msg->safePrefix());
 	QString szChan = msg->connection()->decodeText(msg->safeParam(1));
 	KviChannel * chan = msg->connection()->findChannel(szChan);
-	KviStr modefl = msg->safeParam(2);
+	KviCString modefl = msg->safeParam(2);
 	if(chan)parseChannelMode(szSource,"*","*",chan,modefl,msg,3);
 	else {
 		KviWindow * pOut = KVI_OPTION_BOOL(KviOption_boolServerRepliesToActiveWindow) ?
@@ -655,7 +655,7 @@ void KviServerParser::parseNumericChannelModeIs(KviIrcMessage *msg)
 
 void getDateTimeStringFromCharTimeT(QString & szBuffer, const char * time_t_string)
 {
-	KviStr szTmp = time_t_string;
+	KviCString szTmp = time_t_string;
 	bool bOk = false;
 	unsigned int uTime = szTmp.toUInt(&bOk);
 	if(bOk)
@@ -811,8 +811,8 @@ void KviServerParser::parseNumericWhoReply(KviIrcMessage *msg)
 	bool bAway = szFlag.indexOf('G') != -1;
 	bool bIrcOp = szFlag.indexOf('*') != -1;
 
-	KviStr trailing = msg->safeTrailing();
-	KviStr hops = trailing.getToken(' ');
+	KviCString trailing = msg->safeTrailing();
+	KviCString hops = trailing.getToken(' ');
 	bool bHopsOk = false;
 	int iHops = hops.toInt(&bHopsOk);
 
@@ -919,7 +919,7 @@ void KviServerParser::parseNumericEndOfWho(KviIrcMessage *msg)
 		chan->setLastReceivedWhoReply(tNow);
 		if(msg->connection()->lagMeter())
 		{
-			KviStr tmp(KviStr::Format,"WHO %s",msg->safeParam(1));
+			KviCString tmp(KviCString::Format,"WHO %s",msg->safeParam(1));
 			msg->connection()->lagMeter()->lagCheckComplete(tmp.ptr());
 		}
 
@@ -1395,8 +1395,8 @@ void KviServerParser::parseNumericWhoisIdle(KviIrcMessage *msg)
 	{
 		KviWindow * pOut = KVI_OPTION_BOOL(KviOption_boolWhoisRepliesToActiveWindow) ?
 			msg->console()->activeWindow() : (KviWindow *)(msg->console());
-		KviStr idle = msg->safeParam(2); // shouldn't be encoded
-		KviStr sign = msg->safeParam(3); // shouldn't be encoded
+		KviCString idle = msg->safeParam(2); // shouldn't be encoded
+		KviCString sign = msg->safeParam(3); // shouldn't be encoded
 
 		bool bOk;
 		unsigned int uTime = idle.toUInt(&bOk);
@@ -1706,7 +1706,7 @@ void KviServerParser::parseNumericCreationTime(KviIrcMessage *msg)
 	// :prefix 329 <target> <channel> <creation_time>
 	QString szChan = msg->connection()->decodeText(msg->safeParam(1));
 	KviChannel * chan = msg->connection()->findChannel(szChan);
-	KviStr tmstr = msg->safeParam(2);
+	KviCString tmstr = msg->safeParam(2);
 	QDateTime date;
 	date.setTime_t((time_t)tmstr.toUInt());
 
@@ -2001,8 +2001,8 @@ void KviServerParser::parseNumericStats(KviIrcMessage * msg)
 		KviWindow * pOut = (KviWindow *)(msg->console());
 		if(msg->paramCount() > 2)
 		{
-			KviStr szParms;
-			KviStr *p = msg->firstParam();
+			KviCString szParms;
+			KviCString *p = msg->firstParam();
 			for(p = msg->nextParam();p;p = msg->nextParam())
 			{
 				if(szParms.hasData())szParms.append(' ');
diff --git a/src/kvirc/sparser/kvi_sparser.cpp b/src/kvirc/sparser/kvi_sparser.cpp
index a0143786a..38393c7bb 100644
--- a/src/kvirc/sparser/kvi_sparser.cpp
+++ b/src/kvirc/sparser/kvi_sparser.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Sun Jun 30 2000 03:25:17 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -27,7 +27,7 @@
 #include "kvi_sparser.h"
 #include "kvi_window.h"
 #include "kvi_out.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_ircsocket.h"
 #include "kvi_options.h"
 #include "kvi_kvs_eventmanager.h"
@@ -60,7 +60,7 @@ void KviServerParser::parseMessage(const char * message,KviIrcConnection * pConn
 				parms.append(pConnection->decodeText(msg.safePrefix()));
 				parms.append(pConnection->decodeText(msg.command()));
 
-				for(KviStr * str = msg.firstParam();str;str = msg.nextParam())
+				for(KviCString * str = msg.firstParam();str;str = msg.nextParam())
 					parms.append(pConnection->console()->decodeText(str->ptr()));
 
 				if(KviKvsEventManager::instance()->triggerRaw(msg.numeric(),pConnection->console(),&parms))
@@ -114,7 +114,7 @@ void KviServerParser::parseMessage(const char * message,KviIrcConnection * pConn
 				parms.append(pConnection->decodeText(msg.safePrefix()));
 				parms.append(pConnection->decodeText(msg.command()));
 
-				for(KviStr * str = msg.firstParam();str;str = msg.nextParam())
+				for(KviCString * str = msg.firstParam();str;str = msg.nextParam())
 					parms.append(pConnection->console()->decodeText(str->ptr()));
 
 				if(KviKvsEventManager::instance()->trigger(KviEvent_OnUnhandledLiteral,pConnection->console(),&parms))
diff --git a/src/kvirc/sparser/kvi_sparser.h b/src/kvirc/sparser/kvi_sparser.h
index 3fa683162..15e499bfc 100644
--- a/src/kvirc/sparser/kvi_sparser.h
+++ b/src/kvirc/sparser/kvi_sparser.h
@@ -7,7 +7,7 @@
 //   Creation date : Sat Jun 29 2000 14:23:11 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -27,8 +27,8 @@
 
 
 #include "kvi_settings.h"
-#include "kvi_pointerlist.h"
-#include "kvi_qstring.h"
+#include "KviPointerList.h"
+#include "KviQString.h"
 #include "kvi_console.h"
 #include "kvi_ircmessage.h"
 
@@ -76,12 +76,12 @@ typedef struct _KviCtcpMessage
 
 typedef struct _KviDccRequest
 {
-	KviStr           szType;
-	KviStr           szParam1;
-	KviStr           szParam2;
-	KviStr           szParam3;
-	KviStr           szParam4;
-	KviStr           szParam5;
+	KviCString           szType;
+	KviCString           szParam1;
+	KviCString           szParam2;
+	KviCString           szParam3;
+	KviCString           szParam4;
+	KviCString           szParam5;
 	bool             bIPv6;
 	KviCtcpMessage * ctcpMsg;
 	KviConsole     * pConsole;
@@ -126,9 +126,9 @@ private:
 	static KviLiteralMessageParseStruct m_literalParseProcTable[];
 	static KviCtcpMessageParseStruct    m_ctcpRequestParseProcTable[];
 	static KviCtcpMessageParseStruct    m_ctcpReplyParseProcTable[];
-	KviStr                              m_szLastParserError;
+	KviCString                              m_szLastParserError;
 
-//	KviStr                              m_szNoAwayNick; //<-- moved to kvi_console.h in KviConnectionInfo
+//	KviCString                              m_szNoAwayNick; //<-- moved to kvi_console.h in KviConnectionInfo
 public:
 	void parseMessage(const char * message,KviIrcConnection *pConnection);
 private:
@@ -226,7 +226,7 @@ private:
 	void parseLiteralWallops(KviIrcMessage *msg);
 	void parseLiteralPong(KviIrcMessage *msg);
 	void parseLiteralError(KviIrcMessage *msg);
-	void parseChannelMode(const QString &szNick,const QString &szUser,const QString &szHost,KviChannel * chan,KviStr &modefl,KviIrcMessage *msg,int curParam);
+	void parseChannelMode(const QString &szNick,const QString &szUser,const QString &szHost,KviChannel * chan,KviCString &modefl,KviIrcMessage *msg,int curParam);
 	void parseUserMode(KviIrcMessage *msg,const char * modeflptr);
 	void parseLiteralCap(KviIrcMessage * msg);
 	void parseLiteralAuthenticate(KviIrcMessage * msg);
@@ -263,11 +263,11 @@ private:
 	void parseNumericSaslFail(KviIrcMessage * msg);
 	
 public:
-	static void encodeCtcpParameter(const char * param,KviStr &buffer,bool bSpaceBreaks = true);
+	static void encodeCtcpParameter(const char * param,KviCString &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,KviCString &buffer);
 	static const char * decodeCtcpEscape(const char * msg_ptr,QByteArray &buffer);
-	static const char * extractCtcpParameter(const char * msg_ptr,KviStr &buffer,bool bSpaceBreaks = true, bool bSafeOnly=false);
+	static const char * extractCtcpParameter(const char * msg_ptr,KviCString &buffer,bool bSpaceBreaks = true, bool bSafeOnly=false);
 	static const char * extractCtcpParameter(const char * msg_ptr,QString &buffer,bool bSpaceBreaks = true, bool bSafeOnly=false);
 };
 
diff --git a/src/kvirc/ui/kvi_actiondrawer.cpp b/src/kvirc/ui/kvi_actiondrawer.cpp
index 618ad4e5c..a041d55e5 100644
--- a/src/kvirc/ui/kvi_actiondrawer.cpp
+++ b/src/kvirc/ui/kvi_actiondrawer.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Sun 21 Nov 2004 05:44:22 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC Client distribution
-//   Copyright (C) 2004-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2004-2010 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
@@ -29,7 +29,7 @@
 #include "kvi_action.h"
 #include "kvi_actionmanager.h"
 #include "kvi_iconmanager.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_tal_listwidget.h"
 
 #include <QLayout>
diff --git a/src/kvirc/ui/kvi_actiondrawer.h b/src/kvirc/ui/kvi_actiondrawer.h
index 6cd97e80b..970666ccf 100644
--- a/src/kvirc/ui/kvi_actiondrawer.h
+++ b/src/kvirc/ui/kvi_actiondrawer.h
@@ -6,7 +6,7 @@
 //   Creation date : Sun 21 Nov 2004 05:44:22 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC Client distribution
-//   Copyright (C) 2004-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2004-2010 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
@@ -31,7 +31,7 @@
 */
 
 #include "kvi_settings.h"
-#include "kvi_qstring.h"
+#include "KviQString.h"
 #include "kvi_tal_listwidget.h"
 
 #include <QWidget>
diff --git a/src/kvirc/ui/kvi_channel.cpp b/src/kvirc/ui/kvi_channel.cpp
index 62506fd21..dfa617d00 100644
--- a/src/kvirc/ui/kvi_channel.cpp
+++ b/src/kvirc/ui/kvi_channel.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Tue Aug  1 2000 02:20:22 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -28,18 +28,18 @@
 #include "kvi_ircview.h"
 #include "kvi_input.h"
 #include "kvi_options.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_topicw.h"
 #include "kvi_ircsocket.h"
 #include "kvi_out.h"
-#include "kvi_malloc.h"
+#include "KviMemory.h"
 #include "kvi_windowlist.h"
 #include "kvi_frame.h"
-#include "kvi_config.h"
+#include "KviConfigurationFile.h"
 #include "kvi_maskeditor.h"
-#include "kvi_mirccntrl.h"
+#include "KviMircCntrl.h"
 #include "kvi_settings.h"
-#include "kvi_parameterlist.h"
+#include "KviParameterList.h"
 #include "kvi_modeeditor.h"
 #include "kvi_app.h"
 #include "kvi_useraction.h"
@@ -51,14 +51,14 @@
 #include "kvi_defaults.h"
 #include "kvi_sparser.h"
 #include "kvi_modew.h"
-#include "kvi_mirccntrl.h"
-#include "kvi_pointerhashtable.h"
+#include "KviMircCntrl.h"
+#include "KviPointerHashTable.h"
 #include "kvi_kvs_script.h"
 #include "kvi_kvs_eventtriggers.h"
 #include "kvi_tal_popupmenu.h"
 
 #ifdef COMPILE_CRYPT_SUPPORT
-	#include "kvi_crypt.h"
+	#include "KviCryptEngine.h"
 	#include "kvi_cryptcontroller.h"
 #endif
 
@@ -342,7 +342,7 @@ void KviChannel::getConfigGroupName(QString & szBuffer)
 // 	}
 }
 
-void KviChannel::saveProperties(KviConfig * cfg)
+void KviChannel::saveProperties(KviConfigurationFile * cfg)
 {
 	KviWindow::saveProperties(cfg);
 	cfg->writeEntry("TopSplitter",m_pTopSplitter->sizes());
@@ -358,7 +358,7 @@ void KviChannel::saveProperties(KviConfig * cfg)
 	cfg->writeEntry("ToolButtonsHidden",buttonContainer()->isHidden());
 }
 
-void KviChannel::loadProperties(KviConfig * cfg)
+void KviChannel::loadProperties(KviConfigurationFile * cfg)
 {
 	int iWidth = width();
 	QList<int> def;
@@ -1177,7 +1177,7 @@ void KviChannel::ownMessage(const QString & szBuffer, bool bUserFeedback)
 		{
 			if(*d != KVI_TEXT_CRYPTESCAPE)
 			{
-				KviStr encrypted;
+				KviCString encrypted;
 				cryptSessionInfo()->m_pEngine->setMaxEncryptLen(maxMsgLen);
 				switch(cryptSessionInfo()->m_pEngine->encrypt(d,encrypted))
 				{
@@ -1749,7 +1749,7 @@ void KviChannel::internalMask(const QString & szMask, bool bAdd, const QString &
 void KviChannel::updateModeLabel()
 {
 	QString szTip = __tr2qs("<b>Channel mode:</b>");
-	KviStr szMod = m_szChannelMode;
+	KviCString szMod = m_szChannelMode;
 	const char * pcAux = szMod.ptr();
 	KviIrcConnectionServerInfo * pServerInfo = serverInfo();
 
diff --git a/src/kvirc/ui/kvi_channel.h b/src/kvirc/ui/kvi_channel.h
index a3b768aaf..7a8d738fa 100644
--- a/src/kvirc/ui/kvi_channel.h
+++ b/src/kvirc/ui/kvi_channel.h
@@ -6,7 +6,7 @@
 //   Creation date : Tue Aug  1 2000 01:42:00 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -33,13 +33,13 @@
 #include "kvi_settings.h"
 #include "kvi_console.h"
 #include "kvi_window.h"
-#include "kvi_string.h"
-#include "kvi_ircuserdb.h"
-#include "kvi_pixmap.h"
+#include "KviCString.h"
+#include "KviIrcUserDataBase.h"
+#include "KviPixmap.h"
 #include "kvi_userlistview.h"
-#include "kvi_time.h"
+#include "KviTimeUtils.h"
 #include "kvi_modew.h"
-#include "kvi_pointerhashtable.h"
+#include "KviPointerHashTable.h"
 
 #include <QList>
 #include <QDateTime>
@@ -921,14 +921,14 @@ protected:
 	* \param cfg The config file
 	* \return void
 	*/
-	virtual void saveProperties(KviConfig * cfg);
+	virtual void saveProperties(KviConfigurationFile * cfg);
 
 	/**
 	* \brief Loads the properties from file
 	* \param cfg The config file
 	* \return void
 	*/
-	virtual void loadProperties(KviConfig * cfg);
+	virtual void loadProperties(KviConfigurationFile * cfg);
 
 	/**
 	* \brief Applies the options
diff --git a/src/kvirc/ui/kvi_colorwin.cpp b/src/kvirc/ui/kvi_colorwin.cpp
index 079a677f5..349bdf0d0 100644
--- a/src/kvirc/ui/kvi_colorwin.cpp
+++ b/src/kvirc/ui/kvi_colorwin.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Wed Jan  6 1999 04:30:20 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 1999-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 1999-2010 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
@@ -68,7 +68,7 @@ void KviColorWindow::paintEvent(QPaintEvent *)
 	{
 		p.fillRect((i % 8) * 18,(i / 8) * 18,18,18,KVI_OPTION_MIRCCOLOR(i));
 		p.setPen(KVI_OPTION_MIRCCOLOR(clrIdx[i]));
-		KviStr szI(KviStr::Format,"%d",i);
+		KviCString szI(KviCString::Format,"%d",i);
 		p.drawText((i % 8) * 18,(i / 8) * 18,18,18,Qt::AlignVCenter | Qt::AlignHCenter,szI.ptr());
 	}
 }
diff --git a/src/kvirc/ui/kvi_colorwin.h b/src/kvirc/ui/kvi_colorwin.h
index 93857691e..e503ee08c 100644
--- a/src/kvirc/ui/kvi_colorwin.h
+++ b/src/kvirc/ui/kvi_colorwin.h
@@ -6,7 +6,7 @@
 //   Creation date : Wed Jan  6 1999 04:27:45 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 1999-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 1999-2010 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
diff --git a/src/kvirc/ui/kvi_console.cpp b/src/kvirc/ui/kvi_console.cpp
index f089bdb32..c53aff8cc 100644
--- a/src/kvirc/ui/kvi_console.cpp
+++ b/src/kvirc/ui/kvi_console.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Sun Jun 25 2000 15:01:34 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -30,33 +30,33 @@
 #include "kvi_frame.h"
 #include "kvi_iconmanager.h"
 #include "kvi_options.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_ircview.h"
-#include "kvi_mirccntrl.h"
+#include "KviMircCntrl.h"
 #include "kvi_input.h"
 #include "kvi_error.h"
-#include "kvi_proxydb.h"
+#include "KviProxyDataBase.h"
 #include "kvi_netutils.h"
-#include "kvi_ircserver.h"
-#include "kvi_ircserverdb.h"
+#include "KviIrcServer.h"
+#include "KviIrcServerDataBase.h"
 #include "kvi_dns.h"
 #include "kvi_defaults.h"
-#include "kvi_ircuserdb.h"
+#include "KviIrcUserDataBase.h"
 #include "kvi_channel.h"
 #include "kvi_query.h"
-#include "kvi_parameterlist.h"
-#include "kvi_regusersdb.h"
+#include "KviParameterList.h"
+#include "KviRegisteredUserDataBase.h"
 #include "kvi_userlistview.h"
 #include "kvi_out.h"
-#include "kvi_config.h"
+#include "KviConfigurationFile.h"
 #include "kvi_irctoolbar.h"
 #include "kvi_internalcmd.h"
 #include "kvi_sparser.h"
 #include "kvi_modulemanager.h"
-#include "kvi_fileutils.h"
-#include "kvi_time.h"
+#include "KviFileUtils.h"
+#include "KviTimeUtils.h"
 #include "kvi_mexlinkfilter.h"
-#include "kvi_avatarcache.h"
+#include "KviAvatarCache.h"
 #include "kvi_ircconnection.h"
 #include "kvi_ircconnectionuserinfo.h"
 #include "kvi_ircconnectionserverinfo.h"
@@ -71,7 +71,7 @@
 #include "kvi_kvs_eventtriggers.h"
 #include "kvi_tal_hbox.h"
 #include "kvi_tal_popupmenu.h"
-#include "kvi_nickcolors.h"
+#include "KviNickColors.h"
 
 #ifdef COMPILE_SSL_SUPPORT
 	#include "kvi_sslmaster.h"
@@ -223,7 +223,7 @@ void KviConsole::completeChannel(const QString &word,KviPointerList<QString> * m
 	if(!connection())return;
 	for(KviChannel * c = connection()->channelList()->first();c;c = connection()->channelList()->next())
 	{
-		if(kvi_strEqualCIN(c->windowName(),word.ptr(),word.len()))matches->append(new KviStr((*it)
+		if(kvi_strEqualCIN(c->windowName(),word.ptr(),word.len()))matches->append(new KviCString((*it)
 	}
 	*/
 	QStringList *pList = g_pApp->recentChannelsForNetwork(currentNetworkName());
@@ -362,7 +362,7 @@ void KviConsole::executeInternalCommand(int index)
 	KviKvsScript::run(kvi_getInternalCommandBuffer(index),this);
 }
 
-void KviConsole::saveProperties(KviConfig *cfg)
+void KviConsole::saveProperties(KviConfigurationFile *cfg)
 {
 	KviWindow::saveProperties(cfg);
 	QList<int> sizes;
@@ -388,7 +388,7 @@ void KviConsole::showNotifyList(bool bShow)
 	}
 }
 
-void KviConsole::loadProperties(KviConfig *cfg)
+void KviConsole::loadProperties(KviConfigurationFile *cfg)
 {
 	int iWidth = width();
 	QList<int> def;
diff --git a/src/kvirc/ui/kvi_console.h b/src/kvirc/ui/kvi_console.h
index 92407e7e8..7f3295c0e 100644
--- a/src/kvirc/ui/kvi_console.h
+++ b/src/kvirc/ui/kvi_console.h
@@ -6,7 +6,7 @@
 //   Creation date : Sun Jun 25 2000 15:00:20 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -29,10 +29,10 @@
 #include "kvi_ircconnectiontarget.h"
 #include "kvi_window.h"
 #include "kvi_ircsocket.h"
-#include "kvi_ircserver.h"
-#include "kvi_string.h"
+#include "KviIrcServer.h"
+#include "KviCString.h"
 #include "kvi_irccontext.h"
-#include "kvi_pointerlist.h"
+#include "KviPointerList.h"
 #include "kvi_userlistview.h"
 #include "kvi_themedcombobox.h"
 
@@ -112,8 +112,8 @@ protected:
 	//void socketStateChange();
 	//void registerLinkMonitor(KviIrcSocketMonitor * m);
 	//void unregisterLinkMonitor(KviIrcSocketMonitor * m);
-	virtual void loadProperties(KviConfig * cfg);
-	virtual void saveProperties(KviConfig * cfg);
+	virtual void loadProperties(KviConfigurationFile * cfg);
+	virtual void saveProperties(KviConfigurationFile * cfg);
 
 	void destroyConnection();
 	// internal helper for applyHighlighting
diff --git a/src/kvirc/ui/kvi_cryptcontroller.cpp b/src/kvirc/ui/kvi_cryptcontroller.cpp
index a3d69b622..ffcc67c44 100644
--- a/src/kvirc/ui/kvi_cryptcontroller.cpp
+++ b/src/kvirc/ui/kvi_cryptcontroller.cpp
@@ -1,10 +1,10 @@
 //=============================================================================
 //
-//   File : kvi_cryptcontroller.cpp
+//   File : KviCryptEngine.cpp
 //   Creation date : Fri Nov 03 2000 14:16:33 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -29,15 +29,15 @@
 #ifdef COMPILE_CRYPT_SUPPORT
 	#include "kvi_cryptcontroller.h"
 	#include "kvi_window.h"
-	#include "kvi_locale.h"
+	#include "KviLocale.h"
 	#include "kvi_out.h"
 	#include "kvi_iconmanager.h"
 	#include "kvi_modulemanager.h"
 	#include "kvi_module.h"
-	#include "kvi_malloc.h"
+	#include "KviMemory.h"
 	#include "kvi_memmove.h"
 	#include "kvi_toolwindows_container.h"
-	#include "kvi_pointerhashtable.h"
+	#include "KviPointerHashTable.h"
 
 	#include <QLayout>
 
@@ -289,8 +289,8 @@
 
 	bool KviCryptController::initializeEngine(KviCryptEngine * pEngine)
 	{
-		KviStr szEncryptKey;
-		KviStr szDecryptKey;
+		KviCString szEncryptKey;
+		KviCString szDecryptKey;
 
 		char * pcEncKey = 0;
 		char * pcDecKey = 0;
@@ -306,12 +306,12 @@
 				iEncKeyLen = szEncryptKey.hexToBuffer(&pcTmpKey,false);
 				if(iEncKeyLen > 0)
 				{
-					pcEncKey = (char *)kvi_malloc(iEncKeyLen);
+					pcEncKey = (char *)KviMemory::allocate(iEncKeyLen);
 					kvi_memmove(pcEncKey,pcTmpKey,iEncKeyLen);
-					KviStr::freeBuffer(pcTmpKey);
+					KviCString::freeBuffer(pcTmpKey);
 				}
 			} else {
-				pcEncKey = (char *)kvi_malloc(szEncryptKey.len());
+				pcEncKey = (char *)KviMemory::allocate(szEncryptKey.len());
 				kvi_memmove(pcEncKey,szEncryptKey.ptr(),szEncryptKey.len());
 				iEncKeyLen = szEncryptKey.len();
 			}
@@ -326,12 +326,12 @@
 				iDecKeyLen = szDecryptKey.hexToBuffer(&pcTmpKey,false);
 				if(iDecKeyLen > 0)
 				{
-					pcDecKey = (char *)kvi_malloc(iDecKeyLen);
+					pcDecKey = (char *)KviMemory::allocate(iDecKeyLen);
 					kvi_memmove(pcDecKey,pcTmpKey,iDecKeyLen);
-					KviStr::freeBuffer(pcTmpKey);
+					KviCString::freeBuffer(pcTmpKey);
 				}
 			} else {
-				pcDecKey = (char *)kvi_malloc(szDecryptKey.len());
+				pcDecKey = (char *)KviMemory::allocate(szDecryptKey.len());
 				kvi_memmove(pcDecKey,szDecryptKey.ptr(),szDecryptKey.len());
 				iDecKeyLen = szDecryptKey.len();
 			}
@@ -339,9 +339,9 @@
 
 		bool bRet = pEngine->init(pcEncKey,iEncKeyLen,pcDecKey,iDecKeyLen);
 		if(pcEncKey)
-			kvi_free(pcEncKey);
+			KviMemory::free(pcEncKey);
 		if(pcDecKey)
-			kvi_free(pcDecKey);
+			KviMemory::free(pcDecKey);
 
 		return bRet;
 	}
diff --git a/src/kvirc/ui/kvi_cryptcontroller.h b/src/kvirc/ui/kvi_cryptcontroller.h
index 6acde8b94..154f554e5 100644
--- a/src/kvirc/ui/kvi_cryptcontroller.h
+++ b/src/kvirc/ui/kvi_cryptcontroller.h
@@ -2,11 +2,11 @@
 #define _KVI_CRYPTCONTROLLER_H_
 //=============================================================================
 //
-//   File : kvi_cryptcontroller.h
+//   File : KviCryptEngine.h
 //   Creation date : Fri Nov 03 2000 14:11:03 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -27,8 +27,8 @@
 #include "kvi_settings.h"
 
 #if defined(COMPILE_CRYPT_SUPPORT)
-	#include "kvi_crypt.h"
-	#include "kvi_heapobject.h"
+	#include "KviCryptEngine.h"
+	#include "KviHeapObject.h"
 	#include "kvi_toolwindows_container.h"
 	#include "kvi_tal_listwidget.h"
 
diff --git a/src/kvirc/ui/kvi_ctcppagedialog.cpp b/src/kvirc/ui/kvi_ctcppagedialog.cpp
index b434c975c..e03abc366 100644
--- a/src/kvirc/ui/kvi_ctcppagedialog.cpp
+++ b/src/kvirc/ui/kvi_ctcppagedialog.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Tue May 21 2002 22:09:45 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2002-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2002-2010 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
@@ -24,7 +24,7 @@
 
 
 #include "kvi_ctcppagedialog.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_app.h"
 #include "kvi_iconmanager.h"
 #include "kvi_options.h"
diff --git a/src/kvirc/ui/kvi_ctcppagedialog.h b/src/kvirc/ui/kvi_ctcppagedialog.h
index c5a228b5f..b569cce34 100644
--- a/src/kvirc/ui/kvi_ctcppagedialog.h
+++ b/src/kvirc/ui/kvi_ctcppagedialog.h
@@ -6,7 +6,7 @@
 //   Creation date : Tue May 21 2002 22:09:45 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2002-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2002-2010 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
@@ -25,7 +25,7 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_string.h"
+#include "KviCString.h"
 
 #include <QWidget>
 
diff --git a/src/kvirc/ui/kvi_customtoolbar.cpp b/src/kvirc/ui/kvi_customtoolbar.cpp
index 1eaa23c0d..1b5521393 100644
--- a/src/kvirc/ui/kvi_customtoolbar.cpp
+++ b/src/kvirc/ui/kvi_customtoolbar.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Sun 21 Nov 2004 05:28:57 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC Client distribution
-//   Copyright (C) 2004-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2004-2010 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
@@ -26,7 +26,7 @@
 
 #include "kvi_customtoolbar.h"
 #include "kvi_frame.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_app.h"
 #include "kvi_actionmanager.h"
 #include "kvi_customtoolbardescriptor.h"
diff --git a/src/kvirc/ui/kvi_customtoolbar.h b/src/kvirc/ui/kvi_customtoolbar.h
index 7126316de..8e60cb208 100644
--- a/src/kvirc/ui/kvi_customtoolbar.h
+++ b/src/kvirc/ui/kvi_customtoolbar.h
@@ -6,7 +6,7 @@
 //   Creation date : Sun 21 Nov 2004 05:28:57 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC Client distribution
-//   Copyright (C) 2004-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2004-2010 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
@@ -26,7 +26,7 @@
 
 #include "kvi_settings.h"
 #include "kvi_toolbar.h"
-#include "kvi_pointerhashtable.h"
+#include "KviPointerHashTable.h"
 
 #ifdef COMPILE_ON_WINDOWS
 	#include "kvi_customtoolbardescriptor.h"
diff --git a/src/kvirc/ui/kvi_debugwindow.cpp b/src/kvirc/ui/kvi_debugwindow.cpp
index ee5b142c1..50b5c3b7c 100644
--- a/src/kvirc/ui/kvi_debugwindow.cpp
+++ b/src/kvirc/ui/kvi_debugwindow.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Sun Jul 18 2005 14:12:22 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2005-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2005-2010 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
@@ -29,10 +29,10 @@
 #include "kvi_ircview.h"
 #include "kvi_input.h"
 #include "kvi_options.h"
-#include "kvi_locale.h"
-#include "kvi_config.h"
+#include "KviLocale.h"
+#include "KviConfigurationFile.h"
 
-#include "kvi_parameterlist.h"
+#include "KviParameterList.h"
 #include "kvi_frame.h"
 
 #include <QList>
@@ -72,13 +72,13 @@ void KviDebugWindow::getBaseLogFileName(QString &buffer)
 	buffer = "debug";
 }
 
-void KviDebugWindow::saveProperties(KviConfig *cfg)
+void KviDebugWindow::saveProperties(KviConfigurationFile *cfg)
 {
 	KviWindow::saveProperties(cfg);
 	cfg->writeEntry("Splitter",m_pSplitter->sizes());
 }
 
-void KviDebugWindow::loadProperties(KviConfig *cfg)
+void KviDebugWindow::loadProperties(KviConfigurationFile *cfg)
 {
 	int w = width();
 	KviWindow::loadProperties(cfg);
diff --git a/src/kvirc/ui/kvi_debugwindow.h b/src/kvirc/ui/kvi_debugwindow.h
index e1f8b7ddf..f68d4485f 100644
--- a/src/kvirc/ui/kvi_debugwindow.h
+++ b/src/kvirc/ui/kvi_debugwindow.h
@@ -6,7 +6,7 @@
 //   Creation date : Sun Jul 18 2005 14:14:00 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2005-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2005-2010 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
@@ -26,7 +26,7 @@
 
 #include "kvi_settings.h"
 #include "kvi_window.h"
-#include "kvi_string.h"
+#include "KviCString.h"
 
 class QSplitter;
 
@@ -45,8 +45,8 @@ protected:
 	virtual QPixmap * myIconPtr();
 	virtual void fillCaptionBuffers();
 	virtual void resizeEvent(QResizeEvent *e);
-	virtual void loadProperties(KviConfig * cfg);
-	virtual void saveProperties(KviConfig * cfg);
+	virtual void loadProperties(KviConfigurationFile * cfg);
+	virtual void saveProperties(KviConfigurationFile * cfg);
 	virtual void getBaseLogFileName(QString &buffer);
 	virtual QSize sizeHint() const;
 };
diff --git a/src/kvirc/ui/kvi_dynamictooltip.cpp b/src/kvirc/ui/kvi_dynamictooltip.cpp
index 902256693..d9472ada5 100644
--- a/src/kvirc/ui/kvi_dynamictooltip.cpp
+++ b/src/kvirc/ui/kvi_dynamictooltip.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Wed Nov 01 2000 15:25:11 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
diff --git a/src/kvirc/ui/kvi_dynamictooltip.h b/src/kvirc/ui/kvi_dynamictooltip.h
index f38cf9a47..65480e0a5 100644
--- a/src/kvirc/ui/kvi_dynamictooltip.h
+++ b/src/kvirc/ui/kvi_dynamictooltip.h
@@ -6,7 +6,7 @@
 //   Creation date : Wed Nov 01 2000 15:23:12 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
diff --git a/src/kvirc/ui/kvi_filedialog.cpp b/src/kvirc/ui/kvi_filedialog.cpp
index 156c0226f..e262b40d5 100644
--- a/src/kvirc/ui/kvi_filedialog.cpp
+++ b/src/kvirc/ui/kvi_filedialog.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Mon Nov 20 2000 12:20:42 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -23,13 +23,13 @@
 //=============================================================================
 
 #include "kvi_filedialog.h"
-#include "kvi_mediatype.h"
+#include "KviMediaType.h"
 #include "kvi_iconmanager.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_app.h"
-#include "kvi_fileutils.h"
+#include "KviFileUtils.h"
 #include "kvi_frame.h"
-#include "kvi_qstring.h"
+#include "KviQString.h"
 #include "kvi_tal_tooltip.h"
 
 #include <QDir>
@@ -53,7 +53,7 @@ KviFileDialog::~KviFileDialog()
 /*
 void KviFileDialog::goKvirc()
 {
-	KviStr tmp;
+	KviCString tmp;
 	g_pApp->getLocalKvircDirectory(tmp,KviApp::None);
 	setDir(QDir(tmp.ptr()));
 }
diff --git a/src/kvirc/ui/kvi_filedialog.h b/src/kvirc/ui/kvi_filedialog.h
index 18eab8b9d..827e80f8a 100644
--- a/src/kvirc/ui/kvi_filedialog.h
+++ b/src/kvirc/ui/kvi_filedialog.h
@@ -6,7 +6,7 @@
 //   Creation date : Mon Nov 20 2000 03:52:12 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -35,7 +35,7 @@
 #endif
 
 #include "kvi_settings.h"
-#include "kvi_string.h"
+#include "KviCString.h"
 #include "kvi_tal_filedialog.h"
 
 #include <QStringList>
diff --git a/src/kvirc/ui/kvi_frame.cpp b/src/kvirc/ui/kvi_frame.cpp
index 0f351411f..a5800bc14 100644
--- a/src/kvirc/ui/kvi_frame.cpp
+++ b/src/kvirc/ui/kvi_frame.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Sun Jun 18 2000 17:59:02 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -38,16 +38,16 @@
 #include "kvi_windowlist.h"
 #include "kvi_windowlist_tree.h"
 #include "kvi_console.h"
-#include "kvi_config.h"
+#include "KviConfigurationFile.h"
 #include "kvi_internalcmd.h"
 #include "kvi_console.h"
 #include "kvi_debug.h"
 #include "kvi_irctoolbar.h"
 #include "kvi_confignames.h"
-#include "kvi_parameterlist.h"
+#include "KviParameterList.h"
 #include "kvi_module.h"
 #include "kvi_mextoolbar.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_irccontext.h"
 #include "kvi_statusbar.h"
 #include "kvi_customtoolbar.h"
@@ -86,7 +86,7 @@
 #define KVI_DEFAULT_FRAME_CAPTION "KVIrc " KVI_VERSION " " KVI_RELEASE_NAME
 
 // Declared and managed by KviApp (kvi_app.cpp)
-extern KviConfig * g_pWinPropertiesConfig;
+extern KviConfigurationFile * g_pWinPropertiesConfig;
 KVIRC_API KviFrame * g_pFrame = 0; // the one and only frame object
 
 KviFrame::KviFrame()
@@ -260,7 +260,7 @@ void KviFrame::restoreModuleExtensionToolBars()
 		{
 			QString szMod = szEntry.left(idx);
 			szEntry.remove(0,idx + 1);
-			g_pModuleExtensionManager->allocateExtension("toolbar",KviStr(szEntry),firstConsole(),0,0,szMod);
+			g_pModuleExtensionManager->allocateExtension("toolbar",KviCString(szEntry),firstConsole(),0,0,szMod);
 		}
 	}
 }
@@ -354,7 +354,7 @@ void KviFrame::saveWindowProperties(KviWindow * wnd,const QString &szSection)
 	while(g_pWinPropertiesConfig->groupsCount() > 80)
 	{
 		// Kill the oldest group
-		KviConfigIterator it(*(g_pWinPropertiesConfig->dict()));
+		KviConfigurationFileIterator it(*(g_pWinPropertiesConfig->dict()));
 		QString minKey;
 		unsigned int minVal = time(0);
 		while(it.current() && minVal)
diff --git a/src/kvirc/ui/kvi_frame.h b/src/kvirc/ui/kvi_frame.h
index 752017554..a1b46bf6f 100644
--- a/src/kvirc/ui/kvi_frame.h
+++ b/src/kvirc/ui/kvi_frame.h
@@ -6,7 +6,7 @@
 //   Creation date : Sun Jun 18 2000 17:59:02 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -34,8 +34,8 @@
 #include "kvi_settings.h"
 
 #include "kvi_tal_mainwindow.h"
-#include "kvi_qstring.h"
-#include "kvi_pointerlist.h"
+#include "KviQString.h"
+#include "KviPointerList.h"
 
 class KviMenuBar;
 class KviMdiChild;
@@ -44,7 +44,7 @@ class KviWindow;
 class KviConsole;
 class KviWindowListBase;
 class QSplitter;
-class KviConfig;
+class KviConfigurationFile;
 class KviMexToolBar;
 class KviIrcContext;
 class KviIrcConnection;
diff --git a/src/kvirc/ui/kvi_historywin.cpp b/src/kvirc/ui/kvi_historywin.cpp
index 1e110d8c6..ace1b5687 100644
--- a/src/kvirc/ui/kvi_historywin.cpp
+++ b/src/kvirc/ui/kvi_historywin.cpp
@@ -6,7 +6,7 @@
 //   Creation date : Mon Aug 19 01:34:48 2002 GMT by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2002-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2002-2010 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
@@ -29,7 +29,7 @@
 #include "kvi_options.h"
 #include "kvi_input.h"
 #include "kvi_input_history.h"
-#include "kvi_mirccntrl.h"
+#include "KviMircCntrl.h"
 
 #include <QEvent>
 #include <QMouseEvent>
@@ -109,7 +109,7 @@ bool KviHistoryWindow::findTypedSeq()
 	bool bFullMax = false;
 	for(int i=0;i<cnt;i++)
 	{
-		KviStr szIt = text(i);
+		KviCString szIt = text(i);
 		int j;
 		for(j=0;j<szIt.len();j++)
 		{
@@ -166,7 +166,7 @@ void KviHistoryWindow::keyPressEvent(QKeyEvent * e)
 			doHide();
 			if(findTypedSeq())
 			{
-				KviStr szItem = m_szTypedSeq;
+				KviCString szItem = m_szTypedSeq;
 				szItem.append(' ');
 				if(m_pOwner)m_pOwner->insertText(szItem);
 			} else {
@@ -177,7 +177,7 @@ void KviHistoryWindow::keyPressEvent(QKeyEvent * e)
 		case Qt::Key_Tab:
 			doHide();
 			findTypedSeq();
-			KviStr szItem = m_szCurFullSeq;
+			KviCString szItem = m_szCurFullSeq;
 			szItem.append(KVI_TEXT_ICON);
 			if(m_pOwner)m_pOwner->insertText(szItem);
 			return;
diff --git a/src/kvirc/ui/kvi_historywin.h b/src/kvirc/ui/kvi_historywin.h
index 1ecb8a0e7..7a611e7d0 100644
--- a/src/kvirc/ui/kvi_historywin.h
+++ b/src/kvirc/ui/kvi_historywin.h
@@ -6,7 +6,7 @@
 //   Creation date : Mon Aug 19 01:34:46 2002 GMT by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2002-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2002-2010 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
@@ -33,7 +33,7 @@
 */
 
 #include "kvi_settings.h"
-#include "kvi_string.h"
+#include "KviCString.h"
 
 #include <QListWidget>
 
diff --git a/src/kvirc/ui/kvi_htmldialog.cpp b/src/kvirc/ui/kvi_htmldialog.cpp
index 592ad3dd9..83d8f347c 100644
--- a/src/kvirc/ui/kvi_htmldialog.cpp
+++ b/src/kvirc/ui/kvi_htmldialog.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Wed 03 Jan 2007 03:36:36 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC Client distribution
-//   Copyright (C) 2007-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2007-2010 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
@@ -24,7 +24,7 @@
 
 
 #include "kvi_htmldialog.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 
 #include <QLabel>
 #include <QPushButton>
diff --git a/src/kvirc/ui/kvi_htmldialog.h b/src/kvirc/ui/kvi_htmldialog.h
index fadbfd9a5..e5cfda2ac 100644
--- a/src/kvirc/ui/kvi_htmldialog.h
+++ b/src/kvirc/ui/kvi_htmldialog.h
@@ -6,7 +6,7 @@
 //   Creation date : Wed 03 Jan 2007 03:36:36 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC Client distribution
-//   Copyright (C) 2007-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2007-2010 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
@@ -24,7 +24,7 @@
 //
 //=============================================================================
 
-#include "kvi_qstring.h"
+#include "KviQString.h"
 #include "kvi_settings.h"
 
 #include <QPixmap>
diff --git a/src/kvirc/ui/kvi_imagedialog.cpp b/src/kvirc/ui/kvi_imagedialog.cpp
index 8009779ae..9a49a2464 100644
--- a/src/kvirc/ui/kvi_imagedialog.cpp
+++ b/src/kvirc/ui/kvi_imagedialog.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Sun Dec 22 2002 19:42 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2002-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2002-2010 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
@@ -23,8 +23,8 @@
 //=============================================================================
 
 #include "kvi_imagedialog.h"
-#include "kvi_fileutils.h"
-#include "kvi_locale.h"
+#include "KviFileUtils.h"
+#include "KviLocale.h"
 #include "kvi_iconmanager.h"
 #include "kvi_options.h"
 #include "kvi_app.h"
diff --git a/src/kvirc/ui/kvi_imagedialog.h b/src/kvirc/ui/kvi_imagedialog.h
index cc6371ff7..2ca37c120 100644
--- a/src/kvirc/ui/kvi_imagedialog.h
+++ b/src/kvirc/ui/kvi_imagedialog.h
@@ -6,7 +6,7 @@
 //   Creation date : Sun Dec 22 2002 19:42 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2002-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2002-2010 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
diff --git a/src/kvirc/ui/kvi_input.cpp b/src/kvirc/ui/kvi_input.cpp
index 901ee2cb4..8760129e3 100644
--- a/src/kvirc/ui/kvi_input.cpp
+++ b/src/kvirc/ui/kvi_input.cpp
@@ -36,7 +36,7 @@
 #include "kvi_colorwin.h"
 #include "kvi_texticonwin.h"
 #include "kvi_window.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_scripteditor.h"
 #include "kvi_historywin.h"
 #include "kvi_userinput.h"
diff --git a/src/kvirc/ui/kvi_input_editor.cpp b/src/kvirc/ui/kvi_input_editor.cpp
index 84cd09b83..fae285928 100644
--- a/src/kvirc/ui/kvi_input_editor.cpp
+++ b/src/kvirc/ui/kvi_input_editor.cpp
@@ -35,11 +35,11 @@
 #include "kvi_ircview.h"
 #include "kvi_kvs_script.h"
 #include "kvi_kvs_kernel.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_mdimanager.h"
-#include "kvi_mirccntrl.h"
+#include "KviMircCntrl.h"
 #include "kvi_options.h"
-#include "kvi_qstring.h"
+#include "KviQString.h"
 #include "kvi_out.h"
 #include "kvi_tal_popupmenu.h"
 #include "kvi_texticonwin.h"
diff --git a/src/kvirc/ui/kvi_input_editor.h b/src/kvirc/ui/kvi_input_editor.h
index 42fd0899d..99ebd2597 100644
--- a/src/kvirc/ui/kvi_input_editor.h
+++ b/src/kvirc/ui/kvi_input_editor.h
@@ -42,8 +42,8 @@
 */
 
 #include "kvi_settings.h"
-#include "kvi_pointerlist.h"
-#include "kvi_string.h"
+#include "KviPointerList.h"
+#include "KviCString.h"
 #include "kvi_window.h"
 
 #include <QString>
@@ -132,7 +132,7 @@ protected:
 	KviPointerList<QString> * m_pHistory;
 	int                       m_iCurHistoryIdx;
 
-	KviStr                    m_szSaveTextBuffer;
+	KviCString                    m_szSaveTextBuffer;
 
 	// Nick completion
 	KviUserListView         * m_pUserListView;
@@ -144,7 +144,7 @@ protected:
 	bool                      m_bLastCompletionFinished;
 
 	bool                      m_bUpdatesEnabled;
-	KviStr                    m_szAltKeyCode;
+	KviCString                    m_szAltKeyCode;
 	KviWindow               * m_pKviWindow;
 	QWidget                 * m_pInputParent;
 	KviTalPopupMenu         * m_pIconMenu;
diff --git a/src/kvirc/ui/kvi_input_history.cpp b/src/kvirc/ui/kvi_input_history.cpp
index 4fc050db5..f23c6cf44 100644
--- a/src/kvirc/ui/kvi_input_history.cpp
+++ b/src/kvirc/ui/kvi_input_history.cpp
@@ -25,8 +25,8 @@
 //============================================================================
 
 #include "kvi_input_history.h"
-#include "kvi_config.h"
-#include "kvi_string.h"
+#include "KviConfigurationFile.h"
+#include "KviCString.h"
 
 KviInputHistory * KviInputHistory::m_pSelf = NULL;
 unsigned int KviInputHistory::m_uCount = 0;
@@ -77,14 +77,14 @@ void KviInputHistory::add(QString * szString)
 
 void KviInputHistory::load(const QString & szFileName)
 {
-	KviConfig c(szFileName,KviConfig::Read);
+	KviConfigurationFile c(szFileName,KviConfigurationFile::Read);
 
 	int iCount = c.readIntEntry("Count",0);
 
 	if(iCount > KVI_INPUT_MAX_GLOBAL_HISTORY_ENTRIES)
 		iCount = KVI_INPUT_MAX_GLOBAL_HISTORY_ENTRIES;
 
-	KviStr szTmp;
+	KviCString szTmp;
 
 	for(int i=0; i<iCount; i++)
 	{
@@ -97,12 +97,12 @@ void KviInputHistory::load(const QString & szFileName)
 
 void KviInputHistory::save(const QString & szFileName)
 {
-	KviConfig c(szFileName,KviConfig::Write);
+	KviConfigurationFile c(szFileName,KviConfigurationFile::Write);
 	c.clear();
 
 	c.writeEntry("Count",m_pStringList->count());
 
-	KviStr szTmp;
+	KviCString szTmp;
 	int iIdx = 0;
 
 	for(QString * szString = m_pStringList->first(); szString; szString = m_pStringList->next())
diff --git a/src/kvirc/ui/kvi_input_history.h b/src/kvirc/ui/kvi_input_history.h
index 71bb9a79d..9b2e786a8 100644
--- a/src/kvirc/ui/kvi_input_history.h
+++ b/src/kvirc/ui/kvi_input_history.h
@@ -36,7 +36,7 @@
 */
 
 #include "kvi_settings.h"
-#include "kvi_pointerlist.h"
+#include "KviPointerList.h"
 
 #define KVI_INPUT_MAX_GLOBAL_HISTORY_ENTRIES 100
 #define KVI_INPUT_MAX_LOCAL_HISTORY_ENTRIES 20
diff --git a/src/kvirc/ui/kvi_ipeditor.cpp b/src/kvirc/ui/kvi_ipeditor.cpp
index 8aa0cf199..f62528cf5 100644
--- a/src/kvirc/ui/kvi_ipeditor.cpp
+++ b/src/kvirc/ui/kvi_ipeditor.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Wed Jun 12 2000 14:16:49 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
diff --git a/src/kvirc/ui/kvi_ipeditor.h b/src/kvirc/ui/kvi_ipeditor.h
index d3f877ab9..a713f55d1 100644
--- a/src/kvirc/ui/kvi_ipeditor.h
+++ b/src/kvirc/ui/kvi_ipeditor.h
@@ -6,7 +6,7 @@
 //   Creation date : Wed Jun 12 2000 14:16:02 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
diff --git a/src/kvirc/ui/kvi_irctoolbar.cpp b/src/kvirc/ui/kvi_irctoolbar.cpp
index 9b54eb0ff..014f7c0ce 100644
--- a/src/kvirc/ui/kvi_irctoolbar.cpp
+++ b/src/kvirc/ui/kvi_irctoolbar.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Thu Oct 29 2000 14:13:13 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -26,7 +26,7 @@
 #include "kvi_irctoolbar.h"
 #include "kvi_console.h"
 #include "kvi_frame.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_iconmanager.h"
 #include "kvi_settings.h"
 #include "kvi_options.h"
@@ -35,7 +35,7 @@
 #include "kvi_dynamictooltip.h"
 #include "kvi_ircurl.h"
 #include "kvi_internalcmd.h"
-#include "kvi_pointerlist.h"
+#include "KviPointerList.h"
 #include "kvi_ircconnection.h"
 #include "kvi_ircconnectionuserinfo.h"
 #include "kvi_irccontext.h"
@@ -291,8 +291,8 @@ void KviIrcContextDisplay::tipRequest(KviDynamicToolTip * tip,const QPoint &)
 			txt += nb;
 			txt += br;
 		} else {
-			KviStr nickAndMode = ic->userInfo()->nickName();
-			if(!(ic->userInfo()->userMode().isEmpty()))nickAndMode.append(KviStr::Format," (+%s)",ic->userInfo()->userMode().toUtf8().data());
+			KviCString nickAndMode = ic->userInfo()->nickName();
+			if(!(ic->userInfo()->userMode().isEmpty()))nickAndMode.append(KviCString::Format," (+%s)",ic->userInfo()->userMode().toUtf8().data());
 
 			txt += ic->currentServerName();
 			txt += nb;
diff --git a/src/kvirc/ui/kvi_irctoolbar.h b/src/kvirc/ui/kvi_irctoolbar.h
index 4ce9333b1..8c62941e9 100644
--- a/src/kvirc/ui/kvi_irctoolbar.h
+++ b/src/kvirc/ui/kvi_irctoolbar.h
@@ -6,7 +6,7 @@
 //   Creation date : Thu Oct 29 2000 14:09:11 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -26,10 +26,10 @@
 
 #include "kvi_settings.h"
 
-#include "kvi_string.h"
+#include "KviCString.h"
 #include "kvi_toolbar.h"
 #include "kvi_console.h"
-#include "kvi_pointerlist.h"
+#include "KviPointerList.h"
 
 #include <QWidget>
 #include <QToolButton>
diff --git a/src/kvirc/ui/kvi_ircview.cpp b/src/kvirc/ui/kvi_ircview.cpp
index 1d1df1104..82a5dd573 100644
--- a/src/kvirc/ui/kvi_ircview.cpp
+++ b/src/kvirc/ui/kvi_ircview.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Tue Jul 6 1999 14:45:20 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 1999-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 1999-2010 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
@@ -78,17 +78,17 @@
 #include "kvi_app.h"
 #include "kvi_settings.h"
 #include "kvi_options.h"
-#include "kvi_mirccntrl.h"
+#include "KviMircCntrl.h"
 #include "kvi_defaults.h"
 #include "kvi_window.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_frame.h"
-#include "kvi_malloc.h"
+#include "KviMemory.h"
 #include "kvi_iconmanager.h"
 #include "kvi_out.h"
-#include "kvi_parameterlist.h"
+#include "KviParameterList.h"
 #include "kvi_console.h"
-#include "kvi_ircuserdb.h"
+#include "KviIrcUserDataBase.h"
 #include "kvi_channel.h"
 #include "kvi_filedialog.h"
 #include "kvi_msgbox.h"
@@ -97,7 +97,7 @@
 #include "kvi_mdimanager.h"
 #include "kvi_userinput.h"
 #include "kvi_tal_popupmenu.h"
-#include "kvi_animatedpixmap.h"
+#include "KviAnimatedPixmap.h"
 
 #include <QBitmap>
 #include <QPainter>
@@ -345,12 +345,12 @@ static inline void delete_text_line(KviIrcViewLine * line,QHash<KviIrcViewLine*,
 		if((line->pChunks[i].type == KVI_TEXT_ESCAPE) || (line->pChunks[i].type == KVI_TEXT_ICON))
 		{
 			if( (line->pChunks[i].type == KVI_TEXT_ICON) && (line->pChunks[i].szPayload!=line->pChunks[i].szSmileId) )
-				kvi_free(line->pChunks[i].szSmileId);
-			kvi_free(line->pChunks[i].szPayload);
+				KviMemory::free(line->pChunks[i].szSmileId);
+			KviMemory::free(line->pChunks[i].szPayload);
 		}
 	}
-	kvi_free(line->pChunks);                        //free attributes data
-	if(line->iBlockCount)kvi_free(line->pBlocks);
+	KviMemory::free(line->pChunks);                        //free attributes data
+	if(line->iBlockCount)KviMemory::free(line->pBlocks);
 	delete line;
 }
 
@@ -1605,9 +1605,9 @@ void KviIrcView::calculateLineWraps(KviIrcViewLine *ptr,int maxWidth)
 		return;
 
 	if(ptr->iBlockCount != 0)
-		kvi_free(ptr->pBlocks); // free any previous wrap blocks
+		KviMemory::free(ptr->pBlocks); // free any previous wrap blocks
 
-	ptr->pBlocks              = (KviIrcViewWrappedBlock *)kvi_malloc(sizeof(KviIrcViewWrappedBlock)); // alloc one block
+	ptr->pBlocks              = (KviIrcViewWrappedBlock *)KviMemory::allocate(sizeof(KviIrcViewWrappedBlock)); // alloc one block
 	ptr->iMaxLineWidth        = maxWidth; // calculus for this width
 	ptr->iBlockCount          = 0;        // it will be ++
 	ptr->uLineWraps           = 0;        // no line wraps yet
@@ -1662,7 +1662,7 @@ void KviIrcView::calculateLineWraps(KviIrcViewLine *ptr,int maxWidth)
 				return;
 
 			//Process the next block of data in the next loop
-			ptr->pBlocks = (KviIrcViewWrappedBlock *)kvi_realloc(ptr->pBlocks,(ptr->iBlockCount + 1) * sizeof(KviIrcViewWrappedBlock));
+			ptr->pBlocks = (KviIrcViewWrappedBlock *)KviMemory::reallocate(ptr->pBlocks,(ptr->iBlockCount + 1) * sizeof(KviIrcViewWrappedBlock));
 			ptr->pBlocks[ptr->iBlockCount].block_start = ptr->pChunks[curAttrBlock].iTextStart;
 			ptr->pBlocks[ptr->iBlockCount].block_len = 0;
 			ptr->pBlocks[ptr->iBlockCount].block_width = 0;
@@ -1701,7 +1701,7 @@ void KviIrcView::calculateLineWraps(KviIrcViewLine *ptr,int maxWidth)
 				ptr->pBlocks[ptr->iBlockCount].pChunk  = 0;
 				ptr->pBlocks[ptr->iBlockCount].block_width = 0;
 				ptr->iBlockCount++;
-				ptr->pBlocks = (KviIrcViewWrappedBlock *)kvi_realloc(ptr->pBlocks,(ptr->iBlockCount + 1) * sizeof(KviIrcViewWrappedBlock));
+				ptr->pBlocks = (KviIrcViewWrappedBlock *)KviMemory::reallocate(ptr->pBlocks,(ptr->iBlockCount + 1) * sizeof(KviIrcViewWrappedBlock));
 				ptr->pBlocks[ptr->iBlockCount].block_start = p - unicode;
 				ptr->pBlocks[ptr->iBlockCount].block_len   = 0;
 				ptr->pBlocks[ptr->iBlockCount].block_width = 0;
@@ -1740,7 +1740,7 @@ void KviIrcView::calculateLineWraps(KviIrcViewLine *ptr,int maxWidth)
 		ptr->pBlocks[ptr->iBlockCount].block_width = -1; // word wrap --> negative block_width
 		maxBlockLen-=curBlockLen;
 		ptr->iBlockCount++;
-		ptr->pBlocks = (KviIrcViewWrappedBlock *)kvi_realloc(ptr->pBlocks,(ptr->iBlockCount + 1) * sizeof(KviIrcViewWrappedBlock));
+		ptr->pBlocks = (KviIrcViewWrappedBlock *)KviMemory::reallocate(ptr->pBlocks,(ptr->iBlockCount + 1) * sizeof(KviIrcViewWrappedBlock));
 		ptr->pBlocks[ptr->iBlockCount].block_start = p - unicode;
 		ptr->pBlocks[ptr->iBlockCount].block_len   = 0;
 		ptr->pBlocks[ptr->iBlockCount].block_width = 0;
diff --git a/src/kvirc/ui/kvi_ircview.h b/src/kvirc/ui/kvi_ircview.h
index 881b970ae..78f187a42 100644
--- a/src/kvirc/ui/kvi_ircview.h
+++ b/src/kvirc/ui/kvi_ircview.h
@@ -6,7 +6,7 @@
 //   Creation date : Fri Mar 19 1999 05:39:01 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 1999-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 1999-2010 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
@@ -25,8 +25,8 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_string.h"
-#include "kvi_pointerlist.h"
+#include "KviCString.h"
+#include "KviPointerList.h"
 
 #include <QToolButton>
 #include <QWidget>
diff --git a/src/kvirc/ui/kvi_ircview_events.cpp b/src/kvirc/ui/kvi_ircview_events.cpp
index 0eae50a52..17b14e69b 100644
--- a/src/kvirc/ui/kvi_ircview_events.cpp
+++ b/src/kvirc/ui/kvi_ircview_events.cpp
@@ -34,8 +34,8 @@
 #include "kvi_ircview.h"
 #include "kvi_ircviewprivate.h"
 #include "kvi_ircviewtools.h"
-#include "kvi_locale.h"
-#include "kvi_mirccntrl.h"
+#include "KviLocale.h"
+#include "KviMircCntrl.h"
 #include "kvi_options.h"
 #include "kvi_out.h"
 #include "kvi_topicw.h"
diff --git a/src/kvirc/ui/kvi_ircview_gettextline.cpp b/src/kvirc/ui/kvi_ircview_gettextline.cpp
index f030ca24b..0b5ab10ce 100644
--- a/src/kvirc/ui/kvi_ircview_gettextline.cpp
+++ b/src/kvirc/ui/kvi_ircview_gettextline.cpp
@@ -31,9 +31,9 @@
 #include "kvi_hstrEqualCIN.h"
 #include "kvi_ircviewprivate.h"
 #include "kvi_kvs_eventtriggers.h"
-#include "kvi_malloc.h"
+#include "KviMemory.h"
 #include "kvi_memmove.h"
-#include "kvi_mirccntrl.h"
+#include "KviMircCntrl.h"
 #include "kvi_options.h"
 #include "kvi_out.h"
 #include "kvi_texticonmanager.h"
@@ -160,7 +160,7 @@ const kvi_wchar_t * KviIrcView::getTextLine(
 
 	//Alloc the first attribute
 	line_ptr->uChunkCount = 1;
-	line_ptr->pChunks = (KviIrcViewLineChunk *)kvi_malloc(sizeof(KviIrcViewLineChunk));
+	line_ptr->pChunks = (KviIrcViewLineChunk *)KviMemory::allocate(sizeof(KviIrcViewLineChunk));
 	//And fill it up
 	line_ptr->pChunks[0].type = KVI_TEXT_COLOR;
 	line_ptr->pChunks[0].iTextStart = 0;
@@ -185,7 +185,7 @@ const kvi_wchar_t * KviIrcView::getTextLine(
 			line_ptr->pChunks[0].iTextLen = 0;
 
 			line_ptr->uChunkCount=3;
-			line_ptr->pChunks=(KviIrcViewLineChunk *)kvi_realloc((void *)line_ptr->pChunks,3 * sizeof(KviIrcViewLineChunk));
+			line_ptr->pChunks=(KviIrcViewLineChunk *)KviMemory::reallocate((void *)line_ptr->pChunks,3 * sizeof(KviIrcViewLineChunk));
 
 			line_ptr->pChunks[1].type = KVI_TEXT_COLOR;
 			line_ptr->pChunks[1].iTextStart = 0;
@@ -262,7 +262,7 @@ const kvi_wchar_t * KviIrcView::getTextLine(
 
 #define NEW_LINE_CHUNK(_chunk_type) \
 	line_ptr->uChunkCount++; \
-	line_ptr->pChunks=(KviIrcViewLineChunk *)kvi_realloc((void *)line_ptr->pChunks, \
+	line_ptr->pChunks=(KviIrcViewLineChunk *)KviMemory::reallocate((void *)line_ptr->pChunks, \
 			line_ptr->uChunkCount * sizeof(KviIrcViewLineChunk)); \
 	iCurChunk++; \
 	line_ptr->pChunks[iCurChunk].type = _chunk_type; \
@@ -564,7 +564,7 @@ found_command_escape:
 						p+=2; //point after \r!
 
 						blockLen = (next_cr - p);
-						line_ptr->pChunks[iCurChunk].szPayload = (kvi_wchar_t *)kvi_malloc(((next_cr - p) + 1) * sizeof(kvi_wchar_t));
+						line_ptr->pChunks[iCurChunk].szPayload = (kvi_wchar_t *)KviMemory::allocate(((next_cr - p) + 1) * sizeof(kvi_wchar_t));
 						kvi_fastmoveodd((void *)(line_ptr->pChunks[iCurChunk].szPayload),p,blockLen * sizeof(kvi_wchar_t));
 
 						line_ptr->pChunks[iCurChunk].szPayload[blockLen] = 0;
@@ -657,7 +657,7 @@ found_icon_escape:
 					{
 						APPEND_LAST_TEXT_BLOCK(data_ptr,beginPtr - data_ptr)
 						NEW_LINE_CHUNK(KVI_TEXT_ICON)
-						line_ptr->pChunks[iCurChunk].szPayload = (kvi_wchar_t *)kvi_malloc((datalen + 1) * sizeof(kvi_wchar_t));
+						line_ptr->pChunks[iCurChunk].szPayload = (kvi_wchar_t *)KviMemory::allocate((datalen + 1) * sizeof(kvi_wchar_t));
 						kvi_fastmoveodd((void *)(line_ptr->pChunks[iCurChunk].szPayload),icon_name,datalen * sizeof(kvi_wchar_t));
 						line_ptr->pChunks[iCurChunk].szPayload[datalen] = 0;
 						line_ptr->pChunks[iCurChunk].szSmileId=line_ptr->pChunks[iCurChunk].szPayload;
@@ -910,7 +910,7 @@ got_url:
 		//	int urlLen = KVI_OPTION_STRING(KviOption_stringUrlLinkCommand).len() + 1;
 
 		//write into null-terminated char* szPayload an 'u' that means that this chunk represents an url
-		line_ptr->pChunks[iCurChunk].szPayload = (kvi_wchar_t *)kvi_malloc(2 * sizeof(kvi_wchar_t));
+		line_ptr->pChunks[iCurChunk].szPayload = (kvi_wchar_t *)KviMemory::allocate(2 * sizeof(kvi_wchar_t));
 		line_ptr->pChunks[iCurChunk].szPayload[0] = 'u';
 		line_ptr->pChunks[iCurChunk].szPayload[1] = 0x0;
 		//set the color for this chunk
@@ -1037,11 +1037,11 @@ check_emoticon_char:
 						int emolen = p - begin;
 						int reallen=item2 ? 3 : 2;
 
-						line_ptr->pChunks[iCurChunk].szPayload = (kvi_wchar_t *)kvi_malloc((emolen + 1) * sizeof(kvi_wchar_t));
+						line_ptr->pChunks[iCurChunk].szPayload = (kvi_wchar_t *)KviMemory::allocate((emolen + 1) * sizeof(kvi_wchar_t));
 						kvi_fastmoveodd(line_ptr->pChunks[iCurChunk].szPayload,begin,emolen * sizeof(kvi_wchar_t));
 						line_ptr->pChunks[iCurChunk].szPayload[emolen] = 0;
 
-						line_ptr->pChunks[iCurChunk].szSmileId = (kvi_wchar_t *)kvi_malloc((reallen + 1) * sizeof(kvi_wchar_t));
+						line_ptr->pChunks[iCurChunk].szSmileId = (kvi_wchar_t *)KviMemory::allocate((reallen + 1) * sizeof(kvi_wchar_t));
 						kvi_fastmoveodd(line_ptr->pChunks[iCurChunk].szSmileId,ng,reallen * sizeof(kvi_wchar_t));
 						line_ptr->pChunks[iCurChunk].szSmileId[reallen] = 0;
 
@@ -1052,11 +1052,11 @@ check_emoticon_char:
 						while(count > 0)
 						{
 							NEW_LINE_CHUNK(KVI_TEXT_ICON)
-							line_ptr->pChunks[iCurChunk].szPayload = (kvi_wchar_t *)kvi_malloc((emolen + 1) * sizeof(kvi_wchar_t));
+							line_ptr->pChunks[iCurChunk].szPayload = (kvi_wchar_t *)KviMemory::allocate((emolen + 1) * sizeof(kvi_wchar_t));
 							kvi_fastmoveodd(line_ptr->pChunks[iCurChunk].szPayload,begin,emolen * sizeof(kvi_wchar_t));
 							line_ptr->pChunks[iCurChunk].szPayload[emolen] = 0;
 
-							line_ptr->pChunks[iCurChunk].szSmileId = (kvi_wchar_t *)kvi_malloc((reallen + 1) * sizeof(kvi_wchar_t));
+							line_ptr->pChunks[iCurChunk].szSmileId = (kvi_wchar_t *)KviMemory::allocate((reallen + 1) * sizeof(kvi_wchar_t));
 							kvi_fastmoveodd(line_ptr->pChunks[iCurChunk].szSmileId,ng,reallen * sizeof(kvi_wchar_t));
 							line_ptr->pChunks[iCurChunk].szSmileId[reallen] = 0;
 
diff --git a/src/kvirc/ui/kvi_ircview_loghandling.cpp b/src/kvirc/ui/kvi_ircview_loghandling.cpp
index 1c2ef762b..e04a137d6 100644
--- a/src/kvirc/ui/kvi_ircview_loghandling.cpp
+++ b/src/kvirc/ui/kvi_ircview_loghandling.cpp
@@ -28,10 +28,10 @@
 
 #include "kvi_ircview.h"
 #include "kvi_ircviewprivate.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_options.h"
 #include "kvi_out.h"
-#include "kvi_qstring.h"
+#include "KviQString.h"
 #include "kvi_window.h"
 
 #ifdef COMPILE_ZLIB_SUPPORT
diff --git a/src/kvirc/ui/kvi_ircviewprivate.h b/src/kvirc/ui/kvi_ircviewprivate.h
index 16bdcfbac..fb32190dd 100644
--- a/src/kvirc/ui/kvi_ircviewprivate.h
+++ b/src/kvirc/ui/kvi_ircviewprivate.h
@@ -6,7 +6,7 @@
 //   Creation date : Sat Oct 9 2004 16:29:01 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2004-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2004-2010 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
diff --git a/src/kvirc/ui/kvi_ircviewtools.cpp b/src/kvirc/ui/kvi_ircviewtools.cpp
index 59a69d00e..bcf8a22cf 100644
--- a/src/kvirc/ui/kvi_ircviewtools.cpp
+++ b/src/kvirc/ui/kvi_ircviewtools.cpp
@@ -28,8 +28,8 @@
 #include "kvi_ircview.h"
 #include "kvi_iconmanager.h"
 #include "kvi_options.h"
-#include "kvi_locale.h"
-#include "kvi_malloc.h"
+#include "KviLocale.h"
+#include "KviMemory.h"
 #include "kvi_msgbox.h"
 #include "kvi_filedialog.h"
 #include "kvi_app.h"
@@ -162,7 +162,7 @@ KviIrcViewToolWidget::KviIrcViewToolWidget(KviIrcView * pParent)
 
 
 
-	m_pFilterItems = (KviIrcMessageCheckListItem **)kvi_malloc(KVI_NUM_MSGTYPE_OPTIONS * sizeof(KviIrcMessageCheckListItem *));
+	m_pFilterItems = (KviIrcMessageCheckListItem **)KviMemory::allocate(KVI_NUM_MSGTYPE_OPTIONS * sizeof(KviIrcMessageCheckListItem *));
 
 	for(int i=0;i<KVI_NUM_MSGTYPE_OPTIONS;i++)
 	{
diff --git a/src/kvirc/ui/kvi_ircviewtools.h b/src/kvirc/ui/kvi_ircviewtools.h
index 80a3d90e1..9fdf87821 100644
--- a/src/kvirc/ui/kvi_ircviewtools.h
+++ b/src/kvirc/ui/kvi_ircviewtools.h
@@ -6,7 +6,7 @@
 //   Creation date : Sat Oct 9 2004 16:03:01 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2004-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2004-2010 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
diff --git a/src/kvirc/ui/kvi_maskeditor.cpp b/src/kvirc/ui/kvi_maskeditor.cpp
index 459c191a1..6159e49a7 100644
--- a/src/kvirc/ui/kvi_maskeditor.cpp
+++ b/src/kvirc/ui/kvi_maskeditor.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Tue Aug 30 2000 12:24:59 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -24,9 +24,9 @@
 
 
 #include "kvi_maskeditor.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_iconmanager.h"
-#include "kvi_qstring.h"
+#include "KviQString.h"
 #include "kvi_channel.h"
 #include "kvi_ircconnectionserverinfo.h"
 #include "kvi_ircconnectionuserinfo.h"
diff --git a/src/kvirc/ui/kvi_maskeditor.h b/src/kvirc/ui/kvi_maskeditor.h
index 0ff9cb83e..89a0e4c66 100644
--- a/src/kvirc/ui/kvi_maskeditor.h
+++ b/src/kvirc/ui/kvi_maskeditor.h
@@ -6,7 +6,7 @@
 //   Creation date : Tue Aug 30 2000 12:20:10 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -25,8 +25,8 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_pointerlist.h"
-#include "kvi_string.h"
+#include "KviPointerList.h"
+#include "KviCString.h"
 #include "kvi_toolwindows_container.h"
 #include <QTreeWidget>
 
diff --git a/src/kvirc/ui/kvi_mdichild.cpp b/src/kvirc/ui/kvi_mdichild.cpp
index b93b988e9..190eaa3a6 100644
--- a/src/kvirc/ui/kvi_mdichild.cpp
+++ b/src/kvirc/ui/kvi_mdichild.cpp
@@ -32,8 +32,8 @@
 #include "kvi_debug.h"
 #include "kvi_mdichild.h"
 #include "kvi_mdimanager.h"
-#include "kvi_string.h"
-#include "kvi_locale.h"
+#include "KviCString.h"
+#include "KviLocale.h"
 #include "kvi_options.h"
 #include "kvi_settings.h"
 #include "kvi_iconmanager.h"
@@ -42,7 +42,7 @@
 #include "kvi_ircconnection.h"
 #include "kvi_ircconnectiontarget.h"
 #include "kvi_irccontext.h"
-#include "kvi_network.h"
+#include "KviNetwork.h"
 #include "kvi_kvs_eventtriggers.h"
 
 #ifdef COMPILE_ON_MAC
@@ -241,7 +241,7 @@ void KviMdiChild::setClient(QWidget * w)
 			tmp1.append(pConnection->target()->network()->name()+"_");
 	}
 
-	KviStr tmp(KviStr::Format,"mdi_child_%s%s",tmp1.toUtf8().data(),w->objectName().toUtf8().data());
+	KviCString tmp(KviCString::Format,"mdi_child_%s%s",tmp1.toUtf8().data(),w->objectName().toUtf8().data());
 	setObjectName(tmp.ptr());
 }
 
diff --git a/src/kvirc/ui/kvi_mdichild.h b/src/kvirc/ui/kvi_mdichild.h
index b152bfc05..aa88f241a 100644
--- a/src/kvirc/ui/kvi_mdichild.h
+++ b/src/kvirc/ui/kvi_mdichild.h
@@ -32,7 +32,7 @@
 */
 
 #include "kvi_settings.h"
-#include "kvi_string.h"
+#include "KviCString.h"
 
 #include <QMdiSubWindow>
 #include <QWindowStateChangeEvent>
diff --git a/src/kvirc/ui/kvi_mdimanager.cpp b/src/kvirc/ui/kvi_mdimanager.cpp
index 94ef3d7db..82cbdee88 100644
--- a/src/kvirc/ui/kvi_mdimanager.cpp
+++ b/src/kvirc/ui/kvi_mdimanager.cpp
@@ -33,7 +33,7 @@
 #include "kvi_settings.h"
 #include "kvi_mdimanager.h"
 #include "kvi_mdichild.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_options.h"
 #include "kvi_iconmanager.h"
 #include "kvi_frame.h"
diff --git a/src/kvirc/ui/kvi_menubar.cpp b/src/kvirc/ui/kvi_menubar.cpp
index 835a08ffc..cfe782917 100644
--- a/src/kvirc/ui/kvi_menubar.cpp
+++ b/src/kvirc/ui/kvi_menubar.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Wen Jun 21 2000 13:12:11 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -25,7 +25,7 @@
 
 #include "kvi_menubar.h"
 #include "kvi_app.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_frame.h"
 #include "kvi_mdimanager.h"
 #include "kvi_iconmanager.h"
@@ -34,7 +34,7 @@
 #include "kvi_ircurl.h"
 #include "kvi_console.h"
 #include "kvi_kvs_popupmenu.h"
-#include "kvi_malloc.h"
+#include "KviMemory.h"
 #include "kvi_moduleextension.h"
 #include "kvi_actionmanager.h"
 #include "kvi_coreactionnames.h"
@@ -256,7 +256,7 @@ void KviMenuBar::newConnectionToServer(int id)
 			KviKvsScript::run("options.edit KviServerOptionsWidget",m_pFrm->firstConsole());
 		} else {
 			text.replace(QString("&"),QString(""));
-			KviStr szCommand;
+			KviCString szCommand;
 			if(KviIrcUrl::parse(text.toUtf8().data(),szCommand,KVI_IRCURL_CONTEXT_FIRSTFREE))
 			{
 				KviKvsScript::run(szCommand.ptr(),g_pApp->activeConsole());
diff --git a/src/kvirc/ui/kvi_menubar.h b/src/kvirc/ui/kvi_menubar.h
index 7791d0da6..debbea53b 100644
--- a/src/kvirc/ui/kvi_menubar.h
+++ b/src/kvirc/ui/kvi_menubar.h
@@ -7,7 +7,7 @@
 //   Creation date : Wen Jun 21 2000 13:11:24 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -26,8 +26,8 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_pointerlist.h"
-#include "kvi_string.h"
+#include "KviPointerList.h"
+#include "KviCString.h"
 #include "kvi_tal_menubar.h"
 
 class KviFrame;
@@ -36,9 +36,9 @@ class KviKvsPopupMenu;
 
 typedef struct _KviScriptMenuBarItem
 {
-	KviStr            szPopupName;
+	KviCString            szPopupName;
 	KviKvsPopupMenu * pPopup;
-	KviStr            szText;
+	KviCString            szText;
 } KviScriptMenuBarItem;
 
 
diff --git a/src/kvirc/ui/kvi_modeeditor.cpp b/src/kvirc/ui/kvi_modeeditor.cpp
index d7c3c6679..13ecfaf46 100644
--- a/src/kvirc/ui/kvi_modeeditor.cpp
+++ b/src/kvirc/ui/kvi_modeeditor.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Sat Apr 14 2001 13:52:11 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-2010 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
@@ -24,8 +24,8 @@
 
 #include "kvi_modeeditor.h"
 #include "kvi_iconmanager.h"
-#include "kvi_locale.h"
-#include "kvi_qstring.h"
+#include "KviLocale.h"
+#include "KviQString.h"
 #include "kvi_ircconnection.h"
 #include "kvi_ircconnectionserverinfo.h"
 #include "kvi_channel.h"
diff --git a/src/kvirc/ui/kvi_modeeditor.h b/src/kvirc/ui/kvi_modeeditor.h
index 4b7af2257..0865d2594 100644
--- a/src/kvirc/ui/kvi_modeeditor.h
+++ b/src/kvirc/ui/kvi_modeeditor.h
@@ -6,7 +6,7 @@
 //   Creation date : Sat Apr 14 2001 13:50:12 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-2010 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
@@ -25,8 +25,8 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_string.h"
-#include "kvi_pointerlist.h"
+#include "KviCString.h"
+#include "KviPointerList.h"
 #include "kvi_toolwindows_container.h"
 
 #include <QMap>
diff --git a/src/kvirc/ui/kvi_msgbox.cpp b/src/kvirc/ui/kvi_msgbox.cpp
index f91a88d5c..d69a99353 100644
--- a/src/kvirc/ui/kvi_msgbox.cpp
+++ b/src/kvirc/ui/kvi_msgbox.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Tue Jun 20 2000 12:49:41 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -23,9 +23,9 @@
 //=============================================================================
 
 #include "kvi_msgbox.h"
-#include "kvi_malloc.h"
-#include "kvi_string.h"
-#include "kvi_locale.h"
+#include "KviMemory.h"
+#include "KviCString.h"
+#include "KviLocale.h"
 
 // FIXME: #warning "This should go into TAL as layer ...then maybe a wrapper in KviApp!"
 #ifdef COMPILE_KDE_SUPPORT
diff --git a/src/kvirc/ui/kvi_msgbox.h b/src/kvirc/ui/kvi_msgbox.h
index 2ea90f37e..c561f555a 100644
--- a/src/kvirc/ui/kvi_msgbox.h
+++ b/src/kvirc/ui/kvi_msgbox.h
@@ -6,7 +6,7 @@
 //   Creation date : Sun Jan 17 1999 13:55:41 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 1999-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 1999-2010 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
@@ -25,7 +25,7 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_qstring.h"
+#include "KviQString.h"
 /*
 class KviMessageBox : public KviTalMessageBox
 {
diff --git a/src/kvirc/ui/kvi_optionswidget.cpp b/src/kvirc/ui/kvi_optionswidget.cpp
index 634e0477b..8c944189d 100644
--- a/src/kvirc/ui/kvi_optionswidget.cpp
+++ b/src/kvirc/ui/kvi_optionswidget.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Mon Jun 10 2000 17:47:33 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -29,7 +29,7 @@
 #define _WANT_OPTION_FLAGS_
 #include "kvi_options.h"
 
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_app.h"
 #include "kvi_tal_tooltip.h"
 
diff --git a/src/kvirc/ui/kvi_optionswidget.h b/src/kvirc/ui/kvi_optionswidget.h
index f1748bf5c..890f13303 100644
--- a/src/kvirc/ui/kvi_optionswidget.h
+++ b/src/kvirc/ui/kvi_optionswidget.h
@@ -7,7 +7,7 @@
 //   Creation date : Mon Jun 10 2000 17:47:33 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -27,7 +27,7 @@
 
 #include "kvi_settings.h"
 #include "kvi_selectors.h"
-#include "kvi_pointerlist.h"
+#include "KviPointerList.h"
 #include "kvi_tal_groupbox.h"
 
 #include <QFrame>
diff --git a/src/kvirc/ui/kvi_query.cpp b/src/kvirc/ui/kvi_query.cpp
index 0d53bab43..2436eb7d8 100644
--- a/src/kvirc/ui/kvi_query.cpp
+++ b/src/kvirc/ui/kvi_query.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Tue Aug 7 2000 14:23:22 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -29,27 +29,27 @@
 #include "kvi_ircview.h"
 #include "kvi_input.h"
 #include "kvi_options.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_settings.h"
 #include "kvi_ircsocket.h"
 #include "kvi_out.h"
-#include "kvi_config.h"
-#include "kvi_mirccntrl.h"
+#include "KviConfigurationFile.h"
+#include "KviMircCntrl.h"
 #include "kvi_settings.h"
 #include "kvi_themedlabel.h"
 #include "kvi_useraction.h"
-#include "kvi_parameterlist.h"
+#include "KviParameterList.h"
 #include "kvi_ircconnection.h"
 #include "kvi_ircconnectionuserinfo.h"
 #include "kvi_sparser.h"
-#include "kvi_ircuserdb.h"
-#include "kvi_mirccntrl.h"
+#include "KviIrcUserDataBase.h"
+#include "KviMircCntrl.h"
 #include "kvi_toolwindows_container.h"
 #include "kvi_kvs_eventtriggers.h"
 #include "kvi_tal_hbox.h"
 
 #ifdef COMPILE_CRYPT_SUPPORT
-	#include "kvi_crypt.h"
+	#include "KviCryptEngine.h"
 	#include "kvi_cryptcontroller.h"
 #endif
 
@@ -311,7 +311,7 @@ void KviQuery::textViewRightClicked()
 	KVS_TRIGGER_EVENT_0(KviEvent_OnQueryPopupRequest,this);
 }
 
-void KviQuery::saveProperties(KviConfig * cfg)
+void KviQuery::saveProperties(KviConfigurationFile * cfg)
 {
 	KviWindow::saveProperties(cfg);
 	QList<int> sizes;
@@ -320,7 +320,7 @@ void KviQuery::saveProperties(KviConfig * cfg)
 	cfg->writeEntry("UserListViewVisible",m_pUserListView->isVisible());
 }
 
-void KviQuery::loadProperties(KviConfig * cfg)
+void KviQuery::loadProperties(KviConfigurationFile * cfg)
 {
 	int iWidth = width();
 	KviWindow::loadProperties(cfg);
@@ -583,7 +583,7 @@ void KviQuery::ownMessage(const QString & szBuffer, bool bUserFeedback)
 		{
 			if(*d != KVI_TEXT_CRYPTESCAPE)
 			{
-				KviStr encrypted;
+				KviCString encrypted;
 				cryptSessionInfo()->m_pEngine->setMaxEncryptLen(500 - szName.length());
 				switch(cryptSessionInfo()->m_pEngine->encrypt(d,encrypted))
 				{
diff --git a/src/kvirc/ui/kvi_query.h b/src/kvirc/ui/kvi_query.h
index 75f3cf97e..e2ba64e64 100644
--- a/src/kvirc/ui/kvi_query.h
+++ b/src/kvirc/ui/kvi_query.h
@@ -6,7 +6,7 @@
 //   Creation date : Mon Aug 7 2000 14:19:00 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -32,14 +32,14 @@
 
 #include "kvi_settings.h"
 #include "kvi_window.h"
-#include "kvi_string.h"
-#include "kvi_ircuserdb.h"
+#include "KviCString.h"
+#include "KviIrcUserDataBase.h"
 #include "kvi_userlistview.h"
 #include "kvi_themedlabel.h"
-#include "kvi_pointerhashtable.h"
+#include "KviPointerHashTable.h"
 
 class KviConsole;
-class KviConfig;
+class KviConfigurationFile;
 class KviWindowToolPageButton;
 
 /**
@@ -280,14 +280,14 @@ protected:
 	* \param cfg The configuration file
 	* \return void
 	*/
-	virtual void loadProperties(KviConfig * cfg);
+	virtual void loadProperties(KviConfigurationFile * cfg);
 
 	/**
 	* \brief Saves the properties to file
 	* \param cfg The configuration file
 	* \return void
 	*/
-	virtual void saveProperties(KviConfig * cfg);
+	virtual void saveProperties(KviConfigurationFile * cfg);
 
 	/**
 	* \brief Gets the base of the log file name
diff --git a/src/kvirc/ui/kvi_scriptbutton.cpp b/src/kvirc/ui/kvi_scriptbutton.cpp
index 5f8593a78..34eb1bd48 100644
--- a/src/kvirc/ui/kvi_scriptbutton.cpp
+++ b/src/kvirc/ui/kvi_scriptbutton.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Wed Nov 14 15:43:41 2001 GMT 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-2010 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
@@ -27,7 +27,7 @@
 #include "kvi_window.h"
 #include "kvi_console.h"
 #include "kvi_app.h"
-#include "kvi_parameterlist.h"
+#include "KviParameterList.h"
 #include "kvi_kvs_variantlist.h"
 #include "kvi_kvs_script.h"
 
diff --git a/src/kvirc/ui/kvi_scriptbutton.h b/src/kvirc/ui/kvi_scriptbutton.h
index d43e482e2..50d19caf8 100644
--- a/src/kvirc/ui/kvi_scriptbutton.h
+++ b/src/kvirc/ui/kvi_scriptbutton.h
@@ -6,7 +6,7 @@
 //   Creation date : Wed Nov 14 15:43:39 2001 GMT 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-2010 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
@@ -25,7 +25,7 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_string.h"
+#include "KviCString.h"
 
 #include <QToolButton>
 #include <QToolBar>
diff --git a/src/kvirc/ui/kvi_scripteditor.cpp b/src/kvirc/ui/kvi_scripteditor.cpp
index c7cf6cc77..8c90930b6 100644
--- a/src/kvirc/ui/kvi_scripteditor.cpp
+++ b/src/kvirc/ui/kvi_scripteditor.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Sun Mar 28 1999 16:12:41 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 1999-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 1999-2010 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
diff --git a/src/kvirc/ui/kvi_scripteditor.h b/src/kvirc/ui/kvi_scripteditor.h
index 8a730e4e2..25656c3eb 100644
--- a/src/kvirc/ui/kvi_scripteditor.h
+++ b/src/kvirc/ui/kvi_scripteditor.h
@@ -6,7 +6,7 @@
 //   Creation date : Sun Mar 28 1999 16:11:48 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 1999-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 1999-2010 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
diff --git a/src/kvirc/ui/kvi_selectors.cpp b/src/kvirc/ui/kvi_selectors.cpp
index f35e3f2d3..f77678c7b 100644
--- a/src/kvirc/ui/kvi_selectors.cpp
+++ b/src/kvirc/ui/kvi_selectors.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Mon Nov 13 2000 15:22:12 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -26,9 +26,9 @@
 #define _KVI_SELECTORS_CPP_
 
 #include "kvi_selectors.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_options.h"
-#include "kvi_mirccntrl.h"
+#include "KviMircCntrl.h"
 #include "kvi_filedialog.h"
 #include "kvi_kvs_script.h"
 #include "kvi_tal_popupmenu.h"
@@ -86,7 +86,7 @@ KviUIntSelector::KviUIntSelector(QWidget * par,const QString & txt,unsigned int
 	m_pSpinBox->setMinimum(m_uLowBound);
 	m_pSpinBox->setMaximum(m_uHighBound);
 
-	//KviStr tmp(KviStr::Format,"%u",bShortInt ? (unsigned int) *((unsigned short int *)pOption) : *pOption);
+	//KviCString tmp(KviCString::Format,"%u",bShortInt ? (unsigned int) *((unsigned short int *)pOption) : *pOption);
 	//m_pLineEdit->setText(tmp.ptr());
 	m_pSpinBox->setValue(bShortInt ? (unsigned int) *((unsigned short int *)pOption) : *pOption);
 
@@ -106,7 +106,7 @@ void KviUIntSelector::setSuffix(const QString & txt)
 
 void KviUIntSelector::commit()
 {
-	KviStr tmp = m_pSpinBox->cleanText();
+	KviCString tmp = m_pSpinBox->cleanText();
 	bool bOk;
 	unsigned int val = tmp.toUInt(&bOk);
 	if(!bOk)val = m_uDefault;
@@ -455,7 +455,7 @@ void KviFileSelector::setSelection(const QString &szSelection)
 
 void KviFileSelector::select()
 {
-	//KviStr tmp;
+	//KviCString tmp;
 	QString tmp = *m_pOption;
 	if(m_uFlags & ChooseSaveFileName)
 	{
diff --git a/src/kvirc/ui/kvi_selectors.h b/src/kvirc/ui/kvi_selectors.h
index 075600a25..c0c4a5e20 100644
--- a/src/kvirc/ui/kvi_selectors.h
+++ b/src/kvirc/ui/kvi_selectors.h
@@ -7,7 +7,7 @@
 //   Creation date : Mon Now 13 2000 15:21:10 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -27,8 +27,8 @@
 
 
 #include "kvi_settings.h"
-#include "kvi_string.h"
-#include "kvi_pixmap.h"
+#include "KviCString.h"
+#include "KviPixmap.h"
 #include "kvi_tal_hbox.h"
 #include "kvi_tal_vbox.h"
 #include "kvi_tal_listwidget.h"
diff --git a/src/kvirc/ui/kvi_splash.cpp b/src/kvirc/ui/kvi_splash.cpp
index be41002b1..6697cc7b3 100644
--- a/src/kvirc/ui/kvi_splash.cpp
+++ b/src/kvirc/ui/kvi_splash.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Wed Aug 8 2001 17:46:10 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-2010 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
@@ -23,12 +23,12 @@
 //=============================================================================
 
 
-#include "kvi_string.h"
+#include "KviCString.h"
 #include "kvi_app.h"
 #include "kvi_defaults.h"
 #include "kvi_splash.h"
-#include "kvi_locale.h"
-#include "kvi_fileutils.h"
+#include "KviLocale.h"
+#include "KviFileUtils.h"
 
 #include <QSplashScreen>
 #include <QDesktopWidget>
diff --git a/src/kvirc/ui/kvi_splash.h b/src/kvirc/ui/kvi_splash.h
index e12f55e75..ed8ab6356 100644
--- a/src/kvirc/ui/kvi_splash.h
+++ b/src/kvirc/ui/kvi_splash.h
@@ -6,7 +6,7 @@
 //   Creation date : Wed Aug 8 2001 17:45:12 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-2010 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
diff --git a/src/kvirc/ui/kvi_statusbar.cpp b/src/kvirc/ui/kvi_statusbar.cpp
index 3f53a7883..a00c65aff 100644
--- a/src/kvirc/ui/kvi_statusbar.cpp
+++ b/src/kvirc/ui/kvi_statusbar.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Tue 07 Sep 2004 03:56:46 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2004-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2004-2010 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
@@ -29,11 +29,11 @@
 #include "kvi_irccontext.h"
 #include "kvi_ircconnection.h"
 #include "kvi_ircconnectionuserinfo.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_app.h"
-#include "kvi_config.h"
-#include "kvi_time.h"
-#include "kvi_qstring.h"
+#include "KviConfigurationFile.h"
+#include "KviTimeUtils.h"
+#include "KviQString.h"
 #include "kvi_modulemanager.h"
 #include "kvi_statusbarapplet.h"
 #include "kvi_dynamictooltip.h"
@@ -178,14 +178,14 @@ void KviStatusBar::load()
 	QString szBuf;
 	if(!g_pApp->getReadOnlyConfigPath(szBuf,"statusbar.kvc"))return; // no config file at all
 
-	KviConfig cfg(szBuf,KviConfig::Read);
+	KviConfigurationFile cfg(szBuf,KviConfigurationFile::Read);
 	cfg.setGroup("Applets");
 
 	int iApplets = cfg.readIntEntry("Count",0);
 	for(int i=0; i<iApplets; i++)
 	{
-		KviStr prefix(KviStr::Format,"Applet%d",i);
-		KviStr tmp(KviStr::Format,"%s_InternalName",prefix.ptr());
+		KviCString prefix(KviCString::Format,"Applet%d",i);
+		KviCString tmp(KviCString::Format,"%s_InternalName",prefix.ptr());
 		QString szInternalName = cfg.readEntry(tmp.ptr(),"");
 // 		qDebug("load applet %d %s",i,szInternalName.toUtf8().data());
 		if(!szInternalName.isEmpty())
@@ -210,7 +210,7 @@ void KviStatusBar::save()
 	QString szBuf;
 	g_pApp->getLocalKvircDirectory(szBuf,KviApp::Config,"statusbar.kvc");
 
-	KviConfig cfg(szBuf,KviConfig::Write);
+	KviConfigurationFile cfg(szBuf,KviConfigurationFile::Write);
 	cfg.setGroup("Applets");
 
 	cfg.writeEntry("Count",m_pAppletList->count());
@@ -222,8 +222,8 @@ void KviStatusBar::save()
 	for(KviStatusBarApplet * pApplet = m_pAppletList->first(); pApplet; pApplet = m_pAppletList->next())
 	{
 // 		qDebug("save applet %d %s index %d",i,pApplet->descriptor()->internalName().toUtf8().data(),pApplet->index());
-		KviStr prefix(KviStr::Format,"Applet%d",i);
-		KviStr tmp(KviStr::Format,"%s_InternalName",prefix.ptr());
+		KviCString prefix(KviCString::Format,"Applet%d",i);
+		KviCString tmp(KviCString::Format,"%s_InternalName",prefix.ptr());
 		cfg.writeEntry(tmp.ptr(),pApplet->descriptor()->internalName());
 		pApplet->saveState(prefix.ptr(),&cfg);
 		if(!(pApplet->descriptor()->preloadModule().isEmpty()))
diff --git a/src/kvirc/ui/kvi_statusbar.h b/src/kvirc/ui/kvi_statusbar.h
index 3b1971373..ebca92d3c 100644
--- a/src/kvirc/ui/kvi_statusbar.h
+++ b/src/kvirc/ui/kvi_statusbar.h
@@ -6,7 +6,7 @@
 //   Creation date : Tue 07 Sep 2004 03:56:46 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2004-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2004-2010 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
@@ -36,9 +36,9 @@
 */
 
 #include "kvi_settings.h"
-#include "kvi_pointerlist.h"
-#include "kvi_heapobject.h"
-#include "kvi_pointerhashtable.h"
+#include "KviPointerList.h"
+#include "KviHeapObject.h"
+#include "KviPointerHashTable.h"
 #include "kvi_tal_hbox.h"
 
 #include <QString>
diff --git a/src/kvirc/ui/kvi_statusbarapplet.cpp b/src/kvirc/ui/kvi_statusbarapplet.cpp
index 9d9fe65ac..d81ac9048 100644
--- a/src/kvirc/ui/kvi_statusbarapplet.cpp
+++ b/src/kvirc/ui/kvi_statusbarapplet.cpp
@@ -33,19 +33,19 @@
 #include "kvi_ircconnection.h"
 #include "kvi_ircconnectionuserinfo.h"
 #include "kvi_ircconnectionstatistics.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_app.h"
-#include "kvi_config.h"
+#include "KviConfigurationFile.h"
 #include "kvi_modulemanager.h"
 #include "kvi_console.h"
 #include "kvi_lagmeter.h"
 #include "kvi_options.h"
 #include "kvi_kvs_script.h"
-#include "kvi_time.h"
-#include "kvi_qstring.h"
+#include "KviTimeUtils.h"
+#include "KviQString.h"
 #include "kvi_buildinfo.h"
 #include "kvi_settings.h"
-#include "kvi_miscutils.h"
+#include "KviMiscUtils.h"
 #include "kvi_http.h"
 #include "kvi_url.h"
 #include "kvi_tal_popupmenu.h"
@@ -164,15 +164,15 @@ void KviStatusBarAwayIndicator::fillContextPopup(KviTalPopupMenu * p)
 	p->setItemChecked(id,m_bAwayOnAllContexts);
 }
 
-void KviStatusBarAwayIndicator::loadState(const char * pcPrefix, KviConfig * pCfg)
+void KviStatusBarAwayIndicator::loadState(const char * pcPrefix, KviConfigurationFile * pCfg)
 {
-	KviStr tmp(KviStr::Format,"%s_AwayOnAllContexts",pcPrefix);
+	KviCString tmp(KviCString::Format,"%s_AwayOnAllContexts",pcPrefix);
 	m_bAwayOnAllContexts = pCfg->readBoolEntry(tmp.ptr(),false);
 }
 
-void KviStatusBarAwayIndicator::saveState(const char * pcPrefix, KviConfig * pCfg)
+void KviStatusBarAwayIndicator::saveState(const char * pcPrefix, KviConfigurationFile * pCfg)
 {
-	KviStr tmp(KviStr::Format,"%s_AwayOnAllContexts",pcPrefix);
+	KviCString tmp(KviCString::Format,"%s_AwayOnAllContexts",pcPrefix);
 	pCfg->writeEntry(tmp.ptr(),m_bAwayOnAllContexts);
 }
 
@@ -490,24 +490,24 @@ void KviStatusBarClock::changeFormat(QAction * pAct)
 	if(!bOk) return;
 }
 
-void KviStatusBarClock::loadState(const char * pcPrefix, KviConfig * pCfg)
+void KviStatusBarClock::loadState(const char * pcPrefix, KviConfigurationFile * pCfg)
 {
-	KviStr tmp(KviStr::Format,"%s_Utc",pcPrefix);
+	KviCString tmp(KviCString::Format,"%s_Utc",pcPrefix);
 	m_bUtc = pCfg->readBoolEntry(tmp.ptr(),false);
-	KviStr tmp2(KviStr::Format,"%s_24h",pcPrefix);
+	KviCString tmp2(KviCString::Format,"%s_24h",pcPrefix);
 	m_b24h = pCfg->readBoolEntry(tmp2.ptr(),false);
-	KviStr tmp3(KviStr::Format,"%s_Format",pcPrefix);
+	KviCString tmp3(KviCString::Format,"%s_Format",pcPrefix);
 	m_iType = pCfg->readIntEntry(tmp3.ptr(),KviStatusBarClock::HMS);
 	adjustMinWidth();
 }
 
-void KviStatusBarClock::saveState(const char * pcPrefix, KviConfig * pCfg)
+void KviStatusBarClock::saveState(const char * pcPrefix, KviConfigurationFile * pCfg)
 {
-	KviStr tmp(KviStr::Format,"%s_Utc",pcPrefix);
+	KviCString tmp(KviCString::Format,"%s_Utc",pcPrefix);
 	pCfg->writeEntry(tmp.ptr(),m_bUtc);
-	KviStr tmp2(KviStr::Format,"%s_24h",pcPrefix);
+	KviCString tmp2(KviCString::Format,"%s_24h",pcPrefix);
 	pCfg->writeEntry(tmp2.ptr(),m_b24h);
-	KviStr tmp3(KviStr::Format,"%s_Format",pcPrefix);
+	KviCString tmp3(KviCString::Format,"%s_Format",pcPrefix);
 	pCfg->writeEntry(tmp3.ptr(),m_iType);
 }
 
@@ -580,15 +580,15 @@ void KviStatusBarConnectionTimer::fillContextPopup(KviTalPopupMenu * p)
 	p->setItemChecked(id,m_bTotal);
 }
 
-void KviStatusBarConnectionTimer::loadState(const char * pcPrefix, KviConfig * pCfg)
+void KviStatusBarConnectionTimer::loadState(const char * pcPrefix, KviConfigurationFile * pCfg)
 {
-	KviStr tmp(KviStr::Format,"%s_Total",pcPrefix);
+	KviCString tmp(KviCString::Format,"%s_Total",pcPrefix);
 	m_bTotal = pCfg->readBoolEntry(tmp.ptr(),false);
 }
 
-void KviStatusBarConnectionTimer::saveState(const char * pcPrefix, KviConfig * pCfg)
+void KviStatusBarConnectionTimer::saveState(const char * pcPrefix, KviConfigurationFile * pCfg)
 {
-	KviStr tmp(KviStr::Format,"%s_Total",pcPrefix);
+	KviCString tmp(KviCString::Format,"%s_Total",pcPrefix);
 	pCfg->writeEntry(tmp.ptr(),m_bTotal);
 }
 
@@ -682,21 +682,21 @@ void KviStatusBarUpdateIndicator::fillContextPopup(KviTalPopupMenu * p)
 	p->setItemChecked(id,m_bUpdateRevision);
 }
 
-void KviStatusBarUpdateIndicator::loadState(const char * pcPrefix, KviConfig * pCfg)
+void KviStatusBarUpdateIndicator::loadState(const char * pcPrefix, KviConfigurationFile * pCfg)
 {
-	KviStr tmp(KviStr::Format,"%s_UpdateOnStartup",pcPrefix);
+	KviCString tmp(KviCString::Format,"%s_UpdateOnStartup",pcPrefix);
 	m_bUpdateOnStartup = pCfg->readBoolEntry(tmp.ptr(),false);
-	KviStr tmp2(KviStr::Format,"%s_UpdateRevision",pcPrefix);
+	KviCString tmp2(KviCString::Format,"%s_UpdateRevision",pcPrefix);
 	m_bUpdateRevision = pCfg->readBoolEntry(tmp2.ptr(),false);
 
 	if(m_bUpdateOnStartup) checkVersion();
 }
 
-void KviStatusBarUpdateIndicator::saveState(const char * pcPrefix, KviConfig * pCfg)
+void KviStatusBarUpdateIndicator::saveState(const char * pcPrefix, KviConfigurationFile * pCfg)
 {
-	KviStr tmp(KviStr::Format,"%s_UpdateOnStartup",pcPrefix);
+	KviCString tmp(KviCString::Format,"%s_UpdateOnStartup",pcPrefix);
 	pCfg->writeEntry(tmp.ptr(),m_bUpdateOnStartup);
-	KviStr tmp2(KviStr::Format,"%s_UpdateRevision",pcPrefix);
+	KviCString tmp2(KviCString::Format,"%s_UpdateRevision",pcPrefix);
 	pCfg->writeEntry(tmp2.ptr(),m_bUpdateRevision);
 }
 
@@ -764,7 +764,7 @@ void KviStatusBarUpdateIndicator::binaryDataReceived(const KviDataBuffer & buffe
 	if(!buffer.data() || buffer.size()<=0)
 		return;
 
-	KviStr szData((const char *)buffer.data(),buffer.size());
+	KviCString szData((const char *)buffer.data(),buffer.size());
 	bool bRemoteNew = false;
 
 	if(m_bUpdateRevision)
diff --git a/src/kvirc/ui/kvi_statusbarapplet.h b/src/kvirc/ui/kvi_statusbarapplet.h
index 0821471a2..8d163cb5c 100644
--- a/src/kvirc/ui/kvi_statusbarapplet.h
+++ b/src/kvirc/ui/kvi_statusbarapplet.h
@@ -26,10 +26,10 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_pointerlist.h"
-#include "kvi_heapobject.h"
+#include "KviPointerList.h"
+#include "KviHeapObject.h"
 #include "kvi_statusbar.h"
-#include "kvi_pointerhashtable.h"
+#include "KviPointerHashTable.h"
 #include "kvi_http.h"
 
 #include <QString>
@@ -40,7 +40,7 @@
 class QTimer;
 class QLabel;
 class KviTalPopupMenu;
-class KviConfig;
+class KviConfigurationFile;
 class KviFrame;
 class KviIrcContext;
 class KviIrcConnection;
@@ -99,8 +99,8 @@ public:
 	inline int index() const { return mIndex; };
 protected:
 	virtual void fillContextPopup(KviTalPopupMenu *){};
-	virtual void loadState(const char *, KviConfig *){};
-	virtual void saveState(const char *, KviConfig *){};
+	virtual void loadState(const char *, KviConfigurationFile *){};
+	virtual void saveState(const char *, KviConfigurationFile *){};
 	virtual QString tipText(const QPoint &);
 };
 
@@ -128,8 +128,8 @@ protected:
 	virtual void fillContextPopup(KviTalPopupMenu * p);
 	virtual void timerEvent(QTimerEvent * e);
 
-	virtual void loadState(const char * pcPrefix, KviConfig * pCfg);
-	virtual void saveState(const char * pcPrefix, KviConfig * pCfg);
+	virtual void loadState(const char * pcPrefix, KviConfigurationFile * pCfg);
+	virtual void saveState(const char * pcPrefix, KviConfigurationFile * pCfg);
 	void adjustMinWidth();
 protected slots:
 	void toggleUtc();
@@ -149,8 +149,8 @@ protected:
 protected:
 	virtual void timerEvent(QTimerEvent * e);
 	virtual void fillContextPopup(KviTalPopupMenu * p);
-	virtual void loadState(const char * pcPrefix, KviConfig * pCfg);
-	virtual void saveState(const char * pcPrefix, KviConfig * pCfg);
+	virtual void loadState(const char * pcPrefix, KviConfigurationFile * pCfg);
+	virtual void saveState(const char * pcPrefix, KviConfigurationFile * pCfg);
 public:
 	static void selfRegister(KviStatusBar * pBar);
 protected slots:
@@ -183,8 +183,8 @@ protected:
 	virtual void mouseDoubleClickEvent(QMouseEvent * e);
 	virtual QString tipText(const QPoint &);
 	virtual void fillContextPopup(KviTalPopupMenu * p);
-	virtual void loadState(const char * pcPrefix, KviConfig * pCfg);
-	virtual void saveState(const char * pcPrefix, KviConfig * pCfg);
+	virtual void loadState(const char * pcPrefix, KviConfigurationFile * pCfg);
+	virtual void saveState(const char * pcPrefix, KviConfigurationFile * pCfg);
 protected slots:
 	void updateDisplay();
 	void toggleContext();
@@ -218,8 +218,8 @@ protected:
 	virtual void mouseDoubleClickEvent(QMouseEvent * e);
 	virtual QString tipText(const QPoint &);
 	virtual void fillContextPopup(KviTalPopupMenu * p);
-	virtual void loadState(const char * pcPrefix, KviConfig * pCfg);
-	virtual void saveState(const char * pcPrefix, KviConfig * pCfg);
+	virtual void loadState(const char * pcPrefix, KviConfigurationFile * pCfg);
+	virtual void saveState(const char * pcPrefix, KviConfigurationFile * pCfg);
 	void checkVersion();
 	void getNewVersion();
 protected slots:
diff --git a/src/kvirc/ui/kvi_texticonwin.cpp b/src/kvirc/ui/kvi_texticonwin.cpp
index ffddee4d0..cc4d20f82 100644
--- a/src/kvirc/ui/kvi_texticonwin.cpp
+++ b/src/kvirc/ui/kvi_texticonwin.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Fri May 17 2002 02:35:20 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2002-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2002-2010 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
@@ -28,7 +28,7 @@
 #include "kvi_options.h"
 #include "kvi_input.h"
 #include "kvi_topicw.h"
-#include "kvi_mirccntrl.h"
+#include "KviMircCntrl.h"
 #include "kvi_iconmanager.h"
 
 #include <QPainter>
diff --git a/src/kvirc/ui/kvi_texticonwin.h b/src/kvirc/ui/kvi_texticonwin.h
index 4c34b4f3e..9670dd3e3 100644
--- a/src/kvirc/ui/kvi_texticonwin.h
+++ b/src/kvirc/ui/kvi_texticonwin.h
@@ -6,7 +6,7 @@
 //   Creation date : Fri May 17 2002 02:33:45 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2002-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2002-2010 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
@@ -34,7 +34,7 @@
 */
 
 #include "kvi_settings.h"
-#include "kvi_string.h"
+#include "KviCString.h"
 #include "kvi_iconmanager.h"
 
 #include <QPainter>
diff --git a/src/kvirc/ui/kvi_themedlabel.cpp b/src/kvirc/ui/kvi_themedlabel.cpp
index 406d234a5..9f88feef9 100644
--- a/src/kvirc/ui/kvi_themedlabel.cpp
+++ b/src/kvirc/ui/kvi_themedlabel.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Tue Aug 29 2000 21:17:01 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
diff --git a/src/kvirc/ui/kvi_themedlabel.h b/src/kvirc/ui/kvi_themedlabel.h
index 32a366712..60da2c9bb 100644
--- a/src/kvirc/ui/kvi_themedlabel.h
+++ b/src/kvirc/ui/kvi_themedlabel.h
@@ -6,7 +6,7 @@
 //   Creation date : Tue Aug 29 2000 21:12:12 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
diff --git a/src/kvirc/ui/kvi_themedtreewidget.cpp b/src/kvirc/ui/kvi_themedtreewidget.cpp
index dd2042d65..975725f7d 100644
--- a/src/kvirc/ui/kvi_themedtreewidget.cpp
+++ b/src/kvirc/ui/kvi_themedtreewidget.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Tue Aug 29 2000 21:17:01 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
diff --git a/src/kvirc/ui/kvi_toolbar.cpp b/src/kvirc/ui/kvi_toolbar.cpp
index a7140b4ab..69cd9ee8c 100644
--- a/src/kvirc/ui/kvi_toolbar.cpp
+++ b/src/kvirc/ui/kvi_toolbar.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Tue Sep 17 02:00:17 2002 GMT by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2002-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2002-2010 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
@@ -24,7 +24,7 @@
 
 #include "kvi_toolbar.h"
 #include "kvi_frame.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_app.h"
 #include "kvi_tal_popupmenu.h"
 
diff --git a/src/kvirc/ui/kvi_toolbar.h b/src/kvirc/ui/kvi_toolbar.h
index 7da1e0031..ddaa3976f 100644
--- a/src/kvirc/ui/kvi_toolbar.h
+++ b/src/kvirc/ui/kvi_toolbar.h
@@ -6,7 +6,7 @@
 //   Creation date : Tue Sep 17 02:00:16 2002 GMT by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2002-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2002-2010 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
diff --git a/src/kvirc/ui/kvi_toolwindows_container.cpp b/src/kvirc/ui/kvi_toolwindows_container.cpp
index 3549cdbfa..39908dbd3 100644
--- a/src/kvirc/ui/kvi_toolwindows_container.cpp
+++ b/src/kvirc/ui/kvi_toolwindows_container.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Tue Aug 1 2000 21:05:22 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
diff --git a/src/kvirc/ui/kvi_toolwindows_container.h b/src/kvirc/ui/kvi_toolwindows_container.h
index bd154e0ce..d4c1fe61e 100644
--- a/src/kvirc/ui/kvi_toolwindows_container.h
+++ b/src/kvirc/ui/kvi_toolwindows_container.h
@@ -7,7 +7,7 @@
 //   Creation date : Tue Aug 1 2000 21:03:41 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -25,7 +25,7 @@
 //
 //=============================================================================
 
-#include "kvi_heapobject.h"
+#include "KviHeapObject.h"
 
 #include <QToolButton>
 
diff --git a/src/kvirc/ui/kvi_topicw.cpp b/src/kvirc/ui/kvi_topicw.cpp
index 0be9d0d5d..1157ecfb7 100644
--- a/src/kvirc/ui/kvi_topicw.cpp
+++ b/src/kvirc/ui/kvi_topicw.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Fri Aug 4 2000 12:09:21 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -26,8 +26,8 @@
 
 #include "kvi_topicw.h"
 #include "kvi_options.h"
-#include "kvi_mirccntrl.h"
-#include "kvi_locale.h"
+#include "KviMircCntrl.h"
+#include "KviLocale.h"
 #include "kvi_defaults.h"
 #include "kvi_settings.h"
 #include "kvi_iconmanager.h"
@@ -41,7 +41,7 @@
 #include "kvi_ircconnectionserverinfo.h"
 #include "kvi_ircconnectionuserinfo.h"
 #include "kvi_htmlgenerator.h"
-#include "kvi_mirccntrl.h"
+#include "KviMircCntrl.h"
 #include "kvi_tal_tooltip.h"
 #include "kvi_tal_popupmenu.h"
 #include "kvi_themedlabel.h"
@@ -291,7 +291,7 @@ void KviTopicWidget::paintColoredText(QPainter *p, QString text,const QPalette&
 				unsigned int icoStart = idx;
 				while((idx < (unsigned int)text.length()) && (text[(int)idx].unicode() > 32))idx++;
 
-				KviStr lookupString = text.mid(icoStart,idx - icoStart);
+				KviCString lookupString = text.mid(icoStart,idx - icoStart);
 
 				KviTextIcon * icon = g_pTextIconManager->lookupTextIcon(lookupString.ptr());
 				if(icon)
diff --git a/src/kvirc/ui/kvi_topicw.h b/src/kvirc/ui/kvi_topicw.h
index 6be6a7f65..5fbe21ef3 100644
--- a/src/kvirc/ui/kvi_topicw.h
+++ b/src/kvirc/ui/kvi_topicw.h
@@ -6,7 +6,7 @@
 //   Creation date : Fri Aug 4 2000 12:03:12 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -25,7 +25,7 @@
 //============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_string.h"
+#include "KviCString.h"
 #include "kvi_app.h"
 #include "kvi_input_editor.h"
 #include "kvi_tal_listwidget.h"
diff --git a/src/kvirc/ui/kvi_userlistview.cpp b/src/kvirc/ui/kvi_userlistview.cpp
index a433fa8ec..4ce8d446c 100644
--- a/src/kvirc/ui/kvi_userlistview.cpp
+++ b/src/kvirc/ui/kvi_userlistview.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Tue Aug 1 2000 21:05:22 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -28,22 +28,22 @@
 #include "kvi_debug.h"
 #include "kvi_userlistview.h"
 #include "kvi_settings.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_options.h"
 #include "kvi_defaults.h"
 #include "kvi_iconmanager.h"
-#include "kvi_regusersdb.h"
-#include "kvi_parameterlist.h"
+#include "KviRegisteredUserDataBase.h"
+#include "KviParameterList.h"
 #include "kvi_window.h"
 #include "kvi_console.h"
 #include "kvi_app.h"
 #include "kvi_useraction.h"
-#include "kvi_qstring.h"
+#include "KviQString.h"
 #include "kvi_frame.h"
 #include "kvi_mdimanager.h"
 #include "kvi_kvs_eventtriggers.h"
 #include "kvi_toolwindows_container.h"
-#include "kvi_stringconversion.h"
+#include "KviStringConversion.h"
 #include "kvi_ircconnection.h"
 #include "kvi_ircconnectionserverinfo.h"
 
@@ -1334,26 +1334,26 @@ void KviUserListView::updateUsersLabel()
 	if(!KVI_OPTION_BOOL(KviOption_boolShowUserListStatisticLabel))
 		return;
 
-	KviStr tmp;
+	KviCString tmp;
 	tmp.sprintf("<nobr><b>[%u]</b>",m_pEntryDict->count());
 	if(m_iChanOwnerCount)
-		tmp.append(KviStr::Format," q:%d",m_iChanOwnerCount);
+		tmp.append(KviCString::Format," q:%d",m_iChanOwnerCount);
 	if(m_iChanAdminCount)
-		tmp.append(KviStr::Format," a:%d",m_iChanAdminCount);
+		tmp.append(KviCString::Format," a:%d",m_iChanAdminCount);
 	if(m_iOpCount)
-		tmp.append(KviStr::Format," o:%d",m_iOpCount);
+		tmp.append(KviCString::Format," o:%d",m_iOpCount);
 	if(m_iHalfOpCount)
-		tmp.append(KviStr::Format," h:%d",m_iHalfOpCount);
+		tmp.append(KviCString::Format," h:%d",m_iHalfOpCount);
 	if(m_iVoiceCount)
-		tmp.append(KviStr::Format," v:%d",m_iVoiceCount);
+		tmp.append(KviCString::Format," v:%d",m_iVoiceCount);
 	if(m_iUserOpCount)
-		tmp.append(KviStr::Format," u:%d",m_iUserOpCount);
+		tmp.append(KviCString::Format," u:%d",m_iUserOpCount);
 	if(m_ibEntries)
-		tmp.append(KviStr::Format," b:%d",m_ibEntries);
+		tmp.append(KviCString::Format," b:%d",m_ibEntries);
 	if(m_ieEntries)
-		tmp.append(KviStr::Format," e:%d",m_ieEntries);
+		tmp.append(KviCString::Format," e:%d",m_ieEntries);
 	if(m_iIEntries)
-		tmp.append(KviStr::Format," I:%d",m_iIEntries);
+		tmp.append(KviCString::Format," I:%d",m_iIEntries);
 	tmp.append("</nobr>");
 	m_pUsersLabel->setText(tmp.ptr());
 }
diff --git a/src/kvirc/ui/kvi_userlistview.h b/src/kvirc/ui/kvi_userlistview.h
index 1963e3287..6ff046738 100644
--- a/src/kvirc/ui/kvi_userlistview.h
+++ b/src/kvirc/ui/kvi_userlistview.h
@@ -6,7 +6,7 @@
 //   Creation date : Tue Aug 1 2000 21:03:41 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -38,13 +38,13 @@
 */
 
 #include "kvi_settings.h"
-#include "kvi_pointerlist.h"
-#include "kvi_pointerhashtable.h"
+#include "KviPointerList.h"
+#include "KviPointerHashTable.h"
 #include "kvi_toolwindows_container.h"
-#include "kvi_string.h"
-#include "kvi_ircuserdb.h"
-#include "kvi_ircmask.h"
-#include "kvi_time.h"
+#include "KviCString.h"
+#include "KviIrcUserDataBase.h"
+#include "KviIrcMask.h"
+#include "KviTimeUtils.h"
 #include "kvi_tal_tooltip.h"
 
 #include <time.h>
diff --git a/src/kvirc/ui/kvi_window.cpp b/src/kvirc/ui/kvi_window.cpp
index c9d9134a6..745e81018 100644
--- a/src/kvirc/ui/kvi_window.cpp
+++ b/src/kvirc/ui/kvi_window.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Tue Jul 6 1999 14:52:11 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 1999-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 1999-2010 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
@@ -41,18 +41,18 @@
 #include "kvi_windowlist.h"
 #include "kvi_iconmanager.h"
 #include "kvi_mdichild.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_ircview.h"
 #include "kvi_out.h"
-#include "kvi_malloc.h"
+#include "KviMemory.h"
 #include "kvi_input.h"
-#include "kvi_fileutils.h"
+#include "KviFileUtils.h"
 #include "kvi_options.h"
-#include "kvi_config.h"
+#include "KviConfigurationFile.h"
 #include "kvi_irccontext.h"
 #include "kvi_console.h"
 #include "kvi_ircconnectionserverinfo.h"
-#include "kvi_mirccntrl.h"
+#include "KviMircCntrl.h"
 #include "kvi_toolwindows_container.h"
 #include "kvi_kvs_script.h"
 #include "kvi_tal_popupmenu.h"
@@ -77,7 +77,7 @@
 #include <QActionGroup>
 
 #ifdef COMPILE_CRYPT_SUPPORT
-	#include "kvi_crypt.h"
+	#include "KviCryptEngine.h"
 	#include "kvi_cryptcontroller.h"
 #endif
 
@@ -571,7 +571,7 @@ void KviWindow::getBaseLogFileName(QString &buffer)
 	buffer = m_szName;
 }
 
-void KviWindow::saveProperties(KviConfig *cfg)
+void KviWindow::saveProperties(KviConfigurationFile *cfg)
 {
 	// store only the non-default text encoding.
 	QString szCodec = m_szTextEncoding;
@@ -596,7 +596,7 @@ void KviWindow::saveProperties(KviConfig *cfg)
 	*/
 }
 
-void KviWindow::loadProperties(KviConfig *cfg)
+void KviWindow::loadProperties(KviConfigurationFile *cfg)
 {
 	QString szKey = "TextEncoding_";
 	szKey += m_szName;
@@ -1290,7 +1290,7 @@ void KviWindow::output(int msg_type,const QString &szFmt,...)
 
 void KviWindow::output(int msg_type,const kvi_wchar_t *format,...)
 {
-	QString szFmt=QString::fromUtf8(KviStr(format).ptr());
+	QString szFmt=QString::fromUtf8(KviCString(format).ptr());
 	kvi_va_list l;
 	kvi_va_start(l,format);
 	QString szBuf;
diff --git a/src/kvirc/ui/kvi_window.h b/src/kvirc/ui/kvi_window.h
index 39516854d..a7482729f 100644
--- a/src/kvirc/ui/kvi_window.h
+++ b/src/kvirc/ui/kvi_window.h
@@ -6,7 +6,7 @@
 //   Creation date : Tue Jul 6 1999 14:52:20 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 1999-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 1999-2010 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
@@ -31,8 +31,8 @@
 
 
 #include "kvi_app.h"
-#include "kvi_string.h"
-#include "kvi_qstring.h"
+#include "KviCString.h"
+#include "KviQString.h"
 #include "kvi_settings.h"
 #include "kvi_irccontext.h"
 #include "kvi_ircconnection.h"
@@ -58,7 +58,7 @@ class QPixmap;
 class QTextCodec;
 class KviFrame;
 class KviWindowListItem;
-class KviConfig;
+class KviConfigurationFile;
 class KviIrcView;
 class KviConsole;
 class KviIrcConnection;
@@ -319,8 +319,8 @@ signals:
 protected:
 	// Loading and saving of properties
 	// Protected: only KviFrame can call these
-	virtual void saveProperties(KviConfig *cfg);
-	virtual void loadProperties(KviConfig *cfg);
+	virtual void saveProperties(KviConfigurationFile *cfg);
+	virtual void loadProperties(KviConfigurationFile *cfg);
 	// Creation and destruction events: overridden in windows that have script events bound to creation and destruction
 	virtual void triggerCreationEvents(){};
 	virtual void triggerDestructionEvents(){};
diff --git a/src/kvirc/ui/kvi_windowlist.cpp b/src/kvirc/ui/kvi_windowlist.cpp
index f1163aa27..b493ba0ea 100644
--- a/src/kvirc/ui/kvi_windowlist.cpp
+++ b/src/kvirc/ui/kvi_windowlist.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Thu Jan 7 1999 03:59:43 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 1999-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 1999-2010 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
@@ -39,10 +39,10 @@
 #include "kvi_dynamictooltip.h"
 #include "kvi_frame.h"
 #include "kvi_ircconnection.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_options.h"
 #include "kvi_settings.h"
-#include "kvi_string.h"
+#include "KviCString.h"
 #include "kvi_window.h"
 #include "kvi_windowlist.h"
 
diff --git a/src/kvirc/ui/kvi_windowlist.h b/src/kvirc/ui/kvi_windowlist.h
index 60c985653..b6741bc00 100644
--- a/src/kvirc/ui/kvi_windowlist.h
+++ b/src/kvirc/ui/kvi_windowlist.h
@@ -6,7 +6,7 @@
 //   Creation date : Thu Jan 7 1999 03:56:50 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 1999-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 1999-2010 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
@@ -25,7 +25,7 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_pointerlist.h"
+#include "KviPointerList.h"
 #include "kvi_tal_tooltip.h"
 
 #include <QPushButton>
diff --git a/src/kvirc/ui/kvi_windowlist_tree.cpp b/src/kvirc/ui/kvi_windowlist_tree.cpp
index 15a22f735..0e68e098f 100644
--- a/src/kvirc/ui/kvi_windowlist_tree.cpp
+++ b/src/kvirc/ui/kvi_windowlist_tree.cpp
@@ -27,7 +27,7 @@
 #include "kvi_console.h"
 #include "kvi_dynamictooltip.h"
 #include "kvi_frame.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_options.h"
 #include "kvi_tal_popupmenu.h"
 #include "kvi_window.h"
diff --git a/src/kvirc/ui/kvi_windowlist_tree.h b/src/kvirc/ui/kvi_windowlist_tree.h
index f816ca4ed..5a5c4e726 100644
--- a/src/kvirc/ui/kvi_windowlist_tree.h
+++ b/src/kvirc/ui/kvi_windowlist_tree.h
@@ -6,7 +6,7 @@
 //   Creation date : Thu Jan 7 1999 03:56:50 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 1999-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 1999-2010 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
diff --git a/src/modules/about/aboutdialog.cpp b/src/modules/about/aboutdialog.cpp
index 1f8da8b7b..24da5a91b 100644
--- a/src/modules/about/aboutdialog.cpp
+++ b/src/modules/about/aboutdialog.cpp
@@ -26,12 +26,12 @@
 #include "aboutdialog.h"
 
 #include "kvi_defaults.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_app.h"
-#include "kvi_fileutils.h"
+#include "KviFileUtils.h"
 #include "kvi_sourcesdate.h"
 #include "kvi_buildinfo.h"
-#include "kvi_osinfo.h"
+#include "KviOsInfo.h"
 
 #include <QTextEdit>
 #include <QWidget>
diff --git a/src/modules/about/aboutdialog.h b/src/modules/about/aboutdialog.h
index f8f4d26a2..9fd444907 100644
--- a/src/modules/about/aboutdialog.h
+++ b/src/modules/about/aboutdialog.h
@@ -6,7 +6,7 @@
 //   Creation date : Sun Jun 23 17:59:13 2002 GMT 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-2010 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
diff --git a/src/modules/about/libkviabout.cpp b/src/modules/about/libkviabout.cpp
index c8f9c4678..2e3dce8a5 100644
--- a/src/modules/about/libkviabout.cpp
+++ b/src/modules/about/libkviabout.cpp
@@ -7,7 +7,7 @@
 //   Copyright (C) 1999 Szymon Stefanek (pragma at kvirc dot net)
 //   Copyright (C) 2000 Christian Strmmen
 //   Copyright (C) 2000 Till Bush (buti at geocities dot com)
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -28,7 +28,7 @@
 #include "aboutdialog.h"
 
 #include "kvi_module.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 
 KviAboutDialog * g_pAboutDialog = 0;
 
diff --git a/src/modules/about/libkviabout.h b/src/modules/about/libkviabout.h
index e302d5f4b..c6b106d07 100644
--- a/src/modules/about/libkviabout.h
+++ b/src/modules/about/libkviabout.h
@@ -7,7 +7,7 @@
 //
 //   This file is part of the KVirc irc client distribution
 //   Copyright (C) 1999-2000 Till Bush (buti@geocities.com)
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
diff --git a/src/modules/action/libkviaction.cpp b/src/modules/action/libkviaction.cpp
index 809a58218..632daffcf 100644
--- a/src/modules/action/libkviaction.cpp
+++ b/src/modules/action/libkviaction.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Tue 7 Dec 00:05:59 2002 GMT by Szymon Stefanek
 //
 //   This toolbar is part of the KVirc irc client distribution
-//   Copyright (C) 2002-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2002-2010 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
@@ -25,15 +25,15 @@
 #include "kvi_module.h"
 #include "kvi_action.h"
 #include "kvi_actionmanager.h"
-#include "kvi_locale.h"
-#include "kvi_qstring.h"
-#include "kvi_parameterlist.h"
-#include "kvi_cmdformatter.h"
-#include "kvi_qstring.h"
+#include "KviLocale.h"
+#include "KviQString.h"
+#include "KviParameterList.h"
+#include "KviCommandFormatter.h"
+#include "KviQString.h"
 #include "kvi_error.h"
 #include "kvi_out.h"
 #include "kvi_iconmanager.h"
-#include "kvi_mirccntrl.h"
+#include "KviMircCntrl.h"
 #include "kvi_kvs_useraction.h"
 #include "kvi_kvs_script.h"
 
diff --git a/src/modules/actioneditor/actioneditor.cpp b/src/modules/actioneditor/actioneditor.cpp
index d195853ae..17948b033 100644
--- a/src/modules/actioneditor/actioneditor.cpp
+++ b/src/modules/actioneditor/actioneditor.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Tue 29 Dec 2004 02:45:59 2002 GMT by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2004-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2004-2010 Szymon Stefanek (pragma at kvirc dot net)
 //
 //   This program is FREE software. You can redistribute it and/or
 //   modify it under the linkss of the GNU General Public License
@@ -25,14 +25,14 @@
 
 #include "kvi_iconmanager.h"
 #include "kvi_options.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_imagedialog.h"
-#include "kvi_config.h"
-#include "kvi_fileutils.h"
+#include "KviConfigurationFile.h"
+#include "KviFileUtils.h"
 #include "kvi_scripteditor.h"
 #include "kvi_debug.h"
 #include "kvi_app.h"
-#include "kvi_qstring.h"
+#include "KviQString.h"
 #include "kvi_kvs_aliasmanager.h"
 #include "kvi_filedialog.h"
 #include "kvi_actionmanager.h"
@@ -922,13 +922,13 @@ void KviActionEditorWindow::getConfigGroupName(QString &szName)
 	szName = "actioneditor";
 }
 
-void KviActionEditorWindow::saveProperties(KviConfig *cfg)
+void KviActionEditorWindow::saveProperties(KviConfigurationFile *cfg)
 {
 	KviWindow::saveProperties(cfg);
 	cfg->writeEntry("Splitter",m_pEditor->m_pSplitter->sizes());
 }
 
-void KviActionEditorWindow::loadProperties(KviConfig *cfg)
+void KviActionEditorWindow::loadProperties(KviConfigurationFile *cfg)
 {
 	int w = width();
 	KviWindow::loadProperties(cfg);
diff --git a/src/modules/actioneditor/actioneditor.h b/src/modules/actioneditor/actioneditor.h
index 8268b5be5..ca9c0e8a1 100644
--- a/src/modules/actioneditor/actioneditor.h
+++ b/src/modules/actioneditor/actioneditor.h
@@ -6,7 +6,7 @@
 //   Creation date : Tue Dec 29 2004 02:40:55 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2004-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2004-2010 Szymon Stefanek (pragma at kvirc dot net)
 //
 //   This program is FREE software. You can redistribute it and/or
 //   modify it under the linkss of the GNU General Public License
@@ -193,8 +193,8 @@ protected:
 protected:
 	virtual QPixmap * myIconPtr();
 	virtual void getConfigGroupName(QString &szName);
-	virtual void saveProperties(KviConfig *);
-	virtual void loadProperties(KviConfig *);
+	virtual void saveProperties(KviConfigurationFile *);
+	virtual void loadProperties(KviConfigurationFile *);
 protected slots:
 	void cancelClicked();
 	void okClicked();
diff --git a/src/modules/actioneditor/libkviactioneditor.cpp b/src/modules/actioneditor/libkviactioneditor.cpp
index 2d5ae139b..10ee5d2d4 100644
--- a/src/modules/actioneditor/libkviactioneditor.cpp
+++ b/src/modules/actioneditor/libkviactioneditor.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Tue 29 Dec 2004 02:45:59 2002 GMT by Szymon Stefanek
 //
 //   This toolbar is part of the KVirc irc client distribution
-//   Copyright (C) 2004-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2004-2010 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
@@ -25,7 +25,7 @@
 #include "actioneditor.h"
 
 #include "kvi_module.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_frame.h"
 
 KviActionEditorWindow * g_pActionEditorWindow = 0;
diff --git a/src/modules/addon/addonfunctions.cpp b/src/modules/addon/addonfunctions.cpp
index 7efd047e1..d8406fa24 100644
--- a/src/modules/addon/addonfunctions.cpp
+++ b/src/modules/addon/addonfunctions.cpp
@@ -24,14 +24,14 @@
 
 #include "addonfunctions.h"
 
-#include "kvi_packagefile.h"
-#include "kvi_locale.h"
+#include "KviPackageFile.h"
+#include "KviLocale.h"
 #include "kvi_msgbox.h"
 #include "kvi_app.h"
 #include "kvi_htmldialog.h"
 #include "kvi_iconmanager.h"
-#include "kvi_fileutils.h"
-#include "kvi_miscutils.h"
+#include "KviFileUtils.h"
+#include "KviMiscUtils.h"
 #include "kvi_sourcesdate.h"
 #include "kvi_frame.h"
 #include "kvi_kvs_script.h"
diff --git a/src/modules/addon/addonfunctions.h b/src/modules/addon/addonfunctions.h
index 40ddbebd8..c8b39e9b0 100644
--- a/src/modules/addon/addonfunctions.h
+++ b/src/modules/addon/addonfunctions.h
@@ -25,7 +25,7 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_qstring.h"
+#include "KviQString.h"
 
 #include <QWidget>
 #include <QPixmap>
diff --git a/src/modules/addon/libkviaddon.cpp b/src/modules/addon/libkviaddon.cpp
index 394105733..58941263c 100644
--- a/src/modules/addon/libkviaddon.cpp
+++ b/src/modules/addon/libkviaddon.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Tue 31 Mar 01:02:12 2005 GMT by Szymon Stefanek
 //
 //   This toolbar is part of the KVirc irc client distribution
-//   Copyright (C) 2005-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2005-2010 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
@@ -27,18 +27,18 @@
 
 #include "kvi_module.h"
 #include "kvi_kvs_scriptaddonmanager.h"
-#include "kvi_locale.h"
-#include "kvi_qstring.h"
-#include "kvi_parameterlist.h"
-#include "kvi_cmdformatter.h"
+#include "KviLocale.h"
+#include "KviQString.h"
+#include "KviParameterList.h"
+#include "KviCommandFormatter.h"
 #include "kvi_error.h"
 #include "kvi_out.h"
 #include "kvi_iconmanager.h"
-#include "kvi_mirccntrl.h"
-#include "kvi_config.h"
+#include "KviMircCntrl.h"
+#include "KviConfigurationFile.h"
 #include "kvi_sourcesdate.h"
-#include "kvi_miscutils.h"
-#include "kvi_fileutils.h"
+#include "KviMiscUtils.h"
+#include "KviFileUtils.h"
 #include "kvi_filedialog.h"
 
 #include <QFileInfo>
@@ -831,7 +831,7 @@ static bool addon_module_init(KviModule *m)
 
 	QString szBuf;
 	m->getDefaultConfigFileName(szBuf);
-	KviConfig cfg(szBuf,KviConfig::Read);
+	KviConfigurationFile cfg(szBuf,KviConfigurationFile::Read);
 	g_rectManagementDialogGeometry = cfg.readRectEntry("EditorGeometry",QRect(10,10,390,440));
 
 	return true;
@@ -843,7 +843,7 @@ static bool addon_module_cleanup(KviModule *m)
 
 	QString szBuf;
 	m->getDefaultConfigFileName(szBuf);
-	KviConfig cfg(szBuf,KviConfig::Write);
+	KviConfigurationFile cfg(szBuf,KviConfigurationFile::Write);
 	cfg.writeEntry("EditorGeometry",g_rectManagementDialogGeometry);
 
 	return true;
diff --git a/src/modules/addon/managementdialog.cpp b/src/modules/addon/managementdialog.cpp
index 87726bcac..fc8542714 100644
--- a/src/modules/addon/managementdialog.cpp
+++ b/src/modules/addon/managementdialog.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Fri 08 Apr 2005 14:54:56 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC Client distribution
-//   Copyright (C) 2005-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2005-2010 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
@@ -27,13 +27,13 @@
 #include "addonfunctions.h"
 
 #include "kvi_app.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_frame.h"
 #include "kvi_iconmanager.h"
 #include "kvi_kvs_scriptaddonmanager.h"
 #include "kvi_window.h"
 #include "kvi_filedialog.h"
-#include "kvi_fileutils.h"
+#include "KviFileUtils.h"
 #include "kvi_fileextensions.h"
 #include "kvi_kvs_script.h"
 #include "kvi_sourcesdate.h"
diff --git a/src/modules/addon/managementdialog.h b/src/modules/addon/managementdialog.h
index 0ffe31987..8288363e5 100644
--- a/src/modules/addon/managementdialog.h
+++ b/src/modules/addon/managementdialog.h
@@ -6,7 +6,7 @@
 //   Creation date : Fri 08 Apr 2005 14:54:56 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC Client distribution
-//   Copyright (C) 2005-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2005-2010 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
diff --git a/src/modules/addon/packaddondialog.cpp b/src/modules/addon/packaddondialog.cpp
index 4d6fc81c0..bb86c9029 100644
--- a/src/modules/addon/packaddondialog.cpp
+++ b/src/modules/addon/packaddondialog.cpp
@@ -25,11 +25,11 @@
 #include "packaddondialog.h"
 #include "addonfunctions.h"
 
-#include "kvi_locale.h"
-#include "kvi_fileutils.h"
+#include "KviLocale.h"
+#include "KviFileUtils.h"
 #include "kvi_app.h"
 #include "kvi_iconmanager.h"
-#include "kvi_packagefile.h"
+#include "KviPackageFile.h"
 #include "kvi_fileextensions.h"
 #include "kvi_sourcesdate.h"
 #include "kvi_options.h"
diff --git a/src/modules/addon/packaddondialog.h b/src/modules/addon/packaddondialog.h
index 98c61ef27..da2ebef3b 100644
--- a/src/modules/addon/packaddondialog.h
+++ b/src/modules/addon/packaddondialog.h
@@ -34,7 +34,7 @@
 */
 
 #include "kvi_settings.h"
-#include "kvi_pointerlist.h"
+#include "KviPointerList.h"
 #include "kvi_selectors.h"
 
 #include <QWizard>
diff --git a/src/modules/aliaseditor/aliaseditor.cpp b/src/modules/aliaseditor/aliaseditor.cpp
index db035890d..a701bcdd0 100644
--- a/src/modules/aliaseditor/aliaseditor.cpp
+++ b/src/modules/aliaseditor/aliaseditor.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Mon Dec 23 2002 14:36:18 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2002-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2002-2010 Szymon Stefanek (pragma at kvirc dot net)
 //
 //   This program is FREE software. You can redistribute it and/or
 //   modify it under the linkss of the GNU General Public License
@@ -27,19 +27,19 @@
 
 #include "kvi_iconmanager.h"
 #include "kvi_options.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_imagedialog.h"
-#include "kvi_config.h"
+#include "KviConfigurationFile.h"
 #include "kvi_filedialog.h"
-#include "kvi_fileutils.h"
+#include "KviFileUtils.h"
 #include "kvi_scripteditor.h"
 #include "kvi_debug.h"
 #include "kvi_app.h"
 #include "kvi_frame.h"
-#include "kvi_qstring.h"
+#include "KviQString.h"
 #include "kvi_kvs_aliasmanager.h"
 #include "kvi_filedialog.h"
-#include "kvi_cmdformatter.h"
+#include "KviCommandFormatter.h"
 #include "kvi_module.h"
 #include "kvi_tal_vbox.h"
 #include "kvi_fileextensions.h"
@@ -835,7 +835,7 @@ void KviAliasEditor::buildAliasesFile(KviPointerList<KviAliasEditorTreeWidgetIte
 	}
 }
 
-void KviAliasEditor::saveProperties(KviConfig *cfg)
+void KviAliasEditor::saveProperties(KviConfigurationFile *cfg)
 {
 	cfg->writeEntry("Sizes",m_pSplitter->sizes());
 	QString szName;
@@ -844,7 +844,7 @@ void KviAliasEditor::saveProperties(KviConfig *cfg)
 	cfg->writeEntry("LastAlias",szName);
 }
 
-void KviAliasEditor::loadProperties(KviConfig *cfg)
+void KviAliasEditor::loadProperties(KviConfigurationFile *cfg)
 {
 	QList<int> def;
 	def.append(20);
@@ -1236,12 +1236,12 @@ void KviAliasEditorWindow::getConfigGroupName(QString &szName)
 	szName = "aliaseditor";
 }
 
-void KviAliasEditorWindow::saveProperties(KviConfig *cfg)
+void KviAliasEditorWindow::saveProperties(KviConfigurationFile *cfg)
 {
 	m_pEditor->saveProperties(cfg);
 }
 
-void KviAliasEditorWindow::loadProperties(KviConfig *cfg)
+void KviAliasEditorWindow::loadProperties(KviConfigurationFile *cfg)
 {
 	m_pEditor->loadProperties(cfg);
 }
diff --git a/src/modules/aliaseditor/aliaseditor.h b/src/modules/aliaseditor/aliaseditor.h
index c6a529e23..95309481c 100644
--- a/src/modules/aliaseditor/aliaseditor.h
+++ b/src/modules/aliaseditor/aliaseditor.h
@@ -6,7 +6,7 @@
 //   Creation date : Mon Dec 23 2002 14:35:55 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2002-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2002-2010 Szymon Stefanek (pragma at kvirc dot net)
 //
 //   This program is FREE software. You can redistribute it and/or
 //   modify it under the linkss of the GNU General Public License
@@ -25,10 +25,10 @@
 //=============================================================================
 
 #include "kvi_window.h"
-#include "kvi_string.h"
-#include "kvi_pointerlist.h"
+#include "KviCString.h"
+#include "KviPointerList.h"
 #include "kvi_tal_popupmenu.h"
-#include "kvi_heapobject.h"
+#include "KviHeapObject.h"
 
 #include <QWidget>
 #include <QLineEdit>
@@ -106,8 +106,8 @@ public:
 	void exportAliases(bool,bool=false);
 	void exportSelectionInSinglesFiles(KviPointerList<KviAliasEditorTreeWidgetItem> *l);
 
-	void saveProperties(KviConfig *);
-	void loadProperties(KviConfig *);
+	void saveProperties(KviConfigurationFile *);
+	void loadProperties(KviConfigurationFile *);
 	static void splitFullAliasOrNamespaceName(const QString &szFullName,QStringList &lNamespaces,QString &szName);
 protected slots:
 	void currentItemChanged(QTreeWidgetItem *it,QTreeWidgetItem *);
@@ -179,8 +179,8 @@ protected:
 protected:
 	virtual QPixmap * myIconPtr();
 	virtual void getConfigGroupName(QString &szName);
-	virtual void saveProperties(KviConfig *);
-	virtual void loadProperties(KviConfig *);
+	virtual void saveProperties(KviConfigurationFile *);
+	virtual void loadProperties(KviConfigurationFile *);
 protected slots:
 	void cancelClicked();
 	void okClicked();
diff --git a/src/modules/aliaseditor/libkvialiaseditor.cpp b/src/modules/aliaseditor/libkvialiaseditor.cpp
index 47217dc6e..e929e3bf2 100644
--- a/src/modules/aliaseditor/libkvialiaseditor.cpp
+++ b/src/modules/aliaseditor/libkvialiaseditor.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Mon 23 Dec 2002 14:30:59 2002 GMT by Szymon Stefanek
 //
 //   This toolbar is part of the KVirc irc client distribution
-//   Copyright (C) 2002-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2002-2010 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
@@ -25,7 +25,7 @@
 #include "aliaseditor.h"
 
 #include "kvi_module.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_frame.h"
 
 
@@ -84,7 +84,7 @@ static bool aliaseditor_module_cleanup(KviModule *)
 KVIRC_MODULE(
 	"AliasEditor",                                                       // module name
 	"4.0.0",                                                             // module version
-	"Copyright (C) 2002-2005 Szymon Stefanek (pragma at kvirc dot net)", // author & (C)
+	"Copyright (C) 2002-2010 Szymon Stefanek (pragma at kvirc dot net)", // author & (C)
 	"Editor for the script aliases",
 	aliaseditor_module_init,
 	aliaseditor_module_can_unload,
diff --git a/src/modules/avatar/libkviavatar.cpp b/src/modules/avatar/libkviavatar.cpp
index d7b46ea48..5a576c9f8 100644
--- a/src/modules/avatar/libkviavatar.cpp
+++ b/src/modules/avatar/libkviavatar.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Thu Nov 12 02:32:59 2004 GMT by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2004-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2004-2010 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
@@ -25,25 +25,25 @@
 #include "libkviavatar.h"
 
 #include "kvi_module.h"
-#include "kvi_fileutils.h"
-#include "kvi_locale.h"
-#include "kvi_malloc.h"
+#include "KviFileUtils.h"
+#include "KviLocale.h"
+#include "KviMemory.h"
 #include "kvi_app.h"
 #include "kvi_options.h"
 #include "kvi_http.h"
 #include "kvi_iconmanager.h"
-#include "kvi_avatar.h"
-#include "kvi_ircuserdb.h"
+#include "KviAvatar.h"
+#include "KviIrcUserDataBase.h"
 #include "kvi_ircconnection.h"
 #include "kvi_ircconnectionuserinfo.h"
 #include "kvi_console.h"
 #include "kvi_filedialog.h"
-#include "kvi_pointerlist.h"
+#include "KviPointerList.h"
 #include "kvi_frame.h"
-#include "kvi_sharedfiles.h"
+#include "KviSharedFilesManager.h"
 #include "kvi_sparser.h"
 #include "kvi_out.h"
-#include "kvi_ircmask.h"
+#include "KviIrcMask.h"
 #include "kvi_tal_hbox.h"
 
 #include <QLineEdit>
diff --git a/src/modules/avatar/libkviavatar.h b/src/modules/avatar/libkviavatar.h
index 9cfdcc66e..908888019 100644
--- a/src/modules/avatar/libkviavatar.h
+++ b/src/modules/avatar/libkviavatar.h
@@ -6,7 +6,7 @@
 //   Creation date : Thu Nov 12 02:32:59 2004 GMT by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2004-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2004-2010 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
@@ -25,7 +25,7 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_qstring.h"
+#include "KviQString.h"
 
 #include <QDialog>
 
diff --git a/src/modules/chan/libkvichan.cpp b/src/modules/chan/libkvichan.cpp
index 18870c9af..3f60c3226 100644
--- a/src/modules/chan/libkvichan.cpp
+++ b/src/modules/chan/libkvichan.cpp
@@ -6,7 +6,7 @@
 //   This chan is part of the KVirc irc client distribution
 //   Copyright (C) 2002 Szymon Stefanek (pragma@kvirc.net)
 //   Copyright (C) 2002 Juanjo Alvarez  (juanjux@yahoo.es)
-//   Copyright (C) 2004-2008 Szymon Stefanek (pragma@kvirc.net)
+//   Copyright (C) 2004-2010 Szymon Stefanek (pragma@kvirc.net)
 //
 //   This program is FREE software. You can redistribute it and/or
 //   modify it under the terms of the GNU General Public License
@@ -25,12 +25,12 @@
 //=============================================================================
 
 #include "kvi_module.h"
-#include "kvi_string.h"
+#include "KviCString.h"
 #include "kvi_app.h"
 #include "kvi_channel.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_topicw.h"
-#include "kvi_ircmask.h"
+#include "KviIrcMask.h"
 #include "kvi_maskeditor.h"
 #include "kvi_ircurl.h"
 #include "kvi_ircconnectiontarget.h"
diff --git a/src/modules/channelsjoin/channelsjoinwindow.cpp b/src/modules/channelsjoin/channelsjoinwindow.cpp
index 24f5f9410..b5a75e1d4 100644
--- a/src/modules/channelsjoin/channelsjoinwindow.cpp
+++ b/src/modules/channelsjoin/channelsjoinwindow.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Thu Nov 6 2001 12:41:18 by Juanjo �varez
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2001-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2001-2010 Szymon Stefanek (pragma at kvirc dot net)
 //
 //   This program is FREE software. You can redistribute it and/or
 //   modify it under the linkss of the GNU General Public License
@@ -24,15 +24,15 @@
 
 #include "channelsjoinwindow.h"
 
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_options.h"
 #include "kvi_selectors.h"
 #include "kvi_app.h"
-#include "kvi_string.h"
-#include "kvi_qstring.h"
+#include "KviCString.h"
+#include "KviQString.h"
 #include "kvi_iconmanager.h"
 #include "kvi_console.h"
-#include "kvi_regchan.h"
+#include "KviRegisteredChannel.h"
 #include "kvi_kvs_script.h"
 #include "kvi_tal_groupbox.h"
 
@@ -375,13 +375,13 @@ void KviChannelsJoinWindow::clearClicked()
 /*
 void KviChannelsJoinWindow::whoClicked()
 {
-	KviStr tmp = m_pChannelEdit->text();
+	KviCString tmp = m_pChannelEdit->text();
 	if(!tmp.isEmpty())doCmd("who", tmp.ptr());
 }
 
 void KviChannelsJoinWindow::namesClicked()
 {
-	KviStr tmp = m_pChannelEdit->text();
+	KviCString tmp = m_pChannelEdit->text();
 	//FIXME: I must be a nice guy and implement /names in the core...
 	if(!tmp.isEmpty())doCmd("raw names", tmp.ptr());
 }
@@ -389,7 +389,7 @@ void KviChannelsJoinWindow::namesClicked()
 void KviChannelsJoinWindow::itemDoubleClicked(KviTalListBoxItem * it)
 {
 	if (it == 0)return;
-	KviStr tmp = it->text();
+	KviCString tmp = it->text();
 	doCmd("join", tmp.ptr());
 //	if(KVI_OPTION_BOOL(KviOption_boolCloseChannelsJoinAfterJoin))
 //		g_pApp->collectGarbage(this);
diff --git a/src/modules/channelsjoin/channelsjoinwindow.h b/src/modules/channelsjoin/channelsjoinwindow.h
index 23c1e0791..76af3d144 100644
--- a/src/modules/channelsjoin/channelsjoinwindow.h
+++ b/src/modules/channelsjoin/channelsjoinwindow.h
@@ -6,7 +6,7 @@
 //   Creation date : Thu Nov 06 2001 12:30:25 CEST by Juan Alvarez
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2001-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2001-2010 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
@@ -31,7 +31,7 @@
 */
 
 #include "kvi_window.h"
-#include "kvi_string.h"
+#include "KviCString.h"
 #include <QTreeWidget>
 
 #include <QDialog>
diff --git a/src/modules/channelsjoin/libkvichannelsjoin.cpp b/src/modules/channelsjoin/libkvichannelsjoin.cpp
index 8bb1299af..9e8aec1bf 100644
--- a/src/modules/channelsjoin/libkvichannelsjoin.cpp
+++ b/src/modules/channelsjoin/libkvichannelsjoin.cpp
@@ -5,7 +5,7 @@
 //
 //   This file is part of the KVirc irc client distribution
 //   Copyright (C) 2001 Juanjo Alvarez
-//   Copyright (C) 2001-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2001-2010 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
@@ -27,8 +27,8 @@
 #include "kvi_module.h"
 #include "kvi_window.h"
 #include "kvi_frame.h"
-#include "kvi_locale.h"
-#include "kvi_config.h"
+#include "KviLocale.h"
+#include "KviConfigurationFile.h"
 
 #include <QSplitter>
 
@@ -68,7 +68,7 @@ static bool channelsjoin_module_init(KviModule * m)
 {
 	QString fName;
 	m->getDefaultConfigFileName(fName);
-	KviConfig cfg(fName,KviConfig::Read);
+	KviConfigurationFile cfg(fName,KviConfigurationFile::Read);
 
 	g_rectChannelsJoinGeometry = cfg.readRectEntry("geometry",QRect(30,30,320,410));
 
@@ -80,7 +80,7 @@ static bool channelsjoin_module_cleanup(KviModule *m)
 {
 	QString fName;
 	m->getDefaultConfigFileName(fName);
-	KviConfig cfg(fName,KviConfig::Write);
+	KviConfigurationFile cfg(fName,KviConfigurationFile::Write);
 
 	cfg.writeEntry("geometry",g_rectChannelsJoinGeometry);
 
diff --git a/src/modules/classeditor/classeditor.cpp b/src/modules/classeditor/classeditor.cpp
index 3f34c0b9e..6c0e59ea2 100644
--- a/src/modules/classeditor/classeditor.cpp
+++ b/src/modules/classeditor/classeditor.cpp
@@ -27,21 +27,21 @@
 
 #include "kvi_iconmanager.h"
 #include "kvi_options.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_imagedialog.h"
-#include "kvi_config.h"
+#include "KviConfigurationFile.h"
 #include "kvi_filedialog.h"
-#include "kvi_fileutils.h"
+#include "KviFileUtils.h"
 #include "kvi_scripteditor.h"
 #include "kvi_debug.h"
 #include "kvi_app.h"
 #include "kvi_frame.h"
-#include "kvi_qstring.h"
+#include "KviQString.h"
 #include "kvi_kvs_kernel.h"
 #include "kvi_kvs_object_class.h"
 #include "kvi_kvs_object_controller.h"
 #include "kvi_filedialog.h"
-#include "kvi_cmdformatter.h"
+#include "KviCommandFormatter.h"
 #include "kvi_module.h"
 #include "kvi_tal_vbox.h"
 #include "kvi_fileextensions.h"
@@ -1222,7 +1222,7 @@ void KviClassEditor::exportClasses(bool bSelectedOnly, bool bSingleFiles)
 	}
 }
 
-void KviClassEditor::saveProperties(KviConfig * pCfg)
+void KviClassEditor::saveProperties(KviConfigurationFile * pCfg)
 {
 	pCfg->writeEntry("Sizes",m_pSplitter->sizes());
 	QString szName;
@@ -1231,7 +1231,7 @@ void KviClassEditor::saveProperties(KviConfig * pCfg)
 	pCfg->writeEntry("LastClass",szName);
 }
 
-void KviClassEditor::loadProperties(KviConfig * pCfg)
+void KviClassEditor::loadProperties(KviConfigurationFile * pCfg)
 {
 	QList<int> def;
 	def.append(20);
@@ -1704,7 +1704,7 @@ void KviClassEditor::build()
 		QString szFileName = "libkviclasseditortmp.kvc";
 		QString szBuffer;
 		g_pApp->getLocalKvircDirectory(szBuffer,KviApp::ConfigPlugins,szFileName);
-		KviConfig cfg(szBuffer,KviConfig::Write);
+		KviConfigurationFile cfg(szBuffer,KviConfigurationFile::Write);
 		cfg.clear();
 		cfg.sync();
 	}
@@ -1716,8 +1716,8 @@ void KviClassEditor::loadNotBuiltClasses()
 	QString szFileName = "libkviclasseditortmp.kvc";
 	QString szBuffer;
 	g_pApp->getLocalKvircDirectory(szBuffer,KviApp::ConfigPlugins,szFileName);
-	KviConfig cfg(szBuffer,KviConfig::Read);
-	KviConfigIterator it(*(cfg.dict()));
+	KviConfigurationFile cfg(szBuffer,KviConfigurationFile::Read);
+	KviConfigurationFileIterator it(*(cfg.dict()));
 
 	KviPointerList<QString> l;
 	l.setAutoDelete(true);
@@ -1734,10 +1734,10 @@ void KviClassEditor::loadNotBuiltClasses()
 		KviClassEditorTreeWidgetItem * pClassItem = createFullItem(*pszTmp);
 		m_pClasses->insert(*pszTmp,pClassItem);
 		pClassItem->setClassNotBuilt(true);
-		KviConfigGroup * pDict = cfg.dict()->find(*pszTmp);
+		KviConfigurationFileGroup * pDict = cfg.dict()->find(*pszTmp);
 		if(pDict)
 		{
-			KviConfigGroupIterator it(*pDict);
+			KviConfigurationFileGroupIterator it(*pDict);
 			KviPointerList<QString> names;
 			names.setAutoDelete(true);
 			while(it.current())
@@ -1775,7 +1775,7 @@ void KviClassEditor::saveNotBuiltClasses()
 	QString szFileName = "libkviclasseditortmp.kvc";
 	QString szBuffer;
 	g_pApp->getLocalKvircDirectory(szBuffer,KviApp::ConfigPlugins,szFileName);
-	KviConfig cfg(szBuffer,KviConfig::Write);
+	KviConfigurationFile cfg(szBuffer,KviConfigurationFile::Write);
 	cfg.clear();
 
 	while(it.current())
@@ -1877,12 +1877,12 @@ void KviClassEditorWindow::configGroupName(QString &szName)
 	szName = "classeditor";
 }
 
-void KviClassEditorWindow::saveProperties(KviConfig * pCfg)
+void KviClassEditorWindow::saveProperties(KviConfigurationFile * pCfg)
 {
 	m_pEditor->saveProperties(pCfg);
 }
 
-void KviClassEditorWindow::loadProperties(KviConfig * pCfg)
+void KviClassEditorWindow::loadProperties(KviConfigurationFile * pCfg)
 {
 	m_pEditor->loadProperties(pCfg);
 }
diff --git a/src/modules/classeditor/classeditor.h b/src/modules/classeditor/classeditor.h
index 21c5589ba..b1418cdcc 100644
--- a/src/modules/classeditor/classeditor.h
+++ b/src/modules/classeditor/classeditor.h
@@ -31,10 +31,10 @@
 */
 
 #include "kvi_window.h"
-#include "kvi_string.h"
-#include "kvi_pointerlist.h"
+#include "KviCString.h"
+#include "KviPointerList.h"
 #include "kvi_tal_popupmenu.h"
-#include "kvi_heapobject.h"
+#include "KviHeapObject.h"
 #include "kvi_kvs_object_class.h"
 
 #include <QWidget>
@@ -298,14 +298,14 @@ public:
 	* \param pCfg The configuration file
 	* \return void
 	*/
-	virtual void saveProperties(KviConfig * pCfg);
+	virtual void saveProperties(KviConfigurationFile * pCfg);
 	
 	/**
 	* \brief Called to load the window properties
 	* \param pCfg The configuration file
 	* \return void
 	*/
-	virtual void loadProperties(KviConfig * pCfg);
+	virtual void loadProperties(KviConfigurationFile * pCfg);
 	
 	/**
 	* \brief Builds the class!
@@ -505,14 +505,14 @@ protected:
 	* \param pCfg The configuration file
 	* \return void
 	*/
-	virtual void saveProperties(KviConfig * pCfg);
+	virtual void saveProperties(KviConfigurationFile * pCfg);
 	
 	/**
 	* \brief Called to load the window properties
 	* \param pCfg The configuration file
 	* \return void
 	*/
-	virtual void loadProperties(KviConfig * pCfg);
+	virtual void loadProperties(KviConfigurationFile * pCfg);
 protected slots:
 	/**
 	* \brief Called when we click the cancel button
diff --git a/src/modules/classeditor/libkviclasseditor.cpp b/src/modules/classeditor/libkviclasseditor.cpp
index 94564c88d..d80c3b64d 100644
--- a/src/modules/classeditor/libkviclasseditor.cpp
+++ b/src/modules/classeditor/libkviclasseditor.cpp
@@ -25,7 +25,7 @@
 #include "classeditor.h"
 
 #include "kvi_module.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_frame.h"
 
 
diff --git a/src/modules/codetester/codetester.cpp b/src/modules/codetester/codetester.cpp
index c7f7a86be..13ad8ab21 100644
--- a/src/modules/codetester/codetester.cpp
+++ b/src/modules/codetester/codetester.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Mon Dec 23 2002 20:28:18 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2002-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2002-2010 Szymon Stefanek (pragma at kvirc dot net)
 //
 //   This program is FREE software. You can redistribute it and/or
 //   modify it under the linkss of the GNU General Public License
@@ -26,14 +26,14 @@
 
 #include "kvi_iconmanager.h"
 #include "kvi_options.h"
-#include "kvi_locale.h"
-#include "kvi_config.h"
+#include "KviLocale.h"
+#include "KviConfigurationFile.h"
 #include "kvi_filedialog.h"
-#include "kvi_fileutils.h"
+#include "KviFileUtils.h"
 #include "kvi_scripteditor.h"
 #include "kvi_app.h"
 #include "kvi_console.h"
-#include "kvi_parameterlist.h"
+#include "KviParameterList.h"
 #include "kvi_kvs_script.h"
 #include "kvi_kvs_variantlist.h"
 #include "kvi_tal_popupmenu.h"
@@ -114,7 +114,7 @@ void KviCodeTesterWindow::getConfigGroupName(QString &szName)
 	szName = "codetester";
 }
 
-void KviCodeTesterWindow::saveProperties(KviConfig *) //cfg
+void KviCodeTesterWindow::saveProperties(KviConfigurationFile *) //cfg
 {
 /*
 #ifdef COMPILE_SCRIPTTOOLBAR
@@ -125,7 +125,7 @@ void KviCodeTesterWindow::saveProperties(KviConfig *) //cfg
 */
 }
 
-void KviCodeTesterWindow::loadProperties(KviConfig *) //cfg
+void KviCodeTesterWindow::loadProperties(KviConfigurationFile *) //cfg
 {
 /*
 #ifdef COMPILE_SCRIPTTOOLBAR
@@ -133,7 +133,7 @@ void KviCodeTesterWindow::loadProperties(KviConfig *) //cfg
 	def.append(20);
 	def.append(80);
 	m_pEditor->setSizes(cfg->readIntListEntry("Sizes",def));
-	KviStr tmp = cfg->readEntry("LastRaw","");
+	KviCString tmp = cfg->readEntry("LastRaw","");
 	m_pEditor->editRaw(tmp);
 	//qDebug("LAST EDITED WAS %s",tmp.ptr());
 #endif // COMPILE_SCRIPTTOOLBAR
diff --git a/src/modules/codetester/codetester.h b/src/modules/codetester/codetester.h
index eb76e052b..04481de28 100644
--- a/src/modules/codetester/codetester.h
+++ b/src/modules/codetester/codetester.h
@@ -6,7 +6,7 @@
 //   Creation date : Mon Dec 23 2002 20:24:55 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2002-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2002-2010 Szymon Stefanek (pragma at kvirc dot net)
 //
 //   This program is FREE software. You can redistribute it and/or
 //   modify it under the linkss of the GNU General Public License
@@ -25,7 +25,7 @@
 //=============================================================================
 
 #include "kvi_window.h"
-#include "kvi_string.h"
+#include "KviCString.h"
 
 #include <QLineEdit>
 
@@ -62,8 +62,8 @@ protected:
 	virtual void fillCaptionBuffers();
 	virtual void resizeEvent(QResizeEvent *e);
 	virtual void getConfigGroupName(QString &szName);
-	virtual void saveProperties(KviConfig *);
-	virtual void loadProperties(KviConfig *);
+	virtual void saveProperties(KviConfigurationFile *);
+	virtual void loadProperties(KviConfigurationFile *);
 };
 
 #endif //_CODETESTER_H_
diff --git a/src/modules/codetester/libkvicodetester.cpp b/src/modules/codetester/libkvicodetester.cpp
index 5569f3d01..5e641bee6 100644
--- a/src/modules/codetester/libkvicodetester.cpp
+++ b/src/modules/codetester/libkvicodetester.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Mon 23 Dec 2002 20:23:59 2002 GMT by Szymon Stefanek
 //
 //   This toolbar is part of the KVirc irc client distribution
-//   Copyright (C) 2002-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2002-2010 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
@@ -25,9 +25,9 @@
 #include "codetester.h"
 
 #include "kvi_module.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_frame.h"
-#include "kvi_pointerlist.h"
+#include "KviPointerList.h"
 
 
 KviPointerList<KviCodeTesterWindow> * g_pCodeTesterWindowList = 0;
diff --git a/src/modules/config/libkviconfig.cpp b/src/modules/config/libkviconfig.cpp
index e5383e72d..685d2db51 100644
--- a/src/modules/config/libkviconfig.cpp
+++ b/src/modules/config/libkviconfig.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Thu Jan 31 2002 22:50:12 GMT by Szymon Stefanek
 //
 //   This config is part of the KVirc irc client distribution
-//   Copyright (C) 2002-2008 Szymon Stefanek (pragma@kvirc.net)
+//   Copyright (C) 2002-2010 Szymon Stefanek (pragma@kvirc.net)
 //
 //   This program is FREE software. You can redistribute it and/or
 //   modify it under the terms of the GNU General Public License
@@ -23,14 +23,14 @@
 //=============================================================================
 
 #include "kvi_module.h"
-#include "kvi_string.h"
-#include "kvi_config.h"
-#include "kvi_fileutils.h"
+#include "KviCString.h"
+#include "KviConfigurationFile.h"
+#include "KviFileUtils.h"
 #include "kvi_app.h"
-#include "kvi_locale.h"
-#include "kvi_pointerhashtable.h"
+#include "KviLocale.h"
+#include "KviPointerHashTable.h"
 
-static KviPointerHashTable<QString,KviConfig> * g_pConfigDict = 0;
+static KviPointerHashTable<QString,KviConfigurationFile> * g_pConfigDict = 0;
 static int g_iNextConfigId = 0;
 
 /*
@@ -89,15 +89,15 @@ static bool config_kvs_fnc_open(KviKvsModuleFunctionCall * c)
 		KVSM_PARAMETER("mode",KVS_PT_STRING,KVS_PF_OPTIONAL,szMode)
 	KVSM_PARAMETERS_END(c)
 
-	KviConfig::FileMode fileMode;
+	KviConfigurationFile::FileMode fileMode;
 
 	if(szMode.contains('r'))
 	{
-		if(szMode.contains('w'))fileMode = KviConfig::ReadWrite;
-		else fileMode = KviConfig::Read;
+		if(szMode.contains('w'))fileMode = KviConfigurationFile::ReadWrite;
+		else fileMode = KviConfigurationFile::Read;
 	} else {
-		if(szMode.contains('w'))fileMode = KviConfig::Write;
-		else fileMode = KviConfig::ReadWrite;
+		if(szMode.contains('w'))fileMode = KviConfigurationFile::Write;
+		else fileMode = KviConfigurationFile::ReadWrite;
 	}
 
 	KviFileUtils::adjustFilePath(szFile);
@@ -106,13 +106,13 @@ static bool config_kvs_fnc_open(KviKvsModuleFunctionCall * c)
 	if(KviFileUtils::isAbsolutePath(szFile))szAbsFile = szFile;
 	else g_pApp->getLocalKvircDirectory(szAbsFile,KviApp::ConfigScripts,szFile,true);
 
-	KviPointerHashTableIterator<QString,KviConfig> it(*g_pConfigDict);
+	KviPointerHashTableIterator<QString,KviConfigurationFile> it(*g_pConfigDict);
 	while(it.current())
 	{
 		if(KviQString::equalCI(it.current()->fileName(),szAbsFile))
 		{
 			c->returnValue()->setString(it.currentKey());
-			if(it.current()->readOnly() && (fileMode & KviConfig::Write))
+			if(it.current()->readOnly() && (fileMode & KviConfigurationFile::Write))
 			{
 				it.current()->setReadOnly(false);
 			}
@@ -121,7 +121,7 @@ static bool config_kvs_fnc_open(KviKvsModuleFunctionCall * c)
 		++it;
 	}
 
-	KviConfig * cfg = new KviConfig(szAbsFile,fileMode);
+	KviConfigurationFile * cfg = new KviConfigurationFile(szAbsFile,fileMode);
 	g_iNextConfigId++;
 	QString tmp = QString("%1").arg(g_iNextConfigId);
 	g_pConfigDict->insert(tmp,cfg);
@@ -162,7 +162,7 @@ static bool config_kvs_fnc_id(KviKvsModuleFunctionCall * c)
 	if(KviFileUtils::isAbsolutePath(szFile))szAbsFile = szFile;
 	else g_pApp->getLocalKvircDirectory(szAbsFile,KviApp::ConfigScripts,szFile,true);
 
-	KviPointerHashTableIterator<QString,KviConfig> it(*g_pConfigDict);
+	KviPointerHashTableIterator<QString,KviConfigurationFile> it(*g_pConfigDict);
 	while(it.current())
 	{
 		if(KviQString::equalCI(it.current()->fileName(),szAbsFile))
@@ -210,7 +210,7 @@ static bool config_kvs_fnc_read(KviKvsModuleFunctionCall * c)
 		KVSM_PARAMETER("default",KVS_PT_STRING,KVS_PF_OPTIONAL,szDefault)
 	KVSM_PARAMETERS_END(c)
 
-	KviConfig * cfg = g_pConfigDict->find(szId);
+	KviConfigurationFile * cfg = g_pConfigDict->find(szId);
 
 	if(cfg)
 	{
@@ -246,7 +246,7 @@ static bool config_kvs_fnc_section(KviKvsModuleFunctionCall * c)
 		KVSM_PARAMETER("id",KVS_PT_STRING,0,szId)
 	KVSM_PARAMETERS_END(c)
 
-	KviConfig * cfg = g_pConfigDict->find(szId);
+	KviConfigurationFile * cfg = g_pConfigDict->find(szId);
 
 	if(cfg)
 	{
@@ -284,7 +284,7 @@ static bool config_kvs_fnc_readonly(KviKvsModuleFunctionCall * c)
 		KVSM_PARAMETER("id",KVS_PT_STRING,0,szId)
 	KVSM_PARAMETERS_END(c)
 
-	KviConfig * cfg = g_pConfigDict->find(szId);
+	KviConfigurationFile * cfg = g_pConfigDict->find(szId);
 
 	if(cfg)
 	{
@@ -322,7 +322,7 @@ static bool config_kvs_fnc_filename(KviKvsModuleFunctionCall * c)
 		KVSM_PARAMETER("id",KVS_PT_STRING,0,szId)
 	KVSM_PARAMETERS_END(c)
 
-	KviConfig * cfg = g_pConfigDict->find(szId);
+	KviConfigurationFile * cfg = g_pConfigDict->find(szId);
 
 	if(cfg)
 	{
@@ -359,7 +359,7 @@ static bool config_kvs_fnc_hassection(KviKvsModuleFunctionCall * c)
 		KVSM_PARAMETER("id",KVS_PT_STRING,0,szSect)
 	KVSM_PARAMETERS_END(c)
 
-	KviConfig * cfg = g_pConfigDict->find(szId);
+	KviConfigurationFile * cfg = g_pConfigDict->find(szId);
 
 	if(cfg)
 	{
@@ -395,11 +395,11 @@ static bool config_kvs_fnc_sectionlist(KviKvsModuleFunctionCall * c)
 		KVSM_PARAMETER("id",KVS_PT_STRING,0,szId)
 	KVSM_PARAMETERS_END(c)
 
-	KviConfig * cfg = g_pConfigDict->find(szId);
+	KviConfigurationFile * cfg = g_pConfigDict->find(szId);
 
 	if(cfg)
 	{
-		KviConfigIterator it(*(cfg->dict()));
+		KviConfigurationFileIterator it(*(cfg->dict()));
 		KviKvsArray* pArray = new KviKvsArray();
 		int id=0;
 		while(it.current())
@@ -439,14 +439,14 @@ static bool config_kvs_fnc_keylist(KviKvsModuleFunctionCall * c)
 		KVSM_PARAMETER("id",KVS_PT_STRING,0,szId)
 	KVSM_PARAMETERS_END(c)
 
-	KviConfig * cfg = g_pConfigDict->find(szId);
+	KviConfigurationFile * cfg = g_pConfigDict->find(szId);
 
 	if(cfg)
 	{
-		KviConfigGroup * d = cfg->dict()->find(cfg->group());
+		KviConfigurationFileGroup * d = cfg->dict()->find(cfg->group());
 		if(!d)return true;
 
-		KviConfigGroupIterator it(*d);
+		KviConfigurationFileGroupIterator it(*d);
 
 		KviKvsArray* pArray = new KviKvsArray();
 		int id=0;
@@ -487,7 +487,7 @@ static bool config_kvs_fnc_filelist(KviKvsModuleFunctionCall * c)
 	KviKvsArray* pArray = new KviKvsArray();
 	int id=0;
 
-	KviPointerHashTableIterator<QString,KviConfig> it(*g_pConfigDict);
+	KviPointerHashTableIterator<QString,KviConfigurationFile> it(*g_pConfigDict);
 	while(it.current())
 	{
 		pArray->set(id++, new KviKvsVariant(it.currentKey()));
@@ -527,7 +527,7 @@ static bool config_kvs_cmd_close(KviKvsModuleCommandCall * c)
 		KVSM_PARAMETER("id",KVS_PT_STRING,0,szId)
 	KVSM_PARAMETERS_END(c)
 
-	KviConfig * cfg = g_pConfigDict->find(szId);
+	KviConfigurationFile * cfg = g_pConfigDict->find(szId);
 
 	if(cfg)
 	{
@@ -582,7 +582,7 @@ static bool config_kvs_cmd_flush(KviKvsModuleCommandCall * c)
 		KVSM_PARAMETER("id",KVS_PT_STRING,0,szId)
 	KVSM_PARAMETERS_END(c)
 
-	KviConfig * cfg = g_pConfigDict->find(szId);
+	KviConfigurationFile * cfg = g_pConfigDict->find(szId);
 
 	if(cfg)
 	{
@@ -627,7 +627,7 @@ static bool config_kvs_cmd_clear(KviKvsModuleCommandCall * c)
 		KVSM_PARAMETER("id",KVS_PT_STRING,0,szId)
 	KVSM_PARAMETERS_END(c)
 
-	KviConfig * cfg = g_pConfigDict->find(szId);
+	KviConfigurationFile * cfg = g_pConfigDict->find(szId);
 
 	if(cfg)
 	{
@@ -671,7 +671,7 @@ static bool config_kvs_cmd_clearsection(KviKvsModuleCommandCall * c)
 		KVSM_PARAMETER("section",KVS_PT_STRING,0,szSect)
 	KVSM_PARAMETERS_END(c)
 
-	KviConfig * cfg = g_pConfigDict->find(szId);
+	KviConfigurationFile * cfg = g_pConfigDict->find(szId);
 
 	if(cfg)
 	{
@@ -721,7 +721,7 @@ static bool config_kvs_cmd_write(KviKvsModuleCommandCall * c)
 		KVSM_PARAMETER("value",KVS_PT_STRING,0,szVal)
 	KVSM_PARAMETERS_END(c)
 
-	KviConfig * cfg = g_pConfigDict->find(szId);
+	KviConfigurationFile * cfg = g_pConfigDict->find(szId);
 
 	if(cfg)
 	{
@@ -767,7 +767,7 @@ static bool config_kvs_cmd_setsection(KviKvsModuleCommandCall * c)
 		KVSM_PARAMETER("section",KVS_PT_STRING,0,szSect)
 	KVSM_PARAMETERS_END(c)
 
-	KviConfig * cfg = g_pConfigDict->find(szId);
+	KviConfigurationFile * cfg = g_pConfigDict->find(szId);
 
 	if(cfg)
 	{
@@ -839,7 +839,7 @@ static bool config_kvs_cmd_setsection(KviKvsModuleCommandCall * c)
 
 static bool config_module_init(KviModule * m)
 {
-	g_pConfigDict = new KviPointerHashTable<QString,KviConfig>;
+	g_pConfigDict = new KviPointerHashTable<QString,KviConfigurationFile>;
 	g_pConfigDict->setAutoDelete(true);
 
 	KVSM_REGISTER_FUNCTION(m,"open",config_kvs_fnc_open);
diff --git a/src/modules/context/libkvicontext.cpp b/src/modules/context/libkvicontext.cpp
index bd3118be8..6e174fde1 100644
--- a/src/modules/context/libkvicontext.cpp
+++ b/src/modules/context/libkvicontext.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Wed Jan 02 2007 03:04:12 GMT by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2007-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2007-2010 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
@@ -25,14 +25,14 @@
 //#warning: FIXME: Incomplete documentation ('example', etc)
 
 #include "kvi_module.h"
-#include "kvi_locale.h"
-#include "kvi_qstring.h"
+#include "KviLocale.h"
+#include "KviQString.h"
 #include "kvi_window.h"
 #include "kvi_frame.h"
 #include "kvi_console.h"
 #include "kvi_app.h"
-#include "kvi_ircserver.h"
-#include "kvi_network.h"
+#include "KviIrcServer.h"
+#include "KviNetwork.h"
 #include "kvi_irccontext.h"
 #include "kvi_ircconnection.h"
 #include "kvi_ircconnectionserverinfo.h"
diff --git a/src/modules/dcc/adpcmcodec.cpp b/src/modules/dcc/adpcmcodec.cpp
index 28f35f948..ee1084c22 100644
--- a/src/modules/dcc/adpcmcodec.cpp
+++ b/src/modules/dcc/adpcmcodec.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Wed Aug 22 19:12:46 2001 GMT 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-2010 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
diff --git a/src/modules/dcc/adpcmcodec.h b/src/modules/dcc/adpcmcodec.h
index dae0651ed..6846da72b 100644
--- a/src/modules/dcc/adpcmcodec.h
+++ b/src/modules/dcc/adpcmcodec.h
@@ -6,7 +6,7 @@
 //   Creation date : Wed Aug 22 19:12:46 2001 GMT 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-2010 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
diff --git a/src/modules/dcc/broker.cpp b/src/modules/dcc/broker.cpp
index 0b389f711..5d4c8c4f8 100644
--- a/src/modules/dcc/broker.cpp
+++ b/src/modules/dcc/broker.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Tue Sep 19 09 2000 10:21:54 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -40,14 +40,14 @@
 
 #include "kvi_app.h"
 #include "kvi_frame.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_options.h"
 #include "kvi_console.h"
-#include "kvi_fileutils.h"
+#include "KviFileUtils.h"
 #include "kvi_out.h"
-#include "kvi_mediatype.h"
+#include "KviMediaType.h"
 #include "kvi_ircconnection.h"
-#include "kvi_sharedfiles.h"
+#include "KviSharedFilesManager.h"
 
 #include <QFileInfo>
 #include <QString>
@@ -319,7 +319,7 @@ void KviDccBroker::executeChat(KviDccBox *box,KviDccDescriptor * dcc)
 		dcc->setConsole(g_pApp->activeConsole());
 	}
 
-	KviStr szSubProto = dcc->szType;
+	KviCString szSubProto = dcc->szType;
 	szSubProto.toLower();
 
 	QString tmp = QString("dcc: %1 %2@%3:%4").arg(szSubProto.ptr(), dcc->szNick, dcc->szIp, dcc->szPort);
@@ -373,7 +373,7 @@ void KviDccBroker::activeVoiceExecute(KviDccBox *box,KviDccDescriptor * dcc)
 		dcc->setConsole(g_pApp->activeConsole());
 	}
 
-	KviStr tmp(KviStr::Format,"dcc: voice %s@%s:%s",dcc->szNick.toUtf8().data(),dcc->szIp.toUtf8().data(),dcc->szPort.toUtf8().data());
+	KviCString tmp(KviCString::Format,"dcc: voice %s@%s:%s",dcc->szNick.toUtf8().data(),dcc->szIp.toUtf8().data(),dcc->szPort.toUtf8().data());
 	KviDccVoice * v = new KviDccVoice(dcc->console()->frame(),dcc,tmp.ptr());
 
 	bool bMinimized = dcc->bOverrideMinimize ? dcc->bShowMinimized : \
@@ -393,7 +393,7 @@ void KviDccBroker::activeVoiceExecute(KviDccBox *box,KviDccDescriptor * dcc)
 
 void KviDccBroker::passiveVoiceExecute(KviDccDescriptor * dcc)
 {
-	KviStr tmp(KviStr::Format,"dcc: voice %s@%s:%s",dcc->szNick.toUtf8().data(),dcc->szIp.toUtf8().data(),dcc->szPort.toUtf8().data());
+	KviCString tmp(KviCString::Format,"dcc: voice %s@%s:%s",dcc->szNick.toUtf8().data(),dcc->szIp.toUtf8().data(),dcc->szPort.toUtf8().data());
 	KviDccVoice * v = new KviDccVoice(dcc->console()->frame(),dcc,tmp.ptr());
 	//#warning "Create minimized dcc voice ?... or maybe it's too much ? :)"
 	bool bMinimized = dcc->bOverrideMinimize ? dcc->bShowMinimized : KVI_OPTION_BOOL(KviOption_boolCreateMinimizedDccChat);
@@ -443,7 +443,7 @@ void KviDccBroker::activeVideoExecute(KviDccBox *box,KviDccDescriptor * dcc)
 		dcc->setConsole(g_pApp->activeConsole());
 	}
 
-	KviStr tmp(KviStr::Format,"dcc: video %s@%s:%s",dcc->szNick.toUtf8().data(),dcc->szIp.toUtf8().data(),dcc->szPort.toUtf8().data());
+	KviCString tmp(KviCString::Format,"dcc: video %s@%s:%s",dcc->szNick.toUtf8().data(),dcc->szIp.toUtf8().data(),dcc->szPort.toUtf8().data());
 	KviDccVideo * v = new KviDccVideo(dcc->console()->frame(),dcc,tmp.ptr());
 
 	bool bMinimized = dcc->bOverrideMinimize ? dcc->bShowMinimized : \
@@ -468,7 +468,7 @@ void KviDccBroker::activeVideoExecute(KviDccBox *,KviDccDescriptor *)
 #ifndef COMPILE_DISABLE_DCC_VIDEO
 void KviDccBroker::passiveVideoExecute(KviDccDescriptor * dcc)
 {
-	KviStr tmp(KviStr::Format,"dcc: video %s@%s:%s",dcc->szNick.toUtf8().data(),dcc->szIp.toUtf8().data(),dcc->szPort.toUtf8().data());
+	KviCString tmp(KviCString::Format,"dcc: video %s@%s:%s",dcc->szNick.toUtf8().data(),dcc->szIp.toUtf8().data(),dcc->szPort.toUtf8().data());
 	KviDccVideo * v = new KviDccVideo(dcc->console()->frame(),dcc,tmp.ptr());
 	//#warning "Create minimized dcc video ?... or maybe it's too much ? :)"
 	bool bMinimized = dcc->bOverrideMinimize ? dcc->bShowMinimized : KVI_OPTION_BOOL(KviOption_boolCreateMinimizedDccChat);
@@ -524,7 +524,7 @@ void KviDccBroker::activeCanvasExecute(KviDccBox *box,KviDccDescriptor * dcc)
 		dcc->setConsole(g_pApp->activeConsole());
 	}
 
-	KviStr tmp(KviStr::Format,"dcc: canvas %s@%s:%s",dcc->szNick.toUtf8().data(),dcc->szIp.toUtf8().data(),dcc->szPort.toUtf8().data());
+	KviCString tmp(KviCString::Format,"dcc: canvas %s@%s:%s",dcc->szNick.toUtf8().data(),dcc->szIp.toUtf8().data(),dcc->szPort.toUtf8().data());
 	KviDccCanvas * cnv = new KviDccCanvas(dcc->console()->frame(),dcc,tmp.ptr());
 
 	//#warning "This option should be dedicated to Dcc Canvas!....for now we are using the DccChat options"
@@ -548,7 +548,7 @@ void KviDccBroker::activeCanvasExecute(KviDccBox *,KviDccDescriptor *)
 #ifdef COMPILE_DCC_CANVAS
 void KviDccBroker::passiveCanvasExecute(KviDccDescriptor * dcc)
 {
-	KviStr tmp(KviStr::Format,"dcc: canvas %s@%s:%s",dcc->szNick.toUtf8().data(),dcc->szIp.toUtf8().data(),dcc->szPort.toUtf8().data());
+	KviCString tmp(KviCString::Format,"dcc: canvas %s@%s:%s",dcc->szNick.toUtf8().data(),dcc->szIp.toUtf8().data(),dcc->szPort.toUtf8().data());
 	KviDccCanvas * cnv = new KviDccCanvas(dcc->console()->frame(),dcc,tmp.ptr());
 	//#warning "This option should be dedicated to Dcc Canvas!....for now we are using the DccChat options"
 	bool bMinimized = dcc->bOverrideMinimize ? dcc->bShowMinimized : KVI_OPTION_BOOL(KviOption_boolCreateMinimizedDccChat);
@@ -823,10 +823,10 @@ void KviDccBroker::renameDccSendFile(KviDccBox *box,KviDccDescriptor * dcc)
 
 	if(QFileInfo(dcc->szLocalFileName).exists())
 	{
-		KviStr szOrig = dcc->szLocalFileName;
+		KviCString szOrig = dcc->szLocalFileName;
 		int i = 1;
 		do {
-			KviStr szNum;
+			KviCString szNum;
 			szNum.setNum(i);
 			int idx = szOrig.findLastIdx('.');
 			if(idx != -1)
@@ -967,7 +967,7 @@ bool KviDccBroker::handleResumeRequest(KviDccRequest * dcc,const char * filename
 			// ok!
 			t->m_uResumePosition = filePos;
 
-			KviStr szBuffy;
+			KviCString szBuffy;
 			KviServerParser::encodeCtcpParameter(filename,szBuffy);
 
 			dcc->ctcpMsg->msg->console()->connection()->sendFmtData(
diff --git a/src/modules/dcc/broker.h b/src/modules/dcc/broker.h
index 338ebb853..8bd2535ff 100644
--- a/src/modules/dcc/broker.h
+++ b/src/modules/dcc/broker.h
@@ -6,7 +6,7 @@
 //   Creation date : Tue Sep 19 09 2000 10:20:01 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -27,10 +27,10 @@
 #include "descriptor.h"
 
 #include "kvi_settings.h"
-#include "kvi_string.h"
-#include "kvi_pointerlist.h"
+#include "KviCString.h"
+#include "KviPointerList.h"
 #include "kvi_sparser.h"
-#include "kvi_pointerhashtable.h"
+#include "KviPointerHashTable.h"
 
 #include <QDateTime>
 #include <QObject>
diff --git a/src/modules/dcc/canvas.cpp b/src/modules/dcc/canvas.cpp
index 2d66a98a0..ee9fb4b62 100644
--- a/src/modules/dcc/canvas.cpp
+++ b/src/modules/dcc/canvas.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Sun Jul 29 07 2001 20:23:13 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-2010 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
@@ -38,15 +38,15 @@
 	#include "kvi_input.h"
 	#include "kvi_ircview.h"
 	#include "kvi_iconmanager.h"
-	#include "kvi_locale.h"
+	#include "KviLocale.h"
 	#include "kvi_error.h"
 	#include "kvi_out.h"
 	#include "kvi_netutils.h"
 	#include "kvi_console.h"
 	#include "kvi_frame.h"
-	#include "kvi_malloc.h"
+	#include "KviMemory.h"
 	#include "kvi_memmove.h"
-	#include "kvi_thread.h"
+	#include "KviThread.h"
 	#include "kvi_ircsocket.h"
 	#include "kvi_settings.h"
 	#include "kvi_ircconnection.h"
@@ -135,7 +135,7 @@
 
 	void KviDccCanvas::fillCaptionBuffers()
 	{
-		KviStr tmp(KviStr::Format,"DCC Canvas %s@%s:%s",
+		KviCString tmp(KviCString::Format,"DCC Canvas %s@%s:%s",
 			m_pDescriptor->szNick.toUtf8().data(),m_pDescriptor->szIp.toUtf8().data(),m_pDescriptor->szPort.toUtf8().data());
 
 		m_szPlainTextCaption = tmp;
@@ -151,14 +151,14 @@
 		return g_pIconManager->getSmallIcon(KVI_SMALLICON_CANVAS);
 	}
 
-	void KviDccCanvas::getBaseLogFileName(KviStr &buffer)
+	void KviDccCanvas::getBaseLogFileName(KviCString &buffer)
 	{
 		buffer.sprintf("%s_%s_%s",m_pDescriptor->szNick.toUtf8().data(),m_pDescriptor->szIp.toUtf8().data(),m_pDescriptor->szPort.toUtf8().data());
 	}
 
 	void KviDccCanvas::ownMessage(const char * text, bool bUserFeedback)
 	{
-		KviStr buf(KviStr::Format,"%s\r\n",text);
+		KviCString buf(KviCString::Format,"%s\r\n",text);
 	//	m_pSlaveThread->sendRawData(buf.ptr(),buf.len());
 		
 		if(bUserFeedback)
@@ -169,7 +169,7 @@
 
 	void KviDccCanvas::ownAction(const char * text)
 	{
-		KviStr buf(KviStr::Format,"%cACTION %s%c\r\n",text);
+		KviCString buf(KviCString::Format,"%cACTION %s%c\r\n",text);
 	//	m_pSlaveThread->sendRawData(buf.ptr(),buf.len());
 		output(KVI_OUT_ACTION,"%Q %s",&(m_pDescriptor->szLocalNick),text);
 	}
@@ -190,7 +190,7 @@
 	//			break;
 	//			case KVI_DCC_THREAD_EVENT_DATA:
 	//			{
-	//				KviStr * d = ((KviThreadDataEvent<KviStr> *)e)->getData();
+	//				KviCString * d = ((KviThreadDataEvent<KviCString> *)e)->getData();
 	//				if(d->firstCharIs(0x01))
 	//				{
 	//					d->cutLeft(1);
@@ -207,7 +207,7 @@
 	//						{
 	//							if(cinf->pEngine->isCryptographicEngine() && (*(d->ptr()) == KVI_TEXT_CRYPT))
 	//							{
-	//								KviStr decryptedStuff;
+	//								KviCString decryptedStuff;
 	//								if(cinf->pEngine->decrypt(d->ptr() + 1,decryptedStuff))
 	//								{
 	//									m_pFrm->firstConsole()->outputPrivmsg(this,KVI_OUT_DCCCHATMSGCRYPTED,
@@ -226,7 +226,7 @@
 	//							} else {
 	//								if(!(cinf->pEngine->isCryptographicEngine()))
 	//								{
-	//									KviStr decryptedStuff;
+	//									KviCString decryptedStuff;
 	//									if(cinf->pEngine->decrypt(d->ptr(),decryptedStuff))
 	//									{
 	//										m_pFrm->firstConsole()->outputPrivmsg(this,KVI_OUT_DCCCHATMSG,
diff --git a/src/modules/dcc/canvas.h b/src/modules/dcc/canvas.h
index 6447fbac9..e27a7ca59 100644
--- a/src/modules/dcc/canvas.h
+++ b/src/modules/dcc/canvas.h
@@ -6,7 +6,7 @@
 //   Creation date : Sun Jul 29 07 2001 20:17:12 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-2010 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
@@ -32,8 +32,8 @@
 	#include "thread.h"
 
 	#include "kvi_window.h"
-	#include "kvi_string.h"
-	#include "kvi_pointerlist.h"
+	#include "KviCString.h"
+	#include "KviPointerList.h"
 
 	class KviDccMarshal;
 	class KviCanvasWidget;
@@ -53,7 +53,7 @@
 	protected:
 		virtual const QString &target();
 		virtual void fillCaptionBuffers();
-		virtual void getBaseLogFileName(KviStr &buffer);
+		virtual void getBaseLogFileName(KviCString &buffer);
 		virtual QPixmap * myIconPtr();
 		virtual void resizeEvent(QResizeEvent *e);
 		virtual QSize sizeHint() const;
diff --git a/src/modules/dcc/canvaswidget.cpp b/src/modules/dcc/canvaswidget.cpp
index 65c9678be..aa1095b34 100644
--- a/src/modules/dcc/canvaswidget.cpp
+++ b/src/modules/dcc/canvaswidget.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Mon Jul 30 07 2001 04:50:50 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-2010 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
@@ -25,8 +25,8 @@
 #include "canvaswidget.h"
 
 #ifdef COMPILE_DCC_CANVAS
-	#include "kvi_string.h"
-	#include "kvi_locale.h"
+	#include "KviCString.h"
+	#include "KviLocale.h"
 	#include "kvi_tal_popupmenu.h"
 
 	#include <QCursor>
@@ -1300,13 +1300,13 @@
 			break;
 			case QVariant::Font:
 			{
-				KviStr txt = ((QComboBox *)w)->currentText();
+				KviCString txt = ((QComboBox *)w)->currentText();
 				if(txt.hasData())
 				{
-					KviStr fam = txt;
+					KviCString fam = txt;
 					fam.cutFromFirst(',',true);
 					fam.trimmed();
-					KviStr psz = txt;
+					KviCString psz = txt;
 					psz.cutToFirst(',',true);
 					psz.trimmed();
 					bool bOk;
diff --git a/src/modules/dcc/canvaswidget.h b/src/modules/dcc/canvaswidget.h
index 5616e1729..c811ccfb6 100644
--- a/src/modules/dcc/canvaswidget.h
+++ b/src/modules/dcc/canvaswidget.h
@@ -6,7 +6,7 @@
 //   Creation date : Mon Jul 30 07 2001 04:49:49 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-2010 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
diff --git a/src/modules/dcc/chat.cpp b/src/modules/dcc/chat.cpp
index c1fdc03de..3ce235aaf 100644
--- a/src/modules/dcc/chat.cpp
+++ b/src/modules/dcc/chat.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Tue Sep 20 09 2000 15:13:13 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -36,24 +36,24 @@
 #include "kvi_input.h"
 #include "kvi_ircview.h"
 #include "kvi_iconmanager.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_error.h"
 #include "kvi_out.h"
 #include "kvi_netutils.h"
 #include "kvi_console.h"
 #include "kvi_frame.h"
-#include "kvi_malloc.h"
+#include "KviMemory.h"
 #include "kvi_memmove.h"
-#include "kvi_thread.h"
+#include "KviThread.h"
 #include "kvi_ircsocket.h"
 #include "kvi_settings.h"
 #include "kvi_socket.h"
 #include "kvi_app.h"
-#include "kvi_parameterlist.h"
+#include "KviParameterList.h"
 #include "kvi_ircconnection.h"
 #include "kvi_ircconnectionuserinfo.h"
 #include "kvi_kvs_eventtriggers.h"
-#include "kvi_mirccntrl.h"
+#include "KviMircCntrl.h"
 #include "kvi_tal_vbox.h"
 
 #include <QEvent>
@@ -62,7 +62,7 @@
 #include <QTextDocument> //for Qt::escape
 
 #ifdef COMPILE_CRYPT_SUPPORT
-	#include "kvi_crypt.h"
+	#include "KviCryptEngine.h"
 	#include "kvi_cryptcontroller.h"
 #endif
 
@@ -187,7 +187,7 @@ void KviDccChat::connectionInProgress()
 
 		if(m_pDescriptor->bSendRequest)
 		{
-			KviStr ip;
+			KviCString ip;
 			if(!m_pDescriptor->szFakeIp.isEmpty())
 			{
 				ip = m_pDescriptor->szFakeIp;
@@ -201,7 +201,7 @@ void KviDccChat::connectionInProgress()
 						// try to get the IP that the IRC server can see
 						if(m_pDescriptor->console())
 						{
-							KviStr tmp = m_pDescriptor->console()->connection() ? m_pDescriptor->console()->connection()->userInfo()->hostIp().toUtf8().data() : "";
+							KviCString tmp = m_pDescriptor->console()->connection() ? m_pDescriptor->console()->connection()->userInfo()->hostIp().toUtf8().data() : "";
 							if(tmp.hasData())
 							{
 								ip = tmp;
@@ -309,13 +309,13 @@ void KviDccChat::ownMessage(const QString &text, bool bUserFeedback)
 		{
 			if(*d != KVI_TEXT_CRYPTESCAPE)
 			{
-				KviStr encrypted;
+				KviCString encrypted;
 				cryptSessionInfo()->m_pEngine->setMaxEncryptLen(-1);
 				switch(cryptSessionInfo()->m_pEngine->encrypt(d,encrypted))
 				{
 					case KviCryptEngine::Encrypted:
 					{
-						KviStr buf(KviStr::Format,"%s\r\n",encrypted.ptr());
+						KviCString buf(KviCString::Format,"%s\r\n",encrypted.ptr());
 						m_pSlaveThread->sendRawData(buf.ptr(),buf.len());
 						if(bUserFeedback)
 							m_pFrm->firstConsole()->outputPrivmsg(this,KVI_OUT_OWNPRIVMSGCRYPTED,
@@ -325,7 +325,7 @@ void KviDccChat::ownMessage(const QString &text, bool bUserFeedback)
 					break;
 					case KviCryptEngine::Encoded:
 					{
-						KviStr buf(KviStr::Format,"%s\r\n",encrypted.ptr());
+						KviCString buf(KviCString::Format,"%s\r\n",encrypted.ptr());
 						m_pSlaveThread->sendRawData(buf.ptr(),buf.len());
 						if(bUserFeedback)
 						{
@@ -348,7 +348,7 @@ void KviDccChat::ownMessage(const QString &text, bool bUserFeedback)
 				return;
 			} else {
 				d++; //eat the escape code
-				KviStr buf(KviStr::Format,"%s\r\n",d);
+				KviCString buf(KviCString::Format,"%s\r\n",d);
 				QString tmp = text.right(text.length() - 1);
 				m_pSlaveThread->sendRawData(buf.ptr(),buf.len());
 				
@@ -361,7 +361,7 @@ void KviDccChat::ownMessage(const QString &text, bool bUserFeedback)
 		}
 	}
 #endif
-	KviStr buf(KviStr::Format,"%s\r\n",d);
+	KviCString buf(KviCString::Format,"%s\r\n",d);
 	m_pSlaveThread->sendRawData(buf.ptr(),buf.len());
 	
 	if(bUserFeedback)
@@ -393,7 +393,7 @@ void KviDccChat::ownAction(const QString &text)
 		QByteArray szData = encodeText(szTmpBuffer);
 		const char * d = szData.data();
 		if(!d)return;
-		KviStr buf(KviStr::Format,"%cACTION %s%c\r\n",0x01,d,0x01);
+		KviCString buf(KviCString::Format,"%cACTION %s%c\r\n",0x01,d,0x01);
 		m_pSlaveThread->sendRawData(buf.ptr(),buf.len());
 		output(KVI_OUT_ACTION,"%Q %Q",&(m_pDescriptor->szLocalNick),&szTmpBuffer);
 	} else {
@@ -420,8 +420,8 @@ bool KviDccChat::event(QEvent *e)
 			break;
 			case KVI_DCC_THREAD_EVENT_DATA:
 			{
-				KviStr * encoded = ((KviThreadDataEvent<KviStr> *)e)->getData();
-				KviStr d=KviStr(decodeText(encoded->ptr()));
+				KviCString * encoded = ((KviThreadDataEvent<KviCString> *)e)->getData();
+				KviCString d=KviCString(decodeText(encoded->ptr()));
 				if(d.firstCharIs(0x01))
 				{
 					d.cutLeft(1);
@@ -452,7 +452,7 @@ bool KviDccChat::event(QEvent *e)
 					{
 						if(cinf->m_bDoDecrypt)
 						{
-							KviStr decryptedStuff;
+							KviCString decryptedStuff;
 							switch(cinf->m_pEngine->decrypt(d.ptr(),decryptedStuff))
 							{
 								case KviCryptEngine::DecryptOkWasEncrypted:
@@ -628,7 +628,7 @@ void KviDccChatThread::run()
 			}
 			if(bCanRead)
 			{
-				data.buffer = (char *) kvi_realloc(data.buffer,(data.iLen + 512) * sizeof(char));
+				data.buffer = (char *) KviMemory::reallocate(data.buffer,(data.iLen + 512) * sizeof(char));
 				int readLen;
 #ifdef COMPILE_SSL_SUPPORT
 				if(m_pSSL)
@@ -643,7 +643,7 @@ void KviDccChatThread::run()
 				if(readLen > 0)
 				{
 					data.iLen += readLen;
-					data.buffer = (char *)kvi_realloc(data.buffer,data.iLen * sizeof(char));
+					data.buffer = (char *)KviMemory::reallocate(data.buffer,data.iLen * sizeof(char));
 					if(!handleIncomingData(&data,false))break; // non critical...
 				} else {
 
@@ -688,9 +688,9 @@ void KviDccChatThread::run()
 #endif
 					if(data.iLen > 0)
 					{
-						data.buffer = (char *)kvi_realloc(data.buffer,data.iLen * sizeof(char));
+						data.buffer = (char *)KviMemory::reallocate(data.buffer,data.iLen * sizeof(char));
 					} else {
-						kvi_free(data.buffer);
+						KviMemory::free(data.buffer);
 						data.buffer = 0;
 					}
 
@@ -709,7 +709,7 @@ void KviDccChatThread::run()
 out_of_the_loop:
 
 
-	if(data.iLen)kvi_free(data.buffer);
+	if(data.iLen)KviMemory::free(data.buffer);
 
 #ifdef COMPILE_SSL_SUPPORT
 	if(m_pSSL)
@@ -733,12 +733,12 @@ bool KviDccChatThread::handleIncomingData(KviDccThreadIncomingData * data,bool b
 	{
 		if((*aux == '\n') || (*aux == '\0'))
 		{
-			KviThreadDataEvent<KviStr> * e = new KviThreadDataEvent<KviStr>(KVI_DCC_THREAD_EVENT_DATA);
+			KviThreadDataEvent<KviCString> * e = new KviThreadDataEvent<KviCString>(KVI_DCC_THREAD_EVENT_DATA);
 			// The left part is len chars long
 			int len = aux - data->buffer;
 //			qDebug("LEN = %d, iLen = %d",len,data->iLen);
 //#warning "DO IT BETTER (the \r cutting)"
-			KviStr * s = new KviStr(data->buffer,len);
+			KviCString * s = new KviCString(data->buffer,len);
 			if(s->lastCharIs('\r'))s->cutRight(1);
 			e->setData(s);
 			// but we cut also \n (or \0)
@@ -752,13 +752,13 @@ bool KviDccChatThread::handleIncomingData(KviDccThreadIncomingData * data,bool b
 				// memmove the remaining part to the beginning
 				// aux points after \n or \0
 				kvi_memmove(data->buffer,aux,data->iLen);
-				data->buffer = (char *)kvi_realloc(data->buffer,data->iLen);
+				data->buffer = (char *)KviMemory::reallocate(data->buffer,data->iLen);
 				end = data->buffer + data->iLen;
 				aux = data->buffer;
 			} else {
 				// no more data in the buffer
 				KVI_ASSERT(data->iLen == 0);
-				kvi_free(data->buffer);
+				KviMemory::free(data->buffer);
 				data->buffer = end = aux = 0;
 			}
 			postEvent(parent(),e);
@@ -772,12 +772,12 @@ bool KviDccChatThread::handleIncomingData(KviDccThreadIncomingData * data,bool b
 		if(data->iLen > 0)
 		{
 			// in the last part there are no NULL and \n chars
-			KviThreadDataEvent<KviStr> * e = new KviThreadDataEvent<KviStr>(KVI_DCC_THREAD_EVENT_DATA);
-			KviStr * s = new KviStr(data->buffer,data->iLen);
+			KviThreadDataEvent<KviCString> * e = new KviThreadDataEvent<KviCString>(KVI_DCC_THREAD_EVENT_DATA);
+			KviCString * s = new KviCString(data->buffer,data->iLen);
 			if(s->lastCharIs('\r'))s->cutRight(1);
 			e->setData(s);
 			data->iLen = 0;
-			kvi_free(data->buffer);
+			KviMemory::free(data->buffer);
 			data->buffer = 0;
 			postEvent(parent(),e);
 		}
diff --git a/src/modules/dcc/chat.h b/src/modules/dcc/chat.h
index 8d5fdde7c..cd7745782 100644
--- a/src/modules/dcc/chat.h
+++ b/src/modules/dcc/chat.h
@@ -6,7 +6,7 @@
 //   Creation date : Tue Sep 20 09 2000 15:11:12 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -28,10 +28,10 @@
 #include "thread.h"
 #include "window.h"
 
-#include "kvi_databuffer.h"
-#include "kvi_pointerlist.h"
+#include "KviDataBuffer.h"
+#include "KviPointerList.h"
 #include "kvi_themedlabel.h"
-#include "kvi_string.h"
+#include "KviCString.h"
 #include "kvi_window.h"
 
 #ifdef COMPILE_SSL_SUPPORT
diff --git a/src/modules/dcc/codec.cpp b/src/modules/dcc/codec.cpp
index a822fb65d..5905a4eed 100644
--- a/src/modules/dcc/codec.cpp
+++ b/src/modules/dcc/codec.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Sun Aug 26 04:19:36 2001 GMT 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-2010 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
diff --git a/src/modules/dcc/codec.h b/src/modules/dcc/codec.h
index 62d5161c3..740740676 100644
--- a/src/modules/dcc/codec.h
+++ b/src/modules/dcc/codec.h
@@ -6,7 +6,7 @@
 //   Creation date : Sun Aug 26 04:19:34 2001 GMT 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-2010 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
@@ -24,9 +24,9 @@
 //
 //=============================================================================
 
-#include "kvi_string.h"
-#include "kvi_oggtheora.h"
-#include "kvi_databuffer.h"
+#include "KviCString.h"
+#include "KviTheoraDecoder.h"
+#include "KviDataBuffer.h"
 
 class KviDccVoiceCodec
 {
@@ -34,7 +34,7 @@ public:
 	KviDccVoiceCodec();
 	virtual ~KviDccVoiceCodec();
 protected:
-	KviStr m_szName;
+	KviCString m_szName;
 public:
 	const char * name();
 	virtual void encode(KviDataBuffer * signal,KviDataBuffer * stream);
@@ -61,7 +61,7 @@ public:
 	KviDccVideoCodec();
 	virtual ~KviDccVideoCodec();
 protected:
-	KviStr m_szName;
+	KviCString m_szName;
 public:
 	const char * name();
 	virtual void encodeVideo(KviDataBuffer * videoSignal, KviDataBuffer * stream);
diff --git a/src/modules/dcc/descriptor.cpp b/src/modules/dcc/descriptor.cpp
index 237acfb5d..e3d841c37 100644
--- a/src/modules/dcc/descriptor.cpp
+++ b/src/modules/dcc/descriptor.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Tue Jul 23 01:11:54 2002 GMT by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2002-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2002-2010 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
@@ -26,7 +26,7 @@
 #include "send.h"
 #include "window.h"
 
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_kvs_eventtriggers.h"
 #include "kvi_window.h"
 #include "kvi_app.h"
diff --git a/src/modules/dcc/descriptor.h b/src/modules/dcc/descriptor.h
index d799c8658..944e063af 100644
--- a/src/modules/dcc/descriptor.h
+++ b/src/modules/dcc/descriptor.h
@@ -6,7 +6,7 @@
 //   Creation date : Tue Jul 23 01:11:52 2002 GMT by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2002-2008 Szymon Stefanek (oragma at kvirc dot net)
+//   Copyright (C) 2002-2010 Szymon Stefanek (oragma 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
@@ -24,9 +24,9 @@
 //
 //=============================================================================
 
-#include "kvi_string.h"
+#include "KviCString.h"
 #include "kvi_console.h"
-#include "kvi_pointerhashtable.h"
+#include "KviPointerHashTable.h"
 
 class KviDccWindow;
 class KviDccFileTransfer;
@@ -41,7 +41,7 @@ protected:
 	KviConsole         * m_pConsole;
 
 	// mIrc zero port reverse send/chat extension
-	KviStr               m_szZeroPortRequestTag;
+	KviCString               m_szZeroPortRequestTag;
 
 	unsigned int         m_uId; // this dcc session ID
 	QString              m_szId;
@@ -64,7 +64,7 @@ public:
 	// mIrc zero port reverse send/chat extension
 	bool isZeroPortRequest() const { return m_szZeroPortRequestTag.hasData(); };
 	const char * zeroPortRequestTag() const { return m_szZeroPortRequestTag.ptr(); };
-	void setZeroPortRequestTag(const KviStr &szTag){ m_szZeroPortRequestTag = szTag; };
+	void setZeroPortRequestTag(const KviCString &szTag){ m_szZeroPortRequestTag = szTag; };
 
 	unsigned int id() const { return m_uId; };
 	const QString & idString() const { return m_szId; };
@@ -127,7 +127,7 @@ public:
 	bool            bIsIncomingAvatar; // It is an Incoming Avatar DCC SEND ?
 
 	// DCC VOICE
-	KviStr          szCodec;           // codec name
+	KviCString          szCodec;           // codec name
 	int             iSampleRate;       // Sample rate
 public:
 	QString protocol() const { return szType; };
diff --git a/src/modules/dcc/dialogs.cpp b/src/modules/dcc/dialogs.cpp
index bee5618d5..da3715274 100644
--- a/src/modules/dcc/dialogs.cpp
+++ b/src/modules/dcc/dialogs.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Tue Sep 19 09 2000 15:23:12 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -24,7 +24,7 @@
 
 #include "dialogs.h"
 
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_iconmanager.h"
 #include "kvi_app.h"
 
diff --git a/src/modules/dcc/dialogs.h b/src/modules/dcc/dialogs.h
index 06e314fde..6b2115787 100644
--- a/src/modules/dcc/dialogs.h
+++ b/src/modules/dcc/dialogs.h
@@ -6,7 +6,7 @@
 //   Creation date : Tue Sep 19 09 2000 15:17:22 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
diff --git a/src/modules/dcc/gsmcodec.cpp b/src/modules/dcc/gsmcodec.cpp
index 4b9bf2f45..38b4a4142 100644
--- a/src/modules/dcc/gsmcodec.cpp
+++ b/src/modules/dcc/gsmcodec.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Wed Aug 22 19:12:55 2001 GMT 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-2010 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
diff --git a/src/modules/dcc/gsmcodec.h b/src/modules/dcc/gsmcodec.h
index c18288f0e..2392e750b 100644
--- a/src/modules/dcc/gsmcodec.h
+++ b/src/modules/dcc/gsmcodec.h
@@ -6,7 +6,7 @@
 //   Creation date : Wed Aug 22 19:12:54 2001 GMT 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-2010 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
diff --git a/src/modules/dcc/libkvidcc.cpp b/src/modules/dcc/libkvidcc.cpp
index 79f1727a9..edf0c0214 100644
--- a/src/modules/dcc/libkvidcc.cpp
+++ b/src/modules/dcc/libkvidcc.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Wed Sep 09 2000 20:59:01 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -32,10 +32,10 @@
 
 #include "kvi_debug.h"
 #include "kvi_settings.h"
-#include "kvi_string.h"
+#include "KviCString.h"
 #include "kvi_module.h"
 #include "kvi_sparser.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_out.h"
 #include "kvi_console.h"
 #include "kvi_netutils.h"
@@ -44,7 +44,7 @@
 #include "kvi_error.h"
 #include "kvi_options.h"
 #include "kvi_defaults.h"
-#include "kvi_mirccntrl.h"
+#include "KviMircCntrl.h"
 #include "kvi_app.h"
 #include "kvi_ircconnection.h"
 #include "kvi_ircconnectionuserinfo.h"
@@ -953,7 +953,7 @@ static bool dcc_kvs_cmd_get(KviKvsModuleCommandCall * c)
 		szFileName.append('"');
 	}
 
-	KviStr szDCC("GET");
+	KviCString szDCC("GET");
 #ifdef COMPILE_SSL_SUPPORT
 	if(c->switches()->find('s',"ssl"))szDCC.prepend('S');
 #else
@@ -1254,7 +1254,7 @@ static bool dcc_module_cmd_canvas(KviModule *m,KviCommand *c)
 {
 	ENTER_STACK_FRAME(c,"dcc_module_cmd_canvas");
 
-	KviStr target;
+	KviCString target;
 	if(!g_pUserParser->parseCmdFinalPart(c,target))return false;
 
 	if(target.isEmpty())return c->error(KviError_notEnoughParameters,"%s",__tr_ctx("Missing target nickname","dcc"));
@@ -1272,7 +1272,7 @@ static bool dcc_module_cmd_canvas(KviModule *m,KviCommand *c)
 
 	if(d->bOverrideMinimize)
 	{
-		KviStr tmpVal;
+		KviCString tmpVal;
 		if(!(c->getSwitchValue('m',tmpVal)))d->bShowMinimized = false;
 		else d->bShowMinimized = kvi_strEqualCI(tmpVal.ptr(),"1");
 	}
diff --git a/src/modules/dcc/marshal.cpp b/src/modules/dcc/marshal.cpp
index 6f2327c44..b97d0ee55 100644
--- a/src/modules/dcc/marshal.cpp
+++ b/src/modules/dcc/marshal.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Sun Sep 17 2000 15:59:11 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -28,10 +28,10 @@
 #include "kvi_netutils.h"
 #include "kvi_error.h"
 #include "kvi_options.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_memmove.h"
 #include "kvi_socket.h"
-#include "kvi_fileutils.h"
+#include "KviFileUtils.h"
 
 #include <stdlib.h> //for exit()
 
@@ -624,7 +624,7 @@ void KviDccMarshal::doSSLHandshake(int)
 		break;
 		default:
 		{
-			KviStr buffer;
+			KviCString buffer;
 			while(m_pSSL->getLastErrorString(buffer))emit sslError(buffer.ptr());
 			reset();
 			emit error(KviError_SSLError);
diff --git a/src/modules/dcc/marshal.h b/src/modules/dcc/marshal.h
index dd5471ef7..4c1259daf 100644
--- a/src/modules/dcc/marshal.h
+++ b/src/modules/dcc/marshal.h
@@ -6,7 +6,7 @@
 //   Creation date : Sun Sep 17 2000 10:44:20 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -24,7 +24,7 @@
 //
 //=============================================================================
 
-#include "kvi_string.h"
+#include "KviCString.h"
 #include "kvi_sockettype.h"
 #include "kvi_inttypes.h"
 
diff --git a/src/modules/dcc/requests.cpp b/src/modules/dcc/requests.cpp
index 0d053c706..dbb8ebb93 100644
--- a/src/modules/dcc/requests.cpp
+++ b/src/modules/dcc/requests.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Tue Jul 23 02:44:38 2002 GMT by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2002-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2002-2010 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
@@ -37,10 +37,10 @@
 
 #include "kvi_debug.h"
 #include "kvi_settings.h"
-#include "kvi_string.h"
+#include "KviCString.h"
 #include "kvi_module.h"
 #include "kvi_sparser.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_out.h"
 #include "kvi_console.h"
 #include "kvi_netutils.h"
@@ -49,8 +49,8 @@
 #include "kvi_error.h"
 #include "kvi_options.h"
 #include "kvi_defaults.h"
-#include "kvi_sharedfiles.h"
-#include "kvi_mirccntrl.h"
+#include "KviSharedFilesManager.h"
+#include "KviMircCntrl.h"
 #include "kvi_app.h"
 #include "kvi_ircconnection.h"
 #include "kvi_ircconnectionuserinfo.h"
@@ -154,7 +154,7 @@ static void dcc_module_set_dcc_type(KviDccDescriptor * d,const char * szBaseType
 	if(d->bIsTdcc)d->szType.prepend('T');
 }
 
-static bool dcc_module_normalize_target_data(KviDccRequest * dcc,KviStr &ipaddr,KviStr &port)
+static bool dcc_module_normalize_target_data(KviDccRequest * dcc,KviCString &ipaddr,KviCString &port)
 {
 	if(!port.isUnsignedNum())
 	{
@@ -185,7 +185,7 @@ static bool dcc_module_normalize_target_data(KviDccRequest * dcc,KviStr &ipaddr,
 		}
 		ipaddr = tmp;
 	} else {
-		//FIXME: KviStr -> QString
+		//FIXME: KviCString -> QString
 		if(!KviNetUtils::stringIpToBinaryIp(QString(ipaddr),&addr))
 		{
 #ifdef COMPILE_IPV6_SUPPORT
@@ -270,7 +270,7 @@ static void dccModuleParseDccChat(KviDccRequest *dcc)
 		}
 	}
 
-	KviStr szExtensions = dcc->szType;
+	KviCString szExtensions = dcc->szType;
 	szExtensions.cutRight(4); // cut off CHAT
 
 #ifdef COMPILE_SSL_SUPPORT
@@ -475,7 +475,7 @@ static void dccModuleParseDccSend(KviDccRequest *dcc)
 		dcc->szParam1.cutToLast("%2F");
 	}
 
-	KviStr szExtensions = dcc->szType;
+	KviCString szExtensions = dcc->szType;
 	szExtensions.cutRight(4); // cut off SEND
 
 	bool bTurboExtension = szExtensions.contains('T',false);
@@ -626,7 +626,7 @@ static void dccModuleParseDccRecv(KviDccRequest * dcc)
 		dcc->szParam1.cutToLast('/');
 	}
 
-	KviStr szExtensions = dcc->szType;
+	KviCString szExtensions = dcc->szType;
 	szExtensions.cutRight(4); // cut off RECV
 
 	bool bTurboExtension = szExtensions.contains('T',false);
@@ -712,7 +712,7 @@ static void dccModuleParseDccRecv(KviDccRequest * dcc)
 			dcc->szParam1.ptr());
 		dcc->ctcpMsg->msg->console()->output(KVI_OUT_DCCMSG,
 			__tr2qs_ctx("The remote client is listening on interface %s and port %s","dcc"),dcc->szParam2.ptr(),dcc->szParam3.ptr());
-		KviStr szSwitches = "-c";
+		KviCString szSwitches = "-c";
 		if(bTurboExtension)szSwitches.prepend("-t ");
 #ifdef COMPILE_SSL_SUPPORT
 		if(bSSLExtension)szSwitches.prepend("-s ");
@@ -765,7 +765,7 @@ static void dccModuleParseDccRSend(KviDccRequest *dcc)
 		dcc->szParam1.cutToLast('/');
 	}
 
-	KviStr szExtensions = dcc->szType;
+	KviCString szExtensions = dcc->szType;
 	szExtensions.cutRight(4); // cut off SEND
 
 	bool bTurboExtension = szExtensions.contains('T',false);
@@ -848,7 +848,7 @@ static void dccModuleParseDccGet(KviDccRequest *dcc)
 	if(!dcc_module_check_limits(dcc))return;
 	if(!dcc_module_check_concurrent_transfers_limit(dcc))return;
 
-	KviStr szExtensions = dcc->szType;
+	KviCString szExtensions = dcc->szType;
 	szExtensions.cutRight(3); // cut off GET
 
 	bool bTurboExtension = szExtensions.contains('T',false);
@@ -888,7 +888,7 @@ static void dccModuleParseDccGet(KviDccRequest *dcc)
 	if(KVI_OPTION_BOOL(KviOption_boolCantAcceptIncomingDccConnections))
 	{
 		// we have to use DCC RSEND, otherwise it will not work
-		KviStr szSubproto("RSEND");
+		KviCString szSubproto("RSEND");
 		szSubproto.prepend(szExtensions);
 
 
diff --git a/src/modules/dcc/send.cpp b/src/modules/dcc/send.cpp
index 8d9c495c5..437890d3c 100644
--- a/src/modules/dcc/send.cpp
+++ b/src/modules/dcc/send.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Tue Sep 20 09 2000 15:14:14 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -35,20 +35,20 @@
 #include "kvi_options.h"
 #include "kvi_ircview.h"
 #include "kvi_iconmanager.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_error.h"
 #include "kvi_out.h"
 #include "kvi_netutils.h"
 #include "kvi_console.h"
 #include "kvi_frame.h"
-#include "kvi_malloc.h"
+#include "KviMemory.h"
 #include "kvi_memmove.h"
-#include "kvi_thread.h"
+#include "KviThread.h"
 #include "kvi_ircsocket.h"
-#include "kvi_mediatype.h"
+#include "KviMediaType.h"
 #include "kvi_socket.h"
 #include "kvi_kvs_eventtriggers.h"
-#include "kvi_parameterlist.h"
+#include "KviParameterList.h"
 #include "kvi_ircconnection.h"
 #include "kvi_ircconnectionuserinfo.h"
 #include "kvi_sparser.h"
@@ -87,7 +87,7 @@ extern KVIRC_API KviMediaManager * g_pMediaManager; // kvi_app.cpp
 static KviPointerList<KviDccFileTransfer> * g_pDccFileTransfers = 0;
 static QPixmap * g_pDccFileTransferIcon = 0;
 
-//#warning "The events that have a KviStr data pointer should become real classes, that take care of deleting the data pointer!"
+//#warning "The events that have a KviCString data pointer should become real classes, that take care of deleting the data pointer!"
 //#warning "Otherwise, when left undispatched we will be leaking memory (event class destroyed but not the data ptr)"
 
 KviDccRecvThread::KviDccRecvThread(QObject * par,kvi_socket_t fd,KviDccRecvThreadOptions * opt)
@@ -165,8 +165,8 @@ void KviDccRecvThread::updateStats()
 
 void KviDccRecvThread::postMessageEvent(const char * m)
 {
-	KviThreadDataEvent<KviStr> * e = new KviThreadDataEvent<KviStr>(KVI_DCC_THREAD_EVENT_MESSAGE);
-	e->setData(new KviStr(m));
+	KviThreadDataEvent<KviCString> * e = new KviThreadDataEvent<KviCString>(KVI_DCC_THREAD_EVENT_MESSAGE);
+	e->setData(new KviCString(m));
 	postEvent(parent(),e);
 }
 
@@ -562,7 +562,7 @@ void KviDccSendThread::run()
 	int iAckHackRounds        = 0;
 	
 	if(m_pOpt->iPacketSize < 32)m_pOpt->iPacketSize = 32;
-	char * buffer = (char *)kvi_malloc(m_pOpt->iPacketSize * sizeof(char));
+	char * buffer = (char *)KviMemory::allocate(m_pOpt->iPacketSize * sizeof(char));
 
 	QFile * pFile = new QFile(QString::fromUtf8(m_pOpt->szFileName.ptr()));
 
@@ -796,8 +796,8 @@ void KviDccSendThread::run()
 
 									if(!handleInvalidSocketRead(readLen))break;
 								} else {
-									KviThreadDataEvent<KviStr> * e = new KviThreadDataEvent<KviStr>(KVI_DCC_THREAD_EVENT_MESSAGE);
-									e->setData(new KviStr(__tr2qs_ctx("WARNING: Received data in a DCC TSEND, there should be no acknowledges","dcc")));
+									KviThreadDataEvent<KviCString> * e = new KviThreadDataEvent<KviCString>(KVI_DCC_THREAD_EVENT_MESSAGE);
+									e->setData(new KviCString(__tr2qs_ctx("WARNING: Received data in a DCC TSEND, there should be no acknowledges","dcc")));
 									postEvent(parent(),e);
 								}
 							}
@@ -967,7 +967,7 @@ handle_system_error:
 	}
 
 exit_dcc:
-	kvi_free(buffer);
+	KviMemory::free(buffer);
 	pFile->close();
 	delete pFile;
 	pFile = 0;
@@ -1430,7 +1430,7 @@ void KviDccFileTransfer::displayPaint(QPainter * p,int column, QRect rect)
 
 			p->setPen(Qt::black);
 
-			KviStr szRemote(KviStr::Format,"dcc://%s@%s:%s/%s",m_pDescriptor->szNick.toUtf8().data(),m_pDescriptor->szIp.toUtf8().data(),m_pDescriptor->szPort.toUtf8().data(),
+			KviCString szRemote(KviCString::Format,"dcc://%s@%s:%s/%s",m_pDescriptor->szNick.toUtf8().data(),m_pDescriptor->szIp.toUtf8().data(),m_pDescriptor->szPort.toUtf8().data(),
 					m_pDescriptor->szFileName.toUtf8().data());
 
 			p->drawText(rect.left() + 4 + daW1,iY,width - (8 + daW1),height - 8,Qt::AlignTop | Qt::AlignLeft,
@@ -1792,7 +1792,7 @@ void KviDccFileTransfer::connectionInProgress()
 			}
 		}
 
-		KviStr port   = !m_pDescriptor->szFakePort.isEmpty() ? m_pDescriptor->szFakePort : m_pMarshal->localPort();
+		KviCString port   = !m_pDescriptor->szFakePort.isEmpty() ? m_pDescriptor->szFakePort : m_pMarshal->localPort();
 		//#warning "OPTION FOR SENDING 127.0.0.1 and so on (not an unsigned nuumber)"
 		struct in_addr a;
 		if(KviNetUtils::stringIpToBinaryIp(ip,&a))ip.setNum(htonl(a.s_addr));
@@ -1810,7 +1810,7 @@ void KviDccFileTransfer::connectionInProgress()
 
 		KviServerParser::encodeCtcpParameter(tmp.toUtf8().data(),fName);
 		// Zero port requests want DCC SEND as back-request
-		KviStr szReq;
+		KviCString szReq;
 
 		if(m_pDescriptor->isZeroPortRequest())
 		{
@@ -1934,7 +1934,7 @@ bool KviDccFileTransfer::event(QEvent *e)
 			break;
 			case KVI_DCC_THREAD_EVENT_MESSAGE:
 			{
-				KviStr * str = ((KviThreadDataEvent<KviStr> *)e)->getData();
+				KviCString * str = ((KviThreadDataEvent<KviCString> *)e)->getData();
 				outputAndLog(QString(__tr_no_xgettext_ctx(str->ptr(),"dcc")));
 				delete str;
 				return true;
@@ -2142,7 +2142,7 @@ bool KviDccFileTransfer::doResume(const char * filename,const char * port,quint6
 
 	m_pDescriptor->szFileSize.setNum(filePos);
 
-	KviStr szBuffy;
+	KviCString szBuffy;
 	KviServerParser::encodeCtcpParameter(filename,szBuffy);
 
 	m_pDescriptor->console()->connection()->sendFmtData("PRIVMSG %s :%cDCC ACCEPT %s %s %u%c",
diff --git a/src/modules/dcc/send.h b/src/modules/dcc/send.h
index e47884b6d..260a28948 100644
--- a/src/modules/dcc/send.h
+++ b/src/modules/dcc/send.h
@@ -6,7 +6,7 @@
 //   Creation date : Tue Sep 24 09 2000 15:06:12 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -29,11 +29,11 @@
 #include "thread.h"
 
 #include "kvi_window.h"
-#include "kvi_string.h"
+#include "KviCString.h"
 #include "kvi_sockettype.h"
-#include "kvi_pointerlist.h"
+#include "KviPointerList.h"
 #include "kvi_filetransfer.h"
-#include "kvi_time.h"
+#include "KviTimeUtils.h"
 #include "kvi_tal_popupmenu.h"
 #include "kvi_tal_hbox.h"
 #include "kvi_tal_vbox.h"
@@ -53,7 +53,7 @@ class KviTalPopupMenu;
 
 typedef struct _KviDccSendThreadOptions
 {
-	KviStr       szFileName;
+	KviCString       szFileName;
 	quint64      uStartPosition;
 	int          iPacketSize;
 	int          iIdleStepLengthInMSec;
@@ -101,7 +101,7 @@ protected:
 typedef struct _KviDccRecvThreadOptions
 {
 	bool         bResume;
-	KviStr       szFileName;
+	KviCString       szFileName;
 	quint64      uTotalFileSize;
 	int          iIdleStepLengthInMSec;
 	bool         bSendZeroAck;
@@ -179,8 +179,8 @@ private:
 	KviDccDescriptor       * m_pDescriptor;
 	KviDccMarshal          * m_pMarshal;
 
-	KviStr                   m_szTarget;
-	KviStr                   m_szDccType;
+	KviCString                   m_szTarget;
+	KviCString                   m_szDccType;
 	QString                  m_szTransferIdString;
 
 	QString                  m_szStatusString;
diff --git a/src/modules/dcc/thread.cpp b/src/modules/dcc/thread.cpp
index 3b78c11e8..dc712791d 100644
--- a/src/modules/dcc/thread.cpp
+++ b/src/modules/dcc/thread.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Tue Sep 20 09 2000 18:29:51 CEST Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -28,7 +28,7 @@
 #include "kvi_window.h"
 #include "kvi_error.h"
 #include "kvi_memmove.h"
-#include "kvi_malloc.h"
+#include "KviMemory.h"
 #include "kvi_netutils.h"
 #include "kvi_socket.h"
 
@@ -90,10 +90,10 @@ bool KviDccThread::handleInvalidSocketRead(int readLen)
 #ifdef COMPILE_SSL_SUPPORT
 void KviDccThread::raiseSSLError()
 {
-	KviStr buffer;
+	KviCString buffer;
 	while(m_pSSL->getLastErrorString(buffer))
 	{
-		KviStr msg(KviStr::Format,"[SSL ERROR]: %s",buffer.ptr());
+		KviCString msg(KviCString::Format,"[SSL ERROR]: %s",buffer.ptr());
 		postMessageEvent(msg.ptr());
 	}
 }
@@ -108,7 +108,7 @@ void KviDccThread::postErrorEvent(int err)
 
 void KviDccThread::postMessageEvent(const char * message)
 {
-	KviThreadDataEvent<KviStr> * e = new KviThreadDataEvent<KviStr>(KVI_DCC_THREAD_EVENT_MESSAGE);
-	e->setData(new KviStr(message));
+	KviThreadDataEvent<KviCString> * e = new KviThreadDataEvent<KviCString>(KVI_DCC_THREAD_EVENT_MESSAGE);
+	e->setData(new KviCString(message));
 	postEvent(m_pParent,e);
 }
diff --git a/src/modules/dcc/thread.h b/src/modules/dcc/thread.h
index 83bb28bb4..877ea56bb 100644
--- a/src/modules/dcc/thread.h
+++ b/src/modules/dcc/thread.h
@@ -6,7 +6,7 @@
 //   Creation date : Tue Sep 20 09 2000 18:28:44 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -25,9 +25,9 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_thread.h"
+#include "KviThread.h"
 #include "kvi_sockettype.h"
-#include "kvi_pointerlist.h"
+#include "KviPointerList.h"
 
 #include <QObject>
 
@@ -37,11 +37,11 @@
 
 // KviThreadDataEvent<int>
 #define KVI_DCC_THREAD_EVENT_ERROR (KVI_THREAD_USER_EVENT_BASE + 1)
-// KviThreadDataEvent<KviStr>
+// KviThreadDataEvent<KviCString>
 #define KVI_DCC_THREAD_EVENT_DATA (KVI_THREAD_USER_EVENT_BASE + 2)
 // KviThreadEvent
 #define KVI_DCC_THREAD_EVENT_SUCCESS (KVI_THREAD_USER_EVENT_BASE + 3)
-// KviThreadDataEvent<KviStr>
+// KviThreadDataEvent<KviCString>
 #define KVI_DCC_THREAD_EVENT_MESSAGE (KVI_THREAD_USER_EVENT_BASE + 4)
 // KviThreadDataEvent<int>
 #define KVI_DCC_THREAD_EVENT_ACTION (KVI_THREAD_USER_EVENT_BASE + 5)
diff --git a/src/modules/dcc/utils.cpp b/src/modules/dcc/utils.cpp
index cc6600601..9c90fe151 100644
--- a/src/modules/dcc/utils.cpp
+++ b/src/modules/dcc/utils.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Tue Jul 23 02:54:44 2002 GMT by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2002-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2002-2010 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
@@ -27,11 +27,11 @@
 #include "utils.h"
 
 #include "kvi_options.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_netutils.h"
 #include "kvi_ircsocket.h"
 #include "kvi_irclink.h"
-#include "kvi_qstring.h"
+#include "KviQString.h"
 
 /*
 bool dcc_module_get_listen_ip_address(KviCommand *c,KviConsole * pConsole,QString &szListenIp)
diff --git a/src/modules/dcc/utils.h b/src/modules/dcc/utils.h
index 44d914c8e..50087c538 100644
--- a/src/modules/dcc/utils.h
+++ b/src/modules/dcc/utils.h
@@ -6,7 +6,7 @@
 //   Creation date : Tue Jul 23 02:54:45 2002 GMT by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2002-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2002-2010 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
@@ -25,7 +25,7 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_string.h"
+#include "KviCString.h"
 #include "kvi_console.h"
 #include "kvi_kvs_moduleinterface.h"
 
diff --git a/src/modules/dcc/video.cpp b/src/modules/dcc/video.cpp
index 461a092a3..08c212e0d 100644
--- a/src/modules/dcc/video.cpp
+++ b/src/modules/dcc/video.cpp
@@ -31,17 +31,17 @@
 #include "kvi_iconmanager.h"
 #include "kvi_ircview.h"
 #include "kvi_kvs_eventtriggers.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_out.h"
 #include "kvi_error.h"
 #include "kvi_netutils.h"
 #include "kvi_options.h"
 #include "kvi_console.h"
-#include "kvi_malloc.h"
+#include "KviMemory.h"
 #include "kvi_socket.h"
 #include "kvi_ircconnection.h"
 #include "kvi_tal_vbox.h"
-#include "kvi_mirccntrl.h"
+#include "KviMircCntrl.h"
 #include "kvi_frame.h"
 
 #include <QToolTip>
@@ -50,8 +50,8 @@
 #include <QTextDocument> //for Qt::escape
 
 #ifdef COMPILE_CRYPT_SUPPORT
-	#include "kvi_crypt.h"
-	#include "kvi_cryptcontroller.h"
+	#include "KviCryptEngine.h"
+	#include "KviCryptEngine.h"
 #endif
 
 #ifdef COMPILE_SSL_SUPPORT
@@ -213,7 +213,7 @@ bool KviDccVideoThread::textStep()
 		{
 			KviDccThreadIncomingData data;
 			data.iLen = m_textInSignalBuffer.size();
-			data.buffer = (char*) kvi_malloc(data.iLen);
+			data.buffer = (char*) KviMemory::allocate(data.iLen);
 			memcpy(data.buffer, m_textInSignalBuffer.data(), data.iLen);
 			handleIncomingData(&data,false);
 
@@ -249,12 +249,12 @@ bool KviDccVideoThread::handleIncomingData(KviDccThreadIncomingData * data,bool
 	{
 		if((*aux == '\n') || (*aux == '\0'))
 		{
-			KviThreadDataEvent<KviStr> * e = new KviThreadDataEvent<KviStr>(KVI_DCC_THREAD_EVENT_DATA);
+			KviThreadDataEvent<KviCString> * e = new KviThreadDataEvent<KviCString>(KVI_DCC_THREAD_EVENT_DATA);
 			// The left part is len chars long
 			int len = aux - data->buffer;
 //			qDebug("LEN = %d, iLen = %d",len,data->iLen);
 //#warning "DO IT BETTER (the \r cutting)"
-			KviStr * s = new KviStr(data->buffer,len);
+			KviCString * s = new KviCString(data->buffer,len);
 			if(s->lastCharIs('\r'))s->cutRight(1);
 			e->setData(s);
 			// but we cut also \n (or \0)
@@ -268,13 +268,13 @@ bool KviDccVideoThread::handleIncomingData(KviDccThreadIncomingData * data,bool
 				// memmove the remaining part to the beginning
 				// aux points after \n or \0
 				kvi_memmove(data->buffer,aux,data->iLen);
-				data->buffer = (char *)kvi_realloc(data->buffer,data->iLen);
+				data->buffer = (char *)KviMemory::reallocate(data->buffer,data->iLen);
 				end = data->buffer + data->iLen;
 				aux = data->buffer;
 			} else {
 				// no more data in the buffer
 				KVI_ASSERT(data->iLen == 0);
-				kvi_free(data->buffer);
+				KviMemory::free(data->buffer);
 				data->buffer = end = aux = 0;
 			}
 			postEvent(parent(),e);
@@ -288,12 +288,12 @@ bool KviDccVideoThread::handleIncomingData(KviDccThreadIncomingData * data,bool
 		if(data->iLen > 0)
 		{
 			// in the last part there are no NULL and \n chars
-			KviThreadDataEvent<KviStr> * e = new KviThreadDataEvent<KviStr>(KVI_DCC_THREAD_EVENT_DATA);
-			KviStr * s = new KviStr(data->buffer,data->iLen);
+			KviThreadDataEvent<KviCString> * e = new KviThreadDataEvent<KviCString>(KVI_DCC_THREAD_EVENT_DATA);
+			KviCString * s = new KviCString(data->buffer,data->iLen);
 			if(s->lastCharIs('\r'))s->cutRight(1);
 			e->setData(s);
 			data->iLen = 0;
-			kvi_free(data->buffer);
+			KviMemory::free(data->buffer);
 			data->buffer = 0;
 			postEvent(parent(),e);
 		}
@@ -612,7 +612,7 @@ void KviDccVideo::connectionInProgress()
 		if(m_pDescriptor->bSendRequest)
 		{
 			QString ip     = !m_pDescriptor->szFakeIp.isEmpty() ? m_pDescriptor->szFakeIp : m_pDescriptor->szListenIp;
-			KviStr port   = !m_pDescriptor->szFakePort.isEmpty() ? m_pDescriptor->szFakePort : m_pMarshal->localPort();
+			KviCString port   = !m_pDescriptor->szFakePort.isEmpty() ? m_pDescriptor->szFakePort : m_pMarshal->localPort();
 //#warning "OPTION FOR SENDING 127.0.0.1 and so on (not an unsigned nuumber)"
 			struct in_addr a;
 			if(KviNetUtils::stringIpToBinaryIp(ip,&a)) {
@@ -646,7 +646,7 @@ void KviDccVideo::getBaseLogFileName(QString &buffer)
 
 void KviDccVideo::fillCaptionBuffers()
 {
-	KviStr tmp(KviStr::Format,"DCC Video %s@%s:%s %s",
+	KviCString tmp(KviCString::Format,"DCC Video %s@%s:%s %s",
 		m_pDescriptor->szNick.toUtf8().data(),m_pDescriptor->szIp.toUtf8().data(),m_pDescriptor->szPort.toUtf8().data(),
 		m_pDescriptor->szLocalFileName.toUtf8().data());
 
@@ -677,13 +677,13 @@ void KviDccVideo::ownMessage(const QString &text, bool bUserFeedback)
 		{
 			if(*d != KVI_TEXT_CRYPTESCAPE)
 			{
-				KviStr encrypted;
+				KviCString encrypted;
 				cryptSessionInfo()->m_pEngine->setMaxEncryptLen(-1);
 				switch(cryptSessionInfo()->m_pEngine->encrypt(d,encrypted))
 				{
 					case KviCryptEngine::Encrypted:
 					{
-						KviStr buf(KviStr::Format,"%s\r\n",encrypted.ptr());
+						KviCString buf(KviCString::Format,"%s\r\n",encrypted.ptr());
 						m_tmpTextDataOut.append(buf.ptr(), buf.len());
 						if(bUserFeedback)
 							m_pFrm->firstConsole()->outputPrivmsg(this,KVI_OUT_OWNPRIVMSGCRYPTED,
@@ -693,7 +693,7 @@ void KviDccVideo::ownMessage(const QString &text, bool bUserFeedback)
 					break;
 					case KviCryptEngine::Encoded:
 					{
-						KviStr buf(KviStr::Format,"%s\r\n",encrypted.ptr());
+						KviCString buf(KviCString::Format,"%s\r\n",encrypted.ptr());
 						m_tmpTextDataOut.append(buf.ptr(), buf.len());
 						if(bUserFeedback)
 						{
@@ -716,7 +716,7 @@ void KviDccVideo::ownMessage(const QString &text, bool bUserFeedback)
 				return;
 			} else {
 				d++; //eat the escape code
-				KviStr buf(KviStr::Format,"%s\r\n",d);
+				KviCString buf(KviCString::Format,"%s\r\n",d);
 				QString tmp = text.right(text.length() - 1);
 				m_tmpTextDataOut.append(buf.ptr(), buf.len());
 
@@ -729,7 +729,7 @@ void KviDccVideo::ownMessage(const QString &text, bool bUserFeedback)
 		}
 	}
 #endif
-	KviStr buf(KviStr::Format,"%s\r\n",d);
+	KviCString buf(KviCString::Format,"%s\r\n",d);
 	m_tmpTextDataOut.append(buf.ptr(), buf.len());
 
 	if(bUserFeedback)
@@ -761,7 +761,7 @@ void KviDccVideo::ownAction(const QString &text)
 		QByteArray szData = encodeText(szTmpBuffer);
 		const char * d = szData.data();
 		if(!d)return;
-		KviStr buf(KviStr::Format,"%cACTION %s%c\r\n",0x01,d,0x01);
+		KviCString buf(KviCString::Format,"%cACTION %s%c\r\n",0x01,d,0x01);
 		m_tmpTextDataOut.append(buf.ptr(), buf.len());
 		output(KVI_OUT_ACTION,"%Q %Q",&(m_pDescriptor->szLocalNick),&szTmpBuffer);
 	} else {
@@ -786,8 +786,8 @@ bool KviDccVideo::event(QEvent *e)
 			break;
 			case KVI_DCC_THREAD_EVENT_DATA:
 			{
-				KviStr * encoded = ((KviThreadDataEvent<KviStr> *)e)->getData();
-				KviStr d=KviStr(decodeText(encoded->ptr()));
+				KviCString * encoded = ((KviThreadDataEvent<KviCString> *)e)->getData();
+				KviCString d=KviCString(decodeText(encoded->ptr()));
 				if(d.firstCharIs(0x01))
 				{
 					d.cutLeft(1);
@@ -818,7 +818,7 @@ bool KviDccVideo::event(QEvent *e)
 					{
 						if(cinf->m_bDoDecrypt)
 						{
-							KviStr decryptedStuff;
+							KviCString decryptedStuff;
 							switch(cinf->m_pEngine->decrypt(d.ptr(),decryptedStuff))
 							{
 								case KviCryptEngine::DecryptOkWasEncrypted:
@@ -875,7 +875,7 @@ bool KviDccVideo::event(QEvent *e)
 
 			case KVI_DCC_THREAD_EVENT_MESSAGE:
 			{
-				KviStr * str = ((KviThreadDataEvent<KviStr> *)e)->getData();
+				KviCString * str = ((KviThreadDataEvent<KviCString> *)e)->getData();
 				outputNoFmt(KVI_OUT_DCCMSG,__tr_no_xgettext_ctx(str->ptr(),"dcc"));
 				delete str;
 				return true;
diff --git a/src/modules/dcc/video.h b/src/modules/dcc/video.h
index 96250c5ee..58a92bc88 100644
--- a/src/modules/dcc/video.h
+++ b/src/modules/dcc/video.h
@@ -30,7 +30,7 @@
 #include "window.h"
 
 #include "kvi_window.h"
-#include "kvi_databuffer.h"
+#include "KviDataBuffer.h"
 #include "kvi_sockettype.h"
 #include "kvi_tal_hbox.h"
 #include "kvi_themedlabel.h"
diff --git a/src/modules/dcc/voice.cpp b/src/modules/dcc/voice.cpp
index c46eb1f81..e59ad40fd 100644
--- a/src/modules/dcc/voice.cpp
+++ b/src/modules/dcc/voice.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Thu Aug 23 04:08:09 2001 GMT 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-2010 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
@@ -31,13 +31,13 @@
 #include "kvi_settings.h"
 #include "kvi_iconmanager.h"
 #include "kvi_ircview.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_out.h"
 #include "kvi_error.h"
 #include "kvi_netutils.h"
 #include "kvi_options.h"
 #include "kvi_console.h"
-#include "kvi_malloc.h"
+#include "KviMemory.h"
 #include "kvi_socket.h"
 #include "kvi_ircconnection.h"
 #include "kvi_tal_vbox.h"
@@ -208,7 +208,7 @@ bool KviDccVoiceThread::openSoundcard(int mode)
 	if(ioctl(m_soundFd,SNDCTL_DSP_SPEED,&speed)<0)goto exit_false;
 	if(speed != m_pOpt->iSampleRate)
 	{
-		KviStr tmp(KviStr::Format,__tr2qs_ctx("WARNING: failed to set the requested sample rate (%d): the device used closest match (%d)","dcc").toUtf8().data(),
+		KviCString tmp(KviCString::Format,__tr2qs_ctx("WARNING: failed to set the requested sample rate (%d): the device used closest match (%d)","dcc").toUtf8().data(),
 						m_pOpt->iSampleRate,speed);
 		postMessageEvent(tmp.ptr());
 	}
@@ -761,7 +761,7 @@ void KviDccVoice::connectionInProgress()
 		if(m_pDescriptor->bSendRequest)
 		{
 			QString ip     = !m_pDescriptor->szFakeIp.isEmpty() ? m_pDescriptor->szFakeIp : m_pDescriptor->szListenIp;
-			KviStr port   = !m_pDescriptor->szFakePort.isEmpty() ? m_pDescriptor->szFakePort : m_pMarshal->localPort();
+			KviCString port   = !m_pDescriptor->szFakePort.isEmpty() ? m_pDescriptor->szFakePort : m_pMarshal->localPort();
 //#warning "OPTION FOR SENDING 127.0.0.1 and so on (not an unsigned nuumber)"
 			struct in_addr a;
 			if(KviNetUtils::stringIpToBinaryIp(ip,&a)) {
@@ -793,7 +793,7 @@ void KviDccVoice::getBaseLogFileName(QString &buffer)
 
 void KviDccVoice::fillCaptionBuffers()
 {
-	KviStr tmp(KviStr::Format,"DCC Voice %s@%s:%s %s",
+	KviCString tmp(KviCString::Format,"DCC Voice %s@%s:%s %s",
 		m_pDescriptor->szNick.toUtf8().data(),m_pDescriptor->szIp.toUtf8().data(),m_pDescriptor->szPort.toUtf8().data(),
 		m_pDescriptor->szLocalFileName.toUtf8().data());
 
@@ -827,7 +827,7 @@ bool KviDccVoice::event(QEvent *e)
 			break;
 			case KVI_DCC_THREAD_EVENT_MESSAGE:
 			{
-				KviStr * str = ((KviThreadDataEvent<KviStr> *)e)->getData();
+				KviCString * str = ((KviThreadDataEvent<KviCString> *)e)->getData();
 				outputNoFmt(KVI_OUT_DCCMSG,__tr_no_xgettext_ctx(str->ptr(),"dcc"));
 				delete str;
 				return true;
@@ -873,7 +873,7 @@ void KviDccVoice::updateInfo()
 		int iOSize = m_pSlaveThread->m_iOutputBufferSize;
 		int iISize = m_pSlaveThread->m_iInputBufferSize;
 		m_pSlaveThread->m_pInfoMutex->unlock();
-		KviStr tmp(KviStr::Format,__tr_ctx("Input buffer: %d bytes","dcc"),iISize);
+		KviCString tmp(KviCString::Format,__tr_ctx("Input buffer: %d bytes","dcc"),iISize);
 		m_pInputLabel->setText(tmp.ptr());
 		tmp.sprintf(__tr_ctx("Output buffer: %d bytes","dcc"),iOSize);
 		m_pOutputLabel->setText(tmp.ptr());
diff --git a/src/modules/dcc/voice.h b/src/modules/dcc/voice.h
index ab3038607..35c726d3f 100644
--- a/src/modules/dcc/voice.h
+++ b/src/modules/dcc/voice.h
@@ -6,7 +6,7 @@
 //   Creation date : Thu Aug 23 04:08:10 2001 GMT 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-2010 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
@@ -30,7 +30,7 @@
 #include "window.h"
 
 #include "kvi_window.h"
-#include "kvi_databuffer.h"
+#include "KviDataBuffer.h"
 #include "kvi_sockettype.h"
 #include "kvi_tal_hbox.h"
 
@@ -55,7 +55,7 @@ typedef struct _KviDccVoiceThreadOptions
 	bool               bForceHalfDuplex;
 	int                iPreBufferSize;
 	int                iSampleRate;
-	KviStr             szSoundDevice;
+	KviCString             szSoundDevice;
 	KviDccVoiceCodec * pCodec;
 } KviDccVoiceThreadOptions;
 
diff --git a/src/modules/dcc/window.cpp b/src/modules/dcc/window.cpp
index b59a13793..b08cbf2c4 100644
--- a/src/modules/dcc/window.cpp
+++ b/src/modules/dcc/window.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Fri Jul 26 02:04:40 2002 GMT by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2002-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2002-2010 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
diff --git a/src/modules/dcc/window.h b/src/modules/dcc/window.h
index 0b85ced3d..bdcc8c088 100644
--- a/src/modules/dcc/window.h
+++ b/src/modules/dcc/window.h
@@ -6,7 +6,7 @@
 //   Creation date : Fri Jul 26 02:04:39 2002 GMT by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2002-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2002-2010 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
diff --git a/src/modules/dialog/libkvidialog.cpp b/src/modules/dialog/libkvidialog.cpp
index 25d328ef8..7bc51493a 100644
--- a/src/modules/dialog/libkvidialog.cpp
+++ b/src/modules/dialog/libkvidialog.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Sat Sep 15 2001 01:13:25 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-2010 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
@@ -25,7 +25,7 @@
 
 #include "libkvidialog.h"
 
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_module.h"
 #include "kvi_modulemanager.h"
 #include "kvi_error.h"
@@ -817,13 +817,13 @@ static void dialog_module_exiting_local_loop(KviModule * m)
 	g_iLocalEventLoops--;
 }
 
-static bool dialog_module_fnc_textline(KviModule *m,KviCommand *c,KviParameterList * parms,KviStr &buffer)
+static bool dialog_module_fnc_textline(KviModule *m,KviCommand *c,KviParameterList * parms,KviCString &buffer)
 {
 	ENTER_STACK_FRAME(c,"dialog_module_fnc_textline");
 
-	KviStr caption = parms->safeFirstParam();
-	KviStr info    = parms->safeNextParam();
-	KviStr initial = parms->safeNextParam();
+	KviCString caption = parms->safeFirstParam();
+	KviCString info    = parms->safeNextParam();
+	KviCString initial = parms->safeNextParam();
 
 	dialog_module_entering_local_loop(m);
 	QMessageBox::information(0,caption.ptr(),info.ptr(),QMessageBox::Ok);
diff --git a/src/modules/dialog/libkvidialog.h b/src/modules/dialog/libkvidialog.h
index 54c543164..7eb71525e 100644
--- a/src/modules/dialog/libkvidialog.h
+++ b/src/modules/dialog/libkvidialog.h
@@ -6,7 +6,7 @@
 //   Creation date : Sat Sep 15 2001 01:13:25 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-2010 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
@@ -25,8 +25,8 @@
 //=============================================================================
 
 #include "kvi_window.h"
-#include "kvi_string.h"
-#include "kvi_parameterlist.h"
+#include "KviCString.h"
+#include "KviParameterList.h"
 #include "kvi_filedialog.h"
 #include "kvi_imagedialog.h"
 #include "kvi_kvs_callbackobject.h"
diff --git a/src/modules/editor/libkvieditor.cpp b/src/modules/editor/libkvieditor.cpp
index 7645c717c..35b1459fb 100644
--- a/src/modules/editor/libkvieditor.cpp
+++ b/src/modules/editor/libkvieditor.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Mon Sep 11 2000 12:19:00 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
diff --git a/src/modules/editor/scripteditor.cpp b/src/modules/editor/scripteditor.cpp
index 10e911bcf..2d2247ff5 100644
--- a/src/modules/editor/scripteditor.cpp
+++ b/src/modules/editor/scripteditor.cpp
@@ -26,21 +26,21 @@
 
 #include "scripteditor.h"
 
-#include "kvi_fileutils.h"
+#include "KviFileUtils.h"
 #include "kvi_fileextensions.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_filedialog.h"
-#include "kvi_qstring.h"
-#include "kvi_config.h"
+#include "KviQString.h"
+#include "KviConfigurationFile.h"
 #include "kvi_module.h"
-#include "kvi_pointerlist.h"
+#include "KviPointerList.h"
 #include "kvi_app.h"
 #include "kvi_console.h"
 #include "kvi_window.h"
 #include "kvi_iconmanager.h"
 #include "kvi_kvs_kernel.h"
 #include "kvi_modulemanager.h"
-#include "kvi_config.h"
+#include "KviConfigurationFile.h"
 #include "kvi_tal_vbox.h"
 #include "kvi_tal_hbox.h"
 #include "kvi_tal_groupbox.h"
@@ -839,7 +839,7 @@ void KviScriptEditorImplementation::loadOptions()
 	QString szTmp;
 	g_pEditorModulePointer->getDefaultConfigFileName(szTmp);
 
-	KviConfig cfg(szTmp,KviConfig::Read);
+	KviConfigurationFile cfg(szTmp,KviConfigurationFile::Read);
 	g_clrBackground = cfg.readColorEntry("Background",QColor(0,0,0));;
 	g_clrNormalText = cfg.readColorEntry("NormalText",QColor(100,255,0));
 	g_clrBracket = cfg.readColorEntry("Bracket",QColor(255,0,0));
@@ -885,7 +885,7 @@ void KviScriptEditorImplementation::saveOptions()
 	QString szTmp;
 	g_pEditorModulePointer->getDefaultConfigFileName(szTmp);
 
-	KviConfig cfg(szTmp,KviConfig::Write);
+	KviConfigurationFile cfg(szTmp,KviConfigurationFile::Write);
 	cfg.writeEntry("Background",g_clrBackground);;
 	cfg.writeEntry("NormalText",g_clrNormalText);
 	cfg.writeEntry("Bracket",g_clrBracket);
@@ -926,7 +926,7 @@ void KviScriptEditorImplementation::saveToFile()
 		QString szBuffer = m_pEditor->toPlainText();
 
 		//if(tmp.isEmpty())tmp = "";
-		//KviStr buffer = tmp.toUtf8().data();
+		//KviCString buffer = tmp.toUtf8().data();
 		if(!KviFileUtils::writeFile(szFileName,szBuffer))
 		{
 			QString szTmp;
diff --git a/src/modules/editor/scripteditor.h b/src/modules/editor/scripteditor.h
index 27c2d58e0..58db627b5 100644
--- a/src/modules/editor/scripteditor.h
+++ b/src/modules/editor/scripteditor.h
@@ -7,7 +7,7 @@
 //   Creation date : Sun Mar 28 1999 16:11:48 CEST by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 1999-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 1999-2010 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
@@ -26,7 +26,7 @@
 //=============================================================================
 
 #include "kvi_scripteditor.h"
-#include "kvi_pointerlist.h"
+#include "KviPointerList.h"
 #include "kvi_selectors.h"
 #include "kvi_tal_popupmenu.h"
 
diff --git a/src/modules/eventeditor/eventeditor.cpp b/src/modules/eventeditor/eventeditor.cpp
index 7f6b37f8e..00f15aefa 100644
--- a/src/modules/eventeditor/eventeditor.cpp
+++ b/src/modules/eventeditor/eventeditor.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Mon Dec 23 2002 20:28:18 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2002-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2002-2010 Szymon Stefanek (pragma at kvirc dot net)
 //
 //   This program is FREE software. You can redistribute it and/or
 //   modify it under the linkss of the GNU General Public License
@@ -26,17 +26,17 @@
 
 #include "kvi_iconmanager.h"
 #include "kvi_options.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_imagedialog.h"
-#include "kvi_config.h"
+#include "KviConfigurationFile.h"
 #include "kvi_filedialog.h"
-#include "kvi_fileutils.h"
+#include "KviFileUtils.h"
 #include "kvi_scripteditor.h"
 #include "kvi_debug.h"
 #include "kvi_app.h"
-#include "kvi_cmdformatter.h"
+#include "KviCommandFormatter.h"
 #include "kvi_fileextensions.h"
-#include "kvi_qstring.h"
+#include "KviQString.h"
 #include "kvi_filedialog.h"
 #include "kvi_kvs_eventmanager.h"
 #include "kvi_tal_vbox.h"
@@ -578,7 +578,7 @@ void KviEventEditorWindow::getConfigGroupName(QString &szName)
 	szName = "eventeditor";
 }
 
-void KviEventEditorWindow::saveProperties(KviConfig *) //cfg
+void KviEventEditorWindow::saveProperties(KviConfigurationFile *) //cfg
 {
 /*
 #ifdef COMPILE_SCRIPTTOOLBAR
@@ -589,7 +589,7 @@ void KviEventEditorWindow::saveProperties(KviConfig *) //cfg
 */
 }
 
-void KviEventEditorWindow::loadProperties(KviConfig *) //cfg
+void KviEventEditorWindow::loadProperties(KviConfigurationFile *) //cfg
 {
 /*
 #ifdef COMPILE_SCRIPTTOOLBAR
@@ -597,7 +597,7 @@ void KviEventEditorWindow::loadProperties(KviConfig *) //cfg
 	def.append(20);
 	def.append(80);
 	m_pEditor->setSizes(cfg->readIntListEntry("Sizes",def));
-	KviStr tmp = cfg->readEntry("LastEvent","");
+	KviCString tmp = cfg->readEntry("LastEvent","");
 	m_pEditor->editEvent(tmp);
 	//qDebug("LAST EDITED WAS %s",tmp.ptr());
 #endif // COMPILE_SCRIPTTOOLBAR
diff --git a/src/modules/eventeditor/eventeditor.h b/src/modules/eventeditor/eventeditor.h
index 7b4d921f1..eadd127ba 100644
--- a/src/modules/eventeditor/eventeditor.h
+++ b/src/modules/eventeditor/eventeditor.h
@@ -6,7 +6,7 @@
 //   Creation date : Mon Dec 23 2002 20:24:55 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2002-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2002-2010 Szymon Stefanek (pragma at kvirc dot net)
 //
 //   This program is FREE software. You can redistribute it and/or
 //   modify it under the linkss of the GNU General Public License
@@ -25,7 +25,7 @@
 //=============================================================================
 
 #include "kvi_window.h"
-#include "kvi_string.h"
+#include "KviCString.h"
 #include "kvi_tal_popupmenu.h"
 
 #include <QWidget>
@@ -125,8 +125,8 @@ protected:
 	virtual QPixmap * myIconPtr();
 	virtual void fillCaptionBuffers();
 	virtual void getConfigGroupName(QString &szName);
-	virtual void saveProperties(KviConfig *);
-	virtual void loadProperties(KviConfig *);
+	virtual void saveProperties(KviConfigurationFile *);
+	virtual void loadProperties(KviConfigurationFile *);
 protected slots:
 	void cancelClicked();
 	void okClicked();
diff --git a/src/modules/eventeditor/libkvieventeditor.cpp b/src/modules/eventeditor/libkvieventeditor.cpp
index a7e3b423a..a51c5420e 100644
--- a/src/modules/eventeditor/libkvieventeditor.cpp
+++ b/src/modules/eventeditor/libkvieventeditor.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Mon 23 Dec 2002 20:23:59 2002 GMT by Szymon Stefanek
 //
 //   This toolbar is part of the KVirc irc client distribution
-//   Copyright (C) 2002-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2002-2010 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
@@ -25,7 +25,7 @@
 #include "eventeditor.h"
 
 #include "kvi_module.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_frame.h"
 
 KviEventEditorWindow * g_pEventEditorWindow = 0;
diff --git a/src/modules/file/libkvifile.cpp b/src/modules/file/libkvifile.cpp
index c235d79c5..3a0f752b5 100644
--- a/src/modules/file/libkvifile.cpp
+++ b/src/modules/file/libkvifile.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Fri Nov  9 03:27:59 2001 GMT 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-2010 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
@@ -23,13 +23,13 @@
 //=============================================================================
 
 #include "kvi_module.h"
-#include "kvi_fileutils.h"
-#include "kvi_locale.h"
-#include "kvi_malloc.h"
+#include "KviFileUtils.h"
+#include "KviLocale.h"
+#include "KviMemory.h"
 #include "kvi_app.h"
 #include "kvi_options.h"
 #include "kvi_kvs_arraycast.h"
-#include "kvi_file.h"
+#include "KviFile.h"
 
 #include <QFileInfo>
 #include <QDir>
@@ -829,7 +829,7 @@ static bool file_kvs_fnc_read(KviKvsModuleFunctionCall * c)
 
 	if(c->params()->count() < 2)uSize = 1024 * 1024; // 1 meg file default
 
-	char * buf = (char *)kvi_malloc(sizeof(char) * (uSize + 1));
+	char * buf = (char *)KviMemory::allocate(sizeof(char) * (uSize + 1));
 	unsigned int uReaded = 0;
 	unsigned int uRetries = 0;
 
@@ -838,7 +838,7 @@ static bool file_kvs_fnc_read(KviKvsModuleFunctionCall * c)
 		if(uRetries > 1000)
 		{
 			// ops
-			kvi_free(buf);
+			KviMemory::free(buf);
 			c->warning(__tr2qs("Read error for file %Q (have been unable to read the requested size in 1000 retries)"),&szNameZ);
 			return true;
 		}
@@ -847,7 +847,7 @@ static bool file_kvs_fnc_read(KviKvsModuleFunctionCall * c)
 
 		if(readedNow < 0)
 		{
-			kvi_free(buf);
+			KviMemory::free(buf);
 			c->warning(__tr2qs("Read error for file %Q"),&szNameZ);
 			return true;
 		}
@@ -863,7 +863,7 @@ static bool file_kvs_fnc_read(KviKvsModuleFunctionCall * c)
 	else
 		c->returnValue()->setString(QString::fromLocal8Bit(buf));
 
-	kvi_free(buf);
+	KviMemory::free(buf);
 
 	return true;
 }
@@ -919,7 +919,7 @@ static bool file_kvs_fnc_readBytes(KviKvsModuleFunctionCall * c)
 	if(c->params()->count() < 2)
 		uSize = 1024 * 1024; // 1 meg file default
 
-	unsigned char * buf = (unsigned char *)kvi_malloc(sizeof(char) * (uSize + 1));
+	unsigned char * buf = (unsigned char *)KviMemory::allocate(sizeof(char) * (uSize + 1));
 	unsigned int uReaded = 0;
 	unsigned int uRetries = 0;
 
@@ -928,7 +928,7 @@ static bool file_kvs_fnc_readBytes(KviKvsModuleFunctionCall * c)
 		if(uRetries > 1000)
 		{
 			// ops
-			kvi_free(buf);
+			KviMemory::free(buf);
 			c->warning(__tr2qs("Read error for file %Q (have been unable to read the requested size in 1000 retries)"),&szNameZ);
 			return true;
 		}
@@ -937,7 +937,7 @@ static bool file_kvs_fnc_readBytes(KviKvsModuleFunctionCall * c)
 
 		if(readedNow < 0)
 		{
-			kvi_free(buf);
+			KviMemory::free(buf);
 			c->warning(__tr2qs("Read error for file %Q"),&szNameZ);
 			return true;
 		}
@@ -959,7 +959,7 @@ static bool file_kvs_fnc_readBytes(KviKvsModuleFunctionCall * c)
 
 	c->returnValue()->setArray(pArray);
 
-	kvi_free(buf);
+	KviMemory::free(buf);
 
 	return true;
 }
diff --git a/src/modules/filetransferwindow/filetransferwindow.cpp b/src/modules/filetransferwindow/filetransferwindow.cpp
index 529b802ce..720c5a43c 100644
--- a/src/modules/filetransferwindow/filetransferwindow.cpp
+++ b/src/modules/filetransferwindow/filetransferwindow.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Mon Apr 21 2003 23:14:12 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2003-2010 Szymon Stefanek (pragma at kvirc dot net)
 //
 //   This program is FREE software. You can redistribute it and/or
 //   modify it under the linkss of the GNU General Public License
@@ -29,12 +29,12 @@
 #include "kvi_ircview.h"
 #include "kvi_out.h"
 #include "kvi_options.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_out.h"
-#include "kvi_mirccntrl.h"
+#include "KviMircCntrl.h"
 #include "kvi_themedlabel.h"
 #include "kvi_input.h"
-#include "kvi_qstring.h"
+#include "KviQString.h"
 #include "kvi_tal_hbox.h"
 #include "kvi_frame.h"
 #include "kvi_mdimanager.h"
diff --git a/src/modules/filetransferwindow/filetransferwindow.h b/src/modules/filetransferwindow/filetransferwindow.h
index 47fc43b98..df96484fb 100644
--- a/src/modules/filetransferwindow/filetransferwindow.h
+++ b/src/modules/filetransferwindow/filetransferwindow.h
@@ -6,7 +6,7 @@
 //   Creation date : Mon Apr 21 2003 23:14:12 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2003-2010 Szymon Stefanek (pragma at kvirc dot net)
 //
 //   This program is FREE software. You can redistribute it and/or
 //   modify it under the linkss of the GNU General Public License
@@ -25,7 +25,7 @@
 //=============================================================================
 
 #include "kvi_window.h"
-#include "kvi_string.h"
+#include "KviCString.h"
 #include "kvi_ircsocket.h"
 #include "kvi_sparser.h"
 #include "kvi_console.h"
diff --git a/src/modules/filetransferwindow/libkvifiletransferwindow.cpp b/src/modules/filetransferwindow/libkvifiletransferwindow.cpp
index 9941cec81..396fb8765 100644
--- a/src/modules/filetransferwindow/libkvifiletransferwindow.cpp
+++ b/src/modules/filetransferwindow/libkvifiletransferwindow.cpp
@@ -3,7 +3,7 @@
 //   File : libkvifiletransferwindow.cpp
 //   Creation date : Mon Apr 21 2003 23:14:12 CEST by Szymon Stefanek
 //
-//   Copyright (C) 2003-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2003-2010 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
@@ -27,7 +27,7 @@
 #include "kvi_app.h"
 #include "kvi_frame.h"
 #include "kvi_window.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_iconmanager.h"
 
 #include <QSplitter>
diff --git a/src/modules/help/helpwidget.cpp b/src/modules/help/helpwidget.cpp
index f84405730..02b73f6ed 100644
--- a/src/modules/help/helpwidget.cpp
+++ b/src/modules/help/helpwidget.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Thu Aug 10 2000 17:42:12 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -27,11 +27,11 @@
 
 #include "kvi_frame.h"
 #include "kvi_iconmanager.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_app.h"
 #include "kvi_msgbox.h"
 #include "kvi_module.h"
-#include "kvi_fileutils.h"
+#include "KviFileUtils.h"
 
 #include <QToolButton>
 #include <QLineEdit>
diff --git a/src/modules/help/helpwidget.h b/src/modules/help/helpwidget.h
index ce8767a25..956aed4ae 100644
--- a/src/modules/help/helpwidget.h
+++ b/src/modules/help/helpwidget.h
@@ -6,7 +6,7 @@
 //   Creation date : Thu Aug 10 2000 17:26:20 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -34,7 +34,7 @@
 class QToolButton;
 class QLineEdit;
 class KviFrame;
-//class KviProcess;
+//class QProcess;
 
 class KviHelpWidget : public QWidget
 {
diff --git a/src/modules/help/helpwindow.cpp b/src/modules/help/helpwindow.cpp
index 621ba4513..03cb7fc64 100644
--- a/src/modules/help/helpwindow.cpp
+++ b/src/modules/help/helpwindow.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Tue Aug 11 2000 18:08:22 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 Szymon Stefanek (pragma at kvirc dot net)
 //
 //   This program is FREE software. You can redistribute it and/or
 //   modify it under the m_terms of the GNU General Public License
@@ -28,9 +28,9 @@
 #include "kvi_app.h"
 #include "kvi_iconmanager.h"
 #include "kvi_options.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_module.h"
-#include "kvi_config.h"
+#include "KviConfigurationFile.h"
 #include "kvi_sourcesdate.h"
 
 #include <QList>
@@ -162,13 +162,13 @@ void KviHelpWindow::indexingEnd()
 	m_pBtnRefreshIndex->setEnabled(true);
 }
 
-void KviHelpWindow::saveProperties(KviConfig *cfg)
+void KviHelpWindow::saveProperties(KviConfigurationFile *cfg)
 {
 	KviWindow::saveProperties(cfg);
 	cfg->writeEntry("Splitter",m_pSplitter->sizes());
 }
 
-void KviHelpWindow::loadProperties(KviConfig *cfg)
+void KviHelpWindow::loadProperties(KviConfigurationFile *cfg)
 {
 	QList<int> def;
 	int w = width();
diff --git a/src/modules/help/helpwindow.h b/src/modules/help/helpwindow.h
index 38fd895a5..7852e99d0 100644
--- a/src/modules/help/helpwindow.h
+++ b/src/modules/help/helpwindow.h
@@ -6,7 +6,7 @@
 //   Creation date : Fri Aug 11 2000 18:05:59 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -25,7 +25,7 @@
 //=============================================================================
 
 #include "kvi_window.h"
-#include "kvi_string.h"
+#include "KviCString.h"
 #include "kvi_tal_vbox.h"
 #include "kvi_tal_listwidget.h"
 
@@ -66,8 +66,8 @@ protected:
 	virtual QPixmap * myIconPtr();
 	virtual void fillCaptionBuffers();
 	virtual void resizeEvent(QResizeEvent *e);
-	virtual void saveProperties(KviConfig * cfg);
-	virtual void loadProperties(KviConfig * cfg);
+	virtual void saveProperties(KviConfigurationFile * cfg);
+	virtual void loadProperties(KviConfigurationFile * cfg);
 public:
 	QTextBrowser * textBrowser();
 public slots:
diff --git a/src/modules/help/libkvihelp.cpp b/src/modules/help/libkvihelp.cpp
index c58a92897..67a9cc1cc 100644
--- a/src/modules/help/libkvihelp.cpp
+++ b/src/modules/help/libkvihelp.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Sun Aug 13 2000 03:00:00 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -25,9 +25,9 @@
 #include "helpwidget.h"
 #include "helpwindow.h"
 #include "index.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_module.h"
-#include "kvi_fileutils.h"
+#include "KviFileUtils.h"
 #include "kvi_sourcesdate.h"
 #include "kvi_app.h"
 #include "kvi_frame.h"
diff --git a/src/modules/http/httpfiletransfer.cpp b/src/modules/http/httpfiletransfer.cpp
index adfcd1c06..7c53191b8 100644
--- a/src/modules/http/httpfiletransfer.cpp
+++ b/src/modules/http/httpfiletransfer.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Tue Apr 22 2003 02:00:12 GMT by Szymon Stefanek
 //
 //   This config is part of the KVirc irc client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2003-2010 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
@@ -26,7 +26,7 @@
 
 #include "kvi_app.h"
 #include "kvi_out.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_window.h"
 #include "kvi_iconmanager.h"
 #include "kvi_netutils.h"
@@ -60,7 +60,7 @@ KviHttpFileTransfer::KviHttpFileTransfer()
 
 	connect(m_pHttpRequest,SIGNAL(status(const QString &)),this,SLOT(statusMessage(const QString &)));
 	connect(m_pHttpRequest,SIGNAL(terminated(bool)),this,SLOT(transferTerminated(bool)));
-	connect(m_pHttpRequest,SIGNAL(header(KviPointerHashTable<const char *,KviStr> *)),this,SLOT(headersReceived(KviPointerHashTable<const char *,KviStr> *)));
+	connect(m_pHttpRequest,SIGNAL(header(KviPointerHashTable<const char *,KviCString> *)),this,SLOT(headersReceived(KviPointerHashTable<const char *,KviCString> *)));
 	connect(m_pHttpRequest,SIGNAL(resolvingHost(const QString &)),this,SLOT(resolvingHost(const QString &)));
 	connect(m_pHttpRequest,SIGNAL(requestSent(const QStringList &)),this,SLOT(requestSent(const QStringList &)));
 	connect(m_pHttpRequest,SIGNAL(contactingHost(const QString &)),this,SLOT(contactingHost(const QString &)));
@@ -458,14 +458,14 @@ void KviHttpFileTransfer::transferTerminated(bool bSuccess)
 	}
 }
 
-void KviHttpFileTransfer::headersReceived(KviPointerHashTable<const char *,KviStr> *h)
+void KviHttpFileTransfer::headersReceived(KviPointerHashTable<const char *,KviCString> *h)
 {
 	if(!h)return;
 	KviWindow * out = transferWindow();
 
 	if(out && (!m_bNoOutput))out->output(KVI_OUT_GENERICSTATUS,__tr2qs_ctx("[HTTP %d]: Response headers:","http"),id());
-	KviPointerHashTableIterator<const char *,KviStr> it(*h);
-	while(KviStr * s = it.current())
+	KviPointerHashTableIterator<const char *,KviCString> it(*h);
+	while(KviCString * s = it.current())
 	{
 		QString szHeader = it.currentKey();
 		szHeader += ": ";
diff --git a/src/modules/http/httpfiletransfer.h b/src/modules/http/httpfiletransfer.h
index 735c53d7a..af904a47a 100644
--- a/src/modules/http/httpfiletransfer.h
+++ b/src/modules/http/httpfiletransfer.h
@@ -6,7 +6,7 @@
 //   Creation date : Tue Apr 22 2003 02:00:12 GMT by Szymon Stefanek
 //
 //   This config is part of the KVirc irc client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2003-2010 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
@@ -26,7 +26,7 @@
 
 #include "kvi_filetransfer.h"
 #include "kvi_http.h"
-#include "kvi_time.h"
+#include "KviTimeUtils.h"
 #include "kvi_kvs_variant.h"
 
 #include <QStringList>
@@ -85,7 +85,7 @@ public:
 protected slots:
 	void statusMessage(const QString &txt);
 	void transferTerminated(bool bSuccess);
-	void headersReceived(KviPointerHashTable<const char *,KviStr> *h);
+	void headersReceived(KviPointerHashTable<const char *,KviCString> *h);
 	void requestSent(const QStringList &sl);
 
 	void resolvingHost(const QString &hostname);
diff --git a/src/modules/http/libkvihttp.cpp b/src/modules/http/libkvihttp.cpp
index b29423271..1abcba578 100644
--- a/src/modules/http/libkvihttp.cpp
+++ b/src/modules/http/libkvihttp.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Tue Apr 22 2003 02:00:12 GMT by Szymon Stefanek
 //
 //   This config is part of the KVirc irc client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2003-2010 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
@@ -25,13 +25,13 @@
 #include "httpfiletransfer.h"
 
 #include "kvi_module.h"
-#include "kvi_string.h"
+#include "KviCString.h"
 #include "kvi_app.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_filedialog.h"
 #include "kvi_window.h"
 #include "kvi_error.h"
-#include "kvi_cmdformatter.h"
+#include "KviCommandFormatter.h"
 
 static bool http_kvs_complete_get(KviKvsModuleCommandCall * c,QString &szUrl,QString &szFileName,const QString &szCallback)
 {
diff --git a/src/modules/ident/libkviident.cpp b/src/modules/ident/libkviident.cpp
index 25fac73da..f9c12a4c1 100644
--- a/src/modules/ident/libkviident.cpp
+++ b/src/modules/ident/libkviident.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Tue Oct  2 18:22:04 2001 GMT 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-2010 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
@@ -29,7 +29,7 @@
 #include "kvi_app.h"
 #include "kvi_out.h"
 #include "kvi_netutils.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_window.h"
 #include "kvi_options.h"
 #include "kvi_defaults.h"
@@ -463,7 +463,7 @@ ipv6_failure:
 				if(idx != -1)
 				{
 					// Ok...parse the request
-					KviStr szReq = r->m_szData.left(idx);
+					KviCString szReq = r->m_szData.left(idx);
 					r->m_szData.cutLeft(idx + 1);
 					szReq.trimmed();
 
@@ -473,10 +473,10 @@ ipv6_failure:
 
 						if(kvi_strEqualCI("VERSION",szReq.ptr()))
 						{
-							KviStr reply("Quad-Echelon 7.12-r-244");
+							KviCString reply("Quad-Echelon 7.12-r-244");
 							kvi_socket_write(r->m_sock,reply.ptr(),reply.len());
 						} else {
-							KviStr reply(KviStr::Format,"%s : USERID : UNIX : %s\r\n",szReq.ptr(),m_szUser.ptr());
+							KviCString reply(KviCString::Format,"%s : USERID : UNIX : %s\r\n",szReq.ptr(),m_szUser.ptr());
 							kvi_socket_write(r->m_sock,reply.ptr(),reply.len());
 						}
 
diff --git a/src/modules/ident/libkviident.h b/src/modules/ident/libkviident.h
index 20f852992..8a2f2c88b 100644
--- a/src/modules/ident/libkviident.h
+++ b/src/modules/ident/libkviident.h
@@ -6,7 +6,7 @@
 //   Creation date : Tue Oct  2 18:22:05 2001 GMT 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-2010 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
@@ -24,12 +24,12 @@
 //
 //=============================================================================
 
-#include "kvi_thread.h"
+#include "KviThread.h"
 #include "kvi_sockettype.h"
-#include "kvi_string.h"
-#include "kvi_time.h"
+#include "KviCString.h"
+#include "KviTimeUtils.h"
 #include "kvi_settings.h"
-#include "kvi_pointerlist.h"
+#include "KviPointerList.h"
 
 #include <QObject>
 
@@ -40,17 +40,17 @@ public:
 	~KviIdentRequest();
 public:
 	kvi_socket_t       m_sock;
-	KviStr             m_szData;
-	KviStr             m_szHost;
+	KviCString             m_szData;
+	KviCString             m_szHost;
 	kvi_u32_t m_uPort;
 	time_t             m_tStart;
 };
 
 typedef struct _KviIdentMessageData
 {
-	KviStr             szMessage;
-	KviStr             szHost;
-	KviStr             szAux;
+	KviCString             szMessage;
+	KviCString             szHost;
+	KviCString             szAux;
 	unsigned int       uPort;
 } KviIdentMessageData;
 
@@ -71,7 +71,7 @@ public:
 	KviIdentDaemon();
 	~KviIdentDaemon();
 private:
-	KviStr                    m_szUser;
+	KviCString                    m_szUser;
 	kvi_u32_t        m_uPort;
 	bool                      m_bEnableIPv6;
 	bool                      m_bIPv6ContainsIPv4;
diff --git a/src/modules/iograph/libkviiograph.cpp b/src/modules/iograph/libkviiograph.cpp
index 9cc647a41..a4a91a499 100644
--- a/src/modules/iograph/libkviiograph.cpp
+++ b/src/modules/iograph/libkviiograph.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Tue Oct 31 2000 00:14:12 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -27,7 +27,7 @@
 #include "libkviiograph.h"
 #include "kvi_frame.h"
 #include "kvi_iconmanager.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_mdimanager.h"
 #include "kvi_module.h"
 #include "kvi_options.h"
diff --git a/src/modules/iograph/libkviiograph.h b/src/modules/iograph/libkviiograph.h
index 55aeb768d..30ea6a6e0 100644
--- a/src/modules/iograph/libkviiograph.h
+++ b/src/modules/iograph/libkviiograph.h
@@ -6,7 +6,7 @@
 //   Creation date : Tue Oct 31 2000 00:14:12 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
diff --git a/src/modules/lamerizer/libkvilamerizer.cpp b/src/modules/lamerizer/libkvilamerizer.cpp
index 136537efc..3b40d625a 100644
--- a/src/modules/lamerizer/libkvilamerizer.cpp
+++ b/src/modules/lamerizer/libkvilamerizer.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Sat Jan 20 2002 17:06:12 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2002-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2002-2010 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
@@ -26,7 +26,7 @@
 
 #include "kvi_module.h"
 #include "kvi_debug.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 
 
 
@@ -48,9 +48,9 @@
 #ifdef COMPILE_CRYPT_SUPPORT
 	
 	#include "kvi_memmove.h"
-	#include "kvi_malloc.h"
+	#include "KviMemory.h"
 
-	#include "kvi_pointerlist.h"
+	#include "KviPointerList.h"
 
 	static KviPointerList<KviCryptEngine> * g_pEngineList = 0;
 
@@ -144,7 +144,7 @@
 	};
 	
 	
-	KviCryptEngine::EncryptResult KviLamerizerEngine::encrypt(const char * plainText,KviStr &outBuffer)
+	KviCryptEngine::EncryptResult KviLamerizerEngine::encrypt(const char * plainText,KviCString &outBuffer)
 	{
 		outBuffer = plainText;
 		unsigned char * aux = (unsigned char *)outBuffer.ptr();
@@ -178,7 +178,7 @@
 		return KviCryptEngine::Encoded;
 	}
 
-	KviCryptEngine::DecryptResult KviLamerizerEngine::decrypt(const char * inBuffer,KviStr &plainText)
+	KviCryptEngine::DecryptResult KviLamerizerEngine::decrypt(const char * inBuffer,KviCString &plainText)
 	{
 		plainText = inBuffer;
 		return KviCryptEngine::DecryptOkWasPlainText;
diff --git a/src/modules/lamerizer/libkvilamerizer.h b/src/modules/lamerizer/libkvilamerizer.h
index 774f09a68..4330720bd 100644
--- a/src/modules/lamerizer/libkvilamerizer.h
+++ b/src/modules/lamerizer/libkvilamerizer.h
@@ -29,7 +29,7 @@
 
 #ifdef COMPILE_CRYPT_SUPPORT
 
-	#include "kvi_crypt.h"
+	#include "KviCryptEngine.h"
 
 	class KviLamerizerEngine : public KviCryptEngine
 	{
@@ -41,8 +41,8 @@
 		bool m_bLight;
 	public:
 		virtual bool init(const char *encKey,int encKeyLen,const char *decKey,int decKeyLen);
-		virtual KviCryptEngine::EncryptResult encrypt(const char * plainText,KviStr &outBuffer);
-		virtual KviCryptEngine::DecryptResult decrypt(const char * inBuffer,KviStr &plainText);
+		virtual KviCryptEngine::EncryptResult encrypt(const char * plainText,KviCString &outBuffer);
+		virtual KviCryptEngine::DecryptResult decrypt(const char * inBuffer,KviCString &plainText);
 	};
 
 #endif // COMPILE_CRYPT_SUPPORT
diff --git a/src/modules/language/detector.h b/src/modules/language/detector.h
index e9592ba45..babb21166 100644
--- a/src/modules/language/detector.h
+++ b/src/modules/language/detector.h
@@ -6,7 +6,7 @@
 //   Creation date : Sun May 11 1999 00:07:20 CET by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 1999-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 1999-2010 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
diff --git a/src/modules/language/libkvilanguage.cpp b/src/modules/language/libkvilanguage.cpp
index 14fa7ab28..37de24685 100644
--- a/src/modules/language/libkvilanguage.cpp
+++ b/src/modules/language/libkvilanguage.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Fri 25 Dec 20:16:49 2004 GMT by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2004-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2004-2010 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
@@ -24,7 +24,7 @@
 
 #include "kvi_module.h"
 #include "kvi_app.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 
 #include <QFileInfo>
 
diff --git a/src/modules/links/libkvilinks.cpp b/src/modules/links/libkvilinks.cpp
index bf5a63ac8..1729b9d29 100644
--- a/src/modules/links/libkvilinks.cpp
+++ b/src/modules/links/libkvilinks.cpp
@@ -3,7 +3,7 @@
 //   File : libkvilinks.cpp
 //   Creation date : Thu Dec 21 2000 12:39:12 CEST by Szymon Stefanek
 //
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -26,7 +26,7 @@
 #include "kvi_module.h"
 #include "kvi_frame.h"
 #include "kvi_window.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 
 #include <QSplitter>
 
@@ -103,7 +103,7 @@ static bool links_module_can_unload(KviModule *)
 KVIRC_MODULE(
 	"Links",                                             // module name
 	"4.0.0",                                                // module version
-	"Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)", // author & (C)
+	"Copyright (C) 2000-2010 Szymon Stefanek (pragma at kvirc dot net)", // author & (C)
 	"Links window extension",
 	links_module_init,
 	links_module_can_unload,
diff --git a/src/modules/links/linkswindow.cpp b/src/modules/links/linkswindow.cpp
index 76efdddaf..215e0674d 100644
--- a/src/modules/links/linkswindow.cpp
+++ b/src/modules/links/linkswindow.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Thu Dec 21 2001 12:41:18 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-2010 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
@@ -29,10 +29,10 @@
 #include "kvi_ircview.h"
 #include "kvi_out.h"
 #include "kvi_options.h"
-#include "kvi_locale.h"
-#include "kvi_qstring.h"
+#include "KviLocale.h"
+#include "KviQString.h"
 #include "kvi_out.h"
-#include "kvi_mirccntrl.h"
+#include "KviMircCntrl.h"
 #include "kvi_themedlabel.h"
 #include "kvi_irccontext.h"
 #include "kvi_ircconnection.h"
@@ -201,7 +201,7 @@ void KviLinksWindow::endOfLinks()
 	int farLinks    = 0;
 	int wildServers = 0;
 
-	KviStr szMaxHop,szMaxLinks;
+	KviCString szMaxHop,szMaxLinks;
 
 	m_pListView->setUpdatesEnabled(false);
 	for(KviLink *l=m_pLinkList->first();l;l=m_pLinkList->next()){
@@ -236,7 +236,7 @@ void KviLinksWindow::endOfLinks()
 				brokenLinks++;
 				QString tmp;
 				KviQString::sprintf(tmp,__tr2qs("%s: Parent link %s"),l->description.ptr(),l->parent.ptr());
-				KviStr tmp2(KviStr::Format,"%d",l->hops);
+				KviCString tmp2(KviCString::Format,"%d",l->hops);
 				if(root)
 				{
 					it = new QTreeWidgetItem(root);
@@ -322,7 +322,7 @@ QTreeWidgetItem * KviLinksWindow::insertLink(KviLink *l)
 	{
 		return 0;
 	} else {
-		KviStr hops(KviStr::Format,"%d",l->hops);
+		KviCString hops(KviCString::Format,"%d",l->hops);
 		it = new QTreeWidgetItem(i);
 		it->setText(0,QString(l->host.ptr()));
 		it->setText(1,QString(hops.ptr()));
@@ -334,7 +334,7 @@ QTreeWidgetItem * KviLinksWindow::insertLink(KviLink *l)
 
 QTreeWidgetItem * KviLinksWindow::getItemByHost(const char *host,QTreeWidgetItem * par)
 {
-	KviStr tmp;
+	KviCString tmp;
 	if(par)
 	{
 		for(int i=0;i<par->childCount();i++)
@@ -359,10 +359,10 @@ QTreeWidgetItem * KviLinksWindow::getItemByHost(const char *host,QTreeWidgetItem
 void KviLinksWindow::showHostPopup(QTreeWidgetItem *i,const QPoint &p)
 {
 	if(!i)return;
-	KviStr host=i->text(0);
+	KviCString host=i->text(0);
 	if(host.isEmpty())return;
 	m_pHostPopup->clear();
-	KviStr tmp(KviStr::Format,"LINKS %s *",host.ptr());
+	KviCString tmp(KviCString::Format,"LINKS %s *",host.ptr());
 	m_pHostPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_LINKS)),tmp.ptr());
 	m_pHostPopup->insertSeparator();
 	tmp.sprintf("TIME %s",host.ptr());
@@ -409,7 +409,7 @@ void KviLinksWindow::showHostPopup(QTreeWidgetItem *i,const QPoint &p)
 
 void KviLinksWindow::hostPopupClicked(int id)
 {
-	KviStr tmp = m_pHostPopup->text(id);
+	KviCString tmp = m_pHostPopup->text(id);
 	if(tmp.hasData())
 	{
 		if(!connection())output(KVI_OUT_SYSTEMERROR,__tr2qs("You're not connected to a server"));
@@ -437,7 +437,7 @@ void KviLinksWindow::processData(KviIrcMessage *msg)
 	{
 		const char *aux = tr;
 		while(*tr && (isdigit(*tr)))tr++;
-		KviStr tmp(aux,tr - aux);
+		KviCString tmp(aux,tr - aux);
 		l->hops = tmp.toInt();
 	} else {
 		outputNoFmt(KVI_OUT_SYSTEMERROR,__tr2qs("Broken message syntax, can't extract hops number, assuming 0"));
diff --git a/src/modules/links/linkswindow.h b/src/modules/links/linkswindow.h
index 8616b0b2a..3b9dcc62a 100644
--- a/src/modules/links/linkswindow.h
+++ b/src/modules/links/linkswindow.h
@@ -6,7 +6,7 @@
 //   Creation date : Thu Dec 21 2000 12:42:55 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 Szymon Stefanek (pragma at kvirc dot net)
 //
 //   This program is FREE software. You can redistribute it and/or
 //   modify it under the linkss of the GNU General Public License
@@ -25,7 +25,7 @@
 //=============================================================================
 
 #include "kvi_window.h"
-#include "kvi_string.h"
+#include "KviCString.h"
 #include "kvi_ircsocket.h"
 #include "kvi_sparser.h"
 #include "kvi_console.h"
@@ -39,10 +39,10 @@ class KviThemedLabel;
 
 typedef struct _KviLink
 {
-	KviStr host;
-	KviStr parent;
+	KviCString host;
+	KviCString parent;
 	int hops;
-	KviStr description;
+	KviCString description;
 } KviLink;
 
 class KviLinksListView : public KviThemedTreeWidget
diff --git a/src/modules/list/libkvilist.cpp b/src/modules/list/libkvilist.cpp
index 753bb4d0c..9444ea902 100644
--- a/src/modules/list/libkvilist.cpp
+++ b/src/modules/list/libkvilist.cpp
@@ -3,7 +3,7 @@
 //   File : libkvilist.cpp
 //   Creation date : Sun Oct 21 2001 13:29:12 CEST by Szymon Stefanek
 //
-//   Copyright (C) 2001-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2001-2010 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
@@ -26,7 +26,7 @@
 #include "kvi_module.h"
 #include "kvi_frame.h"
 #include "kvi_window.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 
 #include <QSplitter>
 
@@ -90,7 +90,7 @@ static bool list_module_can_unload(KviModule *)
 KVIRC_MODULE(
 	"List",                                             // module name
 	"4.0.0",                                                // module version
-	"Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)", // author & (C)
+	"Copyright (C) 2000-2010 Szymon Stefanek (pragma at kvirc dot net)", // author & (C)
 	"List window extension",
 	list_module_init,
 	list_module_can_unload,
diff --git a/src/modules/list/listwindow.cpp b/src/modules/list/listwindow.cpp
index c949bb307..0ec8ab125 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-2009 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2001-2010 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
@@ -29,16 +29,16 @@
 #include "kvi_ircview.h"
 #include "kvi_out.h"
 #include "kvi_options.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_out.h"
-#include "kvi_mirccntrl.h"
+#include "KviMircCntrl.h"
 #include "kvi_themedlabel.h"
 #include "kvi_options.h"
 #include "kvi_ircconnection.h"
 #include "kvi_ircconnection.h"
-#include "kvi_qstring.h"
+#include "KviQString.h"
 #include "kvi_topicw.h"
-#include "kvi_config.h"
+#include "KviConfigurationFile.h"
 #include "kvi_filedialog.h"
 #include "kvi_msgbox.h"
 #include "kvi_fileextensions.h"
@@ -263,7 +263,7 @@ void KviListWindow::requestList()
 {
 	if(m_pConsole->isConnected())
 	{
-		KviStr parms = m_pParamsEdit->text();
+		KviCString parms = m_pParamsEdit->text();
 		if(parms.isEmpty())
 			m_pConsole->connection()->sendFmtData("list");
 		else
@@ -368,7 +368,7 @@ void KviListWindow::exportList()
 		if(QFileInfo(szFile).completeSuffix() != "kvc")
 			szFile.append(".kvc");
 
-		KviConfig cfg(szFile,KviConfig::Write);
+		KviConfigurationFile cfg(szFile,KviConfigurationFile::Write);
 		cfg.clear();
 
 		KviChannelTreeWidgetItem * it;
@@ -397,8 +397,8 @@ void KviListWindow::importList()
 		m_pTreeWidget->clear();
 
 
-		KviConfig cfg(szFile,KviConfig::Read);
-		KviConfigIterator it(*cfg.dict());
+		KviConfigurationFile cfg(szFile,KviConfigurationFile::Read);
+		KviConfigurationFileIterator it(*cfg.dict());
 		while(it.current())
 		{
 			cfg.setGroup(it.currentKey());
diff --git a/src/modules/list/listwindow.h b/src/modules/list/listwindow.h
index 664394b10..a5ab7e9ed 100644
--- a/src/modules/list/listwindow.h
+++ b/src/modules/list/listwindow.h
@@ -6,7 +6,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-2010 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
@@ -25,9 +25,9 @@
 //=============================================================================
 
 #include "kvi_window.h"
-#include "kvi_string.h"
+#include "KviCString.h"
 #include "kvi_ircsocket.h"
-#include "kvi_pointerlist.h"
+#include "KviPointerList.h"
 #include "kvi_sparser.h"
 #include "kvi_console.h"
 #include "kvi_irccontext.h"
diff --git a/src/modules/log/libkvilog.cpp b/src/modules/log/libkvilog.cpp
index 7f3ef66d8..7055101ca 100644
--- a/src/modules/log/libkvilog.cpp
+++ b/src/modules/log/libkvilog.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Sat Jan 06 2001 13:28:02 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-2010 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
@@ -25,7 +25,7 @@
 #include "kvi_module.h"
 #include "kvi_window.h"
 #include "kvi_app.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_ircview.h"
 
 
diff --git a/src/modules/logview/libkvilogview.cpp b/src/modules/logview/libkvilogview.cpp
index eae9c4cd9..b4b9f4d85 100644
--- a/src/modules/logview/libkvilogview.cpp
+++ b/src/modules/logview/libkvilogview.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Sun Feb 10 2000 23:25:10 CEST by Juanjo �varez
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -25,11 +25,11 @@
 #include "logviewwidget.h"
 #include "logviewmdiwindow.h"
 
-#include "kvi_config.h"
+#include "KviConfigurationFile.h"
 #include "kvi_module.h"
 #include "kvi_frame.h"
 #include "kvi_iconmanager.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_app.h"
 
 static QRect                 g_rectLogViewGeometry;
diff --git a/src/modules/logview/logviewmdiwindow.cpp b/src/modules/logview/logviewmdiwindow.cpp
index 7a4f1ac3b..b56523cac 100644
--- a/src/modules/logview/logviewmdiwindow.cpp
+++ b/src/modules/logview/logviewmdiwindow.cpp
@@ -5,7 +5,7 @@
 //
 //   This file is part of the KVirc irc client distribution
 //   Copyright (C) 2002 Juanjo Alvarez
-//   Copyright (C) 2002-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2002-2010 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
@@ -27,14 +27,14 @@
 #include "logviewwidget.h"
 
 #include "kvi_iconmanager.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_module.h"
 #include "kvi_options.h"
 #include "kvi_frame.h"
 #include "kvi_ircview.h"
-#include "kvi_qstring.h"
+#include "KviQString.h"
 #include "kvi_app.h"
-#include "kvi_fileutils.h"
+#include "KviFileUtils.h"
 #include "kvi_tal_popupmenu.h"
 
 #include <QList>
@@ -482,7 +482,7 @@ KviLogFile::KviLogFile(const QString & szName)
 	else
 		m_type = Other;
 
-	KviStr szUndecoded = szTmpName.section('.',0,0);
+	KviCString szUndecoded = szTmpName.section('.',0,0);
 	szUndecoded.cutToFirst('_');
 	m_szName = szUndecoded.hexDecode(szUndecoded.ptr()).ptr();
 
diff --git a/src/modules/logview/logviewmdiwindow.h b/src/modules/logview/logviewmdiwindow.h
index 7cd8ba919..7e8ec68f5 100644
--- a/src/modules/logview/logviewmdiwindow.h
+++ b/src/modules/logview/logviewmdiwindow.h
@@ -7,7 +7,7 @@
 //
 //   This file is part of the KVirc irc client distribution
 //   Copyright (C) 2002 Juanjo Alvarez
-//   Copyright (C) 2002-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2002-2010 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
@@ -30,7 +30,7 @@
 #include "kvi_moduleextension.h"
 #include "kvi_tal_vbox.h"
 #include <QTreeWidget>
-#include "kvi_pointerlist.h"
+#include "KviPointerList.h"
 
 #include <QTabWidget>
 #include <QDateTime>
diff --git a/src/modules/logview/logviewwidget.cpp b/src/modules/logview/logviewwidget.cpp
index 0e1ab0636..ef70b0c7a 100644
--- a/src/modules/logview/logviewwidget.cpp
+++ b/src/modules/logview/logviewwidget.cpp
@@ -5,7 +5,7 @@
 //
 //   This file is part of the KVirc irc client distribution
 //   Copyright (C) 2002 Juanjo Alvarez
-//   Copyright (C) 2002-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2002-2010 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
@@ -26,10 +26,10 @@
 #include "logviewwidget.h"
 
 //#include "kvi_debug.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_iconmanager.h"
 #include "kvi_app.h"
-#include "kvi_qstring.h"
+#include "KviQString.h"
 
 #include <QLayout>
 #include <QDir>
diff --git a/src/modules/logview/logviewwidget.h b/src/modules/logview/logviewwidget.h
index 8029fb014..b3e6929a4 100644
--- a/src/modules/logview/logviewwidget.h
+++ b/src/modules/logview/logviewwidget.h
@@ -7,7 +7,7 @@
 //
 //   This file is part of the KVirc irc client distribution
 //   Copyright (C) 2002 Juanjo Alvarez
-//   Copyright (C) 2002-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2002-2010 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
diff --git a/src/modules/mask/libkvimask.cpp b/src/modules/mask/libkvimask.cpp
index ecb06ade2..c2bce77e0 100644
--- a/src/modules/mask/libkvimask.cpp
+++ b/src/modules/mask/libkvimask.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Thu Dec 27 2001 17:13:12 GMT by Szymon Stefanek
 //
 //   This str is part of the KVirc irc client distribution
-//   Copyright (C) 2001-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2001-2010 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
@@ -23,9 +23,9 @@
 //=============================================================================
 
 #include "kvi_module.h"
-#include "kvi_locale.h"
-#include "kvi_string.h"
-#include "kvi_ircmask.h"
+#include "KviLocale.h"
+#include "KviCString.h"
+#include "KviIrcMask.h"
 
 /*
 	@doc: mask.match
diff --git a/src/modules/math/libkvimath.cpp b/src/modules/math/libkvimath.cpp
index 111e5b026..bcea026fd 100644
--- a/src/modules/math/libkvimath.cpp
+++ b/src/modules/math/libkvimath.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Sat Jan 13 14:00:12 2006 GMT by Szymon Stefanek
 //
 //   This math is part of the KVirc irc client distribution
-//   Copyright (C) 2006-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2006-2010 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
@@ -24,7 +24,7 @@
 
 #include "kvi_settings.h"
 #include "kvi_module.h"
-#include "kvi_string.h"
+#include "KviCString.h"
 
 #include <math.h>
 
diff --git a/src/modules/mediaplayer/libkvimediaplayer.cpp b/src/modules/mediaplayer/libkvimediaplayer.cpp
index d16609c8e..1f5832eb2 100644
--- a/src/modules/mediaplayer/libkvimediaplayer.cpp
+++ b/src/modules/mediaplayer/libkvimediaplayer.cpp
@@ -32,7 +32,7 @@
 
 #include "kvi_module.h"
 #include "kvi_options.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_out.h"
 #include <QUrl>
 
@@ -1741,7 +1741,7 @@ static bool mediaplayer_module_ctrl(KviModule *,const char * operation,void * pa
 KVIRC_MODULE(
 	"mediaplayer",
 	"4.0.0",
-	"Copyright (C) 2001-2008 Szymon Stefanek (pragma at kvirc dot net)," \
+	"Copyright (C) 2001-2010 Szymon Stefanek (pragma at kvirc dot net)," \
 		"Christoph Thielecke (crissi99 at gmx dot de)," \
 		"Tonino Imbesi (grifisx at barmes dot org)," \
 		"Alessandro Carbone (elfonol at gmail dot com)," \
diff --git a/src/modules/mediaplayer/mp_amipinterface.cpp b/src/modules/mediaplayer/mp_amipinterface.cpp
index e8f49dab7..6d111db66 100644
--- a/src/modules/mediaplayer/mp_amipinterface.cpp
+++ b/src/modules/mediaplayer/mp_amipinterface.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Sun 27 Mar 2005 16:55:09 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2005-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2005-2010 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
@@ -29,7 +29,7 @@
 
 #include <QTextCodec>
 
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_module.h"
 
 #include <windows.h>
@@ -392,7 +392,7 @@ bool KviAmipInterface::amipExec(const QString &cmd)
 {
 	if(!amip_dll) return false;
 	QTextCodec *c=mediaplayer_get_codec();
-	KviStr szCmd = c ? c->fromUnicode(cmd) : cmd.toUtf8();
+	KviCString szCmd = c ? c->fromUnicode(cmd) : cmd.toUtf8();
 	return (ac_exec(szCmd) == AC_ERR_NOERROR);
 }
 
@@ -401,7 +401,7 @@ QString KviAmipInterface::amipEval(const QString &cmd)
 	QString ret;
 	if(!amip_dll) return ret;
 	QTextCodec *c=mediaplayer_get_codec();
-	KviStr szCmd = c ? c->fromUnicode(cmd) : cmd.toUtf8();
+	KviCString szCmd = c ? c->fromUnicode(cmd) : cmd.toUtf8();
 	char buff[AC_BUFFER_SIZE];
 	if((ac_eval(szCmd, buff) == AC_ERR_NOERROR)) {
 		QString s = buff;
diff --git a/src/modules/mediaplayer/mp_amipinterface.h b/src/modules/mediaplayer/mp_amipinterface.h
index df0dacf04..f5eaf664d 100644
--- a/src/modules/mediaplayer/mp_amipinterface.h
+++ b/src/modules/mediaplayer/mp_amipinterface.h
@@ -6,7 +6,7 @@
 //   Creation date : Sun 27 Mar 2005 16:55:09 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2005-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2005-2010 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
diff --git a/src/modules/mediaplayer/mp_interface.cpp b/src/modules/mediaplayer/mp_interface.cpp
index 12d0fcf44..61201c0d6 100644
--- a/src/modules/mediaplayer/mp_interface.cpp
+++ b/src/modules/mediaplayer/mp_interface.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Fri Mar 25 20:01:25 2005 GMT by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2005-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2005-2010 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
@@ -26,7 +26,7 @@
 #include "mp_mp3.h"
 
 #include "kvi_options.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 
 #include <QTextCodec>
 
diff --git a/src/modules/mediaplayer/mp_interface.h b/src/modules/mediaplayer/mp_interface.h
index 87631b2d6..9b2755dbe 100644
--- a/src/modules/mediaplayer/mp_interface.h
+++ b/src/modules/mediaplayer/mp_interface.h
@@ -6,7 +6,7 @@
 //   Creation date : Fri Mar 25 20:01:25 2005 GMT by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2005-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2005-2010 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
@@ -25,7 +25,7 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_qstring.h"
+#include "KviQString.h"
 #include "kvi_kvs_types.h"
 
 class KviMediaPlayerInterface
diff --git a/src/modules/mediaplayer/mp_mp3.cpp b/src/modules/mediaplayer/mp_mp3.cpp
index 0790e70df..2ac758d32 100644
--- a/src/modules/mediaplayer/mp_mp3.cpp
+++ b/src/modules/mediaplayer/mp_mp3.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Fri Mar 25 20:01:25 2005 GMT by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2005-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2005-2010 Szymon Stefanek (pragma at kvirc dot net)
 //
 //   This file is based on the mp3tech.c. It is released under the original
 //   license and the original copyright notice follows.
diff --git a/src/modules/mediaplayer/mp_mp3.h b/src/modules/mediaplayer/mp_mp3.h
index 95a0660f3..baa41ac02 100644
--- a/src/modules/mediaplayer/mp_mp3.h
+++ b/src/modules/mediaplayer/mp_mp3.h
@@ -4,7 +4,7 @@
 //   Creation date : Fri Mar 25 20:01:25 2005 GMT by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2005-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2005-2010 Szymon Stefanek (pragma at kvirc dot net)
 //
 //   This file is based on the mp3tech.h. It is released under the original
 //   license and the original copyright notice follows.
diff --git a/src/modules/mediaplayer/mp_mprisinterface.cpp b/src/modules/mediaplayer/mp_mprisinterface.cpp
index fa34c78a8..3bc59730e 100644
--- a/src/modules/mediaplayer/mp_mprisinterface.cpp
+++ b/src/modules/mediaplayer/mp_mprisinterface.cpp
@@ -24,7 +24,7 @@
 
 #include "mp_mprisinterface.h"
 #if (defined(COMPILE_DBUS_SUPPORT) && !defined(COMPILE_ON_WINDOWS) && !defined(COMPILE_ON_MAC) && !defined(COMPILE_ON_MINGW))
-#include "kvi_locale.h"
+#include "KviLocale.h"
 
 /*
 	according to MPRIS 1.0, GetStatus returns struct of 4 integers.
diff --git a/src/modules/mediaplayer/mp_winampinterface.cpp b/src/modules/mediaplayer/mp_winampinterface.cpp
index 3cafbe471..5b5938915 100644
--- a/src/modules/mediaplayer/mp_winampinterface.cpp
+++ b/src/modules/mediaplayer/mp_winampinterface.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Mon 28 Mar 2005 23:41:50 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2005-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2005-2010 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
@@ -29,7 +29,7 @@
 
 #include <QTextCodec>
 
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_module.h"
 
 #include <windows.h>
@@ -377,7 +377,7 @@ bool KviWinampInterface::playMrl(const QString &mrl)
 	if(hWinamp)
 	{
 		QTextCodec *c=mediaplayer_get_codec();
-		KviStr szMrl = c ? c->fromUnicode(mrl) : mrl.toUtf8();
+		KviCString szMrl = c ? c->fromUnicode(mrl) : mrl.toUtf8();
 		COPYDATASTRUCT cds;
 		cds.dwData = IPC_PLAYFILE;
 		cds.lpData = (void *)szMrl.ptr();
diff --git a/src/modules/mediaplayer/mp_winampinterface.h b/src/modules/mediaplayer/mp_winampinterface.h
index 5c4e75cce..648c3c581 100644
--- a/src/modules/mediaplayer/mp_winampinterface.h
+++ b/src/modules/mediaplayer/mp_winampinterface.h
@@ -6,7 +6,7 @@
 //   Creation date : Mon 28 Mar 2005 23:41:50 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2005-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2005-2010 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
diff --git a/src/modules/mediaplayer/mp_xmmsinterface.cpp b/src/modules/mediaplayer/mp_xmmsinterface.cpp
index 465c1dc79..23eddf03b 100644
--- a/src/modules/mediaplayer/mp_xmmsinterface.cpp
+++ b/src/modules/mediaplayer/mp_xmmsinterface.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Fri 25 Mar 2005 20:04:54 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2005-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2005-2010 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
@@ -29,7 +29,7 @@
 
 #if (!defined(COMPILE_ON_WINDOWS) && !defined(COMPILE_ON_MAC) && !defined(COMPILE_ON_MINGW))
 
-#include "kvi_locale.h"
+#include "KviLocale.h"
 
 MP_IMPLEMENT_DESCRIPTOR(
 	KviXmmsInterface,
diff --git a/src/modules/mediaplayer/mp_xmmsinterface.h b/src/modules/mediaplayer/mp_xmmsinterface.h
index 0cb2ef2c2..df6eb04b8 100644
--- a/src/modules/mediaplayer/mp_xmmsinterface.h
+++ b/src/modules/mediaplayer/mp_xmmsinterface.h
@@ -6,7 +6,7 @@
 //   Creation date : Fri 25 Mar 2005 20:04:54 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2005-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2005-2010 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
diff --git a/src/modules/mediaplayer/winamp.cpp b/src/modules/mediaplayer/winamp.cpp
index 561c01cd3..178545c26 100644
--- a/src/modules/mediaplayer/winamp.cpp
+++ b/src/modules/mediaplayer/winamp.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Tue Nov  6 23:01:12 2001 GMT 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-2010 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
diff --git a/src/modules/mircimport/libkvimircimport.cpp b/src/modules/mircimport/libkvimircimport.cpp
index 5fda94784..fb761d535 100644
--- a/src/modules/mircimport/libkvimircimport.cpp
+++ b/src/modules/mircimport/libkvimircimport.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Tue Aug 27 01:20:35 2002 GMT by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2002-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2002-2010 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
@@ -26,12 +26,12 @@
 
 #include "kvi_module.h"
 #include "kvi_filedialog.h"
-#include "kvi_fileutils.h"
+#include "KviFileUtils.h"
 #include "kvi_fileextensions.h"
-#include "kvi_locale.h"
-#include "kvi_config.h"
+#include "KviLocale.h"
+#include "KviConfigurationFile.h"
 #include "kvi_app.h"
-#include "kvi_qstring.h"
+#include "KviQString.h"
 #include "kvi_tal_vbox.h"
 
 #include <QMessageBox>
@@ -55,7 +55,7 @@ KviMircServersIniImport::~KviMircServersIniImport()
 
 int KviMircServersIniImport::doImport(const QString& filename)
 {
-	KviConfig cfg(filename,KviConfig::Read,true);
+	KviConfigurationFile cfg(filename,KviConfigurationFile::Read,true);
 	int iCount = 0;
 	if(cfg.hasGroup("servers"))
 	{
@@ -120,7 +120,7 @@ int KviMircServersIniImport::doImport(const QString& filename)
 
 void KviMircServersIniImport::start()
 {
-	//KviStr buffer;
+	//KviCString buffer;
 	QString buffer;
 	if(!KviFileDialog::askForOpenFileName(buffer,__tr("Choose a servers.ini file"),0,KVI_FILTER_INI,false,true))return;
 
diff --git a/src/modules/mircimport/libkvimircimport.h b/src/modules/mircimport/libkvimircimport.h
index d96a5264f..5f37eebe0 100644
--- a/src/modules/mircimport/libkvimircimport.h
+++ b/src/modules/mircimport/libkvimircimport.h
@@ -6,7 +6,7 @@
 //   Creation date : Tue Aug 27 01:28:02 2002 GMT by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2002-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2002-2010 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
@@ -25,7 +25,7 @@
 //=============================================================================
 
 #include "kvi_mexserverimport.h"
-#include "kvi_string.h"
+#include "KviCString.h"
 #include "kvi_http.h"
 #include <kvi_tal_wizard.h>
 
diff --git a/src/modules/my/libkvimy.cpp b/src/modules/my/libkvimy.cpp
index 3ccbb6a04..9cc9ad92a 100644
--- a/src/modules/my/libkvimy.cpp
+++ b/src/modules/my/libkvimy.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Mon Jul  1 02:46:49 2002 GMT by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2002-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2002-2010 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
@@ -25,12 +25,12 @@
 #include "kvi_module.h"
 #include "kvi_console.h"
 #include "kvi_app.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_irclink.h"
 #include "kvi_ircconnection.h"
 #include "kvi_ircconnectionuserinfo.h"
 #include "kvi_ircconnectionserverinfo.h"
-#include "kvi_ircserver.h"
+#include "KviIrcServer.h"
 
 #include "idle.h"
 Idle* g_pIdle;
diff --git a/src/modules/notifier/libkvinotifier.cpp b/src/modules/notifier/libkvinotifier.cpp
index dea18518f..a0d934e08 100644
--- a/src/modules/notifier/libkvinotifier.cpp
+++ b/src/modules/notifier/libkvinotifier.cpp
@@ -31,9 +31,9 @@
 #include "kvi_app.h"
 #include "kvi_frame.h"
 #include "kvi_window.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_iconmanager.h"
-#include "kvi_time.h"
+#include "KviTimeUtils.h"
 #include "kvi_options.h"
 
 #include <QSplitter>
diff --git a/src/modules/notifier/notifierwindow.cpp b/src/modules/notifier/notifierwindow.cpp
index ddaf7454c..1b312151e 100644
--- a/src/modules/notifier/notifierwindow.cpp
+++ b/src/modules/notifier/notifierwindow.cpp
@@ -29,11 +29,11 @@
 #include "notifierwindowtab.h"
 
 #include "kvi_iconmanager.h"
-#include "kvi_config.h"
+#include "KviConfigurationFile.h"
 #include "kvi_window.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_frame.h"
-#include "kvi_mirccntrl.h"
+#include "KviMircCntrl.h"
 #include "kvi_options.h"
 #include "kvi_userinput.h"
 #include "kvi_themedlineedit.h"
@@ -1114,7 +1114,7 @@ void KviNotifierWindow::returnPressed()
 	QString szHtml = szTxt;
 	szHtml.replace("<","&lt;");
 	szHtml.replace(">","&gt;");
-	KviStr szTmp(KviStr::Format,"%d",KVI_SMALLICON_OWNPRIVMSG);
+	KviCString szTmp(KviCString::Format,"%d",KVI_SMALLICON_OWNPRIVMSG);
 
 	addMessage(pTab->wnd(),szTmp.ptr(),szHtml,0);
 	m_pLineEdit->setText("");
diff --git a/src/modules/notifier/notifierwindow.h b/src/modules/notifier/notifierwindow.h
index c41f19e9f..5b41b0fec 100644
--- a/src/modules/notifier/notifierwindow.h
+++ b/src/modules/notifier/notifierwindow.h
@@ -28,10 +28,10 @@
 #include "notifiersettings.h"
 
 #include "kvi_settings.h"
-#include "kvi_qstring.h"
-#include "kvi_pointerlist.h"
+#include "KviQString.h"
+#include "KviPointerList.h"
 #include "kvi_tal_popupmenu.h"
-#include "kvi_time.h"
+#include "KviTimeUtils.h"
 
 #include <QBitmap>
 #include <QColor>
diff --git a/src/modules/notifier/notifierwindowtab.cpp b/src/modules/notifier/notifierwindowtab.cpp
index 0004fd701..f2543359c 100644
--- a/src/modules/notifier/notifierwindowtab.cpp
+++ b/src/modules/notifier/notifierwindowtab.cpp
@@ -29,8 +29,8 @@
 #include "notifiersettings.h"
 
 #include "kvi_app.h"
-#include "kvi_config.h"
-#include "kvi_locale.h"
+#include "KviConfigurationFile.h"
+#include "KviLocale.h"
 #include "kvi_frame.h"
 #include "kvi_options.h"
 #include "kvi_window.h"
diff --git a/src/modules/objects/class_button.cpp b/src/modules/objects/class_button.cpp
index f686c0187..e65b6b1b9 100644
--- a/src/modules/objects/class_button.cpp
+++ b/src/modules/objects/class_button.cpp
@@ -5,7 +5,7 @@
 //
 //   This file is part of the KVirc irc client distribution
 //   Copyright (C) 2000 Krzysztof Godlewski
-//   Copyright (C) 2000-2009 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -24,10 +24,10 @@
 //=============================================================================
 
 #include "kvi_debug.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_error.h"
 #include "kvi_iconmanager.h"
-#include "kvi_file.h"
+#include "KviFile.h"
 
 #include "class_button.h"
 #include "class_pixmap.h"
diff --git a/src/modules/objects/class_button.h b/src/modules/objects/class_button.h
index 6043319a1..b25a759be 100644
--- a/src/modules/objects/class_button.h
+++ b/src/modules/objects/class_button.h
@@ -7,7 +7,7 @@
 //
 //   This file is part of the KVirc irc client distribution
 //   Copyright (C) 2000 Krzysztof Godlewski
-//   Copyright (C) 2000-2009 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
diff --git a/src/modules/objects/class_buttongroup.cpp b/src/modules/objects/class_buttongroup.cpp
index 33167c1b8..dfa633eef 100644
--- a/src/modules/objects/class_buttongroup.cpp
+++ b/src/modules/objects/class_buttongroup.cpp
@@ -27,7 +27,7 @@
 #include "class_buttongroup.h"
 #include "kvi_error.h"
 #include "kvi_debug.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_iconmanager.h"
 
 #include <QButtonGroup>
diff --git a/src/modules/objects/class_checkbox.cpp b/src/modules/objects/class_checkbox.cpp
index 7c9266ddb..656eebefc 100644
--- a/src/modules/objects/class_checkbox.cpp
+++ b/src/modules/objects/class_checkbox.cpp
@@ -5,7 +5,7 @@
 //
 //   This file is part of the KVirc irc client distribution
 //   Copyright (C) 2000 Krzysztof Godlewski
-//   Copyright (C) 2000-2009 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -26,7 +26,7 @@
 
 #include "kvi_error.h"
 #include "kvi_debug.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "class_checkbox.h"
 
 #include <QCheckBox>
diff --git a/src/modules/objects/class_checkbox.h b/src/modules/objects/class_checkbox.h
index 9c89e0627..51a727675 100644
--- a/src/modules/objects/class_checkbox.h
+++ b/src/modules/objects/class_checkbox.h
@@ -8,7 +8,7 @@
 //
 //   This file is part of the KVirc irc client distribution
 //   Copyright (C) 2000 Krzysztof Godlewski
-//   Copyright (C) 2000-2009 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
diff --git a/src/modules/objects/class_combobox.cpp b/src/modules/objects/class_combobox.cpp
index d3f194e2a..6624e9544 100644
--- a/src/modules/objects/class_combobox.cpp
+++ b/src/modules/objects/class_combobox.cpp
@@ -5,7 +5,7 @@
 //
 //   This file is part of the KVirc irc client distribution
 //   Copyright (C) 2000 Krzysztof Godlewski
-//   Copyright (C) 2000-2009 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -25,7 +25,7 @@
 
 
 #include "kvi_error.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_debug.h"
 #include "class_list.h"
 #include "class_combobox.h"
diff --git a/src/modules/objects/class_combobox.h b/src/modules/objects/class_combobox.h
index 4fc5a3aee..db7920f16 100644
--- a/src/modules/objects/class_combobox.h
+++ b/src/modules/objects/class_combobox.h
@@ -8,7 +8,7 @@
 //
 //   This file is part of the KVirc irc client distribution
 //   Copyright (C) 2000 Krzysztof Godlewski
-//   Copyright (C) 2000-2009 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
diff --git a/src/modules/objects/class_datetimeedit.cpp b/src/modules/objects/class_datetimeedit.cpp
index 4ffdcfa0d..c877c8e71 100644
--- a/src/modules/objects/class_datetimeedit.cpp
+++ b/src/modules/objects/class_datetimeedit.cpp
@@ -23,10 +23,10 @@
 //=============================================================================
 
 #include "kvi_debug.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_error.h"
 #include "kvi_iconmanager.h"
-#include "kvi_file.h"
+#include "KviFile.h"
 
 #include "class_datetimeedit.h"
 #include "class_pixmap.h"
diff --git a/src/modules/objects/class_dialog.cpp b/src/modules/objects/class_dialog.cpp
index 63eb78885..b8a665c71 100644
--- a/src/modules/objects/class_dialog.cpp
+++ b/src/modules/objects/class_dialog.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Sun Apr 10 22:51:48 CEST 2002 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2002-2009 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2002-2010 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
@@ -25,7 +25,7 @@
 #include "class_dialog.h"
 #include "kvi_error.h"
 #include "kvi_debug.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_frame.h"
 #include "kvi_app.h"
 
diff --git a/src/modules/objects/class_dialog.h b/src/modules/objects/class_dialog.h
index 090108bd2..d67cce791 100644
--- a/src/modules/objects/class_dialog.h
+++ b/src/modules/objects/class_dialog.h
@@ -6,7 +6,7 @@
 //   Creation date : Sun Apr 10 22:51:48 CEST 2002 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2002-2009 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2002-2010 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
diff --git a/src/modules/objects/class_dockwindow.cpp b/src/modules/objects/class_dockwindow.cpp
index 592f18b28..d4cd121e6 100644
--- a/src/modules/objects/class_dockwindow.cpp
+++ b/src/modules/objects/class_dockwindow.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Thu 29 Dec 2005 23:45:11 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC Client distribution
-//   Copyright (C) 2005-2009 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2005-2010 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
@@ -25,8 +25,8 @@
 #include "class_dockwindow.h"
 
 #include "kvi_frame.h"
-#include "kvi_locale.h"
-#include "kvi_qstring.h"
+#include "KviLocale.h"
+#include "KviQString.h"
 
 #include <QDockWidget>
 #define QT_DOCK_WINDOW QDockWidget
diff --git a/src/modules/objects/class_dockwindow.h b/src/modules/objects/class_dockwindow.h
index b81b992fa..f194e4a56 100644
--- a/src/modules/objects/class_dockwindow.h
+++ b/src/modules/objects/class_dockwindow.h
@@ -6,7 +6,7 @@
 //   Creation date : Thu 29 Dec 2005 23:45:11 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC Client distribution
-//   Copyright (C) 2005-2009 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2005-2010 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
diff --git a/src/modules/objects/class_file.cpp b/src/modules/objects/class_file.cpp
index 8cc190af3..2af376f64 100644
--- a/src/modules/objects/class_file.cpp
+++ b/src/modules/objects/class_file.cpp
@@ -5,7 +5,7 @@
 //   by Tonino Imbesi(Grifisx) and Alessandro Carbone(Noldor)
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2009 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -26,10 +26,10 @@
 
 #include "class_file.h"
 #include "kvi_debug.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_error.h"
-#include "kvi_file.h"
-#include "kvi_fileutils.h"
+#include "KviFile.h"
+#include "KviFileUtils.h"
 #include "class_memorybuffer.h"
 
 #include <QStringList>
diff --git a/src/modules/objects/class_file.h b/src/modules/objects/class_file.h
index 040653c8f..acf4aa324 100644
--- a/src/modules/objects/class_file.h
+++ b/src/modules/objects/class_file.h
@@ -27,7 +27,7 @@
 
 #include "object_macros.h"
 #include "class_widget.h"
-#include "kvi_file.h"
+#include "KviFile.h"
 
 
 class KviKvsObject_file : public KviKvsObject_widget
diff --git a/src/modules/objects/class_ftp.cpp b/src/modules/objects/class_ftp.cpp
index 9d1c594ac..08a946a5a 100644
--- a/src/modules/objects/class_ftp.cpp
+++ b/src/modules/objects/class_ftp.cpp
@@ -25,7 +25,7 @@
 #include "kvi_debug.h"
 #include "kvi_error.h"
 #include "class_ftp.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 
 #include <QFtp>
 #include <QHashIterator>
diff --git a/src/modules/objects/class_groupbox.cpp b/src/modules/objects/class_groupbox.cpp
index d51603fa6..89c714025 100644
--- a/src/modules/objects/class_groupbox.cpp
+++ b/src/modules/objects/class_groupbox.cpp
@@ -28,7 +28,7 @@
 #include "kvi_error.h"
 #include "kvi_debug.h"
 
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_iconmanager.h"
 
 
diff --git a/src/modules/objects/class_hbox.cpp b/src/modules/objects/class_hbox.cpp
index 091b7e13d..e224b95ec 100644
--- a/src/modules/objects/class_hbox.cpp
+++ b/src/modules/objects/class_hbox.cpp
@@ -24,7 +24,7 @@
 
 #define _KVI_DEBUG_CHECK_RANGE_
 #include "kvi_debug.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "class_hbox.h"
 #include "kvi_tal_hbox.h"
 
diff --git a/src/modules/objects/class_http.cpp b/src/modules/objects/class_http.cpp
index 5a08a9d8e..a0b682963 100644
--- a/src/modules/objects/class_http.cpp
+++ b/src/modules/objects/class_http.cpp
@@ -26,7 +26,7 @@
 
 #include "kvi_debug.h"
 #include "kvi_error.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 
 #include <QHttp>
 #include <QUrl>
diff --git a/src/modules/objects/class_label.cpp b/src/modules/objects/class_label.cpp
index 641e5bee8..891cb6e63 100644
--- a/src/modules/objects/class_label.cpp
+++ b/src/modules/objects/class_label.cpp
@@ -5,7 +5,7 @@
 //
 //   This file is part of the KVirc irc client distribution
 //   Copyright (C) 2000 Krzysztof Godlewski
-//   Copyright (C) 2000-2009 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -26,7 +26,7 @@
 #include "kvi_error.h"
 #include "kvi_debug.h"
 #include "class_label.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_iconmanager.h"
 
 #include <QFont>
diff --git a/src/modules/objects/class_label.h b/src/modules/objects/class_label.h
index 929bebe5a..1ff7f0673 100644
--- a/src/modules/objects/class_label.h
+++ b/src/modules/objects/class_label.h
@@ -7,7 +7,7 @@
 //
 //   This file is part of the KVirc irc client distribution
 //   Copyright (C) 2000 Krzysztof Godlewski
-//   Copyright (C) 2000-2009 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
diff --git a/src/modules/objects/class_layout.cpp b/src/modules/objects/class_layout.cpp
index 2c402942a..163d075fe 100644
--- a/src/modules/objects/class_layout.cpp
+++ b/src/modules/objects/class_layout.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Fri Now 22 2002 00:50:01 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2002-2009 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2002-2010 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
@@ -24,7 +24,7 @@
 
 #define _KVI_DEBUG_CHECK_RANGE_
 #include "kvi_debug.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "class_layout.h"
 
 #include <QGridLayout>
diff --git a/src/modules/objects/class_layout.h b/src/modules/objects/class_layout.h
index 70a62cfe8..a5f5fbff1 100644
--- a/src/modules/objects/class_layout.h
+++ b/src/modules/objects/class_layout.h
@@ -6,7 +6,7 @@
 //   Creation date : Fri Now 22 2002 00:50:01 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2002-2009 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2002-2010 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
diff --git a/src/modules/objects/class_lcd.cpp b/src/modules/objects/class_lcd.cpp
index d04c304bf..e1f570bfc 100644
--- a/src/modules/objects/class_lcd.cpp
+++ b/src/modules/objects/class_lcd.cpp
@@ -26,7 +26,7 @@
 #include "class_lcd.h"
 #include "kvi_error.h"
 #include "kvi_debug.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_iconmanager.h"
 
 #include <QLCDNumber>
diff --git a/src/modules/objects/class_lineedit.cpp b/src/modules/objects/class_lineedit.cpp
index 3b971e4ff..59b20760e 100644
--- a/src/modules/objects/class_lineedit.cpp
+++ b/src/modules/objects/class_lineedit.cpp
@@ -5,7 +5,7 @@
 //
 //   This file is part of the KVirc irc client distribution
 //   Copyright (C) 2000 Krzysztof Godlewski
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -25,7 +25,7 @@
 
 #include "kvi_error.h"
 #include "kvi_debug.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "class_lineedit.h"
 #include <QRegExpValidator>
 #include <QLineEdit>
diff --git a/src/modules/objects/class_lineedit.h b/src/modules/objects/class_lineedit.h
index 755837da9..b920d4187 100644
--- a/src/modules/objects/class_lineedit.h
+++ b/src/modules/objects/class_lineedit.h
@@ -7,7 +7,7 @@
 //
 //   This file is part of the KVirc irc client distribution
 //   Copyright (C) 2000 Krzysztof Godlewski
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
diff --git a/src/modules/objects/class_list.cpp b/src/modules/objects/class_list.cpp
index 298e77dc9..f4d1475c0 100644
--- a/src/modules/objects/class_list.cpp
+++ b/src/modules/objects/class_list.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Wed Sep 09 2000 21:07:55 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -23,8 +23,8 @@
 //============================================================================
 
 #include "kvi_debug.h"
-#include "kvi_malloc.h"
-#include "kvi_locale.h"
+#include "KviMemory.h"
+#include "KviLocale.h"
 #include "class_list.h"
 #include <stdlib.h>
 
diff --git a/src/modules/objects/class_list.h b/src/modules/objects/class_list.h
index 3d583f254..6354f74fe 100644
--- a/src/modules/objects/class_list.h
+++ b/src/modules/objects/class_list.h
@@ -6,7 +6,7 @@
 //   Creation date : Wed Sep 09 2000 21:07:01 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -25,8 +25,8 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_string.h"
-#include "kvi_pointerlist.h"
+#include "KviCString.h"
+#include "KviPointerList.h"
 #include "kvi_kvs_variant.h"
 #include "object_macros.h"
 
diff --git a/src/modules/objects/class_listwidget.cpp b/src/modules/objects/class_listwidget.cpp
index 6cb063d14..a3e7819aa 100644
--- a/src/modules/objects/class_listwidget.cpp
+++ b/src/modules/objects/class_listwidget.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Sat Oct 2 03:40:28 CET 2004 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2004-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2004-2010 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
@@ -23,7 +23,7 @@
 //=============================================================================
 
 #include "kvi_error.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_debug.h"
 #include "class_list.h"
 #include "class_listwidget.h"
diff --git a/src/modules/objects/class_listwidget.h b/src/modules/objects/class_listwidget.h
index 90aa25e51..f6f9aa0c7 100644
--- a/src/modules/objects/class_listwidget.h
+++ b/src/modules/objects/class_listwidget.h
@@ -6,7 +6,7 @@
 //   Creation date : Sat Oct 2 03:40:28 CET 2004 by Szymon Stefanek

 //

 //   This file is part of the KVirc irc client distribution

-//   Copyright (C) 2004-2008 Szymon Stefanek (pragma at kvirc dot net)

+//   Copyright (C) 2004-2010 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

diff --git a/src/modules/objects/class_mainwindow.cpp b/src/modules/objects/class_mainwindow.cpp
index a61d55667..5621b87c1 100644
--- a/src/modules/objects/class_mainwindow.cpp
+++ b/src/modules/objects/class_mainwindow.cpp
@@ -27,7 +27,7 @@
 #include "class_mainwindow.h"
 #include "kvi_error.h"
 #include "kvi_debug.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_iconmanager.h"
 
 
diff --git a/src/modules/objects/class_memorybuffer.cpp b/src/modules/objects/class_memorybuffer.cpp
index 66aa4d0a8..22836afa7 100644
--- a/src/modules/objects/class_memorybuffer.cpp
+++ b/src/modules/objects/class_memorybuffer.cpp
@@ -28,10 +28,10 @@
 #include "kvi_error.h"
 #include "kvi_debug.h"
 #include "kvi_settings.h"
-#include "kvi_locale.h"
-#include "kvi_process.h"
-#include "kvi_fileutils.h"
-#include "kvi_file.h"
+#include "KviLocale.h"
+#include "QProcess"
+#include "KviFileUtils.h"
+#include "KviFile.h"
 
 #include <QFileInfo>
 
diff --git a/src/modules/objects/class_menubar.cpp b/src/modules/objects/class_menubar.cpp
index 3e726918f..85468613f 100644
--- a/src/modules/objects/class_menubar.cpp
+++ b/src/modules/objects/class_menubar.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Tue Now 26 13:16:59 CEST 2002 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2002-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2002-2010 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
@@ -26,7 +26,7 @@
 #include "class_menubar.h"
 #include "kvi_error.h"
 #include "kvi_debug.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 
 /*
 	@doc:	menubar
diff --git a/src/modules/objects/class_menubar.h b/src/modules/objects/class_menubar.h
index 7e842e670..6b8002c35 100644
--- a/src/modules/objects/class_menubar.h
+++ b/src/modules/objects/class_menubar.h
@@ -6,7 +6,7 @@
 //   Creation date : Tue Now 26 13:15:48 CEST 2002 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2002-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2002-2010 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
diff --git a/src/modules/objects/class_multilineedit.cpp b/src/modules/objects/class_multilineedit.cpp
index 88984b1ac..cbb235efb 100644
--- a/src/modules/objects/class_multilineedit.cpp
+++ b/src/modules/objects/class_multilineedit.cpp
@@ -25,8 +25,8 @@
 
 #include "kvi_error.h"
 #include "kvi_debug.h"
-#include "kvi_locale.h"
-#include "kvi_malloc.h"
+#include "KviLocale.h"
+#include "KviMemory.h"
 
 #include <QTextBlock>
 #include <QFile>
diff --git a/src/modules/objects/class_painter.cpp b/src/modules/objects/class_painter.cpp
index ece9586fa..0bc604595 100644
--- a/src/modules/objects/class_painter.cpp
+++ b/src/modules/objects/class_painter.cpp
@@ -29,10 +29,10 @@
 #include "class_widget.h"
 
 #include "kvi_debug.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_error.h"
 #include "kvi_iconmanager.h"
-#include "kvi_malloc.h"
+#include "KviMemory.h"
  #include <QPrintDialog>
 #include <QTextDocument>
 #include <QIcon>
diff --git a/src/modules/objects/class_painter.h b/src/modules/objects/class_painter.h
index f0752323b..9af8f9f90 100644
--- a/src/modules/objects/class_painter.h
+++ b/src/modules/objects/class_painter.h
@@ -29,7 +29,7 @@
 
 #include <qpainter.h>
 #include <qpaintdevice.h>
-#include "kvi_string.h"
+#include "KviCString.h"
 #include <QPainterPath>
 #include "object_macros.h"
 
diff --git a/src/modules/objects/class_pixmap.cpp b/src/modules/objects/class_pixmap.cpp
index 827ca14db..a509884af 100644
--- a/src/modules/objects/class_pixmap.cpp
+++ b/src/modules/objects/class_pixmap.cpp
@@ -27,10 +27,10 @@
 #include "class_widget.h"
 
 #include "class_memorybuffer.h"
-#include "kvi_animatedpixmap.h"
+#include "KviAnimatedPixmap.h"
 
 #include "kvi_debug.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 
 #include <QFile>
 
diff --git a/src/modules/objects/class_pixmap.h b/src/modules/objects/class_pixmap.h
index 485f32e5b..07e46822a 100644
--- a/src/modules/objects/class_pixmap.h
+++ b/src/modules/objects/class_pixmap.h
@@ -30,8 +30,8 @@
 #include <qpixmap.h>
 #include <qimage.h>
 #include <QMatrix>
-#include <kvi_animatedpixmap.h>
-#include "kvi_string.h"
+#include <KviAnimatedPixmap.h>
+#include "KviCString.h"
 
 
 #include "object_macros.h"
diff --git a/src/modules/objects/class_popupmenu.cpp b/src/modules/objects/class_popupmenu.cpp
index 86ff5003e..013fa945e 100644
--- a/src/modules/objects/class_popupmenu.cpp
+++ b/src/modules/objects/class_popupmenu.cpp
@@ -28,7 +28,7 @@
 
 #include "kvi_error.h"
 #include "kvi_debug.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_iconmanager.h"
 #include "kvi_tal_popupmenu.h"
 
diff --git a/src/modules/objects/class_process.cpp b/src/modules/objects/class_process.cpp
index 07bf9ee53..b150fa8af 100644
--- a/src/modules/objects/class_process.cpp
+++ b/src/modules/objects/class_process.cpp
@@ -27,8 +27,8 @@
 #include "kvi_error.h"
 #include "kvi_debug.h"
 #include "kvi_settings.h"
-#include "kvi_locale.h"
-#include "kvi_process.h"
+#include "KviLocale.h"
+#include "QProcess"
 
 /*
 	@doc:	process
@@ -182,7 +182,7 @@ KVSO_BEGIN_REGISTERCLASS(KviKvsObject_process,"process","object")
 
 KVSO_BEGIN_CONSTRUCTOR(KviKvsObject_process,KviKvsObject)
 
-	m_pProcess = new KviProcess();
+	m_pProcess = new QProcess();
 	connect(m_pProcess,SIGNAL(readyReadStandardOutput()),this,SLOT(slotReadStdout()));
 	connect(m_pProcess,SIGNAL(readyReadStandardError()),this,SLOT(slotReadStderr()));
 
@@ -216,7 +216,7 @@ KVSO_CLASS_FUNCTION(process,startProcess)
         szcmd = m_szArgs.takeFirst();
         m_pProcess->start(szcmd, m_szArgs);
 
-	if(m_pProcess->state()==KviProcess::NotRunning)
+	if(m_pProcess->state()==QProcess::NotRunning)
 	{
 		c->warning( __tr2qs_ctx("Process could not be started.","objects"));
 	}
@@ -287,21 +287,21 @@ KVSO_CLASS_FUNCTION(process,tryTerminate)
 KVSO_CLASS_FUNCTION(process,closeStdin)
 {
 	CHECK_INTERNAL_POINTER(m_pProcess)
-	m_pProcess->closeReadChannel(KviProcess::StandardOutput);
+	m_pProcess->closeReadChannel(QProcess::StandardOutput);
 	return true;
 }
 //->Returns if the process still runnig
 KVSO_CLASS_FUNCTION(process,isRunning)
 {
 	CHECK_INTERNAL_POINTER(m_pProcess)
-	c->returnValue()->setBoolean(m_pProcess->state()==KviProcess::Running);
+	c->returnValue()->setBoolean(m_pProcess->state()==QProcess::Running);
 	return true;
 }
 //->Returns if the process exited.
 KVSO_CLASS_FUNCTION(process,normalExit)
 {
 	CHECK_INTERNAL_POINTER(m_pProcess)
-	c->returnValue()->setBoolean(m_pProcess->state()==KviProcess::NotRunning && m_pProcess->exitStatus()==KviProcess::NormalExit);
+	c->returnValue()->setBoolean(m_pProcess->state()==QProcess::NotRunning && m_pProcess->exitStatus()==QProcess::NormalExit);
 	return true;
 }
 
diff --git a/src/modules/objects/class_process.h b/src/modules/objects/class_process.h
index 8293f30aa..a3a808850 100644
--- a/src/modules/objects/class_process.h
+++ b/src/modules/objects/class_process.h
@@ -31,7 +31,7 @@
 
 
 #include "object_macros.h"
-#include "kvi_process.h"
+#include "QProcess"
 
 
 class KviKvsObject_process : public KviKvsObject
@@ -40,7 +40,7 @@ class KviKvsObject_process : public KviKvsObject
 public:
 	KVSO_DECLARE_OBJECT(KviKvsObject_process)
 protected:
-	KviProcess * m_pProcess;
+	QProcess * m_pProcess;
 private:
         QStringList m_szArgs;
 public:
diff --git a/src/modules/objects/class_progressbar.cpp b/src/modules/objects/class_progressbar.cpp
index 60c278663..e88e9f8d1 100644
--- a/src/modules/objects/class_progressbar.cpp
+++ b/src/modules/objects/class_progressbar.cpp
@@ -27,7 +27,7 @@
 #include "kvi_error.h"
 #include "kvi_debug.h"
 
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_iconmanager.h"
 #include <QProgressBar>
 
diff --git a/src/modules/objects/class_radiobutton.cpp b/src/modules/objects/class_radiobutton.cpp
index fe2629153..e3287184f 100644
--- a/src/modules/objects/class_radiobutton.cpp
+++ b/src/modules/objects/class_radiobutton.cpp
@@ -26,7 +26,7 @@
 #include "class_radiobutton.h"
 #include "kvi_error.h"
 #include "kvi_debug.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_iconmanager.h"
 
 #include <QRadioButton>
diff --git a/src/modules/objects/class_slider.cpp b/src/modules/objects/class_slider.cpp
index 0bd1ca8ff..caca558a6 100644
--- a/src/modules/objects/class_slider.cpp
+++ b/src/modules/objects/class_slider.cpp
@@ -26,7 +26,7 @@
 #include "class_slider.h"
 #include "kvi_error.h"
 #include "kvi_debug.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_iconmanager.h"
 
 #include <QSlider>
diff --git a/src/modules/objects/class_socket.cpp b/src/modules/objects/class_socket.cpp
index 0d2034be5..e35c62654 100644
--- a/src/modules/objects/class_socket.cpp
+++ b/src/modules/objects/class_socket.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Sun Nov 11 03:13:45 2001 GMT 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-2010 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
@@ -27,22 +27,22 @@
 #include "class_file.h"
 
 #include "kvi_settings.h"
-#include "kvi_qstring.h"
+#include "KviQString.h"
 
 #define _KVI_DEBUG_CHECK_RANGE_
 #include "kvi_debug.h"
 
-#include "kvi_file.h"
-#include "kvi_fileutils.h"
-#include "kvi_locale.h"
+#include "KviFile.h"
+#include "KviFileUtils.h"
+#include "KviLocale.h"
 #include "kvi_error.h"
 #include "kvi_netutils.h"
 #include "kvi_dns.h"
 #include "kvi_error.h"
 #include "kvi_socket.h"
-#include "kvi_malloc.h"
+#include "KviMemory.h"
 #include "kvi_memmove.h"
-#include "kvi_databuffer.h"
+#include "KviDataBuffer.h"
 
 #include <QByteArray>
 
@@ -316,7 +316,7 @@ KVSO_BEGIN_DESTRUCTOR(KviKvsObject_socket)
 	m_pFlushTimer=0;
 
 
-	if(m_pInBuffer)kvi_free(m_pInBuffer);
+	if(m_pInBuffer)KviMemory::free(m_pInBuffer);
 	if(m_pDelayTimer)delete m_pDelayTimer;
 	if(m_pDns)delete m_pDns;
 	if(m_pSn)delete m_pSn;
@@ -1099,7 +1099,7 @@ void KviKvsObject_socket::readNotifierFired(int)
 	{
 		m_uInBufferLen += KVI_IN_BUFFER_ALLOC_CHUNK;
 		//m_pInBuffer->resize(m_uInBufferLen);
-		m_pInBuffer = (char *)kvi_realloc(m_pInBuffer,m_uInBufferLen);
+		m_pInBuffer = (char *)KviMemory::reallocate(m_pInBuffer,m_uInBufferLen);
 	}
 
 	//int readLength = kvi_socket_recv(m_sock,m_pInBuffer->data() + m_uInDataLen,KVI_READ_CHUNK);
@@ -1179,7 +1179,7 @@ void KviKvsObject_socket::eatInData(unsigned int uLen)
 	if(uSpace > KVI_IN_BUFFER_ALLOC_CHUNK)
 	{
 		m_uInBufferLen -= KVI_IN_BUFFER_ALLOC_CHUNK;
-		m_pInBuffer = (char *)kvi_realloc(m_pInBuffer,m_uInBufferLen);
+		m_pInBuffer = (char *)KviMemory::reallocate(m_pInBuffer,m_uInBufferLen);
 	}
 }
 
@@ -1259,7 +1259,7 @@ void KviKvsObject_socket::reset()
 	}
 	if(m_pInBuffer)
 	{
-		kvi_free(m_pInBuffer);
+		KviMemory::free(m_pInBuffer);
 		m_pInBuffer = 0;
 	}
 	if(m_secondarySock)
diff --git a/src/modules/objects/class_socket.h b/src/modules/objects/class_socket.h
index 191ce4699..a4e252693 100644
--- a/src/modules/objects/class_socket.h
+++ b/src/modules/objects/class_socket.h
@@ -25,7 +25,7 @@
 //=============================================================================
 
 #include "kvi_socket.h"
-#include "kvi_pointerlist.h"
+#include "KviPointerList.h"
 
 #include <QSocketNotifier>
 #include <QTimer>
diff --git a/src/modules/objects/class_spinbox.cpp b/src/modules/objects/class_spinbox.cpp
index b110eeaea..3c27baa08 100644
--- a/src/modules/objects/class_spinbox.cpp
+++ b/src/modules/objects/class_spinbox.cpp
@@ -26,7 +26,7 @@
 #include "class_spinbox.h"
 #include "kvi_error.h"
 #include "kvi_debug.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_iconmanager.h"
 
 #include <QSpinBox>
diff --git a/src/modules/objects/class_sql.cpp b/src/modules/objects/class_sql.cpp
index 68bf04766..6a34589cc 100644
--- a/src/modules/objects/class_sql.cpp
+++ b/src/modules/objects/class_sql.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Wed Gen 28 2009 21:07:55 by Alessandro Carbone
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -23,8 +23,8 @@
 //============================================================================
 
 #include "kvi_debug.h"
-#include "kvi_malloc.h"
-#include "kvi_locale.h"
+#include "KviMemory.h"
+#include "KviLocale.h"
 #include "class_sql.h"
 #include <QtSql>
 #include "class_memorybuffer.h"
diff --git a/src/modules/objects/class_sql.h b/src/modules/objects/class_sql.h
index 0604ad99b..2b848ca97 100644
--- a/src/modules/objects/class_sql.h
+++ b/src/modules/objects/class_sql.h
@@ -6,7 +6,7 @@
 //   Creation date : Wed Gen 28 2009 21:07:55 by Alessandro Carbone
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -25,8 +25,8 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_string.h"
-#include "kvi_pointerlist.h"
+#include "KviCString.h"
+#include "KviPointerList.h"
 #include "kvi_kvs_variant.h"
 #include "object_macros.h"
 #include <QtSql>
diff --git a/src/modules/objects/class_tablewidget.cpp b/src/modules/objects/class_tablewidget.cpp
index 60dc9bc34..c8862cb4a 100644
--- a/src/modules/objects/class_tablewidget.cpp
+++ b/src/modules/objects/class_tablewidget.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Wed 04 Feb 2009 09:30:05 CEST by Carbone Alessandro
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -28,10 +28,10 @@
 
 #include "kvi_debug.h"
 #include "kvi_app.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_error.h"
 #include "kvi_iconmanager.h"
-#include "kvi_file.h"
+#include "KviFile.h"
 #include "kvi_kvs_arraycast.h"
 
 #include <QTableWidget>
diff --git a/src/modules/objects/class_tablewidget.h b/src/modules/objects/class_tablewidget.h
index f2bf20fc6..9b76fbdcb 100644
--- a/src/modules/objects/class_tablewidget.h
+++ b/src/modules/objects/class_tablewidget.h
@@ -7,7 +7,7 @@
 //
 //   This file is part of the KVirc irc client distribution
 //   Copyright (C) 2000 Krzysztof Godlewski
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
diff --git a/src/modules/objects/class_tabwidget.cpp b/src/modules/objects/class_tabwidget.cpp
index b2210654e..40041e02c 100644
--- a/src/modules/objects/class_tabwidget.cpp
+++ b/src/modules/objects/class_tabwidget.cpp
@@ -26,7 +26,7 @@
 #include "class_tabwidget.h"
 #include "kvi_error.h"
 #include "kvi_debug.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_iconmanager.h"
 
 #include <QTabWidget>
diff --git a/src/modules/objects/class_tbrowser.cpp b/src/modules/objects/class_tbrowser.cpp
index c73c9d5a3..f781b68bd 100644
--- a/src/modules/objects/class_tbrowser.cpp
+++ b/src/modules/objects/class_tbrowser.cpp
@@ -27,7 +27,7 @@
 #include "class_tbrowser.h"
 #include "kvi_error.h"
 #include "kvi_debug.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_iconmanager.h"
 
 #include <QTextBrowser>
diff --git a/src/modules/objects/class_toolbar.cpp b/src/modules/objects/class_toolbar.cpp
index 3abadede5..b650d38b8 100644
--- a/src/modules/objects/class_toolbar.cpp
+++ b/src/modules/objects/class_toolbar.cpp
@@ -28,7 +28,7 @@
 #include "kvi_debug.h"
 #include "kvi_tal_toolbar.h"
 #include "kvi_tal_mainwindow.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_iconmanager.h"
 #include "class_mainwindow.h"
 
diff --git a/src/modules/objects/class_toolbutton.cpp b/src/modules/objects/class_toolbutton.cpp
index 5c890ba63..0de288057 100644
--- a/src/modules/objects/class_toolbutton.cpp
+++ b/src/modules/objects/class_toolbutton.cpp
@@ -27,7 +27,7 @@
 #include "kvi_error.h"
 #include "kvi_debug.h"
 
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_iconmanager.h"
 #include "kvi_tal_popupmenu.h"
 /*
diff --git a/src/modules/objects/class_trayicon.cpp b/src/modules/objects/class_trayicon.cpp
index f95251776..9f6b563ca 100644
--- a/src/modules/objects/class_trayicon.cpp
+++ b/src/modules/objects/class_trayicon.cpp
@@ -27,7 +27,7 @@
 #include "kvi_iconmanager.h"
 #include "kvi_debug.h"
 #include "kvi_error.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 
 #include <QSystemTrayIcon>
 
diff --git a/src/modules/objects/class_treewidget.cpp b/src/modules/objects/class_treewidget.cpp
index f06868651..1a0a21973 100644
--- a/src/modules/objects/class_treewidget.cpp
+++ b/src/modules/objects/class_treewidget.cpp
@@ -27,7 +27,7 @@
 
 #include "kvi_error.h"
 #include "kvi_debug.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_iconmanager.h"
 #include <QTreeWidget>
 
diff --git a/src/modules/objects/class_treewidgetitem.cpp b/src/modules/objects/class_treewidgetitem.cpp
index a1641ee37..62e1a2b54 100644
--- a/src/modules/objects/class_treewidgetitem.cpp
+++ b/src/modules/objects/class_treewidgetitem.cpp
@@ -28,7 +28,7 @@
 
 #include "kvi_error.h"
 #include "kvi_debug.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_iconmanager.h"
 #include <QIcon>
 
diff --git a/src/modules/objects/class_vbox.cpp b/src/modules/objects/class_vbox.cpp
index 653f43d2c..5ac157775 100644
--- a/src/modules/objects/class_vbox.cpp
+++ b/src/modules/objects/class_vbox.cpp
@@ -25,7 +25,7 @@
 
 #define _KVI_DEBUG_CHECK_RANGE_
 #include "kvi_debug.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 
 #include "class_vbox.h"
 
diff --git a/src/modules/objects/class_vbox.h b/src/modules/objects/class_vbox.h
index 98763d94f..34ed0a0f1 100644
--- a/src/modules/objects/class_vbox.h
+++ b/src/modules/objects/class_vbox.h
@@ -25,7 +25,7 @@
 //
 //=============================================================================
 
-#include "kvi_string.h"
+#include "KviCString.h"
 #include "class_widget.h"
 #include "object_macros.h"
 
diff --git a/src/modules/objects/class_widget.cpp b/src/modules/objects/class_widget.cpp
index 5a67a4e44..d6bda1561 100644
--- a/src/modules/objects/class_widget.cpp
+++ b/src/modules/objects/class_widget.cpp
@@ -5,7 +5,7 @@
 //
 //   This file is part of the KVirc irc client distribution
 //   Copyright (C) 2000 Krzysztof Godlewski
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -26,10 +26,10 @@
 #include "class_widget.h"
 #include "class_pixmap.h"
 
-#include "kvi_malloc.h"
+#include "KviMemory.h"
 #include "kvi_debug.h"
 #include "kvi_error.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_iconmanager.h"
 #include "kvi_window.h"
 #include "kvi_app.h"
diff --git a/src/modules/objects/class_widget.h b/src/modules/objects/class_widget.h
index c114c8b77..f2575793c 100644
--- a/src/modules/objects/class_widget.h
+++ b/src/modules/objects/class_widget.h
@@ -7,7 +7,7 @@
 //
 //   This file is part of the KVirc irc client distribution
 //   Copyright (C) 2000 Krzysztof Godlewski
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -26,7 +26,7 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_string.h"
+#include "KviCString.h"
 #include "kvi_tal_tooltip.h"
 #include "object_macros.h"
 
diff --git a/src/modules/objects/class_window.cpp b/src/modules/objects/class_window.cpp
index 05235fb87..9c1dfc57d 100644
--- a/src/modules/objects/class_window.cpp
+++ b/src/modules/objects/class_window.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Tue Now 26 21:39:59 CEST 2002 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2002-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2002-2010 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
@@ -28,7 +28,7 @@
 #include "kvi_error.h"
 #include "kvi_debug.h"
 
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_frame.h"
 
 
diff --git a/src/modules/objects/class_window.h b/src/modules/objects/class_window.h
index 036608955..479f5d01a 100644
--- a/src/modules/objects/class_window.h
+++ b/src/modules/objects/class_window.h
@@ -6,7 +6,7 @@
 //   Creation date : Tue Nov 26 21:37:48 CEST 2002 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2002-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2002-2010 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
diff --git a/src/modules/objects/class_wizard.cpp b/src/modules/objects/class_wizard.cpp
index 905608caf..5d7d5559e 100644
--- a/src/modules/objects/class_wizard.cpp
+++ b/src/modules/objects/class_wizard.cpp
@@ -29,7 +29,7 @@
 #include "kvi_error.h"
 #include "kvi_debug.h"
 
-#include "kvi_locale.h"
+#include "KviLocale.h"
 
 #include <QPushButton>
 
diff --git a/src/modules/objects/class_workspace.cpp b/src/modules/objects/class_workspace.cpp
index 39c3632c5..926731fc3 100644
--- a/src/modules/objects/class_workspace.cpp
+++ b/src/modules/objects/class_workspace.cpp
@@ -27,7 +27,7 @@
 #include "class_workspace.h"
 #include "kvi_error.h"
 #include "kvi_debug.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_iconmanager.h"
 
 #include <QMdiArea>
diff --git a/src/modules/objects/class_wrapper.cpp b/src/modules/objects/class_wrapper.cpp
index 2de6e9b77..3c48afb82 100644
--- a/src/modules/objects/class_wrapper.cpp
+++ b/src/modules/objects/class_wrapper.cpp
@@ -27,7 +27,7 @@
 #include "kvi_error.h"
 #include "kvi_debug.h"
 
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_iconmanager.h"
 
 #include "class_widget.h"
diff --git a/src/modules/objects/class_xmlreader.cpp b/src/modules/objects/class_xmlreader.cpp
index 1b0ad7a6b..f8eb6a5bb 100644
--- a/src/modules/objects/class_xmlreader.cpp
+++ b/src/modules/objects/class_xmlreader.cpp
@@ -4,7 +4,7 @@
 //   Created on Tue 27 Dec 2005 00:14:09 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC Client distribution
-//   Copyright (C) 2005-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2005-2010 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
@@ -24,12 +24,12 @@
 
 #include "class_xmlreader.h"
 #include "class_memorybuffer.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 
 #include "kvi_kvs_variantlist.h"
 #include "kvi_kvs_hash.h"
 
-#include "kvi_qstring.h"
+#include "KviQString.h"
 
 
 /*
diff --git a/src/modules/objects/class_xmlreader.h b/src/modules/objects/class_xmlreader.h
index ea2d9cafc..eddad1d38 100644
--- a/src/modules/objects/class_xmlreader.h
+++ b/src/modules/objects/class_xmlreader.h
@@ -6,7 +6,7 @@
 //   Created on Tue 27 Dec 2005 00:14:09 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC Client distribution
-//   Copyright (C) 2005-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2005-2010 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
@@ -25,7 +25,7 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_qstring.h"
+#include "KviQString.h"
 
 #include "object_macros.h"
 
diff --git a/src/modules/objects/libkviobjects.cpp b/src/modules/objects/libkviobjects.cpp
index 178a495af..32014b689 100644
--- a/src/modules/objects/libkviobjects.cpp
+++ b/src/modules/objects/libkviobjects.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Wed Sep 09 2000 20:59:01 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2009 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -74,15 +74,15 @@
 #include "kvi_iconmanager.h"
 #include "kvi_window.h"
 #include "kvi_out.h"
-#include "kvi_mirccntrl.h"
+#include "KviMircCntrl.h"
 #include "kvi_app.h"
 #include "kvi_module.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_error.h"
-#include "kvi_cmdformatter.h"
+#include "KviCommandFormatter.h"
 #include "kvi_out.h"
 #include "kvi_app.h"
-#include "kvi_fileutils.h"
+#include "KviFileUtils.h"
 
 #include <QDir>
 #include <QImage>
@@ -656,7 +656,7 @@ static bool objects_kvs_fnc_listObjects(KviKvsModuleFunctionCall * cmd)
 	if (bFlag) cmd->window()->output(80, "Objects dump:");
 		QWidgetList list = g_pApp->topLevelWidgets();
 
-	KviStr spacing = ">";
+	KviCString spacing = ">";
 	QString  szTemp;
 	KviKvsArray * n = new KviKvsArray();
 	int idx=0;
diff --git a/src/modules/objects/object_macros.h b/src/modules/objects/object_macros.h
index 4ef19acbd..66bd57374 100644
--- a/src/modules/objects/object_macros.h
+++ b/src/modules/objects/object_macros.h
@@ -6,7 +6,7 @@
 //   Creation date : Sat Jun 18 2005 15:32:01 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2005-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2005-2010 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
diff --git a/src/modules/options/container.cpp b/src/modules/options/container.cpp
index 953bb8c78..d37e47f6b 100644
--- a/src/modules/options/container.cpp
+++ b/src/modules/options/container.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Wed Nov 21 17:09:49 2001 GMT 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-2010 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
@@ -25,7 +25,7 @@
 #include "container.h"
 #include "instances.h"
 
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_iconmanager.h"
 #include "kvi_app.h"
 #include "kvi_tal_tooltip.h"
diff --git a/src/modules/options/dialog.cpp b/src/modules/options/dialog.cpp
index da8f4ebfa..47081bc79 100644
--- a/src/modules/options/dialog.cpp
+++ b/src/modules/options/dialog.cpp
@@ -5,7 +5,7 @@
 //   Based on dlg_options.cpp: Tue Jun 11 2000 02:39:12 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC Client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2000-2010 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
@@ -27,10 +27,10 @@
 
 #include "kvi_app.h"
 #include "kvi_options.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_iconmanager.h"
 #include "kvi_module.h"
-#include "kvi_pointerhashtable.h"
+#include "KviPointerHashTable.h"
 #include "kvi_tal_vbox.h"
 #include "kvi_tal_tooltip.h"
 #include "kvi_tal_popupmenu.h"
diff --git a/src/modules/options/dialog.h b/src/modules/options/dialog.h
index a12515c2b..78bc42e08 100644
--- a/src/modules/options/dialog.h
+++ b/src/modules/options/dialog.h
@@ -7,7 +7,7 @@
 //   Based on dlg_options.h: Tue Jun 11 2000 02:39:12 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC Client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2000-2010 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
diff --git a/src/modules/options/instances.cpp b/src/modules/options/instances.cpp
index f0838ae8f..415d90a5a 100644
--- a/src/modules/options/instances.cpp
+++ b/src/modules/options/instances.cpp
@@ -5,7 +5,7 @@
 //   File : instances.cpp
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2001-2008 Szymon Stefanek (stefanek@tin.it)
+//   Copyright (C) 2001-2010 Szymon Stefanek (stefanek@tin.it)
 //
 //   This program is FREE software. You can redistribute it and/or
 //   modify it under the terms of the GNU General Public License
@@ -70,7 +70,7 @@
 #include "optw_userlist.h"
 #include "optw_windowlist.h"
 
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_iconmanager.h"
 #include "instances.h"
 
diff --git a/src/modules/options/instances.h b/src/modules/options/instances.h
index 31af30f53..877dbf13c 100644
--- a/src/modules/options/instances.h
+++ b/src/modules/options/instances.h
@@ -8,7 +8,7 @@
 //   File : instances.h
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2001-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2001-2010 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
@@ -35,8 +35,8 @@
 
 #include "kvi_optionswidget.h"
 #include "kvi_module.h"
-#include "kvi_pointerlist.h"
-#include "kvi_qstring.h"
+#include "KviPointerList.h"
+#include "KviQString.h"
 
 typedef struct _KviOptionsWidgetInstanceEntry KviOptionsWidgetInstanceEntry;
 
diff --git a/src/modules/options/libkvioptions.cpp b/src/modules/options/libkvioptions.cpp
index 60e249e71..51020570e 100644
--- a/src/modules/options/libkvioptions.cpp
+++ b/src/modules/options/libkvioptions.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Fri Aug 18 2000 15:04:09 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -31,11 +31,11 @@
 #include "kvi_app.h"
 #include "kvi_frame.h"
 #include "kvi_window.h"
-#include "kvi_locale.h"
-#include "kvi_mirccntrl.h"
+#include "KviLocale.h"
+#include "KviMircCntrl.h"
 #include "kvi_out.h"
 #include "kvi_splash.h"
-#include "kvi_pointerhashtable.h"
+#include "KviPointerHashTable.h"
 
 #include <QSplitter>
 
@@ -153,7 +153,7 @@ static bool options_kvs_cmd_dialog(KviKvsModuleCommandCall * c)
 static void options_kvs_module_print_pages(KviKvsModuleCommandCall * c,KviOptionsWidgetInstanceEntry * e,const char * prefix)
 {
 	c->window()->output(KVI_OUT_SYSTEMMESSAGE,"%s%c%s%c  (%Q)",prefix,KVI_TEXT_BOLD,e->szClassName,KVI_TEXT_BOLD,&(e->szName));
-	KviStr szPre = prefix;
+	KviCString szPre = prefix;
 	szPre.append("  ");
 	if(e->pChildList)
 	{
diff --git a/src/modules/options/optw_antispam.cpp b/src/modules/options/optw_antispam.cpp
index 5c85c9aa6..8ddf37546 100644
--- a/src/modules/options/optw_antispam.cpp
+++ b/src/modules/options/optw_antispam.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Tue Oct 16 15:47:02 2001 GMT 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-2010 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
@@ -25,7 +25,7 @@
 #include "optw_antispam.h"
 
 #include "kvi_options.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 
 #include <QLayout>
 #include <QLabel>
diff --git a/src/modules/options/optw_antispam.h b/src/modules/options/optw_antispam.h
index 69dc490e1..f37202163 100644
--- a/src/modules/options/optw_antispam.h
+++ b/src/modules/options/optw_antispam.h
@@ -6,7 +6,7 @@
 //   Creation date : Tue Oct 16 15:47:03 2001 GMT 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-2010 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
diff --git a/src/modules/options/optw_avatar.cpp b/src/modules/options/optw_avatar.cpp
index ea8b92597..03f96ef4f 100644
--- a/src/modules/options/optw_avatar.cpp
+++ b/src/modules/options/optw_avatar.cpp
@@ -24,7 +24,7 @@
 
 #include "optw_avatar.h"
 
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_selectors.h"
 #include "kvi_options.h"
 #include "kvi_tal_tooltip.h"
diff --git a/src/modules/options/optw_away.cpp b/src/modules/options/optw_away.cpp
index 4a3125307..eb8b6366f 100644
--- a/src/modules/options/optw_away.cpp
+++ b/src/modules/options/optw_away.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Mon Oct 29 15:37:16 2001 GMT 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-2010 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
@@ -25,7 +25,7 @@
 #include "optw_away.h"
 
 #include "kvi_options.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 
 #include <QLayout>
 
diff --git a/src/modules/options/optw_away.h b/src/modules/options/optw_away.h
index 8820954e2..8b1c1a99a 100644
--- a/src/modules/options/optw_away.h
+++ b/src/modules/options/optw_away.h
@@ -6,7 +6,7 @@
 //   Creation date : Mon Oct 29 15:37:18 2001 GMT 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-2010 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
diff --git a/src/modules/options/optw_channel.cpp b/src/modules/options/optw_channel.cpp
index 9308dd690..85216923c 100644
--- a/src/modules/options/optw_channel.cpp
+++ b/src/modules/options/optw_channel.cpp
@@ -30,9 +30,9 @@
 #include "optw_channel.h"
 
 #include "kvi_options.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_settings.h"
-#include "kvi_ircmask.h"
+#include "KviIrcMask.h"
 
 #include <QComboBox>
 
diff --git a/src/modules/options/optw_connection.cpp b/src/modules/options/optw_connection.cpp
index 80fa3cb0d..55f27a9e5 100644
--- a/src/modules/options/optw_connection.cpp
+++ b/src/modules/options/optw_connection.cpp
@@ -26,7 +26,7 @@
 #include "optw_connection.h"
 
 #include "kvi_settings.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_options.h"
 #include "kvi_iconmanager.h"
 
diff --git a/src/modules/options/optw_connection.h b/src/modules/options/optw_connection.h
index 952a5fdd6..d77ad67ce 100644
--- a/src/modules/options/optw_connection.h
+++ b/src/modules/options/optw_connection.h
@@ -6,7 +6,7 @@
 //   Creation date : Sat Nov 24 04:25:12 2001 GMT 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-2010 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
diff --git a/src/modules/options/optw_ctcp.cpp b/src/modules/options/optw_ctcp.cpp
index c53b34b6f..581e995a9 100644
--- a/src/modules/options/optw_ctcp.cpp
+++ b/src/modules/options/optw_ctcp.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Sun Dec  2 20:40:43 2001 GMT 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-2010 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
@@ -25,7 +25,7 @@
 #include "optw_ctcp.h"
 
 #include "kvi_settings.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_options.h"
 
 
diff --git a/src/modules/options/optw_ctcp.h b/src/modules/options/optw_ctcp.h
index 405a044a5..5799b0617 100644
--- a/src/modules/options/optw_ctcp.h
+++ b/src/modules/options/optw_ctcp.h
@@ -6,7 +6,7 @@
 //   Creation date : Sun Dec  2 20:40:43 2001 GMT 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-2010 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
diff --git a/src/modules/options/optw_ctcpfloodprotection.cpp b/src/modules/options/optw_ctcpfloodprotection.cpp
index e4dd2d4f8..c5216a0d2 100644
--- a/src/modules/options/optw_ctcpfloodprotection.cpp
+++ b/src/modules/options/optw_ctcpfloodprotection.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Sun Jan 21 2001 14:35:06 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-2010 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
@@ -25,7 +25,7 @@
 #include "optw_ctcpfloodprotection.h"
 
 #include "kvi_options.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 
 #include <QLayout>
 #include <QLabel>
diff --git a/src/modules/options/optw_ctcpfloodprotection.h b/src/modules/options/optw_ctcpfloodprotection.h
index d012ebb5f..9b9715ed3 100644
--- a/src/modules/options/optw_ctcpfloodprotection.h
+++ b/src/modules/options/optw_ctcpfloodprotection.h
@@ -6,7 +6,7 @@
 //   Creation date : Sun Jan 21 2000 14:34:12 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-2010 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
diff --git a/src/modules/options/optw_dcc.cpp b/src/modules/options/optw_dcc.cpp
index c92756d00..02e17ce6a 100644
--- a/src/modules/options/optw_dcc.cpp
+++ b/src/modules/options/optw_dcc.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Fri Aug 17 22:08:09 2001 GMT 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-2010 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
@@ -25,7 +25,7 @@
 #include "optw_dcc.h"
 
 #include "kvi_options.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 
 #include <QLayout>
 
diff --git a/src/modules/options/optw_dcc.h b/src/modules/options/optw_dcc.h
index fab7c6565..6291628a9 100644
--- a/src/modules/options/optw_dcc.h
+++ b/src/modules/options/optw_dcc.h
@@ -6,7 +6,7 @@
 //   Creation date : Fri Aug 17 22:08:08 2001 GMT 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-2010 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
diff --git a/src/modules/options/optw_generalopt.cpp b/src/modules/options/optw_generalopt.cpp
index b5cd4998b..3be9c4bb3 100644
--- a/src/modules/options/optw_generalopt.cpp
+++ b/src/modules/options/optw_generalopt.cpp
@@ -25,7 +25,7 @@
 #include "optw_generalopt.h"
 
 #include "kvi_settings.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_options.h"
 
 
diff --git a/src/modules/options/optw_highlighting.cpp b/src/modules/options/optw_highlighting.cpp
index adfd753b1..6836601da 100644
--- a/src/modules/options/optw_highlighting.cpp
+++ b/src/modules/options/optw_highlighting.cpp
@@ -6,7 +6,7 @@
 //   Creation date : Sat Nov  3 18:09:35 2001 GMT 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-2010 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
@@ -26,7 +26,7 @@
 
 #include "optw_highlighting.h"
 #include "kvi_options.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 
 #include <QLayout>
 #include <QLabel>
diff --git a/src/modules/options/optw_highlighting.h b/src/modules/options/optw_highlighting.h
index 04c8f3e2c..bb3ed64ca 100644
--- a/src/modules/options/optw_highlighting.h
+++ b/src/modules/options/optw_highlighting.h
@@ -6,7 +6,7 @@
 //   Creation date : Sat Nov  3 18:09:37 2001 GMT 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-2010 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
diff --git a/src/modules/options/optw_identity.cpp b/src/modules/options/optw_identity.cpp
index c90d4b35c..a793660bc 100644
--- a/src/modules/options/optw_identity.cpp
+++ b/src/modules/options/optw_identity.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Tue Nov 14 2000 23:06:53 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -27,7 +27,7 @@
 #include "kvi_defaults.h"
 #include "kvi_settings.h"
 #include "kvi_options.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_app.h"
 #include "kvi_window.h"
 #include "kvi_console.h"
@@ -36,7 +36,7 @@
 #include "kvi_fileextensions.h"
 #include "kvi_iconmanager.h"
 #include "kvi_http.h"
-#include "kvi_identityprofile.h"
+#include "KviIdentityProfile.h"
 #include "kvi_tal_tooltip.h"
 #include "kvi_tal_hbox.h"
 #include <QTreeWidget>
diff --git a/src/modules/options/optw_identity.h b/src/modules/options/optw_identity.h
index b1664d86f..6075b5984 100644
--- a/src/modules/options/optw_identity.h
+++ b/src/modules/options/optw_identity.h
@@ -7,7 +7,7 @@
 //   Creation date : Tue Nov 14 2000 23:06:12 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 Szymon Stefanek (pragma at kvirc dot net)
 //   Copyright (C) 2008 Elvio Basello (hellvis69 at netsons dot org)
 //
 //   This program is FREE software. You can redistribute it and/or
@@ -30,7 +30,7 @@
 #include "kvi_optionswidget.h"
 #include "kvi_settings.h"
 #include "kvi_selectors.h"
-#include "kvi_pixmap.h"
+#include "KviPixmap.h"
 
 #include <QDialog>
 
@@ -214,7 +214,7 @@ protected:
 	bool               m_bI;
 	bool               m_bW;
 	bool               m_bS;
-	KviStr             m_sModeStr;
+	KviCString             m_sModeStr;
 	KviBoolSelector  * m_pISelector;
 	KviBoolSelector  * m_pWSelector;
 	KviBoolSelector  * m_pSSelector;
diff --git a/src/modules/options/optw_ignore.cpp b/src/modules/options/optw_ignore.cpp
index edb8786f6..6e17f24b2 100644
--- a/src/modules/options/optw_ignore.cpp
+++ b/src/modules/options/optw_ignore.cpp
@@ -5,7 +5,7 @@
 //
 //   This file is part of the KVirc irc client distribution
 //   Copyright (C) 2002 Juanjo �lvarez
-//   Copyright (C) 2002-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2002-2010 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
@@ -26,7 +26,7 @@
 #include "optw_ignore.h"
 
 #include "kvi_options.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 
 #include <QLayout>
 
diff --git a/src/modules/options/optw_ignore.h b/src/modules/options/optw_ignore.h
index 17595cdb8..9a52f04d9 100644
--- a/src/modules/options/optw_ignore.h
+++ b/src/modules/options/optw_ignore.h
@@ -7,7 +7,7 @@
 //
 //   This file is part of the KVirc irc client distribution
 //   Copyright (C) 2002 Juanjo �lvarez
-//   Copyright (C) 2002-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2002-2010 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
diff --git a/src/modules/options/optw_input.cpp b/src/modules/options/optw_input.cpp
index fdeb5a44b..d72909668 100644
--- a/src/modules/options/optw_input.cpp
+++ b/src/modules/options/optw_input.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Sat Aug 11 2001 04:25:52 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-2010 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
@@ -25,7 +25,7 @@
 #include "optw_input.h"
 
 #include "kvi_options.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 
 #include <QLayout>
 
diff --git a/src/modules/options/optw_input.h b/src/modules/options/optw_input.h
index 0d3fc38f3..81a9fbcbb 100644
--- a/src/modules/options/optw_input.h
+++ b/src/modules/options/optw_input.h
@@ -7,7 +7,7 @@
 //   Creation date : Sat Aug 11 2001 04:25:01 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-2010 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
diff --git a/src/modules/options/optw_interfacefeatures.cpp b/src/modules/options/optw_interfacefeatures.cpp
index 9a05f0a09..fbf256131 100644
--- a/src/modules/options/optw_interfacefeatures.cpp
+++ b/src/modules/options/optw_interfacefeatures.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Sat Jun 2 2001 14:52:53 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-2010 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
@@ -25,9 +25,9 @@
 #include "optw_interfacefeatures.h"
 
 #include "kvi_options.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_app.h"
-#include "kvi_fileutils.h"
+#include "KviFileUtils.h"
 
 #include <QLayout>
 #include <QLabel>
diff --git a/src/modules/options/optw_interfacefeatures.h b/src/modules/options/optw_interfacefeatures.h
index 5852e6dc9..cdcc483f6 100644
--- a/src/modules/options/optw_interfacefeatures.h
+++ b/src/modules/options/optw_interfacefeatures.h
@@ -7,7 +7,7 @@
 //   Creation date : Sat Jun 2 2001 14:50:01 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-2010 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
diff --git a/src/modules/options/optw_interfacelookglobal.cpp b/src/modules/options/optw_interfacelookglobal.cpp
index 579045f62..bc532583c 100644
--- a/src/modules/options/optw_interfacelookglobal.cpp
+++ b/src/modules/options/optw_interfacelookglobal.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Sun Jun 3 2001 20:50:13 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-2010 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
@@ -26,7 +26,7 @@
 
 #include "kvi_settings.h"
 #include "kvi_options.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_app.h"
 #include "kvi_tal_tooltip.h"
 
diff --git a/src/modules/options/optw_interfacelookglobal.h b/src/modules/options/optw_interfacelookglobal.h
index 9256a9458..f60bcf2f1 100644
--- a/src/modules/options/optw_interfacelookglobal.h
+++ b/src/modules/options/optw_interfacelookglobal.h
@@ -6,7 +6,7 @@
 //   Creation date : Sun Jun 3 2001 20:49:02 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-2010 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
diff --git a/src/modules/options/optw_irc.cpp b/src/modules/options/optw_irc.cpp
index 362e2cff0..904c679e4 100644
--- a/src/modules/options/optw_irc.cpp
+++ b/src/modules/options/optw_irc.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Sun Dec  2 18:59:48 2001 GMT 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-2010 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
@@ -25,9 +25,9 @@
 #include "optw_irc.h"
 
 #include "kvi_settings.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_options.h"
-#include "kvi_ircmask.h"
+#include "KviIrcMask.h"
 
 
 KviIrcOptionsWidget::KviIrcOptionsWidget(QWidget * parent)
diff --git a/src/modules/options/optw_irc.h b/src/modules/options/optw_irc.h
index 8a3f5b777..9d91f9310 100644
--- a/src/modules/options/optw_irc.h
+++ b/src/modules/options/optw_irc.h
@@ -6,7 +6,7 @@
 //   Creation date : Sun Dec  2 18:59:49 2001 GMT 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-2010 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
diff --git a/src/modules/options/optw_ircoutput.cpp b/src/modules/options/optw_ircoutput.cpp
index 707c70469..21de881c1 100644
--- a/src/modules/options/optw_ircoutput.cpp
+++ b/src/modules/options/optw_ircoutput.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Wed Nov 15 2000 11:45:06 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -26,7 +26,7 @@
 
 #include "kvi_settings.h"
 #include "kvi_options.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_tal_tooltip.h"
 
 #include <QLayout>
diff --git a/src/modules/options/optw_ircoutput.h b/src/modules/options/optw_ircoutput.h
index c0c6e8108..20aafd883 100644
--- a/src/modules/options/optw_ircoutput.h
+++ b/src/modules/options/optw_ircoutput.h
@@ -6,7 +6,7 @@
 //   Creation date : Wed Nov 15 2000 11:47:51 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
diff --git a/src/modules/options/optw_ircview.cpp b/src/modules/options/optw_ircview.cpp
index 76b426f7d..ad5fdbe2b 100644
--- a/src/modules/options/optw_ircview.cpp
+++ b/src/modules/options/optw_ircview.cpp
@@ -26,7 +26,7 @@
 #include "optw_ircview.h"
 
 #include "kvi_options.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 
 #include <QLayout>
 
diff --git a/src/modules/options/optw_lag.cpp b/src/modules/options/optw_lag.cpp
index 9bc5e8619..8619b22b9 100644
--- a/src/modules/options/optw_lag.cpp
+++ b/src/modules/options/optw_lag.cpp
@@ -5,7 +5,7 @@
 //
 //   This file is part of the KVirc irc client distribution
 //   Copyright (C) 2002 Juanjo �lvarez
-//   Copyright (C) 2002-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2002-2010 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
@@ -26,7 +26,7 @@
 #include "optw_lag.h"
 
 #include "kvi_options.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_tal_tooltip.h"
 
 #include <QLayout>
diff --git a/src/modules/options/optw_lag.h b/src/modules/options/optw_lag.h
index 8fe68809f..f34b9075e 100644
--- a/src/modules/options/optw_lag.h
+++ b/src/modules/options/optw_lag.h
@@ -7,7 +7,7 @@
 //
 //   This file is part of the KVirc irc client distribution
 //   Copyright (C) 2002 Juanjo Álvarez
-//   Copyright (C) 2002-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2002-2010 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
diff --git a/src/modules/options/optw_logging.cpp b/src/modules/options/optw_logging.cpp
index 638de5761..e85853d46 100644
--- a/src/modules/options/optw_logging.cpp
+++ b/src/modules/options/optw_logging.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Mon Oct 29 15:37:16 2001 GMT 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-2010 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
@@ -25,7 +25,7 @@
 #include "optw_logging.h"
 
 #include "kvi_options.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 
 #include <QLayout>
 
diff --git a/src/modules/options/optw_logging.h b/src/modules/options/optw_logging.h
index cd14ea55d..a0cadfbf2 100644
--- a/src/modules/options/optw_logging.h
+++ b/src/modules/options/optw_logging.h
@@ -6,7 +6,7 @@
 //   Creation date : Mon Oct 29 15:37:18 2001 GMT 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-2010 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
diff --git a/src/modules/options/optw_mediatypes.cpp b/src/modules/options/optw_mediatypes.cpp
index 429a80936..2a4a631bf 100644
--- a/src/modules/options/optw_mediatypes.cpp
+++ b/src/modules/options/optw_mediatypes.cpp
@@ -25,7 +25,7 @@
 #include "optw_mediatypes.h"
 
 #include "kvi_options.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_tal_tooltip.h"
 
 #include <QLayout>
diff --git a/src/modules/options/optw_mediatypes.h b/src/modules/options/optw_mediatypes.h
index 85448e617..aea1704af 100644
--- a/src/modules/options/optw_mediatypes.h
+++ b/src/modules/options/optw_mediatypes.h
@@ -6,7 +6,7 @@
 //   Creation date : Sat Jan 20 2001 16:12:10 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-2010 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
@@ -25,7 +25,7 @@
 //=============================================================================
 
 #include "kvi_optionswidget.h"
-#include "kvi_mediatype.h"
+#include "KviMediaType.h"
 #include <QTreeWidget>
 
 #include <QLineEdit>
diff --git a/src/modules/options/optw_messages.cpp b/src/modules/options/optw_messages.cpp
index 4f5a71a80..8329a621d 100644
--- a/src/modules/options/optw_messages.cpp
+++ b/src/modules/options/optw_messages.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Sat Aug 11 2001 18:12:00 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-2010 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
@@ -29,10 +29,10 @@
 #include "kvi_settings.h"
 #include "kvi_options.h"
 #include "kvi_app.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_iconmanager.h"
-#include "kvi_mirccntrl.h"
-#include "kvi_config.h"
+#include "KviMircCntrl.h"
+#include "KviConfigurationFile.h"
 #include "kvi_filedialog.h"
 #include "kvi_tal_vbox.h"
 
@@ -202,7 +202,7 @@ KviMessageListWidgetItem::KviMessageListWidgetItem(KviMessageListWidget* l,int o
 : KviTalListWidgetItem(l)
 {
 	m_iOptId = optId;
-	m_pMsgType = new KviMsgType(KVI_OPTION_MSGTYPE(optId));
+	m_pMsgType = new KviMessageTypeSettings(KVI_OPTION_MSGTYPE(optId));
 
 	QString txt = g_msgtypeOptionsTable[m_iOptId].name;
 	// skip the msgtype prefix
@@ -557,11 +557,11 @@ void KviMessageColorsOptionsWidget::save()
 	{
 		if(m_pLastItem)saveLastItem();
 
-		KviConfig cfg(szName,KviConfig::Write);
+		KviConfigurationFile cfg(szName,KviConfigurationFile::Write);
 
 		cfg.setGroup("Messages");
 
-		KviStr tmp;
+		KviCString tmp;
 
 
 		int count = m_pListView->count();
@@ -611,11 +611,11 @@ void KviMessageColorsOptionsWidget::load()
 	{
 		itemChanged();
 
-		KviConfig cfg(szName,KviConfig::Read);
+		KviConfigurationFile cfg(szName,KviConfigurationFile::Read);
 
 		cfg.setGroup("Messages");
 
-		//KviStr tmp;
+		//KviCString tmp;
 		QString tmp;
 
 		int count = m_pListView->count();
diff --git a/src/modules/options/optw_messages.h b/src/modules/options/optw_messages.h
index 473a7730d..e66556f67 100644
--- a/src/modules/options/optw_messages.h
+++ b/src/modules/options/optw_messages.h
@@ -6,7 +6,7 @@
 //   Creation date : Sat Aug 11 2001 18:11:21 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-2010 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
@@ -25,7 +25,7 @@
 //=============================================================================
 
 #include "kvi_optionswidget.h"
-#include "kvi_msgtype.h"
+#include "KviMessageTypeSettings.h"
 #include "kvi_tal_popupmenu.h"
 
 #include <QTreeWidget>
@@ -124,10 +124,10 @@ public:
 	~KviMessageListWidgetItem();
 private:
 	int          m_iOptId;
-	KviMsgType * m_pMsgType;
+	KviMessageTypeSettings * m_pMsgType;
 public:
 	inline int optionId(){ return m_iOptId; };
-	inline KviMsgType * msgType(){ return m_pMsgType; };
+	inline KviMessageTypeSettings * msgType(){ return m_pMsgType; };
 };
 
 
diff --git a/src/modules/options/optw_nickserv.cpp b/src/modules/options/optw_nickserv.cpp
index 88e504f98..0cd0caa97 100644
--- a/src/modules/options/optw_nickserv.cpp
+++ b/src/modules/options/optw_nickserv.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Fri Aug 10 2001 03:38:10 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-2010 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
@@ -24,11 +24,11 @@
 
 #include "optw_nickserv.h"
 
-#include "kvi_qstring.h"
+#include "KviQString.h"
 #include "kvi_options.h"
-#include "kvi_locale.h"
-#include "kvi_nickserv.h"
-#include "kvi_ircmask.h"
+#include "KviLocale.h"
+#include "KviNickServRuleSet.h"
+#include "KviIrcMask.h"
 #include "kvi_tal_tooltip.h"
 #include <QTreeWidget>
 
diff --git a/src/modules/options/optw_nickserv.h b/src/modules/options/optw_nickserv.h
index 0d7f82558..3a4eee01e 100644
--- a/src/modules/options/optw_nickserv.h
+++ b/src/modules/options/optw_nickserv.h
@@ -7,7 +7,7 @@
 //   Creation date : Fri Aug 10 2001 03:37:21 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-2010 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
diff --git a/src/modules/options/optw_notifier.cpp b/src/modules/options/optw_notifier.cpp
index 2392d5b09..43216daa3 100644
--- a/src/modules/options/optw_notifier.cpp
+++ b/src/modules/options/optw_notifier.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Thu Jul 09 2009 10:54:39 CEST by Fabio Bas
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2001-2009 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2001-2010 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
@@ -25,7 +25,7 @@
 #include "optw_notifier.h"
 
 #include "kvi_options.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 
 #include <QLayout>
 
diff --git a/src/modules/options/optw_notifier.h b/src/modules/options/optw_notifier.h
index ccb47be6e..398815e81 100644
--- a/src/modules/options/optw_notifier.h
+++ b/src/modules/options/optw_notifier.h
@@ -7,7 +7,7 @@
 //   Creation date : Thu Jul 09 2009 10:54:39 CEST by Fabio Bas
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2001-2009 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2001-2010 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
diff --git a/src/modules/options/optw_notify.cpp b/src/modules/options/optw_notify.cpp
index dc79ffc0e..3c61ae3ff 100644
--- a/src/modules/options/optw_notify.cpp
+++ b/src/modules/options/optw_notify.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Sun Oct 28 15:11:29 2001 GMT 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-2010 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
@@ -26,7 +26,7 @@
 
 #include "kvi_settings.h"
 #include "kvi_options.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 
 #include <QLayout>
 
diff --git a/src/modules/options/optw_notify.h b/src/modules/options/optw_notify.h
index fe321af82..1557326a7 100644
--- a/src/modules/options/optw_notify.h
+++ b/src/modules/options/optw_notify.h
@@ -6,7 +6,7 @@
 //   Creation date : Sun Oct 28 15:11:30 2001 GMT 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-2010 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
diff --git a/src/modules/options/optw_protection.cpp b/src/modules/options/optw_protection.cpp
index 0c9c19ce4..eb86511f3 100644
--- a/src/modules/options/optw_protection.cpp
+++ b/src/modules/options/optw_protection.cpp
@@ -26,7 +26,7 @@
 
 #include "kvi_settings.h"
 #include "kvi_options.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 
 #include <QLayout>
 
diff --git a/src/modules/options/optw_proxy.cpp b/src/modules/options/optw_proxy.cpp
index 2669c39f1..5454f8140 100644
--- a/src/modules/options/optw_proxy.cpp
+++ b/src/modules/options/optw_proxy.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Mon Jun 24 2000 22:02:11 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -24,9 +24,9 @@
 
 #include "optw_proxy.h"
 
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_iconmanager.h"
-#include "kvi_proxydb.h"
+#include "KviProxyDataBase.h"
 #include "kvi_ipeditor.h"
 #include "kvi_netutils.h"
 #include "kvi_settings.h"
@@ -199,7 +199,7 @@ void KviProxyOptionsWidget::currentItemChanged(QTreeWidgetItem *it,QTreeWidgetIt
 
 		for(int i=0;i<m_pProtocolBox->count();i++)
 		{
-			KviStr txt = m_pProtocolBox->itemText(i);
+			KviCString txt = m_pProtocolBox->itemText(i);
 			if(kvi_strEqualCI(m_pLastEditedItem->m_pProxyData->protocolName().toUtf8().data(),txt.ptr()))
 			{
 				m_pProtocolBox->setCurrentIndex(i);
@@ -226,7 +226,7 @@ void KviProxyOptionsWidget::currentItemChanged(QTreeWidgetItem *it,QTreeWidgetIt
 
 		m_pUserEdit->setText(m_pLastEditedItem->m_pProxyData->m_szUser);
 		m_pPassEdit->setText(m_pLastEditedItem->m_pProxyData->m_szPass);
-		KviStr tmp(KviStr::Format,"%u",m_pLastEditedItem->m_pProxyData->m_uPort);
+		KviCString tmp(KviCString::Format,"%u",m_pLastEditedItem->m_pProxyData->m_uPort);
 		m_pPortEdit->setText(tmp.ptr());
 	} else {
 		m_pProxyEdit->setText("");
@@ -242,7 +242,7 @@ void KviProxyOptionsWidget::saveLastItem()
 {
 	if(m_pLastEditedItem)
 	{
-		KviStr tmp = m_pProxyEdit->text();
+		KviCString tmp = m_pProxyEdit->text();
 		if(tmp.isEmpty())tmp = "irc.unknown.net";
 		m_pLastEditedItem->setText(0,tmp.ptr());
 		m_pLastEditedItem->m_pProxyData->m_szHostname = tmp;
diff --git a/src/modules/options/optw_proxy.h b/src/modules/options/optw_proxy.h
index 5875676a9..b067fc805 100644
--- a/src/modules/options/optw_proxy.h
+++ b/src/modules/options/optw_proxy.h
@@ -6,7 +6,7 @@
 //   Creation date : Mon Jun 24 2000 21:58:25 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
diff --git a/src/modules/options/optw_query.cpp b/src/modules/options/optw_query.cpp
index f107dbc53..e460b7516 100644
--- a/src/modules/options/optw_query.cpp
+++ b/src/modules/options/optw_query.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Mon Oct 29 15:37:16 2001 GMT 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-2010 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
@@ -26,7 +26,7 @@
 #include "optw_query.h"
 
 #include "kvi_options.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_settings.h"
 
 #include <QLayout>
diff --git a/src/modules/options/optw_query.h b/src/modules/options/optw_query.h
index a1c18f57a..0dc45428e 100644
--- a/src/modules/options/optw_query.h
+++ b/src/modules/options/optw_query.h
@@ -6,7 +6,7 @@
 //   Creation date : Tue Mar 05 22:31:18 2002 GMT by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2002-2008 Szymon Stefanek (pragma@kvirc.net)
+//   Copyright (C) 2002-2010 Szymon Stefanek (pragma@kvirc.net)
 //
 //   This program is FREE software. You can redistribute it and/or
 //   modify it under the terms of the GNU General Public License
diff --git a/src/modules/options/optw_servers.cpp b/src/modules/options/optw_servers.cpp
index 67156b5bc..1cb23f13c 100644
--- a/src/modules/options/optw_servers.cpp
+++ b/src/modules/options/optw_servers.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Wed Jun 12 2000 03:29:51 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -30,14 +30,14 @@
 
 #include "kvi_query.h"
 #include "kvi_channel.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_iconmanager.h"
-#include "kvi_ircserverdb.h"
+#include "KviIrcServerDataBase.h"
 #include "kvi_ipeditor.h"
 #include "kvi_netutils.h"
 #include "kvi_settings.h"
 #include "kvi_filedialog.h"
-#include "kvi_config.h"
+#include "KviConfigurationFile.h"
 #include "kvi_scripteditor.h"
 #include "kvi_options.h"
 #include "kvi_app.h"
@@ -48,10 +48,10 @@
 #include "kvi_moduleextension.h"
 #include "kvi_msgbox.h"
 #include "kvi_mexserverimport.h"
-#include "kvi_nickserv.h"
-#include "kvi_proxydb.h"
+#include "KviNickServRuleSet.h"
+#include "KviProxyDataBase.h"
 #include "kvi_kvs_script.h"
-#include "kvi_pointerhashtable.h"
+#include "KviPointerHashTable.h"
 #include "kvi_tal_popupmenu.h"
 #include "kvi_tal_tooltip.h"
 
@@ -592,7 +592,7 @@ KviServerDetailsWidget::KviServerDetailsWidget(QWidget * par,KviServer * s)
 	KviTalToolTip::add(m_pUseDefaultInitUMode,__tr2qs_ctx("<center>If this is enabled, the global initial <b>user mode</b> (configured from"\
 		" the identity dialog) will be used. If disabled, you can configure an initial user mode for this server","options"));
 	bool bHasUmode = !(s->initUMode().isEmpty());
-	KviStr szDefUMode = KVI_OPTION_STRING(KviOption_stringDefaultUserMode);
+	KviCString szDefUMode = KVI_OPTION_STRING(KviOption_stringDefaultUserMode);
 	m_pUseDefaultInitUMode->setChecked(!bHasUmode);
 	connect(m_pUseDefaultInitUMode,SIGNAL(toggled(bool)),this,SLOT(useDefaultInitUModeToggled(bool)));
 
@@ -1088,7 +1088,7 @@ void KviServerDetailsWidget::fillData(KviServer * s)
 
 	if(m_pUseDefaultInitUMode)
 	{
-		KviStr szUMode;
+		KviCString szUMode;
 		if(!m_pUseDefaultInitUMode->isChecked())
 		{
 			if(m_pIMode->isChecked())szUMode.append('i');
@@ -1518,7 +1518,7 @@ void KviServerOptionsWidget::connectCurrentClicked()
 {
 	saveLastItem();
 	commit();
-	KviStr szServer = m_pSrvNetEdit->text();
+	KviCString szServer = m_pSrvNetEdit->text();
 	if(szServer.isEmpty())return;
 	KviKvsScript::run("server -u",g_pApp->activeConsole());
 }
@@ -1624,7 +1624,7 @@ void KviServerOptionsWidget::saveLastItem()
 
 	if(m_pLastEditedItem->m_pServerData)
 	{
-		KviStr tmp = m_pSrvNetEdit->text();
+		KviCString tmp = m_pSrvNetEdit->text();
 		if(tmp.isEmpty())
 			tmp = "irc.unknown.net";
 		m_pLastEditedItem->m_pServerData->m_szHostname = tmp;
diff --git a/src/modules/options/optw_servers.h b/src/modules/options/optw_servers.h
index 496e377c9..68e018167 100644
--- a/src/modules/options/optw_servers.h
+++ b/src/modules/options/optw_servers.h
@@ -7,7 +7,7 @@
 //   Creation date : Wed Jun 12 2000 03:29:01 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
diff --git a/src/modules/options/optw_sound.cpp b/src/modules/options/optw_sound.cpp
index 25a646b33..54c49ae84 100644
--- a/src/modules/options/optw_sound.cpp
+++ b/src/modules/options/optw_sound.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Fri Sep  6 02:18:23 2002 GMT by Szymon Stefanek
 //
 //   This file is part of the KVsound sound client distribution
-//   Copyright (C) 2002-2008 Szymon Stefanek (pragma at kvsound dot net)
+//   Copyright (C) 2002-2010 Szymon Stefanek (pragma at kvsound dot net)
 //
 //   This program is FREE software. You can redistribute it and/or
 //   modify it under the terms of the GNU General Public License
@@ -25,11 +25,11 @@
 #include "optw_sound.h"
 
 #include "kvi_settings.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_options.h"
 #include "kvi_modulemanager.h"
-#include "kvi_pointerlist.h"
-#include "kvi_string.h"
+#include "KviPointerList.h"
+#include "KviCString.h"
 #include "kvi_tal_hbox.h"
 #include "kvi_tal_tooltip.h"
 #include "kvi_app.h"
diff --git a/src/modules/options/optw_sound.h b/src/modules/options/optw_sound.h
index f7aeb17c7..d892924f3 100644
--- a/src/modules/options/optw_sound.h
+++ b/src/modules/options/optw_sound.h
@@ -6,7 +6,7 @@
 //   Creation date : Fri Sep  6 02:18:21 2002 GMT by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2002-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2002-2010 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
diff --git a/src/modules/options/optw_textencoding.cpp b/src/modules/options/optw_textencoding.cpp
index 9b38a6af6..ca3d6fd36 100644
--- a/src/modules/options/optw_textencoding.cpp
+++ b/src/modules/options/optw_textencoding.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Sat Aug 11 2001 03:29:52 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-2010 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
@@ -25,10 +25,10 @@
 #include "optw_textencoding.h"
 
 #include "kvi_options.h"
-#include "kvi_locale.h"
-#include "kvi_qstring.h"
+#include "KviLocale.h"
+#include "KviQString.h"
 #include "kvi_app.h"
-#include "kvi_fileutils.h"
+#include "KviFileUtils.h"
 
 #include <QDir>
 #include <QMessageBox>
diff --git a/src/modules/options/optw_textencoding.h b/src/modules/options/optw_textencoding.h
index f6926c7be..7949c45a1 100644
--- a/src/modules/options/optw_textencoding.h
+++ b/src/modules/options/optw_textencoding.h
@@ -6,7 +6,7 @@
 //   Creation date : Sat Mar 02 2002 12:09:19 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2002-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2002-2010 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
diff --git a/src/modules/options/optw_texticons.cpp b/src/modules/options/optw_texticons.cpp
index 730005664..4bbae171a 100644
--- a/src/modules/options/optw_texticons.cpp
+++ b/src/modules/options/optw_texticons.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Fri May 24 2002 00:16:13 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2002-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2002-2010 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
@@ -26,7 +26,7 @@
 
 #include "kvi_iconmanager.h"
 #include "kvi_texticonmanager.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_filedialog.h"
 #include "kvi_fileextensions.h"
 #include "kvi_tal_hbox.h"
diff --git a/src/modules/options/optw_texticons.h b/src/modules/options/optw_texticons.h
index 2964251e4..611bc9aee 100644
--- a/src/modules/options/optw_texticons.h
+++ b/src/modules/options/optw_texticons.h
@@ -6,7 +6,7 @@
 //   Creation date : Fri May 24 2002 00:14:02 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2002-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2002-2010 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
diff --git a/src/modules/options/optw_tools.cpp b/src/modules/options/optw_tools.cpp
index acf6afecc..a5f99eb38 100644
--- a/src/modules/options/optw_tools.cpp
+++ b/src/modules/options/optw_tools.cpp
@@ -26,7 +26,7 @@
 
 #include "kvi_settings.h"
 #include "kvi_options.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 
 #include <QLayout>
 
diff --git a/src/modules/options/optw_topiclabel.cpp b/src/modules/options/optw_topiclabel.cpp
index 8f0fdbecf..ef6f301cc 100644
--- a/src/modules/options/optw_topiclabel.cpp
+++ b/src/modules/options/optw_topiclabel.cpp
@@ -5,7 +5,7 @@
 //
 //   This file is part of the KVirc irc client distribution
 //   Copyright (C) 2001 Krzysztof Godlewski
-//   Copyright (C) 2001-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2001-2010 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
@@ -26,7 +26,7 @@
 #include "optw_topiclabel.h"
 
 #include "kvi_options.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 
 
 KviTopicLabelLookOptionsWidget::KviTopicLabelLookOptionsWidget(QWidget *p):KviOptionsWidget(p, "topic_label_look_options_widget")
diff --git a/src/modules/options/optw_topiclabel.h b/src/modules/options/optw_topiclabel.h
index e572ca6e7..808b024b4 100644
--- a/src/modules/options/optw_topiclabel.h
+++ b/src/modules/options/optw_topiclabel.h
@@ -7,7 +7,7 @@
 //
 //   This file is part of the KVirc irc client distribution
 //   Copyright (C) 2001 Krzysztof Godlewski
-//   Copyright (C) 2001-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2001-2010 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
diff --git a/src/modules/options/optw_tray.cpp b/src/modules/options/optw_tray.cpp
index 8152cf39f..55a6e8854 100644
--- a/src/modules/options/optw_tray.cpp
+++ b/src/modules/options/optw_tray.cpp
@@ -27,7 +27,7 @@
 #include "kvi_frame.h"
 #include "kvi_internalcmd.h"
 #include "kvi_options.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_tal_tooltip.h"
 
 #include <QLayout>
diff --git a/src/modules/options/optw_uparser.cpp b/src/modules/options/optw_uparser.cpp
index 0791a9ad4..afb151415 100644
--- a/src/modules/options/optw_uparser.cpp
+++ b/src/modules/options/optw_uparser.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Sat Oct 27 16:32:26 2001 GMT 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-2010 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
@@ -25,7 +25,7 @@
 #include "optw_uparser.h"
 
 #include "kvi_options.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 
 #include <QLayout>
 #include <QLabel>
diff --git a/src/modules/options/optw_uparser.h b/src/modules/options/optw_uparser.h
index 915fbb240..efd3acbd8 100644
--- a/src/modules/options/optw_uparser.h
+++ b/src/modules/options/optw_uparser.h
@@ -6,7 +6,7 @@
 //   Creation date : Sat Oct 27 16:32:27 2001 GMT 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-2010 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
diff --git a/src/modules/options/optw_urlhandlers.cpp b/src/modules/options/optw_urlhandlers.cpp
index 8e01b1862..ad2bb4eb8 100644
--- a/src/modules/options/optw_urlhandlers.cpp
+++ b/src/modules/options/optw_urlhandlers.cpp
@@ -6,7 +6,7 @@
 //   Creation date : Fri Aug 23 02:57:40 2002 GMT by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2002-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2002-2010 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
@@ -27,7 +27,7 @@
 #include "optw_urlhandlers.h"
 
 #include "kvi_options.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 
 #include <QLayout>
 #include <QLabel>
diff --git a/src/modules/options/optw_urlhandlers.h b/src/modules/options/optw_urlhandlers.h
index 2f4e40c91..2ac737723 100644
--- a/src/modules/options/optw_urlhandlers.h
+++ b/src/modules/options/optw_urlhandlers.h
@@ -6,7 +6,7 @@
 //   Creation date : Fri Aug 23 02:57:41 2002 GMT by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2002-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2002-2010 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
diff --git a/src/modules/options/optw_userlist.cpp b/src/modules/options/optw_userlist.cpp
index c38371bed..283549159 100644
--- a/src/modules/options/optw_userlist.cpp
+++ b/src/modules/options/optw_userlist.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Sat Aug 11 2001 03:29:52 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-2010 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
@@ -25,7 +25,7 @@
 #include "optw_userlist.h"
 
 #include "kvi_options.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_userlistview.h"
 
 #include <QLayout>
diff --git a/src/modules/options/optw_userlist.h b/src/modules/options/optw_userlist.h
index 9c249e5e8..51a01c040 100644
--- a/src/modules/options/optw_userlist.h
+++ b/src/modules/options/optw_userlist.h
@@ -6,7 +6,7 @@
 //   Creation date : Sat Mar 02 2002 12:09:19 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2002-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2002-2010 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
diff --git a/src/modules/options/optw_windowlist.cpp b/src/modules/options/optw_windowlist.cpp
index d976db6e1..3e0eab9e1 100644
--- a/src/modules/options/optw_windowlist.cpp
+++ b/src/modules/options/optw_windowlist.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Wed Jan 16 04:30:39 2002 GMT by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2002-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2002-2010 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
@@ -25,7 +25,7 @@
 #include "optw_windowlist.h"
 
 #include "kvi_settings.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_options.h"
 
 
diff --git a/src/modules/options/optw_windowlist.h b/src/modules/options/optw_windowlist.h
index 43ee60141..df32837e3 100644
--- a/src/modules/options/optw_windowlist.h
+++ b/src/modules/options/optw_windowlist.h
@@ -7,7 +7,7 @@
 //   Creation date : Wed Jan 16 04:30:41 2002 GMT by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2002-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2002-2010 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
diff --git a/src/modules/perl/libkviperl.cpp b/src/modules/perl/libkviperl.cpp
index 1d56a7f23..0f0b457bf 100644
--- a/src/modules/perl/libkviperl.cpp
+++ b/src/modules/perl/libkviperl.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Tue Jul 13 13:03:31 2004 GMT by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2004-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2004-2010 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
@@ -24,8 +24,8 @@
 
 #include "kvi_settings.h"
 #include "kvi_module.h"
-#include "kvi_fileutils.h"
-#include "kvi_locale.h"
+#include "KviFileUtils.h"
+#include "KviLocale.h"
 #include "kvi_app.h"
 #include "kvi_options.h"
 #include "kvi_modulemanager.h"
diff --git a/src/modules/perlcore/KVIrc.xs b/src/modules/perlcore/KVIrc.xs
index 6e825e30f..f41b39968 100644
--- a/src/modules/perlcore/KVIrc.xs
+++ b/src/modules/perlcore/KVIrc.xs
@@ -77,7 +77,7 @@ char * getLocal(varname)
 	char * varname
 	CODE:
 		QString tmp;
-		KviStr hack;
+		KviCString hack;
 		if(g_pCurrentKvsContext)
 		{
 			KviKvsVariant * pVar = g_pCurrentKvsContext->localVariables()->find(varname);
@@ -110,7 +110,7 @@ char * getGlobal(varname)
 	char * varname
 	CODE:
 		QString tmp;
-		KviStr hack;
+		KviCString hack;
 		if(g_pCurrentKvsContext)
 		{
 			KviKvsVariant * pVar = g_pCurrentKvsContext->globalVariables()->find(varname);
diff --git a/src/modules/perlcore/libkviperlcore.cpp b/src/modules/perlcore/libkviperlcore.cpp
index d0506a3b4..fccc2b64f 100644
--- a/src/modules/perlcore/libkviperlcore.cpp
+++ b/src/modules/perlcore/libkviperlcore.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Tue Jul 13 13:03:31 2004 GMT by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2004-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2004-2010 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
@@ -24,14 +24,14 @@
 
 #include "kvi_module.h"
 #include "kvi_settings.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_out.h"
 #include "kvi_window.h"
 #include "kvi_app.h"
 #include "kvi_kvs_script.h"
 #include "kvi_kvs_variant.h"
 #include "kvi_userinput.h"
-#include "kvi_pointerhashtable.h"
+#include "KviPointerHashTable.h"
 
 #include <QByteArray>
 
@@ -74,7 +74,7 @@
 
 	static KviKvsRunTimeContext * g_pCurrentKvsContext = 0;
 	static bool g_bExecuteQuiet = false;
-	static KviStr g_szLastReturnValue("");
+	static KviCString g_szLastReturnValue("");
 	static QStringList g_lWarningList;
 
 	#include "xs.inc"
diff --git a/src/modules/perlcore/perlcoreinterface.h b/src/modules/perlcore/perlcoreinterface.h
index 36c198afa..a4b039182 100644
--- a/src/modules/perlcore/perlcoreinterface.h
+++ b/src/modules/perlcore/perlcoreinterface.h
@@ -7,7 +7,7 @@
 //   Creation date : Tue Jul 13 13:03:31 2004 GMT by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2004-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2004-2010 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
@@ -26,7 +26,7 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_qstring.h"
+#include "KviQString.h"
 #include "kvi_kvs_runtimecontext.h"
 
 #include <QStringList>
diff --git a/src/modules/perlcore/xs.inc b/src/modules/perlcore/xs.inc
index 5c31cb19b..5f272e49f 100644
--- a/src/modules/perlcore/xs.inc
+++ b/src/modules/perlcore/xs.inc
@@ -126,7 +126,7 @@ XS(XS_KVIrc_getLocal)
 	dXSTARG;
 #line 55 "KVIrc.xs"
 		QString tmp;
-		KviStr hack;
+		KviCString hack;
 		if(g_pCurrentKvsContext)
 		{
 			KviKvsVariant * pVar = g_pCurrentKvsContext->localVariables()->find(varname);
@@ -180,7 +180,7 @@ XS(XS_KVIrc_getGlobal)
 	dXSTARG;
 #line 88 "KVIrc.xs"
 		QString tmp;
-		KviStr hack;
+		KviCString hack;
 		if(g_pCurrentKvsContext)
 		{
 			KviKvsVariant * pVar = g_pCurrentKvsContext->globalVariables()->find(varname);
diff --git a/src/modules/popup/libkvipopup.cpp b/src/modules/popup/libkvipopup.cpp
index 50259ddea..bf432b1a0 100644
--- a/src/modules/popup/libkvipopup.cpp
+++ b/src/modules/popup/libkvipopup.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Fri Sep 03 2010 15:23:00 CEST by Fabio Bas
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2001-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2001-2010 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
@@ -23,7 +23,7 @@
 //=============================================================================
 
 #include "kvi_module.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_kvs_popupmanager.h"
 
 #define GET_KVS_POPUP \
diff --git a/src/modules/popupeditor/libkvipopupeditor.cpp b/src/modules/popupeditor/libkvipopupeditor.cpp
index 3a34be9b7..9205866f8 100644
--- a/src/modules/popupeditor/libkvipopupeditor.cpp
+++ b/src/modules/popupeditor/libkvipopupeditor.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Mon 23 Dec 2002 20:23:59 2002 GMT by Szymon Stefanek
 //
 //   This toolbar is part of the KVirc irc client distribution
-//   Copyright (C) 2002-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2002-2010 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
@@ -25,7 +25,7 @@
 #include "popupeditor.h"
 
 #include "kvi_module.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_frame.h"
 
 
diff --git a/src/modules/popupeditor/popupeditor.cpp b/src/modules/popupeditor/popupeditor.cpp
index f2487c89a..c4a35c17b 100644
--- a/src/modules/popupeditor/popupeditor.cpp
+++ b/src/modules/popupeditor/popupeditor.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Mon Dec 23 2002 20:28:18 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2002-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2002-2010 Szymon Stefanek (pragma at kvirc dot net)
 //
 //   This program is FREE software. You can redistribute it and/or
 //   modify it under the linkss of the GNU General Public License
@@ -26,19 +26,19 @@
 
 #include "kvi_iconmanager.h"
 #include "kvi_options.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_imagedialog.h"
-#include "kvi_config.h"
+#include "KviConfigurationFile.h"
 #include "kvi_filedialog.h"
-#include "kvi_fileutils.h"
+#include "KviFileUtils.h"
 #include "kvi_scripteditor.h"
 #include "kvi_debug.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_app.h"
 #include "kvi_kvs_popupmanager.h"
 #include "kvi_kvs_popupmenu.h"
 #include "kvi_kvs_variantlist.h"
-#include "kvi_pointerhashtable.h"
+#include "KviPointerHashTable.h"
 #include "kvi_tal_vbox.h"
 #include "kvi_fileextensions.h"
 
@@ -1433,7 +1433,7 @@ void KviPopupEditorWindow::getConfigGroupName(QString &szName)
 	szName = "popupeditor";
 }
 
-void KviPopupEditorWindow::saveProperties(KviConfig *) //cfg
+void KviPopupEditorWindow::saveProperties(KviConfigurationFile *) //cfg
 {
 /*
 #ifdef COMPILE_SCRIPTTOOLBAR
@@ -1444,7 +1444,7 @@ void KviPopupEditorWindow::saveProperties(KviConfig *) //cfg
 */
 }
 
-void KviPopupEditorWindow::loadProperties(KviConfig *) // cfg
+void KviPopupEditorWindow::loadProperties(KviConfigurationFile *) // cfg
 {
 /*
 #ifdef COMPILE_SCRIPTTOOLBAR
@@ -1452,7 +1452,7 @@ void KviPopupEditorWindow::loadProperties(KviConfig *) // cfg
 	def.append(20);
 	def.append(80);
 	m_pEditor->setSizes(cfg->readIntListEntry("Sizes",def));
-	KviStr tmp = cfg->readEntry("LastPopup","");
+	KviCString tmp = cfg->readEntry("LastPopup","");
 	m_pEditor->editPopup(tmp);
 	//qDebug("LAST EDITED WAS %s",tmp.ptr());
 #endif // COMPILE_SCRIPTTOOLBAR
diff --git a/src/modules/popupeditor/popupeditor.h b/src/modules/popupeditor/popupeditor.h
index f6a172be7..75a0d8fa3 100644
--- a/src/modules/popupeditor/popupeditor.h
+++ b/src/modules/popupeditor/popupeditor.h
@@ -6,7 +6,7 @@
 //   Creation date : Mon Dec 23 2002 20:24:55 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2002-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2002-2010 Szymon Stefanek (pragma at kvirc dot net)
 //
 //   This program is FREE software. You can redistribute it and/or
 //   modify it under the linkss of the GNU General Public License
@@ -25,7 +25,7 @@
 //=============================================================================
 
 #include "kvi_window.h"
-#include "kvi_string.h"
+#include "KviCString.h"
 #include <QTreeWidget>
 #include "kvi_tal_popupmenu.h"
 
@@ -194,8 +194,8 @@ protected:
 	virtual QPixmap * myIconPtr();
 	virtual void fillCaptionBuffers();
 	virtual void getConfigGroupName(QString &szName);
-	virtual void saveProperties(KviConfig *);
-	virtual void loadProperties(KviConfig *);
+	virtual void saveProperties(KviConfigurationFile *);
+	virtual void loadProperties(KviConfigurationFile *);
 protected slots:
 	void cancelClicked();
 	void okClicked();
diff --git a/src/modules/proxydb/libkviproxydb.cpp b/src/modules/proxydb/libkviproxydb.cpp
index ec23112fe..ae3c2c3e7 100644
--- a/src/modules/proxydb/libkviproxydb.cpp
+++ b/src/modules/proxydb/libkviproxydb.cpp
@@ -24,8 +24,8 @@
 
 #include "kvi_module.h"
 #include "kvi_app.h"
-#include "kvi_locale.h"
-#include "kvi_proxydb.h"
+#include "KviLocale.h"
+#include "KviProxyDataBase.h"
 
 #include <QString>
 #include <QHostAddress>
diff --git a/src/modules/python/libkvipython.cpp b/src/modules/python/libkvipython.cpp
index 21fa11ae2..81006e93c 100644
--- a/src/modules/python/libkvipython.cpp
+++ b/src/modules/python/libkvipython.cpp
@@ -25,8 +25,8 @@
 #include "kvi_settings.h"
 #include "kvi_module.h"
 #include "kvi_modulemanager.h"
-//#include "kvi_fileutils.h"
-#include "kvi_locale.h"
+//#include "KviFileUtils.h"
+#include "KviLocale.h"
 //#include "kvi_app.h"
 //#include "kvi_options.h"
 //#include "kvi_out.h"
diff --git a/src/modules/pythoncore/kvircmodule.cpp b/src/modules/pythoncore/kvircmodule.cpp
index 06e478b75..8aea2c4b5 100644
--- a/src/modules/pythoncore/kvircmodule.cpp
+++ b/src/modules/pythoncore/kvircmodule.cpp
@@ -41,7 +41,7 @@
 
 extern KviKvsRunTimeContext * g_pCurrentKvsContext;
 extern bool g_bExecuteQuiet;
-extern KviStr g_szLastReturnValue;
+extern KviCString g_szLastReturnValue;
 extern QStringList g_lWarningList;
 extern QString g_lError;
 
diff --git a/src/modules/pythoncore/libkvipythoncore.cpp b/src/modules/pythoncore/libkvipythoncore.cpp
index f14cf454e..825a47260 100644
--- a/src/modules/pythoncore/libkvipythoncore.cpp
+++ b/src/modules/pythoncore/libkvipythoncore.cpp
@@ -25,9 +25,9 @@
 
 #include "kvi_settings.h"
 #include "kvi_module.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 //#include "kvi_modulemanager.h"
-//#include "kvi_fileutils.h"
+//#include "KviFileUtils.h"
 //#include "kvi_app.h"
 //#include "kvi_options.h"
 //#include "kvi_out.h"
@@ -42,7 +42,7 @@ KviKvsRunTimeContext * g_pCurrentKvsContext = 0;
 bool g_bExecuteQuiet = false;
 QStringList g_lWarningList;
 QString g_lError;
-static KviStr g_szLastReturnValue("");
+static KviCString g_szLastReturnValue("");
 
 static PyThreadState * mainThreadState = NULL;
 
diff --git a/src/modules/pythoncore/pythoncoreinterface.h b/src/modules/pythoncore/pythoncoreinterface.h
index 3463ce28b..bb6d533e9 100644
--- a/src/modules/pythoncore/pythoncoreinterface.h
+++ b/src/modules/pythoncore/pythoncoreinterface.h
@@ -26,7 +26,7 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_qstring.h"
+#include "KviQString.h"
 #include "kvi_kvs_runtimecontext.h"
 
 #include <QStringList>
diff --git a/src/modules/raweditor/libkviraweditor.cpp b/src/modules/raweditor/libkviraweditor.cpp
index 9b3ecccff..4f7f0f88b 100644
--- a/src/modules/raweditor/libkviraweditor.cpp
+++ b/src/modules/raweditor/libkviraweditor.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Mon 23 Dec 2002 20:23:59 2002 GMT by Szymon Stefanek
 //
 //   This toolbar is part of the KVirc irc client distribution
-//   Copyright (C) 2002-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2002-2010 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
@@ -25,7 +25,7 @@
 #include "raweditor.h"
 
 #include "kvi_module.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_frame.h"
 
 
diff --git a/src/modules/raweditor/raweditor.cpp b/src/modules/raweditor/raweditor.cpp
index f5044bc1f..e6c3cc1c7 100644
--- a/src/modules/raweditor/raweditor.cpp
+++ b/src/modules/raweditor/raweditor.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Mon Dec 23 2002 20:28:18 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2002-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2002-2010 Szymon Stefanek (pragma at kvirc dot net)
 //
 //   This program is FREE software. You can redistribute it and/or
 //   modify it under the linkss of the GNU General Public License
@@ -27,16 +27,16 @@
 #include "kvi_iconmanager.h"
 #include "kvi_iconmanager.h"
 #include "kvi_options.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_imagedialog.h"
-#include "kvi_config.h"
+#include "KviConfigurationFile.h"
 #include "kvi_filedialog.h"
-#include "kvi_fileutils.h"
+#include "KviFileUtils.h"
 #include "kvi_scripteditor.h"
 #include "kvi_debug.h"
 #include "kvi_fileextensions.h"
 #include "kvi_app.h"
-#include "kvi_cmdformatter.h"
+#include "KviCommandFormatter.h"
 #include "kvi_kvs_eventmanager.h"
 #include "kvi_kvs_eventhandler.h"
 #include "kvi_tal_vbox.h"
@@ -531,7 +531,7 @@ void KviRawEditorWindow::getConfigGroupName(QString &szName)
 	szName = "raweditor";
 }
 
-void KviRawEditorWindow::saveProperties(KviConfig *)
+void KviRawEditorWindow::saveProperties(KviConfigurationFile *)
 {
 	/*
 	#ifdef COMPILE_SCRIPTTOOLBAR
@@ -542,7 +542,7 @@ void KviRawEditorWindow::saveProperties(KviConfig *)
 	*/
 }
 
-void KviRawEditorWindow::loadProperties(KviConfig *)
+void KviRawEditorWindow::loadProperties(KviConfigurationFile *)
 {
 	/*
 	#ifdef COMPILE_SCRIPTTOOLBAR
@@ -550,7 +550,7 @@ void KviRawEditorWindow::loadProperties(KviConfig *)
 		def.append(20);
 		def.append(80);
 		m_pEditor->setSizes(cfg->readIntListEntry("Sizes",def));
-		KviStr tmp = cfg->readEntry("LastRaw","");
+		KviCString tmp = cfg->readEntry("LastRaw","");
 		m_pEditor->editRaw(tmp);
 		//qDebug("LAST EDITED WAS %s",tmp.ptr());
 	#endif // COMPILE_SCRIPTTOOLBAR
diff --git a/src/modules/raweditor/raweditor.h b/src/modules/raweditor/raweditor.h
index f2bc47ccd..646e22811 100644
--- a/src/modules/raweditor/raweditor.h
+++ b/src/modules/raweditor/raweditor.h
@@ -6,7 +6,7 @@
 //   Creation date : Mon Dec 23 2002 20:24:55 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2002-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2002-2010 Szymon Stefanek (pragma at kvirc dot net)
 //
 //   This program is FREE software. You can redistribute it and/or
 //   modify it under the linkss of the GNU General Public License
@@ -25,7 +25,7 @@
 //=============================================================================
 
 #include "kvi_window.h"
-#include "kvi_qstring.h"
+#include "KviQString.h"
 #include <QTreeWidget>
 #include "kvi_iconmanager.h"
 
@@ -130,8 +130,8 @@ protected:
 	virtual QPixmap * myIconPtr();
 	virtual void fillCaptionBuffers();
 	virtual void getConfigGroupName(QString &szName);
-	virtual void saveProperties(KviConfig *);
-	virtual void loadProperties(KviConfig *);
+	virtual void saveProperties(KviConfigurationFile *);
+	virtual void loadProperties(KviConfigurationFile *);
 protected slots:
 	void cancelClicked();
 	void okClicked();
diff --git a/src/modules/regchan/libkviregchan.cpp b/src/modules/regchan/libkviregchan.cpp
index d4adea0b8..5bf20468f 100644
--- a/src/modules/regchan/libkviregchan.cpp
+++ b/src/modules/regchan/libkviregchan.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Sat Jun 29 02:55:18 2002 GMT by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2002-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2002-2010 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
@@ -24,10 +24,10 @@
 
 // incomplete
 #include "kvi_module.h"
-#include "kvi_regchan.h"
-#include "kvi_locale.h"
+#include "KviRegisteredChannel.h"
+#include "KviLocale.h"
 #include "kvi_out.h"
-#include "kvi_mirccntrl.h"
+#include "KviMircCntrl.h"
 #include "kvi_window.h"
 #include "kvi_debug.h"
 
diff --git a/src/modules/reguser/dialog.cpp b/src/modules/reguser/dialog.cpp
index 5cd4882c0..4d2325d02 100644
--- a/src/modules/reguser/dialog.cpp
+++ b/src/modules/reguser/dialog.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Tue Dec 26 2000 12:24:12 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -28,21 +28,21 @@
 #include "wizard.h"
 #include "dialog.h"
 
-#include "kvi_regusersdb.h"
-#include "kvi_locale.h"
-#include "kvi_ircmask.h"
+#include "KviRegisteredUserDataBase.h"
+#include "KviLocale.h"
+#include "KviIrcMask.h"
 #include "kvi_debug.h"
 #include "kvi_iconmanager.h"
 #include "kvi_app.h"
 #include "kvi_options.h"
-#include "kvi_file.h"
+#include "KviFile.h"
 #include "kvi_filedialog.h"
 #include "kvi_msgbox.h"
-#include "kvi_fileutils.h"
+#include "KviFileUtils.h"
 #include "kvi_settings.h"
-#include "kvi_stringconversion.h"
+#include "KviStringConversion.h"
 #include "kvi_options.h"
-#include "kvi_pointerhashtable.h"
+#include "KviPointerHashTable.h"
 #include "kvi_tal_hbox.h"
 #include "kvi_tal_vbox.h"
 
@@ -817,7 +817,7 @@ void KviRegisteredUsersDialog::selectAllClicked()
 
 void KviRegisteredUsersDialog::importClicked()
 {
-	//KviStr buffer;
+	//KviCString buffer;
 	QString buffer;
 
 	if(!KviFileDialog::askForOpenFileName(buffer,__tr2qs_ctx("Choose a Filename - KVIrc","register")))return;
diff --git a/src/modules/reguser/dialog.h b/src/modules/reguser/dialog.h
index 21c78f422..5e3cb8d47 100644
--- a/src/modules/reguser/dialog.h
+++ b/src/modules/reguser/dialog.h
@@ -6,7 +6,7 @@
 //   Creation date : Sun Dec 24 2000 15:16:17 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -24,10 +24,10 @@
 //
 //=============================================================================
 
-#include "kvi_string.h"
-#include "kvi_regusersdb.h"
+#include "KviCString.h"
+#include "KviRegisteredUserDataBase.h"
 #include "kvi_selectors.h"
-#include "kvi_pointerhashtable.h"
+#include "KviPointerHashTable.h"
 #include <QTreeWidget>
 #include "kvi_tal_listwidget.h"
 #include "kvi_tal_popupmenu.h"
diff --git a/src/modules/reguser/edituser.cpp b/src/modules/reguser/edituser.cpp
index 25ee40f42..633458046 100644
--- a/src/modules/reguser/edituser.cpp
+++ b/src/modules/reguser/edituser.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Tue Dec 26 2000 12:24:12 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -28,21 +28,21 @@
 #include "wizard.h"
 #include "dialog.h"
 
-#include "kvi_regusersdb.h"
-#include "kvi_locale.h"
-#include "kvi_ircmask.h"
+#include "KviRegisteredUserDataBase.h"
+#include "KviLocale.h"
+#include "KviIrcMask.h"
 #include "kvi_debug.h"
 #include "kvi_iconmanager.h"
 #include "kvi_app.h"
 #include "kvi_options.h"
-#include "kvi_file.h"
+#include "KviFile.h"
 #include "kvi_filedialog.h"
 #include "kvi_msgbox.h"
-#include "kvi_fileutils.h"
+#include "KviFileUtils.h"
 #include "kvi_settings.h"
-#include "kvi_stringconversion.h"
+#include "KviStringConversion.h"
 #include "kvi_options.h"
-#include "kvi_pointerhashtable.h"
+#include "KviPointerHashTable.h"
 #include "kvi_tal_hbox.h"
 #include "kvi_tal_vbox.h"
 
@@ -283,7 +283,7 @@ void KviReguserMaskDialog::closeEvent(QCloseEvent *e)
 
 void KviReguserMaskDialog::okClicked()
 {
-	KviStr szTmp = m_pNickEdit->text();
+	KviCString szTmp = m_pNickEdit->text();
 	if(szTmp.isEmpty())szTmp = "*";
 	m_pMask->setNick(szTmp.ptr());
 
@@ -741,7 +741,7 @@ void KviRegisteredUserEntryDialog::editAllPropertiesClicked()
 	{
 		m_pPropertyDict->remove("avatar");
 	} else {
-		KviStr szPath = m_pAvatar->path();
+		KviCString szPath = m_pAvatar->path();
 		if(szPath.isEmpty())m_pPropertyDict->remove("avatar");
 		else m_pPropertyDict->replace("avatar",new QString(szPath));
 	}
diff --git a/src/modules/reguser/edituser.h b/src/modules/reguser/edituser.h
index f6a3835b3..e453b9b84 100644
--- a/src/modules/reguser/edituser.h
+++ b/src/modules/reguser/edituser.h
@@ -6,7 +6,7 @@
 //   Creation date : Sun Dec 24 2000 15:16:17 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -24,10 +24,10 @@
 //
 //=============================================================================
 
-#include "kvi_string.h"
-#include "kvi_regusersdb.h"
+#include "KviCString.h"
+#include "KviRegisteredUserDataBase.h"
 #include "kvi_selectors.h"
-#include "kvi_pointerhashtable.h"
+#include "KviPointerHashTable.h"
 #include <QTreeWidget>
 #include "kvi_tal_popupmenu.h"
 #include <kvi_tal_tabdialog.h>
diff --git a/src/modules/reguser/libkvireguser.cpp b/src/modules/reguser/libkvireguser.cpp
index 9cbd97cbe..34bc5115f 100644
--- a/src/modules/reguser/libkvireguser.cpp
+++ b/src/modules/reguser/libkvireguser.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Fri Dec 01 2000 14:53:10 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -28,16 +28,16 @@
 #include "dialog.h"
 
 #include "kvi_module.h"
-#include "kvi_regusersdb.h"
-#include "kvi_ircuserdb.h"
+#include "KviRegisteredUserDataBase.h"
+#include "KviIrcUserDataBase.h"
 #include "kvi_out.h"
-#include "kvi_mirccntrl.h"
+#include "KviMircCntrl.h"
 #include "kvi_window.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_app.h"
 #include "kvi_window.h"
 #include "kvi_frame.h"
-#include "kvi_pointerlist.h"
+#include "KviPointerList.h"
 
 #include <QSplitter> // FIXME: REmove this!
 
@@ -936,7 +936,7 @@ static bool reguser_kvs_fnc_exactMatch(KviKvsModuleFunctionCall * c)
 //		[module:reguser]reguser module documentation[/module]
 //*/
 
-//static void search_reguser_list(KviRegisteredUserList * l,KviWindow * w,const char * mask,KviStr & buffer)
+//static void search_reguser_list(KviRegisteredUserList * l,KviWindow * w,const char * mask,KviCString & buffer)
 //{
 //	for(KviRegisteredUser * u = l->first();u;u = l->next())
 //	{
@@ -948,11 +948,11 @@ static bool reguser_kvs_fnc_exactMatch(KviKvsModuleFunctionCall * c)
 //	}
 //}
 
-//static bool reguser_module_fnc_matches(KviModule *m,KviCommand *c,KviParameterList * parms,KviStr &buffer)
+//static bool reguser_module_fnc_matches(KviModule *m,KviCommand *c,KviParameterList * parms,KviCString &buffer)
 //{
 //	ENTER_STACK_FRAME(c,"reguser.matches");
 //
-//	KviStr list;
+//	KviCString list;
 //
 //	const KviPointerHashTable<const char *,KviRegisteredUserList> * d = g_pRegisteredUserDataBase->nickDict();
 //	KviPointerHashTableIterator<const char *,KviRegisteredUserList> it(*d);
@@ -1017,7 +1017,7 @@ static bool reguser_kvs_fnc_mask(KviKvsModuleFunctionCall * c)
 	KviRegisteredUser * u = g_pRegisteredUserDataBase->findUserByName(szName);
 	if(u)
 	{
-		KviStr n = szName;
+		KviCString n = szName;
 		if(n.hasData() && n.isUnsignedNum())
 		{
 			KviIrcMask * m = u->maskList()->at(n.toInt());
diff --git a/src/modules/reguser/wizard.cpp b/src/modules/reguser/wizard.cpp
index bb82d738e..86b888ead 100644
--- a/src/modules/reguser/wizard.cpp
+++ b/src/modules/reguser/wizard.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Fri Jun 26 2002 21:21:21 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2002-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2002-2010 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
@@ -25,13 +25,13 @@
 
 #include "wizard.h"
 
-#include "kvi_locale.h"
-#include "kvi_pointerlist.h"
+#include "KviLocale.h"
+#include "KviPointerList.h"
 #include "kvi_app.h"
-#include "kvi_ircmask.h"
+#include "KviIrcMask.h"
 #include "kvi_selectors.h"
-#include "kvi_pixmap.h"
-#include "kvi_regusersdb.h"
+#include "KviPixmap.h"
+#include "KviRegisteredUserDataBase.h"
 #include "kvi_iconmanager.h"
 
 #include <QDesktopWidget>
@@ -114,7 +114,7 @@ KviRegistrationWizard::KviRegistrationWizard(const QString &startMask,KviRegiste
 
 	m_pPage2Layout->addWidget(m_pLabel2,0,0,1,5);
 
-	//KviStr szMask;
+	//KviCString szMask;
 
 	//mask.mask(szMask,11);
 
@@ -405,9 +405,9 @@ void KviRegistrationWizard::showEvent(QShowEvent *e)
 
 void KviRegistrationWizard::maskChanged(const QString &)
 {
-	KviStr tmp1 = m_pNicknameEdit1->text();
-	KviStr tmp2 = m_pUsernameEdit1->text();
-	KviStr tmp3 = m_pHostEdit1->text();
+	KviCString tmp1 = m_pNicknameEdit1->text();
+	KviCString tmp2 = m_pUsernameEdit1->text();
+	KviCString tmp3 = m_pHostEdit1->text();
 
 	if(tmp1.isEmpty())
 	{
@@ -427,7 +427,7 @@ void KviRegistrationWizard::maskChanged(const QString &)
 		return;
 	}
 
-	KviStr mask(KviStr::Format,"%s!%s@%s",tmp1.ptr(),tmp2.ptr(),tmp3.ptr());
+	KviCString mask(KviCString::Format,"%s!%s@%s",tmp1.ptr(),tmp2.ptr(),tmp3.ptr());
 
 	//KviIrcMask m(mask.ptr());
 
@@ -447,7 +447,7 @@ void KviRegistrationWizard::notifyNickChanged(const QString &)
 	if(!bYes)
 	{
 		// we need at least one nickname then :)
-		KviStr tmp = m_pNotifyNickEdit1->text();
+		KviCString tmp = m_pNotifyNickEdit1->text();
 		if(tmp.hasData())
 		{
 			bYes = true;
diff --git a/src/modules/reguser/wizard.h b/src/modules/reguser/wizard.h
index cb630351d..27481475d 100644
--- a/src/modules/reguser/wizard.h
+++ b/src/modules/reguser/wizard.h
@@ -6,7 +6,7 @@
 //   Creation date : Fri Jun 26 2002 21:21:21 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2002-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2002-2010 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
@@ -24,7 +24,7 @@
 //
 //=============================================================================
 
-#include "kvi_string.h"
+#include "KviCString.h"
 #include "kvi_tal_wizard.h"
 
 #include <QCheckBox>
@@ -48,7 +48,7 @@ public:
 
 	KviRegisteredUserDataBase * m_pDb;
 
-	KviStr m_szStartMask;
+	KviCString m_szStartMask;
 
 	bool m_bModal;
 
diff --git a/src/modules/rijndael/ablowfish.cpp b/src/modules/rijndael/ablowfish.cpp
index 914a51f5c..91820baf3 100644
--- a/src/modules/rijndael/ablowfish.cpp
+++ b/src/modules/rijndael/ablowfish.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Wed Jan 13 2005 02:04:10 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2005-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2005-2010 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
diff --git a/src/modules/rijndael/ablowfish.h b/src/modules/rijndael/ablowfish.h
index 9710dcba3..97c0bec8a 100644
--- a/src/modules/rijndael/ablowfish.h
+++ b/src/modules/rijndael/ablowfish.h
@@ -6,7 +6,7 @@
 //   Creation date : Wed Jan 13 2005 02:04:10 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2005-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2005-2010 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
diff --git a/src/modules/rijndael/libkvirijndael.cpp b/src/modules/rijndael/libkvirijndael.cpp
index 926ed1f09..3a9013c2d 100644
--- a/src/modules/rijndael/libkvirijndael.cpp
+++ b/src/modules/rijndael/libkvirijndael.cpp
@@ -5,7 +5,7 @@
 //
 //   This file is part of the KVirc irc client distribution
 //   Copyright (C) 2000 Till Bush (buti@geocities.com)
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -28,9 +28,9 @@
 
 #include "kvi_module.h"
 #include "kvi_debug.h"
-#include "kvi_locale.h"
-#include "kvi_mirccntrl.h"
-#include "kvi_time.h"
+#include "KviLocale.h"
+#include "KviMircCntrl.h"
+#include "KviTimeUtils.h"
 
 //#warning "Other engines: mircStrip koi2win colorizer lamerizer etc.."
 
@@ -63,8 +63,8 @@
 
 #if defined(COMPILE_CRYPT_SUPPORT) || defined(Q_MOC_RUN)
 	#include "kvi_memmove.h"
-	#include "kvi_malloc.h"
-	#include "kvi_pointerlist.h"
+	#include "KviMemory.h"
+	#include "KviPointerList.h"
 
 	static KviPointerList<KviCryptEngine> * g_pEngineList = 0;
 
@@ -119,8 +119,8 @@
 
 		int defLen = getKeyLen();
 
-		char * encryptKey = (char *)kvi_malloc(defLen);
-		char * decryptKey = (char *)kvi_malloc(defLen);
+		char * encryptKey = (char *)KviMemory::allocate(defLen);
+		char * decryptKey = (char *)KviMemory::allocate(defLen);
 
 		if(encKeyLen > defLen)encKeyLen = defLen;
 		kvi_memmove(encryptKey,encKey,encKeyLen);
@@ -132,10 +132,10 @@
 
 		m_pEncryptCipher = new Rijndael();
 		int retVal = m_pEncryptCipher->init(Rijndael::CBC,Rijndael::Encrypt,(unsigned char *)encryptKey,getKeyLenId());
-		kvi_free(encryptKey);
+		KviMemory::free(encryptKey);
 		if(retVal != RIJNDAEL_SUCCESS)
 		{
-			kvi_free(decryptKey);
+			KviMemory::free(decryptKey);
 			delete m_pEncryptCipher;
 			m_pEncryptCipher = 0;
 			setLastErrorFromRijndaelErrorCode(retVal);
@@ -144,7 +144,7 @@
 
 		m_pDecryptCipher = new Rijndael();
 		retVal = m_pDecryptCipher->init(Rijndael::CBC,Rijndael::Decrypt,(unsigned char *)decryptKey,getKeyLenId());
-		kvi_free(decryptKey);
+		KviMemory::free(decryptKey);
 		if(retVal != RIJNDAEL_SUCCESS)
 		{
 			delete m_pEncryptCipher;
@@ -174,7 +174,7 @@
 		}
 	}
 
-	KviCryptEngine::EncryptResult KviRijndaelEngine::encrypt(const char * plainText,KviStr &outBuffer)
+	KviCryptEngine::EncryptResult KviRijndaelEngine::encrypt(const char * plainText,KviCString &outBuffer)
 	{
 		if(!m_pEncryptCipher)
 		{
@@ -182,22 +182,22 @@
 			return KviCryptEngine::EncryptError;
 		}
 		int len = (int)kvi_strLen(plainText);
-		char * buf = (char *)kvi_malloc(len + 16);
+		char * buf = (char *)KviMemory::allocate(len + 16);
 
 		int retVal = m_pEncryptCipher->padEncrypt((const unsigned char *)plainText,len,(unsigned char *)buf);
 		if(retVal < 0)
 		{
-			kvi_free(buf);
+			KviMemory::free(buf);
 			setLastErrorFromRijndaelErrorCode(retVal);
 			return KviCryptEngine::EncryptError;
 		}
 
 		if(!binaryToAscii(buf,retVal,outBuffer))
 		{
-			kvi_free(buf);
+			KviMemory::free(buf);
 			return KviCryptEngine::EncryptError;
 		}
-		kvi_free(buf);
+		KviMemory::free(buf);
 
 		if(outBuffer.len() > maxEncryptLen())
 		{
@@ -211,7 +211,7 @@
 		return KviCryptEngine::Encrypted;
 	}
 
-	KviCryptEngine::DecryptResult KviRijndaelEngine::decrypt(const char * inBuffer,KviStr &plainText)
+	KviCryptEngine::DecryptResult KviRijndaelEngine::decrypt(const char * inBuffer,KviCString &plainText)
 	{
 		if(!m_pDecryptCipher)
 		{
@@ -238,14 +238,14 @@
 
 		if(!asciiToBinary(inBuffer,&len,&binary))return KviCryptEngine::DecryptError;
 
-		char * buf = (char *)kvi_malloc(len + 1);
+		char * buf = (char *)KviMemory::allocate(len + 1);
 
 		int retVal = m_pDecryptCipher->padDecrypt((const unsigned char *)binary,len,(unsigned char *)buf);
-		kvi_free(binary);
+		KviMemory::free(binary);
 
 		if(retVal < 0)
 		{
-			kvi_free(buf);
+			KviMemory::free(buf);
 			setLastErrorFromRijndaelErrorCode(retVal);
 			return KviCryptEngine::DecryptError;
 		}
@@ -254,11 +254,11 @@
 
 		plainText = buf;
 
-		kvi_free(buf);
+		KviMemory::free(buf);
 		return KviCryptEngine::DecryptOkWasEncrypted;
 	}
 
-	bool KviRijndaelHexEngine::binaryToAscii(const char * inBuffer,int len,KviStr &outBuffer)
+	bool KviRijndaelHexEngine::binaryToAscii(const char * inBuffer,int len,KviCString &outBuffer)
 	{
 		outBuffer.bufferToHex(inBuffer,len);
 		return true;
@@ -266,7 +266,7 @@
 
 	bool KviRijndaelHexEngine::asciiToBinary(const char * inBuffer,int * len,char ** outBuffer)
 	{
-		KviStr hex(inBuffer);
+		KviCString hex(inBuffer);
 		char * tmpBuf;
 		*len = hex.hexToBuffer(&tmpBuf,false);
 		if(*len < 0)
@@ -276,15 +276,15 @@
 		} else {
 			if(len > 0)
 			{
-				*outBuffer = (char *)kvi_malloc(*len);
+				*outBuffer = (char *)KviMemory::allocate(*len);
 				kvi_memmove(*outBuffer,tmpBuf,*len);
-				KviStr::freeBuffer(tmpBuf);
+				KviCString::freeBuffer(tmpBuf);
 			}
 		}
 		return true;
 	}
 
-	bool KviRijndaelBase64Engine::binaryToAscii(const char * inBuffer,int len,KviStr &outBuffer)
+	bool KviRijndaelBase64Engine::binaryToAscii(const char * inBuffer,int len,KviCString &outBuffer)
 	{
 		outBuffer.bufferToBase64(inBuffer,len);
 		return true;
@@ -292,7 +292,7 @@
 
 	bool KviRijndaelBase64Engine::asciiToBinary(const char * inBuffer,int * len,char ** outBuffer)
 	{
-		KviStr base64(inBuffer);
+		KviCString base64(inBuffer);
 		char * tmpBuf;
 		*len = base64.base64ToBuffer(&tmpBuf,false);
 		if(*len < 0)
@@ -302,9 +302,9 @@
 		} else {
 			if(len > 0)
 			{
-				*outBuffer = (char *)kvi_malloc(*len);
+				*outBuffer = (char *)KviMemory::allocate(*len);
 				kvi_memmove(*outBuffer,tmpBuf,*len);
-				KviStr::freeBuffer(tmpBuf);
+				KviCString::freeBuffer(tmpBuf);
 			}
 		}
 		return true;
@@ -382,8 +382,8 @@
 				return false;
 			}
 		}
-		m_szEncryptKey = KviStr(encKey,encKeyLen);
-		m_szDecryptKey = KviStr(decKey,decKeyLen);
+		m_szEncryptKey = KviCString(encKey,encKeyLen);
+		m_szDecryptKey = KviCString(decKey,decKeyLen);
 		if(kvi_strEqualCIN("cbc:",m_szEncryptKey.ptr(),4) && (m_szEncryptKey.len() > 4))
 			m_szEncryptKey.cutLeft(4);
 		else
@@ -395,9 +395,9 @@
 		return true;
 	}
 
-	KviCryptEngine::EncryptResult KviMircryptionEngine::encrypt(const char * plainText,KviStr &outBuffer)
+	KviCryptEngine::EncryptResult KviMircryptionEngine::encrypt(const char * plainText,KviCString &outBuffer)
 	{
-		KviStr szPlain = plainText;
+		KviCString szPlain = plainText;
 		outBuffer = "";
 		if(m_bEncryptCBC)
 		{
@@ -421,10 +421,10 @@
 		return KviCryptEngine::Encrypted;
 	}
 
-	KviCryptEngine::DecryptResult KviMircryptionEngine::decrypt(const char * inBuffer,KviStr &plainText)
+	KviCryptEngine::DecryptResult KviMircryptionEngine::decrypt(const char * inBuffer,KviCString &plainText)
 	{
 		plainText = "";
-		KviStr szIn = inBuffer;
+		KviCString szIn = inBuffer;
 		// various old versions
 		if(kvi_strEqualCSN(inBuffer,"mcps ",5))
 			szIn.cutLeft(5);
@@ -459,7 +459,7 @@
 			idx = szIn.findFirstIdx(MCPS2_ENDTAG);
 			if(idx != -1)
 			{
-				KviStr toDecrypt = szIn.left(idx);
+				KviCString toDecrypt = szIn.left(idx);
 				if(!doDecrypt(toDecrypt,plainText))return false;
 			}
 			szIn.cutLeft(idx + len2);
@@ -500,7 +500,7 @@
 		}
 	}
 
-	bool KviMircryptionEngine::doEncryptECB(KviStr &plain,KviStr &encoded)
+	bool KviMircryptionEngine::doEncryptECB(KviCString &plain,KviCString &encoded)
 	{
 		// make sure it is a multiple of 8 bytes (eventually pad with zeroes)
 		if(plain.len() % 8)
@@ -514,7 +514,7 @@
 
 		//byteswap_buffer((unsigned char *)plain.ptr(),plain.len());
 
-		unsigned char * out =(unsigned char *)kvi_malloc(plain.len()); // we use this to avoid endiannes problems
+		unsigned char * out =(unsigned char *)KviMemory::allocate(plain.len()); // we use this to avoid endiannes problems
 
 		BlowFish bf((unsigned char *)m_szEncryptKey.ptr(),m_szEncryptKey.len());
 		bf.ResetChain();
@@ -552,11 +552,11 @@
 			*p++ = fake_base64[*dd1 & 0x3f];
 		}
 
-		kvi_free(out);
+		KviMemory::free(out);
 		return true;
 	}
 
-	bool KviMircryptionEngine::doDecryptECB(KviStr &encoded,KviStr &plain)
+	bool KviMircryptionEngine::doDecryptECB(KviCString &encoded,KviCString &plain)
 	{
 		// encoded is in this strange base64...
 		// make sure its length is multiple of 12 (eventually pad with zeroes)
@@ -573,7 +573,7 @@
 		// and stuff 6 bytes at a time into a 32 bit long...
 		int ll = (encoded.len() * 2) / 3;
 
-		unsigned char * buf = (unsigned char *)kvi_malloc(ll);
+		unsigned char * buf = (unsigned char *)KviMemory::allocate(ll);
 		unsigned char * p = (unsigned char *)encoded.ptr();
 		unsigned char * e = p + encoded.len();
 		int i;
@@ -600,12 +600,12 @@
 
 		//byteswap_buffer((unsigned char *)plain.ptr(),ll);
 
-		kvi_free(buf);
+		KviMemory::free(buf);
 
 		return true;
 	}
 
-	bool KviMircryptionEngine::doEncryptCBC(KviStr &plain,KviStr &encoded)
+	bool KviMircryptionEngine::doEncryptCBC(KviCString &plain,KviCString &encoded)
 	{
 		// make sure it is a multiple of 8 bytes (eventually pad with zeroes)
 		if(plain.len() % 8)
@@ -618,7 +618,7 @@
 		}
 
 		int ll = plain.len() + 8;
-		unsigned char * in = (unsigned char *)kvi_malloc(ll);
+		unsigned char * in = (unsigned char *)KviMemory::allocate(ll);
 
 		// choose an IV
 		static bool bDidInit = false;
@@ -636,21 +636,21 @@
 		kvi_fastmove(in+8,plain.ptr(),plain.len());
 
 		// encrypt
-		unsigned char * out = (unsigned char *)kvi_malloc(ll);
+		unsigned char * out = (unsigned char *)KviMemory::allocate(ll);
 		BlowFish bf((unsigned char *)m_szEncryptKey.ptr(),m_szEncryptKey.len());
 		bf.ResetChain();
 		bf.Encrypt(in,out,ll,BlowFish::CBC);
-		kvi_free(in);
+		KviMemory::free(in);
 
 		encoded.bufferToBase64((const char *)out,ll);
-		kvi_free(out);
+		KviMemory::free(out);
 
 		encoded.prepend('*'); // prepend the signature
 
 		return true;
 	}
 
-	bool KviMircryptionEngine::doDecryptCBC(KviStr &encoded,KviStr &plain)
+	bool KviMircryptionEngine::doDecryptCBC(KviCString &encoded,KviCString &plain)
 	{
 		if(*(encoded.ptr()) != '*')
 		{
@@ -669,7 +669,7 @@
 		if((len < 8) || (len % 8))
 		{
 			setLastError(__tr2qs("The message doesn't seem to be encoded with CBC Mircryption"));
-			if(len > 0)KviStr::freeBuffer(tmpBuf);
+			if(len > 0)KviCString::freeBuffer(tmpBuf);
 			return false;
 		}
 
@@ -681,7 +681,7 @@
 		// kill the first 8 bytes (random IV)
 		plain.cutLeft(8);
 
-		KviStr::freeBuffer(tmpBuf);
+		KviCString::freeBuffer(tmpBuf);
 
 		return true;
 	}
diff --git a/src/modules/rijndael/libkvirijndael.h b/src/modules/rijndael/libkvirijndael.h
index f6ef1ae14..e09240b2d 100644
--- a/src/modules/rijndael/libkvirijndael.h
+++ b/src/modules/rijndael/libkvirijndael.h
@@ -7,7 +7,7 @@
 //
 //   This file is part of the KVirc irc client distribution
 //   Copyright (C) 2000 Till Bush (buti@geocities.com)
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -29,7 +29,7 @@
 
 #ifdef COMPILE_CRYPT_SUPPORT
 
-	#include "kvi_crypt.h"
+	#include "KviCryptEngine.h"
 	#include "rijndael.h"
 
 	class KviRijndaelEngine : public KviCryptEngine
@@ -43,10 +43,10 @@
 		Rijndael * m_pDecryptCipher;
 	public:
 		virtual bool init(const char *encKey,int encKeyLen,const char *decKey,int decKeyLen);
-		virtual KviCryptEngine::EncryptResult encrypt(const char * plainText,KviStr &outBuffer);
-		virtual KviCryptEngine::DecryptResult decrypt(const char * inBuffer,KviStr &plainText);
+		virtual KviCryptEngine::EncryptResult encrypt(const char * plainText,KviCString &outBuffer);
+		virtual KviCryptEngine::DecryptResult decrypt(const char * inBuffer,KviCString &plainText);
 	protected:
-		virtual bool binaryToAscii(const char *,int,KviStr &){ return false; };
+		virtual bool binaryToAscii(const char *,int,KviCString &){ return false; };
 		virtual bool asciiToBinary(const char *,int *,char **){ return false; };
 		virtual int getKeyLen(){ return 32; };
 		virtual Rijndael::KeyLength getKeyLenId(){ return Rijndael::Key32Bytes; };
@@ -61,7 +61,7 @@
 		KviRijndaelHexEngine() : KviRijndaelEngine() {};
 		virtual ~KviRijndaelHexEngine(){};
 	protected:
-		virtual bool binaryToAscii(const char * inBuffer,int len,KviStr &outBuffer);
+		virtual bool binaryToAscii(const char * inBuffer,int len,KviCString &outBuffer);
 		virtual bool asciiToBinary(const char * inBuffer,int * len,char ** outBuffer);
 	};
 
@@ -104,7 +104,7 @@
 		KviRijndaelBase64Engine() : KviRijndaelEngine() {};
 		virtual ~KviRijndaelBase64Engine(){};
 	protected:
-		virtual bool binaryToAscii(const char * inBuffer,int len,KviStr &outBuffer);
+		virtual bool binaryToAscii(const char * inBuffer,int len,KviCString &outBuffer);
 		virtual bool asciiToBinary(const char * inBuffer,int * len,char ** outBuffer);
 	};
 
@@ -151,20 +151,20 @@
 		KviMircryptionEngine();
 		~KviMircryptionEngine();
 	protected:
-		KviStr m_szEncryptKey;
+		KviCString m_szEncryptKey;
 		bool m_bEncryptCBC;
-		KviStr m_szDecryptKey;
+		KviCString m_szDecryptKey;
 		bool m_bDecryptCBC;
 	public:
 		virtual bool isCryptographicEngine(){ return false; }; // we need to return false since it doesn't use the Qt::CTRL+P escape
 		virtual bool init(const char *encKey,int encKeyLen,const char *decKey,int decKeyLen);
-		virtual KviCryptEngine::EncryptResult encrypt(const char * plainText,KviStr &outBuffer);
-		virtual KviCryptEngine::DecryptResult decrypt(const char * inBuffer,KviStr &plainText);
+		virtual KviCryptEngine::EncryptResult encrypt(const char * plainText,KviCString &outBuffer);
+		virtual KviCryptEngine::DecryptResult decrypt(const char * inBuffer,KviCString &plainText);
 	protected:
-		bool doDecryptECB(KviStr &encoded,KviStr &plain);
-		bool doDecryptCBC(KviStr &encoded,KviStr &plain);
-		bool doEncryptECB(KviStr &plain,KviStr &encoded);
-		bool doEncryptCBC(KviStr &plain,KviStr &encoded);
+		bool doDecryptECB(KviCString &encoded,KviCString &plain);
+		bool doDecryptCBC(KviCString &encoded,KviCString &plain);
+		bool doEncryptECB(KviCString &plain,KviCString &encoded);
+		bool doEncryptCBC(KviCString &plain,KviCString &encoded);
 	};
 
 #endif // COMPILE_CRYPT_SUPPORT
diff --git a/src/modules/rijndael/libkvirijndael_cryptopp.cpp b/src/modules/rijndael/libkvirijndael_cryptopp.cpp
index b1d25c11c..51a8ae4ec 100644
--- a/src/modules/rijndael/libkvirijndael_cryptopp.cpp
+++ b/src/modules/rijndael/libkvirijndael_cryptopp.cpp
@@ -27,9 +27,9 @@
 
 #include "kvi_module.h"
 #include "kvi_debug.h"
-#include "kvi_locale.h"
-#include "kvi_mirccntrl.h"
-#include "kvi_pointerlist.h"
+#include "KviLocale.h"
+#include "KviMircCntrl.h"
+#include "KviPointerList.h"
 
 #include <cryptopp/aes.h>
 #include <cryptopp/blowfish.h>
@@ -129,7 +129,7 @@ bool KviRijndaelEngine::init(const char * pcEncKey, int iEncKeyLen, const char *
 		return true;
 }
 
-KviCryptEngine::EncryptResult KviRijndaelEngine::encrypt(const char * pcPlainText, KviStr & szOutBuffer)
+KviCryptEngine::EncryptResult KviRijndaelEngine::encrypt(const char * pcPlainText, KviCString & szOutBuffer)
 {
 	std::string szCipher;
 	// byte is a typedef by Crypto++ for unsigned char.
@@ -186,7 +186,7 @@ KviCryptEngine::EncryptResult KviRijndaelEngine::encrypt(const char * pcPlainTex
 	return KviCryptEngine::Encrypted;
 }
 
-KviCryptEngine::DecryptResult KviRijndaelEngine::decrypt(const char * pcInBuffer, KviStr & szPlainText)
+KviCryptEngine::DecryptResult KviRijndaelEngine::decrypt(const char * pcInBuffer, KviCString & szPlainText)
 {
 	std::string szPlain;
 	byte key[m_szDecKey.size()],iv[CryptoPP::AES::BLOCKSIZE];
@@ -347,7 +347,7 @@ bool KviMircryptionEngine::init(const char * pcEncKey, int iEncKeyLen, const cha
 	return true;
 }
 
-KviCryptEngine::EncryptResult KviMircryptionEngine::encrypt(const char * pcPlainText, KviStr & szOutBuffer)
+KviCryptEngine::EncryptResult KviMircryptionEngine::encrypt(const char * pcPlainText, KviCString & szOutBuffer)
 {
 	std::string szCipher;
 	byte key[m_szEncKey.size()], iv[CryptoPP::Blowfish::BLOCKSIZE];
@@ -399,7 +399,7 @@ KviCryptEngine::EncryptResult KviMircryptionEngine::encrypt(const char * pcPlain
 	return KviCryptEngine::Encrypted;
 }
 
-KviCryptEngine::DecryptResult KviMircryptionEngine::decrypt(const char * pcInBuffer, KviStr & szPlainText)
+KviCryptEngine::DecryptResult KviMircryptionEngine::decrypt(const char * pcInBuffer, KviCString & szPlainText)
 {
 	std::string szPlain;
 	std::string szIn = pcInBuffer;
@@ -603,7 +603,7 @@ KVIRC_MODULE(
 	"Rijndael crypt engine",
 	"4.0.1",
 	"Copyright ©      2009 Kai Wasserbäch <debian@carbon-project.org>" \
-	"          © 2000-2008 Szymon Stefanek <pragma at kvirc dot net>",
+	"          © 2000-2010 Szymon Stefanek <pragma at kvirc dot net>",
 	"Exports the rijndael crypt engine",
 	rijndael_module_init,
 	rijndael_module_can_unload,
diff --git a/src/modules/rijndael/libkvirijndael_cryptopp.h b/src/modules/rijndael/libkvirijndael_cryptopp.h
index a6f301523..dc6bfc008 100644
--- a/src/modules/rijndael/libkvirijndael_cryptopp.h
+++ b/src/modules/rijndael/libkvirijndael_cryptopp.h
@@ -28,7 +28,7 @@
 #include "kvi_settings.h"
 
 //base class
-#include "kvi_crypt.h"
+#include "KviCryptEngine.h"
 
 // class definitions for the libcrypto++ case
 #include <cryptopp/aes.h>
@@ -55,8 +55,8 @@ private:
 	std::string m_szDecKey;
 public:
 	virtual bool init(const char * pcEncKey, int iEncKeyLen, const char * pcDecKey, int iDecKeyLen);
-	virtual KviCryptEngine::EncryptResult encrypt(const char * pcPlainText, KviStr & szOutBuffer);
-	virtual KviCryptEngine::DecryptResult decrypt(const char * pcInBuffer, KviStr & szPlainText);
+	virtual KviCryptEngine::EncryptResult encrypt(const char * pcPlainText, KviCString & szOutBuffer);
+	virtual KviCryptEngine::DecryptResult decrypt(const char * pcInBuffer, KviCString & szPlainText);
 };
 
 class KviRijndael128HexEngine : public KviRijndaelEngine
@@ -134,8 +134,8 @@ public:
 	~KviMircryptionEngine();
 	
 	virtual bool init(const char * pcEncKey, int iEncKeyLen, const char * pcDecKey, int iDecKeyLen);
-	virtual KviCryptEngine::EncryptResult encrypt(const char * pcPlainText, KviStr & szOutBuffer);
-	virtual KviCryptEngine::DecryptResult decrypt(const char * pcInBuffer, KviStr & szPlainText);
+	virtual KviCryptEngine::EncryptResult encrypt(const char * pcPlainText, KviCString & szOutBuffer);
+	virtual KviCryptEngine::DecryptResult decrypt(const char * pcInBuffer, KviCString & szPlainText);
 private:
 	std::string m_szEncKey;
 	std::string m_szDecKey;
diff --git a/src/modules/rijndael/rijndael.cpp b/src/modules/rijndael/rijndael.cpp
index 59e42debe..9546f4cfa 100644
--- a/src/modules/rijndael/rijndael.cpp
+++ b/src/modules/rijndael/rijndael.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Sun Nov 5 2000 03:22:10 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
diff --git a/src/modules/rijndael/rijndael.h b/src/modules/rijndael/rijndael.h
index caeda9e9e..e1543eea4 100644
--- a/src/modules/rijndael/rijndael.h
+++ b/src/modules/rijndael/rijndael.h
@@ -6,7 +6,7 @@
 //   Creation date : Sun Nov 5 2000 15:42:14 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
diff --git a/src/modules/rot13/libkvirot13.cpp b/src/modules/rot13/libkvirot13.cpp
index bc9c894bf..556ef957d 100644
--- a/src/modules/rot13/libkvirot13.cpp
+++ b/src/modules/rot13/libkvirot13.cpp
@@ -5,7 +5,7 @@
 //
 //   This file is part of the KVirc irc client distribution
 //   Copyright (C) 2009 Aeriana (aeriana at quasarnet dot org)
-//   Copyright (C) 2002-2009 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2002-2010 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
@@ -27,7 +27,7 @@
 
 #include "kvi_module.h"
 #include "kvi_debug.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 
 
 
@@ -48,9 +48,9 @@
 #ifdef COMPILE_CRYPT_SUPPORT
 
 	#include "kvi_memmove.h"
-	#include "kvi_malloc.h"
+	#include "KviMemory.h"
 
-	#include "kvi_pointerlist.h"
+	#include "KviPointerList.h"
 
 	static KviPointerList<KviCryptEngine> * g_pEngineList = 0;
 
@@ -70,7 +70,7 @@
 		return true;
 	}
 
-	KviCryptEngine::EncryptResult KviRot13Engine::encrypt(const char * plainText,KviStr &outBuffer)
+	KviCryptEngine::EncryptResult KviRot13Engine::encrypt(const char * plainText,KviCString &outBuffer)
 	{
 		outBuffer = plainText;
 		unsigned char * aux = (unsigned char *)outBuffer.ptr();
@@ -90,7 +90,7 @@
 		return KviCryptEngine::Encoded;
 	}
 
-	KviCryptEngine::DecryptResult KviRot13Engine::decrypt(const char * inBuffer,KviStr &plainText)
+	KviCryptEngine::DecryptResult KviRot13Engine::decrypt(const char * inBuffer,KviCString &plainText)
 	{
 		plainText = inBuffer;
 		return KviCryptEngine::DecryptOkWasPlainText;
diff --git a/src/modules/rot13/libkvirot13.h b/src/modules/rot13/libkvirot13.h
index 44133f7e8..572db0b0f 100644
--- a/src/modules/rot13/libkvirot13.h
+++ b/src/modules/rot13/libkvirot13.h
@@ -29,7 +29,7 @@
 
 #ifdef COMPILE_CRYPT_SUPPORT
 
-	#include "kvi_crypt.h"
+	#include "KviCryptEngine.h"
 
 	class KviRot13Engine : public KviCryptEngine
 	{
@@ -39,8 +39,8 @@
 		~KviRot13Engine();
 	public:
 		virtual bool init(const char *encKey,int encKeyLen,const char *decKey,int decKeyLen);
-		virtual KviCryptEngine::EncryptResult encrypt(const char * plainText,KviStr &outBuffer);
-		virtual KviCryptEngine::DecryptResult decrypt(const char * inBuffer,KviStr &plainText);
+		virtual KviCryptEngine::EncryptResult encrypt(const char * plainText,KviCString &outBuffer);
+		virtual KviCryptEngine::DecryptResult decrypt(const char * inBuffer,KviCString &plainText);
 	};
 
 #endif // COMPILE_CRYPT_SUPPORT
diff --git a/src/modules/serverdb/libkviserverdb.cpp b/src/modules/serverdb/libkviserverdb.cpp
index 6a73b11cd..76f1014f6 100644
--- a/src/modules/serverdb/libkviserverdb.cpp
+++ b/src/modules/serverdb/libkviserverdb.cpp
@@ -24,9 +24,9 @@
 
 #include "kvi_module.h"
 #include "kvi_app.h"
-#include "kvi_locale.h"
-#include "kvi_ircserver.h"
-#include "kvi_ircserverdb.h"
+#include "KviLocale.h"
+#include "KviIrcServer.h"
+#include "KviIrcServerDataBase.h"
 
 #include <QString>
 
diff --git a/src/modules/setup/libkvisetup.cpp b/src/modules/setup/libkvisetup.cpp
index ec01aba18..19df1bc3f 100644
--- a/src/modules/setup/libkvisetup.cpp
+++ b/src/modules/setup/libkvisetup.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Sat Oct  6 02:08:24 2001 GMT 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-2010 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
@@ -32,7 +32,7 @@
 #include "kvi_kvs_variantlist.h"
 #include "kvi_window.h"
 #include "kvi_theme.h"
-#include "kvi_ircserverdb.h"
+#include "KviIrcServerDataBase.h"
 
 #include <QString>
 #include <QFile>
diff --git a/src/modules/setup/setupwizard.cpp b/src/modules/setup/setupwizard.cpp
index 68d9f5f2d..2a14b5291 100644
--- a/src/modules/setup/setupwizard.cpp
+++ b/src/modules/setup/setupwizard.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Sat Oct  6 02:06:53 2001 GMT 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-2010 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
@@ -27,15 +27,15 @@ bool g_bFoundMirc;
 #include "setupwizard.h"
 
 #include "kvi_app.h"
-#include "kvi_locale.h"
-#include "kvi_fileutils.h"
+#include "KviLocale.h"
+#include "KviFileUtils.h"
 #include "kvi_defaults.h"
 #include "kvi_msgbox.h"
 #include "kvi_tal_filedialog.h"
-#include "kvi_qstring.h"
-#include "kvi_env.h"
+#include "KviQString.h"
+#include "KviEnvironment.h"
 #include "kvi_options.h"
-#include "kvi_config.h"
+#include "KviConfigurationFile.h"
 #include "kvi_tal_hbox.h"
 
 #include <QTextEdit>
@@ -324,7 +324,7 @@ KviSetupWizard::KviSetupWizard()
 		"You will be able to change it later in the Identity properties, or with the /NICK command."));
 
 	QString nick;
-	char * nnn = kvi_getenv("USER");
+	char * nnn = KviEnvironment::getVariable("USER");
 	if(nnn)nick = nnn;
 	else nick = "newbie";
 	if(nick.isEmpty())nick = "newbie";
@@ -562,7 +562,7 @@ KviSetupWizard::KviSetupWizard()
 	g_pApp->getGlobalKvircDirectory(szTmp,KviApp::Config,"preinstalled.kvc");
 	if(KviFileUtils::fileExists(szTmp))
 	{
-		KviConfig cfg(szTmp,KviConfig::Read);
+		KviConfigurationFile cfg(szTmp,KviConfigurationFile::Read);
 		cfg.setGroup("Setup");
 		if(cfg.readBoolEntry("hideServerList",FALSE))
 		{
@@ -616,7 +616,7 @@ KviSetupWizard::KviSetupWizard()
 				szMircIni = szMircDir + "/pirc.ini";
 
 			if(KviFileUtils::fileExists(szMircIni)){
-				KviConfig cfg(szMircIni,KviConfig::Read,true);
+				KviConfigurationFile cfg(szMircIni,KviConfigurationFile::Read,true);
 				if(cfg.hasGroup("mirc"))
 				{
 					g_bFoundMirc = true;
diff --git a/src/modules/setup/setupwizard.h b/src/modules/setup/setupwizard.h
index b98a7be63..f2d0fdd71 100644
--- a/src/modules/setup/setupwizard.h
+++ b/src/modules/setup/setupwizard.h
@@ -6,7 +6,7 @@
 //   Creation date : Sat Oct  6 02:06:51 2001 GMT 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-2010 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
@@ -25,7 +25,7 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_string.h"
+#include "KviCString.h"
 #include "kvi_selectors.h"
 #include "kvi_tal_wizard.h"
 #include "kvi_tal_vbox.h"
diff --git a/src/modules/sharedfile/libkvisharedfile.cpp b/src/modules/sharedfile/libkvisharedfile.cpp
index 483c93f93..cac76532c 100644
--- a/src/modules/sharedfile/libkvisharedfile.cpp
+++ b/src/modules/sharedfile/libkvisharedfile.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Wed Sep 27 2000 20:59:02 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -23,15 +23,15 @@
 //=============================================================================
 
 #include "kvi_module.h"
-#include "kvi_sharedfiles.h"
-#include "kvi_ircmask.h"
-#include "kvi_fileutils.h"
-#include "kvi_locale.h"
+#include "KviSharedFilesManager.h"
+#include "KviIrcMask.h"
+#include "KviFileUtils.h"
+#include "KviLocale.h"
 #include "kvi_out.h"
-#include "kvi_mirccntrl.h"
+#include "KviMircCntrl.h"
 #include "kvi_window.h"
 #include "kvi_frame.h"
-#include "kvi_pointerhashtable.h"
+#include "KviPointerHashTable.h"
 
 #include <time.h>
 
diff --git a/src/modules/sharedfileswindow/libkvisharedfileswindow.cpp b/src/modules/sharedfileswindow/libkvisharedfileswindow.cpp
index adbcd9309..7a86a79b3 100644
--- a/src/modules/sharedfileswindow/libkvisharedfileswindow.cpp
+++ b/src/modules/sharedfileswindow/libkvisharedfileswindow.cpp
@@ -3,7 +3,7 @@
 //   File : libkvisharedfileswindow.cpp
 //   Creation date : Mon Apr 21 2003 23:14:12 CEST by Szymon Stefanek
 //
-//   Copyright (C) 2003-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2003-2010 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
@@ -27,7 +27,7 @@
 #include "kvi_app.h"
 #include "kvi_frame.h"
 #include "kvi_window.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_iconmanager.h"
 
 #include <QSplitter>
diff --git a/src/modules/sharedfileswindow/sharedfileswindow.cpp b/src/modules/sharedfileswindow/sharedfileswindow.cpp
index 4ea3f7e52..6027be480 100644
--- a/src/modules/sharedfileswindow/sharedfileswindow.cpp
+++ b/src/modules/sharedfileswindow/sharedfileswindow.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Mon Apr 21 2003 23:14:12 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2003-2010 Szymon Stefanek (pragma at kvirc dot net)
 //
 //   This program is FREE software. You can redistribute it and/or
 //   modify it under the linkss of the GNU General Public License
@@ -29,9 +29,9 @@
 #include "kvi_ircview.h"
 #include "kvi_out.h"
 #include "kvi_options.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_out.h"
-#include "kvi_mirccntrl.h"
+#include "KviMircCntrl.h"
 #include "kvi_themedlabel.h"
 #include "kvi_input.h"
 #include "kvi_filedialog.h"
diff --git a/src/modules/sharedfileswindow/sharedfileswindow.h b/src/modules/sharedfileswindow/sharedfileswindow.h
index 31a67019d..2693d54b2 100644
--- a/src/modules/sharedfileswindow/sharedfileswindow.h
+++ b/src/modules/sharedfileswindow/sharedfileswindow.h
@@ -6,7 +6,7 @@
 //   Creation date : Mon Apr 21 2003 23:14:12 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2003-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2003-2010 Szymon Stefanek (pragma at kvirc dot net)
 //
 //   This program is FREE software. You can redistribute it and/or
 //   modify it under the linkss of the GNU General Public License
@@ -25,11 +25,11 @@
 //=============================================================================
 
 #include "kvi_window.h"
-#include "kvi_string.h"
+#include "KviCString.h"
 #include "kvi_sparser.h"
 #include "kvi_console.h"
 #include "kvi_moduleextension.h"
-#include "kvi_sharedfiles.h"
+#include "KviSharedFilesManager.h"
 #include <QTreeWidget>
 
 #include <QDialog>
diff --git a/src/modules/snd/libkvisnd.cpp b/src/modules/snd/libkvisnd.cpp
index 5c2863f1e..f8ca68195 100644
--- a/src/modules/snd/libkvisnd.cpp
+++ b/src/modules/snd/libkvisnd.cpp
@@ -5,7 +5,7 @@
 //
 //   This file is part of the KVirc irc client distribution
 //   Copyright (C) 2002 Juanjo Alvarez (juanjux at yahoo dot es)
-//   Copyright (C) 2002-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2002-2010 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
@@ -27,12 +27,12 @@
 
 #include "kvi_module.h"
 #include "kvi_debug.h"
-#include "kvi_fileutils.h"
-#include "kvi_malloc.h"
+#include "KviFileUtils.h"
+#include "KviMemory.h"
 #include "kvi_window.h"
 #include "kvi_out.h"
-#include "kvi_locale.h"
-#include "kvi_qstring.h"
+#include "KviLocale.h"
+#include "KviQString.h"
 
 #include <QSound>
 
@@ -496,7 +496,7 @@ void KviSoundThread::run()
 
 				frameSize = afGetVirtualFrameSize(file, AF_DEFAULT_TRACK, 1);
 				channelCount = afGetVirtualChannels(file, AF_DEFAULT_TRACK);
-				buffer = kvi_malloc(int(BUFFER_FRAMES * frameSize));
+				buffer = KviMemory::allocate(int(BUFFER_FRAMES * frameSize));
 
 				int audiofd_c = open("/dev/dsp", O_WRONLY /*| O_EXCL | O_NDELAY*/);
 
@@ -547,7 +547,7 @@ void KviSoundThread::run()
 				audiofd.close();
 				if(audiofd_c >= 0)close(audiofd_c);
 				afCloseFile(file);
-				kvi_free(buffer);
+				KviMemory::free(buffer);
 			}
 		#endif //COMPILE_AUDIOFILE_SUPPORT
 
diff --git a/src/modules/snd/libkvisnd.h b/src/modules/snd/libkvisnd.h
index 3ef26665f..7e5778abf 100644
--- a/src/modules/snd/libkvisnd.h
+++ b/src/modules/snd/libkvisnd.h
@@ -7,7 +7,7 @@
 //
 //   This file is part of the KVirc irc client distribution
 //   Copyright (C) 2002 Juanjo Alvarez (juanjux at yahoo dot es)
-//   Copyright (C) 2002-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2002-2010 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
@@ -26,11 +26,11 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_pointerlist.h"
-#include "kvi_pointerhashtable.h"
+#include "KviPointerList.h"
+#include "KviPointerHashTable.h"
 #include "kvi_options.h"
-#include "kvi_thread.h"
-#include "kvi_string.h"
+#include "KviThread.h"
+#include "KviCString.h"
 
 #include <QObject>
 
diff --git a/src/modules/socketspy/libkvisocketspy.cpp b/src/modules/socketspy/libkvisocketspy.cpp
index 745fde737..d11f31c70 100644
--- a/src/modules/socketspy/libkvisocketspy.cpp
+++ b/src/modules/socketspy/libkvisocketspy.cpp
@@ -3,7 +3,7 @@
 //   File : libkvisocketspy.cpp
 //   Creation date : Sun Nov 26 2000 13:05:00 CEST by Szymon Stefanek
 //
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -26,7 +26,7 @@
 #include "kvi_module.h"
 #include "kvi_frame.h"
 #include "kvi_window.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 
 #include <QSplitter>
 
diff --git a/src/modules/socketspy/socketspywindow.cpp b/src/modules/socketspy/socketspywindow.cpp
index 4feeb2ebe..113ac3a06 100644
--- a/src/modules/socketspy/socketspywindow.cpp
+++ b/src/modules/socketspy/socketspywindow.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Thu Aug 31 2000 15:02:22 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 Szymon Stefanek (pragma at kvirc dot net)
 //
 //   This program is FREE software. You can redistribute it and/or
 //   modify it under the socketspys of the GNU General Public License
@@ -28,7 +28,7 @@
 #include "kvi_ircview.h"
 #include "kvi_out.h"
 #include "kvi_options.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_console.h"
 //#include "kvi_module.h"
 
diff --git a/src/modules/socketspy/socketspywindow.h b/src/modules/socketspy/socketspywindow.h
index c0da5d638..38e32374c 100644
--- a/src/modules/socketspy/socketspywindow.h
+++ b/src/modules/socketspy/socketspywindow.h
@@ -6,7 +6,7 @@
 //   Creation date : Sun Nov 26 2000 13:13:00 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 Szymon Stefanek (pragma at kvirc dot net)
 //
 //   This program is FREE software. You can redistribute it and/or
 //   modify it under the socketspys of the GNU General Public License
@@ -25,7 +25,7 @@
 //=============================================================================
 
 #include "kvi_window.h"
-#include "kvi_string.h"
+#include "KviCString.h"
 #include "kvi_ircdatastreammonitor.h"
 
 class KviConsole;
diff --git a/src/modules/spaste/controller.cpp b/src/modules/spaste/controller.cpp
index 8a496d442..760efe227 100644
--- a/src/modules/spaste/controller.cpp
+++ b/src/modules/spaste/controller.cpp
@@ -5,7 +5,7 @@
 //
 //   This file is part of the KVirc irc client distribution
 //   Copyright (C) 2002 Juanjo �lvarez (juanjux@yahoo.es)
-//   Copyright (C) 2002-2008 Szymon Stefanek (kvirc@tin.it)
+//   Copyright (C) 2002-2010 Szymon Stefanek (kvirc@tin.it)
 //
 //   This program is FREE software. You can redistribute it and/or
 //   modify it under the terms of the GNU General Public License
@@ -27,7 +27,7 @@
 
 #include "kvi_window.h"
 #include "kvi_console.h"
-#include "kvi_mirccntrl.h"
+#include "KviMircCntrl.h"
 #include "kvi_app.h"
 #include "kvi_options.h"
 
diff --git a/src/modules/spaste/controller.h b/src/modules/spaste/controller.h
index 4fd3d2795..7d8925633 100644
--- a/src/modules/spaste/controller.h
+++ b/src/modules/spaste/controller.h
@@ -7,7 +7,7 @@
 //
 //   This file is part of the KVirc irc client distribution
 //   Copyright (C) 2002 Juanjo �lvarez (juanjux@yahoo.es)
-//   Copyright (C) 2002-2008 Szymon Stefanek (kvirc@tin.it)
+//   Copyright (C) 2002-2010 Szymon Stefanek (kvirc@tin.it)
 //
 //   This program is FREE software. You can redistribute it and/or
 //   modify it under the terms of the GNU General Public License
@@ -27,7 +27,7 @@
 
 
 #include "kvi_window.h"
-#include "kvi_string.h"
+#include "KviCString.h"
 
 #include <QObject>
 #include <QStringList>
@@ -40,7 +40,7 @@ public:
 	SPasteController(KviWindow * w,int id);
 	~SPasteController();
 
-	//bool pasteFileInit(KviStr * fileName);
+	//bool pasteFileInit(KviCString * fileName);
 	bool pasteFileInit(QString &fileName);
 	bool pasteClipboardInit(void);
 	int getId(void){return m_pId;};
diff --git a/src/modules/spaste/libkvispaste.cpp b/src/modules/spaste/libkvispaste.cpp
index 5049167b6..01a8a9260 100644
--- a/src/modules/spaste/libkvispaste.cpp
+++ b/src/modules/spaste/libkvispaste.cpp
@@ -5,7 +5,7 @@
 //
 //   This file is part of the KVirc irc client distribution
 //   Copyright (C) 2002 Juanjo �lvarez (juanjux@yahoo.es)
-//   Copyright (C) 2002-2008 Szymon Stefanek (kvirc@tin.it)
+//   Copyright (C) 2002-2010 Szymon Stefanek (kvirc@tin.it)
 //
 //   This program is FREE software. You can redistribute it and/or
 //   modify it under the terms of the GNU General Public License
@@ -27,10 +27,10 @@
 #include "controller.h"
 
 #include "kvi_module.h"
-#include "kvi_fileutils.h"
-#include "kvi_qstring.h"
+#include "KviFileUtils.h"
+#include "KviQString.h"
 #include "kvi_app.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_console.h"
 #include "kvi_options.h"
 #include "kvi_out.h"
diff --git a/src/modules/spaste/libkvispaste.h b/src/modules/spaste/libkvispaste.h
index 37d1ff79c..1d5a07236 100644
--- a/src/modules/spaste/libkvispaste.h
+++ b/src/modules/spaste/libkvispaste.h
@@ -7,7 +7,7 @@
 //
 //   This file is part of the KVirc irc client distribution
 //   Copyright (C) 2002 Juanjo �lvarez (juanjux@yahoo.es)
-//   Copyright (C) 2002-2008 Szymon Stefanek (kvirc@tin.it)
+//   Copyright (C) 2002-2010 Szymon Stefanek (kvirc@tin.it)
 //
 //   This program is FREE software. You can redistribute it and/or
 //   modify it under the terms of the GNU General Public License
diff --git a/src/modules/str/libkvistr.cpp b/src/modules/str/libkvistr.cpp
index 5e07add17..8696709b3 100644
--- a/src/modules/str/libkvistr.cpp
+++ b/src/modules/str/libkvistr.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Thu Dec 27 2001 17:13:12 GMT by Szymon Stefanek
 //
 //   This str is part of the KVirc irc client distribution
-//   Copyright (C) 2001-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2001-2010 Szymon Stefanek (pragma at kvirc dot net)
 //   Copyright ©        2009 Kai Wasserbäch <debian@carbon-project.org>
 //
 //   This program is FREE software. You can redistribute it and/or
@@ -26,12 +26,12 @@
 //#warning: FIXME: Incomplete documentation ('seealso', 'example', etc)
 
 #include "kvi_module.h"
-#include "kvi_locale.h"
-#include "kvi_mirccntrl.h"
-#include "kvi_qstring.h"
+#include "KviLocale.h"
+#include "KviMircCntrl.h"
+#include "KviQString.h"
 #include "kvi_debug.h"
 #include "kvi_settings.h"
-#include "kvi_malloc.h"
+#include "KviMemory.h"
 #include "kvi_kvs_arraycast.h"
 #include "kvi_options.h"
 
@@ -1890,7 +1890,7 @@ static bool str_kvs_fnc_printf(KviKvsModuleFunctionCall * c)
 	{
 		int reallen = 0;
 		int allocsize = MEMINCREMENT;
-		QChar * buffer = (QChar *)kvi_malloc(sizeof(QChar) * allocsize);
+		QChar * buffer = (QChar *)KviMemory::allocate(sizeof(QChar) * allocsize);
 
 		//9999999999999999999999999999999\0
 		char numberBuffer[1024];
@@ -1905,14 +1905,14 @@ static bool str_kvs_fnc_printf(KviKvsModuleFunctionCall * c)
 	#define INCREMENT_MEM \
 		{ \
 			allocsize += MEMINCREMENT; \
-			buffer = (QChar *)kvi_realloc(buffer,sizeof(QChar) * allocsize); \
+			buffer = (QChar *)KviMemory::reallocate(buffer,sizeof(QChar) * allocsize); \
 			p = buffer + reallen; \
 		}
 
 	#define INCREMENT_MEM_BY(numchars) \
 		{ \
 			allocsize += numchars + MEMINCREMENT; \
-			buffer = (QChar *)kvi_realloc(buffer,sizeof(QChar) * allocsize); \
+			buffer = (QChar *)KviMemory::reallocate(buffer,sizeof(QChar) * allocsize); \
 			p = buffer + reallen; \
 		}
 
@@ -2175,7 +2175,7 @@ static bool str_kvs_fnc_printf(KviKvsModuleFunctionCall * c)
 		}
 
 		s.setUnicode(buffer,reallen);
-		kvi_free(buffer);
+		KviMemory::free(buffer);
 	}
 
 	c->returnValue()->setString(s);
@@ -2287,7 +2287,7 @@ static bool str_kvs_fnc_evpSign(KviKvsModuleFunctionCall * c)
 	}
 
 	len = EVP_PKEY_size(pKey);
-	sig = (unsigned char*)kvi_malloc(len*sizeof(char));
+	sig = (unsigned char*)KviMemory::allocate(len*sizeof(char));
 
 	EVP_SignInit(&md_ctx, EVP_sha1());
 	EVP_SignUpdate(&md_ctx, (unsigned char *)szMessage.data(), szMessage.length());
diff --git a/src/modules/system/libkvisystem.cpp b/src/modules/system/libkvisystem.cpp
index 7d0d4b5fb..3dfcb9f9e 100644
--- a/src/modules/system/libkvisystem.cpp
+++ b/src/modules/system/libkvisystem.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Fri Nov 16 03:50:12 2001 GMT by Szymon Stefanek
 //
 //   This system is part of the KVirc irc client distribution
-//   Copyright (C) 2001-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2001-2010 Szymon Stefanek (pragma at kvirc dot net)
 //   Copyright ©        2009 Kai Wasserbäch <debian@carbon-project.org>
 //
 //   This program is FREE software. You can redistribute it and/or
@@ -27,12 +27,12 @@
 
 #include "kvi_settings.h"
 #include "kvi_module.h"
-#include "kvi_string.h"
-#include "kvi_thread.h"
-#include "kvi_locale.h"
+#include "KviCString.h"
+#include "KviThread.h"
+#include "KviLocale.h"
 #include "kvi_app.h"
-#include "kvi_env.h"
-#include "kvi_osinfo.h"
+#include "KviEnvironment.h"
+#include "KviOsInfo.h"
 #include "kvi_modulemanager.h"
 
 #include <QClipboard>
@@ -212,7 +212,7 @@ static bool system_kvs_fnc_getenv(KviKvsModuleFunctionCall *c)
 	c->returnValue()->setString(env.isEmpty() ? QString::fromLocal8Bit(env) : QString::fromLocal8Bit(def));
 #else
 */
-	char * b = kvi_getenv(szVar.data());
+	char * b = KviEnvironment::getVariable(szVar.data());
 	c->returnValue()->setString(b ? QString::fromLocal8Bit(b) : QString());
 //#endif
 	return true;
@@ -492,7 +492,7 @@ static bool system_kvs_fnc_dbus(KviKvsModuleFunctionCall *c)
 
 	for ( QStringList::Iterator it = parms.begin(); it != parms.end(); ++it )
 	{
-		KviStr tmp = *it;
+		KviCString tmp = *it;
 
 		if(tmp.isEmpty())
 		{
@@ -500,7 +500,7 @@ static bool system_kvs_fnc_dbus(KviKvsModuleFunctionCall *c)
 			return false;
 		}
 
-		KviStr szType = tmp.leftToFirst('=',false);
+		KviCString szType = tmp.leftToFirst('=',false);
 		tmp.cutToFirst('=',true);
 		if(szType.isEmpty())szType = "int";
 		bool bOk;
@@ -630,7 +630,7 @@ static bool system_kvs_cmd_setenv(KviKvsModuleCommandCall * c)
 	QByteArray szVar = szVariable.toLocal8Bit();
 	QByteArray szVal = szValue.toLocal8Bit();
 
-	if(szVal.isEmpty())kvi_unsetenv(szVar.data());
+	if(szVal.isEmpty())KviEnvironment::unsetVariable(szVar.data());
 	else
 	{
 /*#ifdef COMPILE_ON_WINDOWS
@@ -639,8 +639,8 @@ static bool system_kvs_cmd_setenv(KviKvsModuleCommandCall * c)
 		Var			=	szVal.data();
 		VarAndVal	=	Var+"="+Val;
 		putenv(VarAndVal);
-#else*/ // <-- this stuff is implicit in kvi_setenv: that's why we have the kvi_ version.
-		kvi_setenv(szVar.data(),szVal.data());
+#else*/ // <-- this stuff is implicit in KviEnvironment::setVariable: that's why we have the kvi_ version.
+		KviEnvironment::setVariable(szVar.data(),szVal.data());
 /*#endif*/
 	}
 	return true;
diff --git a/src/modules/system/plugin.cpp b/src/modules/system/plugin.cpp
index 15f331396..b06c1c163 100644
--- a/src/modules/system/plugin.cpp
+++ b/src/modules/system/plugin.cpp
@@ -25,11 +25,11 @@
 #include "plugin.h"
 
 #include "kvi_module.h"
-#include "kvi_string.h"
-#include "kvi_thread.h"
-#include "kvi_locale.h"
+#include "KviCString.h"
+#include "KviThread.h"
+#include "KviLocale.h"
 #include "kvi_app.h"
-#include "kvi_fileutils.h"
+#include "KviFileUtils.h"
 
 #include <QDir>
 #include <QFileInfo>
diff --git a/src/modules/system/plugin.h b/src/modules/system/plugin.h
index 0ff3c9baa..8f435353e 100644
--- a/src/modules/system/plugin.h
+++ b/src/modules/system/plugin.h
@@ -26,7 +26,7 @@
 //=============================================================================
 
 #include "kvi_module.h"
-#include "kvi_pointerhashtable.h"
+#include "KviPointerHashTable.h"
 #include <QLibrary>
 
 typedef int (*plugin_function)(int argc, char* argv[], char ** buffer);
diff --git a/src/modules/term/libkviterm.cpp b/src/modules/term/libkviterm.cpp
index 8f1260c2c..851715b5f 100644
--- a/src/modules/term/libkviterm.cpp
+++ b/src/modules/term/libkviterm.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Wed Aug 30 2000 15:29:02 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -26,7 +26,7 @@
 #include "kvi_module.h"
 #include "kvi_window.h"
 #include "kvi_frame.h"
-#include "kvi_pointerlist.h"
+#include "KviPointerList.h"
 
 #include <QSplitter>
 
diff --git a/src/modules/term/termwidget.cpp b/src/modules/term/termwidget.cpp
index 7330a8f47..efa4e099b 100644
--- a/src/modules/term/termwidget.cpp
+++ b/src/modules/term/termwidget.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Thu Aug 10 2000 17:42:12 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -28,8 +28,8 @@
 #include "kvi_module.h"
 #include "kvi_frame.h"
 #include "kvi_iconmanager.h"
-#include "kvi_locale.h"
-#include "kvi_pointerlist.h"
+#include "KviLocale.h"
+#include "KviPointerList.h"
 
 #include <QLabel>
 #include <QToolTip>
diff --git a/src/modules/term/termwidget.h b/src/modules/term/termwidget.h
index dea914910..4c2c076c3 100644
--- a/src/modules/term/termwidget.h
+++ b/src/modules/term/termwidget.h
@@ -6,7 +6,7 @@
 //   Creation date : Wed Aug 30 2000 15:34:20 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
diff --git a/src/modules/term/termwindow.cpp b/src/modules/term/termwindow.cpp
index d86004f36..5b3ff0cb7 100644
--- a/src/modules/term/termwindow.cpp
+++ b/src/modules/term/termwindow.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Thu Aug 31 2000 15:02:22 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -28,7 +28,7 @@
 #ifdef COMPILE_KDE_SUPPORT
 	#include "kvi_iconmanager.h"
 	#include "kvi_options.h"
-	#include "kvi_locale.h"
+	#include "KviLocale.h"
 	#include "kvi_module.h"
 
 	extern KviModule * g_pTermModule;
diff --git a/src/modules/term/termwindow.h b/src/modules/term/termwindow.h
index 10436497a..466520b64 100644
--- a/src/modules/term/termwindow.h
+++ b/src/modules/term/termwindow.h
@@ -6,7 +6,7 @@
 //   Creation date : Thu Aug 31 2000 15:00:00 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2000-2010 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
@@ -28,7 +28,7 @@
 
 #ifdef COMPILE_KDE_SUPPORT
 	#include "kvi_window.h"
-	#include "kvi_string.h"
+	#include "KviCString.h"
 
 	class KviTermWidget;
 
diff --git a/src/modules/theme/libkvitheme.cpp b/src/modules/theme/libkvitheme.cpp
index dff7d4f05..2ba30a640 100644
--- a/src/modules/theme/libkvitheme.cpp
+++ b/src/modules/theme/libkvitheme.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Sat 30 Dec 2006 14:54:56 by Szymon Stefanek
 //
 //   This toolbar is part of the KVirc irc client distribution
-//   Copyright (C) 2006-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2006-2010 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
@@ -27,17 +27,17 @@
 
 #include "kvi_msgbox.h"
 #include "kvi_module.h"
-#include "kvi_locale.h"
-#include "kvi_qstring.h"
-#include "kvi_parameterlist.h"
-#include "kvi_cmdformatter.h"
+#include "KviLocale.h"
+#include "KviQString.h"
+#include "KviParameterList.h"
+#include "KviCommandFormatter.h"
 #include "kvi_error.h"
 #include "kvi_out.h"
 #include "kvi_iconmanager.h"
-#include "kvi_mirccntrl.h"
-#include "kvi_config.h"
+#include "KviMircCntrl.h"
+#include "KviConfigurationFile.h"
 #include "kvi_sourcesdate.h"
-#include "kvi_fileutils.h"
+#include "KviFileUtils.h"
 #include "kvi_filedialog.h"
 #include "kvi_theme.h"
 
@@ -289,7 +289,7 @@ static bool theme_module_init(KviModule *m)
 
 	QString szBuf;
 	m->getDefaultConfigFileName(szBuf);
-	KviConfig cfg(szBuf,KviConfig::Read);
+	KviConfigurationFile cfg(szBuf,KviConfigurationFile::Read);
 	g_rectManagementDialogGeometry = cfg.readRectEntry("EditorGeometry",QRect(10,10,390,440));
 
 	return true;
@@ -301,7 +301,7 @@ static bool theme_module_cleanup(KviModule *m)
 
 	QString szBuf;
 	m->getDefaultConfigFileName(szBuf);
-	KviConfig cfg(szBuf,KviConfig::Write);
+	KviConfigurationFile cfg(szBuf,KviConfigurationFile::Write);
 	cfg.writeEntry("EditorGeometry",g_rectManagementDialogGeometry);
 
 	return true;
diff --git a/src/modules/theme/managementdialog.cpp b/src/modules/theme/managementdialog.cpp
index 85ec9d231..49116bcc8 100644
--- a/src/modules/theme/managementdialog.cpp
+++ b/src/modules/theme/managementdialog.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Sat 30 Dec 2006 14:54:56 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC Client distribution
-//   Copyright (C) 2006-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2006-2010 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
@@ -28,14 +28,14 @@
 #include "themefunctions.h"
 
 #include "kvi_options.h"
-#include "kvi_locale.h"
-#include "kvi_config.h"
-#include "kvi_fileutils.h"
+#include "KviLocale.h"
+#include "KviConfigurationFile.h"
+#include "KviFileUtils.h"
 #include "kvi_app.h"
 #include "kvi_frame.h"
 #include "kvi_iconmanager.h"
 #include "kvi_internalcmd.h"
-#include "kvi_packagefile.h"
+#include "KviPackageFile.h"
 #include "kvi_fileextensions.h"
 #include "kvi_filedialog.h"
 #include "kvi_dynamictooltip.h"
diff --git a/src/modules/theme/managementdialog.h b/src/modules/theme/managementdialog.h
index 88bb670e3..3df640222 100644
--- a/src/modules/theme/managementdialog.h
+++ b/src/modules/theme/managementdialog.h
@@ -6,7 +6,7 @@
 //   Creation date : Sat 30 Dec 2006 14:54:56 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC Client distribution
-//   Copyright (C) 2006-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2006-2010 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
@@ -25,7 +25,7 @@
 //=============================================================================
 
 #include "kvi_optionswidget.h"
-#include "kvi_pointerlist.h"
+#include "KviPointerList.h"
 #include "kvi_theme.h"
 #include "kvi_tal_popupmenu.h"
 #include "kvi_tal_wizard.h"
diff --git a/src/modules/theme/packthemedialog.cpp b/src/modules/theme/packthemedialog.cpp
index b715bb00b..4a4c83440 100644
--- a/src/modules/theme/packthemedialog.cpp
+++ b/src/modules/theme/packthemedialog.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Wed 03 Jan 2007 01:11:44 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC Client distribution
-//   Copyright (C) 2007-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2007-2010 Szymon Stefanek <pragma at kvirc dot net>
 //   Copyright (C) 2010 Elvio Basello <hell at hellvis69 dot netsons dot org>
 //
 //   This program is FREE software. You can redistribute it and/or
@@ -27,18 +27,18 @@
 #include "themefunctions.h"
 
 #include "kvi_options.h"
-#include "kvi_locale.h"
-#include "kvi_config.h"
-#include "kvi_fileutils.h"
+#include "KviLocale.h"
+#include "KviConfigurationFile.h"
+#include "KviFileUtils.h"
 #include "kvi_app.h"
 #include "kvi_frame.h"
 #include "kvi_iconmanager.h"
-#include "kvi_packagefile.h"
+#include "KviPackageFile.h"
 #include "kvi_fileextensions.h"
 #include "kvi_filedialog.h"
 //#include "kvi_msgbox.h"
 #include "kvi_selectors.h"
-#include "kvi_miscutils.h"
+#include "KviMiscUtils.h"
 #include "kvi_sourcesdate.h"
 
 #include <QLineEdit>
diff --git a/src/modules/theme/packthemedialog.h b/src/modules/theme/packthemedialog.h
index b88939f48..ecbeb4c0a 100644
--- a/src/modules/theme/packthemedialog.h
+++ b/src/modules/theme/packthemedialog.h
@@ -6,7 +6,7 @@
 //   Creation date : Wed 03 Jan 2007 01:11:44 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC Client distribution
-//   Copyright (C) 2007-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2007-2010 Szymon Stefanek <pragma at kvirc dot net>
 //   Copyright (C) 2010 Elvio Basello <hell at hellvis69 dot netsons dot org>
 //
 //   This program is FREE software. You can redistribute it and/or
@@ -26,7 +26,7 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_pointerlist.h"
+#include "KviPointerList.h"
 #include "kvi_theme.h"
 
 #include <QWizard>
diff --git a/src/modules/theme/savethemedialog.cpp b/src/modules/theme/savethemedialog.cpp
index fc8f3d256..578e19b6d 100644
--- a/src/modules/theme/savethemedialog.cpp
+++ b/src/modules/theme/savethemedialog.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Wed 03 Jan 2007 03:01:34 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC Client distribution
-//   Copyright (C) 2007-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2007-2010 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
@@ -26,18 +26,18 @@
 #include "themefunctions.h"
 
 #include "kvi_options.h"
-#include "kvi_locale.h"
-#include "kvi_config.h"
-#include "kvi_fileutils.h"
+#include "KviLocale.h"
+#include "KviConfigurationFile.h"
+#include "KviFileUtils.h"
 #include "kvi_app.h"
 #include "kvi_frame.h"
 #include "kvi_iconmanager.h"
-#include "kvi_packagefile.h"
+#include "KviPackageFile.h"
 #include "kvi_fileextensions.h"
 #include "kvi_filedialog.h"
 #include "kvi_msgbox.h"
 #include "kvi_selectors.h"
-#include "kvi_miscutils.h"
+#include "KviMiscUtils.h"
 #include "kvi_sourcesdate.h"
 
 #include <QTextEdit>
diff --git a/src/modules/theme/savethemedialog.h b/src/modules/theme/savethemedialog.h
index 99b9529d5..145ffdcbf 100644
--- a/src/modules/theme/savethemedialog.h
+++ b/src/modules/theme/savethemedialog.h
@@ -6,7 +6,7 @@
 //   Creation date : Wed 03 Jan 2007 03:01:34 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC Client distribution
-//   Copyright (C) 2007-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2007-2010 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
@@ -25,7 +25,7 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_pointerlist.h"
+#include "KviPointerList.h"
 #include "kvi_theme.h"
 #include "kvi_tal_wizard.h"
 
diff --git a/src/modules/theme/themefunctions.cpp b/src/modules/theme/themefunctions.cpp
index a1a39a991..b14d5b5c8 100644
--- a/src/modules/theme/themefunctions.cpp
+++ b/src/modules/theme/themefunctions.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Wed 03 Jan 2007 03:14:07 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC Client distribution
-//   Copyright (C) 2007-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2007-2010 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
@@ -24,13 +24,13 @@
 
 #include "themefunctions.h"
 
-#include "kvi_packagefile.h"
-#include "kvi_locale.h"
+#include "KviPackageFile.h"
+#include "KviLocale.h"
 #include "kvi_msgbox.h"
 #include "kvi_app.h"
 #include "kvi_htmldialog.h"
 #include "kvi_iconmanager.h"
-#include "kvi_miscutils.h"
+#include "KviMiscUtils.h"
 #include "kvi_sourcesdate.h"
 #include "kvi_theme.h"
 #include "kvi_frame.h"
diff --git a/src/modules/theme/themefunctions.h b/src/modules/theme/themefunctions.h
index dd29fe4bd..0aabab805 100644
--- a/src/modules/theme/themefunctions.h
+++ b/src/modules/theme/themefunctions.h
@@ -6,7 +6,7 @@
 //   Creation date : Wed 03 Jan 2007 03:14:07 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC Client distribution
-//   Copyright (C) 2007-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2007-2010 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
@@ -25,7 +25,7 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_qstring.h"
+#include "KviQString.h"
 #include "kvi_htmldialog.h"
 
 #include <QWidget>
diff --git a/src/modules/tip/libkvitip.cpp b/src/modules/tip/libkvitip.cpp
index bf872a037..2bc2977d7 100644
--- a/src/modules/tip/libkvitip.cpp
+++ b/src/modules/tip/libkvitip.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Thu May 10 2001 13:50:11 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-2010 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
@@ -25,11 +25,11 @@
 #include "libkvitip.h"
 
 #include "kvi_module.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_app.h"
 #include "kvi_iconmanager.h"
 #include "kvi_options.h"
-#include "kvi_fileutils.h"
+#include "KviFileUtils.h"
 
 #include <QPushButton>
 #include <QFont>
@@ -135,7 +135,7 @@ bool KviTipWindow::openConfig(QString filename,bool bEnsureExists)
 		if(!KviFileUtils::fileExists(buffer))return false;
 	}
 
-	m_pConfig = new KviConfig(buffer,KviConfig::Read);
+	m_pConfig = new KviConfigurationFile(buffer,KviConfigurationFile::Read);
 
 	return true;
 }
@@ -153,8 +153,8 @@ void KviTipWindow::nextTip()
 {
 	if(!m_pConfig)
 	{
-		KviStr szLocale = KviLocale::localeName();
-		KviStr szFile;
+		KviCString szLocale = KviLocale::localeName();
+		KviCString szFile;
 		szFile.sprintf("libkvitip_%s.kvc",szLocale.ptr());
 		if(!openConfig(szFile.ptr(),true))
 		{
@@ -175,7 +175,7 @@ void KviTipWindow::nextTip()
 	uCurTip++;
 	if(uCurTip >= uNumTips)uCurTip = 0;
 
-	KviStr tmp(KviStr::Format,"%u",uCurTip);
+	KviCString tmp(KviCString::Format,"%u",uCurTip);
 	QString szTip = m_pConfig->readEntry(tmp.ptr(),__tr2qs("<b>Can't find any tip... :(</b>"));
 
 	//qDebug("REDECODED=%s",szTip.toUtf8().data());
@@ -189,8 +189,8 @@ void KviTipWindow::prevTip()
 {
 	if(!m_pConfig)
 	{
-		KviStr szLocale = KviLocale::localeName();
-		KviStr szFile;
+		KviCString szLocale = KviLocale::localeName();
+		KviCString szFile;
 		szFile.sprintf("libkvitip_%s.kvc",szLocale.ptr());
 		if(!openConfig(szFile.ptr(),true))
 		{
@@ -212,7 +212,7 @@ void KviTipWindow::prevTip()
 	if(uCurTip == 0)uCurTip = uNumTips-1;
 	else uCurTip--;
 
-	KviStr tmp(KviStr::Format,"%u",uCurTip);
+	KviCString tmp(KviCString::Format,"%u",uCurTip);
 	QString szTip = m_pConfig->readEntry(tmp.ptr(),__tr2qs("<b>Can't find any tip... :(</b>"));
 
 	//qDebug("REDECODED=%s",szTip.toUtf8().data());
diff --git a/src/modules/tip/libkvitip.h b/src/modules/tip/libkvitip.h
index 2190780a3..d94e1fd99 100644
--- a/src/modules/tip/libkvitip.h
+++ b/src/modules/tip/libkvitip.h
@@ -6,7 +6,7 @@
 //   Creation date : Thu May 10 2001 13:49:12 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-2010 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
@@ -24,8 +24,8 @@
 //
 //=============================================================================
 
-#include "kvi_string.h"
-#include "kvi_config.h"
+#include "KviCString.h"
+#include "KviConfigurationFile.h"
 
 #include <QWidget>
 #include <QFrame>
@@ -54,7 +54,7 @@ public:
 protected:
 	KviTipFrame * m_pTipFrame;
 	QCheckBox   * m_pShowAtStartupCheck;
-	KviConfig   * m_pConfig;
+	KviConfigurationFile   * m_pConfig;
 	QString        m_szConfigFileName; // no path!
 protected:
 	virtual void closeEvent(QCloseEvent *e);
diff --git a/src/modules/tmphighlight/libkvitmphighlight.cpp b/src/modules/tmphighlight/libkvitmphighlight.cpp
index e61119f0b..2d5707b1e 100644
--- a/src/modules/tmphighlight/libkvitmphighlight.cpp
+++ b/src/modules/tmphighlight/libkvitmphighlight.cpp
@@ -5,7 +5,7 @@
 //
 //   This file is part of the KVirc irc client distribution
 //   Copyright (C) 2002 Juanjo Alvarez (juanjux@yahoo.es)
-//   Copyright (C) 2002-2009 Szymon Stefanek (kvirc@tin.it)
+//   Copyright (C) 2002-2010 Szymon Stefanek (kvirc@tin.it)
 //
 //   This program is FREE software. You can redistribute it and/or
 //   modify it under the terms of the GNU General Public License
@@ -25,7 +25,7 @@
 
 
 #include "kvi_module.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_channel.h"
 
 /*
diff --git a/src/modules/toolbar/libkvitoolbar.cpp b/src/modules/toolbar/libkvitoolbar.cpp
index ba68e31fe..66a70c8b8 100644
--- a/src/modules/toolbar/libkvitoolbar.cpp
+++ b/src/modules/toolbar/libkvitoolbar.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Wed 6 Nov 22:51:59 2002 GMT by Szymon Stefanek
 //
 //   This toolbar is part of the KVirc irc client distribution
-//   Copyright (C) 2002-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2002-2010 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
@@ -23,11 +23,11 @@
 //=============================================================================
 
 #include "kvi_module.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_window.h"
 #include "kvi_app.h"
 #include "kvi_error.h"
-#include "kvi_cmdformatter.h"
+#include "KviCommandFormatter.h"
 #include "kvi_customtoolbar.h"
 #include "kvi_customtoolbardescriptor.h"
 #include "kvi_customtoolbarmanager.h"
diff --git a/src/modules/toolbareditor/libkvitoolbareditor.cpp b/src/modules/toolbareditor/libkvitoolbareditor.cpp
index 4462175ce..edec5a67a 100644
--- a/src/modules/toolbareditor/libkvitoolbareditor.cpp
+++ b/src/modules/toolbareditor/libkvitoolbareditor.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Sun 10 Nov 2002 23:25:59 2002 GMT by Szymon Stefanek
 //
 //   This toolbar is part of the KVirc irc client distribution
-//   Copyright (C) 2002-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2002-2010 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
@@ -25,10 +25,10 @@
 #include "toolbareditor.h"
 
 #include "kvi_module.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_frame.h"
 #include "kvi_actionmanager.h"
-#include "kvi_config.h"
+#include "KviConfigurationFile.h"
 #include "kvi_app.h"
 
 QRect g_rectToolBarEditorDialogGeometry(0,0,0,0);
@@ -61,7 +61,7 @@ static bool toolbareditor_module_init(KviModule * m)
 	KVSM_REGISTER_SIMPLE_COMMAND(m,"open",toolbareditor_kvs_cmd_open);
 	QString szBuf;
 	m->getDefaultConfigFileName(szBuf);
-	KviConfig cfg(szBuf,KviConfig::Read);
+	KviConfigurationFile cfg(szBuf,KviConfigurationFile::Read);
 	g_rectToolBarEditorDialogGeometry = cfg.readRectEntry("EditorGeometry",QRect(10,10,390,440));
 
 	return true;
@@ -78,7 +78,7 @@ static bool toolbareditor_module_cleanup(KviModule *m)
 
 	QString szBuf;
 	m->getDefaultConfigFileName(szBuf);
-	KviConfig cfg(szBuf,KviConfig::Write);
+	KviConfigurationFile cfg(szBuf,KviConfigurationFile::Write);
 	cfg.writeEntry("EditorGeometry",g_rectToolBarEditorDialogGeometry);
 
 	return true;
diff --git a/src/modules/toolbareditor/toolbareditor.cpp b/src/modules/toolbareditor/toolbareditor.cpp
index 4f09441c4..fdc61fc93 100644
--- a/src/modules/toolbareditor/toolbareditor.cpp
+++ b/src/modules/toolbareditor/toolbareditor.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Wed 01 Dec 2004 14:42:20 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2004-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2004-2010 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
@@ -26,7 +26,7 @@
 
 #include "kvi_app.h"
 #include "kvi_actiondrawer.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_frame.h"
 #include "kvi_iconmanager.h"
 #include "kvi_actionmanager.h"
@@ -34,7 +34,7 @@
 #include "kvi_customtoolbarmanager.h"
 #include "kvi_customtoolbardescriptor.h"
 #include "kvi_imagedialog.h"
-#include "kvi_fileutils.h"
+#include "KviFileUtils.h"
 #include "kvi_filedialog.h"
 #include "kvi_kvs_useraction.h"
 #include "kvi_tal_tooltip.h"
diff --git a/src/modules/toolbareditor/toolbareditor.h b/src/modules/toolbareditor/toolbareditor.h
index eddba32fa..70e5a71b9 100644
--- a/src/modules/toolbareditor/toolbareditor.h
+++ b/src/modules/toolbareditor/toolbareditor.h
@@ -6,7 +6,7 @@
 //   Creation date : Wed 01 Dec 2004 14:42:20 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2004-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2004-2010 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
diff --git a/src/modules/torrent/libkvitorrent.cpp b/src/modules/torrent/libkvitorrent.cpp
index 716c7653c..b5c283cc2 100644
--- a/src/modules/torrent/libkvitorrent.cpp
+++ b/src/modules/torrent/libkvitorrent.cpp
@@ -30,7 +30,7 @@
 #include "kvi_module.h"
 #include "kvi_options.h"
 #include "kvi_frame.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_out.h"
 
 static KviPointerList<KviTorrentInterfaceDescriptor> * g_pDescriptorList = 0;
diff --git a/src/modules/torrent/tc_interface.cpp b/src/modules/torrent/tc_interface.cpp
index d6989c359..a4595a563 100644
--- a/src/modules/torrent/tc_interface.cpp
+++ b/src/modules/torrent/tc_interface.cpp
@@ -26,6 +26,6 @@
 
 #include "tc_interface.h"
 
-#include "kvi_locale.h"
+#include "KviLocale.h"
 
 KviTorrentInterface *KviTorrentInterface::m_selected = 0;
diff --git a/src/modules/torrent/tc_interface.h b/src/modules/torrent/tc_interface.h
index 7bc018606..5a966ab95 100644
--- a/src/modules/torrent/tc_interface.h
+++ b/src/modules/torrent/tc_interface.h
@@ -28,7 +28,7 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_qstring.h"
+#include "KviQString.h"
 
 #include <QObject>
 
diff --git a/src/modules/torrent/tc_ktorrentdbusinterface.cpp b/src/modules/torrent/tc_ktorrentdbusinterface.cpp
index 537e828bf..62059e634 100644
--- a/src/modules/torrent/tc_ktorrentdbusinterface.cpp
+++ b/src/modules/torrent/tc_ktorrentdbusinterface.cpp
@@ -29,7 +29,7 @@
 #ifdef COMPILE_KDE_SUPPORT
 
 	#include "kvi_app.h"
-	#include "kvi_locale.h"
+	#include "KviLocale.h"
 
 	#include <QTimer>
 
diff --git a/src/modules/torrent/tc_statusbarapplet.cpp b/src/modules/torrent/tc_statusbarapplet.cpp
index 117a68057..bf1b701cb 100644
--- a/src/modules/torrent/tc_statusbarapplet.cpp
+++ b/src/modules/torrent/tc_statusbarapplet.cpp
@@ -27,7 +27,7 @@
 #include "tc_interface.h"
 #include "tc_statusbarapplet.h"
 
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_iconmanager.h"
 
 #include "QTimer"
diff --git a/src/modules/trayicon/libkvitrayicon.cpp b/src/modules/trayicon/libkvitrayicon.cpp
index 887e8a8bc..c2ea870a4 100644
--- a/src/modules/trayicon/libkvitrayicon.cpp
+++ b/src/modules/trayicon/libkvitrayicon.cpp
@@ -29,7 +29,7 @@
 #include "kvi_settings.h"
 #include "kvi_app.h"
 #include "kvi_module.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_memmove.h"
 #include "kvi_windowlist.h"
 #include "kvi_window.h"
diff --git a/src/modules/upnp/libkviupnp.cpp b/src/modules/upnp/libkviupnp.cpp
index 954afe7dd..10a69864d 100644
--- a/src/modules/upnp/libkviupnp.cpp
+++ b/src/modules/upnp/libkviupnp.cpp
@@ -24,7 +24,7 @@
 
 #include "kvi_settings.h"
 #include "kvi_module.h"
-#include "kvi_string.h"
+#include "KviCString.h"
 #include "kvi_netutils.h"
 
 #include "manager.h"
diff --git a/src/modules/upnp/manager.h b/src/modules/upnp/manager.h
index c0cff032c..d501e68ce 100644
--- a/src/modules/upnp/manager.h
+++ b/src/modules/upnp/manager.h
@@ -37,7 +37,7 @@
 #include <QObject>
 #include <QTimer>
 
-#include "kvi_pointerlist.h"
+#include "KviPointerList.h"
 #include "igdcontrolpoint.h"
 #include "ssdpconnection.h"
 
diff --git a/src/modules/upnp/rootservice.cpp b/src/modules/upnp/rootservice.cpp
index 33a044022..7405c2594 100644
--- a/src/modules/upnp/rootservice.cpp
+++ b/src/modules/upnp/rootservice.cpp
@@ -33,7 +33,7 @@
 
 #include "rootservice.h"
 #include "xmlfunctions.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_out.h"
 #include "kvi_app.h"
 #include "kvi_console.h"
diff --git a/src/modules/upnp/wanconnectionservice.h b/src/modules/upnp/wanconnectionservice.h
index 244e68292..1bc3838c8 100644
--- a/src/modules/upnp/wanconnectionservice.h
+++ b/src/modules/upnp/wanconnectionservice.h
@@ -35,7 +35,7 @@
 #define UPNP_WANCONNECTIONSERVICE_H
 
 #include "service.h"
-#include "kvi_pointerlist.h"
+#include "KviPointerList.h"
 
 namespace UPnP
 {
diff --git a/src/modules/url/libkviurl.cpp b/src/modules/url/libkviurl.cpp
index e1bbdec03..abcb31819 100644
--- a/src/modules/url/libkviurl.cpp
+++ b/src/modules/url/libkviurl.cpp
@@ -34,12 +34,12 @@
 #include "kvi_action.h"
 #include "kvi_actionmanager.h"
 #include "kvi_windowlist.h"
-#include "kvi_pointerlist.h"
+#include "KviPointerList.h"
 #include "kvi_kvs_eventmanager.h"
 #include "kvi_tal_popupmenu.h"
 #include "kvi_window.h"
 #include "kvi_options.h"
-#include "kvi_qstring.h"
+#include "KviQString.h"
 #include "kvi_out.h"
 
 #include <QFileDialog>
@@ -168,7 +168,7 @@ UrlDialog::UrlDialog(KviPointerList<KviUrl> *)
 
 	m_pMenuBar = new KviTalMenuBar(this,"url menu");
 	//m_pUrlList = new KviListView(this,"list");
-	KviConfig cfg(szConfigPath,KviConfig::Read);
+	KviConfigurationFile cfg(szConfigPath,KviConfigurationFile::Read);
 /*
 	KviTalPopupMenu *pop;
 
@@ -289,9 +289,9 @@ void UrlDialog::findtext()
 	}
 	for(KviUrl *tmp=g_pList->first();tmp;tmp=g_pList->next())
 	{
-		if (tmp->url == KviStr(m_pUrlList->currentItem()->text(0))) {
+		if (tmp->url == KviCString(m_pUrlList->currentItem()->text(0))) {
 			g_pList->find(tmp);
-			KviStr ft="findtext %";
+			KviCString ft="findtext %";
 			ft.replaceAll('%',tmp->url.ptr());
 			KviWindow *wnd = m_pFrm->findWindow(tmp->window.ptr());
 			if (wnd) {
@@ -396,7 +396,7 @@ void UrlDialog::resizeEvent(QResizeEvent *)
 UrlDialog::~UrlDialog()
 {
 	/*
-	KviConfig cfg(szConfigPath,KviConfig::Write);
+	KviConfigurationFile cfg(szConfigPath,KviConfigurationFile::Write);
 	cfg.setGroup("ConfigDialog");
 	if (cfg.readBoolEntry("SaveColumnWidthOnClose",false)) {
 		cfg.setGroup("ColsWidth");
@@ -426,7 +426,7 @@ ConfigDialog::ConfigDialog()
 
 	QGridLayout *g = new QGridLayout(this);
 
-	KviConfig *cfg = new KviConfig(szConfigPath,KviConfig::Read);
+	KviConfigurationFile *cfg = new KviConfigurationFile(szConfigPath,KviConfigurationFile::Read);
 	cfg->setGroup("ConfigDialog");
 
 	cb[0] = new QCheckBox(__tr2qs("Save URL list on module unload"),this);
@@ -467,7 +467,7 @@ void ConfigDialog::discardbtn()
 
 void ConfigDialog::acceptbtn()
 {
-	KviConfig *cfg = new KviConfig(szConfigPath,KviConfig::Write);
+	KviConfigurationFile *cfg = new KviConfigurationFile(szConfigPath,KviConfigurationFile::Write);
 	cfg->setGroup("ConfigDialog");
 
 	if (m_pBanFrame) m_pBanFrame->saveBans(cfg);
@@ -571,7 +571,7 @@ void BanFrame::removeBan()
 
 }
 
-void BanFrame::saveBans(KviConfig *cfg)
+void BanFrame::saveBans(KviConfigurationFile *cfg)
 {
 	cfg->writeEntry("BanEnabled",m_pEnable->isChecked());
 	if (m_pEnable->isChecked()) saveBanList();
@@ -908,7 +908,7 @@ static bool url_module_init(KviModule *m)
 
 static bool url_module_cleanup(KviModule *)
 {
-	KviConfig cfg(szConfigPath,KviConfig::Read);
+	KviConfigurationFile cfg(szConfigPath,KviConfigurationFile::Read);
 	cfg.setGroup("ConfigDialog");
 	if (cfg.readBoolEntry("SaveUrlListOnUnload",false) == true) saveUrlList();
 	for (UrlDlgList *tmpitem=g_pUrlDlgList->first();tmpitem;tmpitem=g_pUrlDlgList->next()) {
diff --git a/src/modules/url/libkviurl.h b/src/modules/url/libkviurl.h
index db7f5ec0d..e180b2290 100644
--- a/src/modules/url/libkviurl.h
+++ b/src/modules/url/libkviurl.h
@@ -24,8 +24,8 @@
 //
 //=============================================================================
 
-#include "kvi_locale.h"
-#include "kvi_config.h"
+#include "KviLocale.h"
+#include "KviConfigurationFile.h"
 #include "kvi_irctoolbar.h"
 #include "kvi_window.h"
 #include "kvi_tal_menubar.h"
@@ -105,7 +105,7 @@ class BanFrame : public QFrame
 public:
 	BanFrame(QWidget *parent=0, const char *name=0, bool banEnable = false);
 	~BanFrame();
-	void saveBans(KviConfig *cfg);
+	void saveBans(KviConfigurationFile *cfg);
 private:
 	QCheckBox     *m_pEnable;
 	QListWidget   *m_pBanList;
diff --git a/src/modules/userlist/libkviuserlist.cpp b/src/modules/userlist/libkviuserlist.cpp
index 541635d4e..12f508631 100644
--- a/src/modules/userlist/libkviuserlist.cpp
+++ b/src/modules/userlist/libkviuserlist.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Fri Sep 03 2010 15:23:00 CEST by Fabio Bas
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2001-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2001-2010 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
@@ -23,7 +23,7 @@
 //=============================================================================
 
 #include "kvi_module.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_channel.h"
 #include "kvi_userlistview.h"
 
diff --git a/src/modules/window/libkviwindow.cpp b/src/modules/window/libkviwindow.cpp
index 1729c22ac..0a585fb01 100644
--- a/src/modules/window/libkviwindow.cpp
+++ b/src/modules/window/libkviwindow.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Sat Sep 01 2001 17:13:12 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-2010 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
@@ -29,7 +29,7 @@
 #include "kvi_options.h"
 #include "kvi_ircsocket.h"
 #include "kvi_frame.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_app.h"
 #include "kvi_error.h"
 #include "kvi_ircview.h"
@@ -37,16 +37,16 @@
 #include "kvi_iconmanager.h"
 #include "kvi_modulemanager.h"
 #include "kvi_memmove.h"
-#include "kvi_malloc.h"
+#include "KviMemory.h"
 #include "kvi_mdichild.h"
 #include "kvi_channel.h"
-#include "kvi_pointerhashtable.h"
+#include "KviPointerHashTable.h"
 
 #include <QTimer>
 
 
 #ifdef COMPILE_CRYPT_SUPPORT
-	#include "kvi_crypt.h"
+	#include "KviCryptEngine.h"
 	#include "kvi_cryptcontroller.h"
 	// kvi_app.cpp
 	extern KVIRC_API KviCryptEngineManager * g_pCryptEngineManager;
@@ -1484,7 +1484,7 @@ static bool window_kvs_cmd_savePropertiesAsDefault(KviKvsModuleCommandCall * c)
 }
 
 #ifdef COMPILE_CRYPT_SUPPORT
-static bool initializeCryptEngine(KviCryptEngine * eng,KviStr &szEncryptKey,KviStr &szDecryptKey,QString &szError)
+static bool initializeCryptEngine(KviCryptEngine * eng,KviCString &szEncryptKey,KviCString &szDecryptKey,QString &szError)
 {
 	char * encKey = 0;
 	int encKeyLen = 0;
@@ -1493,9 +1493,9 @@ static bool initializeCryptEngine(KviCryptEngine * eng,KviStr &szEncryptKey,KviS
 	encKeyLen = szEncryptKey.hexToBuffer(&tmpKey,false);
 	if(encKeyLen > 0)
 	{
-		encKey = (char *)kvi_malloc(encKeyLen);
+		encKey = (char *)KviMemory::allocate(encKeyLen);
 		kvi_memmove(encKey,tmpKey,encKeyLen);
-		KviStr::freeBuffer(tmpKey);
+		KviCString::freeBuffer(tmpKey);
 	} else {
 		szError = __tr2qs("The encrypt key wasn't a valid hexadecimal string");
 		return false;
@@ -1507,9 +1507,9 @@ static bool initializeCryptEngine(KviCryptEngine * eng,KviStr &szEncryptKey,KviS
 	decKeyLen = szDecryptKey.hexToBuffer(&tmpKey,false);
 	if(decKeyLen > 0)
 	{
-		decKey = (char *)kvi_malloc(decKeyLen);
+		decKey = (char *)KviMemory::allocate(decKeyLen);
 		kvi_memmove(decKey,tmpKey,decKeyLen);
-		KviStr::freeBuffer(tmpKey);
+		KviCString::freeBuffer(tmpKey);
 	} else {
 		szError = __tr2qs("The decrypt key wasn't a valid hexadecimal string");
 		return false;
@@ -1517,8 +1517,8 @@ static bool initializeCryptEngine(KviCryptEngine * eng,KviStr &szEncryptKey,KviS
 	bool bRet = eng->init(encKey,encKeyLen,decKey,decKeyLen);
 	if(!bRet)
 		szError = eng->lastError();
-	if(encKey)kvi_free(encKey);
-	if(decKey)kvi_free(decKey);
+	if(encKey)KviMemory::free(encKey);
+	if(decKey)KviMemory::free(decKey);
 	return bRet;
 }
 #endif
@@ -1567,8 +1567,8 @@ static bool window_kvs_cmd_setCryptEngine(KviKvsModuleCommandCall * c)
 		KviCryptEngine * e = g_pCryptEngineManager->allocateEngine(szEngine.toUtf8().data());
 		if(e)
 		{
-			KviStr enc = KviStr(szEncryptKey.toUtf8().data());
-			KviStr dec = KviStr(szDecryptKey.toUtf8().data());
+			KviCString enc = KviCString(szEncryptKey.toUtf8().data());
+			KviCString dec = KviCString(szDecryptKey.toUtf8().data());
 			QString szError;
 			if(initializeCryptEngine(e,enc,dec,szError))
 			{
diff --git a/src/modules/window/userwindow.cpp b/src/modules/window/userwindow.cpp
index 156c4104f..6007e85fa 100644
--- a/src/modules/window/userwindow.cpp
+++ b/src/modules/window/userwindow.cpp
@@ -4,7 +4,7 @@
 //   Created on Mon 30 Aug 2004 15:00:52 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2004-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2004-2010 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
diff --git a/src/modules/window/userwindow.h b/src/modules/window/userwindow.h
index 21902aa3b..fe4e372e7 100644
--- a/src/modules/window/userwindow.h
+++ b/src/modules/window/userwindow.h
@@ -6,7 +6,7 @@
 //   Created on Mon 30 Aug 2004 15:00:52 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2004-2008 Szymon Stefanek <pragma at kvirc dot net>
+//   Copyright (C) 2004-2010 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