From 330c33ab6f97b279737bf9527c9add7bb1475450 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 10 Aug 2011 06:08:18 +0000 Subject: 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 --- buildtools/qmake/choosesubprojectdlg.cpp | 6 +- buildtools/qmake/choosesubprojectdlg.h | 2 +- buildtools/qmake/createscopedlg.cpp | 4 +- buildtools/qmake/createscopedlg.h | 2 +- buildtools/qmake/disablesubprojectdlg.cpp | 2 +- buildtools/qmake/disablesubprojectdlg.h | 2 +- buildtools/qmake/projectconfigurationdlg.cpp | 190 +++++++++++++-------------- buildtools/qmake/projectconfigurationdlg.h | 2 +- buildtools/qmake/qmakedefaultopts.cpp | 4 +- buildtools/qmake/qmakedefaultopts.h | 2 +- buildtools/qmake/qmakeoptionswidget.cpp | 2 +- buildtools/qmake/qmakeoptionswidget.h | 2 +- buildtools/qmake/qmakescopeitem.cpp | 44 +++---- buildtools/qmake/qmakescopeitem.h | 2 +- buildtools/qmake/scope.cpp | 130 +++++++++--------- buildtools/qmake/scope.h | 2 +- buildtools/qmake/trollprojectpart.cpp | 26 ++-- buildtools/qmake/trollprojectwidget.cpp | 58 ++++---- buildtools/qmake/trollprojectwidget.h | 2 +- 19 files changed, 242 insertions(+), 242 deletions(-) (limited to 'buildtools/qmake') diff --git a/buildtools/qmake/choosesubprojectdlg.cpp b/buildtools/qmake/choosesubprojectdlg.cpp index fc0cb068..a5651b27 100644 --- a/buildtools/qmake/choosesubprojectdlg.cpp +++ b/buildtools/qmake/choosesubprojectdlg.cpp @@ -41,7 +41,7 @@ void ChooseSubprojectDlg::accept() ChooseItem *item = dynamic_cast(subprojects_view->currentItem()); if (!item) return; - if ( item->subproject()->scope->variableValues("TEMPLATE").tqfindIndex("subdirs") != -1 ) + if ( item->subproject()->scope->variableValues("TEMPLATE").findIndex("subdirs") != -1 ) return; TQDialog::accept(); @@ -89,7 +89,7 @@ void ChooseSubprojectDlg::itemSelected( TQListViewItem * it ) ChooseItem *item = dynamic_cast(it); if (!item) return; - if ( item->subproject()->scope->variableValues("TEMPLATE").tqfindIndex("subdirs") != -1 ) + if ( item->subproject()->scope->variableValues("TEMPLATE").findIndex("subdirs") != -1 ) buttonOk->setEnabled(false); else buttonOk->setEnabled(true); @@ -110,5 +110,5 @@ QMakeScopeItem * ChooseSubprojectDlg::selectedSubproject( ) #include "choosesubprojectdlg.moc" -// 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 diff --git a/buildtools/qmake/choosesubprojectdlg.h b/buildtools/qmake/choosesubprojectdlg.h index 3d0ea08b..cf97671f 100644 --- a/buildtools/qmake/choosesubprojectdlg.h +++ b/buildtools/qmake/choosesubprojectdlg.h @@ -62,4 +62,4 @@ private: #endif -// 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 diff --git a/buildtools/qmake/createscopedlg.cpp b/buildtools/qmake/createscopedlg.cpp index c83e1b7b..2792d0ae 100644 --- a/buildtools/qmake/createscopedlg.cpp +++ b/buildtools/qmake/createscopedlg.cpp @@ -58,7 +58,7 @@ void CreateScopeDlg::accept() TQString file = incUrl->url(); if ( !incUrl->url().endsWith( ".pri" ) ) file += ".pri"; - if( file.tqfind("/") == -1 ) + if( file.find("/") == -1 ) file = m_item->scope->projectDir()+"/"+file; // We need to create the file, because getRelativePath checks for existent paths if( !TQFile::exists(file) ) @@ -97,4 +97,4 @@ void CreateScopeDlg::accept() #include "createscopedlg.moc" -// 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 diff --git a/buildtools/qmake/createscopedlg.h b/buildtools/qmake/createscopedlg.h index 31195c87..781522fe 100644 --- a/buildtools/qmake/createscopedlg.h +++ b/buildtools/qmake/createscopedlg.h @@ -42,5 +42,5 @@ private: #endif -// 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 diff --git a/buildtools/qmake/disablesubprojectdlg.cpp b/buildtools/qmake/disablesubprojectdlg.cpp index 161661d5..682fd906 100644 --- a/buildtools/qmake/disablesubprojectdlg.cpp +++ b/buildtools/qmake/disablesubprojectdlg.cpp @@ -47,4 +47,4 @@ TQStringList DisableSubprojectDlg::selectedProjects() #include "disablesubprojectdlg.moc" -// 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 diff --git a/buildtools/qmake/disablesubprojectdlg.h b/buildtools/qmake/disablesubprojectdlg.h index 4e8a4a84..296fcd14 100644 --- a/buildtools/qmake/disablesubprojectdlg.h +++ b/buildtools/qmake/disablesubprojectdlg.h @@ -40,4 +40,4 @@ protected slots: #endif -// 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 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 itemList; @@ -2042,11 +2042,11 @@ void ProjectConfigurationDlg::removeSharedLibDeps() TQMap 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 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 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 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 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 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 diff --git a/buildtools/qmake/projectconfigurationdlg.h b/buildtools/qmake/projectconfigurationdlg.h index d8ec5ea7..6ef112d7 100644 --- a/buildtools/qmake/projectconfigurationdlg.h +++ b/buildtools/qmake/projectconfigurationdlg.h @@ -142,4 +142,4 @@ private: #endif -// 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 diff --git a/buildtools/qmake/qmakedefaultopts.cpp b/buildtools/qmake/qmakedefaultopts.cpp index 304bd1e1..55533ef2 100644 --- a/buildtools/qmake/qmakedefaultopts.cpp +++ b/buildtools/qmake/qmakedefaultopts.cpp @@ -78,7 +78,7 @@ TQMakeDefaultOpts::~TQMakeDefaultOpts() const TQStringList TQMakeDefaultOpts::variableValues( const TQString& var ) const { // TQStringList result; - if ( m_variables.tqcontains(var) ) + if ( m_variables.contains(var) ) return m_variables[var]; return TQStringList(); } @@ -88,4 +88,4 @@ const TQStringList& TQMakeDefaultOpts::variables() const return m_keys; } -// 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 diff --git a/buildtools/qmake/qmakedefaultopts.h b/buildtools/qmake/qmakedefaultopts.h index 121e0cd0..6fee7366 100644 --- a/buildtools/qmake/qmakedefaultopts.h +++ b/buildtools/qmake/qmakedefaultopts.h @@ -46,4 +46,4 @@ private: #endif -// 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 diff --git a/buildtools/qmake/qmakeoptionswidget.cpp b/buildtools/qmake/qmakeoptionswidget.cpp index 920d2efd..01ac0f7b 100644 --- a/buildtools/qmake/qmakeoptionswidget.cpp +++ b/buildtools/qmake/qmakeoptionswidget.cpp @@ -60,4 +60,4 @@ void QMakeOptionsWidget::accept() #include "qmakeoptionswidget.moc" -// 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 diff --git a/buildtools/qmake/qmakeoptionswidget.h b/buildtools/qmake/qmakeoptionswidget.h index 159547f8..9db49213 100644 --- a/buildtools/qmake/qmakeoptionswidget.h +++ b/buildtools/qmake/qmakeoptionswidget.h @@ -35,6 +35,6 @@ private: #endif -// 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 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 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 diff --git a/buildtools/qmake/qmakescopeitem.h b/buildtools/qmake/qmakescopeitem.h index 4dc1dca2..ec45877e 100644 --- a/buildtools/qmake/qmakescopeitem.h +++ b/buildtools/qmake/qmakescopeitem.h @@ -125,4 +125,4 @@ private: #endif -// 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 diff --git a/buildtools/qmake/scope.cpp b/buildtools/qmake/scope.cpp index e332edd2..17c360dc 100644 --- a/buildtools/qmake/scope.cpp +++ b/buildtools/qmake/scope.cpp @@ -121,8 +121,8 @@ Scope::Scope( const TQMap& env, unsigned int num, Scope* tqp { TQString absfilename; TQString tmp = incfile.stripWhiteSpace(); - if( tmp.tqcontains(")" ) ) - tmp = tmp.mid(0, tmp.tqfind(")") ); + if( tmp.contains(")" ) ) + tmp = tmp.mid(0, tmp.find(")") ); if( tmp.startsWith( "\"" ) ) tmp = tmp.mid( 1, tmp.length()-2 ); @@ -315,7 +315,7 @@ TQStringList Scope::variableValues( const TQString& variable, bool checkIncParen if ( !m_root ) return result; - if( m_varCache.tqcontains( variable ) && fetchFromParent && ( checkIncParent || scopeType() != Scope::IncludeScope ) ) + if( m_varCache.contains( variable ) && fetchFromParent && ( checkIncParent || scopeType() != Scope::IncludeScope ) ) { return m_varCache[variable]; } @@ -336,8 +336,8 @@ void Scope::calcValuesFromStatements( const TQString& variable, TQStringList& re /* For variables that we don't know and which are not QT/CONFIG find the default value */ if( setDefault && m_defaultopts - && m_defaultopts->variables().tqfindIndex(variable) != -1 - && ( variable == "TEMPLATE" || variable == "QT" || KnownVariables.tqfindIndex(variable) == -1 || variable == "CONFIG" ) ) + && m_defaultopts->variables().findIndex(variable) != -1 + && ( variable == "TEMPLATE" || variable == "QT" || KnownVariables.findIndex(variable) == -1 || variable == "CONFIG" ) ) { result = m_defaultopts->variableValues(variable); } @@ -370,7 +370,7 @@ void Scope::calcValuesFromStatements( const TQString& variable, TQStringList& re { for ( TQStringList::const_iterator sit = assign->values.begin(); sit != assign->values.end() ; ++sit ) { - if ( result.tqfindIndex( *sit ) == -1 ) + if ( result.findIndex( *sit ) == -1 ) result.append( *sit ); } } @@ -378,7 +378,7 @@ void Scope::calcValuesFromStatements( const TQString& variable, TQStringList& re { for ( TQStringList::const_iterator sit = assign->values.begin(); sit != assign->values.end() ; ++sit ) { - if ( result.tqfindIndex( *sit ) != -1 ) + if ( result.findIndex( *sit ) != -1 ) result.remove( *sit ); } } @@ -392,7 +392,7 @@ void Scope::calcValuesFromStatements( const TQString& variable, TQStringList& re for( unsigned int i = 0; i < l.count(); ++i ) { int num = l[ i ]; - if( m_scopes.tqcontains( num ) ) + if( m_scopes.contains( num ) ) { Scope* s = m_scopes[num]; if( s && s->scopeType() == IncludeScope && s->m_incast == iast ) @@ -412,7 +412,7 @@ void Scope::calcValuesFromStatements( const TQString& variable, TQStringList& re for( unsigned int i = 0; i < l.count(); ++i ) { int num = l[ i ]; - if( m_scopes.tqcontains( num ) ) + if( m_scopes.contains( num ) ) { Scope* s = m_scopes[num]; if( s && s->m_root == past && s->m_root->scopedID == past->scopedID ) @@ -571,17 +571,17 @@ Scope* Scope::createSubProject( const TQString& projname ) if( !m_root ) return 0; - if( variableValuesForOp( "SUBDIRS", "-=").tqfindIndex( projname ) != -1 ) + if( variableValuesForOp( "SUBDIRS", "-=").findIndex( projname ) != -1 ) removeFromMinusOp( "SUBDIRS", projname ); TQString realprojname = resolveVariables(projname); - if( variableValuesForOp( "SUBDIRS", "-=").tqfindIndex( realprojname ) != -1 ) + if( variableValuesForOp( "SUBDIRS", "-=").findIndex( realprojname ) != -1 ) removeFromMinusOp( "SUBDIRS", realprojname ); TQDir curdir( projectDir() ); - if ( variableValues("TEMPLATE").tqfindIndex( "subdirs" ) != -1 ) + if ( variableValues("TEMPLATE").findIndex( "subdirs" ) != -1 ) { TQString filename; if( !realprojname.endsWith(".pro") ) @@ -592,7 +592,7 @@ Scope* Scope::createSubProject( const TQString& projname ) curdir.cd( realprojname ); TQStringList entries = curdir.entryList("*.pro", TQDir::Files); - if ( !entries.isEmpty() && entries.tqfindIndex( curdir.dirName()+".pro" ) == -1 ) + if ( !entries.isEmpty() && entries.findIndex( curdir.dirName()+".pro" ) == -1 ) filename = curdir.absPath() + TQString(TQChar(TQDir::separator()))+entries.first(); else filename = curdir.absPath() + TQString(TQChar(TQDir::separator()))+curdir.dirName()+".pro"; @@ -622,13 +622,13 @@ Scope* Scope::createSubProject( const TQString& projname ) bool Scope::deleteFunctionScope( unsigned int num ) { - if ( !m_root || !m_scopes.tqcontains( num ) ) + if ( !m_root || !m_scopes.contains( num ) ) return false; Scope* funcScope = m_scopes[ num ]; if ( funcScope ) { - TQMake::AST* ast = m_root->m_tqchildren[ m_root->m_tqchildren.tqfindIndex( funcScope->m_root ) ]; + TQMake::AST* ast = m_root->m_tqchildren[ m_root->m_tqchildren.findIndex( funcScope->m_root ) ]; if( !ast ) return false; m_scopes.remove( num ); @@ -642,13 +642,13 @@ bool Scope::deleteFunctionScope( unsigned int num ) bool Scope::deleteSimpleScope( unsigned int num ) { - if ( !m_root || !m_scopes.tqcontains( num ) ) + if ( !m_root || !m_scopes.contains( num ) ) return false; Scope* simpleScope = m_scopes[ num ]; if ( simpleScope ) { - TQMake::AST* ast = m_root->m_tqchildren[ m_root->m_tqchildren.tqfindIndex( simpleScope->m_root ) ]; + TQMake::AST* ast = m_root->m_tqchildren[ m_root->m_tqchildren.findIndex( simpleScope->m_root ) ]; if( !ast ) return false; m_scopes.remove( num ); @@ -663,7 +663,7 @@ bool Scope::deleteSimpleScope( unsigned int num ) bool Scope::deleteIncludeScope( unsigned int num ) { - if ( !m_root || !m_scopes.tqcontains( num ) ) + if ( !m_root || !m_scopes.contains( num ) ) return false; Scope * incScope = m_scopes[ num ]; @@ -682,14 +682,14 @@ bool Scope::deleteIncludeScope( unsigned int num ) bool Scope::deleteSubProject( unsigned int num, bool deleteSubdir ) { - if ( !m_root || !m_scopes.tqcontains( num ) ) + if ( !m_root || !m_scopes.contains( num ) ) return false; TQValueList::iterator it = findExistingVariable( "TEMPLATE" ); if ( it != m_root->m_tqchildren.end() ) { TQMake::AssignmentAST * tempast = static_cast( *it ); - if ( tempast->values.tqfindIndex( "subdirs" ) != -1 || findExistingVariable( "TEMPLATE" ) != m_root->m_tqchildren.end() ) + if ( tempast->values.findIndex( "subdirs" ) != -1 || findExistingVariable( "TEMPLATE" ) != m_root->m_tqchildren.end() ) { Scope* project = m_scopes[ num ]; if( !project ) @@ -727,7 +727,7 @@ bool Scope::deleteSubProject( unsigned int num, bool deleteSubdir ) { TQMake::AssignmentAST * ast = static_cast( *foundit ); updateValues( ast->values, TQStringList( projdir ), true, ast->indent ); - if( m_varCache.tqcontains( "SUBDIRS" ) ) + if( m_varCache.contains( "SUBDIRS" ) ) m_varCache.erase( "SUBDIRS" ); }else return false; @@ -746,7 +746,7 @@ void Scope::updateValues( TQStringList& origValues, const TQStringList& newValue for ( TQStringList::const_iterator it = newValues.begin(); it != newValues.end() ; ++it ) { - if ( origValues.tqfindIndex( *it ) == -1 && !remove ) + if ( origValues.findIndex( *it ) == -1 && !remove ) { while ( !origValues.isEmpty() && origValues.last() == getLineEndingString() ) origValues.pop_back(); @@ -769,17 +769,17 @@ void Scope::updateValues( TQStringList& origValues, const TQStringList& newValue origValues.append(" "); TQString newval = *it; TQRegExp re("([^$])\\$([^$\\(\\)\\{\\} /]*)( |\\)|/)"); - newval.tqreplace(re, "\\1$(\\2)\\3"); - if( (newval).tqcontains(" ") || (newval).tqcontains("\t") || (newval).tqcontains( getLineEndingString() ) || (newval).tqcontains("#") ) + newval.replace(re, "\\1$(\\2)\\3"); + if( (newval).contains(" ") || (newval).contains("\t") || (newval).contains( getLineEndingString() ) || (newval).contains("#") ) origValues.append( "\""+newval+"\"" ); else origValues.append( newval ); origValues.append( getLineEndingString() ); - } else if ( origValues.tqfindIndex( *it ) != -1 && remove ) + } else if ( origValues.findIndex( *it ) != -1 && remove ) { - TQStringList::iterator posit = origValues.tqfind( *it ); + TQStringList::iterator posit = origValues.find( *it ); posit = origValues.remove( posit ); - while( posit != origValues.end() && ( (*posit).tqfind( TQRegExp("\\\\[\\s]*"+getLineEndingString() ) ) != -1 + while( posit != origValues.end() && ( (*posit).find( TQRegExp("\\\\[\\s]*"+getLineEndingString() ) ) != -1 || (*posit).stripWhiteSpace() == "" ) ) { posit = origValues.remove( posit ); @@ -790,9 +790,9 @@ void Scope::updateValues( TQStringList& origValues, const TQStringList& newValue || origValues.last() == getLineEndingString() || origValues.last().stripWhiteSpace() == "" ) && !origValues.isEmpty() ) origValues.pop_back(); - if( !origValues.isEmpty() && origValues.last().tqfind( TQRegExp("\\\\[ \t]*#") ) != -1 ) - origValues[origValues.count()-1] = origValues[origValues.count()-1].mid(origValues[origValues.count()-1].tqfind( "#") ); - if( !origValues.isEmpty() && origValues.last().tqfind( getLineEndingString() ) == -1 ) + if( !origValues.isEmpty() && origValues.last().find( TQRegExp("\\\\[ \t]*#") ) != -1 ) + origValues[origValues.count()-1] = origValues[origValues.count()-1].mid(origValues[origValues.count()-1].find( "#") ); + if( !origValues.isEmpty() && origValues.last().find( getLineEndingString() ) == -1 ) origValues.append(getLineEndingString()); } @@ -801,7 +801,7 @@ void Scope::updateVariable( const TQString& variable, const TQString& op, const if ( !m_root || listIsEmpty( values ) ) return ; - if( m_varCache.tqcontains( variable ) ) + if( m_varCache.contains( variable ) ) m_varCache.erase( variable ); for ( int i = m_root->m_tqchildren.count() - 1; i >= 0; --i ) @@ -823,7 +823,7 @@ void Scope::updateVariable( const TQString& variable, const TQString& op, const { for ( TQStringList::const_iterator it = values.begin() ; it != values.end() ; ++it ) { - if ( op == "+=" && !removeFromOp && assignment->values.tqfindIndex( *it ) != -1 ) + if ( op == "+=" && !removeFromOp && assignment->values.findIndex( *it ) != -1 ) { if ( assignment->op == "=" ) { @@ -841,7 +841,7 @@ void Scope::updateVariable( const TQString& variable, const TQString& op, const } } } - else if ( op == "-=" && !removeFromOp && assignment->values.tqfindIndex( *it ) != -1 ) + else if ( op == "-=" && !removeFromOp && assignment->values.findIndex( *it ) != -1 ) { updateValues( assignment->values, TQStringList( *it ), true, assignment->indent ); if ( listIsEmpty( assignment->values ) ) @@ -858,7 +858,7 @@ void Scope::updateVariable( const TQString& variable, const TQString& op, const m_root->removeChildAST( assignment ); delete assignment; } - else if ( assignment->op == "+=" && assignment->values.tqfindIndex( *it ) != -1 ) + else if ( assignment->op == "+=" && assignment->values.findIndex( *it ) != -1 ) { updateValues( assignment->values, TQStringList( *it ), true, assignment->indent ); if ( listIsEmpty( assignment->values ) ) @@ -885,7 +885,7 @@ void Scope::updateVariable( const TQString& variable, const TQString& op, const else ast->setDepth( m_root->depth()+1 ); m_root->addChildAST( ast ); - if ( values.tqfindIndex( getLineEndingString() ) == -1 ) + if ( values.findIndex( getLineEndingString() ) == -1 ) { ast->values.append( getLineEndingString() ); } @@ -903,7 +903,7 @@ TQValueList::iterator Scope::findExistingVariable( const TQString& if ( ( *it ) ->nodeType() == TQMake::AST::AssignmentAST ) { TQMake::AssignmentAST * assignment = static_cast( *it ); - if ( assignment->scopedID == variable && ops.tqfindIndex( assignment->op ) != -1 ) + if ( assignment->scopedID == variable && ops.findIndex( assignment->op ) != -1 ) { return it; } @@ -942,7 +942,7 @@ void Scope::init() { TQMake::AssignmentAST * m = static_cast( *it ); // Check wether TEMPLATE==subdirs here too! - if ( m->scopedID == "SUBDIRS" && variableValues("TEMPLATE").tqfindIndex("subdirs") != -1 ) + if ( m->scopedID == "SUBDIRS" && variableValues("TEMPLATE").findIndex("subdirs") != -1 ) { for ( TQStringList::const_iterator sit = m->values.begin() ; sit != m->values.end(); ++sit ) { @@ -977,7 +977,7 @@ void Scope::init() }else continue; } - if ( subproject.entryList().isEmpty() || subproject.entryList().tqfindIndex( str + ".pro" ) != -1 ) + if ( subproject.entryList().isEmpty() || subproject.entryList().findIndex( str + ".pro" ) != -1 ) projectfile = (str) + ".pro"; else projectfile = subproject.entryList().first(); @@ -992,16 +992,16 @@ void Scope::init() else { if ( !( - KnownVariables.tqfindIndex( m->scopedID ) != -1 + KnownVariables.findIndex( m->scopedID ) != -1 && ( m->op == "=" || m->op == "+=" || m->op == "-=") ) && !( - ( m->scopedID.tqcontains( ".files" ) || m->scopedID.tqcontains( ".path" ) ) - && variableValues("INSTALLS").tqfindIndex(m->scopedID.left( m->scopedID.tqfindRev(".") != -1 ) ) + ( m->scopedID.contains( ".files" ) || m->scopedID.contains( ".path" ) ) + && variableValues("INSTALLS").findIndex(m->scopedID.left( m->scopedID.findRev(".") != -1 ) ) ) && !( - ( m->scopedID.tqcontains( ".subdir" ) ) - && variableValues("SUBDIRS").tqfindIndex(m->scopedID.left( m->scopedID.tqfindRev(".") != -1 ) ) + ( m->scopedID.contains( ".subdir" ) ) + && variableValues("SUBDIRS").findIndex(m->scopedID.left( m->scopedID.findRev(".") != -1 ) ) ) ) { @@ -1056,11 +1056,11 @@ void Scope::updateCustomVariable( unsigned int id, const TQString& name, const T { if( !m_root ) return; - if ( id > 0 && m_customVariables.tqcontains( id ) ) + if ( id > 0 && m_customVariables.contains( id ) ) { m_customVariables[ id ] ->values.clear(); updateValues( m_customVariables[ id ] ->values, newvalues.stripWhiteSpace() ); - if( m_varCache.tqcontains( m_customVariables[ id ]->scopedID ) ) + if( m_varCache.contains( m_customVariables[ id ]->scopedID ) ) m_varCache.erase( m_customVariables[ id ]->scopedID ); m_customVariables[ id ] ->op = newop; m_customVariables[ id ] ->scopedID = name; @@ -1084,7 +1084,7 @@ unsigned int Scope::addCustomVariable( const TQString& var, const TQString& op, void Scope::removeCustomVariable( unsigned int id ) { - if( m_customVariables.tqcontains(id) ) + if( m_customVariables.contains(id) ) { TQMake::AssignmentAST* m = m_customVariables[id]; m_customVariables.remove(id); @@ -1220,20 +1220,20 @@ Scope* Scope::disableSubproject( const TQString& dir) if( !m_root || ( m_root->isProject() && !m_incast ) ) return 0; - if( scopeType() != Scope::IncludeScope && variableValuesForOp( "SUBDIRS", "+=").tqfindIndex( dir ) != -1 ) + if( scopeType() != Scope::IncludeScope && variableValuesForOp( "SUBDIRS", "+=").findIndex( dir ) != -1 ) removeFromPlusOp( "SUBDIRS", dir ); else if( scopeType() != Scope::IncludeScope ) removeFromPlusOp( "SUBDIRS", dir ); TQDir curdir( projectDir() ); - if ( variableValues("TEMPLATE").tqfindIndex( "subdirs" ) != -1 ) + if ( variableValues("TEMPLATE").findIndex( "subdirs" ) != -1 ) { curdir.cd(dir); TQString filename; TQStringList entries = curdir.entryList("*.pro", TQDir::Files); - if ( !entries.isEmpty() && entries.tqfindIndex( curdir.dirName()+".pro" ) != -1 ) + if ( !entries.isEmpty() && entries.findIndex( curdir.dirName()+".pro" ) != -1 ) filename = curdir.absPath() + TQString(TQChar(TQDir::separator()))+entries.first(); else filename = curdir.absPath() + TQString(TQChar(TQDir::separator()))+curdir.dirName()+".pro"; @@ -1285,7 +1285,7 @@ TQStringList Scope::resolveVariables( const TQStringList& values, TQMake::AST* s pos = re.search( (*it), pos ); if( pos > -1 ) { - if( !variables.tqcontains( re.cap(1) ) ) + if( !variables.contains( re.cap(1) ) ) { variables[re.cap(1)] = resolveVariables( variableValues( re.cap(1), stopHere ) ); if( variables[re.cap(1)].isEmpty() && re.cap(1) == "TARGET" ) @@ -1303,7 +1303,7 @@ TQStringList Scope::resolveVariables( const TQStringList& values, TQMake::AST* s pos = re.search( (*it), pos ); if( pos > -1 ) { - if( !variables.tqcontains( re.cap(1) ) ) + if( !variables.contains( re.cap(1) ) ) { variables[re.cap(1)] = resolveVariables( variableValues( re.cap(1), stopHere ) ); if( variables[re.cap(1)].isEmpty() && re.cap(1) == "TARGET" ) @@ -1322,8 +1322,8 @@ TQStringList Scope::resolveVariables( const TQStringList& values, TQMake::AST* s pos = re.search( (*it), pos ); if( pos > -1 ) { - if( !envvars.tqcontains( re.cap(1) ) ) - if( m_environment.tqcontains( re.cap(1) ) != -1 ) + if( !envvars.contains( re.cap(1) ) ) + if( m_environment.contains( re.cap(1) ) != -1 ) envvars[re.cap(1)] = m_environment[ re.cap(1) ]; else if ( ::getenv( re.cap(1).local8Bit() ) != 0 ) envvars[re.cap(1)] = TQString::fromLocal8Bit( ::getenv( re.cap(1).local8Bit() ) ); @@ -1332,14 +1332,14 @@ TQStringList Scope::resolveVariables( const TQStringList& values, TQMake::AST* s } for( TQMap::const_iterator it2 = envvars.begin(); it2 != envvars.end(); ++it2 ) { - (*it).tqreplace("$$("+it2.key()+")", it2.data() ); + (*it).replace("$$("+it2.key()+")", it2.data() ); } for( TQMap::const_iterator it2 = variables.begin(); it2 != variables.end(); ++it2 ) { for( TQStringList::const_iterator it3 = it2.data().begin(); it3 != it2.data().end(); ++it3 ) { - (*it).tqreplace("$$"+it2.key(), *it3 ); - (*it).tqreplace("$${"+it2.key()+"}", *it3 ); + (*it).replace("$$"+it2.key(), *it3 ); + (*it).replace("$${"+it2.key()+"}", *it3 ); } } } @@ -1353,7 +1353,7 @@ void Scope::allFiles( const TQString& projectDirectory, std::set& res TQString file; TQStringList values; TQString header = ""; - if( variableValues("TEMPLATE",false ).tqfindIndex("subdirs") == -1 ) + if( variableValues("TEMPLATE",false ).findIndex("subdirs") == -1 ) { values = variableValues( "INSTALLS" ,false, false ); TQStringList::const_iterator it; @@ -1368,7 +1368,7 @@ void Scope::allFiles( const TQString& projectDirectory, std::set& res { file = myRelPath + TQString(TQChar(TQDir::separator())) + *filesit; file = resolveVariables( file ); - if( file.tqcontains("*") ) + if( file.contains("*") ) { TQFileInfo fi( projectDirectory + TQString( TQChar( TQDir::separator() ) ) + file ); TQDir absDir = fi.dir( true ); @@ -1408,7 +1408,7 @@ void Scope::allFiles( const TQString& projectDirectory, std::set& res { file = myRelPath + TQString(TQChar(TQDir::separator())) + *it; file = resolveVariables( file ); - if( file.tqcontains("*") ) + if( file.contains("*") ) { TQFileInfo fi( projectDirectory + TQString( TQChar( TQDir::separator() ) ) + file ); TQDir absDir = fi.dir( true ); @@ -1493,7 +1493,7 @@ void Scope::allFiles( const TQString& projectDirectory, std::set& res else { header = projectDir()+TQString(TQChar(TQDir::separator())) + "ui_" +*it; - header.tqreplace(TQRegExp("\\.ui$"),".h"); + header.replace(TQRegExp("\\.ui$"),".h"); if( TQFileInfo(header).exists() ) res.insert( TQDir::cleanDirPath( header ) ); } @@ -1595,13 +1595,13 @@ TQString Scope::getLineEndingString() const TQString Scope::replaceWs(TQString s) { - return s.tqreplace( getLineEndingString(), "%nl").tqreplace("\t", "%tab").tqreplace(" ", "%spc"); + return s.replace( getLineEndingString(), "%nl").replace("\t", "%tab").replace(" ", "%spc"); } bool Scope::containsContinue(const TQString& s ) const { - return( s.tqfind( TQRegExp( "\\\\\\s*"+getLineEndingString() ) ) != -1 - || s.tqfind( TQRegExp( "\\\\\\s*#" ) ) != -1 ); + return( s.find( TQRegExp( "\\\\\\s*"+getLineEndingString() ) ) != -1 + || s.find( TQRegExp( "\\\\\\s*#" ) ) != -1 ); } bool Scope::isComment( const TQString& s) const @@ -1670,7 +1670,7 @@ void Scope::PrintAST::leaveFunctionScope( TQMake::ProjectAST* p ) TQString Scope::PrintAST::replaceWs(TQString s) { - return s.tqreplace("\n", "%nl").tqreplace("\t", "%tab").tqreplace(" ", "%spc"); + return s.replace("\n", "%nl").replace("\t", "%tab").replace(" ", "%spc"); } void Scope::PrintAST::processAssignment( TQMake::AssignmentAST* a) @@ -1707,4 +1707,4 @@ TQString Scope::PrintAST::getIndent() } #endif -// 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 diff --git a/buildtools/qmake/scope.h b/buildtools/qmake/scope.h index a01adaad..8140b5e6 100644 --- a/buildtools/qmake/scope.h +++ b/buildtools/qmake/scope.h @@ -304,5 +304,5 @@ private: #endif -// 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 diff --git a/buildtools/qmake/trollprojectpart.cpp b/buildtools/qmake/trollprojectpart.cpp index 54d31735..5cb9260a 100644 --- a/buildtools/qmake/trollprojectpart.cpp +++ b/buildtools/qmake/trollprojectpart.cpp @@ -479,8 +479,8 @@ TQString TrollProjectPart::runDirectory() const }else { TQString name = m_widget->getCurrentOutputFilename(); - if( name.tqfindRev("/") != -1 ) - name = name.right( name.length()-name.tqfindRev("/")-1 ); + if( name.findRev("/") != -1 ) + name = name.right( name.length()-name.findRev("/")-1 ); cwd = DomUtil::readEntry( dom, "/kdevtrollproject/run/cwd/" + name ); } if( cwd.isEmpty() ) @@ -490,7 +490,7 @@ TQString TrollProjectPart::runDirectory() const { destpath = m_widget->subprojectDirectory() + TQString( TQChar( TQDir::separator() ) ) + destpath; } - destpath = destpath.left( destpath.tqfindRev("/") ); + destpath = destpath.left( destpath.findRev("/") ); cwd = destpath; } @@ -538,7 +538,7 @@ TQString TrollProjectPart::mainProgram() const return TQString(); } - if ( m_widget->currentSubproject()->scope->variableValues("TEMPLATE").tqfindIndex("app") == -1 ) + if ( m_widget->currentSubproject()->scope->variableValues("TEMPLATE").findIndex("app") == -1 ) { KMessageBox::error( m_widget, "Selected Subproject \""+m_widget->currentSubproject()->scope->projectName()+"\"isn't binary ( " + m_widget->currentSubproject()->scope->variableValues("TEMPLATE").join(" ") + " ) !\n" "Unable to determine the main program. If you want this\n" @@ -715,9 +715,9 @@ void TrollProjectPart::startTQMakeCommand(const TQString &dir, bool recursive) TQDir d(dir); TQStringList l = d.entryList("*.pro"); - if( l.isEmpty() || ( l.count() && l.tqfindIndex( projectName() + ".pro" ) != -1 ) ) + if( l.isEmpty() || ( l.count() && l.findIndex( projectName() + ".pro" ) != -1 ) ) cmdline += projectName()+".pro"; - else if( l.isEmpty() || (l.count() && l.tqfindIndex( fi.baseName() + ".pro" ) != -1 ) ) + else if( l.isEmpty() || (l.count() && l.findIndex( fi.baseName() + ".pro" ) != -1 ) ) cmdline += fi.baseName() + ".pro"; else cmdline += l[0]; @@ -778,7 +778,7 @@ bool TrollProjectPart::isDirty() TQString fileName = *it; ++it; - TQMap::Iterator it = m_timestamp.tqfind( fileName ); + TQMap::Iterator it = m_timestamp.find( fileName ); TQDateTime t = TQFileInfo( projectDirectory(), fileName ).lastModified(); if( it == m_timestamp.end() || *it != t ){ return true; @@ -813,14 +813,14 @@ void TrollProjectPart::buildBinDirs( TQStringList & dirs ) const TQStringList paths = TQStringList::split(":",::getenv("PATH")); dirs += paths; TQString binpath = TQDir::rootDirPath() + "bin"; - if( dirs.tqfindIndex( binpath ) != -1 ) + if( dirs.findIndex( binpath ) != -1 ) dirs << binpath; binpath = TQDir::rootDirPath() + "usr" + TQString( TQChar( TQDir::separator() ) ) + "bin"; - if( dirs.tqfindIndex( binpath ) != -1 ) + if( dirs.findIndex( binpath ) != -1 ) dirs << binpath; binpath = TQDir::rootDirPath() + "usr" + TQString( TQChar( TQDir::separator() ) ) + "local" + TQString( TQChar( TQDir::separator() ) ) + "bin"; - if( dirs.tqfindIndex( binpath ) != -1 ) + if( dirs.findIndex( binpath ) != -1 ) dirs << binpath; } @@ -874,8 +874,8 @@ TQStringList recursiveProFind( const TQString &currDir, const TQString &baseDir { TQStringList fileList; - if( !currDir.tqcontains( TQString( TQChar ( TQDir::separator() ) ) +".." ) - && !currDir.tqcontains( TQString( TQChar( TQDir::separator() ) )+".") ) + if( !currDir.contains( TQString( TQChar ( TQDir::separator() ) ) +".." ) + && !currDir.contains( TQString( TQChar( TQDir::separator() ) )+".") ) { TQDir dir(currDir); TQStringList dirList = dir.entryList(TQDir::Dirs ); @@ -926,6 +926,6 @@ void TrollProjectPart::slotBuild() #include "trollprojectpart.moc" -//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 diff --git a/buildtools/qmake/trollprojectwidget.cpp b/buildtools/qmake/trollprojectwidget.cpp index 148f8b22..4baf0b6b 100644 --- a/buildtools/qmake/trollprojectwidget.cpp +++ b/buildtools/qmake/trollprojectwidget.cpp @@ -339,9 +339,9 @@ void TrollProjectWidget::openProject( const TQString &dirName ) TQStringList l = dir.entryList( "*.pro" ); TQString profile; - if( l.count() && l.tqfindIndex( m_part->projectName() + ".pro") != -1 ) + if( l.count() && l.findIndex( m_part->projectName() + ".pro") != -1 ) profile = m_part->projectName()+".pro"; - else if( l.isEmpty() || ( l.count() && l.tqfindIndex( fi.baseName() + ".pro") != -1 ) ) + else if( l.isEmpty() || ( l.count() && l.findIndex( fi.baseName() + ".pro") != -1 ) ) profile = fi.baseName()+".pro"; else profile = l[0]; @@ -362,7 +362,7 @@ void TrollProjectWidget::openProject( const TQString &dirName ) m_rootSubproject->setOpen( true ); - if ( m_rootSubproject->firstChild() && m_rootSubproject->scope->variableValues( "TEMPLATE" ).tqfindIndex("subdirs") != -1 ) + if ( m_rootSubproject->firstChild() && m_rootSubproject->scope->variableValues( "TEMPLATE" ).findIndex("subdirs") != -1 ) { overview->setSelected( m_rootSubproject->firstChild(), true ); } @@ -433,11 +433,11 @@ void TrollProjectWidget::setupContext() TQStringList tmpl = m_shownSubproject->scope->variableValues( "TEMPLATE" ); - if ( tmpl.tqfindIndex( "lib" ) != -1 ) + if ( tmpl.findIndex( "lib" ) != -1 ) { runable = false; } - else if ( tmpl.tqfindIndex( "subdirs" ) != -1 ) + else if ( tmpl.findIndex( "subdirs" ) != -1 ) { hasSubdirs = true; runable = false; @@ -519,7 +519,7 @@ TQString TrollProjectWidget::getCurrentOutputFilename() if ( m_shownSubproject->scope->variableValues( "TARGET", true, true, true ).isEmpty() ) { TQString exe = m_shownSubproject->scope->resolveVariables(m_shownSubproject->scope->fileName()); - return exe.tqreplace( TQRegExp( "\\.pro$" ), "" ); + return exe.replace( TQRegExp( "\\.pro$" ), "" ); } else { @@ -557,7 +557,7 @@ void TrollProjectWidget::buildProjectDetailTree( QMakeScopeItem *item, KListView { // Insert all GroupItems and all of their tqchildren into the view - if ( !listviewControl || item->scope->variableValues( "TEMPLATE" ).tqfindIndex("subdirs") != -1 ) + if ( !listviewControl || item->scope->variableValues( "TEMPLATE" ).findIndex("subdirs") != -1 ) return ; TQMapIterator it2 = item->groups.begin(); @@ -669,7 +669,7 @@ void TrollProjectWidget::slotExecuteTarget() // Only run application projects - if ( !m_shownSubproject->scope->variableValues( "TEMPLATE" ).isEmpty() && m_shownSubproject->scope->variableValues( "TEMPLATE" ).tqfindIndex( "app" ) == -1 ) + if ( !m_shownSubproject->scope->variableValues( "TEMPLATE" ).isEmpty() && m_shownSubproject->scope->variableValues( "TEMPLATE" ).findIndex( "app" ) == -1 ) return ; //only run once @@ -913,7 +913,7 @@ void TrollProjectWidget::addSubprojectToItem( QMakeScopeItem* spitem, const TQSt { spitem->scope->removeFromMinusOp( "SUBDIRS", subdirname ); delete item; - if( spitem->scope->variableValues( "SUBDIRS" ).tqfindIndex( subdirname ) != -1 ) + if( spitem->scope->variableValues( "SUBDIRS" ).findIndex( subdirname ) != -1 ) return; } } @@ -1026,7 +1026,7 @@ void TrollProjectWidget::slotOverviewContextMenu( KListView *, TQListViewItem *i popup.tqsetWhatsThis( idAddSubproject, i18n( "Add subproject

