summaryrefslogtreecommitdiffstats
path: root/languages/cpp/includepathresolver.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-10 06:08:18 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-10 06:08:18 +0000
commit330c33ab6f97b279737bf9527c9add7bb1475450 (patch)
tree85cb998d3077ae295d65944ebb4d0189fc660ead /languages/cpp/includepathresolver.cpp
parent093de0db4fea89b3f94a2359c6981f353d035eb7 (diff)
downloadtdevelop-330c33ab6f97b279737bf9527c9add7bb1475450.tar.gz
tdevelop-330c33ab6f97b279737bf9527c9add7bb1475450.zip
rename the following methods:
tqfind find tqreplace replace tqcontains contains git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdevelop@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
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 fee9832e..1da45d76 100644
--- a/languages/cpp/includepathresolver.cpp
+++ b/languages/cpp/includepathresolver.cpp
@@ -18,7 +18,7 @@
*
*
* unsermake:
- * unsermake is detected by reading the first line of the makefile. If it tqcontains "generated by unsermake" the following things are respected:
+ * unsermake is detected by reading the first line of the makefile. If it contains "generated by unsermake" the following things are respected:
* 1. Since unsermake does not have the -W command(which should tell it to recompile the given file no matter whether it has been changed or not), the file-modification-time of the file is changed temporarily and the --no-real-compare option is used to force recompilation.
* 2. The targets seem to be called *.lo instead of *.o when using unsermake, so *.lo names are used.
* example-(test)command: unsermake --no-real-compare -n myfile.lo
@@ -181,7 +181,7 @@ namespace CppTools {
if( f.open( IO_ReadOnly ) ) {
TQString firstLine;
f.readLine( firstLine, 1000 );
- if( firstLine.tqfind( "generated by unsermake" ) != -1 ) {
+ if( firstLine.find( "generated by unsermake" ) != -1 ) {
ret = true;
}
f.close();
@@ -261,7 +261,7 @@ PathResolutionResult IncludePathResolver::resolveIncludePath( const TQString& fi
TQStringList cachedPath; //If the call doesn't succeed, use the cached not up-to-date version
TQDateTime makeFileModification = makeFile.lastModified();
- Cache::iterator it = m_cache.tqfind( dir.path() );
+ Cache::iterator it = m_cache.find( dir.path() );
if( it != m_cache.end() ) {
cachedPath = (*it).path;
if( makeFileModification == (*it).modificationTime ) {
@@ -272,7 +272,7 @@ PathResolutionResult IncludePathResolver::resolveIncludePath( const TQString& fi
return ret;
} else {
//We have a cached failed result. We should use that for some time but then try again. Return the failed result if: ( there were too many tries within this folder OR this file was already tried ) AND The last tries have not expired yet
- if( /*((*it).failedFiles.size() > 3 || (*it).failedFiles.tqfind( file ) != (*it).failedFiles.end()) &&*/ (*it).failTime.secsTo( TQDateTime::tqcurrentDateTime() ) < CACHE_FAIL_FOR_SECONDS ) {
+ if( /*((*it).failedFiles.size() > 3 || (*it).failedFiles.find( file ) != (*it).failedFiles.end()) &&*/ (*it).failTime.secsTo( TQDateTime::tqcurrentDateTime() ) < CACHE_FAIL_FOR_SECONDS ) {
PathResolutionResult ret(false); //Fake that the result is ok
ret.errorMessage = i18n("Cached: ") + (*it).errorMessage;
ret.longErrorMessage = (*it).longErrorMessage;
@@ -297,7 +297,7 @@ PathResolutionResult IncludePathResolver::resolveIncludePath( const TQString& fi
absoluteFile = u.path();
int dot;
- if( (dot = file.tqfindRev( '.' )) == -1 )
+ if( (dot = file.findRev( '.' )) == -1 )
return PathResolutionResult( false, i18n( "Filename %1 seems to be malformed" ).tqarg(file) );
targetName = file.left( dot );
@@ -413,11 +413,11 @@ PathResolutionResult IncludePathResolver::resolveIncludePathInternal( const TQSt
return res;
TQRegExp newLineRx("\\\\\\n");
- fullOutput.tqreplace( newLineRx, "" );
+ fullOutput.replace( newLineRx, "" );
///@todo collect multiple outputs at the same time for performance-reasons
TQString firstLine = fullOutput;
int lineEnd;
- if( (lineEnd = fullOutput.tqfind('\n')) != -1 )
+ if( (lineEnd = fullOutput.find('\n')) != -1 )
firstLine.truncate( lineEnd ); //Only look at the first line of output
/**
@@ -443,7 +443,7 @@ PathResolutionResult IncludePathResolver::resolveIncludePathInternal( const TQSt
else if( prefix.endsWith( ";" ) )
prefix.truncate( prefix.length() - 1 );
///Now test if what we have as prefix is a simple "cd /foo/bar" call.
- if( prefix.startsWith( "cd ") && !prefix.tqcontains( ";") && !prefix.tqcontains("&&") ) {
+ if( prefix.startsWith( "cd ") && !prefix.contains( ";") && !prefix.contains("&&") ) {
newWorkingDirectory = prefix.right( prefix.length() - 3 ).stripWhiteSpace();
if( !newWorkingDirectory.startsWith("/") )
newWorkingDirectory = workingDirectory + "/" + newWorkingDirectory;
@@ -456,7 +456,7 @@ PathResolutionResult IncludePathResolver::resolveIncludePathInternal( const TQSt
if( d.exists() ) {
///The recursive working-directory exists.
TQString makeParams = firstLine.mid( offset+5 );
- if( !makeParams.tqcontains( ";" ) && !makeParams.tqcontains( "&&" ) ) {
+ if( !makeParams.contains( ";" ) && !makeParams.contains( "&&" ) ) {
///Looks like valid parameters
///Make the file-name absolute, so it can be referenced from any directory
TQString absoluteFile = file;