More Qt 4.x port

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

25 files changed, 286 insertions, 182 deletions

diff --git a/src/kvi_configstatus.h b/src/kvi_configstatus.h
index cc60913cf..7f3799081 100644
--- a/src/kvi_configstatus.h
+++ b/src/kvi_configstatus.h
@@ -8,7 +8,7 @@
 /* #undef BIG_ENDIAN_MACHINE_BYTE_ORDER */
 
 /* this is the build date (configure date rather) */
-#define BUILD_DATE "Sat Jan 20 22:10:21 UTC 2007"
+#define BUILD_DATE "Mon Jan 22 04:28:49 UTC 2007"
 
 /* these are the build flags */
 #define BUILD_FLAGS "x86_64-cefgikopsAGTZ"
diff --git a/src/kvilib/build/Makefile.am b/src/kvilib/build/Makefile.am
index 3c672d3a1..7b96a1901 100644
--- a/src/kvilib/build/Makefile.am
+++ b/src/kvilib/build/Makefile.am
@@ -109,6 +109,7 @@ headers_HEADERS = \
 	../core/kvi_list.h \
 	../core/kvi_malloc.h \
 	../core/kvi_memmove.h \
+	../core/kvi_ptrdict.h \
 	../core/kvi_qcstring.h \
 	../core/kvi_qstring.h \
 	../core/kvi_strasm.h \
diff --git a/src/kvilib/config/kvi_confignames.h b/src/kvilib/config/kvi_confignames.h
index 81612d226..05f6e79fb 100644
--- a/src/kvilib/config/kvi_confignames.h
+++ b/src/kvilib/config/kvi_confignames.h
@@ -56,5 +56,6 @@
 #define KVI_CONFIGFILE_AVATARCACHE "avatarcache." KVI_FILEEXTENSION_CONFIG
 #define KVI_CONFIGFILE_USERACTIONS "useractions." KVI_FILEEXTENSION_CONFIG
 #define KVI_CONFIGFILE_SCRIPTADDONS "scriptaddons." KVI_FILEEXTENSION_CONFIG
+#define KVI_CONFIGFILE_IDENTITIES "identities." KVI_FILEEXTENSION_CONFIG
 
 #endif //_KVI_CONFIGNAMES_H_
diff --git a/src/kvilib/core/kvi_ptrdict.h b/src/kvilib/core/kvi_ptrdict.h
new file mode 100644
index 000000000..d8f4e1308
--- /dev/null
+++ b/src/kvilib/core/kvi_ptrdict.h
@@ -0,0 +1,39 @@
+#ifndef _KVI_PTRDICT_H_
+#define _KVI_PTRDICT_H_
+//=================================================================================================
+//
+//   File : kvi_ptrdict.h
+//   Creation date : Mon Jan 22 2007 05:06 by Szymon Stefanek
+//
+//   This file is part of the KVirc irc client distribution
+//   Copyright (C) 2007 Szymon Stefanek (pragma at kvirc dot net)
+//
+//   This program is FREE software. You can redistribute it and/or
+//   modify it under the terms of the GNU General Public License
+//   as published by the Free Software Foundation; either version 2
+//   of the License, or (at your opinion) any later version.
+//
+//   This program is distributed in the HOPE that it will be USEFUL,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+//   See the GNU General Public License for more details.
+//
+//   You should have received a copy of the GNU General Public License
+//   along with this program. If not, write to the Free Software Foundation,
+//   Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+//
+//=================================================================================================
+
+#include "kvi_settings.h"
+
+#if COMPILE_USE_QT4
+	#include <q3ptrdict.h>
+	#define KviPtrDict Q3PtrDict
+	#define KviPtrDictIterator Q3PtrDictIterator
+#else
+	#include <qptrdict.h>
+	#define KviPtrDict QPtrDict
+	#define KviPtrDictIterator QPtrDictIterator
+#endif
+
+#endif //_KVI_PTRDICT_H_
diff --git a/src/kvilib/core/kvi_qstring.cpp b/src/kvilib/core/kvi_qstring.cpp
index 9f0463936..bd8ade4f6 100644
--- a/src/kvilib/core/kvi_qstring.cpp
+++ b/src/kvilib/core/kvi_qstring.cpp
@@ -47,6 +47,9 @@ extern unsigned char iso88591_toUpper_map[256];
 
 namespace KviQString
 {
+	// The global empty (and null) string
+	const QString empty;
+
 	bool equalCSN(const QString &sz1,const QString &sz2,unsigned int len)
 	{
 		if(len == 0)return true; // assume equal
diff --git a/src/kvilib/core/kvi_qstring.h b/src/kvilib/core/kvi_qstring.h
index 2271c60e5..548f33610 100644
--- a/src/kvilib/core/kvi_qstring.h
+++ b/src/kvilib/core/kvi_qstring.h
@@ -122,6 +122,9 @@ namespace KviQString
 
 	extern KVILIB_API void bufferToHex(QString &szRetBuffer,const unsigned char * buffer,unsigned int len);
 
+	// a global empty string (note that this is ALSO NULL under Qt 3.x)
+	extern KVILIB_API const QString empty;
+
 	inline QString toLower(const QString &s)
 	{
 #ifdef COMPILE_USE_QT4
diff --git a/src/kvilib/ext/kvi_osinfo.cpp b/src/kvilib/ext/kvi_osinfo.cpp
index a189454bf..3d26c3779 100644
--- a/src/kvilib/ext/kvi_osinfo.cpp
+++ b/src/kvilib/ext/kvi_osinfo.cpp
@@ -26,6 +26,7 @@
 
 #include "kvi_osinfo.h"
 #include "kvi_locale.h"
+#include "kvi_qstring.h"
 
 #ifndef COMPILE_ON_WINDOWS
 	#include <sys/utsname.h>
@@ -315,7 +316,7 @@ namespace KviOsInfo
 		struct utsname uts;
 		if(uname(&uts) == 0)
 			return QString::fromLocal8Bit(uts.sysname);
-		return QString::null;
+		return KviQString::empty;
 #endif
 	}
 	
@@ -327,7 +328,7 @@ namespace KviOsInfo
 		struct utsname uts;
 		if(uname(&uts) == 0)
 			return QString::fromLocal8Bit(uts.version);
-		return QString::null;
+		return KviQString::empty;
 #endif
 	}
 	
@@ -339,7 +340,7 @@ namespace KviOsInfo
 		struct utsname uts;
 		if(uname(&uts) == 0)
 			return QString::fromLocal8Bit(uts.release);
-		return QString::null;
+		return KviQString::empty;
 #endif
 	}
 	
@@ -352,7 +353,7 @@ namespace KviOsInfo
 		struct utsname uts;
 		if(uname(&uts) == 0)
 			return QString::fromLocal8Bit(uts.machine);
-		return QString::null;
+		return KviQString::empty;
 #endif
 	}
 	
