Revert "Rename a number of old tq methods that are no longer tq specific"

This reverts commit ca82971624269719d487c6f7980d7237f9420036.

19 files changed, 81 insertions, 81 deletions

diff --git a/kicker-applets/mediacontrol/amarokInterface.cpp b/kicker-applets/mediacontrol/amarokInterface.cpp
index e2265a7..b77b5d2 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(playingStatus());
+   emit playingStatusChanged(playingtqStatus());
 }
 
 // Drag-n-Drop stuff =================================================================
@@ -289,7 +289,7 @@ bool AmarokInterface::findRunningAmarok()
 }
 
 
-int AmarokInterface::playingStatus()
+int AmarokInterface::playingtqStatus()
 {
    TQByteArray data, replyData;
    TQCString replyType;
diff --git a/kicker-applets/mediacontrol/amarokInterface.h b/kicker-applets/mediacontrol/amarokInterface.h
index 5e8c689..f863208 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 playingStatus();
+      virtual int playingtqStatus();
 
    private slots:
       void myInit();
diff --git a/kicker-applets/mediacontrol/jukInterface.cpp b/kicker-applets/mediacontrol/jukInterface.cpp
index 27ce45e..b055424 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(playingStatus());
+	emit playingStatusChanged(playingtqStatus());
 }
 
 // Drag-n-Drop stuff =================================================================
@@ -291,7 +291,7 @@ bool JuKInterface::findRunningJuK()
 	return false;
 }
 
-int JuKInterface::playingStatus()
+int JuKInterface::playingtqStatus()
 {
 	TQByteArray data, replyData;
 	TQCString replyType;
diff --git a/kicker-applets/mediacontrol/jukInterface.h b/kicker-applets/mediacontrol/jukInterface.h
index 51bd6de..fa74fba 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 playingStatus();
+		int playingtqStatus();
 
 	private slots:
 		void myInit();
diff --git a/kicker-applets/mediacontrol/kscdInterface.cpp b/kicker-applets/mediacontrol/kscdInterface.cpp
index 6621c53..67eb931 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(playingStatus());
+	emit playingStatusChanged(playingtqStatus());
 }
 
 // Drag-n-Drop stuff =================================================================
@@ -256,7 +256,7 @@ const TQString KsCDInterface::getTrackTitle() const
 			}
 			else
 			{
-				result = i18n("artist - trackname", "%1 - %2").arg(artist, title);
+				result = i18n("artist - trackname", "%1 - %2").tqarg(artist, title);
 			}
 		}
 	}
@@ -270,18 +270,18 @@ const TQString KsCDInterface::getTrackTitle() const
 			}
 			else
 			{
-				result = i18n("(album) - trackname", "(%1) - %2").arg(artist, title);
+				result = i18n("(album) - trackname", "(%1) - %2").tqarg(artist, title);
 			}
 		}
 		else // artist is non-empty
 		{
 			if(title.isEmpty())
 			{
-				result = i18n("artistname (albumname)", "%1 (%2)").arg(artist, album);
+				result = i18n("artistname (albumname)", "%1 (%2)").tqarg(artist, album);
 			}
 			else
 			{
-				result = i18n("artistname (albumname) - trackname", "%1 (%2) - %3").arg(artist, album, title);
+				result = i18n("artistname (albumname) - trackname", "%1 (%2) - %3").tqarg(artist, album, title);
 			}
 		}
 	}
@@ -305,7 +305,7 @@ bool KsCDInterface::findRunningKsCD()
 	return false;
 }
 
