rename the following methods:

tqfind find
tqreplace replace
tqcontains contains


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

2 files changed, 17 insertions, 17 deletions

diff --git a/kaffeine/src/input/disc/cddb.cpp b/kaffeine/src/input/disc/cddb.cpp
index 037c515..9581651 100644
--- a/kaffeine/src/input/disc/cddb.cpp
+++ b/kaffeine/src/input/disc/cddb.cpp
@@ -107,7 +107,7 @@ bool CDDB::readLine(TQCString& ret)
   while (read_length < 40000)
     {
       // Look for a \n in buf
-      int ni = buf.tqfind('\n');
+      int ni = buf.find('\n');
       if (ni >= 0)
         {
 	  // Nice, so return this substring (without the \n),
@@ -200,14 +200,14 @@ static int get_code (const TQCString &s)
 static void parse_query_resp (const TQCString& _r, TQCString& catg, TQCString& d_id, TQCString& title)
 {
   TQCString r = _r.stripWhiteSpace();
-  int i = r.tqfind(' ');
+  int i = r.find(' ');
   if (i)
     {
       catg = r.left(i).stripWhiteSpace();
       r.remove(0, i+1);
       r = r.stripWhiteSpace();
     }
-  i = r.tqfind(' ');
+  i = r.find(' ');
   if (i)
     {
       d_id = r.left(i).stripWhiteSpace();
@@ -265,7 +265,7 @@ bool CDDB::parse_read_resp(TQTextStream *stream, TQTextStream *write_stream)
       else if (r.left(6) == "TTITLE")
         {
 	  r.remove(0, 6);
-	  int e = r.tqfind('=');
+	  int e = r.find('=');
 	  if (e)
 	    {
 	      bool ok;
@@ -281,7 +281,7 @@ bool CDDB::parse_read_resp(TQTextStream *stream, TQTextStream *write_stream)
 
   /* XXX We should canonicalize the strings ("\n" --> '\n' e.g.) */
 
-  int si = m_title.tqfind(" / ");
+  int si = m_title.find(" / ");
   if (si > 0)
     {
       m_artist = m_title.left(si).stripWhiteSpace();
@@ -292,18 +292,18 @@ bool CDDB::parse_read_resp(TQTextStream *stream, TQTextStream *write_stream)
   if (m_title.isEmpty())
     m_title = i18n("No Title");
   /*else
-    m_title.tqreplace(TQRegExp("/"), "%2f");*/
+    m_title.replace(TQRegExp("/"), "%2f");*/
   if (m_artist.isEmpty())
     m_artist = i18n("Unknown");
   /*else
-    m_artist.tqreplace(TQRegExp("/"), "%2f");*/
+    m_artist.replace(TQRegExp("/"), "%2f");*/
 
   kdDebug(7101) << "CDDB: found Title: `" << m_title << "'" << endl;
   for (int i = 0; i < m_tracks; i++)
     {
       if (m_names[i].isEmpty())
         m_names[i] += i18n("Track %1").tqarg(i);
-      m_names[i].tqreplace(TQRegExp("/"), "%2f");
+      m_names[i].replace(TQRegExp("/"), "%2f");
       kdDebug(7101) << "CDDB: found Track " << i+1 << ": `" << m_names[i]
         << "'" << endl;
     }
@@ -464,7 +464,7 @@ bool CDDB::queryCD(TQValueList<int>& track_ofs)
 	    }
 	  file.close();
 	  /*TQString newname (file.name());
-	  newname.truncate(newname.tqfindRev('.'));
+	  newname.truncate(newname.findRev('.'));
 	  if (TQDir::current().rename(file.name(), newname)) {
 	    kdDebug(7101) << "CDDB: rename failed" << endl;
 	    file.remove();
diff --git a/kaffeine/src/input/disc/paranoia.cpp b/kaffeine/src/input/disc/paranoia.cpp
index 9a32743..ce07604 100644
--- a/kaffeine/src/input/disc/paranoia.cpp
+++ b/kaffeine/src/input/disc/paranoia.cpp
@@ -176,13 +176,13 @@ bool Paranoia::findCdrom()
 	TQTextStream t( f );
 	while ( !t.eof() && !stop ) {
 		s = t.readLine();
-		if ( s.tqcontains("drive name:") )
+		if ( s.contains("drive name:") )
 			stop = true;
 	}
 	if ( !stop )
 		return false;
 
-	pos = s.tqfind(":");
+	pos = s.find(":");
 	c = s.right( s.length()-pos-1 );
 	sscanf( c.latin1(), "%s %s %s %s", dev[0], dev[1], dev[2], dev[3] );
 
@@ -198,15 +198,15 @@ bool Paranoia::procCdrom( TQString name )
 {
 	int pos;
 
-	if ( name.tqcontains("sr") ) {
-		pos = name.tqfind("r");
+	if ( name.contains("sr") ) {
+		pos = name.find("r");
 		name = name.right( name.length()-pos-1 );
 		name = "/dev/scd"+name;
 		d = cdda_identify( name.ascii(), CDDA_MESSAGE_PRINTIT, 0 );
 		if ( cdda_open( d )==0 )
 			return true;
 	}
-	else if ( name.tqcontains("hd") ) {
+	else if ( name.contains("hd") ) {
 		name = "/dev/"+name;
 		d = cdda_identify( name.ascii(), CDDA_MESSAGE_PRINTIT, 0 );
 		if ( cdda_open( d )==0 )
@@ -274,7 +274,7 @@ bool Paranoia::encode( const TQStringList &list, TQWidget *tqparent )
 		return false;
 	}
 
-	if ( !setPath( baseDir, TQString(encodingList[0]).tqreplace("/","_"), TQString(encodingList[1]).tqreplace("/","_") ) ) {
+	if ( !setPath( baseDir, TQString(encodingList[0]).replace("/","_"), TQString(encodingList[1]).replace("/","_") ) ) {
 		return false;
 	}
 	isRunning = true;
@@ -292,7 +292,7 @@ bool Paranoia::loadEncoder( TQWidget *tqparent )
 		return false;
 	}
 
-	if ( service->serviceTypes().tqcontains("KaffeineAudioEncoder") ) {
+	if ( service->serviceTypes().contains("KaffeineAudioEncoder") ) {
 		currentEncoder = KParts::ComponentFactory::createPartInstanceFromService<KaffeineAudioEncoder>(service, 0, service->name().ascii(), 0, 0, 0, &error);
 		if (error > 0) {
 			KMessageBox::error( tqparent, i18n("Loading of encoder '%1' failed.").tqarg(encoderDesktop) );
@@ -389,7 +389,7 @@ void Paranoia::run()
 
 	for ( i=2; i<(int)encodingList.count(); ++i ) {
 		n = encodingList[i].left(2).toInt();
-		s = TQString(encodingList[i]).tqreplace("/","_")+currentEncoder->getExtension();
+		s = TQString(encodingList[i]).replace("/","_")+currentEncoder->getExtension();
 		f.setName( baseDir+s );
 		initTrack( n );
 		max = 0;