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

77 files changed, 154 insertions, 154 deletions

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