diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:51:01 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:51:01 -0600 |
| commit | b9e542d0c805e9adee3a67e44532d5321032e21e (patch) | |
| tree | e82d85b9035cc2ca322911e8a6e38a3bd8b1d431 /vcs/subversion | |
| parent | 7a392a04059bd904dab4c78910a6d34aa0b37798 (diff) | |
| download | tdevelop-b9e542d0c805e9adee3a67e44532d5321032e21e.tar.gz tdevelop-b9e542d0c805e9adee3a67e44532d5321032e21e.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'vcs/subversion')
| -rw-r--r-- | vcs/subversion/integrator/svnintegratordlg.cpp | 2 | ||||
| -rw-r--r-- | vcs/subversion/subversion_core.cpp | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/vcs/subversion/integrator/svnintegratordlg.cpp b/vcs/subversion/integrator/svnintegratordlg.cpp index b197355b..0df43f4a 100644 --- a/vcs/subversion/integrator/svnintegratordlg.cpp +++ b/vcs/subversion/integrator/svnintegratordlg.cpp @@ -86,7 +86,7 @@ void SvnIntegratorDlg::accept() } } //delete the template directory and checkout a fresh one from the server - BlockingKProcess *rmproc = new BlockingKProcess(); + BlockingTDEProcess *rmproc = new BlockingTDEProcess(); *rmproc << "rm"; *rmproc << "-f" << "-r" << m_projectLocation; rmproc->start(); diff --git a/vcs/subversion/subversion_core.cpp b/vcs/subversion/subversion_core.cpp index b8f90263..cba5aee4 100644 --- a/vcs/subversion/subversion_core.cpp +++ b/vcs/subversion/subversion_core.cpp @@ -180,16 +180,16 @@ void subversionCore::diff( const KURL::List& list, const TQString& where){ TQString ourCopy = tmpDir.name()+(*it).fileName(); - KProcess copy; + TDEProcess copy; copy << "cp" << (*it).prettyURL(0,KURL::StripFileProtocol) << tmpDir.name(); - copy.start(KProcess::Block); + copy.start(TDEProcess::Block); - KProcess patch; + TDEProcess patch; patch.setWorkingDirectory(tmpDir.name()); patch << "patch" << "-R" << ourCopy << tmpPatch.name(); - patch.start(KProcess::Block, KProcess::All); + patch.start(TDEProcess::Block, TDEProcess::All); - KProcess *p = new KProcess; + TDEProcess *p = new TDEProcess; *p << "kompare" << ourCopy << (*it).prettyURL(); p->start(); } @@ -203,7 +203,7 @@ void subversionCore::diff( const KURL::List& list, const TQString& where){ ( *stream ) << ( *it2 ) << "\n"; } tmp->close(); - KProcess *p = new KProcess; + TDEProcess *p = new TDEProcess; *p << "kompare" << "-n" << "-o" << tmp->name(); p->start(); } @@ -695,7 +695,7 @@ void subversionCore::slotDiffResult( KIO::Job * job ) ( *stream ) << ( *it2 ) << "\n"; } tmp->close(); - KProcess *p = new KProcess; + TDEProcess *p = new TDEProcess; *p << "kompare" << "-n" << "-o" << tmp->name(); p->start(); |