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/autotools/autosubprojectview.cpp | 38 ++++++++++++++--------------- 1 file changed, 19 insertions(+), 19 deletions(-) (limited to 'buildtools/autotools/autosubprojectview.cpp') diff --git a/buildtools/autotools/autosubprojectview.cpp b/buildtools/autotools/autosubprojectview.cpp index e1d15d90..f6d22a77 100644 --- a/buildtools/autotools/autosubprojectview.cpp +++ b/buildtools/autotools/autosubprojectview.cpp @@ -60,7 +60,7 @@ namespace AutoProjectPrivate bool isHeader( const TQString& fileName ) { - return TQStringList::split( ";", "h;H;hh;hxx;hpp;tcc;h++" ).tqcontains( TQFileInfo(fileName).extension(false) ); + return TQStringList::split( ";", "h;H;hh;hxx;hpp;tcc;h++" ).contains( TQFileInfo(fileName).extension(false) ); } static TQString cleanWhitespace( const TQString &str ) @@ -317,7 +317,7 @@ void AutoSubprojectView::slotContextMenu( KListView *, TQListViewItem *item, con } int id = popup.insertItem(it.key(), this, TQT_SLOT(slotCustomBuildCommand(int))); m_commandList.append(it.data()); - popup.setItemParameter(id, m_commandList.tqfindIndex(it.data())); + popup.setItemParameter(id, m_commandList.findIndex(it.data())); } popup.insertSeparator(); @@ -440,11 +440,11 @@ void AutoSubprojectView::slotRemoveSubproject() } TQStringList list = TQStringList::split( TQRegExp("[ \t]"), tqparent->variables["SUBDIRS"] ); - TQStringList::Iterator it = list.tqfind( spitem->subdir ); + TQStringList::Iterator it = list.find( spitem->subdir ); TQString subdirToRemove = spitem->subdir; bool topsubdirs = true; - if ((tqparent->variables["SUBDIRS"].tqfind("$(TOPSUBDIRS)") == -1) - && (tqparent->variables["SUBDIRS"].tqfind("$(AUTODIRS)") == -1)) + if ((tqparent->variables["SUBDIRS"].find("$(TOPSUBDIRS)") == -1) + && (tqparent->variables["SUBDIRS"].find("$(AUTODIRS)") == -1)) { topsubdirs = false; if( it == list.end() ){ @@ -483,7 +483,7 @@ void AutoSubprojectView::slotRemoveSubproject() TQString projroot = m_part->projectDirectory() + "/"; TQString subdirectory = spitem->path; - TQString relpath = subdirectory.tqreplace(0, projroot.length(),""); + TQString relpath = subdirectory.replace(0, projroot.length(),""); TQString configureFile = m_part->getAutoConfFile(projroot); @@ -511,7 +511,7 @@ void AutoSubprojectView::slotRemoveSubproject() // Adjust SUBDIRS variable in containing Makefile.am - if (tqparent->variables["SUBDIRS"].tqfind("$(TOPSUBDIRS)") != -1) + if (tqparent->variables["SUBDIRS"].find("$(TOPSUBDIRS)") != -1) { TQFile subdirsfile( tqparent->path + "/subdirs" ); TQStringList topdirs; @@ -563,7 +563,7 @@ void AutoSubprojectView::parsePrimary( SubprojectItem *item, { // Parse line foo_bar = bla bla - int pos = lhs.tqfindRev( '_' ); + int pos = lhs.findRev( '_' ); TQString prefix = lhs.left( pos ); TQString primary = lhs.right( lhs.length() - pos - 1 ); // kdDebug(9020) << "Prefix:" << prefix << ",Primary:" << primary << endl; @@ -707,7 +707,7 @@ void AutoSubprojectView::parseKDEICON( SubprojectItem *item, { // Parse a line foo_ICON = bla bla - int pos = lhs.tqfind( "_ICON" ); + int pos = lhs.find( "_ICON" ); TQString prefix = lhs.left( pos ); if ( prefix == "KDE" ) prefix = "kde_icon"; @@ -766,7 +766,7 @@ void AutoSubprojectView::parseSUBDIRS( SubprojectItem *item, // Take care of KDE hacks: // TOPSUBDIRS is an alias for all directories // listed in the subdirs file - if ( subdirs.tqfind( "$(TOPSUBDIRS)" ) != -1 ) + if ( subdirs.find( "$(TOPSUBDIRS)" ) != -1 ) { TQStringList dirs; TQFile subdirsfile( item->path + "/subdirs" ); @@ -795,18 +795,18 @@ void AutoSubprojectView::parseSUBDIRS( SubprojectItem *item, } } - subdirs.tqreplace( TQRegExp( "\\$\\(TOPSUBDIRS\\)" ), dirs.join( " " ) ); + subdirs.replace( TQRegExp( "\\$\\(TOPSUBDIRS\\)" ), dirs.join( " " ) ); } // AUTODIRS is an alias for all subdirectories - if ( subdirs.tqfind( "$(AUTODIRS)" ) != -1 ) + if ( subdirs.find( "$(AUTODIRS)" ) != -1 ) { TQDir d( item->path ); TQStringList dirs = d.entryList( TQDir::Dirs ); dirs.remove( "." ); dirs.remove( ".." ); dirs.remove( "CVS" ); - subdirs.tqreplace( TQRegExp( "\\$\\(AUTODIRS\\)" ), dirs.join( " " ) ); + subdirs.replace( TQRegExp( "\\$\\(AUTODIRS\\)" ), dirs.join( " " ) ); } // If there are any variables in the subdirs line then search @@ -822,7 +822,7 @@ void AutoSubprojectView::parseSUBDIRS( SubprojectItem *item, // Search the whole Makefile(.am?) // Note that if the variable isn't found it just disappears // (Perhaps we should add it back in this case?) - TQMap::ConstIterator varit = item->variables.tqfind( varname ); + TQMap::ConstIterator varit = item->variables.find( varname ); if ( varit != item->variables.end() ) { kdDebug( 9020 ) << "Found Makefile var " << varname << ", adding dirs <" << varit.data() << ">" << endl; @@ -832,7 +832,7 @@ void AutoSubprojectView::parseSUBDIRS( SubprojectItem *item, { kdDebug( 9020 ) << "Not found Makefile var " << varname << endl; } - subdirs.tqreplace( TQRegExp( "\\$\\(\\s*" + varname + "\\s*\\)" ), varvalue ); + subdirs.replace( TQRegExp( "\\$\\(\\s*" + varname + "\\s*\\)" ), varvalue ); } //search for AC_SUBST variables and try to replace them with variables @@ -847,7 +847,7 @@ void AutoSubprojectView::parseSUBDIRS( SubprojectItem *item, // Search the whole Makefile(.am?) // Note that if the variable isn't found it just disappears // (Perhaps we should add it back in this case?) - TQMap::ConstIterator varit = item->variables.tqfind( varname ); + TQMap::ConstIterator varit = item->variables.find( varname ); if ( varit != item->variables.end() ) { kdDebug( 9020 ) << "Found Makefile var " << varname << ", adding dirs <" << varit.data() << ">" << endl; @@ -857,7 +857,7 @@ void AutoSubprojectView::parseSUBDIRS( SubprojectItem *item, { kdDebug( 9020 ) << "Not found Makefile var " << varname << endl; } - subdirs.tqreplace( TQRegExp( "\\@" + varname + "\\@" ), varvalue ); + subdirs.replace( TQRegExp( "\\@" + varname + "\\@" ), varvalue ); } TQStringList l = TQStringList::split( TQRegExp( "[ \t]" ), subdirs ); @@ -914,7 +914,7 @@ void AutoSubprojectView::parse( SubprojectItem *item ) parseKDEDOCS( item, lhs, rhs ); else if ( lhs.right( 5 ) == "_ICON" ) parseKDEICON( item, lhs, rhs ); - else if ( lhs.tqfind( '_' ) > 0 ) + else if ( lhs.find( '_' ) > 0 ) parsePrimary( item, lhs, rhs ); else if ( lhs.right( 3 ) == "dir" ) parsePrefix( item, lhs, rhs ); @@ -937,7 +937,7 @@ void AutoSubprojectView::parse( SubprojectItem *item ) TQString fname = *fileIt; ++fileIt; - if( AutoProjectPrivate::isHeader(fname) && !headers.tqcontains(fname) ){ + if( AutoProjectPrivate::isHeader(fname) && !headers.contains(fname) ){ FileItem *fitem = m_widget->createFileItem( fname, item ); noinst_HEADERS_item->sources.append( fitem ); } -- cgit v1.2.1