@@ -364,7 +365,7 @@ namespace KviOsInfo
 		struct utsname uts;
 		if(uname(&uts) == 0)
 			return QString::fromLocal8Bit(uts.nodename);
-		return QString::null;
+		return KviQString::empty;
 #endif
 	}
 	
@@ -374,7 +375,7 @@ namespace KviOsInfo
 		if(gethostname(hbuffer,1024) == 0)
 			return QString::fromLocal8Bit(hbuffer);
 		else
-			return QString::null;
+			return KviQString::empty;
 	}
 }
 
diff --git a/src/kvilib/irc/kvi_useridentity.cpp b/src/kvilib/irc/kvi_useridentity.cpp
index 374ca466a..cfc012f5e 100644
--- a/src/kvilib/irc/kvi_useridentity.cpp
+++ b/src/kvilib/irc/kvi_useridentity.cpp
@@ -30,82 +30,48 @@
 
 // FIXME: Put here also the default away message, default away nick, default ctcp replies etc ?
 
-bool KviUserIdentity::load(KviConfig &cfg,const QString &szPrefix)
+bool KviUserIdentity::load(KviConfig &cfg)
 {
-	QString szTmp;
-	KviQString::sprintf(szTmp,"%QId",&szPrefix);
-	m_szId = cfg.readQStringEntry(szTmp);
-	KviQString::sprintf(szTmp,"%QNickName",&szPrefix);
-	m_szNickName = cfg.readQStringEntry(szTmp);
-	KviQString::sprintf(szTmp,"%QAltNickName1",&szPrefix);
-	m_szAltNickName1 = cfg.readQStringEntry(szTmp);
-	KviQString::sprintf(szTmp,"%QAltNickName2",&szPrefix);
-	m_szAltNickName2 = cfg.readQStringEntry(szTmp);
-	KviQString::sprintf(szTmp,"%QAltNickName3",&szPrefix);
-	m_szAltNickName3 = cfg.readQStringEntry(szTmp);
-	KviQString::sprintf(szTmp,"%QUserName",&szPrefix);
-	m_szUserName = cfg.readQStringEntry(szTmp);
+	m_szId = cfg.group();
+	m_szNickName = cfg.readQStringEntry("NickName");
+	m_szAltNickName1 = cfg.readQStringEntry("AltNickName1");
+	m_szAltNickName2 = cfg.readQStringEntry("AltNickName2");
+	m_szAltNickName3 = cfg.readQStringEntry("AltNickName3");
+	m_szUserName = cfg.readQStringEntry("UserName");
 	// FIXME: At least scramble the pass ?
-	KviQString::sprintf(szTmp,"%QPassword",&szPrefix);
-	m_szPassword = cfg.readQStringEntry(szTmp);
+	m_szPassword = cfg.readQStringEntry("Password");
 	KviPixmap def;
-	KviQString::sprintf(szTmp,"%QAvatar",&szPrefix);
-	m_pixAvatar = cfg.readPixmapEntry(szTmp,def);
-	KviQString::sprintf(szTmp,"%QPartMessage",&szPrefix);
-	m_szPartMessage = cfg.readQStringEntry(szTmp);
-	KviQString::sprintf(szTmp,"%QQuitMessage",&szPrefix);
-	m_szQuitMessage= cfg.readQStringEntry(szTmp);
-	KviQString::sprintf(szTmp,"%QAge",&szPrefix);
-	m_szAge = cfg.readQStringEntry(szTmp);
-	KviQString::sprintf(szTmp,"%QGender",&szPrefix);
-	m_szGender = cfg.readQStringEntry(szTmp);
-	KviQString::sprintf(szTmp,"%QLocation",&szPrefix);
-	m_szLocation = cfg.readQStringEntry(szTmp);
-	KviQString::sprintf(szTmp,"%QLanguages",&szPrefix);
-	m_szLanguages = cfg.readQStringEntry(szTmp);
-	KviQString::sprintf(szTmp,"%QOtherInfo",&szPrefix);
-	m_szOtherInfo = cfg.readQStringEntry(szTmp);
-	KviQString::sprintf(szTmp,"%QUserMode",&szPrefix);
-	m_szUserMode = cfg.readQStringEntry(szTmp);
+	m_pixAvatar = cfg.readPixmapEntry("Avatar",def);
+	m_szPartMessage = cfg.readQStringEntry("PartMessage");
+	m_szQuitMessage= cfg.readQStringEntry("QuitMessage");
+	m_szAge = cfg.readQStringEntry("Age");
+	m_szGender = cfg.readQStringEntry("Gender");
+	m_szLocation = cfg.readQStringEntry("Location");
+	m_szLanguages = cfg.readQStringEntry("Languages");
+	m_szOtherInfo = cfg.readQStringEntry("OtherInfo");
+	m_szUserMode = cfg.readQStringEntry("UserMode");
 	return !(m_szId.isEmpty() || m_szNickName.isEmpty());
 }
 
-bool KviUserIdentity::save(KviConfig &cfg,const QString &szPrefix)
+bool KviUserIdentity::save(KviConfig &cfg)
 {
-	QString szTmp;
-	KviQString::sprintf(szTmp,"%QId",&szPrefix);
-	cfg.writeEntry(szTmp,m_szId);
-	KviQString::sprintf(szTmp,"%QNickName",&szPrefix);
-	cfg.writeEntry(szTmp,m_szNickName);
-	KviQString::sprintf(szTmp,"%QAltNickName1",&szPrefix);
-	cfg.writeEntry(szTmp,m_szAltNickName1);
-	KviQString::sprintf(szTmp,"%QAltNickName2",&szPrefix);
-	cfg.writeEntry(szTmp,m_szAltNickName2);
-	KviQString::sprintf(szTmp,"%QAltNickName3",&szPrefix);
-	cfg.writeEntry(szTmp,m_szAltNickName3);
-	KviQString::sprintf(szTmp,"%QUserName",&szPrefix);
-	cfg.writeEntry(szTmp,m_szUserName);
+	cfg.setGroup(m_szId);
+	cfg.writeEntry("NickName",m_szNickName);
+	cfg.writeEntry("AltNickName1",m_szAltNickName1);
+	cfg.writeEntry("AltNickName2",m_szAltNickName2);
+	cfg.writeEntry("AltNickName3",m_szAltNickName3);
+	cfg.writeEntry("UserName",m_szUserName);
 	// FIXME: At least scramble the pass ?
-	KviQString::sprintf(szTmp,"%QPassword",&szPrefix);
-	cfg.writeEntry(szTmp,m_szPassword);
-	KviQString::sprintf(szTmp,"%QAvatar",&szPrefix);
-	cfg.writeEntry(szTmp,m_pixAvatar);
-	KviQString::sprintf(szTmp,"%QPartMessage",&szPrefix);
-	cfg.writeEntry(szTmp,m_szPartMessage);
-	KviQString::sprintf(szTmp,"%QQuitMessage",&szPrefix);
-	cfg.writeEntry(szTmp,m_szQuitMessage);
-	KviQString::sprintf(szTmp,"%QAge",&szPrefix);
-	cfg.writeEntry(szTmp,m_szAge);
-	KviQString::sprintf(szTmp,"%QGender",&szPrefix);
-	cfg.writeEntry(szTmp,m_szGender);
-	KviQString::sprintf(szTmp,"%QLocation",&szPrefix);
-	cfg.writeEntry(szTmp,m_szLocation);
-	KviQString::sprintf(szTmp,"%QLanguages",&szPrefix);
-	cfg.writeEntry(szTmp,m_szLanguages);
-	KviQString::sprintf(szTmp,"%QOtherInfo",&szPrefix);
-	cfg.writeEntry(szTmp,m_szOtherInfo);
-	KviQString::sprintf(szTmp,"%QUserMode",&szPrefix);
-	cfg.writeEntry(szTmp,m_szUserMode);
+	cfg.writeEntry("Password",m_szPassword);
+	cfg.writeEntry("Avatar",m_pixAvatar);
+	cfg.writeEntry("PartMessage",m_szPartMessage);
+	cfg.writeEntry("QuitMessage",m_szQuitMessage);
+	cfg.writeEntry("Age",m_szAge);
+	cfg.writeEntry("Gender",m_szGender);
+	cfg.writeEntry("Location",m_szLocation);
+	cfg.writeEntry("Languages",m_szLanguages);
+	cfg.writeEntry("OtherInfo",m_szOtherInfo);
+	cfg.writeEntry("UserMode",m_szUserMode);
 	return true;
 }
 
