Rename a number of old tq methods that are no longer tq specific

7 files changed, 28 insertions, 28 deletions

diff --git a/quanta/parsers/dtd/dtd.cpp b/quanta/parsers/dtd/dtd.cpp
index 5008dcff..92e1e8f8 100644
--- a/quanta/parsers/dtd/dtd.cpp
+++ b/quanta/parsers/dtd/dtd.cpp
@@ -124,7 +124,7 @@ bool DTD::parseDTD(const KURL &url)
  TQString fileName = TQString();
  if (!KIO::NetAccess::download(url, fileName))
  {
-   KMessageBox::error(0, i18n("<qt>Cannot download the DTD from <b>%1</b>.</qt>").tqarg(url.prettyURL(0, KURL::StripFileProtocol)));
+   KMessageBox::error(0, i18n("<qt>Cannot download the DTD from <b>%1</b>.</qt>").arg(url.prettyURL(0, KURL::StripFileProtocol)));
    return false;
  }
   TQFile file(fileName);
@@ -183,7 +183,7 @@ bool DTD::parseDTD(const KURL &url)
         parseDTD(entityURL);
       } else
       {
-        kdDebug(24000) << TQString("Unknown tag: [%1]").tqarg(line) << endl;
+        kdDebug(24000) << TQString("Unknown tag: [%1]").arg(line) << endl;
       }
 
       if (it != lines.end()) ++it;
diff --git a/quanta/parsers/dtd/dtdparser.cpp b/quanta/parsers/dtd/dtdparser.cpp
index b384e456..24d7c529 100644
--- a/quanta/parsers/dtd/dtdparser.cpp
+++ b/quanta/parsers/dtd/dtdparser.cpp
@@ -75,7 +75,7 @@ bool DTDParser::parse(const TQString &targetDir, bool entitiesOnly)
   TQString fileName = TQString();
   if (!KIO::NetAccess::download(m_dtdURL, fileName, 0))
   {
-    KMessageBox::error(0, i18n("<qt>Cannot download the DTD from <b>%1</b>.</qt>").tqarg( m_dtdURL.prettyURL(0, KURL::StripFileProtocol)));
+    KMessageBox::error(0, i18n("<qt>Cannot download the DTD from <b>%1</b>.</qt>").arg( m_dtdURL.prettyURL(0, KURL::StripFileProtocol)));
     return false;
   }
   DTD::dtd_ptr = xmlParseDTD(NULL, xmlCharStrndup(fileName.utf8(), fileName.utf8().length()));
@@ -86,23 +86,23 @@ bool DTDParser::parse(const TQString &targetDir, bool entitiesOnly)
     xmlErrorPtr errorPtr = xmlGetLastError();
     if (errorPtr != NULL)
     {
-      TQString s = TQString::tqfromLatin1(errorPtr->message);
+      TQString s = TQString::fromLatin1(errorPtr->message);
       if (!s.isEmpty())
         errorStr = s;
-      s = TQString::tqfromLatin1(errorPtr->str1);
+      s = TQString::fromLatin1(errorPtr->str1);
       if (!s.isEmpty())
         errorStr += "<br>" + s;
-      s = TQString::tqfromLatin1(errorPtr->str2);
+      s = TQString::fromLatin1(errorPtr->str2);
       if (!s.isEmpty())
         errorStr += "<br>" + s;
-      s = TQString::tqfromLatin1(errorPtr->str2);
+      s = TQString::fromLatin1(errorPtr->str2);
       if (!s.isEmpty())
         errorStr += "<br>" + s;
-      errorStr += TQString("(%1, %2)").tqarg(errorPtr->line).tqarg(errorPtr->int2);
+      errorStr += TQString("(%1, %2)").arg(errorPtr->line).arg(errorPtr->int2);
       xmlResetError(errorPtr);
     }
 #endif
-    KMessageBox::error(0, i18n("<qt>Error while parsing the DTD.<br>The error message is:<br><i>%1</i></qt>").tqarg(errorStr));
+    KMessageBox::error(0, i18n("<qt>Error while parsing the DTD.<br>The error message is:<br><i>%1</i></qt>").arg(errorStr));
     return false;
   }
   if (targetDir.isEmpty())
@@ -155,7 +155,7 @@ bool DTDParser::parse(const TQString &targetDir, bool entitiesOnly)
     } else
     {
       KMessageBox::error(0L, i18n("<qt>Cannot create the <br><b>%1</b> file.<br>Check that you have write permission in the parent folder.</qt>")
-                             .tqarg(file.name()));
+                             .arg(file.name()));
       return false;
     }
   }
