Rename old tq methods that no longer need a unique name

26 files changed, 93 insertions, 93 deletions

diff --git a/noatun/modules/excellent/userinterface.cpp b/noatun/modules/excellent/userinterface.cpp
index 5d18d488..3b084d4e 100644
--- a/noatun/modules/excellent/userinterface.cpp
+++ b/noatun/modules/excellent/userinterface.cpp
@@ -107,10 +107,10 @@ Excellent::Excellent()
 	labelFont.setBold(true);
 	TQFontMetrics labelFontMetrics = labelFont;
 	elapsed->setFont(labelFont);
-	elapsed->tqsetAlignment(AlignCenter | AlignVCenter | ExpandTabs);
+	elapsed->setAlignment(AlignCenter | AlignVCenter | ExpandTabs);
 	elapsed->setText("--:--");
 	elapsed->setFixedHeight(labelFontMetrics.height());
-	elapsed->setMinimumWidth(elapsed->tqsizeHint().width());
+	elapsed->setMinimumWidth(elapsed->sizeHint().width());
 
 	// Doing this makes the slider the same heigh as the font. This is just plain wrong...
 	//slider->setFixedHeight(labelFontMetrics.height());
@@ -121,9 +121,9 @@ Excellent::Excellent()
 	labelFont = total->font();
 	labelFont.setBold(true);
 	total->setFont(labelFont);
-	total->tqsetAlignment(AlignCenter | AlignVCenter | ExpandTabs);
+	total->setAlignment(AlignCenter | AlignVCenter | ExpandTabs);
 	total->setText("--:--");
-	total->setMinimumWidth(total->tqsizeHint().width());
+	total->setMinimumWidth(total->sizeHint().width());
 	total->setText("");
 
 	statusBar()->addWidget(total, 0, true);
diff --git a/noatun/modules/htmlexport/htmlexport.cpp b/noatun/modules/htmlexport/htmlexport.cpp
index 3a1e2b4e..2a4c53eb 100644
--- a/noatun/modules/htmlexport/htmlexport.cpp
+++ b/noatun/modules/htmlexport/htmlexport.cpp
@@ -213,19 +213,19 @@ Prefs::Prefs(TQObject *parent)
 
 	txtColorLabel = new TQLabel( colorBox, "txtColorLabel" );
 	txtColorLabel->setText( i18n( "Text:"  ) );
-	txtColorLabel->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+	txtColorLabel->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
 
 	bgColorLabel = new TQLabel( colorBox, "bgColorLabel" );
 	bgColorLabel->setText( i18n( "Background:"  ) );
-	bgColorLabel->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+	bgColorLabel->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
 
 	headColorLabel = new TQLabel( colorBox, "headColorLabel" );
 	headColorLabel->setText( i18n( "Heading:"  ) );
-	headColorLabel->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+	headColorLabel->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
 
 	hoverColorLabel = new TQLabel( colorBox, "hoverColorLabel" );
 	hoverColorLabel->setText( i18n( "Link hover:" ) );
-	hoverColorLabel->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+	hoverColorLabel->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
 
 	bgcolorLabel->setRowStretch(0, 1);
 
diff --git a/noatun/modules/kaiman/SKIN-SPECS b/noatun/modules/kaiman/SKIN-SPECS
index 7cfc61e2..ef603f30 100644
--- a/noatun/modules/kaiman/SKIN-SPECS
+++ b/noatun/modules/kaiman/SKIN-SPECS
@@ -185,7 +185,7 @@ Preset_1_/.../Preset_10_Button: filename prelight x y [clip_filename]
  Items                     (with fixed number sections)
 ==========================
 
-Stereo/Shuffle/Repeat/Mpegversion/Mpeglayer/Mpegmode/tqStatus/
+Stereo/Shuffle/Repeat/Mpegversion/Mpeglayer/Mpegmode/Status/
             Minus/Total_Item: filename x y
 
  filename
@@ -401,7 +401,7 @@ Option line:           | # images | Normal | Pressed | Prelit |
   Items (all item images contained vertically)
 --------------------------
 
