diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:43:14 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:43:14 -0600 |
| commit | 79b21d47bce1ee428affc97534cd8b257232a871 (patch) | |
| tree | 0df1fa0109d9f2bcef932eda8b5c25b2e06669ed /twin/client.cpp | |
| parent | 9a898d493f493adbc404f7223043c85f3817472b (diff) | |
| download | tdebase-79b21d47bce1ee428affc97534cd8b257232a871.tar.gz tdebase-79b21d47bce1ee428affc97534cd8b257232a871.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'twin/client.cpp')
| -rw-r--r-- | twin/client.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/twin/client.cpp b/twin/client.cpp index f421560a4..4f5d618eb 100644 --- a/twin/client.cpp +++ b/twin/client.cpp @@ -1819,25 +1819,25 @@ void Client::killProcess( bool ask, Time timestamp ) { if( machine != "localhost" ) { - KProcess proc; + TDEProcess proc; proc << "xon" << machine << "kill" << pid; - proc.start( KProcess::DontCare ); + proc.start( TDEProcess::DontCare ); } else ::kill( pid, SIGTERM ); } else { // SELI TODO handle the window created by handler specially (on top,urgent?) - process_killer = new KProcess( this ); + process_killer = new TDEProcess( this ); *process_killer << KStandardDirs::findExe( "twin_killer_helper" ) << "--pid" << TQCString().setNum( pid ) << "--hostname" << machine << "--windowname" << caption().utf8() << "--applicationname" << resourceClass() << "--wid" << TQCString().setNum( window()) << "--timestamp" << TQCString().setNum( timestamp ); - connect( process_killer, TQT_SIGNAL( processExited( KProcess* )), + connect( process_killer, TQT_SIGNAL( processExited( TDEProcess* )), TQT_SLOT( processKillerExited())); - if( !process_killer->start( KProcess::NotifyOnExit )) + if( !process_killer->start( TDEProcess::NotifyOnExit )) { delete process_killer; process_killer = NULL; @@ -1957,15 +1957,15 @@ bool Client::queryUserSuspendedResume() return false; } // FIXME We should display a busy cursor until twin_resumer_helper loads - process_resumer = new KProcess( this ); + process_resumer = new TDEProcess( this ); *process_resumer << KStandardDirs::findExe( "twin_resumer_helper" ) << "--pid" << TQCString().setNum( info->pid() ) << "--hostname" << wmClientMachine( true ) << "--windowname" << caption().utf8() << "--applicationname" << resourceClass() << "--wid" << TQCString().setNum( window()); - connect( process_resumer, TQT_SIGNAL( processExited( KProcess* )), + connect( process_resumer, TQT_SIGNAL( processExited( TDEProcess* )), TQT_SLOT( processResumerExited())); - if( !process_resumer->start( KProcess::NotifyOnExit )) + if( !process_resumer->start( TDEProcess::NotifyOnExit )) { delete process_resumer; process_resumer = NULL; |