1 files changed, 20 insertions, 20 deletions

diff --git a/noatun/modules/systray/systray.cpp b/noatun/modules/systray/systray.cpp
index 4d008783..c298df37 100644
--- a/noatun/modules/systray/systray.cpp
+++ b/noatun/modules/systray/systray.cpp
@@ -91,7 +91,7 @@ protected:
 
 
 NoatunSystray::NoatunSystray() : KMainWindow(0, "NoatunSystray"), Plugin(),
-	mTray(0), trayStatus(0), trayBase(0), mPassivePopup(0L)
+	mTray(0), traytqStatus(0), trayBase(0), mPassivePopup(0L)
 {
 	//self = this;
 	hide();
@@ -118,10 +118,10 @@ NoatunSystray::NoatunSystray() : KMainWindow(0, "NoatunSystray"), Plugin(),
 	mTray->show();
 
 	trayBase = renderIcon(BASEICON, TQString());
-	trayStatus = renderIcon(BASEICON, "player_stop");
+	traytqStatus = renderIcon(BASEICON, "player_stop");
 
 	mTray->changeTitle(*trayBase, i18n("Noatun"));
-	showingTrayStatus = false;
+	showingTraytqStatus = false;
 
 	mBlinkTimer = new TQTimer(this);
 	connect(mBlinkTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotBlinkTimer()));
@@ -138,7 +138,7 @@ NoatunSystray::~NoatunSystray()
 	//kdDebug(66666) << k_funcinfo << "Called." << endl;
 	removeCover();
 	delete trayBase;
-	delete trayStatus;
+	delete traytqStatus;
 	napp->showInterfaces();
 }
 
@@ -213,21 +213,21 @@ void NoatunSystray::slotPlayPause()
 	if(!item.isProperty("title"))
 	{
 		// No metadata
-		s = TQString("<nobr>%1</nobr>").arg(item.title());
+		s = TQString("<nobr>%1</nobr>").tqarg(item.title());
 	}
 	else
 	{
-		s = TQString("<h2><nobr>%1</nobr></h2>").arg(item.property("title"));
+		s = TQString("<h2><nobr>%1</nobr></h2>").tqarg(item.property("title"));
 
 		if(item.isProperty("author"))
-			s += TQString("<nobr>%1</nobr><br>").arg(item.property("author"));
+			s += TQString("<nobr>%1</nobr><br>").tqarg(item.property("author"));
 
 		if(item.isProperty("album"))
 		{
 			if(item.isProperty("date"))
-				s += TQString("<nobr>%1 (%2)</nobr><br>").arg(item.property("album")).arg(item.property("date"));
+				s += TQString("<nobr>%1 (%2)</nobr><br>").tqarg(item.property("album")).tqarg(item.property("date"));
 			else
-				s += TQString("<nobr>%1</nobr><br>").arg(item.property("album"));
+				s += TQString("<nobr>%1</nobr><br>").tqarg(item.property("album"));
 		}
 	}
 
@@ -242,11 +242,11 @@ void NoatunSystray::slotPlayPause()
 		setTipText(TQString("<qt><br><table cellspacing=0 cellpadding=0><tr>" \
 			"<td align=center valign=center><h4><nobr>%1</nobr></h4>%2</td>" \
 			"<td valign=center><img src='%3'></td>" \
-			"</qt></tr></table>").arg(status).arg(s).arg(tmpCoverPath));
+			"</qt></tr></table>").tqarg(status).tqarg(s).tqarg(tmpCoverPath));
 	}
 	else
 	{
-		setTipText(TQString("<qt><center><h4><nobr>%1</nobr></h4>%2</center></qt>").arg(status).arg(s));
+		setTipText(TQString("<qt><center><h4><nobr>%1</nobr></h4>%2</center></qt>").tqarg(status).tqarg(s));
 	}
 }
 
@@ -256,16 +256,16 @@ void NoatunSystray::slotStopped()
 	if(!napp->player()->current())
 		return;
 	changeTray("player_stop");
-	setTipText(TQString("<qt><nobr><h4>%1</h4></nobr></qt>").arg(i18n("Noatun - Stopped")));
+	setTipText(TQString("<qt><nobr><h4>%1</h4></nobr></qt>").tqarg(i18n("Noatun - Stopped")));
 }
 
 
 
 void NoatunSystray::changeTray(const TQString &pm)
 {
-	delete trayStatus;
-	trayStatus = renderIcon(BASEICON, pm);
-	if(showingTrayStatus)
+	delete traytqStatus;
+	traytqStatus = renderIcon(BASEICON, pm);
+	if(showingTraytqStatus)
 		slotBlinkTimer();
 }
 
@@ -275,18 +275,18 @@ void NoatunSystray::slotBlinkTimer()
 	switch(YHConfig::self()->stateIconDisplay())
 	{
 		case (YHConfig::FlashingIcon):
-			showingTrayStatus ^= true;
+			showingTraytqStatus ^= true;
 			break;
 		case (YHConfig::StaticIcon):
-			showingTrayStatus = true;
+			showingTraytqStatus = true;
 			break;
 		case (YHConfig::NoIcon):
-			showingTrayStatus = false;
+			showingTraytqStatus = false;
 			break;
 	}
 
-	if(showingTrayStatus)
-		mTray->setPixmap(*trayStatus);
+	if(showingTraytqStatus)
+		mTray->setPixmap(*traytqStatus);
 	else
 		mTray->setPixmap(*trayBase);
 }