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, 20 insertions, 20 deletions

diff --git a/src/modules/http/libkvihttp.cpp b/src/modules/http/libkvihttp.cpp
index eb6f28fb..8b98b218 100644
--- a/src/modules/http/libkvihttp.cpp
+++ b/src/modules/http/libkvihttp.cpp
@@ -36,7 +36,7 @@
 #include "httpfiletransfer.h"
 
 
-static bool http_kvs_complete_get(KviKvsModuleCommandCall * c,QString &szUrl,QString &szFileName,const QString &szCallback)
+static bool http_kvs_complete_get(KviKvsModuleCommandCall * c,TQString &szUrl,TQString &szFileName,const TQString &szCallback)
 {
 	if(szUrl.isEmpty())
 	{
@@ -46,17 +46,17 @@ static bool http_kvs_complete_get(KviKvsModuleCommandCall * c,QString &szUrl,QSt
 
 	KviUrl url(szUrl);
 
-	QString tmp;
+	TQString tmp;
 
 	if(szFileName.isEmpty())
 	{
-		if(c->switches()->find('a',"auto-file-name"))
+		if(c->switches()->tqfind('a',"auto-file-name"))
 		{
 			tmp = szUrl;
-			tmp.replace('/',"_");
-			tmp.replace(':',"_");
-			tmp.replace('@',"_");
-			tmp.replace('?',"_");
+			tmp.tqreplace('/',"_");
+			tmp.tqreplace(':',"_");
+			tmp.tqreplace('@',"_");
+			tmp.tqreplace('?',"_");
 			// http____path_path2_path3_filename.ext
 			g_pApp->getLocalKvircDirectory(szFileName,KviApp::Incoming,tmp);
 		} else {
@@ -68,7 +68,7 @@ static bool http_kvs_complete_get(KviKvsModuleCommandCall * c,QString &szUrl,QSt
 
 	KviHttpFileTransfer * hft = new KviHttpFileTransfer();
 
-	bool bHead = c->switches()->find('h',"head");
+	bool bHead = c->switches()->tqfind('h',"head");
 
 	if(c->switches()->getAsStringIfExisting('p',"post-data",tmp))
 	{
@@ -86,13 +86,13 @@ static bool http_kvs_complete_get(KviKvsModuleCommandCall * c,QString &szUrl,QSt
 
 	if(c->switches()->getAsStringIfExisting('e',"existing-file-action",tmp))
 	{
-		if(KviQString::equalCI(tmp,"e"))
+		if(KviTQString::equalCI(tmp,"e"))
 			hft->request()->setExistingFileAction(KviHttpRequest::RenameExisting);
-		else if(KviQString::equalCI(tmp,"i"))
+		else if(KviTQString::equalCI(tmp,"i"))
 			hft->request()->setExistingFileAction(KviHttpRequest::RenameIncoming);
-		else if(KviQString::equalCI(tmp,"o"))
+		else if(KviTQString::equalCI(tmp,"o"))
 			hft->request()->setExistingFileAction(KviHttpRequest::Overwrite);
-		else if(KviQString::equalCI(tmp,"r"))
+		else if(KviTQString::equalCI(tmp,"r"))
 			hft->request()->setExistingFileAction(KviHttpRequest::Resume);
 	}
 
@@ -114,25 +114,25 @@ static bool http_kvs_complete_get(KviKvsModuleCommandCall * c,QString &szUrl,QSt
 
 	if(c->switches()->getAsStringIfExisting('w',"winctrl",tmp))
 	{
-		if(!tmp.contains('h'))hft->invokeTransferWindow(c->window(),tmp.contains('m'),tmp.contains('n'));
+		if(!tmp.tqcontains('h'))hft->invokeTransferWindow(c->window(),tmp.tqcontains('m'),tmp.tqcontains('n'));
 	} else {
 		hft->invokeTransferWindow(c->window(),false,false);
 	}
 
-	KviKvsVariant * v = c->switches()->find('i',"identifier");
+	KviKvsVariant * v = c->switches()->tqfind('i',"identifier");
 	if(v)
 		hft->setMagicIdentifier(*v);
 
-	if(c->switches()->find('q',"quiet"))
+	if(c->switches()->tqfind('q',"quiet"))
 		hft->setNotifyCompletion(false);
 	
-	if(c->switches()->find('y',"no-output"))
+	if(c->switches()->tqfind('y',"no-output"))
 		hft->setNoOutput(true);
 		
 	if(!szCallback.isEmpty())
 		hft->setCompletionCallback(szCallback);
 
-	if(c->switches()->find('c',"clear"))
+	if(c->switches()->tqfind('c',"clear"))
 		hft->setAutoClean(true);
 
 	if(!hft->startDownload())
@@ -242,13 +242,13 @@ static bool http_kvs_complete_get(KviKvsModuleCommandCall * c,QString &szUrl,QSt
 
 static bool http_kvs_cmd_get(KviKvsModuleCommandCall * c)
 {
-	QString szUrl,szFileName;
+	TQString szUrl,szFileName;
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("url",KVS_PT_NONEMPTYSTRING,0,szUrl)
 		KVSM_PARAMETER("filename",KVS_PT_STRING,KVS_PF_OPTIONAL,szFileName)
 	KVSM_PARAMETERS_END(c)
 
-	return http_kvs_complete_get(c,szUrl,szFileName,QString::null);
+	return http_kvs_complete_get(c,szUrl,szFileName,TQString());
 }
 /*
 	@doc: http.asyncGet
@@ -281,7 +281,7 @@ static bool http_kvs_cmd_get(KviKvsModuleCommandCall * c)
 
 static bool http_kvs_cmd_asyncGet(KviKvsModuleCallbackCommandCall * c)
 {
-	QString szUrl,szFileName;
+	TQString szUrl,szFileName;
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("url",KVS_PT_NONEMPTYSTRING,0,szUrl)
 		KVSM_PARAMETER("filename",KVS_PT_STRING,KVS_PF_OPTIONAL,szFileName)