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

46 files changed, 257 insertions, 257 deletions

diff --git a/ksim/generalprefs.cpp b/ksim/generalprefs.cpp
index 3727b1f..15f427d 100644
--- a/ksim/generalprefs.cpp
+++ b/ksim/generalprefs.cpp
@@ -27,7 +27,7 @@
 #include <tqlineedit.h>
 #include <tqpushbutton.h>
 #include <tqtabwidget.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqtooltip.h>
 #include <tqpopupmenu.h>
 
@@ -50,7 +50,7 @@ KSim::GeneralPrefs::GeneralPrefs(TQWidget *parent, const char *name)
   m_sizeBox->setTitle(i18n("Graph Size"));
   m_sizeBox->setColumnLayout(0, Qt::Horizontal);
 
-  TQGridLayout *sizeBoxLayout = new TQGridLayout(m_sizeBox->tqlayout());
+  TQGridLayout *sizeBoxLayout = new TQGridLayout(m_sizeBox->layout());
   sizeBoxLayout->setSpacing(6);
 
   m_sizeHLabel = new TQLabel(m_sizeBox);
@@ -61,7 +61,7 @@ KSim::GeneralPrefs::GeneralPrefs(TQWidget *parent, const char *name)
   m_sizeHSpin->setValue(40);
   m_sizeHSpin->setMinValue(40);
   m_sizeHSpin->setMaxValue(200);
-  m_sizeHSpin->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred,
+  m_sizeHSpin->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred,
      TQSizePolicy::Fixed));
   sizeBoxLayout->addWidget(m_sizeHSpin, 0, 1);
 
@@ -77,7 +77,7 @@ KSim::GeneralPrefs::GeneralPrefs(TQWidget *parent, const char *name)
   m_sizeWSpin->setValue(58);
   m_sizeWSpin->setMinValue(58);
   m_sizeWSpin->setMaxValue(200);
-  m_sizeWSpin->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred,
+  m_sizeWSpin->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred,
      TQSizePolicy::Fixed));
   sizeBoxLayout->addWidget(m_sizeWSpin, 1, 1);
 
@@ -168,7 +168,7 @@ KSim::UptimePrefs::UptimePrefs(TQWidget *parent, const char *name)
 
   m_uptimeCombo = new KComboBox(true, this);
   m_uptimeCombo->setDuplicatesEnabled(false);
-  m_uptimeCombo->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding,
+  m_uptimeCombo->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding,
      TQSizePolicy::Fixed));
   m_uptimeCombo->insertItem(i18n("%hh:%mm:%ss"));
   m_uptimeCombo->insertItem(i18n("%dd %h:%m"));
@@ -211,10 +211,10 @@ KSim::UptimePrefs::UptimePrefs(TQWidget *parent, const char *name)
   m_uptimeBox = new TQGroupBox(this);
   m_uptimeBox->setTitle(i18n("Uptime Legend"));
   m_uptimeBox->setColumnLayout(0, Qt::Vertical);
-  m_uptimeBox->tqlayout()->setSpacing(0);
-  m_uptimeBox->tqlayout()->setMargin(0);
-  m_boxLayout = new TQVBoxLayout(m_uptimeBox->tqlayout());
-  m_boxLayout->tqsetAlignment(TQt::AlignTop);
+  m_uptimeBox->layout()->setSpacing(0);
+  m_uptimeBox->layout()->setMargin(0);
+  m_boxLayout = new TQVBoxLayout(m_uptimeBox->layout());
+  m_boxLayout->setAlignment(TQt::AlignTop);
   m_boxLayout->setSpacing(6);
   m_boxLayout->setMargin(11);
 
@@ -305,7 +305,7 @@ KSim::MemoryPrefs::MemoryPrefs(TQWidget *parent, const char *name)
 
   m_memCombo = new KComboBox(true, this);
   m_memCombo->setDuplicatesEnabled(false);
-  m_memCombo->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding,
+  m_memCombo->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding,
      TQSizePolicy::Fixed));
   //m_memCombo->insertItem(i18n("%tM - %fM free"));
   //m_memCombo->insertItem(i18n("%tM - %uM used"));
@@ -347,10 +347,10 @@ KSim::MemoryPrefs::MemoryPrefs(TQWidget *parent, const char *name)
   m_memBox = new TQGroupBox(this);
   m_memBox->setTitle(i18n("Memory Legend"));
   m_memBox->setColumnLayout(0, Qt::Vertical);
-  m_memBox->tqlayout()->setSpacing(0);
-  m_memBox->tqlayout()->setMargin(0);
-  m_boxLayout = new TQVBoxLayout(m_memBox->tqlayout());
-  m_boxLayout->tqsetAlignment(TQt::AlignTop);
+  m_memBox->layout()->setSpacing(0);
+  m_memBox->layout()->setMargin(0);
+  m_boxLayout = new TQVBoxLayout(m_memBox->layout());
+  m_boxLayout->setAlignment(TQt::AlignTop);
   m_boxLayout->setSpacing(6);
   m_boxLayout->setMargin(11);
 
@@ -458,7 +458,7 @@ KSim::SwapPrefs::SwapPrefs(TQWidget *parent, const char *name)
 
   m_swapCombo = new KComboBox(true, this);
   m_swapCombo->setDuplicatesEnabled(false);
-  m_swapCombo->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding,
+  m_swapCombo->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding,
      TQSizePolicy::Fixed));
   //m_swapCombo->insertItem(i18n("%tM - %fM free"));
   //m_swapCombo->insertItem(i18n("%tM - %uM used"));
@@ -496,10 +496,10 @@ KSim::SwapPrefs::SwapPrefs(TQWidget *parent, const char *name)
   m_swapBox = new TQGroupBox(this);
   m_swapBox->setTitle(i18n("Swap Legend"));
   m_swapBox->setColumnLayout(0, Qt::Vertical);
-  m_swapBox->tqlayout()->setSpacing(0);
-  m_swapBox->tqlayout()->setMargin(0);
-  m_boxLayout = new TQVBoxLayout(m_swapBox->tqlayout());
-  m_boxLayout->tqsetAlignment(TQt::AlignTop);
+  m_swapBox->layout()->setSpacing(0);
+  m_swapBox->layout()->setMargin(0);
+  m_boxLayout = new TQVBoxLayout(m_swapBox->layout());
+  m_boxLayout->setAlignment(TQt::AlignTop);
   m_boxLayout->setSpacing(6);
   m_boxLayout->setMargin(11);
 
diff --git a/ksim/ksim.cpp b/ksim/ksim.cpp
index 2e2587e..396a772 100644
--- a/ksim/ksim.cpp
+++ b/ksim/ksim.cpp
@@ -23,7 +23,7 @@
 #include <ksimconfig.h>
 #include <common.h>
 
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <kaboutapplication.h>
 #include <kbugreport.h>
@@ -75,9 +75,9 @@ KSim::PanelExtension::~PanelExtension()
   delete m_dcopClient;
 }
 
-TQSize KSim::PanelExtension::tqsizeHint(Position p, TQSize maxSize) const
+TQSize KSim::PanelExtension::sizeHint(Position p, TQSize maxSize) const
 {
-  return m_view->tqsizeHint(p, maxSize);
+  return m_view->sizeHint(p, maxSize);
 }
 
 void KSim::PanelExtension::resizeEvent(TQResizeEvent *)
diff --git a/ksim/ksim.h b/ksim/ksim.h
index 2c1a4f5..5451b83 100644
--- a/ksim/ksim.h
+++ b/ksim/ksim.h
@@ -42,7 +42,7 @@ namespace KSim
 
       ~PanelExtension();
 
