1 files changed, 39 insertions, 39 deletions

diff --git a/kicker-applets/mediacontrol/kscdInterface.cpp b/kicker-applets/mediacontrol/kscdInterface.cpp
index f7f7e90..fea1048 100644
--- a/kicker-applets/mediacontrol/kscdInterface.cpp
+++ b/kicker-applets/mediacontrol/kscdInterface.cpp
@@ -21,8 +21,8 @@
 
 #include <kapplication.h>
 #include <kdebug.h>
-#include <qstringlist.h>
-#include <qstrlist.h>
+#include <tqstringlist.h>
+#include <tqstrlist.h>
 #include <kurldrag.h>
 #include <klocale.h>
 
@@ -30,18 +30,18 @@
 
 KsCDInterface::KsCDInterface() : PlayerInterface()
 {
-	mKsCDTimer = new QTimer(this, "mKsCDTimer");
+	mKsCDTimer = new TQTimer(this, "mKsCDTimer");
 
-	connect(mKsCDTimer, SIGNAL(timeout()), SLOT(updateSlider()) );
+	connect(mKsCDTimer, TQT_SIGNAL(timeout()), TQT_SLOT(updateSlider()) );
 	kapp->dcopClient()->setNotifications ( true );
 
-	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&)));
 
-	QTimer::singleShot(0, this, SLOT(myInit()));
+	TQTimer::singleShot(0, this, TQT_SLOT(myInit()));
 }
 
 KsCDInterface::~KsCDInterface()
@@ -66,7 +66,7 @@ void KsCDInterface::myInit()
 	}
 }
 
-void KsCDInterface::appRegistered(const QCString &appId)
+void KsCDInterface::appRegistered(const TQCString &appId)
 {
 	if((appId) == "kscd")
 	{
@@ -76,7 +76,7 @@ void KsCDInterface::appRegistered(const QCString &appId)
 	}
 }
 
