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

This reverts commit d6331f1b56eb6dca7a1950658b2932f208015da0.

11 files changed, 45 insertions, 45 deletions

diff --git a/poxml/antlr/antlr/AST.hpp b/poxml/antlr/antlr/AST.hpp
index a36ffd15..7eb883c2 100644
--- a/poxml/antlr/antlr/AST.hpp
+++ b/poxml/antlr/antlr/AST.hpp
@@ -59,7 +59,7 @@ public:
 	virtual ANTLR_USE_NAMESPACE(std)vector<RefAST> findAll(RefAST t)=0;
 	virtual ANTLR_USE_NAMESPACE(std)vector<RefAST> findAllPartial(RefAST t)=0;
 
-	/** Get the first child of this node; null if no children */
+	/** Get the first child of this node; null if no tqchildren */
 	virtual RefAST getFirstChild() const=0;
 	/** Get  the next sibling in line after this one */
 	virtual RefAST getNextSibling() const=0;
diff --git a/poxml/antlr/antlr/ASTFactory.hpp b/poxml/antlr/antlr/ASTFactory.hpp
index 584cee6d..f83bec10 100644
--- a/poxml/antlr/antlr/ASTFactory.hpp
+++ b/poxml/antlr/antlr/ASTFactory.hpp
@@ -90,7 +90,7 @@ public:
 	RefAST dupTree(RefAST t);
 	/** Make a tree from a list of nodes.  The first element in the
 	 *  array is the root.  If the root is null, then the tree is
-	 *  a simple list not a tree.  Handles null children nodes correctly.
+	 *  a simple list not a tree.  Handles null tqchildren nodes correctly.
 	 *  For example, build(a, b, null, c) yields tree (a b c).  build(null,a,b)
 	 *  yields tree (nil a b).
 	 */
diff --git a/poxml/antlr/antlr/BaseAST.hpp b/poxml/antlr/antlr/BaseAST.hpp
index 7b93c1ef..bf1e1629 100644
--- a/poxml/antlr/antlr/BaseAST.hpp
+++ b/poxml/antlr/antlr/BaseAST.hpp
@@ -70,7 +70,7 @@ public:
 	virtual ANTLR_USE_NAMESPACE(std)vector<RefAST> findAll(RefAST t);
 	virtual ANTLR_USE_NAMESPACE(std)vector<RefAST> findAllPartial(RefAST t);
 
-	/** Get the first child of this node; null if no children */
+	/** Get the first child of this node; null if no tqchildren */
 	virtual RefAST getFirstChild() const;
 	/** Get  the next sibling in line after this one */
 	virtual RefAST getNextSibling() const;
@@ -80,7 +80,7 @@ public:
 	/** Get the token type for this node */
 	virtual int getType() const;
 
-	/** Remove all children */
+	/** Remove all tqchildren */
 	virtual void removeChildren();
 
 	/** Set the first child of a node. */
diff --git a/poxml/antlr/src/ASTFactory.cpp b/poxml/antlr/src/ASTFactory.cpp
index e44386f7..66902522 100644
--- a/poxml/antlr/src/ASTFactory.cpp
+++ b/poxml/antlr/src/ASTFactory.cpp
@@ -144,7 +144,7 @@ RefAST ASTFactory::dupList(RefAST t)
 RefAST ASTFactory::dupTree(RefAST t)
 {
 	RefAST result = dup(t);		// make copy of root
-	// copy all children of root.
+	// copy all tqchildren of root.
 	if (t) {
 		result->setFirstChild( dupList(t->getFirstChild()) );
 	}
@@ -152,7 +152,7 @@ RefAST ASTFactory::dupTree(RefAST t)
 }
 /** Make a tree from a list of nodes.  The first element in the
  *  array is the root.  If the root is null, then the tree is
- *  a simple list not a tree.  Handles null children nodes correctly.
+ *  a simple list not a tree.  Handles null tqchildren nodes correctly.
  *  For example, build(a, b, null, c) yields tree (a b c).  build(null,a,b)
  *  yields tree (nil a b).
  */
@@ -165,7 +165,7 @@ RefAST ASTFactory::make(ANTLR_USE_NAMESPACE(std)vector<RefAST> nodes)
 	if (root) {
 		root->setFirstChild(RefAST(nullASTptr));	// don't leave any old pointers set
 	}