@@ -265,7 +265,7 @@ void saveElement(xmlElementPtr elem, xmlBufferPtr buf)
 
         if (childNum > 0)
         {
-          stream << "<tqchildren>" << endl;
+          stream << "<children>" << endl;
           for( int i = 0; i < childNum; i++ )
           {
             stream << "  <child name=\"" << TQString((const char*)list_ptr[i]) << "\"";
@@ -293,14 +293,14 @@ void saveElement(xmlElementPtr elem, xmlBufferPtr buf)
             stream << " />" << endl;
           }
 
-          stream << "</tqchildren>" << endl;
+          stream << "</children>" << endl;
           stream << endl;
         }
         /*
         xmlElementContentPtr content_ptr = el_ptr->content;
         if (content_ptr)
         {
-          stream << "<tqchildren>" << endl;
+          stream << "<children>" << endl;
           while (content_ptr)
           {
             if (!TQString((const char*)content_ptr->name).isEmpty())
@@ -335,7 +335,7 @@ void saveElement(xmlElementPtr elem, xmlBufferPtr buf)
               content_ptr = content_ptr->parent;
             }
           }
-          stream << "</tqchildren>" << endl;
+          stream << "</children>" << endl;
         } */
       }
       stream << "</tag>" << endl
diff --git a/quanta/parsers/dtd/dtepcreationdlg.ui b/quanta/parsers/dtd/dtepcreationdlg.ui
index db29d504..8c55bbcd 100644
--- a/quanta/parsers/dtd/dtepcreationdlg.ui
+++ b/quanta/parsers/dtd/dtepcreationdlg.ui
@@ -21,7 +21,7 @@
             <height>285</height>
         </rect>
     </property>
-    <property name="tqminimumSize">
+    <property name="minimumSize">
         <size>
             <width>500</width>
             <height>200</height>
diff --git a/quanta/parsers/parser.cpp b/quanta/parsers/parser.cpp
index 8206ac29..261d4f97 100644
--- a/quanta/parsers/parser.cpp
+++ b/quanta/parsers/parser.cpp
@@ -23,7 +23,7 @@
 #include <tqstrlist.h>
 #include <tqdatetime.h>
 #include <tqfile.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
 #include <tqvaluelist.h>
 #include <tqvaluestack.h>
 
@@ -860,7 +860,7 @@ void Parser::deleteNodes(Node *firstNode, Node *lastNode, NodeModifsSet *modifs)
     j = 0;
     if (!closesPrevious)
     {
-      //move the tqchildren up one level
+      //move the children up one level
       Node *n = child;
       Node *m = child;
       while (n)
@@ -900,7 +900,7 @@ void Parser::deleteNodes(Node *firstNode, Node *lastNode, NodeModifsSet *modifs)
       }
     } else
     {
-      //change the parent of tqchildren, so the prev will be the new parent
+      //change the parent of children, so the prev will be the new parent
       if (child)
       {
         Node *n = child;
@@ -928,7 +928,7 @@ void Parser::deleteNodes(Node *firstNode, Node *lastNode, NodeModifsSet *modifs)
           prev->child = child;
         }
       }
-      //move down the nodes starting with next one level and append to the list of tqchildren of prev
+      //move down the nodes starting with next one level and append to the list of children of prev
       if (next)
       {
         if (prev->child) //if the previous node has a child, append the next node after the last child
@@ -1020,7 +1020,7 @@ Node *Parser::rebuild(Document *w)
        return n;
    }
 
-   kdDebug(24000) << TQString("Invalid area: %1,%2,%3,%4").tqarg(area.bLine).tqarg(area.bCol).tqarg(area.eLine).tqarg(area.eCol) << "\n";
+   kdDebug(24000) << TQString("Invalid area: %1,%2,%3,%4").arg(area.bLine).arg(area.bCol).arg(area.eLine).arg(area.eCol) << "\n";
 
 //    kdDebug(24000) << "lastNode1: " << lastNode << " " << lastNode->tag << endl;
    deleteNodes(firstNode->nextSibling(), lastNode, modifs);
diff --git a/quanta/parsers/parsercommon.cpp b/quanta/parsers/parsercommon.cpp
index 9d1f9d0d..be660255 100644
--- a/quanta/parsers/parsercommon.cpp
+++ b/quanta/parsers/parsercommon.cpp
@@ -174,7 +174,7 @@ Node* createScriptTagNode(Document *write, const AreaStruct &area, const TQStrin
      tag->setDtd(d);
   else
       tag->setDtd(dtd);
-  tag->name = i18n("%1 block").tqarg(dtd->specialAreaNames[areaName].upper());
+  tag->name = i18n("%1 block").arg(dtd->specialAreaNames[areaName].upper());
   tag->type = Tag::ScriptTag;
   tag->validXMLTag = false;
 
diff --git a/quanta/parsers/qtag.h b/quanta/parsers/qtag.h
index f19bcf5d..3f74a42f 100644
--- a/quanta/parsers/qtag.h
+++ b/quanta/parsers/qtag.h
@@ -243,7 +243,7 @@ public:
   void setScope(TQString const& scope) {m_scope = scope;}
   
   /** Returns true if tag is a possible child of this tag, or if
-  there are no tqchildren defined and if trueIfNoChildsDefined is set to true. */
+  there are no children defined and if trueIfNoChildsDefined is set to true. */
   bool isChild(const TQString& tag, bool trueIfNoChildsDefined = true);
   //prefer using this variant, it handle Text, Empty, XmlTagEnd nodes!
   bool isChild(Node *node, bool trueIfNoChildsDefined = true, bool treatEmptyNodesAsText = false);
diff --git a/quanta/parsers/saparser.cpp b/quanta/parsers/saparser.cpp
index 1dab9ccc..f402e0c8 100644
--- a/quanta/parsers/saparser.cpp
+++ b/quanta/parsers/saparser.cpp
@@ -201,7 +201,7 @@ bool SAParser::slotParseOneLine()
                 }
                 s_currentContext.area.eLine = s_line;
                 s_currentContext.area.eCol = groupKeywordPos - 1;