-Stereo/Shuffle/Repeat/Mpegversion/Mpeglayer/Mpegmode/tqStatus/Minus/Total_Item: filename x y
+Stereo/Shuffle/Repeat/Mpegversion/Mpeglayer/Mpegmode/Status/Minus/Total_Item: filename x y
 
 Item:                  | # images | Image 1 | Image 2 | Image 3 | Image 4 | Image 5 |
                        |  total   |         |         |         |         |         |
diff --git a/noatun/modules/kaiman/userinterface.cpp b/noatun/modules/kaiman/userinterface.cpp
index a8b241f7..2a992040 100644
--- a/noatun/modules/kaiman/userinterface.cpp
+++ b/noatun/modules/kaiman/userinterface.cpp
@@ -335,13 +335,13 @@ void Kaiman::toggleSkin()
 	TQString oldDesc, newDesc;
 	if ( _altSkin )
 	{
-		oldDesc = TQString::tqfromLatin1("skindata");
-		newDesc = TQString::tqfromLatin1("alt_skindata");
+		oldDesc = TQString::fromLatin1("skindata");
+		newDesc = TQString::fromLatin1("alt_skindata");
 	}
 	else
 	{
-		newDesc = TQString::tqfromLatin1("skindata");
-		oldDesc = TQString::tqfromLatin1("alt_skindata");
+		newDesc = TQString::fromLatin1("skindata");
+		oldDesc = TQString::fromLatin1("alt_skindata");
 	}
 
 	if ( !changeStyle(skinName, newDesc) )
@@ -372,7 +372,7 @@ void Kaiman::volumeDown()
 
 void Kaiman::execMixer()
 {
-	kapp->startServiceByDesktopName ( TQString::tqfromLatin1("kmix"), TQString() );
+	kapp->startServiceByDesktopName ( TQString::fromLatin1("kmix"), TQString() );
 }
 
 
diff --git a/noatun/modules/kjofol-skin/kjguisettingswidget.ui b/noatun/modules/kjofol-skin/kjguisettingswidget.ui
index 762d86b9..934285fa 100644
--- a/noatun/modules/kjofol-skin/kjguisettingswidget.ui
+++ b/noatun/modules/kjofol-skin/kjguisettingswidget.ui
@@ -276,7 +276,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>60</height>
@@ -320,7 +320,7 @@
                     <property name="name">
                         <cstring>titleScrollSpeed</cstring>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>80</width>
                             <height>0</height>
@@ -428,7 +428,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>140</width>
                     <height>21</height>
diff --git a/noatun/modules/kjofol-skin/kjloader.cpp b/noatun/modules/kjofol-skin/kjloader.cpp
index a97acb98..c4339229 100644
--- a/noatun/modules/kjofol-skin/kjloader.cpp
+++ b/noatun/modules/kjofol-skin/kjloader.cpp
@@ -812,7 +812,7 @@ void KJLoader::showSplash()
 	splashScreen->setBackgroundMode ( NoBackground );
 	splashScreen->setMask( KJWidget::getMask(image(item("splashscreen")[1])) );
 
