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

5 files changed, 45 insertions, 45 deletions

diff --git a/parts/outputviews/appoutputwidget.cpp b/parts/outputviews/appoutputwidget.cpp
index 89c3ced5..48b25db3 100644
--- a/parts/outputviews/appoutputwidget.cpp
+++ b/parts/outputviews/appoutputwidget.cpp
@@ -180,11 +180,11 @@ bool AppOutputWidget::filterSingleLine(const TQString & line)
 
 	if ( m_filter.m_isRegExp )
 	{
-		return ( line.tqfind( TQRegExp( m_filter.m_filterString, m_filter.m_caseSensitive, false ) ) != -1 );
+		return ( line.find( TQRegExp( m_filter.m_filterString, m_filter.m_caseSensitive, false ) ) != -1 );
 	}
 	else
 	{
-		return ( line.tqfind( m_filter.m_filterString, 0, m_filter.m_caseSensitive ) != -1 );
+		return ( line.find( m_filter.m_filterString, 0, m_filter.m_caseSensitive ) != -1 );
 	}	
 }
 
diff --git a/parts/outputviews/compileerrorfilter.cpp b/parts/outputviews/compileerrorfilter.cpp
index c365d6cf..a17ba71b 100644
--- a/parts/outputviews/compileerrorfilter.cpp
+++ b/parts/outputviews/compileerrorfilter.cpp
@@ -53,7 +53,7 @@ CompileErrorFilter::ErrorFormat* CompileErrorFilter::errorFormats()
 		// ld
 		ErrorFormat( "undefined reference", 0, 0, 0 ),
 		ErrorFormat( "undefined symbol", 0, 0, 0 ),
-		ErrorFormat( "ld: cannot tqfind", 0, 0, 0 ),
+		ErrorFormat( "ld: cannot find", 0, 0, 0 ),
 		ErrorFormat( "No such file", 0, 0, 0 ),
 		// make
  		ErrorFormat( "No rule to make target", 0, 0, 0 ),
@@ -98,9 +98,9 @@ void CompileErrorFilter::processLine( const TQString& line )
 			text    = regExp.cap( format->textGroup );
 			compiler = format->compiler;
 			TQString cap = regExp.cap(3);
-			if (cap.tqcontains("warning:", false) || cap.tqcontains("Warnung:", false))
+			if (cap.contains("warning:", false) || cap.contains("Warnung:", false))
 				isWarning = true;