Creates a new or adds an existing subproject to a currently selected subproject. " "This action is allowed only if a type of the subproject is 'subdirectories'. The type of the subproject can be " "defined in Subproject Settings dialog (open it from the subproject context menu)." ) ); - if ( spitem->scope->variableValues( "TEMPLATE" ).tqfindIndex( "subdirs" ) == -1 ) + if ( spitem->scope->variableValues( "TEMPLATE" ).findIndex( "subdirs" ) == -1 ) popup.setItemEnabled( idAddSubproject, false ); idRemoveSubproject = popup.insertItem( SmallIcon( "remove_subdir" ), i18n( "Remove Subproject..." ) ); popup.tqsetWhatsThis( idRemoveSubproject, i18n( "Remove subproject

Removes currently selected subproject. Does not delete any file from disk. Deleted subproject can be later added by calling 'Add Subproject' action." ) ); @@ -1051,11 +1051,11 @@ void TrollProjectWidget::slotOverviewContextMenu( KListView *, TQListViewItem *i popup.tqsetWhatsThis( idAddSubproject, i18n( "Add subproject

Creates a new or adds an existing subproject to the currently selected scope. " "This action is allowed only if the type of the subproject is 'subdirectories'. The type of the subproject can be " "defined in the Subproject Settings dialog (open it from the subproject context menu)." ) ); - if ( spitem->scope->variableValues( "TEMPLATE" ).tqfindIndex( "subdirs" ) == -1 ) + if ( spitem->scope->variableValues( "TEMPLATE" ).findIndex( "subdirs" ) == -1 ) popup.setItemEnabled( idAddSubproject, false ); idDisableSubproject = popup.insertItem( SmallIcon( "remove_subdir" ), i18n( "Disable Subproject..." ) ); popup.tqsetWhatsThis( idRemoveSubproject, i18n( "Disable subproject

