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

12 files changed, 28 insertions, 28 deletions

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