From e6aaa3624cc6179b82a9bfff1760e742a669064c Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:49:56 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- cervisia/diffdlg.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'cervisia/diffdlg.cpp') 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); } } -- cgit v1.2.3