-	// link in children;
+	// link in tqchildren;
 	for (unsigned int i=1; i<nodes.size(); i++) {
 		if ( !nodes[i] ) continue;	// ignore null nodes
 		if ( !root ) {
diff --git a/poxml/antlr/src/BaseAST.cpp b/poxml/antlr/src/BaseAST.cpp
index 4080e0e8..d4b7368b 100644
--- a/poxml/antlr/src/BaseAST.cpp
+++ b/poxml/antlr/src/BaseAST.cpp
@@ -64,7 +64,7 @@ void BaseAST::doWorkForFindAll(
 				(!partialMatch && sibling->equalsTree(target)) ) {
 			v.push_back(sibling);
 		}
-		// regardless of match or not, check any children for matches
+		// regardless of match or not, check any tqchildren for matches
 		if ( sibling->getFirstChild() ) {
 			RefBaseAST(sibling->getFirstChild())->doWorkForFindAll(v, target, partialMatch);
 		}
@@ -96,7 +96,7 @@ bool BaseAST::equalsList(RefAST t) const
 		// as a quick optimization, check roots first.
 		if (!sibling->equals(t))
 			return false;
-		// if roots match, do full list match test on children.
+		// if roots match, do full list match test on tqchildren.
 		if (sibling->getFirstChild()) {
 			if (!sibling->getFirstChild()->equalsList(t->getFirstChild()))
 				return false;
@@ -129,7 +129,7 @@ bool BaseAST::equalsListPartial(RefAST sub) const
 		// as a quick optimization, check roots first.
 		if (!sibling->equals(sub))
 			return false;
-		// if roots match, do partial list match test on children.
+		// if roots match, do partial list match test on tqchildren.
 		if (sibling->getFirstChild())
 			if (!sibling->getFirstChild()->equalsListPartial(sub->getFirstChild()))
 				return false;
@@ -151,7 +151,7 @@ bool BaseAST::equalsTree(RefAST t) const
 	// check roots first
 	if (!equals(t))
 		return false;
-	// if roots match, do full list match test on children.
+	// if roots match, do full list match test on tqchildren.
 	if (getFirstChild()) {
 		if (!getFirstChild()->equalsList(t->getFirstChild()))
 			return false;
@@ -175,7 +175,7 @@ bool BaseAST::equalsTreePartial(RefAST sub) const
 	// check roots first
 	if (!equals(sub))
 		return false;
-	// if roots match, do full list partial match test on children.
+	// if roots match, do full list partial match test on tqchildren.
 	if (getFirstChild())
 		if (!getFirstChild()->equalsListPartial(sub->getFirstChild()))
 			return false;
diff --git a/poxml/lauri.po b/poxml/lauri.po
index 6384835c..c28eeb2f 100644
--- a/poxml/lauri.po
+++ b/poxml/lauri.po
@@ -299,7 +299,7 @@ msgstr "Der schlimme Teil"
 msgid "Ending Text:"
 msgstr "Ende:"
 
-#. Tag: literallayout
+#. Tag: literaltqlayout
 #: lauri.xml:143
 #, no-c-format
 msgid ""
diff --git a/poxml/lauri.xml b/poxml/lauri.xml
index 18a1e08a..35448f0c 100644
--- a/poxml/lauri.xml
+++ b/poxml/lauri.xml
@@ -165,7 +165,7 @@ editor.</action></para>
 <para>
   Ending Text:
 
-<literallayout>
+<literaltqlayout>
 Matthias Hoelzer
 KDE-Verein i.G.
 Account-Nr. 2798296
@@ -180,7 +180,7 @@ SWIFT-Address: BYLA DE 77
 print "$b4 /path/to/KDE/libs/libpng.a $af\n"; \
 you see it here
 whereever
-</literallayout>
+</literaltqlayout>
 </para>
 <para>
 <screen>
diff --git a/poxml/parser.cpp b/poxml/parser.cpp
index be06d80a..b4f0161b 100644
--- a/poxml/parser.cpp
+++ b/poxml/parser.cpp
@@ -44,7 +44,7 @@ static const char *cuttingtags[] = {"bridgehead", "trans_comment", "para", "titl
                                     "revdescription", "glossentry", "partinfo", 
 				    "segmentedlist", "segtitle", "seg", "seglistitem", "screenco",
                                     0};
-static const char *literaltags[] = {"literallayout", "synopsis", "screen",
+static const char *literaltags[] = {"literaltqlayout", "synopsis", "screen",
 				    "programlisting", 0};
 
 bool StructureParser::fatalError ( const TQXmlParseException &e )
@@ -99,7 +99,7 @@ bool StructureParser::isLiteralTag(const TQString &qName)
 bool StructureParser::skippedEntity ( const TQString & name )
 {
     if (inside)
-        message += TQString("&%1;").arg(name);
+        message += TQString("&%1;").tqarg(name);
     return true;
 }
 
@@ -126,10 +126,10 @@ bool StructureParser::startElement( const TQString& , const TQString& ,
     {
         TQString tmp = "<" + tname;
         for (int i = 0; i < attr.length(); i++) {
-            tmp += TQString(" %1=\"%2\"").arg(attr.qName(i)).arg(attr.value(i));
+            tmp += TQString(" %1=\"%2\"").tqarg(attr.qName(i)).tqarg(attr.value(i));
         }
-        tmp += TQString(" poxml_line=\"%1\"").arg(locator->lineNumber());
-        tmp += TQString(" poxml_col=\"%1\"").arg(locator->columnNumber());
+        tmp += TQString(" poxml_line=\"%1\"").tqarg(locator->lineNumber());
+        tmp += TQString(" poxml_col=\"%1\"").tqarg(locator->columnNumber());
 
         if (isSingleTag(qName))
             tmp += "/>";
@@ -180,8 +180,8 @@ bool StructureParser::closureTag(const TQString& message, const TQString &tag)
     uint index = 0;
     while (true)
     {
-        int nextclose = message.find(TQRegExp(TQString::fromLatin1("</%1[\\s>]").arg(tag)), index);
-        int nextstart = message.find(TQRegExp(TQString::fromLatin1("<%1[>\\s]").arg(tag)), index);
+        int nextclose = message.find(TQRegExp(TQString::tqfromLatin1("</%1[\\s>]").tqarg(tag)), index);
+        int nextstart = message.find(TQRegExp(TQString::tqfromLatin1("<%1[>\\s]").tqarg(tag)), index);
         //  qDebug("finding %d %d %d %d", nextstart, nextclose, index, inside);
         if (nextclose == -1) {
 #ifdef POXML_DEBUG
@@ -223,7 +223,7 @@ void StructureParser::descape(TQString &message)
     bool lastws = false;
 
     while (index < message.length()) {
-        switch (message.at(index).latin1()) {
+        switch (message.tqat(index).latin1()) {
             case '\n':
             case '\t':
             case '\r':
@@ -278,7 +278,7 @@ bool StructureParser::formatMessage(MsgBlock &msg) const
     {
         int slen = strlen(singletags[index]);
 
-        if (msg.msgid.left(slen + 1) == TQString::fromLatin1("<%1").arg(singletags[index]) &&
+        if (msg.msgid.left(slen + 1) == TQString::tqfromLatin1("<%1").tqarg(singletags[index]) &&
             !msg.msgid.at( slen + 1 ).isLetterOrNumber() )
         {
 #ifdef POXML_DEBUG
@@ -418,9 +418,9 @@ MsgList StructureParser::splitMessage(const MsgBlock &mb)
 #endif
 
                 // the exception for poxml_* attributes is made in the closing tag
-                int closing_index = message.find(TQRegExp(TQString::fromLatin1("</%1[\\s>]").arg(tag)),
+                int closing_index = message.find(TQRegExp(TQString::tqfromLatin1("</%1[\\s>]").tqarg(tag)),
                                                  strindex);
-                int starting_index = message.find(TQRegExp(TQString::fromLatin1("<%1[\\s>]").arg(tag)),
+                int starting_index = message.find(TQRegExp(TQString::tqfromLatin1("<%1[\\s>]").tqarg(tag)),
                                                   strindex);
 
 #ifdef POXML_DEBUG
@@ -529,9 +529,9 @@ MsgList StructureParser::splitMessage(const MsgBlock &mb)
                 qDebug("inside %s %d", message.mid(strindex, 35).latin1(), inside);
 #endif
 
-                int closing_index = message.findRev(TQRegExp(TQString::fromLatin1("</%1[\\s>]").arg(tag)),
+                int closing_index = message.findRev(TQRegExp(TQString::tqfromLatin1("</%1[\\s>]").tqarg(tag)),
                                                     strindex - 1);
-                int starting_index = message.findRev(TQRegExp(TQString::fromLatin1("<%1[\\s>]").arg(tag)),
+                int starting_index = message.findRev(TQRegExp(TQString::tqfromLatin1("<%1[\\s>]").tqarg(tag)),
                                                      strindex - 1);
 
 #ifdef POXML_DEBUG
@@ -601,9 +601,9 @@ bool StructureParser::endElement( const TQString& , const TQString&, const TQStr
 
     if (inside) {
         if (!isSingleTag(qName)) {
-            message += TQString("</%1").arg(tname);
-            message += TQString(" poxml_line=\"%1\"").arg(locator->lineNumber());
-            message += TQString(" poxml_col=\"%1\"").arg(locator->columnNumber());
+            message += TQString("</%1").tqarg(tname);
+            message += TQString(" poxml_line=\"%1\"").tqarg(locator->lineNumber());
+            message += TQString(" poxml_col=\"%1\"").tqarg(locator->columnNumber());
             message += ">";
         }
     }
@@ -713,8 +713,8 @@ void StructureParser::cleanupTags( TQString &contents )
     contents.replace(TQRegExp("&"), "!POXML_AMP!");
 
     for (int index = 0; literaltags[index]; index++) {
-        TQRegExp start(TQString("<%1[\\s>]").arg(literaltags[index]));
-        TQRegExp end(TQString("</%1[\\s>]").arg(literaltags[index]));
+        TQRegExp start(TQString("<%1[\\s>]").tqarg(literaltags[index]));
+        TQRegExp end(TQString("</%1[\\s>]").tqarg(literaltags[index]));
         int strindex = 0;
         while (true) {
             strindex = contents.find(start, strindex);
@@ -739,7 +739,7 @@ void StructureParser::cleanupTags( TQString &contents )
         if (index < 0)
             break;
         TQString tag = unclosed.cap(1);
-        contents.replace(index, unclosed.matchedLength(), TQString("</%1>").arg(tag));
+        contents.replace(index, unclosed.matchedLength(), TQString("</%1>").tqarg(tag));
     }
 
     TQRegExp start("<((\\s*[^<>\\s])*)\\s\\s*(/*)>");
@@ -753,7 +753,7 @@ void StructureParser::cleanupTags( TQString &contents )
         TQString tag = start.cap(1);
 	TQString cut = start.capturedTexts().last();
         // qDebug("UNCLO %s %d -%s- -%s-", start.cap(0).latin1(), index, tag.latin1(), cut.latin1());
-        contents.replace(index, start.matchedLength(), TQString("<%1%2>").arg(tag).arg(cut));
+        contents.replace(index, start.matchedLength(), TQString("<%1%2>").tqarg(tag).tqarg(cut));
     }
     TQRegExp singletag("<(\\w*)\\s([^><]*)/>");
 
@@ -764,7 +764,7 @@ void StructureParser::cleanupTags( TQString &contents )
             break;
         TQString tag = singletag.cap(1);
         if (!StructureParser::isSingleTag(tag)) {
-            contents.replace(index, singletag.matchedLength(), TQString("<%1 %2></%3>").arg(tag).arg(singletag.cap(2)).arg(tag));
+            contents.replace(index, singletag.matchedLength(), TQString("<%1 %2></%3>").tqarg(tag).tqarg(singletag.cap(2)).tqarg(tag));
         }
     }
 
@@ -775,7 +775,7 @@ void StructureParser::cleanupTags( TQString &contents )
         if (index < 0)
             break;
         TQString msgid = trans_comment.cap(1);
-        contents.replace(index, trans_comment.matchedLength(), TQString("<trans_comment>%1</trans_comment>").arg(msgid));
+        contents.replace(index, trans_comment.matchedLength(), TQString("<trans_comment>%1</trans_comment>").tqarg(msgid));
     }
 
 #ifdef POXML_DEBUG
@@ -788,7 +788,7 @@ static bool removeEmptyTag( TQString &contents, const TQString & tag)
 {
 //    qDebug("cont %s %s", contents.latin1(), tag.latin1());
 
-    TQRegExp empty(TQString("<%1[^>]*>[\\s\n][\\s\n]*</%2\\s*>").arg(tag).arg(tag));
+    TQRegExp empty(TQString("<%1[^>]*>[\\s\n][\\s\n]*</%2\\s*>").tqarg(tag).tqarg(tag));
     int strindex = 0;
     while (true) {
         strindex = contents.find(empty, strindex);
@@ -938,7 +938,7 @@ MsgList parseXML(const char *filename)
         TQString replacement = "";
         while (contents.at(endindex) != '>' || inside)
         {
-            switch (contents.at(endindex).latin1()) {
+            switch (contents.tqat(endindex).latin1()) {
                 case '<':
                     inside++; break;
                 case '>':
@@ -977,8 +977,8 @@ MsgList parseXML(const char *filename)
         {
             TQMap<TQString,TQString>::Iterator found = msgids.find((*it).msgid);
             if ((*it).msgid.length() < 4) {
-                (*it).msgid = TQString("<%1>").arg((*it).tag) + (*it).msgid +
-                              TQString("</%1>").arg((*it).tag);
+                (*it).msgid = TQString("<%1>").tqarg((*it).tag) + (*it).msgid +
+                              TQString("</%1>").tqarg((*it).tag);
                 changed = true;
                 break;
             }
@@ -993,7 +993,7 @@ MsgList parseXML(const char *filename)
                          it2 != english.end(); it2++)
                     {
                         if ((*it2).msgid == msgid)
-                            (*it2).msgid = TQString("<%1>").arg((*it2).tag) + msgid + TQString("</%1>").arg((*it2).tag);
+                            (*it2).msgid = TQString("<%1>").tqarg((*it2).tag) + msgid + TQString("</%1>").tqarg((*it2).tag);
                     }
                     break;
                 }
diff --git a/poxml/split.cpp b/poxml/split.cpp
index 29104d3e..db20f15f 100644
--- a/poxml/split.cpp
+++ b/poxml/split.cpp
@@ -112,7 +112,7 @@ int main( int argc, char **argv )
     while (tit != translated.end())
     {
         MsgBlock mb;
-        mb.msgid = TQString::fromLatin1("appended paragraph %1").arg(counter++);
+        mb.msgid = TQString::tqfromLatin1("appended paragraph %1").tqarg(counter++);
         mb.msgstr = (*tit).msgid;
         mb.lines += (*tit).lines;
         english.append(mb);
diff --git a/poxml/transxx.cpp b/poxml/transxx.cpp
index bfc2e9cf..cd3a78be 100644
--- a/poxml/transxx.cpp
+++ b/poxml/transxx.cpp
@@ -62,7 +62,7 @@ int main(int argc, char **argv)
         headerLines.gres( TQRegExp( "^Last-Translator:.*" ), "Last-Translator: transxx program <null@kde.org>" );
         headerLines.gres( TQRegExp( "^Language-Team:.*" ), "Language-Team: Test Language <tde-i18n-doc@kde.org>" );
         TQString revisionDate ( "PO-Revision-Date: " );
-        const TQDateTime dt = TQDateTime::currentDateTime( Qt::UTC );
+        const TQDateTime dt = TQDateTime::tqcurrentDateTime( Qt::UTC );
         revisionDate += dt.toString( "yyyy-MM-dd hh:mm+0000" );
         headerLines.gres( TQRegExp( "^PO-Revision-Date:.*" ), revisionDate );
         headerLines << "Plural-Forms: nplurals=1; plural=0;";
diff --git a/poxml/xml2pot.cpp b/poxml/xml2pot.cpp
index 345a53e6..658e557b 100644
--- a/poxml/xml2pot.cpp
+++ b/poxml/xml2pot.cpp
@@ -33,7 +33,7 @@ int main( int argc, char **argv )
         }
     }
 
-    const TQDateTime now = TQDateTime::currentDateTime( Qt::UTC );
+    const TQDateTime now = TQDateTime::tqcurrentDateTime( Qt::UTC );
     
     cout << "# SOME DESCRIPTIVE TITLE.\n";
     cout << "# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.\n";