Remove additional unneeded tq method conversions

9 files changed, 16 insertions, 16 deletions

diff --git a/kmix/kledbutton.cpp b/kmix/kledbutton.cpp
index 6c134d2b..3ad3ba75 100644
--- a/kmix/kledbutton.cpp
+++ b/kmix/kledbutton.cpp
@@ -33,8 +33,8 @@ KLedButton::KLedButton(const TQColor &col, TQWidget *parent, const char *name)
 }
 
 KLedButton::KLedButton(const TQColor& col, KLed::State st, KLed::Look look,
-		       KLed::Shape tqshape, TQWidget *parent, const char *name)
-   : KLed( col, st, look, tqshape, parent, name )
+		       KLed::Shape shape, TQWidget *parent, const char *name)
+   : KLed( col, st, look, shape, parent, name )
 {
 }
 
diff --git a/kmix/kledbutton.h b/kmix/kledbutton.h
index 8e22cb9b..36572ad2 100644
--- a/kmix/kledbutton.h
+++ b/kmix/kledbutton.h
@@ -35,7 +35,7 @@ class KLedButton : public KLed  {
   TQ_OBJECT
   public: 
    KLedButton(const TQColor &col=TQt::green, TQWidget *parent=0, const char *name=0);
-   KLedButton(const TQColor& col, KLed::State st, KLed::Look look, KLed::Shape tqshape,
+   KLedButton(const TQColor& col, KLed::State st, KLed::Look look, KLed::Shape shape,
 	      TQWidget *parent=0, const char *name=0);
    ~KLedButton();	
 
diff --git a/kmix/kmix.cpp b/kmix/kmix.cpp
index bc9a7124..8ee4701e 100644
--- a/kmix/kmix.cpp
+++ b/kmix/kmix.cpp
@@ -551,7 +551,7 @@ KMixWindow::applyPrefs( KMixPrefDlg *prefDlg )
        show();
    }
 
-   this->tqrepaint(); // make KMix look fast (saveConfig() often uses several seconds)
+   this->repaint(); // make KMix look fast (saveConfig() often uses several seconds)
    kapp->processEvents();
    saveConfig();
 }
diff --git a/kmix/kmixdockwidget.cpp b/kmix/kmixdockwidget.cpp
index 039d3237..aff3e500 100644
--- a/kmix/kmixdockwidget.cpp
+++ b/kmix/kmixdockwidget.cpp
@@ -191,7 +191,7 @@ KMixDockWidget::setVolumeTip()
         }
 	newToolTipValue = val + 10000*md->isMuted();
 	if ( _oldToolTipValue != newToolTipValue ) {
-	    tip = i18n( "Volume at %1%" ).tqarg( val );
+	    tip = i18n( "Volume at %1%" ).arg( val );
 	    if ( md->isMuted() ) {
 		tip += i18n( " (Muted)" );
 	    }
diff --git a/kmix/ksmallslider.cpp b/kmix/ksmallslider.cpp
index ef3382c5..c47dfe93 100644
--- a/kmix/ksmallslider.cpp
+++ b/kmix/ksmallslider.cpp
@@ -486,7 +486,7 @@ void KSmallSlider::setGray( bool value )
    {
       grayed = value;
       update();
-      //tqrepaint();
+      //repaint();
    }
 }
 
@@ -501,7 +501,7 @@ void KSmallSlider::setColors( TQColor high, TQColor low, TQColor back )
     colLow = low;
     colBack = back;
     update();
-    //tqrepaint();
+    //repaint();
 }
 
 void KSmallSlider::setGrayColors( TQColor high, TQColor low, TQColor back )
@@ -510,7 +510,7 @@ void KSmallSlider::setGrayColors( TQColor high, TQColor low, TQColor back )
     grayLow = low;
     grayBack = back;
     update();
-    //tqrepaint();
+    //repaint();
 }
 
 #include "ksmallslider.moc"