-      TQSize tqsizeHint( Position, TQSize maxSize ) const;
+      TQSize sizeHint( Position, TQSize maxSize ) const;
       void resizeEvent(TQResizeEvent *);
       Position preferedPosition() const;
 
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 6813aeb..2e3d860 100644
--- a/ksim/ksimsysinfo.cpp
+++ b/ksim/ksimsysinfo.cpp
@@ -18,10 +18,10 @@
  */
 
 #include <tqtooltip.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqtimer.h>
 #include <tqregexp.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqdatetime.h>
 
 #include <kdebug.h>
@@ -86,7 +86,7 @@ void KSim::Sysinfo::clockUptimeUpdate()
   // only update the date when necessary
   if (m_dateLabel) {
     if (updateDate) {
-      m_dateLabel->setText(KGlobal::locale()->formatDate(TQDate::tqcurrentDate()));
+      m_dateLabel->setText(KGlobal::locale()->formatDate(TQDate::currentDate()));
       updateDate = false;
     }
   }
@@ -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 1e93816..fc8e2cd 100644
--- a/ksim/ksimview.cpp
+++ b/ksim/ksimview.cpp
@@ -49,7 +49,7 @@
 #include <tqfile.h>
 #include <tqbitmap.h>
 #include <tqtimer.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqobjectlist.h>
 #include <tqpainter.h>
 #include <tqcursor.h>
@@ -183,8 +183,8 @@ KSim::Config *KSim::MainView::config() const
 void KSim::MainView::makeDirs()
 {
   TQString homeDir = locateLocal("data", "ksim");
-  TQString themeDir = homeDir + TQString::tqfromLatin1("/themes");
-  TQString monitorDir = homeDir + TQString::tqfromLatin1("/monitors");
+  TQString themeDir = homeDir + TQString::fromLatin1("/themes");
+  TQString monitorDir = homeDir + TQString::fromLatin1("/monitors");
 
   // return true if the dirs already exist
   if (TQFile::exists(themeDir) && TQFile::exists(monitorDir))
@@ -217,7 +217,7 @@ void KSim::MainView::maskMainView()
       !m_rightFrame->background()->mask() ||
       !m_bottomFrame->background()->mask())
   {
-    tqtopLevelWidget()->clearMask();
+    topLevelWidget()->clearMask();
     return;
   }
   
@@ -226,16 +226,16 @@ 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(tqtopLevelWidget()->size(), true);
+  TQBitmap bigBitmap(topLevelWidget()->size(), true);
 
   // better return if our bitmap is null so we can avoid crashes
   if (bigBitmap.isNull())
     return;
 
-  TQPoint ofs = mapTo(tqtopLevelWidget(), TQPoint(0,0));
+  TQPoint ofs = mapTo(topLevelWidget(), TQPoint(0,0));
   int ofsX = ofs.x();
   int ofsY = ofs.y();
 
@@ -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);
@@ -254,7 +254,7 @@ void KSim::MainView::maskMainView()
      bottomPixmap);
 
   painter.end();
-  tqtopLevelWidget()->setMask(bigBitmap);
+  topLevelWidget()->setMask(bigBitmap);
 }
 
 void KSim::MainView::reparseConfig(bool emitReload,
@@ -430,7 +430,7 @@ void KSim::MainView::destroyPref()
   }
 }
 
-TQSize KSim::MainView::tqsizeHint(KPanelExtension::Position p, TQSize) const
+TQSize KSim::MainView::sizeHint(KPanelExtension::Position p, TQSize) const
 {
   int width = 0;
   int height = 0;
@@ -439,7 +439,7 @@ TQSize KSim::MainView::tqsizeHint(KPanelExtension::Position p, TQSize) const
   for( TQLayoutIterator it = m_pluginLayout->iterator();
        (child = it.current()) != 0; ++it)
   {
-     TQSize sz = child->tqminimumSize();
+     TQSize sz = child->minimumSize();
      if ((p == KPanelExtension::Right) || (p == KPanelExtension::Left))
      {
         width = TQMAX(width, sz.width());
diff --git a/ksim/ksimview.h b/ksim/ksimview.h
index 7aaacf1..6bbb989 100644
--- a/ksim/ksimview.h
+++ b/ksim/ksimview.h
@@ -63,7 +63,7 @@ namespace KSim
       KSim::Config *config() const;
       void makeDirs();
 
-      TQSize tqsizeHint(KPanelExtension::Position, TQSize maxSize) const;
+      TQSize sizeHint(KPanelExtension::Position, TQSize maxSize) const;
       void positionChange(Qt::Orientation);
 
     k_dcop:
diff --git a/ksim/library/chart.cpp b/ksim/library/chart.cpp
index ca555a4..b9b5e31 100644
--- a/ksim/library/chart.cpp
+++ b/ksim/library/chart.cpp
@@ -251,7 +251,7 @@ void KSim::Chart::buildPixmaps()
 
 void KSim::Chart::configureObject(bool repaintWidget)
 {
-  TQSize oldSize = tqsizeHint();
+  TQSize oldSize = sizeHint();
   KSim::Config::config()->setGroup("Misc");
   d->size = KSim::Config::config()->readSizeEntry("GraphSize");
 
@@ -263,11 +263,11 @@ void KSim::Chart::configureObject(bool repaintWidget)
     d->krell->show();
   }
 
-  // Update our tqgeometry if we need to let any
-  // tqlayout know about our tqsizeHint() change
-  if (oldSize != tqsizeHint()) {
+  // Update our geometry if we need to let any
+  // layout know about our sizeHint() change
+  if (oldSize != sizeHint()) {
     // Using resize() here seems to be needed
-    resize(tqsizeHint());
+    resize(sizeHint());
     updateGeometry();
   }
 
@@ -279,14 +279,14 @@ void KSim::Chart::configureObject(bool repaintWidget)
     update();
 }
 
-TQSize KSim::Chart::tqsizeHint() const
+TQSize KSim::Chart::sizeHint() const
 {
   return d->size;
 }
 
-TQSize KSim::Chart::tqminimumSizeHint() const
+TQSize KSim::Chart::minimumSizeHint() const
 {
-  return tqsizeHint();
+  return sizeHint();
 }
 
 void KSim::Chart::resizeEvent(TQResizeEvent *re)
@@ -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;
@@ -608,7 +608,7 @@ void KSim::Chart::init(bool krell, int maxValue, const TQString &title)
 {
   setConfigString("StyleChart");
   setThemeConfigOnly(false);
-  tqsetSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed));
+  setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed));
 
   d = new Private;
   KSim::Config::config()->setGroup("Misc");
diff --git a/ksim/library/chart.h b/ksim/library/chart.h
index cd658c0..6f8cfeb 100644
--- a/ksim/library/chart.h
+++ b/ksim/library/chart.h
@@ -109,11 +109,11 @@ namespace KSim
       /**
        * reimplemented for internal reasons
        */
-      TQSize tqsizeHint() const;
+      TQSize sizeHint() const;
       /**
        * reimplemented for internal reasons
        */
-      TQSize tqminimumSizeHint() const;
+      TQSize minimumSizeHint() const;
 
       void disableAutomaticUpdates();
 
diff --git a/ksim/library/label.cpp b/ksim/library/label.cpp
index 0b9ed18..16be059 100644
--- a/ksim/library/label.cpp
+++ b/ksim/library/label.cpp
@@ -24,7 +24,7 @@
 
 #include <tqpainter.h>
 #include <tqstyle.h>
-#include <tqstylesheet.h>
+#include <stylesheet.h>
 #include <tqsimplerichtext.h>
 #include <tqcursor.h>
 #include <tqpixmap.h>
