TQt4 port kdemultimedia

This enables compilation under both Qt3 and Qt4


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

1 files changed, 11 insertions, 11 deletions

diff --git a/noatun/library/plugin.cpp b/noatun/library/plugin.cpp
index 3c5b6f5d..36c1a2cf 100644
--- a/noatun/library/plugin.cpp
+++ b/noatun/library/plugin.cpp
@@ -85,16 +85,16 @@ Visualization::Visualization(int timeout, int pid)
 	// if this is a fork, do a cutesy arts thingy to get a remote
 	// stack, otherwise, get it from localhost :)
 	{
-		int parent=pid ? pid : getppid();
+		int tqparent=pid ? pid : getppid();
 
 		if (getenv("NOATUN_PID"))
-			parent = TQString::fromLatin1(getenv("NOATUN_PID")).toInt();
+			tqparent = TQString::tqfromLatin1(getenv("NOATUN_PID")).toInt();
 
 		DCOPClient c;
 		c.attach();
 
 		TQCString appids[2];
-		appids[0]=TQString("noatun-%1").arg(parent).local8Bit();
+		appids[0]=TQString("noatun-%1").tqarg(tqparent).local8Bit();
 		appids[1]="noatun";
 		TQCString &appid=appids[0];
 
@@ -120,7 +120,7 @@ Visualization::Visualization(int timeout, int pid)
 
 			if (!c.call(appid, "Noatun", "visStack()", TQByteArray(), replyType, replyData))
 			{
-				kdDebug(66666) << "Error communicating to parent noatun" << endl;
+				kdDebug(66666) << "Error communicating to tqparent noatun" << endl;
 			}
 			else
 			{
@@ -187,7 +187,7 @@ int Visualization::noatunPid()
 		{
 			if ((*i).left(6) != "noatun")
 				continue;
-			int pid=(*i).mid((*i).find('-')+1).toInt();
+			int pid=(*i).mid((*i).tqfind('-')+1).toInt();
 			return pid;
 		}
 	return -1;
@@ -473,7 +473,7 @@ void StereoScope::setSamples(int len)
 
 
 
-NoatunListener::NoatunListener(TQObject *parent) : TQObject(parent)
+NoatunListener::NoatunListener(TQObject *tqparent) : TQObject(tqparent)
 { }
 
 NoatunListener::~NoatunListener()
@@ -495,7 +495,7 @@ void NoatunListenerNotif::message()
 }
 
 
-ExitNotifier::ExitNotifier(int pid, TQObject *parent) : NoatunListener(parent)
+ExitNotifier::ExitNotifier(int pid, TQObject *tqparent) : NoatunListener(tqparent)
 {
 	mNotif=new NoatunListenerNotif(this);
 
@@ -504,7 +504,7 @@ ExitNotifier::ExitNotifier(int pid, TQObject *parent) : NoatunListener(parent)
 
 
 	TQCString appids[2];
-	appids[0]=TQString("noatun-%1").arg(pid).local8Bit();
+	appids[0]=TQString("noatun-%1").tqarg(pid).local8Bit();
 	appids[1]="noatun";
 	appid=appids[0];
 
@@ -528,7 +528,7 @@ ExitNotifier::ExitNotifier(int pid, TQObject *parent) : NoatunListener(parent)
 
 	if (!c.call(appid, "Noatun", "session()", TQByteArray(), replyType, replyData))
 	{
-		kdDebug(66666) << "Error communicating to parent noatun" << endl;
+		kdDebug(66666) << "Error communicating to tqparent noatun" << endl;
 	}
 	else
 	{
@@ -563,8 +563,8 @@ ExitNotifier::~ExitNotifier()
 	delete mNotif;
 }
 
-BoolNotifier::BoolNotifier(bool *value, NoatunListener *listener, TQObject *parent)
-	: TQObject(parent)
+BoolNotifier::BoolNotifier(bool *value, NoatunListener *listener, TQObject *tqparent)
+	: TQObject(tqparent)
 {
 	connect(listener, TQT_SIGNAL(event()), TQT_SLOT(event()));
 	mValue=value;