rename the following methods:

tqfind find
tqreplace replace
tqcontains contains


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

5 files changed, 24 insertions, 24 deletions

diff --git a/src/document/MultiViewCommandHistory.cpp b/src/document/MultiViewCommandHistory.cpp
index 04f1aa4..0cc94b2 100644
--- a/src/document/MultiViewCommandHistory.cpp
+++ b/src/document/MultiViewCommandHistory.cpp
@@ -322,8 +322,8 @@ MultiViewCommandHistory::updateButton(bool undo,
         } else {
             action->setEnabled(true);
             TQString commandName = stack.top()->name();
-            commandName.tqreplace(TQRegExp("&"), "");
-            commandName.tqreplace(TQRegExp("\\.\\.\\.$"), "");
+            commandName.replace(TQRegExp("&"), "");
+            commandName.replace(TQRegExp("\\.\\.\\.$"), "");
             if (undo)
                 text = i18n("Und&o %1").tqarg(commandName);
             else
@@ -364,8 +364,8 @@ MultiViewCommandHistory::updateMenu(bool undo,
             stack.pop();
 
             TQString commandName = command->name();
-            commandName.tqreplace(TQRegExp("&"), "");
-            commandName.tqreplace(TQRegExp("\\.\\.\\.$"), "");
+            commandName.replace(TQRegExp("&"), "");
+            commandName.replace(TQRegExp("\\.\\.\\.$"), "");
 
             TQString text;
             if (undo)
diff --git a/src/document/RoseXmlHandler.cpp b/src/document/RoseXmlHandler.cpp
index fe99128..c378687 100644
--- a/src/document/RoseXmlHandler.cpp
+++ b/src/document/RoseXmlHandler.cpp
@@ -148,7 +148,7 @@ bool ConfigurationXmlSubHandler::characters(const TQString& chars)
     
     if (m_propertyType == "RealTime") {
         Rosegarden::RealTime rt;
-        int sepIdx = ch.tqfind(',');
+        int sepIdx = ch.find(',');
         
         rt.sec = ch.left(sepIdx).toInt();
         rt.nsec = ch.mid(sepIdx + 1).toInt();
diff --git a/src/document/RosegardenGUIDoc.cpp b/src/document/RosegardenGUIDoc.cpp
index 88ce346..71c3c2a 100644
--- a/src/document/RosegardenGUIDoc.cpp
+++ b/src/document/RosegardenGUIDoc.cpp
@@ -1834,7 +1834,7 @@ RosegardenGUIDoc::insertRecordedMidi(const MappedComposition &mC)
 
                     // it's a note-off
 
-                    //NoteOnMap::iterator mi = m_noteOnEvents.tqfind((*i)->getPitch());
+                    //NoteOnMap::iterator mi = m_noteOnEvents.find((*i)->getPitch());
                     PitchMap *pm = &m_noteOnEvents[device][channel];
                     PitchMap::iterator mi = pm->find(pitch);
 
diff --git a/src/document/io/LilyPondExporter.cpp b/src/document/io/LilyPondExporter.cpp
index f5e5ff9..b445a41 100644
--- a/src/document/io/LilyPondExporter.cpp
+++ b/src/document/io/LilyPondExporter.cpp
@@ -351,15 +351,15 @@ LilyPondExporter::protectIllegalChars(std::string inStr)
 
     TQString tmpStr = strtoqstr(inStr);
 
-    tmpStr.tqreplace(TQRegExp("&"), "\\&");
-    tmpStr.tqreplace(TQRegExp("\\^"), "\\^");
-    tmpStr.tqreplace(TQRegExp("%"), "\\%");
-    tmpStr.tqreplace(TQRegExp("<"), "\\<");
-    tmpStr.tqreplace(TQRegExp(">"), "\\>");
-    tmpStr.tqreplace(TQRegExp("\\["), "");
-    tmpStr.tqreplace(TQRegExp("\\]"), "");
-    tmpStr.tqreplace(TQRegExp("\\{"), "");
-    tmpStr.tqreplace(TQRegExp("\\}"), "");
+    tmpStr.replace(TQRegExp("&"), "\\&");
+    tmpStr.replace(TQRegExp("\\^"), "\\^");
+    tmpStr.replace(TQRegExp("%"), "\\%");
+    tmpStr.replace(TQRegExp("<"), "\\<");
+    tmpStr.replace(TQRegExp(">"), "\\>");
+    tmpStr.replace(TQRegExp("\\["), "");
+    tmpStr.replace(TQRegExp("\\]"), "");
+    tmpStr.replace(TQRegExp("\\{"), "");
+    tmpStr.replace(TQRegExp("\\}"), "");
 
     //
     // LilyPond uses utf8 encoding.
@@ -389,11 +389,11 @@ LilyPondExporter::write()
     TQString baseName = nfo.fileName();
 
     // sed LilyPond-choking chars out of the filename proper
-    bool illegalFilename = (baseName.tqcontains(' ') || baseName.tqcontains("\\"));
-    baseName.tqreplace(TQRegExp(" "), "");
-    baseName.tqreplace(TQRegExp("\\\\"), "");
-    baseName.tqreplace(TQRegExp("'"), "");
-    baseName.tqreplace(TQRegExp("\""), "");
+    bool illegalFilename = (baseName.contains(' ') || baseName.contains("\\"));
+    baseName.replace(TQRegExp(" "), "");
+    baseName.replace(TQRegExp("\\\\"), "");
+    baseName.replace(TQRegExp("'"), "");
+    baseName.replace(TQRegExp("\""), "");
 
     // cat back together
     tmpName = dirName + '/' + baseName;
@@ -1181,7 +1181,7 @@ LilyPondExporter::write()
 				    text += " ";
 			    
 		                    TQString syllable(strtoqstr(ssyllable));
-		                    syllable.tqreplace(TQRegExp("\\s+"), "");
+		                    syllable.replace(TQRegExp("\\s+"), "");
 		                    text += "\"" + syllable + "\"";
 		                    haveLyric = true;
 				} else if (verse > lastVerse) {
@@ -1190,8 +1190,8 @@ LilyPondExporter::write()
 			    }
 		        }
 
-			text.tqreplace( TQRegExp(" _+([^ ])") , " \\1" );
-			text.tqreplace( "\"_\"" , " " );
+			text.replace( TQRegExp(" _+([^ ])") , " \\1" );
+			text.replace( "\"_\"" , " " );
 		
 		        // Do not create empty context for lyrics.
 		        // Does this save some vertical space, as was written
diff --git a/src/document/io/LilyPondExporter.h b/src/document/io/LilyPondExporter.h
index a106243..5656f77 100644
--- a/src/document/io/LilyPondExporter.h
+++ b/src/document/io/LilyPondExporter.h
@@ -129,7 +129,7 @@ protected:
     // compose an appropriate LilyPond representation for various Marks
     std::string composeLilyMark(std::string eventMark, bool stemUp);
 
-    // tqfind/protect illegal characters in user-supplied strings
+    // find/protect illegal characters in user-supplied strings
     std::string protectIllegalChars(std::string inStr);
 
     // return a string full of column tabs