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

1 files changed, 16 insertions, 16 deletions

diff --git a/ksim/monitors/i8k/ksimi8k.cpp b/ksim/monitors/i8k/ksimi8k.cpp
index c265055..ecff93d 100644
--- a/ksim/monitors/i8k/ksimi8k.cpp
+++ b/ksim/monitors/i8k/ksimi8k.cpp
@@ -19,10 +19,10 @@
 
 #include "ksimi8k.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqtimer.h>
 #include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqregexp.h>
 #include <tqlabel.h>
 #include <tqcheckbox.h>
@@ -151,15 +151,15 @@ void I8KView::closeStream()
 
 void I8KView::initGUI()
 {
-  TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
+  TQVBoxLayout *layout = new TQVBoxLayout( this );
 
   m_fan1Label = new KSim::Label( this );
   m_fan2Label = new KSim::Label( this );
   m_tempLabel = new KSim::Label( this );
 
-  tqlayout->addWidget( m_fan1Label );
-  tqlayout->addWidget( m_fan2Label );
-  tqlayout->addWidget( m_tempLabel );
+  layout->addWidget( m_fan1Label );
+  layout->addWidget( m_fan2Label );
+  layout->addWidget( m_tempLabel );
 }
 
 void I8KView::updateView()
@@ -195,17 +195,17 @@ void I8KView::updateView()
   }
 
   if ( rightspeed > 0 )
-    m_fan1Label->setText( i18n( "Right fan: %1 RPM" ).tqarg( rightspeed ) );
+    m_fan1Label->setText( i18n( "Right fan: %1 RPM" ).arg( rightspeed ) );
   else
     m_fan1Label->setText( i18n( "Right fan: Off" ) );
 
   if ( leftspeed > 0 )
-    m_fan2Label->setText( i18n( "Left fan: %1 RPM" ).tqarg( leftspeed ) );
+    m_fan2Label->setText( i18n( "Left fan: %1 RPM" ).arg( leftspeed ) );
   else
     m_fan2Label->setText( i18n( "Left fan: Off" ) );
 
-  m_tempLabel->setText( i18n( "CPU temp: %1°%2" ).tqarg( cputemp )
-      .tqarg( m_unit ) );
+  m_tempLabel->setText( i18n( "CPU temp: %1°%2" ).arg( cputemp )
+      .arg( m_unit ) );
 }
 
 I8KConfig::I8KConfig(KSim::PluginObject *parent, const char *name)
@@ -218,14 +218,14 @@ I8KConfig::I8KConfig(KSim::PluginObject *parent, const char *name)
   m_interval->setRange( 2, 60, 1, true );
   m_interval->setSuffix( i18n( " sec" ) );
 
-  TQGridLayout *tqlayout = new TQGridLayout( this, 3, 2, 0, 
+  TQGridLayout *layout = new TQGridLayout( this, 3, 2, 0, 
       KDialog::spacingHint() );
 
-  tqlayout->addMultiCellWidget( m_unit, 0, 0, 0, 1 );
-  tqlayout->addWidget( label, 1, 0 );
-  tqlayout->addWidget( m_interval, 1, 1 );
-  tqlayout->setColStretch( 1, 1 );
-  tqlayout->setRowStretch( 2, 1 );
+  layout->addMultiCellWidget( m_unit, 0, 0, 0, 1 );
+  layout->addWidget( label, 1, 0 );
+  layout->addWidget( m_interval, 1, 1 );
+  layout->setColStretch( 1, 1 );
+  layout->setRowStretch( 2, 1 );
 }
 
 I8KConfig::~I8KConfig()