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

17 files changed, 88 insertions, 88 deletions

diff --git a/buildtools/autotools/addexistingdirectoriesdlg.cpp b/buildtools/autotools/addexistingdirectoriesdlg.cpp
index 19d400fb..eaca2161 100644
--- a/buildtools/autotools/addexistingdirectoriesdlg.cpp
+++ b/buildtools/autotools/addexistingdirectoriesdlg.cpp
@@ -186,7 +186,7 @@ void AddExistingDirectoriesDialog::slotOk()
         TQString name = *it;
 
         // Adjust SUBDIRS variable in containing Makefile.am
-        if (m_spitem->variables["SUBDIRS"].tqfind("$(TOPSUBDIRS)") != -1)
+        if (m_spitem->variables["SUBDIRS"].find("$(TOPSUBDIRS)") != -1)
         {
             TQFile subdirsfile( m_spitem->path + "/subdirs" );
             if ( subdirsfile.open( IO_WriteOnly | IO_Append ) )
@@ -196,7 +196,7 @@ void AddExistingDirectoriesDialog::slotOk()
                 subdirsfile.close();
             }
         }
-        else if (m_spitem->variables["SUBDIRS"].tqfind("$(AUTODIRS)") != -1)
+        else if (m_spitem->variables["SUBDIRS"].find("$(AUTODIRS)") != -1)
         {
         }
         else
