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 /languages/cpp/includepathresolver.cpp | |
parent | 7a392a04059bd904dab4c78910a6d34aa0b37798 (diff) | |
download | tdevelop-b9e542d0c805e9adee3a67e44532d5321032e21e.tar.gz tdevelop-b9e542d0c805e9adee3a67e44532d5321032e21e.zip |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'languages/cpp/includepathresolver.cpp')
-rw-r--r-- | languages/cpp/includepathresolver.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/languages/cpp/includepathresolver.cpp b/languages/cpp/includepathresolver.cpp index 8cdeafb8..fd29416c 100644 --- a/languages/cpp/includepathresolver.cpp +++ b/languages/cpp/includepathresolver.cpp @@ -31,7 +31,7 @@ #include "tqdir.h" /* defines TQDir */ #include "tqregexp.h" /* defines TQRegExp */ #include "klocale.h" /* defines [function] i18n */ -#include "blockingkprocess.h" /* defines BlockingKProcess */ +#include "blockingkprocess.h" /* defines BlockingTDEProcess */ #include "includepathresolver.h" #include <sys/stat.h> #include <sys/time.h> @@ -377,11 +377,11 @@ PathResolutionResult IncludePathResolver::resolveIncludePath( const TQString& fi PathResolutionResult IncludePathResolver::getFullOutput( const TQString& command, const TQString& workingDirectory, TQString& output ) const{ if( m_continueEventLoop ) { - BlockingKProcess proc; + BlockingTDEProcess proc; proc.setWorkingDirectory( workingDirectory ); proc.setUseShell( true ); proc << command; - if ( !proc.start(KProcess::NotifyOnExit, KProcess::Stdout) ) { + if ( !proc.start(TDEProcess::NotifyOnExit, TDEProcess::Stdout) ) { return PathResolutionResult( false, i18n("Could not start the make-process") ); } |