diff options
Diffstat (limited to 'buildtools/custommakefiles/customprojectpart.cpp')
| -rw-r--r-- | buildtools/custommakefiles/customprojectpart.cpp | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/buildtools/custommakefiles/customprojectpart.cpp b/buildtools/custommakefiles/customprojectpart.cpp index 4511769b..67a56ce0 100644 --- a/buildtools/custommakefiles/customprojectpart.cpp +++ b/buildtools/custommakefiles/customprojectpart.cpp @@ -910,7 +910,7 @@ void CustomProjectPart::startMakeCommand( const TQString &dir, const TQString &t cmdline = DomUtil::readEntry( dom, "/kdevcustomproject/other/otherbin" ); if ( cmdline.isEmpty() ) cmdline = "echo"; - else if ( cmdline.tqfind( "/" ) == -1 ) + else if ( cmdline.find( "/" ) == -1 ) cmdline = "./" + cmdline; cmdline += " " + DomUtil::readEntry( dom, "/kdevcustomproject/other/otheroptions" ); } @@ -1186,7 +1186,7 @@ void CustomProjectPart::putEnvVarsInVarMap() void CustomProjectPart::parseMakefile( const TQString& filename ) { - if ( m_parsedMakefiles.tqcontains( filename ) ) + if ( m_parsedMakefiles.contains( filename ) ) return; m_parsedMakefiles.insert( filename, 1 ); @@ -1218,9 +1218,9 @@ void CustomProjectPart::parseMakefile( const TQString& filename ) while (( offset = variablesRe.search( str, offset + 1 ) ) != -1 ) { TQString variableName = variablesRe.cap( 1 ).simplifyWhiteSpace(); - if ( m_makefileVars.tqcontains( variableName ) ) + if ( m_makefileVars.contains( variableName ) ) { - str.tqreplace( variablesRe.cap( 0 ), m_makefileVars[variableName] ); + str.replace( variablesRe.cap( 0 ), m_makefileVars[variableName] ); } } @@ -1245,17 +1245,17 @@ void CustomProjectPart::parseMakefile( const TQString& filename ) TQString tmpTarget = targetRe.cap( 1 ).simplifyWhiteSpace(); if ( tmpTarget.endsWith( ".o" ) ) { - if ( m_targetsObjectFiles.tqfind( tmpTarget ) == m_targetsObjectFiles.end() ) + if ( m_targetsObjectFiles.find( tmpTarget ) == m_targetsObjectFiles.end() ) m_targetsObjectFiles += tmpTarget; } - else if ( tmpTarget.tqcontains( '.' ) ) + else if ( tmpTarget.contains( '.' ) ) { - if ( m_targetsOtherFiles.tqfind( tmpTarget ) == m_targetsOtherFiles.end() ) + if ( m_targetsOtherFiles.find( tmpTarget ) == m_targetsOtherFiles.end() ) m_targetsOtherFiles += tmpTarget; } else { - if ( m_targets.tqfind( tmpTarget ) == m_targets.end() ) + if ( m_targets.find( tmpTarget ) == m_targets.end() ) m_targets += tmpTarget; } } @@ -1289,7 +1289,7 @@ void CustomProjectPart::updateMakeEnvironmentsMenu() { TQStringList l = allMakeEnvironments(); m_makeEnvironmentsSelector->setItems( l ); - m_makeEnvironmentsSelector->setCurrentItem( l.tqfindIndex( currentMakeEnvironment() ) ); + m_makeEnvironmentsSelector->setCurrentItem( l.findIndex( currentMakeEnvironment() ) ); } else { @@ -1361,7 +1361,7 @@ bool CustomProjectPart::isDirty() TQString fileName = *it; ++it; - TQMap<TQString, TQDateTime>::Iterator it = m_timestamp.tqfind( fileName ); + TQMap<TQString, TQDateTime>::Iterator it = m_timestamp.find( fileName ); TQDateTime t = TQFileInfo( projectDirectory(), fileName ).lastModified(); if ( it == m_timestamp.end() || *it != t ) { @@ -1401,7 +1401,7 @@ TQString CustomProjectPart::currentMakeEnvironment() const TQStringList allEnvs = allMakeEnvironments(); TQDomDocument &dom = *projectDom(); TQString environment = DomUtil::readEntry( dom, "/kdevcustomproject/make/selectedenvironment" ); - if ( environment.isEmpty() || !allEnvs.tqcontains( environment ) ) + if ( environment.isEmpty() || !allEnvs.contains( environment ) ) environment = allEnvs[0]; return environment; } @@ -1510,11 +1510,11 @@ bool CustomProjectPart::isProjectFileType( const TQString& filename ) const re.setPattern( *it ); int pos = re.search( filename ); uint len = re.matchedLength(); - if ((( *it ).tqfind( "*" ) != -1 || ( *it ).tqfind( "?" ) != -1 ) && pos + len == filename.length() ) + if ((( *it ).find( "*" ) != -1 || ( *it ).find( "?" ) != -1 ) && pos + len == filename.length() ) return true; - else if ( filename.tqfind( "/" ) != -1 && filename.tqfind( *it ) != -1 ) + else if ( filename.find( "/" ) != -1 && filename.find( *it ) != -1 ) return true; - else if ( filename.tqfind( "/" ) == -1 && filename == *it ) + else if ( filename.find( "/" ) == -1 && filename == *it ) return true; } return false; @@ -1555,14 +1555,14 @@ bool CustomProjectPart::isInBlacklist( const TQString& path ) const TQStringList blacklist = this->blacklist(); if ( !TQFileInfo( relpath ).isRelative() ) relpath = relativeToProject( path ); - if ( blacklist.tqfind( relpath ) != blacklist.end() ) + if ( blacklist.find( relpath ) != blacklist.end() ) return true; TQStringList paths = TQStringList::split( "/", relpath ); TQString parentpath; for ( TQStringList::const_iterator it = paths.begin(); it != paths.end(); ++it ) { parentpath += *it; - if ( blacklist.tqfind( parentpath ) != blacklist.end() ) + if ( blacklist.find( parentpath ) != blacklist.end() ) return true; parentpath = parentpath + "/"; } @@ -1607,7 +1607,7 @@ void CustomProjectPart::addNewFilesToProject( const TQStringList& filelist ) { for ( ProjectFilesSet::ConstIterator it2 = m_sourceFilesSet.constBegin(); it2 != m_sourceFilesSet.constEnd(); ++it2 ) { - if ( it2.key().tqfind( *it ) != -1 ) + if ( it2.key().find( *it ) != -1 ) { removeFromExcludes << *it; } @@ -1637,7 +1637,7 @@ void CustomProjectPart::setFiletypes( const TQStringList& l ) */ bool CustomProjectPart::isInProject( const TQString& fileName ) const { - return m_sourceFilesSet.tqcontains( fileName ); + return m_sourceFilesSet.contains( fileName ); } |