summaryrefslogtreecommitdiffstats
path: root/vcs/perforce
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:51:01 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:51:01 -0600
commitb9e542d0c805e9adee3a67e44532d5321032e21e (patch)
treee82d85b9035cc2ca322911e8a6e38a3bd8b1d431 /vcs/perforce
parent7a392a04059bd904dab4c78910a6d34aa0b37798 (diff)
downloadtdevelop-b9e542d0c805e9adee3a67e44532d5321032e21e.tar.gz
tdevelop-b9e542d0c805e9adee3a67e44532d5321032e21e.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'vcs/perforce')
-rw-r--r--vcs/perforce/commitdlg.h2
-rw-r--r--vcs/perforce/perforcepart.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/vcs/perforce/commitdlg.h b/vcs/perforce/commitdlg.h
index 6ed69346..e9cdb1e1 100644
--- a/vcs/perforce/commitdlg.h
+++ b/vcs/perforce/commitdlg.h
@@ -19,7 +19,7 @@
#include <klistbox.h>
#include <kdialogbase.h>
-class KProcess;
+class TDEProcess;
class CommitDialog : public KDialogBase
{
diff --git a/vcs/perforce/perforcepart.cpp b/vcs/perforce/perforcepart.cpp
index 3220d33e..06d55ec9 100644
--- a/vcs/perforce/perforcepart.cpp
+++ b/vcs/perforce/perforcepart.cpp
@@ -136,7 +136,7 @@ void PerforcePart::execCommand( const TQString& cmd, const TQString& filename )
TQString name = fi.fileName();
TQString command("cd ");
- command += KProcess::quote(dir);
+ command += TDEProcess::quote(dir);
command += " && p4 " + cmd + " ";
command += name;
@@ -204,7 +204,7 @@ void PerforcePart::update( const TQString& filename )
}
TQString command("cd ");
- command += KProcess::quote(dir);
+ command += TDEProcess::quote(dir);
command += " && p4 sync ";
command += name;