1 files changed, 19 insertions, 19 deletions

diff --git a/quanta/utility/quantacommon.cpp b/quanta/utility/quantacommon.cpp
index 7846fa15..bc279dc9 100644
--- a/quanta/utility/quantacommon.cpp
+++ b/quanta/utility/quantacommon.cpp
@@ -144,11 +144,11 @@ bool QuantaCommon::isSingleTag(const TQString& dtdName, const TQString& tag)
   if(tag.lower() == "!doctype" || tag.lower() == "?xml")
     return true;
 
-  const DTDStruct* dtd = DTDs::ref()->tqfind(dtdName);
+  const DTDStruct* dtd = DTDs::ref()->find(dtdName);
   if (dtd && !tag.isEmpty())
   {
     TQString searchForTag = (dtd->caseSensitive) ? tag : tag.upper();
-    TQTag* qtag = dtd->tagsList->tqfind(searchForTag);
+    TQTag* qtag = dtd->tagsList->find(searchForTag);
     if (qtag)
         single = qtag->isSingle();
   }
@@ -161,11 +161,11 @@ bool QuantaCommon::isOptionalTag(const TQString& dtdName, const TQString& tag)
 {
   bool optional = false;
 
-  const DTDStruct* dtd = DTDs::ref()->tqfind(dtdName);
+  const DTDStruct* dtd = DTDs::ref()->find(dtdName);
   if (dtd && !tag.isEmpty())
   {
     TQString searchForTag = (dtd->caseSensitive) ? tag : tag.upper();
-    TQTag* qtag = dtd->tagsList->tqfind(searchForTag);
+    TQTag* qtag = dtd->tagsList->find(searchForTag);
     if (qtag)
         optional = qtag->isOptional();
   }
@@ -177,11 +177,11 @@ bool QuantaCommon::isKnownTag(const TQString& dtdName, const TQString& tag)
 {
   bool known = false;
 
-  const DTDStruct* dtd = DTDs::ref()->tqfind(dtdName);
+  const DTDStruct* dtd = DTDs::ref()->find(dtdName);
   if (dtd && !tag.isEmpty())
   {
     TQString searchForTag = (dtd->caseSensitive) ? tag : tag.upper();
-    if (dtd->tagsList->tqfind(searchForTag))
+    if (dtd->tagsList->find(searchForTag))
         known = true;
   }
 
@@ -192,11 +192,11 @@ AttributeList* QuantaCommon::tagAttributes(const TQString& dtdName, const TQStri
 {
   AttributeList* attrs = 0L;
 
-  const DTDStruct* dtd = DTDs::ref()->tqfind(dtdName);
+  const DTDStruct* dtd = DTDs::ref()->find(dtdName);
   if (dtd && !tag.isEmpty())
   {
     TQString searchForTag = (dtd->caseSensitive) ? tag : tag.upper();
-    TQTag* qtag = dtd->tagsList->tqfind(searchForTag);
+    TQTag* qtag = dtd->tagsList->find(searchForTag);
     if (qtag)
         attrs = qtag->attributes();
   }
@@ -207,7 +207,7 @@ AttributeList* QuantaCommon::tagAttributes(const TQString& dtdName, const TQStri
 /** Returns the TQTag object for the tag "tag" from the DTD named "dtdname". */
 TQTag* QuantaCommon::tagFromDTD(const TQString& dtdName, const TQString& tag)
 {
-  const DTDStruct* dtd = DTDs::ref()->tqfind(dtdName);
+  const DTDStruct* dtd = DTDs::ref()->find(dtdName);
   return tagFromDTD(dtd, tag);
 }
 
@@ -218,7 +218,7 @@ TQTag* QuantaCommon::tagFromDTD(const DTDStruct *dtd, const TQString& tag)
   if (dtd && !tag.isEmpty())
   {
     TQString searchForTag = (dtd->caseSensitive) ? tag : tag.upper();
-    qtag = dtd->tagsList->tqfind(searchForTag);
+    qtag = dtd->tagsList->find(searchForTag);
   }
 
  return qtag;
@@ -311,7 +311,7 @@ bool QuantaCommon::checkMimeGroup(const KURL& url, const TQString& group)
  mimetype = mimetype.section('/',-1);
  for ( it = list.begin(); it != list.end(); ++it )
  {
-    if ( ((*it)->name().tqcontains(group)) && ((*it)->name().tqfind(mimetype) != -1)
+    if ( ((*it)->name().contains(group)) && ((*it)->name().find(mimetype) != -1)
 )    {
       status = true;
       break;
@@ -410,7 +410,7 @@ TQString QuantaCommon::makeRxCompatible(const TQString& s)
   TQString str = s;
   for (uint i = 0; i < max - 1; i++)
   {
-    str.tqreplace(rxs[i], strs[i]);
+    str.replace(rxs[i], strs[i]);
   }
 
   return str;
@@ -488,7 +488,7 @@ void QuantaCommon::removeCommentsAndQuotes(TQString &str, const DTDStruct *dtd)
      } else
      {
        s = dtd->comments[s];
-       l = str.tqfind(s, pos);
+       l = str.find(s, pos);
        l = (l == -1) ? str.length() : l;
        for (int i = pos; i < l ; i++)
        {
@@ -554,7 +554,7 @@ bool QuantaCommon::insideCommentsOrQuotes(int position, const TQString &string,
      } else
      {
        s = dtd->comments[s];
-       l = str.tqfind(s, pos);
+       l = str.find(s, pos);
        l = (l == -1) ? str.length() : l;
        for (int i = pos; i < l ; i++)
        {
@@ -633,12 +633,12 @@ void QuantaCommon::normalizeStructure(TQString f,TQStringList& l)
  f.remove("\n");
  f.remove("\r");
 
- while(f.tqcontains("<"))
+ while(f.contains("<"))
   {
      TQString z(f);
-     z.truncate(z.tqfind(">")+1);
-     z.remove(0,z.tqfind("<"));
-     f.remove(0,f.tqfind(">")+1);
+     z.truncate(z.find(">")+1);
+     z.remove(0,z.find("<"));
+     f.remove(0,f.find(">")+1);
      l.append(z);
   }
 }
@@ -745,7 +745,7 @@ TQString QuantaCommon::readPathEntry(KConfig *config, const TQString &pKey)
 TQString QuantaCommon::encodedChar(uint code)
 {
    
-  if (replacementMap.tqcontains(code))
+  if (replacementMap.contains(code))
     return TQString("%1;").tqarg(replacementMap[code]);
   else
     return TQString("&#%1;").tqarg(code);