diff options
Diffstat (limited to 'ksmserver/startup.cpp')
| -rw-r--r-- | ksmserver/startup.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/ksmserver/startup.cpp b/ksmserver/startup.cpp index fb9e696ec..8e02643eb 100644 --- a/ksmserver/startup.cpp +++ b/ksmserver/startup.cpp @@ -68,12 +68,12 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tdelocale.h> #include <tdeglobal.h> #include <tdeconfig.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <unistd.h> #include <tdeapplication.h> #include <kstaticdeleter.h> #include <tdetempfile.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <dcopclient.h> #include <dcopref.h> #include <twinmodule.h> @@ -87,8 +87,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <kdebug.h> // shall we show a nice fancy login screen? -bool showFancyLogin = FALSE; -bool trinity_startup_main_sequence_done = FALSE; +bool showFancyLogin = false; +bool trinity_startup_main_sequence_done = false; /*! Restores the previous session. Ensures the window manager is running (if specified). @@ -145,7 +145,7 @@ void KSMServer::restoreSession( TQString sessionName ) if ((showFancyLogin) && (!startupNotifierIPDlg)) { startupNotifierIPDlg = KSMStartupIPDlg::showStartupIP(); } - TQTimer::singleShot( 4000, this, TQT_SLOT( autoStart0() ) ); + TQTimer::singleShot( 4000, this, TQ_SLOT( autoStart0() ) ); } else { if ((showFancyLogin) && (!startupNotifierIPDlg)) { startupNotifierIPDlg = KSMStartupIPDlg::showStartupIP(); @@ -192,7 +192,7 @@ void KSMServer::startDefaultSession() if ((showFancyLogin) && (!startupNotifierIPDlg)) { startupNotifierIPDlg = KSMStartupIPDlg::showStartupIP(); } - TQTimer::singleShot( 4000, this, TQT_SLOT( autoStart0() ) ); + TQTimer::singleShot( 4000, this, TQ_SLOT( autoStart0() ) ); } @@ -226,7 +226,7 @@ void KSMServer::autoStart0Done() connectDCOPSignal( "kcminit", "kcminit", "phase1Done()", "kcmPhase1Done()", true); state = KcmInitPhase1; - TQTimer::singleShot( 10000, this, TQT_SLOT( kcmPhase1Timeout())); // protection + TQTimer::singleShot( 10000, this, TQ_SLOT( kcmPhase1Timeout())); // protection DCOPRef( "kcminit", "kcminit" ).send( "runPhase1" ); } @@ -307,7 +307,7 @@ void KSMServer::tryRestoreNext() config->readEntry( TQString("userId")+n )); lastIdStarted = config->readEntry( TQString("clientId")+n ); if ( !lastIdStarted.isEmpty() ) { - restoreTimer.start( 2000, TRUE ); + restoreTimer.start( 2000, true ); return; // we get called again from the clientRegistered handler } } @@ -333,7 +333,7 @@ void KSMServer::autoStart2() DCOPRef( "kdesktop", "KDesktopIface" ).send( "runAutoStart" ); connectDCOPSignal( "kcminit", "kcminit", "phase2Done()", "kcmPhase2Done()", true); - TQTimer::singleShot( 10000, this, TQT_SLOT( kcmPhase2Timeout())); // protection + TQTimer::singleShot( 10000, this, TQ_SLOT( kcmPhase2Timeout())); // protection DCOPRef( "kcminit", "kcminit" ).send( "runPhase2" ); if( !defaultSession()) restoreLegacySession( TDEGlobal::config()); @@ -462,7 +462,7 @@ void KSMServer::upAndRunning( const TQString& msg ) if (startupNotifierIPDlg) { static_cast<KSMStartupIPDlg*>(startupNotifierIPDlg)->setStartupPhase(msg); if (msg == TQString("session ready")) { - trinity_startup_main_sequence_done = TRUE; + trinity_startup_main_sequence_done = true; } } DCOPRef( "ksplash" ).send( "upAndRunning", msg ); |