@@ -206,21 +172,74 @@ const KviUserIdentity * KviUserIdentityManager::defaultIdentity()
 	return ret;
 }
 
+void KviUserIdentityManager::load(const QString &szFileName)
+{
+	m_pIdentityDict->clear();
+
+	KviConfig cfg(szFileName,KviConfig::Read);
+
+	cfg.setGroup("KVIrc");
+	
+	m_szDefaultIdentity = cfg.readQStringEntry("DefaultIdentity","");
+
+	KviConfigIterator it(*(cfg.dict()));
+	while(KviConfigGroup * grp = it.current())
+	{
+		if(!KviQString::equalCI(it.currentKey(),"KVIrc"))
+		{
+			cfg.setGroup(it.currentKey());
+
+			KviUserIdentity * id = new KviUserIdentity();
+			if(id->load(cfg))
+				m_pIdentityDict->replace(id->id(),id);
+			else
+				delete id;
+		}
+		++it;
+	}
+}
+
 void KviUserIdentityManager::save(const QString &szFileName)
 {
+	KviConfig cfg(szFileName,KviConfig::Write);
+	cfg.clear();
+	
+	cfg.setGroup("KVIrc");
+
+	cfg.writeEntry("DefaultIdentity",m_szDefaultIdentity);
+	
+	KviDictIterator<KviUserIdentity> it(*m_pIdentityDict);
+	while(KviUserIdentity * id = it.current())
+	{
+		id->save(cfg);
+		++it;
+	}
 }
 
-void KviUserIdentityManager::load(const QString &szFileName)
+void KviUserIdentityManager::copyFrom(KviUserIdentityManager * pWorkingCopy)
 {
+	m_pIdentityDict->clear();
+	m_szDefaultIdentity = pWorkingCopy->m_szDefaultIdentity;
+	KviDictIterator<KviUserIdentity> it(*(pWorkingCopy->m_pIdentityDict));
+	while(KviUserIdentity * id = it.current())
+	{
+		KviUserIdentity * pNew = new KviUserIdentity();
+		pNew->copyFrom(*id);
+		m_pIdentityDict->replace(pNew->id(),pNew);
+		++it;
+	}
 }
 
-KviUserIdentityManager * KviUserIdentityManager::getWorkingCopy()
+KviUserIdentityManager * KviUserIdentityManager::createWorkingCopy()
 {
-	return 0;
+	KviUserIdentityManager * pCopy = new KviUserIdentityManager();
+	pCopy->copyFrom(this);
+	return pCopy;
 }
 
-void KviUserIdentityManager::setValuesFrom(KviUserIdentityManager * pWorkingCopy)
+void KviUserIdentityManager::releaseWorkingCopy(KviUserIdentityManager * pWorkingCopy)
 {
-	
+	if(pWorkingCopy)delete pWorkingCopy;
 }
 
+
diff --git a/src/kvilib/irc/kvi_useridentity.h b/src/kvilib/irc/kvi_useridentity.h
index 911f1dd0b..5f5786989 100644
--- a/src/kvilib/irc/kvi_useridentity.h
+++ b/src/kvilib/irc/kvi_useridentity.h
@@ -102,13 +102,13 @@ public:
 	void setUserMode(const QString &szUserMode){ m_szUserMode = szUserMode; };
 protected:
 	void copyFrom(const KviUserIdentity &src);
