rename the following methods:

tqfind find
tqreplace replace
tqcontains contains


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

8 files changed, 26 insertions, 26 deletions

diff --git a/kaudiocreator/encoder.cpp b/kaudiocreator/encoder.cpp
index a0567fbf..97ab366a 100644
--- a/kaudiocreator/encoder.cpp
+++ b/kaudiocreator/encoder.cpp
@@ -160,7 +160,7 @@ void Encoder::tendToNewJobs() {
 	EncoderPrefs* prefs = loadEncoder(job->encoder);
 	
 	TQString desiredFile = Prefs::fileFormat();
-	desiredFile.tqreplace( TQRegExp("~"), TQDir::homeDirPath() );
+	desiredFile.replace( TQRegExp("~"), TQDir::homeDirPath() );
 	{
 		TQMap <TQString,TQString> map;
 		map.insert("extension", prefs->extension());
@@ -185,7 +185,7 @@ void Encoder::tendToNewJobs() {
 		}
 	}
 	
-	int lastSlash = desiredFile.tqfindRev('/',-1);
+	int lastSlash = desiredFile.findRev('/',-1);
 	if ( lastSlash == -1 ||
 			!(KStandardDirs::makeDir( desiredFile.mid(0,lastSlash), 0775)) ) {
 		KMessageBox::sorry(0, i18n("Cannot place file, unable to make directories."), i18n("Encoding Failed"));
@@ -225,7 +225,7 @@ void Encoder::tendToNewJobs() {
 }
 
 /**
- * We have received some output from a thread. See if it tqcontains %.
+ * We have received some output from a thread. See if it contains %.
  * @param proc the process that has new output.
  * @param buffer the output from the process
  * @param buflen the length of the buffer.
@@ -235,7 +235,7 @@ void Encoder::receivedThreadOutput(KProcess *process, char *buffer, int length )
 		kdDebug(60002) << buffer << endl;
 	
 	// Make sure we have a job to send an update too.
-	if(jobs.tqfind((KShellProcess*)process) == jobs.end()){
+	if(jobs.find((KShellProcess*)process) == jobs.end()){
 		kdDebug(60002) << "Encoder::receivedThreadOutput Job doesn't exists. Line: " <<  __LINE__ << endl;
 		return;
 	}
@@ -247,13 +247,13 @@ void Encoder::receivedThreadOutput(KProcess *process, char *buffer, int length )
 
 	// Make sure the output string has a % symble in it.
 	TQString output = TQString(buffer).mid(0,length);
-	if ( output.tqfind('%') == -1 && reportCount < 5 ) {
+	if ( output.find('%') == -1 && reportCount < 5 ) {
 		kdDebug(60002) << "No \'%%\' in output. Report as bug w/encoder options if progressbar doesn't fill." << endl;
 		reportCount++;
 		return;
 	}
 	//qDebug(TQString("Pre cropped: %1").tqarg(output).latin1());
-	output = output.mid(output.tqfind('%')-loadEncoder(job->encoder)->percentLength(),2);
+	output = output.mid(output.find('%')-loadEncoder(job->encoder)->percentLength(),2);
 	//qDebug(TQString("Post cropped: %1").tqarg(output).latin1());
 	bool conversionSuccessfull = false;
 	int percent = output.toInt(&conversionSuccessfull);
diff --git a/kaudiocreator/encoderconfigimp.cpp b/kaudiocreator/encoderconfigimp.cpp
index 4455781c..a2fb31e2 100644
--- a/kaudiocreator/encoderconfigimp.cpp
+++ b/kaudiocreator/encoderconfigimp.cpp
@@ -242,7 +242,7 @@ void EncoderConfigImp::updateEncoder(const char *dialogName){
   if(newName == encoderName)
     return;
 
-  TQListBoxItem *item = kcfg_currentEncoder->tqfindItem(encoderName);
+  TQListBoxItem *item = kcfg_currentEncoder->findItem(encoderName);
   if(!item)
     return;
   kcfg_currentEncoder->changeItem(newName, kcfg_currentEncoder->index(item));
@@ -260,7 +260,7 @@ EncoderPrefs *EncoderPrefs::prefs(const TQString &groupName)
      m_prefs = new TQDict<EncoderPrefs>();
      m_prefs->setAutoDelete(true);
   }
-  EncoderPrefs *encPrefs = m_prefs->tqfind(groupName);
+  EncoderPrefs *encPrefs = m_prefs->find(groupName);
   if (encPrefs)
     return encPrefs;
 
diff --git a/kaudiocreator/general.ui.h b/kaudiocreator/general.ui.h
index 98c00de3..a980b3af 100644
--- a/kaudiocreator/general.ui.h
+++ b/kaudiocreator/general.ui.h
@@ -14,6 +14,6 @@
 void General::updateExample()
 {
   TQString text = example->text();
-  text.tqreplace( TQRegExp(kcfg_replaceInput->text()), kcfg_replaceOutput->text() );
+  text.replace( TQRegExp(kcfg_replaceInput->text()), kcfg_replaceOutput->text() );
   exampleOutput->setText(text);
 }
diff --git a/kaudiocreator/job.cpp b/kaudiocreator/job.cpp
index c4950377..740aeb5e 100644
--- a/kaudiocreator/job.cpp
+++ b/kaudiocreator/job.cpp
@@ -21,7 +21,7 @@
 #include <tqregexp.h>
 
 /**
- * A helper function to tqreplace %X with the stuff in the album.
+ * A helper function to replace %X with the stuff in the album.
  * if quote is true then put "" around the %X
  */
 TQString Job::replaceSpecialChars(const TQString &string, bool quote, TQMap<TQString, TQString> _map){
@@ -45,14 +45,14 @@ TQString Job::replaceSpecialChars(const TQString &string, bool quote, TQMap<TQSt
 }
 
 void Job::fix(const TQString &in, const TQString &out){
-	track_title.tqreplace( TQRegExp(in), out );
-	track_artist.tqreplace( TQRegExp(in), out );
-	track_comment.tqreplace( TQRegExp(in), out );
+	track_title.replace( TQRegExp(in), out );
+	track_artist.replace( TQRegExp(in), out );
+	track_comment.replace( TQRegExp(in), out );
 	// year
 	// track
-	genre.tqreplace( TQRegExp(in), out );
-	album.tqreplace( TQRegExp(in), out );
-	comment.tqreplace( TQRegExp(in), out );
-	group.tqreplace( TQRegExp(in), out );
+	genre.replace( TQRegExp(in), out );
+	album.replace( TQRegExp(in), out );
+	comment.replace( TQRegExp(in), out );
+	group.replace( TQRegExp(in), out );
 }
 
diff --git a/kaudiocreator/kaudiocreator.kcfg b/kaudiocreator/kaudiocreator.kcfg
index 03e5fa12..9e8addd0 100644
--- a/kaudiocreator/kaudiocreator.kcfg
+++ b/kaudiocreator/kaudiocreator.kcfg
@@ -31,7 +31,7 @@
     <entry name="replaceInput" type="String" key="selection">
       <label>Regexp to match file names with</label>
     </entry>
-    <entry name="replaceOutput" type="String" key="tqreplace">
+    <entry name="replaceOutput" type="String" key="replace">
       <label>String used to replace the parts that match the selection regexp</label>
     </entry>
     <entry name="seperateMultiArtist" type="Bool">
diff --git a/kaudiocreator/ripper.cpp b/kaudiocreator/ripper.cpp
index 7a308a9f..dcc391ca 100644
--- a/kaudiocreator/ripper.cpp
+++ b/kaudiocreator/ripper.cpp
@@ -201,7 +201,7 @@ void Ripper::copyJobResult(KIO::Job *copyjob){
 	KIO::FileCopyJob *copyJob = dynamic_cast<KIO::FileCopyJob*> (copyjob);
 	KNotifyClient::event("track ripped");
 
-	if(jobs.tqfind(copyjob) == jobs.end())
+	if(jobs.find(copyjob) == jobs.end())
 		return;
 	Job *newJob = jobs[copyjob];
 	jobs.remove(copyjob);
diff --git a/kaudiocreator/tracksimp.cpp b/kaudiocreator/tracksimp.cpp
index 02668821..146a4c89 100644
--- a/kaudiocreator/tracksimp.cpp
+++ b/kaudiocreator/tracksimp.cpp
@@ -84,7 +84,7 @@ TracksImp::~TracksImp() {
         list.append(deviceCombo->currentText());
     for ( int i=0; i<deviceCombo->count();i++ ) {
         TQString text = deviceCombo->text(i);
-        if( list.tqfind(text) == list.end())
+        if( list.find(text) == list.end())
             list.append(text);
         if( list.count() == 5)
             break;
@@ -104,13 +104,13 @@ void TracksImp::loadSettings() {
     TQStringList prefsList = Prefs::device();
     TQStringList::Iterator it;
     for ( it = prefsList.begin(); it != prefsList.end(); ++it ) {
-        if( list.tqfind( *it ) == list.end())
+        if( list.find( *it ) == list.end())
             list.append(*it);
     }
     // Get current list, no dups
     for ( int i=0; i<deviceCombo->count();i++ ) {
         TQString text = deviceCombo->text(i);
-        if( list.tqfind(text) == list.end())
+        if( list.find(text) == list.end())
             list.append(text);
     }
 
@@ -277,7 +277,7 @@ void TracksImp::lookupCDDBDone(CDDB::Result result ) {
     }
 
     // Some sanity provisions to ensure that the number of records matches what
-    // the CD actually tqcontains.
+    // the CD actually contains.
     while (info.trackInfoList.count() < cddbInfo.trackInfoList.count())
     {
         info.trackInfoList.append(KCDDB::TrackInfo());
@@ -496,7 +496,7 @@ void TracksImp::newAlbum()
     bool isSampler = true;
     for( unsigned i = 0; i < t.count(); i++ )
     {
-        if (t[i].title.tqfind(" / ") == -1)
+        if (t[i].title.find(" / ") == -1)
         {
             isSampler = false;
             break;
@@ -512,7 +512,7 @@ void TracksImp::newAlbum()
         if( isSampler )
         {
             // Support for multiple artists stripping.
-            int delimiter = t[i].title.tqfind(" / ");
+            int delimiter = t[i].title.find(" / ");
             Q_ASSERT( delimiter != -1 );
             trackArtist = t[i].title.left(delimiter);
             title = t[i].title.mid(delimiter + 3);
diff --git a/kaudiocreator/wizard.ui.h b/kaudiocreator/wizard.ui.h
index 294d36dc..7c22638e 100644
--- a/kaudiocreator/wizard.ui.h
+++ b/kaudiocreator/wizard.ui.h
@@ -90,7 +90,7 @@ void fileWizard::commentPressed()
 void fileWizard::fileFormatTextChanged(const TQString& text)
 {
 	TQString string = text;
-	string.tqreplace(TQRegExp("~"), "/home/foo");
+	string.replace(TQRegExp("~"), "/home/foo");
 	Job job;
 	job.genre = "Rock";
 	job.group = "J Rocker";