Remove additional unneeded tq method conversions

19 files changed, 58 insertions, 58 deletions

diff --git a/ksim/ksimpref.cpp b/ksim/ksimpref.cpp
index e5bb44a..66d2ef3 100644
--- a/ksim/ksimpref.cpp
+++ b/ksim/ksimpref.cpp
@@ -122,7 +122,7 @@ void KSim::ConfigDialog::removePage(const TQCString &name)
   const KSim::Plugin &plugin = KSim::PluginLoader::self().find(name);
   if (plugin.isNull() || !plugin.configPage()) {
     KMessageBox::sorry(0, i18n("Failed to remove %1's config page due to the "
-       "plugin not being loaded or the config page has not been created").tqarg(name.data()));
+       "plugin not being loaded or the config page has not been created").arg(name.data()));
     return;
   }
 
@@ -148,7 +148,7 @@ void KSim::ConfigDialog::createPage(const KSim::Plugin &plugin)
   if (plugin.isNull() || !plugin.configPage()) {
     KMessageBox::sorry(0, i18n("Failed to add %1's config page due to the plugin"
        " not being loaded or the config page has not been created")
-       .tqarg(plugin.libName().data()));
+       .arg(plugin.libName().data()));
     return;
   }
 
@@ -156,7 +156,7 @@ void KSim::ConfigDialog::createPage(const KSim::Plugin &plugin)
 
   TQStringList list;
   list << ' ' + i18n("Plugins") << ' ' + plugin.name();
-  TQFrame *pluginFrame = addHBoxPage(list, i18n("%1 Options").tqarg(plugin.name()),
+  TQFrame *pluginFrame = addHBoxPage(list, i18n("%1 Options").arg(plugin.name()),
      plugin.icon());
 
   plugin.configPage()->reparent(pluginFrame, TQPoint(0, 0), true);
diff --git a/ksim/ksimsysinfo.cpp b/ksim/ksimsysinfo.cpp
index 49e4608..7140e3a 100644
--- a/ksim/ksimsysinfo.cpp
+++ b/ksim/ksimsysinfo.cpp
@@ -173,7 +173,7 @@ void KSim::Sysinfo::sysUpdate()
   }
 
 //  if (m_config->showProcs()) {
-//    m_procsLabel->setText(i18n("Procs: %1").tqarg(sysInfo.procs));
+//    m_procsLabel->setText(i18n("Procs: %1").arg(sysInfo.procs));
 //  }
 }
 
@@ -274,7 +274,7 @@ void KSim::Sysinfo::createView()
     m_procsLabel = 0L;
   }*/
 
-//  m_layout->tqinvalidate();
+//  m_layout->invalidate();
   updateGeometry();
   adjustSize();
 
diff --git a/ksim/ksimview.cpp b/ksim/ksimview.cpp
index af53876..4f91647 100644
--- a/ksim/ksimview.cpp
+++ b/ksim/ksimview.cpp
@@ -226,7 +226,7 @@ void KSim::MainView::maskMainView()
   TQBitmap rightPixmap(*m_rightFrame->background()->mask());
   TQBitmap bottomPixmap(*m_bottomFrame->background()->mask());
 
-  TQSize insideSize(m_pluginLayout->tqgeometry().size());
+  TQSize insideSize(m_pluginLayout->geometry().size());
 
   // make a cleared bigrect where we can put our pixmap masks on
   TQBitmap bigBitmap(topLevelWidget()->size(), true);
@@ -243,7 +243,7 @@ void KSim::MainView::maskMainView()
   painter.begin(&bigBitmap);
   painter.setBrush(color1);
   painter.setPen(color1);
-  TQRect rect = m_pluginLayout->tqgeometry();
+  TQRect rect = m_pluginLayout->geometry();
   rect.moveBy(ofsX, ofsY);
   painter.drawRect(rect);
   painter.drawPixmap(ofsX, ofsY, topPixmap);