-void KsCDInterface::appRemoved(const QCString &appId)
+void KsCDInterface::appRemoved(const TQCString &appId)
 {
 	if ((appId) == "kscd")
 	{
@@ -97,13 +97,13 @@ void KsCDInterface::updateSlider()
 	// length/time in secs, -1 means "no playobject in kscd"
 	int len = -1;
 	int time = -1;
-	QByteArray data, replyData;
-	QCString replyType;
+	TQByteArray data, replyData;
+	TQCString replyType;
 
 	if (kapp->dcopClient()->call(mAppId, "CDPlayer", "currentTrackLength()", data,
 		replyType, replyData))
 	{
-		QDataStream reply(replyData, IO_ReadOnly);
+		TQDataStream reply(replyData, IO_ReadOnly);
 		if (replyType == "int")
 			reply >> len;
 	}
@@ -115,7 +115,7 @@ void KsCDInterface::updateSlider()
 	if (kapp->dcopClient()->call(mAppId, "CDPlayer", "currentPosition()", data,
 		replyType, replyData))
 	{
-		QDataStream reply(replyData, IO_ReadOnly);
+		TQDataStream reply(replyData, IO_ReadOnly);
 		if (replyType == "int")
 			reply >> time;
 	}
@@ -134,12 +134,12 @@ void KsCDInterface::updateSlider()
 // or even no application to drag AudioCD track from (not the KIO-wrapped track
 // path (audiocd:/...) like from Konqueror)
 
-void KsCDInterface::dragEnterEvent(QDragEnterEvent* event)
+void KsCDInterface::dragEnterEvent(TQDragEnterEvent* event)
 {
 	event->ignore();
 }
 
-void KsCDInterface::dropEvent(QDropEvent* event)
+void KsCDInterface::dropEvent(TQDropEvent* event)
 {
 	event->ignore();
 }
@@ -158,8 +158,8 @@ void KsCDInterface::sliderStopDrag()
 
 void KsCDInterface::jumpToTime(int sec)
 {
-	QByteArray data;
-	QDataStream arg(data, IO_WriteOnly);
+	TQByteArray data;
+	TQDataStream arg(data, IO_WriteOnly);
 	arg << sec;
 	kapp->dcopClient()->send(mAppId, "CDPlayer", "jumpTo(int)", data);
 }
@@ -168,52 +168,52 @@ void KsCDInterface::playpause()
 {
 	if (!findRunningKsCD())
 		startPlayer("kscd");
-	QByteArray data;
+	TQByteArray data;
 	kapp->dcopClient()->send(mAppId, "CDPlayer", "play()", data);
 }
 
 void KsCDInterface::stop()
 {
-	QByteArray data;
+	TQByteArray data;
 	kapp->dcopClient()->send(mAppId, "CDPlayer", "stop()", data);
 }
 
 void KsCDInterface::next()
 {
-	QByteArray data;
+	TQByteArray data;
 	kapp->dcopClient()->send(mAppId, "CDPlayer", "next()", data);
 }
 
 void KsCDInterface::prev()
 {
-	QByteArray data;
+	TQByteArray data;
 	kapp->dcopClient()->send(mAppId, "CDPlayer", "previous()", data);
 }
 
 void KsCDInterface::volumeUp()
 {
-   QByteArray data;
+   TQByteArray data;
    kapp->dcopClient()->send(mAppId, "CDPlayer", "volumeUp()", data);
 }
 
 void KsCDInterface::volumeDown()
 {
-   QByteArray data;
+   TQByteArray data;
    kapp->dcopClient()->send(mAppId, "CDPlayer", "volumeDown()", data);
 }
 
-const QString KsCDInterface::getTrackTitle() const
+const TQString KsCDInterface::getTrackTitle() const
 {
-	QString title, artist, album, result;
-	QByteArray data, replyData;
-	QCString replyType;
+	TQString title, artist, album, result;
+	TQByteArray data, replyData;
+	TQCString replyType;
 
 	// Get track title from KsCD...
 	if (kapp->dcopClient()->call(mAppId, "CDPlayer", "currentTrackTitle()", data,
 		replyType, replyData))
 	{
-		QDataStream reply(replyData, IO_ReadOnly);
-		if (replyType == "QString")
+		TQDataStream reply(replyData, IO_ReadOnly);
+		if (replyType == "TQString")
 		{
 			reply >> title;
 		}
@@ -223,8 +223,8 @@ const QString KsCDInterface::getTrackTitle() const
 	if (kapp->dcopClient()->call(mAppId, "CDPlayer", "currentAlbum()", data,
 		replyType, replyData))
 	{
-		QDataStream reply(replyData, IO_ReadOnly);
-		if (replyType == "QString")
+		TQDataStream reply(replyData, IO_ReadOnly);
+		if (replyType == "TQString")
 		{
 			reply >> album;
 		}
@@ -234,8 +234,8 @@ const QString KsCDInterface::getTrackTitle() const
 	if (kapp->dcopClient()->call(mAppId, "CDPlayer", "currentArtist()", data,
 		replyType, replyData))
 	{
-		QDataStream reply(replyData, IO_ReadOnly);
-		if (replyType == "QString")
+		TQDataStream reply(replyData, IO_ReadOnly);
+		if (replyType == "TQString")
 		{
 			reply >> artist;
 		}
@@ -292,7 +292,7 @@ const QString KsCDInterface::getTrackTitle() const
 bool KsCDInterface::findRunningKsCD()
 {
 	QCStringList allApps = kapp->dcopClient()->registeredApplications();
-	QValueList<QCString>::const_iterator iterator;
+	TQValueList<TQCString>::const_iterator iterator;
 
 	for (iterator = allApps.constBegin(); iterator != allApps.constEnd(); ++iterator)
 	{
@@ -307,14 +307,14 @@ bool KsCDInterface::findRunningKsCD()
 
 int KsCDInterface::playingStatus()
 {
-	QByteArray data, replyData;
-	QCString replyType;
+	TQByteArray data, replyData;
+	TQCString replyType;
 
 	if (kapp->dcopClient()->call(mAppId, "CDPlayer", "getStatus()", data, replyType,
 		replyData))
 	{
 		int status = 0;
-		QDataStream reply(replyData, IO_ReadOnly);
+		TQDataStream reply(replyData, IO_ReadOnly);
 		if (replyType == "int")
 			reply >> status;