Rename old tq methods that no longer need a unique name

24 files changed, 99 insertions, 99 deletions

diff --git a/kicker-applets/kbinaryclock/kbinaryclock.cpp b/kicker-applets/kbinaryclock/kbinaryclock.cpp
index ebf7d59..6acd08b 100644
--- a/kicker-applets/kbinaryclock/kbinaryclock.cpp
+++ b/kicker-applets/kbinaryclock/kbinaryclock.cpp
@@ -290,7 +290,7 @@ void KBinaryClock::openContextMenu() {
 		menu->insertTitle( SmallIcon( "clock" ), i18n( "KBinaryClock" ) );
 
 		KLocale *loc = KGlobal::locale();
-		TQDateTime dt = TQDateTime::tqcurrentDateTime();
+		TQDateTime dt = TQDateTime::currentDateTime();
 
 		KPopupMenu *copyMenu = new KPopupMenu( menu );
 		copyMenu->insertItem(loc->formatDateTime(dt), 201);
@@ -361,15 +361,15 @@ void KBinaryClock::toggleCalendar()
 	if (_calendar || _disableCalendar){
 		return;
 	}
-	_calendar = new DatePicker(this, TQDateTime::tqcurrentDateTime().date());
+	_calendar = new DatePicker(this, TQDateTime::currentDateTime().date());
 	connect( _calendar, TQT_SIGNAL( destroyed() ), TQT_SLOT( slotCalendarDeleted() ));
 
 	// some extra spacing is included if aligned on a desktop edge
 	TQPoint c = mapToGlobal(TQPoint(0,0));
 
-	int w = _calendar->tqsizeHint().width() + 28;
+	int w = _calendar->sizeHint().width() + 28;
 															// Added 28 px. to size poperly as said in API
-	int h = _calendar->tqsizeHint().height();
+	int h = _calendar->sizeHint().height();
 
 	switch (position()) {
 	case KPanelApplet::pLeft:	c.setX(c.x()+width()+2);	break;
@@ -405,7 +405,7 @@ ClockAppletToolTip::ClockAppletToolTip( KBinaryClock *clock ) : TQToolTip( clock
 
 void ClockAppletToolTip::maybeTip( const TQPoint & /*point*/ )
 {
-	tip(m_clock->tqgeometry(), KGlobal::locale()->formatDate(TQDateTime::tqcurrentDateTime().date(), false));
+	tip(m_clock->tqgeometry(), KGlobal::locale()->formatDate(TQDateTime::currentDateTime().date(), false));
 }
 
 #include "kbinaryclock.moc"
diff --git a/kicker-applets/kbinaryclock/settings.ui b/kicker-applets/kbinaryclock/settings.ui
index 321f913..2ebb466 100644
--- a/kicker-applets/kbinaryclock/settings.ui
+++ b/kicker-applets/kbinaryclock/settings.ui
@@ -96,7 +96,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>21</width>
                             <height>20</height>
@@ -169,7 +169,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>16</width>
                             <height>20</height>
@@ -287,7 +287,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
@@ -332,7 +332,7 @@
                                     <property name="name">
                                         <cstring>kLed1</cstring>
                                     </property>
-                                    <property name="tqminimumSize">
+                                    <property name="minimumSize">
                                         <size>
                                             <width>32</width>
                                             <height>32</height>
@@ -346,7 +346,7 @@
                                     <property name="name">
                                         <cstring>kLed2</cstring>
                                     </property>
-                                    <property name="tqminimumSize">
+                                    <property name="minimumSize">
                                         <size>
                                             <width>32</width>
                                             <height>32</height>
@@ -357,7 +357,7 @@
                                     <property name="name">
                                         <cstring>kLed4</cstring>
                                     </property>
-                                    <property name="tqminimumSize">
+                                    <property name="minimumSize">
                                         <size>
                                             <width>32</width>
                                             <height>32</height>
@@ -368,7 +368,7 @@
                                     <property name="name">
                                         <cstring>kLed3</cstring>
                                     </property>
-                                    <property name="tqminimumSize">
+                                    <property name="minimumSize">
                                         <size>
                                             <width>32</width>
                                             <height>32</height>
@@ -382,7 +382,7 @@
                                     <property name="name">
                                         <cstring>kLed6</cstring>
                                     </property>
-                                    <property name="tqminimumSize">
+                                    <property name="minimumSize">
                                         <size>
                                             <width>32</width>
                                             <height>32</height>
@@ -396,7 +396,7 @@
                                     <property name="name">
                                         <cstring>kLed5</cstring>
                                     </property>
-                                    <property name="tqminimumSize">
+                                    <property name="minimumSize">
                                         <size>
                                             <width>32</width>
                                             <height>32</height>
@@ -415,7 +415,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>21</width>
                                     <height>20</height>
@@ -434,7 +434,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>84</height>
diff --git a/kicker-applets/kolourpicker/simplebutton.cpp b/kicker-applets/kolourpicker/simplebutton.cpp
index f232377..f5239bd 100644
--- a/kicker-applets/kolourpicker/simplebutton.cpp
+++ b/kicker-applets/kolourpicker/simplebutton.cpp
@@ -63,22 +63,22 @@ void SimpleButton::setOrientation(Qt::Orientation orientation)
     update();
 }
 
-TQSize SimpleButton::tqsizeHint() const
+TQSize SimpleButton::sizeHint() const
 {
     const TQPixmap* pm = pixmap();
 
     if (!pm)
-        return TQButton::tqsizeHint();
+        return TQButton::sizeHint();
     else
         return TQSize(pm->width() + KDialog::spacingHint(), pm->height() + KDialog::spacingHint());
 }
 
-TQSize SimpleButton::tqminimumSizeHint() const
+TQSize SimpleButton::minimumSizeHint() const
 {
     const TQPixmap* pm = pixmap();
 
     if (!pm)
-        return TQButton::tqminimumSizeHint();
+        return TQButton::minimumSizeHint();
     else
         return TQSize(pm->width(), pm->height());
 }
@@ -200,7 +200,7 @@ SimpleArrowButton::SimpleArrowButton(TQWidget *parent, TQt::ArrowType arrow, con
     _inside = false;
 }
 
-TQSize SimpleArrowButton::tqsizeHint() const
+TQSize SimpleArrowButton::sizeHint() const
 {
     return TQSize( 12, 12 );
 }
@@ -234,7 +234,7 @@ void SimpleArrowButton::drawButton( TQPainter *p )
     
     int flags = TQStyle::Style_Default | TQStyle::Style_Enabled;
     if (isDown() || isOn())	flags |= TQStyle::Style_Down;
-    tqstyle().tqdrawPrimitive(pe, p, r, tqcolorGroup(), flags);
+    tqstyle().tqdrawPrimitive(pe, p, r, colorGroup(), flags);
 }
 
 void SimpleArrowButton::enterEvent( TQEvent *e )
diff --git a/kicker-applets/kolourpicker/simplebutton.h b/kicker-applets/kolourpicker/simplebutton.h
index 0cf11e5..9c66f85 100644
--- a/kicker-applets/kolourpicker/simplebutton.h
+++ b/kicker-applets/kolourpicker/simplebutton.h
@@ -35,8 +35,8 @@ class KDE_EXPORT SimpleButton : public TQButton
         SimpleButton(TQWidget *parent, const char *name = 0);
         void setPixmap(const TQPixmap &pix);
         void setOrientation(Qt::Orientation orientaton);
-        TQSize tqsizeHint() const;
-        TQSize tqminimumSizeHint() const;
+        TQSize sizeHint() const;
+        TQSize minimumSizeHint() const;
 
     protected:
         void drawButton( TQPainter *p );
@@ -69,7 +69,7 @@ class KDE_EXPORT SimpleArrowButton: public SimpleButton
     public:
         SimpleArrowButton(TQWidget *parent = 0, TQt::ArrowType arrow = TQt::UpArrow, const char *name = 0);
         virtual ~SimpleArrowButton() {};
-        TQSize tqsizeHint() const;
+        TQSize sizeHint() const;
     
     protected:
         virtual void enterEvent( TQEvent *e );
diff --git a/kicker-applets/ktimemon/timemon.cc b/kicker-applets/ktimemon/timemon.cc
index 2c78031..f0cc61a 100644
--- a/kicker-applets/ktimemon/timemon.cc
+++ b/kicker-applets/ktimemon/timemon.cc
@@ -111,7 +111,7 @@ void KTimeMon::paintEvent(TQPaintEvent *)
     b = r / 3;            // bar width
     r -= b;
 
-    if (bgColour != tqcolorGroup().background())
+    if (bgColour != colorGroup().background())
     {
         paintRect(x, 0, b, h, bgColour, &painter);
     }
@@ -125,7 +125,7 @@ void KTimeMon::paintEvent(TQPaintEvent *)
     b = r / 2;
     r -= b;
 
-    if (bgColour != tqcolorGroup().background())
+    if (bgColour != colorGroup().background())
     {
         paintRect(x, 0, b, h, bgColour, &painter);
     }
@@ -138,7 +138,7 @@ void KTimeMon::paintEvent(TQPaintEvent *)
     x += b;
     b = r;
 
-    if (bgColour != tqcolorGroup().background())
+    if (bgColour != colorGroup().background())
     {
         paintRect(x, 0, b, h, bgColour, &painter);
     }
@@ -192,7 +192,7 @@ KTimeMon::KTimeMon(const TQString& configFile, Type type, int actions,
     niceColour("yellow"), iowaitColour("darkgreen"),
     usedColour("blue1"), buffersColour("yellow"),
     cachedColour("darkgreen"), mkernelColour("red1"),
-    swapColour("cyan3"), bgColour(tqcolorGroup().background())
+    swapColour("cyan3"), bgColour(colorGroup().background())
 {
     mouseAction[0] = NOTHING;
     mouseAction[1] = NOTHING;
diff --git a/kicker-applets/math/mathapplet.cpp b/kicker-applets/math/mathapplet.cpp
index 772afeb..37e0bd6 100644
--- a/kicker-applets/math/mathapplet.cpp
+++ b/kicker-applets/math/mathapplet.cpp
@@ -157,14 +157,14 @@ void MathApplet::resizeEvent(TQResizeEvent*)
 	    _input->reparent(this, TQPoint(0,0), true);
 	    _label->setGeometry(0,0, width(), _label->height());
 
-	    if(height() >= _input->tqsizeHint().height() + _label->height())
+	    if(height() >= _input->sizeHint().height() + _label->height())
 		{
-                    int inputVOffset = height() - _input->tqsizeHint().height() - 2;
-                    int labelHeight = _label->tqsizeHint().height();
+                    int inputVOffset = height() - _input->sizeHint().height() - 2;
+                    int labelHeight = _label->sizeHint().height();
 		    _label->setGeometry(0, inputVOffset - labelHeight,
                                         width(), labelHeight);
 		    _input->setGeometry(0, inputVOffset,
-					width(), _input->tqsizeHint().height());
+					width(), _input->sizeHint().height());
 		    _label->show();
 		}
 	    else
@@ -174,7 +174,7 @@ void MathApplet::resizeEvent(TQResizeEvent*)
                     // make it as high as the combobox naturally wants to be
                     // but no taller than the panel is!
                     // don't forget to center it vertically either.
-                    int newHeight = _input->tqsizeHint().height();
+                    int newHeight = _input->sizeHint().height();
                     if (newHeight > height())
                         newHeight = height();
 		    _input->setGeometry(0, (height() - newHeight) / 2,
diff --git a/kicker-applets/mediacontrol/amarokInterface.cpp b/kicker-applets/mediacontrol/amarokInterface.cpp
index b77b5d2..e2265a7 100644
--- a/kicker-applets/mediacontrol/amarokInterface.cpp
+++ b/kicker-applets/mediacontrol/amarokInterface.cpp
@@ -146,7 +146,7 @@ void AmarokInterface::updateSlider ( )
       time = 0;
    }
    emit newSliderPosition(len,time);
-   emit playingStatusChanged(playingtqStatus());
+   emit playingStatusChanged(playingStatus());
 }
 
 // Drag-n-Drop stuff =================================================================
@@ -289,7 +289,7 @@ bool AmarokInterface::findRunningAmarok()
 }
 
 