diff --git a/ksim/library/chart.cpp b/ksim/library/chart.cpp
index 388b9ea..b68c073 100644
--- a/ksim/library/chart.cpp
+++ b/ksim/library/chart.cpp
@@ -263,7 +263,7 @@ void KSim::Chart::configureObject(bool repaintWidget)
     d->krell->show();
   }
 
-  // Update our tqgeometry if we need to let any
+  // Update our geometry if we need to let any
   // tqlayout know about our sizeHint() change
   if (oldSize != sizeHint()) {
     // Using resize() here seems to be needed
@@ -333,19 +333,19 @@ void KSim::Chart::setDisplayMeter(bool value)
 
 void KSim::Chart::setText(const TQString &in, const TQString &out)
 {
-  bool tqrepaint = false;
+  bool repaint = false;
 
   if (d->inText != in) {
-    tqrepaint = true;
+    repaint = true;
     d->inText = in;
   }
 
   if (d->outText != out) {
-    tqrepaint = true;
+    repaint = true;
     d->outText = out;
   }
 
-  if (tqrepaint)
+  if (repaint)
     update();
 }
 
@@ -407,13 +407,13 @@ void KSim::Chart::setValue(int valueIn, int valueOut)
 void KSim::Chart::setConfigValues()
 {
   TQFont newFont = font();
-  bool tqrepaint = themeLoader().current().fontColours(this,
+  bool repaint = themeLoader().current().fontColours(this,
      newFont, d->mColour, d->sColour, d->showShadow);
 
   if (font() != newFont)
     setFont(newFont);
 
-  if (tqrepaint)
+  if (repaint)
     update();
 }
 
@@ -446,7 +446,7 @@ void KSim::Chart::paintEvent(TQPaintEvent *)
   const TQSize &size = chartSize();
   TQPixmap pixmap(size);
   TQPainter painter;
-  painter.tqbegin(&pixmap, this);
+  painter.begin(&pixmap, this);
 
   int location = size.height() / 5;
   painter.drawPixmap(0, 0, d->chartPixmap);
@@ -521,7 +521,7 @@ void KSim::Chart::drawChart()
 
   TQPainter painter;
   d->graphData.setMask(drawMask(&painter));
-  painter.tqbegin(&d->graphData, this);
+  painter.begin(&d->graphData, this);
 
   int position = width() - 1;
   TQValueList<Private::ValuePair>::ConstIterator it;
@@ -553,7 +553,7 @@ TQSize KSim::Chart::chartSize() const
 TQBitmap KSim::Chart::drawMask(TQPainter *painter)
 {
   TQBitmap bitmap(chartSize(), true);
-  painter->tqbegin(&bitmap, this);
+  painter->begin(&bitmap, this);
   painter->setPen(color1);
 
   int position = width() - 1;
diff --git a/ksim/library/label.cpp b/ksim/library/label.cpp
index 32a18d8..4aa12b0 100644
--- a/ksim/library/label.cpp
+++ b/ksim/library/label.cpp
@@ -136,10 +136,10 @@ void KSim::Label::clear()
 void KSim::Label::setText(const TQString &text)
 {
   if (text == d->text)
-    return; // If the text is the same, no need to tqrepaint etc
+    return; // If the text is the same, no need to repaint etc
 
   TQSize oldSize = sizeHint();
-  // set the text of our widget and tqrepaint
+  // set the text of our widget and repaint
   d->text = text;
   relayoutLabel(oldSize);
 }
@@ -183,13 +183,13 @@ const TQColor &KSim::Label::shadowColour() const
 void KSim::Label::setConfigValues()
 {
   TQFont newFont = font();
-  bool tqrepaint = themeLoader().current().fontColours(this,
+  bool repaint = themeLoader().current().fontColours(this,
      newFont, d->mColour, d->sColour, d->showShadow);
 
   if (font() != newFont)
     setFont(newFont);
 
-  if (tqrepaint)
+  if (repaint)
     update();
 }
 
@@ -276,13 +276,13 @@ void KSim::Label::setThemePixmap(const TQString &image)
   relayoutLabel(oldSize);
 }
 
-void KSim::Label::relayoutLabel(const TQSize &old, bool tqrepaint)
+void KSim::Label::relayoutLabel(const TQSize &old, bool repaint)
 {
   if (sizeHint() != old) {
     updateGeometry();
   }
 
-  if (tqrepaint)
+  if (repaint)
     update();
 }
 
diff --git a/ksim/library/label.h b/ksim/library/label.h
index 8ae9b64..9e24c95 100644
--- a/ksim/library/label.h
+++ b/ksim/library/label.h
@@ -196,7 +196,7 @@ namespace KSim
        * sets the background image to be painted
        */
       void setThemePixmap(const TQString &image);
-      void relayoutLabel(const TQSize &old, bool tqrepaint = true);
+      void relayoutLabel(const TQSize &old, bool repaint = true);
 
     private:
       /**
diff --git a/ksim/library/led.h b/ksim/library/led.h
index bdb26f4..6dcecce 100644
--- a/ksim/library/led.h
+++ b/ksim/library/led.h
@@ -88,7 +88,7 @@ namespace KSim
        */
       Type type() const;
       /**
-       * Force the Led to tqrepaint its state
+       * Force the Led to repaint its state
        */
       void update();
 
diff --git a/ksim/library/pluginloader.cpp b/ksim/library/pluginloader.cpp
index 775a02e..71b17b7 100644
--- a/ksim/library/pluginloader.cpp
+++ b/ksim/library/pluginloader.cpp
@@ -92,13 +92,13 @@ bool KSim::PluginLoader::loadPlugin(const KDesktopFile &file)
     case KSim::PluginLoader::EmptyLibName:
       KMessageBox::error(0, i18n("KSim was unable to load the plugin %1"
             " due to the X-KSIM-LIBRARY property being empty in the"
-            " plugins desktop file").tqarg(file.readName()));
+            " plugins desktop file").arg(file.readName()));
       return false;
       break;
     case KSim::PluginLoader::LibNotFound:
       KMessageBox::error(0, i18n("KSim was unable to load the plugin %1"
             " due to not being able to find the plugin, check that the plugin"
-            " is installed and is in your $TDEDIR/lib path").tqarg(file.readName()));
+            " is installed and is in your $TDEDIR/lib path").arg(file.readName()));
       return false;
       break;
     case KSim::PluginLoader::UnSymbols:
