summaryrefslogtreecommitdiffstats
path: root/buildtools/qmake/qmakescopeitem.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'buildtools/qmake/qmakescopeitem.cpp')
-rw-r--r--buildtools/qmake/qmakescopeitem.cpp44
1 files changed, 22 insertions, 22 deletions
diff --git a/buildtools/qmake/qmakescopeitem.cpp b/buildtools/qmake/qmakescopeitem.cpp
index f3cebef2..9da11ca4 100644
--- a/buildtools/qmake/qmakescopeitem.cpp
+++ b/buildtools/qmake/qmakescopeitem.cpp
@@ -338,7 +338,7 @@ TQString QMakeScopeItem::relativePath()
return "";
if( scope->scopeType() == Scope::ProjectScope )
{
- if( scope->tqparent() && scope->tqparent()->variableValues("SUBDIRS").tqcontains( URLUtil::relativePathToFile( scope->tqparent()->projectDir(), scope->projectDir()+"/"+scope->fileName() ) ) )
+ if( scope->tqparent() && scope->tqparent()->variableValues("SUBDIRS").contains( URLUtil::relativePathToFile( scope->tqparent()->projectDir(), scope->projectDir()+"/"+scope->fileName() ) ) )
{
return URLUtil::relativePathToFile( scope->tqparent()->projectDir(), scope->projectDir()+"/"+scope->fileName() );
}else
@@ -360,7 +360,7 @@ TQString QMakeScopeItem::relativePath()
TQString QMakeScopeItem::getSharedLibAddObject( TQString basePath )
{
- if ( scope->variableValues( "CONFIG" ).tqfindIndex( "dll" ) != -1 )
+ if ( scope->variableValues( "CONFIG" ).findIndex( "dll" ) != -1 )
{
TQString tmpPath = URLUtil::getRelativePath(basePath, scope->projectDir() );
if ( !scope->variableValues( "DESTDIR" ).front().isEmpty() )
@@ -422,7 +422,7 @@ TQString QMakeScopeItem::getApplicationObject( TQString basePath )
TQString QMakeScopeItem::getLibAddObject( TQString basePath )
{
- if ( scope->variableValues( "CONFIG" ).tqfindIndex( "dll" ) != -1 )
+ if ( scope->variableValues( "CONFIG" ).findIndex( "dll" ) != -1 )
{
TQString target = scope->resolveVariables( scope->variableValues( "TARGET" ).front() );
if ( !target.isEmpty() )
@@ -434,8 +434,8 @@ TQString QMakeScopeItem::getLibAddObject( TQString basePath )
return ( "-l" + scope->projectName() );
}
}
- else if ( scope->variableValues( "CONFIG" ).tqfindIndex( "staticlib" ) != -1
- || scope->variableValues("TEMPLATE").tqfindIndex("lib") != -1 )
+ else if ( scope->variableValues( "CONFIG" ).findIndex( "staticlib" ) != -1
+ || scope->variableValues("TEMPLATE").findIndex("lib") != -1 )
{
TQString tmpPath = URLUtil::getRelativePath(basePath, scope->projectDir() );
TQString destdir = scope->resolveVariables( scope->variableValues( "DESTDIR" ).front() );
@@ -474,7 +474,7 @@ TQString QMakeScopeItem::getLibAddPath( TQString basePath )
{
//PATH only add if shared lib
- if ( scope->variableValues( "CONFIG" ).tqfindIndex( "dll" ) == -1 ) return ( "" );
+ if ( scope->variableValues( "CONFIG" ).findIndex( "dll" ) == -1 ) return ( "" );
TQString tmpPath = URLUtil::getRelativePath(basePath, scope->projectDir() );
TQString destdir = scope->resolveVariables( scope->variableValues( "DESTDIR" ).front() );
@@ -541,17 +541,17 @@ void QMakeScopeItem::init()
TQStringList tmp = scope->variableValues( "TEMPLATE" );
if( scope->isEnabled() )
{
- if ( tmp.tqfindIndex( "subdirs" ) != -1 )
+ if ( tmp.findIndex( "subdirs" ) != -1 )
setPixmap( 0, SmallIcon( "folder" ) );
- else if ( tmp.tqfindIndex( "lib" ) != -1 )
+ else if ( tmp.findIndex( "lib" ) != -1 )
setPixmap( 0, SmallIcon( "qmake_lib" ) );
else
setPixmap( 0, SmallIcon( "qmake_app" ) );
}else
{
- if ( tmp.tqfindIndex( "subdirs" ) != -1 )
+ if ( tmp.findIndex( "subdirs" ) != -1 )
setPixmap( 0, SmallIcon( "folder_grey" ) );
- else if ( tmp.tqfindIndex( "lib" ) != -1 )
+ else if ( tmp.findIndex( "lib" ) != -1 )
setPixmap( 0, SmallIcon( "qmake_lib_disabled" ) );
else
setPixmap( 0, SmallIcon( "qmake_app_disabled" ) );
@@ -578,7 +578,7 @@ FileItem* QMakeScopeItem::createFileItem( const TQString& name )
TQString display = name;
if( m_widget->showFilenamesOnly() )
{
- int dirSepPos = name.tqfindRev( TQChar( TQDir::separator() ) );
+ int dirSepPos = name.findRev( TQChar( TQDir::separator() ) );
if ( dirSepPos != - 1 )
display = name.mid( dirSepPos + 1 );
}
@@ -596,7 +596,7 @@ FileItem* QMakeScopeItem::createFileItem( const TQString& name )
void QMakeScopeItem::buildGroups()
{
- if( scope->variableValues("TEMPLATE").tqfindIndex("subdirs") != -1 )
+ if( scope->variableValues("TEMPLATE").findIndex("subdirs") != -1 )
return;
TQStringList values;
@@ -739,12 +739,12 @@ void QMakeScopeItem::addValues( const TQString& var, const TQStringList& values
void QMakeScopeItem::removeValue( const TQString& var, const TQString& value )
{
- if( scope->scopeType() != Scope::IncludeScope && scope->variableValues( var ).tqfindIndex( value ) != -1 )
+ if( scope->scopeType() != Scope::IncludeScope && scope->variableValues( var ).findIndex( value ) != -1 )
{
- if( scope->variableValuesForOp( var, "+=" ).tqfindIndex(value) != -1 )
+ if( scope->variableValuesForOp( var, "+=" ).findIndex(value) != -1 )
{
scope->removeFromPlusOp( var, TQStringList( value ) );
- if( scope->variableValues( var ).tqfindIndex( value ) != -1 )
+ if( scope->variableValues( var ).findIndex( value ) != -1 )
{
scope->addToMinusOp( var, TQStringList( value ) );
}
@@ -758,9 +758,9 @@ void QMakeScopeItem::removeValue( const TQString& var, const TQString& value )
void QMakeScopeItem::addValue( const TQString& var, const TQString& value )
{
- if( scope->scopeType() != Scope::IncludeScope && scope->variableValues( var ).tqfindIndex( value ) == -1 )
+ if( scope->scopeType() != Scope::IncludeScope && scope->variableValues( var ).findIndex( value ) == -1 )
{
- if( scope->variableValuesForOp( var, "-=" ).tqfindIndex(value) != -1 )
+ if( scope->variableValuesForOp( var, "-=" ).findIndex(value) != -1 )
scope->removeFromMinusOp( var, TQStringList( value ) );
else
scope->addToPlusOp( var, TQStringList( value ) );
@@ -776,9 +776,9 @@ void QMakeScopeItem::updateValues( const TQString& var, const TQStringList& valu
TQStringList scopeValues = scope->variableValuesForOp( var, "+=" );
for( TQStringList::const_iterator it = curValues.begin(); it != curValues.end(); ++it )
{
- if ( values.tqfindIndex( *it ) == -1 )
+ if ( values.findIndex( *it ) == -1 )
{
- if( scopeValues.tqfindIndex( *it ) != -1 )
+ if( scopeValues.findIndex( *it ) != -1 )
{
scope->removeFromPlusOp( var, TQStringList( *it ) );
scopeValues.remove( *it );
@@ -788,7 +788,7 @@ void QMakeScopeItem::updateValues( const TQString& var, const TQStringList& valu
}
for( TQStringList::const_iterator it = values.begin(); it != values.end(); ++it )
{
- if ( scopeValues.tqfindIndex( *it ) != -1 )
+ if ( scopeValues.findIndex( *it ) != -1 )
{
scopeValues.remove(*it);
}
@@ -843,7 +843,7 @@ void QMakeScopeItem::disableSubprojects( const TQStringList& dirs )
TQStringList::const_iterator it = dirs.begin();
for( ; it != dirs.end() ; ++it)
{
- if( scope->variableValues("SUBDIRS").tqfindIndex(*it) != -1 )
+ if( scope->variableValues("SUBDIRS").findIndex(*it) != -1 )
{
Scope* s = scope->disableSubproject(*it);
if( !s )
@@ -926,4 +926,4 @@ TQMap<TQString, TQString> QMakeScopeItem::getLibInfos( TQString basePath )
return result;
}
-// kate: space-indent on; indent-width 4; tab-width 4; tqreplace-tabs on
+// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-18 17:18:10 +0000