diff --git a/kmix/mdwslider.cpp b/kmix/mdwslider.cpp
index 18037f69..a4fa0bcc 100644
--- a/kmix/mdwslider.cpp
+++ b/kmix/mdwslider.cpp
@@ -81,11 +81,11 @@ MDWSlider::MDWSlider(Mixer *mixer, MixDevice* md,
 	// create widgets
 	createWidgets( showMuteLED, showRecordLED );
 
-	m_keys->insert( "Increase volume", i18n( "Increase Volume of '%1'" ).tqarg(m_mixdevice->name().utf8().data()), TQString(),
+	m_keys->insert( "Increase volume", i18n( "Increase Volume of '%1'" ).arg(m_mixdevice->name().utf8().data()), TQString(),
 			KShortcut(), KShortcut(), TQT_TQOBJECT(this), TQT_SLOT( increaseVolume() ) );
-	m_keys->insert( "Decrease volume", i18n( "Decrease Volume of '%1'" ).tqarg(m_mixdevice->name().utf8().data()), TQString(),
+	m_keys->insert( "Decrease volume", i18n( "Decrease Volume of '%1'" ).arg(m_mixdevice->name().utf8().data()), TQString(),
 			KShortcut(), KShortcut(), TQT_TQOBJECT(this), TQT_SLOT( decreaseVolume() ) );
-	m_keys->insert( "Toggle mute", i18n( "Toggle Mute of '%1'" ).tqarg(m_mixdevice->name().utf8().data()), TQString(),
+	m_keys->insert( "Toggle mute", i18n( "Toggle Mute of '%1'" ).arg(m_mixdevice->name().utf8().data()), TQString(),
 			KShortcut(), KShortcut(), TQT_TQOBJECT(this), TQT_SLOT( toggleMuted() ) );
 
 	installEventFilter( this ); // filter for popup
diff --git a/kmix/mixer_alsa9.cpp b/kmix/mixer_alsa9.cpp
index dc4935c4..6c8c1783 100644
--- a/kmix/mixer_alsa9.cpp
+++ b/kmix/mixer_alsa9.cpp
@@ -115,7 +115,7 @@ Mixer_ALSA::open()
 
     // Card information
     if ((unsigned)m_devnum > 31) m_devnum = -1;
-    devName = m_devnum == -1 ? "default" : TQString("hw:%1").tqarg(m_devnum);
+    devName = m_devnum == -1 ? "default" : TQString("hw:%1").arg(m_devnum);
 
     TQString probeMessage;
 
diff --git a/kmix/mixertoolbox.cpp b/kmix/mixertoolbox.cpp
index 051f0c53..66e0241c 100644
--- a/kmix/mixertoolbox.cpp
+++ b/kmix/mixertoolbox.cpp
@@ -148,9 +148,9 @@ void MixerToolBox::initMixer(TQPtrList<Mixer> &mixers, bool multiDriverMode, TQS
 			TQString mixerName = mixer->mixerName();
 			mixerName.replace(":","_");
 			TQString primaryKeyOfMixer = TQString("%1::%2:%3")
-			    .tqarg(driverName)
-			    .tqarg(mixerName)
-			    .tqarg(mixerNums[mixer->mixerName()]);
+			    .arg(driverName)
+			    .arg(mixerName)
+			    .arg(mixerNums[mixer->mixerName()]);
 			// The following 3 replaces are for not messing up the config file
 			primaryKeyOfMixer.replace("]","_");
 			primaryKeyOfMixer.replace("[","_"); // not strictly neccesary, but lets play safe
diff --git a/kmix/viewgrid.cpp b/kmix/viewgrid.cpp
index 588f9c5e..a52973c4 100644
--- a/kmix/viewgrid.cpp
+++ b/kmix/viewgrid.cpp
@@ -178,7 +178,7 @@ void ViewGrid::refreshVolumeLevels() {
 }
 
 /**
-   This implementation makes sure the Grid's tqgeometry is updated
+   This implementation makes sure the Grid's geometry is updated
    after hiding/showing channels.
 */
 void ViewGrid::configurationUpdate() {