1 files changed, 39 insertions, 39 deletions

diff --git a/kicker-applets/mediacontrol/noatunInterface.cpp b/kicker-applets/mediacontrol/noatunInterface.cpp
index f6cdfc8..c7355dc 100644
--- a/kicker-applets/mediacontrol/noatunInterface.cpp
+++ b/kicker-applets/mediacontrol/noatunInterface.cpp
@@ -20,8 +20,8 @@
 
 #include <kapplication.h>
 #include <kdebug.h>
-#include <qstringlist.h>
-#include <qstrlist.h>
+#include <tqstringlist.h>
+#include <tqstrlist.h>
 #include <kurldrag.h>
 
 #define TIMER_FAST  250
@@ -29,18 +29,18 @@
 NoatunInterface::NoatunInterface() : PlayerInterface()
 {
 	mTimerValue = TIMER_FAST;
-	mNoatunTimer = new QTimer(this, "mNoatunTimer");
+	mNoatunTimer = new TQTimer(this, "mNoatunTimer");
 
-	connect(mNoatunTimer, SIGNAL(timeout()), SLOT(updateSlider()));
+	connect(mNoatunTimer, TQT_SIGNAL(timeout()), TQT_SLOT(updateSlider()));
 
-	connect(kapp->dcopClient(), SIGNAL(applicationRegistered(const QCString&)),
-		SLOT(appRegistered(const QCString&)) );
+	connect(kapp->dcopClient(), TQT_SIGNAL(applicationRegistered(const TQCString&)),
+		TQT_SLOT(appRegistered(const TQCString&)) );
 
-	connect(kapp->dcopClient(), SIGNAL(applicationRemoved(const QCString&)),
-		SLOT(appRemoved(const QCString&)));
+	connect(kapp->dcopClient(), TQT_SIGNAL(applicationRemoved(const TQCString&)),
+		TQT_SLOT(appRemoved(const TQCString&)));
 
 	kapp->dcopClient()->setNotifications(true);
-	QTimer::singleShot(0, this, SLOT(myInit()));
+	TQTimer::singleShot(0, this, TQT_SLOT(myInit()));
 }
 
 NoatunInterface::~NoatunInterface()
@@ -64,7 +64,7 @@ void NoatunInterface::myInit()
 	}
 }
 
-void NoatunInterface::appRegistered(const QCString &appId)
+void NoatunInterface::appRegistered(const TQCString &appId)
 {
 	if (appId.contains("noatun",false))
 	{
@@ -74,7 +74,7 @@ void NoatunInterface::appRegistered(const QCString &appId)
 	}
 }
 
