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

6 files changed, 8 insertions, 8 deletions

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;