TQt4 port kvirc

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kvirc@1238719 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 15 insertions, 15 deletions

diff --git a/src/kvirc/module/kvi_moduleextension.cpp b/src/kvirc/module/kvi_moduleextension.cpp
index fb6a9ae6..5e82f634 100644
--- a/src/kvirc/module/kvi_moduleextension.cpp
+++ b/src/kvirc/module/kvi_moduleextension.cpp
@@ -32,7 +32,7 @@
 KVIRC_API KviModuleExtensionManager    * g_pModuleExtensionManager    = 0;
 
 
-KviModuleExtensionDescriptor::KviModuleExtensionDescriptor(KviModule * m,const KviStr &szType,const KviStr &szName,const QString &szVisibleName,KviModuleExtensionAllocRoutine r,const QPixmap &pix)
+KviModuleExtensionDescriptor::KviModuleExtensionDescriptor(KviModule * m,const KviStr &szType,const KviStr &szName,const TQString &szVisibleName,KviModuleExtensionAllocRoutine r,const TQPixmap &pix)
 {
 	m_iId = KviApp::getGloballyUniqueId();
 
@@ -44,7 +44,7 @@ KviModuleExtensionDescriptor::KviModuleExtensionDescriptor(KviModule * m,const K
 	m_pObjectList = new KviPointerList<KviModuleExtension>;
 	m_pObjectList->setAutoDelete(false);
 	if(pix.isNull())m_pIcon = 0;
-	else m_pIcon = new QPixmap(pix);
+	else m_pIcon = new TQPixmap(pix);
 }
 
 KviModuleExtensionDescriptor::~KviModuleExtensionDescriptor()
@@ -54,14 +54,14 @@ KviModuleExtensionDescriptor::~KviModuleExtensionDescriptor()
 	if(m_pIcon)delete m_pIcon;
 }
 
-void KviModuleExtensionDescriptor::setIcon(const QPixmap &pix)
+void KviModuleExtensionDescriptor::setIcon(const TQPixmap &pix)
 {
 	if(m_pIcon)delete m_pIcon;
 	if(pix.isNull())m_pIcon = 0;
-	else m_pIcon = new QPixmap(pix);
+	else m_pIcon = new TQPixmap(pix);
 }
 
