TQt4 port kdeaddons

This enables compilation under both Qt3 and Qt4


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

1 files changed, 10 insertions, 10 deletions

diff --git a/kicker-applets/mediacontrol/kscdInterface.cpp b/kicker-applets/mediacontrol/kscdInterface.cpp
index fea1048..d14d609 100644
--- a/kicker-applets/mediacontrol/kscdInterface.cpp
+++ b/kicker-applets/mediacontrol/kscdInterface.cpp
@@ -126,7 +126,7 @@ void KsCDInterface::updateSlider()
 		time = 0;
 	}
 	emit newSliderPosition(len,time);
-	emit playingStatusChanged(playingStatus());
+	emit playingStatusChanged(playingtqStatus());
 }
 
 // Drag-n-Drop stuff =================================================================
@@ -213,7 +213,7 @@ const TQString KsCDInterface::getTrackTitle() const
 		replyType, replyData))
 	{
 		TQDataStream reply(replyData, IO_ReadOnly);
-		if (replyType == "TQString")
+		if (replyType == TQSTRING_OBJECT_NAME_STRING)
 		{
 			reply >> title;
 		}
@@ -224,7 +224,7 @@ const TQString KsCDInterface::getTrackTitle() const
 		replyType, replyData))
 	{
 		TQDataStream reply(replyData, IO_ReadOnly);
-		if (replyType == "TQString")
+		if (replyType == TQSTRING_OBJECT_NAME_STRING)
 		{
 			reply >> album;
 		}
@@ -235,7 +235,7 @@ const TQString KsCDInterface::getTrackTitle() const
 		replyType, replyData))
 	{
 		TQDataStream reply(replyData, IO_ReadOnly);
-		if (replyType == "TQString")
+		if (replyType == TQSTRING_OBJECT_NAME_STRING)
 		{
 			reply >> artist;
 		}
@@ -256,7 +256,7 @@ const TQString KsCDInterface::getTrackTitle() const
 			}
 			else
 			{
-				result = i18n("artist - trackname", "%1 - %2").arg(artist, title);
+				result = i18n("artist - trackname", "%1 - %2").tqarg(artist, title);
 			}
 		}
 	}
@@ -270,18 +270,18 @@ const TQString KsCDInterface::getTrackTitle() const
 			}
 			else
 			{
-				result = i18n("(album) - trackname", "(%1) - %2").arg(artist, title);
+				result = i18n("(album) - trackname", "(%1) - %2").tqarg(artist, title);
 			}
 		}
 		else // artist is non-empty
 		{
 			if(title.isEmpty())
 			{
-				result = i18n("artistname (albumname)", "%1 (%2)").arg(artist, album);
+				result = i18n("artistname (albumname)", "%1 (%2)").tqarg(artist, album);
 			}
 			else
 			{
-				result = i18n("artistname (albumname) - trackname", "%1 (%2) - %3").arg(artist, album, title);
+				result = i18n("artistname (albumname) - trackname", "%1 (%2) - %3").tqarg(artist, album, title);
 			}
 		}
 	}
@@ -305,12 +305,12 @@ bool KsCDInterface::findRunningKsCD()
 	return false;
 }
 
-int KsCDInterface::playingStatus()
+int KsCDInterface::playingtqStatus()
 {
 	TQByteArray data, replyData;
 	TQCString replyType;
 
-	if (kapp->dcopClient()->call(mAppId, "CDPlayer", "getStatus()", data, replyType,
+	if (kapp->dcopClient()->call(mAppId, "CDPlayer", "gettqStatus()", data, replyType,
 		replyData))
 	{
 		int status = 0;