Rename old tq methods that no longer need a unique name

4 files changed, 17 insertions, 17 deletions

diff --git a/noatun/modules/systray/kitsystemtray.cpp b/noatun/modules/systray/kitsystemtray.cpp
index 95bbb698..a0b545ab 100644
--- a/noatun/modules/systray/kitsystemtray.cpp
+++ b/noatun/modules/systray/kitsystemtray.cpp
@@ -47,7 +47,7 @@
 KitSystemTray::KitSystemTray(const TQString &contextMenu, KMainWindow *parent, const char *name)
 	: KSystemTray(parent, name)
 {
-	tqsetAlignment(AlignHCenter | AlignVCenter);
+	setAlignment(AlignHCenter | AlignVCenter);
 	menu = (KPopupMenu *)parent->guiFactory()->container(contextMenu, parent);
 	menu->insertTitle(SmallIcon("noatun"), TQString(), 0, 0);
 	setAcceptDrops(true);
diff --git a/noatun/modules/systray/systray.cpp b/noatun/modules/systray/systray.cpp
index c298df37..3303ad6a 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), traytqStatus(0), trayBase(0), mPassivePopup(0L)
+	mTray(0), trayStatus(0), trayBase(0), mPassivePopup(0L)
 {
 	//self = this;
 	hide();
@@ -118,10 +118,10 @@ NoatunSystray::NoatunSystray() : KMainWindow(0, "NoatunSystray"), Plugin(),
 	mTray->show();
 
 	trayBase = renderIcon(BASEICON, TQString());
-	traytqStatus = renderIcon(BASEICON, "player_stop");
+	trayStatus = renderIcon(BASEICON, "player_stop");
 
 	mTray->changeTitle(*trayBase, i18n("Noatun"));
-	showingTraytqStatus = false;
+	showingTrayStatus = 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 traytqStatus;
+	delete trayStatus;
 	napp->showInterfaces();
 }
 
@@ -263,9 +263,9 @@ void NoatunSystray::slotStopped()
 
 void NoatunSystray::changeTray(const TQString &pm)
 {
-	delete traytqStatus;
-	traytqStatus = renderIcon(BASEICON, pm);
-	if(showingTraytqStatus)
+	delete trayStatus;
+	trayStatus = renderIcon(BASEICON, pm);
+	if(showingTrayStatus)
 		slotBlinkTimer();
 }
 
@@ -275,18 +275,18 @@ void NoatunSystray::slotBlinkTimer()
 	switch(YHConfig::self()->stateIconDisplay())
 	{
 		case (YHConfig::FlashingIcon):
-			showingTraytqStatus ^= true;
+			showingTrayStatus ^= true;
 			break;
 		case (YHConfig::StaticIcon):
-			showingTraytqStatus = true;
+			showingTrayStatus = true;
 			break;
 		case (YHConfig::NoIcon):
-			showingTraytqStatus = false;
+			showingTrayStatus = false;
 			break;
 	}
 
-	if(showingTraytqStatus)
-		mTray->setPixmap(*traytqStatus);
+	if(showingTrayStatus)
+		mTray->setPixmap(*trayStatus);
 	else
 		mTray->setPixmap(*trayBase);
 }
diff --git a/noatun/modules/systray/systray.h b/noatun/modules/systray/systray.h
index 11743a22..efab29be 100644
--- a/noatun/modules/systray/systray.h
+++ b/noatun/modules/systray/systray.h
@@ -69,11 +69,11 @@ private:
 private:
 	KitSystemTray *mTray;
 	TQTimer *mBlinkTimer;
-	TQPixmap *traytqStatus;
+	TQPixmap *trayStatus;
 	TQPixmap *trayBase;
 	PassivePopup *mPassivePopup;
 
-	bool showingTraytqStatus;
+	bool showingTrayStatus;
 	TQString tipText;
 	TQString tmpCoverPath;
 };
diff --git a/noatun/modules/systray/yhconfigwidget.ui b/noatun/modules/systray/yhconfigwidget.ui
index f63d7319..3c14d3df 100644
--- a/noatun/modules/systray/yhconfigwidget.ui
+++ b/noatun/modules/systray/yhconfigwidget.ui
@@ -169,7 +169,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>81</height>
@@ -299,7 +299,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>21</height>