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

3 files changed, 11 insertions, 11 deletions

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