@@ -108,8 +108,8 @@ bool KSim::PluginLoader::loadPlugin(const KDesktopFile &file)
             " macro</li>\n<li>The plugin has been damaged or has"
             " some unresolved symbols</li>\n</ul> \nLast"
             " error message that occurred: \n%3</qt>")
-            .tqarg(d->lib.prepend("ksim_")).tqarg("KSIM_INIT_PLUGIN")
-            .tqarg(d->error));
+            .arg(d->lib.prepend("ksim_")).arg("KSIM_INIT_PLUGIN")
+            .arg(d->error));
       return false;
       break;
     default:
diff --git a/ksim/library/themeloader.cpp b/ksim/library/themeloader.cpp
index a453af2..a7e21da 100644
--- a/ksim/library/themeloader.cpp
+++ b/ksim/library/themeloader.cpp
@@ -718,14 +718,14 @@ bool KSim::Theme::fontColours(int type, const TQString &string, TQFont &font,
    TQColor &text, TQColor &shadow, bool &showShadow) const
 {
   TQString key = KSim::Types::typeToString(type, false);
-  bool tqrepaint = false;
+  bool repaint = false;
 
   // set colours from the string 'key'
   if (!readEntry(string, key + ".textcolor").isEmpty()) {
     text= textColour(string, key + ".textcolor");
     shadow = shadowColour(string, key + ".textcolor");
     showShadow = textShadow(string, key + ".textcolor");
-    tqrepaint = true;
+    repaint = true;
   }
   else {
     text= textColour(string, "*.textcolor");
@@ -737,14 +737,14 @@ bool KSim::Theme::fontColours(int type, const TQString &string, TQFont &font,
   if (!readEntry(string, key + ".font").isEmpty()) {
     if (KSim::ThemeLoader::currentFontItem() != 3) {
       font = readFontEntry(string, key + ".font");
-      tqrepaint = true;
+      repaint = true;
     }
   }
   else {
     font = currentFont();
   }
 
-  return tqrepaint;
+  return repaint;
 }
 
 bool KSim::Theme::fontColours(const KSim::Base *const base, TQFont &font,
diff --git a/ksim/monitors/cpu/ksimcpu.cpp b/ksim/monitors/cpu/ksimcpu.cpp
index 2f05e7c..9be4b15 100644
--- a/ksim/monitors/cpu/ksimcpu.cpp
+++ b/ksim/monitors/cpu/ksimcpu.cpp
@@ -201,7 +201,7 @@ void CpuView::updateView()
         cpuDiff = 100;
     }
 
-    current.chart()->setText(i18n("%1%").tqarg(cpuDiff));
+    current.chart()->setText(i18n("%1%").arg(cpuDiff));
     current.chart()->setValue(cpuDiff, 0);
     current.label()->setValue(cpuDiff);
   }
@@ -420,7 +420,7 @@ CpuConfig::CpuConfig(KSim::PluginObject *parent, const char *name)
 
   for (uint i = 0; i < addCpus(); ++i)
   {
-    TQCheckListItem *item = new TQCheckListItem(m_listView, i18n("cpu %1").tqarg(i), TQCheckListItem::CheckBox);
+    TQCheckListItem *item = new TQCheckListItem(m_listView, i18n("cpu %1").arg(i), TQCheckListItem::CheckBox);
     item->setText(1, "%T");
   }
 }
