7 files changed, 15 insertions, 15 deletions
diff --git a/ksim/library/label.cpp b/ksim/library/label.cpp
index 1f32724..37b86b3 100644
--- a/ksim/library/label.cpp
+++ b/ksim/library/label.cpp
@@ -91,7 +91,7 @@ void KSim::Label::configureObject(bool repaintWidget)
   TQSize oldSize = tqsizeHint();
 
   setConfigValues();
-  retqlayoutLabel(oldSize, repaintWidget);
+  relayoutLabel(oldSize, repaintWidget);
 }
 
 void KSim::Label::setPixmap(const TQPixmap &pixmap)
@@ -102,7 +102,7 @@ void KSim::Label::setPixmap(const TQPixmap &pixmap)
   TQSize oldSize = tqsizeHint();
   d->sidePixmap = pixmap;
 
-  retqlayoutLabel(oldSize);
+  relayoutLabel(oldSize);
 }
 
 const TQPixmap &KSim::Label::pixmap() const
@@ -141,7 +141,7 @@ void KSim::Label::setText(const TQString &text)
   TQSize oldSize = tqsizeHint();
   // set the text of our widget and tqrepaint
   d->text = text;
-  retqlayoutLabel(oldSize);
+  relayoutLabel(oldSize);
 }
 
 void KSim::Label::extraTypeCall()
@@ -273,10 +273,10 @@ void KSim::Label::setThemePixmap(const TQString &image)
   d->meterImage.load(image);
   KSim::ThemeLoader::self().reColourImage(d->meterImage);
   d->background = d->meterImage.smoothScale(size());
-  retqlayoutLabel(oldSize);
+  relayoutLabel(oldSize);
 }
 
-void KSim::Label::retqlayoutLabel(const TQSize &old, bool tqrepaint)
+void KSim::Label::relayoutLabel(const TQSize &old, bool tqrepaint)
 {
   if (tqsizeHint() != old) {
     updateGeometry();
diff --git a/ksim/library/label.h b/ksim/library/label.h
index 484b36b..a888d89 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 retqlayoutLabel(const TQSize &old, bool tqrepaint = true);
+      void relayoutLabel(const TQSize &old, bool tqrepaint = true);
 
     private:
       /**
diff --git a/ksim/library/led.cpp b/ksim/library/led.cpp
index 6977304..f2acc2b 100644
--- a/ksim/library/led.cpp
+++ b/ksim/library/led.cpp
@@ -228,7 +228,7 @@ void KSim::LedLabel::configureObject(bool reapaintWidget)
   d->sendLed.update();
 
   setConfigValues();
-  tqlayoutLeds();
+  layoutLeds();
 
   if (reapaintWidget)
     update();
@@ -313,10 +313,10 @@ void KSim::LedLabel::paintEvent(TQPaintEvent *ev)
 void KSim::LedLabel::resizeEvent(TQResizeEvent *ev)
 {
   KSim::Progress::resizeEvent(ev);
-  tqlayoutLeds();
+  layoutLeds();
 }
 
-void KSim::LedLabel::tqlayoutLeds()
+void KSim::LedLabel::layoutLeds()
 {
   int ledHeight = height() / 2;
 
diff --git a/ksim/library/led.h b/ksim/library/led.h
index 1d0cb4f..8ed0a14 100644
--- a/ksim/library/led.h
+++ b/ksim/library/led.h
@@ -184,7 +184,7 @@ namespace KSim
       virtual void resizeEvent(TQResizeEvent *);
 
     private:
-      void tqlayoutLeds();
+      void layoutLeds();
       void init();
 
       class Private;
diff --git a/ksim/library/pluginmodule.cpp b/ksim/library/pluginmodule.cpp
index 7dff303..cfc57de 100644
--- a/ksim/library/pluginmodule.cpp
+++ b/ksim/library/pluginmodule.cpp
@@ -163,12 +163,12 @@ void KSim::PluginView::mousePressEvent(TQMouseEvent *ev)
     doCommand();
 }
 
-KSim::PluginObject *KSim::PluginView::tqparentPlugin() const
+KSim::PluginObject *KSim::PluginView::parentPlugin() const
 {
   return d->tqparent;
 }
 
 void KSim::PluginView::showAbout()
 {
-  tqparentPlugin()->showAbout();
+  parentPlugin()->showAbout();
 }
diff --git a/ksim/library/pluginmodule.h b/ksim/library/pluginmodule.h
index 39baef4..91285f4 100644
--- a/ksim/library/pluginmodule.h
+++ b/ksim/library/pluginmodule.h
@@ -145,7 +145,7 @@ namespace KSim
       void pageChanged();
 
     protected:
-      PluginObject *tqparentPlugin() const;
+      PluginObject *parentPlugin() const;
 
     private:
       class Private;
@@ -194,7 +194,7 @@ namespace KSim
 
     protected:
       virtual void mousePressEvent(TQMouseEvent *);
-      PluginObject *tqparentPlugin() const;
+      PluginObject *parentPlugin() const;
 
     private slots:
       void showAbout();
diff --git a/ksim/library/progress.cpp b/ksim/library/progress.cpp
index 32311e4..bbdbd61 100644
--- a/ksim/library/progress.cpp
+++ b/ksim/library/progress.cpp
@@ -188,7 +188,7 @@ void KSim::Progress::setMeterPixmap(const TQPixmap &pixmap)
 {
   TQSize oldSize = tqsizeHint();
   d->meterPixmap = pixmap;
-  retqlayoutLabel(oldSize);
+  relayoutLabel(oldSize);
 }
 
 int KSim::Progress::xLocation() const