Disables the currently selected subproject when this scope is active. Does not delete the directory from disk. The deleted subproject can be later added by using the 'Add Subproject' action." ) ); - if( spitem->scope->variableValues( "TEMPLATE" ).tqfindIndex( "subdirs" ) == -1 && spitem->scope->tqparent()->variableValues( "TEMPLATE" ).tqfindIndex( "subdirs" ) == -1 ) + if( spitem->scope->variableValues( "TEMPLATE" ).findIndex( "subdirs" ) == -1 && spitem->scope->tqparent()->variableValues( "TEMPLATE" ).findIndex( "subdirs" ) == -1 ) popup.setItemEnabled( idDisableSubproject, false ); popup.insertSeparator(); idProjectConfiguration = popup.insertItem( SmallIcon( "configure" ), i18n( "Scope Settings" ) ); @@ -1144,7 +1144,7 @@ void TrollProjectWidget::addFileToCurrentSubProject( GroupItem::GroupType gtype, GroupItem *gitem = 0; - if ( m_shownSubproject->groups.tqcontains( gtype ) ) + if ( m_shownSubproject->groups.contains( gtype ) ) gitem = m_shownSubproject->groups[ gtype ]; if ( !gitem ) @@ -1170,12 +1170,12 @@ void TrollProjectWidget::addFiles( TQStringList &files, bool relativeToProjectRo TQString fileName = *it; kdDebug(9024) << "Adding file:" << fileName << " " << relativeToProjectRoot << endl; - if ( m_shownSubproject->scope->variableValues( "TEMPLATE" ).tqfindIndex( "subdirs" ) != -1 && !fileName.endsWith(".pro") ) + if ( m_shownSubproject->scope->variableValues( "TEMPLATE" ).findIndex( "subdirs" ) != -1 && !fileName.endsWith(".pro") ) { ChooseSubprojectDlg dlg( this, false ); if ( dlg.exec() == TQDialog::Accepted ) { - if ( dlg.selectedSubproject() && dlg.selectedSubproject()->scope->variableValues("TEMPLATE").tqfindIndex( "subdirs" ) != -1 ) + if ( dlg.selectedSubproject() && dlg.selectedSubproject()->scope->variableValues("TEMPLATE").findIndex( "subdirs" ) != -1 ) { fileName = URLUtil::getRelativePath( dlg.selectedSubproject()->scope->projectDir() , TQDir::cleanDirPath( @@ -1213,7 +1213,7 @@ void TrollProjectWidget::addFiles( TQStringList &files, bool relativeToProjectRo kdDebug(9024) << "calc filename:" << noPathFileName << endl; // GroupItem *gitem = 0; // GroupItem::GroupType gtype = GroupItem::groupTypeForExtension( ext ); -// if ( m_shownSubproject->groups.tqcontains( gtype ) ) +// if ( m_shownSubproject->groups.contains( gtype ) ) // gitem = m_shownSubproject->groups[ gtype ]; @@ -1307,7 +1307,7 @@ void TrollProjectWidget::slotAddFiles() *proc << files[ i ]; *proc << cleanSubprojectDir; proc->start(KProcess::Block); - TQString filename = files[ i ].right( files[ i ].length() - files[ i ].tqfindRev( '/' ) - 1 ); + TQString filename = files[ i ].right( files[ i ].length() - files[ i ].findRev( '/' ) - 1 ); // and add them to the filelist TQFile testExist( cleanSubprojectDir + TQString( TQChar( TQDir::separator() ) ) + filename ); if ( testExist.exists() ) @@ -1333,7 +1333,7 @@ void TrollProjectWidget::slotAddFiles() GroupItem* TrollProjectWidget::getInstallRoot( QMakeScopeItem* item ) { - if ( item->groups.tqcontains( GroupItem::InstallRoot ) ) + if ( item->groups.contains( GroupItem::InstallRoot ) ) return item->groups[ GroupItem::InstallRoot ]; return 0; } @@ -1651,7 +1651,7 @@ void TrollProjectWidget::slotDetailsContextMenu( KListView *, TQListViewItem *it *proc << files[ i ]; *proc << cleanSubprojectPath; proc->start(KProcess::Block); - TQString filename = files[ i ].right( files[ i ].length() - files[ i ].tqfindRev( '/' ) - 1 ); + TQString filename = files[ i ].right( files[ i ].length() - files[ i ].findRev( '/' ) - 1 ); // and add them to the filelist TQFile testExist( cleanSubprojectPath + TQString( TQChar( TQDir::separator() ) ) + filename ); if ( testExist.exists() ) @@ -1776,7 +1776,7 @@ void TrollProjectWidget::slotDetailsContextMenu( KListView *, TQListViewItem *it popup.tqsetWhatsThis( idUpdateWidgetclass, i18n( "Edit ui-subclass

