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

This reverts commit ca82971624269719d487c6f7980d7237f9420036.

1 files changed, 11 insertions, 11 deletions

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;