-int KsCDInterface::playingStatus()
+int KsCDInterface::playingtqStatus()
 {
 	TQByteArray data, replyData;
 	TQCString replyType;
diff --git a/kicker-applets/mediacontrol/kscdInterface.h b/kicker-applets/mediacontrol/kscdInterface.h
index 2448080..2d37e42 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 playingStatus();
+		int playingtqStatus();
 
 	private slots:
 		void myInit();
diff --git a/kicker-applets/mediacontrol/mediacontrol.cpp b/kicker-applets/mediacontrol/mediacontrol.cpp
index 95cf81c..a2bf77b 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 (mLastStatus == status)
+	if (mLasttqStatus == status)
 		return;
 
-	mLastStatus = status;
+	mLasttqStatus = 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->playingStatus() == PlayerInterface::Playing)
+		if (_player->playingtqStatus() == 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;
-	mLastStatus = -1;
+	mLasttqStatus = -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->playingStatus() == PlayerInterface::Playing)
+			if (_player->playingtqStatus() == PlayerInterface::Playing)
 				playpause_button->setIconSet(SmallIconSet(locate("data",skindir+"play.png")));
 			else
 				playpause_button->setIconSet(SmallIconSet(locate("data",skindir+"pause.png")));
@@ -424,7 +424,7 @@ void MediaControl::reparseConfig()
 		{
 			KNotifyClient::event(winId(), KNotifyClient::warning,
 				i18n("There was trouble loading theme %1. Please choose" \
-					" a different theme.").arg(skindir));
+					" a different theme.").tqarg(skindir));
 
 			// default to kde-icons, they have to be installed :)
 			slotIconChanged();
@@ -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->minimumSizeHint().height() << endl;
+//	kdDebug(90200) << "slider needs: " << time_slider->tqminimumSizeHint().height() << endl;
 
 	// slider height + button height