@@ -88,7 +88,7 @@ void KSim::Label::configureObject(bool repaintWidget)
   d->meterImage.load(image);
   KSim::ThemeLoader::self().reColourImage(d->meterImage);
   d->background = d->meterImage.smoothScale(size());
-  TQSize oldSize = tqsizeHint();
+  TQSize oldSize = sizeHint();
 
   setConfigValues();
   relayoutLabel(oldSize, repaintWidget);
@@ -99,7 +99,7 @@ void KSim::Label::setPixmap(const TQPixmap &pixmap)
   if (pixmap.serialNumber() == d->sidePixmap.serialNumber())
     return;
 
-  TQSize oldSize = tqsizeHint();
+  TQSize oldSize = sizeHint();
   d->sidePixmap = pixmap;
 
   relayoutLabel(oldSize);
@@ -110,7 +110,7 @@ const TQPixmap &KSim::Label::pixmap() const
   return d->sidePixmap;
 }
 
-TQSize KSim::Label::tqsizeHint() const
+TQSize KSim::Label::sizeHint() const
 {
   int width = fontMetrics().size(SingleLine, text()).width();
   if (!pixmap().isNull())
@@ -123,9 +123,9 @@ TQSize KSim::Label::tqsizeHint() const
   return TQSize(width, height);
 }
 
-TQSize KSim::Label::tqminimumSizeHint() const
+TQSize KSim::Label::minimumSizeHint() const
 {
-  return tqsizeHint();
+  return sizeHint();
 }
 
 void KSim::Label::clear()
@@ -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 = tqsizeHint();
-  // set the text of our widget and tqrepaint
+  TQSize oldSize = sizeHint();
+  // 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();
 }
 
