diff options
| author | Timothy Pearson <[email protected]> | 2013-01-20 00:17:06 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-20 00:17:06 -0600 |
| commit | e4e0479220e9e9616b68b2a11e42cff7a8af7b3d (patch) | |
| tree | 8e01571cdd132dad34ebec38b12c2dbc37d05bd9 /ksmserver/server.cpp | |
| 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.cpp')
| -rw-r--r-- | ksmserver/server.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ksmserver/server.cpp b/ksmserver/server.cpp index 2b6c406a0..cdf3f98c5 100644 --- a/ksmserver/server.cpp +++ b/ksmserver/server.cpp @@ -195,10 +195,10 @@ void KSMSaveYourselfRequestProc ( { if ( shutdown ) { the_server->shutdown( fast ? - KApplication::ShutdownConfirmNo : - KApplication::ShutdownConfirmDefault, - KApplication::ShutdownTypeDefault, - KApplication::ShutdownModeDefault ); + TDEApplication::ShutdownConfirmNo : + TDEApplication::ShutdownConfirmDefault, + TDEApplication::ShutdownTypeDefault, + TDEApplication::ShutdownModeDefault ); } else if ( !global ) { SmsSaveYourself( smsConn, saveType, false, interactStyle, fast ); SmsSaveComplete( smsConn ); @@ -586,7 +586,7 @@ KSMServer::KSMServer( const TQString& windowManager, const TQString& windowManag wm = windowManager; wmAddArgs = windowManagerAddArgs; - shutdownType = KApplication::ShutdownTypeNone; + shutdownType = TDEApplication::ShutdownTypeNone; state = Idle; dialogActive = false; @@ -609,7 +609,7 @@ KSMServer::KSMServer( const TQString& windowManager, const TQString& windowManag only_local = false; #endif - launcher = KApplication::launcher(); + launcher = TDEApplication::launcher(); char errormsg[256]; if (!SmsInitialize ( (char*) KSMVendorString, (char*) KSMReleaseString, |