-                //kdDebug(24000) << TQString("Group Struct s_context: %1, %2, %3, %4").tqarg( s_currentContext.bLine).tqarg(s_currentContext.bCol).tqarg(s_currentContext.eLine).tqarg(s_currentContext.eCol) << endl;
+                //kdDebug(24000) << TQString("Group Struct s_context: %1, %2, %3, %4").arg( s_currentContext.bLine).arg(s_currentContext.bCol).arg(s_currentContext.eLine).arg(s_currentContext.eCol) << endl;
 
                 if (s_currentNode &&
                     (s_currentNode->tag->type == Tag::Text ||
@@ -351,7 +351,7 @@ bool SAParser::slotParseOneLine()
               s_currentNode->specialInsideXml = m_specialInsideXml;
             }
           }
-          //kdDebug(24000) << TQString("Special area %1 ends at %2, %3").tqarg(s_dtd->name).tqarg(s_line).tqarg(lastCol) << endl;
+          //kdDebug(24000) << TQString("Special area %1 ends at %2, %3").arg(s_dtd->name).arg(s_line).arg(lastCol) << endl;
 
           //create a closing node for the special area
           Tag *tag = new Tag();
@@ -468,7 +468,7 @@ bool SAParser::slotParseOneLine()
               s_currentNode = node;
             }
           }
-          //kdDebug(24000) << TQString("%1 s_context: %2, %3, %4, %5").tqarg(s_currentContext.type).tqarg( s_currentContext.bLine).tqarg(s_currentContext.bCol).tqarg(s_currentContext.eLine).tqarg(s_currentContext.eCol) << endl;
+          //kdDebug(24000) << TQString("%1 s_context: %2, %3, %4, %5").arg(s_currentContext.type).arg( s_currentContext.bLine).arg(s_currentContext.bCol).arg(s_currentContext.eLine).arg(s_currentContext.eCol) << endl;
 
           s_currentContext = s_context;
           s_col = s_context.area.bCol + s_context.startString.length();
@@ -514,7 +514,7 @@ bool SAParser::slotParseOneLine()
       //    if (pos != 0) pos++;
           s_currentContext.area.eLine = s_line;
           s_currentContext.area.eCol = pos;
-          //kdDebug(24000) << TQString("Quoted String s_context: %1, %2, %3, %4").tqarg( s_currentContext.bLine).tqarg(s_currentContext.bCol).tqarg(s_currentContext.eLine).tqarg(s_currentContext.eCol) << endl;
+          //kdDebug(24000) << TQString("Quoted String s_context: %1, %2, %3, %4").arg( s_currentContext.bLine).arg(s_currentContext.bCol).arg(s_currentContext.eLine).arg(s_currentContext.eCol) << endl;
           if (s_fullParse)
           {
             if ( s_currentNode  &&
@@ -561,7 +561,7 @@ bool SAParser::slotParseOneLine()
           s_currentContext.area.eLine = s_line;
           s_currentContext.area.eCol = pos + s_dtd->comments[s_currentContext.startString].length() - 1;
           s_currentContext.type = s_previousContext.type;
-          //kdDebug(24000) << TQString("Comment s_context: %1, %2, %3, %4").tqarg( s_currentContext.bLine).tqarg(s_currentContext.bCol).tqarg(s_currentContext.eLine).tqarg(s_currentContext.eCol) << endl;
+          //kdDebug(24000) << TQString("Comment s_context: %1, %2, %3, %4").arg( s_currentContext.bLine).arg(s_currentContext.bCol).arg(s_currentContext.eLine).arg(s_currentContext.eCol) << endl;
 
           if (s_fullParse)
           {
@@ -649,7 +649,7 @@ Node* SAParser::parseArea(const AreaStruct &specialArea,
   int s_startCol = specialArea.bCol;
   s_endLine = specialArea.eLine;
   s_endCol = specialArea.eCol;
-  //kdDebug(24000) << TQString("Starting to parse at %1, %2 for %3").tqarg(s_startLine).tqarg(s_startCol).tqarg(areaStartString) << endl;
+  //kdDebug(24000) << TQString("Starting to parse at %1, %2 for %3").arg(s_startLine).arg(s_startCol).arg(areaStartString) << endl;
 
   s_searchForAreaEnd = false;
   s_searchForForcedAreaEnd = false;