@@ -232,7 +232,7 @@ void KSim::Label::drawText(TQPainter *painter, const TQRect &rect,
   if (!pixmap().isNull())
     location.setX(pixmap().width() + 5);
    
-  tqstyle().drawItem(painter, location, AlignCenter, tqcolorGroup(), true,
+  tqstyle().drawItem(painter, location, AlignCenter, colorGroup(), true,
       0, text, -1, &color);
 }
 
@@ -242,7 +242,7 @@ void KSim::Label::drawPixmap(TQPainter *painter, const TQRect &rect,
   TQRect location(rect);
   location.setWidth(pixmap.width());
 
-  tqstyle().drawItem(painter, location, AlignCenter, tqcolorGroup(), true,
+  tqstyle().drawItem(painter, location, AlignCenter, colorGroup(), true,
     pixmap.isNull() ? 0 : &pixmap, TQString());
 }
 
@@ -268,7 +268,7 @@ const TQRect &KSim::Label::shadowLocation() const
 
 void KSim::Label::setThemePixmap(const TQString &image)
 {
-  TQSize oldSize = tqsizeHint();
+  TQSize oldSize = sizeHint();
   d->meterImage.reset();
   d->meterImage.load(image);
   KSim::ThemeLoader::self().reColourImage(d->meterImage);
@@ -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 (tqsizeHint() != old) {
+  if (sizeHint() != old) {
     updateGeometry();
   }
 
-  if (tqrepaint)
+  if (repaint)
     update();
 }
 
@@ -294,7 +294,7 @@ void KSim::Label::initWidget(int type)
 
   // try to reduce flicker as much as possible
   setBackgroundMode(NoBackground);
-  tqsetSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding,
+  setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding,
      TQSizePolicy::Fixed));
 
   configureObject();
diff --git a/ksim/library/label.h b/ksim/library/label.h
index f20d8df..9e24c95 100644
--- a/ksim/library/label.h
+++ b/ksim/library/label.h
@@ -108,11 +108,11 @@ namespace KSim
       /**
        * reimplemented for internal reasons
        */
-      virtual TQSize tqsizeHint() const;
+      virtual TQSize sizeHint() const;
       /**
        * reimplemented for internal reasons
        */
-      virtual TQSize tqminimumSizeHint() const;
+      virtual TQSize minimumSizeHint() const;
 
     public slots:
       /**
@@ -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.cpp b/ksim/library/led.cpp
index 3fa8d7f..a20a1d1 100644
--- a/ksim/library/led.cpp
+++ b/ksim/library/led.cpp
@@ -234,9 +234,9 @@ void KSim::LedLabel::configureObject(bool reapaintWidget)
     update();
 }
 
-TQSize KSim::LedLabel::tqsizeHint() const
+TQSize KSim::LedLabel::sizeHint() const
 {
-  TQSize hint(Progress::tqsizeHint());
+  TQSize hint(Progress::sizeHint());
 
   if (d->sendLed.height() > hint.height())
     hint.setHeight(d->sendLed.height());
diff --git a/ksim/library/led.h b/ksim/library/led.h
index 5c5e615..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();
 
@@ -150,7 +150,7 @@ namespace KSim
       /**
        * reimplemented for internal reasons
        */
-      virtual TQSize tqsizeHint() const;
+      virtual TQSize sizeHint() const;
 
     public slots:
       /**
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/progress.cpp b/ksim/library/progress.cpp
index e37cff1..82ae16e 100644
--- a/ksim/library/progress.cpp
+++ b/ksim/library/progress.cpp
@@ -124,9 +124,9 @@ void KSim::Progress::configureObject(bool repaintWidget)
     update();
 }
 
-TQSize KSim::Progress::tqsizeHint() const
+TQSize KSim::Progress::sizeHint() const
 {
-  TQSize hint(Label::tqsizeHint());
+  TQSize hint(Label::sizeHint());
 
   if (d->meterPixmap.height() > hint.height())
     hint.setHeight(d->meterPixmap.height());
@@ -186,7 +186,7 @@ void KSim::Progress::setOrigin(const TQRect &origin)
 
 void KSim::Progress::setMeterPixmap(const TQPixmap &pixmap)
 {
-  TQSize oldSize = tqsizeHint();
+  TQSize oldSize = sizeHint();
   d->meterPixmap = pixmap;
   relayoutLabel(oldSize);
 }
diff --git a/ksim/library/progress.h b/ksim/library/progress.h
index 0e30986..415c9fa 100644
--- a/ksim/library/progress.h
+++ b/ksim/library/progress.h
@@ -122,7 +122,7 @@ namespace KSim
       /**
        * reimplemented for internal reasons
        */
-      virtual TQSize tqsizeHint() const;
+      virtual TQSize sizeHint() const;
 
     public slots:
       /**
diff --git a/ksim/library/themeloader.cpp b/ksim/library/themeloader.cpp
index 3fced29..f6d6474 100644
--- a/ksim/library/themeloader.cpp
+++ b/ksim/library/themeloader.cpp
@@ -217,7 +217,7 @@ TQRect KSim::Theme::frameRightBorder(const TQRect &defValue) const
 TQColor KSim::Theme::chartInColour(const TQColor &defValue) const
 {
   if (d->recolour)
-    return TQApplication::tqpalette().active().background();
+    return TQApplication::palette().active().background();
 
   return internalColourEntry("chart_in_color", defValue);
 }
@@ -230,7 +230,7 @@ TQColor KSim::Theme::chartInColourGrid(const TQColor &defValue) const
 TQColor KSim::Theme::chartOutColour(const TQColor &defValue) const
 {
   if (d->recolour)
-    return TQApplication::tqpalette().active().background();
+    return TQApplication::palette().active().background();
 
   return internalColourEntry("chart_out_color", defValue);
 }
@@ -691,7 +691,7 @@ TQString KSim::Theme::readColourEntry(const TQString &itemType,
 {
   TQString color = readEntry(itemType, entry);
   if (color.isEmpty())
-    color = TQString::tqfromLatin1("#ffffff #ffffff");
+    color = TQString::fromLatin1("#ffffff #ffffff");
 
   return TQStringList::split(' ', color)[row];
 }
@@ -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,
@@ -927,7 +927,7 @@ void KSim::ThemeLoader::reload()
   if (m_theme.d)
     m_theme.d->globalReader = d->globalReader;
 
-  TQString fileName = TQString::tqfromLatin1("gkrellmrc") + alternativeAsString();
+  TQString fileName = TQString::fromLatin1("gkrellmrc") + alternativeAsString();
   m_theme.reparse(currentUrl(), fileName, currentAlternative());
 }
 
@@ -948,7 +948,7 @@ void KSim::ThemeLoader::reColourImage(TQImage &image)
   if (!d->recolour || image.isNull())
     return;
 
-  TQColor color = TQApplication::tqpalette().active().background();
+  TQColor color = TQApplication::palette().active().background();
   TQImage output(image.width(), image.height(), 32);
   output.setAlphaBuffer(image.hasAlphaBuffer());
 
@@ -1036,7 +1036,7 @@ void KSim::ThemeLoader::parseDir(const TQString &url, int alt)
   {
     TQString homePath = TQDir::current().path();
     homePath = locateLocal( "data", "ksim" )
-       + TQString::tqfromLatin1( "/themes" )
+       + TQString::fromLatin1( "/themes" )
        + homePath.right( homePath.length()
        - homePath.findRev( TQRegExp( "\\/" ),
        homePath.length() ) );
@@ -1072,7 +1072,7 @@ void KSim::ThemeLoader::parseDir(const TQString &url, int alt)
       // go through the meters array and move the files to the correct dir/filename
       TQStringList::Iterator meter;
       for (meter = meters.begin(); meter != meters.end(); ++meter) {
-        TQString bgMeter = TQString::tqfromLatin1("bg_meter_");
+        TQString bgMeter = TQString::fromLatin1("bg_meter_");
         if (TQFile::exists(bgMeter + (*meter) + altString + "." +  (*format))) {
           if (KStandardDirs::makeDir(url + (*meter)))
             directory.rename(bgMeter + (*meter) + altString + "." + (*format),
@@ -1083,7 +1083,7 @@ void KSim::ThemeLoader::parseDir(const TQString &url, int alt)
       // go through the panels array and move the files to the correct dir/filename
       TQStringList::ConstIterator panel;
       for (panel = panels.begin(); panel != panels.end(); ++panel) {
-        TQString bgPanel = TQString::tqfromLatin1("bg_panel_");
+        TQString bgPanel = TQString::fromLatin1("bg_panel_");
         if (TQFile::exists(bgPanel + (*panel) + altString + "." + (*format))) {
           if (KStandardDirs::makeDir(url + (*panel)))
             directory.rename(bgPanel + (*panel) + altString + "." + (*format),
@@ -1092,13 +1092,13 @@ void KSim::ThemeLoader::parseDir(const TQString &url, int alt)
       }
 
       // fix stupid themes that have a bg_panel image in the host dir
-      TQString tempFile = TQString::tqfromLatin1("host/bg_panel");
+      TQString tempFile = TQString::fromLatin1("host/bg_panel");
       if (TQFile::exists(tempFile + altString + "." + (*format)))
         directory.rename(tempFile + altString + "." + (*format), "host/bg_meter"
            + altString + "." + (*format));
 
       // move decal_net_leds* to the net folder to be more consistant
-      tempFile = TQString::tqfromLatin1("decal_net_leds");
+      tempFile = TQString::fromLatin1("decal_net_leds");
       if (TQFile::exists(tempFile + altString + "." + (*format))) {
         if (KStandardDirs::makeDir(url + "net"))
           directory.rename(tempFile + altString + "." + (*format),
@@ -1159,7 +1159,7 @@ int KSim::ThemeLoader::currentAlternative()
 TQString KSim::ThemeLoader::alternativeAsString(int alt)
 {
   int alternative = (alt == -1 ? currentAlternative() : alt);
-  return (alternative == 0 ? TQString() : TQString::tqfromLatin1("_")
+  return (alternative == 0 ? TQString() : TQString::fromLatin1("_")
      + TQString::number(alternative));
 }
 
@@ -1225,7 +1225,7 @@ KSim::ThemeLoader::ThemeLoader()
 
   m_theme.create(d->fileNames, d->imageTypes, d->globalReader);
 
-  TQString fileName = TQString::tqfromLatin1("gkrellmrc") + alternativeAsString();
+  TQString fileName = TQString::fromLatin1("gkrellmrc") + alternativeAsString();
   m_theme.init(currentUrl(), fileName, currentAlternative());
 
   reColourItems();
diff --git a/ksim/library/themetypes.h b/ksim/library/themetypes.h
index 82b7aa3..9ca4bb4 100644
--- a/ksim/library/themetypes.h
+++ b/ksim/library/themetypes.h
@@ -74,7 +74,7 @@ namespace KSim
 
       TQString returnString;
       returnString.setLatin1(typeNames[type]);
-      return incSlash ? returnString + TQString::tqfromLatin1("/") : returnString;
+      return incSlash ? returnString + TQString::fromLatin1("/") : returnString;
     }
   }
 }
diff --git a/ksim/monitors/cpu/ksimcpu.cpp b/ksim/monitors/cpu/ksimcpu.cpp
index 39bbffd..dfbaf9b 100644
--- a/ksim/monitors/cpu/ksimcpu.cpp
+++ b/ksim/monitors/cpu/ksimcpu.cpp
@@ -20,9 +20,9 @@
 #include "ksimcpu.h"
 #include "ksimcpu.moc"
 
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqregexp.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqtimer.h>
 #include <tqfile.h>
 #include <tqgroupbox.h>
@@ -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);
   }
@@ -377,27 +377,27 @@ CpuConfig::CpuConfig(KSim::PluginObject *parent, const char *name)
 
   mainLayout->addWidget( m_listView );
 
-  TQHBoxLayout * tqlayout = new TQHBoxLayout;
-  tqlayout->setSpacing( 6 );
+  TQHBoxLayout * layout = new TQHBoxLayout;
+  layout->setSpacing( 6 );
 
   TQSpacerItem * spacer = new TQSpacerItem( 20, 20,
      TQSizePolicy::Expanding, TQSizePolicy::Minimum );
-  tqlayout->addItem(spacer);
+  layout->addItem(spacer);
 
   m_modify = new TQPushButton( this );
   m_modify->setText( i18n( "Modify..." ) );
   connect( m_modify, TQT_SIGNAL( clicked() ), TQT_SLOT( modify() ) );
-  tqlayout->addWidget( m_modify );
-  mainLayout->addLayout( tqlayout );
+  layout->addWidget( m_modify );
+  mainLayout->addLayout( layout );
 
   m_legendBox = new TQGroupBox(this);
   m_legendBox->setColumnLayout(0, Qt::Vertical);
   m_legendBox->setTitle(i18n("Chart Legend"));
-  m_legendBox->tqlayout()->setSpacing(0);
-  m_legendBox->tqlayout()->setMargin(0);
+  m_legendBox->layout()->setSpacing(0);
+  m_legendBox->layout()->setMargin(0);
 
-  m_legendLayout = new TQVBoxLayout(m_legendBox->tqlayout());
-  m_legendLayout->tqsetAlignment(TQt::AlignTop);
+  m_legendLayout = new TQVBoxLayout(m_legendBox->layout());
+  m_legendLayout->setAlignment(TQt::AlignTop);
   m_legendLayout->setSpacing(6);
   m_legendLayout->setMargin(11);
 
@@ -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 c91f173..3a4e921 100644
--- a/ksim/monitors/disk/ksimdisk.cpp
+++ b/ksim/monitors/disk/ksimdisk.cpp
@@ -20,10 +20,10 @@
 #include "ksimdisk.h"
 #include "ksimdisk.moc"
 
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqregexp.h>
 #include <tqtimer.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqradiobutton.h>
 #include <tqvbuttongroup.h>
 #include <tqpushbutton.h>
@@ -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)
@@ -414,23 +414,23 @@ TQString DiskView::diskName( int major, int minor ) const
   switch ( major )
   {
     case IDE0_MAJOR:
-      returnValue.prepend(TQString::tqfromLatin1("hda"));
+      returnValue.prepend(TQString::fromLatin1("hda"));
       break;
     case IDE1_MAJOR:
-      returnValue.prepend(TQString::tqfromLatin1("hdc"));
+      returnValue.prepend(TQString::fromLatin1("hdc"));
       break;
     case IDE3_MAJOR:
-      returnValue.prepend(TQString::tqfromLatin1("hde"));
+      returnValue.prepend(TQString::fromLatin1("hde"));
       break;
     case SCSI_DISK0_MAJOR:
-      returnValue.prepend(TQString::tqfromLatin1("sda"));
+      returnValue.prepend(TQString::fromLatin1("sda"));
       break;
     case SCSI_GENERIC_MAJOR:
-      returnValue.prepend(TQString::tqfromLatin1("sg0"));
+      returnValue.prepend(TQString::fromLatin1("sg0"));
       break;
   }
 
-  returnValue.tqat(2) = returnValue.tqat(2).latin1() + minor;
+  returnValue.at(2) = returnValue.at(2).latin1() + minor;
   return returnValue;
 #else
   Q_UNUSED(major);
@@ -482,23 +482,23 @@ DiskConfig::DiskConfig(KSim::PluginObject *parent, const char *name)
   m_listview->addColumn(i18n("Disks"));
   m_layout->addWidget(m_listview);
 
-  TQHBoxLayout *tqlayout = new TQHBoxLayout;
-  tqlayout->setSpacing(6);
+  TQHBoxLayout *layout = new TQHBoxLayout;
+  layout->setSpacing(6);
 
   TQSpacerItem *spacer = new TQSpacerItem(20, 20,
      TQSizePolicy::Expanding, TQSizePolicy::Minimum);
-  tqlayout->addItem(spacer);
+  layout->addItem(spacer);
 
   m_add = new TQPushButton(this);
   m_add->setText(i18n("Add..."));
   connect(m_add, TQT_SIGNAL(clicked()), TQT_SLOT(addItem()));
-  tqlayout->addWidget(m_add);
+  layout->addWidget(m_add);
 
   m_remove = new TQPushButton(this);
   m_remove->setText(i18n("Remove"));
   connect(m_remove, TQT_SIGNAL(clicked()), TQT_SLOT(removeItem()));
-  tqlayout->addWidget(m_remove);
-  m_layout->addLayout(tqlayout);
+  layout->addWidget(m_remove);
+  m_layout->addLayout(layout);
 
   m_buttonBox = new TQVButtonGroup(i18n("Disk Styles"), this);
   m_layout->addWidget(m_buttonBox);
diff --git a/ksim/monitors/filesystem/filesystemstats.cpp b/ksim/monitors/filesystem/filesystemstats.cpp
index fa215fc..1aa156d 100644
--- a/ksim/monitors/filesystem/filesystemstats.cpp
+++ b/ksim/monitors/filesystem/filesystemstats.cpp
@@ -184,7 +184,7 @@ FilesystemStats::List FilesystemStats::readEntries()
 #endif
 
 #ifdef USE_FAILSAFE
-  TQFile file( TQString::tqfromLatin1( _PATH_MOUNTED ) );
+  TQFile file( TQString::fromLatin1( _PATH_MOUNTED ) );
 
   if ( !file.open( IO_ReadOnly ) )
     return list;
diff --git a/ksim/monitors/filesystem/filesystemwidget.cpp b/ksim/monitors/filesystem/filesystemwidget.cpp
index fb04470..ac81156 100644
--- a/ksim/monitors/filesystem/filesystemwidget.cpp
+++ b/ksim/monitors/filesystem/filesystemwidget.cpp
@@ -21,7 +21,7 @@
 
 #include <pluginmodule.h>
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpopupmenu.h>
 #include <tqregexp.h>
 #include <tqcursor.h>
@@ -188,11 +188,11 @@ void FilesystemWidget::processExited(KProcess *)
 
   TQStringList::Iterator it;
   for (it = errorList.begin(); it != errorList.end(); ++it) {
-    message += TQString::tqfromLatin1("<li>%1</li>")
-       .tqarg((*it).replace(TQRegExp("[u]?mount: "), TQString()));
+    message += TQString::fromLatin1("<li>%1</li>")
+       .arg((*it).replace(TQRegExp("[u]?mount: "), TQString()));
   }
 
-  message += TQString::tqfromLatin1("</ul></qt>");
+  message += TQString::fromLatin1("</ul></qt>");
   KMessageBox::sorry(0, message);
 }
 
diff --git a/ksim/monitors/filesystem/fsystemconfig.cpp b/ksim/monitors/filesystem/fsystemconfig.cpp
index 6b8c928..37646b7 100644
--- a/ksim/monitors/filesystem/fsystemconfig.cpp
+++ b/ksim/monitors/filesystem/fsystemconfig.cpp
@@ -29,7 +29,7 @@
 #include <kdebug.h>
 
 #include <tqcheckbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqtooltip.h>
 #include <tqlabel.h>
 #include <tqwhatsthis.h>
@@ -71,7 +71,7 @@ FsystemConfig::FsystemConfig(KSim::PluginObject *parent, const char *name)
 
   m_intervalLabel = new TQLabel(this);
   m_intervalLabel->setText( i18n("Update interval:"));
-  m_intervalLabel->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed,
+  m_intervalLabel->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed,
      TQSizePolicy::Fixed));
   m_mainLayout->addMultiCellWidget(m_intervalLabel, 3, 3, 0, 0);
 
@@ -82,7 +82,7 @@ FsystemConfig::FsystemConfig(KSim::PluginObject *parent, const char *name)
 
   TQLabel *intervalLabel = new TQLabel(this);
   intervalLabel->setText(i18n("seconds"));
-  intervalLabel->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed,
+  intervalLabel->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed,
      TQSizePolicy::Fixed));
   m_mainLayout->addMultiCellWidget(intervalLabel, 3, 3, 2, 2);
 
diff --git a/ksim/monitors/filesystem/ksimfsystem.cpp b/ksim/monitors/filesystem/ksimfsystem.cpp
index 9b08da9..9af2b2d 100644
--- a/ksim/monitors/filesystem/ksimfsystem.cpp
+++ b/ksim/monitors/filesystem/ksimfsystem.cpp
@@ -21,7 +21,7 @@
 
 #include <config.h>
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqvaluelist.h>
 #include <tqtimer.h>
 #include <tqfile.h>
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()
diff --git a/ksim/monitors/lm_sensors/ksimsensors.cpp b/ksim/monitors/lm_sensors/ksimsensors.cpp
index eb2614f..136d314 100644
--- a/ksim/monitors/lm_sensors/ksimsensors.cpp
+++ b/ksim/monitors/lm_sensors/ksimsensors.cpp
@@ -27,7 +27,7 @@
 #include <kaboutdata.h>
 #include <kconfig.h>
 
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <label.h>
 #include <themetypes.h>
diff --git a/ksim/monitors/lm_sensors/sensorbase.cpp b/ksim/monitors/lm_sensors/sensorbase.cpp
index cabbf5a..45251db 100644
--- a/ksim/monitors/lm_sensors/sensorbase.cpp
+++ b/ksim/monitors/lm_sensors/sensorbase.cpp
@@ -126,7 +126,7 @@ void SensorBase::update()
 
         m_sensorList.append(SensorInfo(currentSensor++, label,
            TQString::fromUtf8(name), TQString::fromUtf8(chip->prefix),
-           chipset, sensorType(TQString::tqfromLatin1(name))));
+           chipset, sensorType(TQString::fromLatin1(name))));
       }
     }
   }
@@ -134,13 +134,13 @@ void SensorBase::update()
   if (m_hasNVControl) {
       int temp = 0;
       if (XNVCTRLQueryAttribute(qt_xdisplay(), qt_xscreen(), 0 /* not used? */, NV_CTRL_GPU_CORE_TEMPERATURE, &temp)) {
-          TQString name = TQString::tqfromLatin1("GPU Temp");
+          TQString name = TQString::fromLatin1("GPU Temp");
           m_sensorList.append(SensorInfo(currentSensor++, TQString::number(temp),
                                          name, TQString(), TQString(), sensorType(name)));
       }
 
       if (XNVCTRLQueryAttribute(qt_xdisplay(), qt_xscreen(), 0 /* not used? */, NV_CTRL_AMBIENT_TEMPERATURE, &temp)) {
-          TQString name = TQString::tqfromLatin1("GPU Ambient Temp");
+          TQString name = TQString::fromLatin1("GPU Ambient Temp");
           m_sensorList.append(SensorInfo(currentSensor++, TQString::number(temp),
                                          name, TQString(), TQString(), sensorType(name)));
       }