diff --git a/ksim/monitors/disk/ksimdisk.cpp b/ksim/monitors/disk/ksimdisk.cpp
index 69c1219..c0123d4 100644
--- a/ksim/monitors/disk/ksimdisk.cpp
+++ b/ksim/monitors/disk/ksimdisk.cpp
@@ -216,13 +216,13 @@ void DiskView::updateDisplay()
     if (m_useSeperatly) {
       it.current()->first->setValue(diskData.readBlocks, diskData.writeBlocks);
       it.current()->first->setText(i18n("in: %1k")
-         .tqarg(KGlobal::locale()->formatNumber((float)diskData.readBlocks / 1024.0, 1)),
-         i18n("out: %1k").tqarg(KGlobal::locale()->formatNumber((float)diskData.writeBlocks / 1024.0, 1)));
+         .arg(KGlobal::locale()->formatNumber((float)diskData.readBlocks / 1024.0, 1)),
+         i18n("out: %1k").arg(KGlobal::locale()->formatNumber((float)diskData.writeBlocks / 1024.0, 1)));
     }
     else {
       it.current()->first->setValue(diff, 0);
       it.current()->first->setText(i18n("%1k")
-         .tqarg(KGlobal::locale()->formatNumber((float)diff / 1024.0, 1)));
+         .arg(KGlobal::locale()->formatNumber((float)diff / 1024.0, 1)));
     }
 
     it.current()->second->setMaxValue(it.current()->first->maxValue());
@@ -239,7 +239,7 @@ void DiskView::updateData(DiskList &disks)
   if (!m_procStream)
      return;
 
-  m_procStream->tqdevice()->reset();
+  m_procStream->device()->reset();
   fseek(m_procFile, 0L, SEEK_SET);
 
   if (m_bLinux24)
@@ -430,7 +430,7 @@ TQString DiskView::diskName( int major, int minor ) const
       break;
   }
 
-  returnValue.tqat(2) = returnValue.tqat(2).latin1() + minor;
+  returnValue.at(2) = returnValue.at(2).latin1() + minor;
   return returnValue;
 #else
   Q_UNUSED(major);
