rename the following methods:

tqfind find
tqreplace replace
tqcontains contains


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

8 files changed, 24 insertions, 24 deletions

diff --git a/kdeprint/descriptions/sortthem.cpp b/kdeprint/descriptions/sortthem.cpp
index 1e1a37d93..9adc284b1 100644
--- a/kdeprint/descriptions/sortthem.cpp
+++ b/kdeprint/descriptions/sortthem.cpp
@@ -15,7 +15,7 @@ char buf[1024];
    while (!feof(stdin)) {
       char *cline = fgets(buf, 1000, stdin);
       if (!cline) break;
-      if (!have.tqcontains(cline)) {
+      if (!have.contains(cline)) {
          have << cline;
          fprintf(stdout, "%s", cline);
       }
diff --git a/kdeprint/kdeprintfax/conffilters.cpp b/kdeprint/kdeprintfax/conffilters.cpp
index 388cd1ab2..7f33136d9 100644
--- a/kdeprint/kdeprintfax/conffilters.cpp
+++ b/kdeprint/kdeprintfax/conffilters.cpp
@@ -95,7 +95,7 @@ void ConfFilters::load()
 		while (!t.eof())
 		{
 			line = t.readLine().stripWhiteSpace();
-			if ((p=line.tqfind(TQRegExp("\\s"))) != -1)
+			if ((p=line.find(TQRegExp("\\s"))) != -1)
 			{
 				TQString	mime(line.left(p)), cmd(line.right(line.length()-p-1).stripWhiteSpace());
 				if (!mime.isEmpty() && !cmd.isEmpty())
diff --git a/kdeprint/kdeprintfax/defcmds.cpp b/kdeprint/kdeprintfax/defcmds.cpp
index 7dacc787a..123956377 100644
--- a/kdeprint/kdeprintfax/defcmds.cpp
+++ b/kdeprint/kdeprintfax/defcmds.cpp
@@ -32,7 +32,7 @@ TQString defaultCommand(const TQString& cmd)
 		TQString	exe = KStandardDirs::findExe(r.cap(1));
 		if (exe.isEmpty())
 			exe = "/usr/bin/"+r.cap(1);
-		str.tqreplace(p, r.matchedLength(), exe);
+		str.replace(p, r.matchedLength(), exe);
 	}
 	return str;
 }
diff --git a/kdeprint/kdeprintfax/faxab.cpp b/kdeprint/kdeprintfax/faxab.cpp
index 403caee04..a54375867 100644
--- a/kdeprint/kdeprintfax/faxab.cpp
+++ b/kdeprint/kdeprintfax/faxab.cpp
@@ -163,7 +163,7 @@ bool FaxAB::getEntry(TQStringList& number, TQStringList& name, TQStringList& ent
 		/*
 		number = kab.m_fax->currentText();
 		name = kab.m_name->currentText();
-		if (kab.m_entries.tqcontains(name))
+		if (kab.m_entries.contains(name))
 		{
 			enterprise = kab.m_entries[name][0];
 		}
diff --git a/kdeprint/kdeprintfax/faxctrl.cpp b/kdeprint/kdeprintfax/faxctrl.cpp
index 51db82870..eed9d5816 100644
--- a/kdeprint/kdeprintfax/faxctrl.cpp
+++ b/kdeprint/kdeprintfax/faxctrl.cpp
@@ -87,9 +87,9 @@ static TQString stripNumber( const TQString& s )
 
 	// removes any non-numeric character, except ('+','*','#') (hope it's supported by faxing tools)
 	TQString strip_s = s;
-	strip_s.tqreplace( TQRegExp( "[^\\d+*#]" ), "" );
-	if ( strip_s.tqfind( '+' ) != -1 && conf->readBoolEntry( "ReplaceIntChar", false ) )
-		strip_s.tqreplace( "+", conf->readEntry( "ReplaceIntCharVal" ) );
+	strip_s.replace( TQRegExp( "[^\\d+*#]" ), "" );
+	if ( strip_s.find( '+' ) != -1 && conf->readBoolEntry( "ReplaceIntChar", false ) )
+		strip_s.replace( "+", conf->readEntry( "ReplaceIntCharVal" ) );
 	return strip_s;
 }
 
@@ -133,11 +133,11 @@ static TQString tagList( int n, ... )
 static TQString processTag( const TQString& match, bool value)
 {
 	TQString v;
-	int p = match.tqfind( '_' );
+	int p = match.find( '_' );
 	if ( p != -1 && match[ p+1 ] == '{' )
 	{
 		// Find the ?? that separates the iftrue from the iffalse parts.
-		int q = match.tqfind( "?\?", p+2 );
+		int q = match.find( "?\?", p+2 );
 		if ( q == -1 )
 		{
 			// No iffalse part
@@ -162,7 +162,7 @@ static TQString processTag( const TQString& match, bool value)
 static TQString processTag( const TQString& match, const TQString& value )
 {
 	TQString v;
-	int p = match.tqfind( '_' );
+	int p = match.find( '_' );
 	if ( p != -1 )
 	{
 		if ( value.isEmpty() )
@@ -172,7 +172,7 @@ static TQString processTag( const TQString& match, const TQString& value )
 			if ( match[ p+1 ] == '{' )
 			{
 				v = match.mid( p+2, match.length()-p-3 );
-				v.tqreplace( "@@", quote( value ) );
+				v.replace( "@@", quote( value ) );
 			}
 			else
 				v = ( "-" + match.mid( p+1 ) + " " + quote( value ) );
@@ -445,13 +445,13 @@ TQString FaxCtrl::faxCommand()
 
 void FaxCtrl::sendFax()
 {
-	if ( m_command.tqfind( "%files" ) != -1 )
+	if ( m_command.find( "%files" ) != -1 )
 	{
 		// replace %files tag
 		TQString	filestr;
 		for (TQStringList::ConstIterator it=m_filteredfiles.begin(); it!=m_filteredfiles.end(); ++it)
 			filestr += (quote(*it)+" ");
-		m_command.tqreplace("%files", filestr);
+		m_command.replace("%files", filestr);
 	}
 
 	if ( !m_faxlist.isEmpty() )
@@ -625,7 +625,7 @@ void FaxCtrl::slotPrintLog()
 			//TQString txt = m_logview->text();
 			TQString txt = m_log;
 
-			txt.tqreplace( '\n', "<br>" );
+			txt.replace( '\n', "<br>" );
 			txt.prepend( "<h2>" + i18n( "KDEPrint Fax Tool Log" ) + "</h2>" );
 
 			kdDebug() << "Log: " << txt << endl;
diff --git a/kdeprint/kdeprintfax/kdeprintfax.cpp b/kdeprint/kdeprintfax/kdeprintfax.cpp
index e8daf8c89..0b0e59b6b 100644
--- a/kdeprint/kdeprintfax/kdeprintfax.cpp
+++ b/kdeprint/kdeprintfax/kdeprintfax.cpp
@@ -425,10 +425,10 @@ void KdeprintFax::slotConfigure()
 void KdeprintFax::updateState()
 {
 	TQString	cmd = m_faxctrl->faxCommand();
-	m_cover->setEnabled(cmd.tqfind("%cover") != -1);
+	m_cover->setEnabled(cmd.find("%cover") != -1);
 	if ( !m_cover->isEnabled() )
 		m_cover->setChecked(false);
-	m_comment->setEnabled(cmd.tqfind("%comment") != -1 && m_cover->isChecked());
+	m_comment->setEnabled(cmd.find("%comment") != -1 && m_cover->isChecked());
 	//m_comment->setPaper(m_comment->isEnabled() ? tqcolorGroup().brush(TQColorGroup::Base) : tqcolorGroup().brush(TQColorGroup::Background));
 	if (!m_comment->isEnabled())
 	{
@@ -438,11 +438,11 @@ void KdeprintFax::updateState()
 	else
 		m_comment->setPaper( tqcolorGroup().base() );
 	/*
-	m_enterprise->setEnabled(cmd.tqfind("%enterprise") != -1);
+	m_enterprise->setEnabled(cmd.find("%enterprise") != -1);
 	if (!m_enterprise->isEnabled())
 		m_enterprise->setText("");
 	*/
-	if (cmd.tqfind("%time") == -1)
+	if (cmd.find("%time") == -1)
 	{
 		m_timecombo->setCurrentItem(0);
 		m_timecombo->setEnabled(false);
@@ -450,8 +450,8 @@ void KdeprintFax::updateState()
 	}
 	else
 		m_timecombo->setEnabled( true );
-	/*m_name->setEnabled( cmd.tqfind( "%name" ) != -1 );*/
-	m_subject->setEnabled( cmd.tqfind( "%subject" ) != -1 && m_cover->isChecked() );
+	/*m_name->setEnabled( cmd.find( "%name" ) != -1 );*/
+	m_subject->setEnabled( cmd.find( "%subject" ) != -1 && m_cover->isChecked() );
 	statusBar()->changeItem(m_faxctrl->faxSystem(), 2);
 }
 
diff --git a/kdeprint/kjobviewer/kjobviewer.cpp b/kdeprint/kjobviewer/kjobviewer.cpp
index a11592c33..fc251d664 100644
--- a/kdeprint/kjobviewer/kjobviewer.cpp
+++ b/kdeprint/kjobviewer/kjobviewer.cpp
@@ -141,7 +141,7 @@ void KJobViewerApp::initialize()
 
         }
 
-        view = m_views.tqfind(prname);
+        view = m_views.find(prname);
         if (!view)
         {
             kdDebug() << "creating new view: " << TQString(prname) << endl;
@@ -200,7 +200,7 @@ void KJobViewerApp::slotTimer()
 
 void KJobViewerApp::slotPrinterChanged(KMJobViewer *view, const TQString& prname)
 {
-	KMJobViewer	*other = m_views.tqfind(prname);
+	KMJobViewer	*other = m_views.find(prname);
 	if (other)
 	{
 		if (other->isVisible())
diff --git a/kdeprint/slave/kio_print.cpp b/kdeprint/slave/kio_print.cpp
index 920c12073..ebb6b859f 100644
--- a/kdeprint/slave/kio_print.cpp
+++ b/kdeprint/slave/kio_print.cpp
@@ -563,7 +563,7 @@ void KIO_Print::get(const KURL& url)
 
 	if (group.startsWith("jobs"))
 	{
-		int	p = group.tqfind('?');
+		int	p = group.find('?');
 		if (p != -1)
 			query = group.mid(p+1);
 		if (!query.isEmpty() && query != "jobs" && query != "completed_jobs")
@@ -576,7 +576,7 @@ void KIO_Print::get(const KURL& url)
 		return;
 	}
 
-	int	p = printer.tqfind('?');
+	int	p = printer.find('?');
 	if (p != -1)
 	{
 		query = printer.mid(p+1);