@@ -217,9 +217,9 @@ TQString SensorBase::sensorType(const TQString &name)
 
   if (name.findRev("temp", -1, false) != -1)
     if (SensorBase::fahrenheit())
-      return TQString::tqfromLatin1("°F");
+      return TQString::fromLatin1("°F");
     else
-      return TQString::tqfromLatin1("°C");
+      return TQString::fromLatin1("°C");
 
   if (name.findRev(TQRegExp("[^\\+]?[^\\-]?V$")) != -1)
     return i18n("Volt", "V");
diff --git a/ksim/monitors/lm_sensors/sensorsconfig.cpp b/ksim/monitors/lm_sensors/sensorsconfig.cpp
index 1f1cf10..7406016 100644
--- a/ksim/monitors/lm_sensors/sensorsconfig.cpp
+++ b/ksim/monitors/lm_sensors/sensorsconfig.cpp
@@ -31,7 +31,7 @@
 
 #include <tqtimer.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqcheckbox.h>
 #include <tqcursor.h>
 #include <tqpopupmenu.h>
@@ -86,7 +86,7 @@ SensorsConfig::SensorsConfig(KSim::PluginObject *parent, const char *name)
 
   m_updateLabel = new TQLabel(this);
   m_updateLabel->setText(i18n("Update interval:"));
