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

369 files changed, 1294 insertions, 1294 deletions

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