1 files changed, 16 insertions, 16 deletions

diff --git a/khtml/xml/dom_docimpl.cpp b/khtml/xml/dom_docimpl.cpp
index 9de636704..0f70610ef 100644
--- a/khtml/xml/dom_docimpl.cpp
+++ b/khtml/xml/dom_docimpl.cpp
@@ -232,7 +232,7 @@ void ElementMappingCache::add(const TQString& id, ElementImpl* nd)
 {
     if (id.isEmpty()) return;
 
-    ItemInfo* info = m_dict.tqfind(id);
+    ItemInfo* info = m_dict.find(id);
     if (info)
     {
         info->ref++;
@@ -251,7 +251,7 @@ void ElementMappingCache::set(const TQString& id, ElementImpl* nd)
 {
     if (id.isEmpty()) return;
 
-    ItemInfo* info = m_dict.tqfind(id);
+    ItemInfo* info = m_dict.find(id);
     info->nd = nd;
 }
 
@@ -259,7 +259,7 @@ void ElementMappingCache::remove(const TQString& id, ElementImpl* nd)
 {
     if (id.isEmpty()) return;
 
-    ItemInfo* info = m_dict.tqfind(id);
+    ItemInfo* info = m_dict.find(id);
     info->ref--;
     if (info->ref == 0)
     {
@@ -276,13 +276,13 @@ void ElementMappingCache::remove(const TQString& id, ElementImpl* nd)
 bool ElementMappingCache::contains(const TQString& id)
 {
     if (id.isEmpty()) return false;
-    return m_dict.tqfind(id);
+    return m_dict.find(id);
 }
 
 ElementMappingCache::ItemInfo* ElementMappingCache::get(const TQString& id)
 {
     if (id.isEmpty()) return 0;
-    return m_dict.tqfind(id);
+    return m_dict.find(id);
 }
 
 static KStaticDeleter< TQPtrList<DocumentImpl> > s_changedDocumentsDeleter;
@@ -1668,9 +1668,9 @@ void DocumentImpl::processHttpEquiv(const DOMString &equiv, const DOMString &con
     {
         // get delay and url
         TQString str = content.string().stripWhiteSpace();
-        int pos = str.tqfind(TQRegExp("[;,]"));
+        int pos = str.find(TQRegExp("[;,]"));
         if ( pos == -1 )
-            pos = str.tqfind(TQRegExp("[ \t]"));
+            pos = str.find(TQRegExp("[ \t]"));
 
         bool ok = false;
 	int delay = kMax( 0, content.implementation()->toInt(&ok) );
@@ -1685,7 +1685,7 @@ void DocumentImpl::processHttpEquiv(const DOMString &equiv, const DOMString &con
             pos++;
             while(pos < (int)str.length() && str[pos].isSpace()) pos++;
             str = str.mid(pos);
-            if(str.tqfind("url", 0,  false ) == 0)  str = str.mid(3);
+            if(str.find("url", 0,  false ) == 0)  str = str.mid(3);
             str = str.stripWhiteSpace();
             if ( str.length() && str[0] == '=' ) str = str.mid( 1 ).stripWhiteSpace();
             while(str.length() &&
@@ -1881,17 +1881,17 @@ NodeImpl::Id DocumentImpl::getId( NodeImpl::IdType _type, DOMStringImpl* _nsURI,
     TQString name = cs ? n.string() : n.string().upper();
 
     if (!_nsURI) {
-        id = (NodeImpl::Id)(long) map->ids.tqfind( name );
+        id = (NodeImpl::Id)(long) map->ids.find( name );
         if (!id && _type != NodeImpl::NamespaceId) {
-            id = (NodeImpl::Id)(long) map->ids.tqfind( "aliases: " + name );
+            id = (NodeImpl::Id)(long) map->ids.find( "aliases: " + name );
 	}
     } else {
-        id = (NodeImpl::Id)(long) map->ids.tqfind( name );
+        id = (NodeImpl::Id)(long) map->ids.find( name );
         if (!readonly && id && _prefix && _prefix->l) {
             // we were called in registration mode... check if the alias exists
             TQConstString px( _prefix->s, _prefix->l );
             TQString qn("aliases: " + (cs ? px.string() : px.string().upper()) + ":" + name);
-            if (!map->ids.tqfind( qn )) {
+            if (!map->ids.find( qn )) {
                 map->ids.insert( qn, (void*)id );
             }
         }
@@ -2143,7 +2143,7 @@ void DocumentImpl::recalcStyleSelector()
 
                     title = title.replace('&',  "&&");
 
-                    if ( !m_availableSheets.tqcontains( title ) )
+                    if ( !m_availableSheets.contains( title ) )
                         m_availableSheets.append( title );
                 }
             }
@@ -2170,7 +2170,7 @@ void DocumentImpl::recalcStyleSelector()
         // or we found the sheet we selected
         if (sheetUsed.isEmpty() ||
             (!canResetSheet && tokenizer()) ||
-            m_availableSheets.tqcontains(sheetUsed)) {
+            m_availableSheets.contains(sheetUsed)) {
             break;
         }
 
@@ -2690,7 +2690,7 @@ NodeListImpl::Cache* DOM::DocumentImpl::acquireCachedNodeListInfo(
 
     //Check to see if we have this sort of item cached.
     NodeListImpl::Cache* cached =
-        (type == NodeListImpl::UNCACHEABLE) ? 0 : m_nodeListCache.tqfind(key.hash());
+        (type == NodeListImpl::UNCACHEABLE) ? 0 : m_nodeListCache.find(key.hash());
 
     if (cached) {
         if (cached->key == key) {
@@ -2710,7 +2710,7 @@ NodeListImpl::Cache* DOM::DocumentImpl::acquireCachedNodeListInfo(
 
     if (type != NodeListImpl::UNCACHEABLE) {
         newInfo->ref(); //Add the cache's reference
-        m_nodeListCache.tqreplace(key.hash(), newInfo);
+        m_nodeListCache.replace(key.hash(), newInfo);
     }
 
     return newInfo;