-  m_updateLabel->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed,
+  m_updateLabel->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed,
      TQSizePolicy::Fixed));
   m_layout->addMultiCellWidget(m_updateLabel, 4, 4, 0, 0);
 
@@ -95,7 +95,7 @@ SensorsConfig::SensorsConfig(KSim::PluginObject *parent, const char *name)
 
   TQLabel *intervalLabel = new TQLabel(this);
   intervalLabel->setText(i18n("seconds"));
-  intervalLabel->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed,
+  intervalLabel->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed,
      TQSizePolicy::Fixed));
   m_layout->addMultiCellWidget(intervalLabel, 4, 4, 2, 2);
 }
diff --git a/ksim/monitors/mail/ksimmail.cpp b/ksim/monitors/mail/ksimmail.cpp
index f6cbe4a..4e03a5c 100644
--- a/ksim/monitors/mail/ksimmail.cpp
+++ b/ksim/monitors/mail/ksimmail.cpp
@@ -20,7 +20,7 @@
 // $Id$
 
 #include <tqbitmap.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqtimer.h>
 
 #include <kaboutapplication.h>
@@ -69,10 +69,10 @@ void MailPlugin::showAbout()
 MailView::MailView( KSim::PluginObject* parent, const char* name )
 	: KSim::PluginView( parent, name )
 {
-	TQVBoxLayout* tqlayout = new TQVBoxLayout( this );
+	TQVBoxLayout* layout = new TQVBoxLayout( this );
 
 	MailLabel* label = new MailLabel( this );
-	tqlayout->addWidget( label, 0, AlignHCenter );
+	layout->addWidget( label, 0, AlignHCenter );
 }
 
 MailView::~MailView()
@@ -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..f97871a 100644
--- a/ksim/monitors/net/ksimnet.cpp
+++ b/ksim/monitors/net/ksimnet.cpp
@@ -34,10 +34,10 @@ static int mib[] = { CTL_NET, PF_ROUTE, 0, 0, NET_RT_IFLIST, 0 };
 #endif
 
 #include <tqpushbutton.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqfile.h>
 #include <tqdatetime.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqtimer.h>
 #include <tqregexp.h>
 #include <tqcursor.h>
@@ -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..ccb276f 100644
--- a/ksim/monitors/net/netconfig.cpp
+++ b/ksim/monitors/net/netconfig.cpp
@@ -18,7 +18,7 @@
  */
 
 #include <tqpushbutton.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqcursor.h>
 
 #include <klistview.h>
@@ -56,29 +56,29 @@ NetConfig::NetConfig(KSim::PluginObject *parent, const char *name)
      TQT_SLOT(modifyItem(TQListViewItem *)));
   mainLayout->addWidget(usingBox);
 
-  tqlayout = new TQHBoxLayout;
-  tqlayout->setSpacing(6);
+  layout = new TQHBoxLayout;
+  layout->setSpacing(6);
 
   TQSpacerItem *spacer = new TQSpacerItem(20, 20,
      TQSizePolicy::Expanding, TQSizePolicy::Minimum);
-  tqlayout->addItem(spacer);
+  layout->addItem(spacer);
 
   insertButton = new TQPushButton(this);
   insertButton->setText(i18n("Add..."));
   connect(insertButton, TQT_SIGNAL(clicked()), TQT_SLOT(showNetDialog()));
-  tqlayout->addWidget(insertButton);
+  layout->addWidget(insertButton);
 
   modifyButton = new TQPushButton(this);
   modifyButton->setText(i18n("Modify..."));
   connect(modifyButton, TQT_SIGNAL(clicked()), TQT_SLOT(modifyCurrent()));
-  tqlayout->addWidget(modifyButton);
+  layout->addWidget(modifyButton);
 
   removeButton = new TQPushButton(this);
   removeButton->setText(i18n("Remove"));
   connect(removeButton, TQT_SIGNAL(clicked()), TQT_SLOT(removeCurrent()));
-  tqlayout->addWidget(removeButton);
+  layout->addWidget(removeButton);
 
-  mainLayout->addLayout(tqlayout);
+  mainLayout->addLayout(layout);
 }
 
 NetConfig::~NetConfig()
@@ -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/net/netconfig.h b/ksim/monitors/net/netconfig.h
index 4d6de56..c2b5387 100644
--- a/ksim/monitors/net/netconfig.h
+++ b/ksim/monitors/net/netconfig.h
@@ -54,7 +54,7 @@ class NetConfig : public KSim::PluginPage
     // Couldnt think of a better name for this :)
     const TQString &boolToString(bool) const;
 
-    TQHBoxLayout *tqlayout;
+    TQHBoxLayout *layout;
     TQPushButton *insertButton;
     TQPushButton *removeButton;
     TQPushButton *modifyButton;