Launches Subclassing wizard " "and prompts to implement missing in childclass slots and functions." ) ); } - if ( fitem->text( 0 ).tqcontains( ".ui" ) ) + if ( fitem->text( 0 ).contains( ".ui" ) ) { idSubclassWidget = popup.insertItem( SmallIconSet( "qmake_subclass" ), i18n( "Subclassing Wizard..." ) ); popup.tqsetWhatsThis( idSubclassWidget, i18n( "Subclass widget

Launches Subclassing wizard. " @@ -1827,9 +1827,9 @@ void TrollProjectWidget::slotDetailsContextMenu( KListView *, TQListViewItem *it } else if ( r == idViewUIH ) { - kdDebug(9024) << "Opening:" << fitem->text(0) << ";" << fitem->text(0).tqreplace(".ui","") << endl; + kdDebug(9024) << "Opening:" << fitem->text(0) << ";" << fitem->text(0).replace(".ui","") << endl; m_part->partController() ->editDocument( KURL( m_shownSubproject->scope->projectDir() + TQChar( TQDir::separator() ) + - fitem->localFilePath.tqreplace(".ui","") + ".h" ) ); + fitem->localFilePath.replace(".ui","") + ".h" ) ); } else if ( r == idSubclassWidget ) @@ -1850,7 +1850,7 @@ void TrollProjectWidget::slotDetailsContextMenu( KListView *, TQListViewItem *it list << DomUtil::Pair( srcfile_relpath, uifile_relpath ); DomUtil::writePairListEntry( dom, "/kdevtrollproject/subclassing", "subclass", "sourcefile", "uifile", list ); - // newFileNames[i] = newFileNames[i].tqreplace(TQRegExp(projectDirectory()+"/"),""); + // newFileNames[i] = newFileNames[i].replace(TQRegExp(projectDirectory()+"/"),""); qWarning( "new file: %s", newFileNames[ i ].latin1() ); } m_subclasslist = DomUtil::readPairListEntry( dom, "/kdevtrollproject/subclassing" , @@ -1862,11 +1862,11 @@ void TrollProjectWidget::slotDetailsContextMenu( KListView *, TQListViewItem *it else if ( r == idUpdateWidgetclass ) { TQString noext = fitem->text( 0 ); - if ( noext.tqfindRev( '.' ) > -1 ) - noext = noext.left( noext.tqfindRev( '.' ) ); + if ( noext.findRev( '.' ) > -1 ) + noext = noext.left( noext.findRev( '.' ) ); TQStringList dummy; TQString uifile = fitem->uiFileLink; - if ( uifile.tqfindRev( TQString( TQChar( TQDir::separator() ) ) ) > -1 ) + if ( uifile.findRev( TQString( TQChar( TQDir::separator() ) ) ) > -1 ) { TQStringList uisplit = TQStringList::split( TQString( TQChar( TQDir::separator() ) ), uifile ); uifile = uisplit[ uisplit.count() - 1 ]; @@ -2426,7 +2426,7 @@ void TrollProjectWidget::slotDisableSubproject( QMakeScopeItem* spitem ) m_filesCached = false; m_allFilesCache.clear(); - if( spitem->scope->variableValues("TEMPLATE").tqfindIndex("subdirs") != -1 ) + if( spitem->scope->variableValues("TEMPLATE").findIndex("subdirs") != -1 ) { TQStringList subdirs = spitem->scope->variableValues( "SUBDIRS" ); DisableSubprojectDlg dlg( subdirs ); @@ -2436,7 +2436,7 @@ void TrollProjectWidget::slotDisableSubproject( QMakeScopeItem* spitem ) TQListViewItem* item = spitem->firstChild(); while( item ) { - if( values.tqfindIndex( item->text(0) ) != -1 ) + if( values.findIndex( item->text(0) ) != -1 ) delete item; item = item->nextSibling(); } @@ -2543,5 +2543,5 @@ TQMap TrollProjectWidget::qmakeEnvironment() const #include "trollprojectwidget.moc" -//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 diff --git a/buildtools/qmake/trollprojectwidget.h b/buildtools/qmake/trollprojectwidget.h index d5e86a17..5d07c798 100644 --- a/buildtools/qmake/trollprojectwidget.h +++ b/buildtools/qmake/trollprojectwidget.h @@ -216,4 +216,4 @@ private: #endif -// 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 -- cgit v1.2.3