More alternate port to Qt4: no longer relying on Qt collection classes

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

311 files changed, 2206 insertions, 1478 deletions

diff --git a/src/kvilib/build/Makefile.am b/src/kvilib/build/Makefile.am
index e344d9971..1edff1b76 100644
--- a/src/kvilib/build/Makefile.am
+++ b/src/kvilib/build/Makefile.am
@@ -17,7 +17,6 @@ libkvilib_la_LIBADD  = $(SS_LIBLINK)
 # echo $SRC
 #
 
-
 nodist_libkvilib_la_SOURCES = \
 	../ext/moc_kvi_crypt.cpp \
 	../ext/moc_kvi_garbage.cpp \
@@ -116,17 +115,14 @@ headers_HEADERS = \
 	../config/kvi_settings.h \
 	../config/kvi_sourcesdate.h \
 	../config/kvi_wincfg.h \
-	../core/kvi_asciidict.h \
 	../core/kvi_bswap.h \
-	../core/kvi_dict.h \
 	../core/kvi_error.h \
 	../core/kvi_heapobject.h \
-	../core/kvi_intdict.h \
 	../core/kvi_inttypes.h \
-	../core/kvi_list.h \
 	../core/kvi_malloc.h \
 	../core/kvi_memmove.h \
-	../core/kvi_ptrdict.h \
+	../core/kvi_pointerlist.h \
+	../core/kvi_pointerhashtable.h \
 	../core/kvi_qcstring.h \
 	../core/kvi_qstring.h \
 	../core/kvi_strasm.h \
@@ -263,6 +259,13 @@ headers_HEADERS = \
 %.moc: %.h
 	$(SS_QT_MOC) $< -o $@
 
+#%.h.gch: %.h
+#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c $< -o $@
+
+#PRECOMPILED_HDRS = \
+#	../config/kvi_confignames.h.gch \
+#   ...
+
 #
 # Command useful to find the moc dependancies
 # grep "\.moc" ../*/*.cpp | sort | sed -e 's/[[:space:]]*#include//' | sed -e 's/\"//g'
@@ -309,9 +312,11 @@ headers_HEADERS = \
 ../tal/kvi_tal_widgetstack.cpp: ../tal/kvi_tal_widgetstack_qt4.moc
 
 #
-# All the cpp files depend on symlinks beging up-to-date
+# All the cpp files depend on the precompiled headers being up-to-date
 #
 
+#../*/*.cpp: symlinks $(PRECOMPILED_HDRS) gchsymlinks
+
 ../*/*.cpp: symlinks
 
 #
@@ -322,8 +327,13 @@ symlinks: ../config/*.h ../core/*.h ../ext/*.h ../file/*.h ../irc/*.h ../net/*.h
 	cd ../include; for i in kvi_*.h; do if [ ! -f $$i ]; then rm -f $$i; fi; done; for i in $(SS_TOPSRCDIR)/src/kvilib/*/kvi_*.h; do $(LN_S) $$i . >/dev/null 2>&1; echo "Created link to $$i"; done;
 	touch symlinks
 
+# gchsymlinks: ../config/*.h ../core/*.h ../ext/*.h ../file/*.h ../irc/*.h ../net/*.h ../system/*.h ../tal/*.h
+#	cd ../include; for i in kvi_*.gch; do if [ ! -f $$i ]; then rm -f $$i; fi; done; for i in $(SS_TOPSRCDIR)/src/kvilib/*/kvi_*.h.gch; do $(LN_S) $$i . >/dev/null 2>&1; echo "Created link to $$i"; done;
+#	touch gchsymlinks
+
 #
-# When cleaning...remove also the symlinks
+# When cleaning...remove also the symlinks, gchsymlinks and gch headers
 #
 
+#CLEANFILES = ../include/*.h ../include/*.gch symlinks gchsymlinks ../*/*.moc ../*/moc_kvi_*.cpp ../*/*.gch
 CLEANFILES = ../include/*.h symlinks ../*/*.moc ../*/moc_kvi_*.cpp
diff --git a/src/kvilib/core/kvi_asciidict.h b/src/kvilib/core/kvi_asciidict.h
deleted file mode 100644
index 94518eb6c..000000000
--- a/src/kvilib/core/kvi_asciidict.h
+++ /dev/null
@@ -1,39 +0,0 @@
-#ifndef _KVI_ASCIIDICT_H_
-#define _KVI_ASCIIDICT_H_
-//=================================================================================================
-//
-//   File : kvi_asciidict.h
-//   Creation date : Mon Jan 15 2007 04:53 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"
-
-#ifdef COMPILE_USE_QT4
-	#include <q3asciidict.h>
-	#define KviAsciiDict Q3AsciiDict
-	#define KviAsciiDictIterator Q3AsciiDictIterator
-#else
-	#include <qasciidict.h>
-	#define KviAsciiDict QAsciiDict
-	#define KviAsciiDictIterator QAsciiDictIterator
-#endif
-
-#endif //_KVI_ASCIIDICT_H_
diff --git a/src/kvilib/core/kvi_dict.h b/src/kvilib/core/kvi_dict.h
deleted file mode 100644
index cd5a9dc5a..000000000
--- a/src/kvilib/core/kvi_dict.h
+++ /dev/null
@@ -1,39 +0,0 @@
-#ifndef _KVI_DICT_H_
-#define _KVI_DICT_H_
-//=================================================================================================
-//
-//   File : kvi_dict.h
-//   Creation date : Mon Jan 15 2007 04:53 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"
-
-#ifdef COMPILE_USE_QT4
-	#include <q3dict.h>
-	#define KviDict Q3Dict
-	#define KviDictIterator Q3DictIterator
-#else
-	#include <qdict.h>
-	#define KviDict QDict
-	#define KviDictIterator QDictIterator
-#endif
-
-#endif //_KVI_DICT_H_
diff --git a/src/kvilib/core/kvi_intdict.h b/src/kvilib/core/kvi_intdict.h
deleted file mode 100644
index 5498653df..000000000
--- a/src/kvilib/core/kvi_intdict.h
+++ /dev/null
@@ -1,39 +0,0 @@
-#ifndef _KVI_INTDICT_H_
-#define _KVI_INTDICT_H_
-//=================================================================================================
-//
-//   File : kvi_intdict.h
-//   Creation date : Mon Jan 15 2007 04:53 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"
-
-#ifdef COMPILE_USE_QT4
-	#include <q3intdict.h>
-	#define KviIntDict Q3IntDict
-	#define KviIntDictIterator Q3IntDictIterator
-#else
-	#include <qintdict.h>
-	#define KviIntDict QIntDict
-	#define KviIntDictIterator QIntDictIterator
-#endif
-
-#endif //_KVI_INTDICT_H_
diff --git a/src/kvilib/core/kvi_malloc.cpp b/src/kvilib/core/kvi_malloc.cpp
index 08ba2e4c5..18ee5bb4d 100644
--- a/src/kvilib/core/kvi_malloc.cpp
+++ b/src/kvilib/core/kvi_malloc.cpp
@@ -44,7 +44,7 @@
 	// Used to find memory leaks etc...
 	//
 
-	#include "kvi_list.h"
+	#include "kvi_pointerlist.h"
 
 	typedef struct _KviMallocEntry {
 		struct _KviMallocEntry * prev;
diff --git a/src/kvilib/core/kvi_pointerhashtable.h b/src/kvilib/core/kvi_pointerhashtable.h
new file mode 100644
index 000000000..5fe6ffea6
--- /dev/null
+++ b/src/kvilib/core/kvi_pointerhashtable.h
@@ -0,0 +1,972 @@
+#ifndef _KVI_POINTERHASHTABLE_H_
+#define _KVI_POINTERHASHTABLE_H_
+//=================================================================================================
+//
+//   File : kvi_pointerhashtable.h
+//   Creation date : Sat Jan 12 2008 04:53 by Szymon Stefanek
+//
+//   This file is part of the KVirc irc client distribution
+//   Copyright (C) 2008 Szymon Stefanek (pragma at kvirc dot net)
+//
+//   This program is FREE software. You can redistribute it and/or
+//   modify it under the terms of the GNU General Public License
+//   as published by the Free Software Foundation; either version 2
+//   of the License, or (at your opinion) any later version.
+//
+//   This program is distributed in the HOPE that it will be USEFUL,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+//   See the GNU General Public License for more details.
+//
+//   You should have received a copy of the GNU General Public License
+//   along with this program. If not, write to the Free Software Foundation,
+//   Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+//
+//=================================================================================================
+
+#include "kvi_settings.h"
+#include "kvi_pointerlist.h"
+#include "kvi_string.h"
+#include "kvi_qstring.h"
+#include "kvi_malloc.h"
+#include "kvi_memmove.h"
+
+#include <ctype.h>
+
+///
+/// Hash functions for various data types
+///
+
+inline unsigned int kvi_hash_hash(const char * szKey,bool bCaseSensitive)
+{
+	unsigned int uResult = 0;
+	if(bCaseSensitive)
+	{
+		while(*szKey)
+		{
+			uResult += (unsigned char)(*(szKey));
+			szKey++;
+		}
+	} else {
+		while(*szKey)
+		{
+			uResult += (unsigned char)tolower(*(szKey));
+			szKey++;
+		}
+	}
+	return uResult;
+}
+
+inline bool kvi_hash_key_equal(const char * szKey1,const char * szKey2,bool bCaseSensitive)
+{
+	if(bCaseSensitive)
+	{
+		while(*szKey1 && *szKey2)
+		{
+			if(*szKey1 != *szKey2)
+				return false;
+			szKey1++;
+			szKey2++;
+		}
+	} else {
+		while(*szKey1 && *szKey2)
+		{
+			if(tolower(*szKey1) != tolower(*szKey2))
+				return false;
+			szKey1++;
+			szKey2++;
+		}
+	}
+	return true;
+}
+
+inline void kvi_hash_key_copy(const char * const &szFrom,const char * &szTo,bool bDeepCopy)
+{
+	if(bDeepCopy)
+	{
+		int len = kvi_strLen(szFrom);
+		char * dst = (char *)kvi_malloc(len+1);
+		kvi_fastmove(dst,szFrom,len+1);
+		szTo = dst;
+	} else {
+		szTo = szFrom; // we never modify it anyway
+	}
+}
+
+inline void kvi_hash_key_destroy(const char * &szKey,bool bDeepCopy)
+{
+	if(bDeepCopy)
+		kvi_free(szKey);
+}
+
+inline const char * & kvi_hash_key_default(const char **)
+{
+	static const char * static_null = NULL;
+	return static_null;
+}
+
+inline unsigned int kvi_hash_hash(const KviStr &szKey,bool bCaseSensitive)
+{
+	unsigned int uResult = 0;
+	const char * p = szKey.ptr();
+	if(bCaseSensitive)
+	{
+		while(*p)
+		{
+			uResult += *((const unsigned char *)p);
+			p++;
+		}
+	} else {
+		while(*p)
+		{
+			uResult += tolower(*((const unsigned char *)p));
+			p++;
+		}
+	}
+	return uResult;
+}
+
+inline bool kvi_hash_key_equal(const KviStr &szKey1,const KviStr &szKey2)
+{
+	return kvi_hash_key_equal(szKey1.ptr(),szKey2.ptr());
+}
+
+inline void kvi_hash_key_copy(const KviStr &szFrom,KviStr &szTo,bool)
+{
+	szTo = szFrom;
+}
+
+inline void kvi_hash_key_destroy(KviStr &szKey,bool)
+{
+}
+
+inline const KviStr & kvi_hash_key_default(KviStr *)
+{
+	return KviStr::emptyString();
+}
+
+inline unsigned int kvi_hash_hash(const int &iKey,bool)
+{
+	return (unsigned int)iKey;
+}
+
+inline bool kvi_hash_key_equal(const int &iKey1,const int &iKey2,bool)
+{
+	return iKey1 == iKey2;
+}
+
+inline void kvi_hash_key_copy(const int &iKeyFrom,int &iKeyTo,bool)
+{
+	iKeyTo = iKeyFrom;
+}
+
+inline void kvi_hash_key_destroy(int &iKey,bool)
+{
+}
+
+inline const int & kvi_hash_key_default(int *)
+{
+	static int static_default = 0;
+	return static_default;
+}
+
+inline unsigned int kvi_hash_hash(void * pKey,bool)
+{
+	unsigned char * pBytes = (unsigned char *)&(pKey);
+	unsigned char * pEnd = pBytes + sizeof(void *);
+	unsigned int uSum = 0;
+	while(pBytes < pEnd)
+	{
+		uSum += *pBytes;
+		pBytes++;
+	}
+	return uSum;
+}
+
+inline bool kvi_hash_key_equal(void *pKey1,void *pKey2,bool)
+{
+	return pKey1 == pKey2;
+}
+
+inline void kvi_hash_key_copy(void * const &pKeyFrom,void *&pKeyTo,bool)
+{
+	pKeyTo = pKeyFrom;
+}
+
+inline void kvi_hash_key_destroy(void *iKey,bool)
+{
+}
+
+inline void * & kvi_hash_key_default(void *)
+{
+	static void * static_default = NULL;
+	return static_default;
+}
+
+inline unsigned int kvi_hash_hash(const QString &szKey,bool bCaseSensitive)
+{
+	unsigned int uResult = 0;
+	const QChar * p = KviQString::nullTerminatedArray(szKey);
+	if(bCaseSensitive)
+	{
+		while(p->unicode())
+		{
+			uResult += p->unicode();
+			p++;
+		}
+	} else {
+		while(p->unicode())
+		{
+#ifdef COMPILE_USE_QT4
+			uResult += p->toLower().unicode();
+#else
+			uResult += p->lower().unicode();
+#endif
+			p++;
+		}
+	}
+	return uResult;
+}
+
+inline bool kvi_hash_key_equal(const QString &szKey1,const QString &szKey2,bool bCaseSensitive)
+{
+	if(bCaseSensitive)
+		return KviQString::equalCS(szKey1,szKey2);
+	return KviQString::equalCI(szKey1,szKey2);
+}
+
+inline void kvi_hash_key_copy(const QString &szFrom,QString &szTo,bool)
+{
+	szTo = szFrom;
+}
+
+inline void kvi_hash_key_destroy(QString &szKey,bool)
+{
+}
+
+inline const QString & kvi_hash_key_default(QString *)
+{
+	return KviQString::empty;
+}
+
+template<typename Key,typename T> class KviPointerHashTable;
+template<typename Key,typename T> class KviPointerHashTableIterator;
+
+template<typename Key,typename T> class KviPointerHashTableEntry
+{
+	friend class KviPointerHashTable<Key,T>;
+protected:
+	T  * pData;
+	Key  hKey;
+public:
+	Key & key(){ return hKey; };
+	T * data(){ return pData; };
+};
+
+///
+///
+/// \class KviPointerHashTable
+/// \brief A fast pointer hash table implementation
+///
+/// A very cool, very fast hash table implementation :P
+///
+/// To use this hash table you need to provide implementations
+/// for the following functions:
+///
+/// \verbatim
+///
+/// unsigned int kvi_hash_hash(const Key &hKey,bool bCaseSensitive);
+/// bool kvi_hash_key_equal(const Key &hKey1,const Key &hKey2,bool bCaseSensitive);
+/// void kvi_hash_key_copy(const Key &hKeyFrom,Key &hKeyTo,bool bDeepCopy);
+/// void kvi_hash_key_destroy(Key &hKey,bool bIsDeepCopy);
+/// const Key & kvi_hash_key_default(Key *);
+///
+/// \endverbatim
+///
+/// Implementations for the most likey Key data types are provided below.
+/// KviPointerHashTable will automagically work with const char *,QString,KviStr
+/// and integer types as keys.
+///
+/// For string Key types, the hash table may or may not be case sensitive.
+/// For other Key types the case sensitive flag has no meaning and will
+/// (hopefully) be optimized out by the compiler.
+///
+/// For pointer based keys the hash table may or may not mantain deep copies
+/// of Key data. For example, with char * keys, if deep copying is enabled
+/// then a private copy of the string data will be mantained. With deep
+/// copying disabled only char * pointers will be kept. For types
+/// that do not have meaning of deep copy the deep copying code will
+/// (hopefully) be optimized out by the compiler.
+///
+/// The hashtable mantains an array of KviPointerList based buckets.
+/// The number of buckets may be specified by the application user
+/// and does NOT need to be a prime number. Yet better to have it a power
+/// of two so the memory allocation routines will feel better and are
+/// less likely to waste space.
+///
+template<class Key,class T> class KviPointerHashTable
+{
+	friend class KviPointerHashTableIterator<Key,T>;
+protected:
+	KviPointerList<KviPointerHashTableEntry<Key,T> >      ** m_pDataArray;
+	bool                                                     m_bAutoDelete;
+	unsigned int                                             m_uSize;
+	unsigned int                                             m_uCount;
+	bool                                                     m_bCaseSensitive;
+	bool                                                     m_bDeepCopyKeys;
+	unsigned int                                             m_uIteratorIdx;
+public:
+	///
+	/// Returns the item associated to the key hKey
+	/// or NULL if no such item exists in the hash table.
+	/// Places the hash table iterator at the position
+	/// of the item found.
+	///
+	T * find(const Key & hKey)
+	{
+		m_uIteratorIdx = kvi_hash_hash(hKey,m_bCaseSensitive) % m_uSize;
+		if(!m_pDataArray[m_uIteratorIdx])return 0;
+		for(KviPointerHashTableEntry<Key,T> * e = m_pDataArray[m_uIteratorIdx]->first();e;e = m_pDataArray[m_uIteratorIdx]->next())
+		{
+			if(kvi_hash_key_equal(e->hKey,hKey,m_bCaseSensitive))return (T *)e->pData;
+		}
+		return 0;
+	}
+	
+	///
+	/// Returns the item associated to the key hKey
+	/// or NULL if no such item exists in the hash table.
+	/// Places the hash table iterator at the position
+	/// of the item found. This is an alias to find().
+	///
+	T * operator[](const Key & hKey)
+	{
+		return find(hKey);
+	}
+
+	///
+	/// Returns the number of items in this hash table
+	///
+	unsigned int count() const
+	{
+		return m_uCount;
+	}
+
+	///
+	/// Returns true if the hash table is empty
+	///
+	bool isEmpty() const
+	{
+		return m_uCount == 0;
+	}
+
+	///
+	/// Inserts the item pData at the position specified by the key hKey.
+	/// Replaces any previous item with the same key
+	/// The replaced item is deleted if autodelete is enabled.
+	/// The hash table iterator is placed at the newly inserted item.
+	///
+	void insert(const Key & hKey,T * pData)
+	{
+		if(!pData)return;
+		unsigned int uEntry = kvi_hash_hash(hKey,m_bCaseSensitive) % m_uSize;
+		if(!m_pDataArray[uEntry])m_pDataArray[uEntry] = new KviPointerList<KviPointerHashTableEntry<Key,T> >(true);
+		for(KviPointerHashTableEntry<Key,T> * e = m_pDataArray[uEntry]->first();e;e = m_pDataArray[uEntry]->next())
+		{
+			if(kvi_hash_key_equal(e->hKey,hKey,m_bCaseSensitive))
+			{
+				if(!m_bCaseSensitive)
+				{
+					// must change the key too
+					kvi_hash_key_destroy(e->hKey,m_bDeepCopyKeys);
+					kvi_hash_key_copy(hKey,e->hKey,m_bDeepCopyKeys);
+				}
+				if(m_bAutoDelete)delete e->pData;
+				e->pData = pData;
+				return;
+			}
+		}
+		KviPointerHashTableEntry<Key,T> * n = new KviPointerHashTableEntry<Key,T>;
+		kvi_hash_key_copy(hKey,n->hKey,m_bDeepCopyKeys);
+		n->pData = pData;
+		m_pDataArray[uEntry]->append(n);
+		m_uCount++;
+	}
+
+	///
+	/// Inserts the item pData at the position specified by the key hKey.
+	/// Replaces any previous item with the same key
+	/// The replaced item is deleted if autodelete is enabled.
+	/// The hash table iterator is placed at the newly inserted item.
+	/// This is just an alias to insert() with a different name.
+	///
+	void replace(const Key & hKey,T * pData)
+	{
+		insert(hKey,pData);
+	}
+
+	///
+	/// Removes the item pointer associated to the key hKey, if such an item
+	/// exists in the hash table. The item is deleted if autodeletion
+	/// is enabled. Returns true if the item was found and removed and false if it wasn't found.
+	/// Invalidates the hash table iterator.
+	///
+	bool remove(const Key & hKey)
+	{
+		unsigned int uEntry = kvi_hash_hash(hKey,m_bCaseSensitive) % m_uSize;
+		if(!m_pDataArray[uEntry])return false;
+		for(KviPointerHashTableEntry<Key,T> * e = m_pDataArray[uEntry]->first();e;e = m_pDataArray[uEntry]->next())
+		{
+			if(kvi_hash_key_equal(e->hKey,hKey,m_bCaseSensitive))
+			{
+				kvi_hash_key_destroy(e->hKey,m_bDeepCopyKeys);
+				if(m_bAutoDelete)delete ((T *)(e->pData));
+				m_pDataArray[uEntry]->removeRef(e);
+				if(m_pDataArray[uEntry]->isEmpty())
+				{
+					delete m_pDataArray[uEntry];
+					m_pDataArray[uEntry] = 0;
+				}
+				m_uCount--;
+				return true;
+			}
+		}
+		return false;
+	}
+
+	///
+	/// Removes the first occurence of the item pointer pRef. The item is deleted if autodeletion
+	/// is enabled. Returns true if the pointer was found and false otherwise
+	/// Invalidates the hash table iterator.
+	///
+	bool removeRef(const T * pRef)
+	{
+		for(unsigned int i=0;i<m_uSize;i++)
+		{
+			if(m_pDataArray[i])
+			{
+				for(KviPointerHashTableEntry<Key,T> * e = m_pDataArray[i]->first();e;e = m_pDataArray[i]->next())
+				{
+					if(e->pData == pRef)
+					{
+						kvi_hash_key_destroy(e->hKey,m_bDeepCopyKeys);
+						if(m_bAutoDelete)delete ((T *)(e->pData));
+						m_pDataArray[i]->removeRef(e);
+						if(m_pDataArray[i]->isEmpty())
+						{
+							delete m_pDataArray[i];
+							m_pDataArray[i] = 0;
+						}
+						m_uCount--;
+						return true;
+					}
+				}
+			}			
+		}
+		return false;
+	}
+
+	///
+	/// Removes all the items from the hash table.
+	/// The items are deleted if autodeletion is enabled.
+	/// Invalidates the hash table iterator.
+	///
+	void clear()
+	{
+		for(unsigned int i=0;i<m_uSize;i++)
+		{
+			if(m_pDataArray[i])
+			{
+				for(KviPointerHashTableEntry<Key,T> * e = m_pDataArray[i]->first();e;e = m_pDataArray[i]->next())
+				{
+					kvi_hash_key_destroy(e->hKey,m_bDeepCopyKeys);
+					if(m_bAutoDelete)
+						delete ((T *)(e->pData));
+				}
+				delete m_pDataArray[i];
+				m_pDataArray[i] = 0;
+			}
+		}
+		m_uCount = 0;
+	}
+
+	///
+	/// Searches for the item pointer pRef and returns
+	/// it's hash table entry, if found, and NULL otherwise.
+	/// The hash table iterator is placed at the item found.
+	///
+	KviPointerHashTableEntry<Key,T> * findRef(const T * pRef)
+	{
+		for(m_uIteratorIdx = 0;m_uIteratorIdx<m_uSize;m_uIteratorIdx++)
+		{
+			if(m_pDataArray[m_uIteratorIdx])
+			{
+				for(KviPointerHashTableEntry<Key,T> * e = m_pDataArray[m_uIteratorIdx]->first();e;e = m_pDataArray[m_uIteratorIdx]->next())
+				{
+					if(e->pData == pRef)return e;
+				}
+			}
+		}
+		return 0;
+	}
+
+	///
+	/// Returns the entry pointed by the hash table iterator.
+	/// This function must be preceeded by a call to firstEntry(), first()
+	/// or findRef().
+	///
+	KviPointerHashTableEntry<Key,T> * currentEntry()
+	{
+		if(m_uIteratorIdx >= m_uSize)return 0;
+		if(m_pDataArray[m_uIteratorIdx])return m_pDataArray[m_uIteratorIdx]->current();
+		return 0;
+	}
+
+	///
+	/// Places the hash table iterator at the first entry
+	/// and returns it.
+	///
+	KviPointerHashTableEntry<Key,T> * firstEntry()
+	{
+		m_uIteratorIdx = 0;
+		while(m_uIteratorIdx < m_uSize && (!m_pDataArray[m_uIteratorIdx]))
+		{
+			m_uIteratorIdx++;
+		}
+		if(m_uIteratorIdx == m_uSize)return 0;
+		return m_pDataArray[m_uIteratorIdx]->first();
+	}
+
+	///
+	/// Places the hash table iterator at the next entry
+	/// and returns it.
+	/// This function must be preceeded by a call to firstEntry(), first()
+	/// or findRef().
+	///
+	KviPointerHashTableEntry<Key,T> * nextEntry()
+	{
+		if(m_uIteratorIdx >= m_uSize)return 0;
+
+		if(m_uIteratorIdx < m_uSize)
+		{
+			KviPointerHashTableEntry<Key,T> * t = m_pDataArray[m_uIteratorIdx]->next();
+			if(t)return t;
+		}
+
+		m_uIteratorIdx++;
+
+		while(m_uIteratorIdx < m_uSize && (!m_pDataArray[m_uIteratorIdx]))
+		{
+			m_uIteratorIdx++;
+		}
+
+		if(m_uIteratorIdx == m_uSize)return 0;
+
+		return m_pDataArray[m_uIteratorIdx]->first();
+
+	}
+
+	///
+	/// Returns the data value pointer pointed by the hash table iterator.
+	/// This function must be preceeded by a call to firstEntry(), first()
+	/// or findRef().
+	///
+	T * current()
+	{
+		if(m_uIteratorIdx >= m_uSize)return 0;
+		if(m_pDataArray[m_uIteratorIdx])
+		{
+			KviPointerHashTableEntry<Key,T> * e = m_pDataArray[m_uIteratorIdx]->current();
+			if(!e)return 0;
+			return e->data();
+		}
+		return 0;
+	}
+	
+	///
+	/// Returns the key pointed by the hash table iterator.
+	/// This function must be preceeded by a call to firstEntry(), first()
+	/// or findRef().
+	///
+	const Key & currentKey()
+	{
+		if(m_uIteratorIdx >= m_uSize)return kvi_hash_key_default(((Key *)NULL));
+		if(m_pDataArray[m_uIteratorIdx])
+		{
+			KviPointerHashTableEntry<Key,T> * e = m_pDataArray[m_uIteratorIdx]->current();
+			if(!e)return kvi_hash_key_default(((Key *)NULL));
+			return e->key();
+		}
+		return kvi_hash_key_default(((Key *)NULL));
+	}
+
+	///
+	/// Places the hash table iterator at the first entry
+	/// and returns the associated data value pointer.
+	///
+	T * first()
+	{
+		m_uIteratorIdx = 0;
+		while(m_uIteratorIdx < m_uSize && (!m_pDataArray[m_uIteratorIdx]))
+		{
+			m_uIteratorIdx++;
+		}
+		if(m_uIteratorIdx == m_uSize)return 0;
+		KviPointerHashTableEntry<Key,T> * e = m_pDataArray[m_uIteratorIdx]->first();
+		if(!e)return 0;
+		return e->data();
+	}
+
+	///
+	/// Places the hash table iterator at the next entry
+	/// and returns the associated data value pointer.
+	/// This function must be preceeded by a call to firstEntry(), first()
+	/// or findRef().
+	///
+	T * next()
+	{
+		if(m_uIteratorIdx >= m_uSize)return 0;
+
+		if(m_uIteratorIdx < m_uSize)
+		{
+			KviPointerHashTableEntry<Key,T> * t = m_pDataArray[m_uIteratorIdx]->next();
+			if(t)
+			{
+				return t->data();
+			}
+		}
+
+		m_uIteratorIdx++;
+
+		while(m_uIteratorIdx < m_uSize && (!m_pDataArray[m_uIteratorIdx]))
+		{
+			m_uIteratorIdx++;
+		}
+
+		if(m_uIteratorIdx == m_uSize)return 0;
+
+		KviPointerHashTableEntry<Key,T> * e = m_pDataArray[m_uIteratorIdx]->first();
+		if(!e)return 0;
+		return e->data();
+	}
+
+	///
+	/// Removes all items in the hash table and then
+	/// makes a complete shallow copy of the data contained in t.
+	/// The removed items are deleted if autodeletion is enabled.
+	/// The hash table iterator is invalidated.
+	/// Does not change autodelete flag: make sure you not delete the items twice :)
+	///
+	void copyFrom(KviPointerHashTable<Key,T> &t)
+	{
+		clear();
+		for(KviPointerHashTableEntry<Key,T> * e = t.firstEntry();e;e = t.nextEntry())
+			insert(e->key(),e->data());
+	}
+
+	///
+	/// Inserts a complete shallow copy of the data contained in t.
+	/// The hash table iterator is invalidated.
+	///
+	void insert(KviPointerHashTable<Key,T> &t)
+	{
+		for(KviPointerHashTableEntry<Key,T> * e = t.firstEntry();e;e = t.nextEntry())
+			insert(e->key(),e->data());
+	}
+
+	///
+	/// Enables or disabled the autodeletion feature.
+	/// Items are deleted upon removal when the feature is enabled.
+	///
+	void setAutoDelete(bool bAutoDelete)
+	{
+		m_bAutoDelete = bAutoDelete;
+	}
+
+	///
+	/// Creates an empty hash table.
+	/// Automatic deletion is enabled.
+	///
+	/// \param uSize The number of hash buckets: does NOT necesairly need to be prime
+	/// \param bCaseSensitive Are the key comparisons case sensitive ?
+	/// \param Do we need to mantain deep copies of keys ?
+	///
+	KviPointerHashTable(unsigned int uSize = 32,bool bCaseSensitive = true,bool bDeepCopyKeys = true)
+	{
+		m_uCount = 0;
+		m_bCaseSensitive = bCaseSensitive;
+		m_bAutoDelete = true;
+		m_bDeepCopyKeys = bDeepCopyKeys;
+		m_uSize = uSize > 0 ? uSize : 32;
+		m_pDataArray = new KviPointerList<KviPointerHashTableEntry<Key,T> > *[uSize];
+		for(unsigned int i=0;i<m_uSize;i++)m_pDataArray[i] = 0;
+	}
+
+	///
+	/// First creates an empty hash table
+	/// and then inserts a copy of all the item pointers present in t.
+	/// The autodelete feature is automatically disabled (take care!).
+	///
+	KviPointerHashTable(KviPointerHashTable<Key,T> &t)
+	{
+		m_uCount = 0;
+		m_bAutoDelete = false;
+		m_bCaseSensitive = t.m_bCaseSensitive;
+		m_bDeepCopyKeys = t.m_bDeepCopyKeys;
+		m_uSize = t.m_uSize;
+		m_pDataArray = new KviPointerList<KviPointerHashTableEntry<Key,T> > *[m_uSize];
+		for(unsigned int i=0;i<m_uSize;i++)m_pDataArray[i] = 0;
+		copyFrom(t);
+	}
+
+	///
+	/// Destroys the hash table and all the items contained within.
+	/// Items are deleted if autodeletion is enabled.
+	///
+	~KviPointerHashTable()
+	{
+		clear();
+		delete [] m_pDataArray;
+	}
+};
+
+template<typename Key,typename T> class KviPointerHashTableIterator
+{
+protected:
+	const KviPointerHashTable<Key,T>                         * m_pHashTable;
+	unsigned int                                               m_uEntryIndex;
+	KviPointerListIterator<KviPointerHashTableEntry<Key,T> > * m_pIterator;
+public:
+	///
+	/// Creates an iterator copy.
+	/// The new iterator points exactly to the item pointed by src.
+	///
+	void operator = (const KviPointerHashTableIterator<Key,T> &src)
+	{
+		m_pHashTable = src.m_pHashTable;
+		m_uEntryIndex = src.m_uEntryIndex;
+		if(src.m_pIterator)
+			m_pIterator = new KviPointerListIterator<KviPointerHashTableEntry<Key,T> >(*(src.m_pIterator));
+		else
+			m_pIterator = NULL;
+	}
+
+	///
+	/// Moves the iterator to the first element of the hash table.
+	/// Returns true in case of success or false if the hash table is empty.
+	///
+	bool moveFirst()
+	{
+		if(m_pIterator)
+		{
+			delete m_pIterator;
+			m_pIterator = NULL;
+		}
+
+		m_uEntryIndex = 0;
+		while((m_uEntryIndex < m_pHashTable->m_uSize) && (!(m_pHashTable->m_pDataArray[m_uEntryIndex])))
+		{
+			m_uEntryIndex++;
+		}
+
+		if(m_uEntryIndex == m_pHashTable->m_uSize)
+			return false;
+
+		m_pIterator = new KviPointerListIterator<KviPointerHashTableEntry<Key,T> >(*(m_pHashTable->m_pDataArray[m_uEntryIndex]));
+		bool bRet = m_pIterator->moveFirst();
+		if(!bRet)
+		{
+			delete m_pIterator;
+			m_pIterator = NULL;
+		}
+		return bRet;
+	}
+	
+	///
+	/// Moves the iterator to the last element of the hash table.
+	/// Returns true in case of success or false if the hash table is empty.
+	///
+	bool moveLast()
+	{
+		if(m_pIterator)
+		{
+			delete m_pIterator;
+			m_pIterator = NULL;
+		}
+
+		m_uEntryIndex = m_pHashTable->m_uSize;
+		while(m_uEntryIndex > 0)
+		{
+			m_uEntryIndex--;
+			if(m_pHashTable->m_pDataArray[m_uEntryIndex])
+			{
+				m_pIterator = new KviPointerListIterator<KviPointerHashTableEntry<Key,T> >(*(m_pHashTable->m_pDataArray[m_uEntryIndex]));
+				bool bRet = m_pIterator->moveLast();
+				if(!bRet)
+				{
+					delete m_pIterator;
+					m_pIterator = NULL;
+				}
+				return bRet;
+			}
+		}
+		return false;
+	}
+
+	///
+	/// Moves the iterator to the next element of the hash table.
+	/// The iterator must be actually valid for this function to work.
+	/// Returns true in case of success or false if there is no next item.
+	///
+	bool moveNext()
+	{
+		if(!m_pIterator)
+			return false;
+		if(m_pIterator->moveNext())
+			return true;
+		if(m_pIterator)
+		{
+			delete m_pIterator;
+			m_pIterator = NULL;
+		}
+		m_uEntryIndex++;
+		while((m_uEntryIndex < m_pHashTable->m_uSize) && (!(m_pHashTable->m_pDataArray[m_uEntryIndex])))
+		{
+			m_uEntryIndex++;
+		}
+		if(m_uEntryIndex == m_pHashTable->m_uSize)
+			return false;
+		m_pIterator = new KviPointerListIterator<KviPointerHashTableEntry<Key,T> >(*(m_pHashTable->m_pDataArray[m_uEntryIndex]));
+		bool bRet = m_pIterator->moveFirst();
+		if(!bRet)
+		{
+			delete m_pIterator;
+			m_pIterator = NULL;
+		}
+		return bRet;
+	}
+	
+	///
+	/// Moves the iterator to the next element of the hash table.
+	/// The iterator must be actually valid for this function to work.
+	/// Returns true in case of success or false if there is no next item.
+	/// This is just an alias to moveNext().
+	///
+	bool operator ++()
+	{
+		return moveNext();
+	}
+	
+	///
+	/// Moves the iterator to the previous element of the hash table.
+	/// The iterator must be actually valid for this function to work.
+	/// Returns true in case of success or false if there is no previous item.
+	///
+	bool movePrev()
+	{
+		if(!m_pIterator)
+			return false;
+		if(m_pIterator->movePrev())
+			return true;
+		if(m_pIterator)
+		{
+			delete m_pIterator;
+			m_pIterator = NULL;
+		}
+		if(m_uEntryIndex >= m_pHashTable->m_uSize)
+			return false;
+		while(m_uEntryIndex > 0)
+		{
+			m_uEntryIndex--;
+			if(m_pHashTable->m_pDataArray[m_uEntryIndex])
+			{
+				m_pIterator = new KviPointerListIterator<KviPointerHashTableEntry<Key,T> >(*(m_pHashTable->m_pDataArray[m_uEntryIndex]));
+				bool bRet = m_pIterator->moveLast();
+				if(!bRet)
+				{
+					delete m_pIterator;
+					m_pIterator = NULL;
+				}
+				return bRet;
+			}
+		}
+		return false;
+	}
+
+	
+	///
+	/// Moves the iterator to the previous element of the hash table.
+	/// The iterator must be actually valid for this function to work.
+	/// Returns true in case of success or false if there is no previous item.
+	/// This is just an alias to movePrev() with a different name.
+	///
+	bool operator --()
+	{
+		return movePrev();
+	}
+
+	///
+	/// Returs the value pointed by the iterator
+	/// or a default constructed value if the iterator is not valid.
+	/// This is an alias to operator *() with just a different name.
+	///
+	T * current() const
+	{
+		return m_pIterator ? m_pIterator->current()->data() : NULL;
+	}
+
+	///
+	/// Returs the value pointed by the iterator
+	/// or a default constructed value if the iterator is not valid.
+	/// This is an alias to current() with just a different name.
+	///
+	T * operator *() const
+	{
+		return m_pIterator ? m_pIterator->current()->data() : NULL;
+	}
+	
+	///
+	/// Returs the key pointed by the iterator
+	/// or a default constructed key if the iterator is not valid.
+	///
+	const Key & currentKey() const
+	{
+		return m_pIterator ? m_pIterator->current()->key() : kvi_hash_key_default(((Key *)NULL));
+	}
+
+	///
+	/// Moves the iterator to the first element of the hash table.
+	/// Returns the first item found or NULL if the hash table is empty.
+	///
+	T * toFirst()
+	{
+		if(!moveFirst())
+			return NULL;
+		return current();
+	}
+public:
+	///
+	/// Creates an iterator pointing to the first item in the hash table, if any.
+	///
+	KviPointerHashTableIterator(const KviPointerHashTable<Key,T> &hTable)
+	{
+		m_pHashTable = &hTable;
+		m_uEntryIndex = 0;
+		m_pIterator = NULL;
+		moveFirst();
+	}
+	
+	///
+	/// Destroys the iterator
+	///
+	~KviPointerHashTableIterator()
+	{
+		if(m_pIterator)
+			delete m_pIterator;
+	}
+};
+
+
+
+
+#endif //_KVI_POINTERHASHTABLE_H_
diff --git a/src/kvilib/core/kvi_list.h b/src/kvilib/core/kvi_pointerlist.h
index 28345d49d..afe08e526 100644
--- a/src/kvilib/core/kvi_list.h
+++ b/src/kvilib/core/kvi_pointerlist.h
@@ -1,8 +1,8 @@
-#ifndef _KVI_LIST_H_
-#define _KVI_LIST_H_
+#ifndef _KVI_POINTERLIST_H_
+#define _KVI_POINTERLIST_H_
 //=================================================================================================
 //
-//   File : kvi_list.h
+//   File : kvi_pointerlist.h
 //   Creation date : Tue Jul 6 1999 14:52:20 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -43,8 +43,8 @@
 
 #include "kvi_settings.h"
 
-template<typename T> class KviPtrList;
-template<typename T> class KviPtrListIterator;
+template<typename T> class KviPointerList;
+template<typename T> class KviPointerListIterator;
 
 #ifndef NULL
 	#define NULL 0
@@ -53,17 +53,17 @@ template<typename T> class KviPtrListIterator;
 ///
 /// \internal
 ///
-class KviPtrListNode
+class KviPointerListNode
 {
 public:
-	KviPtrListNode * m_pPrev;
+	KviPointerListNode * m_pPrev;
 	void               * m_pData;
-	KviPtrListNode * m_pNext;
+	KviPointerListNode * m_pNext;
 };
 
 ///
-/// \class KviPtrListIterator
-/// \brief A fast KviPtrList iterator.
+/// \class KviPointerListIterator
+/// \brief A fast KviPointerList iterator.
 ///
 /// This class allows traversing the list sequentially.
 /// Multilpe iterators can traverse the list at the same time.
@@ -71,7 +71,7 @@ public:
 /// Iteration example 1:
 ///
 /// \verbatim
-/// KviPtrListIterator<T> it(list);
+/// KviPointerListIterator<T> it(list);
 /// for(bool b = it.moveFirst();b;b = it.moveNext())
 /// {
 ///     T * pData = it.data();
@@ -82,7 +82,7 @@ public:
 /// Iteration example 2:
 ///
 /// \verbatim
-/// KviPtrListIterator<T> it(list);
+/// KviPointerListIterator<T> it(list);
 /// if(it.moveFirst())
 /// {
 ///     do {
@@ -95,7 +95,7 @@ public:
 /// Iteration example 3:
 ///
 /// \verbatim
-/// KviPtrListIterator<T> it(list.iteratorAt(10));
+/// KviPointerListIterator<T> it(list.iteratorAt(10));
 /// if(it.isValid())
 /// {
 ///    do {
@@ -111,10 +111,10 @@ public:
 /// The following code will NOT work (and crash):
 ///
 /// \verbatim
-/// KviPtrList<T> l;
+/// KviPointerList<T> l;
 /// l.append(new KviStr("x"));
 /// l.append(new KviStr("y"));
-/// KviPtrListIterator<T> it(l);
+/// KviPointerListIterator<T> it(l);
 /// it.moveFirst();
 /// l.removeFirst();
 /// KviStr * tmp = it.data(); <-- this will crash
@@ -131,17 +131,17 @@ public:
 ///
 /// \warning This class is not thread safe by itself.
 ///
-template<typename T> class KviPtrListIterator
+template<typename T> class KviPointerListIterator
 {
 protected:
-	KviPtrList<T>                 * m_pList;
-	KviPtrListNode                * m_pNode;
+	KviPointerList<T>                 * m_pList;
+	KviPointerListNode                * m_pNode;
 public:
 	///
 	/// Creates an iterator copy.
 	/// The new iterator points exactly to the item pointed by src.
 	///
-	KviPtrListIterator(const KviPtrListIterator<T> &src)
+	KviPointerListIterator(const KviPointerListIterator<T> &src)
 	{
 		m_pList = src.m_pList;
 		m_pNode = src.m_pNode;
@@ -151,9 +151,9 @@ public:
 	/// Creates an iterator for the list l.
 	/// The iterator points to the first list item, if any.
 	///
-	KviPtrListIterator(KviPtrList<T> &l)
+	KviPointerListIterator(KviPointerList<T> &l)
 	{
-		m_pList = (KviPtrList<T> *)&l;
+		m_pList = (KviPointerList<T> *)&l;
 		m_pNode = m_pList->m_pHead;
 	}
 
@@ -161,9 +161,9 @@ public:
 	/// Creates an iterator for the list l.
 	/// The iterator points to the specified list node.
 	///
-	KviPtrListIterator(KviPtrList<T> &l,KviPtrListNode * pNode)
+	KviPointerListIterator(KviPointerList<T> &l,KviPointerListNode * pNode)
 	{
-		m_pList = (KviPtrList<T> *)&l;
+		m_pList = (KviPointerList<T> *)&l;
 		m_pNode = pNode;
 	}
 
@@ -171,7 +171,7 @@ public:
 	/// Creates an iterator copy.
 	/// The new iterator points exactly to the item pointed by src.
 	///
-	void operator = (const KviPtrListIterator<T> &src)
+	void operator = (const KviPointerListIterator<T> &src)
 	{
 		m_pList = src.m_pList;
 		m_pNode = src.m_pNode;
@@ -277,7 +277,7 @@ public:
 };
 
 ///
-/// \class KviPtrList
+/// \class KviPointerList
 /// \brief A template double linked list of pointers.
 ///
 /// The main advantage of this type of list is speed.
@@ -310,7 +310,7 @@ public:
 /// Typcal usage:
 ///
 /// \verbatim
-///   KviPtrList<MyClass> list();
+///   KviPointerList<MyClass> list();
 ///   list.append(new MyClass());
 ///   list.append(new MyClass());
 ///   ...
@@ -322,15 +322,15 @@ public:
 /// protect concurrent access from multiple threads by
 /// using an external synchronization tool (such as KviMutex).
 ///
-template<typename T> class KviPtrList
+template<typename T> class KviPointerList
 {
-	friend class KviPtrListIterator<T>;
+	friend class KviPointerListIterator<T>;
 protected:
 	bool   m_bAutoDelete;   //< do we automatically delete items when they are removed ?
 
-	KviPtrListNode * m_pHead;         //< our list head pointer (NULL if there are no items in the list)
-	KviPtrListNode * m_pTail;         //< our list tail
-	KviPtrListNode * m_pAux;          //< our iteration pointer
+	KviPointerListNode * m_pHead;         //< our list head pointer (NULL if there are no items in the list)
+	KviPointerListNode * m_pTail;         //< our list tail
+	KviPointerListNode * m_pAux;          //< our iteration pointer
 
 	unsigned int m_uCount;  //< the count of items in the list
 protected:
@@ -341,10 +341,10 @@ protected:
 	/// if ref is not found in the list
 	/// also sets the current iteration pointer to the newly inserted item
 	///
-	void insertBeforeSafe(KviPtrListNode * ref,const T * d)
+	void insertBeforeSafe(KviPointerListNode * ref,const T * d)
 	{
 		m_pAux = ref;
-		KviPtrListNode * n = new KviPtrListNode;
+		KviPointerListNode * n = new KviPointerListNode;
 		n->m_pPrev = m_pAux->m_pPrev;
 		n->m_pNext = m_pAux;
 		if(m_pAux->m_pPrev)
@@ -364,9 +364,9 @@ protected:
 	/// Grabs the first element from the list src
 	/// and puts it as the first element of this list.
 	///
-	void grabFirstAndPrepend(KviPtrList<T> * src)
+	void grabFirstAndPrepend(KviPointerList<T> * src)
 	{
-		KviPtrListNode * pNewHead = src->m_pHead;
+		KviPointerListNode * pNewHead = src->m_pHead;
 		if(!pNewHead)
 			return;
 
@@ -421,17 +421,17 @@ public:
 	/// by respecting the sort order.
 	/// The src list elements are removed.
 	///
-	void merge(KviPtrList<T> * src)
+	void merge(KviPointerList<T> * src)
 	{
 		m_pAux = m_pHead;
-		KviPtrListNode * n = src->m_pHead;
+		KviPointerListNode * n = src->m_pHead;
 		m_uCount += src->m_uCount;
 		while(m_pAux && n)
 		{
 			if(kvi_compare((const T *)(m_pAux->m_pData),(const T *)(n->m_pData)) > 0)
 			{
 				// our element is greater, n->m_pData goes first
-				KviPtrListNode * pNext = n->m_pNext;
+				KviPointerListNode * pNext = n->m_pNext;
 				n->m_pPrev = m_pAux->m_pPrev; // his prev becomes 
 				n->m_pNext = m_pAux;
 				if(m_pAux->m_pPrev)
@@ -465,9 +465,9 @@ public:
 		src->m_uCount = 0;
 	}
 	
-	void swap(KviPtrList<T> * src)
+	void swap(KviPointerList<T> * src)
 	{
-		KviPtrListNode * n = m_pHead;
+		KviPointerListNode * n = m_pHead;
 		m_pHead = src->m_pHead;
 		src->m_pHead = n;
 		n = m_pTail;
@@ -490,10 +490,10 @@ public:
 	{
 		if(m_uCount < 2)return;
 
-		KviPtrList<T> carry;
-		KviPtrList<T> tmp[64];
-		KviPtrList * fill = &tmp[0];
-		KviPtrList * counter;
+		KviPointerList<T> carry;
+		KviPointerList<T> tmp[64];
+		KviPointerList * fill = &tmp[0];
+		KviPointerList * counter;
 
 		do {
 			carry.grabFirstAndPrepend(this);
@@ -523,7 +523,7 @@ public:
 	///
 	void inSort(T * t)
 	{
-		KviPtrListNode * x = m_pHead;
+		KviPointerListNode * x = m_pHead;
 		while(x && (kvi_compare(((T *)x->m_pData),t) > 0))x = x->m_pNext;
 		if(!x)append(t);
 		else insertBeforeSafe(x,t);
@@ -582,9 +582,9 @@ public:
 	///
 	/// Returns an iterator pointing to the first item of the list.
 	///
-	KviPtrListIterator<T> iteratorAtFirst()
+	KviPointerListIterator<T> iteratorAtFirst()
 	{
-		return KviPtrListIterator<T>(*this,m_pHead);
+		return KviPointerListIterator<T>(*this,m_pHead);
 	}
 
 	///
@@ -601,9 +601,9 @@ public:
 	///
 	/// Returns an iterator pointing to the first item of the list.
 	///
-	KviPtrListIterator<T> iteratorAtLast()
+	KviPointerListIterator<T> iteratorAtLast()
 	{
-		return KviPtrListIterator<T>(*this,m_pTail);
+		return KviPointerListIterator<T>(*this,m_pTail);
 	}
 
 	///
@@ -634,9 +634,9 @@ public:
 	/// A call to this function MUST be preceded by a call to
 	/// first(),last(),at() or findRef()
 	///
-	KviPtrListIterator<T> iteratorAtCurrent()
+	KviPointerListIterator<T> iteratorAtCurrent()
 	{
-		return KviPtrListIterator<T>(*this,m_pAux);
+		return KviPointerListIterator<T>(*this,m_pAux);
 	}
 
 	///
@@ -685,18 +685,18 @@ public:
 	///
 	/// Returns an iterator pointing to the item at the specified index.
 	///
-	KviPtrListIterator<T> iteratorAt(int idx)
+	KviPointerListIterator<T> iteratorAt(int idx)
 	{
-		KviPtrListNode * n = m_pHead;
+		KviPointerListNode * n = m_pHead;
 		int cnt = 0;
 		while(n)
 		{
 			if(idx == cnt)
-				return KviPtrListIterator<T>(*this,n);
+				return KviPointerListIterator<T>(*this,n);
 			n = n->m_pNext;
 			cnt++;
 		}
-		return KviPtrListIterator<T>(*this,NULL);
+		return KviPointerListIterator<T>(*this,NULL);
 	}
 
 	///
@@ -718,16 +718,16 @@ public:
 	///
 	/// Returns an iterator pointing to the item with pointer d.
 	///
-	KviPtrListIterator<T> iteratorAtRef(const T * d)
+	KviPointerListIterator<T> iteratorAtRef(const T * d)
 	{
-		KviPtrListNode * n = m_pHead;
+		KviPointerListNode * n = m_pHead;
 		while(n)
 		{
 			if(n->m_pData == d)
-				return KviPtrListIterator<T>(*this,n);
+				return KviPointerListIterator<T>(*this,n);
 			n = n->m_pNext;
 		}
-		return KviPtrListIterator<T>(*this,NULL);
+		return KviPointerListIterator<T>(*this,NULL);
 	}
 
 	///
@@ -737,13 +737,13 @@ public:
 	{
 		if(!m_pHead)
 		{
-			m_pHead = new KviPtrListNode;
+			m_pHead = new KviPointerListNode;
 			m_pHead->m_pPrev = NULL;
 			m_pHead->m_pNext = NULL;
 			m_pHead->m_pData = (void *)d;
 			m_pTail = m_pHead;
 		} else {
-			m_pTail->m_pNext = new KviPtrListNode;
+			m_pTail->m_pNext = new KviPointerListNode;
 			m_pTail->m_pNext->m_pPrev = m_pTail;
 			m_pTail->m_pNext->m_pNext = NULL;
 			m_pTail->m_pNext->m_pData = (void *)d;
@@ -755,7 +755,7 @@ public:
 	///
 	/// Appends all the items from the list l to this list
 	///
-	void append(KviPtrList<T> * l)
+	void append(KviPointerList<T> * l)
 	{
 		for(T * t = l->first();t;t = l->next())append(t);
 	}
@@ -764,7 +764,7 @@ public:
 	/// Prepends (inserts in head position) all the items from
 	/// the list l to this list
 	///
-	void prepend(KviPtrList<T> * l)
+	void prepend(KviPointerList<T> * l)
 	{
 		for(T * t = l->last();t;t = l->prev())prepend(t);
 	}
@@ -776,13 +776,13 @@ public:
 	{
 		if(!m_pHead)
 		{
-			m_pHead = new KviPtrListNode;
+			m_pHead = new KviPointerListNode;
 			m_pHead->m_pPrev = NULL;
 			m_pHead->m_pNext = NULL;
 			m_pHead->m_pData = (void *)d;
 			m_pTail = m_pHead;
 		} else {
-			m_pHead->m_pPrev = new KviPtrListNode;
+			m_pHead->m_pPrev = new KviPointerListNode;
 			m_pHead->m_pPrev->m_pNext = m_pHead;
 			m_pHead->m_pPrev->m_pPrev = NULL;
 			m_pHead->m_pPrev->m_pData = (void *)d;
@@ -949,7 +949,7 @@ public:
 			append(d);
 			return;
 		}
-		KviPtrListNode * n = new KviPtrListNode;
+		KviPointerListNode * n = new KviPointerListNode;
 		n->m_pPrev = m_pAux;
 		n->m_pNext = m_pAux->m_pNext;
 		if(m_pAux->m_pNext)
@@ -973,7 +973,7 @@ public:
 			prepend(d);
 			return;
 		}
-		KviPtrListNode * n = new KviPtrListNode;
+		KviPointerListNode * n = new KviPointerListNode;
 		n->m_pPrev = m_pAux->m_pPrev;
 		n->m_pNext = m_pAux;
 		if(m_pAux->m_pPrev)
@@ -991,12 +991,12 @@ public:
 	void invert()
 	{
 		if(!m_pHead)return;
-		KviPtrListNode * oldHead = m_pHead;
-		KviPtrListNode * oldTail = m_pTail;
-		KviPtrListNode * n = m_pHead;
+		KviPointerListNode * oldHead = m_pHead;
+		KviPointerListNode * oldTail = m_pTail;
+		KviPointerListNode * n = m_pHead;
 		while(n)
 		{
-			KviPtrListNode * next = n->m_pNext;
+			KviPointerListNode * next = n->m_pNext;
 			n->m_pNext = n->m_pPrev;
 			n->m_pPrev = next;
 			n = next;
@@ -1008,7 +1008,7 @@ public:
 	///
 	/// clears the list and inserts all the items from the list l
 	///
-	void copyFrom(KviPtrList<T> * l)
+	void copyFrom(KviPointerList<T> * l)
 	{
 		clear();
 		for(T * t = l->first();t;t = l->next())append(t);
@@ -1017,7 +1017,7 @@ public:
 	///
 	/// equivalent to copyFrom(l)
 	///
-	KviPtrList<T> & operator = (KviPtrList<T> &l)
+	KviPointerList<T> & operator = (KviPointerList<T> &l)
 	{
 		copyFrom(&l);
 		return *this;
@@ -1026,7 +1026,7 @@ public:
 	///
 	/// creates a template list
 	///
-	KviPtrList<T>(bool bAutoDelete = true)
+	KviPointerList<T>(bool bAutoDelete = true)
 	{
 		m_bAutoDelete = bAutoDelete;
 		m_pHead = NULL;
@@ -1039,18 +1039,18 @@ public:
 	/// destroys the list
 	/// if autoDelete() is set to true, all the items are deleted
 	///
-	virtual ~KviPtrList<T>()
+	virtual ~KviPointerList<T>()
 	{
 		clear();
 	};
 };
 
-#define KviPtrListBase KviPtrList
+#define KviPointerListBase KviPointerList
 
 // BROKEN MSVC LINKER
 #ifdef COMPILE_ON_WINDOWS
 	#include "kvi_string.h"
-	template class KVILIB_API KviPtrList<KviStr>;
+	template class KVILIB_API KviPointerList<KviStr>;
 #endif
 
-#endif //_KVI_LIST_H_
+#endif //_KVI_POINTERLIST_H_
diff --git a/src/kvilib/core/kvi_ptrdict.h b/src/kvilib/core/kvi_ptrdict.h
deleted file mode 100644
index 3e2535372..000000000
--- a/src/kvilib/core/kvi_ptrdict.h
+++ /dev/null
@@ -1,39 +0,0 @@
-#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"
-
-#ifdef 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/ext/kvi_config.cpp b/src/kvilib/ext/kvi_config.cpp
index bf778bd84..2def6c974 100644
--- a/src/kvilib/ext/kvi_config.cpp
+++ b/src/kvilib/ext/kvi_config.cpp
@@ -42,7 +42,7 @@ KviConfig::KviConfig(const QString &filename,FileMode f,bool bLocal8Bit)
 	m_szGroup              = KVI_CONFIG_DEFAULT_GROUP;
 	m_bPreserveEmptyGroups = false;
 	m_bReadOnly            = (f == KviConfig::Read);
-	m_pDict                = new KviDict<KviConfigGroup>(17,false);
+	m_pDict                = new KviPointerHashTable<QString,KviConfigGroup>(17,false);
 	m_pDict->setAutoDelete(true);
 	if(f != KviConfig::Write)load();
 }
@@ -55,7 +55,7 @@ KviConfig::KviConfig(const char* filename,FileMode f,bool bLocal8Bit)
 	m_szGroup              = KVI_CONFIG_DEFAULT_GROUP;
 	m_bPreserveEmptyGroups = false;
 	m_bReadOnly            = (f == KviConfig::Read);
-	m_pDict                = new KviDict<KviConfigGroup>(17,false);
+	m_pDict                = new KviPointerHashTable<QString,KviConfigGroup>(17,false);
 	m_pDict->setAutoDelete(true);
 	if(f != KviConfig::Write)load();
 }
@@ -70,7 +70,7 @@ KviConfig::~KviConfig()
 void KviConfig::clear()
 {
 	delete m_pDict;
-	m_pDict      = new KviDict<KviConfigGroup>(17,false);
+	m_pDict      = new KviPointerHashTable<QString,KviConfigGroup>(17,false);
 	m_pDict->setAutoDelete(true);
 	m_bDirty     = false;
 	m_szGroup    = KVI_CONFIG_DEFAULT_GROUP;
@@ -99,13 +99,13 @@ void KviConfig::getContentsString(KviStr &buffer)
 	buffer.append('\n');
 	int sections = 0;
 	int keys     = 0;
-	KviDictIterator<KviStrDict> it(*m_pDict);
+	KviPointerHashTableIterator<QString,KviStrDict> it(*m_pDict);
 	while(it.current()){
 		buffer.append(" Section [");
 		buffer.append(it.currentKey());
 		buffer.append("]\n");
 		int sectionKeys = 0;
-		KviDictIterator<KviStr> it2(*it.current());
+		KviPointerHashTableIterator<QString,KviStr> it2(*it.current());
 		while(it2.current()){
 			buffer.append("  Key [");
 			buffer.append(it2.currentKey());
@@ -497,7 +497,7 @@ bool KviConfig::save()
 	if(!f.openForWriting())return false;
 	if(f.writeBlock("# KVIrc configuration file\n",27) != 27)return false;
 
-	KviDictIterator<KviConfigGroup> it(*m_pDict);
+	KviPointerHashTableIterator<QString,KviConfigGroup> it(*m_pDict);
 	while (it.current())
 	{
 		if((it.current()->count() != 0) || (m_bPreserveEmptyGroups))
diff --git a/src/kvilib/ext/kvi_config.h b/src/kvilib/ext/kvi_config.h
index 9b6664157..1f529ccba 100644
--- a/src/kvilib/ext/kvi_config.h
+++ b/src/kvilib/ext/kvi_config.h
@@ -28,7 +28,7 @@
 #include "kvi_string.h"
 #include "kvi_settings.h"
 #include "kvi_heapobject.h"
-#include "kvi_dict.h"
+#include "kvi_pointerhashtable.h"
 #include "kvi_valuelist.h"
 
 #include <qcolor.h>
@@ -41,9 +41,9 @@
 class KviPixmap;
 class KviMsgType;
 
-typedef KviDict<QString> KviConfigGroup;
-typedef KviDictIterator<QString> KviConfigGroupIterator;
-typedef KviDictIterator<KviConfigGroup> KviConfigIterator;
+typedef KviPointerHashTable<QString,QString> KviConfigGroup;
+typedef KviPointerHashTableIterator<QString,QString> KviConfigGroupIterator;
+typedef KviPointerHashTableIterator<QString,KviConfigGroup> KviConfigIterator;
 
 class KVILIB_API KviConfig : public KviHeapObject
 {
@@ -55,7 +55,7 @@ public:
 	~KviConfig();
 private:
 	bool                         m_bLocal8Bit;
-	KviDict<KviConfigGroup>      * m_pDict;
+	KviPointerHashTable<QString,KviConfigGroup>      * m_pDict;
 	QString                      m_szFileName;
 	bool                         m_bDirty;
 	QString                      m_szStrBuffer;
@@ -89,7 +89,7 @@ public:
 	// as default configuration, alter its settings and save it to the
 	// user local configuration directory
 	void setSavePath(const QString & savePath){ m_szFileName = savePath; };
-	KviDict<KviConfigGroup> *dict(){ return m_pDict; };
+	KviPointerHashTable<QString,KviConfigGroup> *dict(){ return m_pDict; };
 
 	void clearDirtyFlag(){ m_bDirty = false; };
 	void clear();
diff --git a/src/kvilib/ext/kvi_crypt.cpp b/src/kvilib/ext/kvi_crypt.cpp
index bd99bdc3e..1846753d9 100644
--- a/src/kvilib/ext/kvi_crypt.cpp
+++ b/src/kvilib/ext/kvi_crypt.cpp
@@ -189,7 +189,7 @@
 
 	KviCryptEngineManager::KviCryptEngineManager()
 	{
-		m_pEngineDict = new KviDict<KviCryptEngineDescription>;
+		m_pEngineDict = new KviPointerHashTable<QString,KviCryptEngineDescription>;
 		m_pEngineDict->setAutoDelete(true);
 	}
 
@@ -210,7 +210,7 @@
 
 	void KviCryptEngineManager::unregisterEngines(void * providerHandle)
 	{
-		KviDictIterator<KviCryptEngineDescription> it(*m_pEngineDict);
+		KviPointerHashTableIterator<QString,KviCryptEngineDescription> it(*m_pEngineDict);
 		while(it.current())
 		{
 			if(it.current()->providerHandle == providerHandle)
diff --git a/src/kvilib/ext/kvi_crypt.h b/src/kvilib/ext/kvi_crypt.h
index f5afc9f50..5e05a2667 100644
--- a/src/kvilib/ext/kvi_crypt.h
+++ b/src/kvilib/ext/kvi_crypt.h
@@ -40,7 +40,7 @@
 #include "kvi_qstring.h"
 #include "kvi_string.h"
 #include "kvi_heapobject.h"
-#include "kvi_dict.h"
+#include "kvi_pointerhashtable.h"
 
 #include <qobject.h>
 
@@ -139,9 +139,9 @@
 		KviCryptEngineManager();
 		virtual ~KviCryptEngineManager();
 	private:
-		KviDict<KviCryptEngineDescription> * m_pEngineDict;
+		KviPointerHashTable<QString,KviCryptEngineDescription> * m_pEngineDict;
 	public:
-		const KviDict<KviCryptEngineDescription> * engineDict(){ return m_pEngineDict; };
+		const KviPointerHashTable<QString,KviCryptEngineDescription> * engineDict(){ return m_pEngineDict; };
 		void registerEngine(KviCryptEngineDescription * d);
 		void unregisterEngine(const QString &szName);
 		void unregisterEngines(void * providerHandle);
diff --git a/src/kvilib/ext/kvi_garbage.cpp b/src/kvilib/ext/kvi_garbage.cpp
index 33ba2dd5d..87be5c323 100644
--- a/src/kvilib/ext/kvi_garbage.cpp
+++ b/src/kvilib/ext/kvi_garbage.cpp
@@ -45,7 +45,7 @@ void KviGarbageCollector::collect(QObject * g)
 {
 	if(!m_pGarbageList)
 	{
-		m_pGarbageList = new KviPtrList<QObject>;
+		m_pGarbageList = new KviPointerList<QObject>;
 		m_pGarbageList->setAutoDelete(true);
 	}
 	//debug("COLLECTING GARBAGE %s",g->className());
@@ -94,7 +94,7 @@ void KviGarbageCollector::cleanup()
 	if(m_pGarbageList)
 	{
 		//debug("SOME GARBAGE TO DELETE");
-		KviPtrList<QObject> dying;
+		KviPointerList<QObject> dying;
 		dying.setAutoDelete(false);
 		for(QObject * o = m_pGarbageList->first();o;o = m_pGarbageList->next())
 		{
diff --git a/src/kvilib/ext/kvi_garbage.h b/src/kvilib/ext/kvi_garbage.h
index 5931d2394..bf0b34862 100644
--- a/src/kvilib/ext/kvi_garbage.h
+++ b/src/kvilib/ext/kvi_garbage.h
@@ -25,7 +25,7 @@
 #include "kvi_settings.h"
 
 #include <qobject.h>
-#include "kvi_list.h"
+#include "kvi_pointerlist.h"
 #include <qtimer.h>
 
 
@@ -36,7 +36,7 @@ public:
 	KviGarbageCollector();
 	~KviGarbageCollector();
 protected:
-	KviPtrList<QObject> * m_pGarbageList;
+	KviPointerList<QObject> * m_pGarbageList;
 	QTimer              * m_pCleanupTimer;
 	bool                  m_bForceCleanupNow;
 public:
diff --git a/src/kvilib/ext/kvi_mediatype.cpp b/src/kvilib/ext/kvi_mediatype.cpp
index bc8e8a886..c17131cda 100644
--- a/src/kvilib/ext/kvi_mediatype.cpp
+++ b/src/kvilib/ext/kvi_mediatype.cpp
@@ -78,7 +78,7 @@
 KviMediaManager::KviMediaManager()
 : KviMutex()
 {
-	m_pMediaTypeList = new KviPtrList<KviMediaType>;
+	m_pMediaTypeList = new KviPointerList<KviMediaType>;
 	m_pMediaTypeList->setAutoDelete(true);
 }
 
diff --git a/src/kvilib/ext/kvi_mediatype.h b/src/kvilib/ext/kvi_mediatype.h
index 49dc5edfd..d93221c2f 100644
--- a/src/kvilib/ext/kvi_mediatype.h
+++ b/src/kvilib/ext/kvi_mediatype.h
@@ -27,7 +27,7 @@
 #include "kvi_string.h"
 #include "kvi_thread.h"
 
-#include "kvi_list.h"
+#include "kvi_pointerlist.h"
 
 
 //
@@ -62,11 +62,11 @@ public:
 	KviMediaManager();
 	~KviMediaManager();
 protected:
-	KviPtrList<KviMediaType> * m_pMediaTypeList;
+	KviPointerList<KviMediaType> * m_pMediaTypeList;
 private:
 	KviMediaType * findMediaTypeForRegularFile(const char * szFullPath,const char * szFileName,bool bCheckMagic);
 public:
-	KviPtrList<KviMediaType> * mediaTypeList(){ return m_pMediaTypeList; };
+	KviPointerList<KviMediaType> * mediaTypeList(){ return m_pMediaTypeList; };
 	KviMediaType * findMediaTypeByFileMask(const char * filemask);
 	KviMediaType * findMediaTypeByIanaType(const char * ianaType);
 	bool removeMediaType(KviMediaType * t){ return m_pMediaTypeList->removeRef(t); };
diff --git a/src/kvilib/ext/kvi_parameterlist.cpp b/src/kvilib/ext/kvi_parameterlist.cpp
index dad1c7bc7..2369667a8 100644
--- a/src/kvilib/ext/kvi_parameterlist.cpp
+++ b/src/kvilib/ext/kvi_parameterlist.cpp
@@ -26,20 +26,20 @@
 #include "kvi_parameterlist.h"
 
 KviParameterList::KviParameterList()
-: KviPtrList<KviStr>()
+: KviPointerList<KviStr>()
 {
 	setAutoDelete(true);
 }
 
 KviParameterList::KviParameterList(KviStr *p1)
-: KviPtrList<KviStr>()
+: KviPointerList<KviStr>()
 {
 	setAutoDelete(true);
 	append(p1);
 }
 
 KviParameterList::KviParameterList(KviStr *p1,KviStr *p2)
-: KviPtrList<KviStr>()
+: KviPointerList<KviStr>()
 {
 	setAutoDelete(true);
 	append(p1);
@@ -47,7 +47,7 @@ KviParameterList::KviParameterList(KviStr *p1,KviStr *p2)
 }
 
 KviParameterList::KviParameterList(KviStr *p1,KviStr *p2,KviStr *p3)
-: KviPtrList<KviStr>()
+: KviPointerList<KviStr>()
 {
 	setAutoDelete(true);
 	append(p1);
@@ -56,7 +56,7 @@ KviParameterList::KviParameterList(KviStr *p1,KviStr *p2,KviStr *p3)
 }
 
 KviParameterList::KviParameterList(KviStr *p1,KviStr *p2,KviStr *p3,KviStr *p4)
-: KviPtrList<KviStr>()
+: KviPointerList<KviStr>()
 {
 	setAutoDelete(true);
 	append(p1);
@@ -66,7 +66,7 @@ KviParameterList::KviParameterList(KviStr *p1,KviStr *p2,KviStr *p3,KviStr *p4)
 }
 
 KviParameterList::KviParameterList(KviStr *p1,KviStr *p2,KviStr *p3,KviStr *p4,KviStr *p5)
-: KviPtrList<KviStr>()
+: KviPointerList<KviStr>()
 {
 	setAutoDelete(true);
 	append(p1);
@@ -77,7 +77,7 @@ KviParameterList::KviParameterList(KviStr *p1,KviStr *p2,KviStr *p3,KviStr *p4,K
 }
 
 KviParameterList::KviParameterList(KviStr *p1,KviStr *p2,KviStr *p3,KviStr *p4,KviStr *p5,KviStr *p6)
-: KviPtrList<KviStr>()
+: KviPointerList<KviStr>()
 {
 	setAutoDelete(true);
 	append(p1);
@@ -90,7 +90,7 @@ KviParameterList::KviParameterList(KviStr *p1,KviStr *p2,KviStr *p3,KviStr *p4,K
 
 
 KviParameterList::KviParameterList(KviStr *p1,KviStr *p2,KviStr *p3,KviStr *p4,KviStr *p5,KviStr *p6,KviStr *p7)
-: KviPtrList<KviStr>()
+: KviPointerList<KviStr>()
 {
 	setAutoDelete(true);
 	append(p1);
@@ -103,7 +103,7 @@ KviParameterList::KviParameterList(KviStr *p1,KviStr *p2,KviStr *p3,KviStr *p4,K
 }
 
 KviParameterList::KviParameterList(const char *paramBuffer)
-: KviPtrList<KviStr>()
+: KviPointerList<KviStr>()
 {
 	setAutoDelete(true);
 	while(*paramBuffer)
diff --git a/src/kvilib/ext/kvi_parameterlist.h b/src/kvilib/ext/kvi_parameterlist.h
index 12c782be9..fe01d66f4 100644
--- a/src/kvilib/ext/kvi_parameterlist.h
+++ b/src/kvilib/ext/kvi_parameterlist.h
@@ -27,12 +27,12 @@
 #include "kvi_heapobject.h"
 #include "kvi_string.h"
 
-#include "kvi_list.h"
+#include "kvi_pointerlist.h"
 #include <qrect.h>
 #include <qpoint.h>
 #include <qsize.h>
 
-class KVILIB_API KviParameterList : public KviPtrList<KviStr>, public KviHeapObject
+class KVILIB_API KviParameterList : public KviPointerList<KviStr>, public KviHeapObject
 {
 public:
 	KviParameterList();
diff --git a/src/kvilib/ext/kvi_proxydb.cpp b/src/kvilib/ext/kvi_proxydb.cpp
index adbbcc454..fb254af8e 100644
--- a/src/kvilib/ext/kvi_proxydb.cpp
+++ b/src/kvilib/ext/kvi_proxydb.cpp
@@ -84,7 +84,7 @@ void KviProxy::normalizeUserAndPass()
 
 KviProxyDataBase::KviProxyDataBase()
 {
-	m_pProxyList = new KviPtrList<KviProxy>;
+	m_pProxyList = new KviPointerList<KviProxy>;
 	m_pProxyList->setAutoDelete(true);
 	m_pCurrentProxy = 0;
 }
@@ -109,7 +109,7 @@ void KviProxyDataBase::updateProxyIp(const char * proxy,const char * ip)
 void KviProxyDataBase::clear()
 {
 	delete m_pProxyList;
-	m_pProxyList = new KviPtrList<KviProxy>;
+	m_pProxyList = new KviPointerList<KviProxy>;
 	m_pProxyList->setAutoDelete(true);
 	m_pCurrentProxy = 0;
 }
diff --git a/src/kvilib/ext/kvi_proxydb.h b/src/kvilib/ext/kvi_proxydb.h
index b3158d0a3..16a323406 100644
--- a/src/kvilib/ext/kvi_proxydb.h
+++ b/src/kvilib/ext/kvi_proxydb.h
@@ -27,7 +27,7 @@
 
 #include "kvi_string.h"
 #include "kvi_inttypes.h"
-#include "kvi_list.h"
+#include "kvi_pointerlist.h"
 #include <qstringlist.h>
 
 class KVILIB_API KviProxy
@@ -70,11 +70,11 @@ public:
 	KviProxyDataBase();
 	~KviProxyDataBase();
 private:
-	KviPtrList<KviProxy> * m_pProxyList;
+	KviPointerList<KviProxy> * m_pProxyList;
 	KviProxy        * m_pCurrentProxy;
 public:
 	void clear();
-	KviPtrList<KviProxy> * proxyList(){ return m_pProxyList; };
+	KviPointerList<KviProxy> * proxyList(){ return m_pProxyList; };
 	KviProxy * currentProxy(){ return m_pCurrentProxy; };
 	void updateProxyIp(const char * proxy,const char * ip);
 	void setCurrentProxy(KviProxy * prx){ m_pCurrentProxy = prx; };
diff --git a/src/kvilib/ext/kvi_regchan.cpp b/src/kvilib/ext/kvi_regchan.cpp
index a47d0870b..bd763877b 100644
--- a/src/kvilib/ext/kvi_regchan.cpp
+++ b/src/kvilib/ext/kvi_regchan.cpp
@@ -32,7 +32,7 @@ KviRegisteredChannel::KviRegisteredChannel(const KviStr &name,const KviStr &netm
 {
 	m_szName = name;
 	m_szNetMask = netmask;
-	m_pPropertyDict = new KviAsciiDict<KviStr>(7,false,true);
+	m_pPropertyDict = new KviPointerHashTable<const char *,KviStr>(7,false,true);
 	m_pPropertyDict->setAutoDelete(true);
 }
 
@@ -45,7 +45,7 @@ KviRegisteredChannel::~KviRegisteredChannel()
 
 KviRegisteredChannelDataBase::KviRegisteredChannelDataBase()
 {
-	m_pChannelDict = new KviAsciiDict<KviRegisteredChannelList>(17,false,true);
+	m_pChannelDict = new KviPointerHashTable<const char *,KviRegisteredChannelList>(17,false,true);
 	m_pChannelDict->setAutoDelete(true);
 }
 
@@ -81,14 +81,14 @@ void KviRegisteredChannelDataBase::save(const char * filename)
 	KviConfig cfg(filename,KviConfig::Write);
 	cfg.clear();
 
-	KviAsciiDictIterator<KviRegisteredChannelList> it(*m_pChannelDict);
+	KviPointerHashTableIterator<const char *,KviRegisteredChannelList> it(*m_pChannelDict);
 	while(KviRegisteredChannelList * l = it.current())
 	{
 		for(KviRegisteredChannel * c = l->first();c;c = l->next())
 		{
 			KviStr szGrp(KviStr::Format,"%s@%s",c->name().ptr(),c->netMask().ptr());
 			cfg.setGroup(szGrp.ptr());
-			KviAsciiDictIterator<KviStr> pit(*(c->propertyDict()));
+			KviPointerHashTableIterator<const char *,KviStr> pit(*(c->propertyDict()));
 			while(KviStr * s = pit.current())
 			{
 				cfg.writeEntry(pit.currentKey(),s->ptr());
@@ -147,7 +147,7 @@ void KviRegisteredChannelDataBase::add(KviRegisteredChannel * c)
 	KviRegisteredChannel * old = findExact(c->name().ptr(),c->netMask().ptr());
 	if(old)
 	{
-		KviAsciiDictIterator<KviStr> pit(*(old->propertyDict()));
+		KviPointerHashTableIterator<const char *,KviStr> pit(*(old->propertyDict()));
 		while(KviStr *s = pit.current())
 		{
 			if(!c->property(pit.currentKey()))
diff --git a/src/kvilib/ext/kvi_regchan.h b/src/kvilib/ext/kvi_regchan.h
index e8102f310..2848ffb73 100644
--- a/src/kvilib/ext/kvi_regchan.h
+++ b/src/kvilib/ext/kvi_regchan.h
@@ -27,9 +27,9 @@
 #include "kvi_settings.h"
 #include "kvi_heapobject.h"
 #include "kvi_string.h"
-#include "kvi_list.h"
+#include "kvi_pointerlist.h"
 
-#include "kvi_asciidict.h"
+#include "kvi_pointerhashtable.h"
 
 class KVILIB_API KviRegisteredChannel : public KviHeapObject
 {
@@ -40,9 +40,9 @@ public:
 protected:
 	KviStr               m_szName;
 	KviStr               m_szNetMask;
-	KviAsciiDict<KviStr> * m_pPropertyDict;
+	KviPointerHashTable<const char *,KviStr> * m_pPropertyDict;
 public:
-	KviAsciiDict<KviStr> * propertyDict(){ return m_pPropertyDict; };
+	KviPointerHashTable<const char *,KviStr> * propertyDict(){ return m_pPropertyDict; };
 	const KviStr & name(){ return m_szName; };
 	const KviStr & netMask(){ return m_szNetMask; };
 	KviStr * property(const char * name){ return m_pPropertyDict->find(name); };
@@ -51,7 +51,7 @@ public:
 	void removeProperty(const char * name){ m_pPropertyDict->remove(name); };
 };
 
-typedef KVILIB_API KviPtrList<KviRegisteredChannel> KviRegisteredChannelList;
+typedef KVILIB_API KviPointerList<KviRegisteredChannel> KviRegisteredChannelList;
 
 class KVILIB_API KviRegisteredChannelDataBase
 {
@@ -59,9 +59,9 @@ public:
 	KviRegisteredChannelDataBase();
 	~KviRegisteredChannelDataBase();
 protected:
-	KviAsciiDict<KviRegisteredChannelList> * m_pChannelDict;
+	KviPointerHashTable<const char *,KviRegisteredChannelList> * m_pChannelDict;
 public:
-	KviAsciiDict<KviRegisteredChannelList> * channelDict(){ return m_pChannelDict; };
+	KviPointerHashTable<const char *,KviRegisteredChannelList> * channelDict(){ return m_pChannelDict; };
 	KviRegisteredChannel * find(const char * name,const char * net);
 	KviRegisteredChannel * findExact(const char * name,const char * netmask);
 	void remove(KviRegisteredChannel * c);
diff --git a/src/kvilib/ext/kvi_regusersdb.cpp b/src/kvilib/ext/kvi_regusersdb.cpp
index 66c8878fe..44c72ba60 100644
--- a/src/kvilib/ext/kvi_regusersdb.cpp
+++ b/src/kvilib/ext/kvi_regusersdb.cpp
@@ -146,7 +146,7 @@ KviRegisteredUser::KviRegisteredUser(const QString & name)
 	m_bIgnoreEnabled=false;
 	m_szName        = name;
 	m_pPropertyDict = 0;
-	m_pMaskList     = new KviPtrList<KviIrcMask>;
+	m_pMaskList     = new KviPointerList<KviIrcMask>;
 	m_pMaskList->setAutoDelete(true);
 }
 
@@ -227,7 +227,7 @@ void KviRegisteredUser::setProperty(const QString & name,const QString & value)
 	{
 		if(!m_pPropertyDict)
 		{
-			m_pPropertyDict = new KviDict<QString>(7,false);
+			m_pPropertyDict = new KviPointerHashTable<QString,QString>(7,false);
 			m_pPropertyDict->setAutoDelete(true);
 		}
 #ifdef COMPILE_USE_QT4
@@ -306,16 +306,16 @@ KviRegisteredUserGroup::~KviRegisteredUserGroup()
 
 KviRegisteredUserDataBase::KviRegisteredUserDataBase()
 {
-	m_pUserDict = new KviDict<KviRegisteredUser>(31,false); // do not copy keys
+	m_pUserDict = new KviPointerHashTable<QString,KviRegisteredUser>(31,false); // do not copy keys
 	m_pUserDict->setAutoDelete(true);
 
 	m_pWildMaskList = new KviRegisteredMaskList;
 	m_pWildMaskList->setAutoDelete(true);
 
-	m_pMaskDict = new KviDict<KviRegisteredMaskList>(49,false); // copy keys here!
+	m_pMaskDict = new KviPointerHashTable<QString,KviRegisteredMaskList>(49,false); // copy keys here!
 	m_pMaskDict->setAutoDelete(true);
 	
-	m_pGroupDict = new  KviDict<KviRegisteredUserGroup>(5,false); // copy keys here!
+	m_pGroupDict = new  KviPointerHashTable<QString,KviRegisteredUserGroup>(5,false); // copy keys here!
 	m_pGroupDict->setAutoDelete(true);
 }
 
@@ -445,23 +445,23 @@ void KviRegisteredUserDataBase::copyFrom(KviRegisteredUserDataBase * db)
 	m_pGroupDict->clear();
 	emit(databaseCleared());
 
-	KviDictIterator<KviRegisteredUser> it(*(db->m_pUserDict));
+	KviPointerHashTableIterator<QString,KviRegisteredUser> it(*(db->m_pUserDict));
 
 	while(KviRegisteredUser * theCur = it.current())
 	{
 		KviRegisteredUser * u = getUser(theCur->name());
 		// copy masks
-		KviPtrList<KviIrcMask> * l = theCur->maskList();
+		KviPointerList<KviIrcMask> * l = theCur->maskList();
 		for(KviIrcMask * m=l->first();m;m = l->next())
 		{
 			KviIrcMask * m2 = new KviIrcMask(*m);
 			addMask(u,m2);
 		}
 		// copy properties
-		KviDict<QString> * pd = theCur->propertyDict();
+		KviPointerHashTable<QString,QString> * pd = theCur->propertyDict();
 		if(pd)
 		{
-			KviDictIterator<QString> pdi(*pd);
+			KviPointerHashTableIterator<QString,QString> pdi(*pd);
 			while(pdi.current())
 			{
 				u->setProperty(pdi.currentKey(),*(pdi.current()));
@@ -474,7 +474,7 @@ void KviRegisteredUserDataBase::copyFrom(KviRegisteredUserDataBase * db)
 		++it;
 	}
 	
-	KviDictIterator<KviRegisteredUserGroup> git(*db->m_pGroupDict);
+	KviPointerHashTableIterator<QString,KviRegisteredUserGroup> git(*db->m_pGroupDict);
 	while(git.current())
 	{
 		addGroup(git.currentKey());	
@@ -697,7 +697,7 @@ void KviRegisteredUserDataBase::save(const QString & filename)
 	cfg.clear();
 	cfg.preserveEmptyGroups(true);
 
-	KviDictIterator<KviRegisteredUser> it(*m_pUserDict);
+	KviPointerHashTableIterator<QString,KviRegisteredUser> it(*m_pUserDict);
 
 	while(it.current())
 	{
@@ -707,7 +707,7 @@ void KviRegisteredUserDataBase::save(const QString & filename)
 		cfg.writeEntry("IgnoreFlags",it.current()->ignoreFlags());
 		if(it.current()->propertyDict())
 		{
-			KviDictIterator<QString> pit(*(it.current()->propertyDict()));
+			KviPointerHashTableIterator<QString,QString> pit(*(it.current()->propertyDict()));
 			while(pit.current())
 			{
 				QString tmp = "prop_";
@@ -731,7 +731,7 @@ void KviRegisteredUserDataBase::save(const QString & filename)
 		++it;
 	}
 	
-	KviDictIterator<KviRegisteredUserGroup> git(*m_pGroupDict);
+	KviPointerHashTableIterator<QString,KviRegisteredUserGroup> git(*m_pGroupDict);
 	QString szTmp;
 	while(git.current())
 	{
diff --git a/src/kvilib/ext/kvi_regusersdb.h b/src/kvilib/ext/kvi_regusersdb.h
index 35a56fd54..7773dc136 100644
--- a/src/kvilib/ext/kvi_regusersdb.h
+++ b/src/kvilib/ext/kvi_regusersdb.h
@@ -36,8 +36,8 @@
 #include "kvi_ircmask.h"
 #include "kvi_debug.h"
 
-#include "kvi_list.h"
-#include "kvi_dict.h"
+#include "kvi_pointerlist.h"
+#include "kvi_pointerhashtable.h"
 #include <qobject.h>
 
 class KviRegisteredUserDataBase;
@@ -71,8 +71,8 @@ private:
 	bool                       m_bIgnoreEnabled;
 	QString                    m_szName;
 	QString					   m_szGroup;
-	KviDict<QString>           * m_pPropertyDict;   // owned properties
-	KviPtrList<KviIrcMask>     * m_pMaskList;       // owned masks
+	KviPointerHashTable<QString,QString>           * m_pPropertyDict;   // owned properties
+	KviPointerList<KviIrcMask>     * m_pMaskList;       // owned masks
 protected:
 	// mask ownership is transferred! (always!) returns false if the mask was already there
 	bool addMask(KviIrcMask * mask);
@@ -100,9 +100,9 @@ public:
 	bool getProperty(const QString &name,QString &value); // returns false if the property is not there
 	bool getBoolProperty(const QString &name,bool def=FALSE);           // returns true if the property is there and is true
 	// the propertyDict may be 0!
-	KviDict<QString> * propertyDict(){ return m_pPropertyDict; };
+	KviPointerHashTable<QString,QString> * propertyDict(){ return m_pPropertyDict; };
 	// this is never zero (but may contain no masks)
-	KviPtrList<KviIrcMask> * maskList(){ return m_pMaskList; };
+	KviPointerList<KviIrcMask> * maskList(){ return m_pMaskList; };
 };
 
 //============================================================================================================
@@ -142,7 +142,7 @@ public:
 	KviIrcMask        * mask(){ return m_pMask; };
 };
 
-typedef KviPtrList<KviRegisteredMask> KviRegisteredMaskList;
+typedef KviPointerList<KviRegisteredMask> KviRegisteredMaskList;
 
 //=================================================================================================
 //
@@ -161,10 +161,10 @@ public:
 	KviRegisteredUserDataBase();
 	~KviRegisteredUserDataBase();
 private:
-	KviDict<KviRegisteredUser>     * m_pUserDict; // unique namespace, owns the objects, does not copy keys
-	KviDict<KviRegisteredMaskList> * m_pMaskDict; // owns the objects, copies the keys
+	KviPointerHashTable<QString,KviRegisteredUser>     * m_pUserDict; // unique namespace, owns the objects, does not copy keys
+	KviPointerHashTable<QString,KviRegisteredMaskList> * m_pMaskDict; // owns the objects, copies the keys
 	KviRegisteredMaskList          * m_pWildMaskList; // owns the objects
-	KviDict<KviRegisteredUserGroup>* m_pGroupDict;
+	KviPointerHashTable<QString,KviRegisteredUserGroup>* m_pGroupDict;
 public:
 	void copyFrom(KviRegisteredUserDataBase * db);
 	KviRegisteredUser * addUser(const QString &name); // returns 0 if already there
@@ -186,8 +186,8 @@ public:
 	void load(const QString &filename);
 	void save(const QString &filename);
 
-	KviDict<KviRegisteredUser> * userDict(){ return m_pUserDict; };
-	KviDict<KviRegisteredUserGroup>* groupDict() { return m_pGroupDict; };
+	KviPointerHashTable<QString,KviRegisteredUser> * userDict(){ return m_pUserDict; };
+	KviPointerHashTable<QString,KviRegisteredUserGroup>* groupDict() { return m_pGroupDict; };
 	
 	KviRegisteredUserGroup* addGroup(const QString &name);
 signals:
diff --git a/src/kvilib/ext/kvi_sharedfiles.cpp b/src/kvilib/ext/kvi_sharedfiles.cpp
index a9f020078..693f24d38 100644
--- a/src/kvilib/ext/kvi_sharedfiles.cpp
+++ b/src/kvilib/ext/kvi_sharedfiles.cpp
@@ -103,7 +103,7 @@ KviSharedFile::~KviSharedFile()
 KviSharedFilesManager::KviSharedFilesManager()
 : QObject()
 {
-	m_pSharedListDict = new KviDict<KviSharedFileList>();
+	m_pSharedListDict = new KviPointerHashTable<QString,KviSharedFileList>();
 	m_pSharedListDict->setAutoDelete(true);
 	m_pCleanupTimer = new QTimer();
 	connect(m_pCleanupTimer,SIGNAL(timeout()),this,SLOT(cleanup()));
@@ -118,7 +118,7 @@ KviSharedFilesManager::~KviSharedFilesManager()
 
 void KviSharedFilesManager::cleanup()
 {
-	KviDictIterator<KviSharedFileList> it(*m_pSharedListDict);
+	KviPointerHashTableIterator<QString,KviSharedFileList> it(*m_pSharedListDict);
 	time_t curTime = time(0);
 
 	bool bOtherStuffToCleanup = false;
@@ -126,7 +126,7 @@ void KviSharedFilesManager::cleanup()
 
 	while(KviSharedFileList * l = it.current())
 	{
-		KviPtrList<KviSharedFile> tmp;
+		KviPointerList<KviSharedFile> tmp;
 		tmp.setAutoDelete(false);
 		for(KviSharedFile * o = l->first();o;o = l->next())
 		{
@@ -361,7 +361,7 @@ void KviSharedFilesManager::save(const QString &filename)
 	cfg.clear();
 	cfg.setGroup("PermanentFileOffers");
 
-	KviDictIterator<KviSharedFileList> it(*m_pSharedListDict);
+	KviPointerHashTableIterator<QString,KviSharedFileList> it(*m_pSharedListDict);
 	int idx = 0;
 	while(KviSharedFileList * l = it.current())
 	{
diff --git a/src/kvilib/ext/kvi_sharedfiles.h b/src/kvilib/ext/kvi_sharedfiles.h
index 5374f151f..c01a58426 100644
--- a/src/kvilib/ext/kvi_sharedfiles.h
+++ b/src/kvilib/ext/kvi_sharedfiles.h
@@ -28,10 +28,10 @@
 #include "kvi_heapobject.h"
 #include "kvi_string.h"
 #include "kvi_ircmask.h"
-#include "kvi_list.h"
+#include "kvi_pointerlist.h"
 #include "kvi_qstring.h"
 
-#include "kvi_dict.h"
+#include "kvi_pointerhashtable.h"
 
 #include <time.h>
 #include <qtimer.h>
@@ -68,7 +68,7 @@ public:
 };
 
 
-typedef KviPtrList<KviSharedFile> KviSharedFileList;
+typedef KviPointerList<KviSharedFile> KviSharedFileList;
 
 
 class KVILIB_API KviSharedFilesManager : public QObject
@@ -79,7 +79,7 @@ public:
 	~KviSharedFilesManager();
 private:
 	QTimer                     * m_pCleanupTimer;
-	KviDict<KviSharedFileList>   * m_pSharedListDict;
+	KviPointerHashTable<QString,KviSharedFileList>   * m_pSharedListDict;
 public:
 	void addSharedFile(KviSharedFile * f);
 	KviSharedFile * addSharedFile(const QString &szName,const QString &szAbsPath,const QString &szMask,int timeoutInSecs);
@@ -89,7 +89,7 @@ public:
 	void load(const QString &filename);
 	void save(const QString &filename);
 	void clear();
-	KviDict<KviSharedFileList> * sharedFileListDict(){ return m_pSharedListDict; };
+	KviPointerHashTable<QString,KviSharedFileList> * sharedFileListDict(){ return m_pSharedListDict; };
 private:
 	void doInsert(KviSharedFileList * l, KviSharedFile * o);
 private slots:
diff --git a/src/kvilib/file/kvi_file.cpp b/src/kvilib/file/kvi_file.cpp
index c01627687..b1abd48e1 100644
--- a/src/kvilib/file/kvi_file.cpp
+++ b/src/kvilib/file/kvi_file.cpp
@@ -194,7 +194,7 @@ bool KviFile::load(kvi_u8_t &t)
 }
 
 
-bool KviFile::save(KviPtrList<KviStr> * pData)
+bool KviFile::save(KviPointerList<KviStr> * pData)
 {
 	if(!save((int)(pData->count())))return false;
 	for(KviStr * s = pData->first();s;s = pData->next())
@@ -204,7 +204,7 @@ bool KviFile::save(KviPtrList<KviStr> * pData)
 	return true;
 }
 
-bool KviFile::load(KviPtrList<KviStr> * pData)
+bool KviFile::load(KviPointerList<KviStr> * pData)
 {
 	pData->clear();
 	int iCount;
diff --git a/src/kvilib/file/kvi_file.h b/src/kvilib/file/kvi_file.h
index f500619c1..394220666 100644
--- a/src/kvilib/file/kvi_file.h
+++ b/src/kvilib/file/kvi_file.h
@@ -29,7 +29,7 @@
 #include "kvi_heapobject.h"
 #include "kvi_qstring.h"
 #include "kvi_string.h"
-#include "kvi_list.h"
+#include "kvi_pointerlist.h"
 #include "kvi_inttypes.h"
 #include "kvi_qcstring.h"
 
@@ -112,8 +112,8 @@ public:
 	bool skipFirst(char t,unsigned int maxdist = 0xffffffff);
 	bool skipFirst(const KviStr &t,unsigned int maxdist = 0xffffffff);
 
-	bool save(KviPtrList<KviStr> * pData);
-	bool load(KviPtrList<KviStr> * pData);
+	bool save(KviPointerList<KviStr> * pData);
+	bool load(KviPointerList<KviStr> * pData);
 };
 
 
diff --git a/src/kvilib/file/kvi_packagefile.cpp b/src/kvilib/file/kvi_packagefile.cpp
index bf872be16..8b62f9249 100644
--- a/src/kvilib/file/kvi_packagefile.cpp
+++ b/src/kvilib/file/kvi_packagefile.cpp
@@ -111,9 +111,9 @@
 KviPackageIOEngine::KviPackageIOEngine()
 {
 	m_pProgressDialog = 0;
-	m_pStringInfoFields = new KviDict<QString>();
+	m_pStringInfoFields = new KviPointerHashTable<QString,QString>();
 	m_pStringInfoFields->setAutoDelete(true);
-	m_pBinaryInfoFields = new KviDict<QByteArray>();
+	m_pBinaryInfoFields = new KviPointerHashTable<QString,QByteArray>();
 	m_pBinaryInfoFields->setAutoDelete(true);
 }
 
@@ -185,7 +185,7 @@ bool KviPackageIOEngine::readError()
 KviPackageWriter::KviPackageWriter()
 : KviPackageIOEngine()
 {
-	m_pDataFields = new KviPtrList<DataField>();
+	m_pDataFields = new KviPointerList<DataField>();
 	m_pDataFields->setAutoDelete(true);
 }
 
@@ -572,7 +572,7 @@ bool KviPackageWriter::packInternal(const QString &szFileName,kvi_u32_t uPackFla
 		return false; // aborted
 	
 	// InfoFields (string)
-	KviDictIterator<QString> it(*m_pStringInfoFields);
+	KviPointerHashTableIterator<QString,QString> it(*m_pStringInfoFields);
 	while(QString * s = it.current())
 	{
 		if(!f.save(it.currentKey()))return writeError();
@@ -583,7 +583,7 @@ bool KviPackageWriter::packInternal(const QString &szFileName,kvi_u32_t uPackFla
 	}
 	
 	// InfoFields (binary)
-	KviDictIterator<QByteArray> it2(*m_pBinaryInfoFields);
+	KviPointerHashTableIterator<QString,QByteArray> it2(*m_pBinaryInfoFields);
 	while(QByteArray * b = it2.current())
 	{
 		if(!f.save(it2.currentKey()))return writeError();
diff --git a/src/kvilib/file/kvi_packagefile.h b/src/kvilib/file/kvi_packagefile.h
index b38a14fbd..a7c461aa0 100644
--- a/src/kvilib/file/kvi_packagefile.h
+++ b/src/kvilib/file/kvi_packagefile.h
@@ -26,10 +26,10 @@
 
 #include "kvi_settings.h"
 #include "kvi_qstring.h"
-#include "kvi_dict.h"
+#include "kvi_pointerhashtable.h"
 #include "kvi_qcstring.h" // QByteArray anyway
 #include <qobject.h>
-#include "kvi_list.h"
+#include "kvi_pointerlist.h"
 
 class KviFile;
 class QProgressDialog;
@@ -48,15 +48,15 @@ public:
 	virtual ~KviPackageIOEngine();
 protected:
 	QString m_szLastError;
-	KviDict<QString> * m_pStringInfoFields;
-	KviDict<QByteArray> * m_pBinaryInfoFields;
+	KviPointerHashTable<QString,QString> * m_pStringInfoFields;
+	KviPointerHashTable<QString,QByteArray> * m_pBinaryInfoFields;
 	QProgressDialog * m_pProgressDialog;
 	QLabel * m_pProgressDialogLabel;
 public:
 	const QString & lastError(){ return m_szLastError; };
 	void setLastError(const QString &szLastError){ m_szLastError = szLastError; };
-	KviDict<QString> * stringInfoFields(){ return m_pStringInfoFields; };
-	KviDict<QByteArray> * binaryInfoFields(){ return m_pBinaryInfoFields; };
+	KviPointerHashTable<QString,QString> * stringInfoFields(){ return m_pStringInfoFields; };
+	KviPointerHashTable<QString,QByteArray> * binaryInfoFields(){ return m_pBinaryInfoFields; };
 protected:
 	void showProgressDialog(const QString &szCaption,int iTotalSteps);
 	void hideProgressDialog();
@@ -91,7 +91,7 @@ protected:
 		QString m_szFileTargetName;
 	};
 
-	KviPtrList<DataField> * m_pDataFields;
+	KviPointerList<DataField> * m_pDataFields;
 	int m_iCurrentProgress;
 public:
 	// Adds a file to the package. The file must be specified as absolute local
diff --git a/src/kvilib/irc/kvi_avatarcache.cpp b/src/kvilib/irc/kvi_avatarcache.cpp
index d72e1acdf..4de5d6c72 100644
--- a/src/kvilib/irc/kvi_avatarcache.cpp
+++ b/src/kvilib/irc/kvi_avatarcache.cpp
@@ -25,7 +25,7 @@
 
 
 #include "kvi_avatarcache.h"
-#include "kvi_list.h"
+#include "kvi_pointerlist.h"
 #include "kvi_config.h"
 
 // this level triggers a cleanup
@@ -66,7 +66,7 @@ void KviAvatarCache::done()
 
 KviAvatarCache::KviAvatarCache()
 {
-	m_pAvatarDict = new KviDict<KviAvatarCacheEntry>(CACHE_DICT_SIZE,false);
+	m_pAvatarDict = new KviPointerHashTable<QString,KviAvatarCacheEntry>(CACHE_DICT_SIZE,false);
 	m_pAvatarDict->setAutoDelete(true);
 }
 
@@ -163,7 +163,7 @@ void KviAvatarCache::save(const QString &szFileName)
 	KviConfig cfg(szFileName,KviConfig::Write);
 //	cfg.clear(); // not needed with KviConfig::Write
 
-	KviDictIterator<KviAvatarCacheEntry> it(*m_pAvatarDict);
+	KviPointerHashTableIterator<QString,KviAvatarCacheEntry> it(*m_pAvatarDict);
 
 	while(KviAvatarCacheEntry * e = it.current())
 	{
@@ -180,11 +180,11 @@ void KviAvatarCache::save(const QString &szFileName)
 void KviAvatarCache::cleanup()
 {
 	// first do a quick run deleting the avatars really too old
-	KviDictIterator<KviAvatarCacheEntry> it(*m_pAvatarDict);
+	KviPointerHashTableIterator<QString,KviAvatarCacheEntry> it(*m_pAvatarDict);
 	
 	kvi_time_t tNow = kvi_unixTime();
 
-	KviPtrList<QString> l;
+	KviPointerList<QString> l;
 	l.setAutoDelete(false);
 
 	KviAvatarCacheEntry * e;
@@ -206,7 +206,7 @@ void KviAvatarCache::cleanup()
 
 	it.toFirst();
 	
-	KviPtrList<KviAvatarCacheEntry> ll;
+	KviPointerList<KviAvatarCacheEntry> ll;
 	ll.setAutoDelete(true);
 
 	// here we use the cache entries in another way
diff --git a/src/kvilib/irc/kvi_avatarcache.h b/src/kvilib/irc/kvi_avatarcache.h
index dc8b944c9..2eb14092e 100644
--- a/src/kvilib/irc/kvi_avatarcache.h
+++ b/src/kvilib/irc/kvi_avatarcache.h
@@ -29,7 +29,7 @@
 #include "kvi_time.h"
 #include "kvi_ircmask.h"
 
-#include "kvi_dict.h"
+#include "kvi_pointerhashtable.h"
 
 
 typedef struct _KviAvatarCacheEntry
@@ -46,7 +46,7 @@ protected:
 	KviAvatarCache();
 	~KviAvatarCache();
 public:
-	KviDict<KviAvatarCacheEntry> * m_pAvatarDict;
+	KviPointerHashTable<QString,KviAvatarCacheEntry> * m_pAvatarDict;
 protected:
 	static KviAvatarCache * m_pAvatarCacheInstance;
 public:
diff --git a/src/kvilib/irc/kvi_ircserver.cpp b/src/kvilib/irc/kvi_ircserver.cpp
index dbd3c12df..373738ed4 100644
--- a/src/kvilib/irc/kvi_ircserver.cpp
+++ b/src/kvilib/irc/kvi_ircserver.cpp
@@ -59,7 +59,7 @@ KviProxy* KviIrcServer::proxyServer(KviProxyDataBase * pDb)
 {
 	int i=0;
 	if(proxy()<0) return 0;
-	KviPtrList<KviProxy> * proxylist = pDb->proxyList();
+	KviPointerList<KviProxy> * proxylist = pDb->proxyList();
 	for(KviProxy * p = proxylist->first();p;p = proxylist->next())
 	{
 		if(i==proxy()) return p;
diff --git a/src/kvilib/irc/kvi_ircserver.h b/src/kvilib/irc/kvi_ircserver.h
index 0ae0f53cd..975b50c5d 100644
--- a/src/kvilib/irc/kvi_ircserver.h
+++ b/src/kvilib/irc/kvi_ircserver.h
@@ -28,7 +28,7 @@
 #include "kvi_settings.h"
 #include "kvi_heapobject.h"
 #include "kvi_qstring.h"
-#include "kvi_list.h"
+#include "kvi_pointerlist.h"
 
 #include <qstringlist.h>
 
diff --git a/src/kvilib/irc/kvi_ircserverdb.cpp b/src/kvilib/irc/kvi_ircserverdb.cpp
index cb04949ab..274a1e6de 100644
--- a/src/kvilib/irc/kvi_ircserverdb.cpp
+++ b/src/kvilib/irc/kvi_ircserverdb.cpp
@@ -39,7 +39,7 @@
 KviIrcServerDataBaseRecord::KviIrcServerDataBaseRecord(KviIrcNetwork * n)
 {
 	m_pNetwork = n;
-	m_pServerList = new KviPtrList<KviIrcServer>;
+	m_pServerList = new KviPointerList<KviIrcServer>;
 	m_pServerList->setAutoDelete(true);
 	m_pCurrentServer = 0;
 }
@@ -90,7 +90,7 @@ KviIrcServer * KviIrcServerDataBaseRecord::currentServer()
 
 KviIrcServerDataBase::KviIrcServerDataBase()
 {
-	m_pRecords = new KviDict<KviIrcServerDataBaseRecord>(17,false);
+	m_pRecords = new KviPointerHashTable<QString,KviIrcServerDataBaseRecord>(17,false);
 	m_pRecords->setAutoDelete(true);
 	m_pAutoConnectOnStartupServers = 0;
 	m_pAutoConnectOnStartupNetworks = 0;
@@ -149,7 +149,7 @@ KviIrcServerDataBaseRecord * KviIrcServerDataBase::currentRecord()
 	if(!m_szCurrentNetwork.isEmpty())r = m_pRecords->find(m_szCurrentNetwork);
 	if(r)return r;
 
-	KviDictIterator<KviIrcServerDataBaseRecord> it(*m_pRecords);
+	KviPointerHashTableIterator<QString,KviIrcServerDataBaseRecord> it(*m_pRecords);
 	r = it.current();
 	if(!r)return 0;
 	m_szCurrentNetwork = r->network()->name();
@@ -158,7 +158,7 @@ KviIrcServerDataBaseRecord * KviIrcServerDataBase::currentRecord()
 
 void KviIrcServerDataBase::updateServerIp(KviIrcServer * pServer,const QString & ip)
 {
-	KviDictIterator<KviIrcServerDataBaseRecord> it(*m_pRecords);
+	KviPointerHashTableIterator<QString,KviIrcServerDataBaseRecord> it(*m_pRecords);
 	while(KviIrcServerDataBaseRecord * r = it.current())
 	{
 		KviIrcServer * srv = r->findServer(pServer);
@@ -225,7 +225,7 @@ bool KviIrcServerDataBase::makeCurrentServer(KviIrcServerDefinition * d,QString
 {
 	KviIrcServer * pServer = 0;
 
-	KviDictIterator<KviIrcServerDataBaseRecord> it(*m_pRecords);
+	KviPointerHashTableIterator<QString,KviIrcServerDataBaseRecord> it(*m_pRecords);
 	KviIrcServerDataBaseRecord * r = 0;
 	KviIrcServer * srv;
 
@@ -550,7 +550,7 @@ void KviIrcServerDataBase::load(const QString & filename)
 			{
 				if(!m_pAutoConnectOnStartupNetworks)
 				{
-					m_pAutoConnectOnStartupNetworks = new KviPtrList<KviIrcServerDataBaseRecord>;
+					m_pAutoConnectOnStartupNetworks = new KviPointerList<KviIrcServerDataBaseRecord>;
 					m_pAutoConnectOnStartupNetworks->setAutoDelete(false);
 				}
 				m_pAutoConnectOnStartupNetworks->append(r);
@@ -574,7 +574,7 @@ void KviIrcServerDataBase::load(const QString & filename)
 					{
 						if(!m_pAutoConnectOnStartupServers)
 						{
-							m_pAutoConnectOnStartupServers = new KviPtrList<KviIrcServer>;
+							m_pAutoConnectOnStartupServers = new KviPointerList<KviIrcServer>;
 							m_pAutoConnectOnStartupServers->setAutoDelete(false);
 						}
 						m_pAutoConnectOnStartupServers->append(s);
@@ -593,7 +593,7 @@ void KviIrcServerDataBase::save(const QString &filename)
 
 	cfg.clear(); // clear any old entry
 
-	KviDictIterator<KviIrcServerDataBaseRecord> it(*m_pRecords);
+	KviPointerHashTableIterator<QString,KviIrcServerDataBaseRecord> it(*m_pRecords);
 
 	QString tmp;
 
diff --git a/src/kvilib/irc/kvi_ircserverdb.h b/src/kvilib/irc/kvi_ircserverdb.h
index ff5be77f5..403908d90 100644
--- a/src/kvilib/irc/kvi_ircserverdb.h
+++ b/src/kvilib/irc/kvi_ircserverdb.h
@@ -28,7 +28,7 @@
 #include "kvi_qstring.h"
 #include "kvi_ircserver.h"
 
-#include "kvi_dict.h"
+#include "kvi_pointerhashtable.h"
 
 typedef struct _KviIrcServerDefinition
 {
@@ -53,12 +53,12 @@ public:
 	~KviIrcServerDataBaseRecord();
 protected:
 	KviIrcNetwork            * m_pNetwork;
-	KviPtrList<KviIrcServer> * m_pServerList;
+	KviPointerList<KviIrcServer> * m_pServerList;
 
 	KviIrcServer             * m_pCurrentServer;
 public:
 	KviIrcNetwork * network(){ return m_pNetwork; };
-	KviPtrList<KviIrcServer> * serverList(){ return m_pServerList; };
+	KviPointerList<KviIrcServer> * serverList(){ return m_pServerList; };
 	KviIrcServer * currentServer();
 	void insertServer(KviIrcServer *srv);
 	KviIrcServer * findServer(const KviIrcServer * pServer);
@@ -75,7 +75,7 @@ public:
 	KviIrcServerDataBase();
 	~KviIrcServerDataBase();
 private:
-	KviDict<KviIrcServerDataBaseRecord> * m_pRecords;
+	KviPointerHashTable<QString,KviIrcServerDataBaseRecord> * m_pRecords;
 	QString                             m_szCurrentNetwork;
 	// This list is computed when the data are loaded from disk
 	// during the startup and is used by KviApp to
@@ -85,13 +85,13 @@ private:
 	// because it contains shallow pointers to the servers
 	// really contained in the server/network list
 	// and it is never updated later
-	KviPtrList<KviIrcServer>                * m_pAutoConnectOnStartupServers;
-	KviPtrList<KviIrcServerDataBaseRecord>  * m_pAutoConnectOnStartupNetworks;
+	KviPointerList<KviIrcServer>                * m_pAutoConnectOnStartupServers;
+	KviPointerList<KviIrcServerDataBaseRecord>  * m_pAutoConnectOnStartupNetworks;
 public:
 	void clear();
-	KviDict<KviIrcServerDataBaseRecord> * recordDict(){ return m_pRecords; };
-	KviPtrList<KviIrcServer> * autoConnectOnStartupServers(){ return m_pAutoConnectOnStartupServers; };
-	KviPtrList<KviIrcServerDataBaseRecord> * autoConnectOnStartupNetworks(){ return m_pAutoConnectOnStartupNetworks; };
+	KviPointerHashTable<QString,KviIrcServerDataBaseRecord> * recordDict(){ return m_pRecords; };
+	KviPointerList<KviIrcServer> * autoConnectOnStartupServers(){ return m_pAutoConnectOnStartupServers; };
+	KviPointerList<KviIrcServerDataBaseRecord> * autoConnectOnStartupNetworks(){ return m_pAutoConnectOnStartupNetworks; };
 	void clearAutoConnectOnStartupServers();
 	void clearAutoConnectOnStartupNetworks();
 	void setCurrentNetwork(const QString &szNetName){ m_szCurrentNetwork = szNetName; };
diff --git a/src/kvilib/irc/kvi_ircuserdb.cpp b/src/kvilib/irc/kvi_ircuserdb.cpp
index 95154e1ee..77aa0cc7a 100644
--- a/src/kvilib/irc/kvi_ircuserdb.cpp
+++ b/src/kvilib/irc/kvi_ircuserdb.cpp
@@ -102,7 +102,7 @@ KviIrcUserDataBase::KviIrcUserDataBase()
 	// the performance increase since kvirc versions < 3.0.0
 	// is really big anyway (there was a linear list instead of a hash!!!)
 
-	m_pDict = new KviDict<KviIrcUserEntry>(4001,false);
+	m_pDict = new KviPointerHashTable<QString,KviIrcUserEntry>(4001,false);
 	m_pDict->setAutoDelete(true);
 	setupConnectionWithReguserDb();
 }
@@ -197,7 +197,7 @@ KviRegisteredUser* KviIrcUserDataBase::registeredUser(const QString & nick)
 void KviIrcUserDataBase::clear()
 {
 	delete m_pDict;
-	m_pDict = new KviDict<KviIrcUserEntry>(4001,false);
+	m_pDict = new KviPointerHashTable<QString,KviIrcUserEntry>(4001,false);
 	m_pDict->setAutoDelete(true);
 }
 
@@ -237,7 +237,7 @@ void KviIrcUserDataBase::setupConnectionWithReguserDb()
 
 void KviIrcUserDataBase::registeredUserRemoved(const QString& user)
 {
-	KviDictIterator<KviIrcUserEntry> it( *m_pDict );
+	KviPointerHashTableIterator<QString,KviIrcUserEntry> it( *m_pDict );
     for( ; it.current(); ++it )
 	{
 		if(it.current()->m_szRegisteredUserName==user)
@@ -251,7 +251,7 @@ void KviIrcUserDataBase::registeredUserRemoved(const QString& user)
 void KviIrcUserDataBase::registeredUserChanged(const QString& user)
 {
 	//the same as above
-	KviDictIterator<KviIrcUserEntry> it( *m_pDict );
+	KviPointerHashTableIterator<QString,KviIrcUserEntry> it( *m_pDict );
     for( ; it.current(); ++it )
 	{
 		if(it.current()->m_szRegisteredUserName==user)
@@ -264,7 +264,7 @@ void KviIrcUserDataBase::registeredUserChanged(const QString& user)
 
 void KviIrcUserDataBase::registeredUserAdded(const QString& user)
 {
-	KviDictIterator<KviIrcUserEntry> it( *m_pDict );
+	KviPointerHashTableIterator<QString,KviIrcUserEntry> it( *m_pDict );
     for( ; it.current(); ++it )
 	{
 		if(it.current()->m_szRegisteredUserName.isEmpty())
@@ -276,7 +276,7 @@ void KviIrcUserDataBase::registeredUserAdded(const QString& user)
 
 void KviIrcUserDataBase::registeredDatabaseCleared()
 {
-	KviDictIterator<KviIrcUserEntry> it( *m_pDict );
+	KviPointerHashTableIterator<QString,KviIrcUserEntry> it( *m_pDict );
     for( ; it.current(); ++it )
 	{
 		it.current()->m_szRegisteredUserName="";
diff --git a/src/kvilib/irc/kvi_ircuserdb.h b/src/kvilib/irc/kvi_ircuserdb.h
index 95ed6556f..e616fc1c0 100644
--- a/src/kvilib/irc/kvi_ircuserdb.h
+++ b/src/kvilib/irc/kvi_ircuserdb.h
@@ -27,7 +27,7 @@
 
 #include "kvi_settings.h"
 
-#include "kvi_dict.h"
+#include "kvi_pointerhashtable.h"
 
 #include "kvi_string.h"
 #include "kvi_avatar.h"
@@ -120,13 +120,13 @@ public:
 	KviIrcUserDataBase();
 	~KviIrcUserDataBase();
 private:
-	KviDict<KviIrcUserEntry> * m_pDict;
+	KviPointerHashTable<QString,KviIrcUserEntry> * m_pDict;
 public:
 	void clear();
 	KviIrcUserEntry * insertUser(const QString &nick,const QString &user,const QString &hostname);
 	KviIrcUserEntry * find(const QString &nick){ return m_pDict->find(nick); };
 	void removeUser(const QString &nick,KviIrcUserEntry * e);
-	KviDict<KviIrcUserEntry> * dict(){ return m_pDict; };
+	KviPointerHashTable<QString,KviIrcUserEntry> * dict(){ return m_pDict; };
 
 	KviRegisteredUser* registeredUser(const QString & nick);
 	KviRegisteredUser* registeredUser(const QString & nick,const QString & user,const QString & host);
diff --git a/src/kvilib/irc/kvi_nickserv.cpp b/src/kvilib/irc/kvi_nickserv.cpp
index 46474c802..49ccf7ba1 100644
--- a/src/kvilib/irc/kvi_nickserv.cpp
+++ b/src/kvilib/irc/kvi_nickserv.cpp
@@ -141,7 +141,7 @@ bool KviNickServRuleSet::loadPrivate(KviConfig * cfg,const QString &prefix,unsig
 {
 	if(m_pRules)m_pRules->clear();
 	else {
-		m_pRules = new KviPtrList<KviNickServRule>;
+		m_pRules = new KviPointerList<KviNickServRule>;
 		m_pRules->setAutoDelete(true);
 	}
 
@@ -183,7 +183,7 @@ void KviNickServRuleSet::addRule(KviNickServRule * r)
 {
 	if(!m_pRules)
 	{
-		m_pRules = new KviPtrList<KviNickServRule>;
+		m_pRules = new KviPointerList<KviNickServRule>;
 		m_pRules->setAutoDelete(true);
 	}
 	m_pRules->append(r);
@@ -227,7 +227,7 @@ void KviNickServRuleSet::copyFrom(const KviNickServRuleSet &src)
 	{
 		if(m_pRules)m_pRules->clear();
 		else {
-			m_pRules = new KviPtrList<KviNickServRule>;
+			m_pRules = new KviPointerList<KviNickServRule>;
 			m_pRules->setAutoDelete(true);
 		}
 		for(KviNickServRule * r = src.m_pRules->first();r;r = src.m_pRules->next())
diff --git a/src/kvilib/irc/kvi_nickserv.h b/src/kvilib/irc/kvi_nickserv.h
index b0eb5c70d..6a15cc535 100644
--- a/src/kvilib/irc/kvi_nickserv.h
+++ b/src/kvilib/irc/kvi_nickserv.h
@@ -27,7 +27,7 @@
 #include "kvi_settings.h"
 #include "kvi_qstring.h"
 #include "kvi_heapobject.h"
-#include "kvi_list.h"
+#include "kvi_pointerlist.h"
 
 class KviConfig;
 class KviIrcMask;
@@ -87,7 +87,7 @@ public:
 	KviNickServRuleSet(const KviNickServRuleSet &s);
 	~KviNickServRuleSet();
 protected:
-	KviPtrList<KviNickServRule> * m_pRules; // FIXME: Replace with KviDict<KviPtrList>
+	KviPointerList<KviNickServRule> * m_pRules; // FIXME: Replace with KviPointerHashTable<QString,KviPointerList>
 	bool                          m_bEnabled;
 public:
 	// avoid crashes under windows
@@ -102,7 +102,7 @@ public:
 	void load(const QString &szConfigFile);
 	void save(const QString &szConfigFile);
 	void save(KviConfig * cfg,const QString &prefix);
-	KviPtrList<KviNickServRule> * rules(){ return m_pRules; };
+	KviPointerList<KviNickServRule> * rules(){ return m_pRules; };
 	static KviNickServRuleSet * load(KviConfig * cfg,const QString &prefix);
 protected:
 	bool loadPrivate(KviConfig * cfg,const QString &prefix,unsigned int nEntries);
diff --git a/src/kvilib/irc/kvi_useridentity.cpp b/src/kvilib/irc/kvi_useridentity.cpp
index 752bb9f86..c896930c1 100644
--- a/src/kvilib/irc/kvi_useridentity.cpp
+++ b/src/kvilib/irc/kvi_useridentity.cpp
@@ -121,7 +121,7 @@ KviUserIdentityManager * KviUserIdentityManager::m_pInstance = 0;
 KviUserIdentityManager::KviUserIdentityManager()
 : KviHeapObject()
 {
-	m_pIdentityDict = new KviDict<KviUserIdentity>();
+	m_pIdentityDict = new KviPointerHashTable<QString,KviUserIdentity>();
 	m_pIdentityDict->setAutoDelete(true);
 }
 
@@ -154,7 +154,7 @@ const KviUserIdentity * KviUserIdentityManager::defaultIdentity()
 
 	// the default identity is borken :/
 	// grab the first one
-	KviDictIterator<KviUserIdentity> it(*m_pIdentityDict);
+	KviPointerHashTableIterator<QString,KviUserIdentity> it(*m_pIdentityDict);
 	ret = it.current();
 	if(ret)
 	{
@@ -215,7 +215,7 @@ void KviUserIdentityManager::save(const QString &szFileName)
 
 	cfg.writeEntry("DefaultIdentity",m_szDefaultIdentity);
 	
-	KviDictIterator<KviUserIdentity> it(*m_pIdentityDict);
+	KviPointerHashTableIterator<QString,KviUserIdentity> it(*m_pIdentityDict);
 	while(KviUserIdentity * id = it.current())
 	{
 		id->save(cfg);
@@ -227,7 +227,7 @@ void KviUserIdentityManager::copyFrom(KviUserIdentityManager * pWorkingCopy)
 {
 	m_pIdentityDict->clear();
 	m_szDefaultIdentity = pWorkingCopy->m_szDefaultIdentity;
-	KviDictIterator<KviUserIdentity> it(*(pWorkingCopy->m_pIdentityDict));
+	KviPointerHashTableIterator<QString,KviUserIdentity> it(*(pWorkingCopy->m_pIdentityDict));
 	while(KviUserIdentity * id = it.current())
 	{
 		KviUserIdentity * pNew = new KviUserIdentity();
diff --git a/src/kvilib/irc/kvi_useridentity.h b/src/kvilib/irc/kvi_useridentity.h
index 978dc5f75..5a3f546de 100644
--- a/src/kvilib/irc/kvi_useridentity.h
+++ b/src/kvilib/irc/kvi_useridentity.h
@@ -28,7 +28,7 @@
 #include "kvi_heapobject.h"
 #include "kvi_pixmap.h"
 #include "kvi_config.h"
-#include "kvi_dict.h"
+#include "kvi_pointerhashtable.h"
 
 class KVILIB_API KviUserIdentity : public KviHeapObject
 {
@@ -120,14 +120,14 @@ protected:
 	~KviUserIdentityManager();
 protected:
 	static KviUserIdentityManager * m_pInstance;
-	KviDict<KviUserIdentity> * m_pIdentityDict;
+	KviPointerHashTable<QString,KviUserIdentity> * m_pIdentityDict;
 	QString m_szDefaultIdentity;
 public:
 	static void init();
 	static void done();
 	static KviUserIdentityManager * instance(){ return m_pInstance; };
 
-	KviDict<KviUserIdentity> * identityDict(){ return m_pIdentityDict; };
+	KviPointerHashTable<QString,KviUserIdentity> * identityDict(){ return m_pIdentityDict; };
 	const KviUserIdentity * findIdentity(const QString &szId){ return m_pIdentityDict->find(szId); };
 	// NEVER NULL
 	const KviUserIdentity * defaultIdentity();
diff --git a/src/kvilib/net/kvi_dns.cpp b/src/kvilib/net/kvi_dns.cpp
index 25aa1b2b4..d3bbfd3ae 100644
--- a/src/kvilib/net/kvi_dns.cpp
+++ b/src/kvilib/net/kvi_dns.cpp
@@ -60,9 +60,9 @@
 KviDnsResult::KviDnsResult()
 {
 	m_iError = KviError_success;
-	m_pHostnameList = new KviPtrList<QString>;
+	m_pHostnameList = new KviPointerList<QString>;
 	m_pHostnameList->setAutoDelete(true);
-	m_pIpAddressList = new KviPtrList<QString>;
+	m_pIpAddressList = new KviPointerList<QString>;
 	m_pIpAddressList->setAutoDelete(true);
 
 }
@@ -393,12 +393,12 @@ KviDnsResult * KviDns::result()
 	return m_pDnsResult;
 }
 
-KviPtrList<QString> * KviDns::hostnameList()
+KviPointerList<QString> * KviDns::hostnameList()
 {
 	return result()->hostnameList();
 }
 
-KviPtrList<QString> * KviDns::ipAddressList()
+KviPointerList<QString> * KviDns::ipAddressList()
 {
 	return result()->ipAddressList();
 }
diff --git a/src/kvilib/net/kvi_dns.h b/src/kvilib/net/kvi_dns.h
index 911edfdae..0fa1ed9e9 100644
--- a/src/kvilib/net/kvi_dns.h
+++ b/src/kvilib/net/kvi_dns.h
@@ -44,15 +44,15 @@ public:
 	~KviDnsResult();
 protected:
 	int             m_iError;
-	KviPtrList<QString> * m_pHostnameList;
-	KviPtrList<QString> * m_pIpAddressList;
+	KviPointerList<QString> * m_pHostnameList;
+	KviPointerList<QString> * m_pIpAddressList;
 	QString               m_szQuery;
 public:
 	int error(){ return m_iError; };
 	// never store nor delete these pointers!
 	// (these are NEVER 0)
-	KviPtrList<QString> * hostnameList(){ return m_pHostnameList; };
-	KviPtrList<QString> * ipAddressList(){ return m_pIpAddressList; };
+	KviPointerList<QString> * hostnameList(){ return m_pHostnameList; };
+	KviPointerList<QString> * ipAddressList(){ return m_pIpAddressList; };
 	const QString &query(){ return m_szQuery; };
 protected:
 	void setError(int iError){ m_iError = iError; };
@@ -96,8 +96,8 @@ public:
 	const QString & firstIpAddress();
 	int hostnameCount();
 	int ipAddressCount();
-	KviPtrList<QString> * hostnameList();
-	KviPtrList<QString> * ipAddressList();
+	KviPointerList<QString> * hostnameList();
+	KviPointerList<QString> * ipAddressList();
 	const QString & query();
 	bool isRunning() const;
 
diff --git a/src/kvilib/net/kvi_http.cpp b/src/kvilib/net/kvi_http.cpp
index 518a6a9f0..91b02bd84 100644
--- a/src/kvilib/net/kvi_http.cpp
+++ b/src/kvilib/net/kvi_http.cpp
@@ -505,7 +505,7 @@ bool KviHttpRequest::processHeader(KviStr &szHeader)
 	emit status(tmp);
 	emit receivedResponse(QString(szResponse.ptr()));
 
-	KviPtrList<KviStr> hlist;
+	KviPointerList<KviStr> hlist;
 	hlist.setAutoDelete(true);
 
 	idx = szHeader.findFirstIdx("\r\n");
@@ -520,7 +520,7 @@ bool KviHttpRequest::processHeader(KviStr &szHeader)
 	}
 	if(szHeader.hasData())hlist.append(new KviStr(szHeader));
 
-	KviAsciiDict<KviStr> hdr(11,false,true);
+	KviPointerHashTable<const char *,KviStr> hdr(11,false,true);
 	hdr.setAutoDelete(true);
 
 	for(KviStr * s = hlist.first();s;s = hlist.next())
diff --git a/src/kvilib/net/kvi_http.h b/src/kvilib/net/kvi_http.h
index 9f3504e54..23fbf407a 100644
--- a/src/kvilib/net/kvi_http.h
+++ b/src/kvilib/net/kvi_http.h
@@ -34,7 +34,7 @@
 #include "kvi_url.h"
 
 #include <qobject.h>
-#include "kvi_asciidict.h"
+#include "kvi_pointerhashtable.h"
 #include "kvi_file.h"
 #include <qstringlist.h>
 
@@ -152,7 +152,7 @@ signals:
 	void status(const QString &message);
 	void data(const KviStr &data);
 	void binaryData(const KviDataBuffer &data);
-	void header(KviAsciiDict<KviStr> * hdr);
+	void header(KviPointerHashTable<const char *,KviStr> * hdr);
 	void requestSent(const QStringList &request);
 };
 
diff --git a/src/kvilib/net/kvi_ssl.cpp b/src/kvilib/net/kvi_ssl.cpp
index 51c874cf4..974bd4d13 100644
--- a/src/kvilib/net/kvi_ssl.cpp
+++ b/src/kvilib/net/kvi_ssl.cpp
@@ -481,9 +481,9 @@ KviSSLCipherInfo * KviSSL::getCurrentCipherInfo()
 
 KviSSLCertificate::KviSSLCertificate(X509 * x509)
 {
-	m_pSubject = new KviAsciiDict<KviStr>(17);
+	m_pSubject = new KviPointerHashTable<const char *,KviStr>(17);
 	m_pSubject->setAutoDelete(true);
-	m_pIssuer = new KviAsciiDict<KviStr>(17);
+	m_pIssuer = new KviPointerHashTable<const char *,KviStr>(17);
 	m_pIssuer->setAutoDelete(true);
 	m_pX509 = 0;
 	setX509(x509);
@@ -546,7 +546,7 @@ void KviSSLCertificate::extractIssuer()
 	splitX509String(m_pIssuer,t);
 }
 
-void KviSSLCertificate::splitX509String(KviAsciiDict<KviStr> * dict,const char * t)
+void KviSSLCertificate::splitX509String(KviPointerHashTable<const char *,KviStr> * dict,const char * t)
 {
 	KviStr buf = t;
 	int cnt;
@@ -575,7 +575,7 @@ void KviSSLCertificate::splitX509String(KviAsciiDict<KviStr> * dict,const char *
 }
 
 
-const char * KviSSLCertificate::dictEntry(KviAsciiDict<KviStr> * dict,const char * entry)
+const char * KviSSLCertificate::dictEntry(KviPointerHashTable<const char *,KviStr> * dict,const char * entry)
 {
 	KviStr * t = dict->find(entry);
 	if(!t)return __tr("Unknown");
diff --git a/src/kvilib/net/kvi_ssl.h b/src/kvilib/net/kvi_ssl.h
index d61e67ab3..c8ee8a299 100644
--- a/src/kvilib/net/kvi_ssl.h
+++ b/src/kvilib/net/kvi_ssl.h
@@ -29,7 +29,7 @@
 #include "kvi_string.h"
 #include "kvi_sockettype.h"
 
-#include "kvi_asciidict.h"
+#include "kvi_pointerhashtable.h"
 
 #include <openssl/ssl.h>
 
@@ -41,8 +41,8 @@ public:
 	~KviSSLCertificate();
 protected:
 	X509 * m_pX509;
-	KviAsciiDict<KviStr> * m_pSubject;
-	KviAsciiDict<KviStr> * m_pIssuer;
+	KviPointerHashTable<const char *,KviStr> * m_pSubject;
+	KviPointerHashTable<const char *,KviStr> * m_pIssuer;
 	int                  m_iPubKeyBits;
 	KviStr               m_szPubKeyType;
 	int                  m_iSerialNumber;
@@ -55,8 +55,8 @@ private:
 	void extractPubKeyInfo();
 	void extractSerialNumber();
 	void extractSignature();
-	const char * dictEntry(KviAsciiDict<KviStr> * dict,const char * entry);
-	void splitX509String(KviAsciiDict<KviStr> * dict,const char * t);
+	const char * dictEntry(KviPointerHashTable<const char *,KviStr> * dict,const char * entry);
+	void splitX509String(KviPointerHashTable<const char *,KviStr> * dict,const char * t);
 //	void getPKeyType(int type,KviStr &buffer);
 public:
 	void setX509(X509 * x509);
diff --git a/src/kvilib/system/kvi_locale.cpp b/src/kvilib/system/kvi_locale.cpp
index 4110e39d0..e137eb9c1 100644
--- a/src/kvilib/system/kvi_locale.cpp
+++ b/src/kvilib/system/kvi_locale.cpp
@@ -52,7 +52,7 @@ KVILIB_API KviMessageCatalogue           * g_pMainCatalogue       = 0;
 
 static KviStr                              g_szLang;
 static KviTranslator                     * g_pTranslator          = 0;
-static KviAsciiDict<KviMessageCatalogue> * g_pCatalogueDict       = 0;
+static KviPointerHashTable<const char *,KviMessageCatalogue> * g_pCatalogueDict       = 0;
 static QTextCodec                        * g_pUtf8TextCodec       = 0;
 
 
@@ -370,7 +370,7 @@ public:
 #endif
 };
 
-static KviAsciiDict<KviSmartTextCodec>   * g_pSmartCodecDict      = 0;
+static KviPointerHashTable<const char *,KviSmartTextCodec>   * g_pSmartCodecDict      = 0;
 
 
 
@@ -476,13 +476,15 @@ KviMessageCatalogue::KviMessageCatalogue()
 	//m_uEncoding = 0;
 	m_pTextCodec = QTextCodec::codecForLocale();
 
-	m_pMessages = new KviAsciiDict<KviTranslationEntry>(1123,true,false); // dictSize, case sensitive , don't copy keys
+	//m_pMessages = new KviPointerHashTable<const char *,KviTranslationEntry>(1123,true,false); // dictSize, case sensitive , don't copy keys
+	m_pMessages = new KviPointerHashTable<const char *,KviTranslationEntry>(32,true,false); // dictSize, case sensitive , don't copy keys
 	m_pMessages->setAutoDelete(true);
 }
 
 KviMessageCatalogue::~KviMessageCatalogue()
 {
-	delete m_pMessages;
+	if(m_pMessages)
+		delete m_pMessages;
 }
 
 bool KviMessageCatalogue::load(const QString& name)
@@ -585,7 +587,10 @@ bool KviMessageCatalogue::load(const QString& name)
 	// Ok...we can run now
 
 	int dictSize = kvi_getFirstBiggerPrime(numberOfStrings);
-	m_pMessages->resize(dictSize);
+	if(m_pMessages)
+		delete m_pMessages;
+	m_pMessages = new KviPointerHashTable<const char *,KviTranslationEntry>(dictSize,true,false); // dictSize, case sensitive , don't copy keys
+	m_pMessages->setAutoDelete(true);
 
 	KviStr szHeader;
 
@@ -976,11 +981,11 @@ namespace KviLocale
 		// the main catalogue is supposed to be kvirc_<language>.mo
 		g_pMainCatalogue = new KviMessageCatalogue();
 		// the catalogue dict
-		g_pCatalogueDict = new KviAsciiDict<KviMessageCatalogue>;
+		g_pCatalogueDict = new KviPointerHashTable<const char *,KviMessageCatalogue>;
 		g_pCatalogueDict->setAutoDelete(true);
 
 		// the smart codec dict
-		g_pSmartCodecDict = new KviAsciiDict<KviSmartTextCodec>;
+		g_pSmartCodecDict = new KviPointerHashTable<const char *,KviSmartTextCodec>;
 		// the Qt docs explicitly state that we shouldn't delete
 		// the codecs by ourselves...
 		g_pSmartCodecDict->setAutoDelete(false);
diff --git a/src/kvilib/system/kvi_locale.h b/src/kvilib/system/kvi_locale.h
index a138fd6d8..ec9d2d78f 100644
--- a/src/kvilib/system/kvi_locale.h
+++ b/src/kvilib/system/kvi_locale.h
@@ -29,7 +29,7 @@
 #include "kvi_settings.h"
 #include "kvi_qstring.h"
 #include "kvi_string.h"
-#include "kvi_asciidict.h"
+#include "kvi_pointerhashtable.h"
 
 #include <qapplication.h>
 
@@ -94,8 +94,9 @@ public:
 	KviMessageCatalogue();
 	~KviMessageCatalogue();
 protected:
-	KviAsciiDict<KviTranslationEntry> * m_pMessages;
-	QTextCodec                        * m_pTextCodec;
+	//KviPointerHashTable<const char *,KviTranslationEntry> * m_pMessages;
+	KviPointerHashTable<const char *,KviTranslationEntry> * m_pMessages;
+	QTextCodec                                            * m_pTextCodec;
 public:
 	bool load(const QString& name);
 	const char * translate(const char * text);
diff --git a/src/kvilib/system/kvi_thread.cpp b/src/kvilib/system/kvi_thread.cpp
index 5dcdae8f9..f046204d4 100644
--- a/src/kvilib/system/kvi_thread.cpp
+++ b/src/kvilib/system/kvi_thread.cpp
@@ -175,7 +175,7 @@ KviThreadManager::KviThreadManager()
 
 
 	m_pMutex = new KviMutex();
-	m_pThreadList = new KviPtrList<KviThread>;
+	m_pThreadList = new KviPointerList<KviThread>;
 	m_pThreadList->setAutoDelete(false);
 
 	m_iWaitingThreads = 0;
@@ -184,7 +184,7 @@ KviThreadManager::KviThreadManager()
 
 	m_iTriggerCount = 0;
 
-	m_pEventQueue = new KviPtrList<KviThreadPendingEvent>;
+	m_pEventQueue = new KviPointerList<KviThreadPendingEvent>;
 	m_pEventQueue->setAutoDelete(true);
 
 	if(pipe(m_fd) != 0)
@@ -268,7 +268,7 @@ void KviThreadManager::killPendingEvents(QObject * receiver)
 void KviThreadManager::killPendingEventsByReceiver(QObject * receiver)
 {
 #ifndef COMPILE_ON_WINDOWS
-	KviPtrList<KviThreadPendingEvent> l;
+	KviPointerList<KviThreadPendingEvent> l;
 	l.setAutoDelete(false);
 	m_pMutex->lock();
 	for(KviThreadPendingEvent * ev = m_pEventQueue->first();ev;ev = m_pEventQueue->next())
@@ -586,7 +586,7 @@ KviSensitiveThread::KviSensitiveThread()
 : KviThread()
 {
 	m_pLocalEventQueueMutex = new KviMutex();
-	m_pLocalEventQueue = new KviPtrList<KviThreadEvent>;
+	m_pLocalEventQueue = new KviPointerList<KviThreadEvent>;
 	m_pLocalEventQueue->setAutoDelete(false);
 }
 
diff --git a/src/kvilib/system/kvi_thread.h b/src/kvilib/system/kvi_thread.h
index 705bd4354..005a32cad 100644
--- a/src/kvilib/system/kvi_thread.h
+++ b/src/kvilib/system/kvi_thread.h
@@ -29,7 +29,7 @@
 #include <qnamespace.h>
 #include <qobject.h>
 #include <qsocketnotifier.h>
-#include "kvi_list.h"
+#include "kvi_pointerlist.h"
 #include <qevent.h>
 
 
@@ -181,7 +181,7 @@ private:
 	bool            m_bRunning;
 	bool            m_bStartingUp;
 	KviMutex      * m_pRunningMutex;
-	KviPtrList<QEvent> * m_pLocalEventQueue;
+	KviPointerList<QEvent> * m_pLocalEventQueue;
 public:
 	// public KviThread interface
 	// HANDLE WITH CARE
@@ -307,7 +307,7 @@ public:
 	virtual ~KviSensitiveThread();
 protected:
 	KviMutex              * m_pLocalEventQueueMutex;
-	KviPtrList<KviThreadEvent> * m_pLocalEventQueue;
+	KviPointerList<KviThreadEvent> * m_pLocalEventQueue;
 public:
 	// enqueues an event directed to THIS thread
 	// the event must be allocated with NEW and
@@ -350,10 +350,10 @@ private:
 	QSocketNotifier * m_pSn;
 #endif
 	KviMutex * m_pMutex; // This class performs only atomic operations
-	KviPtrList<KviThread> * m_pThreadList;
+	KviPointerList<KviThread> * m_pThreadList;
 	int m_iWaitingThreads;
 #ifndef COMPILE_ON_WINDOWS
-	KviPtrList<KviThreadPendingEvent> * m_pEventQueue;
+	KviPointerList<KviThreadPendingEvent> * m_pEventQueue;
 	int m_fd[2];
 	int m_iTriggerCount;
 #endif
diff --git a/src/kvilib/tal/kvi_tal_listview.cpp b/src/kvilib/tal/kvi_tal_listview.cpp
index 1381ddef3..1fd3b3157 100644
--- a/src/kvilib/tal/kvi_tal_listview.cpp
+++ b/src/kvilib/tal/kvi_tal_listview.cpp
@@ -25,7 +25,7 @@
 #define __KVILIB__
 #include "kvi_tal_listview.h"
 
-#include "kvi_ptrdict.h"
+#include "kvi_pointerhashtable.h"
 
 
 #ifdef COMPILE_USE_QT4
@@ -929,7 +929,7 @@
 	
 	    KviTalCheckListItem *exclusive;
 	    KviTalCheckListItem::ToggleState currentState;
-	    KviPtrDict<KviTalCheckListItem::ToggleState> *statesDict;
+	    KviPointerHashTable<void *,KviTalCheckListItem::ToggleState> *statesDict;
 	    bool tristate;
 	};
 	
@@ -1042,7 +1042,7 @@
 	    d = new KviTalCheckListItemPrivate();
 	    on = FALSE; // ### remove on ver 4
 	    if ( myType == CheckBoxController || myType == CheckBox ) {
-		d->statesDict = new KviPtrDict<ToggleState>(101);
+		d->statesDict = new KviPointerHashTable<void *,ToggleState>(101);
 		d->statesDict->setAutoDelete( TRUE );
 	    }
 	    // CheckBoxControllers by default have tristate set to TRUE
diff --git a/src/kvilib/tal/kvi_tal_wizard.cpp b/src/kvilib/tal/kvi_tal_wizard.cpp
index 281fbdab7..6acc5a10c 100644
--- a/src/kvilib/tal/kvi_tal_wizard.cpp
+++ b/src/kvilib/tal/kvi_tal_wizard.cpp
@@ -25,7 +25,7 @@
 #define __KVILIB__
 #include "kvi_tal_wizard.h"
 #include "kvi_tal_hbox.h"
-#include "kvi_list.h"
+#include "kvi_pointerlist.h"
 #include "kvi_locale.h"
 
 #ifdef COMPILE_USE_QT4
@@ -69,7 +69,7 @@ public:
 class KviTalWizardPrivate
 {
 public:
-	KviPtrList<KviTalWizardPageData> * pPageList;
+	KviPointerList<KviTalWizardPageData> * pPageList;
 	int                                iEnabledPageCount;
 	KviTalWizardPageData             * pCurrentPage;
 	QGridLayout                      * pLayout;
@@ -170,7 +170,7 @@ KviTalWizard::KviTalWizard(QWidget * pParent)
 : QDialog(pParent)
 {
 	m_p = new KviTalWizardPrivate;
-	m_p->pPageList = new KviPtrList<KviTalWizardPageData>;
+	m_p->pPageList = new KviPointerList<KviTalWizardPageData>;
 	m_p->pPageList->setAutoDelete(true);
 	m_p->pCurrentPage = NULL;
 	m_p->iEnabledPageCount = 0;
diff --git a/src/kvirc/kernel/kvi_action.cpp b/src/kvirc/kernel/kvi_action.cpp
index be307a668..0a2dbc764 100644
--- a/src/kvirc/kernel/kvi_action.cpp
+++ b/src/kvirc/kernel/kvi_action.cpp
@@ -403,7 +403,7 @@ void KviAction::registerWidget(QWidget * b)
 	connect(b,SIGNAL(destroyed()),this,SLOT(widgetDestroyed()));
 	if(!m_pWidgetList)
 	{
-		m_pWidgetList = new KviPtrList<QWidget>;
+		m_pWidgetList = new KviPointerList<QWidget>;
 		m_pWidgetList->setAutoDelete(false);
 	}
 	m_pWidgetList->append(b);
diff --git a/src/kvirc/kernel/kvi_action.h b/src/kvirc/kernel/kvi_action.h
index a0e6962b7..609d434a1 100644
--- a/src/kvirc/kernel/kvi_action.h
+++ b/src/kvirc/kernel/kvi_action.h
@@ -25,7 +25,7 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_list.h"
+#include "kvi_pointerlist.h"
 
 #include <qobject.h>
 #include <qstring.h>
@@ -74,7 +74,7 @@ protected:
 	KviActionCategory * m_pCategory;                // may be 0, not owned!
 	QString m_szBigIcon;
 	int     m_iSmallIconId;
-	KviPtrList<QWidget> * m_pWidgetList;
+	KviPointerList<QWidget> * m_pWidgetList;
 	unsigned short int m_uInternalFlags;
 	unsigned int m_uFlags;
 	QString m_szKeySequence;
@@ -135,7 +135,7 @@ protected:
 	// called once before the FIRST button or menu item is created
 	bool setupDone() const { return (m_uInternalFlags & KVI_ACTION_FLAG_SETUPDONE); };
 	virtual void setup();
-	KviPtrList<QWidget> * widgetList(){ return m_pWidgetList; };
+	KviPointerList<QWidget> * widgetList(){ return m_pWidgetList; };
 	void registerAccelerator();
 	void unregisterAccelerator();
 	void registerWidget(QWidget * b);
diff --git a/src/kvirc/kernel/kvi_actionmanager.cpp b/src/kvirc/kernel/kvi_actionmanager.cpp
index 4e3f1677e..0a3dc7e12 100644
--- a/src/kvirc/kernel/kvi_actionmanager.cpp
+++ b/src/kvirc/kernel/kvi_actionmanager.cpp
@@ -52,10 +52,10 @@ extern void register_core_actions(KviActionManager *);
 KviActionManager::KviActionManager()
 : QObject()
 {
-	m_pActions = new KviDict<KviAction>(101);
+	m_pActions = new KviPointerHashTable<QString,KviAction>(101);
 	m_pActions->setAutoDelete(false);
 
-	m_pCategories = new KviDict<KviActionCategory>(17,false);
+	m_pCategories = new KviPointerHashTable<QString,KviActionCategory>(17,false);
 	m_pCategories->setAutoDelete(true);
 
 #define CATEGORY(__var,__name,__vname,__descr) \
@@ -82,7 +82,7 @@ KviActionManager::~KviActionManager()
 	// killed all the modules at this point...
 	//KviActionDialog::cleanup();
 
-	KviDictIterator<KviAction> it(*m_pActions);
+	KviPointerHashTableIterator<QString,KviAction> it(*m_pActions);
 	while(KviAction * a = it.current())
 	{
 		disconnect(a,SIGNAL(destroyed()),this,SLOT(actionDestroyed()));
@@ -113,7 +113,7 @@ void KviActionManager::save(const QString &szFileName)
 	KviConfig cfg(szFileName,KviConfig::Write);
 	cfg.clear();
 	
-	KviDictIterator<KviAction> it(*m_pActions);
+	KviPointerHashTableIterator<QString,KviAction> it(*m_pActions);
 	while(KviAction * a = it.current())
 	{
 		if(a->isKviUserActionNeverOverrideThis())
@@ -127,10 +127,10 @@ void KviActionManager::save(const QString &szFileName)
 
 void KviActionManager::killAllKvsUserActions()
 {
-	KviPtrList<KviKvsUserAction> dying;
+	KviPointerList<KviKvsUserAction> dying;
 	dying.setAutoDelete(true);
 
-	KviDictIterator<KviAction> it(*m_pActions);
+	KviPointerHashTableIterator<QString,KviAction> it(*m_pActions);
 	while(KviAction * a = it.current())
 	{
 		if(a->isKviUserActionNeverOverrideThis())
@@ -238,7 +238,7 @@ void KviActionManager::done()
 
 void KviActionManager::delayedRegisterAccelerators()
 {
-	KviDictIterator<KviAction> it(*m_pActions);
+	KviPointerHashTableIterator<QString,KviAction> it(*m_pActions);
 	while(KviAction * a = it.current())
 	{
 		a->registerAccelerator();
@@ -303,14 +303,14 @@ KviAction * KviActionManager::getAction(const QString &szName)
 	return m_pActions->find(szName);
 }
 
-void KviActionManager::listActionsByCategory(const QString &szCatName,KviPtrList<KviAction> * pBuffer)
+void KviActionManager::listActionsByCategory(const QString &szCatName,KviPointerList<KviAction> * pBuffer)
 {
 	loadAllAvailableActions();
 	KviActionCategory * pCat = category(szCatName);
 	pBuffer->setAutoDelete(false);
 	pBuffer->clear();
 	if(!pCat)return;
-	KviDictIterator<KviAction> it(*m_pActions);
+	KviPointerHashTableIterator<QString,KviAction> it(*m_pActions);
 	while(KviAction * a = it.current())
 	{
 		if(a->category() == pCat)
diff --git a/src/kvirc/kernel/kvi_actionmanager.h b/src/kvirc/kernel/kvi_actionmanager.h
index 57c60c71a..9daad5c4d 100644
--- a/src/kvirc/kernel/kvi_actionmanager.h
+++ b/src/kvirc/kernel/kvi_actionmanager.h
@@ -28,7 +28,7 @@
 #include "kvi_action.h"
 
 #include <qobject.h>
-#include "kvi_dict.h"
+#include "kvi_pointerhashtable.h"
 
 class KviActionDrawer;
 class KviCustomToolBar;
@@ -45,8 +45,8 @@ public:
 	~KviActionManager();
 protected:
 	static KviActionManager * m_pInstance;
-	KviDict<KviAction> * m_pActions;
-	KviDict<KviActionCategory> * m_pCategories;
+	KviPointerHashTable<QString,KviAction> * m_pActions;
+	KviPointerHashTable<QString,KviActionCategory> * m_pCategories;
 	static bool m_bCustomizingToolBars;
 	
 	// action categories
@@ -74,15 +74,15 @@ public:
 	static KviActionCategory * categoryChannel(){ return m_pCategoryChannel; };
 	static KviActionCategory * categoryTools(){ return m_pCategoryTools; };
 	
-	KviDict<KviAction> * actions(){ return m_pActions; };
+	KviPointerHashTable<QString,KviAction> * actions(){ return m_pActions; };
 	KviActionCategory * category(const QString &szName);
-	KviDict<KviActionCategory> * categories(){ return m_pCategories; };
+	KviPointerHashTable<QString,KviActionCategory> * categories(){ return m_pCategories; };
 	
 	void killAllKvsUserActions();
 
 	static KviCustomToolBar * currentToolBar(){ return m_pCurrentToolBar; };
 	KviAction * getAction(const QString &szName);
-	void listActionsByCategory(const QString &szCatName,KviPtrList<KviAction> * pBuffer);
+	void listActionsByCategory(const QString &szCatName,KviPointerList<KviAction> * pBuffer);
 	QString nameForAutomaticAction(const QString &szTemplate);
 	bool coreActionExists(const QString &szName);
 
diff --git a/src/kvirc/kernel/kvi_app.cpp b/src/kvirc/kernel/kvi_app.cpp
index 2f1d9d248..2ef96c13a 100644
--- a/src/kvirc/kernel/kvi_app.cpp
+++ b/src/kvirc/kernel/kvi_app.cpp
@@ -88,7 +88,7 @@
 #include "kvi_tal_popupmenu.h"
 #include <qsplitter.h>
 #include <qstringlist.h>
-#include "kvi_asciidict.h"
+#include "kvi_pointerhashtable.h"
 #include <qmime.h>
 #ifdef COMPILE_USE_QT4
 	#include <q3mimefactory.h>
@@ -122,7 +122,7 @@ KVIRC_API KviTextIconWindow            * g_pTextIconWindow            = 0;
 KVIRC_API KviTalPopupMenu              * g_pInputPopup                = 0;
 KVIRC_API QStringList                  * g_pRecentTopicList           = 0;
 //KVIRC_API QStringList                  * g_pBookmarkList            = 0;
-KVIRC_API KviAsciiDict<KviWindow>      * g_pGlobalWindowDict          = 0;
+KVIRC_API KviPointerHashTable<const char *,KviWindow>      * g_pGlobalWindowDict          = 0;
 KVIRC_API KviMediaManager              * g_pMediaManager              = 0;
 //KVIRC_API KviRegisteredUserDataBase    * g_pRegisteredUserDataBase    = 0;
 KVIRC_API KviSharedFilesManager        * g_pSharedFilesManager        = 0;
@@ -460,7 +460,7 @@ void KviApp::setup()
 	KVI_SPLASH_SET_PROGRESS(91)
 
 	// Global window dictionary
-	g_pGlobalWindowDict = new KviAsciiDict<KviWindow>(41);
+	g_pGlobalWindowDict = new KviPointerHashTable<const char *,KviWindow>(41);
 	g_pGlobalWindowDict->setAutoDelete(false);
 	// Script object controller
 	//g_pScriptObjectController = new KviScriptObjectController(); gone
@@ -951,7 +951,7 @@ void KviApp::setClipboardText(const KviStr &str)
 
 void KviApp::setAvatarFromOptions()
 {
-	KviAsciiDictIterator<KviWindow> it(*g_pGlobalWindowDict);
+	KviPointerHashTableIterator<const char *,KviWindow> it(*g_pGlobalWindowDict);
 
 	while(it.current())
 	{
@@ -968,7 +968,7 @@ void KviApp::setAvatarOnFileReceived(KviConsole * pConsole,const QString &szRemo
 {
 	if(!m_pPendingAvatarChanges)
 	{
-		m_pPendingAvatarChanges = new KviPtrList<KviPendingAvatarChange>;
+		m_pPendingAvatarChanges = new KviPointerList<KviPendingAvatarChange>;
 		m_pPendingAvatarChanges->setAutoDelete(true);
 	}
 
@@ -1541,7 +1541,7 @@ void KviApp::saveConfiguration()
 
 void KviApp::autoConnectToServers()
 {
-	KviPtrList<KviIrcServer> * l = g_pIrcServerDataBase->autoConnectOnStartupServers();
+	KviPointerList<KviIrcServer> * l = g_pIrcServerDataBase->autoConnectOnStartupServers();
 	if(l)
 	{
 		for(KviIrcServer * s = l->first();s;s = l->next())
@@ -1555,7 +1555,7 @@ void KviApp::autoConnectToServers()
 		g_pIrcServerDataBase->clearAutoConnectOnStartupServers();
 	}
 	
-	KviPtrList<KviIrcServerDataBaseRecord> * lr = g_pIrcServerDataBase->autoConnectOnStartupNetworks();
+	KviPointerList<KviIrcServerDataBaseRecord> * lr = g_pIrcServerDataBase->autoConnectOnStartupNetworks();
 	if(lr)
 	{
 		for(KviIrcServerDataBaseRecord * r = lr->first();r;r = lr->next())
@@ -1614,7 +1614,7 @@ void KviApp::destroyFrame()
 
 bool KviApp::connectionExists(KviIrcConnection *cnn)
 {
-	KviAsciiDictIterator<KviWindow> it(*g_pGlobalWindowDict);
+	KviPointerHashTableIterator<const char *,KviWindow> it(*g_pGlobalWindowDict);
 
 	while(it.current())
 	{
@@ -1627,7 +1627,7 @@ bool KviApp::connectionExists(KviIrcConnection *cnn)
 
 bool KviApp::windowExists(KviWindow *wnd)
 {
-	KviAsciiDictIterator<KviWindow> it(*g_pGlobalWindowDict);
+	KviPointerHashTableIterator<const char *,KviWindow> it(*g_pGlobalWindowDict);
 
 	while(it.current())
 	{
@@ -1644,7 +1644,7 @@ unsigned int KviApp::windowCount()
 
 KviConsole * KviApp::findConsole(QString &server,QString &nick)
 {
-	KviAsciiDictIterator<KviWindow> it(*g_pGlobalWindowDict);
+	KviPointerHashTableIterator<const char *,KviWindow> it(*g_pGlobalWindowDict);
 
 	while(it.current())
 	{
@@ -1689,7 +1689,7 @@ KviConsole * KviApp::findConsole(KviStr &server,KviStr &nick)
 
 void KviApp::restartLagMeters()
 {
-	KviAsciiDictIterator<KviWindow> it(*g_pGlobalWindowDict);
+	KviPointerHashTableIterator<const char *,KviWindow> it(*g_pGlobalWindowDict);
 
 	while(it.current())
 	{
@@ -1704,7 +1704,7 @@ void KviApp::restartLagMeters()
 
 void KviApp::restartNotifyLists()
 {
-	KviAsciiDictIterator<KviWindow> it(*g_pGlobalWindowDict);
+	KviPointerHashTableIterator<const char *,KviWindow> it(*g_pGlobalWindowDict);
 
 	while(it.current())
 	{
@@ -1719,7 +1719,7 @@ void KviApp::restartNotifyLists()
 
 void KviApp::resetAvatarForMatchingUsers(KviRegisteredUser * u)
 {
-	KviAsciiDictIterator<KviWindow> it(*g_pGlobalWindowDict);
+	KviPointerHashTableIterator<const char *,KviWindow> it(*g_pGlobalWindowDict);
 
 	while(it.current())
 	{
@@ -1733,7 +1733,7 @@ void KviApp::resetAvatarForMatchingUsers(KviRegisteredUser * u)
 
 KviConsole * KviApp::findConsole(unsigned int ircContextId)
 {
-	KviAsciiDictIterator<KviWindow> it(*g_pGlobalWindowDict);
+	KviPointerHashTableIterator<const char *,KviWindow> it(*g_pGlobalWindowDict);
 
 	while(it.current())
 	{
@@ -1759,7 +1759,7 @@ KviConsole * KviApp::topmostConnectedConsole()
 
 	// try ANY connected console
 
-	KviAsciiDictIterator<KviWindow> it(*g_pGlobalWindowDict);
+	KviPointerHashTableIterator<const char *,KviWindow> it(*g_pGlobalWindowDict);
 
 	while(it.current())
 	{
@@ -1780,7 +1780,7 @@ KviWindow * KviApp::findWindow(const char * windowId)
 
 KviWindow * KviApp::findWindowByCaption(const QString &windowCaption,int iContextId)
 {
-	KviAsciiDictIterator<KviWindow> it(*g_pGlobalWindowDict);
+	KviPointerHashTableIterator<const char *,KviWindow> it(*g_pGlobalWindowDict);
 
 	while(it.current())
 	{
@@ -1875,7 +1875,7 @@ void KviApp::buildRecentChannels()
 {
 	if(m_pRecentChannelsDict)
 		delete m_pRecentChannelsDict;
-	m_pRecentChannelsDict = new KviAsciiDict<QStringList>;
+	m_pRecentChannelsDict = new KviPointerHashTable<const char *,QStringList>;
 	m_pRecentChannelsDict->setAutoDelete(TRUE);
 	QString szChan,szNet;
 	for ( 
@@ -1910,7 +1910,7 @@ void KviApp::saveRecentChannels()
 	if(!m_pRecentChannelsDict) return;
 	QString szTmp;
 	KVI_OPTION_STRINGLIST(KviOption_stringlistRecentChannels).clear();
-	KviAsciiDictIterator<QStringList> it( *m_pRecentChannelsDict );
+	KviPointerHashTableIterator<const char *,QStringList> it( *m_pRecentChannelsDict );
 	for( ; it.current(); ++it )
 	{
 		for ( QStringList::Iterator it_str = it.current()->begin(); it_str != it.current()->end(); ++it_str ) {
diff --git a/src/kvirc/kernel/kvi_app.h b/src/kvirc/kernel/kvi_app.h
index 09afbab0a..62fd63d8e 100644
--- a/src/kvirc/kernel/kvi_app.h
+++ b/src/kvirc/kernel/kvi_app.h
@@ -29,9 +29,9 @@
 #include "kvi_string.h"
 #include "kvi_qstring.h"
 #include "kvi_tal_application.h"
-#include "kvi_list.h"
+#include "kvi_pointerlist.h"
 #include "kvi_time.h"
-#include "kvi_asciidict.h" // ?
+#include "kvi_pointerhashtable.h" // ?
 
 #define KVI_RECENT_CHANNELS_SEPARATOR ":"
 
@@ -94,9 +94,9 @@ protected:
 	bool                            m_bFirstTimeRun;
 	KviWindow                     * m_pActiveWindow;
 	bool                            m_bUpdateGuiPending;
-	KviPtrList<KviPendingAvatarChange> * m_pPendingAvatarChanges;
+	KviPointerList<KviPendingAvatarChange> * m_pPendingAvatarChanges;
 	bool                            m_bSetupDone;
-	KviAsciiDict<QStringList>     * m_pRecentChannelsDict;
+	KviPointerHashTable<const char *,QStringList>     * m_pRecentChannelsDict;
 #ifdef COMPILE_PSEUDO_TRANSPARENCY
 	bool                            m_bUpdatePseudoTransparencyPending;
 #endif
@@ -215,7 +215,7 @@ public:
 	bool mapImageFile(QString &szRetPath,const char * filename);
 
 	//void getDefaultDccSaveFilePath(KviStr &path,const char *filename);
-	void completeDirectory(const QString &word,KviPtrList<QString> * matches);
+	void completeDirectory(const QString &word,KviPointerList<QString> * matches);
 	//
 	// Returns a config path suitable for reading (at least)
 	// First lookups the user local config directory,
diff --git a/src/kvirc/kernel/kvi_app_fs.cpp b/src/kvirc/kernel/kvi_app_fs.cpp
index 4c1d06bf4..31309ddea 100644
--- a/src/kvirc/kernel/kvi_app_fs.cpp
+++ b/src/kvirc/kernel/kvi_app_fs.cpp
@@ -243,7 +243,7 @@ bool KviApp::trashFile(const char *filename)
 	return KviFileUtils::renameFile(filename,trashFile.ptr());
 }
 
-void KviApp::completeDirectory(const QString &word,KviPtrList<QString> * matches)
+void KviApp::completeDirectory(const QString &word,KviPointerList<QString> * matches)
 {
 	QString szDir = word;
 	QString szFile = word;
diff --git a/src/kvirc/kernel/kvi_coreactions.cpp b/src/kvirc/kernel/kvi_coreactions.cpp
index 9f0937b01..4a3f682fa 100644
--- a/src/kvirc/kernel/kvi_coreactions.cpp
+++ b/src/kvirc/kernel/kvi_coreactions.cpp
@@ -569,7 +569,7 @@ void KviConnectAction::activeContextChanged()
 void KviConnectAction::activeContextStateChanged()
 {
 
-	KviPtrList<QWidget> * bl = widgetList();
+	KviPointerList<QWidget> * bl = widgetList();
 	if(!bl)return;
 
 	QPixmap * p;
@@ -1006,7 +1006,7 @@ void KviGoAwayAction::activeContextChanged()
 
 void KviGoAwayAction::activeContextStateChanged()
 {
-	KviPtrList<QWidget> * bl = widgetList();
+	KviPointerList<QWidget> * bl = widgetList();
 	if(!bl)return;
 
 	QPixmap * p;
diff --git a/src/kvirc/kernel/kvi_coreactions.h b/src/kvirc/kernel/kvi_coreactions.h
index a178c1be5..e92de9601 100644
--- a/src/kvirc/kernel/kvi_coreactions.h
+++ b/src/kvirc/kernel/kvi_coreactions.h
@@ -27,7 +27,7 @@
 #include "kvi_settings.h"
 #include "kvi_action.h"
 #include "kvi_kvs_action.h"
-#include "kvi_list.h"
+#include "kvi_pointerlist.h"
 
 #include <qtoolbutton.h>
 
diff --git a/src/kvirc/kernel/kvi_customtoolbardescriptor.cpp b/src/kvirc/kernel/kvi_customtoolbardescriptor.cpp
index 9e0414519..ab4678940 100644
--- a/src/kvirc/kernel/kvi_customtoolbardescriptor.cpp
+++ b/src/kvirc/kernel/kvi_customtoolbardescriptor.cpp
@@ -38,7 +38,7 @@ KviCustomToolBarDescriptor::KviCustomToolBarDescriptor(const QString &szId,const
 {
 	m_iInternalId = g_pApp->getGloballyUniqueId();
 	m_szId = szId;
-	m_pActions = new KviPtrList<QString>;
+	m_pActions = new KviPointerList<QString>;
 	m_pActions->setAutoDelete(true);
 	m_pToolBar = 0;
 	m_bVisibleAtStartup = false;
@@ -130,7 +130,7 @@ void KviCustomToolBarDescriptor::fillToolBar()
 		// force layout of the toolbar
 		QApplication::postEvent(m_pToolBar,new QEvent(QEvent::LayoutHint));
 	} else {
-		KviPtrList<QString> dying;
+		KviPointerList<QString> dying;
 		dying.setAutoDelete(false);
 		for(QString *p = m_pActions->first();p;p = m_pActions->next())
 		{
diff --git a/src/kvirc/kernel/kvi_customtoolbardescriptor.h b/src/kvirc/kernel/kvi_customtoolbardescriptor.h
index d36f60545..2c39df119 100644
--- a/src/kvirc/kernel/kvi_customtoolbardescriptor.h
+++ b/src/kvirc/kernel/kvi_customtoolbardescriptor.h
@@ -26,7 +26,7 @@
 
 #include "kvi_settings.h"
 #include "kvi_qstring.h"
-#include "kvi_list.h"
+#include "kvi_pointerlist.h"
 
 class KviCustomToolBar;
 class KviConfig;
@@ -48,7 +48,7 @@ protected:
 	QString               m_szId;
 	QString               m_szIconId;
 	QString               m_szParsedLabel;
-	KviPtrList<QString> * m_pActions;
+	KviPointerList<QString> * m_pActions;
 	KviCustomToolBar    * m_pToolBar;
 	int                   m_iInternalId;
 	bool                  m_bVisibleAtStartup;
@@ -67,7 +67,7 @@ public:
 	bool removeAction(unsigned int iAction);
 	void clear();
 	void rename(const QString &szNewName);
-	KviPtrList<QString> * actions(){ return m_pActions; };
+	KviPointerList<QString> * actions(){ return m_pActions; };
 	void updateToolBar();
 protected:
 	void createLabelScript(const QString &szNewLabelCode);
diff --git a/src/kvirc/kernel/kvi_customtoolbarmanager.cpp b/src/kvirc/kernel/kvi_customtoolbarmanager.cpp
index 1d8e67ba0..034c086ea 100644
--- a/src/kvirc/kernel/kvi_customtoolbarmanager.cpp
+++ b/src/kvirc/kernel/kvi_customtoolbarmanager.cpp
@@ -33,7 +33,7 @@ KviCustomToolBarManager * KviCustomToolBarManager::m_pInstance = 0;
 
 KviCustomToolBarManager::KviCustomToolBarManager()
 {
-	m_pDescriptors = new KviDict<KviCustomToolBarDescriptor>(17,false);
+	m_pDescriptors = new KviPointerHashTable<QString,KviCustomToolBarDescriptor>(17,false);
 	m_pDescriptors->setAutoDelete(true);
 }
 
@@ -44,7 +44,7 @@ KviCustomToolBarManager::~KviCustomToolBarManager()
 
 KviCustomToolBar * KviCustomToolBarManager::firstExistingToolBar()
 {
-	KviDictIterator<KviCustomToolBarDescriptor> it(*m_pDescriptors);
+	KviPointerHashTableIterator<QString,KviCustomToolBarDescriptor> it(*m_pDescriptors);
 	while(KviCustomToolBarDescriptor * d = it.current())
 	{
 		if(d->toolBar())return d->toolBar();
@@ -94,7 +94,7 @@ QString KviCustomToolBarManager::idForNewToolBar(const QString &szTemplate)
 
 KviCustomToolBarDescriptor * KviCustomToolBarManager::findDescriptorByInternalId(int id)
 {
-	KviDictIterator<KviCustomToolBarDescriptor> it(*m_pDescriptors);
+	KviPointerHashTableIterator<QString,KviCustomToolBarDescriptor> it(*m_pDescriptors);
 	while(KviCustomToolBarDescriptor * d = it.current())
 	{
 		if(d->internalId() == id)return d;
@@ -140,7 +140,7 @@ KviCustomToolBarDescriptor * KviCustomToolBarManager::create(const QString &szId
 
 void KviCustomToolBarManager::storeVisibilityState()
 {
-	KviDictIterator<KviCustomToolBarDescriptor> it(*m_pDescriptors);
+	KviPointerHashTableIterator<QString,KviCustomToolBarDescriptor> it(*m_pDescriptors);
 	while(KviCustomToolBarDescriptor * d = it.current())
 	{
 		d->m_bVisibleAtStartup = d->toolBar() != 0;
@@ -152,7 +152,7 @@ void KviCustomToolBarManager::storeVisibilityState()
 int KviCustomToolBarManager::visibleToolBarCount()
 {
 	int cnt = 0;
-	KviDictIterator<KviCustomToolBarDescriptor> it(*m_pDescriptors);
+	KviPointerHashTableIterator<QString,KviCustomToolBarDescriptor> it(*m_pDescriptors);
 	while(KviCustomToolBarDescriptor * d = it.current())
 	{
 		if(d->toolBar() != 0)cnt++;
@@ -163,7 +163,7 @@ int KviCustomToolBarManager::visibleToolBarCount()
 
 void KviCustomToolBarManager::createToolBarsVisibleAtStartup()
 {
-	KviDictIterator<KviCustomToolBarDescriptor> it(*m_pDescriptors);
+	KviPointerHashTableIterator<QString,KviCustomToolBarDescriptor> it(*m_pDescriptors);
 	while(KviCustomToolBarDescriptor * d = it.current())
 	{
 		if(d->m_bVisibleAtStartup && (!d->toolBar()))
@@ -174,7 +174,7 @@ void KviCustomToolBarManager::createToolBarsVisibleAtStartup()
 
 void KviCustomToolBarManager::updateVisibleToolBars()
 {
-	KviDictIterator<KviCustomToolBarDescriptor> it(*m_pDescriptors);
+	KviPointerHashTableIterator<QString,KviCustomToolBarDescriptor> it(*m_pDescriptors);
 	while(KviCustomToolBarDescriptor * d = it.current())
 	{
 		if(d->toolBar())d->updateToolBar();
@@ -201,7 +201,7 @@ void KviCustomToolBarManager::load(const QString &szFileName)
 void KviCustomToolBarManager::save(const QString &szFileName)
 {
 	KviConfig cfg(szFileName,KviConfig::Write);
-	KviDictIterator<KviCustomToolBarDescriptor> it(*m_pDescriptors);
+	KviPointerHashTableIterator<QString,KviCustomToolBarDescriptor> it(*m_pDescriptors);
 	while(KviCustomToolBarDescriptor * d = it.current())
 	{
 		cfg.setGroup(d->id());
diff --git a/src/kvirc/kernel/kvi_customtoolbarmanager.h b/src/kvirc/kernel/kvi_customtoolbarmanager.h
index 3b1f458f2..1ae47ab53 100644
--- a/src/kvirc/kernel/kvi_customtoolbarmanager.h
+++ b/src/kvirc/kernel/kvi_customtoolbarmanager.h
@@ -25,7 +25,7 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_dict.h"
+#include "kvi_pointerhashtable.h"
 
 #ifdef COMPILE_ON_WINDOWS
 	#include "kvi_customtoolbardescriptor.h"
@@ -45,7 +45,7 @@ protected:
 	~KviCustomToolBarManager();
 protected:
 	static KviCustomToolBarManager * m_pInstance;
-	KviDict<KviCustomToolBarDescriptor> * m_pDescriptors;
+	KviPointerHashTable<QString,KviCustomToolBarDescriptor> * m_pDescriptors;
 public:
 	static KviCustomToolBarManager * instance(){ return m_pInstance; };
 	static void init();
@@ -54,7 +54,7 @@ public:
 	int descriptorCount(){ return m_pDescriptors->count(); };
 	int visibleToolBarCount();
 	QString idForNewToolBar(const QString &szTemplate);
-	KviDict<KviCustomToolBarDescriptor> * descriptors(){ return m_pDescriptors; };
+	KviPointerHashTable<QString,KviCustomToolBarDescriptor> * descriptors(){ return m_pDescriptors; };
 	KviCustomToolBar * firstExistingToolBar();
 	KviCustomToolBarDescriptor * create(const QString &szId,const QString &szLabelCode);
 	KviCustomToolBarDescriptor * find(const QString &szId){ return m_pDescriptors->find(szId); };
diff --git a/src/kvirc/kernel/kvi_filetransfer.cpp b/src/kvirc/kernel/kvi_filetransfer.cpp
index ff67dcb3a..53f89edc8 100644
--- a/src/kvirc/kernel/kvi_filetransfer.cpp
+++ b/src/kvirc/kernel/kvi_filetransfer.cpp
@@ -72,7 +72,7 @@ void KviFileTransferManager::killTerminatedTransfers()
 {
 	if(!m_pTransferList)return;
 
-	KviPtrList<KviFileTransfer> l;
+	KviPointerList<KviFileTransfer> l;
 	l.setAutoDelete(false);
 
 	for(KviFileTransfer * f = m_pTransferList->first();f;f = m_pTransferList->next())
@@ -88,7 +88,7 @@ void KviFileTransferManager::invokeTransferWindow(KviWindow * pWnd,bool bCreateM
 {
 	if(!m_pTransferWindow)
 	{
-		KviDict<QVariant> d(7,false);
+		KviPointerHashTable<QString,QVariant> d(7,false);
 		d.setAutoDelete(true);
 		d.replace("bCreateMinimized",new QVariant(bCreateMinimized,0));
 		d.replace("bNoRaise",new QVariant(bNoRaise,0));
@@ -105,7 +105,7 @@ void KviFileTransferManager::registerTransfer(KviFileTransfer * t)
 {
 	if(!m_pTransferList)
 	{
-		m_pTransferList = new KviPtrList<KviFileTransfer>;
+		m_pTransferList = new KviPointerList<KviFileTransfer>;
 		m_pTransferList->setAutoDelete(false);
 	}
 
diff --git a/src/kvirc/kernel/kvi_filetransfer.h b/src/kvirc/kernel/kvi_filetransfer.h
index 79a6b5376..135a8c5a4 100644
--- a/src/kvirc/kernel/kvi_filetransfer.h
+++ b/src/kvirc/kernel/kvi_filetransfer.h
@@ -29,7 +29,7 @@
 
 #include <qobject.h>
 
-#include "kvi_list.h"
+#include "kvi_pointerlist.h"
 #include "kvi_tal_listview.h"
 
 class KviFileTransfer;
@@ -51,7 +51,7 @@ public:
 	KviFileTransferManager();
 	~KviFileTransferManager();
 protected:
-	KviPtrList<KviFileTransfer> * m_pTransferList;
+	KviPointerList<KviFileTransfer> * m_pTransferList;
 	KviWindow                   * m_pTransferWindow;
 protected:
 	static void cleanup();
@@ -62,7 +62,7 @@ public:
 	// might be zero!
 	KviWindow * transferWindow(){ return m_pTransferWindow; };
 	static KviFileTransferManager * instance();
-	KviPtrList<KviFileTransfer> * transferList(){ return m_pTransferList; };
+	KviPointerList<KviFileTransfer> * transferList(){ return m_pTransferList; };
 	void invokeTransferWindow(KviWindow * pWnd = 0,bool bCreateMinimized = false,bool bNoRaise = false);
 	void killAllTransfers();
 	void killTerminatedTransfers();
diff --git a/src/kvirc/kernel/kvi_iconmanager.cpp b/src/kvirc/kernel/kvi_iconmanager.cpp
index 18ba42df1..2c0aa55e9 100644
--- a/src/kvirc/kernel/kvi_iconmanager.cpp
+++ b/src/kvirc/kernel/kvi_iconmanager.cpp
@@ -475,7 +475,7 @@ KviIconManager::KviIconManager()
 
 	//loadSmallIcons();
 
-	m_pCachedImages = new KviDict<KviCachedPixmap>(21,true);
+	m_pCachedImages = new KviPointerHashTable<QString,KviCachedPixmap>(21,true);
 	m_pCachedImages->setAutoDelete(true);
 
 	m_uCacheTotalSize = 0;
@@ -540,7 +540,7 @@ int KviIconManager::getSmallIconIdFromName(const QString &szName)
 {
 	if(!m_pIconNames)
 	{
-		m_pIconNames = new KviDict<int>(257,false);
+		m_pIconNames = new KviPointerHashTable<QString,int>(257,false);
 		m_pIconNames->setAutoDelete(true);
 		
 		for(int i=0;i<KVI_NUM_SMALL_ICONS;i++)
@@ -889,7 +889,7 @@ void KviIconManager::cacheCleanup()
 {
 	QStringList l;
 
-	KviDictIterator<KviCachedPixmap> it(*m_pCachedImages);
+	KviPointerHashTableIterator<QString,KviCachedPixmap> it(*m_pCachedImages);
 
 
 //#warning "IMPLEMENT CLEANUP"
diff --git a/src/kvirc/kernel/kvi_iconmanager.h b/src/kvirc/kernel/kvi_iconmanager.h
index 80ca7b2d5..e50244397 100644
--- a/src/kvirc/kernel/kvi_iconmanager.h
+++ b/src/kvirc/kernel/kvi_iconmanager.h
@@ -33,7 +33,7 @@
 #include <qpixmap.h>
 #include <qobject.h>
 #include <qwidget.h>
-#include "kvi_dict.h"
+#include "kvi_pointerhashtable.h"
 
 
 
@@ -440,8 +440,8 @@ private:
 	QPixmap                     * m_smallIcons[KVI_NUM_SMALL_ICONS];
 	KviIconWidget               * m_pIconWidget;
 
-	KviDict<KviCachedPixmap>      * m_pCachedImages;
-	KviDict<int>                  * m_pIconNames;
+	KviPointerHashTable<QString,KviCachedPixmap>      * m_pCachedImages;
+	KviPointerHashTable<QString,int>                  * m_pIconNames;
 	unsigned int                  m_uCacheTotalSize;
 	unsigned int                  m_uCacheMaxSize;
 public:
diff --git a/src/kvirc/kernel/kvi_ircconnection.cpp b/src/kvirc/kernel/kvi_ircconnection.cpp
index 21f6a6eb2..ded8088be 100644
--- a/src/kvirc/kernel/kvi_ircconnection.cpp
+++ b/src/kvirc/kernel/kvi_ircconnection.cpp
@@ -82,9 +82,9 @@ KviIrcConnection::KviIrcConnection(KviIrcContext * pContext,KviIrcConnectionTarg
 	m_pFrame = m_pConsole->frame();
 	m_pTarget = pTarget;
 	m_pUserIdentity = pIdentity;
-	m_pChannelList = new KviPtrList<KviChannel>;
+	m_pChannelList = new KviPointerList<KviChannel>;
 	m_pChannelList->setAutoDelete(false);
-	m_pQueryList = new KviPtrList<KviQuery>;
+	m_pQueryList = new KviPointerList<KviQuery>;
 	m_pQueryList->setAutoDelete(false);
 	m_pLink = new KviIrcLink(this);
 	m_pUserDataBase = new KviIrcUserDataBase();
@@ -286,7 +286,7 @@ void KviIrcConnection::linkEstabilished()
 	m_pStatistics->setLastMessageTime(kvi_unixTime());
 	m_pServerInfo->setName(target()->server()->m_szHostname);
 
-	if(KviPtrList<KviIrcDataStreamMonitor> * l = context()->monitorList())
+	if(KviPointerList<KviIrcDataStreamMonitor> * l = context()->monitorList())
 	{
 		for(KviIrcDataStreamMonitor *m =l->first();m;m =l->next())
 			m->connectionInitiated();
@@ -320,7 +320,7 @@ void KviIrcConnection::linkTerminated()
 		m_pLagMeter = 0;
 	}
 	
-	if(KviPtrList<KviIrcDataStreamMonitor> * l = context()->monitorList())
+	if(KviPointerList<KviIrcDataStreamMonitor> * l = context()->monitorList())
 	{
 		for(KviIrcDataStreamMonitor *m =l->first();m;m =l->next())
 			m->connectionTerminated();
@@ -554,7 +554,7 @@ bool KviIrcConnection::sendFmtData(const char *fmt,...)
 	}
 
 	// notify the monitors
-	if(KviPtrList<KviIrcDataStreamMonitor> * l = context()->monitorList())
+	if(KviPointerList<KviIrcDataStreamMonitor> * l = context()->monitorList())
 	{
 		for(KviIrcDataStreamMonitor *m = l->first();m;m = l->next())
 			m->outgoingMessage((const char *)(pData->data()),iLen - 2);
@@ -578,7 +578,7 @@ bool KviIrcConnection::sendData(const char *buffer,int buflen)
 	*(pData->data()+buflen+1)='\n';
 
 	// notify the monitors
-	if(KviPtrList<KviIrcDataStreamMonitor> * l = context()->monitorList())
+	if(KviPointerList<KviIrcDataStreamMonitor> * l = context()->monitorList())
 	{
 		for(KviIrcDataStreamMonitor *m = l->first();m;m = l->next())
 			m->outgoingMessage((const char *)(pData->data()),buflen);
@@ -1293,7 +1293,7 @@ void KviIrcConnection::incomingMessage(const char * message)
 {
 	// A message has arrived from the current server
 	// First of all , notify the monitors
-	if(KviPtrList<KviIrcDataStreamMonitor> * l = context()->monitorList())
+	if(KviPointerList<KviIrcDataStreamMonitor> * l = context()->monitorList())
 	{
 		for(KviIrcDataStreamMonitor *m = l->first();m;m = l->next())
 		{
diff --git a/src/kvirc/kernel/kvi_ircconnection.h b/src/kvirc/kernel/kvi_ircconnection.h
index bf33ed0ed..4227c971b 100644
--- a/src/kvirc/kernel/kvi_ircconnection.h
+++ b/src/kvirc/kernel/kvi_ircconnection.h
@@ -27,7 +27,7 @@
 #include "kvi_settings.h"
 #include "kvi_qstring.h"
 #include "kvi_qcstring.h"
-#include "kvi_list.h"
+#include "kvi_pointerlist.h"
 #include "kvi_time.h"
 #include <qobject.h>
 
@@ -98,8 +98,8 @@ private:
 
 	KviIrcConnectionStateData            * m_pStateData;            // owned, never null
 
-	KviPtrList<KviChannel>               * m_pChannelList;          // owned, never null, elements shallow
-	KviPtrList<KviQuery>                 * m_pQueryList;            // owned, never null, elements shallow
+	KviPointerList<KviChannel>               * m_pChannelList;          // owned, never null, elements shallow
+	KviPointerList<KviQuery>                 * m_pQueryList;            // owned, never null, elements shallow
 
 	KviIrcUserDataBase                   * m_pUserDataBase;         // owned, never null
 	
@@ -177,7 +177,7 @@ public:
 	//
 	// ----> KviChannelManager ?
 	KviChannel * findChannel(const QString &name);
-	KviPtrList<KviChannel> * channelList(){ return m_pChannelList; };
+	KviPointerList<KviChannel> * channelList(){ return m_pChannelList; };
 	int getCommonChannels(const QString &nick,QString &szChansBuffer,bool bAddEscapeSequences = true);
 	KviChannel * createChannel(const QString &name);
 	void registerChannel(KviChannel *c);
@@ -197,7 +197,7 @@ public:
 	//
 	// ----> KviQueryManager ?
 	KviQuery * findQuery(const QString &nick);
-	KviPtrList<KviQuery> * queryList(){ return m_pQueryList; };
+	KviPointerList<KviQuery> * queryList(){ return m_pQueryList; };
 	KviQuery * createQuery(const QString &nick);
 	void registerQuery(KviQuery *q);
 	void unregisterQuery(KviQuery *q);
diff --git a/src/kvirc/kernel/kvi_ircconnectionasyncwhoisdata.cpp b/src/kvirc/kernel/kvi_ircconnectionasyncwhoisdata.cpp
index f646c2722..c8dbef002 100644
--- a/src/kvirc/kernel/kvi_ircconnectionasyncwhoisdata.cpp
+++ b/src/kvirc/kernel/kvi_ircconnectionasyncwhoisdata.cpp
@@ -53,7 +53,7 @@ void KviIrcConnectionAsyncWhoisData::add(KviAsyncWhoisInfo * i)
 {
 	if(!m_pWhoisInfoList)
 	{
-		m_pWhoisInfoList = new KviPtrList<KviAsyncWhoisInfo>;
+		m_pWhoisInfoList = new KviPointerList<KviAsyncWhoisInfo>;
 		m_pWhoisInfoList->setAutoDelete(true);
 	}
 	m_pWhoisInfoList->append(i);
diff --git a/src/kvirc/kernel/kvi_ircconnectionasyncwhoisdata.h b/src/kvirc/kernel/kvi_ircconnectionasyncwhoisdata.h
index 46574ee72..84a389981 100644
--- a/src/kvirc/kernel/kvi_ircconnectionasyncwhoisdata.h
+++ b/src/kvirc/kernel/kvi_ircconnectionasyncwhoisdata.h
@@ -26,7 +26,7 @@
 
 #include "kvi_settings.h"
 #include "kvi_qstring.h"
-#include "kvi_list.h"
+#include "kvi_pointerlist.h"
 
 class KviWindow;
 class KviKvsScript;
@@ -62,7 +62,7 @@ public:
 	KviIrcConnectionAsyncWhoisData();
 	~KviIrcConnectionAsyncWhoisData();
 protected:
-	KviPtrList<KviAsyncWhoisInfo> * m_pWhoisInfoList; // awhois pending stuff
+	KviPointerList<KviAsyncWhoisInfo> * m_pWhoisInfoList; // awhois pending stuff
 public:
 	void add(KviAsyncWhoisInfo * i);
 	KviAsyncWhoisInfo * lookup(const QString &nick);
diff --git a/src/kvirc/kernel/kvi_irccontext.cpp b/src/kvirc/kernel/kvi_irccontext.cpp
index b4840d792..107c93080 100644
--- a/src/kvirc/kernel/kvi_irccontext.cpp
+++ b/src/kvirc/kernel/kvi_irccontext.cpp
@@ -134,7 +134,7 @@ void KviIrcContext::registerDataStreamMonitor(KviIrcDataStreamMonitor * m)
 {
 	if(!m_pMonitorList)
 	{
-		m_pMonitorList = new KviPtrList<KviIrcDataStreamMonitor>;
+		m_pMonitorList = new KviPointerList<KviIrcDataStreamMonitor>;
 		m_pMonitorList->setAutoDelete(false);
 	}
 	m_pMonitorList->append(m);
@@ -226,7 +226,7 @@ void KviIrcContext::registerContextWindow(KviWindow * pWnd)
 {
 	if(!m_pContextWindows)
 	{
-		m_pContextWindows = new KviPtrList<KviWindow>;
+		m_pContextWindows = new KviPointerList<KviWindow>;
 		m_pContextWindows->setAutoDelete(false);
 	}
 	m_pContextWindows->append(pWnd);
@@ -236,7 +236,7 @@ void KviIrcContext::registerDeadChannel(KviChannel * c)
 {
 	if(!m_pDeadChannels)
 	{
-		m_pDeadChannels = new KviPtrList<KviChannel>;
+		m_pDeadChannels = new KviPointerList<KviChannel>;
 		m_pDeadChannels->setAutoDelete(false);
 	}
 	m_pDeadChannels->append(c);
@@ -246,7 +246,7 @@ void KviIrcContext::registerDeadQuery(KviQuery * q)
 {
 	if(!m_pDeadQueries)
 	{
-		m_pDeadQueries = new KviPtrList<KviQuery>;
+		m_pDeadQueries = new KviPointerList<KviQuery>;
 		m_pDeadQueries->setAutoDelete(false);
 	}
 	m_pDeadQueries->append(q);
diff --git a/src/kvirc/kernel/kvi_irccontext.h b/src/kvirc/kernel/kvi_irccontext.h
index 98c338b4d..ab3baba12 100644
--- a/src/kvirc/kernel/kvi_irccontext.h
+++ b/src/kvirc/kernel/kvi_irccontext.h
@@ -25,7 +25,7 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_list.h"
+#include "kvi_pointerlist.h"
 #include <qobject.h>
 
 class KviChannel;
@@ -96,13 +96,13 @@ protected:
 	unsigned int                       m_uConnectAttemptCount;
 	QTimer                           * m_pReconnectTimer;
 
-	KviPtrList<KviIrcDataStreamMonitor> * m_pMonitorList; // owned, may be null
+	KviPointerList<KviIrcDataStreamMonitor> * m_pMonitorList; // owned, may be null
 
 	// dead channels and queries
-	KviPtrList<KviChannel>           * m_pDeadChannels;
-	KviPtrList<KviQuery>             * m_pDeadQueries;
+	KviPointerList<KviChannel>           * m_pDeadChannels;
+	KviPointerList<KviQuery>             * m_pDeadQueries;
 	// other context bound windows
-	KviPtrList<KviWindow>            * m_pContextWindows;
+	KviPointerList<KviWindow>            * m_pContextWindows;
 	
 	int                                m_iHeartbeatTimerId;
 public:
@@ -132,7 +132,7 @@ public:
 	void registerContextWindow(KviWindow * pWnd);
 	bool unregisterContextWindow(KviWindow * pWnd);
 
-	KviPtrList<KviIrcDataStreamMonitor> * monitorList(){ return m_pMonitorList; };
+	KviPointerList<KviIrcDataStreamMonitor> * monitorList(){ return m_pMonitorList; };
 
 	// links window
 	void createLinksWindow();
diff --git a/src/kvirc/kernel/kvi_ircsocket.h b/src/kvirc/kernel/kvi_ircsocket.h
index 117c448b3..0b45cfedb 100644
--- a/src/kvirc/kernel/kvi_ircsocket.h
+++ b/src/kvirc/kernel/kvi_ircsocket.h
@@ -28,7 +28,7 @@
 #include "kvi_string.h"
 #include "kvi_sockettype.h"
 #include "kvi_time.h"
-#include "kvi_list.h"
+#include "kvi_pointerlist.h"
 
 #include <qobject.h>
 
diff --git a/src/kvirc/kernel/kvi_lagmeter.cpp b/src/kvirc/kernel/kvi_lagmeter.cpp
index c9e0a008d..a621cfceb 100644
--- a/src/kvirc/kernel/kvi_lagmeter.cpp
+++ b/src/kvirc/kernel/kvi_lagmeter.cpp
@@ -42,7 +42,7 @@ KviLagMeter::KviLagMeter(KviIrcConnection * c)
 : QObject()
 {
 	m_pConnection = c;
-	m_pCheckList = new KviPtrList<KviLagCheck>;
+	m_pCheckList = new KviPointerList<KviLagCheck>;
 	m_pCheckList->setAutoDelete(true);
 	m_uLag = 0;
 	m_uLastEmittedLag = 0;
@@ -251,7 +251,7 @@ bool KviLagMeter::lagCheckComplete(const char * key)
 
 void KviLagMeter::lagCheckAbort(const char * key)
 {
-	KviPtrList<KviLagCheck> l;
+	KviPointerList<KviLagCheck> l;
 	l.setAutoDelete(false);
 	KviLagCheck * c;
 
diff --git a/src/kvirc/kernel/kvi_lagmeter.h b/src/kvirc/kernel/kvi_lagmeter.h
index e287f8a81..77adc533b 100644
--- a/src/kvirc/kernel/kvi_lagmeter.h
+++ b/src/kvirc/kernel/kvi_lagmeter.h
@@ -26,7 +26,7 @@
 
 #include "kvi_settings.h"
 #include "kvi_string.h"
-#include "kvi_list.h"
+#include "kvi_pointerlist.h"
 
 #include <qobject.h>
 
@@ -54,7 +54,7 @@ protected:
 	unsigned int              m_uLastEmittedLag;     // last emitted lag
 	long                      m_tLastCompleted;      // time when the last lag was completed (gettimeofday!)
 	unsigned int              m_uLastReliability;    // how much reliable was the last completed check ?
-	KviPtrList<KviLagCheck> * m_pCheckList;
+	KviPointerList<KviLagCheck> * m_pCheckList;
 	long                      m_tFirstOwnCheck;      // time when the first ping after a completed check was sent
 	long                      m_tLastOwnCheck;       // time when the last ping was sent
 	bool                      m_bOnAlarm;
diff --git a/src/kvirc/kernel/kvi_notifylist.cpp b/src/kvirc/kernel/kvi_notifylist.cpp
index 5463cfc7d..c18a03973 100644
--- a/src/kvirc/kernel/kvi_notifylist.cpp
+++ b/src/kvirc/kernel/kvi_notifylist.cpp
@@ -166,8 +166,8 @@ void KviNotifyListManager::notifyOnLine(const QString &nick,const QString &user,
 	else
 		KviQString::sprintf(szWho,"\r!n\r%Q\r",&nick);
 	
-	KviDict<KviRegisteredUser> * d = g_pRegisteredUserDataBase->userDict();
-	KviDictIterator<KviRegisteredUser> it(*d);
+	KviPointerHashTable<QString,KviRegisteredUser> * d = g_pRegisteredUserDataBase->userDict();
+	KviPointerHashTableIterator<QString,KviRegisteredUser> it(*d);
 	QString szNotify;
 	
 	while(KviRegisteredUser * u = it.current())
@@ -226,8 +226,8 @@ void KviNotifyListManager::notifyOffLine(const QString &nick,const QString &user
 	
 		QString szMsg;
 		
-		KviDict<KviRegisteredUser> * d = g_pRegisteredUserDataBase->userDict();
-		KviDictIterator<KviRegisteredUser> it(*d);
+		KviPointerHashTable<QString,KviRegisteredUser> * d = g_pRegisteredUserDataBase->userDict();
+		KviPointerHashTableIterator<QString,KviRegisteredUser> it(*d);
 		QString szNotify;
 		
 		while(KviRegisteredUser * u = it.current())
@@ -319,15 +319,15 @@ void KviNotifyListManager::notifyOffLine(const QString &nick,const QString &user
 KviIsOnNotifyListManager::KviIsOnNotifyListManager(KviIrcConnection * pConnection)
 : KviNotifyListManager(pConnection)
 {
-	m_pRegUserDict = new KviDict<QString>(17,false); // case insensitive , copy keys
+	m_pRegUserDict = new KviPointerHashTable<QString,QString>(17,false); // case insensitive , copy keys
 	m_pRegUserDict->setAutoDelete(true);
-	m_pNotifyList  = new KviPtrList<QString>;
+	m_pNotifyList  = new KviPointerList<QString>;
 	m_pNotifyList->setAutoDelete(true);
-	m_pIsOnList = new KviPtrList<QString>;
+	m_pIsOnList = new KviPointerList<QString>;
 	m_pIsOnList->setAutoDelete(true);
-	m_pOnlineList = new KviPtrList<QString>;
+	m_pOnlineList = new KviPointerList<QString>;
 	m_pOnlineList->setAutoDelete(true);
-	m_pUserhostList = new KviPtrList<QString>;
+	m_pUserhostList = new KviPointerList<QString>;
 	m_pUserhostList->setAutoDelete(true);
 	m_pDelayedNotifyTimer = new QTimer();
 	connect(m_pDelayedNotifyTimer,SIGNAL(timeout()),this,SLOT(newNotifySession()));
@@ -376,8 +376,8 @@ void KviIsOnNotifyListManager::buildRegUserDict()
 {
 	m_pRegUserDict->clear();
 
-	const KviDict<KviRegisteredUser> * d = g_pRegisteredUserDataBase->userDict();
-	KviDictIterator<KviRegisteredUser> it(*d);
+	const KviPointerHashTable<QString,KviRegisteredUser> * d = g_pRegisteredUserDataBase->userDict();
+	KviPointerHashTableIterator<QString,KviRegisteredUser> it(*d);
 	while(KviRegisteredUser * u = it.current())
 	{
 		QString notify;
@@ -435,7 +435,7 @@ void KviIsOnNotifyListManager::newNotifySession()
 void KviIsOnNotifyListManager::buildNotifyList()
 {
 	m_pNotifyList->clear();
-	KviDictIterator<QString> it(*m_pRegUserDict);
+	KviPointerHashTableIterator<QString,QString> it(*m_pRegUserDict);
 	while(it.current())
 	{
 		m_pNotifyList->append(new QString(it.currentKey()));
@@ -506,7 +506,7 @@ bool KviIsOnNotifyListManager::handleIsOn(KviIrcMessage *msg)
 	// Check if it is our ISON
 	// all the nicks must be on the IsOnList
 
-	KviPtrList<QString> tmplist;
+	KviPointerList<QString> tmplist;
 	tmplist.setAutoDelete(false);
 
 	KviStr nk;
@@ -584,7 +584,7 @@ bool KviIsOnNotifyListManager::handleIsOn(KviIrcMessage *msg)
 
 	KviIrcUserDataBase * db = console()->connection()->userDataBase();
 
-	KviPtrList<QString> l;
+	KviPointerList<QString> l;
 	l.setAutoDelete(false);
 
 	for(s = m_pOnlineList->first();s;s = m_pOnlineList->next())
@@ -602,7 +602,7 @@ bool KviIsOnNotifyListManager::handleIsOn(KviIrcMessage *msg)
 					// mmmh...we have more than one ref , so the user is at least in one query or channel
 					// look him up on channels , if we find his entry , we can be sure that he is
 					// still the right user
-					KviPtrList<KviChannel> * chlist = m_pConsole->connection()->channelList();
+					KviPointerList<KviChannel> * chlist = m_pConsole->connection()->channelList();
 					for(KviChannel * ch = chlist->first();ch;ch = chlist->next())
 					{
 						if(KviUserListEntry * le = ch->findEntry(*s))
@@ -772,7 +772,7 @@ bool KviIsOnNotifyListManager::handleUserhost(KviIrcMessage *msg)
 {
 	if(!m_bExpectingUserhost)return false;
 	// first check for consistency: all the replies must be on the USERHOST list
-	KviPtrList<KviIrcMask> tmplist;
+	KviPointerList<KviIrcMask> tmplist;
 	tmplist.setAutoDelete(true);
 
 	KviStr nk;
@@ -905,7 +905,7 @@ void KviIsOnNotifyListManager::stop()
 KviStupidNotifyListManager::KviStupidNotifyListManager(KviIrcConnection * pConnection)
 : KviNotifyListManager(pConnection)
 {
-	m_pNickList = new KviPtrList<QString>;
+	m_pNickList = new KviPointerList<QString>;
 	m_pNickList->setAutoDelete(true);
 	m_iRestartTimer = 0;
 }
@@ -1050,8 +1050,8 @@ void KviStupidNotifyListManager::stop()
 
 void KviStupidNotifyListManager::buildNickList()
 {
-	const KviDict<KviRegisteredUser> * d = g_pRegisteredUserDataBase->userDict();
-	KviDictIterator<KviRegisteredUser> it(*d);
+	const KviPointerHashTable<QString,KviRegisteredUser> * d = g_pRegisteredUserDataBase->userDict();
+	KviPointerHashTableIterator<QString,KviRegisteredUser> it(*d);
 	m_pNickList->clear();
 	while(it.current())
 	{
@@ -1073,7 +1073,7 @@ void KviStupidNotifyListManager::buildNickList()
 KviWatchNotifyListManager::KviWatchNotifyListManager(KviIrcConnection * pConnection)
 : KviNotifyListManager(pConnection)
 {
-	m_pRegUserDict = new KviDict<QString>(17,false);
+	m_pRegUserDict = new KviPointerHashTable<QString,QString>(17,false);
 	m_pRegUserDict->setAutoDelete(true);
 }
 
@@ -1086,8 +1086,8 @@ void KviWatchNotifyListManager::buildRegUserDict()
 {
 	m_pRegUserDict->clear();
 
-	const KviDict<KviRegisteredUser> * d = g_pRegisteredUserDataBase->userDict();
-	KviDictIterator<KviRegisteredUser> it(*d);
+	const KviPointerHashTable<QString,KviRegisteredUser> * d = g_pRegisteredUserDataBase->userDict();
+	KviPointerHashTableIterator<QString,KviRegisteredUser> it(*d);
 	while(KviRegisteredUser * u = it.current())
 	{
 		QString notify;
@@ -1112,7 +1112,7 @@ void KviWatchNotifyListManager::start()
 
 	QString watchStr;
 
-	KviDictIterator<QString> it(*m_pRegUserDict);
+	KviPointerHashTableIterator<QString,QString> it(*m_pRegUserDict);
 	while(it.current())
 	{
 		QString nk = it.currentKey();
diff --git a/src/kvirc/kernel/kvi_notifylist.h b/src/kvirc/kernel/kvi_notifylist.h
index 734d7915b..e3ffffd10 100644
--- a/src/kvirc/kernel/kvi_notifylist.h
+++ b/src/kvirc/kernel/kvi_notifylist.h
@@ -29,8 +29,8 @@
 #include "kvi_settings.h"
 
 #include <qobject.h>
-#include "kvi_list.h"
-#include "kvi_dict.h"
+#include "kvi_pointerlist.h"
+#include "kvi_pointerhashtable.h"
 #include <qtimer.h>
 
 #include "kvi_qstring.h"
@@ -75,12 +75,12 @@ protected:
 	KviIsOnNotifyListManager(KviIrcConnection * pConnection);
 	~KviIsOnNotifyListManager();
 private:
-	KviDict<QString>      * m_pRegUserDict;            // dict notifystring->reguser name
-	KviPtrList<QString> * m_pNotifyList;                  // list of notifystring (total)
-	KviPtrList<QString> * m_pIsOnList;                    // list of notifystring (one session)
+	KviPointerHashTable<QString,QString>      * m_pRegUserDict;            // dict notifystring->reguser name
+	KviPointerList<QString> * m_pNotifyList;                  // list of notifystring (total)
+	KviPointerList<QString> * m_pIsOnList;                    // list of notifystring (one session)
 	QString               m_szIsOnString;                 // m_pIsOnList in form of a string
-	KviPtrList<QString> * m_pOnlineList;                  //
-	KviPtrList<QString> * m_pUserhostList;
+	KviPointerList<QString> * m_pOnlineList;                  //
+	KviPointerList<QString> * m_pUserhostList;
 	QString               m_szUserhostString;
 	bool                  m_bExpectingIsOn;
 	bool                  m_bExpectingUserhost;
@@ -123,7 +123,7 @@ protected:
 	KviStupidNotifyListManager(KviIrcConnection * pConnection);
 	~KviStupidNotifyListManager();
 protected:
-	KviPtrList<QString> * m_pNickList;
+	KviPointerList<QString> * m_pNickList;
 	QString m_szLastIsOnMsg;
 	int m_iNextNickToCheck;
 	int m_iRestartTimer;
@@ -148,7 +148,7 @@ public:
 	KviWatchNotifyListManager(KviIrcConnection * pConnection);
 	~KviWatchNotifyListManager();
 protected:
-	KviDict<QString> * m_pRegUserDict;            // dict notifystring->reguser name
+	KviPointerHashTable<QString,QString> * m_pRegUserDict;            // dict notifystring->reguser name
 protected:
 	void buildRegUserDict();
 	virtual void start();
diff --git a/src/kvirc/kernel/kvi_texticonmanager.cpp b/src/kvirc/kernel/kvi_texticonmanager.cpp
index 7af47c51b..180c10360 100644
--- a/src/kvirc/kernel/kvi_texticonmanager.cpp
+++ b/src/kvirc/kernel/kvi_texticonmanager.cpp
@@ -30,7 +30,7 @@
 #include "kvi_iconmanager.h"
 #include "kvi_texticonmanager.h"
 #include "kvi_string.h"
-#include "kvi_list.h"
+#include "kvi_pointerlist.h"
 #include "kvi_config.h"
 #include "kvi_app.h"
 #include "kvi_confignames.h"
@@ -75,7 +75,7 @@ QPixmap * KviTextIcon::pixmap()
 KviTextIconManager::KviTextIconManager()
 : QObject()
 {
-	m_pTextIconDict = new KviDict<KviTextIcon>(47,false);
+	m_pTextIconDict = new KviPointerHashTable<QString,KviTextIcon>(47,false);
 	m_pTextIconDict->setAutoDelete(true);
 }
 
@@ -177,7 +177,7 @@ int KviTextIconManager::load(const QString &filename,bool bMerge)
 	{
 		KviConfigGroupIterator it(*dict);
 	
-		KviPtrList<QString> names;
+		KviPointerList<QString> names;
 		names.setAutoDelete(true);
 	
 		while(it.current())
@@ -240,7 +240,7 @@ void KviTextIconManager::save(const QString &filename)
 
 	cfg.setGroup("TextIcons");
 
-	KviDictIterator<KviTextIcon> it(*m_pTextIconDict);
+	KviPointerHashTableIterator<QString,KviTextIcon> it(*m_pTextIconDict);
 	while(KviTextIcon * i = it.current())
 	{
 		if(i->id()!=-1)
diff --git a/src/kvirc/kernel/kvi_texticonmanager.h b/src/kvirc/kernel/kvi_texticonmanager.h
index fca0f4147..50d06a8e0 100644
--- a/src/kvirc/kernel/kvi_texticonmanager.h
+++ b/src/kvirc/kernel/kvi_texticonmanager.h
@@ -28,7 +28,7 @@
 #include "kvi_settings.h"
 
 #include <qpixmap.h>
-#include "kvi_dict.h"
+#include "kvi_pointerhashtable.h"
 
 
 class KVIRC_API KviTextIcon
@@ -60,11 +60,11 @@ public:
 	KviTextIconManager();
 	~KviTextIconManager();
 private:
-	KviDict<KviTextIcon> * m_pTextIconDict;
+	KviPointerHashTable<QString,KviTextIcon> * m_pTextIconDict;
 signals:
 	void changed();
 public:
-	KviDict<KviTextIcon> * textIconDict(){ return m_pTextIconDict; };
+	KviPointerHashTable<QString,KviTextIcon> * textIconDict(){ return m_pTextIconDict; };
 	void checkDefaultAssociations();
 	void clear();
 	void insert(const QString &name,int id);
diff --git a/src/kvirc/kvs/kvi_kvs_aliasmanager.cpp b/src/kvirc/kvs/kvi_kvs_aliasmanager.cpp
index 1372760d0..81e1234c2 100644
--- a/src/kvirc/kvs/kvi_kvs_aliasmanager.cpp
+++ b/src/kvirc/kvs/kvi_kvs_aliasmanager.cpp
@@ -32,7 +32,7 @@ KviKvsAliasManager * KviKvsAliasManager::m_pAliasManager = 0;
 KviKvsAliasManager::KviKvsAliasManager()
 {
 	m_pAliasManager = this;
-	m_pAliasDict = new KviDict<KviKvsScript>(51,false);
+	m_pAliasDict = new KviPointerHashTable<QString,KviKvsScript>(51,false);
 	m_pAliasDict->setAutoDelete(true);
 }
 
@@ -61,9 +61,9 @@ void KviKvsAliasManager::done()
 	delete KviKvsAliasManager::instance();
 }
 
-void KviKvsAliasManager::completeCommand(const QString &word,KviPtrList<QString> * matches)
+void KviKvsAliasManager::completeCommand(const QString &word,KviPointerList<QString> * matches)
 {
-	KviDictIterator<KviKvsScript> it(*m_pAliasDict);
+	KviPointerHashTableIterator<QString,KviKvsScript> it(*m_pAliasDict);
 	while(it.current())
 	{
 		if(KviQString::equalCIN(word,it.current()->name(),word.length()))
@@ -79,7 +79,7 @@ void KviKvsAliasManager::save(const QString & filename)
 	KviConfig cfg(filename,KviConfig::Write);
 	cfg.clear();
 
-	KviDictIterator<KviKvsScript> it(*m_pAliasDict);
+	KviPointerHashTableIterator<QString,KviKvsScript> it(*m_pAliasDict);
 
 	while(it.current())
 	{
@@ -96,7 +96,7 @@ void KviKvsAliasManager::load(const QString & filename)
 
 	KviConfigIterator it(*(cfg.dict()));
 
-	KviPtrList<QString> l;
+	KviPointerList<QString> l;
 	l.setAutoDelete(true);
 
 	while(it.current())
diff --git a/src/kvirc/kvs/kvi_kvs_aliasmanager.h b/src/kvirc/kvs/kvi_kvs_aliasmanager.h
index db2ef9f8c..4d3871d4a 100644
--- a/src/kvirc/kvs/kvi_kvs_aliasmanager.h
+++ b/src/kvirc/kvs/kvi_kvs_aliasmanager.h
@@ -25,9 +25,9 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_dict.h"
+#include "kvi_pointerhashtable.h"
 
-#include "kvi_list.h"
+#include "kvi_pointerlist.h"
 #include "kvi_qstring.h"
 
 #include "kvi_kvs_script.h"
@@ -38,7 +38,7 @@ protected: // it only can be created and destroyed by KviKvsAliasManager::init()
 	KviKvsAliasManager();
 	~KviKvsAliasManager();
 protected:
-	KviDict<KviKvsScript>        * m_pAliasDict;
+	KviPointerHashTable<QString,KviKvsScript>        * m_pAliasDict;
 	static KviKvsAliasManager  * m_pAliasManager;
 public:
 	static KviKvsAliasManager * instance()
@@ -46,7 +46,7 @@ public:
 	static void init(); // called by KviKvs::init()
 	static void done(); // called by KviKvs::done()
 
-	KviDict<KviKvsScript> * aliasDict(){ return m_pAliasDict; };
+	KviPointerHashTable<QString,KviKvsScript> * aliasDict(){ return m_pAliasDict; };
 	const KviKvsScript * lookup(const QString & szName)
 		{ return m_pAliasDict->find(szName); };
 	void add(const QString &szName,KviKvsScript * pAlias)
@@ -59,7 +59,7 @@ public:
 	void save(const QString & filename);
 	void load(const QString & filename);
 
-	void completeCommand(const QString &word,KviPtrList<QString> * matches);
+	void completeCommand(const QString &word,KviPointerList<QString> * matches);
 };
 
 // namespaces are handled completly in the editing!
diff --git a/src/kvirc/kvs/kvi_kvs_asyncoperation.cpp b/src/kvirc/kvs/kvi_kvs_asyncoperation.cpp
index 38e0253d9..ff503c02c 100644
--- a/src/kvirc/kvs/kvi_kvs_asyncoperation.cpp
+++ b/src/kvirc/kvs/kvi_kvs_asyncoperation.cpp
@@ -43,7 +43,7 @@ KviKvsAsyncOperation::~KviKvsAsyncOperation()
 
 KviKvsAsyncOperationManager::KviKvsAsyncOperationManager()
 {
-	m_pOperationList = new KviPtrList<KviKvsAsyncOperation>;
+	m_pOperationList = new KviPointerList<KviKvsAsyncOperation>;
 	m_pOperationList->setAutoDelete(false);
 }
 
diff --git a/src/kvirc/kvs/kvi_kvs_asyncoperation.h b/src/kvirc/kvs/kvi_kvs_asyncoperation.h
index 7e10e31b6..a870b4081 100644
--- a/src/kvirc/kvs/kvi_kvs_asyncoperation.h
+++ b/src/kvirc/kvs/kvi_kvs_asyncoperation.h
@@ -25,7 +25,7 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_list.h"
+#include "kvi_pointerlist.h"
 #include <qobject.h>
 
 class KviWindow;
@@ -50,7 +50,7 @@ public:
 	KviKvsAsyncOperationManager();
 	~KviKvsAsyncOperationManager();
 protected:
-	KviPtrList<KviKvsAsyncOperation> * m_pOperationList;
+	KviPointerList<KviKvsAsyncOperation> * m_pOperationList;
 protected:
 	void registerOperation(KviKvsAsyncOperation * o);
 	void unregisterOperation(KviKvsAsyncOperation * o);
diff --git a/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp b/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp
index 79293ef6e..b99b8ee58 100644
--- a/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp
+++ b/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp
@@ -59,7 +59,7 @@
 #include "kvi_tal_tooltip.h"
 
 // kvi_app.cpp
-extern KviAsciiDict<KviWindow> * g_pGlobalWindowDict;
+extern KviPointerHashTable<const char *,KviWindow> * g_pGlobalWindowDict;
 
 namespace KviKvsCoreSimpleCommands
 {
@@ -124,7 +124,7 @@ namespace KviKvsCoreSimpleCommands
 	
 		if(KVSCSC_pSwitches->find('a',"all-networks"))
 		{
-			KviAsciiDictIterator<KviWindow> it(*g_pGlobalWindowDict);
+			KviPointerHashTableIterator<const char *,KviWindow> it(*g_pGlobalWindowDict);
 			while(KviWindow * wnd = it.current())
 			{
 				if(wnd->type()==KVI_WINDOW_TYPE_CONSOLE)
@@ -178,7 +178,7 @@ namespace KviKvsCoreSimpleCommands
 		
 		if(KVSCSC_pSwitches->find('a',"all-networks"))
 		{
-			KviAsciiDictIterator<KviWindow> it(*g_pGlobalWindowDict);
+			KviPointerHashTableIterator<const char *,KviWindow> it(*g_pGlobalWindowDict);
 			while(KviWindow * wnd = it.current())
 			{
 				if(wnd->type()==KVI_WINDOW_TYPE_CONSOLE)
diff --git a/src/kvirc/kvs/kvi_kvs_coresimplecommands_gl.cpp b/src/kvirc/kvs/kvi_kvs_coresimplecommands_gl.cpp
index b62bf0244..8847b51e3 100644
--- a/src/kvirc/kvs/kvi_kvs_coresimplecommands_gl.cpp
+++ b/src/kvirc/kvs/kvi_kvs_coresimplecommands_gl.cpp
@@ -616,12 +616,12 @@ try_again:
 
 	KVSCSC(listtimers)
 	{
-		KviDict<KviKvsTimer> * pTimerDict = KviKvsTimerManager::instance()->timerDict();
+		KviPointerHashTable<QString,KviKvsTimer> * pTimerDict = KviKvsTimerManager::instance()->timerDict();
 
 		if(!pTimerDict)
 			return true;
 		
-		KviDictIterator<KviKvsTimer> it(*pTimerDict);
+		KviPointerHashTableIterator<QString,KviKvsTimer> it(*pTimerDict);
 		
 		KVSCSC_pContext->window()->outputNoFmt(KVI_OUT_VERBOSE,__tr2qs("List of active timers"));
 		
diff --git a/src/kvirc/kvs/kvi_kvs_dnsmanager.cpp b/src/kvirc/kvs/kvi_kvs_dnsmanager.cpp
index 05669e242..bfca60eb0 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 KviPtrDict<KviKvsDnsObject>;
+		m_pDnsObjects = new KviPointerHashTable<void *,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 5e80289aa..ae0cbc663 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 "kvi_ptrdict.h"
+#include "kvi_pointerhashtable.h"
 #include <qstring.h>
 
 class KviDns;
@@ -70,7 +70,7 @@ public:
 	~KviKvsDnsManager();
 protected:
 	static KviKvsDnsManager   * m_pInstance;
-	KviPtrDict<KviKvsDnsObject> * m_pDnsObjects;
+	KviPointerHashTable<void *,KviKvsDnsObject> * m_pDnsObjects;
 public:
 	static KviKvsDnsManager * instance(){ return m_pInstance; };
 	static void init();
diff --git a/src/kvirc/kvs/kvi_kvs_event.cpp b/src/kvirc/kvs/kvi_kvs_event.cpp
index ec0419fe7..d86f3e885 100644
--- a/src/kvirc/kvs/kvi_kvs_event.cpp
+++ b/src/kvirc/kvs/kvi_kvs_event.cpp
@@ -52,7 +52,7 @@ void KviKvsEvent::addHandler(KviKvsEventHandler * h)
 {
 	if(!m_pHandlers)
 	{
-		m_pHandlers = new KviPtrList<KviKvsEventHandler>();
+		m_pHandlers = new KviPointerList<KviKvsEventHandler>();
 		m_pHandlers->setAutoDelete(true);
 	}
 	m_pHandlers->append(h);
@@ -61,7 +61,7 @@ void KviKvsEvent::addHandler(KviKvsEventHandler * h)
 void KviKvsEvent::clearScriptHandlers()
 {
 	if(!m_pHandlers)return;
-	KviPtrList<KviKvsEventHandler> dl;
+	KviPointerList<KviKvsEventHandler> dl;
 	dl.setAutoDelete(false);
 	KviKvsEventHandler * e;
 	for(e = m_pHandlers->first();e;e = m_pHandlers->next())
diff --git a/src/kvirc/kvs/kvi_kvs_event.h b/src/kvirc/kvs/kvi_kvs_event.h
index 1f4bdea5c..f88936b7b 100644
--- a/src/kvirc/kvs/kvi_kvs_event.h
+++ b/src/kvirc/kvs/kvi_kvs_event.h
@@ -26,7 +26,7 @@
 
 #include "kvi_settings.h"
 #include "kvi_qstring.h"
-#include "kvi_list.h"
+#include "kvi_pointerlist.h"
 
 #include "kvi_kvs_eventhandler.h"
 
@@ -35,7 +35,7 @@ class KVIRC_API KviKvsEvent
 protected:
 	QString                          m_szName;
 	QString                          m_szParameterDescription;
-	KviPtrList<KviKvsEventHandler> * m_pHandlers;
+	KviPointerList<KviKvsEventHandler> * m_pHandlers;
 public:
 	// the event name and the parameter description are NOT translated
 	KviKvsEvent(const char * szEventName,const char * szParameterDescription)
@@ -44,7 +44,7 @@ public:
 	void clear();
 	void clearScriptHandlers();
 	bool hasHandlers(){ return m_pHandlers != 0; };
-	KviPtrList<KviKvsEventHandler> * handlers(){ return m_pHandlers; };
+	KviPointerList<KviKvsEventHandler> * handlers(){ return m_pHandlers; };
 	void addHandler(KviKvsEventHandler * h);
 	void removeHandler(KviKvsEventHandler * h);
 	const QString & name(){ return m_szName; };
diff --git a/src/kvirc/kvs/kvi_kvs_eventmanager.cpp b/src/kvirc/kvs/kvi_kvs_eventmanager.cpp
index 4b53155a6..b4f9ee70c 100644
--- a/src/kvirc/kvs/kvi_kvs_eventmanager.cpp
+++ b/src/kvirc/kvs/kvi_kvs_eventmanager.cpp
@@ -159,7 +159,7 @@ bool KviKvsEventManager::addRawHandler(unsigned int uRawIdx,KviKvsEventHandler *
 	if(uRawIdx >= KVI_KVS_NUM_RAW_EVENTS)return false;
 	if(!m_rawEventTable[uRawIdx])
 	{
-		m_rawEventTable[uRawIdx] = new KviPtrList<KviKvsEventHandler>();
+		m_rawEventTable[uRawIdx] = new KviPointerList<KviKvsEventHandler>();
 		m_rawEventTable[uRawIdx]->setAutoDelete(true);
 	}
 	m_rawEventTable[uRawIdx]->append(h);
@@ -268,7 +268,7 @@ void KviKvsEventManager::removeAllModuleAppHandlers(KviKvsModuleInterface *pIfac
 	{
 		if(!m_appEventTable[i].handlers())continue;
 	
-		KviPtrList<KviKvsEventHandler> l;
+		KviPointerList<KviKvsEventHandler> l;
 		l.setAutoDelete(false);
 		for(h = m_appEventTable[i].handlers()->first();h;h = m_appEventTable[i].handlers()->next())
 		{
@@ -303,7 +303,7 @@ void KviKvsEventManager::removeAllModuleRawHandlers(KviKvsModuleInterface *pIfac
 	{
 		if(!m_rawEventTable[i])continue;
 
-		KviPtrList<KviKvsEventHandler> l;
+		KviPointerList<KviKvsEventHandler> l;
 		l.setAutoDelete(false);
 		for(h = m_rawEventTable[i]->first();h;h = m_rawEventTable[i]->next())
 		{
@@ -432,7 +432,7 @@ void KviKvsEventManager::removeAllScriptRawHandlers()
 	{
 		if(m_rawEventTable[i])
 		{
-			KviPtrList<KviKvsEventHandler> dl;
+			KviPointerList<KviKvsEventHandler> dl;
 			dl.setAutoDelete(false);
 			KviKvsEventHandler * e;
 			for(e = m_rawEventTable[i]->first();e;e = m_rawEventTable[i]->next())
@@ -477,7 +477,7 @@ void KviKvsEventManager::clear()
 	clearAppEvents();
 }
 
-bool KviKvsEventManager::triggerHandlers(KviPtrList<KviKvsEventHandler> * pHandlers,KviWindow *pWnd,KviKvsVariantList *pParams)
+bool KviKvsEventManager::triggerHandlers(KviPointerList<KviKvsEventHandler> * pHandlers,KviWindow *pWnd,KviKvsVariantList *pParams)
 {
 	if(!pHandlers)return false;
 
@@ -539,7 +539,7 @@ void KviKvsEventManager::loadRawEvents(const QString &szFileName)
 			unsigned int nHandlers = cfg.readUIntEntry("NHandlers",0);
 			if(nHandlers)
 			{
-				m_rawEventTable[i] = new KviPtrList<KviKvsEventHandler>();
+				m_rawEventTable[i] = new KviPointerList<KviKvsEventHandler>();
 				m_rawEventTable[i]->setAutoDelete(true);
 				for(unsigned int index = 0;index < nHandlers;index++)
 				{
diff --git a/src/kvirc/kvs/kvi_kvs_eventmanager.h b/src/kvirc/kvs/kvi_kvs_eventmanager.h
index 89ffd7a5b..14a78e029 100644
--- a/src/kvirc/kvs/kvi_kvs_eventmanager.h
+++ b/src/kvirc/kvs/kvi_kvs_eventmanager.h
@@ -27,7 +27,7 @@
 #include "kvi_settings.h"
 
 #include "kvi_kvs_event.h"
-#include "kvi_list.h"
+#include "kvi_pointerlist.h"
 #include "kvi_kvs_eventtable.h"
 
 class KviWindow;
@@ -46,7 +46,7 @@ protected:
 	static KviKvsEventManager * m_pInstance;
 
 	static KviKvsEvent               m_appEventTable[KVI_KVS_NUM_APP_EVENTS];
-	KviPtrList<KviKvsEventHandler> * m_rawEventTable[KVI_KVS_NUM_RAW_EVENTS];
+	KviPointerList<KviKvsEventHandler> * m_rawEventTable[KVI_KVS_NUM_RAW_EVENTS];
 public:
 	static KviKvsEventManager * instance(){ return m_pInstance; };
 	static void init(); // called by KviKvs::init()
@@ -55,10 +55,10 @@ public:
 	KviKvsEvent * appEvent(unsigned int uEvIdx){ return &(m_appEventTable[uEvIdx]); };
 
 	bool hasAppHandlers(unsigned int uEvIdx){ return m_appEventTable[uEvIdx].hasHandlers(); };
-	KviPtrList<KviKvsEventHandler> * appHandlers(unsigned int uEvIdx){ return m_appEventTable[uEvIdx].handlers(); };
+	KviPointerList<KviKvsEventHandler> * appHandlers(unsigned int uEvIdx){ return m_appEventTable[uEvIdx].handlers(); };
 	
 	bool hasRawHandlers(unsigned int uEvIdx){ return m_rawEventTable[uEvIdx]; };
-	KviPtrList<KviKvsEventHandler> * rawHandlers(unsigned int uEvIdx){ return m_rawEventTable[uEvIdx]; };
+	KviPointerList<KviKvsEventHandler> * rawHandlers(unsigned int uEvIdx){ return m_rawEventTable[uEvIdx]; };
 
 	KviKvsEvent * findAppEventByName(const QString &szName);
 	unsigned int findAppEventIndexByName(const QString &szName);
@@ -88,7 +88,7 @@ public:
 
 	// returns true if further processing should be stopped
 	// none of these functions takes params ownership, so be sure to delete them !
-	bool triggerHandlers(KviPtrList<KviKvsEventHandler> * pHandlers,KviWindow *pWnd,KviKvsVariantList *pParams);
+	bool triggerHandlers(KviPointerList<KviKvsEventHandler> * pHandlers,KviWindow *pWnd,KviKvsVariantList *pParams);
 	bool trigger(unsigned int uEvIdx,KviWindow * pWnd,KviKvsVariantList * pParams)
 		{ return triggerHandlers(m_appEventTable[uEvIdx].handlers(),pWnd,pParams); };
 	bool triggerRaw(unsigned int uEvIdx,KviWindow *pWnd,KviKvsVariantList * pParams)
diff --git a/src/kvirc/kvs/kvi_kvs_hash.cpp b/src/kvirc/kvs/kvi_kvs_hash.cpp
index ad74b6a88..09ce85cf5 100644
--- a/src/kvirc/kvs/kvi_kvs_hash.cpp
+++ b/src/kvirc/kvs/kvi_kvs_hash.cpp
@@ -28,15 +28,15 @@
 
 KviKvsHash::KviKvsHash()
 {
-	m_pDict = new KviDict<KviKvsVariant>(17,false);
+	m_pDict = new KviPointerHashTable<QString,KviKvsVariant>(17,false);
 	m_pDict->setAutoDelete(true);
 }
 
 KviKvsHash::KviKvsHash(const KviKvsHash &h)
 {
-	m_pDict = new KviDict<KviKvsVariant>();
+	m_pDict = new KviPointerHashTable<QString,KviKvsVariant>();
 	m_pDict->setAutoDelete(true);
-	KviDictIterator<KviKvsVariant> it(*(h.m_pDict));
+	KviPointerHashTableIterator<QString,KviKvsVariant> it(*(h.m_pDict));
 	while(it.current())
 	{
 		m_pDict->replace(it.currentKey(),new KviKvsVariant(*(it.current())));
@@ -51,7 +51,7 @@ KviKvsHash::~KviKvsHash()
 
 void KviKvsHash::appendAsString(QString &szBuffer) const
 {
-	KviDictIterator<KviKvsVariant> it(*m_pDict);
+	KviPointerHashTableIterator<QString,KviKvsVariant> it(*m_pDict);
 	bool bNeedComma = false;
 	while(KviKvsVariant * s = it.current())
 	{
@@ -66,7 +66,7 @@ void KviKvsHash::serialize(QString& result)
 {
 	QString tmpBuffer;
 	result="{";
-	KviDictIterator<KviKvsVariant> it(*m_pDict);
+	KviPointerHashTableIterator<QString,KviKvsVariant> it(*m_pDict);
 	bool bNeedComma = false;
 	while(KviKvsVariant * s = it.current())
 	{
diff --git a/src/kvirc/kvs/kvi_kvs_hash.h b/src/kvirc/kvs/kvi_kvs_hash.h
index c4cc19be1..482cad41f 100644
--- a/src/kvirc/kvs/kvi_kvs_hash.h
+++ b/src/kvirc/kvs/kvi_kvs_hash.h
@@ -26,13 +26,13 @@
 
 #include "kvi_settings.h"
 
-#include "kvi_dict.h"
+#include "kvi_pointerhashtable.h"
 #include "kvi_qstring.h"
 
 #include "kvi_kvs_variant.h"
 #include "kvi_heapobject.h"
 
-typedef KVIRC_API KviDictIterator<KviKvsVariant> KviKvsHashIterator;
+typedef KVIRC_API KviPointerHashTableIterator<QString,KviKvsVariant> KviKvsHashIterator;
 
 // This class must not have virtual funcitons nor destructor
 // Otherwise it will happily crash on windows when it is
@@ -44,7 +44,7 @@ public:
 	KviKvsHash(const KviKvsHash &h);
 	~KviKvsHash();
 protected:
-	KviDict<KviKvsVariant> * m_pDict;
+	KviPointerHashTable<QString,KviKvsVariant> * m_pDict;
 public:
 	void unset(const QString &szKey){ m_pDict->remove(szKey); };
 	void set(const QString &szKey,KviKvsVariant * pVal){ m_pDict->replace(szKey,pVal); };
@@ -56,7 +56,7 @@ public:
 
 	void appendAsString(QString &szBuffer) const;
 	
-	const KviDict<KviKvsVariant> * dict(){ return m_pDict; };
+	const KviPointerHashTable<QString,KviKvsVariant> * dict(){ return m_pDict; };
 
 	void serialize(QString& result);
 };
diff --git a/src/kvirc/kvs/kvi_kvs_kernel.cpp b/src/kvirc/kvs/kvi_kvs_kernel.cpp
index cab1d6249..a3aac1f4f 100644
--- a/src/kvirc/kvs/kvi_kvs_kernel.cpp
+++ b/src/kvirc/kvs/kvi_kvs_kernel.cpp
@@ -47,13 +47,13 @@ KviKvsKernel::KviKvsKernel()
 {
 	m_pKvsKernel = this;
 
-	m_pSpecialCommandParsingRoutineDict = new KviDict<KviKvsSpecialCommandParsingRoutine>(17,false);
+	m_pSpecialCommandParsingRoutineDict = new KviPointerHashTable<QString,KviKvsSpecialCommandParsingRoutine>(17,false);
 	m_pSpecialCommandParsingRoutineDict->setAutoDelete(true);
-	m_pCoreSimpleCommandExecRoutineDict = new KviDict<KviKvsCoreSimpleCommandExecRoutine>(51,false);
+	m_pCoreSimpleCommandExecRoutineDict = new KviPointerHashTable<QString,KviKvsCoreSimpleCommandExecRoutine>(51,false);
 	m_pCoreSimpleCommandExecRoutineDict->setAutoDelete(true);
-	m_pCoreFunctionExecRoutineDict = new KviDict<KviKvsCoreFunctionExecRoutine>(51,false);
+	m_pCoreFunctionExecRoutineDict = new KviPointerHashTable<QString,KviKvsCoreFunctionExecRoutine>(51,false);
 	m_pCoreFunctionExecRoutineDict->setAutoDelete(true);
-	m_pCoreCallbackCommandExecRoutineDict = new KviDict<KviKvsCoreCallbackCommandExecRoutine>(17,false);
+	m_pCoreCallbackCommandExecRoutineDict = new KviPointerHashTable<QString,KviKvsCoreCallbackCommandExecRoutine>(17,false);
 	m_pCoreCallbackCommandExecRoutineDict->setAutoDelete(true);
 
 	m_pGlobalVariables = new KviKvsHash();
@@ -101,7 +101,7 @@ void KviKvsKernel::done()
 
 #define COMPLETE_COMMAND_BY_DICT(__type,__dict) \
 	{ \
-		KviDictIterator<__type> it(*__dict); \
+		KviPointerHashTableIterator<QString,__type> it(*__dict); \
 		int l = szCommandBegin.length(); \
 		while(it.current()) \
 		{ \
@@ -112,7 +112,7 @@ void KviKvsKernel::done()
 	}
 
 
-void KviKvsKernel::completeCommand(const QString &szCommandBegin,KviPtrList<QString> * pMatches)
+void KviKvsKernel::completeCommand(const QString &szCommandBegin,KviPointerList<QString> * pMatches)
 {
 	int idx = szCommandBegin.find(QChar('.'));
 	if(idx == -1)
@@ -122,7 +122,7 @@ void KviKvsKernel::completeCommand(const QString &szCommandBegin,KviPtrList<QStr
 		COMPLETE_COMMAND_BY_DICT(KviKvsSpecialCommandParsingRoutine,m_pSpecialCommandParsingRoutineDict)
 		COMPLETE_COMMAND_BY_DICT(KviKvsCoreCallbackCommandExecRoutine,m_pCoreCallbackCommandExecRoutineDict)
 
-		KviPtrList<QString> lModules;
+		KviPointerList<QString> lModules;
 		lModules.setAutoDelete(true);
 		g_pModuleManager->completeModuleNames(szCommandBegin,&lModules);
 		QString szEmpty = "";
@@ -138,12 +138,12 @@ void KviKvsKernel::completeCommand(const QString &szCommandBegin,KviPtrList<QStr
 	}
 }
 
-void KviKvsKernel::completeModuleCommand(const QString &szModuleName,const QString &szCommandBegin,KviPtrList<QString> * pMatches)
+void KviKvsKernel::completeModuleCommand(const QString &szModuleName,const QString &szCommandBegin,KviPointerList<QString> * pMatches)
 {
 	KviModule * pModule = g_pModuleManager->getModule(szModuleName.latin1());
 	if(!pModule)return;
 
-	KviPtrList<QString> lModuleMatches;
+	KviPointerList<QString> lModuleMatches;
 	lModuleMatches.setAutoDelete(true);
 	pModule->completeCommand(szCommandBegin,&lModuleMatches);
 	for(QString * pszModuleMatch = lModuleMatches.first();pszModuleMatch;pszModuleMatch = lModuleMatches.next())
@@ -155,14 +155,14 @@ void KviKvsKernel::completeModuleCommand(const QString &szModuleName,const QStri
 	}
 }
 
-void KviKvsKernel::completeFunction(const QString &szFunctionBegin,KviPtrList<QString> * pMatches)
+void KviKvsKernel::completeFunction(const QString &szFunctionBegin,KviPointerList<QString> * pMatches)
 {
 	int idx = szFunctionBegin.find(QChar('.'));
 	if(idx == -1)
 	{
 		// no module name inside
 
-		KviDictIterator<KviKvsCoreFunctionExecRoutine> it(*m_pCoreFunctionExecRoutineDict);
+		KviPointerHashTableIterator<QString,KviKvsCoreFunctionExecRoutine> it(*m_pCoreFunctionExecRoutineDict);
 		int l = szFunctionBegin.length();
 		while(it.current())
 		{
@@ -175,14 +175,14 @@ void KviKvsKernel::completeFunction(const QString &szFunctionBegin,KviPtrList<QS
 			++it;
 		}
 
-		KviPtrList<QString> lModules;
+		KviPointerList<QString> lModules;
 		lModules.setAutoDelete(true);
 		g_pModuleManager->completeModuleNames(szFunctionBegin,&lModules);
 		QString szEmpty = "";
 		for(QString * pszModuleName = lModules.first();pszModuleName;pszModuleName = lModules.next())
 			completeModuleFunction(*pszModuleName,szEmpty,pMatches);
 
-		KviPtrList<QString> lAliases;
+		KviPointerList<QString> lAliases;
 		lAliases.setAutoDelete(true);
 
 		KviKvsAliasManager::instance()->completeCommand(szFunctionBegin,&lAliases);
@@ -202,12 +202,12 @@ void KviKvsKernel::completeFunction(const QString &szFunctionBegin,KviPtrList<QS
 	
 }
 
-void KviKvsKernel::completeModuleFunction(const QString &szModuleName,const QString &szCommandBegin,KviPtrList<QString> * pMatches)
+void KviKvsKernel::completeModuleFunction(const QString &szModuleName,const QString &szCommandBegin,KviPointerList<QString> * pMatches)
 {
 	KviModule * pModule = g_pModuleManager->getModule(szModuleName.latin1());
 	if(!pModule)return;
 
-	KviPtrList<QString> lModuleMatches;
+	KviPointerList<QString> lModuleMatches;
 	lModuleMatches.setAutoDelete(true);
 	pModule->completeFunction(szCommandBegin,&lModuleMatches);
 	for(QString * pszModuleMatch = lModuleMatches.first();pszModuleMatch;pszModuleMatch = lModuleMatches.next())
diff --git a/src/kvirc/kvs/kvi_kvs_kernel.h b/src/kvirc/kvs/kvi_kvs_kernel.h
index fe9a18e21..8e6e55642 100644
--- a/src/kvirc/kvs/kvi_kvs_kernel.h
+++ b/src/kvirc/kvs/kvi_kvs_kernel.h
@@ -27,10 +27,10 @@
 #include "kvi_settings.h"
 
 #include "kvi_kvs_parser.h"
-#include "kvi_list.h"
+#include "kvi_pointerlist.h"
 #include "kvi_qstring.h"
 
-#include "kvi_dict.h"
+#include "kvi_pointerhashtable.h"
 
 class KviKvsTreeNodeSpecialCommand;
 class KviKvsObjectController;
@@ -76,11 +76,11 @@ public:
 private:
 	static KviKvsKernel * m_pKvsKernel; // global kernel object
 
-	KviDict<KviKvsSpecialCommandParsingRoutine>     * m_pSpecialCommandParsingRoutineDict;
+	KviPointerHashTable<QString,KviKvsSpecialCommandParsingRoutine>     * m_pSpecialCommandParsingRoutineDict;
 	
-	KviDict<KviKvsCoreSimpleCommandExecRoutine>     * m_pCoreSimpleCommandExecRoutineDict;
-	KviDict<KviKvsCoreCallbackCommandExecRoutine>   * m_pCoreCallbackCommandExecRoutineDict;
-	KviDict<KviKvsCoreFunctionExecRoutine>          * m_pCoreFunctionExecRoutineDict;
+	KviPointerHashTable<QString,KviKvsCoreSimpleCommandExecRoutine>     * m_pCoreSimpleCommandExecRoutineDict;
+	KviPointerHashTable<QString,KviKvsCoreCallbackCommandExecRoutine>   * m_pCoreCallbackCommandExecRoutineDict;
+	KviPointerHashTable<QString,KviKvsCoreFunctionExecRoutine>          * m_pCoreFunctionExecRoutineDict;
 	
 	KviKvsHash                                    * m_pGlobalVariables;
 	KviKvsVariantList                             * m_pEmptyParameterList;
@@ -120,14 +120,14 @@ public:
 	KviKvsCoreCallbackCommandExecRoutine * findCoreCallbackCommandExecRoutine(const QString &szCmdName)
 		{ return m_pCoreCallbackCommandExecRoutineDict->find(szCmdName); };
 
-	void completeCommand(const QString &szCommandBegin,KviPtrList<QString> * pMatches);
-	void completeFunction(const QString &szFunctionBegin,KviPtrList<QString> * pMatches);
-	void completeModuleCommand(const QString &szModuleName,const QString &szCommandBegin,KviPtrList<QString> * matches);
-	void completeModuleFunction(const QString &szModuleName,const QString &szFunctionBegin,KviPtrList<QString> * matches);
+	void completeCommand(const QString &szCommandBegin,KviPointerList<QString> * pMatches);
+	void completeFunction(const QString &szFunctionBegin,KviPointerList<QString> * pMatches);
+	void completeModuleCommand(const QString &szModuleName,const QString &szCommandBegin,KviPointerList<QString> * matches);
+	void completeModuleFunction(const QString &szModuleName,const QString &szFunctionBegin,KviPointerList<QString> * matches);
 /*
-	KviPtrList<QString> * completeCommandAllocateResult(const QString &szCommandBegin);
-	KviPtrList<QString> * completeFunctionAllocateResult(const QString &szFunctionBegin);
-	void freeCompletionResult(KviPtrList<QString> * l);
+	KviPointerList<QString> * completeCommandAllocateResult(const QString &szCommandBegin);
+	KviPointerList<QString> * completeFunctionAllocateResult(const QString &szFunctionBegin);
+	void freeCompletionResult(KviPointerList<QString> * l);
 */
 };
 
diff --git a/src/kvirc/kvs/kvi_kvs_moduleinterface.cpp b/src/kvirc/kvs/kvi_kvs_moduleinterface.cpp
index 7406105a0..a87a2eca1 100644
--- a/src/kvirc/kvs/kvi_kvs_moduleinterface.cpp
+++ b/src/kvirc/kvs/kvi_kvs_moduleinterface.cpp
@@ -48,11 +48,11 @@ bool KviKvsModuleCallbackCommandCall::getParameterCode(unsigned int uParamIdx,QS
 
 KviKvsModuleInterface::KviKvsModuleInterface()
 {
-	m_pModuleSimpleCommandExecRoutineDict = new KviDict<KviKvsModuleSimpleCommandExecRoutine>(17,false);
+	m_pModuleSimpleCommandExecRoutineDict = new KviPointerHashTable<QString,KviKvsModuleSimpleCommandExecRoutine>(17,false);
 	m_pModuleSimpleCommandExecRoutineDict->setAutoDelete(true);
-	m_pModuleFunctionExecRoutineDict = new KviDict<KviKvsModuleFunctionExecRoutine>(17,false);
+	m_pModuleFunctionExecRoutineDict = new KviPointerHashTable<QString,KviKvsModuleFunctionExecRoutine>(17,false);
 	m_pModuleFunctionExecRoutineDict->setAutoDelete(true);
-	m_pModuleCallbackCommandExecRoutineDict = new KviDict<KviKvsModuleCallbackCommandExecRoutine>(17,false);
+	m_pModuleCallbackCommandExecRoutineDict = new KviPointerHashTable<QString,KviKvsModuleCallbackCommandExecRoutine>(17,false);
 	m_pModuleCallbackCommandExecRoutineDict->setAutoDelete(true);
 }
 
@@ -66,7 +66,7 @@ KviKvsModuleInterface::~KviKvsModuleInterface()
 
 #define COMPLETE_WORD_BY_DICT(__word,__list,__type,__dict) \
 	{ \
-		KviDictIterator<__type> it(*__dict); \
+		KviPointerHashTableIterator<QString,__type> it(*__dict); \
 		int l = __word.length(); \
 		while(it.current()) \
 		{ \
@@ -76,13 +76,13 @@ KviKvsModuleInterface::~KviKvsModuleInterface()
 		} \
 	}
 
-void KviKvsModuleInterface::completeCommand(const QString &szCommandBegin,KviPtrList<QString> * pMatches)
+void KviKvsModuleInterface::completeCommand(const QString &szCommandBegin,KviPointerList<QString> * pMatches)
 {
 	COMPLETE_WORD_BY_DICT(szCommandBegin,pMatches,KviKvsModuleSimpleCommandExecRoutine,m_pModuleSimpleCommandExecRoutineDict)
 	COMPLETE_WORD_BY_DICT(szCommandBegin,pMatches,KviKvsModuleCallbackCommandExecRoutine,m_pModuleCallbackCommandExecRoutineDict)
 }
 
-void KviKvsModuleInterface::completeFunction(const QString &szFunctionBegin,KviPtrList<QString> * pMatches)
+void KviKvsModuleInterface::completeFunction(const QString &szFunctionBegin,KviPointerList<QString> * pMatches)
 {
 	COMPLETE_WORD_BY_DICT(szFunctionBegin,pMatches,KviKvsModuleFunctionExecRoutine,m_pModuleFunctionExecRoutineDict)
 }
diff --git a/src/kvirc/kvs/kvi_kvs_moduleinterface.h b/src/kvirc/kvs/kvi_kvs_moduleinterface.h
index 60a454acd..77f1e4117 100644
--- a/src/kvirc/kvs/kvi_kvs_moduleinterface.h
+++ b/src/kvirc/kvs/kvi_kvs_moduleinterface.h
@@ -27,13 +27,13 @@
 
 #include "kvi_settings.h"
 
-#include "kvi_dict.h"
+#include "kvi_pointerhashtable.h"
 
 #include "kvi_kvs_runtimecall.h"
 #include "kvi_kvs_parameterprocessor.h"
 #include "kvi_kvs_switchlist.h"
 #include "kvi_kvs_script.h"
-#include "kvi_list.h"
+#include "kvi_pointerlist.h"
 #include "kvi_qstring.h"
 
 class KviModule;
@@ -137,9 +137,9 @@ public:
 	KviKvsModuleInterface();
 	~KviKvsModuleInterface();
 protected:
-	KviDict<KviKvsModuleSimpleCommandExecRoutine>         * m_pModuleSimpleCommandExecRoutineDict;
-	KviDict<KviKvsModuleFunctionExecRoutine>              * m_pModuleFunctionExecRoutineDict;
-	KviDict<KviKvsModuleCallbackCommandExecRoutine>       * m_pModuleCallbackCommandExecRoutineDict;
+	KviPointerHashTable<QString,KviKvsModuleSimpleCommandExecRoutine>         * m_pModuleSimpleCommandExecRoutineDict;
+	KviPointerHashTable<QString,KviKvsModuleFunctionExecRoutine>              * m_pModuleFunctionExecRoutineDict;
+	KviPointerHashTable<QString,KviKvsModuleCallbackCommandExecRoutine>       * m_pModuleCallbackCommandExecRoutineDict;
 public:
 	void kvsRegisterSimpleCommand(const QString &szCommand,KviKvsModuleSimpleCommandExecRoutine r);
 	void kvsRegisterCallbackCommand(const QString &szCommand,KviKvsModuleCallbackCommandExecRoutine r);
@@ -173,8 +173,8 @@ public:
 	KviKvsModuleFunctionExecRoutine * kvsFindFunction(const QString &szFunction)
 		{ return m_pModuleFunctionExecRoutineDict->find(szFunction); };
 
-	void completeCommand(const QString &cmd,KviPtrList<QString> * matches);
-	void completeFunction(const QString &cmd,KviPtrList<QString> * matches);
+	void completeCommand(const QString &cmd,KviPointerList<QString> * matches);
+	void completeFunction(const QString &cmd,KviPointerList<QString> * matches);
 protected:
 	void registerDefaultCommands();
 };
diff --git a/src/kvirc/kvs/kvi_kvs_object.cpp b/src/kvirc/kvs/kvi_kvs_object.cpp
index 89506bd17..bdff019a5 100644
--- a/src/kvirc/kvs/kvi_kvs_object.cpp
+++ b/src/kvirc/kvs/kvi_kvs_object.cpp
@@ -600,7 +600,7 @@ KviKvsObject::KviKvsObject(KviKvsObjectClass * pClass,KviKvsObject * pParent,con
 
 	m_pClass             = pClass;
 
-	m_pChildList         = new KviPtrList<KviKvsObject>;
+	m_pChildList         = new KviPointerList<KviKvsObject>;
 	m_pChildList->setAutoDelete(false);
 
 	m_pDataContainer     = new KviKvsHash();
@@ -638,7 +638,7 @@ KviKvsObject::~KviKvsObject()
 	// Disconnect all the signals
 	if(m_pSignalDict)
 	{
-		KviDictIterator<KviKvsObjectConnectionList> it(*m_pSignalDict);
+		KviPointerHashTableIterator<QString,KviKvsObjectConnectionList> it(*m_pSignalDict);
 
 		while(it.current())
 		{
@@ -715,7 +715,7 @@ bool KviKvsObject::connectSignal(const QString &sigName,KviKvsObject * pTarget,c
 
 	if(!m_pSignalDict)
 	{
-		m_pSignalDict = new KviDict<KviKvsObjectConnectionList>(7,false);
+		m_pSignalDict = new KviPointerHashTable<QString,KviKvsObjectConnectionList>(7,false);
 		m_pSignalDict->setAutoDelete(true);
 	}
 
@@ -821,7 +821,7 @@ int KviKvsObject::emitSignal(const QString &sigName,KviKvsObjectFunctionCall * p
 	KviKvsVariant retVal;
 
 	// The objects we're going to disconnect
-	KviPtrList<KviKvsObjectConnection> * pDis = 0;
+	KviPointerList<KviKvsObjectConnection> * pDis = 0;
 
 	kvs_int_t emitted = 0;
 
@@ -855,7 +855,7 @@ int KviKvsObject::emitSignal(const QString &sigName,KviKvsObjectFunctionCall * p
 
 				if(!pDis)
 				{
-					pDis = new KviPtrList<KviKvsObjectConnection>;
+					pDis = new KviPointerList<KviKvsObjectConnection>;
 					pDis->setAutoDelete(false);
 				}
 				pDis->append(s);
@@ -1497,7 +1497,7 @@ bool KviKvsObject::function_property(KviKvsObjectFunctionCall * c)
 
 void KviKvsObject::killAllChildrenWithClass(KviKvsObjectClass *cl)
 {
-	KviPtrList<KviKvsObject> l;
+	KviPointerList<KviKvsObject> l;
 	l.setAutoDelete(true);
 	for(KviKvsObject * o=m_pChildList->first();o;o=m_pChildList->next())
 	{
@@ -1680,7 +1680,7 @@ void KviKvsObject::registerPrivateImplementation(const QString &szFunctionName,c
 	} else {
 		if(!m_pFunctionHandlers)
 		{
-			m_pFunctionHandlers = new KviDict<KviKvsObjectFunctionHandler>(7,false);
+			m_pFunctionHandlers = new KviPointerHashTable<QString,KviKvsObjectFunctionHandler>(7,false);
 			m_pFunctionHandlers->setAutoDelete(true);
 		}
 
diff --git a/src/kvirc/kvs/kvi_kvs_object.h b/src/kvirc/kvs/kvi_kvs_object.h
index cd2e63ff6..0f7db263d 100644
--- a/src/kvirc/kvs/kvi_kvs_object.h
+++ b/src/kvirc/kvs/kvi_kvs_object.h
@@ -26,7 +26,7 @@
 
 #include "kvi_settings.h"
 #include "kvi_qstring.h"
-#include "kvi_list.h"
+#include "kvi_pointerlist.h"
 #include "kvi_kvs_runtimecall.h"
 #include "kvi_kvs_parameterprocessor.h"
 #include "kvi_kvs_object_functionhandler.h"
@@ -45,8 +45,8 @@ typedef struct _KviKvsObjectConnection
 	QString        szSlot;           // target slot function
 } KviKvsObjectConnection;
 
-typedef KviPtrList<KviKvsObjectConnection> KviKvsObjectConnectionList;
-typedef KviPtrListIterator<KviKvsObjectConnection> KviKvsObjectConnectionListIterator;
+typedef KviPointerList<KviKvsObjectConnection> KviKvsObjectConnectionList;
+typedef KviPointerListIterator<KviKvsObjectConnection> KviKvsObjectConnectionListIterator;
 
 class KVIRC_API KviKvsObject : public QObject
 {
@@ -64,11 +64,11 @@ protected:
 
 	KviKvsHash                                 * m_pDataContainer;     // member variables
 
-	KviPtrList<KviKvsObject>                   * m_pChildList;
+	KviPointerList<KviKvsObject>                   * m_pChildList;
 
-	KviDict<KviKvsObjectFunctionHandler>         * m_pFunctionHandlers;  // our function handlers
+	KviPointerHashTable<QString,KviKvsObjectFunctionHandler>         * m_pFunctionHandlers;  // our function handlers
 
-	KviDict<KviKvsObjectConnectionList>          * m_pSignalDict;        // our signals connected to other object functions
+	KviPointerHashTable<QString,KviKvsObjectConnectionList>          * m_pSignalDict;        // our signals connected to other object functions
 
 	KviKvsObjectConnectionList                 * m_pConnectionList;    // signals connected to this object functions
 	
@@ -110,7 +110,7 @@ public:
 	kvs_hobject_t signalSender(){ return m_hSignalSender; };
 	void setSignalName(const QString &szSigName){ m_szSignalName = szSigName; };
 
-	KviDict<KviKvsObjectFunctionHandler> * functionHandlers(){ return m_pFunctionHandlers; };
+	KviPointerHashTable<QString,KviKvsObjectFunctionHandler> * functionHandlers(){ return m_pFunctionHandlers; };
 
 	KviKvsHash * dataContainer(){ return m_pDataContainer; };
 
diff --git a/src/kvirc/kvs/kvi_kvs_object_class.cpp b/src/kvirc/kvs/kvi_kvs_object_class.cpp
index bb97db1df..9f8e86108 100644
--- a/src/kvirc/kvs/kvi_kvs_object_class.cpp
+++ b/src/kvirc/kvs/kvi_kvs_object_class.cpp
@@ -49,16 +49,16 @@ KviKvsObjectClass::KviKvsObjectClass(
 	m_szName        = szName;

 	m_bBuiltin      = bBuiltin;

 	m_bDirty        = !bBuiltin;

-	m_pFunctionHandlers = new KviDict<KviKvsObjectFunctionHandler>(17,false);

+	m_pFunctionHandlers = new KviPointerHashTable<QString,KviKvsObjectFunctionHandler>(17,false);

 	m_pFunctionHandlers->setAutoDelete(true);

-	m_pChildClasses = new KviPtrList<KviKvsObjectClass>;

+	m_pChildClasses = new KviPointerList<KviKvsObjectClass>;

 	m_pChildClasses->setAutoDelete(false);

 	m_allocProc     = pProc ? pProc : pParent->m_allocProc;

 

 	// inherit everything from the class above

 	if(pParent)

 	{

-		KviDictIterator<KviKvsObjectFunctionHandler> it(*(pParent->functionHandlers()));

+		KviPointerHashTableIterator<QString,KviKvsObjectFunctionHandler> it(*(pParent->functionHandlers()));

 		while(KviKvsObjectFunctionHandler * fh = it.current())

 		{

 			m_pFunctionHandlers->insert(it.currentKey(),fh->clone());

@@ -185,7 +185,7 @@ bool KviKvsObjectClass::save(const QString &szFileName)
 					"{\n",

 					&m_szName,&szParentName);

 		

-	KviDictIterator<KviKvsObjectFunctionHandler> it(*m_pFunctionHandlers);

+	KviPointerHashTableIterator<QString,KviKvsObjectFunctionHandler> it(*m_pFunctionHandlers);

 	

 	while(KviKvsObjectFunctionHandler * h = it.current())

 	{

diff --git a/src/kvirc/kvs/kvi_kvs_object_class.h b/src/kvirc/kvs/kvi_kvs_object_class.h
index 3b8e7f50e..10ab10d6f 100644
--- a/src/kvirc/kvs/kvi_kvs_object_class.h
+++ b/src/kvirc/kvs/kvi_kvs_object_class.h
@@ -26,9 +26,9 @@
 

 #include "kvi_settings.h"

 #include "kvi_qstring.h"

-#include "kvi_list.h"

+#include "kvi_pointerlist.h"

 

-#include "kvi_dict.h"

+#include "kvi_pointerhashtable.h"

 

 #include "kvi_kvs_object_functionhandler.h"

 

@@ -63,14 +63,14 @@ protected:
 	KviKvsObjectClass                           * m_pParentClass;      // the parent (base) class

 	QString                                       m_szName;            // the class name

 	bool                                          m_bBuiltin;          // is this a builtin or script based class ?

-	KviDict<KviKvsObjectFunctionHandler>          * m_pFunctionHandlers; // all our function handlers

-	KviPtrList<KviKvsObjectClass>               * m_pChildClasses;     // 

+	KviPointerHashTable<QString,KviKvsObjectFunctionHandler>          * m_pFunctionHandlers; // all our function handlers

+	KviPointerList<KviKvsObjectClass>               * m_pChildClasses;     // 

 	KviKvsObjectAllocateInstanceProc              m_allocProc;

 	bool                                          m_bDirty;            // not yet flushed to disk (only for not builtin classes)

 protected:

 	void registerChildClass(KviKvsObjectClass *pClass);

 	void unregisterChildClass(KviKvsObjectClass *pClass);

-	KviDict<KviKvsObjectFunctionHandler> * functionHandlers(){ return m_pFunctionHandlers; };

+	KviPointerHashTable<QString,KviKvsObjectFunctionHandler> * functionHandlers(){ return m_pFunctionHandlers; };

 public:

 	void clearDirtyFlag(){ m_bDirty = false; };

 	bool isDirty(){ return m_bDirty; };

@@ -94,7 +94,7 @@ public:
 	bool save(const QString &szFileName);

 	static bool load(const QString &szFileName);

 	void getFunctionCode(QString &szCode,KviKvsObjectFunctionHandler &h);

-	KviDict<KviKvsObjectFunctionHandler> * getHandlers(){return m_pFunctionHandlers;};

+	KviPointerHashTable<QString,KviKvsObjectFunctionHandler> * getHandlers(){return m_pFunctionHandlers;};

 

 };

 

diff --git a/src/kvirc/kvs/kvi_kvs_object_controller.cpp b/src/kvirc/kvs/kvi_kvs_object_controller.cpp
index 420464b6d..2292c17dc 100644
--- a/src/kvirc/kvs/kvi_kvs_object_controller.cpp
+++ b/src/kvirc/kvs/kvi_kvs_object_controller.cpp
@@ -40,11 +40,11 @@ static KviKvsObject * objectClassCreateInstance(KviKvsObjectClass *pClass,KviKvs
 
 KviKvsObjectController::KviKvsObjectController()
 {
-	m_pTopLevelObjectList = new KviPtrList<KviKvsObject>;
+	m_pTopLevelObjectList = new KviPointerList<KviKvsObject>;
 	m_pTopLevelObjectList->setAutoDelete(false);
-	m_pObjectDict = new KviPtrDict<KviKvsObject>(101);
+	m_pObjectDict = new KviPointerHashTable<void *,KviKvsObject>(101);
 	m_pObjectDict->setAutoDelete(false);
-	m_pClassDict = new KviDict<KviKvsObjectClass>(31,false);
+	m_pClassDict = new KviPointerHashTable<QString,KviKvsObjectClass>(31,false);
 	m_pClassDict->setAutoDelete(false);
 }
 
@@ -91,7 +91,7 @@ void KviKvsObjectController::init()
 void KviKvsObjectController::killAllObjectsWithClass(KviKvsObjectClass * pClass)
 {
 	if(!m_pObjectDict)return; // no more objects at all...
-	KviPtrList<KviKvsObject> l;
+	KviPointerList<KviKvsObject> l;
 	l.setAutoDelete(true);
 
 	for(KviKvsObject * o = m_pTopLevelObjectList->first();o;o = m_pTopLevelObjectList->next())
@@ -104,8 +104,8 @@ void KviKvsObjectController::killAllObjectsWithClass(KviKvsObjectClass * pClass)
 void KviKvsObjectController::clearUserClasses()
 {
 	flushUserClasses();
-	KviDictIterator<KviKvsObjectClass> it(*m_pClassDict);
-	KviPtrList<KviKvsObjectClass> l;
+	KviPointerHashTableIterator<QString,KviKvsObjectClass> it(*m_pClassDict);
+	KviPointerList<KviKvsObjectClass> l;
 	l.setAutoDelete(true);
 	while(it.current())
 	{
@@ -122,9 +122,9 @@ void KviKvsObjectController::clearInstances()
 	while(m_pTopLevelObjectList->first())delete m_pTopLevelObjectList->first();
 	delete m_pTopLevelObjectList; // empty list
 	delete m_pObjectDict; // empty dict
-	m_pTopLevelObjectList = new KviPtrList<KviKvsObject>;
+	m_pTopLevelObjectList = new KviPointerList<KviKvsObject>;
 	m_pTopLevelObjectList->setAutoDelete(false);
-	m_pObjectDict = new KviPtrDict<KviKvsObject>(101);
+	m_pObjectDict = new KviPointerHashTable<void *,KviKvsObject>(101);
 	m_pObjectDict->setAutoDelete(false);
 }
 
@@ -156,7 +156,7 @@ void KviKvsObjectController::unregisterObject(KviKvsObject *pObject)
 
 void KviKvsObjectController::flushUserClasses()
 {
-	KviDictIterator<KviKvsObjectClass> it(*m_pClassDict);
+	KviPointerHashTableIterator<QString,KviKvsObjectClass> it(*m_pClassDict);
 	while(KviKvsObjectClass * c = it.current())
 	{
 		if(!c->isBuiltin())
diff --git a/src/kvirc/kvs/kvi_kvs_object_controller.h b/src/kvirc/kvs/kvi_kvs_object_controller.h
index 54fcaff39..c2e435021 100644
--- a/src/kvirc/kvs/kvi_kvs_object_controller.h
+++ b/src/kvirc/kvs/kvi_kvs_object_controller.h
@@ -28,10 +28,10 @@
 #include "kvi_settings.h"

 

 #include "kvi_qstring.h"

-#include "kvi_list.h"

+#include "kvi_pointerlist.h"

 

-#include "kvi_dict.h"

-#include "kvi_ptrdict.h"

+#include "kvi_pointerhashtable.h"

+#include "kvi_pointerhashtable.h"

 

 #include "kvi_kvs_object.h"

 #include "kvi_kvs_object_class.h"

@@ -44,9 +44,9 @@ public:
 	KviKvsObjectController();

 	~KviKvsObjectController();

 protected:

-	KviPtrList<KviKvsObject>      * m_pTopLevelObjectList;

-	KviPtrDict<KviKvsObject>        * m_pObjectDict;

-	KviDict<KviKvsObjectClass>      * m_pClassDict;

+	KviPointerList<KviKvsObject>      * m_pTopLevelObjectList;

+	KviPointerHashTable<void *,KviKvsObject>        * m_pObjectDict;

+	KviPointerHashTable<QString,KviKvsObjectClass>      * m_pClassDict;

 	KviKvsObjectClass             * m_pObjectClass; //base class

 protected:

 	// the classes and the objects register themselves with the controller

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

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

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

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

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

+	KviPointerHashTable<void *,KviKvsObject> * objectDict(){ return m_pObjectDict; };

+	KviPointerHashTable<QString,KviKvsObjectClass> * classDict(){ return m_pClassDict; };

 };

 

 #endif //!_KVI_KVS_OBJECT_CONTROLLER_H_

diff --git a/src/kvirc/kvs/kvi_kvs_parameterprocessor.cpp b/src/kvirc/kvs/kvi_kvs_parameterprocessor.cpp
index 1f8b1ba54..956135909 100644
--- a/src/kvirc/kvs/kvi_kvs_parameterprocessor.cpp
+++ b/src/kvirc/kvs/kvi_kvs_parameterprocessor.cpp
@@ -35,7 +35,7 @@
 
 #include "kvi_qstring.h"
 #include "kvi_locale.h"
-#include "kvi_list.h"
+#include "kvi_pointerlist.h"
 
 
 #include <qstringlist.h>
diff --git a/src/kvirc/kvs/kvi_kvs_parser.cpp b/src/kvirc/kvs/kvi_kvs_parser.cpp
index 99b536383..e13aee252 100644
--- a/src/kvirc/kvs/kvi_kvs_parser.cpp
+++ b/src/kvirc/kvs/kvi_kvs_parser.cpp
@@ -92,12 +92,12 @@ void KviKvsParser::report(bool bError,const QChar * pLocation,const QString &szM
 	QString szMsg;
 	KviQString::vsprintf(szMsg,szMsgFmt,va);
 
-	KviPtrList<QString> * pCodeListing = 0;
+	KviPointerList<QString> * pCodeListing = 0;
 	QString szLocation;
 
 	if(pLocation)
 	{
-		pCodeListing = new KviPtrList<QString>;
+		pCodeListing = new KviPointerList<QString>;
 		pCodeListing->setAutoDelete(true);
 
 		int iLine,iCol;
@@ -2932,9 +2932,9 @@ KviKvsTreeNodeDataList * KviKvsParser::parseCommandParameterList()
 }
 
 
-KviPtrList<QString> * KviKvsParser::parseCommaSeparatedParameterListNoTree()
+KviPointerList<QString> * KviKvsParser::parseCommaSeparatedParameterListNoTree()
 {
-	KviPtrList<QString> * l = new KviPtrList<QString>;
+	KviPointerList<QString> * l = new KviPointerList<QString>;
 	l->setAutoDelete(true);
 
 	KVSP_skipChar;
@@ -3261,7 +3261,7 @@ LITERAL_PARAM_PARSING_FUNCTION_GENERIC_END
 /*
 KviKvsTreeNodeData * KviKvsParser::parseArrayIndex()
 {
-	KviPtrList<KviKvsTreeNodeData> * l = new KviPtrList<KviKvsTreeNodeData>();
+	KviPointerList<KviKvsTreeNodeData> * l = new KviPointerList<KviKvsTreeNodeData>();
 	l->setAutoDelete(true);
 
 	const QChar * pBegin = KVSP_curCharPointer;
@@ -3370,7 +3370,7 @@ end_of_the_array_index:
 
 KviKvsTreeNodeData * KviKvsParser::parseHashKey()
 {
-	KviPtrList<KviKvsTreeNodeData> * l = new KviPtrList<KviKvsTreeNodeData>();
+	KviPointerList<KviKvsTreeNodeData> * l = new KviPointerList<KviKvsTreeNodeData>();
 	l->setAutoDelete(true);
 
 	const QChar * pBegin = KVSP_curCharPointer;
@@ -3478,7 +3478,7 @@ PARENTHESIS_PARAMETER_PARSING_FUNCTION_END()
 
 KviKvsTreeNodeData * KviKvsParser::parseCommaSeparatedParameter()
 {
-	KviPtrList<KviKvsTreeNodeData> * l = new KviPtrList<KviKvsTreeNodeData>;
+	KviPointerList<KviKvsTreeNodeData> * l = new KviPointerList<KviKvsTreeNodeData>;
 	l->setAutoDelete(true);
 
 	const QChar * pBegin = KVSP_curCharPointer;
@@ -3565,7 +3565,7 @@ end_of_function_parameter:
 
 KviKvsTreeNodeData * KviKvsParser::parseSingleParameterInParenthesis()
 {
-	KviPtrList<KviKvsTreeNodeData> * l = new KviPtrList<KviKvsTreeNodeData>;
+	KviPointerList<KviKvsTreeNodeData> * l = new KviPointerList<KviKvsTreeNodeData>;
 	l->setAutoDelete(true);
 
 	const QChar * pBegin = KVSP_curCharPointer;
@@ -3656,7 +3656,7 @@ KviKvsTreeNodeData * KviKvsParser::parseStringParameter()
 {
 	KVSP_ASSERT(KVSP_curCharUnicode == '"');
 
-	KviPtrList<KviKvsTreeNodeData> * l = new KviPtrList<KviKvsTreeNodeData>();
+	KviPointerList<KviKvsTreeNodeData> * l = new KviPointerList<KviKvsTreeNodeData>();
 	l->setAutoDelete(true);
 
 	const QChar * pBegin = KVSP_curCharPointer;
@@ -3737,7 +3737,7 @@ end_of_the_string:
 
 KviKvsTreeNodeData * KviKvsParser::parseCommandParameter(bool bPreferNumeric)
 {
-	KviPtrList<KviKvsTreeNodeData> * l = new KviPtrList<KviKvsTreeNodeData>;
+	KviPointerList<KviKvsTreeNodeData> * l = new KviPointerList<KviKvsTreeNodeData>;
 	l->setAutoDelete(true);
 
 	bool bGotLiteral = false;
diff --git a/src/kvirc/kvs/kvi_kvs_parser.h b/src/kvirc/kvs/kvi_kvs_parser.h
index b210ca1bf..3e3406d28 100644
--- a/src/kvirc/kvs/kvi_kvs_parser.h
+++ b/src/kvirc/kvs/kvi_kvs_parser.h
@@ -26,9 +26,9 @@
 
 #include "kvi_settings.h"
 #include "kvi_qstring.h"
-#include "kvi_list.h"
+#include "kvi_pointerlist.h"
 
-#include "kvi_dict.h"
+#include "kvi_pointerhashtable.h"
 
 class KviKvsTreeNode;
 
@@ -64,7 +64,7 @@ private:
 	const QChar              * m_pBuffer;        // the local pointer to the beginning of the buffer
 	const QChar              * m_ptr;            // the parsing pointer
 	// parsing state
-	KviDict<QString>           * m_pGlobals;       // the dict of the vars declared with global in this script
+	KviPointerHashTable<QString,QString>           * m_pGlobals;       // the dict of the vars declared with global in this script
 	int                        m_iFlags;         // the current parsing flags
 	bool                       m_bError;         // error(..) was called ?
 	// this stuff is used only for reporting errors and warnings
@@ -121,7 +121,7 @@ private:
 	// if started in the middle of the list returns only the remaining
 	// parameters.
 	KviKvsTreeNodeDataList                   * parseCommaSeparatedParameterList();
-	KviPtrList<QString>                      * parseCommaSeparatedParameterListNoTree();
+	KviPointerList<QString>                      * parseCommaSeparatedParameterListNoTree();
 	// returns 0 in case of error or if it starts on a terminating character (null parameter)
 	// check error() to see if there was an error condition (unless you already know that
 	// there was a valid first character)
diff --git a/src/kvirc/kvs/kvi_kvs_parser_expression.cpp b/src/kvirc/kvs/kvi_kvs_parser_expression.cpp
index 348f08242..83d153228 100644
--- a/src/kvirc/kvs/kvi_kvs_parser_expression.cpp
+++ b/src/kvirc/kvs/kvi_kvs_parser_expression.cpp
@@ -352,7 +352,7 @@ KviKvsTreeNodeExpression * KviKvsParser::parseExpressionOperand(char terminator)
 
 KviKvsTreeNodeExpression * KviKvsParser::parseExpressionOperandCore(char terminator)
 {
-	KviPtrList<KviKvsTreeNodeData> * pDataList = new KviPtrList<KviKvsTreeNodeData>;
+	KviPointerList<KviKvsTreeNodeData> * pDataList = new KviPointerList<KviKvsTreeNodeData>;
 	pDataList->setAutoDelete(true);
 
 	static QString szStaticSingleSpace(" ");
diff --git a/src/kvirc/kvs/kvi_kvs_parser_lside.cpp b/src/kvirc/kvs/kvi_kvs_parser_lside.cpp
index 974e6e3b9..10e5e23b2 100644
--- a/src/kvirc/kvs/kvi_kvs_parser_lside.cpp
+++ b/src/kvirc/kvs/kvi_kvs_parser_lside.cpp
@@ -271,7 +271,7 @@
 
 KviKvsTreeNodeData * KviKvsParser::parseOperationRightSide(bool bPreferNumeric)
 {
-	KviPtrList<KviKvsTreeNodeData> * l = new KviPtrList<KviKvsTreeNodeData>();
+	KviPointerList<KviKvsTreeNodeData> * l = new KviPointerList<KviKvsTreeNodeData>();
 	l->setAutoDelete(true);
 
 	const QChar * pBegin = KVSP_curCharPointer;
@@ -744,7 +744,7 @@ end_of_the_param:
 
 KviKvsTreeNodeData * KviKvsParser::parseBindingOperationParameter()
 {
-	KviPtrList<KviKvsTreeNodeData> * l = new KviPtrList<KviKvsTreeNodeData>;
+	KviPointerList<KviKvsTreeNodeData> * l = new KviPointerList<KviKvsTreeNodeData>;
 	l->setAutoDelete(true);
 
 	const QChar * pBegin = KVSP_curCharPointer;
diff --git a/src/kvirc/kvs/kvi_kvs_parser_specialcommands.cpp b/src/kvirc/kvs/kvi_kvs_parser_specialcommands.cpp
index b85fcf97a..756cd25f2 100644
--- a/src/kvirc/kvs/kvi_kvs_parser_specialcommands.cpp
+++ b/src/kvirc/kvs/kvi_kvs_parser_specialcommands.cpp
@@ -185,7 +185,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandUnset()
 
 	const QChar * pCmdBegin = KVSP_curCharPointer;
 
-	KviPtrList<KviKvsTreeNodeVariable> * pVarList = new KviPtrList<KviKvsTreeNodeVariable>;
+	KviPointerList<KviKvsTreeNodeVariable> * pVarList = new KviPointerList<KviKvsTreeNodeVariable>;
 	pVarList->setAutoDelete(true);
 	
 	while(KVSP_curCharUnicode == '%')
@@ -260,7 +260,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandGlobal()
 
 		if(!m_pGlobals)
 		{
-			m_pGlobals = new KviDict<QString>(17,false);
+			m_pGlobals = new KviPointerHashTable<QString,QString>(17,false);
 			m_pGlobals->setAutoDelete(true);
 		}
 		m_pGlobals->replace(szIdentifier,new QString());
@@ -1574,7 +1574,7 @@ KviKvsTreeNodeSpecialCommandDefpopupLabelPopup * KviKvsParser::parseSpecialComma
 		QString szLabel(pLabelBegin,KVSP_curCharPointer - pLabelBegin);
 		QString szLabelLow = szLabel.lower();
 
-		KviPtrList<QString> * pParameters = 0;
+		KviPointerList<QString> * pParameters = 0;
 		
 		QString szCondition;
 
diff --git a/src/kvirc/kvs/kvi_kvs_popupmanager.cpp b/src/kvirc/kvs/kvi_kvs_popupmanager.cpp
index e31de00b5..e04d9033c 100644
--- a/src/kvirc/kvs/kvi_kvs_popupmanager.cpp
+++ b/src/kvirc/kvs/kvi_kvs_popupmanager.cpp
@@ -33,7 +33,7 @@ KviKvsPopupManager * KviKvsPopupManager::m_pInstance = 0;
 KviKvsPopupManager::KviKvsPopupManager()
 {
 	m_pInstance = this;
-	m_pPopupDict = new KviDict<KviKvsPopupMenu>(17,false);
+	m_pPopupDict = new KviPointerHashTable<QString,KviKvsPopupMenu>(17,false);
 	m_pPopupDict->setAutoDelete(true);
 }
 
@@ -80,7 +80,7 @@ void KviKvsPopupManager::load(const QString &szFileName)
 
 	KviConfigIterator it(*(cfg.dict()));
 
-	KviPtrList<QString> l;
+	KviPointerList<QString> l;
 	l.setAutoDelete(true);
 
 	while(it.current())
@@ -104,7 +104,7 @@ void KviKvsPopupManager::save(const QString &szFileName)
 	KviConfig cfg(szFileName,KviConfig::Write);
 	cfg.clear();
 
-	KviDictIterator<KviKvsPopupMenu> it(*m_pPopupDict);
+	KviPointerHashTableIterator<QString,KviKvsPopupMenu> it(*m_pPopupDict);
 	while(it.current())
 	{
 		cfg.setGroup(it.current()->popupName());
diff --git a/src/kvirc/kvs/kvi_kvs_popupmanager.h b/src/kvirc/kvs/kvi_kvs_popupmanager.h
index 903671dd5..ae8aa514e 100644
--- a/src/kvirc/kvs/kvi_kvs_popupmanager.h
+++ b/src/kvirc/kvs/kvi_kvs_popupmanager.h
@@ -33,7 +33,7 @@ protected: // can only be created by init/done
 	KviKvsPopupManager();
 	~KviKvsPopupManager();
 protected:
-	KviDict<KviKvsPopupMenu>    * m_pPopupDict;
+	KviPointerHashTable<QString,KviKvsPopupMenu>    * m_pPopupDict;
 	static KviKvsPopupManager * m_pInstance;
 public:
 	static KviKvsPopupManager * instance(){ return m_pInstance; };
@@ -41,7 +41,7 @@ public:
 	static void done();
 	int popupCount(){ return m_pPopupDict->count(); };
 
-	KviDict<KviKvsPopupMenu> * popupDict(){ return m_pPopupDict; };
+	KviPointerHashTable<QString,KviKvsPopupMenu> * popupDict(){ return m_pPopupDict; };
 
 	KviKvsPopupMenu * lookup(const QString &szPopupName){ return m_pPopupDict->find(szPopupName); };
 	KviKvsPopupMenu * get(const QString &szPopupName);
diff --git a/src/kvirc/kvs/kvi_kvs_popupmenu.cpp b/src/kvirc/kvs/kvi_kvs_popupmenu.cpp
index fa820586a..6c3daf8d9 100644
--- a/src/kvirc/kvs/kvi_kvs_popupmenu.cpp
+++ b/src/kvirc/kvs/kvi_kvs_popupmenu.cpp
@@ -531,11 +531,11 @@ KviKvsPopupMenu::KviKvsPopupMenu(const QString &szName)
 :KviTalPopupMenu(0,szName)
 {
 	m_szName = szName;
-	m_pItemList = new KviPtrList<KviKvsPopupMenuItem>;
+	m_pItemList = new KviPointerList<KviKvsPopupMenuItem>;
 	m_pItemList->setAutoDelete(true);
-	m_pPrologues = new KviPtrList<KviKvsScript>;
+	m_pPrologues = new KviPointerList<KviKvsScript>;
 	m_pPrologues->setAutoDelete(true);
-	m_pEpilogues = new KviPtrList<KviKvsScript>;
+	m_pEpilogues = new KviPointerList<KviKvsScript>;
 	m_pEpilogues->setAutoDelete(true);
 	m_pParentPopup = 0;
 	m_pTopLevelData = 0;
diff --git a/src/kvirc/kvs/kvi_kvs_popupmenu.h b/src/kvirc/kvs/kvi_kvs_popupmenu.h
index a2b13cf5f..301b0f464 100644
--- a/src/kvirc/kvs/kvi_kvs_popupmenu.h
+++ b/src/kvirc/kvs/kvi_kvs_popupmenu.h
@@ -245,12 +245,12 @@ public:
 	KviKvsPopupMenu(const QString &szName);
 	~KviKvsPopupMenu();
 protected:
-	KviPtrList<KviKvsPopupMenuItem>  * m_pItemList;
+	KviPointerList<KviKvsPopupMenuItem>  * m_pItemList;
 private:
 	QString                            m_szName;
 	KviKvsPopupMenu                  * m_pParentPopup;
-	KviPtrList<KviKvsScript>         * m_pPrologues;
-	KviPtrList<KviKvsScript>         * m_pEpilogues;
+	KviPointerList<KviKvsScript>         * m_pPrologues;
+	KviPointerList<KviKvsScript>         * m_pEpilogues;
 	KviKvsPopupMenuTopLevelData      * m_pTopLevelData;
 	// this is a temporary used to hack-in the activation from KviMenuBar
 	KviKvsPopupMenuTopLevelData      * m_pTempTopLevelData;
@@ -274,8 +274,8 @@ public:
 	void addPrologue(const QString &szItemName,const QString &szCode);
 	void addEpilogue(const QString &szItemName,const QString &szCode);
 	bool removeItemByName(const QString &szItemName,bool bRecursive);
-	KviPtrList<KviKvsScript> * epilogues(){ return m_pEpilogues; };
-	KviPtrList<KviKvsScript> * prologues(){ return m_pPrologues; };
+	KviPointerList<KviKvsScript> * epilogues(){ return m_pEpilogues; };
+	KviPointerList<KviKvsScript> * prologues(){ return m_pPrologues; };
 	KviKvsPopupMenu * parentPopup(){ return m_pParentPopup; };
 	void generateDefPopup(QString &buffer);
 	void setParentPopup(KviKvsPopupMenu * par){ m_pParentPopup = par; };
diff --git a/src/kvirc/kvs/kvi_kvs_processmanager.h b/src/kvirc/kvs/kvi_kvs_processmanager.h
index 21dab5e6d..5cfcbb711 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 "kvi_ptrdict.h"
+#include "kvi_pointerhashtable.h"
 
 #ifdef Unsorted
 	#undef Unsorted
diff --git a/src/kvirc/kvs/kvi_kvs_report.cpp b/src/kvirc/kvs/kvi_kvs_report.cpp
index 55bc3cfde..1ba9db998 100644
--- a/src/kvirc/kvs/kvi_kvs_report.cpp
+++ b/src/kvirc/kvs/kvi_kvs_report.cpp
@@ -82,7 +82,7 @@ void KviKvsReport::findLineAndCol(const QChar * pBegin,const QChar * pPoint,int
 
 
 
-void KviKvsReport::findLineColAndListing(const QChar * pBegin,const QChar * pPoint,int &iLine,int &iCol,KviPtrList<QString> * pListing)
+void KviKvsReport::findLineColAndListing(const QChar * pBegin,const QChar * pPoint,int &iLine,int &iCol,KviPointerList<QString> * pListing)
 {
 #ifdef COMPILE_NEW_KVS
 	iLine = 1;
@@ -227,7 +227,7 @@ void KviKvsReport::report(KviKvsReport * r,KviWindow * pOutput)
 	
 	if(pOutput == KviDebugWindow::instance())
 	{
-		KviPtrList<QString> * l;
+		KviPointerList<QString> * l;
 		if(l = r->codeListing())
 		{
 			pOutput->outputNoFmt(out,__tr2qs("[KVS] Code listing:"));
diff --git a/src/kvirc/kvs/kvi_kvs_report.h b/src/kvirc/kvs/kvi_kvs_report.h
index 60a72eb67..febf16dee 100644
--- a/src/kvirc/kvs/kvi_kvs_report.h
+++ b/src/kvirc/kvs/kvi_kvs_report.h
@@ -26,7 +26,7 @@
 
 #include "kvi_settings.h"
 #include "kvi_qstring.h"
-#include "kvi_list.h"
+#include "kvi_pointerlist.h"
 
 class KviWindow;
 
@@ -48,8 +48,8 @@ protected:
 	KviWindow           * m_pWindow;        // the window that the script was attacched to
 
 	// optional
-	KviPtrList<QString> * m_pCodeListing;   // code listing, if present, it is owned
-	KviPtrList<QString> * m_pCallStack;     // call stack, if present, it is owned
+	KviPointerList<QString> * m_pCodeListing;   // code listing, if present, it is owned
+	KviPointerList<QString> * m_pCallStack;     // call stack, if present, it is owned
 public:
 	Type type() const { return m_eType; };
 
@@ -57,17 +57,17 @@ public:
 	const QString & context(){ return m_szContext; };
 	const QString & message(){ return m_szMessage; };
 	const QString & location(){ return m_szLocation; };
-	KviPtrList<QString> * codeListing(){ return m_pCodeListing; };
-	KviPtrList<QString> * callStack(){ return m_pCallStack; };
+	KviPointerList<QString> * codeListing(){ return m_pCodeListing; };
+	KviPointerList<QString> * callStack(){ return m_pCallStack; };
 
 	void setContext(const QString &szContext){ m_szContext = szContext; };
 	void setMessage(const QString &szMessage){ m_szMessage = szMessage; };
 	void setLocation(const QString &szLocation){ m_szLocation = szLocation; };
-	void setCodeListing(KviPtrList<QString> * pListing){ m_pCodeListing = pListing; };
-	void setCallStack(KviPtrList<QString> * pStack){ m_pCallStack = pStack; };
+	void setCodeListing(KviPointerList<QString> * pListing){ m_pCodeListing = pListing; };
+	void setCallStack(KviPointerList<QString> * pStack){ m_pCallStack = pStack; };
 
 	static void findLineAndCol(const QChar * pBegin,const QChar * pPoint,int &iLine,int &iCol);
-	static void findLineColAndListing(const QChar * pBegin,const QChar * pPoint,int &iLine,int &iCol,KviPtrList<QString> * pListing);
+	static void findLineColAndListing(const QChar * pBegin,const QChar * pPoint,int &iLine,int &iCol,KviPointerList<QString> * pListing);
 
 	static void report(KviKvsReport * r,KviWindow * pOutput);
 };
diff --git a/src/kvirc/kvs/kvi_kvs_runtimecontext.cpp b/src/kvirc/kvs/kvi_kvs_runtimecontext.cpp
index 27a4bb191..d5e2d27fc 100644
--- a/src/kvirc/kvs/kvi_kvs_runtimecontext.cpp
+++ b/src/kvirc/kvs/kvi_kvs_runtimecontext.cpp
@@ -92,15 +92,15 @@ void KviKvsRunTimeContext::report(bool bError,KviKvsTreeNode * pNode,const QStri
 	QString szMsg;
 	KviQString::vsprintf(szMsg,szMsgFmt,va);
 
-	KviPtrList<QString> * pCodeListing = 0;
-	KviPtrList<QString> * pCallStack = 0;
+	KviPointerList<QString> * pCodeListing = 0;
+	KviPointerList<QString> * pCallStack = 0;
 	QString szLocation;
 
 	if(pNode)
 	{
 		if(pNode->location() && m_pScript)
 		{
-			pCodeListing = new KviPtrList<QString>;
+			pCodeListing = new KviPointerList<QString>;
 			pCodeListing->setAutoDelete(true);
 	
 			int iLine,iCol;
@@ -113,7 +113,7 @@ void KviKvsRunTimeContext::report(bool bError,KviKvsTreeNode * pNode,const QStri
 		// create the call stack
 		int iFrame = 0;
 		
-		pCallStack = new KviPtrList<QString>;
+		pCallStack = new KviPointerList<QString>;
 		pCallStack->setAutoDelete(true);
 
 		while(pNode && (iFrame < 12))
diff --git a/src/kvirc/kvs/kvi_kvs_script.h b/src/kvirc/kvs/kvi_kvs_script.h
index f94812345..d2befedcb 100644
--- a/src/kvirc/kvs/kvi_kvs_script.h
+++ b/src/kvirc/kvs/kvi_kvs_script.h
@@ -27,7 +27,7 @@
 #include "kvi_settings.h"
 #include "kvi_qstring.h"
 #include "kvi_window.h"
-#include "kvi_list.h"
+#include "kvi_pointerlist.h"
 #include "kvi_kvs_variant.h"
 #include "kvi_kvs_variantlist.h"
 #include "kvi_heapobject.h"
diff --git a/src/kvirc/kvs/kvi_kvs_scriptaddonmanager.cpp b/src/kvirc/kvs/kvi_kvs_scriptaddonmanager.cpp
index 95cd8cee1..2c2de5461 100644
--- a/src/kvirc/kvs/kvi_kvs_scriptaddonmanager.cpp
+++ b/src/kvirc/kvs/kvi_kvs_scriptaddonmanager.cpp
@@ -243,7 +243,7 @@ KviKvsScriptAddonManager::KviKvsScriptAddonManager()
 {
 	m_pInstance = this;
 	m_bLoaded = false;
-	m_pAddonDict = new KviDict<KviKvsScriptAddon>(17,false);
+	m_pAddonDict = new KviPointerHashTable<QString,KviKvsScriptAddon>(17,false);
 	m_pAddonDict->setAutoDelete(true);
 }
 
@@ -294,7 +294,7 @@ void KviKvsScriptAddonManager::save(const QString &szFileName)
 
 	cfg.clear();
 
-	KviDictIterator<KviKvsScriptAddon> it(*m_pAddonDict);
+	KviPointerHashTableIterator<QString,KviKvsScriptAddon> it(*m_pAddonDict);
 	
 	while(KviKvsScriptAddon * a = it.current())
 	{
@@ -315,10 +315,10 @@ void KviKvsScriptAddonManager::delayedLoad()
 
 	KviConfig cfg(m_szFileName,KviConfig::Read);
 
-	KviDict<KviConfigGroup> * d = cfg.dict();
+	KviPointerHashTable<QString,KviConfigGroup> * d = cfg.dict();
 	if(!d)return;
 	
-	KviDictIterator<KviConfigGroup> it(*d);
+	KviPointerHashTableIterator<QString,KviConfigGroup> it(*d);
 	while(it.current())
 	{
 		QString szName = it.currentKey();
@@ -331,7 +331,7 @@ void KviKvsScriptAddonManager::delayedLoad()
 	}
 }
 
-KviDict<KviKvsScriptAddon> * KviKvsScriptAddonManager::addonDict()
+KviPointerHashTable<QString,KviKvsScriptAddon> * KviKvsScriptAddonManager::addonDict()
 {
 	if(!m_bLoaded)delayedLoad();
 	return m_pAddonDict;
diff --git a/src/kvirc/kvs/kvi_kvs_scriptaddonmanager.h b/src/kvirc/kvs/kvi_kvs_scriptaddonmanager.h
index 20953462a..a1142369a 100644
--- a/src/kvirc/kvs/kvi_kvs_scriptaddonmanager.h
+++ b/src/kvirc/kvs/kvi_kvs_scriptaddonmanager.h
@@ -27,7 +27,7 @@
 #include "kvi_settings.h"
 #include "kvi_heapobject.h"
 #include "kvi_qstring.h"
-#include "kvi_dict.h"
+#include "kvi_pointerhashtable.h"
 
 
 class KviConfig;
@@ -108,7 +108,7 @@ protected:
 	// this class implements delayed loading
 	QString                            m_szFileName;  // the file name that we will load from
 	bool                               m_bLoaded;     // have we loaded stuff from disk yet ?
-	KviDict<KviKvsScriptAddon>         * m_pAddonDict;  // all the registered addons
+	KviPointerHashTable<QString,KviKvsScriptAddon>         * m_pAddonDict;  // all the registered addons
 public:
 	static KviKvsScriptAddonManager * instance(){ return m_pInstance; };
 	static void init(); // called by KviKvs::init()
@@ -117,7 +117,7 @@ public:
 	bool registerAddon(KviKvsScriptAddonRegistrationData * d);
 	KviKvsScriptAddon * findAddon(const QString &szName);
 	bool unregisterAddon(const QString &szName,KviWindow * pWnd,bool bExecuteUninstallCallback = true);
-	KviDict<KviKvsScriptAddon> * addonDict();
+	KviPointerHashTable<QString,KviKvsScriptAddon> * addonDict();
 
 	void clear();
 	void load(const QString &szFileName); // called in the KviKvs namespace
diff --git a/src/kvirc/kvs/kvi_kvs_switchlist.cpp b/src/kvirc/kvs/kvi_kvs_switchlist.cpp
index bd22258ae..d740724a6 100644
--- a/src/kvirc/kvs/kvi_kvs_switchlist.cpp
+++ b/src/kvirc/kvs/kvi_kvs_switchlist.cpp
@@ -57,7 +57,7 @@ void KviKvsSwitchList::addShort(unsigned short uShortKey,KviKvsVariant * pVarian
 {
 	if(!m_pShortSwitchDict)
 	{
-		m_pShortSwitchDict = new KviIntDict<KviKvsVariant>(11);
+		m_pShortSwitchDict = new KviPointerHashTable<int,KviKvsVariant>(11);
 		m_pShortSwitchDict->setAutoDelete(true);
 	}
 	m_pShortSwitchDict->replace(uShortKey,pVariant);
@@ -67,7 +67,7 @@ void KviKvsSwitchList::addLong(const QString &szLongKey,KviKvsVariant * pVariant
 {
 	if(!m_pLongSwitchDict)
 	{
-		m_pLongSwitchDict = new KviDict<KviKvsVariant>(11);
+		m_pLongSwitchDict = new KviPointerHashTable<QString,KviKvsVariant>(11);
 		m_pLongSwitchDict->setAutoDelete(true);
 	}
 	m_pLongSwitchDict->replace(szLongKey,pVariant);
diff --git a/src/kvirc/kvs/kvi_kvs_switchlist.h b/src/kvirc/kvs/kvi_kvs_switchlist.h
index ff6529039..ee6ef7692 100644
--- a/src/kvirc/kvs/kvi_kvs_switchlist.h
+++ b/src/kvirc/kvs/kvi_kvs_switchlist.h
@@ -28,8 +28,8 @@
 #include "kvi_qstring.h"
 #include "kvi_kvs_variant.h"
 
-#include "kvi_intdict.h"
-#include "kvi_dict.h"
+#include "kvi_pointerhashtable.h"
+#include "kvi_pointerhashtable.h"
 
 class KVIRC_API KviKvsSwitchList
 {
@@ -37,8 +37,8 @@ public:
 	KviKvsSwitchList();
 	~KviKvsSwitchList();
 protected:
-	KviIntDict<KviKvsVariant> * m_pShortSwitchDict;
-	KviDict<KviKvsVariant>    * m_pLongSwitchDict;
+	KviPointerHashTable<int,KviKvsVariant> * m_pShortSwitchDict;
+	KviPointerHashTable<QString,KviKvsVariant>    * m_pLongSwitchDict;
 public:
 	void clear();
 	void addShort(unsigned short uShortKey,KviKvsVariant * pVariant);
diff --git a/src/kvirc/kvs/kvi_kvs_timermanager.cpp b/src/kvirc/kvs/kvi_kvs_timermanager.cpp
index d965bf2e6..c4fcaf9a7 100644
--- a/src/kvirc/kvs/kvi_kvs_timermanager.cpp
+++ b/src/kvirc/kvs/kvi_kvs_timermanager.cpp
@@ -70,9 +70,9 @@ KviKvsTimerManager * KviKvsTimerManager::m_pInstance = 0;
 KviKvsTimerManager::KviKvsTimerManager()
 : QObject()
 {
-	m_pTimerDictById = new KviIntDict<KviKvsTimer>(17);
+	m_pTimerDictById = new KviPointerHashTable<int,KviKvsTimer>(17);
 	m_pTimerDictById->setAutoDelete(false);
-	m_pTimerDictByName = new KviDict<KviKvsTimer>(17,false);
+	m_pTimerDictByName = new KviPointerHashTable<QString,KviKvsTimer>(17,false);
 	m_pTimerDictByName->setAutoDelete(false);
 	m_pKilledTimerList = 0;
 	m_iAssassinTimer = 0;
@@ -162,8 +162,8 @@ bool KviKvsTimerManager::deleteCurrentTimer()
 void KviKvsTimerManager::deleteAllTimers()
 {
 	if(m_pTimerDictById->isEmpty())return;
-	KviIntDictIterator<KviKvsTimer> it(*m_pTimerDictById);
-	KviPtrList<KviKvsTimer> tl;
+	KviPointerHashTableIterator<int,KviKvsTimer> it(*m_pTimerDictById);
+	KviPointerList<KviKvsTimer> tl;
 	tl.setAutoDelete(false);
 	while(KviKvsTimer * t = it.current())
 	{
@@ -180,7 +180,7 @@ void KviKvsTimerManager::scheduleKill(KviKvsTimer *t)
 {
 	if(!m_pKilledTimerList)
 	{
-		m_pKilledTimerList = new KviPtrList<KviKvsTimer>;
+		m_pKilledTimerList = new KviPointerList<KviKvsTimer>;
 		m_pKilledTimerList->setAutoDelete(true);
 	}
 	m_pKilledTimerList->append(t);
diff --git a/src/kvirc/kvs/kvi_kvs_timermanager.h b/src/kvirc/kvs/kvi_kvs_timermanager.h
index 6b51c6514..e11891f9b 100644
--- a/src/kvirc/kvs/kvi_kvs_timermanager.h
+++ b/src/kvirc/kvs/kvi_kvs_timermanager.h
@@ -29,9 +29,9 @@
 #include "kvi_qstring.h"
 
 #include <qobject.h>
-#include "kvi_intdict.h"
-#include "kvi_dict.h"
-#include "kvi_list.h"
+#include "kvi_pointerhashtable.h"
+#include "kvi_pointerhashtable.h"
+#include "kvi_pointerlist.h"
 
 class KviKvsTimerManager;
 class KviKvsScript;
@@ -92,10 +92,10 @@ protected: // it only can be created and destroyed by KviKvsTimerManager::init()
 	KviKvsTimerManager();
 	~KviKvsTimerManager();
 private:
-	KviIntDict<KviKvsTimer>     * m_pTimerDictById;      // stored by id
-	KviDict<KviKvsTimer>        * m_pTimerDictByName;    // stored by name
+	KviPointerHashTable<int,KviKvsTimer>     * m_pTimerDictById;      // stored by id
+	KviPointerHashTable<QString,KviKvsTimer>        * m_pTimerDictByName;    // stored by name
 	static KviKvsTimerManager   * m_pInstance;             // the one and only timer manager instance
-	KviPtrList<KviKvsTimer>     * m_pKilledTimerList;      // list of timers for that killing has been scheduled
+	KviPointerList<KviKvsTimer>     * m_pKilledTimerList;      // list of timers for that killing has been scheduled
 	int                           m_iAssassinTimer;        // assassin timer id
 	int                           m_iCurrentTimer;         // the timer currently executed
 public:
@@ -112,7 +112,7 @@ public:
 	bool deleteCurrentTimer();
 	void deleteAllTimers();
 	bool timerExists(const QString &szName){ return m_pTimerDictByName->find(szName); };
-	KviDict<KviKvsTimer> * timerDict()
+	KviPointerHashTable<QString,KviKvsTimer> * timerDict()
 		{ return m_pTimerDictByName; };
 protected:
 	void scheduleKill(KviKvsTimer * t);
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_compositedata.cpp b/src/kvirc/kvs/kvi_kvs_treenode_compositedata.cpp
index 54d945959..187415fa8 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_compositedata.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_compositedata.cpp
@@ -30,7 +30,7 @@
 
 #define DEBUGME
 
-KviKvsTreeNodeCompositeData::KviKvsTreeNodeCompositeData(const QChar * pLocation,KviPtrList<KviKvsTreeNodeData> * pSubData)
+KviKvsTreeNodeCompositeData::KviKvsTreeNodeCompositeData(const QChar * pLocation,KviPointerList<KviKvsTreeNodeData> * pSubData)
 : KviKvsTreeNodeData(pLocation)
 {
 #ifdef DEBUGME
@@ -57,7 +57,7 @@ bool KviKvsTreeNodeCompositeData::evaluateReadOnly(KviKvsRunTimeContext * c,KviK
 	KviKvsVariant res;
 
 	// we need to use an iterator to accomodate recursion
-	KviPtrListIterator<KviKvsTreeNodeData> it(*m_pSubData);
+	KviPointerListIterator<KviKvsTreeNodeData> it(*m_pSubData);
 	
 	while(KviKvsTreeNodeData * d = it.current())
 	{
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_compositedata.h b/src/kvirc/kvs/kvi_kvs_treenode_compositedata.h
index 234fcc0e7..093c080c7 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_compositedata.h
+++ b/src/kvirc/kvs/kvi_kvs_treenode_compositedata.h
@@ -26,17 +26,17 @@
 
 #include "kvi_settings.h"
 
-#include "kvi_list.h"
+#include "kvi_pointerlist.h"
 
 #include "kvi_kvs_treenode_data.h"
 
 class KVIRC_API KviKvsTreeNodeCompositeData : public KviKvsTreeNodeData
 {
 public:
-	KviKvsTreeNodeCompositeData(const QChar * pLocation,KviPtrList<KviKvsTreeNodeData> * pSubData);
+	KviKvsTreeNodeCompositeData(const QChar * pLocation,KviPointerList<KviKvsTreeNodeData> * pSubData);
 	~KviKvsTreeNodeCompositeData();
 protected:
-	KviPtrList<KviKvsTreeNodeData> * m_pSubData;
+	KviPointerList<KviKvsTreeNodeData> * m_pSubData;
 public:
 	virtual bool evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pBuffer);
 	virtual void contextDescription(QString &szBuffer);
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_datalist.cpp b/src/kvirc/kvs/kvi_kvs_treenode_datalist.cpp
index 9ad05cfe6..8a20b396f 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_datalist.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_datalist.cpp
@@ -32,7 +32,7 @@
 KviKvsTreeNodeDataList::KviKvsTreeNodeDataList(const QChar * pLocation)
 : KviKvsTreeNode(pLocation)
 {
-	m_pDataList = new KviPtrList<KviKvsTreeNodeData>();
+	m_pDataList = new KviPointerList<KviKvsTreeNodeData>();
 	m_pDataList->setAutoDelete(true);
 }
 
@@ -81,7 +81,7 @@ bool KviKvsTreeNodeDataList::evaluate(KviKvsRunTimeContext * c,KviKvsVariantList
 	pBuffer->clear();
 
 	// we use an iterator to accomodate recursion
-	KviPtrListIterator<KviKvsTreeNodeData> it(*m_pDataList);
+	KviPointerListIterator<KviKvsTreeNodeData> it(*m_pDataList);
 	while(KviKvsTreeNodeData * t = it.current())
 	{
 		KviKvsVariant * v = new KviKvsVariant();
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_datalist.h b/src/kvirc/kvs/kvi_kvs_treenode_datalist.h
index 7c1f6e06c..a398ae943 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_datalist.h
+++ b/src/kvirc/kvs/kvi_kvs_treenode_datalist.h
@@ -26,7 +26,7 @@
 
 #include "kvi_settings.h"
 
-#include "kvi_list.h"
+#include "kvi_pointerlist.h"
 
 #include "kvi_kvs_variantlist.h"
 #include "kvi_kvs_treenode_base.h"
@@ -41,7 +41,7 @@ public:
 	KviKvsTreeNodeDataList(const QChar * pLocation);
 	~KviKvsTreeNodeDataList();
 protected:
-	KviPtrList<KviKvsTreeNodeData> * m_pDataList;
+	KviPointerList<KviKvsTreeNodeData> * m_pDataList;
 protected:
 	void addItem(KviKvsTreeNodeData * p);
 	void prependItem(KviKvsTreeNodeData * p);
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_instructionblock.cpp b/src/kvirc/kvs/kvi_kvs_treenode_instructionblock.cpp
index d098aa9b0..97e71aaf1 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_instructionblock.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_instructionblock.cpp
@@ -31,7 +31,7 @@
 KviKvsTreeNodeInstructionBlock::KviKvsTreeNodeInstructionBlock(const QChar * pLocation)
 : KviKvsTreeNodeInstruction(pLocation)
 {
-	m_pInstructionList = new KviPtrList<KviKvsTreeNodeInstruction>;
+	m_pInstructionList = new KviPointerList<KviKvsTreeNodeInstruction>;
 	m_pInstructionList->setAutoDelete(true);
 }
 
@@ -78,7 +78,7 @@ void KviKvsTreeNodeInstructionBlock::addInstruction(KviKvsTreeNodeInstruction *
 bool KviKvsTreeNodeInstructionBlock::execute(KviKvsRunTimeContext * c)
 {
 	// to accomodate recursion we need to use an iterator here
-	KviPtrListIterator<KviKvsTreeNodeInstruction> it(*m_pInstructionList);
+	KviPointerListIterator<KviKvsTreeNodeInstruction> it(*m_pInstructionList);
 	while(KviKvsTreeNodeInstruction * i = it.current())
 	{
 		if(!i->execute(c))return false;
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_instructionblock.h b/src/kvirc/kvs/kvi_kvs_treenode_instructionblock.h
index 6283688da..78f1805ad 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_instructionblock.h
+++ b/src/kvirc/kvs/kvi_kvs_treenode_instructionblock.h
@@ -26,7 +26,7 @@
 
 #include "kvi_settings.h"
 #include "kvi_qstring.h"
-#include "kvi_list.h"
+#include "kvi_pointerlist.h"
 
 #include "kvi_kvs_treenode_instruction.h"
 
@@ -39,7 +39,7 @@ public:
 	KviKvsTreeNodeInstructionBlock(const QChar * pLocation);
 	~KviKvsTreeNodeInstructionBlock();
 protected:
-	KviPtrList<KviKvsTreeNodeInstruction> * m_pInstructionList;
+	KviPointerList<KviKvsTreeNodeInstruction> * m_pInstructionList;
 public:
 	unsigned int instructionCount(){ return m_pInstructionList->count(); };
 	void addInstruction(KviKvsTreeNodeInstruction * i);
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandclass.cpp b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandclass.cpp
index 1b2793aad..536fc4472 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandclass.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandclass.cpp
@@ -55,7 +55,7 @@ KviKvsTreeNodeSpecialCommandClass::KviKvsTreeNodeSpecialCommandClass(const QChar
 {
 	m_pParams = pParams;
 	m_pParams->setParent(this);
-	m_pFunctions = new KviPtrList<KviKvsTreeNodeSpecialCommandClassFunctionDefinition>;
+	m_pFunctions = new KviPointerList<KviKvsTreeNodeSpecialCommandClassFunctionDefinition>;
 	m_pFunctions->setAutoDelete(true);
 }
 
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandclass.h b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandclass.h
index ebd6a12a7..cee749f55 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandclass.h
+++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandclass.h
@@ -58,7 +58,7 @@ public:
 	virtual ~KviKvsTreeNodeSpecialCommandClass();
 protected:
 	KviKvsTreeNodeDataList * m_pParams;
-	KviPtrList<KviKvsTreeNodeSpecialCommandClassFunctionDefinition> * m_pFunctions;
+	KviPointerList<KviKvsTreeNodeSpecialCommandClassFunctionDefinition> * m_pFunctions;
 public:
 	void addFunctionDefinition(KviKvsTreeNodeSpecialCommandClassFunctionDefinition * pDef);
 	virtual void contextDescription(QString &szBuffer);
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddefpopup.cpp b/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddefpopup.cpp
index 4f13d95fe..782aa5669 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddefpopup.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddefpopup.cpp
@@ -252,7 +252,7 @@ KviKvsTreeNodeSpecialCommandDefpopupLabelPopup::KviKvsTreeNodeSpecialCommandDefp
 : KviKvsTreeNodeSpecialCommandDefpopupConditionalLabelWithTextAndIcon(pLocation,QString::null,QString::null,QString::null,QString::null)
 {
 #ifdef COMPILE_NEW_KVS
-	m_pLabels = new KviPtrList<KviKvsTreeNodeSpecialCommandDefpopupLabel>;
+	m_pLabels = new KviPointerList<KviKvsTreeNodeSpecialCommandDefpopupLabel>;
 	m_pLabels->setAutoDelete(true);
 #endif
 }
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddefpopup.h b/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddefpopup.h
index 72d04131d..f251d44e3 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddefpopup.h
+++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddefpopup.h
@@ -165,7 +165,7 @@ public:
 	KviKvsTreeNodeSpecialCommandDefpopupLabelPopup(const QChar * pLocation);
 	~KviKvsTreeNodeSpecialCommandDefpopupLabelPopup();
 protected:
-	KviPtrList<KviKvsTreeNodeSpecialCommandDefpopupLabel> * m_pLabels;
+	KviPointerList<KviKvsTreeNodeSpecialCommandDefpopupLabel> * m_pLabels;
 public:
 	bool isEmpty(){ return m_pLabels->isEmpty(); };
 	void addLabel(KviKvsTreeNodeSpecialCommandDefpopupLabel * pLabel);
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandswitch.cpp b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandswitch.cpp
index 8b7f4e803..169a67c33 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandswitch.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandswitch.cpp
@@ -294,7 +294,7 @@ KviKvsTreeNodeSpecialCommandSwitch::KviKvsTreeNodeSpecialCommandSwitch(const QCh
 {
 	m_pExpression = e;
 	m_pExpression->setParent(this);
-	m_pLabels = new KviPtrList<KviKvsTreeNodeSpecialCommandSwitchLabel>;
+	m_pLabels = new KviPointerList<KviKvsTreeNodeSpecialCommandSwitchLabel>;
 	m_pLabels->setAutoDelete(true);
 }
 
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandswitch.h b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandswitch.h
index ff7dd311f..bc1e58b4a 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandswitch.h
+++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandswitch.h
@@ -105,7 +105,7 @@ public:
 	~KviKvsTreeNodeSpecialCommandSwitch();
 private:
 	KviKvsTreeNodeExpression * m_pExpression; // can't be 0
-	KviPtrList<KviKvsTreeNodeSpecialCommandSwitchLabel> * m_pLabels; //can't be 0
+	KviPointerList<KviKvsTreeNodeSpecialCommandSwitchLabel> * m_pLabels; //can't be 0
 public:
 	void addLabel(KviKvsTreeNodeSpecialCommandSwitchLabel * l);
 	bool isEmpty(){ return m_pLabels->isEmpty(); };
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandunset.cpp b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandunset.cpp
index 69ecef308..862b1ac16 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandunset.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandunset.cpp
@@ -29,7 +29,7 @@
 #include "kvi_kvs_rwevaluationresult.h"
 #include "kvi_locale.h"
 
-KviKvsTreeNodeSpecialCommandUnset::KviKvsTreeNodeSpecialCommandUnset(const QChar * pLocation,KviPtrList<KviKvsTreeNodeVariable> * pVariableList)
+KviKvsTreeNodeSpecialCommandUnset::KviKvsTreeNodeSpecialCommandUnset(const QChar * pLocation,KviPointerList<KviKvsTreeNodeVariable> * pVariableList)
 : KviKvsTreeNodeSpecialCommand(pLocation,"unset")
 {
 	m_pVariableList = pVariableList;
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandunset.h b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandunset.h
index 9e3431c6d..858f2d780 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandunset.h
+++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandunset.h
@@ -34,10 +34,10 @@ class KviKvsRunTimeContext;
 class KVIRC_API KviKvsTreeNodeSpecialCommandUnset : public KviKvsTreeNodeSpecialCommand
 {
 public:
-	KviKvsTreeNodeSpecialCommandUnset(const QChar * pLocation,KviPtrList<KviKvsTreeNodeVariable> * pVarList);
+	KviKvsTreeNodeSpecialCommandUnset(const QChar * pLocation,KviPointerList<KviKvsTreeNodeVariable> * pVarList);
 	~KviKvsTreeNodeSpecialCommandUnset();
 private:
-	KviPtrList<KviKvsTreeNodeVariable> * m_pVariableList;
+	KviPointerList<KviKvsTreeNodeVariable> * m_pVariableList;
 public:
 	virtual void contextDescription(QString &szBuffer);
 	virtual void dump(const char * prefix);
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_switchlist.cpp b/src/kvirc/kvs/kvi_kvs_treenode_switchlist.cpp
index a6639f79f..e9acf77c8 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_switchlist.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_switchlist.cpp
@@ -51,7 +51,7 @@ void KviKvsTreeNodeSwitchList::dump(const char * prefix)
 	debug("%s SwitchList",prefix);
 	if(m_pShortSwitchDict)
 	{
-		KviIntDictIterator<KviKvsTreeNodeData> it(*m_pShortSwitchDict);
+		KviPointerHashTableIterator<int,KviKvsTreeNodeData> it(*m_pShortSwitchDict);
 		while(it.current())
 		{
 			QString tmp = prefix;
@@ -65,7 +65,7 @@ void KviKvsTreeNodeSwitchList::dump(const char * prefix)
 	}
 	if(m_pLongSwitchDict)
 	{
-		KviDictIterator<KviKvsTreeNodeData> it(*m_pLongSwitchDict);
+		KviPointerHashTableIterator<QString,KviKvsTreeNodeData> it(*m_pLongSwitchDict);
 		while(it.current())
 		{
 			QString tmp = prefix;
@@ -82,7 +82,7 @@ void KviKvsTreeNodeSwitchList::addShort(int iShortKey,KviKvsTreeNodeData * p)
 {
 	if(!m_pShortSwitchDict)
 	{
-		m_pShortSwitchDict = new KviIntDict<KviKvsTreeNodeData>(11);
+		m_pShortSwitchDict = new KviPointerHashTable<int,KviKvsTreeNodeData>(11);
 		m_pShortSwitchDict->setAutoDelete(true);
 	}
 
@@ -94,7 +94,7 @@ void KviKvsTreeNodeSwitchList::addLong(const QString &szLongKey,KviKvsTreeNodeDa
 {
 	if(!m_pLongSwitchDict)
 	{
-		m_pLongSwitchDict = new KviDict<KviKvsTreeNodeData>(11);
+		m_pLongSwitchDict = new KviPointerHashTable<QString,KviKvsTreeNodeData>(11);
 		m_pLongSwitchDict->setAutoDelete(true);
 	}
 
@@ -109,7 +109,7 @@ bool KviKvsTreeNodeSwitchList::evaluate(KviKvsRunTimeContext * c,KviKvsSwitchLis
 
 	if(m_pShortSwitchDict)
 	{
-		KviIntDictIterator<KviKvsTreeNodeData> it(*m_pShortSwitchDict);
+		KviPointerHashTableIterator<int,KviKvsTreeNodeData> it(*m_pShortSwitchDict);
 		while(KviKvsTreeNodeData * d = it.current())
 		{
 			KviKvsVariant * v = new KviKvsVariant();
@@ -124,7 +124,7 @@ bool KviKvsTreeNodeSwitchList::evaluate(KviKvsRunTimeContext * c,KviKvsSwitchLis
 	}
 	if(m_pLongSwitchDict)
 	{
-		KviDictIterator<KviKvsTreeNodeData> it(*m_pLongSwitchDict);
+		KviPointerHashTableIterator<QString,KviKvsTreeNodeData> it(*m_pLongSwitchDict);
 		while(KviKvsTreeNodeData * d = it.current())
 		{
 			KviKvsVariant * v = new KviKvsVariant();
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_switchlist.h b/src/kvirc/kvs/kvi_kvs_treenode_switchlist.h
index b7d954677..88ea02df0 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_switchlist.h
+++ b/src/kvirc/kvs/kvi_kvs_treenode_switchlist.h
@@ -27,8 +27,8 @@
 #include "kvi_settings.h"
 #include "kvi_qstring.h"
 
-#include "kvi_intdict.h"
-#include "kvi_dict.h"
+#include "kvi_pointerhashtable.h"
+#include "kvi_pointerhashtable.h"
 
 #include "kvi_kvs_treenode_base.h"
 #include "kvi_kvs_treenode_data.h"
@@ -42,8 +42,8 @@ public:
 	KviKvsTreeNodeSwitchList(const QChar * pLocation);
 	~KviKvsTreeNodeSwitchList();
 public:
-	KviIntDict<KviKvsTreeNodeData> * m_pShortSwitchDict;
-	KviDict<KviKvsTreeNodeData> *m_pLongSwitchDict;
+	KviPointerHashTable<int,KviKvsTreeNodeData> * m_pShortSwitchDict;
+	KviPointerHashTable<QString,KviKvsTreeNodeData> *m_pLongSwitchDict;
 public:
 	void addShort(int iShortKey,KviKvsTreeNodeData * p);
 	void addLong(const QString &szLongKey,KviKvsTreeNodeData * p);
diff --git a/src/kvirc/kvs/kvi_kvs_variant.cpp b/src/kvirc/kvs/kvi_kvs_variant.cpp
index 9605ee262..1d1ced629 100644
--- a/src/kvirc/kvs/kvi_kvs_variant.cpp
+++ b/src/kvirc/kvs/kvi_kvs_variant.cpp
@@ -413,7 +413,7 @@ void KviKvsVariant::castToArray(KviKvsArrayCast *c) const
 		break;
 		case KviKvsVariantData::Hash:
 		{
-			KviDictIterator<KviKvsVariant> it(*(m_pData->m_u.pHash->dict()));
+			KviPointerHashTableIterator<QString,KviKvsVariant> it(*(m_pData->m_u.pHash->dict()));
 			KviKvsArray * a = new KviKvsArray();
 			kvs_int_t idx = 0;
 			while(KviKvsVariant * v = it.current())
@@ -451,7 +451,7 @@ void KviKvsVariant::convertToArray()
 		break;
 		case KviKvsVariantData::Hash:
 		{
-			KviDictIterator<KviKvsVariant> it(*(m_pData->m_u.pHash->dict()));
+			KviPointerHashTableIterator<QString,KviKvsVariant> it(*(m_pData->m_u.pHash->dict()));
 			KviKvsArray * a = new KviKvsArray();
 			kvs_int_t idx = 0;
 			while(KviKvsVariant * v = it.current())
diff --git a/src/kvirc/kvs/kvi_kvs_variantlist.cpp b/src/kvirc/kvs/kvi_kvs_variantlist.cpp
index 284369dcd..3ff6907a7 100644
--- a/src/kvirc/kvs/kvi_kvs_variantlist.cpp
+++ b/src/kvirc/kvs/kvi_kvs_variantlist.cpp
@@ -28,20 +28,20 @@
 
 KviKvsVariantList::KviKvsVariantList()
 {
-	m_pList = new KviPtrList<KviKvsVariant>();
+	m_pList = new KviPointerList<KviKvsVariant>();
 	m_pList->setAutoDelete(true);
 }
 
 KviKvsVariantList::KviKvsVariantList(KviKvsVariant * v1)
 {
-	m_pList = new KviPtrList<KviKvsVariant>();
+	m_pList = new KviPointerList<KviKvsVariant>();
 	m_pList->setAutoDelete(true);
 	m_pList->append(v1);
 }
 
 KviKvsVariantList::KviKvsVariantList(KviKvsVariant * v1,KviKvsVariant * v2)
 {
-	m_pList = new KviPtrList<KviKvsVariant>();
+	m_pList = new KviPointerList<KviKvsVariant>();
 	m_pList->setAutoDelete(true);
 	m_pList->append(v1);
 	m_pList->append(v2);
@@ -49,7 +49,7 @@ KviKvsVariantList::KviKvsVariantList(KviKvsVariant * v1,KviKvsVariant * v2)
 
 KviKvsVariantList::KviKvsVariantList(KviKvsVariant * v1,KviKvsVariant * v2,KviKvsVariant * v3)
 {
-	m_pList = new KviPtrList<KviKvsVariant>();
+	m_pList = new KviPointerList<KviKvsVariant>();
 	m_pList->setAutoDelete(true);
 	m_pList->append(v1);
 	m_pList->append(v2);
@@ -58,7 +58,7 @@ KviKvsVariantList::KviKvsVariantList(KviKvsVariant * v1,KviKvsVariant * v2,KviKv
 
 KviKvsVariantList::KviKvsVariantList(KviKvsVariant * v1,KviKvsVariant * v2,KviKvsVariant * v3,KviKvsVariant * v4)
 {
-	m_pList = new KviPtrList<KviKvsVariant>();
+	m_pList = new KviPointerList<KviKvsVariant>();
 	m_pList->setAutoDelete(true);
 	m_pList->append(v1);
 	m_pList->append(v2);
@@ -68,7 +68,7 @@ KviKvsVariantList::KviKvsVariantList(KviKvsVariant * v1,KviKvsVariant * v2,KviKv
 
 KviKvsVariantList::KviKvsVariantList(KviKvsVariant * v1,KviKvsVariant * v2,KviKvsVariant * v3,KviKvsVariant * v4,KviKvsVariant * v5)
 {
-	m_pList = new KviPtrList<KviKvsVariant>();
+	m_pList = new KviPointerList<KviKvsVariant>();
 	m_pList->setAutoDelete(true);
 	m_pList->append(v1);
 	m_pList->append(v2);
@@ -79,7 +79,7 @@ KviKvsVariantList::KviKvsVariantList(KviKvsVariant * v1,KviKvsVariant * v2,KviKv
 
 KviKvsVariantList::KviKvsVariantList(KviKvsVariant * v1,KviKvsVariant * v2,KviKvsVariant * v3,KviKvsVariant * v4,KviKvsVariant * v5,KviKvsVariant * v6)
 {
-	m_pList = new KviPtrList<KviKvsVariant>();
+	m_pList = new KviPointerList<KviKvsVariant>();
 	m_pList->setAutoDelete(true);
 	m_pList->append(v1);
 	m_pList->append(v2);
@@ -91,7 +91,7 @@ KviKvsVariantList::KviKvsVariantList(KviKvsVariant * v1,KviKvsVariant * v2,KviKv
 
 KviKvsVariantList::KviKvsVariantList(KviKvsVariant * v1,KviKvsVariant * v2,KviKvsVariant * v3,KviKvsVariant * v4,KviKvsVariant * v5,KviKvsVariant * v6,KviKvsVariant * v7)
 {
-	m_pList = new KviPtrList<KviKvsVariant>();
+	m_pList = new KviPointerList<KviKvsVariant>();
 	m_pList->setAutoDelete(true);
 	m_pList->append(v1);
 	m_pList->append(v2);
@@ -104,14 +104,14 @@ KviKvsVariantList::KviKvsVariantList(KviKvsVariant * v1,KviKvsVariant * v2,KviKv
 
 KviKvsVariantList::KviKvsVariantList(QString * s1)
 {
-	m_pList = new KviPtrList<KviKvsVariant>();
+	m_pList = new KviPointerList<KviKvsVariant>();
 	m_pList->setAutoDelete(true);
 	m_pList->append(new KviKvsVariant(s1));
 }
 
 KviKvsVariantList::KviKvsVariantList(QString * s1,QString * s2)
 {
-	m_pList = new KviPtrList<KviKvsVariant>();
+	m_pList = new KviPointerList<KviKvsVariant>();
 	m_pList->setAutoDelete(true);
 	m_pList->append(new KviKvsVariant(s1));
 	m_pList->append(new KviKvsVariant(s2));
@@ -119,7 +119,7 @@ KviKvsVariantList::KviKvsVariantList(QString * s1,QString * s2)
 
 KviKvsVariantList::KviKvsVariantList(QString * s1,QString * s2,QString * s3)
 {
-	m_pList = new KviPtrList<KviKvsVariant>();
+	m_pList = new KviPointerList<KviKvsVariant>();
 	m_pList->setAutoDelete(true);
 	m_pList->append(new KviKvsVariant(s1));
 	m_pList->append(new KviKvsVariant(s2));
@@ -128,7 +128,7 @@ KviKvsVariantList::KviKvsVariantList(QString * s1,QString * s2,QString * s3)
 
 KviKvsVariantList::KviKvsVariantList(QString * s1,QString * s2,QString * s3,QString * s4)
 {
-	m_pList = new KviPtrList<KviKvsVariant>();
+	m_pList = new KviPointerList<KviKvsVariant>();
 	m_pList->setAutoDelete(true);
 	m_pList->append(new KviKvsVariant(s1));
 	m_pList->append(new KviKvsVariant(s2));
@@ -138,7 +138,7 @@ KviKvsVariantList::KviKvsVariantList(QString * s1,QString * s2,QString * s3,QStr
 
 KviKvsVariantList::KviKvsVariantList(QString * s1,QString * s2,QString * s3,QString * s4,QString * s5)
 {
-	m_pList = new KviPtrList<KviKvsVariant>();
+	m_pList = new KviPointerList<KviKvsVariant>();
 	m_pList->setAutoDelete(true);
 	m_pList->append(new KviKvsVariant(s1));
 	m_pList->append(new KviKvsVariant(s2));
@@ -149,7 +149,7 @@ KviKvsVariantList::KviKvsVariantList(QString * s1,QString * s2,QString * s3,QStr
 
 KviKvsVariantList::KviKvsVariantList(QString * s1,QString * s2,QString * s3,QString * s4,QString * s5,QString * s6)
 {
-	m_pList = new KviPtrList<KviKvsVariant>();
+	m_pList = new KviPointerList<KviKvsVariant>();
 	m_pList->setAutoDelete(true);
 	m_pList->append(new KviKvsVariant(s1));
 	m_pList->append(new KviKvsVariant(s2));
diff --git a/src/kvirc/kvs/kvi_kvs_variantlist.h b/src/kvirc/kvs/kvi_kvs_variantlist.h
index 9f95045ee..19b9a33e5 100644
--- a/src/kvirc/kvs/kvi_kvs_variantlist.h
+++ b/src/kvirc/kvs/kvi_kvs_variantlist.h
@@ -25,7 +25,7 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_list.h"
+#include "kvi_pointerlist.h"
 #include "kvi_kvs_variant.h"
 
 
@@ -49,7 +49,7 @@ public:
 	KviKvsVariantList(QString * s1,QString * s2,QString * s3,QString * s4,QString * s5,QString * s6);
 	~KviKvsVariantList();
 protected:
-	KviPtrList<KviKvsVariant> * m_pList;
+	KviPointerList<KviKvsVariant> * m_pList;
 public:
 	KviKvsVariant * first(){ return m_pList->first(); };
 	KviKvsVariant * next(){ return m_pList->next(); };
diff --git a/src/kvirc/module/kvi_module.cpp b/src/kvirc/module/kvi_module.cpp
index 0fc16dbcf..1174e78a9 100644
--- a/src/kvirc/module/kvi_module.cpp
+++ b/src/kvirc/module/kvi_module.cpp
@@ -145,9 +145,9 @@ KviModule::KviModule(kvi_library_t handle,KviModuleInfo * info,const char * name
 	m_szFileName = filename;
 // FIXME: this should become case insensitive and converted toUpper()
 	/*
-	m_pCommandDict = new KviAsciiDict<KviModuleCommandParseProc>(17,false,true);
+	m_pCommandDict = new KviPointerHashTable<const char *,KviModuleCommandParseProc>(17,false,true);
 	m_pCommandDict->setAutoDelete(true);
-	m_pFunctionDict = new KviAsciiDict<KviModuleFunctionParseProc>(17,false,true);
+	m_pFunctionDict = new KviPointerHashTable<const char *,KviModuleFunctionParseProc>(17,false,true);
 	m_pFunctionDict->setAutoDelete(true);
 	*/
 	m_uLock = 0;
@@ -216,9 +216,9 @@ void KviModule::setGenericFunctionParseProc(KviModuleFunctionParseProc proc)
 	}
 }
 
-void KviModule::completeCommand(const QString &cmd,KviPtrList<QString> * matches)
+void KviModule::completeCommand(const QString &cmd,KviPointerList<QString> * matches)
 {
-	KviAsciiDictIterator<KviModuleCommandParseProc> it(*m_pCommandDict);
+	KviPointerHashTableIterator<const char *,KviModuleCommandParseProc> it(*m_pCommandDict);
 
 	while(it.current())
 	{
@@ -232,9 +232,9 @@ void KviModule::completeCommand(const QString &cmd,KviPtrList<QString> * matches
 	}
 }
 
-void KviModule::completeFunction(const QString &cmd,KviPtrList<QString> * matches)
+void KviModule::completeFunction(const QString &cmd,KviPointerList<QString> * matches)
 {
-	KviAsciiDictIterator<KviModuleFunctionParseProc> it(*m_pFunctionDict);
+	KviPointerHashTableIterator<const char *,KviModuleFunctionParseProc> it(*m_pFunctionDict);
 
 	while(it.current())
 	{
@@ -282,7 +282,7 @@ void KviModule::unregisterCommand(const char * cmd)
 void KviModule::unregisterAllCommands()
 {
 	delete m_pCommandDict;
-	m_pCommandDict = new KviAsciiDict<KviModuleCommandParseProc>(17,false,true);
+	m_pCommandDict = new KviPointerHashTable<const char *,KviModuleCommandParseProc>(17,false,true);
 	m_pCommandDict->setAutoDelete(true);
 }
 
@@ -328,7 +328,7 @@ void KviModule::unregisterFunction(const char * fnc)
 void KviModule::unregisterAllFunctions()
 {
 	delete m_pFunctionDict;
-	m_pFunctionDict = new KviAsciiDict<KviModuleFunctionParseProc>(17,false,true);
+	m_pFunctionDict = new KviPointerHashTable<const char *,KviModuleFunctionParseProc>(17,false,true);
 	m_pFunctionDict->setAutoDelete(true);
 }
 */
diff --git a/src/kvirc/module/kvi_module.h b/src/kvirc/module/kvi_module.h
index 7726c27c2..67396ed2c 100644
--- a/src/kvirc/module/kvi_module.h
+++ b/src/kvirc/module/kvi_module.h
@@ -30,11 +30,11 @@
 //#include "kvi_command.h"
 #include "kvi_parameterlist.h"
 #include "kvi_library.h"
-#include "kvi_list.h"
+#include "kvi_pointerlist.h"
 #include "kvi_moduleextension.h"
 #include "kvi_kvs_moduleinterface.h"
 
-#include "kvi_asciidict.h"
+#include "kvi_pointerhashtable.h"
 
 #ifdef COMPILE_CRYPT_SUPPORT
 	#include "kvi_crypt.h"
@@ -136,7 +136,7 @@ typedef bool (*KviModuleEventParseProc)(KviModule *,KviWindow *,KviParameterList
 
 class KVIRC_API KviModule : public KviKvsModuleInterface
 {
-	friend class KviAsciiDict<KviModule>;
+	friend class KviPointerHashTable<const char *,KviModule>;
 	friend class KviModuleManager;
 	friend class KviUserParser;
 protected:
diff --git a/src/kvirc/module/kvi_moduleextension.cpp b/src/kvirc/module/kvi_moduleextension.cpp
index 531add470..3f862ad39 100644
--- a/src/kvirc/module/kvi_moduleextension.cpp
+++ b/src/kvirc/module/kvi_moduleextension.cpp
@@ -41,7 +41,7 @@ KviModuleExtensionDescriptor::KviModuleExtensionDescriptor(KviModule * m,const K
 	m_szName = szName;
 	m_szVisibleName = szVisibleName;
 	m_allocRoutine = r;
-	m_pObjectList = new KviPtrList<KviModuleExtension>;
+	m_pObjectList = new KviPointerList<KviModuleExtension>;
 	m_pObjectList->setAutoDelete(false);
 	if(pix.isNull())m_pIcon = 0;
 	else m_pIcon = new QPixmap(pix);
@@ -61,7 +61,7 @@ void KviModuleExtensionDescriptor::setIcon(const QPixmap &pix)
 	else m_pIcon = new QPixmap(pix);
 }
 
-KviModuleExtension * KviModuleExtensionDescriptor::allocate(KviWindow * pWnd,KviDict<QVariant> * pParams,void * pSpecial)
+KviModuleExtension * KviModuleExtensionDescriptor::allocate(KviWindow * pWnd,KviPointerHashTable<QString,QVariant> * pParams,void * pSpecial)
 {
 	KviModuleExtensionAllocStruct s;
 	s.pDescriptor = this;
@@ -91,7 +91,7 @@ void KviModuleExtensionDescriptor::unregisterObject(KviModuleExtension * e)
 
 KviModuleExtensionManager::KviModuleExtensionManager()
 {
-	m_pExtensionDict = new KviAsciiDict<KviModuleExtensionDescriptorList>(17,false);
+	m_pExtensionDict = new KviPointerHashTable<const char *,KviModuleExtensionDescriptorList>(17,false);
 	m_pExtensionDict->setAutoDelete(true);
 }
 
@@ -122,12 +122,12 @@ KviModuleExtensionDescriptor * KviModuleExtensionManager::registerExtension(KviM
 
 void KviModuleExtensionManager::unregisterExtensionsByModule(KviModule * m)
 {
-	KviAsciiDictIterator<KviModuleExtensionDescriptorList> it(*m_pExtensionDict);
-	KviPtrList<KviStr> dying;
+	KviPointerHashTableIterator<const char *,KviModuleExtensionDescriptorList> it(*m_pExtensionDict);
+	KviPointerList<KviStr> dying;
 	dying.setAutoDelete(true);
 	while(KviModuleExtensionDescriptorList * l = it.current())
 	{
-		KviPtrList<KviModuleExtensionDescriptor> dying2;
+		KviPointerList<KviModuleExtensionDescriptor> dying2;
 		dying2.setAutoDelete(true);
 
 		for(KviModuleExtensionDescriptor * d = l->first();d;d = l->next())
@@ -181,7 +181,7 @@ KviModuleExtensionDescriptor * KviModuleExtensionManager::findExtensionDescripto
 	return 0;
 }
 
-KviModuleExtension * KviModuleExtensionManager::allocateExtension(const KviStr &szType,const KviStr &szName,KviWindow * pWnd,KviDict<QVariant> * pParams,void * pSpecial,const char * preloadModule)
+KviModuleExtension * KviModuleExtensionManager::allocateExtension(const KviStr &szType,const KviStr &szName,KviWindow * pWnd,KviPointerHashTable<QString,QVariant> * pParams,void * pSpecial,const char * preloadModule)
 {
 	KviModuleExtensionDescriptorList * l = allocateExtensionGetDescriptorList(szType,preloadModule);
 	if(!l)return 0;
@@ -208,7 +208,7 @@ KviModuleExtension * KviModuleExtensionManager::allocateExtension(const KviStr &
 }
 
 
-KviModuleExtension * KviModuleExtensionManager::allocateExtension(const KviStr &szType,int id,KviWindow * pWnd,KviDict<QVariant> * pParams,void * pSpecial,const char * preloadModule)
+KviModuleExtension * KviModuleExtensionManager::allocateExtension(const KviStr &szType,int id,KviWindow * pWnd,KviPointerHashTable<QString,QVariant> * pParams,void * pSpecial,const char * preloadModule)
 {
 	KviModuleExtensionDescriptorList * l = allocateExtensionGetDescriptorList(szType,preloadModule);
 	if(!l)return 0;
diff --git a/src/kvirc/module/kvi_moduleextension.h b/src/kvirc/module/kvi_moduleextension.h
index c36306cdf..5903ea391 100644
--- a/src/kvirc/module/kvi_moduleextension.h
+++ b/src/kvirc/module/kvi_moduleextension.h
@@ -24,13 +24,13 @@
 
 #include "kvi_settings.h"
 #include "kvi_string.h"
-#include "kvi_list.h"
+#include "kvi_pointerlist.h"
 #include "kvi_heapobject.h"
 
-#include "kvi_asciidict.h"
+#include "kvi_pointerhashtable.h"
 #include <qpixmap.h>
 #include <qvariant.h>
-#include "kvi_dict.h"
+#include "kvi_pointerhashtable.h"
 
 class KviWindow;
 class KviModule;
@@ -41,7 +41,7 @@ typedef struct _KviModuleExtensionAllocStructTag
 {
 	KviModuleExtensionDescriptor * pDescriptor; // module extension that this alloc routine refers to
 	KviWindow                    * pWindow;     // may be 0!
-	KviDict<QVariant>              * pParams;     // parameter dict (may be 0!)
+	KviPointerHashTable<QString,QVariant>              * pParams;     // parameter dict (may be 0!)
 	void                         * pSpecial;    // special parameter passed to the alloc routine, may be 0
 } KviModuleExtensionAllocStruct;
 
@@ -65,12 +65,12 @@ private:
 	int                              m_iFlags;         // Flags (0 if not applicable)
 	QPixmap                        * m_pIcon;          // Icon (may be null!)
 	KviModuleExtensionAllocRoutine   m_allocRoutine;
-	KviPtrList<KviModuleExtension> * m_pObjectList;
+	KviPointerList<KviModuleExtension> * m_pObjectList;
 
 	KviModule                      * m_pModule;        // module pointer
 public:
 	// pParams ownership is NOT taken
-	KviModuleExtension * allocate(KviWindow * pWnd = 0,KviDict<QVariant> * pParams = 0,void * pSpecial = 0);
+	KviModuleExtension * allocate(KviWindow * pWnd = 0,KviPointerHashTable<QString,QVariant> * pParams = 0,void * pSpecial = 0);
 
 	int id(){ return m_iId; };
 	KviModule * module(){ return m_pModule; };
@@ -93,7 +93,7 @@ protected:
 	void unregisterObject(KviModuleExtension * e);
 };
 
-typedef KviPtrList<KviModuleExtensionDescriptor> KviModuleExtensionDescriptorList;
+typedef KviPointerList<KviModuleExtensionDescriptor> KviModuleExtensionDescriptorList;
 
 class KviModuleExtensionManager;
 
@@ -107,7 +107,7 @@ protected:
 	KviModuleExtensionManager(); // KviApp calls this
 	~KviModuleExtensionManager(); // and this
 protected:
-	KviAsciiDict<KviModuleExtensionDescriptorList> * m_pExtensionDict;
+	KviPointerHashTable<const char *,KviModuleExtensionDescriptorList> * m_pExtensionDict;
 protected:
 	// Only KviModule can call this
 	KviModuleExtensionDescriptor * registerExtension(KviModule * m,const KviStr &szType,const KviStr &szName,const QString &szVisibleName,KviModuleExtensionAllocRoutine r,const QPixmap &icon);
@@ -116,8 +116,8 @@ public:
 	KviModuleExtensionDescriptor * findExtensionDescriptor(const KviStr &szType,const KviStr &szName);
 	static KviModuleExtensionManager * instance(){ return g_pModuleExtensionManager; };
 	KviModuleExtensionDescriptorList * getExtensionList(const KviStr &szType);
-	KviModuleExtension * allocateExtension(const KviStr &szType,const KviStr &szName,KviWindow * pWnd = 0,KviDict<QVariant> * pParams = 0,void * pSpecial = 0,const char * preloadModule = 0);
-	KviModuleExtension * allocateExtension(const KviStr &szType,int id,KviWindow * pWnd = 0,KviDict<QVariant> * pParams = 0,void * pSpecial = 0,const char * preloadModule = 0);
+	KviModuleExtension * allocateExtension(const KviStr &szType,const KviStr &szName,KviWindow * pWnd = 0,KviPointerHashTable<QString,QVariant> * pParams = 0,void * pSpecial = 0,const char * preloadModule = 0);
+	KviModuleExtension * allocateExtension(const KviStr &szType,int id,KviWindow * pWnd = 0,KviPointerHashTable<QString,QVariant> * pParams = 0,void * pSpecial = 0,const char * preloadModule = 0);
 private:
 	KviModuleExtensionDescriptorList * allocateExtensionGetDescriptorList(const KviStr &szType,const char * preloadModule);
 };
diff --git a/src/kvirc/module/kvi_modulemanager.cpp b/src/kvirc/module/kvi_modulemanager.cpp
index 711aec155..ea126cc26 100644
--- a/src/kvirc/module/kvi_modulemanager.cpp
+++ b/src/kvirc/module/kvi_modulemanager.cpp
@@ -43,7 +43,7 @@ KviModuleManager * g_pModuleManager = 0;
 
 KviModuleManager::KviModuleManager()
 {
-	m_pModuleDict = new KviAsciiDict<KviModule>(17,false);
+	m_pModuleDict = new KviPointerHashTable<const char *,KviModule>(17,false);
 	m_pModuleDict->setAutoDelete(false);
 
 	m_pCleanupTimer = new QTimer(this);
@@ -85,7 +85,7 @@ void KviModuleManager::loadModulesByCaps(const char * caps)
 	loadModulesByCaps(caps,szDir.ptr());
 }
 
-void KviModuleManager::completeModuleNames(const QString &path,const QString &word,KviPtrList<QString> * matches)
+void KviModuleManager::completeModuleNames(const QString &path,const QString &word,KviPointerList<QString> * matches)
 {
 	QDir d(path);
 #ifdef COMPILE_ON_WINDOWS
@@ -112,7 +112,7 @@ void KviModuleManager::completeModuleNames(const QString &path,const QString &wo
 	}
 }
 
-void KviModuleManager::completeModuleNames(const QString &word,KviPtrList<QString> * matches)
+void KviModuleManager::completeModuleNames(const QString &word,KviPointerList<QString> * matches)
 {
 	QString szDir;
 	// FIXME: Should check for duplicate names here!
@@ -310,7 +310,7 @@ bool KviModuleManager::unloadModule(KviModule * module)
 
 bool KviModuleManager::hasLockedModules()
 {
-	KviAsciiDictIterator<KviModule> it(*m_pModuleDict);
+	KviPointerHashTableIterator<const char *,KviModule> it(*m_pModuleDict);
 	while(KviModule * m = it.current())
 	{
 		if(m->isLocked())return true;
@@ -322,7 +322,7 @@ bool KviModuleManager::hasLockedModules()
 
 void KviModuleManager::cleanupUnusedModules()
 {
-	KviAsciiDictIterator<KviModule> it(*m_pModuleDict);
+	KviPointerHashTableIterator<const char *,KviModule> it(*m_pModuleDict);
 	while(it.current())
 	{
 		if(it.current()->secondsSinceLastAccess() > KVI_OPTION_UINT(KviOption_uintModuleCleanupTimeout))
@@ -352,6 +352,6 @@ void KviModuleManager::cleanupUnusedModules()
 
 void KviModuleManager::unloadAllModules()
 {
-	KviAsciiDictIterator<KviModule> it(*m_pModuleDict);
+	KviPointerHashTableIterator<const char *,KviModule> it(*m_pModuleDict);
 	while(it.current())unloadModule(it.current());
 }
diff --git a/src/kvirc/module/kvi_modulemanager.h b/src/kvirc/module/kvi_modulemanager.h
index 91e973f15..15e080c9c 100644
--- a/src/kvirc/module/kvi_modulemanager.h
+++ b/src/kvirc/module/kvi_modulemanager.h
@@ -28,9 +28,9 @@
 #include "kvi_settings.h"
 
 #include <qobject.h>
-#include "kvi_asciidict.h"
+#include "kvi_pointerhashtable.h"
 #include <qtimer.h>
-#include "kvi_list.h"
+#include "kvi_pointerlist.h"
 
 #include "kvi_module.h"
 
@@ -41,7 +41,7 @@ public:
 	KviModuleManager();
 	~KviModuleManager();
 private:
-	KviAsciiDict<KviModule>                        * m_pModuleDict;
+	KviPointerHashTable<const char *,KviModule>                        * m_pModuleDict;
 	QTimer                                       * m_pCleanupTimer;
 	KviStr                                         m_szLastError;
 public:
@@ -56,9 +56,9 @@ public:
 	void loadModulesByCaps(const char * caps,const char * dir);
 	void loadModulesByCaps(const char * caps);
 	bool hasLockedModules();
-	void completeModuleNames(const QString &word,KviPtrList<QString> * matches);
+	void completeModuleNames(const QString &word,KviPointerList<QString> * matches);
 protected:
-	void completeModuleNames(const QString &path,const QString &work,KviPtrList<QString> * matches);
+	void completeModuleNames(const QString &path,const QString &work,KviPointerList<QString> * matches);
 public slots:
 	void cleanupUnusedModules();
 signals:
diff --git a/src/kvirc/sparser/kvi_ircmessage.cpp b/src/kvirc/sparser/kvi_ircmessage.cpp
index cc0178ca5..002c4b898 100644
--- a/src/kvirc/sparser/kvi_ircmessage.cpp
+++ b/src/kvirc/sparser/kvi_ircmessage.cpp
@@ -37,10 +37,10 @@ KviIrcMessage::KviIrcMessage(const char * message,KviIrcConnection * pConnection
 	const char * aux;
 	m_ptr = message;
 
-	m_pParams = new KviPtrList<KviStr>;
+	m_pParams = new KviPointerList<KviStr>;
 	m_pParams->setAutoDelete(true);
 
-	//m_pcParams = new KviPtrList<QCString>;
+	//m_pcParams = new KviPointerList<QCString>;
 	//m_pcParams->setAutoDelete(true);
 	
 	while(*m_ptr == ' ')++m_ptr;
diff --git a/src/kvirc/sparser/kvi_ircmessage.h b/src/kvirc/sparser/kvi_ircmessage.h
index 45d99817f..63ace90e7 100644
--- a/src/kvirc/sparser/kvi_ircmessage.h
+++ b/src/kvirc/sparser/kvi_ircmessage.h
@@ -25,7 +25,7 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_list.h"
+#include "kvi_pointerlist.h"
 #include "kvi_string.h"
 #include "kvi_qstring.h"
 #include "kvi_console.h"
@@ -55,7 +55,7 @@ private:
 	const char          * m_ptr;                // shallow! never null
 	KviStr                m_szPrefix;           // the extracted prefix string
 	KviStr                m_szCommand;          // the extracted command (may be numeric)
-	KviPtrList<KviStr>  * m_pParams;            // the list of parameters
+	KviPointerList<KviStr>  * m_pParams;            // the list of parameters
 	KviConsole          * m_pConsole;           // the console we're attacched to
 	KviIrcConnection    * m_pConnection;        // the connection we're attacched to
 	int                   m_iNumericCommand;    // the numeric of the command (0 if non numeric)
diff --git a/src/kvirc/sparser/kvi_sparser.h b/src/kvirc/sparser/kvi_sparser.h
index c05b3c4ab..f8a602e41 100644
--- a/src/kvirc/sparser/kvi_sparser.h
+++ b/src/kvirc/sparser/kvi_sparser.h
@@ -31,7 +31,7 @@
 #include <time.h>
 
 #include <qobject.h>
-#include "kvi_list.h"
+#include "kvi_pointerlist.h"
 
 #include "kvi_qstring.h"
 #include "kvi_qcstring.h"
diff --git a/src/kvirc/ui/kvi_actiondrawer.cpp b/src/kvirc/ui/kvi_actiondrawer.cpp
index 1149728d1..b09476dae 100644
--- a/src/kvirc/ui/kvi_actiondrawer.cpp
+++ b/src/kvirc/ui/kvi_actiondrawer.cpp
@@ -193,13 +193,13 @@ void KviActionDrawer::fill()
 {
 	KviActionManager::loadAllAvailableActions();
 
-	KviDict<KviActionDrawerPage> pages;
+	KviPointerHashTable<QString,KviActionDrawerPage> pages;
 	pages.setAutoDelete(false);
 
-	KviDict<KviAction> * d = KviActionManager::instance()->actions();
+	KviPointerHashTable<QString,KviAction> * d = KviActionManager::instance()->actions();
 	if(!d)return; // ooops
 
-	KviDictIterator<KviAction> it(*d);
+	KviPointerHashTableIterator<QString,KviAction> it(*d);
 	while(KviAction * a = it.current())
 	{
 		KviActionCategory * c = a->category();
diff --git a/src/kvirc/ui/kvi_channel.cpp b/src/kvirc/ui/kvi_channel.cpp
index 430043292..b736d676a 100644
--- a/src/kvirc/ui/kvi_channel.cpp
+++ b/src/kvirc/ui/kvi_channel.cpp
@@ -76,7 +76,7 @@
 
 #include <qpalette.h>
 #include "kvi_tal_popupmenu.h"
-#include "kvi_dict.h"
+#include "kvi_pointerhashtable.h"
 #include <qmessagebox.h>
 #include "kvi_tal_widgetstack.h" 
 
@@ -97,17 +97,17 @@ KviChannel::KviChannel(KviFrame * lpFrm,KviConsole * lpConsole,const char * name
 	// Init some member variables
 	m_pInput               = 0;
 	m_iStateFlags          = 0;
-	m_pBanList             = new KviPtrList<KviMaskEntry>;
+	m_pBanList             = new KviPointerList<KviMaskEntry>;
 	m_pBanList->setAutoDelete(true);
-	m_pBanExceptionList    = new KviPtrList<KviMaskEntry>;
+	m_pBanExceptionList    = new KviPointerList<KviMaskEntry>;
 	m_pBanExceptionList->setAutoDelete(true);
-	m_pInviteList = new KviPtrList<KviMaskEntry>;
+	m_pInviteList = new KviPointerList<KviMaskEntry>;
 	m_pInviteList->setAutoDelete(true);
-	m_pActionHistory = new KviPtrList<KviChannelAction>;
+	m_pActionHistory = new KviPointerList<KviChannelAction>;
 	m_pActionHistory->setAutoDelete(true);
 	m_uActionHistoryHotActionCount = 0;
 
-	m_pTmpHighLighted      = new KviAsciiDict<QString>();
+	m_pTmpHighLighted      = new KviPointerHashTable<const char *,QString>();
 	m_pTmpHighLighted->setAutoDelete(true);
 
 	// Register ourselves
@@ -452,7 +452,7 @@ void KviChannel::toggleInviteEditor()
 			m_pInviteList,'I',"invite_exception_editor");
 }
 
-void KviChannel::toggleEditor(KviMaskEditor ** ppEd,KviWindowToolPageButton ** ppBtn,KviPtrList<KviMaskEntry> *l,char flag,const char *edName)
+void KviChannel::toggleEditor(KviMaskEditor ** ppEd,KviWindowToolPageButton ** ppBtn,KviPointerList<KviMaskEntry> *l,char flag,const char *edName)
 {
 	if(*ppEd)
 	{
@@ -496,8 +496,8 @@ void KviChannel::toggleEditor(KviMaskEditor ** ppEd,KviWindowToolPageButton ** p
 		}
 
 		*ppEd = new KviMaskEditor(m_pSplitter,*ppBtn,l,flag,edName);
-		connect(*ppEd,SIGNAL(removeMasks(KviMaskEditor *,KviPtrList<KviMaskEntry> *)),
-			this,SLOT(removeMasks(KviMaskEditor *,KviPtrList<KviMaskEntry> *)));
+		connect(*ppEd,SIGNAL(removeMasks(KviMaskEditor *,KviPointerList<KviMaskEntry> *)),
+			this,SLOT(removeMasks(KviMaskEditor *,KviPointerList<KviMaskEntry> *)));
 		//setFocusHandler(m_pInput,*ppEd); //socket it!
 		(*ppEd)->show();
 		if(!(*ppBtn))return;
@@ -505,7 +505,7 @@ void KviChannel::toggleEditor(KviMaskEditor ** ppEd,KviWindowToolPageButton ** p
 	}
 }
 
-void KviChannel::removeMasks(KviMaskEditor *ed,KviPtrList<KviMaskEntry> *l)
+void KviChannel::removeMasks(KviMaskEditor *ed,KviPointerList<KviMaskEntry> *l)
 {
 	KviStr masks;
 	KviStr flags;
@@ -1301,7 +1301,7 @@ void KviChannel::getChannelActivityStats(KviChannelActivityStats * s)
 	tTwoMinsAgo-= 120;
 	tNow -= 60;
 
-	KviDict<int> userDict;
+	KviPointerHashTable<QString,int> userDict;
 	userDict.setAutoDelete(false);
 
 	int fake;
@@ -1427,7 +1427,7 @@ int KviChannel::myFlags()
 void KviChannel::setMask(char flag, const QString &mask,bool bAdd,const QString &setBy,unsigned int setAt)
 {
 	if(!connection())return;
-	KviPtrList<KviMaskEntry> * list = m_pBanList;
+	KviPointerList<KviMaskEntry> * list = m_pBanList;
 	KviMaskEditor * editor = m_pBanEditor;
 	switch(flag)
 	{
@@ -1450,7 +1450,7 @@ void KviChannel::setMask(char flag, const QString &mask,bool bAdd,const QString
 	m_pUserListView->setMaskEntries(flag,(int)list->count());
 }
 
-void KviChannel::internalMask(const QString &mask,bool bAdd,const QString &setBy,unsigned int setAt,KviPtrList<KviMaskEntry> *l,KviMaskEditor **ppEd)
+void KviChannel::internalMask(const QString &mask,bool bAdd,const QString &setBy,unsigned int setAt,KviPointerList<KviMaskEntry> *l,KviMaskEditor **ppEd)
 {
 	KviMaskEntry * e = 0;
 	if(bAdd)
diff --git a/src/kvirc/ui/kvi_channel.h b/src/kvirc/ui/kvi_channel.h
index 306f4ff39..cd06db5d0 100644
--- a/src/kvirc/ui/kvi_channel.h
+++ b/src/kvirc/ui/kvi_channel.h
@@ -38,7 +38,7 @@
 #include "kvi_valuelist.h"
 
 #include <qdatetime.h>
-#include "kvi_asciidict.h"
+#include "kvi_pointerhashtable.h"
 #include <qstringlist.h>
 
 class KviConsole;
@@ -133,15 +133,15 @@ protected:
 	QString                               m_szChannelMode;
 	QString                               m_szChannelKey;
 	KviStr                                m_szChannelLimit;
-	KviPtrList<KviMaskEntry>            * m_pBanList;
-	KviPtrList<KviMaskEntry>            * m_pBanExceptionList;
-	KviPtrList<KviMaskEntry>            * m_pInviteList;
+	KviPointerList<KviMaskEntry>            * m_pBanList;
+	KviPointerList<KviMaskEntry>            * m_pBanExceptionList;
+	KviPointerList<KviMaskEntry>            * m_pInviteList;
 	KviPixmap                             m_privateBackground;
 	QDateTime                             m_joinTime;
 	QString                               m_szNameWithUserFlag;
-	KviAsciiDict<QString>               * m_pTmpHighLighted;
+	KviPointerHashTable<const char *,QString>               * m_pTmpHighLighted;
 	unsigned int                          m_uActionHistoryHotActionCount;
-	KviPtrList<KviChannelAction>        * m_pActionHistory;
+	KviPointerList<KviChannelAction>        * m_pActionHistory;
 	kvi_time_t                            m_tLastReceivedWhoReply;
 	KviValueList<int>                     m_VertSplitterSizesList;
 	KviTalHBox                          * m_pButtonContainer;
@@ -158,8 +158,8 @@ protected:
 	virtual void applyOptions();
 	virtual void getBaseLogFileName(QString &buffer);
 	virtual void triggerCreationEvents();
-	void toggleEditor(KviMaskEditor ** ppEd,KviWindowToolPageButton ** ppBtn,KviPtrList<KviMaskEntry> *l,char flag,const char *edName);
-	void internalMask(const QString &mask,bool bAdd,const QString &setBy,unsigned int setAt,KviPtrList<KviMaskEntry> *l,KviMaskEditor **ppEd);
+	void toggleEditor(KviMaskEditor ** ppEd,KviWindowToolPageButton ** ppBtn,KviPointerList<KviMaskEntry> *l,char flag,const char *edName);
+	void internalMask(const QString &mask,bool bAdd,const QString &setBy,unsigned int setAt,KviPointerList<KviMaskEntry> *l,KviMaskEditor **ppEd);
 	void checkChannelSync();
 	void showDoubleView(bool bShow);
 	void fixActionHistory();
@@ -168,9 +168,9 @@ public:
 	void getChannelActivityStats(KviChannelActivityStats * s);
 	//void getChannelActivityStatsDescription(QString &buffer);
 
-	KviPtrList<KviMaskEntry> * banList(){ return m_pBanList; };
-	KviPtrList<KviMaskEntry> * banExceptionList(){ return m_pBanExceptionList; };
-	KviPtrList<KviMaskEntry> * inviteList(){ return m_pInviteList; };
+	KviPointerList<KviMaskEntry> * banList(){ return m_pBanList; };
+	KviPointerList<KviMaskEntry> * banExceptionList(){ return m_pBanExceptionList; };
+	KviPointerList<KviMaskEntry> * inviteList(){ return m_pInviteList; };
 
 	QString * firstSelectedNickname(){ return m_pUserListView->firstSelectedNickname(); };
 	QString * nextSelectedNickname(){ return m_pUserListView->nextSelectedNickname(); };
@@ -304,7 +304,7 @@ private slots:
 	void setMode(const char * mode);
 	void modeSelectorDone();
 	void textViewRightClicked();
-	void removeMasks(KviMaskEditor *ed,KviPtrList<KviMaskEntry> *l);
+	void removeMasks(KviMaskEditor *ed,KviPointerList<KviMaskEntry> *l);
 	void toggleToolButtons();
 protected:
 	virtual void preprocessMessage(QString & szMessage);
diff --git a/src/kvirc/ui/kvi_console.cpp b/src/kvirc/ui/kvi_console.cpp
index 1d80df5a4..96eebbd20 100644
--- a/src/kvirc/ui/kvi_console.cpp
+++ b/src/kvirc/ui/kvi_console.cpp
@@ -277,7 +277,7 @@ void KviConsole::fillContextPopup(KviTalPopupMenu * p)
 	}
 }
 
-void KviConsole::completeChannel(const QString &word,KviPtrList<QString> * matches)
+void KviConsole::completeChannel(const QString &word,KviPointerList<QString> * matches)
 {
 	// FIXME: first look in our context ?
 	/*
@@ -297,7 +297,7 @@ void KviConsole::completeChannel(const QString &word,KviPtrList<QString> * match
 	}
 }
 
-void KviConsole::completeServer(const QString &word, KviPtrList<QString> * matches)
+void KviConsole::completeServer(const QString &word, KviPointerList<QString> * matches)
 {
 	for(QStringList::Iterator it = KVI_OPTION_STRINGLIST(KviOption_stringlistRecentServers).begin(); it != KVI_OPTION_STRINGLIST(KviOption_stringlistRecentServers).end(); ++it)
 	{
@@ -973,7 +973,7 @@ void KviConsole::resetAvatarForMatchingUsers(KviRegisteredUser * u)
 	QString szAvatar;
 	if(!u->getProperty("avatar",szAvatar))return;
 
-	KviDictIterator<KviIrcUserEntry> it(*(connection()->userDataBase()->dict()));
+	KviPointerHashTableIterator<QString,KviIrcUserEntry> it(*(connection()->userDataBase()->dict()));
 	while(KviIrcUserEntry * e = it.current())
 	{
 		if(e->hasHost())
diff --git a/src/kvirc/ui/kvi_console.h b/src/kvirc/ui/kvi_console.h
index 2326f8e7c..ef4cb5993 100644
--- a/src/kvirc/ui/kvi_console.h
+++ b/src/kvirc/ui/kvi_console.h
@@ -31,7 +31,7 @@
 #include "kvi_string.h"
 #include "kvi_irccontext.h"
 
-#include "kvi_list.h"
+#include "kvi_pointerlist.h"
 
 #include <time.h>
 #include <qcombobox.h>
@@ -184,8 +184,8 @@ public:
 	const QString & statusString(){ return m_szStatusString; };
 	
 	// forwarders from KviIrcConnection
-	KVI_DEPRECATED KviPtrList<KviChannel> * channelList(){ return connection() ? connection()->channelList() : 0; };
-	KVI_DEPRECATED KviPtrList<KviQuery> * queryList(){ return connection() ? connection()->queryList() : 0; };
+	KVI_DEPRECATED KviPointerList<KviChannel> * channelList(){ return connection() ? connection()->channelList() : 0; };
+	KVI_DEPRECATED KviPointerList<KviQuery> * queryList(){ return connection() ? connection()->queryList() : 0; };
 	KVI_DEPRECATED unsigned int channelCount(){ return (connection() ? connection()->channelList()->count() : 0); };
 	KVI_DEPRECATED unsigned int queryCount(){ return (connection() ? connection()->queryList()->count() : 0); };
 	
@@ -195,8 +195,8 @@ public:
 
 	KviWindow * activeWindow();
 	// User db, connection related
-	void completeChannel(const QString &word,KviPtrList<QString> * matches);
-	void completeServer(const QString &word,KviPtrList<QString> * matches);
+	void completeChannel(const QString &word,KviPointerList<QString> * matches);
+	void completeServer(const QString &word,KviPointerList<QString> * matches);
 	void connectionAttached();
 	void connectionDetached();
 public slots:
diff --git a/src/kvirc/ui/kvi_cryptcontroller.cpp b/src/kvirc/ui/kvi_cryptcontroller.cpp
index 941355b69..70607abe5 100644
--- a/src/kvirc/ui/kvi_cryptcontroller.cpp
+++ b/src/kvirc/ui/kvi_cryptcontroller.cpp
@@ -41,7 +41,7 @@
 	#include "kvi_toolwindows_container.h"
 	
 	#include <qlayout.h>
-	#include "kvi_asciidict.h"
+	#include "kvi_pointerhashtable.h"
 
 	// kvi_app.cpp
 	extern KVIRC_API KviCryptEngineManager * g_pCryptEngineManager;
@@ -184,10 +184,10 @@
 
 	void KviCryptController::fillEngineList()
 	{
-		const KviDict<KviCryptEngineDescription> * a = g_pCryptEngineManager->engineDict();
+		const KviPointerHashTable<QString,KviCryptEngineDescription> * a = g_pCryptEngineManager->engineDict();
 		if(a)
 		{
-			KviDictIterator<KviCryptEngineDescription> it(*a);
+			KviPointerHashTableIterator<QString,KviCryptEngineDescription> it(*a);
 			while(it.current())
 			{
 				KviStr modName = it.current()->providerHandle ? ((KviModule *)(it.current()->providerHandle))->name() : "";
diff --git a/src/kvirc/ui/kvi_customtoolbar.cpp b/src/kvirc/ui/kvi_customtoolbar.cpp
index 6faa5bae4..fec8c16c3 100644
--- a/src/kvirc/ui/kvi_customtoolbar.cpp
+++ b/src/kvirc/ui/kvi_customtoolbar.cpp
@@ -167,7 +167,7 @@ void KviCustomToolBar::unfilterChild(QObject * o)
 void KviCustomToolBar::beginCustomize()
 {
 	if(m_pFilteredChildren)delete m_pFilteredChildren;
-	m_pFilteredChildren = new KviPtrDict<bool>;
+	m_pFilteredChildren = new KviPointerHashTable<void *,bool>;
 	m_pFilteredChildren->setAutoDelete(true);
 	// filter the events for all the children
 #ifdef COMPILE_USE_QT4
diff --git a/src/kvirc/ui/kvi_customtoolbar.h b/src/kvirc/ui/kvi_customtoolbar.h
index c7d0c671a..85f6be730 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 "kvi_ptrdict.h"
+#include "kvi_pointerhashtable.h"
 
 #ifdef COMPILE_ON_WINDOWS
 	#include "kvi_customtoolbardescriptor.h"
@@ -59,7 +59,7 @@ protected:
 	KviCustomToolBarDescriptor * m_pDescriptor;
 	QWidget * m_pMovedChild;
 	QWidget * m_pDraggedChild;
-	KviPtrDict<bool> * m_pFilteredChildren;
+	KviPointerHashTable<void *,bool> * m_pFilteredChildren;
 public:
 	KviCustomToolBarDescriptor * descriptor(){ return m_pDescriptor; };
 protected:
diff --git a/src/kvirc/ui/kvi_frame.cpp b/src/kvirc/ui/kvi_frame.cpp
index 362e6595c..3bd7501ca 100644
--- a/src/kvirc/ui/kvi_frame.cpp
+++ b/src/kvirc/ui/kvi_frame.cpp
@@ -110,10 +110,10 @@ KviFrame::KviFrame()
 
 	setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_KVIRC)));
 
-	m_pWinList  = new KviPtrList<KviWindow>;
+	m_pWinList  = new KviPointerList<KviWindow>;
 	m_pWinList->setAutoDelete(false);
 
-	m_pModuleExtensionToolBarList = new KviPtrList<KviMexToolBar>;
+	m_pModuleExtensionToolBarList = new KviPointerList<KviMexToolBar>;
 	m_pModuleExtensionToolBarList->setAutoDelete(false);
 
 	m_pActiveContext = 0;
@@ -1082,7 +1082,7 @@ void KviFrame::fillToolBarsPopup(KviTalPopupMenu * p)
 	}
 
 	// FIXME: Should this display "Hide %1" when the toolbar is already visible ?
-	KviDictIterator<KviCustomToolBarDescriptor> it2(*(KviCustomToolBarManager::instance()->descriptors()));
+	KviPointerHashTableIterator<QString,KviCustomToolBarDescriptor> it2(*(KviCustomToolBarManager::instance()->descriptors()));
 	if(it2.current())
 	{
 		if(cnt > 0)p->insertSeparator();
diff --git a/src/kvirc/ui/kvi_frame.h b/src/kvirc/ui/kvi_frame.h
index b645adbee..cce0ab0c1 100644
--- a/src/kvirc/ui/kvi_frame.h
+++ b/src/kvirc/ui/kvi_frame.h
@@ -35,7 +35,7 @@
 
 #include "kvi_tal_mainwindow.h"
 #include "kvi_qstring.h"
-#include "kvi_list.h"
+#include "kvi_pointerlist.h"
 
 class KviMenuBar;
 class KviMdiManager;
@@ -54,7 +54,7 @@ class KviTalPopupMenu;
 #include "kvi_accel.h" // we need this :/
 
 #ifdef COMPILE_ON_WINDOWS
-	// MSCV has problems with KviPtrList<KviWindow> otherwise
+	// MSCV has problems with KviPointerList<KviWindow> otherwise
 	#include "kvi_window.h"
 #endif
 
@@ -99,11 +99,11 @@ protected:
 	QSplitter                             * m_pSplitter;                     // the frame is splitted vertically and thus can host widgets
 	KviMenuBar                            * m_pMenuBar;                      // the main menu bar
 	KviMdiManager                         * m_pMdi;                          // the mdi manager widget (child of the splitter)
-	KviPtrList<KviMexToolBar>             * m_pModuleExtensionToolBarList;   // the module extension toolbars
+	KviPointerList<KviMexToolBar>             * m_pModuleExtensionToolBarList;   // the module extension toolbars
 	KviTaskBarBase                        * m_pTaskBar;                      // the taskbar
 	KviStatusBar                          * m_pStatusBar;
 	// the mdi workspace child windows
-	KviPtrList<KviWindow>                 * m_pWinList;                      // the main list of windows
+	KviPointerList<KviWindow>                 * m_pWinList;                      // the main list of windows
 	KviIrcContext                         * m_pActiveContext;                // the context of the m_pActiveWindow
 	// other
 	KviDockExtension                      * m_pDockExtension;                // the frame's dock extension: this should be prolly moved ?
@@ -124,7 +124,7 @@ public:
 	KviIrcConnection * activeConnection();
 	// The list of the windows belonging to this frame
 	// Note that the windows may be also undocked, but they are still owned by the frame
-	KviPtrList<KviWindow> * windowList() { return m_pWinList; };
+	KviPointerList<KviWindow> * windowList() { return m_pWinList; };
 	// Sets the specified window to be the active one
 	// Raises it and focuses it
 	void setActiveWindow(KviWindow *wnd);
diff --git a/src/kvirc/ui/kvi_input.cpp b/src/kvirc/ui/kvi_input.cpp
index f560af280..0e799eac8 100644
--- a/src/kvirc/ui/kvi_input.cpp
+++ b/src/kvirc/ui/kvi_input.cpp
@@ -63,7 +63,7 @@
 #include <qpainter.h>
 #include <qclipboard.h>
 #include <qstringlist.h>
-#include "kvi_list.h"
+#include "kvi_pointerlist.h"
 #include <qapplication.h>
 #include <qclipboard.h>
 #include <qmessagebox.h>
@@ -115,7 +115,7 @@ extern KviInputHistory * g_pInputHistory;
 
 KviInputHistory::KviInputHistory()
 {
-	m_pStringList = new KviPtrList<QString>;
+	m_pStringList = new KviPointerList<QString>;
 	m_pStringList->setAutoDelete(true);
 }
 
@@ -201,7 +201,7 @@ KviInputEditor::KviInputEditor(QWidget * par,KviWindow *wnd,KviUserListView * vi
 	m_bUpdatesEnabled      = true;
 	m_pKviWindow           = wnd;
 	m_pUserListView        = view;
-	m_pHistory             = new KviPtrList<QString>;
+	m_pHistory             = new KviPointerList<QString>;
 	m_pHistory->setAutoDelete(true);
 	m_bReadOnly = FALSE;
 	
@@ -872,8 +872,8 @@ void KviInputEditor::mousePressEvent(QMouseEvent *e)
 		g_pInputPopup->insertSeparator();
 		m_pIconMenu->clear();
 		
-		KviDict<KviTextIcon> * d = g_pTextIconManager->textIconDict();
-		KviDictIterator<KviTextIcon> it(*d);
+		KviPointerHashTable<QString,KviTextIcon> * d = g_pTextIconManager->textIconDict();
+		KviPointerHashTableIterator<QString,KviTextIcon> it(*d);
 		QStringList strList;
 		while(KviTextIcon * i = it.current())
 		{
@@ -1814,7 +1814,7 @@ void KviInputEditor::completion(bool bShift)
 			return;
 		}
 	}
-	KviPtrList<QString> tmp;
+	KviPointerList<QString> tmp;
 	tmp.setAutoDelete(true);
 
 	bool bIsCommand = false;
diff --git a/src/kvirc/ui/kvi_input.h b/src/kvirc/ui/kvi_input.h
index 2477db2f8..0fd4031be 100644
--- a/src/kvirc/ui/kvi_input.h
+++ b/src/kvirc/ui/kvi_input.h
@@ -31,7 +31,7 @@
 #include <qwidget.h>
 #include "kvi_tal_hbox.h"
 #include <qpixmap.h>
-#include "kvi_list.h"
+#include "kvi_pointerlist.h"
 
 #include "kvi_string.h"
 
@@ -63,10 +63,10 @@ public:
 	KviInputHistory();
 	~KviInputHistory();
 protected:
-	KviPtrList<QString> * m_pStringList;
+	KviPointerList<QString> * m_pStringList;
 public:
 	void add(QString * s);
-	KviPtrList<QString> * list(){ return m_pStringList; };
+	KviPointerList<QString> * list(){ return m_pStringList; };
 	void save(const char * filename);
 	void load(const char * filename);
 };
@@ -121,7 +121,7 @@ protected:
 	int                      m_iSelectionAnchorChar;
 
 	// History stuff
-	KviPtrList<QString>    * m_pHistory;
+	KviPointerList<QString>    * m_pHistory;
 	int                      m_iCurHistoryIdx;
 
 	KviStr                   m_szSaveTextBuffer;
diff --git a/src/kvirc/ui/kvi_irctoolbar.cpp b/src/kvirc/ui/kvi_irctoolbar.cpp
index c69b323c0..8950cc7b5 100644
--- a/src/kvirc/ui/kvi_irctoolbar.cpp
+++ b/src/kvirc/ui/kvi_irctoolbar.cpp
@@ -35,7 +35,7 @@
 #include "kvi_dynamictooltip.h"
 #include "kvi_ircurl.h"
 #include "kvi_internalcmd.h"
-#include "kvi_list.h"
+#include "kvi_pointerlist.h"
 #include "kvi_ircconnection.h"
 #include "kvi_ircconnectionuserinfo.h"
 #include "kvi_irccontext.h"
@@ -55,14 +55,14 @@
 #endif
 
 static QPixmap                                  * g_pIccMemBuffer               = 0;
-static KviPtrList<KviToolBarGraphicalApplet>    * g_pToolBarGraphicalAppletList = 0;
+static KviPointerList<KviToolBarGraphicalApplet>    * g_pToolBarGraphicalAppletList = 0;
 
 KviToolBarGraphicalApplet::KviToolBarGraphicalApplet(QWidget * par,const char * name)
 : QToolButton(par,name)
 {
 	if(!g_pToolBarGraphicalAppletList)
 	{
-		g_pToolBarGraphicalAppletList = new KviPtrList<KviToolBarGraphicalApplet>();
+		g_pToolBarGraphicalAppletList = new KviPointerList<KviToolBarGraphicalApplet>();
 		g_pToolBarGraphicalAppletList->setAutoDelete(false);
 		g_pIccMemBuffer = new QPixmap(1,1);
 	}
diff --git a/src/kvirc/ui/kvi_irctoolbar.h b/src/kvirc/ui/kvi_irctoolbar.h
index 67c97d59b..0ea2dd657 100644
--- a/src/kvirc/ui/kvi_irctoolbar.h
+++ b/src/kvirc/ui/kvi_irctoolbar.h
@@ -29,7 +29,7 @@
 #include "kvi_toolbar.h"
 #include "kvi_console.h"
 
-#include "kvi_list.h"
+#include "kvi_pointerlist.h"
 #include <qwidget.h>
 #include <qtoolbutton.h>
 #include "kvi_tal_widgetstack.h"
diff --git a/src/kvirc/ui/kvi_ircview.cpp b/src/kvirc/ui/kvi_ircview.cpp
index e35dc727a..211b5a6ea 100644
--- a/src/kvirc/ui/kvi_ircview.cpp
+++ b/src/kvirc/ui/kvi_ircview.cpp
@@ -348,7 +348,7 @@ KviIrcView::KviIrcView(QWidget *parent,KviFrame *pFrm,KviWindow *pWnd)
 	m_pWrappedBlockSelectionInfo  = new KviIrcViewWrappedBlockSelectionInfo;

 	

 

-	m_pMessagesStoppedWhileSelecting = new KviPtrList<KviIrcViewLine>;

+	m_pMessagesStoppedWhileSelecting = new KviPointerList<KviIrcViewLine>;

 	m_pMessagesStoppedWhileSelecting->setAutoDelete(false);

 

 	// say qt to avoid erasing on repaint

@@ -2825,15 +2825,15 @@ void KviIrcView::fastScroll(int lines)
 			l = l->pPrev;

 		} else lines = 0;

 	}

-

+
+#ifdef COMPILE_USE_QT4
+	scroll(0,-(heightToPaint-1));
+#else
 	bitBlt(this,1,1,this,1,heightToPaint,widgetWidth -2,widgetHeight - (heightToPaint + KVI_IRCVIEW_VERTICAL_BORDER));

 

 	QRect r(0,widgetHeight - (heightToPaint + KVI_IRCVIEW_VERTICAL_BORDER),

 			widgetWidth,heightToPaint + KVI_IRCVIEW_VERTICAL_BORDER);

 

-#if defined(COMPILE_USE_QT4) && defined(COMPILE_ON_WINDOWS) 

-	repaint(r);

-#else

 	QPaintEvent * e = new QPaintEvent(r);

 	paintEvent(e);

 	delete e;

diff --git a/src/kvirc/ui/kvi_ircview.h b/src/kvirc/ui/kvi_ircview.h
index 2a3fd6bfd..26097f0db 100644
--- a/src/kvirc/ui/kvi_ircview.h
+++ b/src/kvirc/ui/kvi_ircview.h
@@ -26,7 +26,7 @@
 
 #include "kvi_settings.h"
 #include "kvi_string.h"
-#include "kvi_list.h"
+#include "kvi_pointerlist.h"
 
 #include <qwidget.h>
 #include <qpixmap.h>      // needed
@@ -140,7 +140,7 @@ private:
 	bool                        m_bAcceptDrops;
 	int                         m_iUnprocessedPaintEventRequests;
 	bool                        m_bPostedPaintEventPending;
-	KviPtrList<KviIrcViewLine> * m_pMessagesStoppedWhileSelecting;
+	KviPointerList<KviIrcViewLine> * m_pMessagesStoppedWhileSelecting;
 	KviIrcView                * m_pMasterView;
 	QFontMetrics              * m_pFm;               // assume this valid only inside a paint event (may be 0 in other circumstances)
 	
diff --git a/src/kvirc/ui/kvi_maskeditor.cpp b/src/kvirc/ui/kvi_maskeditor.cpp
index 07dd6eec7..c9224a742 100644
--- a/src/kvirc/ui/kvi_maskeditor.cpp
+++ b/src/kvirc/ui/kvi_maskeditor.cpp
@@ -123,7 +123,7 @@ void KviMaskInputDialog::accept()
 	QDialog::accept();
 }
 
-KviMaskEditor::KviMaskEditor(QWidget * par,KviWindowToolPageButton* button,KviPtrList<KviMaskEntry> * maskList,char flag,const char * nam)
+KviMaskEditor::KviMaskEditor(QWidget * par,KviWindowToolPageButton* button,KviPointerList<KviMaskEntry> * maskList,char flag,const char * nam)
 : KviWindowToolWidget(par,button)
 {
 	bool isEnabled=1;
@@ -265,7 +265,7 @@ void KviMaskEditor::searchTextChanged ( const QString & text)
 
 void KviMaskEditor::removeClicked()
 {
-	KviPtrList<KviMaskEntry>  * l = new KviPtrList<KviMaskEntry>;
+	KviPointerList<KviMaskEntry>  * l = new KviPointerList<KviMaskEntry>;
 	l->setAutoDelete(true);
 	KviMaskItem * it = (KviMaskItem *)(m_pMaskBox->firstChild());
 	while(it)
diff --git a/src/kvirc/ui/kvi_maskeditor.h b/src/kvirc/ui/kvi_maskeditor.h
index d86a94fca..32b710f5a 100644
--- a/src/kvirc/ui/kvi_maskeditor.h
+++ b/src/kvirc/ui/kvi_maskeditor.h
@@ -29,7 +29,7 @@
 #include <qwidget.h>
 #include "kvi_tal_listview.h"
 #include <qpushbutton.h>
-#include "kvi_list.h"
+#include "kvi_pointerlist.h"
 
 #include "kvi_string.h"
 #include "kvi_toolwindows_container.h"
@@ -82,7 +82,7 @@ class KVIRC_API KviMaskEditor : public KviWindowToolWidget
 {
 	Q_OBJECT
 public:
-	KviMaskEditor(QWidget * par,KviWindowToolPageButton* button,KviPtrList<KviMaskEntry> * maskList,
+	KviMaskEditor(QWidget * par,KviWindowToolPageButton* button,KviPointerList<KviMaskEntry> * maskList,
 		char flag,const char * nam);
 	~KviMaskEditor();
 protected:
@@ -102,7 +102,7 @@ protected slots:
 	void listViewDoubleClicked( KviTalListViewItem * );
 	void searchTextChanged ( const QString & );
 signals:
-	void removeMasks(KviMaskEditor *,KviPtrList<KviMaskEntry> *);
+	void removeMasks(KviMaskEditor *,KviPointerList<KviMaskEntry> *);
 };
 
 #endif //_KVI_MASKEDITOR_H_
diff --git a/src/kvirc/ui/kvi_mdicaption.cpp b/src/kvirc/ui/kvi_mdicaption.cpp
index 37f90b2e5..e166edc40 100644
--- a/src/kvirc/ui/kvi_mdicaption.cpp
+++ b/src/kvirc/ui/kvi_mdicaption.cpp
@@ -40,7 +40,7 @@
 #include <qnamespace.h>
 #include <qapplication.h>
 #include <qfontmetrics.h>
-#include "kvi_list.h"
+#include "kvi_pointerlist.h"
 #include <qpixmap.h>
 #include <qstyle.h>
 #include <qpainter.h>
diff --git a/src/kvirc/ui/kvi_mdichild.cpp b/src/kvirc/ui/kvi_mdichild.cpp
index 5ac39122f..7581844c6 100644
--- a/src/kvirc/ui/kvi_mdichild.cpp
+++ b/src/kvirc/ui/kvi_mdichild.cpp
@@ -39,7 +39,7 @@
 #include <qnamespace.h>
 #include <qapplication.h>
 #include <qfontmetrics.h>
-#include "kvi_list.h"
+#include "kvi_pointerlist.h"
 #include <qpixmap.h>
 #include <qstyle.h>
 #include <qpainter.h>
diff --git a/src/kvirc/ui/kvi_mdimanager.cpp b/src/kvirc/ui/kvi_mdimanager.cpp
index e1789a8e9..872c0afe0 100644
--- a/src/kvirc/ui/kvi_mdimanager.cpp
+++ b/src/kvirc/ui/kvi_mdimanager.cpp
@@ -61,7 +61,7 @@ KviMdiManager::KviMdiManager(QWidget * parent,KviFrame * pFrm,const char * name)
 : KviTalScrollView(parent)
 {
 	setFrameShape(NoFrame);
-	m_pZ = new KviPtrList<KviMdiChild>;
+	m_pZ = new KviPointerList<KviMdiChild>;
 	m_pZ->setAutoDelete(true);
 
 	m_pFrm = pFrm;
@@ -799,7 +799,7 @@ void KviMdiManager::cascadeWindows()
 	if(g_pApp->closingDown())return;
 
 	int idx=0;
-	KviPtrList<KviMdiChild> list(*m_pZ);
+	KviPointerList<KviMdiChild> list(*m_pZ);
 	list.setAutoDelete(false);
 	while(!list.isEmpty())
 	{
@@ -827,7 +827,7 @@ void KviMdiManager::cascadeMaximized()
 	if(g_pApp->closingDown())return;
 	
 	int idx=0;
-	KviPtrList<KviMdiChild> list(*m_pZ);
+	KviPointerList<KviMdiChild> list(*m_pZ);
 
 	list.setAutoDelete(false);
 	while(!list.isEmpty())
@@ -858,7 +858,7 @@ void KviMdiManager::expandVertical()
 	g_pApp->sendPostedEvents();
 	if(g_pApp->closingDown())return;
 	
-	KviPtrList<KviMdiChild> list(*m_pZ);
+	KviPointerList<KviMdiChild> list(*m_pZ);
 	list.setAutoDelete(false);
 	while(!list.isEmpty())
 	{
@@ -884,7 +884,7 @@ void KviMdiManager::expandHorizontal()
 	g_pApp->sendPostedEvents();
 	if(g_pApp->closingDown())return;
 	
-	KviPtrList<KviMdiChild> list(*m_pZ);
+	KviPointerList<KviMdiChild> list(*m_pZ);
 	list.setAutoDelete(false);
 	while(!list.isEmpty())
 	{
@@ -902,7 +902,7 @@ void KviMdiManager::expandHorizontal()
 
 void KviMdiManager::minimizeAll()
 {
-	KviPtrList<KviMdiChild> list(*m_pZ);
+	KviPointerList<KviMdiChild> list(*m_pZ);
 	list.setAutoDelete(false);
     m_pFrm->setActiveWindow((KviWindow*)m_pFrm->firstConsole());
 	while(!list.isEmpty())
@@ -919,7 +919,7 @@ void KviMdiManager::minimizeAll()
 void KviMdiManager::restoreAll()
 {
 	int idx=0;
-	KviPtrList<KviMdiChild> list(*m_pZ);
+	KviPointerList<KviMdiChild> list(*m_pZ);
 	list.setAutoDelete(false);
 	while(!list.isEmpty())
 	{
diff --git a/src/kvirc/ui/kvi_mdimanager.h b/src/kvirc/ui/kvi_mdimanager.h
index 783e51a07..dba19b0ee 100644
--- a/src/kvirc/ui/kvi_mdimanager.h
+++ b/src/kvirc/ui/kvi_mdimanager.h
@@ -26,7 +26,7 @@
 
 
 #include "kvi_settings.h"
-#include "kvi_list.h"
+#include "kvi_pointerlist.h"
 
 #include <qwidget.h>
 #include <qframe.h>
@@ -74,7 +74,7 @@ public:
 	int getVisibleChildCount();
 	bool isInSDIMode();
 protected:
-	KviPtrList<KviMdiChild>  * m_pZ; // topmost child is the last in the list
+	KviPointerList<KviMdiChild>  * m_pZ; // topmost child is the last in the list
 
 	KviMenuBarToolButton     * m_pSdiRestoreButton;
 	KviMenuBarToolButton     * m_pSdiMinimizeButton;
diff --git a/src/kvirc/ui/kvi_menubar.cpp b/src/kvirc/ui/kvi_menubar.cpp
index 71601c68d..a219b204a 100644
--- a/src/kvirc/ui/kvi_menubar.cpp
+++ b/src/kvirc/ui/kvi_menubar.cpp
@@ -310,7 +310,7 @@ void KviMenuBar::setupToolsPopup()
 #endif
 
 	
-	KviPtrList<KviAction> list;
+	KviPointerList<KviAction> list;
 	KviActionManager::instance()->listActionsByCategory("tools",&list);
 	if(!list.isEmpty())
 	{
@@ -398,7 +398,7 @@ void KviMenuBar::addMenu(const QString &text,KviKvsPopupMenu * p,int index)
 {
 	if(!m_pScriptItemList)
 	{
-		m_pScriptItemList = new KviPtrList<KviScriptMenuBarItem>;
+		m_pScriptItemList = new KviPointerList<KviScriptMenuBarItem>;
 		m_pScriptItemList->setAutoDelete(true);
 	}/* else {
    		removeMenu(text);
diff --git a/src/kvirc/ui/kvi_menubar.h b/src/kvirc/ui/kvi_menubar.h
index 5045afafd..32cce8665 100644
--- a/src/kvirc/ui/kvi_menubar.h
+++ b/src/kvirc/ui/kvi_menubar.h
@@ -30,7 +30,7 @@
 #include "kvi_tal_menubar.h"
 #include "kvi_string.h"
 
-#include "kvi_list.h"
+#include "kvi_pointerlist.h"
 
 class KviFrame;
 class KviTalPopupMenu;
@@ -55,7 +55,7 @@ protected:
 	KviTalPopupMenu                       * m_pToolbarsPopup;
 	KviTalPopupMenu                       * m_pRecentServersPopup;
 	KviFrame                         * m_pFrm;
-	KviPtrList<KviScriptMenuBarItem> * m_pScriptItemList;
+	KviPointerList<KviScriptMenuBarItem> * m_pScriptItemList;
 	int                                m_iNumDefaultItems;
 	int                              * m_pDefaultItemId;
 protected:
diff --git a/src/kvirc/ui/kvi_modeeditor.cpp b/src/kvirc/ui/kvi_modeeditor.cpp
index 6db6eaf73..0bb34ab23 100644
--- a/src/kvirc/ui/kvi_modeeditor.cpp
+++ b/src/kvirc/ui/kvi_modeeditor.cpp
@@ -109,7 +109,7 @@ KviModeEditor::KviModeEditor(QWidget * par,KviWindowToolPageButton* button,const
 	int i = 1;
 	QString tmp;
 
-	m_pCheckBoxes = new KviPtrList<KviStyledCheckBox>;
+	m_pCheckBoxes = new KviPointerList<KviStyledCheckBox>;
 	m_pCheckBoxes->setAutoDelete(false);
 
 	
diff --git a/src/kvirc/ui/kvi_modeeditor.h b/src/kvirc/ui/kvi_modeeditor.h
index b84c115ab..49bc2f06c 100644
--- a/src/kvirc/ui/kvi_modeeditor.h
+++ b/src/kvirc/ui/kvi_modeeditor.h
@@ -32,7 +32,7 @@
 #include <qlabel.h>
 
 #include "kvi_string.h"
-#include "kvi_list.h"
+#include "kvi_pointerlist.h"
 #include "kvi_styled_controls.h"
 #include "kvi_toolwindows_container.h"
 
@@ -53,7 +53,7 @@ protected: // fields
 	KviStr m_szMode;
 	KviStr m_szKey;
 	KviStr m_szLimit;
-	KviPtrList<KviStyledCheckBox> * m_pCheckBoxes;
+	KviPointerList<KviStyledCheckBox> * m_pCheckBoxes;
 	KviStyledCheckBox * m_pLimitBox;
 	QLineEdit * m_pLimitEdit;
 	KviStyledCheckBox * m_pKeyBox;
diff --git a/src/kvirc/ui/kvi_optionswidget.cpp b/src/kvirc/ui/kvi_optionswidget.cpp
index ed275ec3e..3dda8fda9 100644
--- a/src/kvirc/ui/kvi_optionswidget.cpp
+++ b/src/kvirc/ui/kvi_optionswidget.cpp
@@ -59,7 +59,7 @@ KviOptionsWidget::KviOptionsWidget(QWidget * parent,const char * name,bool bSunk
 	m_pTabWidget = 0;
 	m_iResetFlags = 0;
 	m_iSelectors = 0;
-	m_pSelectorInterfaceList = new KviPtrList<KviSelectorInterface>;
+	m_pSelectorInterfaceList = new KviPointerList<KviSelectorInterface>;
 	m_pSelectorInterfaceList->setAutoDelete(false);
 }
 
diff --git a/src/kvirc/ui/kvi_optionswidget.h b/src/kvirc/ui/kvi_optionswidget.h
index c81cd4f10..dd6f28f97 100644
--- a/src/kvirc/ui/kvi_optionswidget.h
+++ b/src/kvirc/ui/kvi_optionswidget.h
@@ -29,7 +29,7 @@
 
 #include <qframe.h>
 #include <qlayout.h>
-#include "kvi_list.h"
+#include "kvi_pointerlist.h"
 #include <qlineedit.h>
 #include <kvi_tal_groupbox.h>
 #include <qtabwidget.h>
@@ -47,7 +47,7 @@ private:
 	QTabWidget                       * m_pTabWidget;
 	int                                m_iResetFlags;
 	int                                m_iSelectors;
-	KviPtrList<KviSelectorInterface> * m_pSelectorInterfaceList;
+	KviPointerList<KviSelectorInterface> * m_pSelectorInterfaceList;
 	static QString                     m_szBasicTipStart;
 	static QString                     m_szBasicTipEnd;
 public:
diff --git a/src/kvirc/ui/kvi_query.cpp b/src/kvirc/ui/kvi_query.cpp
index a2c4455ce..cbb3de024 100644
--- a/src/kvirc/ui/kvi_query.cpp
+++ b/src/kvirc/ui/kvi_query.cpp
@@ -404,7 +404,7 @@ void KviQuery::notifyCommonChannels(const QString &nick,const QString &user,cons
 
 	if(targetCount() > 0)
 	{
-		KviDictIterator<KviUserListEntry> it(*(m_pUserListView->entryDict()));
+		KviPointerHashTableIterator<QString,KviUserListEntry> it(*(m_pUserListView->entryDict()));
 		if(it.current())szName = it.currentKey();
 	}
 
diff --git a/src/kvirc/ui/kvi_query.h b/src/kvirc/ui/kvi_query.h
index 2603d1066..19659d0fa 100644
--- a/src/kvirc/ui/kvi_query.h
+++ b/src/kvirc/ui/kvi_query.h
@@ -31,7 +31,7 @@
 #include "kvi_userlistview.h"
 #include "kvi_themedlabel.h"
 
-#include "kvi_asciidict.h"
+#include "kvi_pointerhashtable.h"
 #include "kvi_tal_grid.h"
 
 class KviConsole;
diff --git a/src/kvirc/ui/kvi_selectors.cpp b/src/kvirc/ui/kvi_selectors.cpp
index 192f2dbc9..e619a3c2c 100644
--- a/src/kvirc/ui/kvi_selectors.cpp
+++ b/src/kvirc/ui/kvi_selectors.cpp
@@ -826,7 +826,7 @@ void KviCahnnelListSelector::addClicked()
 
 void KviCahnnelListSelector::removeClicked()
 {
-	KviPtrList<KviTalListViewItem> lst;
+	KviPointerList<KviTalListViewItem> lst;
 	KviTalListViewItemIterator it( m_pListView, KviTalListViewItemIterator::Selected );
 	while ( it.current() ) {
 		lst.append((KviTalListViewItem *)it.current() );
diff --git a/src/kvirc/ui/kvi_statusbar.cpp b/src/kvirc/ui/kvi_statusbar.cpp
index 16cecc0be..6bdab2d42 100644
--- a/src/kvirc/ui/kvi_statusbar.cpp
+++ b/src/kvirc/ui/kvi_statusbar.cpp
@@ -86,7 +86,7 @@ KviStatusBar::KviStatusBar(KviFrame * pFrame)
 	
 	m_pClickedApplet = 0;
 
-	m_pAppletDescriptors = new KviDict<KviStatusBarAppletDescriptor>;
+	m_pAppletDescriptors = new KviPointerHashTable<QString,KviStatusBarAppletDescriptor>;
 	m_pAppletDescriptors->setAutoDelete(true);
 
 	KviStatusBarClock::selfRegister(this);
@@ -95,10 +95,10 @@ KviStatusBar::KviStatusBar(KviFrame * pFrame)
 	KviStatusBarConnectionTimer::selfRegister(this);
 	KviStatusBarSeparator::selfRegister(this);
 
-	m_pAppletList = new KviPtrList<KviStatusBarApplet>;
+	m_pAppletList = new KviPointerList<KviStatusBarApplet>;
 	m_pAppletList->setAutoDelete(false);
 
-	m_pMessageQueue = new KviPtrList<KviStatusBarMessage>;
+	m_pMessageQueue = new KviPointerList<KviStatusBarMessage>;
 	m_pMessageQueue->setAutoDelete(true);
 
 	m_pMessageTimer = 0;
@@ -380,7 +380,7 @@ void KviStatusBar::appletsPopupAboutToShow()
 	// FIXME: could we cache the module results in some way ?
 	g_pModuleManager->loadModulesByCaps("statusbarapplet");
 	
-	KviDictIterator<KviStatusBarAppletDescriptor> it(*m_pAppletDescriptors);
+	KviPointerHashTableIterator<QString,KviStatusBarAppletDescriptor> it(*m_pAppletDescriptors);
 	while(KviStatusBarAppletDescriptor * d = it.current())
 	{
 		int id;
@@ -412,7 +412,7 @@ void KviStatusBar::appletsPopupActivated(int id)
 
 	if(!m_pAppletsPopup)return;
 	int par = m_pAppletsPopup->itemParameter(id);
-	KviDictIterator<KviStatusBarAppletDescriptor> it(*m_pAppletDescriptors);
+	KviPointerHashTableIterator<QString,KviStatusBarAppletDescriptor> it(*m_pAppletDescriptors);
 	while(KviStatusBarAppletDescriptor * d = it.current())
 	{
 		if(par == d->id())
diff --git a/src/kvirc/ui/kvi_statusbar.h b/src/kvirc/ui/kvi_statusbar.h
index 218afcdb2..0569e2760 100644
--- a/src/kvirc/ui/kvi_statusbar.h
+++ b/src/kvirc/ui/kvi_statusbar.h
@@ -25,11 +25,11 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_list.h"
+#include "kvi_pointerlist.h"
 #include "kvi_heapobject.h"
 
 #include <qstring.h>
-#include "kvi_dict.h"
+#include "kvi_pointerhashtable.h"
 #include <qstatusbar.h>
 
 class KviFrame;
@@ -71,11 +71,11 @@ public:
 	~KviStatusBar();
 protected:
 	KviFrame                                 * m_pFrame;
-	KviPtrList<KviStatusBarMessage>          * m_pMessageQueue;
+	KviPointerList<KviStatusBarMessage>          * m_pMessageQueue;
 	QTimer                                   * m_pMessageTimer;
 	QLabel                                   * m_pMessageLabel;
-	KviPtrList<KviStatusBarApplet>           * m_pAppletList;
-	KviDict<KviStatusBarAppletDescriptor>      * m_pAppletDescriptors;
+	KviPointerList<KviStatusBarApplet>           * m_pAppletList;
+	KviPointerHashTable<QString,KviStatusBarAppletDescriptor>      * m_pAppletDescriptors;
 	KviTalPopupMenu                               * m_pContextPopup;
 	KviTalPopupMenu                               * m_pAppletsPopup;
 	KviStatusBarApplet                       * m_pClickedApplet;
diff --git a/src/kvirc/ui/kvi_statusbarapplet.cpp b/src/kvirc/ui/kvi_statusbarapplet.cpp
index dfa0b2d86..11f0a194a 100644
--- a/src/kvirc/ui/kvi_statusbarapplet.cpp
+++ b/src/kvirc/ui/kvi_statusbarapplet.cpp
@@ -79,7 +79,7 @@ KviStatusBarAppletDescriptor::KviStatusBarAppletDescriptor(const QString &szVisi
 	m_szInternalName = szInternalName;
 	m_szPreloadModule = szPreloadModule;
 	m_pProc = pProc;
-	m_pAppletList = new KviPtrList<KviStatusBarApplet>;
+	m_pAppletList = new KviPointerList<KviStatusBarApplet>;
 	m_pAppletList->setAutoDelete(false);
 	if(!pixIcon.isNull())m_pIcon = new QPixmap(pixIcon);
 	else m_pIcon = 0;
diff --git a/src/kvirc/ui/kvi_statusbarapplet.h b/src/kvirc/ui/kvi_statusbarapplet.h
index 9affc6cd5..3e37fb67c 100644
--- a/src/kvirc/ui/kvi_statusbarapplet.h
+++ b/src/kvirc/ui/kvi_statusbarapplet.h
@@ -25,12 +25,12 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_list.h"
+#include "kvi_pointerlist.h"
 #include "kvi_heapobject.h"
 #include "kvi_statusbar.h"
 
 #include <qstring.h>
-#include "kvi_dict.h"
+#include "kvi_pointerhashtable.h"
 #include <qstatusbar.h>
 #include <qlabel.h>
 #include <qpixmap.h>
@@ -59,7 +59,7 @@ protected:
 	CreateAppletCallback             m_pProc;               // creation callback
 	QPixmap                        * m_pIcon;
 	int                              m_iId;
-	KviPtrList<KviStatusBarApplet> * m_pAppletList;
+	KviPointerList<KviStatusBarApplet> * m_pAppletList;
 public:
 	KviStatusBarAppletDescriptor(const QString &szVisibleName,
 					const QString &szInternalName,
diff --git a/src/kvirc/ui/kvi_taskbar.cpp b/src/kvirc/ui/kvi_taskbar.cpp
index 3917f23b2..2fdf96d04 100644
--- a/src/kvirc/ui/kvi_taskbar.cpp
+++ b/src/kvirc/ui/kvi_taskbar.cpp
@@ -440,7 +440,7 @@ void KviTaskBarToolTip::maybeTip(const QPoint &pnt)
 KviClassicTaskBar::KviClassicTaskBar()
 : KviTaskBarBase()
 {
-	m_pButtonList = new KviPtrList<KviTaskBarButton>;
+	m_pButtonList = new KviPointerList<KviTaskBarButton>;
 	m_pButtonList->setAutoDelete(true);
 
 	calcButtonHeight();
diff --git a/src/kvirc/ui/kvi_taskbar.h b/src/kvirc/ui/kvi_taskbar.h
index 24022a82c..823db275f 100644
--- a/src/kvirc/ui/kvi_taskbar.h
+++ b/src/kvirc/ui/kvi_taskbar.h
@@ -28,7 +28,7 @@
 
 #include "kvi_toolbar.h"
 
-#include "kvi_list.h"
+#include "kvi_pointerlist.h"
 #include <qframe.h>
 #include "kvi_tal_tooltip.h"
 #include "kvi_tal_listview.h"
@@ -147,7 +147,7 @@ public:
 	KviClassicTaskBar();
 	~KviClassicTaskBar();
 protected:
-	KviPtrList<KviTaskBarButton> * m_pButtonList;
+	KviPointerList<KviTaskBarButton> * m_pButtonList;
 	int                       m_iButtonHeight;
 	QWidget                 * m_pBase;
 protected:
diff --git a/src/kvirc/ui/kvi_texticonwin.cpp b/src/kvirc/ui/kvi_texticonwin.cpp
index a5b25a1b0..abd3f522b 100644
--- a/src/kvirc/ui/kvi_texticonwin.cpp
+++ b/src/kvirc/ui/kvi_texticonwin.cpp
@@ -73,8 +73,8 @@ KviTextIconWindow::~KviTextIconWindow()
 void KviTextIconWindow::fill()
 {
 	clear();
-	KviDict<KviTextIcon> * d = g_pTextIconManager->textIconDict();
-	KviDictIterator<KviTextIcon> it(*d);
+	KviPointerHashTable<QString,KviTextIcon> * d = g_pTextIconManager->textIconDict();
+	KviPointerHashTableIterator<QString,KviTextIcon> it(*d);
 	while(KviTextIcon * i = it.current())
 	{
 		QPixmap *pix = i->pixmap();
diff --git a/src/kvirc/ui/kvi_userlistview.cpp b/src/kvirc/ui/kvi_userlistview.cpp
index b39fc404d..cfd466c33 100644
--- a/src/kvirc/ui/kvi_userlistview.cpp
+++ b/src/kvirc/ui/kvi_userlistview.cpp
@@ -189,7 +189,7 @@ KviUserListView::KviUserListView(QWidget * parent,KviWindowToolPageButton* butto
 {
 	setAutoDelete(0);
 	m_pKviWindow  = pWnd;
-	m_pEntryDict  = new KviDict<KviUserListEntry>(dictSize,false);
+	m_pEntryDict  = new KviPointerHashTable<QString,KviUserListEntry>(dictSize,false);
 	m_pEntryDict->setAutoDelete(true);
 
 	m_pUsersLabel = new QLabel(this,"userslabel");
@@ -338,7 +338,7 @@ void KviUserListView::setMaskEntries(char type, int num)
 	updateUsersLabel();
 }
 
-void KviUserListView::completeNickBashLike(const QString &begin,KviPtrList<QString> *l,bool bAppendMask)
+void KviUserListView::completeNickBashLike(const QString &begin,KviPointerList<QString> *l,bool bAppendMask)
 {
 	KviUserListEntry * entry = m_pHeadItem;
 
@@ -943,7 +943,7 @@ void KviUserListView::appendSelectedNicknames(QString &buffer)
 }
 
 void KviUserListView::select(const QString& nick){
-	KviDictIterator<KviUserListEntry> it(*m_pEntryDict);
+	KviPointerHashTableIterator<QString,KviUserListEntry> it(*m_pEntryDict);
 	while(it.current())
 	{
 		((KviUserListEntry *)it.current())->m_bSelected = false;
@@ -1085,7 +1085,7 @@ void KviUserListView::updateUsersLabel()
 void KviUserListView::partAllButOne(const QString &whoNot)
 {
 	QStringList ll;
-	KviDictIterator<KviUserListEntry> it(*m_pEntryDict);
+	KviPointerHashTableIterator<QString,KviUserListEntry> it(*m_pEntryDict);
 	while(it.current())
 	{
 		if(!KviQString::equalCI(whoNot,it.currentKey()))
@@ -1100,7 +1100,7 @@ void KviUserListView::partAllButOne(const QString &whoNot)
 
 void KviUserListView::removeAllEntries()
 {
-	KviDictIterator<KviUserListEntry> it(*m_pEntryDict);
+	KviPointerHashTableIterator<QString,KviUserListEntry> it(*m_pEntryDict);
 	while(it.current())
 	{
 		m_pIrcUserDataBase->removeUser(it.currentKey(),
@@ -1440,7 +1440,6 @@ void KviUserListViewArea::paintEvent(QPaintEvent *ev)
 	}
 #endif
 
-
 	KviUserListEntry * e = m_pListView->m_pTopItem;
 
 	int theY = KVI_USERLIST_BORDER_WIDTH - m_iTopItemOffset;
@@ -1692,9 +1691,9 @@ void KviUserListViewArea::paintEvent(QPaintEvent *ev)
 				}
 				theX +=18;
 #ifdef COMPILE_USE_QT4
-	p.drawText(iAvatarAndTextX,theY,wdth - theX,fm.lineSpacing(),Qt::AlignLeft|Qt::AlignVCenter,e->m_szNick);
+				p.drawText(iAvatarAndTextX,theY,wdth - theX,fm.lineSpacing(),Qt::AlignLeft|Qt::AlignVCenter,e->m_szNick);
 #else
-	p.drawText(iAvatarAndTextX,theY,wdth - theX,m_pListView->m_iFontHeight,Qt::AlignLeft|Qt::AlignVCenter,e->m_szNick);
+				p.drawText(iAvatarAndTextX,theY,wdth - theX,m_pListView->m_iFontHeight,Qt::AlignLeft|Qt::AlignVCenter,e->m_szNick);
 #endif
 			} else {
 
@@ -1801,7 +1800,7 @@ void KviUserListViewArea::mousePressEvent(QMouseEvent *e)
 			if(!entry->m_bSelected){
 				entry->m_bSelected = true;
 				m_pListView->m_iSelectedCount=1;
-				KviDictIterator<KviUserListEntry> it(*(m_pListView->m_pEntryDict));
+				KviPointerHashTableIterator<QString,KviUserListEntry> it(*(m_pListView->m_pEntryDict));
 				while(it.current())
 				{
 					if(it.current()!=entry)
diff --git a/src/kvirc/ui/kvi_userlistview.h b/src/kvirc/ui/kvi_userlistview.h
index 02467edf0..33943fa45 100644
--- a/src/kvirc/ui/kvi_userlistview.h
+++ b/src/kvirc/ui/kvi_userlistview.h
@@ -35,8 +35,8 @@
 #include <time.h>
 #include "kvi_tal_tooltip.h"
 #include <qwidget.h>
-#include "kvi_list.h"
-#include "kvi_dict.h"
+#include "kvi_pointerlist.h"
+#include "kvi_pointerhashtable.h"
 #include "kvi_toolwindows_container.h"
 
 class QLabel;
@@ -130,7 +130,7 @@ public:
 	KviUserListView(QWidget * parent,KviWindowToolPageButton* button,KviIrcUserDataBase * db,KviWindow * pWnd,int dictSize = 5,const QString &label_text = QString::null,const char * name = 0);
 	~KviUserListView();
 protected:
-	KviDict<KviUserListEntry>         * m_pEntryDict;
+	KviPointerHashTable<QString,KviUserListEntry>         * m_pEntryDict;
 	KviUserListEntry                * m_pTopItem;
 	KviUserListEntry                * m_pHeadItem;
 	KviUserListEntry                * m_pTailItem;
@@ -166,7 +166,7 @@ public:
 	void updateArea();
 	void select(const QString&);
 	void applyOptions();
-	KviDict<KviUserListEntry> * entryDict(){ return m_pEntryDict; };
+	KviPointerHashTable<QString,KviUserListEntry> * entryDict(){ return m_pEntryDict; };
 	KviUserListEntry * firstItem(){ return m_pHeadItem; };
 	KviUserListEntry * itemAt(const QPoint &pnt,QRect * rct = 0);
 	bool itemVisible(KviUserListEntry * e);
@@ -221,7 +221,7 @@ public:
 	void emitRightClick();
 	void emitDoubleClick();
 	bool completeNickStandard(const QString &begin,const QString &skipAfter,QString &buffer,bool bAppendMask);
-	void completeNickBashLike(const QString &begin,KviPtrList<QString> * l,bool bAppendMask);
+	void completeNickBashLike(const QString &begin,KviPointerList<QString> * l,bool bAppendMask);
 };
 
 class KVIRC_API KviUserListViewArea : public QWidget
diff --git a/src/modules/action/libkviaction.cpp b/src/modules/action/libkviaction.cpp
index a731ab104..47c75983d 100644
--- a/src/modules/action/libkviaction.cpp
+++ b/src/modules/action/libkviaction.cpp
@@ -55,7 +55,7 @@ static bool action_kvs_cmd_list(KviKvsModuleCommandCall * c)
 {
 	KviWindow * pOut = c->window();
 
-	KviDictIterator<KviAction> it(*(KviActionManager::instance()->actions()));
+	KviPointerHashTableIterator<QString,KviAction> it(*(KviActionManager::instance()->actions()));
 	while(KviAction * a = it.current())
 	{
 		if(a->isKviUserActionNeverOverrideThis())
diff --git a/src/modules/actioneditor/actioneditor.cpp b/src/modules/actioneditor/actioneditor.cpp
index f4f345737..49bce0426 100644
--- a/src/modules/actioneditor/actioneditor.cpp
+++ b/src/modules/actioneditor/actioneditor.cpp
@@ -324,7 +324,7 @@ KviSingleActionEditor::KviSingleActionEditor(QWidget * par,KviActionEditor * ed)
 	g->setColStretch(1,1);
 
 
-	KviDictIterator<KviActionCategory> it(*(KviActionManager::instance()->categories()));
+	KviPointerHashTableIterator<QString,KviActionCategory> it(*(KviActionManager::instance()->categories()));
 	while(KviActionCategory * ac = it.current())
 	{
 		m_pCategoryCombo->insertItem(ac->visibleName() + " (" + ac->name() + ")");
@@ -693,7 +693,7 @@ KviActionEditor::KviActionEditor(QWidget * par)
 	KviActionEditorListViewItem * last = 0;
 	KviActionEditorListViewItem * first = 0;
 
-	KviDictIterator<KviAction> it(*(KviActionManager::instance()->actions()));
+	KviPointerHashTableIterator<QString,KviAction> it(*(KviActionManager::instance()->actions()));
 	while(KviAction * a = it.current())
 	{
 		if(a->isKviUserActionNeverOverrideThis())
@@ -776,7 +776,7 @@ void KviActionEditor::exportActions()
 
 void KviActionEditor::deleteActions()
 {
-	KviPtrList<KviActionEditorListViewItem> l;
+	KviPointerList<KviActionEditorListViewItem> l;
 	l.setAutoDelete(false);
 
 	KviActionEditorListViewItem * it = (KviActionEditorListViewItem *)m_pListView->firstChild();
diff --git a/src/modules/addon/libkviaddon.cpp b/src/modules/addon/libkviaddon.cpp
index 465402ca0..118d7b80f 100644
--- a/src/modules/addon/libkviaddon.cpp
+++ b/src/modules/addon/libkviaddon.cpp
@@ -135,10 +135,10 @@ static bool addon_kvs_fnc_version(KviKvsModuleFunctionCall * c)
 
 static bool addon_kvs_cmd_list(KviKvsModuleCommandCall * c)
 {
-	KviDict<KviKvsScriptAddon> * da = KviKvsScriptAddonManager::instance()->addonDict();
+	KviPointerHashTable<QString,KviKvsScriptAddon> * da = KviKvsScriptAddonManager::instance()->addonDict();
 
 	int cnt = 0;
-	KviDictIterator<KviKvsScriptAddon> it(*da);
+	KviPointerHashTableIterator<QString,KviKvsScriptAddon> it(*da);
 	while(KviKvsScriptAddon * a = it.current())
 	{
 		c->window()->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs("%cAddon id %Q, version %Q%c"),KVI_TEXT_BOLD,&(a->name()),&(a->version()),KVI_TEXT_BOLD);
diff --git a/src/modules/addon/managementdialog.cpp b/src/modules/addon/managementdialog.cpp
index 450c5c2a3..a0ec53f02 100644
--- a/src/modules/addon/managementdialog.cpp
+++ b/src/modules/addon/managementdialog.cpp
@@ -282,9 +282,9 @@ KviScriptManagementDialog::~KviScriptManagementDialog()
 void KviScriptManagementDialog::fillListView()

 {

 	m_pListView->clear();

-	KviDict<KviKvsScriptAddon> * d = KviKvsScriptAddonManager::instance()->addonDict();

+	KviPointerHashTable<QString,KviKvsScriptAddon> * d = KviKvsScriptAddonManager::instance()->addonDict();

 	if(!d)return;

-	KviDictIterator<KviKvsScriptAddon> it(*d);

+	KviPointerHashTableIterator<QString,KviKvsScriptAddon> it(*d);

 	KviScriptAddonListViewItem * item;

 	while(KviKvsScriptAddon * a = it.current())

 	{

diff --git a/src/modules/aliaseditor/aliaseditor.cpp b/src/modules/aliaseditor/aliaseditor.cpp
index af167f080..91f86d206 100644
--- a/src/modules/aliaseditor/aliaseditor.cpp
+++ b/src/modules/aliaseditor/aliaseditor.cpp
@@ -371,10 +371,10 @@ KviAliasNamespaceListViewItem * KviAliasEditor::createFullNamespaceItem(const QS
 
 void KviAliasEditor::oneTimeSetup()
 {
-	KviDict<KviKvsScript> * a = KviKvsAliasManager::instance()->aliasDict();
+	KviPointerHashTable<QString,KviKvsScript> * a = KviKvsAliasManager::instance()->aliasDict();
 	if(!a)return;
 
-	KviDictIterator<KviKvsScript> it(*a);
+	KviPointerHashTableIterator<QString,KviKvsScript> it(*a);
 
 	KviAliasListViewItem * item;
 	while(it.current())
@@ -577,7 +577,7 @@ void KviAliasEditor::exportSelected()
 	exportAliases(true);
 }
 
-void KviAliasEditor::exportSelectionInSinglesFiles(KviPtrList<KviAliasListViewItem> *l)
+void KviAliasEditor::exportSelectionInSinglesFiles(KviPointerList<KviAliasListViewItem> *l)
 {
 	if(!m_szDir.endsWith(QString(KVI_PATH_SEPARATOR)))m_szDir += KVI_PATH_SEPARATOR;
 	debug ("dir %s",m_szDir.latin1());
@@ -631,7 +631,7 @@ void KviAliasEditor::exportAliases(bool bSelectedOnly,bool bSingleFiles)
 {
 	saveLastEditedItem();
 	
-	KviPtrList<KviAliasListViewItem> l;
+	KviPointerList<KviAliasListViewItem> l;
 	l.setAutoDelete(false);
 
 	QString out;
@@ -715,7 +715,7 @@ void KviAliasEditor::loadProperties(KviConfig *cfg)
 	if(it)activateItem(it);
 }
 
-void KviAliasEditor::appendAliasItems(KviPtrList<KviAliasListViewItem> * l,KviAliasEditorListViewItem * pStartFrom,bool bSelectedOnly)
+void KviAliasEditor::appendAliasItems(KviPointerList<KviAliasListViewItem> * l,KviAliasEditorListViewItem * pStartFrom,bool bSelectedOnly)
 {
 	if(!pStartFrom)return;
 	if(pStartFrom->isAlias())
@@ -741,7 +741,7 @@ void KviAliasEditor::appendAliasItems(KviPtrList<KviAliasListViewItem> * l,KviAl
 	appendAliasItems(l,(KviAliasEditorListViewItem *)(pStartFrom->nextSibling()),bSelectedOnly);
 }
 
-void KviAliasEditor::appendNamespaceItems(KviPtrList<KviAliasListViewItem> * l,KviAliasEditorListViewItem * pStartFrom,bool bSelectedOnly)
+void KviAliasEditor::appendNamespaceItems(KviPointerList<KviAliasListViewItem> * l,KviAliasEditorListViewItem * pStartFrom,bool bSelectedOnly)
 {
 	if(!pStartFrom)return;
 	if(pStartFrom->isNamespace())
@@ -767,7 +767,7 @@ void KviAliasEditor::appendNamespaceItems(KviPtrList<KviAliasListViewItem> * l,K
 	appendNamespaceItems(l,(KviAliasEditorListViewItem *)(pStartFrom->nextSibling()),bSelectedOnly);
 }
 
-void KviAliasEditor::appendSelectedItems(KviPtrList<KviAliasEditorListViewItem> * l,KviAliasEditorListViewItem * pStartFrom,bool bIncludeChildrenOfSelected)
+void KviAliasEditor::appendSelectedItems(KviPointerList<KviAliasEditorListViewItem> * l,KviAliasEditorListViewItem * pStartFrom,bool bIncludeChildrenOfSelected)
 {
 	if(!pStartFrom)return;
 	if(pStartFrom->isSelected())
@@ -840,7 +840,7 @@ bool KviAliasEditor::removeItem(KviAliasEditorListViewItem *it,bool * pbYesToAll
 
 void KviAliasEditor::removeSelectedItems()
 {
-	KviPtrList<KviAliasEditorListViewItem> l;
+	KviPointerList<KviAliasEditorListViewItem> l;
 	l.setAutoDelete(false);
 	appendSelectedItems(&l,(KviAliasEditorListViewItem *)(m_pListView->firstChild()),false);
 
@@ -1069,7 +1069,7 @@ void KviAliasEditor::newNamespace()
 
 bool KviAliasEditor::aliasExists(QString &szFullItemName)
 {
-	KviPtrList<KviAliasListViewItem> l;
+	KviPointerList<KviAliasListViewItem> l;
 	l.setAutoDelete(false);
 
 	appendAliasItems(&l,(KviAliasEditorListViewItem *)(m_pListView->firstChild()),false);
@@ -1085,7 +1085,7 @@ bool KviAliasEditor::aliasExists(QString &szFullItemName)
 
 bool KviAliasEditor::namespaceExists(QString &szFullItemName)
 {
-	KviPtrList<KviAliasListViewItem> l;
+	KviPointerList<KviAliasListViewItem> l;
 	l.setAutoDelete(false);
 	
 	appendNamespaceItems(&l,(KviAliasEditorListViewItem *)(m_pListView->firstChild()),false);
@@ -1152,7 +1152,7 @@ void KviAliasEditor::renameItem()
 	}
 
 	// take child items, if any
-	KviPtrList<KviTalListViewItem> lChildren;
+	KviPointerList<KviTalListViewItem> lChildren;
 	lChildren.setAutoDelete(false);
 	KviTalListViewItem * it = m_pLastEditedItem->firstChild();
 	while(it)
diff --git a/src/modules/aliaseditor/aliaseditor.h b/src/modules/aliaseditor/aliaseditor.h
index fa69fb2d8..193d66df1 100644
--- a/src/modules/aliaseditor/aliaseditor.h
+++ b/src/modules/aliaseditor/aliaseditor.h
@@ -26,7 +26,7 @@
 
 #include "kvi_window.h"
 #include "kvi_string.h"
-#include "kvi_list.h"
+#include "kvi_pointerlist.h"
 
 
 #include <qwidget.h>
@@ -121,7 +121,7 @@ public:
 	//bool modified(){ return m_bModified; };
 	void commit();
 	void exportAliases(bool,bool=false);
-	void exportSelectionInSinglesFiles(KviPtrList<KviAliasListViewItem> *l);
+	void exportSelectionInSinglesFiles(KviPointerList<KviAliasListViewItem> *l);
 
 	void saveProperties(KviConfig *);
 	void loadProperties(KviConfig *);
@@ -151,9 +151,9 @@ protected:
 	void selectOneItem(KviTalListViewItem * it,KviTalListViewItem *pStartFrom);
 	void saveLastEditedItem();
 	void getUniqueItemName(KviAliasEditorListViewItem *item,QString &buffer,KviAliasEditorListViewItem::Type eType);
-	void appendSelectedItems(KviPtrList<KviAliasEditorListViewItem> * l,KviAliasEditorListViewItem * pStartFrom,bool bIncludeChildrenOfSelected = false);
-	void appendAliasItems(KviPtrList<KviAliasListViewItem> * l,KviAliasEditorListViewItem * pStartFrom,bool bSelectedOnly);
-	void appendNamespaceItems(KviPtrList<KviAliasListViewItem> * l,KviAliasEditorListViewItem * pStartFrom,bool bSelectedOnly);
+	void appendSelectedItems(KviPointerList<KviAliasEditorListViewItem> * l,KviAliasEditorListViewItem * pStartFrom,bool bIncludeChildrenOfSelected = false);
+	void appendAliasItems(KviPointerList<KviAliasListViewItem> * l,KviAliasEditorListViewItem * pStartFrom,bool bSelectedOnly);
+	void appendNamespaceItems(KviPointerList<KviAliasListViewItem> * l,KviAliasEditorListViewItem * pStartFrom,bool bSelectedOnly);
 	bool removeItem(KviAliasEditorListViewItem *it,bool * pbYesToAll,bool bDeleteEmptyTree);
 	void openParentItems(KviTalListViewItem * it);
 	void activateItem(KviTalListViewItem * it);
diff --git a/src/modules/avatar/libkviavatar.cpp b/src/modules/avatar/libkviavatar.cpp
index 8a1cc8dd7..30c181d76 100644
--- a/src/modules/avatar/libkviavatar.cpp
+++ b/src/modules/avatar/libkviavatar.cpp
@@ -39,7 +39,7 @@
 #include "kvi_ircconnectionuserinfo.h"
 #include "kvi_console.h"
 #include "kvi_filedialog.h"
-#include "kvi_list.h"
+#include "kvi_pointerlist.h"
 #include "kvi_frame.h"
 #include "kvi_sharedfiles.h"
 #include "kvi_out.h"
@@ -54,7 +54,7 @@
 #include "kvi_tal_hbox.h"
 #include <qlayout.h>
 
-static KviPtrList<KviAsyncAvatarSelectionDialog> * g_pAvatarSelectionDialogList = 0;
+static KviPointerList<KviAsyncAvatarSelectionDialog> * g_pAvatarSelectionDialogList = 0;
 extern KVIRC_API KviSharedFilesManager * g_pSharedFilesManager;
 
 KviAsyncAvatarSelectionDialog::KviAsyncAvatarSelectionDialog(QWidget * par,const QString &szInitialPath,KviIrcConnection * c)
@@ -546,7 +546,7 @@ static bool avatar_kvs_cmd_query(KviKvsModuleCommandCall * c)
 
 static bool avatar_module_init(KviModule * m)
 {
-	g_pAvatarSelectionDialogList = new KviPtrList<KviAsyncAvatarSelectionDialog>;
+	g_pAvatarSelectionDialogList = new KviPointerList<KviAsyncAvatarSelectionDialog>;
 	g_pAvatarSelectionDialogList->setAutoDelete(false);
 
 	KVSM_REGISTER_SIMPLE_COMMAND(m,"query",avatar_kvs_cmd_query);
diff --git a/src/modules/chan/libkvichan.cpp b/src/modules/chan/libkvichan.cpp
index 2373bf876..fb27c31b4 100644
--- a/src/modules/chan/libkvichan.cpp
+++ b/src/modules/chan/libkvichan.cpp
@@ -1200,7 +1200,7 @@ static bool chan_kvs_fnc_banlist(KviKvsModuleFunctionCall * c)
 
 	int idx = 0;
 
-	KviPtrList<KviMaskEntry> * l = ((KviChannel *)(c->window()))->banList();
+	KviPointerList<KviMaskEntry> * l = ((KviChannel *)(c->window()))->banList();
 
 	for(KviMaskEntry * e = l->first();e;e = l->next())
 	{
@@ -1243,7 +1243,7 @@ static bool chan_kvs_fnc_banexceptionlist(KviKvsModuleFunctionCall * c)
 
 	int idx = 0;
 
-	KviPtrList<KviMaskEntry> * l = ((KviChannel *)(c->window()))->banExceptionList();
+	KviPointerList<KviMaskEntry> * l = ((KviChannel *)(c->window()))->banExceptionList();
 
 	for(KviMaskEntry * e = l->first();e;e = l->next())
 	{
@@ -1286,7 +1286,7 @@ static bool chan_kvs_fnc_invitelist(KviKvsModuleFunctionCall * c)
 
 	int idx = 0;
 
-	KviPtrList<KviMaskEntry> * l = ((KviChannel *)(c->window()))->inviteList();
+	KviPointerList<KviMaskEntry> * l = ((KviChannel *)(c->window()))->inviteList();
 
 	for(KviMaskEntry * e = l->first();e;e = l->next())
 	{
@@ -1331,7 +1331,7 @@ static bool chan_kvs_fnc_matchban(KviKvsModuleFunctionCall * c)
 		return true;
 	}
 
-	KviPtrList<KviMaskEntry> * l = ((KviChannel *)(c->window()))->banList();
+	KviPointerList<KviMaskEntry> * l = ((KviChannel *)(c->window()))->banList();
 
 	for(KviMaskEntry * e = l->first();e;e = l->next())
 	{
@@ -1380,7 +1380,7 @@ static bool chan_kvs_fnc_matchbanexception(KviKvsModuleFunctionCall * c)
 		return true;
 	}
 
-	KviPtrList<KviMaskEntry> * l = ((KviChannel *)(c->window()))->banExceptionList();
+	KviPointerList<KviMaskEntry> * l = ((KviChannel *)(c->window()))->banExceptionList();
 
 	for(KviMaskEntry * e = l->first();e;e = l->next())
 	{
@@ -1429,7 +1429,7 @@ static bool chan_kvs_fnc_matchinvite(KviKvsModuleFunctionCall * c)
 		return true;
 	}
 
-	KviPtrList<KviMaskEntry> * l = ((KviChannel *)(c->window()))->inviteList();
+	KviPointerList<KviMaskEntry> * l = ((KviChannel *)(c->window()))->inviteList();
 
 	for(KviMaskEntry * e = l->first();e;e = l->next())
 	{
diff --git a/src/modules/channelsjoin/channelsjoinwindow.cpp b/src/modules/channelsjoin/channelsjoinwindow.cpp
index 00f138597..0954e7437 100644
--- a/src/modules/channelsjoin/channelsjoinwindow.cpp
+++ b/src/modules/channelsjoin/channelsjoinwindow.cpp
@@ -182,10 +182,10 @@ void KviChannelsJoinWindow::fillListView()
 	par = new KviTalListViewItem(m_pListView,__tr2qs("Registered Channels"));
 	par->setOpen(true);
 
-	KviAsciiDict<KviRegisteredChannelList> * d = g_pRegisteredChannelDataBase->channelDict();
+	KviPointerHashTable<const char *,KviRegisteredChannelList> * d = g_pRegisteredChannelDataBase->channelDict();
 	if(d)
 	{
-		KviAsciiDictIterator<KviRegisteredChannelList> it(*d);
+		KviPointerHashTableIterator<const char *,KviRegisteredChannelList> it(*d);
 		while(it.current())
 		{
 			chld = new KviTalListViewItem(par,it.currentKey());
diff --git a/src/modules/clock/libkviclock.cpp b/src/modules/clock/libkviclock.cpp
index 08e02a66d..e724c0372 100644
--- a/src/modules/clock/libkviclock.cpp
+++ b/src/modules/clock/libkviclock.cpp
@@ -28,7 +28,7 @@
 #include "kvi_frame.h"
 #include "kvi_locale.h"
 
-#include "kvi_list.h"
+#include "kvi_pointerlist.h"
 #include <qbitmap.h>
 #include <qtooltip.h>
 #include <qpainter.h>
@@ -85,7 +85,7 @@ extern QPixmap                 * g_pIccMemBuffer;
 //extern HANDLE                      g_hIccMemBuffer;
 
 
-static KviPtrList<KviClockDisplay> * g_pClockWidgetList;
+static KviPointerList<KviClockDisplay> * g_pClockWidgetList;
 
 static QBitmap * g_pClockBitmap = 0;
 
@@ -212,7 +212,7 @@ static bool clock_module_init(KviModule *m)
 	g_pClockBitmap = new QBitmap();
 	QPixmap pix(kvi_clock_digits_xpm);
 	*g_pClockBitmap = pix;
-	g_pClockWidgetList = new KviPtrList<KviClockDisplay>;
+	g_pClockWidgetList = new KviPointerList<KviClockDisplay>;
 	g_pClockWidgetList->setAutoDelete(false);
 	m->registerCommand("add",clock_module_cmd_add);
 #endif
diff --git a/src/modules/codetester/codetester.cpp b/src/modules/codetester/codetester.cpp
index 075c13f40..cf0caf187 100644
--- a/src/modules/codetester/codetester.cpp
+++ b/src/modules/codetester/codetester.cpp
@@ -41,7 +41,7 @@
 #include <qtoolbutton.h>
 #include "kvi_tal_popupmenu.h"
 
-extern KviPtrList<KviCodeTesterWindow> * g_pCodeTesterWindowList;
+extern KviPointerList<KviCodeTesterWindow> * g_pCodeTesterWindowList;
 
 
 
diff --git a/src/modules/codetester/libkvicodetester.cpp b/src/modules/codetester/libkvicodetester.cpp
index 849c2fadb..0c4dad576 100644
--- a/src/modules/codetester/libkvicodetester.cpp
+++ b/src/modules/codetester/libkvicodetester.cpp
@@ -25,11 +25,11 @@
 #include "kvi_module.h"
 #include "kvi_locale.h"
 #include "kvi_frame.h"
-#include "kvi_list.h"
+#include "kvi_pointerlist.h"
 
 #include "codetester.h"
 
-KviPtrList<KviCodeTesterWindow> * g_pCodeTesterWindowList = 0;
+KviPointerList<KviCodeTesterWindow> * g_pCodeTesterWindowList = 0;
 
 
 /*
@@ -58,7 +58,7 @@ static bool codetester_module_init(KviModule * m)
 {
 	KVSM_REGISTER_SIMPLE_COMMAND(m,"open",codetester_kvs_cmd_open);
 
-	g_pCodeTesterWindowList = new KviPtrList<KviCodeTesterWindow>();
+	g_pCodeTesterWindowList = new KviPointerList<KviCodeTesterWindow>();
 	g_pCodeTesterWindowList->setAutoDelete(false);
 	return true;
 }
diff --git a/src/modules/config/libkviconfig.cpp b/src/modules/config/libkviconfig.cpp
index 5942a0447..ef1c5b4b6 100644
--- a/src/modules/config/libkviconfig.cpp
+++ b/src/modules/config/libkviconfig.cpp
@@ -29,9 +29,9 @@
 #include "kvi_app.h"
 #include "kvi_locale.h"
 
-#include "kvi_dict.h"
+#include "kvi_pointerhashtable.h"
 
-static KviDict<KviConfig> * g_pConfigDict = 0;
+static KviPointerHashTable<QString,KviConfig> * g_pConfigDict = 0;
 static int g_iNextConfigId = 0;
 
 /*
@@ -107,7 +107,7 @@ static bool config_kvs_fnc_open(KviKvsModuleFunctionCall * c)
 	if(KviFileUtils::isAbsolutePath(szFile))szAbsFile = szFile;
 	else g_pApp->getLocalKvircDirectory(szAbsFile,KviApp::ConfigScripts,szFile,true);
 
-	KviDictIterator<KviConfig> it(*g_pConfigDict);
+	KviPointerHashTableIterator<QString,KviConfig> it(*g_pConfigDict);
 	while(it.current())
 	{
 		if(KviQString::equalCI(it.current()->fileName(),szAbsFile))
@@ -163,7 +163,7 @@ static bool config_kvs_fnc_id(KviKvsModuleFunctionCall * c)
 	if(KviFileUtils::isAbsolutePath(szFile))szAbsFile = szFile;
 	else g_pApp->getLocalKvircDirectory(szAbsFile,KviApp::ConfigScripts,szFile,true);
 
-	KviDictIterator<KviConfig> it(*g_pConfigDict);
+	KviPointerHashTableIterator<QString,KviConfig> it(*g_pConfigDict);
 	while(it.current())
 	{
 		if(KviQString::equalCI(it.current()->fileName(),szAbsFile))
@@ -489,7 +489,7 @@ static bool config_kvs_fnc_filelist(KviKvsModuleFunctionCall * c)
 	KviKvsArray* pArray = new KviKvsArray();
 	int id=0;
 	
-	KviDictIterator<KviConfig> it(*g_pConfigDict);
+	KviPointerHashTableIterator<QString,KviConfig> it(*g_pConfigDict);
 	while(it.current())
 	{
 		pArray->set(id++, new KviKvsVariant(it.currentKey()));
@@ -830,7 +830,7 @@ static bool config_kvs_cmd_setsection(KviKvsModuleCommandCall * c)
 
 static bool config_module_init(KviModule * m)
 {
-	g_pConfigDict = new KviDict<KviConfig>;
+	g_pConfigDict = new KviPointerHashTable<QString,KviConfig>;
 	g_pConfigDict->setAutoDelete(true);
 
 	KVSM_REGISTER_FUNCTION(m,"open",config_kvs_fnc_open);
diff --git a/src/modules/context/libkvicontext.cpp b/src/modules/context/libkvicontext.cpp
index f205b5930..c97c7cebe 100644
--- a/src/modules/context/libkvicontext.cpp
+++ b/src/modules/context/libkvicontext.cpp
@@ -342,7 +342,7 @@ static bool context_kvs_fnc_list(KviKvsModuleFunctionCall * c)
 {
 	KviKvsArray * pArray = new KviKvsArray();
 
-	KviPtrList<KviWindow> * pWinList = g_pFrame->windowList();
+	KviPointerList<KviWindow> * pWinList = g_pFrame->windowList();
 	int idx = 0;
 	for(KviWindow * pWnd = pWinList->first();pWnd;pWnd = pWinList->next())
 	{
diff --git a/src/modules/dcc/broker.cpp b/src/modules/dcc/broker.cpp
index 02ab19886..0212adac4 100644
--- a/src/modules/dcc/broker.cpp
+++ b/src/modules/dcc/broker.cpp
@@ -54,13 +54,13 @@ KviDccBroker::KviDccBroker()
 {
 	KviDccFileTransfer::init();
 
-	m_pBoxList = new KviPtrList<KviDccBox>;
+	m_pBoxList = new KviPointerList<KviDccBox>;
 	m_pBoxList->setAutoDelete(false);
 
-	m_pDccWindowList = new KviPtrList<KviWindow>;
+	m_pDccWindowList = new KviPointerList<KviWindow>;
 	m_pDccWindowList->setAutoDelete(false);
 
-	m_pZeroPortTags = new KviDict<KviDccZeroPortTag>(17);
+	m_pZeroPortTags = new KviPointerHashTable<QString,KviDccZeroPortTag>(17);
 	m_pZeroPortTags->setAutoDelete(true);
 }
 
diff --git a/src/modules/dcc/broker.h b/src/modules/dcc/broker.h
index c1f253849..dd61cbd6f 100644
--- a/src/modules/dcc/broker.h
+++ b/src/modules/dcc/broker.h
@@ -33,10 +33,10 @@
 #endif
 
 #include "kvi_string.h"
-#include "kvi_list.h"
+#include "kvi_pointerlist.h"
 #include "kvi_sparser.h"
 
-#include "kvi_dict.h"
+#include "kvi_pointerhashtable.h"
 #include <qdatetime.h>
 #include <qobject.h>
 
@@ -63,9 +63,9 @@ public:
 	KviDccBroker();
 	~KviDccBroker();
 protected:
-	KviPtrList<KviDccBox>         * m_pBoxList;
-	KviPtrList<KviWindow>         * m_pDccWindowList;
-	KviDict<KviDccZeroPortTag>      * m_pZeroPortTags;
+	KviPointerList<KviDccBox>         * m_pBoxList;
+	KviPointerList<KviWindow>         * m_pDccWindowList;
+	KviPointerHashTable<QString,KviDccZeroPortTag>      * m_pZeroPortTags;
 public:
 	KviDccZeroPortTag * addZeroPortTag();
 	KviDccZeroPortTag * findZeroPortTag(const QString &szTag);
diff --git a/src/modules/dcc/canvas.h b/src/modules/dcc/canvas.h
index 2e993a25e..10a0d72ee 100644
--- a/src/modules/dcc/canvas.h
+++ b/src/modules/dcc/canvas.h
@@ -33,7 +33,7 @@
 #include "window.h"
 #include "thread.h"
 
-#include "kvi_list.h"
+#include "kvi_pointerlist.h"
 
 
 
diff --git a/src/modules/dcc/chat.cpp b/src/modules/dcc/chat.cpp
index a0cb686ba..d629b3d14 100644
--- a/src/modules/dcc/chat.cpp
+++ b/src/modules/dcc/chat.cpp
@@ -539,7 +539,7 @@ void KviDccChat::connected()
 KviDccChatThread::KviDccChatThread(KviWindow *wnd,kvi_socket_t fd)
 : KviDccThread(wnd,fd)
 {
-	m_pOutBuffers = new KviPtrList<KviDataBuffer>;
+	m_pOutBuffers = new KviPointerList<KviDataBuffer>;
 	m_pOutBuffers->setAutoDelete(true);
 }
 
diff --git a/src/modules/dcc/chat.h b/src/modules/dcc/chat.h
index e44270828..d309d1482 100644
--- a/src/modules/dcc/chat.h
+++ b/src/modules/dcc/chat.h
@@ -32,7 +32,7 @@
 #include "descriptor.h"
 #include "thread.h"
 
-#include "kvi_list.h"
+#include "kvi_pointerlist.h"
 
 #ifdef COMPILE_SSL_SUPPORT
 	class KviSSL;
@@ -44,7 +44,7 @@ public:
 	KviDccChatThread(KviWindow * wnd,kvi_socket_t fd);
 	~KviDccChatThread();
 protected:
-	KviPtrList<KviDataBuffer>    * m_pOutBuffers;
+	KviPointerList<KviDataBuffer>    * m_pOutBuffers;
 protected:
 	virtual void run();
 	bool tryFlushOutBuffers();
diff --git a/src/modules/dcc/descriptor.cpp b/src/modules/dcc/descriptor.cpp
index 38adb65a3..261500a35 100644
--- a/src/modules/dcc/descriptor.cpp
+++ b/src/modules/dcc/descriptor.cpp
@@ -35,9 +35,9 @@
 
 
 static unsigned int g_uNextDescriptorId = 1; // we use 0 as an invalid descriptor id
-static KviIntDict<KviDccDescriptor> * g_pDescriptorDict = 0;
+static KviPointerHashTable<int,KviDccDescriptor> * g_pDescriptorDict = 0;
 
-KviIntDict<KviDccDescriptor> * KviDccDescriptor::descriptorDict()
+KviPointerHashTable<int,KviDccDescriptor> * KviDccDescriptor::descriptorDict()
 {
 	return g_pDescriptorDict;
 }
@@ -62,7 +62,7 @@ KviDccDescriptor::KviDccDescriptor(KviConsole * pConsole)
 	
 	if(!g_pDescriptorDict)
 	{
-		g_pDescriptorDict = new KviIntDict<KviDccDescriptor>;
+		g_pDescriptorDict = new KviPointerHashTable<int,KviDccDescriptor>;
 		g_pDescriptorDict->setAutoDelete(false);
 	}
 	g_pDescriptorDict->replace((long)m_uId,this);
diff --git a/src/modules/dcc/descriptor.h b/src/modules/dcc/descriptor.h
index e08ff6015..ec6bee789 100644
--- a/src/modules/dcc/descriptor.h
+++ b/src/modules/dcc/descriptor.h
@@ -27,7 +27,7 @@
 #include "kvi_string.h"
 #include "kvi_console.h"
 
-#include "kvi_intdict.h"
+#include "kvi_pointerhashtable.h"
 
 
 class KviDccWindow;
@@ -71,7 +71,7 @@ public:
 	unsigned int id() const { return m_uId; };
 	const QString & idString() const { return m_szId; };
 	static KviDccDescriptor * find(unsigned int uId);
-	static KviIntDict<KviDccDescriptor> * descriptorDict();
+	static KviPointerHashTable<int,KviDccDescriptor> * descriptorDict();
 
 	void triggerCreationEvent(); // this MUST be called by the creator of the descriptor!
 //private:
diff --git a/src/modules/dcc/libkvidcc.cpp b/src/modules/dcc/libkvidcc.cpp
index 992701a09..e5bebbb26 100644
--- a/src/modules/dcc/libkvidcc.cpp
+++ b/src/modules/dcc/libkvidcc.cpp
@@ -2601,10 +2601,10 @@ static bool dcc_kvs_fnc_sessionList(KviKvsModuleFunctionCall * c)
 	KviKvsArray * a = new KviKvsArray();
 	c->returnValue()->setArray(a);
 
-	KviIntDict<KviDccDescriptor> * dict = KviDccDescriptor::descriptorDict();
+	KviPointerHashTable<int,KviDccDescriptor> * dict = KviDccDescriptor::descriptorDict();
 	if(!dict)return true;
 
-	KviIntDictIterator<KviDccDescriptor> it(*dict);
+	KviPointerHashTableIterator<int,KviDccDescriptor> it(*dict);
 
 	int idx = 0;
 	
diff --git a/src/modules/dcc/send.cpp b/src/modules/dcc/send.cpp
index ba4f79f49..19f907da3 100644
--- a/src/modules/dcc/send.cpp
+++ b/src/modules/dcc/send.cpp
@@ -87,7 +87,7 @@ extern KviDccBroker * g_pDccBroker;
 extern KVIRC_API KviMediaManager * g_pMediaManager; // kvi_app.cpp
 
 
-static KviPtrList<KviDccFileTransfer> * g_pDccFileTransfers = 0;
+static KviPointerList<KviDccFileTransfer> * g_pDccFileTransfers = 0;
 static QPixmap * g_pDccFileTransferIcon = 0;
 
 //#warning "The events that have a KviStr data pointer should become real classes, that take care of deleting the data pointer!"
@@ -1354,7 +1354,7 @@ QString KviDccFileTransfer::tipText()
 void KviDccFileTransfer::init()
 {
 	if(g_pDccFileTransfers)return;
-	g_pDccFileTransfers = new KviPtrList<KviDccFileTransfer>;
+	g_pDccFileTransfers = new KviPointerList<KviDccFileTransfer>;
 	g_pDccFileTransfers->setAutoDelete(false);
 
 	QPixmap * pix = g_pIconManager->getImage("kvi_dccfiletransfericons.png");
diff --git a/src/modules/dcc/send.h b/src/modules/dcc/send.h
index 81276820b..c083ce4af 100644
--- a/src/modules/dcc/send.h
+++ b/src/modules/dcc/send.h
@@ -33,7 +33,7 @@
 
 #include "kvi_sockettype.h"
 
-#include "kvi_list.h"
+#include "kvi_pointerlist.h"
 #include <qlabel.h>
 #include <qprogressbar.h>
 #include "kvi_tal_popupmenu.h"
diff --git a/src/modules/dcc/thread.h b/src/modules/dcc/thread.h
index cff7871a9..91b46f314 100644
--- a/src/modules/dcc/thread.h
+++ b/src/modules/dcc/thread.h
@@ -26,7 +26,7 @@
 #include "kvi_thread.h"
 #include "kvi_sockettype.h"
 
-#include "kvi_list.h"
+#include "kvi_pointerlist.h"
 
 #include <qobject.h>
 
diff --git a/src/modules/dcc/voice.h b/src/modules/dcc/voice.h
index bfbe62ac0..fcd8b5978 100644
--- a/src/modules/dcc/voice.h
+++ b/src/modules/dcc/voice.h
@@ -174,7 +174,7 @@ protected:
 	QString m_szIp;
 	unsigned short m_uPort;
 	QString m_szNick;
-	KviPtrList<KviVoiceParty> * m_pChildrenTree;
+	KviPointerList<KviVoiceParty> * m_pChildrenTree;
 public:
 	const QString & ip(){ return m_szIp; };
 	unsigned short port(){ return m_uPort; };
@@ -198,7 +198,7 @@ void KviVoiceParty::addChild(KviVoiceParty * pChild)
 {
 	if(!m_pChildrenTree)
 	{
-		m_pChildrenTree = new KviPtrList<KviVoiceParty>;
+		m_pChildrenTree = new KviPointerList<KviVoiceParty>;
 		m_pChildrenTree->setAutoDelete(true);
 	}
 	m_pChildrenTree->append(pChild);
@@ -314,8 +314,8 @@ public:
 	KviVoiceConference();
 	~KviVoiceConference();
 public:
-	KviPtrList<KviVoiceLink> * m_pLinks;
-	KviDict<KviVoiceLink> * 
+	KviPointerList<KviVoiceLink> * m_pLinks;
+	KviPointerHashTable<QString,KviVoiceLink> * 
 	SOCKET m_hUdpSocket;
 	QString m_szLastError;
 	
@@ -332,7 +332,7 @@ protected:
 
 KviVoiceConference::KviVoiceConference()
 {
-	m_pLinks = new KviPtrList<KviVoiceLink>;
+	m_pLinks = new KviPointerList<KviVoiceLink>;
 	m_pLinks->setAutoDelete(true);
 }
 
diff --git a/src/modules/dialog/libkvidialog.cpp b/src/modules/dialog/libkvidialog.cpp
index 3e4e24240..6fbb81912 100644
--- a/src/modules/dialog/libkvidialog.cpp
+++ b/src/modules/dialog/libkvidialog.cpp
@@ -51,7 +51,7 @@
 #include "kvi_kvs_script.h"
 #include "kvi_msgbox.h"
 
-static KviPtrList<QWidget> * g_pDialogModuleDialogList;
+static KviPointerList<QWidget> * g_pDialogModuleDialogList;
 
 KviKvsCallbackMessageBox::KviKvsCallbackMessageBox(
 		const QString &szCaption,
@@ -878,7 +878,7 @@ static bool dialog_module_fnc_textline(KviModule *m,KviCommand *c,KviParameterLi
 
 static bool dialog_module_init(KviModule * m)
 {
-	g_pDialogModuleDialogList = new KviPtrList<QWidget>;
+	g_pDialogModuleDialogList = new KviPointerList<QWidget>;
 	g_pDialogModuleDialogList->setAutoDelete(false);
 
 	KVSM_REGISTER_CALLBACK_COMMAND(m,"message",dialog_kvs_cmd_message);
diff --git a/src/modules/dockwidget/libkvidockwidget_qt3.cpp b/src/modules/dockwidget/libkvidockwidget_qt3.cpp
index 50e31cb04..9283907c2 100644
--- a/src/modules/dockwidget/libkvidockwidget_qt3.cpp
+++ b/src/modules/dockwidget/libkvidockwidget_qt3.cpp
@@ -89,8 +89,8 @@
 #endif
 #endif
 
-extern KVIRC_API KviAsciiDict<KviWindow> * g_pGlobalWindowDict;
-static KviPtrList<KviDockWidget> * g_pDockWidgetList = 0;
+extern KVIRC_API KviPointerHashTable<const char *,KviWindow> * g_pGlobalWindowDict;
+static KviPointerList<KviDockWidget> * g_pDockWidgetList = 0;
 
 static QPixmap * g_pDock1 = 0;
 static QPixmap * g_pDock2 = 0;
@@ -388,7 +388,7 @@ void KviDockWidget::doAway(int id)
 {
 	if(id<0)
 	{
-		KviAsciiDictIterator<KviWindow> it(*g_pGlobalWindowDict);
+		KviPointerHashTableIterator<const char *,KviWindow> it(*g_pGlobalWindowDict);
 		while(KviWindow * wnd = it.current())
 		{
 			if(wnd->type()==KVI_WINDOW_TYPE_CONSOLE)
@@ -433,7 +433,7 @@ void KviDockWidget::fillContextPopup()
 		
 		int iSeparator=m_pAwayPopup->insertSeparator();
 		
-		KviAsciiDictIterator<KviWindow> it(*g_pGlobalWindowDict);
+		KviPointerHashTableIterator<const char *,KviWindow> it(*g_pGlobalWindowDict);
 		bool bAllAway=1;
 		bool bAllUnaway=1;
 		int iNetCount=0;
@@ -802,7 +802,7 @@ static bool dockwidget_module_init(KviModule * m)
 #endif
 
 
-	g_pDockWidgetList = new KviPtrList<KviDockWidget>;
+	g_pDockWidgetList = new KviPointerList<KviDockWidget>;
 	g_pDockWidgetList->setAutoDelete(false);
 
 
diff --git a/src/modules/dockwidget/libkvidockwidget_qt4.cpp b/src/modules/dockwidget/libkvidockwidget_qt4.cpp
index 26d866fba..997c8c8a1 100644
--- a/src/modules/dockwidget/libkvidockwidget_qt4.cpp
+++ b/src/modules/dockwidget/libkvidockwidget_qt4.cpp
@@ -64,8 +64,8 @@
 #include <time.h>
 
 
-extern KVIRC_API KviAsciiDict<KviWindow> * g_pGlobalWindowDict;
-static KviPtrList<KviDockWidget> * g_pDockWidgetList = 0;
+extern KVIRC_API KviPointerHashTable<const char *,KviWindow> * g_pGlobalWindowDict;
+static KviPointerList<KviDockWidget> * g_pDockWidgetList = 0;
 
 static QPixmap * g_pDock1 = 0;
 static QPixmap * g_pDock2 = 0;
@@ -219,7 +219,7 @@ void KviDockWidget::doAway(int id)
 {
 	if(id<0)
 	{
-		KviAsciiDictIterator<KviWindow> it(*g_pGlobalWindowDict);
+		KviPointerHashTableIterator<const char *,KviWindow> it(*g_pGlobalWindowDict);
 		while(KviWindow * wnd = it.current())
 		{
 			if(wnd->type()==KVI_WINDOW_TYPE_CONSOLE)
@@ -264,7 +264,7 @@ void KviDockWidget::fillContextPopup()
 		
 		int iSeparator=m_pAwayPopup->insertSeparator();
 		
-		KviAsciiDictIterator<KviWindow> it(*g_pGlobalWindowDict);
+		KviPointerHashTableIterator<const char *,KviWindow> it(*g_pGlobalWindowDict);
 		bool bAllAway=1;
 		bool bAllUnaway=1;
 		int iNetCount=0;
@@ -636,7 +636,7 @@ static bool dockwidget_module_init(KviModule * m)
 	g_pDock3 = new QPixmap(buffer);
 
 
-	g_pDockWidgetList = new KviPtrList<KviDockWidget>;
+	g_pDockWidgetList = new KviPointerList<KviDockWidget>;
 	g_pDockWidgetList->setAutoDelete(false);
 
 
diff --git a/src/modules/editor/libkvieditor.cpp b/src/modules/editor/libkvieditor.cpp
index 3e027f261..2e60c651f 100644
--- a/src/modules/editor/libkvieditor.cpp
+++ b/src/modules/editor/libkvieditor.cpp
@@ -27,11 +27,11 @@
 
 KviModule * g_pEditorModulePointer = 0;
 
-KviPtrList<KviScriptEditorImplementation> * g_pScriptEditorWindowList = 0;
+KviPointerList<KviScriptEditorImplementation> * g_pScriptEditorWindowList = 0;
 
 static bool editor_module_init(KviModule * m)
 {
-	g_pScriptEditorWindowList = new KviPtrList<KviScriptEditorImplementation>;
+	g_pScriptEditorWindowList = new KviPointerList<KviScriptEditorImplementation>;
 	g_pScriptEditorWindowList->setAutoDelete(false);
 
 	g_pEditorModulePointer = m;
diff --git a/src/modules/editor/scripteditor.cpp b/src/modules/editor/scripteditor.cpp
index 2e7ab0d3e..70237ee07 100644
--- a/src/modules/editor/scripteditor.cpp
+++ b/src/modules/editor/scripteditor.cpp
@@ -47,7 +47,7 @@
 #include "kvi_qstring.h"
 #include "kvi_config.h"
 #include "kvi_module.h"
-#include "kvi_list.h"
+#include "kvi_pointerlist.h"
 //
 #include "kvi_app.h"
 #include "kvi_console.h"
@@ -58,7 +58,7 @@
 #include <qlayout.h>
 
 
-extern KviPtrList<KviScriptEditorImplementation> * g_pScriptEditorWindowList;
+extern KviPointerList<KviScriptEditorImplementation> * g_pScriptEditorWindowList;
 extern KviModule * g_pEditorModulePointer;
 
 
@@ -96,7 +96,7 @@ KviCompletionBox::KviCompletionBox(QWidget * parent = 0)
 void KviCompletionBox::updateContents(QString buffer)
 {
 	buffer=buffer.stripWhiteSpace();
-	KviPtrList<QString> list;
+	KviPointerList<QString> list;
 	clear();
 	
 	QString szModule;
@@ -167,7 +167,7 @@ void KviCompletionBox::keyPressEvent(QKeyEvent * e)
 KviScriptEditorWidgetColorOptions::KviScriptEditorWidgetColorOptions(QWidget * pParent)
 : QDialog(pParent)
 {
-	m_pSelectorInterfaceList = new KviPtrList<KviSelectorInterface>;
+	m_pSelectorInterfaceList = new KviPointerList<KviSelectorInterface>;
         m_pSelectorInterfaceList->setAutoDelete(false);
 	setCaption(__tr2qs_ctx("Preferences","editor"));
 	QGridLayout * g = new QGridLayout(this,3,3,4,4);
@@ -409,7 +409,7 @@ void KviScriptEditorWidget::contentsMousePressEvent(QMouseEvent *e)
 	buffer=this->text(para);
 	getWordOnCursor(buffer,index);
 	QString tmp=buffer;
-	KviPtrList<QString> l;
+	KviPointerList<QString> l;
 	if (tmp.left(1) == "$")
 	{	
 		tmp.remove(0,1);
@@ -441,7 +441,7 @@ bool KviScriptEditorWidget::contextSensitiveHelp() const
 
 	/*
 	QString tmp=buffer;
-	KviPtrList<QString> * l;
+	KviPointerList<QString> * l;
 	if(tmp.left(1) == "$")
 	{
 		tmp.remove(0,1);
diff --git a/src/modules/editor/scripteditor.h b/src/modules/editor/scripteditor.h
index 8a6147ef6..0d14ede29 100644
--- a/src/modules/editor/scripteditor.h
+++ b/src/modules/editor/scripteditor.h
@@ -38,9 +38,9 @@
 
 #include "kvi_tal_popupmenu.h"
 
-#include "kvi_list.h"
+#include "kvi_pointerlist.h"
 #include "kvi_selectors.h"
-typedef KviPtrList<int> ColumnList;
+typedef KviPointerList<int> ColumnList;
 
 class KviCompletionBox: public KviTalListBox
 {
@@ -113,7 +113,7 @@ public:
 	KviScriptEditorWidgetColorOptions(QWidget * pParent);
 	~KviScriptEditorWidgetColorOptions();
 private:
-	KviPtrList<KviSelectorInterface> * m_pSelectorInterfaceList;
+	KviPointerList<KviSelectorInterface> * m_pSelectorInterfaceList;
 protected:
 	KviColorSelector * addColorSelector(QWidget * pParent,const QString & txt,QColor * pOption,bool bEnabled);
 
diff --git a/src/modules/eventeditor/eventeditor.cpp b/src/modules/eventeditor/eventeditor.cpp
index 77e5b4361..a9d78c093 100644
--- a/src/modules/eventeditor/eventeditor.cpp
+++ b/src/modules/eventeditor/eventeditor.cpp
@@ -112,7 +112,7 @@ void KviEventEditor::oneTimeSetup()
 	{
 		KviKvsEvent * e = KviKvsEventManager::instance()->appEvent(i);
 		it = new KviEventListViewItem(m_pListView,i,e->name(),e->parameterDescription());
-		if(KviPtrList<KviKvsEventHandler> * l = e->handlers())
+		if(KviPointerList<KviKvsEventHandler> * l = e->handlers())
 		{
 			for(KviKvsEventHandler * s = l->first();s;s = l->next())
 			{
diff --git a/src/modules/filetransferwindow/filetransferwindow.cpp b/src/modules/filetransferwindow/filetransferwindow.cpp
index c607efcb8..93b8a6b33 100644
--- a/src/modules/filetransferwindow/filetransferwindow.cpp
+++ b/src/modules/filetransferwindow/filetransferwindow.cpp
@@ -238,7 +238,7 @@ void KviFileTransferWindow::tipRequest(KviDynamicToolTip * tip,const QPoint &pnt
 
 void KviFileTransferWindow::fillTransferView()
 {
-	KviPtrList<KviFileTransfer> * l = KviFileTransferManager::instance()->transferList();
+	KviPointerList<KviFileTransfer> * l = KviFileTransferManager::instance()->transferList();
 	if(!l)return;
 	KviFileTransferItem * it;
 	for(KviFileTransfer * t = l->first();t;t = l->next())
diff --git a/src/modules/filetransferwindow/libkvifiletransferwindow.cpp b/src/modules/filetransferwindow/libkvifiletransferwindow.cpp
index 8e5e2ccf3..916375372 100644
--- a/src/modules/filetransferwindow/libkvifiletransferwindow.cpp
+++ b/src/modules/filetransferwindow/libkvifiletransferwindow.cpp
@@ -105,7 +105,7 @@ static bool filetransferwindow_kvs_cmd_open(KviKvsModuleCommandCall * c)
 
 	if(d)
 	{
-		KviDict<QVariant> dict(17,true);
+		KviPointerHashTable<QString,QVariant> dict(17,true);
 		dict.setAutoDelete(true);
 		QString dummy;
 		dict.replace("bCreateMinimized",new QVariant(c->hasSwitch('m',dummy)));
diff --git a/src/modules/help/helpwidget.cpp b/src/modules/help/helpwidget.cpp
index c416b714e..b35c1d1a0 100644
--- a/src/modules/help/helpwidget.cpp
+++ b/src/modules/help/helpwidget.cpp
@@ -39,8 +39,8 @@
 #include <qclipboard.h>
 
 extern Index        * g_pDocIndex;
-extern KviPtrList<KviHelpWindow> * g_pHelpWindowList;
-extern KviPtrList<KviHelpWidget> * g_pHelpWidgetList;
+extern KviPointerList<KviHelpWindow> * g_pHelpWindowList;
+extern KviPointerList<KviHelpWidget> * g_pHelpWidgetList;
 
 KviHelpWidget::KviHelpWidget(QWidget * par,KviFrame * lpFrm,bool bIsStandalone)
 : QWidget(par,"help_widget")
diff --git a/src/modules/help/helpwindow.cpp b/src/modules/help/helpwindow.cpp
index 197e9e811..a1a8a6dec 100644
--- a/src/modules/help/helpwindow.cpp
+++ b/src/modules/help/helpwindow.cpp
@@ -41,8 +41,8 @@
 #include "kvi_valuelist.h"
 
 extern Index        * g_pDocIndex;
-extern KviPtrList<KviHelpWindow> * g_pHelpWindowList;
-extern KviPtrList<KviHelpWidget> * g_pHelpWidgetList;
+extern KviPointerList<KviHelpWindow> * g_pHelpWindowList;
+extern KviPointerList<KviHelpWidget> * g_pHelpWidgetList;
 
 bool g_bIndexingDone = FALSE;
 KviHelpWindow::KviHelpWindow(KviFrame * lpFrm,const char * name)
diff --git a/src/modules/help/index.cpp b/src/modules/help/index.cpp
index d1c629793..659ff44cb 100755
--- a/src/modules/help/index.cpp
+++ b/src/modules/help/index.cpp
@@ -1,75 +1,14 @@
-/**********************************************************************
-
-** Copyright (C) 2000-2003 Trolltech AS.  All rights reserved.
-
-**
-
-** This file is part of the Qt Assistant.
-
-**
-
-** This file may be distributed and/or modified under the terms of the
-
-** GNU General Public License version 2 as published by the Free Software
-
-** Foundation and appearing in the file LICENSE.GPL included in the
-
-** packaging of this file.
-
-**
-
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-
-** licenses may use this file in accordance with the Qt Commercial License
-
-** Agreement provided with the Software.
-
-**
-
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-
-**
-
-** See http://www.trolltech.com/gpl/ for GPL licensing information.
-
-** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-
-**   information about Qt Commercial License Agreements.
-
-**
-
-** Contact info@trolltech.com if any conditions of this licensing are
-
-** not clear to you.
-
-**
-
-**********************************************************************/
-
-
-
 #include "index.h"
 
-
-
 #include "kvi_file.h"
-
 #include <qdir.h>
-
 #include <qstringlist.h>
-
-#include "kvi_dict.h"
-
+#include "kvi_pointerhashtable.h"
 #include <qapplication.h>
-
 #include <qtextstream.h>
-
 #include <ctype.h>
 
 
-
 int kvi_compare(const Term * p1,const Term * p2)
 {
 	if(p1->frequency == p2->frequency)
@@ -79,49 +18,29 @@ int kvi_compare(const Term * p1,const Term * p2)
 	return 1;
 }
 
-
 QDataStream &operator>>( QDataStream &s, Document &l )
-
 {
-
     s >> l.docNumber;
-
     s >> l.frequency;
-
     return s;
-
 }
 
-
-
 QDataStream &operator<<( QDataStream &s, const Document &l )
-
 {
-
     s << (Q_INT16)l.docNumber;
-
     s << (Q_INT16)l.frequency;
-
     return s;
-
 }
 
-
-
 Index::Index( const QString &dp, const QString &hp )
 
     : QObject( 0, 0 ), dict( 8999 ), docPath( dp )
 
 {
-
     alreadyHaveDocList = FALSE;
-
     lastWindowClosed = FALSE;
-
     connect( qApp, SIGNAL( lastWindowClosed() ),
-
 	     this, SLOT( setLastWinClosed() ) );
-
 }
 
 
@@ -131,17 +50,11 @@ Index::Index( const QStringList &dl, const QString &hp )
     : QObject( 0, 0 ), dict( 8999 )
 
 {
-
     docList = dl;
-
     alreadyHaveDocList = TRUE;
-
     lastWindowClosed = FALSE;
-
     connect( qApp, SIGNAL( lastWindowClosed() ),
-
 	     this, SLOT( setLastWinClosed() ) );
-
 }
 
 
@@ -220,37 +133,21 @@ void Index::setupDocumentList()
 
 
 void Index::insertInDict( const QString &str, int docNum )
-
 {
-
     if ( strcmp( str, "amp" ) == 0 || strcmp( str, "nbsp" ) == 0 )
-
 	return;
-
     Entry *e = 0;
-
     if ( dict.count() )
-
 	e = dict[ str ];
 
-
-
     if ( e ) {
-
 	if ( e->documents.first().docNumber != docNum )
-
 	    e->documents.prepend( Document( docNum, 1 ) );
-
 	else
-
 	    e->documents.first().frequency++;
-
     } else {
-
 	dict.insert( str, new Entry( docNum ) );
-
     }
-
 }
 
 
@@ -329,7 +226,7 @@ void Index::writeDict()
 
 {
 
-    KviDictIterator<Entry> it( dict );
+    KviPointerHashTableIterator<QString,Entry> it( dict );
 
     KviFile f( dictFile );
 
@@ -596,7 +493,7 @@ QStringList Index::getWildcardTerms( const QString &term )
 #endif
 
 
-    KviDictIterator<Entry> it( dict );
+    KviPointerHashTableIterator<QString,Entry> it( dict );
 
     for( ; it.current(); ++it ) {
 
diff --git a/src/modules/help/index.h b/src/modules/help/index.h
index 3d2abd996..9debcb3e9 100755
--- a/src/modules/help/index.h
+++ b/src/modules/help/index.h
@@ -30,8 +30,8 @@
 #define INDEX_H
 
 #include <qstringlist.h>
-#include "kvi_dict.h"
-#include "kvi_list.h"
+#include "kvi_pointerhashtable.h"
+#include "kvi_pointerlist.h"
 #include "kvi_valuelist.h"
 #include <qdatastream.h>
 #include <qobject.h>
@@ -99,8 +99,8 @@ private:
     void buildMiniDict( const QString& );
     QStringList docList;
     QStringList titleList;
-    KviDict<Entry> dict;
-    KviDict<PosEntry> miniDict;
+    KviPointerHashTable<QString,Entry> dict;
+    KviPointerHashTable<QString,PosEntry> miniDict;
     uint wordNum;
     QString docPath;
     QString dictFile, docListFile;
@@ -118,7 +118,7 @@ struct Term {
 
 
 
-#define TermList KviPtrList<Term>
+#define TermList KviPointerList<Term>
 
 #endif
 
diff --git a/src/modules/help/libkvihelp.cpp b/src/modules/help/libkvihelp.cpp
index 5f1c30f02..5bf4737c7 100644
--- a/src/modules/help/libkvihelp.cpp
+++ b/src/modules/help/libkvihelp.cpp
@@ -39,8 +39,8 @@
 
 #include <qsplitter.h>
 Index        * g_pDocIndex = 0;
-KviPtrList<KviHelpWidget> * g_pHelpWidgetList = 0;
-KviPtrList<KviHelpWindow> * g_pHelpWindowList = 0;
+KviPointerList<KviHelpWidget> * g_pHelpWidgetList = 0;
+KviPointerList<KviHelpWindow> * g_pHelpWindowList = 0;
 
 /*
 	@doc: help.search
@@ -197,9 +197,9 @@ static bool help_module_init(KviModule * m)
 	
 
 	
-	g_pHelpWidgetList = new KviPtrList<KviHelpWidget>;
+	g_pHelpWidgetList = new KviPointerList<KviHelpWidget>;
 	g_pHelpWidgetList->setAutoDelete(false);
-	g_pHelpWindowList = new KviPtrList<KviHelpWindow>;
+	g_pHelpWindowList = new KviPointerList<KviHelpWindow>;
 	g_pHelpWindowList->setAutoDelete(false);
 
 	KVSM_REGISTER_SIMPLE_COMMAND(m,"open",help_kvs_cmd_open);
diff --git a/src/modules/http/httpfiletransfer.cpp b/src/modules/http/httpfiletransfer.cpp
index 18ccb5b7d..2b9b34f11 100644
--- a/src/modules/http/httpfiletransfer.cpp
+++ b/src/modules/http/httpfiletransfer.cpp
@@ -37,7 +37,7 @@
 #include "kvi_tal_popupmenu.h"
 #include <qpainter.h>
 
-static KviPtrList<KviHttpFileTransfer> * g_pHttpFileTransfers = 0;
+static KviPointerList<KviHttpFileTransfer> * g_pHttpFileTransfers = 0;
 static QPixmap * g_pHttpIcon = 0;
 
 
@@ -60,7 +60,7 @@ KviHttpFileTransfer::KviHttpFileTransfer()
 
 	connect(m_pHttpRequest,SIGNAL(status(const QString &)),this,SLOT(statusMessage(const QString &)));
 	connect(m_pHttpRequest,SIGNAL(terminated(bool)),this,SLOT(transferTerminated(bool)));
-	connect(m_pHttpRequest,SIGNAL(header(KviAsciiDict<KviStr> *)),this,SLOT(headersReceived(KviAsciiDict<KviStr> *)));
+	connect(m_pHttpRequest,SIGNAL(header(KviPointerHashTable<const char *,KviStr> *)),this,SLOT(headersReceived(KviPointerHashTable<const char *,KviStr> *)));
 	connect(m_pHttpRequest,SIGNAL(resolvingHost(const QString &)),this,SLOT(resolvingHost(const QString &)));
 	connect(m_pHttpRequest,SIGNAL(requestSent(const QStringList &)),this,SLOT(requestSent(const QStringList &)));
 	connect(m_pHttpRequest,SIGNAL(contactingHost(const QString &)),this,SLOT(contactingHost(const QString &)));
@@ -337,7 +337,7 @@ QString KviHttpFileTransfer::tipText()
 void KviHttpFileTransfer::init()
 {
 	if(g_pHttpFileTransfers)return;
-	g_pHttpFileTransfers = new KviPtrList<KviHttpFileTransfer>;
+	g_pHttpFileTransfers = new KviPointerList<KviHttpFileTransfer>;
 	g_pHttpFileTransfers->setAutoDelete(false);
 
 	QPixmap * pix = g_pIconManager->getImage("kvi_httpicons.png");
@@ -462,13 +462,13 @@ void KviHttpFileTransfer::transferTerminated(bool bSuccess)
 	}
 }
 
-void KviHttpFileTransfer::headersReceived(KviAsciiDict<KviStr> *h)
+void KviHttpFileTransfer::headersReceived(KviPointerHashTable<const char *,KviStr> *h)
 {
 	if(!h)return;
 	KviWindow * out = transferWindow();
 
 	if(out && (!m_bNoOutput))out->output(KVI_OUT_GENERICSTATUS,__tr2qs_ctx("[HTTP %d]: Response headers:","http"),id());
-	KviAsciiDictIterator<KviStr> it(*h);
+	KviPointerHashTableIterator<const char *,KviStr> it(*h);
 	while(KviStr * s = it.current())
 	{
 		QString szHeader = it.currentKey();
diff --git a/src/modules/http/httpfiletransfer.h b/src/modules/http/httpfiletransfer.h
index 0a556a6bf..88dea71d6 100644
--- a/src/modules/http/httpfiletransfer.h
+++ b/src/modules/http/httpfiletransfer.h
@@ -87,7 +87,7 @@ public:
 protected slots:
 	void statusMessage(const QString &txt);
 	void transferTerminated(bool bSuccess);
-	void headersReceived(KviAsciiDict<KviStr> *h);
+	void headersReceived(KviPointerHashTable<const char *,KviStr> *h);
 	void requestSent(const QStringList &sl);
 
 	void resolvingHost(const QString &hostname);
diff --git a/src/modules/ident/libkviident.cpp b/src/modules/ident/libkviident.cpp
index b7ac36def..fbe5c978d 100644
--- a/src/modules/ident/libkviident.cpp
+++ b/src/modules/ident/libkviident.cpp
@@ -198,10 +198,10 @@ void KviIdentDaemon::run()
 	m_sock6 = KVI_INVALID_SOCKET;
 	bool bEventPosted = false;
 
-	m_pRequestList = new KviPtrList<KviIdentRequest>;
+	m_pRequestList = new KviPointerList<KviIdentRequest>;
 	m_pRequestList->setAutoDelete(true);
 
-	KviPtrList<KviIdentRequest> dying;
+	KviPointerList<KviIdentRequest> dying;
 	dying.setAutoDelete(false);
 
 #ifdef COMPILE_IPV6_SUPPORT
diff --git a/src/modules/ident/libkviident.h b/src/modules/ident/libkviident.h
index 5e5b68428..8e8b7d2cd 100644
--- a/src/modules/ident/libkviident.h
+++ b/src/modules/ident/libkviident.h
@@ -28,7 +28,7 @@
 #include "kvi_time.h"
 #include "kvi_settings.h"
 
-#include "kvi_list.h"
+#include "kvi_pointerlist.h"
 #include <qobject.h>
 
 class KviIdentRequest
@@ -75,7 +75,7 @@ private:
 	bool                      m_bIpV6ContainsIpV4;
 	kvi_socket_t              m_sock;
 	kvi_socket_t              m_sock6;
-	KviPtrList<KviIdentRequest> *  m_pRequestList;
+	KviPointerList<KviIdentRequest> *  m_pRequestList;
 public:
 	virtual void run();
 protected:
diff --git a/src/modules/iograph/libkviiograph.cpp b/src/modules/iograph/libkviiograph.cpp
index 2ad73a410..21d94e75b 100644
--- a/src/modules/iograph/libkviiograph.cpp
+++ b/src/modules/iograph/libkviiograph.cpp
@@ -33,7 +33,7 @@
 #include "kvi_frame.h"
 #include "kvi_locale.h"
 
-#include "kvi_list.h"
+#include "kvi_pointerlist.h"
 #include <qtooltip.h>
 #include <qpointarray.h>
 #include <qpainter.h>
@@ -42,7 +42,7 @@
 extern QPixmap                 * g_pIccMemBuffer;
 
 
-static KviPtrList<KviIOGraphDisplay> * g_pIOGraphWidgetList;
+static KviPointerList<KviIOGraphDisplay> * g_pIOGraphWidgetList;
 
 KviIOGraphDisplay::KviIOGraphDisplay(KviIrcContextController * pController,bool sentGraph,bool recvGraph)
 : KviIrcContextGraphicalApplet(pController,"iograph_display")
@@ -252,7 +252,7 @@ static bool iograph_module_cmd_add(KviModule *m,KviCommand *c)
 static bool iograph_module_init(KviModule *m)
 {
 #if 0
-	g_pIOGraphWidgetList = new KviPtrList<KviIOGraphDisplay>;
+	g_pIOGraphWidgetList = new KviPointerList<KviIOGraphDisplay>;
 	g_pIOGraphWidgetList->setAutoDelete(false);
 	m->registerCommand("add",iograph_module_cmd_add);
 #endif
diff --git a/src/modules/lamerizer/libkvilamerizer.cpp b/src/modules/lamerizer/libkvilamerizer.cpp
index 5518bd09e..66512534c 100644
--- a/src/modules/lamerizer/libkvilamerizer.cpp
+++ b/src/modules/lamerizer/libkvilamerizer.cpp
@@ -50,9 +50,9 @@
 	#include "kvi_memmove.h"
 	#include "kvi_malloc.h"
 
-	#include "kvi_list.h"
+	#include "kvi_pointerlist.h"
 
-	static KviPtrList<KviCryptEngine> * g_pEngineList = 0;
+	static KviPointerList<KviCryptEngine> * g_pEngineList = 0;
 
 	KviLamerizerEngine::KviLamerizerEngine(bool bLight)
 	: KviCryptEngine()
@@ -208,7 +208,7 @@
 static bool lamerizer_module_init(KviModule * m)
 {
 #ifdef COMPILE_CRYPT_SUPPORT
-	g_pEngineList = new KviPtrList<KviCryptEngine>;
+	g_pEngineList = new KviPointerList<KviCryptEngine>;
 	g_pEngineList->setAutoDelete(false);
 
 	// FIXME: Maybe convert this repeated code to a function eh ?
diff --git a/src/modules/links/libkvilinks.cpp b/src/modules/links/libkvilinks.cpp
index 69751d9c2..baf6ba69f 100644
--- a/src/modules/links/libkvilinks.cpp
+++ b/src/modules/links/libkvilinks.cpp
@@ -31,7 +31,7 @@
 
 #include <qsplitter.h>
 
-KviPtrList<KviLinksWindow> * g_pLinksWindowList = 0;
+KviPointerList<KviLinksWindow> * g_pLinksWindowList = 0;
 
 
 /*
@@ -82,7 +82,7 @@ static bool links_kvs_cmd_open(KviKvsModuleCommandCall * c)
 
 static bool links_module_init(KviModule * m)
 {
-	g_pLinksWindowList = new KviPtrList<KviLinksWindow>;
+	g_pLinksWindowList = new KviPointerList<KviLinksWindow>;
 	g_pLinksWindowList->setAutoDelete(false);
 
 
diff --git a/src/modules/links/linkswindow.cpp b/src/modules/links/linkswindow.cpp
index 7986c70f2..a9ccdad90 100644
--- a/src/modules/links/linkswindow.cpp
+++ b/src/modules/links/linkswindow.cpp
@@ -38,7 +38,7 @@
 #include "kvi_tal_hbox.h"
 #include <qlabel.h>
 
-extern KviPtrList<KviLinksWindow> * g_pLinksWindowList;
+extern KviPointerList<KviLinksWindow> * g_pLinksWindowList;
 
 KviLinksWindow::KviLinksWindow(KviFrame * lpFrm,KviConsole * lpConsole)
 : KviWindow(KVI_WINDOW_TYPE_LINKS,lpFrm,"links",lpConsole) , KviExternalServerDataParser()
@@ -77,7 +77,7 @@ KviLinksWindow::KviLinksWindow(KviFrame * lpFrm,KviConsole * lpConsole)
 
 	m_pIrcView = new KviIrcView(m_pVertSplitter,lpFrm,this);
 
-	m_pLinkList = new KviPtrList<KviLink>;
+	m_pLinkList = new KviPointerList<KviLink>;
 	m_pLinkList->setAutoDelete(true);
 
 	m_pHostPopup = new KviTalPopupMenu();
diff --git a/src/modules/links/linkswindow.h b/src/modules/links/linkswindow.h
index f89129b5a..2d65f0fdc 100644
--- a/src/modules/links/linkswindow.h
+++ b/src/modules/links/linkswindow.h
@@ -55,7 +55,7 @@ protected:
 	QSplitter      * m_pVertSplitter;
 	QSplitter      * m_pTopSplitter;
 	KviTalListView      * m_pListView;
-	KviPtrList<KviLink> * m_pLinkList;
+	KviPointerList<KviLink> * m_pLinkList;
 	KviTalPopupMenu     * m_pHostPopup;
 	QString          m_szRootServer;
 	QToolButton    * m_pRequestButton;
diff --git a/src/modules/list/libkvilist.cpp b/src/modules/list/libkvilist.cpp
index bdc4deae4..161c714cc 100644
--- a/src/modules/list/libkvilist.cpp
+++ b/src/modules/list/libkvilist.cpp
@@ -31,7 +31,7 @@
 
 #include <qsplitter.h>
 
-KviPtrList<KviListWindow> * g_pListWindowList = 0;
+KviPointerList<KviListWindow> * g_pListWindowList = 0;
 
 
 /*
@@ -69,7 +69,7 @@ static bool list_kvs_cmd_open(KviKvsModuleCommandCall * c)
 
 static bool list_module_init(KviModule * m)
 {
-	g_pListWindowList = new KviPtrList<KviListWindow>;
+	g_pListWindowList = new KviPointerList<KviListWindow>;
 	g_pListWindowList->setAutoDelete(false);
 
 	KVSM_REGISTER_SIMPLE_COMMAND(m,"open",list_kvs_cmd_open);
diff --git a/src/modules/list/listwindow.cpp b/src/modules/list/listwindow.cpp
index 6594d878f..2e800f40d 100644
--- a/src/modules/list/listwindow.cpp
+++ b/src/modules/list/listwindow.cpp
@@ -53,7 +53,7 @@
 #include "kvi_tal_hbox.h"
 #include "kvi_msgbox.h"
 
-extern KviPtrList<KviListWindow> * g_pListWindowList;
+extern KviPointerList<KviListWindow> * g_pListWindowList;
 
 // kvi_ircview.cpp
 //extern KVIRC_API const char * getColorBytes(const char *data_ptr,unsigned char *byte_1,unsigned char *byte_2);
@@ -178,7 +178,7 @@ KviListWindow::KviListWindow(KviFrame * lpFrm,KviConsole * lpConsole)
 
 	m_pFlushTimer = 0;
 
-	m_pItemList = new KviPtrList<KviChannelListViewItemData>;
+	m_pItemList = new KviPointerList<KviChannelListViewItemData>;
 	m_pItemList->setAutoDelete(false);
 
 	m_pSplitter = new QSplitter(Qt::Horizontal,this,"splitter");
diff --git a/src/modules/list/listwindow.h b/src/modules/list/listwindow.h
index a8c10e486..727c246d8 100644
--- a/src/modules/list/listwindow.h
+++ b/src/modules/list/listwindow.h
@@ -27,7 +27,7 @@
 #include "kvi_window.h"
 #include "kvi_string.h"
 #include "kvi_ircsocket.h"
-#include "kvi_list.h"
+#include "kvi_pointerlist.h"
 #include "kvi_sparser.h"
 #include "kvi_console.h"
 #include "kvi_irccontext.h"
@@ -92,7 +92,7 @@ protected:
 	QToolButton							   * m_pSaveButton;
 	KviThemedLabel                         * m_pInfoLabel;
 	QTimer                                 * m_pFlushTimer;
-	KviPtrList<KviChannelListViewItemData> * m_pItemList;
+	KviPointerList<KviChannelListViewItemData> * m_pItemList;
 public: // Methods
 	virtual void control(int msg);
 	virtual void processData(KviIrcMessage * msg);
diff --git a/src/modules/logview/libkvilogview.cpp b/src/modules/logview/libkvilogview.cpp
index 3e7d3f7be..83e54ddac 100644
--- a/src/modules/logview/libkvilogview.cpp
+++ b/src/modules/logview/libkvilogview.cpp
@@ -66,7 +66,7 @@ static bool logview_kvs_cmd_open(KviKvsModuleCommandCall * c)
 	KviModuleExtensionDescriptor * d = c->module()->findExtensionDescriptor("tool",LOGVIEW_MODULE_EXTENSION_NAME);
 	if(d)
 	{
-		KviDict<QVariant> dict(17,true);
+		KviPointerHashTable<QString,QVariant> dict(17,true);
 		dict.setAutoDelete(true);
 		QString dummy;
 		dict.replace("bCreateMinimized",new QVariant(c->hasSwitch('m',dummy)));
diff --git a/src/modules/logview/logviewmdiwindow.h b/src/modules/logview/logviewmdiwindow.h
index f0a196854..95fb855aa 100644
--- a/src/modules/logview/logviewmdiwindow.h
+++ b/src/modules/logview/logviewmdiwindow.h
@@ -28,7 +28,7 @@
 
 #include "kvi_tal_vbox.h"
 #include "kvi_tal_listview.h"
-#include "kvi_list.h"
+#include "kvi_pointerlist.h"
 #include <qtabwidget.h>
 #include <qdatetime.h> 
 
@@ -77,7 +77,7 @@ public:
 	KviLogViewMDIWindow(KviModuleExtensionDescriptor * d,KviFrame * lpFrm);
 	~KviLogViewMDIWindow();
 protected:
-	KviPtrList<KviLogFile> m_logList;
+	KviPointerList<KviLogFile> m_logList;
 
 	KviTalListView     * m_pListView;
 
diff --git a/src/modules/mediaplayer/libkvimediaplayer.cpp b/src/modules/mediaplayer/libkvimediaplayer.cpp
index 493bbeb2c..0ed46a805 100644
--- a/src/modules/mediaplayer/libkvimediaplayer.cpp
+++ b/src/modules/mediaplayer/libkvimediaplayer.cpp
@@ -37,7 +37,7 @@
 #include "kvi_locale.h"
 #include "kvi_out.h"
 
-static KviPtrList<KviMediaPlayerInterfaceDescriptor> * g_pDescriptorList = 0;
+static KviPointerList<KviMediaPlayerInterfaceDescriptor> * g_pDescriptorList = 0;
 
 static KviMediaPlayerInterface * g_pMPInterface = 0;
 
@@ -1552,7 +1552,7 @@ MP_KVS_COMMAND(setShuffle)
 
 static bool mediaplayer_module_init( KviModule * m )
 {
-	g_pDescriptorList = new KviPtrList<KviMediaPlayerInterfaceDescriptor>;
+	g_pDescriptorList = new KviPointerList<KviMediaPlayerInterfaceDescriptor>;
 	g_pDescriptorList->setAutoDelete(true);
 
 #ifndef COMPILE_ON_WINDOWS
diff --git a/src/modules/notifier/notifiermessage.h b/src/modules/notifier/notifiermessage.h
index 9597f6bea..c7b337315 100644
--- a/src/modules/notifier/notifiermessage.h
+++ b/src/modules/notifier/notifiermessage.h
@@ -38,7 +38,7 @@
 #include <qlineedit.h>
 
 #include "kvi_qstring.h"
-#include "kvi_list.h"
+#include "kvi_pointerlist.h"
 #include "kvi_time.h"
 
 #ifdef COMPILE_USE_QT4
diff --git a/src/modules/notifier/notifierwindow.cpp b/src/modules/notifier/notifierwindow.cpp
index 305053cd9..9169a110a 100644
--- a/src/modules/notifier/notifierwindow.cpp
+++ b/src/modules/notifier/notifierwindow.cpp
@@ -704,7 +704,7 @@ void KviNotifierWindow::redrawText()
 	if(!tab)return;
 	
 	// it's message list
-	KviPtrList<KviNotifierMessage> * l = tab->messageList();
+	KviPointerList<KviNotifierMessage> * l = tab->messageList();
 	if(!l)return;
 	if(l->isEmpty())return;
 	
diff --git a/src/modules/notifier/notifierwindow.h b/src/modules/notifier/notifierwindow.h
index 8966089eb..27480e25b 100644
--- a/src/modules/notifier/notifierwindow.h
+++ b/src/modules/notifier/notifierwindow.h
@@ -39,7 +39,7 @@
 #include <qwidget.h>
 
 #include "kvi_qstring.h"
-#include "kvi_list.h"
+#include "kvi_pointerlist.h"
 #include "kvi_time.h"
 
 #include "notifiersettings.h"
diff --git a/src/modules/notifier/notifierwindowtabs.cpp b/src/modules/notifier/notifierwindowtabs.cpp
index cca66d387..e13a8f219 100644
--- a/src/modules/notifier/notifierwindowtabs.cpp
+++ b/src/modules/notifier/notifierwindowtabs.cpp
@@ -49,7 +49,7 @@ KviNotifierWindowTab::KviNotifierWindowTab(KviWindow * pWnd, QString label)
 {
 	m_pWnd = pWnd;
 	m_label = label;
-	m_pMessageList = new KviPtrList<KviNotifierMessage>;
+	m_pMessageList = new KviPointerList<KviNotifierMessage>;
 	m_pMessageList->setAutoDelete(true);
 	m_bFocused = false;
 	m_pCurrentMessage = 0;
@@ -371,7 +371,7 @@ void KviNotifierWindowTabs::prev()
 	if(!m_pTabFocused)return;
 
 	KviNotifierWindowTab * tab;
-	KviPtrListIterator<KviNotifierWindowTab> tabIterator (m_tabPtrList);
+	KviPointerListIterator<KviNotifierWindowTab> tabIterator (m_tabPtrList);
 
 	tab = m_tabMap[m_pTabFocused->wnd()];
 	
@@ -394,7 +394,7 @@ void KviNotifierWindowTabs::next()
 	if(!m_pTabFocused)return;
 	
 	KviNotifierWindowTab * tab;
-	KviPtrListIterator<KviNotifierWindowTab> tabIterator (m_tabPtrList);
+	KviPointerListIterator<KviNotifierWindowTab> tabIterator (m_tabPtrList);
 
 	tab = m_tabMap[m_pTabFocused->wnd()];
 	tabIterator.moveFirst();
@@ -552,7 +552,7 @@ void KviNotifierWindowTabs::draw(QPainter * p)
 	m_pPainter->drawPixmap(m_rct.width()-m_pixDX.width(),0,m_pixDX);
 	m_pPainter->drawTiledPixmap(m_pixSX.width(),0,m_rct.width()-m_pixSX.width()-m_pixDX.width(),m_rct.height(),m_pixBKG);
 
-	KviPtrListIterator<KviNotifierWindowTab> tabIterator (m_tabPtrList);
+	KviPointerListIterator<KviNotifierWindowTab> tabIterator (m_tabPtrList);
 	
 	//m_tabPtrList.findRef(m_tabMap[m_pTabFocused->wnd()]);
 
@@ -639,7 +639,7 @@ void KviNotifierWindowTabs::markAllMessagesAsHistoric()
 	
 		if (!tab.value()) break;
 		
-		KviPtrList<KviNotifierMessage> * tmpMessageList = tab.value()->messageList();
+		KviPointerList<KviNotifierMessage> * tmpMessageList = tab.value()->messageList();
 		
 		if (!tmpMessageList) break;
 		
diff --git a/src/modules/notifier/notifierwindowtabs.h b/src/modules/notifier/notifierwindowtabs.h
index 8b92eb091..cc22f9589 100644
--- a/src/modules/notifier/notifierwindowtabs.h
+++ b/src/modules/notifier/notifierwindowtabs.h
@@ -31,7 +31,7 @@
 #include <qpoint.h>
 #include <qrect.h>
 #include "kvi_settings.h"
-#include "kvi_list.h"
+#include "kvi_pointerlist.h"
 #include "notifiersettings.h"
 #include "notifierwindow.h"
 
@@ -69,7 +69,7 @@ private:
 
 	QString	m_label;
 
-	KviPtrList<KviNotifierMessage> * m_pMessageList;
+	KviPointerList<KviNotifierMessage> * m_pMessageList;
 	KviWindow * m_pWnd;
 	KviNotifierMessage	* m_pCurrentMessage;
 		
@@ -109,7 +109,7 @@ public:
 	QString label() { return m_label; };
 	
 	KviNotifierMessage * currentMessage() { return m_pCurrentMessage; };
-	KviPtrList<KviNotifierMessage> * messageList() { return m_pMessageList; };
+	KviPointerList<KviNotifierMessage> * messageList() { return m_pMessageList; };
 	KviWindow * window() { return m_pWnd; };
 	KviWindow * wnd() {return m_pWnd; };
 	
@@ -141,8 +141,8 @@ private:
 	QPoint	m_pnt;
 
 	QMap<KviWindow *, KviNotifierWindowTab *> m_tabMap;
-	KviPtrList<KviNotifierWindowTab> m_tabPtrList;
-	KviPtrList<KviNotifierWindowTab> m_lastVisitedTabPtrList;
+	KviPointerList<KviNotifierWindowTab> m_tabPtrList;
+	KviPointerList<KviNotifierWindowTab> m_lastVisitedTabPtrList;
 	
 	QFont * m_pFocusedFont;
 	QFont * m_pUnfocusedFont;
diff --git a/src/modules/objects/class_list.cpp b/src/modules/objects/class_list.cpp
index d798cad2f..6f4357c79 100644
--- a/src/modules/objects/class_list.cpp
+++ b/src/modules/objects/class_list.cpp
@@ -165,7 +165,7 @@ KVSO_END_REGISTERCLASS(KviKvsObject_list)
 
 
 KVSO_BEGIN_CONSTRUCTOR(KviKvsObject_list,KviKvsObject)
-	m_pDataList = new KviPtrList<KviKvsVariant>;
+	m_pDataList = new KviPointerList<KviKvsVariant>;
 	m_pDataList->setAutoDelete(true);
 KVSO_END_CONSTRUCTOR(KviKvsObject_list)
 
diff --git a/src/modules/objects/class_list.h b/src/modules/objects/class_list.h
index e034ab152..20d5d1359 100644
--- a/src/modules/objects/class_list.h
+++ b/src/modules/objects/class_list.h
@@ -26,7 +26,7 @@
 
 #include "kvi_settings.h"
 #include "kvi_string.h"
-#include "kvi_list.h"
+#include "kvi_pointerlist.h"
 #include "kvi_kvs_variant.h"
 #include "object_macros.h"
 
@@ -36,9 +36,9 @@ class KviKvsObject_list : public KviKvsObject
 public:
 	KVSO_DECLARE_OBJECT(KviKvsObject_list)
 protected:
-	KviPtrList<KviKvsVariant> * m_pDataList;
+	KviPointerList<KviKvsVariant> * m_pDataList;
 protected:
-	KviPtrList<KviKvsVariant> * dataList() const { return m_pDataList; };
+	KviPointerList<KviKvsVariant> * dataList() const { return m_pDataList; };
 public:
 	bool function_count(KviKvsObjectFunctionCall *c);
 	bool function_isEmpty(KviKvsObjectFunctionCall *c);
diff --git a/src/modules/objects/class_socket.h b/src/modules/objects/class_socket.h
index 1be8b122e..28e078613 100644
--- a/src/modules/objects/class_socket.h
+++ b/src/modules/objects/class_socket.h
@@ -25,7 +25,7 @@
 
 
 
-#include "kvi_list.h"
+#include "kvi_pointerlist.h"
 #include <qsocketnotifier.h>
 #include <qtimer.h>
 
diff --git a/src/modules/objects/libkviobjects.cpp b/src/modules/objects/libkviobjects.cpp
index 93abc58a4..7df3f07fe 100644
--- a/src/modules/objects/libkviobjects.cpp
+++ b/src/modules/objects/libkviobjects.cpp
@@ -349,9 +349,9 @@ static bool objects_kvs_fnc_instances(KviKvsModuleFunctionCall * c)
 			c->warning(__tr2qs("The class '%Q' does not exist"),&szClassName);
 		return true;
 	}
-	KviPtrDict<KviKvsObject> * od = KviKvsKernel::instance()->objectController()->objectDict();
+	KviPointerHashTable<void *,KviKvsObject> * od = KviKvsKernel::instance()->objectController()->objectDict();
 
-	KviPtrDictIterator<KviKvsObject> it(*od);
+	KviPointerHashTableIterator<void *,KviKvsObject> it(*od);
 	kvs_uint_t uIdx = 0;
 	if(szFlags.contains(QChar('s')))
 	{
@@ -404,7 +404,7 @@ static bool objects_kvs_fnc_variables(KviKvsModuleFunctionCall * c)
 		c->warning(__tr2qs("Object does not exists"));
 		return true;
 	}
-	KviDictIterator<KviKvsVariant> it(* ob->dataContainer()->dict());
+	KviPointerHashTableIterator<QString,KviKvsVariant> it(* ob->dataContainer()->dict());
 	KviKvsHash* pHash = new KviKvsHash();
 	c->returnValue()->setHash(pHash);
 	while(KviKvsVariant * t = it.current())
@@ -445,7 +445,7 @@ static bool objects_kvs_fnc_classAllHandlers(KviKvsModuleFunctionCall * c)
 		return true;
 	}
 
-	KviDictIterator<KviKvsObjectFunctionHandler>  it(* pClass->getHandlers());
+	KviPointerHashTableIterator<QString,KviKvsObjectFunctionHandler>  it(* pClass->getHandlers());
 	KviKvsHash* pHash = new KviKvsHash();
 	c->returnValue()->setHash(pHash);
 	while(KviKvsObjectFunctionHandler * t = it.current())
@@ -481,8 +481,8 @@ static bool objects_kvs_fnc_classes(KviKvsModuleFunctionCall * c)
 	KviKvsArray * pArry = new KviKvsArray();
 	c->returnValue()->setArray(pArry);
 	int uIdx=0;
-	KviDictIterator<KviKvsObjectClass> it(*KviKvsKernel::instance()->objectController()->classDict());
-	KviDict<bool> *classdict=new KviDict<bool>;
+	KviPointerHashTableIterator<QString,KviKvsObjectClass> it(*KviKvsKernel::instance()->objectController()->classDict());
+	KviPointerHashTable<QString,bool> *classdict=new KviPointerHashTable<QString,bool>;
 	classdict->setAutoDelete(false);
 	bool bFake=true;
 	while(KviKvsObjectClass * pClass=it.current())
@@ -504,7 +504,7 @@ static bool objects_kvs_fnc_classes(KviKvsModuleFunctionCall * c)
 	KviKvsArray* pArray = new KviKvsArray();
 	c->returnValue()->setArray(pArray);
 	int idx=0;
-	KviDictIterator<bool>  strIt(*classdict);
+	KviPointerHashTableIterator<QString,bool>  strIt(*classdict);
 	while(strIt.current())
 	{
 		pArray->set(idx,new KviKvsVariant(strIt.currentKey()));
diff --git a/src/modules/options/dialog.cpp b/src/modules/options/dialog.cpp
index fb133c852..24f31897c 100644
--- a/src/modules/options/dialog.cpp
+++ b/src/modules/options/dialog.cpp
@@ -31,7 +31,7 @@
 #include "kvi_iconmanager.h"
 #include "kvi_module.h"
 #include "kvi_styled_controls.h"
-#include "kvi_ptrdict.h"
+#include "kvi_pointerhashtable.h"
 #include <qlayout.h>
 #include "kvi_accel.h"
 #include <qlabel.h>
@@ -56,7 +56,7 @@
 #include <qevent.h>
 
 //extern KviModule * g_pOptionsModule;
-extern KviDict<KviOptionsDialog> * g_pOptionsDialogDict;
+extern KviPointerHashTable<QString,KviOptionsDialog> * g_pOptionsDialogDict;
 
 extern KVIRC_API KviApp * g_pApp;
 extern KviOptionsInstanceManager * g_pOptionsInstanceManager;
@@ -318,7 +318,7 @@ bool KviOptionsDialog::recursiveSearch(KviOptionsListViewItem * pItem,const QStr
 	}
 
 	bool bFoundSomethingHere = false;
-	KviPtrDict<bool> lOptionWidgetsToMark;
+	KviPointerHashTable<void *,bool> lOptionWidgetsToMark;
 	lOptionWidgetsToMark.setAutoDelete(true);
 	QTabWidget * pTabWidgetToMark = 0;
 	
@@ -425,7 +425,7 @@ bool KviOptionsDialog::recursiveSearch(KviOptionsListViewItem * pItem,const QStr
 
 	if(pTabWidgetToMark)
 	{
-		KviPtrDictIterator<bool> it(lOptionWidgetsToMark);
+		KviPointerHashTableIterator<void *,bool> it(lOptionWidgetsToMark);
 		while(bool * pBool = it.current())
 		{
 			KviOptionsWidget * pOptionsWidget = (KviOptionsWidget *)it.currentKey();
@@ -488,14 +488,14 @@ void KviOptionsDialog::searchClicked()
 		search(szTxt);
 }
 
-void KviOptionsDialog::fillListView(KviTalListViewItem * p,KviPtrList<KviOptionsWidgetInstanceEntry> * l,const QString &szGroup,bool bNotContainedOnly)
+void KviOptionsDialog::fillListView(KviTalListViewItem * p,KviPointerList<KviOptionsWidgetInstanceEntry> * l,const QString &szGroup,bool bNotContainedOnly)
 {
 	if(!l)return;
 
 	KviOptionsListViewItem * it;
 	KviOptionsWidgetInstanceEntry * e;
 
-	KviPtrList<KviOptionsWidgetInstanceEntry> tmp;
+	KviPointerList<KviOptionsWidgetInstanceEntry> tmp;
 	tmp.setAutoDelete(false);
 
 
diff --git a/src/modules/options/dialog.h b/src/modules/options/dialog.h
index 52867fbe2..355e4565d 100644
--- a/src/modules/options/dialog.h
+++ b/src/modules/options/dialog.h
@@ -79,8 +79,8 @@ private:
 	QToolButton  * m_pSearchButton;
 private:
 	void recursiveCommit(KviOptionsListViewItem *it);
-	void fillListView(KviTalListViewItem * p,KviPtrList<KviOptionsWidgetInstanceEntry> * l,const QString &szGroup,bool bNotContainedOnly = false);
-	//KviOptionsListViewItem * showHiddenChildren(KviTalListViewItem * p,KviPtrList<KviOptionsWidgetInstanceEntry> * l);
+	void fillListView(KviTalListViewItem * p,KviPointerList<KviOptionsWidgetInstanceEntry> * l,const QString &szGroup,bool bNotContainedOnly = false);
+	//KviOptionsListViewItem * showHiddenChildren(KviTalListViewItem * p,KviPointerList<KviOptionsWidgetInstanceEntry> * l);
 	KviOptionsListViewItem * findItemByPage(KviOptionsListViewItem *it,KviOptionsWidget * pPage);
 private slots:
 	void listViewItemSelectionChanged(KviTalListViewItem *it);
diff --git a/src/modules/options/instances.cpp b/src/modules/options/instances.cpp
index 8ee3f3dc4..b5c7bb32f 100644
--- a/src/modules/options/instances.cpp
+++ b/src/modules/options/instances.cpp
@@ -652,7 +652,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 
 	//debug("Instantiating");
 	// Create the global widget dict : case sensitive , do not copy keys
-	m_pInstanceTree = new KviPtrList<KviOptionsWidgetInstanceEntry>;
+	m_pInstanceTree = new KviPointerList<KviOptionsWidgetInstanceEntry>;
 	m_pInstanceTree->setAutoDelete(true);
 
 
@@ -690,7 +690,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 	e0->szName = __tr2qs_ctx_no_xgettext(g_szName_KviConnectionOptionsWidget,"options");
 	m_pInstanceTree->append(e0);
 
-	e0->pChildList = new KviPtrList<KviOptionsWidgetInstanceEntry>;
+	e0->pChildList = new KviPointerList<KviOptionsWidgetInstanceEntry>;
 	e0->pChildList->setAutoDelete(true);
 
 		KviOptionsWidgetInstanceEntry * e1;
@@ -727,7 +727,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		e1->szName = __tr2qs_ctx_no_xgettext(g_szName_KviConnectionAdvancedOptionsWidget,"options");
 		e0->pChildList->append(e1);
 
-		e1->pChildList = new KviPtrList<KviOptionsWidgetInstanceEntry>;
+		e1->pChildList = new KviPointerList<KviOptionsWidgetInstanceEntry>;
 		e1->pChildList->setAutoDelete(true);
 
 			KviOptionsWidgetInstanceEntry * e2;
@@ -900,7 +900,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 	e0->szName = __tr2qs_ctx_no_xgettext(g_szName_KviDccOptionsWidget,"options");
 	m_pInstanceTree->append(e0);
 
-	e0->pChildList = new KviPtrList<KviOptionsWidgetInstanceEntry>;
+	e0->pChildList = new KviPointerList<KviOptionsWidgetInstanceEntry>;
 	e0->pChildList->setAutoDelete(true);
 
 		e1 = new KviOptionsWidgetInstanceEntry;
@@ -1004,7 +1004,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		e1->szName = __tr2qs_ctx_no_xgettext(g_szName_KviDccSendOptionsWidget,"options");
 		e0->pChildList->append(e1);
 
-		e1->pChildList = new KviPtrList<KviOptionsWidgetInstanceEntry>;
+		e1->pChildList = new KviPointerList<KviOptionsWidgetInstanceEntry>;
 		e1->pChildList->setAutoDelete(true);
 
 			e2 = new KviOptionsWidgetInstanceEntry;
@@ -1176,7 +1176,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 	e0->szName = __tr2qs_ctx_no_xgettext(g_szName_KviGeneralOptOptionsWidget,"options");
 	m_pInstanceTree->append(e0);
 
-	e0->pChildList = new KviPtrList<KviOptionsWidgetInstanceEntry>;
+	e0->pChildList = new KviPointerList<KviOptionsWidgetInstanceEntry>;
 	e0->pChildList->setAutoDelete(true);
 
 		e1 = new KviOptionsWidgetInstanceEntry;
@@ -1246,7 +1246,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		e1->szName = __tr2qs_ctx_no_xgettext(g_szName_KviSoundOptionsWidget,"options");
 		e0->pChildList->append(e1);
 
-		e1->pChildList = new KviPtrList<KviOptionsWidgetInstanceEntry>;
+		e1->pChildList = new KviPointerList<KviOptionsWidgetInstanceEntry>;
 		e1->pChildList->setAutoDelete(true);
 
 			e2 = new KviOptionsWidgetInstanceEntry;
@@ -1452,7 +1452,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 	e0->szName = __tr2qs_ctx_no_xgettext(g_szName_KviIdentityOptionsWidget,"options");
 	m_pInstanceTree->append(e0);
 
-	e0->pChildList = new KviPtrList<KviOptionsWidgetInstanceEntry>;
+	e0->pChildList = new KviPointerList<KviOptionsWidgetInstanceEntry>;
 	e0->pChildList->setAutoDelete(true);
 
 		e1 = new KviOptionsWidgetInstanceEntry;
@@ -1624,7 +1624,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 	e0->szName = __tr2qs_ctx_no_xgettext(g_szName_KviInterfaceFeaturesOptionsWidget,"options");
 	m_pInstanceTree->append(e0);
 
-	e0->pChildList = new KviPtrList<KviOptionsWidgetInstanceEntry>;
+	e0->pChildList = new KviPointerList<KviOptionsWidgetInstanceEntry>;
 	e0->pChildList->setAutoDelete(true);
 
 		e1 = new KviOptionsWidgetInstanceEntry;
@@ -1932,7 +1932,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 	e0->szName = __tr2qs_ctx_no_xgettext(g_szName_KviIrcOptionsWidget,"options");
 	m_pInstanceTree->append(e0);
 
-	e0->pChildList = new KviPtrList<KviOptionsWidgetInstanceEntry>;
+	e0->pChildList = new KviPointerList<KviOptionsWidgetInstanceEntry>;
 	e0->pChildList->setAutoDelete(true);
 
 		e1 = new KviOptionsWidgetInstanceEntry;
@@ -2036,7 +2036,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		e1->szName = __tr2qs_ctx_no_xgettext(g_szName_KviChannelOptionsWidget,"options");
 		e0->pChildList->append(e1);
 
-		e1->pChildList = new KviPtrList<KviOptionsWidgetInstanceEntry>;
+		e1->pChildList = new KviPointerList<KviOptionsWidgetInstanceEntry>;
 		e1->pChildList->setAutoDelete(true);
 
 			e2 = new KviOptionsWidgetInstanceEntry;
@@ -2174,7 +2174,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		e1->szName = __tr2qs_ctx_no_xgettext(g_szName_KviProtectionOptionsWidget,"options");
 		e0->pChildList->append(e1);
 
-		e1->pChildList = new KviPtrList<KviOptionsWidgetInstanceEntry>;
+		e1->pChildList = new KviPointerList<KviOptionsWidgetInstanceEntry>;
 		e1->pChildList->setAutoDelete(true);
 
 			e2 = new KviOptionsWidgetInstanceEntry;
@@ -2346,7 +2346,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		e1->szName = __tr2qs_ctx_no_xgettext(g_szName_KviToolsOptionsWidget,"options");
 		e0->pChildList->append(e1);
 
-		e1->pChildList = new KviPtrList<KviOptionsWidgetInstanceEntry>;
+		e1->pChildList = new KviPointerList<KviOptionsWidgetInstanceEntry>;
 		e1->pChildList->setAutoDelete(true);
 
 			e2 = new KviOptionsWidgetInstanceEntry;
@@ -2484,7 +2484,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 			e2->szName = __tr2qs_ctx_no_xgettext(g_szName_KviAlertHighlightingOptionsWidget,"options");
 			e1->pChildList->append(e2);
 
-			e2->pChildList = new KviPtrList<KviOptionsWidgetInstanceEntry>;
+			e2->pChildList = new KviPointerList<KviOptionsWidgetInstanceEntry>;
 			e2->pChildList->setAutoDelete(true);
 
 				KviOptionsWidgetInstanceEntry * e3;
@@ -2759,7 +2759,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 	e0->szName = __tr2qs_ctx_no_xgettext(g_szName_KviIrcViewThemeOptionsWidget,"options");
 	m_pInstanceTree->append(e0);
 
-	e0->pChildList = new KviPtrList<KviOptionsWidgetInstanceEntry>;
+	e0->pChildList = new KviPointerList<KviOptionsWidgetInstanceEntry>;
 	e0->pChildList->setAutoDelete(true);
 
 		e1 = new KviOptionsWidgetInstanceEntry;
@@ -2863,7 +2863,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 	e0->szName = __tr2qs_ctx_no_xgettext(g_szName_KviMessageOptionsWidget,"options");
 	m_pInstanceTree->append(e0);
 
-	e0->pChildList = new KviPtrList<KviOptionsWidgetInstanceEntry>;
+	e0->pChildList = new KviPointerList<KviOptionsWidgetInstanceEntry>;
 	e0->pChildList->setAutoDelete(true);
 
 		e1 = new KviOptionsWidgetInstanceEntry;
@@ -3069,7 +3069,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 	e0->szName = __tr2qs_ctx_no_xgettext(g_szName_KviTaskBarOptionsWidget,"options");
 	m_pInstanceTree->append(e0);
 
-	e0->pChildList = new KviPtrList<KviOptionsWidgetInstanceEntry>;
+	e0->pChildList = new KviPointerList<KviOptionsWidgetInstanceEntry>;
 	e0->pChildList->setAutoDelete(true);
 
 		e1 = new KviOptionsWidgetInstanceEntry;
@@ -3105,7 +3105,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		e1->szName = __tr2qs_ctx_no_xgettext(g_szName_KviTreeTaskBarOptionsWidget,"options");
 		e0->pChildList->append(e1);
 
-		e1->pChildList = new KviPtrList<KviOptionsWidgetInstanceEntry>;
+		e1->pChildList = new KviPointerList<KviOptionsWidgetInstanceEntry>;
 		e1->pChildList->setAutoDelete(true);
 
 			e2 = new KviOptionsWidgetInstanceEntry;
@@ -3311,7 +3311,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 	e0->szName = __tr2qs_ctx_no_xgettext(g_szName_KviUserListLookOptionsWidget,"options");
 	m_pInstanceTree->append(e0);
 
-	e0->pChildList = new KviPtrList<KviOptionsWidgetInstanceEntry>;
+	e0->pChildList = new KviPointerList<KviOptionsWidgetInstanceEntry>;
 	e0->pChildList->setAutoDelete(true);
 
 		e1 = new KviOptionsWidgetInstanceEntry;
@@ -3452,7 +3452,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 
 }
 
-void KviOptionsInstanceManager::deleteInstanceTree(KviPtrList<KviOptionsWidgetInstanceEntry> * l)
+void KviOptionsInstanceManager::deleteInstanceTree(KviPointerList<KviOptionsWidgetInstanceEntry> * l)
 {
 	if(l)
 	{
@@ -3516,7 +3516,7 @@ KviOptionsWidget * KviOptionsInstanceManager::getInstance(KviOptionsWidgetInstan
 		e->pWidget->createTabbedPage();
 		if(e->pChildList)
 		{
-			KviPtrList<KviOptionsWidgetInstanceEntry> tmp;
+			KviPointerList<KviOptionsWidgetInstanceEntry> tmp;
 			tmp.setAutoDelete(false);
 
 			for(KviOptionsWidgetInstanceEntry * e2 = e->pChildList->first();e2;e2 = e->pChildList->next())
@@ -3546,7 +3546,7 @@ KviOptionsWidget * KviOptionsInstanceManager::getInstance(KviOptionsWidgetInstan
 	return e->pWidget;
 }
 
-KviOptionsWidgetInstanceEntry * KviOptionsInstanceManager::findInstanceEntry(const QObject * ptr,KviPtrList<KviOptionsWidgetInstanceEntry> * l)
+KviOptionsWidgetInstanceEntry * KviOptionsInstanceManager::findInstanceEntry(const QObject * ptr,KviPointerList<KviOptionsWidgetInstanceEntry> * l)
 {
 	if(l)
 	{
@@ -3563,7 +3563,7 @@ KviOptionsWidgetInstanceEntry * KviOptionsInstanceManager::findInstanceEntry(con
 	return 0;
 }
 
-KviOptionsWidgetInstanceEntry * KviOptionsInstanceManager::findInstanceEntry(const char * clName,KviPtrList<KviOptionsWidgetInstanceEntry> * l)
+KviOptionsWidgetInstanceEntry * KviOptionsInstanceManager::findInstanceEntry(const char * clName,KviPointerList<KviOptionsWidgetInstanceEntry> * l)
 {
 	if(l)
 	{
diff --git a/src/modules/options/instances.h b/src/modules/options/instances.h
index e99463ef8..12f10a42c 100644
--- a/src/modules/options/instances.h
+++ b/src/modules/options/instances.h
@@ -33,7 +33,7 @@
 
 #include "kvi_optionswidget.h"
 #include "kvi_module.h"
-#include "kvi_list.h"
+#include "kvi_pointerlist.h"
 #include "kvi_qstring.h"
 
 typedef struct _KviOptionsWidgetInstanceEntry KviOptionsWidgetInstanceEntry;
@@ -53,7 +53,7 @@ typedef struct _KviOptionsWidgetInstanceEntry
 	QString                                     szGroup;
 	bool                                        bIsContainer;
 	bool                                        bIsNotContained;
-	KviPtrList<KviOptionsWidgetInstanceEntry> * pChildList;
+	KviPointerList<KviOptionsWidgetInstanceEntry> * pChildList;
 	bool                                        bDoInsert; // a helper for KviOptionsDialog::fillListView()
 } KviOptionsWidgetInstanceEntry;
 
@@ -65,16 +65,16 @@ public:
 	KviOptionsInstanceManager();
 	virtual ~KviOptionsInstanceManager();
 protected:
-	KviPtrList<KviOptionsWidgetInstanceEntry> *  m_pInstanceTree;
+	KviPointerList<KviOptionsWidgetInstanceEntry> *  m_pInstanceTree;
 public:
-	KviPtrList<KviOptionsWidgetInstanceEntry> * instanceEntryTree(){ return m_pInstanceTree; };
+	KviPointerList<KviOptionsWidgetInstanceEntry> * instanceEntryTree(){ return m_pInstanceTree; };
 	KviOptionsWidget * getInstance(KviOptionsWidgetInstanceEntry * e,QWidget * par);
 	KviOptionsWidgetInstanceEntry * findInstanceEntry(const char * clName);
 	void cleanup(KviModule * m);
 protected:
-	KviOptionsWidgetInstanceEntry * findInstanceEntry(const char * clName,KviPtrList<KviOptionsWidgetInstanceEntry> * l);
-	KviOptionsWidgetInstanceEntry * findInstanceEntry(const QObject * ptr,KviPtrList<KviOptionsWidgetInstanceEntry> * l);
-	void deleteInstanceTree(KviPtrList<KviOptionsWidgetInstanceEntry> * l);
+	KviOptionsWidgetInstanceEntry * findInstanceEntry(const char * clName,KviPointerList<KviOptionsWidgetInstanceEntry> * l);
+	KviOptionsWidgetInstanceEntry * findInstanceEntry(const QObject * ptr,KviPointerList<KviOptionsWidgetInstanceEntry> * l);
+	void deleteInstanceTree(KviPointerList<KviOptionsWidgetInstanceEntry> * l);
 protected slots:
 	void widgetDestroyed();
 };
diff --git a/src/modules/options/libkvioptions.cpp b/src/modules/options/libkvioptions.cpp
index 6f120a744..eca1ff85d 100644
--- a/src/modules/options/libkvioptions.cpp
+++ b/src/modules/options/libkvioptions.cpp
@@ -38,10 +38,10 @@
 #include "dialog.h"
 
 #include <qsplitter.h>
-#include "kvi_dict.h"
+#include "kvi_pointerhashtable.h"
 
 
-KviDict<KviOptionsDialog> * g_pOptionsDialogDict = 0;
+KviPointerHashTable<QString,KviOptionsDialog> * g_pOptionsDialogDict = 0;
 
 KviOptionsInstanceManager * g_pOptionsInstanceManager = 0;
 
@@ -159,7 +159,7 @@ static void options_kvs_module_print_pages(KviKvsModuleCommandCall * c,KviOption
 }
 static bool options_kvs_cmd_pages(KviKvsModuleCommandCall * c)
 {
-	KviPtrList<KviOptionsWidgetInstanceEntry> * l = g_pOptionsInstanceManager->instanceEntryTree();
+	KviPointerList<KviOptionsWidgetInstanceEntry> * l = g_pOptionsInstanceManager->instanceEntryTree();
 
 	for(KviOptionsWidgetInstanceEntry * e = l->first();e;e = l->next())
 	{
@@ -279,7 +279,7 @@ static bool options_module_init(KviModule * m)
 	KVSM_REGISTER_SIMPLE_COMMAND(m,"edit",options_kvs_cmd_edit);
 	KVSM_REGISTER_FUNCTION(m,"isDialog",options_kvs_fnc_isdialog);
 
-	g_pOptionsDialogDict = new KviDict<KviOptionsDialog>;
+	g_pOptionsDialogDict = new KviPointerHashTable<QString,KviOptionsDialog>;
 	g_pOptionsDialogDict->setAutoDelete(false);
 
 	return true;
@@ -287,8 +287,8 @@ static bool options_module_init(KviModule * m)
 
 static bool options_module_cleanup(KviModule *m)
 {
-	KviDictIterator<KviOptionsDialog> it(*g_pOptionsDialogDict);
-	KviPtrList<KviOptionsDialog> l;
+	KviPointerHashTableIterator<QString,KviOptionsDialog> it(*g_pOptionsDialogDict);
+	KviPointerList<KviOptionsDialog> l;
 	l.setAutoDelete(false);
 	KviOptionsDialog * d;
 	while(d = it.current())
diff --git a/src/modules/options/optw_mediatypes.cpp b/src/modules/options/optw_mediatypes.cpp
index 062b50309..02bbc6342 100644
--- a/src/modules/options/optw_mediatypes.cpp
+++ b/src/modules/options/optw_mediatypes.cpp
@@ -157,7 +157,7 @@ void KviMediaTypesOptionsWidget::fillListView()
 {
 	m_pListView->clear();
 	g_pMediaManager->lock();
-	KviPtrList<KviMediaType> * l = g_pMediaManager->mediaTypeList();
+	KviPointerList<KviMediaType> * l = g_pMediaManager->mediaTypeList();
 	KviMediaTypeListViewItem * it;
 	for(KviMediaType * t = l->first();t;t = l->next())
 	{
diff --git a/src/modules/options/optw_nickserv.cpp b/src/modules/options/optw_nickserv.cpp
index c6ac75df6..efa7d2ef1 100644
--- a/src/modules/options/optw_nickserv.cpp
+++ b/src/modules/options/optw_nickserv.cpp
@@ -289,7 +289,7 @@ KviNickServOptionsWidget::KviNickServOptionsWidget(QWidget * parent)
 
 	if(rs && rs->rules())
 	{
-		KviPtrList<KviNickServRule> * ll = rs->rules();
+		KviPointerList<KviNickServRule> * ll = rs->rules();
 		for(KviNickServRule * rule = ll->first();rule;rule = ll->next())
 		{
 			(void)new KviTalListViewItem(m_pNickServListView,rule->registeredNick(),rule->serverMask(),rule->nickServMask(),rule->messageRegexp(),rule->identifyCommand());
diff --git a/src/modules/options/optw_proxy.cpp b/src/modules/options/optw_proxy.cpp
index 44c635205..cd2f34304 100644
--- a/src/modules/options/optw_proxy.cpp
+++ b/src/modules/options/optw_proxy.cpp
@@ -169,7 +169,7 @@ void KviProxyOptionsWidget::fillProxyList()
 {
 	KviProxyOptionsListViewItem * prx;
 
-	KviPtrList<KviProxy> * l = g_pProxyDataBase->proxyList();
+	KviPointerList<KviProxy> * l = g_pProxyDataBase->proxyList();
 
 	for(KviProxy * p = l->first();p;p = l->next())
 	{
diff --git a/src/modules/options/optw_servers.cpp b/src/modules/options/optw_servers.cpp
index ae98e14fc..b6c121bae 100644
--- a/src/modules/options/optw_servers.cpp
+++ b/src/modules/options/optw_servers.cpp
@@ -59,7 +59,7 @@
 #include "kvi_tal_tooltip.h"
 #include <qvalidator.h>
 #include <qmessagebox.h>
-#include "kvi_asciidict.h"
+#include "kvi_pointerhashtable.h"
 #include <qcombobox.h>
 #include <qbuttongroup.h>
 #include <qmessagebox.h>
@@ -307,7 +307,7 @@ KviNetworkDetailsWidget::KviNetworkDetailsWidget(QWidget * par,KviIrcNetwork * n
 	
 	if(rs && rs->rules())
 	{
-		KviPtrList<KviNickServRule> * ll = rs->rules();
+		KviPointerList<KviNickServRule> * ll = rs->rules();
 		for(KviNickServRule * rule = ll->first();rule;rule = ll->next())
 		{
 			(void)new KviTalListViewItem(m_pNickServListView,rule->registeredNick(),rule->nickServMask(),rule->messageRegexp(),rule->identifyCommand());
@@ -729,7 +729,7 @@ KviServerDetailsWidget::KviServerDetailsWidget(QWidget * par,KviIrcServer * s)
 	m_pProxyEditor->insertItem(__tr2qs_ctx("Default","options"));
 	m_pProxyEditor->insertItem(__tr2qs_ctx("Direct connection","options"));	
 	
-	KviPtrList<KviProxy> * proxylist = g_pProxyDataBase->proxyList();
+	KviPointerList<KviProxy> * proxylist = g_pProxyDataBase->proxyList();
 	for(KviProxy * p = proxylist->first();p;p = proxylist->next())
 	{
 		m_pProxyEditor->insertItem(QString("%1:%2").arg(p->hostname()).arg(p->port()));
@@ -1289,12 +1289,12 @@ void KviServerOptionsWidget::fillServerList()
 	KviServerOptionsListViewItem * srv;
 	KviServerOptionsListViewItem * cur = 0;
 
-	KviDictIterator<KviIrcServerDataBaseRecord> it(*(g_pIrcServerDataBase->recordDict()));
+	KviPointerHashTableIterator<QString,KviIrcServerDataBaseRecord> it(*(g_pIrcServerDataBase->recordDict()));
 
 	while(KviIrcServerDataBaseRecord * r = it.current())
 	{
 		net = new KviServerOptionsListViewItem(m_pListView,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_WORLD)),r->network());
-		KviPtrList<KviIrcServer> * sl = r->serverList();
+		KviPointerList<KviIrcServer> * sl = r->serverList();
 		bool bCurrent = r->network()->name() == g_pIrcServerDataBase->currentNetworkName().utf8().data();
 		net->setOpen(bCurrent);
 		for(KviIrcServer * s = sl->first();s;s = sl->next())
diff --git a/src/modules/options/optw_sound.cpp b/src/modules/options/optw_sound.cpp
index 69f1f4a4a..dcd1f2e7e 100644
--- a/src/modules/options/optw_sound.cpp
+++ b/src/modules/options/optw_sound.cpp
@@ -28,7 +28,7 @@
 #include "kvi_locale.h"
 #include "kvi_options.h"
 #include "kvi_modulemanager.h"
-#include "kvi_list.h"
+#include "kvi_pointerlist.h"
 #include "kvi_string.h"
 
 #include <qlabel.h>
diff --git a/src/modules/options/optw_texticons.cpp b/src/modules/options/optw_texticons.cpp
index 09edb250e..8ff6a7ca1 100644
--- a/src/modules/options/optw_texticons.cpp
+++ b/src/modules/options/optw_texticons.cpp
@@ -141,7 +141,7 @@ KviTextIconsOptionsWidget::KviTextIconsOptionsWidget(QWidget * parent)
 {
 	createLayout(2,2);
 
-	KviDictIterator<KviTextIcon> it(*(g_pTextIconManager->textIconDict()));
+	KviPointerHashTableIterator<QString,KviTextIcon> it(*(g_pTextIconManager->textIconDict()));
 
 	m_pTable = new KviTalTable(g_pTextIconManager->textIconDict()->count(),2,this);
 
diff --git a/src/modules/perlcore/libkviperlcore.cpp b/src/modules/perlcore/libkviperlcore.cpp
index 38526094f..d58ca19c8 100644
--- a/src/modules/perlcore/libkviperlcore.cpp
+++ b/src/modules/perlcore/libkviperlcore.cpp
@@ -33,7 +33,7 @@
 #include "kvi_kvs_variant.h"
 #include "kvi_userinput.h"
 #include "kvi_qcstring.h"
-#include "kvi_dict.h"
+#include "kvi_pointerhashtable.h"
 
 #ifdef DEBUG
 	#undef DEBUG
@@ -295,7 +295,7 @@ bool KviPerlInterpreter::execute(
 	return true;
 }
 
-static KviDict<KviPerlInterpreter> * g_pInterpreters = 0;
+static KviPointerHashTable<QString,KviPerlInterpreter> * g_pInterpreters = 0;
 
 static KviPerlInterpreter * perlcore_get_interpreter(const QString &szContextName)
 {
@@ -322,7 +322,7 @@ static void perlcore_destroy_interpreter(const QString &szContextName)
 
 static void perlcore_destroy_all_interpreters()
 {
-	KviDictIterator<KviPerlInterpreter> it(*g_pInterpreters);
+	KviPointerHashTableIterator<QString,KviPerlInterpreter> it(*g_pInterpreters);
 	
 	while(it.current())
 	{
@@ -376,7 +376,7 @@ static bool perlcore_module_ctrl(KviModule * m,const char * cmd,void * param)
 static bool perlcore_module_init(KviModule * m)
 {
 #ifdef COMPILE_PERL_SUPPORT
-	g_pInterpreters = new KviDict<KviPerlInterpreter>(17,false);
+	g_pInterpreters = new KviPointerHashTable<QString,KviPerlInterpreter>(17,false);
 	g_pInterpreters->setAutoDelete(false);
 	return true;
 #else // !COMPILE_PERL_SUPPORT
diff --git a/src/modules/popupeditor/popupeditor.cpp b/src/modules/popupeditor/popupeditor.cpp
index 53e1b9d29..9ebbb7e67 100644
--- a/src/modules/popupeditor/popupeditor.cpp
+++ b/src/modules/popupeditor/popupeditor.cpp
@@ -46,7 +46,7 @@
 #include <qlayout.h>
 #include <qlabel.h>
 #include <qtooltip.h>
-#include "kvi_asciidict.h"
+#include "kvi_pointerhashtable.h"
 #include <qpushbutton.h>
 #include "kvi_tal_vbox.h"
 
@@ -1067,10 +1067,10 @@ void KviPopupEditor::oneTimeSetup()
 	if(m_bOneTimeSetupDone)return;
 	m_bOneTimeSetupDone = true;
 
-	const KviDict<KviKvsPopupMenu> * a = KviKvsPopupManager::instance()->popupDict();
+	const KviPointerHashTable<QString,KviKvsPopupMenu> * a = KviKvsPopupManager::instance()->popupDict();
 	if(!a)return;
 
-	KviDictIterator<KviKvsPopupMenu> it(*a);
+	KviPointerHashTableIterator<QString,KviKvsPopupMenu> it(*a);
 
 	KviMenuListViewItem * item;
 
@@ -1255,7 +1255,7 @@ void KviPopupEditor::commit()
 	KviMenuListViewItem * it = (KviMenuListViewItem *)m_pListView->firstChild();
 
 	// Copy the original popup dict
-	KviDict<KviKvsPopupMenu> copy(*(KviKvsPopupManager::instance()->popupDict()));
+	KviPointerHashTable<QString,KviKvsPopupMenu> copy(*(KviKvsPopupManager::instance()->popupDict()));
 	copy.setAutoDelete(false);
 
 	while(it)
@@ -1270,7 +1270,7 @@ void KviPopupEditor::commit()
 
 	// the remaining elements in the copy need to be removed from
 	// the "new" dictionary (they are no longer used)
-	KviDictIterator<KviKvsPopupMenu> iter(copy);
+	KviPointerHashTableIterator<QString,KviKvsPopupMenu> iter(copy);
 
 	while(iter.current())
 	{
diff --git a/src/modules/raweditor/raweditor.cpp b/src/modules/raweditor/raweditor.cpp
index bba9da924..6601a7004 100644
--- a/src/modules/raweditor/raweditor.cpp
+++ b/src/modules/raweditor/raweditor.cpp
@@ -116,7 +116,7 @@ void KviRawEditor::oneTimeSetup()
 
 	for(unsigned int i = 0;i < 999;i++)
 	{
-		KviPtrList<KviKvsEventHandler> * l = KviKvsEventManager::instance()->rawHandlers(i);
+		KviPointerList<KviKvsEventHandler> * l = KviKvsEventManager::instance()->rawHandlers(i);
 		if(l)
 		{
 			it = new KviRawListViewItem(m_pListView,i);
diff --git a/src/modules/regchan/libkviregchan.cpp b/src/modules/regchan/libkviregchan.cpp
index 9dfa88eb7..ca8c64234 100644
--- a/src/modules/regchan/libkviregchan.cpp
+++ b/src/modules/regchan/libkviregchan.cpp
@@ -199,7 +199,7 @@ static bool regchan_kvs_cmd_showlist(KviKvsModuleCommandCall * c)
 
 	int tot = 0;
 
-	KviAsciiDictIterator<KviRegisteredChannelList> it(*(g_pRegisteredChannelDataBase->channelDict()));
+	KviPointerHashTableIterator<const char *,KviRegisteredChannelList> it(*(g_pRegisteredChannelDataBase->channelDict()));
 	while(KviRegisteredChannelList * l = it.current())
 	{
 		for(KviRegisteredChannel * ch = l->first();ch;ch = l->next())
@@ -207,7 +207,7 @@ static bool regchan_kvs_cmd_showlist(KviKvsModuleCommandCall * c)
 			tot++;
 			c->window()->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs("Channel: %c%s@%s"),
 				KVI_TEXT_BOLD,ch->name().ptr(),ch->netMask().ptr());
-			KviAsciiDictIterator<KviStr> pit(*(ch->propertyDict()));
+			KviPointerHashTableIterator<const char *,KviStr> pit(*(ch->propertyDict()));
 			while(KviStr * s = pit.current())
 			{
 				c->window()->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs("   Property: %s=%s"),pit.currentKey(),s->ptr());
@@ -259,8 +259,8 @@ static bool regchan_kvs_fnc_list(KviKvsModuleFunctionCall * c)
 	if(szChan.isEmpty())szChan="*";
 	if(szNetmask.isEmpty())szNetmask="*";
 
-	KviAsciiDict<KviRegisteredChannelList> * d = g_pRegisteredChannelDataBase->channelDict();
-	KviAsciiDictIterator<KviRegisteredChannelList> it(*d);
+	KviPointerHashTable<const char *,KviRegisteredChannelList> * d = g_pRegisteredChannelDataBase->channelDict();
+	KviPointerHashTableIterator<const char *,KviRegisteredChannelList> it(*d);
 
 	while(KviRegisteredChannelList * l = it.current())
 	{
diff --git a/src/modules/reguser/dialog.cpp b/src/modules/reguser/dialog.cpp
index 7ac0c818f..64d07fc4c 100644
--- a/src/modules/reguser/dialog.cpp
+++ b/src/modules/reguser/dialog.cpp
@@ -51,7 +51,7 @@
 #else
 #include <qheader.h>
 #endif
-#include "kvi_asciidict.h"
+#include "kvi_pointerhashtable.h"
 #include <qimage.h>
 #include <qstring.h>
 #include <qcombobox.h>
@@ -406,8 +406,8 @@ void KviRegisteredUsersDialog::editGroup(KviRegisteredUserGroup* group)
 		group->setName(text);
 		g_pLocalRegisteredUserDataBase->groupDict()->insert(text,group);
 		
-		KviDict<KviRegisteredUser> * d = g_pLocalRegisteredUserDataBase->userDict();
-		KviDictIterator<KviRegisteredUser> it(*d);
+		KviPointerHashTable<QString,KviRegisteredUser> * d = g_pLocalRegisteredUserDataBase->userDict();
+		KviPointerHashTableIterator<QString,KviRegisteredUser> it(*d);
 	
 		while(KviRegisteredUser * u = it.current())
 		{
@@ -430,8 +430,8 @@ void KviRegisteredUsersDialog::listViewRightButtonClicked ( KviTalListViewItem *
 		{
 			KviTalPopupMenu *groups = new KviTalPopupMenu;
 			
-			KviDict<KviRegisteredUserGroup> * pGroups = g_pLocalRegisteredUserDataBase->groupDict();
-			KviDictIterator<KviRegisteredUserGroup> git(*pGroups);
+			KviPointerHashTable<QString,KviRegisteredUserGroup> * pGroups = g_pLocalRegisteredUserDataBase->groupDict();
+			KviPointerHashTableIterator<QString,KviRegisteredUserGroup> git(*pGroups);
 			m_TmpDict.clear();
 			while(KviRegisteredUserGroup * g = git.current())
 			{
@@ -467,10 +467,10 @@ void KviRegisteredUsersDialog::moveToGroupMenuClicked(int id)
 void KviRegisteredUsersDialog::fillList()
 {
 	m_pListView->clear();
-	KviDict<KviRegisteredUsersGroupItem> groupItems(5,false);
+	KviPointerHashTable<QString,KviRegisteredUsersGroupItem> groupItems(5,false);
 	
-	KviDict<KviRegisteredUserGroup> * pGroups = g_pLocalRegisteredUserDataBase->groupDict();
-	KviDictIterator<KviRegisteredUserGroup> git(*pGroups);
+	KviPointerHashTable<QString,KviRegisteredUserGroup> * pGroups = g_pLocalRegisteredUserDataBase->groupDict();
+	KviPointerHashTableIterator<QString,KviRegisteredUserGroup> git(*pGroups);
 	while(KviRegisteredUserGroup * g = git.current())
 	{
 		KviRegisteredUsersGroupItem* pCur = new KviRegisteredUsersGroupItem(m_pListView,g);
@@ -479,8 +479,8 @@ void KviRegisteredUsersDialog::fillList()
 		++git;
 	}
 	
-	KviDict<KviRegisteredUser> * d = g_pLocalRegisteredUserDataBase->userDict();
-	KviDictIterator<KviRegisteredUser> it(*d);
+	KviPointerHashTable<QString,KviRegisteredUser> * d = g_pLocalRegisteredUserDataBase->userDict();
+	KviPointerHashTableIterator<QString,KviRegisteredUser> it(*d);
 	KviRegisteredUsersDialogItem * item;
 
 	while(KviRegisteredUser * u = it.current())
@@ -572,7 +572,7 @@ void KviRegisteredUsersDialog::removeClicked()
 // 	KviRegisteredUsersDialogItemBase* b=(KviRegisteredUsersDialogItemBase*)it;
 // 	if(b->type()==KviRegisteredUsersDialogItemBase::User)
 // 	{
-// 		KviPtrList<KviRegisteredUsersDialogItem> l;
+// 		KviPointerList<KviRegisteredUsersDialogItem> l;
 // 		l.setAutoDelete(false);
 // 		while(it)
 // 		{
@@ -710,11 +710,11 @@ void KviRegisteredUsersDialog::exportClicked()
 		if(u)
 		{
 			if(!f.save(szName))goto write_error;
-			KviDict<QString> * pd = u->propertyDict();
+			KviPointerHashTable<QString,QString> * pd = u->propertyDict();
 			if(pd)
 			{
 				if(!f.save(pd->count()))goto write_error;
-				KviDictIterator<QString> it(*pd);
+				KviPointerHashTableIterator<QString,QString> it(*pd);
 				while(it.current())
 				{
 					QString key = it.currentKey();
@@ -726,7 +726,7 @@ void KviRegisteredUsersDialog::exportClicked()
 				if(!f.save(0))goto write_error;
 			}
 
-			KviPtrList<KviIrcMask> * ml = u->maskList();
+			KviPointerList<KviIrcMask> * ml = u->maskList();
 			if(ml)
 			{
 				if(!f.save(ml->count()))goto write_error;
diff --git a/src/modules/reguser/dialog.h b/src/modules/reguser/dialog.h
index 9bad72dfe..ef9bee676 100644
--- a/src/modules/reguser/dialog.h
+++ b/src/modules/reguser/dialog.h
@@ -32,7 +32,7 @@
 #include <qpushbutton.h>
 #include "kvi_tal_listview.h"
 #include "kvi_tal_listbox.h"
-#include "kvi_dict.h"
+#include "kvi_pointerhashtable.h"
 #include "kvi_tal_popupmenu.h"
 #ifdef COMPILE_USE_QT4
 	#include <q3intdict.h>
diff --git a/src/modules/reguser/edituser.cpp b/src/modules/reguser/edituser.cpp
index f6b82516b..ed6e21b16 100644
--- a/src/modules/reguser/edituser.cpp
+++ b/src/modules/reguser/edituser.cpp
@@ -51,7 +51,7 @@
 #else

 #include <qheader.h>

 #endif

-#include "kvi_asciidict.h"

+#include "kvi_pointerhashtable.h"

 #include <qimage.h>

 #include <qstring.h>

 #include <qcombobox.h>

@@ -78,7 +78,7 @@ KviRegisteredUserDataBase * g_pLocalRegisteredUserDataBase; // local copy!
 

 

 

-KviReguserPropertiesDialog::KviReguserPropertiesDialog(QWidget * p,KviDict<QString> * dict)

+KviReguserPropertiesDialog::KviReguserPropertiesDialog(QWidget * p,KviPointerHashTable<QString,QString> * dict)

 : QDialog(p,"property_editor",true)

 {

 	m_pPropertyDict = dict;

@@ -148,7 +148,7 @@ void KviReguserPropertiesDialog::closeEvent(QCloseEvent *e)
 void KviReguserPropertiesDialog::fillData()

 {

 	m_pTable->setNumRows(m_pPropertyDict->count());

-	KviDictIterator<QString> it(*m_pPropertyDict);

+	KviPointerHashTableIterator<QString,QString> it(*m_pPropertyDict);

 	int row = 0;

 	while(it.current())

 	{

@@ -324,7 +324,7 @@ KviRegisteredUserEntryDialog::KviRegisteredUserEntryDialog(QWidget *p,KviRegiste
 		KviStringConversion::fromString(col,(*m_pCustomColor));

 	}

 	

-	m_pPropertyDict = new KviDict<QString>(17,false);

+	m_pPropertyDict = new KviPointerHashTable<QString,QString>(17,false);

 	m_pPropertyDict->setAutoDelete(true);

 

 	//setMinimumSize(400,450);

@@ -514,7 +514,7 @@ KviRegisteredUserEntryDialog::KviRegisteredUserEntryDialog(QWidget *p,KviRegiste
 		

 		if(r->propertyDict())

 		{

-			KviDictIterator<QString> it(*(r->propertyDict()));

+			KviPointerHashTableIterator<QString,QString> it(*(r->propertyDict()));

 			while(QString *s = it.current())

 			{

 				m_pPropertyDict->insert(it.currentKey(),new QString(*s));

@@ -636,7 +636,7 @@ void KviRegisteredUserEntryDialog::okClicked()
 	m_pPropertyDict->remove("notify");

 	m_pPropertyDict->remove("avatar");

 

-	KviDictIterator<QString> it(*m_pPropertyDict);

+	KviPointerHashTableIterator<QString,QString> it(*m_pPropertyDict);

 	while(QString *s = it.current())

 	{

 		u->setProperty(it.currentKey(),*s);

diff --git a/src/modules/reguser/edituser.h b/src/modules/reguser/edituser.h
index 8e711d9e7..566322e89 100644
--- a/src/modules/reguser/edituser.h
+++ b/src/modules/reguser/edituser.h
@@ -33,7 +33,7 @@
 #include <qpushbutton.h>
 #include "kvi_tal_listview.h"
 #include "kvi_tal_listbox.h"
-#include "kvi_dict.h"
+#include "kvi_pointerhashtable.h"
 #include <kvi_tal_tabdialog.h>
 #ifdef COMPILE_USE_QT4
 #include <q3table.h>
@@ -58,7 +58,7 @@ class KviReguserPropertiesDialog : public QDialog
 {
 	Q_OBJECT
 public:
-	KviReguserPropertiesDialog(QWidget *p,KviDict<QString> * dict);
+	KviReguserPropertiesDialog(QWidget *p,KviPointerHashTable<QString,QString> * dict);
 	~KviReguserPropertiesDialog();
 protected:
 #ifdef COMPILE_USE_QT4
@@ -66,7 +66,7 @@ protected:
 #else
 	QTable             * m_pTable;
 #endif
-	KviDict<QString>     * m_pPropertyDict;
+	KviPointerHashTable<QString,QString>     * m_pPropertyDict;
 	QPushButton        * m_pDelButton;
 	QPushButton        * m_pAddButton;
 protected:
@@ -122,7 +122,7 @@ protected:
 	KviPixmap          * m_pAvatar;
 	KviPixmapSelector  * m_pAvatarSelector;
 
-	KviDict<QString>     * m_pPropertyDict;
+	KviPointerHashTable<QString,QString>     * m_pPropertyDict;
 	
 	QCheckBox          * m_pCustomColorCheck;
 	QColor		   * m_pCustomColor;
diff --git a/src/modules/reguser/libkvireguser.cpp b/src/modules/reguser/libkvireguser.cpp
index e51f35e76..53f403b0e 100644
--- a/src/modules/reguser/libkvireguser.cpp
+++ b/src/modules/reguser/libkvireguser.cpp
@@ -39,7 +39,7 @@
 #include "kvi_ircconnection.h"
 #include "dialog.h"
 
-#include "kvi_list.h"
+#include "kvi_pointerlist.h"
 #include <qsplitter.h> // FIXME: REmove this!
 
 //#warning "$reguser.matches..."
@@ -52,7 +52,7 @@
 
 extern KVIRC_API KviRegisteredUserDataBase * g_pRegisteredUserDataBase;
 
-KviPtrList<KviRegistrationWizard> * g_pRegistrationWizardList = 0;
+KviPointerList<KviRegistrationWizard> * g_pRegistrationWizardList = 0;
 
 KviRegisteredUsersDialog * g_pRegisteredUsersDialog = 0;
 
@@ -754,12 +754,12 @@ static bool reguser_kvs_fnc_list(KviKvsModuleFunctionCall * c)
 	
 	int cnt = 0;
 
-	KviDict<KviRegisteredUser> * d = g_pRegisteredUserDataBase->userDict();
-	KviDictIterator<KviRegisteredUser> it(*d);
+	KviPointerHashTable<QString,KviRegisteredUser> * d = g_pRegisteredUserDataBase->userDict();
+	KviPointerHashTableIterator<QString,KviRegisteredUser> it(*d);
 
 	while(KviRegisteredUser * u = it.current())
 	{
-		KviPtrList<KviIrcMask> * ml = u->maskList();
+		KviPointerList<KviIrcMask> * ml = u->maskList();
 		if(u->matches(mask) || (ml->count() == 0))
 		{
 			pArray->set(aid,new KviKvsVariant(u->name()));
@@ -810,11 +810,11 @@ static bool reguser_kvs_cmd_showlist(KviKvsModuleCommandCall * c)
 
 	int count = 0;
 
-	KviDict<KviRegisteredUser> * d = g_pRegisteredUserDataBase->userDict();
-	KviDictIterator<KviRegisteredUser> it(*d);
+	KviPointerHashTable<QString,KviRegisteredUser> * d = g_pRegisteredUserDataBase->userDict();
+	KviPointerHashTableIterator<QString,KviRegisteredUser> it(*d);
 	while(KviRegisteredUser * u = it.current())
 	{
-		KviPtrList<KviIrcMask> * ml = u->maskList();
+		KviPointerList<KviIrcMask> * ml = u->maskList();
 		if(u->matches(mask) || (ml->count() == 0))
 		{
 			c->window()->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs(" User: %c%Q"),KVI_TEXT_BOLD,&(u->name()));
@@ -829,10 +829,10 @@ static bool reguser_kvs_cmd_showlist(KviKvsModuleCommandCall * c)
 				}
 			}
 
-			KviDict<QString> * pd = u->propertyDict();
+			KviPointerHashTable<QString,QString> * pd = u->propertyDict();
 			if(pd)
 			{
-				KviDictIterator<QString> pdit(*pd);
+				KviPointerHashTableIterator<QString,QString> pdit(*pd);
 				while(pdit.current())
 				{
 					QString key = pdit.currentKey();
@@ -961,8 +961,8 @@ static bool reguser_kvs_fnc_exactMatch(KviKvsModuleFunctionCall * c)
 //
 //	KviStr list;
 //
-//	const KviAsciiDict<KviRegisteredUserList> * d = g_pRegisteredUserDataBase->nickDict();
-//	KviAsciiDictIterator<KviRegisteredUserList> it(*d);
+//	const KviPointerHashTable<const char *,KviRegisteredUserList> * d = g_pRegisteredUserDataBase->nickDict();
+//	KviPointerHashTableIterator<const char *,KviRegisteredUserList> it(*d);
 //	while(KviRegisteredUserList * l = it.current())
 //	{
 //		search_reguser_list(l,c->window(),parms->safeFirstParam(),list);
@@ -1184,7 +1184,7 @@ static bool reguser_kvs_cmd_wizard(KviKvsModuleCommandCall * c)
 static bool reguser_module_init(KviModule * m)
 {
 	g_pLocalRegisteredUserDataBase = 0;
-	g_pRegistrationWizardList = new KviPtrList<KviRegistrationWizard>;
+	g_pRegistrationWizardList = new KviPointerList<KviRegistrationWizard>;
 	g_pRegistrationWizardList->setAutoDelete(true);
 
 	KVSM_REGISTER_SIMPLE_COMMAND(m,"add",reguser_kvs_cmd_add);
diff --git a/src/modules/reguser/wizard.cpp b/src/modules/reguser/wizard.cpp
index 327612824..8661921df 100644
--- a/src/modules/reguser/wizard.cpp
+++ b/src/modules/reguser/wizard.cpp
@@ -24,7 +24,7 @@
 #include "wizard.h"
 
 #include "kvi_locale.h"
-#include "kvi_list.h"
+#include "kvi_pointerlist.h"
 #include "kvi_app.h"
 #include "kvi_ircmask.h"
 #include "kvi_selectors.h"
@@ -46,7 +46,7 @@
 
 
 extern KVIRC_API KviRegisteredUserDataBase * g_pRegisteredUserDataBase;
-extern KviPtrList<KviRegistrationWizard> * g_pRegistrationWizardList;
+extern KviPointerList<KviRegistrationWizard> * g_pRegistrationWizardList;
 
 KviRegistrationWizard::KviRegistrationWizard(const char * startMask,KviRegisteredUserDataBase * db,QWidget * par,bool bModal)
 : KviTalWizard(par)
diff --git a/src/modules/rijndael/libkvirijndael.cpp b/src/modules/rijndael/libkvirijndael.cpp
index 8bd3ba5e9..e974d0f68 100644
--- a/src/modules/rijndael/libkvirijndael.cpp
+++ b/src/modules/rijndael/libkvirijndael.cpp
@@ -65,9 +65,9 @@
 	#include "kvi_memmove.h"
 	#include "kvi_malloc.h"
 
-	#include "kvi_list.h"
+	#include "kvi_pointerlist.h"
 
-	static KviPtrList<KviCryptEngine> * g_pEngineList = 0;
+	static KviPointerList<KviCryptEngine> * g_pEngineList = 0;
 
 
 
@@ -706,7 +706,7 @@
 static bool rijndael_module_init(KviModule * m)
 {
 #ifdef COMPILE_CRYPT_SUPPORT
-	g_pEngineList = new KviPtrList<KviCryptEngine>;
+	g_pEngineList = new KviPointerList<KviCryptEngine>;
 	g_pEngineList->setAutoDelete(false);
 
 	KviStr format = __tr("Cryptographic engine based on the\n" \
diff --git a/src/modules/sharedfile/libkvisharedfile.cpp b/src/modules/sharedfile/libkvisharedfile.cpp
index 88e9e08eb..4095af0b3 100644
--- a/src/modules/sharedfile/libkvisharedfile.cpp
+++ b/src/modules/sharedfile/libkvisharedfile.cpp
@@ -36,7 +36,7 @@
 
 
 #include <time.h>
-#include "kvi_asciidict.h"
+#include "kvi_pointerhashtable.h"
 
 extern KVIRC_API KviSharedFilesManager * g_pSharedFilesManager;
 
@@ -210,7 +210,7 @@ static bool sharedfile_kvs_cmd_clear(KviKvsModuleCommandCall * c)
 
 static bool sharedfile_kvs_cmd_list(KviKvsModuleCommandCall * c)
 {
-	KviDictIterator<KviSharedFileList> it(*(g_pSharedFilesManager->sharedFileListDict()));
+	KviPointerHashTableIterator<QString,KviSharedFileList> it(*(g_pSharedFilesManager->sharedFileListDict()));
 
 	int idx = 0;
 
diff --git a/src/modules/sharedfileswindow/libkvisharedfileswindow.cpp b/src/modules/sharedfileswindow/libkvisharedfileswindow.cpp
index e48d48000..df4a3e299 100644
--- a/src/modules/sharedfileswindow/libkvisharedfileswindow.cpp
+++ b/src/modules/sharedfileswindow/libkvisharedfileswindow.cpp
@@ -106,7 +106,7 @@ static bool sharedfileswindow_kvs_cmd_open(KviKvsModuleCommandCall * c)
 	KviModuleExtensionDescriptor * d = c->module()->findExtensionDescriptor("tool",KVI_SHARED_FILES_WINDOW_EXTENSION_NAME);
 	if(d)
 	{
-		KviDict<QVariant> dict(17,true);
+		KviPointerHashTable<QString,QVariant> dict(17,true);
 		dict.setAutoDelete(true);
 		dict.replace("bCreateMinimized",new QVariant(c->hasSwitch('m',"minimized")));
 		dict.replace("bNoRaise",new QVariant(c->hasSwitch('n',"noraise")));
diff --git a/src/modules/sharedfileswindow/sharedfileswindow.cpp b/src/modules/sharedfileswindow/sharedfileswindow.cpp
index c6deec20d..bab3490f3 100644
--- a/src/modules/sharedfileswindow/sharedfileswindow.cpp
+++ b/src/modules/sharedfileswindow/sharedfileswindow.cpp
@@ -290,7 +290,7 @@ void KviSharedFilesWindow::editClicked()
 void KviSharedFilesWindow::fillFileView()
 {
 	m_pListView->clear();
-	KviDictIterator<KviSharedFileList> it(*(g_pSharedFilesManager->sharedFileListDict()));
+	KviPointerHashTableIterator<QString,KviSharedFileList> it(*(g_pSharedFilesManager->sharedFileListDict()));
 
 	KviSharedFilesListViewItem * itm;
 
@@ -343,7 +343,7 @@ void KviSharedFilesWindow::tipRequest(KviDynamicToolTip * tip,const QPoint &pnt)
 /*
 void KviSharedFilesWindow::fillTransferView()
 {
-	KviPtrList<KviSharedFiles> * l = KviSharedFilesManager::instance()->transferList();
+	KviPointerList<KviSharedFiles> * l = KviSharedFilesManager::instance()->transferList();
 	if(!l)return;
 	KviSharedFilesItem * it;
 	for(KviSharedFiles * t = l->first();t;t = l->next())
diff --git a/src/modules/snd/libkvisnd.cpp b/src/modules/snd/libkvisnd.cpp
index 9f95e442b..cfdfac002 100644
--- a/src/modules/snd/libkvisnd.cpp
+++ b/src/modules/snd/libkvisnd.cpp
@@ -80,10 +80,10 @@ static KviSoundPlayer * g_pSoundPlayer = 0;
 KviSoundPlayer::KviSoundPlayer()
 : QObject()
 {
-	m_pThreadList = new KviPtrList<KviSoundThread>;
+	m_pThreadList = new KviPointerList<KviSoundThread>;
 	m_pThreadList->setAutoDelete(true);
 
-	m_pSoundSystemDict = new KviDict<SoundSystemRoutine>(17,false);
+	m_pSoundSystemDict = new KviPointerHashTable<QString,SoundSystemRoutine>(17,false);
 	m_pSoundSystemDict->setAutoDelete(true);
 
 #ifdef COMPILE_ON_WINDOWS
@@ -134,7 +134,7 @@ KviSoundPlayer::~KviSoundPlayer()
 
 void KviSoundPlayer::getAvailableSoundSystems(QStringList *l)
 {
-	KviDictIterator<SoundSystemRoutine> it(*m_pSoundSystemDict);
+	KviPointerHashTableIterator<QString,SoundSystemRoutine> it(*m_pSoundSystemDict);
 	while(it.current())
 	{
 		l->append(it.currentKey());
diff --git a/src/modules/snd/libkvisnd.h b/src/modules/snd/libkvisnd.h
index c1e52b778..a5fd3c63c 100644
--- a/src/modules/snd/libkvisnd.h
+++ b/src/modules/snd/libkvisnd.h
@@ -30,8 +30,8 @@
 #include "kvi_thread.h"
 #include "kvi_string.h"
 
-#include "kvi_list.h"
-#include "kvi_dict.h"
+#include "kvi_pointerlist.h"
+#include "kvi_pointerhashtable.h"
 #include "kvi_options.h"
 
 //class KviWavSoundFileReader
@@ -177,13 +177,13 @@ public:
 	bool play(const QString &szFileName);
 	void detectSoundSystem();
 	bool havePlayingSounds();
-	//void getAvailableSoundSystems(KviPtrList<QString> * l);
+	//void getAvailableSoundSystems(KviPointerList<QString> * l);
 	void getAvailableSoundSystems(QStringList * l);
 	bool isMuted() {return KVI_OPTION_BOOL(KviOption_boolMuteAllSounds); };
 	void setMuted(bool muted) {KVI_OPTION_BOOL(KviOption_boolMuteAllSounds)=muted;};
 protected:
-	KviPtrList<KviSoundThread> * m_pThreadList;
-	KviDict<SoundSystemRoutine> * m_pSoundSystemDict;
+	KviPointerList<KviSoundThread> * m_pThreadList;
+	KviPointerHashTable<QString,SoundSystemRoutine> * m_pSoundSystemDict;
 protected:
 	void registerSoundThread(KviSoundThread * t);
 	void unregisterSoundThread(KviSoundThread * t);
diff --git a/src/modules/socketspy/libkvisocketspy.cpp b/src/modules/socketspy/libkvisocketspy.cpp
index 342df128b..f77d863c4 100644
--- a/src/modules/socketspy/libkvisocketspy.cpp
+++ b/src/modules/socketspy/libkvisocketspy.cpp
@@ -31,7 +31,7 @@
 
 #include <qsplitter.h>
 
-KviPtrList<KviSocketSpyWindow> * g_pSocketSpyWindowList = 0;
+KviPointerList<KviSocketSpyWindow> * g_pSocketSpyWindowList = 0;
 
 
 /*
@@ -60,7 +60,7 @@ static bool socketspy_kvs_cmd_open(KviKvsModuleCommandCall * c)
 
 static bool socketspy_module_init(KviModule * m)
 {
-	g_pSocketSpyWindowList = new KviPtrList<KviSocketSpyWindow>;
+	g_pSocketSpyWindowList = new KviPointerList<KviSocketSpyWindow>;
 	g_pSocketSpyWindowList->setAutoDelete(false);
 
 	KVSM_REGISTER_SIMPLE_COMMAND(m,"open",socketspy_kvs_cmd_open);
diff --git a/src/modules/socketspy/socketspywindow.cpp b/src/modules/socketspy/socketspywindow.cpp
index 6456d5992..3af4e5b4f 100644
--- a/src/modules/socketspy/socketspywindow.cpp
+++ b/src/modules/socketspy/socketspywindow.cpp
@@ -31,7 +31,7 @@
 #include <qsplitter.h>
 //#include "kvi_module.h"
 
-extern KviPtrList<KviSocketSpyWindow> * g_pSocketSpyWindowList;
+extern KviPointerList<KviSocketSpyWindow> * g_pSocketSpyWindowList;
 
 KviSocketSpyWindow::KviSocketSpyWindow(KviFrame * lpFrm,KviConsole * lpConsole)
 : KviWindow(KVI_WINDOW_TYPE_SOCKETSPY,lpFrm,"socket_spy",lpConsole) , KviIrcDataStreamMonitor(lpConsole->context())
diff --git a/src/modules/spaste/controller.cpp b/src/modules/spaste/controller.cpp
index 4e6df0429..23f4e732a 100644
--- a/src/modules/spaste/controller.cpp
+++ b/src/modules/spaste/controller.cpp
@@ -30,7 +30,7 @@
 #include <qstringlist.h>
 #include <qclipboard.h>
 
-extern KviPtrList<SPasteController> * g_pControllerList;
+extern KviPointerList<SPasteController> * g_pControllerList;
 
 SPasteController::SPasteController(KviWindow * w,int id)
 	: m_pClipBuff(NULL),m_pFile(NULL),m_pId(id),m_pWindow(w)
diff --git a/src/modules/spaste/libkvispaste.cpp b/src/modules/spaste/libkvispaste.cpp
index 14f40be7e..0d3457c40 100644
--- a/src/modules/spaste/libkvispaste.cpp
+++ b/src/modules/spaste/libkvispaste.cpp
@@ -41,7 +41,7 @@
     #include <unistd.h>
 #endif
 
-KviPtrList<SPasteController> * g_pControllerList = 0;
+KviPointerList<SPasteController> * g_pControllerList = 0;
 int ctrlId = 0;
 
 static SPasteController * spaste_find_controller(KviWindow * w)
@@ -208,7 +208,7 @@ static bool spaste_kvs_cmd_stop(KviKvsModuleCommandCall * c)
         return true;
     } else 
     {
-        KviPtrListIterator<SPasteController> it(*g_pControllerList);
+        KviPointerListIterator<SPasteController> it(*g_pControllerList);
         SPasteController *item;
         
         if(!iId) //Delete all spaste's from the current window
@@ -264,7 +264,7 @@ static bool spaste_kvs_cmd_stop(KviKvsModuleCommandCall * c)
 
 static bool spaste_kvs_cmd_list(KviKvsModuleCommandCall * c)
 { 
-	KviPtrListIterator<SPasteController> it(*g_pControllerList);
+	KviPointerListIterator<SPasteController> it(*g_pControllerList);
     SPasteController *item;
     
     while( (item = it.current()) != 0)
@@ -312,7 +312,7 @@ static bool spaste_kvs_cmd_setdelay(KviKvsModuleCommandCall * c)
 //-------------------------------------------------    
 static bool spaste_module_init(KviModule * m)
 {
-    g_pControllerList = new KviPtrList<SPasteController>;
+    g_pControllerList = new KviPointerList<SPasteController>;
     g_pControllerList->setAutoDelete(false);
 
 	KVSM_REGISTER_SIMPLE_COMMAND(m,"file",spaste_kvs_cmd_file);
diff --git a/src/modules/system/plugin.cpp b/src/modules/system/plugin.cpp
index 9aeb1b615..ebebfbb1f 100644
--- a/src/modules/system/plugin.cpp
+++ b/src/modules/system/plugin.cpp
@@ -212,7 +212,7 @@ void KviPlugin::setName(const QString& Name)
 
 KviPluginManager::KviPluginManager()
 {
-	m_pPluginDict = new KviDict<KviPlugin>(5,false);
+	m_pPluginDict = new KviPointerHashTable<QString,KviPlugin>(5,false);
 	m_pPluginDict->setAutoDelete(false);
 	
 	m_bCanUnload = true;
@@ -339,7 +339,7 @@ bool KviPluginManager::checkUnload()
 	Always called when system module should be unloaded
 	Checking here if all small "modules" can be unloaded	
 	*/
-	KviDictIterator<KviPlugin> it(*m_pPluginDict);
+	KviPointerHashTableIterator<QString,KviPlugin> it(*m_pPluginDict);
 	
 	m_bCanUnload = true;
 	
@@ -360,7 +360,7 @@ bool KviPluginManager::checkUnload()
 
 void KviPluginManager::unloadAll()
 {
-	KviDictIterator<KviPlugin> it(*m_pPluginDict);
+	KviPointerHashTableIterator<QString,KviPlugin> it(*m_pPluginDict);
 	
 	while(it.current())
 	{
diff --git a/src/modules/system/plugin.h b/src/modules/system/plugin.h
index 8e7f936af..b8727db2a 100644
--- a/src/modules/system/plugin.h
+++ b/src/modules/system/plugin.h
@@ -25,7 +25,7 @@
 //=============================================================================
 
 #include "kvi_module.h"
-#include "kvi_dict.h"
+#include "kvi_pointerhashtable.h"
 
 typedef int (*plugin_function)(int argc, char* argv[], char ** buffer);
 typedef int (*plugin_unload)();
@@ -65,7 +65,7 @@ class KviPluginManager
 		// shared
 		bool m_bCanUnload;
 		// internal
-		KviDict<KviPlugin> * m_pPluginDict;
+		KviPointerHashTable<QString,KviPlugin> * m_pPluginDict;
 	public:
 		bool pluginCall(KviKvsModuleFunctionCall *c);
 		bool checkUnload();
diff --git a/src/modules/term/libkviterm.cpp b/src/modules/term/libkviterm.cpp
index 3ba5d66a4..94f38035e 100644
--- a/src/modules/term/libkviterm.cpp
+++ b/src/modules/term/libkviterm.cpp
@@ -29,7 +29,7 @@
 #include "kvi_frame.h"
 
 #include <qsplitter.h>
-#include "kvi_list.h"
+#include "kvi_pointerlist.h"
 
 #ifdef COMPILE_KDE_SUPPORT
 
@@ -47,8 +47,8 @@
 KviModule * g_pTermModule = 0;
 
 #ifdef COMPILE_KDE_SUPPORT
-	KviPtrList<KviTermWidget> * g_pTermWidgetList      = 0;
-	KviPtrList<KviTermWindow> * g_pTermWindowList      = 0;
+	KviPointerList<KviTermWidget> * g_pTermWidgetList      = 0;
+	KviPointerList<KviTermWindow> * g_pTermWindowList      = 0;
 	KviStr                 g_szKonsoleLibraryName = "";
 #endif
 
@@ -104,9 +104,9 @@ static bool term_module_init(KviModule * m)
 	g_pTermModule = m;
 
 #ifdef COMPILE_KDE_SUPPORT
-	g_pTermWidgetList = new KviPtrList<KviTermWidget>;
+	g_pTermWidgetList = new KviPointerList<KviTermWidget>;
 	g_pTermWidgetList->setAutoDelete(false);
-	g_pTermWindowList = new KviPtrList<KviTermWindow>;
+	g_pTermWindowList = new KviPointerList<KviTermWindow>;
 	g_pTermWindowList->setAutoDelete(false);
 
 //	KTrader::OfferList offers = KTrader::self()->query("Browser/View","KonsolePart");
diff --git a/src/modules/term/termwidget.cpp b/src/modules/term/termwidget.cpp
index 703ba01d0..26ed7c3af 100644
--- a/src/modules/term/termwidget.cpp
+++ b/src/modules/term/termwidget.cpp
@@ -29,7 +29,7 @@
 #include "kvi_locale.h"
 
 #include <qlabel.h>
-#include "kvi_list.h"
+#include "kvi_pointerlist.h"
 #include <qtooltip.h>
 #include <qtimer.h>
 
@@ -40,8 +40,8 @@
 #include "kparts/factory.h"
 
 extern KviModule            * g_pTermModule;
-extern KviPtrList<KviTermWidget> * g_pTermWidgetList;
-extern KviPtrList<KviTermWindow> * g_pTermWindowList;
+extern KviPointerList<KviTermWidget> * g_pTermWidgetList;
+extern KviPointerList<KviTermWindow> * g_pTermWindowList;
 extern KviStr                 g_szKonsoleLibraryName;
 
 KviTermWidget::KviTermWidget(QWidget * par,KviFrame * lpFrm,bool bIsStandalone)
diff --git a/src/modules/term/termwindow.cpp b/src/modules/term/termwindow.cpp
index 45fc58e3c..04ab34643 100644
--- a/src/modules/term/termwindow.cpp
+++ b/src/modules/term/termwindow.cpp
@@ -31,8 +31,8 @@
 #include "kvi_module.h"
 
 extern KviModule * g_pTermModule;
-extern KviPtrList<KviTermWindow> * g_pTermWindowList;
-extern KviPtrList<KviTermWidget> * g_pTermWidgetList;
+extern KviPointerList<KviTermWindow> * g_pTermWindowList;
+extern KviPointerList<KviTermWidget> * g_pTermWidgetList;
 
 KviTermWindow::KviTermWindow(KviFrame * lpFrm,const char * name)
 : KviWindow(KVI_WINDOW_TYPE_TERM,lpFrm,name)
diff --git a/src/modules/texticons/libkvitexticons.cpp b/src/modules/texticons/libkvitexticons.cpp
index cca494b36..36cdd7f75 100644
--- a/src/modules/texticons/libkvitexticons.cpp
+++ b/src/modules/texticons/libkvitexticons.cpp
@@ -66,7 +66,7 @@ static bool texticons_kvs_fnc_get(KviKvsModuleFunctionCall * c)
 	} else {
 		KviKvsHash* hash = new KviKvsHash();
 		
-		KviDictIterator<KviTextIcon> it(*(g_pTextIconManager->textIconDict()));
+		KviPointerHashTableIterator<QString,KviTextIcon> it(*(g_pTextIconManager->textIconDict()));
 		
 		while(KviTextIcon * i = it.current())
 		{
diff --git a/src/modules/theme/managementdialog.cpp b/src/modules/theme/managementdialog.cpp
index e72ede3d6..cef417909 100644
--- a/src/modules/theme/managementdialog.cpp
+++ b/src/modules/theme/managementdialog.cpp
@@ -262,7 +262,7 @@ void KviThemeManagementDialog::cleanup()
 
 void KviThemeManagementDialog::packTheme()
 {
-	KviPtrList<KviThemeInfo> dl;
+	KviPointerList<KviThemeInfo> dl;
 	dl.setAutoDelete(false);
 	for(KviThemeListBoxItem * it = (KviThemeListBoxItem *)m_pListBox->firstItem();it;it = (KviThemeListBoxItem *)it->next())
 	{
diff --git a/src/modules/theme/managementdialog.h b/src/modules/theme/managementdialog.h
index 54588b609..9feb2117e 100644
--- a/src/modules/theme/managementdialog.h
+++ b/src/modules/theme/managementdialog.h
@@ -25,7 +25,7 @@
 //=============================================================================
 
 #include "kvi_optionswidget.h"
-#include "kvi_list.h"
+#include "kvi_pointerlist.h"
 #include "kvi_theme.h"
 
 #include <qdialog.h>
diff --git a/src/modules/theme/packthemedialog.cpp b/src/modules/theme/packthemedialog.cpp
index 53fe5de98..036c95434 100644
--- a/src/modules/theme/packthemedialog.cpp
+++ b/src/modules/theme/packthemedialog.cpp
@@ -65,7 +65,7 @@
 
 
 
-KviPackThemeDialog::KviPackThemeDialog(QWidget * pParent,KviPtrList<KviThemeInfo> * pThemeInfoList)
+KviPackThemeDialog::KviPackThemeDialog(QWidget * pParent,KviPointerList<KviThemeInfo> * pThemeInfoList)
 : KviTalWizard(pParent)
 {
 	m_pThemeInfoList = pThemeInfoList;
diff --git a/src/modules/theme/packthemedialog.h b/src/modules/theme/packthemedialog.h
index 083d42f39..9834006a2 100644
--- a/src/modules/theme/packthemedialog.h
+++ b/src/modules/theme/packthemedialog.h
@@ -25,7 +25,7 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_list.h"
+#include "kvi_pointerlist.h"
 #include "kvi_theme.h"
 
 #include <qdialog.h>
@@ -42,7 +42,7 @@ class KviPackThemeDialog : public KviTalWizard
 {
 	Q_OBJECT
 public:
-	KviPackThemeDialog(QWidget * pParent,KviPtrList<KviThemeInfo> * pThemeInfoList);
+	KviPackThemeDialog(QWidget * pParent,KviPointerList<KviThemeInfo> * pThemeInfoList);
 	virtual ~KviPackThemeDialog();
 protected:
 	QString m_szImagePath;
@@ -50,7 +50,7 @@ protected:
 	QString m_szPackagePath;
 	KviFileSelector * m_pPathSelector;
 	QLabel * m_pImageLabel;
-	KviPtrList<KviThemeInfo> * m_pThemeInfoList;
+	KviPointerList<KviThemeInfo> * m_pThemeInfoList;
 	QLineEdit * m_pPackageNameEdit;
 	KviTalTextEdit * m_pPackageDescriptionEdit;
 	QLineEdit * m_pPackageVersionEdit;
diff --git a/src/modules/theme/savethemedialog.h b/src/modules/theme/savethemedialog.h
index 0e26ce44b..1ab9548ba 100644
--- a/src/modules/theme/savethemedialog.h
+++ b/src/modules/theme/savethemedialog.h
@@ -25,7 +25,7 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_list.h"
+#include "kvi_pointerlist.h"
 #include "kvi_theme.h"
 
 #include <qdialog.h>
diff --git a/src/modules/theme/themefunctions.cpp b/src/modules/theme/themefunctions.cpp
index 6b5993943..2afa21f3a 100644
--- a/src/modules/theme/themefunctions.cpp
+++ b/src/modules/theme/themefunctions.cpp
@@ -53,7 +53,7 @@ namespace KviThemeFunctions
 
 	bool installThemePackage(const QString &szThemePackageFileName,QString &szError,QWidget * pDialogParent)
 	{
-		KviDict<QString> * pInfoFields;
+		KviPointerHashTable<QString,QString> * pInfoFields;
 		QString * pValue;
 		bool bInstall;
 		QPixmap pix;
diff --git a/src/modules/toolbar/libkvitoolbar.cpp b/src/modules/toolbar/libkvitoolbar.cpp
index 66c66e571..54b965004 100644
--- a/src/modules/toolbar/libkvitoolbar.cpp
+++ b/src/modules/toolbar/libkvitoolbar.cpp
@@ -359,7 +359,7 @@ static bool toolbar_kvs_fnc_list(KviKvsModuleFunctionCall * c)
 { 
 	KviKvsArray * a = new KviKvsArray();
 
-	KviDictIterator<KviCustomToolBarDescriptor> it(*(KviCustomToolBarManager::instance()->descriptors()));
+	KviPointerHashTableIterator<QString,KviCustomToolBarDescriptor> it(*(KviCustomToolBarManager::instance()->descriptors()));
 
 	kvs_uint_t id = 0;
 
@@ -550,7 +550,7 @@ static bool toolbar_kvs_fnc_items(KviKvsModuleFunctionCall * c)
 
 	KviKvsArray * a = new KviKvsArray();
 
-	KviDictIterator<KviCustomToolBarDescriptor> it(*(KviCustomToolBarManager::instance()->descriptors()));
+	KviPointerHashTableIterator<QString,KviCustomToolBarDescriptor> it(*(KviCustomToolBarManager::instance()->descriptors()));
 
 	kvs_uint_t id = 0;
 
diff --git a/src/modules/toolbareditor/toolbareditor.cpp b/src/modules/toolbareditor/toolbareditor.cpp
index 8cb4a64cd..f697046a5 100644
--- a/src/modules/toolbareditor/toolbareditor.cpp
+++ b/src/modules/toolbareditor/toolbareditor.cpp
@@ -406,7 +406,7 @@ void KviCustomizeToolBarsDialog::exportToolBar()
 
 	if(bExportActions)
 	{
-		KviPtrList<QString> * a = t->descriptor()->actions();
+		KviPointerList<QString> * a = t->descriptor()->actions();
 		if(a)
 		{
 			for(QString * s = a->first();s;s = a->next())
@@ -432,7 +432,7 @@ void KviCustomizeToolBarsDialog::exportToolBar()
 	szCode += t->descriptor()->iconId();
 	szCode += "\n";
 
-	KviPtrList<QString> * aa = t->descriptor()->actions();
+	KviPointerList<QString> * aa = t->descriptor()->actions();
 	if(aa)
 	{
 		for(QString * ss = aa->first();ss;ss = aa->next())
diff --git a/src/modules/torrent/libkvitorrent.cpp b/src/modules/torrent/libkvitorrent.cpp
index c4d92fff8..ebe5c1e7f 100644
--- a/src/modules/torrent/libkvitorrent.cpp
+++ b/src/modules/torrent/libkvitorrent.cpp
@@ -34,7 +34,7 @@
 #include "kvi_out.h"
 
 
-static KviPtrList<KviTorrentInterfaceDescriptor> * g_pDescriptorList = 0;
+static KviPointerList<KviTorrentInterfaceDescriptor> * g_pDescriptorList = 0;
 
 static KviTorrentInterface *auto_detect_torrent_client(KviWindow * pOut = 0)
 {
@@ -822,7 +822,7 @@ static bool torrent_module_init(KviModule *m)
 	TC_KVS_REGFNC(fileName, "fileName")
 	TC_KVS_REGFNC(filePriority, "filePriority")
 
-	g_pDescriptorList = new KviPtrList<KviTorrentInterfaceDescriptor>;
+	g_pDescriptorList = new KviPointerList<KviTorrentInterfaceDescriptor>;
 	g_pDescriptorList->setAutoDelete(true);
 
 #ifdef COMPILE_KDE_SUPPORT
diff --git a/src/modules/url/libkviurl.cpp b/src/modules/url/libkviurl.cpp
index a7c1d874e..2b9038268 100644
--- a/src/modules/url/libkviurl.cpp
+++ b/src/modules/url/libkviurl.cpp
@@ -32,7 +32,7 @@
 #include "kvi_actionmanager.h"
 #include "kvi_taskbar.h"
 #include "icons.h"
-#include "kvi_list.h"
+#include "kvi_pointerlist.h"
 #include <qfiledialog.h>
 #include <qmessagebox.h>
 #include <qcursor.h>
@@ -51,9 +51,9 @@ typedef struct _UrlDlgList
 const char *g_pUrlListFilename = "/list.kviurl";
 const char *g_pBanListFilename = "/list.kviban";
 
-KviPtrList<KviUrl> *g_pList;
-KviPtrList<UrlDlgList> *g_pUrlDlgList;
-KviPtrList<KviStr> *g_pBanList;
+KviPointerList<KviUrl> *g_pList;
+KviPointerList<UrlDlgList> *g_pUrlDlgList;
+KviPointerList<KviStr> *g_pBanList;
 ConfigDialog *g_pConfigDialog;
 
 KviStr szConfigPath;
@@ -106,7 +106,7 @@ QPixmap * KviUrlAction::smallIcon()
 
 // ---------------------------- CLASS URLDIALOG ------------------------begin //
 
-UrlDialog::UrlDialog(KviPtrList<KviUrl> *g_pList)
+UrlDialog::UrlDialog(KviPointerList<KviUrl> *g_pList)
 :KviWindow(KVI_WINDOW_TYPE_TOOL,g_pFrame,"URL List")
 {
 	m_pMenuBar = new KviTalMenuBar(this,"url menu");
@@ -794,13 +794,13 @@ static bool url_module_init(KviModule *m)
 							url_extension_alloc);
 	if(d)d->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_URL)));
 
-	g_pList = new KviPtrList<KviUrl>;
+	g_pList = new KviPointerList<KviUrl>;
 	g_pList->setAutoDelete(true);
 
-	g_pUrlDlgList = new KviPtrList<UrlDlgList>;
+	g_pUrlDlgList = new KviPointerList<UrlDlgList>;
 	g_pUrlDlgList->setAutoDelete(true);
 
-	g_pBanList = new KviPtrList<KviStr>;
+	g_pBanList = new KviPointerList<KviStr>;
 	g_pBanList->setAutoDelete(true);
 
 	g_pUrlIconPixmap = new QPixmap(url_icon_xpm);
diff --git a/src/modules/url/libkviurl.h b/src/modules/url/libkviurl.h
index 0dbfe8ba4..b34edc7de 100644
--- a/src/modules/url/libkviurl.h
+++ b/src/modules/url/libkviurl.h
@@ -63,7 +63,7 @@ class UrlDialog : public KviWindow
 {
 	Q_OBJECT
 public:
-	UrlDialog(KviPtrList<KviUrl> *g_pList);
+	UrlDialog(KviPointerList<KviUrl> *g_pList);
 	~UrlDialog();
 private:
 	KviTalMenuBar *m_pMenuBar;
diff --git a/src/modules/window/libkviwindow.cpp b/src/modules/window/libkviwindow.cpp
index fee311552..222cbb01b 100644
--- a/src/modules/window/libkviwindow.cpp
+++ b/src/modules/window/libkviwindow.cpp
@@ -41,7 +41,7 @@
 #include "kvi_channel.h"
 #include "userwindow.h"
 
-#include "kvi_asciidict.h"
+#include "kvi_pointerhashtable.h"
 #include <qtimer.h>
 
 
@@ -54,8 +54,8 @@
 
 
 // kvi_app.cpp
-extern KVIRC_API KviAsciiDict<KviWindow> * g_pGlobalWindowDict;
-KviPtrList<KviUserWindow> * g_pUserWindowList = 0;
+extern KVIRC_API KviPointerHashTable<const char *,KviWindow> * g_pGlobalWindowDict;
+KviPointerList<KviUserWindow> * g_pUserWindowList = 0;
 
 // $window.caption $window.x $window.y $window.width $window.height $window.isActive $window.type
 // $window.input.text $window.input.cursorpos $window.input.textlen
@@ -858,7 +858,7 @@ static bool window_kvs_fnc_list(KviKvsModuleFunctionCall * c)
 	{
 		// all contexts but no "no_context" windows
 		bool bAllWindows = KviQString::equalCI(szType,"all");
-		KviAsciiDictIterator<KviWindow> it(*g_pGlobalWindowDict);
+		KviPointerHashTableIterator<const char *,KviWindow> it(*g_pGlobalWindowDict);
 
 		while(KviWindow * wnd = it.current())
 		{
@@ -882,7 +882,7 @@ static bool window_kvs_fnc_list(KviKvsModuleFunctionCall * c)
 	{
 		// all contexts and also "no_context" windows
 		bool bAllWindows = KviQString::equalCI(szType.lower(),"all");
-		KviAsciiDictIterator<KviWindow> it(*g_pGlobalWindowDict);
+		KviPointerHashTableIterator<const char *,KviWindow> it(*g_pGlobalWindowDict);
 
 		while(KviWindow * wnd = it.current())
 		{
@@ -903,7 +903,7 @@ static bool window_kvs_fnc_list(KviKvsModuleFunctionCall * c)
 	{
 		// only "no_context" windows
 		bool bAllWindows = KviQString::equalCI(szType.lower(),"all");
-		KviAsciiDictIterator<KviWindow> it(*g_pGlobalWindowDict);
+		KviPointerHashTableIterator<const char *,KviWindow> it(*g_pGlobalWindowDict);
 
 		while(KviWindow * wnd = it.current())
 		{
@@ -948,7 +948,7 @@ static bool window_kvs_fnc_list(KviKvsModuleFunctionCall * c)
 		}
 
 		bool bAllWindows = KviQString::equalCI(szType.lower(),"all");
-		KviAsciiDictIterator<KviWindow> it(*g_pGlobalWindowDict);
+		KviPointerHashTableIterator<const char *,KviWindow> it(*g_pGlobalWindowDict);
 
 		while(KviWindow * wnd = it.current())
 		{
@@ -1461,7 +1461,7 @@ static bool window_kvs_cmd_setCryptEngine(KviKvsModuleCommandCall * c)
 
 static bool window_module_init(KviModule *m)
 {
-	g_pUserWindowList = new KviPtrList<KviUserWindow>();
+	g_pUserWindowList = new KviPointerList<KviUserWindow>();
 	g_pUserWindowList->setAutoDelete(false);
 
 	KVSM_REGISTER_FUNCTION(m,"activityTemperature",window_kvs_fnc_activityTemperature);
diff --git a/src/modules/window/userwindow.cpp b/src/modules/window/userwindow.cpp
index 505e2843e..d022b040f 100644
--- a/src/modules/window/userwindow.cpp
+++ b/src/modules/window/userwindow.cpp
@@ -30,7 +30,7 @@
 #include "kvi_frame.h"
 #include "kvi_console.h"
 
-extern KviPtrList<KviUserWindow> * g_pUserWindowList;
+extern KviPointerList<KviUserWindow> * g_pUserWindowList;
 
 
 KviUserWindow::KviUserWindow(KviFrame * pFrm,const char * name,int iIcon,KviConsole * pConsole,int iCreationFlags)