diff --git a/ksim/monitors/net/netdialog.cpp b/ksim/monitors/net/netdialog.cpp
index c470a2c..d16f117 100644
--- a/ksim/monitors/net/netdialog.cpp
+++ b/ksim/monitors/net/netdialog.cpp
@@ -26,7 +26,7 @@
 #include <tqpushbutton.h>
 #include <tqtabwidget.h>
 #include <tqwidget.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqfile.h>
 #include <tqregexp.h>
 
@@ -65,7 +65,7 @@ NetDialog::NetDialog(TQWidget *parent, const char *name)
   m_generalLayout->addMultiCellWidget(m_deviceLabel, 0, 0, 0, 0);
 
   m_deviceCombo = new KComboBox(true, m_generalTab);
-  m_deviceCombo->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred,
+  m_deviceCombo->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred,
      TQSizePolicy::Fixed));
   m_deviceCombo->setFocus();
   m_deviceCombo->setDuplicatesEnabled(false);
@@ -86,10 +86,10 @@ NetDialog::NetDialog(TQWidget *parent, const char *name)
   m_timerBox = new TQGroupBox(m_generalTab);
   m_timerBox->setTitle(i18n("Timer"));
   m_timerBox->setColumnLayout(0, Qt::Vertical);
-  m_timerBox->tqlayout()->setSpacing(0);
-  m_timerBox->tqlayout()->setMargin(0);
-  m_timerBoxLayout = new TQVBoxLayout(m_timerBox->tqlayout());
-  m_timerBoxLayout->tqsetAlignment(TQt::AlignTop);
+  m_timerBox->layout()->setSpacing(0);
+  m_timerBox->layout()->setMargin(0);
+  m_timerBoxLayout = new TQVBoxLayout(m_timerBox->layout());
+  m_timerBoxLayout->setAlignment(TQt::AlignTop);
   m_timerBoxLayout->setSpacing(6);
   m_timerBoxLayout->setMargin(11);
 
diff --git a/ksim/monitors/snmp/browsedialogbase.ui b/ksim/monitors/snmp/browsedialogbase.ui
index b79fc80..3dfc236 100644
--- a/ksim/monitors/snmp/browsedialogbase.ui
+++ b/ksim/monitors/snmp/browsedialogbase.ui
@@ -24,7 +24,7 @@
         </property>
         <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>tqlayout2</cstring>
+                <cstring>layout2</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -121,7 +121,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -157,7 +157,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="2" column="0">
             <property name="name">
-                <cstring>tqlayout4</cstring>
+                <cstring>layout4</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -205,7 +205,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>71</width>
                             <height>20</height>
diff --git a/ksim/monitors/snmp/configpage.cpp b/ksim/monitors/snmp/configpage.cpp
index ee50054..797e5ce 100644
--- a/ksim/monitors/snmp/configpage.cpp
+++ b/ksim/monitors/snmp/configpage.cpp
@@ -24,7 +24,7 @@
 #include "hostdialog.h"
 #include "monitordialog.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqgroupbox.h>
 #include <tqpushbutton.h>
 
diff --git a/ksim/monitors/snmp/configwidget.ui b/ksim/monitors/snmp/configwidget.ui
index 608dc8f..69b94db 100644
--- a/ksim/monitors/snmp/configwidget.ui
+++ b/ksim/monitors/snmp/configwidget.ui
@@ -102,7 +102,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>141</width>
                             <height>20</height>
@@ -156,7 +156,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>121</width>
                             <height>20</height>
diff --git a/ksim/monitors/snmp/hostdialogbase.ui b/ksim/monitors/snmp/hostdialogbase.ui
index d3da054..f25aa12 100644
--- a/ksim/monitors/snmp/hostdialogbase.ui
+++ b/ksim/monitors/snmp/hostdialogbase.ui
@@ -78,7 +78,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>91</width>
                     <height>20</height>
@@ -132,7 +132,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>41</height>
@@ -149,7 +149,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>160</width>
                                         <height>20</height>
@@ -253,7 +253,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>71</width>
                                         <height>20</height>
@@ -309,7 +309,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>20</height>
@@ -359,7 +359,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>351</width>
                             <height>20</height>
@@ -384,7 +384,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="3" column="0" rowspan="1" colspan="5">
             <property name="name">
-                <cstring>tqlayout2</cstring>
+                <cstring>layout2</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -408,7 +408,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>220</width>
                             <height>20</height>
