diff options
author | Timothy Pearson <[email protected]> | 2013-01-24 13:49:56 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-01-24 13:49:56 -0600 |
commit | e6aaa3624cc6179b82a9bfff1760e742a669064c (patch) | |
tree | 3fed4deb0540d34f85dfb53b02bea7519e66cc6f /cervisia/diffdlg.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/diffdlg.cpp')
-rw-r--r-- | cervisia/diffdlg.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cervisia/diffdlg.cpp b/cervisia/diffdlg.cpp index 720d3706..993f4f6c 100644 --- a/cervisia/diffdlg.cpp +++ b/cervisia/diffdlg.cpp @@ -374,9 +374,9 @@ void DiffDialog::callExternalDiff(const TQString& extdiff, CvsService_stub* serv if( !service->ok() ) return; - extcmdline += KProcess::quote(revAFilename); + extcmdline += TDEProcess::quote(revAFilename); extcmdline += " "; - extcmdline += KProcess::quote(revBFilename); + extcmdline += TDEProcess::quote(revBFilename); } else { @@ -386,9 +386,9 @@ void DiffDialog::callExternalDiff(const TQString& extdiff, CvsService_stub* serv if( !service->ok() ) return; - extcmdline += KProcess::quote(revAFilename); + extcmdline += TDEProcess::quote(revAFilename); extcmdline += " "; - extcmdline += KProcess::quote(TQFileInfo(fileName).absFilePath()); + extcmdline += TDEProcess::quote(TQFileInfo(fileName).absFilePath()); } ProgressDialog dlg(this, "Diff", job, "diff"); @@ -396,10 +396,10 @@ void DiffDialog::callExternalDiff(const TQString& extdiff, CvsService_stub* serv { // call external diff application // TODO CL maybe use system()? - KProcess proc; + TDEProcess proc; proc.setUseShell(true, "/bin/sh"); proc << extcmdline; - proc.start(KProcess::DontCare); + proc.start(TDEProcess::DontCare); } } |