From b9e542d0c805e9adee3a67e44532d5321032e21e Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:51:01 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- languages/cpp/includepathresolver.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'languages/cpp/includepathresolver.cpp') 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 #include @@ -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") ); } -- cgit v1.2.3