diff --git a/ksim/monitors/snmp/monitorconfig.cpp b/ksim/monitors/snmp/monitorconfig.cpp
index 1bcbb0b..6ab85b6 100644
--- a/ksim/monitors/snmp/monitorconfig.cpp
+++ b/ksim/monitors/snmp/monitorconfig.cpp
@@ -117,8 +117,8 @@ TQString KSim::Snmp::monitorDisplayTypeToString( MonitorConfig::DisplayType type
 {
     switch ( type )
     {
-        case MonitorConfig::Label: return TQString::tqfromLatin1( "Label" );
-        case MonitorConfig::Chart: return TQString::tqfromLatin1( "Chart" );
+        case MonitorConfig::Label: return TQString::fromLatin1( "Label" );
+        case MonitorConfig::Chart: return TQString::fromLatin1( "Chart" );
         default: assert( false );
     };
     return TQString();
diff --git a/ksim/monitors/snmp/monitordialogbase.ui b/ksim/monitors/snmp/monitordialogbase.ui
index 5f9fb53..bb7f7cc 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>
@@ -112,7 +112,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="3" column="1" rowspan="1" colspan="3">
             <property name="name">
-                <cstring>tqlayout2</cstring>
+                <cstring>layout2</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -163,7 +163,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>141</width>
                             <height>20</height>
@@ -174,7 +174,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="4" column="1" rowspan="1" colspan="3">
             <property name="name">
-                <cstring>tqlayout3</cstring>
+                <cstring>layout3</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -205,7 +205,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>271</width>
                             <height>20</height>
@@ -224,7 +224,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>244</width>
                     <height>20</height>
@@ -246,7 +246,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>210</width>
                     <height>20</height>
@@ -282,7 +282,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -335,7 +335,7 @@
                 <cstring>status</cstring>
             </property>
             <property name="text">
-                <string>blehtqStatus</string>
+                <string>blehStatus</string>
             </property>
         </widget>
         <widget class="TQGroupBox" row="6" column="0" rowspan="1" colspan="4">
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/proberesultdialogbase.ui b/ksim/monitors/snmp/proberesultdialogbase.ui
index c3df9bd..dcdbd2a 100644
--- a/ksim/monitors/snmp/proberesultdialogbase.ui
+++ b/ksim/monitors/snmp/proberesultdialogbase.ui
@@ -84,7 +84,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
diff --git a/ksim/monitors/snmp/session.cpp b/ksim/monitors/snmp/session.cpp
index 2f16adc..6d63fab 100644
--- a/ksim/monitors/snmp/session.cpp
+++ b/ksim/monitors/snmp/session.cpp
@@ -54,7 +54,7 @@ Session::Session( const HostConfig &source )
 
     d->source = source;
 
-    // tqunicode madness
+    // unicode madness
     d->host = source.name.ascii();
     d->community = source.community.ascii();
     d->securityName = source.securityName.ascii();
diff --git a/ksim/monitors/snmp/snmp.cpp b/ksim/monitors/snmp/snmp.cpp
index d79c596..ae04b67 100644
--- a/ksim/monitors/snmp/snmp.cpp
+++ b/ksim/monitors/snmp/snmp.cpp
@@ -57,7 +57,7 @@ static TQStringList allStrings( const EnumStringMapInfo *array )
 {
     TQStringList result;
     for ( uint i = 0; array[ i ].stringValue; ++i )
-        result << TQString::tqfromLatin1( array[ i ].stringValue );
+        result << TQString::fromLatin1( array[ i ].stringValue );
     return result;
 }
 
@@ -65,7 +65,7 @@ static TQString enumToString( const EnumStringMapInfo *array, int value )
 {
     for ( uint i = 0; array[ i ].stringValue; ++i )
         if ( array[ i ].enumValue == value )
-            return TQString::tqfromLatin1( array[ i ].stringValue );
+            return TQString::fromLatin1( array[ i ].stringValue );
 
     assert( false );
     return TQString();
@@ -76,7 +76,7 @@ static int stringToEnum( const EnumStringMapInfo *array, TQString string, bool *
     string = string.lower();
     uint i;
     for ( i = 0; array[ i ].stringValue; ++i )
-        if ( TQString::tqfromLatin1( array[ i ].stringValue ).lower() == string ) {
+        if ( TQString::fromLatin1( array[ i ].stringValue ).lower() == string ) {
             if ( ok ) *ok = true;
             return array[ i ].enumValue;
         }
@@ -291,9 +291,9 @@ int KSim::Snmp::sessionErrorCode( netsnmp_session &session )
 static TQString messageForErrorCode( int errorCode )
 {
     if ( errorCode >= SNMPERR_MAX && errorCode <= SNMPERR_GENERR )
-        return TQString::tqfromLatin1( SnmpLib::self()->snmp_api_errstring( errorCode ) );
+        return TQString::fromLatin1( SnmpLib::self()->snmp_api_errstring( errorCode ) );
     if ( errorCode >= SNMP_ERR_NOERROR && errorCode <= MAX_SNMP_ERR )
-        return TQString::tqfromLatin1( SnmpLib::self()->snmp_errstring( errorCode ) );
+        return TQString::fromLatin1( SnmpLib::self()->snmp_errstring( errorCode ) );
 
     return TQString();
 }
diff --git a/ksim/monitors/snmp/value.cpp b/ksim/monitors/snmp/value.cpp
index 2803aec..ad707b5 100644
--- a/ksim/monitors/snmp/value.cpp
+++ b/ksim/monitors/snmp/value.cpp
@@ -294,9 +294,9 @@ TQString Value::toString( int conversionFlags ) const
         case Value::TimeTicks: return formatTimeTicks( toTimeTicks(), conversionFlags );
         // not using i18n here, because it may be called from within a worker thread, and I'm
         // not sure it makes sense to translate it anyway
-        case Value::NoSuchObject: return TQString::tqfromLatin1( "No Such Object" );
-        case Value::NoSuchInstance: return TQString::tqfromLatin1( "No Such Instance" );
-        case Value::EndOfMIBView: return TQString::tqfromLatin1( "End Of MIB View" );
+        case Value::NoSuchObject: return TQString::fromLatin1( "No Such Object" );
+        case Value::NoSuchInstance: return TQString::fromLatin1( "No Such Instance" );
+        case Value::EndOfMIBView: return TQString::fromLatin1( "End Of MIB View" );
         case Value::Invalid:
         case Value::Null: return TQString();
     }
@@ -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";
diff --git a/ksim/monitors/snmp/view.cpp b/ksim/monitors/snmp/view.cpp
index 9515645..4b01203 100644
--- a/ksim/monitors/snmp/view.cpp
+++ b/ksim/monitors/snmp/view.cpp
@@ -23,7 +23,7 @@
 
 #include <label.h>
 
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <kconfig.h>
 
diff --git a/ksim/themeprefs.cpp b/ksim/themeprefs.cpp
index afabec5..d3964a5 100644
--- a/ksim/themeprefs.cpp
+++ b/ksim/themeprefs.cpp
@@ -21,7 +21,7 @@
 #include "themeprefs.moc"
 
 #include <tqdir.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqtooltip.h>
 #include <tqlabel.h>
 #include <tqregexp.h>
@@ -67,16 +67,16 @@ KSim::ThemePrefs::ThemePrefs(TQWidget *parent, const char *name)
   m_label = new TQLabel(this);
   m_label->setText(i18n("GKrellm theme support. To use"
      " gkrellm themes just untar the themes into the folder below"));
-  m_label->tqsetAlignment(TQLabel::WordBreak |
+  m_label->setAlignment(TQLabel::WordBreak |
      TQLabel::AlignVCenter | TQLabel::AlignLeft);
   m_themeLayout->addMultiCellWidget(m_label, 0, 0, 0, 4);
 
   TQString themeDir(locateLocal("data", "ksim"));
-  themeDir += TQString::tqfromLatin1("/themes");
+  themeDir += TQString::fromLatin1("/themes");
 
   m_urlLabel = new KURLLabel(this);
   m_urlLabel->setText(i18n("Open Konqueror in KSim's theme folder"));
-  m_urlLabel->setURL(TQString::tqfromLatin1("file://") + themeDir);
+  m_urlLabel->setURL(TQString::fromLatin1("file://") + themeDir);
   connect(m_urlLabel, TQT_SIGNAL(leftClickedURL(const TQString &)),
      this, TQT_SLOT(openURL(const TQString &)));
   m_themeLayout->addMultiCellWidget(m_urlLabel, 1, 1, 0, 4);
@@ -85,13 +85,13 @@ KSim::ThemePrefs::ThemePrefs(TQWidget *parent, const char *name)
   m_themeLayout->addMultiCellWidget(m_line, 2, 2, 0, 4);
 
   m_authorLabel = new TQLabel(this);
-  m_authorLabel->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed,
+  m_authorLabel->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed,
      TQSizePolicy::Minimum));
   m_authorLabel->setText(i18n("Author:"));
   m_themeLayout->addMultiCellWidget(m_authorLabel, 3, 3, 0, 0);
 
   m_authLabel = new KSqueezedTextLabel(this);
-  m_authLabel->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding,
+  m_authLabel->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding,
      TQSizePolicy::Minimum));
   m_authLabel->setText(i18n("None"));
   m_themeLayout->addMultiCellWidget(m_authLabel, 3, 3, 1, 4);
@@ -105,7 +105,7 @@ KSim::ThemePrefs::ThemePrefs(TQWidget *parent, const char *name)
 
   m_alternateLabel = new TQLabel(this);
   m_alternateLabel->setText(i18n("Alternate themes:"));
-  m_alternateLabel->tqsetAlignment(AlignVCenter | AlignRight);
+  m_alternateLabel->setAlignment(AlignVCenter | AlignRight);
   m_themeLayout->addMultiCellWidget(m_alternateLabel, 5, 5, 0, 1);
 
   m_altTheme = new KIntSpinBox(this);
@@ -113,8 +113,8 @@ KSim::ThemePrefs::ThemePrefs(TQWidget *parent, const char *name)
 
   m_fontLabel = new TQLabel(this);
   m_fontLabel->setText(i18n("Font:"));
-  m_fontLabel->tqsetAlignment(AlignVCenter | AlignRight);
-  m_fontLabel->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum,
+  m_fontLabel->setAlignment(AlignVCenter | AlignRight);
+  m_fontLabel->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum,
      TQSizePolicy::Fixed));
   m_themeLayout->addMultiCellWidget(m_fontLabel, 5, 5, 3, 3);
 
@@ -124,7 +124,7 @@ KSim::ThemePrefs::ThemePrefs(TQWidget *parent, const char *name)
   m_fontsCombo->insertItem(i18n("Large"));
   m_fontsCombo->insertItem(i18n("Custom"));
   m_fontsCombo->insertItem(i18n("Default"));
-  m_fontsCombo->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding,
+  m_fontsCombo->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding,
      TQSizePolicy::Fixed));
   connect(m_fontsCombo, TQT_SIGNAL(activated(int)),
      this, TQT_SLOT(showFontDialog(int)));