2 files changed, 12 insertions, 12 deletions

diff --git a/ksplashml/themeengine/default/themelegacy.cpp b/ksplashml/themeengine/default/themelegacy.cpp
index 0e1242120..99a3145f0 100644
--- a/ksplashml/themeengine/default/themelegacy.cpp
+++ b/ksplashml/themeengine/default/themelegacy.cpp
@@ -15,7 +15,7 @@
 #include <kgenericfactory.h>
 #include <tdeglobalsettings.h>
 #include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kprogress.h>
 
 #include <tqcheckbox.h>
@@ -71,7 +71,7 @@ ThemeDefault::ThemeDefault( TQWidget *parent, const char *name, const TQStringLi
   if( mIconsFlashing )
   {
     mFlashTimer = new TQTimer( this );
-    connect( mFlashTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(flash()) );
+    connect( mFlashTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(flash()) );
     mFlashPixmap1 = new TQPixmap();
     mFlashPixmap2 = new TQPixmap();
 
@@ -120,19 +120,19 @@ void ThemeDefault::_initUi()
   if (mActivePixmap->isNull())
   {
     mActivePixmap->resize(200,100);
-    mActivePixmap->fill(Qt::blue);
+    mActivePixmap->fill(TQt::blue);
   }
   if (mInactivePixmap->isNull())
   {
     mInactivePixmap->resize(200,100);
-    mInactivePixmap->fill(Qt::black);
+    mInactivePixmap->fill(TQt::black);
   }
 
   TQPixmap tlimage( _findPicture(TQString("splash_top.png")) );
   if (tlimage.isNull())
   {
     tlimage.resize(200,100);
-    tlimage.fill(Qt::blue);
+    tlimage.fill(TQt::blue);
   }
   TQLabel *top_label = new TQLabel( vbox );
   top_label->setPixmap( tlimage );
@@ -147,7 +147,7 @@ void ThemeDefault::_initUi()
   if (blimage.isNull())
   {
     blimage.resize(200,100);
-    blimage.fill(Qt::black);
+    blimage.fill(TQt::black);
   }
   TQLabel *bottom_label = new TQLabel( vbox );
   bottom_label->setPaletteBackgroundPixmap( blimage );
@@ -158,7 +158,7 @@ void ThemeDefault::_initUi()
       mLabel->setPaletteForegroundColor( mLabelForeground );
       mLabel->setPaletteBackgroundPixmap( blimage );
       TQFont f(mLabel->font());
-      f.setBold(TRUE);
+      f.setBold(true);
       mLabel->setFont(f);
 
       mProgressBar = new KProgress( mLabel );
@@ -191,7 +191,7 @@ void ThemeDefault::_initUi()
   setFixedHeight( mInactivePixmap->height() +
                   top_label->height() + bottom_label->height() );
 
-  const TQRect rect = kapp->desktop()->screenGeometry( mTheme->xineramaScreen() );
+  const TQRect rect = tdeApp->desktop()->screenGeometry( mTheme->xineramaScreen() );
   // TDEGlobalSettings::splashScreenDesktopGeometry(); cannot be used here.
   // kdDebug() << "ThemeDefault::_initUi" << rect << endl;
 
@@ -212,7 +212,7 @@ void ThemeDefault::_readSettings()
   cfg->setGroup( TQString("KSplash Theme: %1").arg(mTheme->theme()) );
 
   mIconsFlashing = cfg->readBoolEntry( "Icons Flashing", true );
-  TQColor df(Qt::white);
+  TQColor df(TQt::white);
   mLabelForeground = cfg->readColorEntry( "Label Foreground", &df );
   TQValueList<int> io_list=cfg->readIntListEntry("Icon Offsets");
   if (io_list.size() == MAX_ICONS)
diff --git a/ksplashml/themeengine/default/themelegacy.h b/ksplashml/themeengine/default/themelegacy.h
index 1f56d05b0..35aa414eb 100644
--- a/ksplashml/themeengine/default/themelegacy.h
+++ b/ksplashml/themeengine/default/themelegacy.h
@@ -29,7 +29,7 @@ class TQCheckBox;
 
 class DefaultConfig: public ThemeEngineConfig
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   DefaultConfig( TQWidget *, TDEConfig * );
   void save();
@@ -41,9 +41,9 @@ protected:
  * @short Traditional Trinity splash screen.
  */
 class ObjKsTheme;
-class KDE_EXPORT ThemeDefault : public ThemeEngine
+class TDE_EXPORT ThemeDefault : public ThemeEngine
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   ThemeDefault( TQWidget *, const char *, const TQStringList& );
    virtual ~ThemeDefault();