@@ -243,7 +243,7 @@ void AddExistingDirectoriesDialog::slotOk()
         if ( !m_part->isKDE() ) {
             TQString projroot = m_part->projectDirectory() + "/";
             TQString subdirectory = dir.path();
-            TQString relpath = subdirectory.tqreplace(0, projroot.length(),"");
+            TQString relpath = subdirectory.replace(0, projroot.length(),"");
 
             TQString configureFile = m_part->getAutoConfFile(projroot);
 
@@ -270,7 +270,7 @@ void AddExistingDirectoriesDialog::slotAddSelected()
         TQString relPath = URLUtil::extractPathNameRelative(m_part->projectDirectory(), ( *it )->url());
         if (relPath[relPath.length()-1] == '/')
             relPath = relPath.left(relPath.length()-1);
-        if ( (relPath.isEmpty()) || (! m_widget->allSubprojects().tqcontains( relPath )) )
+        if ( (relPath.isEmpty()) || (! m_widget->allSubprojects().contains( relPath )) )
         {
             m_importList.append ( ( *it ) );
         }
@@ -288,7 +288,7 @@ void AddExistingDirectoriesDialog::slotAddAll()
         TQString relPath = URLUtil::extractPathNameRelative(m_part->projectDirectory(), ( *it )->url());
         if (relPath[relPath.length()-1] == '/')
             relPath = relPath.left(relPath.length()-1);
-        if ( (relPath.isEmpty()) || ( ! m_widget->allSubprojects().tqcontains( relPath )) )
+        if ( (relPath.isEmpty()) || ( ! m_widget->allSubprojects().contains( relPath )) )
  		{
 			m_importList.append ( ( *it ) );
 		}
@@ -363,7 +363,7 @@ void AddExistingDirectoriesDialog::slotDropped ( TQDropEvent* ev )
         TQString relPath = URLUtil::extractPathNameRelative(m_part->projectDirectory(), *it);
         if (relPath[relPath.length()-1] == '/')
             relPath = relPath.left(relPath.length()-1);
-        if ( (relPath.isEmpty()) || ( ! m_widget->allSubprojects().tqcontains( relPath )) )
+        if ( (relPath.isEmpty()) || ( ! m_widget->allSubprojects().contains( relPath )) )
  		{
 			type = KMimeType::findByURL ( ( *it ) );
 
diff --git a/buildtools/autotools/addfiledlg.cpp b/buildtools/autotools/addfiledlg.cpp
index 407e5109..99e75ebf 100644
--- a/buildtools/autotools/addfiledlg.cpp
+++ b/buildtools/autotools/addfiledlg.cpp
@@ -68,7 +68,7 @@ AddFileDialog::~AddFileDialog()
 void AddFileDialog::accept()
 {
 	TQString name = fileEdit->text();
-	if (name.tqfind('/') != -1) {
+	if (name.find('/') != -1) {
 		KMessageBox::sorry(this, i18n("Please enter the file name without '/' and so on."));
 		return;
 	}
diff --git a/buildtools/autotools/addservicedlg.cpp b/buildtools/autotools/addservicedlg.cpp
index a53b2551..67903ebe 100644
--- a/buildtools/autotools/addservicedlg.cpp
+++ b/buildtools/autotools/addservicedlg.cpp
@@ -77,7 +77,7 @@ void AddServiceDialog::updateProperties()
             TQStringList stprops = type->propertyDefNames();
             TQStringList::ConstIterator stit;
             for (stit = stprops.begin(); stit != stprops.end(); ++stit)
-                if (props.tqfind(*stit) == props.end() && (*stit) != "Name" && (*stit) != "Comment"
+                if (props.find(*stit) == props.end() && (*stit) != "Name" && (*stit) != "Comment"
                     && (*stit) != "Icon")
                     props.append(*stit);
         }
diff --git a/buildtools/autotools/addsubprojectdlg.cpp b/buildtools/autotools/addsubprojectdlg.cpp
index bb0e5527..d9913af7 100644
--- a/buildtools/autotools/addsubprojectdlg.cpp
+++ b/buildtools/autotools/addsubprojectdlg.cpp
@@ -106,7 +106,7 @@ void AddSubprojectDialog::accept()
     }
 
     // Adjust SUBDIRS variable in containing Makefile.am
-    if (m_subProject->variables["SUBDIRS"].tqfind("$(TOPSUBDIRS)") != -1)
+    if (m_subProject->variables["SUBDIRS"].find("$(TOPSUBDIRS)") != -1)
     {
         TQFile subdirsfile( m_subProject->path + "/subdirs" );
         if ( subdirsfile.open( IO_WriteOnly | IO_Append ) )
@@ -116,7 +116,7 @@ void AddSubprojectDialog::accept()
             subdirsfile.close();
         }
     }
-    else if (m_subProject->variables["SUBDIRS"].tqfind("$(AUTODIRS)") != -1)
+    else if (m_subProject->variables["SUBDIRS"].find("$(AUTODIRS)") != -1)
     {
     }
     else
@@ -162,7 +162,7 @@ void AddSubprojectDialog::accept()
     if ( !m_part->isKDE() ) {
         TQString projroot = m_part->projectDirectory() + "/";
         TQString subdirectory = dir.path();
-        TQString relpath = subdirectory.tqreplace(0, projroot.length(),"");
+        TQString relpath = subdirectory.replace(0, projroot.length(),"");
 
         TQString configureFile = m_part->getAutoConfFile(projroot);
 
diff --git a/buildtools/autotools/autodetailsview.cpp b/buildtools/autotools/autodetailsview.cpp
index 7002b7c8..6f1f56e8 100644
--- a/buildtools/autotools/autodetailsview.cpp
+++ b/buildtools/autotools/autodetailsview.cpp
@@ -587,7 +587,7 @@ void AutoDetailsView::slotDetailsContextMenu( KListView *, TQListViewItem *item,
 		popup.tqsetWhatsThis(idViewUIH, i18n("<b>Open ui.h file</b><p>Opens .ui.h file "
 		                                   "associated with the selected .ui."));
 
-		if (!fitem->name.tqcontains(TQRegExp("ui$")) || fitem->is_subst == true)
+		if (!fitem->name.contains(TQRegExp("ui$")) || fitem->is_subst == true)
 		{
             popup.removeItem(idUISubclasses);
 			popup.removeItem(idViewUIH);
@@ -625,7 +625,7 @@ void AutoDetailsView::slotDetailsContextMenu( KListView *, TQListViewItem *item,
 					list << DomUtil::Pair(srcfile_relpath,uifile_relpath);
 					DomUtil::writePairListEntry(dom, "/kdevautoproject/subclassing",
 					                            "subclass", "sourcefile", "uifile", list);
-					newFileNames[i] = newFileNames[i].tqreplace(TQRegExp(m_part->projectDirectory()+"/"),"");
+					newFileNames[i] = newFileNames[i].replace(TQRegExp(m_part->projectDirectory()+"/"),"");
 				}
 				m_subclasslist = DomUtil::readPairListEntry(dom,"/kdevautoproject/subclassing",
 				                                            "subclass","sourcefile", "uifile");
@@ -636,13 +636,13 @@ void AutoDetailsView::slotDetailsContextMenu( KListView *, TQListViewItem *item,
 		{
 			TQString noext = m_widget->selectedSubproject()->path + "/" + fitem->name;
 
-			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('/')>-1)
+			if (uifile.findRev('/')>-1)
 			{
 				TQStringList uisplit = TQStringList::split('/',uifile);
 				uifile=uisplit[uisplit.count()-1];
diff --git a/buildtools/autotools/autolistviewitems.cpp b/buildtools/autotools/autolistviewitems.cpp
index 3fb0bffd..6e96bd4f 100644
--- a/buildtools/autotools/autolistviewitems.cpp
+++ b/buildtools/autotools/autolistviewitems.cpp
@@ -167,7 +167,7 @@ void FileItem::changeMakefileEntry(const TQString& new_name)
  		if ( SubprojectItem* subProject = lv->m_part->m_widget->selectedSubproject() )
 		{
 			TQStringList sources = TQStringList::split(TQRegExp("[ \t\n]"), subProject->variables[varname]);
-			TQStringList::iterator it = sources.tqfind(name);
+			TQStringList::iterator it = sources.find(name);
 			(*it) = new_name;
 			subProject->variables[varname] = sources.join(" ");
 			replaceMap.insert(varname, subProject->variables[varname]);
diff --git a/buildtools/autotools/autoprojectpart.cpp b/buildtools/autotools/autoprojectpart.cpp
index a2c500a4..15d6bc45 100644
--- a/buildtools/autotools/autoprojectpart.cpp
+++ b/buildtools/autotools/autoprojectpart.cpp
@@ -525,7 +525,7 @@ void AutoProjectPart::addFiles ( const TQStringList& fileList )
 
     for ( it = fileList.begin(); it != fileList.end(); ++it )
     {
-        int pos = ( *it ).tqfindRev('/');
+        int pos = ( *it ).findRev('/');
         if (pos != -1)
         {
             directory = ( *it ).left(pos);
@@ -597,7 +597,7 @@ TQString AutoProjectPart::currentBuildConfig() const
     TQDomDocument &dom = *projectDom();
 
     TQString config = DomUtil::readEntry(dom, "/kdevautoproject/general/useconfiguration");
-    if (config.isEmpty() || !allBuildConfigs().tqcontains(config))
+    if (config.isEmpty() || !allBuildConfigs().contains(config))
         config = "default";
 
     return config;
@@ -732,13 +732,13 @@ bool AutoProjectPart::queueInternalLibDependenciesBuild(TargetItem* titem, TQStr
             // These are the internal libraries
             dependency.remove("$(top_builddir)/");
 
-            if( !alreadyScheduledDeps.tqcontains(*l2it) )
+            if( !alreadyScheduledDeps.contains(*l2it) )
             {
                 alreadyScheduledDeps << *l2it;
                 tdir = buildDirectory();
                 if (!tdir.endsWith("/") && !tdir.isEmpty())
                     tdir += "/";
-                int pos = dependency.tqfindRev('/');
+                int pos = dependency.findRev('/');
                 if (pos == -1)
                 {
                     tname = dependency;
@@ -782,7 +782,7 @@ bool AutoProjectPart::queueInternalLibDependenciesBuild(TargetItem* titem, TQStr
                 tdir = buildDirectory();
                 if (!tdir.endsWith("/") && !tdir.isEmpty())
                     tdir += "/";
-                int pos = dependency.tqfindRev('/');
+                int pos = dependency.findRev('/');
                 if (pos == -1)
                 {
                     tname = dependency;
@@ -1282,7 +1282,7 @@ void AutoProjectPart::slotBuildConfigAboutToShow()
 {
     TQStringList l = allBuildConfigs();
     buildConfigAction->setItems(l);
-    buildConfigAction->setCurrentItem(l.tqfindIndex(currentBuildConfig()));
+    buildConfigAction->setCurrentItem(l.findIndex(currentBuildConfig()));
 }
 
 void AutoProjectPart::restorePartialProjectSession ( const TQDomElement* el )
@@ -1356,7 +1356,7 @@ bool AutoProjectPart::isDirty()
         TQString fileName = *it;
         ++it;
 
-        TQMap<TQString, TQDateTime>::Iterator it = m_timestamp.tqfind( fileName );
+        TQMap<TQString, TQDateTime>::Iterator it = m_timestamp.find( fileName );
         TQDateTime t = TQFileInfo( projectDirectory(), fileName ).lastModified();
         if( it == m_timestamp.end() || *it != t ){
             return true;
@@ -1386,7 +1386,7 @@ TQStringList recursiveATFind( const TQString &currDir, const TQString &baseDir )
     kdDebug(9020) << "Dir " << currDir << endl;
     TQStringList fileList;
 
-    if( !currDir.tqcontains( "/..") && !currDir.tqcontains("/.") )
+    if( !currDir.contains( "/..") && !currDir.contains("/.") )
     {
         TQDir dir(currDir);
         TQStringList dirList = dir.entryList(TQDir::Dirs );
diff --git a/buildtools/autotools/autoprojectwidget.cpp b/buildtools/autotools/autoprojectwidget.cpp
index 57b63573..ff89fe35 100644
--- a/buildtools/autotools/autoprojectwidget.cpp
+++ b/buildtools/autotools/autoprojectwidget.cpp
@@ -225,7 +225,7 @@ TQString AutoProjectWidget::pathForTarget(const TargetItem *titem) const
 	{
 		SubprojectItem* spitem = static_cast<SubprojectItem*>(it.current() );
 		kdDebug(9020) << "Checking: " << spitem->path << endl;
-		if (spitem->targets.tqcontainsRef(titem))
+		if (spitem->targets.containsRef(titem))
 		{
 			kdDebug(9020) << "Found it!" << endl;
 			TQString relpath = (spitem->path).mid(prefixLen);
@@ -405,7 +405,7 @@ void AutoProjectWidget::addFiles( const TQStringList &list )
 
 		for ( it = fileList.begin(); it != fileList.end(); ++it )
 		{
-			int pos = ( *it ).tqfindRev('/');
+			int pos = ( *it ).findRev('/');
 			if (pos != -1)
 				fileName = ( *it ).mid(pos+1);
 			else
@@ -652,7 +652,7 @@ TargetItem *AutoProjectWidget::createTargetItem( const TQString &name,
 FileItem *AutoProjectWidget::createFileItem( const TQString &name, SubprojectItem *subproject )
 {
 	bool is_subst;
-	if(name.tqfind("$(") == 0 || name.tqfind("${") == 0)
+	if(name.find("$(") == 0 || name.find("${") == 0)
 		is_subst = true;
 	else
 		is_subst = false;
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<TQString, TQString>::ConstIterator varit = item->variables.tqfind( varname );
+		TQMap<TQString, TQString>::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<TQString, TQString>::ConstIterator varit = item->variables.tqfind( varname );
+		TQMap<TQString, TQString>::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 );
 	    }
diff --git a/buildtools/autotools/choosetargetdialog.cpp b/buildtools/autotools/choosetargetdialog.cpp
index d09f0a7b..154b72b4 100644
--- a/buildtools/autotools/choosetargetdialog.cpp
+++ b/buildtools/autotools/choosetargetdialog.cpp
@@ -128,7 +128,7 @@ ChooseTargetDialog::ChooseTargetDialog ( AutoProjectWidget* widget, AutoProjectP
 
 	for ( it = fileList.begin(); it != fileList.end(); ++it )
 	{
-		int pos = ( *it ).tqfindRev('/');
+		int pos = ( *it ).findRev('/');
 		if (pos != -1)
 			fileName = ( *it ).mid(pos+1);
 		else
@@ -246,7 +246,7 @@ void ChooseTargetDialog::slotOk()
 	{
 		bool found = false;
 
-		int pos = ( *it ).tqfindRev('/');
+		int pos = ( *it ).findRev('/');
 		if (pos != -1)
 		{
 			directory = ( *it ).left(pos);
diff --git a/buildtools/autotools/configureoptionswidget.cpp b/buildtools/autotools/configureoptionswidget.cpp
index 1e877a5c..afb6f9b4 100644
--- a/buildtools/autotools/configureoptionswidget.cpp
+++ b/buildtools/autotools/configureoptionswidget.cpp
@@ -267,8 +267,8 @@ void ConfigureOptionsWidget::topsourcedirClicked()
 
 void ConfigureOptionsWidget::configComboTextChanged(const TQString &config)
 {
-    bool canAdd = !allConfigs.tqcontains(config) && !config.tqcontains("/") && !config.isEmpty();
-    bool canRemove = allConfigs.tqcontains(config) && config != "default";
+    bool canAdd = !allConfigs.contains(config) && !config.contains("/") && !config.isEmpty();
+    bool canRemove = allConfigs.contains(config) && config != "default";
     addconfig_button->setEnabled(canAdd);
     removeconfig_button->setEnabled(canRemove);
 }
@@ -276,7 +276,7 @@ void ConfigureOptionsWidget::configComboTextChanged(const TQString &config)
 
 void ConfigureOptionsWidget::configChanged(const TQString &config)
 {
-    if (config == currentConfig || !allConfigs.tqcontains(config))
+    if (config == currentConfig || !allConfigs.contains(config))
         return;
 
     if (!currentConfig.isNull() && dirty)
diff --git a/buildtools/autotools/fileselectorwidget.cpp b/buildtools/autotools/fileselectorwidget.cpp
index f67d9295..2a199c3a 100644
--- a/buildtools/autotools/fileselectorwidget.cpp
+++ b/buildtools/autotools/fileselectorwidget.cpp
@@ -148,7 +148,7 @@ FileSelectorWidget::FileSelectorWidget(AutoProjectPart* part, KFile::Mode mode,
     {
         if (groupEl.tagName() == "group")
         {
-            list << groupEl.attribute("pattern").tqreplace ( TQRegExp ( ";" ), " " ) + " (" + groupEl.attribute("name") + ")";
+            list << groupEl.attribute("pattern").replace ( TQRegExp ( ";" ), " " ) + " (" + groupEl.attribute("name") + ")";
         }
         groupEl = groupEl.nextSibling().toElement();
     }
diff --git a/buildtools/autotools/kfiledndiconview.cpp b/buildtools/autotools/kfiledndiconview.cpp
index d230eee7..b59031df 100644
--- a/buildtools/autotools/kfiledndiconview.cpp
+++ b/buildtools/autotools/kfiledndiconview.cpp
@@ -84,7 +84,7 @@ void KFileDnDIconView::contentsDragEnterEvent( TQDragEnterEvent *e ) {
 		return;
 	}
 	e->acceptAction();     // Yes
-	TQIconViewItem *i = tqfindItem( contentsToViewport( e->pos() ) );
+	TQIconViewItem *i = findItem( contentsToViewport( e->pos() ) );
 	if ( i && m_useAutoOpenTimer) {  // are we over an item ?
 		m_dropItem = i;  // set new m_dropItem
 		m_autoOpenTimer.start( m_autoOpenTime ); // restart timer
@@ -97,7 +97,7 @@ void KFileDnDIconView::contentsDragMoveEvent( TQDragMoveEvent *e ) {
 		return;
 	}
 	e->acceptAction();     // Yes
-	TQIconViewItem *i = tqfindItem( contentsToViewport( e->pos() ) );
+	TQIconViewItem *i = findItem( contentsToViewport( e->pos() ) );
 	if( ! m_useAutoOpenTimer )
 		return;
 	if ( i ) {  // are we over an item ?
diff --git a/buildtools/autotools/makefilehandler.cpp b/buildtools/autotools/makefilehandler.cpp
index ef2354f1..7e19dd56 100644
--- a/buildtools/autotools/makefilehandler.cpp
+++ b/buildtools/autotools/makefilehandler.cpp
@@ -122,7 +122,7 @@ void MakefileHandler::parse( const TQString& folder, bool recursive )
 
 AutoTools::ProjectAST* MakefileHandler::astForFolder( const TQString& folderPath )
 {
-    if ( d->folderToFileMap.tqcontains( folderPath ) )
+    if ( d->folderToFileMap.contains( folderPath ) )
     {
         TQString filePath = d->folderToFileMap[folderPath];
         return d->projects[filePath];
@@ -152,7 +152,7 @@ TQString MakefileHandler::resolveVariable( const TQString& variable, AutoTools::
         if ( ( *it )->nodeType() == AutoTools::AST::AssignmentAST )
         {
             AutoTools::AssignmentAST* assignment = static_cast<AutoTools::AssignmentAST*>( ( *it ) );
-            if ( variable.tqfind( assignment->scopedID ) != -1 )
+            if ( variable.find( assignment->scopedID ) != -1 )
             {
                 kdDebug(9020) << k_funcinfo << "Resolving variable '" << variable << "' to '"
                               << assignment->values.join( TQString::null ).stripWhiteSpace() << "'" << endl;
diff --git a/buildtools/autotools/misc.cpp b/buildtools/autotools/misc.cpp
index 9dfffefb..a4162a40 100644
--- a/buildtools/autotools/misc.cpp
+++ b/buildtools/autotools/misc.cpp
@@ -238,11 +238,11 @@ void AutoProjectTool::setMakefileam ( const TQString &fileName, TQMap<TQString,
 		if ( re.exactMatch ( s ) )
 		{
 			TQString lhs = re.cap ( 2 );
-			bool notFound = ( variables.tqfind ( lhs ) == variables.end() );
+			bool notFound = ( variables.find ( lhs ) == variables.end() );
 
 			if ( notFound )
 			{
-				if ( seenLhs.tqfind ( lhs ) == seenLhs.end() )
+				if ( seenLhs.find ( lhs ) == seenLhs.end() )
 				{
 					// not interested in this line at all
 					// write it out as is..
@@ -446,7 +446,7 @@ void AutoProjectTool::addRemoveMakefileam(const TQString &fileName, TQMap<TQStri
 		if (re.exactMatch(s))
 		{
 			TQString lhs = re.cap(2);
-			TQMap<TQString, bool>* ourRhs = interest.tqfind(lhs);
+			TQMap<TQString, bool>* ourRhs = interest.find(lhs);
 
 			if (!ourRhs)
 			{
@@ -478,7 +478,7 @@ void AutoProjectTool::addRemoveMakefileam(const TQString &fileName, TQMap<TQStri
 						// add this line to we we want to add to remove duplicates.
 						for (uint index = 0; index < bits.size(); index++)
 						{
-							TQMap<TQString, bool>::iterator findEntry = ourRhs->tqfind(bits[index]);
+							TQMap<TQString, bool>::iterator findEntry = ourRhs->find(bits[index]);
 							if (findEntry == ourRhs->end())
 							{
 								// we haven't seen it, so add it, so we don't add it again later..
@@ -490,7 +490,7 @@ void AutoProjectTool::addRemoveMakefileam(const TQString &fileName, TQMap<TQStri
 						}
 						// now write the line out if it is not going to be empty.
 						TQString newLine(lhs);
-						if (seenLhs.tqfind(lhs) == seenLhs.end())
+						if (seenLhs.find(lhs) == seenLhs.end())
 						{
 							newLine += " = ";
 							seenLhs[lhs] = "";
@@ -537,7 +537,7 @@ void AutoProjectTool::addRemoveMakefileam(const TQString &fileName, TQMap<TQStri
 						{
 							// check if any of these values are down to remove.
 							TQString newLine(lhs);
-							if (seenLhs.tqfind(lhs) == seenLhs.end())
+							if (seenLhs.find(lhs) == seenLhs.end())
 							{
 								newLine += " = ";
 								seenLhs[lhs] = "";
@@ -551,7 +551,7 @@ void AutoProjectTool::addRemoveMakefileam(const TQString &fileName, TQMap<TQStri
 							bool added = false;
 							for (TQStringList::Iterator posIter = bits.begin(); posIter != bits.end();posIter++)
 							{
-								TQMap<TQString, bool>::iterator findEntry = ourRhs->tqfind(*posIter);
+								TQMap<TQString, bool>::iterator findEntry = ourRhs->find(*posIter);
 								if (findEntry == ourRhs->end())
 								{
 									// we do not want to remove it..
@@ -598,7 +598,7 @@ void AutoProjectTool::addRemoveMakefileam(const TQString &fileName, TQMap<TQStri
 			{
 				// now we have to deal with this multiLine value..
 				// ourRhs will always be a value, as we only get multiLine if we're interested in it..
-				TQMap<TQString, bool>* ourRhs = interest.tqfind(lastLhs);
+				TQMap<TQString, bool>* ourRhs = interest.find(lastLhs);
 
 				if (add)
 				{
@@ -607,7 +607,7 @@ void AutoProjectTool::addRemoveMakefileam(const TQString &fileName, TQMap<TQStri
 					// add this line to we we want to add to remove duplicates.
 					for (uint index = 0; index < lastRhs.size(); index++)
 					{
-						TQMap<TQString, bool>::iterator findEntry = ourRhs->tqfind(lastRhs[index]);
+						TQMap<TQString, bool>::iterator findEntry = ourRhs->find(lastRhs[index]);
 						if (findEntry == ourRhs->end())
 						{
 							// we haven't seen it, so add it, so we don't add it again later..
@@ -619,7 +619,7 @@ void AutoProjectTool::addRemoveMakefileam(const TQString &fileName, TQMap<TQStri
 					}
 					// now write the line out if it is not going to be empty.
 					TQString newLine(lastLhs);
-					if (seenLhs.tqfind(lastLhs) == seenLhs.end())
+					if (seenLhs.find(lastLhs) == seenLhs.end())
 					{
 						newLine += " = ";
 						seenLhs[lastLhs] = "";
@@ -665,7 +665,7 @@ void AutoProjectTool::addRemoveMakefileam(const TQString &fileName, TQMap<TQStri
 					{
 						// check if any of these values are down to remove.
 						TQString newLine(lastLhs);
-						if (seenLhs.tqfind(lastLhs) == seenLhs.end())
+						if (seenLhs.find(lastLhs) == seenLhs.end())
 						{
 							newLine += " = ";
 							seenLhs[lastLhs] = "";
@@ -678,7 +678,7 @@ void AutoProjectTool::addRemoveMakefileam(const TQString &fileName, TQMap<TQStri
 						bool added = false;
 						for (TQStringList::Iterator posIter = lastRhs.begin(); posIter != lastRhs.end();posIter++)
 						{
-							TQMap<TQString, bool>::iterator findEntry = ourRhs->tqfind(*posIter);
+							TQMap<TQString, bool>::iterator findEntry = ourRhs->find(*posIter);
 							if (findEntry == ourRhs->end())
 							{
 								// we do not want to remove it..
@@ -724,7 +724,7 @@ void AutoProjectTool::addRemoveMakefileam(const TQString &fileName, TQMap<TQStri
 			TQMap<TQString, bool>* ourRhs = it.current();
 
 			TQString newLine(lhs);
-			if (seenLhs.tqfind(lhs) == seenLhs.end())
+			if (seenLhs.find(lhs) == seenLhs.end())
 			{
 				newLine += " = ";
 				seenLhs[lastLhs] = "";
@@ -814,7 +814,7 @@ TQStringList AutoProjectTool::configureinLoadMakefiles(TQString configureinpath)
 		{
 			if (close.search(line) >= 0)
 			{
-				line = line.tqreplace(close.search(line), 1, "");
+				line = line.replace(close.search(line), 1, "");
 				list += TQStringList::split(" ", line);
 				break;
 			}
@@ -829,11 +829,11 @@ TQStringList AutoProjectTool::configureinLoadMakefiles(TQString configureinpath)
 		}
 		else if (ac_regex.search(line) >= 0)
 		{
-			line = line.tqreplace(ac_regex.search(line), ac_match.length() - 1, "");
+			line = line.replace(ac_regex.search(line), ac_match.length() - 1, "");
 
 			if (open.search(line) >= 0)
 			{
-				line = line.tqreplace(open.search(line), 1, "");
+				line = line.replace(open.search(line), 1, "");
 			}
 
 			if (line.endsWith(cont))
@@ -845,7 +845,7 @@ TQStringList AutoProjectTool::configureinLoadMakefiles(TQString configureinpath)
 			{
 				if (close.search(line) >= 0)
 				{
-					line = line.tqreplace(close.search(line), 1, "");
+					line = line.replace(close.search(line), 1, "");
 				}
 			}
 
@@ -946,7 +946,7 @@ void AutoProjectTool::configureinSaveMakefiles(TQString fileName, TQStringList m
 			else if (ac_regex.search(line) >= 0)
 			{
 				line = line.stripWhiteSpace();
-				line = line.tqreplace(ac_regex.search(line), ac_match.length() - 1, "");
+				line = line.replace(ac_regex.search(line), ac_match.length() - 1, "");
 				if (line.endsWith(cont))
 				{
 					line.setLength(line.length() - 1);
@@ -954,11 +954,11 @@ void AutoProjectTool::configureinSaveMakefiles(TQString fileName, TQStringList m
 				}
 				if (open.search(line) >= 0)
 				{
-					line = line.tqreplace(open.search(line), 1, "");
+					line = line.replace(open.search(line), 1, "");
 				}
 				if (close.search(line) >= 0)
 				{
-					line = line.tqreplace(close.search(line), 1, "");
+					line = line.replace(close.search(line), 1, "");
 				}
 
 				if (!multiLine)
diff --git a/buildtools/autotools/removetargetdlg.cpp b/buildtools/autotools/removetargetdlg.cpp
index 962a386c..f40452c9 100644
--- a/buildtools/autotools/removetargetdlg.cpp
+++ b/buildtools/autotools/removetargetdlg.cpp
@@ -96,8 +96,8 @@ void RemoveTargetDialog::init()
 			{
 				TQString canonname = AutoProjectTool::canonicalize ( titem->name );
 
-				if ( spitem->variables[canonname + "_LIBADD"].tqcontains ( m_titem->name ) > 0 ||
-					spitem->variables[canonname + "_LDADD"].tqcontains ( m_titem->name ) > 0 )
+				if ( spitem->variables[canonname + "_LIBADD"].contains ( m_titem->name ) > 0 ||
+					spitem->variables[canonname + "_LDADD"].contains ( m_titem->name ) > 0 )
 				{
 					dependencyListBox->insertItem ( SmallIcon ( "target_kdevelop" ), spitem->path + " (" + titem->name + ")" );
 
@@ -136,7 +136,7 @@ void RemoveTargetDialog::accept ()
 			TQString curCanonname = AutoProjectTool::canonicalize ( titem->name );
 			TQStringList dependencies;
 
-			if ( spitem->variables[curCanonname + "_LIBADD"].tqcontains ( m_titem->name ) )
+			if ( spitem->variables[curCanonname + "_LIBADD"].contains ( m_titem->name ) )
 				curVarname = curCanonname + "_LIBADD";
 			else
 				curVarname = curCanonname + "_LDADD";
@@ -148,7 +148,7 @@ void RemoveTargetDialog::accept ()
 			for ( uint i = 0; i < dependencies.size(); ++i )
 			{
 				TQString s = dependencies[i];
-				if ( s.tqcontains ( m_titem->name ) > 0 )
+				if ( s.contains ( m_titem->name ) > 0 )
 					dependencies.remove ( s );
 			}
 
@@ -250,7 +250,7 @@ void RemoveTargetDialog::accept ()
 			// before removing the files, check if they are mentioned in "noinst_HEADERS = blabla1.h blabla2.h"
 			TQStringList noInstHeaders = TQStringList::split ( TQRegExp ( "[ \t\n]" ), m_spitem->variables["noinst_HEADERS"] );
 
-			if ( noInstHeaders.tqcontains ( fitem->name ) )
+			if ( noInstHeaders.contains ( fitem->name ) )
 			{
 				noInstHeaders.remove ( fitem->name );
 
diff --git a/buildtools/autotools/targetoptionsdlg.cpp b/buildtools/autotools/targetoptionsdlg.cpp
index 14e5ee96..02673c0c 100644
--- a/buildtools/autotools/targetoptionsdlg.cpp
+++ b/buildtools/autotools/targetoptionsdlg.cpp
@@ -79,26 +79,26 @@ TargetOptionsDialog::~TargetOptionsDialog()
 void TargetOptionsDialog::readConfig()
 {
     TQString flagsstr = target->ldflags;
-    flagsstr.tqreplace(TQRegExp("$(KDE_PLUGIN)"), "-avoid-version -module -no-undefined $(KDE_RPATH)");
+    flagsstr.replace(TQRegExp("$(KDE_PLUGIN)"), "-avoid-version -module -no-undefined $(KDE_RPATH)");
     TQStringList l1 = TQStringList::split(TQRegExp("[ \t]"), flagsstr);
     TQStringList::Iterator l1it;
 
-    l1it = l1.tqfind("-all-static");
+    l1it = l1.find("-all-static");
     if (l1it != l1.end()) {
         allstatic_box->setChecked(true);
         l1.remove(l1it);
     }
-    l1it = l1.tqfind("-avoid-version");
+    l1it = l1.find("-avoid-version");
     if (l1it != l1.end()) {
         avoidversion_box->setChecked(true);
         l1.remove(l1it);
     }
-    l1it = l1.tqfind("-module");
+    l1it = l1.find("-module");
     if (l1it != l1.end()) {
         module_box->setChecked(true);
         l1.remove(l1it);
     }
-    l1it = l1.tqfind("-no-undefined");
+    l1it = l1.find("-no-undefined");
     if (l1it != l1.end()) {
         noundefined_box->setChecked(true);
         l1.remove(l1it);
@@ -354,4 +354,4 @@ void TargetOptionsDialog::accept()
 }
 
 #include "targetoptionsdlg.moc"
-// kate: indent-mode csands; space-indent on; indent-width 4; tqreplace-tabs on;
+// kate: indent-mode csands; space-indent on; indent-width 4; replace-tabs on;