diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 06:08:18 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 06:08:18 +0000 |
commit | 330c33ab6f97b279737bf9527c9add7bb1475450 (patch) | |
tree | 85cb998d3077ae295d65944ebb4d0189fc660ead /buildtools/qmake/projectconfigurationdlg.cpp | |
parent | 093de0db4fea89b3f94a2359c6981f353d035eb7 (diff) | |
download | tdevelop-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 'buildtools/qmake/projectconfigurationdlg.cpp')
-rw-r--r-- | buildtools/qmake/projectconfigurationdlg.cpp | 190 |
1 files changed, 95 insertions, 95 deletions
diff --git a/buildtools/qmake/projectconfigurationdlg.cpp b/buildtools/qmake/projectconfigurationdlg.cpp index 0bb85870..713084fd 100644 --- a/buildtools/qmake/projectconfigurationdlg.cpp +++ b/buildtools/qmake/projectconfigurationdlg.cpp @@ -158,21 +158,21 @@ void ProjectConfigurationDlg::updateProjectConfiguration() { if ( radioApplication->isChecked() ) { - if( myProjectItem->scope->variableValues("TEMPLATE").tqfindIndex("app") == -1 ) + if( myProjectItem->scope->variableValues("TEMPLATE").findIndex("app") == -1 ) { addAppDeps(); removeSharedLibDeps(); removeStaticLibDeps(); } myProjectItem->scope->setEqualOp( "TEMPLATE", "app" ); - if( myProjectItem->scope->variableValues( "CONFIG" ).tqfindIndex( "staticlib" ) != -1 ) + if( myProjectItem->scope->variableValues( "CONFIG" ).findIndex( "staticlib" ) != -1 ) myProjectItem->scope->removeFromPlusOp( "CONFIG", "staticlib" ); - if( myProjectItem->scope->variableValues( "CONFIG" ).tqfindIndex( "dll" ) != -1 ) + if( myProjectItem->scope->variableValues( "CONFIG" ).findIndex( "dll" ) != -1 ) myProjectItem->scope->removeFromPlusOp( "CONFIG", "dll" ); myProjectItem->setPixmap( 0, SmallIcon( "qmake_app" ) ); TQString targetname = prjWidget->getCurrentOutputFilename(); - if( targetname.tqfindRev("/") != -1 ) - targetname = targetname.right( targetname.length() - targetname.tqfindRev("/") - 1 ); + if( targetname.findRev("/") != -1 ) + targetname = targetname.right( targetname.length() - targetname.findRev("/") - 1 ); DomUtil::writeEntry( *prjWidget->m_part->projectDom(), "/kdevtrollproject/run/runarguments/"+targetname, m_editRunArguments->text() ); DomUtil::writeEntry( *prjWidget->m_part->projectDom(), @@ -186,7 +186,7 @@ void ProjectConfigurationDlg::updateProjectConfiguration() myProjectItem->scope->setEqualOp( "TEMPLATE", "lib" ); if ( staticRadio->isOn() ) { - if( myProjectItem->scope->variableValues("CONFIG").tqfindIndex("dll") != -1 ) + if( myProjectItem->scope->variableValues("CONFIG").findIndex("dll") != -1 ) { addStaticLibDeps(); removeSharedLibDeps(); @@ -203,14 +203,14 @@ void ProjectConfigurationDlg::updateProjectConfiguration() if ( sharedRadio->isOn() ) { kdDebug(9024) << "Activating debug lib:" << myProjectItem->scope->variableValues("CONFIG") << endl; - if( myProjectItem->scope->variableValues("CONFIG").tqfindIndex("dll") == -1 ) + if( myProjectItem->scope->variableValues("CONFIG").findIndex("dll") == -1 ) { addSharedLibDeps(); removeStaticLibDeps(); } myProjectItem->addValue( "CONFIG", "dll" ); myProjectItem->scope->setEqualOp( "VERSION", m_targetLibraryVersion->text() ); - if ( myProjectItem->scope->variableValues( "CONFIG" ).tqfindIndex( "staticlib" ) != -1 ) + if ( myProjectItem->scope->variableValues( "CONFIG" ).findIndex( "staticlib" ) != -1 ) myProjectItem->removeValue( "CONFIG", "staticlib" ); } if ( checkPlugin->isOn() ) @@ -227,15 +227,15 @@ void ProjectConfigurationDlg::updateProjectConfiguration() } else if ( radioSubdirs->isChecked() ) { - if( myProjectItem->scope->variableValues("TEMPLATE").tqfindIndex("subdirs") == -1 ) + if( myProjectItem->scope->variableValues("TEMPLATE").findIndex("subdirs") == -1 ) { removeSharedLibDeps(); removeStaticLibDeps(); removeAppDeps(); } - if( myProjectItem->scope->variableValues( "CONFIG" ).tqfindIndex( "dll" ) != -1 ) + if( myProjectItem->scope->variableValues( "CONFIG" ).findIndex( "dll" ) != -1 ) myProjectItem->scope->removeFromPlusOp( "CONFIG", "dll" ); - if( myProjectItem->scope->variableValues( "CONFIG" ).tqfindIndex( "staticlib" ) != -1 ) + if( myProjectItem->scope->variableValues( "CONFIG" ).findIndex( "staticlib" ) != -1 ) myProjectItem->scope->removeFromPlusOp( "CONFIG", "staticlib" ); myProjectItem->scope->setEqualOp( "TEMPLATE", "subdirs" ); myProjectItem->setPixmap( 0, SmallIcon( "folder" ) ); @@ -243,8 +243,8 @@ void ProjectConfigurationDlg::updateProjectConfiguration() } // Buildmode - int releaseidx = myProjectItem->scope->variableValues( "CONFIG" ).tqfindIndex( "release" ); - int debugidx = myProjectItem->scope->variableValues( "CONFIG" ).tqfindIndex( "debug" ); + int releaseidx = myProjectItem->scope->variableValues( "CONFIG" ).findIndex( "release" ); + int debugidx = myProjectItem->scope->variableValues( "CONFIG" ).findIndex( "debug" ); if ( radioReleaseMode->isChecked() ) { if( releaseidx != -1 && releaseidx < debugidx ) @@ -414,7 +414,7 @@ void ProjectConfigurationDlg::updateProjectConfiguration() TQStringList extraValues = TQStringList::split( " ", editConfigExtra->text() ); for ( TQStringList::iterator it = confValues.begin() ; it != confValues.end() ; ++it ) { - if ( Scope::KnownConfigValues.tqfindIndex( *it ) == -1 && extraValues.tqfindIndex( *it ) == -1 ) + if ( Scope::KnownConfigValues.findIndex( *it ) == -1 && extraValues.findIndex( *it ) == -1 ) { myProjectItem->scope->removeFromPlusOp( "CONFIG", *it ); } @@ -422,7 +422,7 @@ void ProjectConfigurationDlg::updateProjectConfiguration() for ( TQStringList::iterator it = extraValues.begin() ; it != extraValues.end() ; ++it ) { - if ( confValues.tqfindIndex( *it ) == -1 ) + if ( confValues.findIndex( *it ) == -1 ) myProjectItem->scope->addToPlusOp( "CONFIG", *it ); } @@ -431,9 +431,9 @@ void ProjectConfigurationDlg::updateProjectConfiguration() // targetpath = URLUtil::getRelativePath( myProjectItem->scope->projectDir(), targetpath ); if( myProjectItem->scope->scopeType() == Scope::FunctionScope || myProjectItem->scope->scopeType() == Scope::SimpleScope ) { - if( myProjectItem->scope->variableValues("TARGET").tqfindIndex( m_targetOutputFile->text() ) == -1 ) + if( myProjectItem->scope->variableValues("TARGET").findIndex( m_targetOutputFile->text() ) == -1 ) myProjectItem->scope->setEqualOp( "TARGET", TQStringList( m_targetOutputFile->text() ) ); - if( myProjectItem->scope->variableValues("DESTDIR").tqfindIndex( targetpath ) == -1 ) + if( myProjectItem->scope->variableValues("DESTDIR").findIndex( targetpath ) == -1 ) myProjectItem->scope->setEqualOp( "DESTDIR", TQStringList( targetpath ) ); }else { @@ -497,7 +497,7 @@ void ProjectConfigurationDlg::updateProjectConfiguration() { TQString tmpLib = insideItem->prjItem->getLibAddObject( myProjectItem->scope->projectDir() ); - if ( insideItem->prjItem->scope->variableValues( "CONFIG" ).tqfindIndex( "dll" ) != -1 ) + if ( insideItem->prjItem->scope->variableValues( "CONFIG" ).findIndex( "dll" ) != -1 ) { //add path if shared lib is linked TQString tmpPath = insideItem->prjItem->getLibAddPath( @@ -550,14 +550,14 @@ void ProjectConfigurationDlg::updateProjectConfiguration() { if ( insideItem->isOn() ) { - if ( insideItem->prjItem->scope->variableValues( "CONFIG" ).tqfindIndex( "staticlib" ) != -1 - || ( insideItem->prjItem->scope->variableValues( "CONFIG" ).tqfindIndex("dll") == -1 - && insideItem->prjItem->scope->variableValues( "TEMPLATE" ).tqfindIndex("lib") != -1 ) ) + if ( insideItem->prjItem->scope->variableValues( "CONFIG" ).findIndex( "staticlib" ) != -1 + || ( insideItem->prjItem->scope->variableValues( "CONFIG" ).findIndex("dll") == -1 + && insideItem->prjItem->scope->variableValues( "TEMPLATE" ).findIndex("lib") != -1 ) ) { values << insideItem->prjItem->getLibAddObject( myProjectItem->scope->projectDir() ); } - else if ( insideItem->prjItem->scope->variableValues( "CONFIG" ).tqfindIndex( "dll" ) != -1 ) + else if ( insideItem->prjItem->scope->variableValues( "CONFIG" ).findIndex( "dll" ) != -1 ) { values << insideItem->prjItem->getSharedLibAddObject( myProjectItem->scope->projectDir() ); @@ -576,7 +576,7 @@ void ProjectConfigurationDlg::updateProjectConfiguration() values.clear(); //change build order lvItem = buildorder_listview->firstChild(); - if ( lvItem && lvItem->itemBelow() && myProjectItem->scope->variableValues("TEMPLATE").tqfindIndex("subdirs") != -1 ) + if ( lvItem && lvItem->itemBelow() && myProjectItem->scope->variableValues("TEMPLATE").findIndex("subdirs") != -1 ) { while ( lvItem ) @@ -648,14 +648,14 @@ void ProjectConfigurationDlg::updateControls() TQStringList templateValues = myProjectItem->scope->variableValues( "TEMPLATE" ); //if( !myProjectItem->isScope ) //{ - if ( templateValues.tqfindIndex( "lib" ) != -1 ) + if ( templateValues.findIndex( "lib" ) != -1 ) { groupLibraries->setEnabled( true ); radioLibrary->setChecked( true ); staticRadio->setChecked( true ); //default - if ( configValues.tqfindIndex( "staticlib" ) != -1 ) + if ( configValues.findIndex( "staticlib" ) != -1 ) { staticRadio->setChecked( true ); checkPlugin->setEnabled( false ); @@ -663,7 +663,7 @@ void ProjectConfigurationDlg::updateControls() } else staticRadio->setChecked( false ); - if ( configValues.tqfindIndex( "dll" ) != -1 ) + if ( configValues.findIndex( "dll" ) != -1 ) { sharedRadio->setChecked( true ); checkPlugin->setEnabled( true ); @@ -684,33 +684,33 @@ void ProjectConfigurationDlg::updateControls() checkDesigner->setEnabled( false ); } - if ( configValues.tqfindIndex( "plugin" ) != -1 ) + if ( configValues.findIndex( "plugin" ) != -1 ) checkPlugin->setChecked( true ); else checkPlugin->setChecked( false ); - if ( configValues.tqfindIndex( "designer" ) != -1 ) + if ( configValues.findIndex( "designer" ) != -1 ) checkDesigner->setChecked( true ); else checkDesigner->setChecked( false ); - if ( configValues.tqfindIndex( "compile_libtool" ) != -1 ) + if ( configValues.findIndex( "compile_libtool" ) != -1 ) checkLibtool->setChecked( true ); else checkLibtool->setChecked( false ); } - else if ( templateValues.tqfindIndex( "subdirs" ) != -1 ) + else if ( templateValues.findIndex( "subdirs" ) != -1 ) { radioSubdirs->setChecked( true ); }else { //Default is app mode radioApplication->setChecked( true ); - if ( configValues.tqfindIndex( "console" ) != -1 ) + if ( configValues.findIndex( "console" ) != -1 ) { checkConsole->setChecked( true ); } TQString targetname = prjWidget->getCurrentOutputFilename(); - if( targetname.tqfindRev("/") != -1 ) - targetname = targetname.right( targetname.length() - targetname.tqfindRev("/") - 1 ); + if( targetname.findRev("/") != -1 ) + targetname = targetname.right( targetname.length() - targetname.findRev("/") - 1 ); m_editRunArguments->setText( DomUtil::readEntry( *prjWidget->m_part->projectDom(), "/kdevtrollproject/run/runarguments/"+targetname, "" ) ); TQString dir = DomUtil::readEntry( *prjWidget->m_part->projectDom(), "/kdevtrollproject/run/cwd/"+targetname, "" ); @@ -731,15 +731,15 @@ void ProjectConfigurationDlg::updateControls() TQString destdir = myProjectItem->m_widget->getCurrentDestDir(); if( !destdir.startsWith( "/" ) ) destdir = myProjectItem->m_widget->projectDirectory()+"/"+destdir; - m_CWDEdit->setURL( destdir.left( destdir.tqfindRev("/") ) ); - m_CWDEdit->fileDialog()->setURL( KURL::fromPathOrURL( destdir.left( destdir.tqfindRev("/") ) ) ); + m_CWDEdit->setURL( destdir.left( destdir.findRev("/") ) ); + m_CWDEdit->fileDialog()->setURL( KURL::fromPathOrURL( destdir.left( destdir.findRev("/") ) ) ); } m_editDebugArguments->setText( DomUtil::readEntry( *prjWidget->m_part->projectDom(), "/kdevtrollproject/run/debugarguments/"+targetname, "" ) ); } // Buildmode - int debugidx = configValues.tqfindIndex( "debug" ); - int releaseidx = configValues.tqfindIndex( "release" ); + int debugidx = configValues.findIndex( "debug" ); + int releaseidx = configValues.findIndex( "release" ); if ( debugidx != -1 && debugidx > releaseidx ) { radioDebugMode->setChecked( true ); @@ -748,59 +748,59 @@ void ProjectConfigurationDlg::updateControls() { radioReleaseMode->setChecked( true ); } - if ( configValues.tqfindIndex( "debug_and_release" ) != -1 ) + if ( configValues.findIndex( "debug_and_release" ) != -1 ) { checkDebugReleaseMode->setChecked( true ); } // Requirements - if ( configValues.tqfindIndex( "qt" ) != -1 ) + if ( configValues.findIndex( "qt" ) != -1 ) checkQt->setChecked( true ); else checkQt->setChecked( false ); - if ( configValues.tqfindIndex( "opengl" ) != -1 ) + if ( configValues.findIndex( "opengl" ) != -1 ) checkOpenGL->setChecked( true ); else checkOpenGL->setChecked( false ); - if ( configValues.tqfindIndex( "thread" ) != -1 ) + if ( configValues.findIndex( "thread" ) != -1 ) checkThread->setChecked( true ); else checkThread->setChecked( false ); - if ( configValues.tqfindIndex( "x11" ) != -1 ) + if ( configValues.findIndex( "x11" ) != -1 ) checkX11->setChecked( true ); else checkX11->setChecked( false ); - if ( configValues.tqfindIndex( "ordered" ) != -1 ) + if ( configValues.findIndex( "ordered" ) != -1 ) checkOrdered->setChecked( true ); else checkOrdered->setChecked( false ); - if ( configValues.tqfindIndex( "exceptions" ) != -1 ) + if ( configValues.findIndex( "exceptions" ) != -1 ) exceptionCheck->setChecked( true ); else exceptionCheck->setChecked( false ); - if ( configValues.tqfindIndex( "stl" ) != -1 ) + if ( configValues.findIndex( "stl" ) != -1 ) stlCheck->setChecked( true ); else stlCheck->setChecked( false ); - if ( configValues.tqfindIndex( "rtti" ) != -1 ) + if ( configValues.findIndex( "rtti" ) != -1 ) rttiCheck->setChecked( true ); else rttiCheck->setChecked( false ); - if ( configValues.tqfindIndex( "precompile_header" ) != -1 ) + if ( configValues.findIndex( "precompile_header" ) != -1 ) checkPCH->setChecked( true ); else checkPCH->setChecked( false ); // Warnings - if ( configValues.tqfindIndex( "warn_on" ) != -1 ) + if ( configValues.findIndex( "warn_on" ) != -1 ) { checkWarning->setChecked( true ); } - if ( configValues.tqfindIndex( "warn_off" ) != -1 ) + if ( configValues.findIndex( "warn_off" ) != -1 ) { checkWarning->setChecked( false ); } - if ( configValues.tqfindIndex( "windows" ) != -1 ) + if ( configValues.findIndex( "windows" ) != -1 ) checkWindows->setChecked( true ); else checkWindows->setChecked( false ); @@ -809,77 +809,77 @@ void ProjectConfigurationDlg::updateControls() if ( prjWidget->m_part->isTQt4Project() ) { - if ( configValues.tqfindIndex( "assistant" ) != -1 ) + if ( configValues.findIndex( "assistant" ) != -1 ) checkAssistant->setChecked( true ); else checkAssistant->setChecked( false ); - if ( configValues.tqfindIndex( "qtestlib" ) != -1 ) + if ( configValues.findIndex( "qtestlib" ) != -1 ) checkTestlib->setChecked( true ); else checkTestlib->setChecked( false ); - if ( configValues.tqfindIndex( "uitools" ) != -1 ) + if ( configValues.findIndex( "uitools" ) != -1 ) checkUiTools->setChecked( true ); else checkUiTools->setChecked( false ); - if ( configValues.tqfindIndex( "dbus" ) != -1 ) + if ( configValues.findIndex( "dbus" ) != -1 ) checkQDBus->setChecked( true ); else checkQDBus->setChecked( false ); - if ( configValues.tqfindIndex( "build_all" ) != -1 ) + if ( configValues.findIndex( "build_all" ) != -1 ) checkBuildAll->setChecked( true ); else checkBuildAll->setChecked( false ); - if ( configValues.tqfindIndex( "help" ) != -1 ) + if ( configValues.findIndex( "help" ) != -1 ) checkQtHelp->setChecked( true ); else checkQtHelp->setChecked( false ); TQStringList qtLibs = myProjectItem->scope->variableValues( "QT" ); - if ( qtLibs.tqfindIndex( "core" ) != -1 ) + if ( qtLibs.findIndex( "core" ) != -1 ) checkQt4Core->setChecked( true ); else checkQt4Core->setChecked( false ); - if ( qtLibs.tqfindIndex( "gui" ) != -1 ) + if ( qtLibs.findIndex( "gui" ) != -1 ) checkQt4Gui->setChecked( true ); else checkQt4Gui->setChecked( false ); - if ( qtLibs.tqfindIndex( "sql" ) != -1 ) + if ( qtLibs.findIndex( "sql" ) != -1 ) checkQt4SQL->setChecked( true ); else checkQt4SQL->setChecked( false ); - if ( qtLibs.tqfindIndex( "xml" ) != -1 ) + if ( qtLibs.findIndex( "xml" ) != -1 ) checkQt4XML->setChecked( true ); else checkQt4XML->setChecked( false ); - if ( qtLibs.tqfindIndex( "network" ) != -1 ) + if ( qtLibs.findIndex( "network" ) != -1 ) checkQt4Network->setChecked( true ); else checkQt4Network->setChecked( false ); - if ( qtLibs.tqfindIndex( "svg" ) != -1 ) + if ( qtLibs.findIndex( "svg" ) != -1 ) checkQt4SVG->setChecked( true ); else checkQt4SVG->setChecked( false ); - if ( qtLibs.tqfindIndex( "opengl" ) != -1 ) + if ( qtLibs.findIndex( "opengl" ) != -1 ) checkQt4OpenGL->setChecked( true ); else checkQt4OpenGL->setChecked( false ); - if ( qtLibs.tqfindIndex( "qt3support" ) != -1 ) + if ( qtLibs.findIndex( "qt3support" ) != -1 ) checkQt3Support->setChecked( true ); else checkQt3Support->setChecked( false ); - if ( qtLibs.tqfindIndex( "script" ) != -1 ) + if ( qtLibs.findIndex( "script" ) != -1 ) checkQtScript->setChecked( true ); else checkQtScript->setChecked( false ); - if ( qtLibs.tqfindIndex( "phonon" ) != -1 ) + if ( qtLibs.findIndex( "phonon" ) != -1 ) checkPhonon->setChecked( true ); else checkPhonon->setChecked( false ); - if ( qtLibs.tqfindIndex( "webkit" ) != -1 ) + if ( qtLibs.findIndex( "webkit" ) != -1 ) checkQtWebKit->setChecked( true ); else checkQtWebKit->setChecked( false ); - if ( qtLibs.tqfindIndex( "xmlpatterns" ) != -1 ) + if ( qtLibs.findIndex( "xmlpatterns" ) != -1 ) checkQtXmlPatterns->setChecked( true ); else checkQtXmlPatterns->setChecked( false ); @@ -895,7 +895,7 @@ void ProjectConfigurationDlg::updateControls() TQStringList extraValues; for ( TQStringList::const_iterator it = configValues.begin() ; it != configValues.end() ; ++it ) { - if ( Scope::KnownConfigValues.tqfindIndex( *it ) == -1 ) + if ( Scope::KnownConfigValues.findIndex( *it ) == -1 ) { extraValues << *it; } @@ -914,7 +914,7 @@ void ProjectConfigurationDlg::updateControls() } makefile_url->setURL( dir ); - if ( myProjectItem->scope->variableValues( "INSTALLS" ).tqfindIndex( "target" ) != -1 ) + if ( myProjectItem->scope->variableValues( "INSTALLS" ).findIndex( "target" ) != -1 ) { checkInstallTarget->setChecked( true ); m_InstallTargetPath->setEnabled( true ); @@ -1070,8 +1070,8 @@ void ProjectConfigurationDlg::updateIncludeControl() QMakeScopeItem *item = itemList.first(); while ( item ) { - if ( item->scope->variableValues( "TEMPLATE" ).tqfindIndex( "lib" ) != -1 || - item->scope->variableValues( "TEMPLATE" ).tqfindIndex( "app" ) != -1 ) + if ( item->scope->variableValues( "TEMPLATE" ).findIndex( "lib" ) != -1 || + item->scope->variableValues( "TEMPLATE" ).findIndex( "app" ) != -1 ) { TQString tmpInc = item->getIncAddPath( myProjectItem->scope->projectDir() ); tmpInc = TQDir::cleanDirPath( tmpInc ); @@ -1079,7 +1079,7 @@ void ProjectConfigurationDlg::updateIncludeControl() insideinc_listview->lastItem(), item, this ); items[tmpInc] = newItem; - if ( incList.tqfindIndex( tmpInc ) != -1 ) + if ( incList.findIndex( tmpInc ) != -1 ) { incList.remove( tmpInc ); newItem->setOn( true ); @@ -1128,7 +1128,7 @@ void ProjectConfigurationDlg::updateLibControls() QMakeScopeItem* item = itemList.first(); while ( item ) { - if ( item->scope->variableValues( "TEMPLATE" ).tqfindIndex( "lib" ) != -1 ) + if ( item->scope->variableValues( "TEMPLATE" ).findIndex( "lib" ) != -1 ) { if ( item != myProjectItem ) { @@ -1141,11 +1141,11 @@ void ProjectConfigurationDlg::updateLibControls() items[tmpLib] = newItem; TQString tmpLibDir = item->getLibAddPath( myProjectItem->scope->projectDir() ); kdDebug(9024) << "lib:" << tmpLib << " dir:" << tmpLibDir << "|" << libList << endl; - if ( libList.tqfindIndex( "-L" + tmpLibDir ) != -1 ) + if ( libList.findIndex( "-L" + tmpLibDir ) != -1 ) { libList.remove( "-L" + tmpLibDir ); } - if ( libList.tqfindIndex( tmpLib ) != -1 ) + if ( libList.findIndex( tmpLib ) != -1 ) { libList.remove( tmpLib ); newItem->setOn( true ); @@ -1199,20 +1199,20 @@ void ProjectConfigurationDlg::updateDependenciesControl( ) while ( item ) { TQStringList templateval = item->scope->variableValues( "TEMPLATE" ); - if ( templateval.tqfindIndex( "lib" ) != -1 - || templateval.tqfindIndex( "app" ) != -1 ) + if ( templateval.findIndex( "lib" ) != -1 + || templateval.findIndex( "app" ) != -1 ) { TQString tmpLib; TQStringList values = item->scope->variableValues( "CONFIG" ); - if ( templateval.tqfindIndex( "lib" ) != -1 && values.tqfindIndex( "dll" ) != -1 ) + if ( templateval.findIndex( "lib" ) != -1 && values.findIndex( "dll" ) != -1 ) tmpLib = item->getSharedLibAddObject( myProjectItem->scope->projectDir() ); - else if ( templateval.tqfindIndex( "lib" ) != -1 ) + else if ( templateval.findIndex( "lib" ) != -1 ) tmpLib = item->getLibAddObject( myProjectItem->scope->projectDir() ); else tmpLib = item->getApplicationObject( myProjectItem->scope->projectDir() ); InsideCheckListItem * newItem = new InsideCheckListItem( intDeps_view, intDeps_view->lastItem(), item, this ); items[tmpLib] = newItem; - if ( depsList.tqfindIndex( tmpLib ) != -1 ) + if ( depsList.findIndex( tmpLib ) != -1 ) { depsList.remove( tmpLib ); newItem->setOn( true ); @@ -1248,7 +1248,7 @@ void ProjectConfigurationDlg::updateDependenciesControl( ) void ProjectConfigurationDlg::updateBuildOrderControl() { //sort build order only if subdirs - if ( myProjectItem->scope->variableValues( "TEMPLATE" ).tqfindIndex( "subdirs" ) != -1 ) + if ( myProjectItem->scope->variableValues( "TEMPLATE" ).findIndex( "subdirs" ) != -1 ) { TQPtrList <QMakeScopeItem> itemList; @@ -2042,11 +2042,11 @@ void ProjectConfigurationDlg::removeSharedLibDeps() TQMap<TQString, TQString> infos = myProjectItem->getLibInfos(prjItem->scope->projectDir()); - if( prjItem->scope->variableValues("LIBS").tqfindIndex(infos["shared_lib"]) != -1 ) + if( prjItem->scope->variableValues("LIBS").findIndex(infos["shared_lib"]) != -1 ) prjItem->scope->removeFromPlusOp("LIBS", infos["shared_lib"]); - if( prjItem->scope->variableValues("LIBS").tqfindIndex(infos["shared_libdir"]) != -1 ) + if( prjItem->scope->variableValues("LIBS").findIndex(infos["shared_libdir"]) != -1 ) prjItem->scope->removeFromPlusOp("LIBS", infos["shared_libdir"]); - if( prjItem->scope->variableValues("TARGETDEPS").tqfindIndex(infos["shared_depend"]) != -1 ) + if( prjItem->scope->variableValues("TARGETDEPS").findIndex(infos["shared_depend"]) != -1 ) { prjItem->scope->removeFromPlusOp("TARGETDEPS", infos["shared_depend"]); @@ -2066,8 +2066,8 @@ void ProjectConfigurationDlg::addStaticLibDeps() TQMap<TQString, TQString> infos = myProjectItem->getLibInfos(prjItem->scope->projectDir()); - if( prjItem->scope->variableValues("TARGETDEPS").tqfindIndex(infos["app_depend"]) != -1 - || prjItem->scope->variableValues("TARGETDEPS").tqfindIndex(infos["shared_depend"]) != -1 ) + if( prjItem->scope->variableValues("TARGETDEPS").findIndex(infos["app_depend"]) != -1 + || prjItem->scope->variableValues("TARGETDEPS").findIndex(infos["shared_depend"]) != -1 ) { prjItem->scope->addToPlusOp("LIBS", infos["static_lib"]); prjItem->scope->addToPlusOp("TARGETDEPS", infos["static_depend"]); @@ -2088,9 +2088,9 @@ void ProjectConfigurationDlg::removeStaticLibDeps() TQMap<TQString, TQString> infos = myProjectItem->getLibInfos(prjItem->scope->projectDir()); - if( prjItem->scope->variableValues("LIBS").tqfindIndex(infos["static_lib"]) != -1 ) + if( prjItem->scope->variableValues("LIBS").findIndex(infos["static_lib"]) != -1 ) prjItem->scope->removeFromPlusOp("LIBS", infos["static_lib"]); - if( prjItem->scope->variableValues("TARGETDEPS").tqfindIndex(infos["static_depend"]) != -1 ) + if( prjItem->scope->variableValues("TARGETDEPS").findIndex(infos["static_depend"]) != -1 ) { prjItem->scope->removeFromPlusOp("TARGETDEPS", infos["static_depend"]); prjItem->scope->saveToFile(); @@ -2108,8 +2108,8 @@ void ProjectConfigurationDlg::addSharedLibDeps() continue; TQMap<TQString, TQString> infos = myProjectItem->getLibInfos(prjItem->scope->projectDir()); - if( prjItem->scope->variableValues("TARGETDEPS").tqfindIndex(infos["app_depend"]) != -1 - || prjItem->scope->variableValues("TARGETDEPS").tqfindIndex(infos["static_depend"]) != -1 ) + if( prjItem->scope->variableValues("TARGETDEPS").findIndex(infos["app_depend"]) != -1 + || prjItem->scope->variableValues("TARGETDEPS").findIndex(infos["static_depend"]) != -1 ) { prjItem->scope->addToPlusOp("LIBS", infos["shared_lib"]); prjItem->scope->addToPlusOp("LIBS", infos["shared_libdir"]); @@ -2130,7 +2130,7 @@ void ProjectConfigurationDlg::removeAppDeps() TQMap<TQString, TQString> infos = myProjectItem->getLibInfos(prjItem->scope->projectDir()); - if( prjItem->scope->variableValues("TARGETDEPS").tqfindIndex(infos["app_depend"]) != -1 ) + if( prjItem->scope->variableValues("TARGETDEPS").findIndex(infos["app_depend"]) != -1 ) { prjItem->scope->removeFromPlusOp("TARGETDEPS", infos["app_depend"]); prjItem->scope->saveToFile(); @@ -2149,8 +2149,8 @@ void ProjectConfigurationDlg::addAppDeps() TQMap<TQString, TQString> infos = myProjectItem->getLibInfos(prjItem->scope->projectDir()); - if( prjItem->scope->variableValues("TARGETDEPS").tqfindIndex(infos["shared_depend"]) != -1 - || prjItem->scope->variableValues("TARGETDEPS").tqfindIndex(infos["static_depend"]) != -1 ) + if( prjItem->scope->variableValues("TARGETDEPS").findIndex(infos["shared_depend"]) != -1 + || prjItem->scope->variableValues("TARGETDEPS").findIndex(infos["static_depend"]) != -1 ) { prjItem->scope->addToPlusOp("TARGETDEPS", infos["app_depend"]); @@ -2171,4 +2171,4 @@ void ProjectConfigurationDlg::customVarChanged() activateApply( 0 ); } -// 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 |