-KviModuleExtension * KviModuleExtensionDescriptor::allocate(KviWindow * pWnd,KviPointerHashTable<QString,QVariant> * pParams,void * pSpecial)
+KviModuleExtension * KviModuleExtensionDescriptor::allocate(KviWindow * pWnd,KviPointerHashTable<TQString,TQVariant> * pParams,void * pSpecial)
 {
 	KviModuleExtensionAllocStruct s;
 	s.pDescriptor = this;
@@ -103,13 +103,13 @@ KviModuleExtensionManager::~KviModuleExtensionManager()
 KviModuleExtensionDescriptorList * KviModuleExtensionManager::getExtensionList(const KviStr &szType)
 {
 	g_pModuleManager->loadModulesByCaps(szType.ptr());
-	return m_pExtensionDict->find(szType.ptr());
+	return m_pExtensionDict->tqfind(szType.ptr());
 }
 
-KviModuleExtensionDescriptor * KviModuleExtensionManager::registerExtension(KviModule * m,const KviStr &szType,const KviStr &szName,const QString &szVisibleName,KviModuleExtensionAllocRoutine r,const QPixmap &icon)
+KviModuleExtensionDescriptor * KviModuleExtensionManager::registerExtension(KviModule * m,const KviStr &szType,const KviStr &szName,const TQString &szVisibleName,KviModuleExtensionAllocRoutine r,const TQPixmap &icon)
 {
 	KviModuleExtensionDescriptor * d = new KviModuleExtensionDescriptor(m,szType,szName,szVisibleName,r,icon);
-	KviModuleExtensionDescriptorList * l = m_pExtensionDict->find(szType.ptr());
+	KviModuleExtensionDescriptorList * l = m_pExtensionDict->tqfind(szType.ptr());
 	if(!l)
 	{
 		l = new KviModuleExtensionDescriptorList();
@@ -157,12 +157,12 @@ KviModuleExtensionDescriptorList * KviModuleExtensionManager::allocateExtensionG
 		(void)m; // get rid of the unused warning :D
 	}
 
-	KviModuleExtensionDescriptorList * l = m_pExtensionDict->find(szType.ptr());
+	KviModuleExtensionDescriptorList * l = m_pExtensionDict->tqfind(szType.ptr());
 	if(!l)
 	{
 		// retry : it might have been unloaded
 		g_pModuleManager->loadModulesByCaps(szType.ptr());
-		l = m_pExtensionDict->find(szType.ptr());
+		l = m_pExtensionDict->tqfind(szType.ptr());
 	}
 
 	return l;
@@ -170,7 +170,7 @@ KviModuleExtensionDescriptorList * KviModuleExtensionManager::allocateExtensionG
 
 KviModuleExtensionDescriptor * KviModuleExtensionManager::findExtensionDescriptor(const KviStr &szType,const KviStr &szName)
 {
-	KviModuleExtensionDescriptorList * l = m_pExtensionDict->find(szType.ptr());
+	KviModuleExtensionDescriptorList * l = m_pExtensionDict->tqfind(szType.ptr());
 	if(!l)return 0;
 
 	for(KviModuleExtensionDescriptor * d = l->first();d;d = l->next())
@@ -181,7 +181,7 @@ KviModuleExtensionDescriptor * KviModuleExtensionManager::findExtensionDescripto
 	return 0;
 }
 
-KviModuleExtension * KviModuleExtensionManager::allocateExtension(const KviStr &szType,const KviStr &szName,KviWindow * pWnd,KviPointerHashTable<QString,QVariant> * pParams,void * pSpecial,const char * preloadModule)
+KviModuleExtension * KviModuleExtensionManager::allocateExtension(const KviStr &szType,const KviStr &szName,KviWindow * pWnd,KviPointerHashTable<TQString,TQVariant> * pParams,void * pSpecial,const char * preloadModule)
 {
 	KviModuleExtensionDescriptorList * l = allocateExtensionGetDescriptorList(szType,preloadModule);
 	if(!l)return 0;
@@ -196,7 +196,7 @@ KviModuleExtension * KviModuleExtensionManager::allocateExtension(const KviStr &
 	// uhm... not there ?
 	g_pModuleManager->loadModulesByCaps(szType.ptr());
 	// try again after loading the modules
-	// l = m_pExtensionDict->find(szType.ptr()); <--- this shouldn't change!
+	// l = m_pExtensionDict->tqfind(szType.ptr()); <--- this shouldn't change!
 	for(d = l->first();d;d = l->next())
 	{
 		if(d->name().equalsCI(szName))return d->allocate(pWnd,pParams,pSpecial);
@@ -208,7 +208,7 @@ KviModuleExtension * KviModuleExtensionManager::allocateExtension(const KviStr &
 }
 
 
-KviModuleExtension * KviModuleExtensionManager::allocateExtension(const KviStr &szType,int id,KviWindow * pWnd,KviPointerHashTable<QString,QVariant> * pParams,void * pSpecial,const char * preloadModule)
+KviModuleExtension * KviModuleExtensionManager::allocateExtension(const KviStr &szType,int id,KviWindow * pWnd,KviPointerHashTable<TQString,TQVariant> * pParams,void * pSpecial,const char * preloadModule)
 {
 	KviModuleExtensionDescriptorList * l = allocateExtensionGetDescriptorList(szType,preloadModule);
 	if(!l)return 0;
@@ -222,7 +222,7 @@ KviModuleExtension * KviModuleExtensionManager::allocateExtension(const KviStr &
 	// uhm... not there ?
 	g_pModuleManager->loadModulesByCaps(szType.ptr());
 	// try again after loading the modules
-	// l = m_pExtensionDict->find(szType.ptr()); <--- this shouldn't change!
+	// l = m_pExtensionDict->tqfind(szType.ptr()); <--- this shouldn't change!
 	for(d = l->first();d;d = l->next())
 	{
 		if(d->id() == id)return d->allocate(pWnd,pParams,pSpecial);