-int AmarokInterface::playingtqStatus()
+int AmarokInterface::playingStatus()
 {
    TQByteArray data, replyData;
    TQCString replyType;
diff --git a/kicker-applets/mediacontrol/amarokInterface.h b/kicker-applets/mediacontrol/amarokInterface.h
index f863208..5e8c689 100644
--- a/kicker-applets/mediacontrol/amarokInterface.h
+++ b/kicker-applets/mediacontrol/amarokInterface.h
@@ -48,7 +48,7 @@ class AmarokInterface : public PlayerInterface
       virtual void dragEnterEvent(TQDragEnterEvent* event);
       virtual void dropEvent(TQDropEvent* event);
       virtual const TQString getTrackTitle() const;
-      virtual int playingtqStatus();
+      virtual int playingStatus();
 
    private slots:
       void myInit();
diff --git a/kicker-applets/mediacontrol/jukInterface.cpp b/kicker-applets/mediacontrol/jukInterface.cpp
index b055424..27ce45e 100644
--- a/kicker-applets/mediacontrol/jukInterface.cpp
+++ b/kicker-applets/mediacontrol/jukInterface.cpp
@@ -148,7 +148,7 @@ void JuKInterface::updateSlider ()
 		time = 0;
 	}
 	emit ( newSliderPosition(len,time) );