diff --git a/ksim/monitors/filesystem/filesystemwidget.cpp b/ksim/monitors/filesystem/filesystemwidget.cpp
index 3df1917..7286e0f 100644
--- a/ksim/monitors/filesystem/filesystemwidget.cpp
+++ b/ksim/monitors/filesystem/filesystemwidget.cpp
@@ -189,7 +189,7 @@ void FilesystemWidget::processExited(KProcess *)
   TQStringList::Iterator it;
   for (it = errorList.begin(); it != errorList.end(); ++it) {
     message += TQString::fromLatin1("<li>%1</li>")
-       .tqarg((*it).replace(TQRegExp("[u]?mount: "), TQString()));
+       .arg((*it).replace(TQRegExp("[u]?mount: "), TQString()));
   }
 
   message += TQString::fromLatin1("</ul></qt>");
diff --git a/ksim/monitors/i8k/ksimi8k.cpp b/ksim/monitors/i8k/ksimi8k.cpp
index c265055..66eadf2 100644
--- a/ksim/monitors/i8k/ksimi8k.cpp
+++ b/ksim/monitors/i8k/ksimi8k.cpp
@@ -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)
diff --git a/ksim/monitors/mail/ksimmail.cpp b/ksim/monitors/mail/ksimmail.cpp
index f6cbe4a..1f35224 100644
--- a/ksim/monitors/mail/ksimmail.cpp
+++ b/ksim/monitors/mail/ksimmail.cpp
@@ -101,7 +101,7 @@ MailLabel::~MailLabel()
 {
 }
 
-void MailLabel::configureObject( bool tqrepaint )
+void MailLabel::configureObject( bool repaint )
 {
 	m_envelope.load( themeLoader().current().mailPixmap() );
 	m_frames = themeLoader().current().mailFrames();
@@ -112,7 +112,7 @@ void MailLabel::configureObject( bool tqrepaint )
 
 	setPixmap( frame( m_envelope, 1 ) );
 
-	KSim::Label::configureObject( tqrepaint );
+	KSim::Label::configureObject( repaint );
 }
 
 void MailLabel::paintEvent( TQPaintEvent* e )
