summaryrefslogtreecommitdiffstats
path: root/languages/cpp/includepathresolver.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-19 12:00:33 -0600
committerSlávek Banko <slavek.banko@axis.cz>2012-06-23 19:35:16 +0200
commitec049c7c32d50faf317b13d5c844a19978881fc3 (patch)
treeca9b445d4cba887b9161fddd3ba714e1d7b5060b /languages/cpp/includepathresolver.cpp
parent1c082a5ba751ddd4edd36bb0061462f9a999f88d (diff)
downloadtdevelop-ec049c7c32d50faf317b13d5c844a19978881fc3.tar.gz
tdevelop-ec049c7c32d50faf317b13d5c844a19978881fc3.zip
Remove additional unneeded tq method conversions
(cherry picked from commit 7e66d7c3611d907ea28b140281b472bb1c406be6)
Diffstat (limited to 'languages/cpp/includepathresolver.cpp')
-rw-r--r--languages/cpp/includepathresolver.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/languages/cpp/includepathresolver.cpp b/languages/cpp/includepathresolver.cpp
index cbd4c57b..ebd536ec 100644
--- a/languages/cpp/includepathresolver.cpp
+++ b/languages/cpp/includepathresolver.cpp
@@ -257,7 +257,7 @@ PathResolutionResult IncludePathResolver::resolveIncludePath( const TQString& fi
dir = TQDir( dir.absPath() );
TQFileInfo makeFile( dir, "Makefile" );
if( !makeFile.exists() )
- return PathResolutionResult(false, i18n("Makefile is missing in folder \"%1\"").tqarg(dir.absPath()), i18n("problem while trying to resolve include-paths for %1").tqarg(file) );
+ return PathResolutionResult(false, i18n("Makefile is missing in folder \"%1\"").arg(dir.absPath()), i18n("problem while trying to resolve include-paths for %1").arg(file) );
TQStringList cachedPath; //If the call doesn't succeed, use the cached not up-to-date version
TQDateTime makeFileModification = makeFile.lastModified();
@@ -298,7 +298,7 @@ PathResolutionResult IncludePathResolver::resolveIncludePath( const TQString& fi
int dot;
if( (dot = file.findRev( '.' )) == -1 )
- return PathResolutionResult( false, i18n( "Filename %1 seems to be malformed" ).tqarg(file) );
+ return PathResolutionResult( false, i18n( "Filename %1 seems to be malformed" ).arg(file) );
targetName = file.left( dot );
@@ -387,12 +387,12 @@ PathResolutionResult IncludePathResolver::getFullOutput( const TQString& command
output = proc.stdOut();
if( proc.exitStatus() != 0 )
- return PathResolutionResult( false, i18n("make-process finished with nonzero exit-status"), i18n("output: %1").tqarg( output ) );
+ return PathResolutionResult( false, i18n("make-process finished with nonzero exit-status"), i18n("output: %1").arg( output ) );
} else {
bool ret = executeCommandPopen(command, workingDirectory, output);
if( !ret )
- return PathResolutionResult( false, i18n("make-process failed"), i18n("output: %1").tqarg( output ) );
+ return PathResolutionResult( false, i18n("make-process failed"), i18n("output: %1").arg( output ) );
}
return PathResolutionResult(true);
}
@@ -471,14 +471,14 @@ PathResolutionResult IncludePathResolver::resolveIncludePathInternal( const TQSt
return res;
return resolveIncludePathInternal( KURL::relativePath(newWorkingDirectory,u.path()), newWorkingDirectory, makeParams , newSource );
}else{
- return PathResolutionResult( false, i18n("Recursive make-call failed"), i18n("The parameter-string \"%1\" does not seem to be valid. Output was: %2").tqarg(makeParams).tqarg(fullOutput) );
+ return PathResolutionResult( false, i18n("Recursive make-call failed"), i18n("The parameter-string \"%1\" does not seem to be valid. Output was: %2").arg(makeParams).arg(fullOutput) );
}
} else {
- return PathResolutionResult( false, i18n("Recursive make-call failed"), i18n("The directory \"%1\" does not exist. Output was: %2").tqarg(newWorkingDirectory).tqarg(fullOutput) );
+ return PathResolutionResult( false, i18n("Recursive make-call failed"), i18n("The directory \"%1\" does not exist. Output was: %2").arg(newWorkingDirectory).arg(fullOutput) );
}
} else {
- return PathResolutionResult( false, i18n("Recursive make-call malformed"), i18n("Output was: %2").tqarg(fullOutput) );
+ return PathResolutionResult( false, i18n("Recursive make-call malformed"), i18n("Output was: %2").arg(fullOutput) );
}
++offset;
@@ -488,7 +488,7 @@ PathResolutionResult IncludePathResolver::resolveIncludePathInternal( const TQSt
///STEP 2: Search the output for include-paths
TQRegExp validRx( "\\b([cg]\\+\\+|gcc)" );
if( validRx.search( fullOutput ) == -1 )
- return PathResolutionResult( false, i18n("Output seems not to be a valid gcc or g++ call"), i18n("Folder: \"%1\" Command: \"%2\" Output: \"%3\"").tqarg(workingDirectory).tqarg( source.getCommand(file, makeParameters) ).tqarg(fullOutput) );
+ return PathResolutionResult( false, i18n("Output seems not to be a valid gcc or g++ call"), i18n("Folder: \"%1\" Command: \"%2\" Output: \"%3\"").arg(workingDirectory).arg( source.getCommand(file, makeParameters) ).arg(fullOutput) );
PathResolutionResult ret( true );
ret.longErrorMessage = fullOutput;
@@ -497,7 +497,7 @@ PathResolutionResult IncludePathResolver::resolveIncludePathInternal( const TQSt
TQString quotedRx( "(\\').*(\\')|(\\\").*(\\\")" ); //Matches "hello", 'hello', 'hello"hallo"', etc.
TQString escapedPathRx( "(([^)(\"'\\s]*)(\\\\\\s)?)*" ); //Matches /usr/I\ am \ a\ strange\ path/include
- TQRegExp includeRx( TQString( "%1(%2|%3)(?=\\s)" ).tqarg( includeParameterRx ).tqarg( quotedRx ).tqarg( escapedPathRx ) );
+ TQRegExp includeRx( TQString( "%1(%2|%3)(?=\\s)" ).arg( includeParameterRx ).arg( quotedRx ).arg( escapedPathRx ) );
includeRx.setMinimal( true );
includeRx.setCaseSensitive( true );
offset = 0;