From 75112ed8e227f656f98523b7ffdad5422d9a6f11 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Mon, 19 Dec 2011 11:52:34 -0600
Subject: Remove additional unneeded tq method conversions

---
 kicker-applets/mediacontrol/kscdInterface.cpp |  8 ++++----
 kicker-applets/mediacontrol/mediacontrol.cpp  |  2 +-
 kicker-applets/mediacontrol/mpdInterface.cpp  | 14 +++++++-------
 kicker-applets/mediacontrol/simplebutton.cpp  |  4 ++--
 4 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'kicker-applets/mediacontrol')

diff --git a/kicker-applets/mediacontrol/kscdInterface.cpp b/kicker-applets/mediacontrol/kscdInterface.cpp
index 916c0e1..6621c53 100644
--- a/kicker-applets/mediacontrol/kscdInterface.cpp
+++ b/kicker-applets/mediacontrol/kscdInterface.cpp
@@ -256,7 +256,7 @@ const TQString KsCDInterface::getTrackTitle() const
 			}
 			else
 			{
-				result = i18n("artist - trackname", "%1 - %2").tqarg(artist, title);
+				result = i18n("artist - trackname", "%1 - %2").arg(artist, title);
 			}
 		}
 	}
@@ -270,18 +270,18 @@ const TQString KsCDInterface::getTrackTitle() const
 			}
 			else
 			{
-				result = i18n("(album) - trackname", "(%1) - %2").tqarg(artist, title);
+				result = i18n("(album) - trackname", "(%1) - %2").arg(artist, title);
 			}
 		}
 		else // artist is non-empty
 		{
 			if(title.isEmpty())
 			{
-				result = i18n("artistname (albumname)", "%1 (%2)").tqarg(artist, album);
+				result = i18n("artistname (albumname)", "%1 (%2)").arg(artist, album);
 			}
 			else
 			{
-				result = i18n("artistname (albumname) - trackname", "%1 (%2) - %3").tqarg(artist, album, title);
+				result = i18n("artistname (albumname) - trackname", "%1 (%2) - %3").arg(artist, album, title);
 			}
 		}
 	}
diff --git a/kicker-applets/mediacontrol/mediacontrol.cpp b/kicker-applets/mediacontrol/mediacontrol.cpp
index ac32064..95cf81c 100644
--- a/kicker-applets/mediacontrol/mediacontrol.cpp
+++ b/kicker-applets/mediacontrol/mediacontrol.cpp
@@ -424,7 +424,7 @@ void MediaControl::reparseConfig()
 		{
 			KNotifyClient::event(winId(), KNotifyClient::warning,
 				i18n("There was trouble loading theme %1. Please choose" \
-					" a different theme.").tqarg(skindir));
+					" a different theme.").arg(skindir));
 
 			// default to kde-icons, they have to be installed :)
 			slotIconChanged();
diff --git a/kicker-applets/mediacontrol/mpdInterface.cpp b/kicker-applets/mediacontrol/mpdInterface.cpp
index b17afa3..98ba0cb 100644
--- a/kicker-applets/mediacontrol/mpdInterface.cpp
+++ b/kicker-applets/mediacontrol/mpdInterface.cpp
@@ -137,10 +137,10 @@ void MpdInterface::connectionError(int e)
         switch (e)
         {
             case TQSocket::ErrConnectionRefused:
-                message=i18n("Connection refused to %1:%2.\nIs mpd running?").tqarg(hostname).tqarg(port);
+                message=i18n("Connection refused to %1:%2.\nIs mpd running?").arg(hostname).arg(port);
                 break;
             case TQSocket::ErrHostNotFound:
-                message=i18n("Host '%1' not found.").tqarg(hostname);
+                message=i18n("Host '%1' not found.").arg(hostname);
                 break;
             case TQSocket::ErrSocketRead:
                 message=i18n("Error reading socket.");
@@ -306,7 +306,7 @@ void MpdInterface::jumpToTime(int sec)
 
     if (songid>-1)
     {
-        if (dispatch(TQString("seekid %1 %2\n").tqarg(songid).tqarg(sec).latin1()))
+        if (dispatch(TQString("seekid %1 %2\n").arg(songid).arg(sec).latin1()))
         {
             fetchOk(); // unlocks
         }
@@ -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").tqarg(volume).latin1()))
+        if (dispatch(TQString("setvol %1\n").arg(volume).latin1()))
         {
             fetchOk();
         }
@@ -433,7 +433,7 @@ void MpdInterface::dropEvent(TQDropEvent* event)
                 // found song, so lets play it
                 if (songid>-1)
                 {
-                    if (dispatch((TQString("playid %1\n").tqarg(songid)).latin1()))
+                    if (dispatch((TQString("playid %1\n").arg(songid)).latin1()))
                     {
                         if (fetchOk()) list.pop_front();
                         return;
@@ -491,7 +491,7 @@ const TQString MpdInterface::getTrackTitle() const
 
     if (!(songid>-1)) return result;
 
-    if (!dispatch(TQString("playlistid %1\n").tqarg(songid).latin1()))
+    if (!dispatch(TQString("playlistid %1\n").arg(songid).latin1()))
         return result;
 
     TQString artist;
@@ -559,7 +559,7 @@ const TQString MpdInterface::getTrackTitle() const
         else
             return album;
     }
-    return i18n("No tags: %1").tqarg(file);
+    return i18n("No tags: %1").arg(file);
 }
 
 int MpdInterface::playingStatus()
diff --git a/kicker-applets/mediacontrol/simplebutton.cpp b/kicker-applets/mediacontrol/simplebutton.cpp
index f5239bd..4760982 100644
--- a/kicker-applets/mediacontrol/simplebutton.cpp
+++ b/kicker-applets/mediacontrol/simplebutton.cpp
@@ -174,7 +174,7 @@ void SimpleButton::enterEvent( TQEvent *e )
 {
     m_highlight = true;
 
-    tqrepaint( false );
+    repaint( false );
     TQButton::enterEvent( e );
 }
 
@@ -182,7 +182,7 @@ void SimpleButton::leaveEvent( TQEvent *e )
 {
     m_highlight = false;
 
-    tqrepaint( false );
+    repaint( false );
     TQButton::enterEvent( e );
 }
 
-- 
cgit v1.2.1