-			if (regExp.cap(3).tqcontains("instantiated from", false)) {
+			if (regExp.cap(3).contains("instantiated from", false)) {
 				isInstantiationInfo = true;
 			}
 			break;
@@ -112,8 +112,8 @@ void CompileErrorFilter::processLine( const TQString& line )
 	if( hasmatch )
 	{
 		// Add hacks for error strings you want excluded here
-		if( text.tqfind( TQString::tqfromLatin1("(Each undeclared identifier is reported only once") ) >= 0
-			|| text.tqfind( TQString::tqfromLatin1("for each function it appears in.)") ) >= 0 )
+		if( text.find( TQString::tqfromLatin1("(Each undeclared identifier is reported only once") ) >= 0
+			|| text.find( TQString::tqfromLatin1("for each function it appears in.)") ) >= 0 )
 		hasmatch = false;
 	}
 
diff --git a/parts/outputviews/directorystatusmessagefilter.cpp b/parts/outputviews/directorystatusmessagefilter.cpp
index 9d110533..64945ad5 100644
--- a/parts/outputviews/directorystatusmessagefilter.cpp
+++ b/parts/outputviews/directorystatusmessagefilter.cpp
@@ -93,18 +93,18 @@ bool DirectoryStatusMessageFilter::matchEnterDir( const TQString& line, TQString
 
 	// avoid TQRegExp if possible. This regex performs VERY badly with large inputs,
 	// and the input required is very short if these strings match.
-	if(line.tqfind(en_e) > -1 ||
-	   line.tqfind(fr_e) > -1 ||
-	   line.tqfind(pl_e) > -1 ||
-	   line.tqfind(ja_e) > -1 ||
-	   line.tqfind(ko_e) > -1 ||
-	   line.tqfind(ko_b) > -1 ||
-	   line.tqfind(pt_br_e) > -1 ||
-	   line.tqfind(ru_e) > -1 ||
-	   line.tqfind(de_e1) > -1 ||
-	   line.tqfind(de_e2) > -1 ||
-	   line.tqfind(es_e) > -1 ||
-	   line.tqfind(nl_e) > -1)
+	if(line.find(en_e) > -1 ||
+	   line.find(fr_e) > -1 ||
+	   line.find(pl_e) > -1 ||
+	   line.find(ja_e) > -1 ||
+	   line.find(ko_e) > -1 ||
+	   line.find(ko_b) > -1 ||
+	   line.find(pt_br_e) > -1 ||
+	   line.find(ru_e) > -1 ||
+	   line.find(de_e1) > -1 ||
+	   line.find(de_e2) > -1 ||
+	   line.find(es_e) > -1 ||
+	   line.find(nl_e) > -1)
 	{
 		// grab the directory name
 		if(dirChange.search(line) > -1)
@@ -164,17 +164,17 @@ bool DirectoryStatusMessageFilter::matchLeaveDir( const TQString& line, TQString
 
 	// avoid TQRegExp if possible. This regex performs VERY badly with large inputs,
 	// and the input required is very short if these strings match.
-	if(line.tqfind(en_l) > -1 ||
-	   line.tqfind(fr_l) > -1 ||
-	   line.tqfind(ja_l) > -1 ||
-	   (line.tqfind(ko_l) > -1 && line.tqfind(ko_b) > -1) ||
-	   line.tqfind(pt_br_l) > -1 ||
-	   line.tqfind(ru_l) > -1 ||
-	   line.tqfind(de_l1) > -1 ||
-	   line.tqfind(de_l2) > -1 ||
-	   line.tqfind(es_l) > -1 ||
-	   line.tqfind(nl_l) > -1 ||
-	   line.tqfind(po_l) > -1)
+	if(line.find(en_l) > -1 ||
+	   line.find(fr_l) > -1 ||
+	   line.find(ja_l) > -1 ||
+	   (line.find(ko_l) > -1 && line.find(ko_b) > -1) ||
+	   line.find(pt_br_l) > -1 ||
+	   line.find(ru_l) > -1 ||
+	   line.find(de_l1) > -1 ||
+	   line.find(de_l2) > -1 ||
+	   line.find(es_l) > -1 ||
+	   line.find(nl_l) > -1 ||
+	   line.find(po_l) > -1)
 	{
 		// grab the directory name
 		if(dirChange.search(line) > -1 )
diff --git a/parts/outputviews/makeactionfilter.cpp b/parts/outputviews/makeactionfilter.cpp
index ca3e843a..61e98409 100644
--- a/parts/outputviews/makeactionfilter.cpp
+++ b/parts/outputviews/makeactionfilter.cpp
@@ -233,7 +233,7 @@ void MakeActionFilter::test()
 		"-W -Wpointer-arith -Wwrite-strings -ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts "
 		"-fno-builtin -g3 -fno-exceptions -fno-check-new -fno-common    -o libkfilereplacepart.la.closure libkfilereplacepart_la_closure.lo "
 		"-module -no-undefined  -L/usr/X11R6/lib -L/usr/lib/qt3/lib -L/opt/kde3/lib  -version-info 1:0:0 kfilereplacepart.lo kfilereplacedoc.lo "
-		"kfilereplaceview.lo kaboutkfiletqreplace.lo kaddstringdlg.lo kconfirmdlg.lo kernel.lo kexpression.lo kfilereplacepref.lo "
+		"kfilereplaceview.lo kaboutkfilereplace.lo kaddstringdlg.lo kconfirmdlg.lo kernel.lo kexpression.lo kfilereplacepref.lo "
 		"klistviewstring.lo knewprojectdlg.lo koptionsdlg.lo kresultview.lo filelib.lo knewprojectdlgs.lo -lkio -lkparts -lkhtml",
 		"linking", "libtool", "libkfilereplacepart.la.closure")
 	<< TestItem( //libtool, linking 3
@@ -241,7 +241,7 @@ void MakeActionFilter::test()
 		"-W -Wpointer-arith -Wwrite-strings -ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts "
 		"-fno-builtin -g3 -fno-exceptions -fno-check-new -fno-common    -o libkfilereplacepart.la -rpath /opt/kde3/lib/kde3 "
 		"-module -no-undefined  -L/usr/X11R6/lib -L/usr/lib/qt3/lib -L/opt/kde3/lib  -version-info 1:0:0 kfilereplacepart.lo "
-		"kfilereplacedoc.lo kfilereplaceview.lo kaboutkfiletqreplace.lo kaddstringdlg.lo kconfirmdlg.lo kernel.lo kexpression.lo "
+		"kfilereplacedoc.lo kfilereplaceview.lo kaboutkfilereplace.lo kaddstringdlg.lo kconfirmdlg.lo kernel.lo kexpression.lo "
 		"kfilereplacepref.lo klistviewstring.lo knewprojectdlg.lo koptionsdlg.lo kresultview.lo filelib.lo knewprojectdlgs.lo -lkio -lkparts -lkhtml",
 		"linking", "libtool", "libkfilereplacepart.la")
 	<< TestItem( //automake, builddir!=srcdir, libtool=no, compiling
diff --git a/parts/outputviews/makewidget.cpp b/parts/outputviews/makewidget.cpp
index 4734408f..a35a3d3c 100644
--- a/parts/outputviews/makewidget.cpp
+++ b/parts/outputviews/makewidget.cpp
@@ -247,20 +247,20 @@ void MakeWidget::startNextJob()
 	currentCommand = *it;
 	commandList.remove(it);
 
-	int i = currentCommand.tqfindRev(" gmake");
+	int i = currentCommand.findRev(" gmake");
 	if ( i == -1 )
-		i = currentCommand.tqfindRev(" make");
+		i = currentCommand.findRev(" make");
 	if ( i == -1 )
 		m_bCompiling = false;
 	else
 	{
 		TQString s = currentCommand.right(currentCommand.length() - i);
-		if ( s.tqcontains("configure ")        ||
-		     s.tqcontains(" Makefile.cvs")     ||
-		     s.tqcontains(" clean")            ||
-		     s.tqcontains(" distclean")        ||
-		     s.tqcontains(" package-messages") ||
-		     s.tqcontains(" install") )
+		if ( s.contains("configure ")        ||
+		     s.contains(" Makefile.cvs")     ||
+		     s.contains(" clean")            ||
+		     s.contains(" distclean")        ||
+		     s.contains(" package-messages") ||
+		     s.contains(" install") )
 		{
 		    m_bCompiling = false;
 		}
@@ -337,10 +337,10 @@ void MakeWidget::copy()
 	  selection.remove((selection.length()-1) -  removeend, removeend);
 	}
 
-	selection.tqreplace("&lt;","<");
-	selection.tqreplace("&gt;",">");
-	selection.tqreplace("&quot;","\"");
-	selection.tqreplace("&amp;","&");
+	selection.replace("&lt;","<");
+	selection.replace("&gt;",">");
+	selection.replace("&quot;","\"");
+	selection.replace("&amp;","&");
 
 	kapp->tqclipboard()->setText(selection, TQClipboard::Clipboard);
 }
@@ -453,7 +453,7 @@ void MakeWidget::specialCheck( const TQString& file, TQString& fName ) const
     TQStringList files = m_part->project()->allFiles();
     for( TQStringList::iterator it = files.begin() ; it != files.end(); ++it)
     {
-        if( (*it).tqcontains( file ) )
+        if( (*it).contains( file ) )
         {
             fName = URLUtil::canonicalPath( m_part->project()->projectDirectory() + "/" + *it );
         }