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

diff --git a/src/modules/mediaplayer/libkvimediaplayer.cpp b/src/modules/mediaplayer/libkvimediaplayer.cpp
index bd8a144f..8b99165e 100644
--- a/src/modules/mediaplayer/libkvimediaplayer.cpp
+++ b/src/modules/mediaplayer/libkvimediaplayer.cpp
@@ -61,9 +61,9 @@ static KviMediaPlayerInterface * auto_detect_player(KviWindow * pOut = 0)
 			}
 			if(pOut)
 			{
-				QString szOut;
-				QString szNam = d->name();
-				KviQString::sprintf(szOut,__tr2qs_ctx("Trying media player interface \"%Q\": score %d","mediaplayer"),&(szNam),iScore);
+				TQString szOut;
+				TQString szNam = d->name();
+				KviTQString::sprintf(szOut,__tr2qs_ctx("Trying media player interface \"%Q\": score %d","mediaplayer"),&(szNam),iScore);
 				pOut->output(KVI_OUT_MULTIMEDIA,szOut);
 			}
 		}
@@ -87,9 +87,9 @@ static KviMediaPlayerInterface * auto_detect_player(KviWindow * pOut = 0)
 				}
 				if(pOut)
 				{
-					QString szOut;
-					QString szNam = d->name();
-					KviQString::sprintf(szOut,__tr2qs_ctx("Trying media player interface \"%Q\": score %d","mediaplayer"),&(szNam),iScore);
+					TQString szOut;
+					TQString szNam = d->name();
+					KviTQString::sprintf(szOut,__tr2qs_ctx("Trying media player interface \"%Q\": score %d","mediaplayer"),&(szNam),iScore);
 					pOut->output(KVI_OUT_MULTIMEDIA,szOut);
 				}
 			}
@@ -132,7 +132,7 @@ static KviMediaPlayerInterface * auto_detect_player(KviWindow * pOut = 0)
 					if(!c->hasSwitch('q',"quiet")) \
 					{ \
 						c->warning(__tr2qs_ctx("The selected media player interface failed to execute the requested function","mediaplayer")); \
-						QString tmp = __tr2qs_ctx("Last interface error: ","mediaplayer"); \
+						TQString tmp = __tr2qs_ctx("Last interface error: ","mediaplayer"); \
 						tmp += g_pMPInterface->lastError(); \
 						c->warning(tmp); \
 					} \
@@ -144,7 +144,7 @@ static KviMediaPlayerInterface * auto_detect_player(KviWindow * pOut = 0)
 	MP_KVS_FUNCTION(__name) \
 	{ \
 		MP_KVS_FAIL_ON_NO_INTERFACE \
-		QString szRet = g_pMPInterface->__ifacecommand(); \
+		TQString szRet = g_pMPInterface->__ifacecommand(); \
 		c->returnValue()->setString(szRet); \
 		return true; \
 	}
