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, 17 insertions, 21 deletions

diff --git a/src/kvirc/module/kvi_module.cpp b/src/kvirc/module/kvi_module.cpp
index f0e50d0..8716c16 100644
--- a/src/kvirc/module/kvi_module.cpp
+++ b/src/kvirc/module/kvi_module.cpp
@@ -33,10 +33,6 @@
 
 #include <time.h>
 
-#if QT_VERSION < 300
-	#include <qobjectdict.h>
-#endif
-
 #ifdef COMPILE_CRYPT_SUPPORT
 	extern KviCryptEngineManager * g_pCryptEngineManager;
 #endif
@@ -173,13 +169,13 @@ KviModule::~KviModule()
 	*/
 }
 
-KviModuleExtensionDescriptor * KviModule::registerExtension(const KviStr &szType,const KviStr &szName,const QString &szVisibleName,KviModuleExtensionAllocRoutine r)
+KviModuleExtensionDescriptor * KviModule::registerExtension(const KviStr &szType,const KviStr &szName,const TQString &szVisibleName,KviModuleExtensionAllocRoutine r)
 {
-	QPixmap pix; // null
+	TQPixmap pix; // null
 	return g_pModuleExtensionManager->registerExtension(this,szType,szName,szVisibleName,r,pix);
 }
 
-KviModuleExtensionDescriptor * KviModule::registerExtension(const KviStr &szType,const KviStr &szName,const QString &szVisibleName,KviModuleExtensionAllocRoutine r,const QPixmap &icon)
+KviModuleExtensionDescriptor * KviModule::registerExtension(const KviStr &szType,const KviStr &szName,const TQString &szVisibleName,KviModuleExtensionAllocRoutine r,const TQPixmap &icon)
 {
 	return g_pModuleExtensionManager->registerExtension(this,szType,szName,szVisibleName,r,icon);
 }
@@ -216,32 +212,32 @@ void KviModule::setGenericFunctionParseProc(KviModuleFunctionParseProc proc)
 	}
 }
 
-void KviModule::completeCommand(const QString &cmd,KviPointerList<QString> * matches)
+void KviModule::completeCommand(const TQString &cmd,KviPointerList<TQString> * matches)
 {
 	KviPointerHashTableIterator<const char *,KviModuleCommandParseProc> it(*m_pCommandDict);
 
 	while(it.current())
 	{
-		if(KviQString::equalCIN(cmd,it.currentKey(),cmd.length()))
+		if(KviTQString::equalCIN(cmd,it.currentKey(),cmd.length()))
 		{
-			QString * s = new QString();
-			KviQString::sprintf(*s,"%s.%s",name(),it.currentKey());
+			TQString * s = new TQString();
+			KviTQString::sprintf(*s,"%s.%s",name(),it.currentKey());
 			matches->append(s);
 		}
 		++it;
 	}
 }
 
-void KviModule::completeFunction(const QString &cmd,KviPointerList<QString> * matches)
+void KviModule::completeFunction(const TQString &cmd,KviPointerList<TQString> * matches)
 {
 	KviPointerHashTableIterator<const char *,KviModuleFunctionParseProc> it(*m_pFunctionDict);
 
 	while(it.current())
 	{
-		if(KviQString::equalCIN(cmd,it.currentKey(),cmd.length()))
+		if(KviTQString::equalCIN(cmd,it.currentKey(),cmd.length()))
 		{
-			QString * s = new QString();
-			KviQString::sprintf(*s,"%s.%s",name(),it.currentKey());
+			TQString * s = new TQString();
+			KviTQString::sprintf(*s,"%s.%s",name(),it.currentKey());
 			matches->append(s);
 		}
 		++it;
@@ -251,8 +247,8 @@ void KviModule::completeFunction(const QString &cmd,KviPointerList<QString> * ma
 
 void KviModule::unregisterMetaObject(const char * metaObjName)
 {
-#if QT_VERSION < 300
-// FIXME: 	#warning "We might need zeroing the d->slotAccess member of QMetaObject!"
+#if [[[TQT_VERSION IS DEPRECATED]]] < 300
+// FIXME: 	#warning "We might need zeroing the d->slotAccess member of TQMetaObject!"
 	if(!objectDict)return;
 	objectDict->remove(metaObjName);
 #endif
@@ -270,7 +266,7 @@ unsigned int KviModule::secondsSinceLastAccess()
 /*
 void KviModule::registerCommand(const char * cmd,KviModuleCommandParseProc proc)
 {
-	if(m_pCommandDict->find(cmd))m_pCommandDict->remove(cmd);
+	if(m_pCommandDict->tqfind(cmd))m_pCommandDict->remove(cmd);
 	m_pCommandDict->insert(cmd,new KviModuleCommandParseProc(proc));
 }
 
@@ -316,7 +312,7 @@ void KviModule::unregisterAllEventHandlers()
 
 void KviModule::registerFunction(const char * fnc,KviModuleFunctionParseProc proc)
 {
-	if(m_pFunctionDict->find(fnc))m_pFunctionDict->remove(fnc);
+	if(m_pFunctionDict->tqfind(fnc))m_pFunctionDict->remove(fnc);
 	m_pFunctionDict->insert(fnc,new KviModuleFunctionParseProc(proc));
 }
 
@@ -364,9 +360,9 @@ void KviModule::getDefaultConfigFileName(KviStr &buffer)
 	g_pApp->getLocalKvircDirectory(buffer,KviApp::ConfigPlugins,szName.ptr());
 }
 
-void KviModule::getDefaultConfigFileName(QString &szBuffer)
+void KviModule::getDefaultConfigFileName(TQString &szBuffer)
 {
-	QString tmp = "libkvi";
+	TQString tmp = "libkvi";
 	tmp += m_szName.ptr();
 	tmp += ".kvc";
 	g_pApp->getLocalKvircDirectory(szBuffer,KviApp::ConfigPlugins,tmp);