5 files changed, 15 insertions, 15 deletions
diff --git a/ksplashml/themeengine/redmond/main.cpp b/ksplashml/themeengine/redmond/main.cpp
index 7b4a6bb2e..6e910064d 100644
--- a/ksplashml/themeengine/redmond/main.cpp
+++ b/ksplashml/themeengine/redmond/main.cpp
@@ -10,7 +10,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include <tqlabel.h>
 #include <tqpixmap.h>
diff --git a/ksplashml/themeengine/redmond/previewredmond.cpp b/ksplashml/themeengine/redmond/previewredmond.cpp
index 29bfa4b66..5f759686c 100644
--- a/ksplashml/themeengine/redmond/previewredmond.cpp
+++ b/ksplashml/themeengine/redmond/previewredmond.cpp
@@ -33,10 +33,10 @@ PreviewRedmond::PreviewRedmond( TQWidget* parent )
     m_userFont (TQFont( "Arial", 16 )),
     m_statusFont (TQFont( "Arial", 12, TQFont::Bold )),
 
-    m_welcomeColor (Qt::white),
-    m_welcomeShadowColor (Qt::darkGray),
-    m_userColor (Qt::darkGray),
-    m_statusColor (Qt::white),
+    m_welcomeColor (TQt::white),
+    m_welcomeShadowColor (TQt::darkGray),
+    m_userColor (TQt::darkGray),
+    m_statusColor (TQt::white),
 
     m_icon (DesktopIcon("kmenu")),
 
@@ -71,7 +71,7 @@ void PreviewRedmond::_updateCache()
   TQPainter p;
   p.begin( &m_cache );
 
-  p.fillRect( rect(), Qt::gray );
+  p.fillRect( rect(), TQt::gray );
 
   m_welcomeFont.setItalic( true );
   p.setFont( m_welcomeFont );
diff --git a/ksplashml/themeengine/redmond/previewredmond.h b/ksplashml/themeengine/redmond/previewredmond.h
index 5fc5558c2..fdaf6418e 100644
--- a/ksplashml/themeengine/redmond/previewredmond.h
+++ b/ksplashml/themeengine/redmond/previewredmond.h
@@ -27,7 +27,7 @@
  */
 class PreviewRedmond: public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
 
   PreviewRedmond( TQWidget* );
diff --git a/ksplashml/themeengine/redmond/themeredmond.cpp b/ksplashml/themeengine/redmond/themeredmond.cpp
index b0e81ba72..548e62769 100644
--- a/ksplashml/themeengine/redmond/themeredmond.cpp
+++ b/ksplashml/themeengine/redmond/themeredmond.cpp
@@ -22,7 +22,7 @@
 #include <tdeglobalsettings.h>
 #include <kiconloader.h>
 #include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kuser.h>
 #include <tdeemailsettings.h>
 
@@ -52,7 +52,7 @@ CfgRedmond::CfgRedmond( TQWidget *p, TDEConfig *c )
   TQFont defaultUsernameFont( "Arial", 16, TQFont::Bold );
   TQFont defaultActionFont( "Arial", 12, TQFont::Bold );
   TQColor defaultDarkColor( 3, 47, 156 );
-  TQColor defaultWhiteColor( Qt::white );
+  TQColor defaultWhiteColor( TQt::white );
 
   TQHBox *hbox = new TQHBox( vbox );
   hbox->setFrameStyle( TQFrame::WinPanel );
@@ -86,7 +86,7 @@ ThemeRedmond::ThemeRedmond( TQWidget *parent, const char *name, const TQStringLi
 
 void ThemeRedmond::_initUi()
 {
-  const TQRect screen = kapp->desktop()->screenGeometry( mTheme->xineramaScreen() );
+  const TQRect screen = tdeApp->desktop()->screenGeometry( mTheme->xineramaScreen() );
   //TQRect fullScreen = TDEGlobalSettings::desktopGeometry(0L);
 
   mImage.resize( screen.width(), screen.height() );
@@ -275,7 +275,7 @@ void ThemeRedmond::_initUi()
 
 void ThemeRedmond::paintEvent( TQPaintEvent *pe )
 {
-  const TQRect screen = kapp->desktop()->screenGeometry( mTheme->xineramaScreen() );
+  const TQRect screen = tdeApp->desktop()->screenGeometry( mTheme->xineramaScreen() );
 
   TQPainter p;
   p.begin( this );
@@ -308,7 +308,7 @@ void ThemeRedmond::paintEvent( TQPaintEvent *pe )
 
 void ThemeRedmond::_readSettings()
 {
-  const TQRect screen = kapp->desktop()->screenGeometry( mTheme->xineramaScreen() );
+  const TQRect screen = tdeApp->desktop()->screenGeometry( mTheme->xineramaScreen() );
   //TQRect fullScreen = TDEGlobalSettings::desktopGeometry(0L);
 
   if( !mTheme )
@@ -356,7 +356,7 @@ void ThemeRedmond::_readSettings()
   mActionFont        = cfg->readFontEntry( "Action Font", &defaultActionFont );
 
   TQColor defaultDarkColor( 3, 47, 156 );
-  TQColor defaultWhiteColor( Qt::white );
+  TQColor defaultWhiteColor( TQt::white );
 
   mWelcomeTextColor       = cfg->readColorEntry( "Welcome Text Color", &defaultWhiteColor );
   mWelcomeTextShadowColor = cfg->readColorEntry( "Welcome Shadow Color", &defaultDarkColor );
diff --git a/ksplashml/themeengine/redmond/themeredmond.h b/ksplashml/themeengine/redmond/themeredmond.h
index d68e004da..1fbb7c57a 100644
--- a/ksplashml/themeengine/redmond/themeredmond.h
+++ b/ksplashml/themeengine/redmond/themeredmond.h
@@ -23,7 +23,7 @@ class TQCheckBox;
 
 class CfgRedmond: public ThemeEngineConfig
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   CfgRedmond( TQWidget *, TDEConfig * );
 
@@ -39,7 +39,7 @@ protected:
 class ObjKsTheme;
 class ThemeRedmond: public ThemeEngine
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   ThemeRedmond( TQWidget *, const char *, const TQStringList& );