@@ -455,7 +455,7 @@ MP_KVS_COMMAND(detect)
 
 MP_KVS_COMMAND(setPlayer)
 {
-	QString szPlayer;
+	TQString szPlayer;
 
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("player",KVS_PT_STRING,0,szPlayer)
@@ -557,7 +557,7 @@ MP_KVS_FUNCTION(playerList)
 
 MP_KVS_COMMAND(playMrl)
 {
-	QString szMrl;
+	TQString szMrl;
 
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("player",KVS_PT_STRING,0,szMrl)
@@ -569,7 +569,7 @@ MP_KVS_COMMAND(playMrl)
 		if(!c->hasSwitch('q',"quiet"))
 		{
 			c->warning(__tr2qs_ctx("The selected media player interface failed to execute the requested function","mediaplayer"));
-			QString tmp = __tr2qs_ctx("Last interface error: ","mediaplayer");
+			TQString tmp = __tr2qs_ctx("Last interface error: ","mediaplayer");
 			tmp += g_pMPInterface->lastError();
 			c->warning(tmp);
 		}
@@ -580,7 +580,7 @@ MP_KVS_COMMAND(playMrl)
 
 MP_KVS_COMMAND(amipExec)
 {
-	QString szMrl;
+	TQString szMrl;
 
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("player",KVS_PT_STRING,0,szMrl)
@@ -592,7 +592,7 @@ MP_KVS_COMMAND(amipExec)
 		if(!c->hasSwitch('q',"quiet"))
 		{
 			c->warning(__tr2qs_ctx("The selected media player interface failed to execute the requested function","mediaplayer"));
-			QString tmp = __tr2qs_ctx("Last interface error: ","mediaplayer");
+			TQString tmp = __tr2qs_ctx("Last interface error: ","mediaplayer");
 			tmp += g_pMPInterface->lastError();
 			c->warning(tmp);
 		}
@@ -634,7 +634,7 @@ MP_KVS_COMMAND(jumpTo)
 		if(!c->hasSwitch('q',"quiet"))
 		{
 			c->warning(__tr2qs_ctx("The selected media player interface failed to execute the requested function","mediaplayer"));
-			QString tmp = __tr2qs_ctx("Last interface error: ","mediaplayer");
+			TQString tmp = __tr2qs_ctx("Last interface error: ","mediaplayer");
 			tmp += g_pMPInterface->lastError();
 			c->warning(tmp);
 		}
@@ -673,7 +673,7 @@ MP_KVS_COMMAND(setVol)
 		if(!c->hasSwitch('q',"quiet"))
 		{
 			c->warning(__tr2qs_ctx("The selected media player interface failed to execute the requested function","mediaplayer"));
-			QString tmp = __tr2qs_ctx("Last interface error: ","mediaplayer");
+			TQString tmp = __tr2qs_ctx("Last interface error: ","mediaplayer");
 			tmp += g_pMPInterface->lastError();
 			c->warning(tmp);
 		}
@@ -1181,7 +1181,7 @@ MP_KVS_COMMAND(setPlayListPos)
 		if(!c->hasSwitch('q',"quiet"))
 		{
 			c->warning(__tr2qs_ctx("The selected media player interface failed to execute the requested function","mediaplayer"));
-			QString tmp = __tr2qs_ctx("Last interface error: ","mediaplayer");
+			TQString tmp = __tr2qs_ctx("Last interface error: ","mediaplayer");
 			tmp += g_pMPInterface->lastError();
 			c->warning(tmp);
 		}
@@ -1301,7 +1301,7 @@ MP_KVS_SIMPLE_BOOL_FUNCTION(getShuffle,getShuffle)
 MP_KVS_FUNCTION(getEqData)
 {
 	int iValue;
-	QString szOptions;
+	TQString szOptions;
 
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("item",KVS_PT_INT,0,iValue)
@@ -1310,14 +1310,14 @@ MP_KVS_FUNCTION(getEqData)
 
 	MP_KVS_FAIL_ON_NO_INTERFACE
 
-	bool bQuiet = szOptions.find('q',false) != -1;
+	bool bQuiet = szOptions.tqfind('q',false) != -1;
 
 	int ret = g_pMPInterface->getEqData(iValue);
 
 	if(!ret && !bQuiet)
 	{
 		c->warning(__tr2qs_ctx("The selected media player interface failed to execute the requested function","mediaplayer"));
-		QString tmp = __tr2qs_ctx("Last interface error: ","mediaplayer");
+		TQString tmp = __tr2qs_ctx("Last interface error: ","mediaplayer");
 		tmp += g_pMPInterface->lastError();
 		c->warning(tmp);
 	}
@@ -1361,7 +1361,7 @@ MP_KVS_COMMAND(setEqData)
 		if(!c->hasSwitch('q',"quiet"))
 		{
 			c->warning(__tr2qs_ctx("The selected media player interface failed to execute the requested function","mediaplayer"));
-			QString tmp = __tr2qs_ctx("Last interface error: ","mediaplayer");
+			TQString tmp = __tr2qs_ctx("Last interface error: ","mediaplayer");
 			tmp += g_pMPInterface->lastError();
 			c->warning(tmp);
 		}
@@ -1399,9 +1399,9 @@ MP_KVS_FUNCTION(localFile)
 	KVSM_PARAMETERS_END(c)
 
 	MP_KVS_FAIL_ON_NO_INTERFACE
-	QString szRet = g_pMPInterface->mrl();
+	TQString szRet = g_pMPInterface->mrl();
 	if(szRet.isEmpty())return true;
-	if(szRet.startsWith("file://",false))
+	if(szRet.tqstartsWith("file://",false))
 	{
 		szRet.remove(0,7);
 		c->returnValue()->setString(szRet);
@@ -1411,14 +1411,14 @@ MP_KVS_FUNCTION(localFile)
 
 MP_KVS_FUNCTION(amipEval)
 {
-	QString szMrl;
+	TQString szMrl;
 
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("player",KVS_PT_STRING,0,szMrl)
 	KVSM_PARAMETERS_END(c)
 
 	MP_KVS_FAIL_ON_NO_INTERFACE
-	QString szRet = g_pMPInterface->amipEval(szMrl);
+	TQString szRet = g_pMPInterface->amipEval(szMrl);
 	if(szRet.isEmpty())return true;
 
 	c->returnValue()->setString(szRet);
@@ -1453,7 +1453,7 @@ MP_KVS_FUNCTION(status)
 	KVSM_PARAMETERS_END(c)
 
 	MP_KVS_FAIL_ON_NO_INTERFACE
-	KviMediaPlayerInterface::PlayerStatus eStat = g_pMPInterface->status();
+	KviMediaPlayerInterface::PlayertqStatus eStat = g_pMPInterface->status();
 	switch(eStat)
 	{
 		case KviMediaPlayerInterface::Stopped:
@@ -1549,7 +1549,7 @@ MP_KVS_COMMAND(setRepeat)
 		if(!c->hasSwitch('q',"quiet"))
 		{
 			c->warning(__tr2qs_ctx("The selected media player interface failed to execute the requested function","mediaplayer"));
-			QString tmp = __tr2qs_ctx("Last interface error: ","mediaplayer");
+			TQString tmp = __tr2qs_ctx("Last interface error: ","mediaplayer");
 			tmp += g_pMPInterface->lastError();
 			c->warning(tmp);
 		}
@@ -1592,7 +1592,7 @@ MP_KVS_COMMAND(setShuffle)
 		if(!c->hasSwitch('q',"quiet"))
 		{
 			c->warning(__tr2qs_ctx("The selected media player interface failed to execute the requested function","mediaplayer"));
-			QString tmp = __tr2qs_ctx("Last interface error: ","mediaplayer");
+			TQString tmp = __tr2qs_ctx("Last interface error: ","mediaplayer");
 			tmp += g_pMPInterface->lastError();
 			c->warning(tmp);
 		}
@@ -1716,8 +1716,8 @@ static bool mediaplayer_module_ctrl(KviModule * m,const char * operation,void *
 {
 	if(kvi_strEqualCI(operation,"getAvailableMediaPlayers"))
 	{
-		// we expect param to be a pointer to QStringList
-		QStringList * l = (QStringList *)param;
+		// we expect param to be a pointer to TQStringList
+		TQStringList * l = (TQStringList *)param;
 		for(KviMediaPlayerInterfaceDescriptor * d = g_pDescriptorList->first();d;d = g_pDescriptorList->next())
 		{
 			l->append(d->name());