-	emit playingStatusChanged(playingtqStatus());
+	emit playingStatusChanged(playingStatus());
 }
 
 // Drag-n-Drop stuff =================================================================
@@ -291,7 +291,7 @@ bool JuKInterface::findRunningJuK()
 	return false;
 }
 
-int JuKInterface::playingtqStatus()
+int JuKInterface::playingStatus()
 {
 	TQByteArray data, replyData;
 	TQCString replyType;
diff --git a/kicker-applets/mediacontrol/jukInterface.h b/kicker-applets/mediacontrol/jukInterface.h
index fa74fba..51bd6de 100644
--- a/kicker-applets/mediacontrol/jukInterface.h
+++ b/kicker-applets/mediacontrol/jukInterface.h
@@ -49,7 +49,7 @@ class JuKInterface : public PlayerInterface
 		void dragEnterEvent(TQDragEnterEvent* event);
 		void dropEvent(TQDropEvent* event);
 		const TQString getTrackTitle() const;
-		int playingtqStatus();
+		int playingStatus();
 
 	private slots:
 		void myInit();
diff --git a/kicker-applets/mediacontrol/kscdInterface.cpp b/kicker-applets/mediacontrol/kscdInterface.cpp
index 67eb931..916c0e1 100644
--- a/kicker-applets/mediacontrol/kscdInterface.cpp
+++ b/kicker-applets/mediacontrol/kscdInterface.cpp
@@ -126,7 +126,7 @@ void KsCDInterface::updateSlider()
 		time = 0;
 	}
 	emit newSliderPosition(len,time);
