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

diff --git a/src/modules/mediaplayer/mp_amarokinterface.cpp b/src/modules/mediaplayer/mp_amarokinterface.cpp
index 5c941d4f..6cb20e2c 100644
--- a/src/modules/mediaplayer/mp_amarokinterface.cpp
+++ b/src/modules/mediaplayer/mp_amarokinterface.cpp
@@ -31,8 +31,8 @@
 #include "dcopclient.h"
 #include "kurl.h"
 
-#include <qdatastream.h>
-#include <qvaluelist.h>
+#include <tqdatastream.h>
+#include <tqvaluelist.h>
 
 #include "kvi_locale.h"
 
@@ -76,9 +76,9 @@ bool KviAmarokInterface::setVol(kvs_int_t &iVol)
 }
 
 #define MP_DCOP_STRING_CALL(_fncname,_iface,_fnc) \
-QString KviAmarokInterface::_fncname() \
+TQString KviAmarokInterface::_fncname() \
 { \
-	QString ret; \
+	TQString ret; \
 	if(!stringRetVoidDCOPCall(_iface,_fnc,ret))return false; \
 	return ret; \
 }
@@ -122,14 +122,14 @@ int KviAmarokInterface::position()
 bool KviAmarokInterface::getRepeat()
 {
 	bool ret;
-	if(!boolRetVoidDCOPCall("player","repeatTrackStatus()",ret))return false;
+	if(!boolRetVoidDCOPCall("player","repeatTracktqStatus()",ret))return false;
 	return ret;
 }
 
 bool KviAmarokInterface::getShuffle()
 {
 	bool ret;
-	if(!boolRetVoidDCOPCall("player","randomModeStatus()",ret))return false;
+	if(!boolRetVoidDCOPCall("player","randomModetqStatus()",ret))return false;
 	return ret;
 }
 
@@ -143,7 +143,7 @@ bool KviAmarokInterface::setShuffle(bool &bVal)
 	return voidRetBoolDCOPCall("player","enableRandomMode(bool)",bVal);
 }
 
-KviMediaPlayerInterface::PlayerStatus KviAmarokInterface::status()
+KviMediaPlayerInterface::PlayertqStatus KviAmarokInterface::status()
 {
 	int ret;
 	if(!intRetVoidDCOPCall("player","status()",ret))return KviMediaPlayerInterface::Unknown;
@@ -165,20 +165,20 @@ KviMediaPlayerInterface::PlayerStatus KviAmarokInterface::status()
 	return KviMediaPlayerInterface::Unknown;
 }
 
-QString KviAmarokInterface::mrl()
+TQString KviAmarokInterface::mrl()
 {
-	QString ret;
+	TQString ret;
 	if(!stringRetVoidDCOPCall("player","encodedURL()",ret))return false;
 	KURL url(ret);
 	return url.prettyURL();
 }
 
-bool KviAmarokInterface::playMrl(const QString &mrl)
+bool KviAmarokInterface::playMrl(const TQString &mrl)
 {
-	QString title;
-	QByteArray data, replyData;
-	KviQCString replyType;
-	QDataStream arg(data,IO_WriteOnly);
+	TQString title;
+	TQByteArray data, replyData;
+	KviTQCString replyType;
+	TQDataStream arg(data,IO_WriteOnly);
 	arg << KURL(mrl);
 	if(!g_pApp->dcopClient()->call(m_szAppId,"playlist","playMedia(KURL)",data,replyType,replyData))
 		return false;