rename the following methods:

tqfind find
tqreplace replace
tqcontains contains


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

5 files changed, 21 insertions, 21 deletions

diff --git a/khtml/html/html_documentimpl.cpp b/khtml/html/html_documentimpl.cpp
index a38f6c2fb..a5c78657c 100644
--- a/khtml/html/html_documentimpl.cpp
+++ b/khtml/html/html_documentimpl.cpp
@@ -233,11 +233,11 @@ HTMLMapElementImpl* HTMLDocumentImpl::getMap(const DOMString& _url)
 {
     TQString url = _url.string();
     TQString s;
-    int pos = url.tqfind('#');
+    int pos = url.find('#');
     //kdDebug(0) << "map pos of #:" << pos << endl;
     s = TQString(_url.tqunicode() + pos + 1, _url.length() - pos - 1);
 
-    TQMapConstIterator<TQString,HTMLMapElementImpl*> it = mapMap.tqfind(s);
+    TQMapConstIterator<TQString,HTMLMapElementImpl*> it = mapMap.find(s);
 
     if (it != mapMap.end())
         return *it;
@@ -297,7 +297,7 @@ static int parseDocTypePart(const TQString& buffer, int index)
         else if (ch == '-') {
             int tmpIndex=index;
             if (buffer[index+1] == '-' &&
-                ((tmpIndex=buffer.tqfind("--", index+2)) != -1))
+                ((tmpIndex=buffer.find("--", index+2)) != -1))
                 index = tmpIndex+2;
             else
                 return index;
@@ -330,7 +330,7 @@ static bool parseDocTypeDeclaration(const TQString& buffer,
     // Skip through any comments and processing instructions.
     int index = 0;
     do {
-        index = buffer.tqfind('<', index);
+        index = buffer.find('<', index);
         if (index == -1) break;
         TQChar nextChar = buffer[index+1];
         if (nextChar == '!') {
@@ -340,10 +340,10 @@ static bool parseDocTypeDeclaration(const TQString& buffer,
                 break;
             }
             index = parseDocTypePart(buffer,index);
-            index = buffer.tqfind('>', index);
+            index = buffer.find('>', index);
         }
         else if (nextChar == '?')
-            index = buffer.tqfind('>', index);
+            index = buffer.find('>', index);
         else
             break;
     } while (index != -1);
@@ -371,7 +371,7 @@ static bool parseDocTypeDeclaration(const TQString& buffer,
         // |start| is the first character (after the quote) and |end|
         // is the final quote, so there are |end|-|start| characters.
         int publicIDStart = index+1;
-        int publicIDEnd = buffer.tqfind(theChar, publicIDStart);
+        int publicIDEnd = buffer.find(theChar, publicIDStart);
         if (publicIDEnd == -1)
             return false;
         index = parseDocTypePart(buffer, publicIDEnd+1);
@@ -385,7 +385,7 @@ static bool parseDocTypeDeclaration(const TQString& buffer,
             // We have a system identifier.
             *resultFlags |= PARSEMODE_HAVE_SYSTEM_ID;
             int systemIDStart = index+1;
-            int systemIDEnd = buffer.tqfind(next, systemIDStart);
+            int systemIDEnd = buffer.find(next, systemIDStart);
             if (systemIDEnd == -1)
                 return false;
             systemID = buffer.mid(systemIDStart, systemIDEnd - systemIDStart);
@@ -410,7 +410,7 @@ static bool parseDocTypeDeclaration(const TQString& buffer,
             if (next != '\"' && next != '\'')
                 return false;
             int systemIDStart = index+1;
-            int systemIDEnd = buffer.tqfind(next, systemIDStart);
+            int systemIDEnd = buffer.find(next, systemIDStart);
             if (systemIDEnd == -1)
                 return false;
             systemID = buffer.mid(systemIDStart, systemIDEnd - systemIDStart);
diff --git a/khtml/html/html_formimpl.cpp b/khtml/html/html_formimpl.cpp
index d025f428e..1512395e2 100644
--- a/khtml/html/html_formimpl.cpp
+++ b/khtml/html/html_formimpl.cpp
@@ -122,8 +122,8 @@ static TQCString encodeCString(const TQCString& e)
     // http://www.w3.org/TR/html4/interact/forms.html#h-17.13.4.1
     // safe characters like NS handles them for compatibility
     static const char *safe = "-._*";
-    TQCString encoded(( e.length()+e.tqcontains( '\n' ) )*3
-                     +e.tqcontains('\r') * 3 + 1);
+    TQCString encoded(( e.length()+e.contains( '\n' ) )*3
+                     +e.contains('\r') * 3 + 1);
     int enclen = 0;
     bool crmissing = false;
     unsigned char oldc;
@@ -391,12 +391,12 @@ TQByteArray HTMLFormElementImpl::formData(bool& ok)
 
 void HTMLFormElementImpl::setEnctype( const DOMString& type )
 {
-    if(type.string().tqfind("multipart", 0, false) != -1 || type.string().tqfind("form-data", 0, false) != -1)
+    if(type.string().find("multipart", 0, false) != -1 || type.string().find("form-data", 0, false) != -1)
     {
         m_enctype = "multipart/form-data";
         m_multipart = true;
         m_post = true;
-    } else if (type.string().tqfind("text", 0, false) != -1 || type.string().tqfind("plain", 0, false) != -1)
+    } else if (type.string().find("text", 0, false) != -1 || type.string().find("plain", 0, false) != -1)
     {
         m_enctype = "text/plain";
         m_multipart = false;
@@ -457,7 +457,7 @@ void HTMLFormElementImpl::walletOpened(KWallet::Wallet *w) {
             if ((current->inputType() == HTMLInputElementImpl::PASSWORD ||
                     current->inputType() == HTMLInputElementImpl::TEXT) &&
                     !current->readOnly() &&
-                    map.tqcontains(current->name().string())) {
+                    map.contains(current->name().string())) {
                 getDocument()->setFocusNode(current);
                 current->setValue(map[current->name().string()]);
             }
@@ -2751,7 +2751,7 @@ void HTMLTextAreaElementImpl::attach()
 static TQString expandLF(const TQString& s)
 {
     // LF -> CRLF
-    unsigned crs = s.tqcontains( '\n' );
+    unsigned crs = s.contains( '\n' );
     if (crs == 0)
 	return s;
     unsigned len = s.length();
diff --git a/khtml/html/html_miscimpl.cpp b/khtml/html/html_miscimpl.cpp
index 2b0387d35..d5e812029 100644
--- a/khtml/html/html_miscimpl.cpp
+++ b/khtml/html/html_miscimpl.cpp
@@ -290,7 +290,7 @@ TQValueList<NodeImpl*> HTMLCollectionImpl::namedItems( const DOMString &name ) c
     //remember stuff about elements we were asked for.
     m_cache->updateNodeListInfo(m_refNode->getDocument());
     CollectionCache* cache = static_cast<CollectionCache*>(m_cache);
-    if (TQValueList<NodeImpl*>* info = cache->nameCache.tqfind(key)) {
+    if (TQValueList<NodeImpl*>* info = cache->nameCache.find(key)) {
         return *info;
     }
     else {
diff --git a/khtml/html/html_objectimpl.cpp b/khtml/html/html_objectimpl.cpp
index 5ed1e11f3..2dc0f4288 100644
--- a/khtml/html/html_objectimpl.cpp
+++ b/khtml/html/html_objectimpl.cpp
@@ -57,7 +57,7 @@ HTMLObjectBaseElementImpl::HTMLObjectBaseElementImpl(DocumentImpl *doc)
 
 void HTMLObjectBaseElementImpl::setServiceType(const TQString & val) {
     serviceType = val.lower();
-    int pos = serviceType.tqfind( ";" );
+    int pos = serviceType.find( ";" );
     if ( pos!=-1 )
         serviceType.truncate( pos );
 }
@@ -160,9 +160,9 @@ void HTMLObjectBaseElementImpl::attach() {
 
     if (serviceType.isEmpty() && url.startsWith("data:")) {
         // Extract the MIME type from the data URL.
-        int index = url.tqfind(';');
+        int index = url.find(';');
         if (index == -1)
-            index = url.tqfind(',');
+            index = url.find(',');
         if (index != -1) {
             int len = index - 5;
             if (len > 0)
diff --git a/khtml/html/htmltokenizer.cpp b/khtml/html/htmltokenizer.cpp
index d1d009d39..0b9b5f34d 100644
--- a/khtml/html/htmltokenizer.cpp
+++ b/khtml/html/htmltokenizer.cpp
@@ -347,7 +347,7 @@ void HTMLTokenizer::parseSpecial(TokenizerString &src)
         // possible end of tagname, lets check.
         if ( !scriptCodeResync && !escaped && !src.escaped() && ( ch == '>' || ch == '/' || ch <= ' ' ) && ch &&
              scriptCodeSize >= searchStopperLen &&
-             !TQConstString( scriptCode+scriptCodeSize-searchStopperLen, searchStopperLen ).string().tqfind( searchStopper, 0, false )) {
+             !TQConstString( scriptCode+scriptCodeSize-searchStopperLen, searchStopperLen ).string().find( searchStopper, 0, false )) {
             scriptCodeResync = scriptCodeSize-searchStopperLen+1;
             tquote = NoQuote;
             continue;
@@ -1618,7 +1618,7 @@ void HTMLTokenizer::finish()
             food += TQString(scriptCode, scriptCodeSize);
         }
         else {
-            pos = TQConstString(scriptCode, scriptCodeSize).string().tqfind('>');
+            pos = TQConstString(scriptCode, scriptCodeSize).string().find('>');
             food.setUnicode(scriptCode+pos+1, scriptCodeSize-pos-1); // deep copy
         }
         KHTML_DELETE_QCHAR_VEC(scriptCode);