1 files changed, 27 insertions, 30 deletions

diff --git a/ksplashml/wndmain.cpp b/ksplashml/wndmain.cpp
index c37c6e214..eb0a1472a 100644
--- a/ksplashml/wndmain.cpp
+++ b/ksplashml/wndmain.cpp
@@ -19,7 +19,7 @@
 #include <klibloader.h>
 #include <tdelocale.h>
 #include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <ktrader.h>
 #include <twin.h>
 #include <dcopclient.h>
@@ -46,7 +46,7 @@ KSplash::KSplash(const char *name)
   mSessMgrCalled = false;
   mTimeToGo = false;
 
-  TDEConfig * config = kapp->config();
+  TDEConfig * config = tdeApp->config();
   slotReadProperties(config);
 
   prepareSplashScreen();
@@ -55,27 +55,27 @@ KSplash::KSplash(const char *name)
   mCurrentAction = mActionList.first();
 
   config->setGroup( "General" );
-  if ( config->readBoolEntry( "CloseOnClick", TRUE ) )
+  if ( config->readBoolEntry( "CloseOnClick", true ) )
     mThemeEngine->installEventFilter( this );
 
-  connect( mThemeEngine, TQT_SIGNAL(destroyed()), this, TQT_SLOT(close()) );
-  connect( this, TQT_SIGNAL(stepsChanged(int)), TQT_SLOT(slotUpdateSteps(int)) );
-  connect( this, TQT_SIGNAL(progressChanged(int)), TQT_SLOT(slotUpdateProgress(int)) );
+  connect( mThemeEngine, TQ_SIGNAL(destroyed()), this, TQ_SLOT(close()) );
+  connect( this, TQ_SIGNAL(stepsChanged(int)), TQ_SLOT(slotUpdateSteps(int)) );
+  connect( this, TQ_SIGNAL(progressChanged(int)), TQ_SLOT(slotUpdateProgress(int)) );
 
   if( mKsTheme->testing() )
   {
     slotUpdateSteps(7);
-    TQTimer::singleShot( 1000, this, TQT_SLOT(slotExec()));
+    TQTimer::singleShot( 1000, this, TQ_SLOT(slotExec()));
   }
   else
-    TQTimer::singleShot( 100, this, TQT_SLOT(initDcop()));
+    TQTimer::singleShot( 100, this, TQ_SLOT(initDcop()));
 
   // Make sure we don't stay up forever.
   if (!mKsTheme->managedMode())
   {
     close_timer = new TQTimer( this );
-    connect( close_timer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( close() ) );
-    close_timer->start( 60000, TRUE );
+    connect( close_timer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( close() ) );
+    close_timer->start( 60000, true );
   }
 }
 
@@ -133,14 +133,14 @@ void KSplash::slotInsertAction( const TQString& pix, const TQString& msg )
 
 void KSplash::slotExec()
 {
-  TQTimer::singleShot( 200, this, TQT_SLOT(nextIcon()));
+  TQTimer::singleShot( 200, this, TQ_SLOT(nextIcon()));
 }
 
 void KSplash::nextIcon()
 {
   if( !mCurrentAction || mTimeToGo )
   {
-    TQTimer::singleShot( 1000, this, TQT_SLOT(close()));
+    TQTimer::singleShot( 1000, this, TQ_SLOT(close()));
     return;
   }
 
@@ -155,26 +155,26 @@ void KSplash::nextIcon()
   }
 
   if( mKsTheme->testing() )
-    TQTimer::singleShot( 1000, this, TQT_SLOT(nextIcon()));
+    TQTimer::singleShot( 1000, this, TQ_SLOT(nextIcon()));
 }
 
 void KSplash::initDcop()
 {
-  disconnect( kapp->dcopClient(), TQT_SIGNAL( attachFailed(const TQString&) ), kapp, TQT_SLOT( dcopFailure(const TQString&) ) );
+  disconnect( tdeApp->dcopClient(), TQ_SIGNAL( attachFailed(const TQString&) ), tdeApp, TQ_SLOT( dcopFailure(const TQString&) ) );
 
-  if ( kapp->dcopClient()->isAttached() )
+  if ( tdeApp->dcopClient()->isAttached() )
     return;
 
-  if ( kapp->dcopClient()->attach() )
+  if ( tdeApp->dcopClient()->attach() )
   {
     if(!mKsTheme->managedMode())
       upAndRunning( "dcop" );
-    kapp->dcopClient()->registerAs( "ksplash", false );
-    kapp->dcopClient()->setDefaultObject( objId() );
+    tdeApp->dcopClient()->registerAs( "ksplash", false );
+    tdeApp->dcopClient()->setDefaultObject( objId() );
   }
   else
   {
-    TQTimer::singleShot( 100, this, TQT_SLOT(initDcop()) );
+    TQTimer::singleShot( 100, this, TQ_SLOT(initDcop()) );
   }
 }
 
@@ -206,7 +206,7 @@ void KSplash::upAndRunning( TQString s )
     firstTime = false;
   }
   if ( close_timer->isActive() )
-    close_timer->start( 60000, TRUE );
+    close_timer->start( 60000, true );
 
   if( s == "dcop" )
   {
@@ -247,7 +247,7 @@ void KSplash::upAndRunning( TQString s )
     //if(!mSessMgrCalled) emit nextIcon();
     mTimeToGo = true;
     close_timer->stop();
-    TQTimer::singleShot( 1000, this, TQT_SLOT(close()));
+    TQTimer::singleShot( 1000, this, TQ_SLOT(close()));
   }
   else
   {
@@ -307,15 +307,12 @@ void KSplash::setStartupItemCount( int count )
 void KSplash::startupComplete()
 {
   mTimeToGo = true;
-  TQTimer::singleShot( 1000, this, TQT_SLOT(close()));
+  TQTimer::singleShot( 1000, this, TQ_SLOT(close()));
 }
 
 void KSplash::close()
 {
   TQWidget::close();
-#ifdef USE_QT4
-  exit(0);
-#endif // USE_QT4
 }
 
 void KSplash::hide()
@@ -386,7 +383,7 @@ ThemeEngine *KSplash::_loadThemeEngine( const TQString& pluginName, const TQStri
   {
     TQStringList themeTitle;
     themeTitle << theme;
-    return static_cast<ThemeEngine *>(TQT_TQWIDGET(factory->create(TQT_TQOBJECT(this), "theme", objName.latin1(), themeTitle)));
+    return static_cast<ThemeEngine *>(factory->create(this, "theme", objName.latin1(), themeTitle));
   }
   else
     return 0L;
@@ -427,11 +424,11 @@ TQPtrList<Action> KSplash::actionList()
 
 bool KSplash::eventFilter( TQObject *o, TQEvent *e )
 {
-  if ( ( e->type() == TQEvent::MouseButtonRelease ) && ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(mThemeEngine) ) )
+  if ( ( e->type() == TQEvent::MouseButtonRelease ) && ( o == mThemeEngine ) )
   {
-    TQTimer::singleShot( 0, this, TQT_SLOT(close()));
-    return TRUE;
+    TQTimer::singleShot( 0, this, TQ_SLOT(close()));
+    return true;
   }
   else
-    return FALSE;
+    return false;
 }