-	TQSize sh = splashScreen->tqsizeHint();
+	TQSize sh = splashScreen->sizeHint();
 
 	TQRect desk = KGlobalSettings::splashScreenDesktopGeometry();
 	splashScreen->move (desk.x() + (desk.width() - sh.width())/2,
diff --git a/noatun/modules/kjofol-skin/kjskinselectorwidget.ui b/noatun/modules/kjofol-skin/kjskinselectorwidget.ui
index 229d307e..17bce84d 100644
--- a/noatun/modules/kjofol-skin/kjskinselectorwidget.ui
+++ b/noatun/modules/kjofol-skin/kjskinselectorwidget.ui
@@ -70,7 +70,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>31</height>
@@ -87,7 +87,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>51</width>
                             <height>21</height>
@@ -104,7 +104,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>41</height>
@@ -121,7 +121,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>31</width>
                             <height>21</height>
diff --git a/noatun/modules/marquis/marquis.cpp b/noatun/modules/marquis/marquis.cpp
index b51841a4..566e291d 100644
--- a/noatun/modules/marquis/marquis.cpp
+++ b/noatun/modules/marquis/marquis.cpp
@@ -37,7 +37,7 @@
 #include <noatun/engine.h>
 #include <kaction.h>
 
-static int getPlaytqStatus( Player *player )
+static int getPlayStatus( Player *player )
 {
 	if ( player->isPlaying() )
 		return 1;
@@ -46,7 +46,7 @@ static int getPlaytqStatus( Player *player )
 	return 0;
 }
 
-static void setPlaytqStatus( Player *player, int status )
+static void setPlayStatus( Player *player, int status )
 {
 	switch( status )
 	{
@@ -114,7 +114,7 @@ void Marquis::saveSessionConfig(KConfig *c)
 		c->writePathEntry("Current Song", TQString());
 
 	c->writeEntry("Current Position", player->getTime());
-	c->writeEntry("PlayStatus", getPlaytqStatus( player ));
+	c->writeEntry("PlayStatus", getPlayStatus( player ));
 
 	// borrowed from Plugin config dialog
 	TQStringList specList;
diff --git a/noatun/modules/metatag/edit.cpp b/noatun/modules/metatag/edit.cpp
index 89c123a4..6e37347c 100644
--- a/noatun/modules/metatag/edit.cpp
+++ b/noatun/modules/metatag/edit.cpp
@@ -37,9 +37,9 @@ Editor::Editor()
     TQHBox *heading = new TQHBox(mMainWidget, "Editor::heading");
     heading->setSpacing(4);
     mFileIcon = new TQLabel(heading);
-    mFileIcon->tqsetAlignment(AlignVCenter | AlignLeft);
+    mFileIcon->setAlignment(AlignVCenter | AlignLeft);
     mFile = new TQLabel(heading);
-    mFile->tqsetAlignment(AlignVCenter | AlignLeft);
+    mFile->setAlignment(AlignVCenter | AlignLeft);
     heading->setStretchFactor(mFile, 2);
     mGrid->addMultiCellWidget(heading, 0, 0, 0, 2);
 
@@ -53,7 +53,7 @@ Editor::Editor()
     connect(this, TQT_SIGNAL(okClicked()), TQT_SLOT(save()));
 
     enableButtonSeparator(true);
-    setFixedHeight(tqsizeHint().height());
+    setFixedHeight(sizeHint().height());
 }
 
 void Editor::open(const PlaylistItem & file)
diff --git a/noatun/modules/noatunui/userinterface.cpp b/noatun/modules/noatunui/userinterface.cpp
index 07ff7e15..9d19b166 100644
--- a/noatun/modules/noatunui/userinterface.cpp
+++ b/noatun/modules/noatunui/userinterface.cpp
@@ -140,7 +140,7 @@ MilkChocolate::MilkChocolate() : TQWidget(0,"NoatunUI"), UserInterface()
 	show();
 
 	// What it is now, stay, stay.. roll over, good boy!
-	setFixedSize(tqminimumSize());
+	setFixedSize(minimumSize());
 }
 
 MilkChocolate::~MilkChocolate()
diff --git a/noatun/modules/simple/propertiesdialog.ui b/noatun/modules/simple/propertiesdialog.ui
index 8712ed1a..21fd0686 100644
--- a/noatun/modules/simple/propertiesdialog.ui
+++ b/noatun/modules/simple/propertiesdialog.ui
@@ -51,7 +51,7 @@
                         <property name="name">
                             <cstring>nameField</cstring>
                         </property>
-                        <property name="tqminimumSize">
+                        <property name="minimumSize">
                             <size>
                                 <width>180</width>
                                 <height>0</height>
@@ -109,7 +109,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
@@ -142,13 +142,13 @@
                         <property name="name">
                             <cstring>TextLabel2_2</cstring>
                         </property>
-                        <property name="tqminimumSize">
+                        <property name="minimumSize">
                             <size>
                                 <width>25</width>
                                 <height>0</height>
                             </size>
                         </property>
-                        <property name="tqmaximumSize">
+                        <property name="maximumSize">
                             <size>
                                 <width>25</width>
                                 <height>32767</height>
@@ -241,13 +241,13 @@
                         <property name="name">
                             <cstring>TextLabel2</cstring>
                         </property>
-                        <property name="tqminimumSize">
+                        <property name="minimumSize">
                             <size>
                                 <width>80</width>
                                 <height>0</height>
                             </size>
                         </property>
-                        <property name="tqmaximumSize">
+                        <property name="maximumSize">
                             <size>
                                 <width>80</width>
                                 <height>32767</height>
@@ -305,7 +305,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
diff --git a/noatun/modules/simple/userinterface.cpp b/noatun/modules/simple/userinterface.cpp
index 591335f9..2661f27c 100644
--- a/noatun/modules/simple/userinterface.cpp
+++ b/noatun/modules/simple/userinterface.cpp
@@ -74,7 +74,7 @@ SimpleUI::SimpleUI()
 
     napp->player()->handleButtons();
 
-    resize( tqminimumSize() );
+    resize( minimumSize() );
 
     // Show UI and calculate video widget frame
     show();
@@ -173,7 +173,7 @@ void SimpleUI::setupCentralWidget()
     npWidget->setSpacing( 0 );
 
     positionLabel = new TQLabel( statusBar() );
-    positionLabel->tqsetAlignment( AlignVCenter | AlignCenter );
+    positionLabel->setAlignment( AlignVCenter | AlignCenter );
     positionLabel->setFixedSize( fontMetrics().size( 0, " 00:00/00:00 " ) );
     statusBar()->addWidget( positionLabel, 0, true );
 
@@ -238,15 +238,15 @@ void SimpleUI::setupCentralWidget()
 
     volumeLabel = new TQLabel( volumeFrame );
     volumeLabel->setText( "100%" );
-    volumeLabel->tqsetAlignment( AlignCenter );
-    volumeLabel->setFixedSize( volumeLabel->tqsizeHint() );
+    volumeLabel->setAlignment( AlignCenter );
+    volumeLabel->setFixedSize( volumeLabel->sizeHint() );
 
     TQHBox *volumeSubFrame = new TQHBox( volumeFrame );
     volumeSlider = new L33tSlider( 0, 100, 10, 0,Qt::Vertical, volumeSubFrame );
     volumeSlider->setValue( 100 - napp->player()->volume() );
-    volumeSlider->setFixedSize( volumeSlider->tqsizeHint() );
+    volumeSlider->setFixedSize( volumeSlider->sizeHint() );
 
-    volumeFrame->resize( volumeFrame->tqsizeHint() );
+    volumeFrame->resize( volumeFrame->sizeHint() );
 
     connect( volumeSlider, TQT_SIGNAL(sliderMoved(int)), TQT_SLOT(slotVolumeSliderMoved(int)) );
     connect( volumeSlider, TQT_SIGNAL(userChanged(int)), TQT_SLOT(slotVolumeSliderMoved(int)) );
@@ -254,7 +254,7 @@ void SimpleUI::setupCentralWidget()
 
     setCentralWidget( npWidget );
 
-    video->setMinimumSize( tqminimumSizeHint().width(), 1 );
+    video->setMinimumSize( minimumSizeHint().width(), 1 );
 
     // Create properties dialog
     propertiesDialog = new PropertiesDialog( this );
diff --git a/noatun/modules/splitplaylist/playlist.cpp b/noatun/modules/splitplaylist/playlist.cpp
index 787791ac..3d42d566 100644
--- a/noatun/modules/splitplaylist/playlist.cpp
+++ b/noatun/modules/splitplaylist/playlist.cpp
@@ -217,13 +217,13 @@ void SplitPlaylist::setCurrent(const PlaylistItem &i, bool emitC)
 		if (now)
 			now->setPixmap(0, TQPixmap());
 
-		TQRect rect(view->listView()->tqitemRect(static_cast<SafeListViewItem*>(current().data())));
+		TQRect rect(view->listView()->itemRect(static_cast<SafeListViewItem*>(current().data())));
 		rect.setWidth(view->listView()->viewport()->width());
 		currentItem=i;
 		view->listView()->viewport()->tqrepaint(rect,true);
 
 		view->listView()->ensureItemVisible(static_cast<SafeListViewItem*>(current().data()));
-		TQRect currentRect= view->listView()->tqitemRect(static_cast<SafeListViewItem*>(current().data()));
+		TQRect currentRect= view->listView()->itemRect(static_cast<SafeListViewItem*>(current().data()));
 		view->listView()->viewport()->tqrepaint(currentRect);
 
 		now=static_cast<SafeListViewItem*>(current().data());
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>
diff --git a/noatun/modules/winskin/waInfo.cpp b/noatun/modules/winskin/waInfo.cpp
index fb923994..05aa6381 100644
--- a/noatun/modules/winskin/waInfo.cpp
+++ b/noatun/modules/winskin/waInfo.cpp
@@ -30,7 +30,7 @@ WaInfo::WaInfo() : WaWidget(_WA_MAPPING_INFO)
 
     completePixmap = new TQPixmap();
 
-    TQSize size = tqsizeHint();
+    TQSize size = sizeHint();
     completePixmap->resize(size.width(), size.height());
 
     xGrabbedPos = -1;
@@ -65,7 +65,7 @@ void WaInfo::scrollerSetup()
     xScrollPos = 0;
     xScrollDirection = 0;
     timer->stop();
-    TQSize size = tqsizeHint();
+    TQSize size = sizeHint();
     if (completePixmap->width() > size.width()) {
 		xScrollDirection = 1;
 		
@@ -79,7 +79,7 @@ void WaInfo::scrollerSetup()
 
 void WaInfo::paintEvent(TQPaintEvent *)
 {
-    TQSize size = tqsizeHint();
+    TQSize size = sizeHint();
 
     if (completePixmap->width() <= size.width()) {
 	bitBlt(this, 0, 0, completePixmap);
@@ -127,7 +127,7 @@ void WaInfo::pixmapChange()
     int x = 0;
     int n=infoString ? strlen(infoString) : 0;
 
-    TQSize size = tqsizeHint();
+    TQSize size = sizeHint();
 
     completePixmap->resize(TQMAX(n * _WA_TEXT_WIDTH, size.width()), _WA_TEXT_HEIGHT);
 
diff --git a/noatun/modules/winskin/waLabel.cpp b/noatun/modules/winskin/waLabel.cpp
index bb16d118..71f2baa2 100644
--- a/noatun/modules/winskin/waLabel.cpp
+++ b/noatun/modules/winskin/waLabel.cpp
@@ -24,7 +24,7 @@ WaLabel::WaLabel(int mapping) : WaWidget(mapping)
 
     completePixmap = new TQPixmap();
 
-    TQSize size = tqsizeHint();
+    TQSize size = sizeHint();
 
     completePixmap->resize(size.width(), size.height());
 }
diff --git a/noatun/modules/winskin/waSkin.cpp b/noatun/modules/winskin/waSkin.cpp
index e4770b7f..c2da5eb8 100644
--- a/noatun/modules/winskin/waSkin.cpp
+++ b/noatun/modules/winskin/waSkin.cpp
@@ -72,8 +72,8 @@ WaSkin::WaSkin() : TQWidget(0, "NoatunWinampSkin"), UserInterface()
 
     createHighLevelElements();
     createButtons();
-    setMinimumSize(tqsizeHint());
-    setMaximumSize(tqsizeHint());
+    setMinimumSize(sizeHint());
+    setMaximumSize(sizeHint());
 
     KWin::setType(this->winId(), NET::Override);
     setBackgroundMode(NoBackground);
@@ -142,7 +142,7 @@ void WaSkin::loadSkin(TQString newSkinDir)
 {
     waSkinManager->loadSkin(newSkinDir);
 
-    setMinimumSize(tqsizeHint());
+    setMinimumSize(sizeHint());
 
     if (title_shaded) {
         // waSkinModel::load() resets our skin model :(
@@ -154,7 +154,7 @@ void WaSkin::loadSkin(TQString newSkinDir)
     }
 }
 
-TQSize WaSkin::tqsizeHint() const
+TQSize WaSkin::sizeHint() const
 {
     TQRect temp_rect;
 
@@ -305,7 +305,7 @@ void WaSkin::createHighLevelElements()
 
     waInfo = new WaInfo();
 
-    watqStatus = new WatqStatus();
+    waStatus = new WaStatus();
 
     waStereo = new WaIndicator(_WA_MAPPING_MONOSTER_STEREO, _WA_SKIN_MONOSTER_STEREO_TRUE, _WA_SKIN_MONOSTER_STEREO_FALSE);
     waMono = new WaIndicator(_WA_MAPPING_MONOSTER_MONO, _WA_SKIN_MONOSTER_MONO_TRUE, _WA_SKIN_MONOSTER_MONO_FALSE);
@@ -337,7 +337,7 @@ void WaSkin::setChannels(int val)
 void WaSkin::shade() {
     waSkinModel->setSkinModel(WA_MODEL_WINDOWSHADE);
 
-    setMinimumSize(tqsizeHint());
+    setMinimumSize(sizeHint());
     setMask(*windowRegion->mainWindowShadeMask());
 
     title_shaded = true;
@@ -346,7 +346,7 @@ void WaSkin::shade() {
 void WaSkin::unshade() {
     waSkinModel->setSkinModel(WA_MODEL_NORMAL);
 
-    setMinimumSize(tqsizeHint());
+    setMinimumSize(sizeHint());
     setMask(*windowRegion->mainWindowMask());
 
     title_shaded = false;
@@ -679,7 +679,7 @@ void WaSkin::volumeSetValue(int val)
 
 void WaSkin::slotPlaying()
 {
-    watqStatus->settqStatus(STATUS_PLAYING);
+    waStatus->setStatus(STATUS_PLAYING);
 
     if (!napp->playlist()->current()) {
       return;
@@ -710,7 +710,7 @@ void WaSkin::slotPlaying()
 
 void WaSkin::slotStopped()
 {
-    watqStatus->settqStatus(STATUS_STOPPED);
+    waStatus->setStatus(STATUS_STOPPED);
 
     waDigit->setTime("");
 
@@ -733,7 +733,7 @@ void WaSkin::slotStopped()
 
 void WaSkin::slotPaused()
 {
-    watqStatus->settqStatus(STATUS_PAUSED);
+    waStatus->setStatus(STATUS_PAUSED);
 }
 
 void WaSkin::keyPressEvent(TQKeyEvent *e) {
diff --git a/noatun/modules/winskin/waSkin.h b/noatun/modules/winskin/waSkin.h
index 5c363428..842a17d7 100644
--- a/noatun/modules/winskin/waSkin.h
+++ b/noatun/modules/winskin/waSkin.h
@@ -33,7 +33,7 @@ class WaMain;
 class WaIndicator;
 class WaTitleBar;
 class WaClutterbar;
-class WatqStatus;
+class WaStatus;
 
 class WaJumpSlider;
 class WaVolumeSlider;
@@ -60,7 +60,7 @@ class WaSkin : public TQWidget, public UserInterface {
     void loadSkin(TQString skinDir);
     void setChannels(int val);
 
-    TQSize tqsizeHint() const;
+    TQSize sizeHint() const;
 
     static TQString defaultSkin();
     static WaSkin *instance() { return _waskin_instance; }
@@ -159,7 +159,7 @@ class WaSkin : public TQWidget, public UserInterface {
     WaLabel *waFreq;
 
     WaInfo *waInfo;
-    WatqStatus *watqStatus;
+    WaStatus *waStatus;
     WaIndicator *waStereo;
     WaIndicator *waMono;
 
diff --git a/noatun/modules/winskin/waSlider.cpp b/noatun/modules/winskin/waSlider.cpp
index 3323e7ee..8c97c272 100644
--- a/noatun/modules/winskin/waSlider.cpp
+++ b/noatun/modules/winskin/waSlider.cpp
@@ -70,7 +70,7 @@ void WaSlider::mouseMoveEvent(TQMouseEvent * e)
     if (newX < 0) 
 	newX = 0;
 
-    TQSize size = tqsizeHint();
+    TQSize size = sizeHint();
 
     int maxX = size.width() - slider_width;
     
@@ -143,7 +143,7 @@ void WaSlider::mouseReleaseEvent(TQMouseEvent *e)
 
 int WaSlider::pixel2Value(int xpos)
 {
-    TQSize size = tqsizeHint();
+    TQSize size = sizeHint();
     int min = abs(minValue);
     int max = abs(maxValue);
 
@@ -158,7 +158,7 @@ int WaSlider::pixel2Value(int xpos)
 
 int WaSlider::value2Pixel(int value)
 {
-    TQSize size = tqsizeHint();
+    TQSize size = sizeHint();
     float min = (float) minValue;
     float max = (float) maxValue;
     float fmin = min;
diff --git a/noatun/modules/winskin/waStatus.cpp b/noatun/modules/winskin/waStatus.cpp
index 20f95d92..861e8677 100644
--- a/noatun/modules/winskin/waStatus.cpp
+++ b/noatun/modules/winskin/waStatus.cpp
@@ -14,16 +14,16 @@
 #include "waStatus.h"
 #include "waSkinModel.h"
 
-WatqStatus::WatqStatus() : WaWidget(_WA_MAPPING_PLAYPAUS)
+WaStatus::WaStatus() : WaWidget(_WA_MAPPING_PLAYPAUS)
 {
     _status = STATUS_STOPPED;
 }
 
-WatqStatus::~WatqStatus()
+WaStatus::~WaStatus()
 {
 }
 
-void WatqStatus::paintEvent(TQPaintEvent *)
+void WaStatus::paintEvent(TQPaintEvent *)
 {
     if (_status == STATUS_PLAYING) {
 	paintPixmap(_WA_SKIN_PLAYPAUS_WORK_INDICATOR);
diff --git a/noatun/modules/winskin/waStatus.h b/noatun/modules/winskin/waStatus.h
index e028f318..3508ddca 100644
--- a/noatun/modules/winskin/waStatus.h
+++ b/noatun/modules/winskin/waStatus.h
@@ -22,15 +22,15 @@
 
 enum status_enum {STATUS_PLAYING, STATUS_STOPPED, STATUS_PAUSED};
 
-class WatqStatus : public WaWidget {
+class WaStatus : public WaWidget {
     Q_OBJECT
   TQ_OBJECT
 
   public:
-     WatqStatus();
-    ~WatqStatus();
+     WaStatus();
+    ~WaStatus();
 
-    void settqStatus(status_enum status) { _status = status; update(); }
+    void setStatus(status_enum status) { _status = status; update(); }
     status_enum status() const { return _status; }
 
   private:
diff --git a/noatun/modules/winskin/waWidget.cpp b/noatun/modules/winskin/waWidget.cpp
index 0b792c7c..4a44f252 100644
--- a/noatun/modules/winskin/waWidget.cpp
+++ b/noatun/modules/winskin/waWidget.cpp
@@ -41,7 +41,7 @@ void WaWidget::paintPixmap(int pixmap_mapping, int argument, int x, int y) {
         WaSkinModel::instance()->paintBackgroundTo(mapping, TQT_TQPAINTDEVICE(this), x, y);
 }
 
-TQSize WaWidget::tqsizeHint() {
+TQSize WaWidget::sizeHint() {
     return WaSkinModel::instance()->getMapGeometry(mapping).size();
 }
 
diff --git a/noatun/modules/winskin/waWidget.h b/noatun/modules/winskin/waWidget.h
index d1fb1d9c..b8b5cb3f 100644
--- a/noatun/modules/winskin/waWidget.h
+++ b/noatun/modules/winskin/waWidget.h
@@ -11,7 +11,7 @@ public:
     WaWidget(int mapping);
     virtual ~WaWidget();
 
-    TQSize tqsizeHint();
+    TQSize sizeHint();
 
     void paintPixmap(int wa_mapping);
     void paintPixmap(int wa_mapping, int number);