-	bool save(KviConfig &cfg,const QString &szPrefix);
-	bool load(KviConfig &cfg,const QString &szPrefix);
+	bool save(KviConfig &cfg);
+	bool load(KviConfig &cfg);
 };
 
 class KVILIB_API KviUserIdentityManager : public KviHeapObject
 {
-public:
+protected:
 	KviUserIdentityManager();
 	~KviUserIdentityManager();
 protected:
@@ -126,8 +126,9 @@ public:
 
 	void setDefaultIdentity(const QString &szIdentityId){ m_szDefaultIdentity = szIdentityId; };
 	
-	KviUserIdentityManager * getWorkingCopy();
-	void setValuesFrom(KviUserIdentityManager * pWorkingCopy);
+	KviUserIdentityManager * createWorkingCopy();
+	void copyFrom(KviUserIdentityManager * pWorkingCopy);
+	void releaseWorkingCopy(KviUserIdentityManager * pWorkingCopy);
 
 	void save(const QString &szFileName);
 	void load(const QString &szFileName);
diff --git a/src/kvilib/net/kvi_dns.cpp b/src/kvilib/net/kvi_dns.cpp
index a2de3271a..25aa1b2b4 100644
--- a/src/kvilib/net/kvi_dns.cpp
+++ b/src/kvilib/net/kvi_dns.cpp
@@ -417,14 +417,14 @@ const QString & KviDns::firstHostname()
 {
 	QString * pStr = result()->hostnameList()->first();
 	if(pStr)return *pStr;
-	return QString::null;
+	return KviQString::empty;
 }
 
 const QString & KviDns::firstIpAddress()
 {
 	QString * pStr = result()->ipAddressList()->first();
 	if(pStr)return *pStr;
-	return QString::null;
+	return KviQString::empty;
 }
 
 const QString & KviDns::query()
diff --git a/src/kvirc/kernel/kvi_app.cpp b/src/kvirc/kernel/kvi_app.cpp
index 7a28eb6f8..c912a744c 100644
--- a/src/kvirc/kernel/kvi_app.cpp
+++ b/src/kvirc/kernel/kvi_app.cpp
@@ -71,6 +71,7 @@
 #include "kvi_time.h"
 #include "kvi_doublebuffer.h"
 #include "kvi_stringconversion.h"
+#include "kvi_useridentity.h"
 
 #ifndef COMPILE_NO_IPC
 	#include "kvi_ipc.h"
@@ -191,7 +192,7 @@ void KviApp::setup()
 
 #ifndef COMPILE_NO_IPC
 	// Create this very early
-	// FIXME: this is still not early enough...
+	// FIXME: this is still not early enough... we actually HAVE race conditions (should use a file for locking this ?)
 	createIpcSentinel();
 #endif
 
@@ -227,19 +228,19 @@ void KviApp::setup()
 
 	// Set the default help files search path
 	QStringList list;
-	KviStr tmp;
+	QString tmp;
 	getLocalKvircDirectory(tmp,Help); // localized help/lang or help if help/lang doesn't exist
-	list.append(tmp.ptr());
+	list.append(tmp);
 	getLocalKvircDirectory(tmp,HelpEN); // help/en
-	list.append(tmp.ptr());
+	list.append(tmp);
 	getLocalKvircDirectory(tmp,HelpNoIntl); // just help/
-	list.append(tmp.ptr());
+	list.append(tmp);
 	getGlobalKvircDirectory(tmp,Help);
-	list.append(tmp.ptr());
+	list.append(tmp);
 	getGlobalKvircDirectory(tmp,HelpEN);
-	list.append(tmp.ptr());
+	list.append(tmp);
 	getGlobalKvircDirectory(tmp,HelpNoIntl);
-	list.append(tmp.ptr());
+	list.append(tmp);
 	QMimeSourceFactory::defaultFactory()->setFilePath(list);
 
 	KVI_SPLASH_SET_PROGRESS(1)
@@ -265,14 +266,26 @@ void KviApp::setup()
 	KVI_SPLASH_SET_PROGRESS(5)
 
 	if(getReadOnlyConfigPath(tmp,KVI_CONFIGFILE_USERACTIONS))
-		KviActionManager::instance()->load(tmp.ptr());
+		KviActionManager::instance()->load(tmp);
 
 	KVI_SPLASH_SET_PROGRESS(8);
 
-	// Load the configuration
+	// Initialize and load the identities
+	KviUserIdentityManager::init();
+
+	KVI_SPLASH_SET_PROGRESS(9);
+
+	if(getReadOnlyConfigPath(tmp,KVI_CONFIGFILE_IDENTITIES))
+		KviUserIdentityManager::instance()->load(tmp);
+
+	KVI_SPLASH_SET_PROGRESS(12);
+
+	// Load the remaining configuration
+	// Note that loadOptions() assumes that the current progress is 12 and
+	// will bump it up to 45 in small steps
 	loadOptions();
 
-	KVI_SPLASH_SET_PROGRESS(42)
+	KVI_SPLASH_SET_PROGRESS(47)
 
 	// set the global font if needed
 	updateApplicationFont();
@@ -281,66 +294,66 @@ void KviApp::setup()
 	updatePseudoTransparency();
 #endif
 
-	KVI_SPLASH_SET_PROGRESS(44)
+	KVI_SPLASH_SET_PROGRESS(48)
 
 	// Load the win properties config
 	getLocalKvircDirectory(tmp,Config,KVI_CONFIGFILE_WINPROPERTIES);
-	g_pWinPropertiesConfig = new KviConfig(tmp.ptr(),KviConfig::ReadWrite);
+	g_pWinPropertiesConfig = new KviConfig(tmp,KviConfig::ReadWrite);
 
-	KVI_SPLASH_SET_PROGRESS(48)
+	KVI_SPLASH_SET_PROGRESS(50)
 
 	// Load the server database
 	g_pIrcServerDataBase   = new KviIrcServerDataBase();
 	if(getReadOnlyConfigPath(tmp,KVI_CONFIGFILE_SERVERDB))
-		g_pIrcServerDataBase->load(tmp.ptr());
+		g_pIrcServerDataBase->load(tmp);
 
-	KVI_SPLASH_SET_PROGRESS(51)
+	KVI_SPLASH_SET_PROGRESS(53)
 
 	// Load the proxy database
 	g_pProxyDataBase = new KviProxyDataBase();
 	if(getReadOnlyConfigPath(tmp,KVI_CONFIGFILE_PROXYDB))
-		g_pProxyDataBase->load(tmp.ptr());
+		g_pProxyDataBase->load(tmp);
 
 	KVI_SPLASH_SET_PROGRESS(54)
 
 	// Event manager
 	if(getReadOnlyConfigPath(tmp,KVI_CONFIGFILE_EVENTS))
-		KviKvs::loadAppEvents(tmp.ptr());
+		KviKvs::loadAppEvents(tmp);
 
 	KVI_SPLASH_SET_PROGRESS(59)
 
 	if(getReadOnlyConfigPath(tmp,KVI_CONFIGFILE_RAWEVENTS))
-		KviKvs::loadRawEvents(tmp.ptr());
+		KviKvs::loadRawEvents(tmp);
 
 	KVI_SPLASH_SET_PROGRESS(62)
 
 	// Popup manager
 	if(getReadOnlyConfigPath(tmp,KVI_CONFIGFILE_POPUPS))
-		KviKvs::loadPopups(tmp.ptr());
+		KviKvs::loadPopups(tmp);
 
 	KVI_SPLASH_SET_PROGRESS(67)
 
 	KviCustomToolBarManager::init();
 	if(getReadOnlyConfigPath(tmp,KVI_CONFIGFILE_CUSTOMTOOLBARS))
-		KviCustomToolBarManager::instance()->load(tmp.ptr());
+		KviCustomToolBarManager::instance()->load(tmp);
 	// THIS IS A COMPATIBILITY ENTRY ADDED AT 3.0.2 TIME THAT SHOULD BE DROPPED IN A COUPLE OF VERSION BUMPS!
 	getLocalKvircDirectory(tmp,Config,KVI_CONFIGFILE_SCRIPTTOOLBARS);
-	if(KviFileUtils::fileExists(tmp.ptr()))
-		KviCustomToolBarManager::instance()->loadScripttoolbarsCompat(tmp.ptr());
+	if(KviFileUtils::fileExists(tmp))
+		KviCustomToolBarManager::instance()->loadScripttoolbarsCompat(tmp);
 	// EOF COMPATIBILITY
 
 	KVI_SPLASH_SET_PROGRESS(70)
 
 	// Alias manager
 	if(getReadOnlyConfigPath(tmp,KVI_CONFIGFILE_ALIASES))
-		KviKvs::loadAliases(tmp.ptr());
+		KviKvs::loadAliases(tmp);
 
 	KVI_SPLASH_SET_PROGRESS(75)
 
 	// Script addons manager (this in fact has delayed loading, so we don't even care
 	// about showing up an entry in the splash screen)
 	if(getReadOnlyConfigPath(tmp,KVI_CONFIGFILE_SCRIPTADDONS))
-		KviKvs::loadScriptAddons(tmp.ptr());
+		KviKvs::loadScriptAddons(tmp);
 
 	KVI_SPLASH_SET_PROGRESS(77)
 
@@ -360,7 +373,7 @@ void KviApp::setup()
 	g_pMediaManager = new KviMediaManager();
 	g_pMediaManager->lock();
 	if(getReadOnlyConfigPath(tmp,KVI_CONFIGFILE_MEDIATYPES))
-		g_pMediaManager->load(tmp.ptr());
+		g_pMediaManager->load(tmp);
 	g_pMediaManager->unlock();
 
 
@@ -369,39 +382,39 @@ void KviApp::setup()
 	// registered user data base
 	g_pRegisteredUserDataBase = new KviRegisteredUserDataBase();
 	if(getReadOnlyConfigPath(tmp,KVI_CONFIGFILE_REGUSERDB))
-		g_pRegisteredUserDataBase->load(tmp.ptr());
+		g_pRegisteredUserDataBase->load(tmp);
 
 	KVI_SPLASH_SET_PROGRESS(84)
 
 	// registered channel data base
 	g_pRegisteredChannelDataBase = new KviRegisteredChannelDataBase();
 	if(getReadOnlyConfigPath(tmp,KVI_CONFIGFILE_REGCHANDB))
-		g_pRegisteredChannelDataBase->load(tmp.ptr());
+		g_pRegisteredChannelDataBase->load(tmp);
 
 	KVI_SPLASH_SET_PROGRESS(85)
 
 	// file trader
 	g_pSharedFilesManager = new KviSharedFilesManager();
 	if(getReadOnlyConfigPath(tmp,KVI_CONFIGFILE_SHAREDFILES))
-		g_pSharedFilesManager->load(tmp.ptr());
+		g_pSharedFilesManager->load(tmp);
 
 	KVI_SPLASH_SET_PROGRESS(86)
 
 	// nick serv data base
 	g_pNickServRuleSet = new KviNickServRuleSet();
 	if(getReadOnlyConfigPath(tmp,KVI_CONFIGFILE_NICKSERVDATABASE))
-		g_pNickServRuleSet->load(tmp.ptr());
+		g_pNickServRuleSet->load(tmp);
 
 	KVI_SPLASH_SET_PROGRESS(88)
 
 	g_pInputHistory = new KviInputHistory();
 	if(getReadOnlyConfigPath(tmp,KVI_CONFIGFILE_INPUTHISTORY))
-		g_pInputHistory->load(tmp.ptr());
+		g_pInputHistory->load(tmp);
 
 	KVI_SPLASH_SET_PROGRESS(89)
 	KviAvatarCache::init();
 	if(getReadOnlyConfigPath(tmp,KVI_CONFIGFILE_AVATARCACHE))
-		KviAvatarCache::instance()->load(tmp.ptr());
+		KviAvatarCache::instance()->load(tmp);
 
 	KVI_SPLASH_SET_PROGRESS(90)
 
@@ -512,6 +525,8 @@ KviApp::~KviApp()
 	// We should have almost no UI here: only certain dialogs or popup windows may
 	// still exist: they should be harmless tough.
 	saveOptions();
+	saveIdentities();
+	KviUserIdentityManager::done();
 	if(m_pRecentChannelsDict) delete m_pRecentChannelsDict;
 	// now kill the stuff that the frame depends on
 	saveIrcServerDataBase();
@@ -1303,66 +1318,66 @@ void KviApp::updateApplicationFont()
 
 void KviApp::loadRecentEntries()
 {
-	KviStr tmp;
+	QString tmp;
 	getLocalKvircDirectory(tmp,Config,KVI_CONFIGFILE_RECENT);
-	KviConfig cfg(tmp.ptr(),KviConfig::Read);
+	KviConfig cfg(tmp,KviConfig::Read);
 	*g_pRecentTopicList = cfg.readStringListEntry("RecentTopicList",QStringList());
 	//*g_pBookmarkList = cfg.readStringListEntry("Bookmarks",QStringList());
 }
 void KviApp::saveRecentEntries()
 {
-	KviStr tmp;
+	QString tmp;
 	getLocalKvircDirectory(tmp,Config,KVI_CONFIGFILE_RECENT);
-	KviConfig cfg(tmp.ptr(),KviConfig::Write);
+	KviConfig cfg(tmp,KviConfig::Write);
 	cfg.writeEntry("RecentTopicList",*g_pRecentTopicList);
 	//cfg.writeEntry("Bookmarks",*g_pBookmarkList);
 }
 
 void KviApp::saveAvatarCache()
 {
-	KviStr tmp;
+	QString tmp;
 	getLocalKvircDirectory(tmp,Config,KVI_CONFIGFILE_AVATARCACHE);
-	KviAvatarCache::instance()->save(tmp.ptr());
+	KviAvatarCache::instance()->save(tmp);
 }
 
 
 void KviApp::saveToolBars()
 {
-	KviStr tmp;
+	QString tmp;
 	getLocalKvircDirectory(tmp,Config,KVI_CONFIGFILE_CUSTOMTOOLBARS);
-	KviCustomToolBarManager::instance()->save(tmp.ptr());
+	KviCustomToolBarManager::instance()->save(tmp);
 }
 
 void KviApp::savePopups()
 {
-	KviStr tmp;
+	QString tmp;
 	getLocalKvircDirectory(tmp,Config,KVI_CONFIGFILE_POPUPS);
-	KviKvs::savePopups(tmp.ptr());
+	KviKvs::savePopups(tmp);
 }
 
 void KviApp::saveInputHistory()
 {
 	if(!KVI_OPTION_BOOL(KviOption_boolDisableInputHistory))
 	{
-		KviStr tmp;
+		QString tmp;
 		getLocalKvircDirectory(tmp,Config,KVI_CONFIGFILE_INPUTHISTORY);
-		g_pInputHistory->save(tmp.ptr());
+		g_pInputHistory->save(tmp);
 	}
 }
 
 
 void KviApp::saveAliases()
 {
-	KviStr tmp;
+	QString tmp;
 	getLocalKvircDirectory(tmp,Config,KVI_CONFIGFILE_ALIASES);
-	KviKvs::saveAliases(tmp.ptr());
+	KviKvs::saveAliases(tmp);
 }
 
 void KviApp::saveScriptAddons()
 {
-	KviStr tmp;
+	QString tmp;
 	getLocalKvircDirectory(tmp,Config,KVI_CONFIGFILE_SCRIPTADDONS);
-	KviKvs::saveScriptAddons(tmp.ptr());
+	KviKvs::saveScriptAddons(tmp);
 }
 
 void KviApp::saveTextIcons()
@@ -1372,74 +1387,81 @@ void KviApp::saveTextIcons()
 
 void KviApp::saveAppEvents()
 {
-	KviStr tmp;
+	QString tmp;
 	getLocalKvircDirectory(tmp,Config,KVI_CONFIGFILE_EVENTS);
-	KviKvs::saveAppEvents(tmp.ptr());
+	KviKvs::saveAppEvents(tmp);
 }
 
 void KviApp::saveRawEvents()
 {
-	KviStr tmp;
+	QString tmp;
 	getLocalKvircDirectory(tmp,Config,KVI_CONFIGFILE_RAWEVENTS);
-	KviKvs::saveRawEvents(tmp.ptr());
+	KviKvs::saveRawEvents(tmp);
 }
 
 void KviApp::saveMediaTypes()
 {
-	KviStr tmp;
+	QString tmp;
 	getLocalKvircDirectory(tmp,Config,KVI_CONFIGFILE_MEDIATYPES);
 	g_pMediaManager->lock();
-	g_pMediaManager->save(tmp.ptr());
+	g_pMediaManager->save(tmp);
 	g_pMediaManager->unlock();
 }
 
 void KviApp::saveIrcServerDataBase()
 {
-	KviStr tmp;
+	QString tmp;
 	getLocalKvircDirectory(tmp,Config,KVI_CONFIGFILE_SERVERDB);
-	g_pIrcServerDataBase->save(tmp.ptr());
+	g_pIrcServerDataBase->save(tmp);
 }
 
 void KviApp::saveProxyDataBase()
 {
-	KviStr tmp;
+	QString tmp;
 	getLocalKvircDirectory(tmp,Config,KVI_CONFIGFILE_PROXYDB);
-	g_pProxyDataBase->save(tmp.ptr());
+	g_pProxyDataBase->save(tmp);
 }
 
 void KviApp::saveRegisteredUsers()
 {
-	KviStr tmp;
+	QString tmp;
 	getLocalKvircDirectory(tmp,Config,KVI_CONFIGFILE_REGUSERDB);
-	g_pRegisteredUserDataBase->save(tmp.ptr());
+	g_pRegisteredUserDataBase->save(tmp);
 }
 
 void KviApp::saveRegisteredChannels()
 {
-	KviStr tmp;
+	QString tmp;
 	getLocalKvircDirectory(tmp,Config,KVI_CONFIGFILE_REGCHANDB);
-	g_pRegisteredChannelDataBase->save(tmp.ptr());
+	g_pRegisteredChannelDataBase->save(tmp);
 }
 
 void KviApp::saveNickServ()
 {
-	KviStr tmp;
+	QString tmp;
 	getLocalKvircDirectory(tmp,Config,KVI_CONFIGFILE_NICKSERVDATABASE);
-	g_pNickServRuleSet->save(tmp.ptr());
+	g_pNickServRuleSet->save(tmp);
 }
 
 void KviApp::saveSharedFiles()
 {
-	KviStr tmp;
+	QString tmp;
 	getLocalKvircDirectory(tmp,Config,KVI_CONFIGFILE_SHAREDFILES);
-	g_pSharedFilesManager->save(tmp.ptr());
+	g_pSharedFilesManager->save(tmp);
 }
 
 void KviApp::saveActions()
 {
-	KviStr tmp;
+	QString tmp;
 	getLocalKvircDirectory(tmp,Config,KVI_CONFIGFILE_USERACTIONS);
-	KviActionManager::instance()->save(tmp.ptr());
+	KviActionManager::instance()->save(tmp);
+}
+
+void KviApp::saveIdentities()
+{
+	QString tmp;
+	getLocalKvircDirectory(tmp,Config,KVI_CONFIGFILE_IDENTITIES);
+	KviUserIdentityManager::instance()->save(tmp);
 }
 
 void KviApp::saveConfiguration()
@@ -1447,6 +1469,7 @@ void KviApp::saveConfiguration()
 	// this is NOT called when the application is closing down
 	KviCustomToolBarManager::instance()->storeVisibilityState();
 	saveOptions();
+	saveIdentities();
 	saveActions();
 	saveIrcServerDataBase();
 	saveProxyDataBase();
diff --git a/src/kvirc/kernel/kvi_app.h b/src/kvirc/kernel/kvi_app.h
index 372c9d93d..3051f87e3 100644
--- a/src/kvirc/kernel/kvi_app.h
+++ b/src/kvirc/kernel/kvi_app.h
@@ -169,6 +169,7 @@ public:
 	void saveToolBars();
 	void saveActions();
 	void saveScriptAddons();
+	void saveIdentities();
 
 	// kvi_options.cpp : Options saving and loading (kvi.main.conf))
 	void loadOptions();
@@ -223,6 +224,7 @@ public:
 	// directory is used
 	//
 	bool getReadOnlyConfigPath(KviStr &buffer,const char *config_name,KvircSubdir sbd = Config,bool bNoFail = false);
+	bool getReadOnlyConfigPath(QString &buffer,const char *config_name,KvircSubdir sbd = Config,bool bNoFail = false);
 
 	// kvi_app.cpp : Window stuff
 	KviWindow       * findWindow(const char * windowId);
diff --git a/src/kvirc/kernel/kvi_app_fs.cpp b/src/kvirc/kernel/kvi_app_fs.cpp
index 4105267a3..c3b570db0 100644
--- a/src/kvirc/kernel/kvi_app_fs.cpp
+++ b/src/kvirc/kernel/kvi_app_fs.cpp
@@ -692,15 +692,24 @@ bool KviApp::findSmallIcon(QString &szRetPath,const char *filename)
 
 bool KviApp::getReadOnlyConfigPath(KviStr &buffer,const char *config_name,KvircSubdir sbd,bool bNoFail)
 {
+	// DEPRECATED
+	QString tmp;
+	bool bRet = getReadOnlyConfigPath(tmp,config_name,sbd,bNoFail);
+	buffer = tmp;
+	return bRet;
+}
+
+bool KviApp::getReadOnlyConfigPath(QString &buffer,const char *config_name,KvircSubdir sbd,bool bNoFail)
+{
 	// Take a look in the local directory....
 	getLocalKvircDirectory(buffer,sbd,config_name);
 	//debug("%s %s %i |%s| %i",__FILE__,__FUNCTION__,__LINE__,buffer.ptr(),KviFileUtils::fileExists(buffer.ptr()));
-	if(!KviFileUtils::fileExists(buffer.ptr()))
+	if(!KviFileUtils::fileExists(buffer))
 	{
 		// No saved config yet... check for defaults
-		KviStr tmp;
+		QString tmp;
 		getGlobalKvircDirectory(tmp,sbd,config_name);
-		if(!KviFileUtils::fileExists(tmp.ptr()))
+		if(!KviFileUtils::fileExists(tmp))
 		{
 			// No defaults...no such config file at all.
 			if(bNoFail)getLocalKvircDirectory(buffer,sbd,config_name);
diff --git a/src/kvirc/kernel/kvi_ircconnection.cpp b/src/kvirc/kernel/kvi_ircconnection.cpp
index e3f6f007a..2bb3b43bf 100644
--- a/src/kvirc/kernel/kvi_ircconnection.cpp
+++ b/src/kvirc/kernel/kvi_ircconnection.cpp
@@ -199,7 +199,7 @@ void KviIrcConnection::setupTextCodec()
 	m_pConsole->setTextEncoding(QString(m_pTextCodec->name()));
 }
 
-QCString KviIrcConnection::encodeText(const QString &szText)
+KviQCString KviIrcConnection::encodeText(const QString &szText)
 {
 	if(!m_pTextCodec)return szText.utf8();
 	return m_pTextCodec->fromUnicode(szText);
@@ -910,9 +910,9 @@ void KviIrcConnection::loginToIrcServer()
 	
 	// FIXME: The server's encoding!
 	setupTextCodec();
-	QCString szNick = encodeText(m_pUserInfo->nickName()); // never empty
-	QCString szUser = encodeText(m_pUserInfo->userName()); // never empty
-	QCString szReal = encodeText(m_pUserInfo->realName()); // may be empty
+	KviQCString szNick = encodeText(m_pUserInfo->nickName()); // never empty
+	KviQCString szUser = encodeText(m_pUserInfo->userName()); // never empty
+	KviQCString szReal = encodeText(m_pUserInfo->realName()); // may be empty
 
 	if(!szReal.data())szReal = "";
 
@@ -962,7 +962,7 @@ void KviIrcConnection::loginToIrcServer()
 	}
 
 	if(!sendFmtData("USER %s 0 %s :%s",szUser.data(),
-			pServer->m_szHostname.utf8().data(),szReal.data()))
+			KviQString::toUtf8(pServer->m_szHostname).data(),szReal.data()))
 	{
 		// disconnected in the meantime!
 		return;
diff --git a/src/kvirc/kernel/kvi_ircconnection.h b/src/kvirc/kernel/kvi_ircconnection.h
index b8b642ee0..b506273d3 100644
--- a/src/kvirc/kernel/kvi_ircconnection.h
+++ b/src/kvirc/kernel/kvi_ircconnection.h
@@ -26,6 +26,7 @@
 
 #include "kvi_settings.h"
 #include "kvi_qstring.h"
+#include "kvi_qcstring.h"
 #include "kvi_list.h"
 #include "kvi_time.h"
 #include <qobject.h>
@@ -260,7 +261,7 @@ signals:
 	void chanListChanged();
 public:
 	QString decodeText(const char * szText);
-	QCString encodeText(const QString &szText);
+	KviQCString encodeText(const QString &szText);
 private:
 	void setupTextCodec();
 };
diff --git a/src/kvirc/kernel/kvi_options.cpp b/src/kvirc/kernel/kvi_options.cpp
index b28815bdb..b08d6c800 100644
--- a/src/kvirc/kernel/kvi_options.cpp
+++ b/src/kvirc/kernel/kvi_options.cpp
@@ -837,7 +837,7 @@ void KviApp::loadOptions()
 	{
 		KviConfig cfg(buffer.ptr(),KviConfig::Read);
 
-		int prg = 8;
+		int prg = 12;
 		int i;
 
 		#define READ_OPTIONS(_num,_table,_readFnc) \
diff --git a/src/kvirc/kvs/kvi_kvs_dnsmanager.cpp b/src/kvirc/kvs/kvi_kvs_dnsmanager.cpp
index ff482c368..05669e242 100644
--- a/src/kvirc/kvs/kvi_kvs_dnsmanager.cpp
+++ b/src/kvirc/kvs/kvi_kvs_dnsmanager.cpp
@@ -99,7 +99,7 @@ void KviKvsDnsManager::addDns(KviKvsDnsObject * pObject)
 {
 	if(!m_pDnsObjects)
 	{
-		m_pDnsObjects = new QPtrDict<KviKvsDnsObject>;
+		m_pDnsObjects = new KviPtrDict<KviKvsDnsObject>;
 		m_pDnsObjects->setAutoDelete(true);
 	}
 	m_pDnsObjects->replace(pObject->dns(),pObject);
diff --git a/src/kvirc/kvs/kvi_kvs_dnsmanager.h b/src/kvirc/kvs/kvi_kvs_dnsmanager.h
index 620c78456..5e80289aa 100644
--- a/src/kvirc/kvs/kvi_kvs_dnsmanager.h
+++ b/src/kvirc/kvs/kvi_kvs_dnsmanager.h
@@ -26,7 +26,7 @@
 
 #include "kvi_settings.h"
 #include <qobject.h>
-#include <qptrdict.h>
+#include "kvi_ptrdict.h"
 #include <qstring.h>
 
 class KviDns;
@@ -70,7 +70,7 @@ public:
 	~KviKvsDnsManager();
 protected:
 	static KviKvsDnsManager   * m_pInstance;
-	QPtrDict<KviKvsDnsObject> * m_pDnsObjects;
+	KviPtrDict<KviKvsDnsObject> * m_pDnsObjects;
 public:
 	static KviKvsDnsManager * instance(){ return m_pInstance; };
 	static void init();
diff --git a/src/kvirc/kvs/kvi_kvs_object_controller.cpp b/src/kvirc/kvs/kvi_kvs_object_controller.cpp
index 10c5baaaa..420464b6d 100644
--- a/src/kvirc/kvs/kvi_kvs_object_controller.cpp
+++ b/src/kvirc/kvs/kvi_kvs_object_controller.cpp
@@ -42,7 +42,7 @@ KviKvsObjectController::KviKvsObjectController()
 {
 	m_pTopLevelObjectList = new KviPtrList<KviKvsObject>;
 	m_pTopLevelObjectList->setAutoDelete(false);
-	m_pObjectDict = new QPtrDict<KviKvsObject>(101);
+	m_pObjectDict = new KviPtrDict<KviKvsObject>(101);
 	m_pObjectDict->setAutoDelete(false);
 	m_pClassDict = new KviDict<KviKvsObjectClass>(31,false);
 	m_pClassDict->setAutoDelete(false);
@@ -124,7 +124,7 @@ void KviKvsObjectController::clearInstances()
 	delete m_pObjectDict; // empty dict
 	m_pTopLevelObjectList = new KviPtrList<KviKvsObject>;
 	m_pTopLevelObjectList->setAutoDelete(false);
-	m_pObjectDict = new QPtrDict<KviKvsObject>(101);
+	m_pObjectDict = new KviPtrDict<KviKvsObject>(101);
 	m_pObjectDict->setAutoDelete(false);
 }
 
diff --git a/src/kvirc/kvs/kvi_kvs_object_controller.h b/src/kvirc/kvs/kvi_kvs_object_controller.h
index e06b0776e..54fcaff39 100644
--- a/src/kvirc/kvs/kvi_kvs_object_controller.h
+++ b/src/kvirc/kvs/kvi_kvs_object_controller.h
@@ -31,7 +31,7 @@
 #include "kvi_list.h"

 

 #include "kvi_dict.h"

-#include <qptrdict.h>

+#include "kvi_ptrdict.h"

 

 #include "kvi_kvs_object.h"

 #include "kvi_kvs_object_class.h"

@@ -45,7 +45,7 @@ public:
 	~KviKvsObjectController();

 protected:

 	KviPtrList<KviKvsObject>      * m_pTopLevelObjectList;

-	QPtrDict<KviKvsObject>        * m_pObjectDict;

+	KviPtrDict<KviKvsObject>        * m_pObjectDict;

 	KviDict<KviKvsObjectClass>      * m_pClassDict;

 	KviKvsObjectClass             * m_pObjectClass; //base class

 protected:

@@ -63,7 +63,7 @@ public:
 	void killAllObjectsWithClass(KviKvsObjectClass * pClass);

 	KviKvsObjectClass * lookupClass(const QString &szClass,bool bBuiltinOnly = false);

 	KviKvsObject * lookupObject(kvs_hobject_t hObject){ return m_pObjectDict->find(hObject); };

-	QPtrDict<KviKvsObject> * objectDict(){ return m_pObjectDict; };

+	KviPtrDict<KviKvsObject> * objectDict(){ return m_pObjectDict; };

 	KviDict<KviKvsObjectClass> * classDict(){ return m_pClassDict; };

 };

 

diff --git a/src/kvirc/kvs/kvi_kvs_processmanager.h b/src/kvirc/kvs/kvi_kvs_processmanager.h
index e2cf75b1c..9d0ed997e 100644
--- a/src/kvirc/kvs/kvi_kvs_processmanager.h
+++ b/src/kvirc/kvs/kvi_kvs_processmanager.h
@@ -32,7 +32,7 @@
 #include "kvi_kvs_runtimecontext.h"
 #include "kvi_kvs_variant.h"
 
-#include <qptrdict.h>
+#include "kvi_ptrdict.h"
 
 #ifdef Unsorted
 	#undef Unsorted
diff --git a/src/kvirc/ui/kvi_customtoolbar.cpp b/src/kvirc/ui/kvi_customtoolbar.cpp
index 11eded251..2a6ea513a 100644
--- a/src/kvirc/ui/kvi_customtoolbar.cpp
+++ b/src/kvirc/ui/kvi_customtoolbar.cpp
@@ -143,7 +143,7 @@ void KviCustomToolBar::unfilterChild(QObject * o)
 void KviCustomToolBar::beginCustomize()
 {
 	if(m_pFilteredChildren)delete m_pFilteredChildren;
-	m_pFilteredChildren = new QPtrDict<bool>;
+	m_pFilteredChildren = new KviPtrDict<bool>;
 	m_pFilteredChildren->setAutoDelete(true);
 	// filter the events for all the children
 	const QObjectList * l = children();
diff --git a/src/kvirc/ui/kvi_customtoolbar.h b/src/kvirc/ui/kvi_customtoolbar.h
index fcf348efc..c7d0c671a 100644
--- a/src/kvirc/ui/kvi_customtoolbar.h
+++ b/src/kvirc/ui/kvi_customtoolbar.h
@@ -26,7 +26,7 @@
 
 #include "kvi_settings.h"
 #include "kvi_toolbar.h"
-#include <qptrdict.h>
+#include "kvi_ptrdict.h"
 
 #ifdef COMPILE_ON_WINDOWS
 	#include "kvi_customtoolbardescriptor.h"
@@ -59,7 +59,7 @@ protected:
 	KviCustomToolBarDescriptor * m_pDescriptor;
 	QWidget * m_pMovedChild;
 	QWidget * m_pDraggedChild;
-	QPtrDict<bool> * m_pFilteredChildren;
+	KviPtrDict<bool> * m_pFilteredChildren;
 public:
 	KviCustomToolBarDescriptor * descriptor(){ return m_pDescriptor; };
 protected:
diff --git a/src/modules/objects/libkviobjects.cpp b/src/modules/objects/libkviobjects.cpp
index 358de42a4..2d6412c3f 100644
--- a/src/modules/objects/libkviobjects.cpp
+++ b/src/modules/objects/libkviobjects.cpp
@@ -83,7 +83,7 @@
 #include "class_vbox.h"

 #include "class_hbox.h"

 static int contatore=0;

-static QPtrDict<KviKvsObject> *objectsdict=new QPtrDict<KviKvsObject>;

+static KviPtrDict<KviKvsObject> *objectsdict=new KviPtrDict<KviKvsObject>;

 static void dumpChildObjects(KviWindow *pWnd, QObject *parent, const char *spacing, bool bWidgetsOnly, KviKvsArray *n, int &idx);

 

 static bool objects_module_cleanup(KviModule *m)

@@ -348,9 +348,9 @@ static bool objects_kvs_fnc_instances(KviKvsModuleFunctionCall * c)
 			c->warning(__tr2qs("The class '%Q' does not exist"),&szClassName);

 		return true;

 	}

-	QPtrDict<KviKvsObject> * od = KviKvsKernel::instance()->objectController()->objectDict();

+	KviPtrDict<KviKvsObject> * od = KviKvsKernel::instance()->objectController()->objectDict();

 

-	QPtrDictIterator<KviKvsObject> it(*od);

+	KviPtrDictIterator<KviKvsObject> it(*od);

 	kvs_uint_t uIdx = 0;

 	if(szFlags.contains(QChar('s')))

 	{

diff --git a/src/modules/options/dialog.cpp b/src/modules/options/dialog.cpp
index 032b70a8e..e4b5835a9 100644
--- a/src/modules/options/dialog.cpp
+++ b/src/modules/options/dialog.cpp
@@ -31,6 +31,7 @@
 #include "kvi_iconmanager.h"
 #include "kvi_module.h"
 #include "kvi_styled_controls.h"
+#include "kvi_ptrdict.h"
 
 #include <qlayout.h>
 #include <qaccel.h>
@@ -310,7 +311,7 @@ bool KviOptionsDialog::recursiveSearch(KviOptionsListViewItem * pItem,const QStr
 	}
 
 	bool bFoundSomethingHere = false;
-	QPtrDict<bool> lOptionWidgetsToMark;
+	KviPtrDict<bool> lOptionWidgetsToMark;
 	lOptionWidgetsToMark.setAutoDelete(true);
 	QTabWidget * pTabWidgetToMark = 0;
 	
@@ -396,7 +397,7 @@ bool KviOptionsDialog::recursiveSearch(KviOptionsListViewItem * pItem,const QStr
 
 	if(pTabWidgetToMark)
 	{
-		QPtrDictIterator<bool> it(lOptionWidgetsToMark);
+		KviPtrDictIterator<bool> it(lOptionWidgetsToMark);
 		while(bool * pBool = it.current())
 		{
 			KviOptionsWidget * pOptionsWidget = (KviOptionsWidget *)it.currentKey();