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

diff --git a/kicker-applets/mediacontrol/noatunInterface.cpp b/kicker-applets/mediacontrol/noatunInterface.cpp
index c7355dc..4047eb6 100644
--- a/kicker-applets/mediacontrol/noatunInterface.cpp
+++ b/kicker-applets/mediacontrol/noatunInterface.cpp
@@ -66,7 +66,7 @@ void NoatunInterface::myInit()
 
 void NoatunInterface::appRegistered(const TQCString &appId)
 {
-	if (appId.contains("noatun",false))
+	if (appId.tqcontains("noatun",false))
 	{
 		mAppId = appId;
 		emit playerStarted();
@@ -76,7 +76,7 @@ void NoatunInterface::appRegistered(const TQCString &appId)
 
 void NoatunInterface::appRemoved(const TQCString &appId)
 {
-	if (appId.contains("noatun",false))
+	if (appId.tqcontains("noatun",false))
 	{
 	 	// is there still another noatun alive?
 		if (findRunningNoatun())
@@ -145,10 +145,10 @@ void NoatunInterface::updateSlider()
 		time = 0;
 	}
 	emit newSliderPosition(len/1000,time/1000);
-	emit playingStatusChanged(playingStatus());
+	emit playingStatusChanged(playingtqStatus());
 }
 
-int NoatunInterface::playingStatus()
+int NoatunInterface::playingtqStatus()
 {
 	TQByteArray data, replyData;
 	TQCString replyType;
@@ -220,34 +220,34 @@ void NoatunInterface::playpause()
 {
 	if (!findRunningNoatun())
 		startPlayer("noatun");
-	kapp->dcopClient()->send(mAppId, "Noatun", "playpause()", TQString::null);
+	kapp->dcopClient()->send(mAppId, "Noatun", "playpause()", TQString());
 }
 
 void NoatunInterface::stop()
 {
-	kapp->dcopClient()->send(mAppId, "Noatun", "stop()", TQString::null);
+	kapp->dcopClient()->send(mAppId, "Noatun", "stop()", TQString());
 }
 
 void NoatunInterface::next()
 {
 	// fastForward() is noatun from kde2
-	//kapp->dcopClient()->send("noatun", "Noatun", "fastForward()", TQString::null);
-	kapp->dcopClient()->send(mAppId, "Noatun", "forward()", TQString::null);
+	//kapp->dcopClient()->send("noatun", "Noatun", "fastForward()", TQString());
+	kapp->dcopClient()->send(mAppId, "Noatun", "forward()", TQString());
 }
 
 void NoatunInterface::prev()
 {
-	kapp->dcopClient()->send(mAppId, "Noatun", "back()", TQString::null);
+	kapp->dcopClient()->send(mAppId, "Noatun", "back()", TQString());
 }
 
 void NoatunInterface::volumeUp()
 {
-	kapp->dcopClient()->send(mAppId, "Noatun", "volumeDown()", TQString::null);
+	kapp->dcopClient()->send(mAppId, "Noatun", "volumeDown()", TQString());
 }
 
 void NoatunInterface::volumeDown()
 {
-	kapp->dcopClient()->send(mAppId, "Noatun", "volumeUp()", TQString::null);
+	kapp->dcopClient()->send(mAppId, "Noatun", "volumeUp()", TQString());
 }
 
 const TQString NoatunInterface::getTrackTitle() const
@@ -259,7 +259,7 @@ const TQString NoatunInterface::getTrackTitle() const
 		replyData, false, 200))
 	{
 		TQDataStream reply(replyData, IO_ReadOnly);
-		if (replyType == "TQString")
+		if (replyType == TQSTRING_OBJECT_NAME_STRING)
 			reply >> title;
 	}
 	return title;
@@ -273,7 +273,7 @@ bool NoatunInterface::findRunningNoatun()
 
 	for (iterator = allApps.constBegin(); iterator != allApps.constEnd(); ++iterator)
 	{
-		if ((*iterator).contains("noatun", false))
+		if ((*iterator).tqcontains("noatun", false))
 		{
 			mAppId = *iterator;
 			return true;