diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-20 00:17:06 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-20 00:17:06 -0600 |
| commit | e4e0479220e9e9616b68b2a11e42cff7a8af7b3d (patch) | |
| tree | 8e01571cdd132dad34ebec38b12c2dbc37d05bd9 /ksmserver/server.h | |
| parent | d41050ea3f6904e5156d35f664346b816b9e4d12 (diff) | |
| download | tdebase-e4e0479220e9e9616b68b2a11e42cff7a8af7b3d.tar.gz tdebase-e4e0479220e9e9616b68b2a11e42cff7a8af7b3d.zip | |
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'ksmserver/server.h')
| -rw-r--r-- | ksmserver/server.h | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/ksmserver/server.h b/ksmserver/server.h index ca73c3a86..79c1629bd 100644 --- a/ksmserver/server.h +++ b/ksmserver/server.h @@ -86,17 +86,17 @@ public: void restoreSession( TQString sessionName ); void startDefaultSession(); - void shutdown( KApplication::ShutdownConfirm confirm, - KApplication::ShutdownType sdtype, - KApplication::ShutdownMode sdmode ); + void shutdown( TDEApplication::ShutdownConfirm confirm, + TDEApplication::ShutdownType sdtype, + TDEApplication::ShutdownMode sdmode ); virtual void suspendStartup( TQCString app ); virtual void resumeStartup( TQCString app ); bool checkStatus( bool &logoutConfirmed, bool &maysd, - KApplication::ShutdownConfirm confirm, - KApplication::ShutdownType sdtype, - KApplication::ShutdownMode sdmode ); + TDEApplication::ShutdownConfirm confirm, + TDEApplication::ShutdownType sdtype, + TDEApplication::ShutdownMode sdmode ); public slots: void cleanUp(); @@ -150,9 +150,9 @@ private: bool defaultSession() const; // empty session void setupXIOErrorHandler(); - void shutdownInternal( KApplication::ShutdownConfirm confirm, - KApplication::ShutdownType sdtype, - KApplication::ShutdownMode sdmode, + void shutdownInternal( TDEApplication::ShutdownConfirm confirm, + TDEApplication::ShutdownType sdtype, + TDEApplication::ShutdownMode sdmode, TQString bootOption = TQString::null ); void performLegacySessionSave(); @@ -196,8 +196,8 @@ private: int saveType; TQMap< TQCString, int > startupSuspendCount; - KApplication::ShutdownType shutdownType; - KApplication::ShutdownMode shutdownMode; + TDEApplication::ShutdownType shutdownType; + TDEApplication::ShutdownMode shutdownMode; TQString bootOption; bool clean; @@ -216,9 +216,9 @@ private: bool waitAutoStart2; bool waitKcmInit2; TQTimer pendingShutdown; - KApplication::ShutdownConfirm pendingShutdown_confirm; - KApplication::ShutdownType pendingShutdown_sdtype; - KApplication::ShutdownMode pendingShutdown_sdmode; + TDEApplication::ShutdownConfirm pendingShutdown_confirm; + TDEApplication::ShutdownType pendingShutdown_sdtype; + TDEApplication::ShutdownMode pendingShutdown_sdmode; // ksplash interface void upAndRunning( const TQString& msg ); |