-	if ( height >= (time_slider->minimumSizeHint().height()+MC_BUTTONSIZE) )
+	if ( height >= (time_slider->tqminimumSizeHint().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->minimumSizeHint().width()+MC_BUTTONSIZE) )
+	if ( width >= (time_slider->tqminimumSizeHint().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->minimumSizeHint().width();
+		int slider_width = time_slider->tqminimumSizeHint().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->minimumSizeHint().height();
+		int slider_height = time_slider->tqminimumSizeHint().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 ab1cec5..161db39 100644
--- a/kicker-applets/mediacontrol/mediacontrol.h
+++ b/kicker-applets/mediacontrol/mediacontrol.h
@@ -29,7 +29,7 @@
 #include <kaboutdata.h>
 #include <kaboutapplication.h>
 
-#include <palette.h>
+#include <tqpalette.h>
 
 // used everywhere :)
 #include <tqstring.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, mLastStatus;
+		int mLastLen, mLastTime, mLasttqStatus;
 		KPopupMenu *rmbMenu;
 
 		virtual void mousePressEvent(TQMouseEvent* e);
diff --git a/kicker-applets/mediacontrol/mediacontrolconfig.cpp b/kicker-applets/mediacontrol/mediacontrolconfig.cpp
index e87f6b9..6df8886 100644
--- a/kicker-applets/mediacontrol/mediacontrolconfig.cpp
+++ b/kicker-applets/mediacontrol/mediacontrolconfig.cpp
@@ -29,7 +29,7 @@
 #include <tqcheckbox.h>
 #include <tqlistbox.h>
 #include <tqtoolbutton.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqgroupbox.h>
 
 #include <kapplication.h>
diff --git a/kicker-applets/mediacontrol/mediacontrolconfigwidget.ui b/kicker-applets/mediacontrol/mediacontrolconfigwidget.ui
index df36762..36a3e0e 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="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>0</height>
@@ -199,13 +199,13 @@
                                                 <verstretch>0</verstretch>
                                             </sizepolicy>
                                         </property>
-                                        <property name="minimumSize">
+                                        <property name="tqminimumSize">
                                             <size>
                                                 <width>18</width>
                                                 <height>18</height>
                                             </size>
                                         </property>
-                                        <property name="maximumSize">
+                                        <property name="tqmaximumSize">
                                             <size>
                                                 <width>18</width>
                                                 <height>18</height>
@@ -227,13 +227,13 @@
                                                 <verstretch>0</verstretch>
                                             </sizepolicy>
                                         </property>
-                                        <property name="minimumSize">
+                                        <property name="tqminimumSize">
                                             <size>
                                                 <width>18</width>
                                                 <height>18</height>
                                             </size>
                                         </property>
-                                        <property name="maximumSize">
+                                        <property name="tqmaximumSize">
                                             <size>
                                                 <width>18</width>
                                                 <height>18</height>
@@ -255,13 +255,13 @@
                                                 <verstretch>0</verstretch>
                                             </sizepolicy>
                                         </property>
-                                        <property name="minimumSize">
+                                        <property name="tqminimumSize">
                                             <size>
                                                 <width>18</width>
                                                 <height>18</height>
                                             </size>
                                         </property>
-                                        <property name="maximumSize">
+                                        <property name="tqmaximumSize">
                                             <size>
                                                 <width>18</width>
                                                 <height>18</height>
@@ -283,13 +283,13 @@
                                                 <verstretch>0</verstretch>
                                             </sizepolicy>
                                         </property>
-                                        <property name="minimumSize">
+                                        <property name="tqminimumSize">
                                             <size>
                                                 <width>18</width>
                                                 <height>18</height>
                                             </size>
                                         </property>
-                                        <property name="maximumSize">
+                                        <property name="tqmaximumSize">
                                             <size>
                                                 <width>18</width>
                                                 <height>18</height>
@@ -311,13 +311,13 @@
                                                 <verstretch>0</verstretch>
                                             </sizepolicy>
                                         </property>
-                                        <property name="minimumSize">
+                                        <property name="tqminimumSize">
                                             <size>
                                                 <width>18</width>
                                                 <height>18</height>
                                             </size>
                                         </property>
-                                        <property name="maximumSize">
+                                        <property name="tqmaximumSize">
                                             <size>
                                                 <width>18</width>
                                                 <height>18</height>
@@ -339,7 +339,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>0</height>
diff --git a/kicker-applets/mediacontrol/mpdInterface.cpp b/kicker-applets/mediacontrol/mpdInterface.cpp
index 98ba0cb..ea350d2 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(playingStatus());
+        emit playingStatusChanged(playingtqStatus());
     }
     else
     {
@@ -137,10 +137,10 @@ void MpdInterface::connectionError(int e)
         switch (e)
         {
             case TQSocket::ErrConnectionRefused:
-                message=i18n("Connection refused to %1:%2.\nIs mpd running?").arg(hostname).arg(port);
+                message=i18n("Connection refused to %1:%2.\nIs mpd running?").tqarg(hostname).tqarg(port);
                 break;
             case TQSocket::ErrHostNotFound:
-                message=i18n("Host '%1' not found.").arg(hostname);
+                message=i18n("Host '%1' not found.").tqarg(hostname);
                 break;
             case TQSocket::ErrSocketRead:
                 message=i18n("Error reading socket.");
@@ -265,7 +265,7 @@ void MpdInterface::updateSlider()
         }
         else if (time_re.search(res)>=0)
         {
-            TQStringList timeinfo=time_re.capturedTexts();
+            TQStringList timeinfo=time_re.tqcapturedTexts();
             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.capturedTexts();
+            TQStringList songidinfo=songid_re.tqcapturedTexts();
             songidinfo.pop_front();
             songid=songidinfo.first().toInt();
         }
@@ -306,7 +306,7 @@ void MpdInterface::jumpToTime(int sec)
 
     if (songid>-1)
     {
-        if (dispatch(TQString("seekid %1 %2\n").arg(songid).arg(sec).latin1()))
+        if (dispatch(TQString("seekid %1 %2\n").tqarg(songid).tqarg(sec).latin1()))
         {
             fetchOk(); // unlocks
         }
@@ -316,7 +316,7 @@ void MpdInterface::jumpToTime(int sec)
 void MpdInterface::playpause()
 {
     reconnect();
-    if (playingStatus()==Stopped ? dispatch("play\n") : dispatch("pause\n"))
+    if (playingtqStatus()==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.capturedTexts();
+            TQStringList info=volume_re.tqcapturedTexts();
             info.pop_front();
             volume=info.first().toInt();
         }
@@ -366,7 +366,7 @@ void MpdInterface::changeVolume(int delta)
         volume+=delta;
         if (volume<0) volume=0;
         if (volume>100) volume=100;
-        if (dispatch(TQString("setvol %1\n").arg(volume).latin1()))
+        if (dispatch(TQString("setvol %1\n").tqarg(volume).latin1()))
         {
             fetchOk();
         }
@@ -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.capturedTexts();
+                        TQStringList info=file_re.tqcapturedTexts();
                         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.capturedTexts();
+                        TQStringList info=id_re.tqcapturedTexts();
                         info.pop_front();
                         songid=info.first().toInt();
                         fetchOk(); // skip to the end
@@ -433,7 +433,7 @@ void MpdInterface::dropEvent(TQDropEvent* event)
                 // found song, so lets play it
                 if (songid>-1)
                 {
-                    if (dispatch((TQString("playid %1\n").arg(songid)).latin1()))
+                    if (dispatch((TQString("playid %1\n").tqarg(songid)).latin1()))
                     {
                         if (fetchOk()) list.pop_front();
                         return;
@@ -483,7 +483,7 @@ const TQString MpdInterface::getTrackTitle() const
         TQRegExp songid_re("songid: (\\d+)");
         if (songid_re.search(res)>=0)
         {
-            TQStringList songidinfo=songid_re.capturedTexts();
+            TQStringList songidinfo=songid_re.tqcapturedTexts();
             songidinfo.pop_front();
             songid=songidinfo.first().toInt();
         }
@@ -491,7 +491,7 @@ const TQString MpdInterface::getTrackTitle() const
 
     if (!(songid>-1)) return result;
 
-    if (!dispatch(TQString("playlistid %1\n").arg(songid).latin1()))
+    if (!dispatch(TQString("playlistid %1\n").tqarg(songid).latin1()))
         return result;
 
     TQString artist;
@@ -508,31 +508,31 @@ const TQString MpdInterface::getTrackTitle() const
         TQRegExp file_re("file: (.+)");
         if (artist_re.search(res)>=0)
         {
-            TQStringList info=artist_re.capturedTexts();
+            TQStringList info=artist_re.tqcapturedTexts();
             info.pop_front();
             artist=info.first();
         }
         else if (album_re.search(res)>=0)
         {
-            TQStringList info=album_re.capturedTexts();
+            TQStringList info=album_re.tqcapturedTexts();
             info.pop_front();
             album=info.first();
         }
         else if (title_re.search(res)>=0)
         {
-            TQStringList info=title_re.capturedTexts();
+            TQStringList info=title_re.tqcapturedTexts();
             info.pop_front();
             title=info.first();
         }
         else if (track_re.search(res)>=0)
         {
-            TQStringList info=track_re.capturedTexts();
+            TQStringList info=track_re.tqcapturedTexts();
             info.pop_front();
             track=info.first();
         }
         else if (file_re.search(res)>=0)
         {
-            TQStringList info=file_re.capturedTexts();
+            TQStringList info=file_re.tqcapturedTexts();
             info.pop_front();
             file=info.first();
         }
@@ -559,15 +559,15 @@ const TQString MpdInterface::getTrackTitle() const
         else
             return album;
     }
-    return i18n("No tags: %1").arg(file);
+    return i18n("No tags: %1").tqarg(file);
 }
 
-int MpdInterface::playingStatus()
+int MpdInterface::playingtqStatus()
 {
     //kdDebug(90200) << "looking up playing status\n";
     if (!dispatch("status\n")) return Stopped;
 
-    PlayingStatus status=Stopped;
+    PlayingtqStatus status=Stopped;
     TQString res;
     while(fetchLine(res))
     {
diff --git a/kicker-applets/mediacontrol/mpdInterface.h b/kicker-applets/mediacontrol/mpdInterface.h
index 4ba2034..b7512b9 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 playingStatus();
+        virtual int playingtqStatus();
 
         void changeVolume(int delta);
 
diff --git a/kicker-applets/mediacontrol/noatunInterface.cpp b/kicker-applets/mediacontrol/noatunInterface.cpp
index 397dc10..4ba4333 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(playingStatus());
+	emit playingStatusChanged(playingtqStatus());
 }
 
-int NoatunInterface::playingStatus()
+int NoatunInterface::playingtqStatus()
 {
 	TQByteArray data, replyData;
 	TQCString replyType;
diff --git a/kicker-applets/mediacontrol/noatunInterface.h b/kicker-applets/mediacontrol/noatunInterface.h
index 0349458..64f9ab9 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 playingStatus();
+		int playingtqStatus();
 
 		void myInit(void);
 
diff --git a/kicker-applets/mediacontrol/playerInterface.h b/kicker-applets/mediacontrol/playerInterface.h
index 1225290..916d387 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 PlayingStatus { Stopped=0, Playing, Paused };
+		enum PlayingtqStatus { 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 playingStatus()=0;
+		virtual int playingtqStatus()=0;
 
 		void startPlayer(const TQString &desktopname);
 
diff --git a/kicker-applets/mediacontrol/simplebutton.cpp b/kicker-applets/mediacontrol/simplebutton.cpp
index 4760982..f232377 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::sizeHint() const
+TQSize SimpleButton::tqsizeHint() const
 {
     const TQPixmap* pm = pixmap();
 
     if (!pm)
-        return TQButton::sizeHint();
+        return TQButton::tqsizeHint();
     else
         return TQSize(pm->width() + KDialog::spacingHint(), pm->height() + KDialog::spacingHint());
 }
 
-TQSize SimpleButton::minimumSizeHint() const
+TQSize SimpleButton::tqminimumSizeHint() const
 {
     const TQPixmap* pm = pixmap();
 
     if (!pm)
-        return TQButton::minimumSizeHint();
+        return TQButton::tqminimumSizeHint();
     else
         return TQSize(pm->width(), pm->height());
 }
@@ -174,7 +174,7 @@ void SimpleButton::enterEvent( TQEvent *e )
 {
     m_highlight = true;
 
-    repaint( false );
+    tqrepaint( false );
     TQButton::enterEvent( e );
 }
 
@@ -182,7 +182,7 @@ void SimpleButton::leaveEvent( TQEvent *e )
 {
     m_highlight = false;
 
-    repaint( false );
+    tqrepaint( false );
     TQButton::enterEvent( e );
 }
 
@@ -200,7 +200,7 @@ SimpleArrowButton::SimpleArrowButton(TQWidget *parent, TQt::ArrowType arrow, con
     _inside = false;
 }
 
-TQSize SimpleArrowButton::sizeHint() const
+TQSize SimpleArrowButton::tqsizeHint() 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, colorGroup(), flags);
+    tqstyle().tqdrawPrimitive(pe, p, r, tqcolorGroup(), flags);
 }
 
 void SimpleArrowButton::enterEvent( TQEvent *e )
diff --git a/kicker-applets/mediacontrol/simplebutton.h b/kicker-applets/mediacontrol/simplebutton.h
index 9c66f85..0cf11e5 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 sizeHint() const;
-        TQSize minimumSizeHint() const;
+        TQSize tqsizeHint() const;
+        TQSize tqminimumSizeHint() 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 sizeHint() const;
+        TQSize tqsizeHint() const;
     
     protected:
         virtual void enterEvent( TQEvent *e );
diff --git a/kicker-applets/mediacontrol/xmmsInterface.cpp b/kicker-applets/mediacontrol/xmmsInterface.cpp
index 7d8e236..05fc2b0 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(playingStatus());
+	emit playingStatusChanged(playingtqStatus());
 }
 
 
@@ -163,7 +163,7 @@ void XmmsInterface::volumeDown()
 	xmms_remote_set_main_volume(XMMS_SESSION, cur-1);
 }
 
-int XmmsInterface::playingStatus()
+int XmmsInterface::playingtqStatus()
 {
 	if (xmms_remote_is_paused(XMMS_SESSION))
 		return Paused;
diff --git a/kicker-applets/mediacontrol/xmmsInterface.h b/kicker-applets/mediacontrol/xmmsInterface.h
index d67f8df..59bea23 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 playingStatus();
+		virtual int playingtqStatus();
 
 	private:
 		TQTimer *xmms_timer;