-void NoatunInterface::appRemoved(const QCString &appId)
+void NoatunInterface::appRemoved(const TQCString &appId)
 {
 	if (appId.contains("noatun",false))
 	{
@@ -91,8 +91,8 @@ void NoatunInterface::updateSlider()
 {
 	// length/time in msecs, -1 means "no playobject in noatun"
 	int len, time;
-	QByteArray data, replyData;
-	QCString replyType;
+	TQByteArray data, replyData;
+	TQCString replyType;
 
 	if (!kapp->dcopClient()->call(mAppId, "Noatun", "length()", data, replyType, replyData, false, 200))
 	{
@@ -102,7 +102,7 @@ void NoatunInterface::updateSlider()
 	}
 	else
 	{
-		QDataStream reply(replyData, IO_ReadOnly);
+		TQDataStream reply(replyData, IO_ReadOnly);
 		if (replyType == "int")
 		{
 			reply >> len;
@@ -127,7 +127,7 @@ void NoatunInterface::updateSlider()
 	}
 	else
 	{
-		QDataStream reply(replyData, IO_ReadOnly);
+		TQDataStream reply(replyData, IO_ReadOnly);
 		if (replyType == "int")
 		{
 			reply >> time;
@@ -150,8 +150,8 @@ void NoatunInterface::updateSlider()
 
 int NoatunInterface::playingStatus()
 {
-	QByteArray data, replyData;
-	QCString replyType;
+	TQByteArray data, replyData;
+	TQCString replyType;
 
 	if (!kapp->dcopClient()->call(mAppId, "Noatun", "state()", data, replyType,
 		replyData, false, 200))
@@ -161,7 +161,7 @@ int NoatunInterface::playingStatus()
 	else
 	{
 		int status = 0;
-		QDataStream reply(replyData, IO_ReadOnly);
+		TQDataStream reply(replyData, IO_ReadOnly);
 		if (replyType == "int")
 			reply >> status;
 
@@ -177,22 +177,22 @@ int NoatunInterface::playingStatus()
 
 // Drag-n-Drop stuff =================================================================
 
-void NoatunInterface::dragEnterEvent(QDragEnterEvent* event)
+void NoatunInterface::dragEnterEvent(TQDragEnterEvent* event)
 {
 //	kdDebug(90200) << "NoatunInterface::dragEnterEvent()" << endl;
 	event->accept(KURLDrag::canDecode(event));
 }
 
-void NoatunInterface::dropEvent(QDropEvent* event)
+void NoatunInterface::dropEvent(TQDropEvent* event)
 {
 //	kdDebug(90200) << "NoatunInterface::dropEvent()" << endl;
 	KURL::List list;
 	if (KURLDrag::decode(event, list))
 	{
-		QByteArray data;
-		QDataStream arg(data, IO_WriteOnly);
+		TQByteArray data;
+		TQDataStream arg(data, IO_WriteOnly);
 		arg << list.toStringList() << false;
-		kapp->dcopClient()->send(mAppId, "Noatun", "addFile(QStringList,bool)", data);
+		kapp->dcopClient()->send(mAppId, "Noatun", "addFile(TQStringList,bool)", data);
 	}
 }
 
@@ -210,8 +210,8 @@ void NoatunInterface::sliderStopDrag()
 
 void NoatunInterface::jumpToTime(int sec)
 {
-	QByteArray data;
-	QDataStream arg(data, IO_WriteOnly);
+	TQByteArray data;
+	TQDataStream arg(data, IO_WriteOnly);
 	arg << (sec*1000);  // noatun wants milliseconds
 	kapp->dcopClient()->send(mAppId, "Noatun", "skipTo(int)", data);
 }
@@ -220,46 +220,46 @@ void NoatunInterface::playpause()
 {
 	if (!findRunningNoatun())
 		startPlayer("noatun");
-	kapp->dcopClient()->send(mAppId, "Noatun", "playpause()", QString::null);
+	kapp->dcopClient()->send(mAppId, "Noatun", "playpause()", TQString::null);
 }
 
 void NoatunInterface::stop()
 {
-	kapp->dcopClient()->send(mAppId, "Noatun", "stop()", QString::null);
+	kapp->dcopClient()->send(mAppId, "Noatun", "stop()", TQString::null);
 }
 
 void NoatunInterface::next()
 {
 	// fastForward() is noatun from kde2
-	//kapp->dcopClient()->send("noatun", "Noatun", "fastForward()", QString::null);
-	kapp->dcopClient()->send(mAppId, "Noatun", "forward()", QString::null);
+	//kapp->dcopClient()->send("noatun", "Noatun", "fastForward()", TQString::null);
+	kapp->dcopClient()->send(mAppId, "Noatun", "forward()", TQString::null);
 }
 
 void NoatunInterface::prev()
 {
-	kapp->dcopClient()->send(mAppId, "Noatun", "back()", QString::null);
+	kapp->dcopClient()->send(mAppId, "Noatun", "back()", TQString::null);
 }
 
 void NoatunInterface::volumeUp()
 {
-	kapp->dcopClient()->send(mAppId, "Noatun", "volumeDown()", QString::null);
+	kapp->dcopClient()->send(mAppId, "Noatun", "volumeDown()", TQString::null);
 }
 
 void NoatunInterface::volumeDown()
 {
-	kapp->dcopClient()->send(mAppId, "Noatun", "volumeUp()", QString::null);
+	kapp->dcopClient()->send(mAppId, "Noatun", "volumeUp()", TQString::null);
 }
 
-const QString NoatunInterface::getTrackTitle() const
+const TQString NoatunInterface::getTrackTitle() const
 {
-	QString title("");
-	QByteArray data, replyData;
-	QCString replyType;
+	TQString title("");
+	TQByteArray data, replyData;
+	TQCString replyType;
 	if (kapp->dcopClient()->call(mAppId, "Noatun", "title()", data, replyType,
 		replyData, false, 200))
 	{
-		QDataStream reply(replyData, IO_ReadOnly);
-		if (replyType == "QString")
+		TQDataStream reply(replyData, IO_ReadOnly);
+		if (replyType == "TQString")
 			reply >> title;
 	}
 	return title;
@@ -269,7 +269,7 @@ bool NoatunInterface::findRunningNoatun()
 {
 	// FIXME: what if we have a dcop app named, let's say, 'noatunfrontend'?
 	QCStringList allApps = kapp->dcopClient()->registeredApplications();
-	QValueList<QCString>::const_iterator iterator;
+	TQValueList<TQCString>::const_iterator iterator;
 
 	for (iterator = allApps.constBegin(); iterator != allApps.constEnd(); ++iterator)
 	{