diff --git a/src/magiclabel.cpp b/src/magiclabel.cpp
index 57d50c7..5b30252 100644
--- a/src/magiclabel.cpp
+++ b/src/magiclabel.cpp
@@ -73,13 +73,13 @@ void MagicLabel::getCommandOutput()
   mValue = "";
 
   if (!proc->start(KProcess::Block, KProcess::Stdout))
-    KMessageBox::information(0, TQString("Could not start process: %1").arg(cmd));
+    KMessageBox::information(0, TQString("Could not start process: %1").tqarg(cmd));
 }
 
 
 void MagicLabel::receivedStdout(KProcess *proc, char *buffer, int buflen)
 {
-  TQString buf = TQString::fromLatin1(buffer, buflen);
+  TQString buf = TQString::tqfromLatin1(buffer, buflen);
   mValue += buf.replace("\n", "");
 }
 
diff --git a/src/thememoodin.cpp b/src/thememoodin.cpp
index 976b3b1..9c8f7ec 100644
--- a/src/thememoodin.cpp
+++ b/src/thememoodin.cpp
@@ -26,7 +26,7 @@
 #include <tqpainter.h>
 #include <tqstringlist.h>
 #include <tqwidget.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 #include "magiclabel.h"
 #include "thememoodin.h"
@@ -54,7 +54,7 @@ void ThemeMoodin::readSettings()
   if (!cfg)
     return;
 
-  cfg->setGroup(TQString("KSplash Theme: %1").arg(mTheme->theme()));
+  cfg->setGroup(TQString("KSplash Theme: %1").tqarg(mTheme->theme()));
 
   TQFont defaultFont("Trebuchet MS", 10);
   TQFont defaultStatusFont("Trebuchet MS", 12, TQFont::Bold);
@@ -106,26 +106,26 @@ void ThemeMoodin::readSettings()
     if (mUseIconSet)
       defaultIcon = statusPixmaps()[i];
     else
-      defaultIcon = TQString("%1.png").arg(i + 1);
+      defaultIcon = TQString("%1.png").tqarg(i + 1);
 
-    mStatusIcons.append(cfg->readEntry(TQString("Image%1").arg(i + 1), defaultIcon));
+    mStatusIcons.append(cfg->readEntry(TQString("Image%1").tqarg(i + 1), defaultIcon));
     if (mKubuntuStyle) {
       TQPoint *mypoint;
       mypoint = new TQPoint((int)(iconX + (i * (mIconSetSize+mImageSpacer) * scaleRatioWidth)), iconY);
       mStatusIconCoords.append( *mypoint );
     } else {
-      mStatusIconCoords.append(cfg->readPointEntry(TQString("ImageCoords%1").arg(i + 1), &defaultPoint));
+      mStatusIconCoords.append(cfg->readPointEntry(TQString("ImageCoords%1").tqarg(i + 1), &defaultPoint));
     }
-    mStatusImageOffsets.append(cfg->readPointEntry(TQString("ImageOffset%1").arg(i + 1), &defaultOffset));
-    mStatusMessages.append(cfg->readEntry(TQString("StatusMessage%1").arg(i + 1), TQString()));
+    mStatusImageOffsets.append(cfg->readPointEntry(TQString("ImageOffset%1").tqarg(i + 1), &defaultOffset));
+    mStatusMessages.append(cfg->readEntry(TQString("StatusMessage%1").tqarg(i + 1), TQString()));
   }
 
   for (int i = 0; i < mLabelCount; i++)
   {
-    mLabels.append(cfg->readEntry(TQString("Label%1").arg(i + 1), TQString()));
-    mLabelCoords.append(cfg->readPointEntry(TQString("LabelCoords%1").arg(i + 1), &defaultPoint));
-    mLabelFonts.append(cfg->readFontEntry(TQString("LabelFont%1").arg(i + 1), &defaultFont));
-    mLabelColors.append(cfg->readColorEntry(TQString("LabelColor%1").arg(i + 1), &defaultColor));
+    mLabels.append(cfg->readEntry(TQString("Label%1").tqarg(i + 1), TQString()));
+    mLabelCoords.append(cfg->readPointEntry(TQString("LabelCoords%1").tqarg(i + 1), &defaultPoint));
+    mLabelFonts.append(cfg->readFontEntry(TQString("LabelFont%1").tqarg(i + 1), &defaultFont));
+    mLabelColors.append(cfg->readColorEntry(TQString("LabelColor%1").tqarg(i + 1), &defaultColor));
   }
 }
 
@@ -168,7 +168,7 @@ void ThemeMoodin::initBackground(TQPainter* p)
     kdesktoprc.setGroup("Background Common");
     int num = kdesktoprc.readNumEntry("DeskNum", 0);
 
-    kdesktoprc.setGroup(TQString("Desktop%1").arg(num));
+    kdesktoprc.setGroup(TQString("Desktop%1").tqarg(num));
     bgImage = kdesktoprc.readPathEntry("Wallpaper", TQString());
   }
   else
@@ -178,7 +178,7 @@ void ThemeMoodin::initBackground(TQPainter* p)
   }
 
   if (bgImage.isEmpty())
-    bgImage = mTheme->locateThemeData(TQString("Background-%1x%2.jpg").arg(width()).arg(height()));
+    bgImage = mTheme->locateThemeData(TQString("Background-%1x%2.jpg").tqarg(width()).tqarg(height()));
 
   if (bgImage.isEmpty())
     bgImage = mTheme->locateThemeData("Background.jpg");
@@ -376,11 +376,11 @@ void ThemeMoodin::slotSetPixmap(const TQString& s)
   if (fw)
     fw->start();
 
-  repaint(false);
+  tqrepaint(false);
 }
 
 
-void ThemeMoodin::updateStatus()
+void ThemeMoodin::updatetqStatus()
 {
   TQPainter p;
   p.begin(mContainer);
@@ -413,7 +413,7 @@ void ThemeMoodin::paintEvent(TQPaintEvent* pe)
   bitBlt(mContainer, r.x(), r.y(), mBG, r.x(), r.y(), r.width(), r.height());
 
   if (mShowStatusText)
-    updateStatus();
+    updatetqStatus();
 }
 
 #include "thememoodin.moc"
diff --git a/src/thememoodin.h b/src/thememoodin.h
index cf7f285..d607edf 100644
--- a/src/thememoodin.h
+++ b/src/thememoodin.h
@@ -122,7 +122,7 @@ private:
   void paintEvent(TQPaintEvent* pe);
   void readSettings();
   void arrangeWidget(TQWidget* me, const int index);
-  void updateStatus();
+  void updatetqStatus();
 
   EffectWidget* createEffectWidget(TQWidget *parent, TQImage *image);
 };