diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:49:56 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:49:56 -0600 |
commit | e6aaa3624cc6179b82a9bfff1760e742a669064c (patch) | |
tree | 3fed4deb0540d34f85dfb53b02bea7519e66cc6f /cervisia/cvsservice/cvsjob.cpp | |
parent | 4071ae43ea213cd0f7d5c344c939ebd97d097051 (diff) | |
download | tdesdk-e6aaa3624cc6179b82a9bfff1760e742a669064c.tar.gz tdesdk-e6aaa3624cc6179b82a9bfff1760e742a669064c.zip |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'cervisia/cvsservice/cvsjob.cpp')
-rw-r--r-- | cervisia/cvsservice/cvsjob.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/cervisia/cvsservice/cvsjob.cpp b/cervisia/cvsservice/cvsjob.cpp index 3f4f06fe..24f42f48 100644 --- a/cervisia/cvsservice/cvsjob.cpp +++ b/cervisia/cvsservice/cvsjob.cpp @@ -31,12 +31,12 @@ struct CvsJob::Private { Private() : isRunning(false) { - childproc = new KProcess; + childproc = new TDEProcess; childproc->setUseShell(true, "/bin/sh"); } ~Private() { delete childproc; } - KProcess* childproc; + TDEProcess* childproc; TQString server; TQString rsh; TQString directory; @@ -176,17 +176,17 @@ bool CvsJob::execute() if( !d->directory.isEmpty() ) d->childproc->setWorkingDirectory(d->directory); - connect(d->childproc, TQT_SIGNAL(processExited(KProcess*)), + connect(d->childproc, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(slotProcessExited())); - connect(d->childproc, TQT_SIGNAL(receivedStdout(KProcess*, char*, int)), - TQT_SLOT(slotReceivedStdout(KProcess*, char*, int))); - connect(d->childproc, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)), - TQT_SLOT(slotReceivedStderr(KProcess*, char*, int)) ); + connect(d->childproc, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), + TQT_SLOT(slotReceivedStdout(TDEProcess*, char*, int))); + connect(d->childproc, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), + TQT_SLOT(slotReceivedStderr(TDEProcess*, char*, int)) ); kdDebug(8051) << "Execute cvs command: " << cvsCommand() << endl; d->isRunning = true; - return d->childproc->start(KProcess::NotifyOnExit, KProcess::AllOutput); + return d->childproc->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput); } @@ -208,7 +208,7 @@ void CvsJob::slotProcessExited() } -void CvsJob::slotReceivedStdout(KProcess* proc, char* buffer, int buflen) +void CvsJob::slotReceivedStdout(TDEProcess* proc, char* buffer, int buflen) { Q_UNUSED(proc); @@ -221,7 +221,7 @@ void CvsJob::slotReceivedStdout(KProcess* proc, char* buffer, int buflen) } -void CvsJob::slotReceivedStderr(KProcess* proc, char* buffer, int buflen) +void CvsJob::slotReceivedStderr(TDEProcess* proc, char* buffer, int buflen) { Q_UNUSED(proc); |