-	emit playingStatusChanged(playingtqStatus());
+	emit playingStatusChanged(playingStatus());
 }
 
 // Drag-n-Drop stuff =================================================================
@@ -305,7 +305,7 @@ bool KsCDInterface::findRunningKsCD()
 	return false;
 }
 
-int KsCDInterface::playingtqStatus()
+int KsCDInterface::playingStatus()
 {
 	TQByteArray data, replyData;
 	TQCString replyType;
diff --git a/kicker-applets/mediacontrol/kscdInterface.h b/kicker-applets/mediacontrol/kscdInterface.h
index 2d37e42..2448080 100644
--- a/kicker-applets/mediacontrol/kscdInterface.h
+++ b/kicker-applets/mediacontrol/kscdInterface.h
@@ -48,7 +48,7 @@ class KsCDInterface : public PlayerInterface
 		void dragEnterEvent(TQDragEnterEvent* event);
 		void dropEvent(TQDropEvent* event);
 		const TQString getTrackTitle() const;
-		int playingtqStatus();
+		int playingStatus();
 
 	private slots:
 		void myInit();
diff --git a/kicker-applets/mediacontrol/mediacontrol.cpp b/kicker-applets/mediacontrol/mediacontrol.cpp
index a2bf77b..ac32064 100644
--- a/kicker-applets/mediacontrol/mediacontrol.cpp
+++ b/kicker-applets/mediacontrol/mediacontrol.cpp
@@ -226,10 +226,10 @@ void MediaControl::disableAll()
 
 void MediaControl::slotPlayingStatusChanged(int status)
 {
-	if (mLasttqStatus == status)
+	if (mLastStatus == status)
 		return;
 
-	mLasttqStatus = status;
+	mLastStatus = status;
 	TQString skindir = locate("data", "mediacontrol/"+_configFrontend->theme()+"/");
 
 	switch (status)
@@ -255,7 +255,7 @@ void MediaControl::slotIconChanged()
 	if(!_configFrontend->useCustomTheme())
 	{
 		prev_button->setIconSet(SmallIconSet("player_start"));
-		if (_player->playingtqStatus() == PlayerInterface::Playing)
+		if (_player->playingStatus() == PlayerInterface::Playing)
 			playpause_button->setIconSet(SmallIconSet("player_pause"));
 		else
 			playpause_button->setIconSet(SmallIconSet("player_play"));
@@ -350,7 +350,7 @@ void MediaControl::reparseConfig()
 
 	mLastLen = -1;
 	mLastTime = -1;
-	mLasttqStatus = -1;
+	mLastStatus = -1;
 
 	TQString playerString = _configFrontend->player();
 
@@ -413,7 +413,7 @@ void MediaControl::reparseConfig()
 		if (TQFile(skindir+"play.png").exists())
 		{
 			prev_button->setIconSet(SmallIconSet(locate("data",skindir+"prev.png")));
-			if (_player->playingtqStatus() == PlayerInterface::Playing)
+			if (_player->playingStatus() == PlayerInterface::Playing)
 				playpause_button->setIconSet(SmallIconSet(locate("data",skindir+"play.png")));
 			else
 				playpause_button->setIconSet(SmallIconSet(locate("data",skindir+"pause.png")));
@@ -461,10 +461,10 @@ void MediaControl::reparseConfig()
 int MediaControl::widthForHeight(int height) const
 {
 //	kdDebug(90200) << "kicker height: " << height << endl;
-//	kdDebug(90200) << "slider needs: " << time_slider->tqminimumSizeHint().height() << endl;
+//	kdDebug(90200) << "slider needs: " << time_slider->minimumSizeHint().height() << endl;
 
 	// slider height + button height
-	if ( height >= (time_slider->tqminimumSizeHint().height()+MC_BUTTONSIZE) )
+	if ( height >= (time_slider->minimumSizeHint().height()+MC_BUTTONSIZE) )
 	{	// slider UNDER buttons
 		// (5 * button width + spaces between them);
 		return (4*MC_BUTTONSIZE+10);
@@ -483,7 +483,7 @@ int MediaControl::heightForWidth(int width) const
 //	kdDebug(90200) << "kicker width: " << width << endl;
 
 	// slider height + button height
-	if ( width >= (time_slider->tqminimumSizeHint().width()+MC_BUTTONSIZE) )
+	if ( width >= (time_slider->minimumSizeHint().width()+MC_BUTTONSIZE) )
 	{	// slider ASIDE icons
 		// (5 * button width + spaces between them);
 		return (4*MC_BUTTONSIZE+10);
@@ -535,7 +535,7 @@ void MediaControl::resizeEvent( TQResizeEvent* )
 	if ( orientation() ==Qt::Vertical )
 	{		// ====== VERTICAL =================================================
 		time_slider->setOrientation(Qt::Vertical);
-		int slider_width = time_slider->tqminimumSizeHint().width();
+		int slider_width = time_slider->minimumSizeHint().width();
 		// some styles need more space for sliders than avilable in very small panels :(
 		if ( slider_width > w ) slider_width = w;
 
@@ -567,7 +567,7 @@ void MediaControl::resizeEvent( TQResizeEvent* )
 	else	// ====== HORIZONTAL ===============================================
 	{
 		time_slider->setOrientation(Qt::Horizontal);
-		int slider_height = time_slider->tqminimumSizeHint().height();
+		int slider_height = time_slider->minimumSizeHint().height();
 		// some styles need more space for sliders than avilable in very small panels :(
 		if ( slider_height > h ) slider_height = h;
 
diff --git a/kicker-applets/mediacontrol/mediacontrol.h b/kicker-applets/mediacontrol/mediacontrol.h
index 161db39..15315c6 100644
--- a/kicker-applets/mediacontrol/mediacontrol.h
+++ b/kicker-applets/mediacontrol/mediacontrol.h
@@ -95,7 +95,7 @@ class MediaControl : public KPanelApplet, virtual public MediaControlIface
 		TrayButton *stop_button;  // Stop the music
 		TrayButton *next_button;  // GoTo Next Playlist-Item
 		MCSlider *time_slider;
-		int mLastLen, mLastTime, mLasttqStatus;
+		int mLastLen, mLastTime, mLastStatus;
 		KPopupMenu *rmbMenu;
 
 		virtual void mousePressEvent(TQMouseEvent* e);
diff --git a/kicker-applets/mediacontrol/mediacontrolconfigwidget.ui b/kicker-applets/mediacontrol/mediacontrolconfigwidget.ui
index 36a3e0e..df36762 100644
--- a/kicker-applets/mediacontrol/mediacontrolconfigwidget.ui
+++ b/kicker-applets/mediacontrol/mediacontrolconfigwidget.ui
@@ -156,7 +156,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>0</height>
@@ -199,13 +199,13 @@
                                                 <verstretch>0</verstretch>
                                             </sizepolicy>
                                         </property>
-                                        <property name="tqminimumSize">
+                                        <property name="minimumSize">
                                             <size>
                                                 <width>18</width>
                                                 <height>18</height>
                                             </size>
                                         </property>
-                                        <property name="tqmaximumSize">
+                                        <property name="maximumSize">
                                             <size>
                                                 <width>18</width>
                                                 <height>18</height>
@@ -227,13 +227,13 @@
                                                 <verstretch>0</verstretch>
                                             </sizepolicy>
                                         </property>
-                                        <property name="tqminimumSize">
+                                        <property name="minimumSize">
                                             <size>
                                                 <width>18</width>
                                                 <height>18</height>
                                             </size>
                                         </property>
-                                        <property name="tqmaximumSize">
+                                        <property name="maximumSize">
                                             <size>
                                                 <width>18</width>
                                                 <height>18</height>
@@ -255,13 +255,13 @@
                                                 <verstretch>0</verstretch>
                                             </sizepolicy>
                                         </property>
-                                        <property name="tqminimumSize">
+                                        <property name="minimumSize">
                                             <size>
                                                 <width>18</width>
                                                 <height>18</height>
                                             </size>
                                         </property>
-                                        <property name="tqmaximumSize">
+                                        <property name="maximumSize">
                                             <size>
                                                 <width>18</width>
                                                 <height>18</height>
@@ -283,13 +283,13 @@
                                                 <verstretch>0</verstretch>
                                             </sizepolicy>
                                         </property>
-                                        <property name="tqminimumSize">
+                                        <property name="minimumSize">
                                             <size>
                                                 <width>18</width>
                                                 <height>18</height>
                                             </size>
                                         </property>
-                                        <property name="tqmaximumSize">
+                                        <property name="maximumSize">
                                             <size>
                                                 <width>18</width>
                                                 <height>18</height>
@@ -311,13 +311,13 @@
                                                 <verstretch>0</verstretch>
                                             </sizepolicy>
                                         </property>
-                                        <property name="tqminimumSize">
+                                        <property name="minimumSize">
                                             <size>
                                                 <width>18</width>
                                                 <height>18</height>
                                             </size>
                                         </property>
-                                        <property name="tqmaximumSize">
+                                        <property name="maximumSize">
                                             <size>
                                                 <width>18</width>
                                                 <height>18</height>
@@ -339,7 +339,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>0</height>
diff --git a/kicker-applets/mediacontrol/mpdInterface.cpp b/kicker-applets/mediacontrol/mpdInterface.cpp
index ea350d2..b17afa3 100644
--- a/kicker-applets/mediacontrol/mpdInterface.cpp
+++ b/kicker-applets/mediacontrol/mpdInterface.cpp
@@ -118,7 +118,7 @@ void MpdInterface::connected()
     {
         //kdDebug(90200) << "Connected ok\n";
         emit playerStarted();
-        emit playingStatusChanged(playingtqStatus());
+        emit playingStatusChanged(playingStatus());
     }
     else
     {
@@ -265,7 +265,7 @@ void MpdInterface::updateSlider()
         }
         else if (time_re.search(res)>=0)
         {
-            TQStringList timeinfo=time_re.tqcapturedTexts();
+            TQStringList timeinfo=time_re.capturedTexts();
             timeinfo.pop_front();
             int elapsed_seconds=timeinfo.first().toInt();
             timeinfo.pop_front();
@@ -298,7 +298,7 @@ void MpdInterface::jumpToTime(int sec)
     {
         if (songid_re.search(res)>=0)
         {
-            TQStringList songidinfo=songid_re.tqcapturedTexts();
+            TQStringList songidinfo=songid_re.capturedTexts();
             songidinfo.pop_front();
             songid=songidinfo.first().toInt();
         }
@@ -316,7 +316,7 @@ void MpdInterface::jumpToTime(int sec)
 void MpdInterface::playpause()
 {
     reconnect();
-    if (playingtqStatus()==Stopped ? dispatch("play\n") : dispatch("pause\n"))
+    if (playingStatus()==Stopped ? dispatch("play\n") : dispatch("pause\n"))
     {
         fetchOk();
     }
@@ -355,7 +355,7 @@ void MpdInterface::changeVolume(int delta)
     {
         if (volume_re.search(res)>=0)
         {
-            TQStringList info=volume_re.tqcapturedTexts();
+            TQStringList info=volume_re.capturedTexts();
             info.pop_front();
             volume=info.first().toInt();
         }
@@ -411,7 +411,7 @@ void MpdInterface::dropEvent(TQDropEvent* event)
                     TQRegExp id_re("Id: (.+)");
                     if (file.isEmpty() && file_re.search(res)>=0)
                     {
-                        TQStringList info=file_re.tqcapturedTexts();
+                        TQStringList info=file_re.capturedTexts();
                         info.pop_front();
                         // if the dropped file ends with the same name, record it
                         if (list.front().path().endsWith(info.first()))
@@ -422,7 +422,7 @@ void MpdInterface::dropEvent(TQDropEvent* event)
                     else if (!file.isEmpty() && id_re.search(res)>=0)
                     {
                         // when we have the file, pick up the id (file scomes first)
-                        TQStringList info=id_re.tqcapturedTexts();
+                        TQStringList info=id_re.capturedTexts();
                         info.pop_front();
                         songid=info.first().toInt();
                         fetchOk(); // skip to the end
@@ -483,7 +483,7 @@ const TQString MpdInterface::getTrackTitle() const
         TQRegExp songid_re("songid: (\\d+)");
         if (songid_re.search(res)>=0)
         {
-            TQStringList songidinfo=songid_re.tqcapturedTexts();
+            TQStringList songidinfo=songid_re.capturedTexts();
             songidinfo.pop_front();
             songid=songidinfo.first().toInt();
         }
@@ -508,31 +508,31 @@ const TQString MpdInterface::getTrackTitle() const
         TQRegExp file_re("file: (.+)");
         if (artist_re.search(res)>=0)
         {
-            TQStringList info=artist_re.tqcapturedTexts();
+            TQStringList info=artist_re.capturedTexts();
             info.pop_front();
             artist=info.first();
         }
         else if (album_re.search(res)>=0)
         {
-            TQStringList info=album_re.tqcapturedTexts();
+            TQStringList info=album_re.capturedTexts();
             info.pop_front();
             album=info.first();
         }
         else if (title_re.search(res)>=0)
         {
-            TQStringList info=title_re.tqcapturedTexts();
+            TQStringList info=title_re.capturedTexts();
             info.pop_front();
             title=info.first();
         }
         else if (track_re.search(res)>=0)
         {
-            TQStringList info=track_re.tqcapturedTexts();
+            TQStringList info=track_re.capturedTexts();
             info.pop_front();
             track=info.first();
         }
         else if (file_re.search(res)>=0)
         {
-            TQStringList info=file_re.tqcapturedTexts();
+            TQStringList info=file_re.capturedTexts();
             info.pop_front();
             file=info.first();
         }
@@ -562,12 +562,12 @@ const TQString MpdInterface::getTrackTitle() const
     return i18n("No tags: %1").tqarg(file);
 }
 
-int MpdInterface::playingtqStatus()
+int MpdInterface::playingStatus()
 {
     //kdDebug(90200) << "looking up playing status\n";
     if (!dispatch("status\n")) return Stopped;
 
-    PlayingtqStatus status=Stopped;
+    PlayingStatus status=Stopped;
     TQString res;
     while(fetchLine(res))
     {
diff --git a/kicker-applets/mediacontrol/mpdInterface.h b/kicker-applets/mediacontrol/mpdInterface.h
index b7512b9..4ba2034 100644
--- a/kicker-applets/mediacontrol/mpdInterface.h
+++ b/kicker-applets/mediacontrol/mpdInterface.h
@@ -51,7 +51,7 @@ class MpdInterface
         virtual void dragEnterEvent(TQDragEnterEvent* event);
         virtual void dropEvent(TQDropEvent* event);
         virtual const TQString getTrackTitle() const;
-        virtual int playingtqStatus();
+        virtual int playingStatus();
 
         void changeVolume(int delta);
 
diff --git a/kicker-applets/mediacontrol/noatunInterface.cpp b/kicker-applets/mediacontrol/noatunInterface.cpp
index 4ba4333..397dc10 100644
--- a/kicker-applets/mediacontrol/noatunInterface.cpp
+++ b/kicker-applets/mediacontrol/noatunInterface.cpp
@@ -145,10 +145,10 @@ void NoatunInterface::updateSlider()
 		time = 0;
 	}
 	emit newSliderPosition(len/1000,time/1000);
-	emit playingStatusChanged(playingtqStatus());
+	emit playingStatusChanged(playingStatus());
 }
 
-int NoatunInterface::playingtqStatus()
+int NoatunInterface::playingStatus()
 {
 	TQByteArray data, replyData;
 	TQCString replyType;
diff --git a/kicker-applets/mediacontrol/noatunInterface.h b/kicker-applets/mediacontrol/noatunInterface.h
index 64f9ab9..0349458 100644
--- a/kicker-applets/mediacontrol/noatunInterface.h
+++ b/kicker-applets/mediacontrol/noatunInterface.h
@@ -49,7 +49,7 @@ class NoatunInterface : public PlayerInterface
 		const TQString getTrackTitle() const;
 		void appRegistered(const TQCString &appId);
 		void appRemoved(const TQCString &appId);
-		int playingtqStatus();
+		int playingStatus();
 
 		void myInit(void);
 
diff --git a/kicker-applets/mediacontrol/playerInterface.h b/kicker-applets/mediacontrol/playerInterface.h
index 916d387..1225290 100644
--- a/kicker-applets/mediacontrol/playerInterface.h
+++ b/kicker-applets/mediacontrol/playerInterface.h
@@ -29,7 +29,7 @@ class PlayerInterface : public TQObject
 		PlayerInterface();
 		virtual ~PlayerInterface();
 
-		enum PlayingtqStatus { Stopped=0, Playing, Paused };
+		enum PlayingStatus { Stopped=0, Playing, Paused };
 
 	public slots:
 		virtual void updateSlider()=0; // gets called on timer-timeout
@@ -45,7 +45,7 @@ class PlayerInterface : public TQObject
 		virtual void dragEnterEvent(TQDragEnterEvent* event)=0;
 		virtual void dropEvent(TQDropEvent* event)=0;
 		virtual const TQString getTrackTitle() const=0;
-		virtual int playingtqStatus()=0;
+		virtual int playingStatus()=0;
 
 		void startPlayer(const TQString &desktopname);
 
diff --git a/kicker-applets/mediacontrol/simplebutton.cpp b/kicker-applets/mediacontrol/simplebutton.cpp
index f232377..f5239bd 100644
--- a/kicker-applets/mediacontrol/simplebutton.cpp
+++ b/kicker-applets/mediacontrol/simplebutton.cpp
@@ -63,22 +63,22 @@ void SimpleButton::setOrientation(Qt::Orientation orientation)
     update();
 }
 
-TQSize SimpleButton::tqsizeHint() const
+TQSize SimpleButton::sizeHint() const
 {
     const TQPixmap* pm = pixmap();
 
     if (!pm)
-        return TQButton::tqsizeHint();
+        return TQButton::sizeHint();
     else
         return TQSize(pm->width() + KDialog::spacingHint(), pm->height() + KDialog::spacingHint());
 }
 
-TQSize SimpleButton::tqminimumSizeHint() const
+TQSize SimpleButton::minimumSizeHint() const
 {
     const TQPixmap* pm = pixmap();
 
     if (!pm)
-        return TQButton::tqminimumSizeHint();
+        return TQButton::minimumSizeHint();
     else
         return TQSize(pm->width(), pm->height());
 }
@@ -200,7 +200,7 @@ SimpleArrowButton::SimpleArrowButton(TQWidget *parent, TQt::ArrowType arrow, con
     _inside = false;
 }
 
-TQSize SimpleArrowButton::tqsizeHint() const
+TQSize SimpleArrowButton::sizeHint() const
 {
     return TQSize( 12, 12 );
 }
@@ -234,7 +234,7 @@ void SimpleArrowButton::drawButton( TQPainter *p )
     
     int flags = TQStyle::Style_Default | TQStyle::Style_Enabled;
     if (isDown() || isOn())	flags |= TQStyle::Style_Down;
-    tqstyle().tqdrawPrimitive(pe, p, r, tqcolorGroup(), flags);
+    tqstyle().tqdrawPrimitive(pe, p, r, colorGroup(), flags);
 }
 
 void SimpleArrowButton::enterEvent( TQEvent *e )
diff --git a/kicker-applets/mediacontrol/simplebutton.h b/kicker-applets/mediacontrol/simplebutton.h
index 0cf11e5..9c66f85 100644
--- a/kicker-applets/mediacontrol/simplebutton.h
+++ b/kicker-applets/mediacontrol/simplebutton.h
@@ -35,8 +35,8 @@ class KDE_EXPORT SimpleButton : public TQButton
         SimpleButton(TQWidget *parent, const char *name = 0);
         void setPixmap(const TQPixmap &pix);
         void setOrientation(Qt::Orientation orientaton);
-        TQSize tqsizeHint() const;
-        TQSize tqminimumSizeHint() const;
+        TQSize sizeHint() const;
+        TQSize minimumSizeHint() const;
 
     protected:
         void drawButton( TQPainter *p );
@@ -69,7 +69,7 @@ class KDE_EXPORT SimpleArrowButton: public SimpleButton
     public:
         SimpleArrowButton(TQWidget *parent = 0, TQt::ArrowType arrow = TQt::UpArrow, const char *name = 0);
         virtual ~SimpleArrowButton() {};
-        TQSize tqsizeHint() const;
+        TQSize sizeHint() const;
     
     protected:
         virtual void enterEvent( TQEvent *e );
diff --git a/kicker-applets/mediacontrol/xmmsInterface.cpp b/kicker-applets/mediacontrol/xmmsInterface.cpp
index 05fc2b0..7d8e236 100644
--- a/kicker-applets/mediacontrol/xmmsInterface.cpp
+++ b/kicker-applets/mediacontrol/xmmsInterface.cpp
@@ -79,7 +79,7 @@ void XmmsInterface::updateSlider ( void )
 	}
 
 	emit newSliderPosition(len,time);
-	emit playingStatusChanged(playingtqStatus());
+	emit playingStatusChanged(playingStatus());
 }
 
 
@@ -163,7 +163,7 @@ void XmmsInterface::volumeDown()
 	xmms_remote_set_main_volume(XMMS_SESSION, cur-1);
 }
 
-int XmmsInterface::playingtqStatus()
+int XmmsInterface::playingStatus()
 {
 	if (xmms_remote_is_paused(XMMS_SESSION))
 		return Paused;
diff --git a/kicker-applets/mediacontrol/xmmsInterface.h b/kicker-applets/mediacontrol/xmmsInterface.h
index 59bea23..d67f8df 100644
--- a/kicker-applets/mediacontrol/xmmsInterface.h
+++ b/kicker-applets/mediacontrol/xmmsInterface.h
@@ -49,7 +49,7 @@ class XmmsInterface : public PlayerInterface
 		virtual void dragEnterEvent(TQDragEnterEvent* event);
 		virtual void dropEvent(TQDropEvent* event);
 		virtual const TQString getTrackTitle() const;
-		virtual int playingtqStatus();
+		virtual int playingStatus();
 
 	private:
 		TQTimer *xmms_timer;