diff --git a/ksim/monitors/net/ksimnet.cpp b/ksim/monitors/net/ksimnet.cpp
index 42e0ffd..140d822 100644
--- a/ksim/monitors/net/ksimnet.cpp
+++ b/ksim/monitors/net/ksimnet.cpp
@@ -356,7 +356,7 @@ void NetView::updateGraph()
       if ( ( *it ).label() )
       {
         timeDisplay = ( *it ).format();
-        newPid = pid.tqarg( ( *it ).name() );
+        newPid = pid.arg( ( *it ).name() );
 
         if ( TQFile::exists( newPid ) && stat( TQFile::encodeName( newPid ).data(), &st ) == 0 )
         {
@@ -394,16 +394,16 @@ void NetView::updateGraph()
       TQString receiveString = KGlobal::locale()->formatNumber( ( float ) receiveDiff / 1024.0, 1 );
       TQString sendString = KGlobal::locale()->formatNumber( ( float ) sendDiff / 1024.0, 1 );
 
-      ( *it ).chart()->setText( i18n( "in: %1k" ).tqarg( receiveString ),
-         i18n( "out: %1k" ).tqarg( sendString ) );
+      ( *it ).chart()->setText( i18n( "in: %1k" ).arg( receiveString ),
+         i18n( "out: %1k" ).arg( sendString ) );
     }
     else
     {
       ( *it ).setData( NetData() );
       ( *it ).chart()->setValue( 0, 0 );
 
-      ( *it ).chart()->setText( i18n( "in: %1k" ).tqarg( KGlobal::locale()->formatNumber( 0.0, 1 ) ),
-         i18n( "out: %1k" ).tqarg( KGlobal::locale()->formatNumber( 0.0, 1 ) ) );
+      ( *it ).chart()->setText( i18n( "in: %1k" ).arg( KGlobal::locale()->formatNumber( 0.0, 1 ) ),
+         i18n( "out: %1k" ).arg( KGlobal::locale()->formatNumber( 0.0, 1 ) ) );
 
       if ( ( *it ).label() )
         ( *it ).label()->setText( i18n( "offline" ) );
diff --git a/ksim/monitors/net/netconfig.cpp b/ksim/monitors/net/netconfig.cpp
index f3e98b7..b376c24 100644
--- a/ksim/monitors/net/netconfig.cpp
+++ b/ksim/monitors/net/netconfig.cpp
@@ -144,8 +144,8 @@ void NetConfig::menu(KListView *, TQListViewItem *item, const TQPoint &)
 
   if (item) {
     aboutMenu->insertItem(i18n("&Add Net Device"), 3);
-    aboutMenu->insertItem(i18n("&Modify '%1'").tqarg(item->text(0)), 2);
-    aboutMenu->insertItem(i18n("&Remove '%1'").tqarg(item->text(0)), 1);
+    aboutMenu->insertItem(i18n("&Modify '%1'").arg(item->text(0)), 2);
+    aboutMenu->insertItem(i18n("&Remove '%1'").arg(item->text(0)), 1);
   }
   else {
     aboutMenu->insertItem(i18n("&Add Net Device"), 3);
@@ -217,7 +217,7 @@ void NetConfig::removeItem(TQListViewItem *item)
     return;
 
   int result = KMessageBox::warningContinueCancel(0, i18n("Are you sure you "
-     "want to remove the net interface '%1'?").tqarg(item->text(0)), TQString(), KStdGuiItem::del());
+     "want to remove the net interface '%1'?").arg(item->text(0)), TQString(), KStdGuiItem::del());
 
   if (result == KMessageBox::Cancel)
     return;
diff --git a/ksim/monitors/snmp/monitordialogbase.ui b/ksim/monitors/snmp/monitordialogbase.ui
index e466c66..628c5dd 100644
--- a/ksim/monitors/snmp/monitordialogbase.ui
+++ b/ksim/monitors/snmp/monitordialogbase.ui
@@ -104,7 +104,7 @@
                     <property name="text">
                         <string>The text in the edit box is what is displayed except that any occurrence of &lt;b&gt;%s&lt;/b&gt; will be replaced with the snmp object value and any occurrence of &lt;b&gt;%n&lt;/b&gt; will be replaced with the name of this monitor (see Name input field) .</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>WordBreak|AlignVCenter</set>
                     </property>
                 </widget>
diff --git a/ksim/monitors/snmp/proberesultdialog.cpp b/ksim/monitors/snmp/proberesultdialog.cpp
index 1c8033a..bed1e21 100644
--- a/ksim/monitors/snmp/proberesultdialog.cpp
+++ b/ksim/monitors/snmp/proberesultdialog.cpp
@@ -30,7 +30,7 @@ ProbeResultDialog::ProbeResultDialog( const HostConfig &hostConfig, const ProbeD
                                       TQWidget *parent, const char *name )
         : ProbeResultDialogBase( parent, name )
 {
-    info->setText( i18n( "Results of scanning host %1:" ).tqarg( hostConfig.name ) );
+    info->setText( i18n( "Results of scanning host %1:" ).arg( hostConfig.name ) );
 
     for ( ProbeDialog::ProbeResultList::ConstIterator it = probeResults.begin();
           it != probeResults.end(); ++it )
diff --git a/ksim/monitors/snmp/value.cpp b/ksim/monitors/snmp/value.cpp
index 667613a..ad707b5 100644
--- a/ksim/monitors/snmp/value.cpp
+++ b/ksim/monitors/snmp/value.cpp
@@ -321,7 +321,7 @@ TQString Value::formatTimeTicks( int ticks, int conversionFlags )
     if ( days > 0 )
         result += TQString::number( days ) + "d:";
 
-    result += TQString(TQString::fromAscii( "%1h:%2m" )).tqarg( hours ).tqarg( minutes );
+    result += TQString(TQString::fromAscii( "%1h:%2m" )).arg( hours ).arg( minutes );
 
     if ( conversionFlags & TimeTicksWithSeconds )
         result += ":" + TQString::number( seconds ) + "s";