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

4 files changed, 12 insertions, 12 deletions

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()));