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

114 files changed, 356 insertions, 459 deletions

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)