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

This reverts commit 6c3f7a55fb7888efc80a7350ef0c2f46ee02baa3.

1 files changed, 21 insertions, 21 deletions

diff --git a/kanagram/src/keduvockvtmlreader.cpp b/kanagram/src/keduvockvtmlreader.cpp
index c1abc6b6..44a4772d 100644
--- a/kanagram/src/keduvockvtmlreader.cpp
+++ b/kanagram/src/keduvockvtmlreader.cpp
@@ -22,7 +22,7 @@
 #include <kmessagebox.h>
 
 #include <tqdom.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 
 #include "keduvockvtmlreader.h"
 #include "keduvocdocument.h"
@@ -131,7 +131,7 @@ bool KEduVocKvtmlReader::readArticle(TQDomElement &domElementParent)
   {
     if (domElementEntry.tagName() != KV_ART_ENTRY)
     {
-      domError(i18n("expected tag <%1>").arg(KV_ART_ENTRY));
+      domError(i18n("expected tag <%1>").tqarg(KV_ART_ENTRY));
       return false;
     }
 
@@ -1059,7 +1059,7 @@ bool KEduVocKvtmlReader::readExpression(TQDomElement &domElementParent)
   if (domElementExpressionChild.tagName() != KV_ORG)
   {
     // must be preceded by "original"
-    domError(i18n("starting tag <%1> is missing").arg(KV_ORG));
+    domError(i18n("starting tag <%1> is missing").tqarg(KV_ORG));
     return false;
   }
 
@@ -1139,7 +1139,7 @@ bool KEduVocKvtmlReader::readExpression(TQDomElement &domElementParent)
     {
       if (bConjug)
       {
-        domError(i18n("repeated occurrence of tag <%1>").arg(domElementOriginalChild.tagName()));
+        domError(i18n("repeated occurrence of tag <%1>").tqarg(domElementOriginalChild.tagName()));
         return false;
       }
       bConjug = true;
@@ -1152,7 +1152,7 @@ bool KEduVocKvtmlReader::readExpression(TQDomElement &domElementParent)
     {
       if (bComparison)
       {
-        domError(i18n("repeated occurrence of tag <%1>").arg(domElementOriginalChild.tagName()));
+        domError(i18n("repeated occurrence of tag <%1>").tqarg(domElementOriginalChild.tagName()));
         return false;
       }
       bComparison = true;
@@ -1165,7 +1165,7 @@ bool KEduVocKvtmlReader::readExpression(TQDomElement &domElementParent)
     {
       if (bMultipleChoice)
       {
-        domError(i18n("repeated occurrence of tag <%1>").arg(domElementOriginalChild.tagName()));
+        domError(i18n("repeated occurrence of tag <%1>").tqarg(domElementOriginalChild.tagName()));
         return false;
       }
       bMultipleChoice = true;
@@ -1236,7 +1236,7 @@ bool KEduVocKvtmlReader::readExpression(TQDomElement &domElementParent)
     if (domElementExpressionChild.tagName() != KV_TRANS)
     {
       // "original" must be followed by "translations"
-      domError(i18n("starting tag <%1> is missing").arg(KV_TRANS));
+      domError(i18n("starting tag <%1> is missing").tqarg(KV_TRANS));
       return false;
     }
 
@@ -1317,7 +1317,7 @@ bool KEduVocKvtmlReader::readExpression(TQDomElement &domElementParent)
       {
         if (bConjug)
         {
-          domError(i18n("repeated occurrence of tag <%1>").arg(domElementOriginalChild.tagName()));
+          domError(i18n("repeated occurrence of tag <%1>").tqarg(domElementOriginalChild.tagName()));
           return false;
         }
         bConjug = true;
@@ -1330,7 +1330,7 @@ bool KEduVocKvtmlReader::readExpression(TQDomElement &domElementParent)
       {
         if (bComparison)
         {
-          domError(i18n("repeated occurrence of tag <%1>").arg(domElementOriginalChild.tagName()));
+          domError(i18n("repeated occurrence of tag <%1>").tqarg(domElementOriginalChild.tagName()));
           return false;
         }
         bComparison = true;
@@ -1343,7 +1343,7 @@ bool KEduVocKvtmlReader::readExpression(TQDomElement &domElementParent)
       {
         if (bMultipleChoice)
         {
-          domError(i18n("repeated occurrence of tag <%1>").arg(domElementOriginalChild.tagName()));
+          domError(i18n("repeated occurrence of tag <%1>").tqarg(domElementOriginalChild.tagName()));
           return false;
         }
         bMultipleChoice = true;
@@ -1456,7 +1456,7 @@ if (lines != 0)
     {
       if (lessgroup)
       {
-        domError(i18n("repeated occurrence of tag <%1>").arg(domElementChild.tagName()));
+        domError(i18n("repeated occurrence of tag <%1>").tqarg(domElementChild.tagName()));
         return false;
       }
       lessgroup = true;
@@ -1468,7 +1468,7 @@ if (lines != 0)
     {
       if (articlegroup)
       {
-        domError(i18n("repeated occurrence of tag <%1>").arg(domElementChild.tagName()));
+        domError(i18n("repeated occurrence of tag <%1>").tqarg(domElementChild.tagName()));
         return false;
       }
       articlegroup = true;
@@ -1480,7 +1480,7 @@ if (lines != 0)
     {
       if (conjuggroup)
       {
-        domError(i18n("repeated occurrence of tag <%1>").arg(domElementChild.tagName()));
+        domError(i18n("repeated occurrence of tag <%1>").tqarg(domElementChild.tagName()));
         return false;
       }
       conjuggroup = true;
@@ -1492,7 +1492,7 @@ if (lines != 0)
     {
       if (optgroup)
       {
-        domError(i18n("repeated occurrence of tag <%1>").arg(domElementChild.tagName()));
+        domError(i18n("repeated occurrence of tag <%1>").tqarg(domElementChild.tagName()));
         return false;
       }
       optgroup = true;
@@ -1504,7 +1504,7 @@ if (lines != 0)
     {
       if (attrgroup)
       {
-        domError(i18n("repeated occurrence of tag <%1>").arg(domElementChild.tagName()));
+        domError(i18n("repeated occurrence of tag <%1>").tqarg(domElementChild.tagName()));
         return false;
       }
       attrgroup = true;
@@ -1516,7 +1516,7 @@ if (lines != 0)
     {
       if (tensegroup)
       {
-        domError(i18n("repeated occurrence of tag <%1>").arg(domElementChild.tagName()));
+        domError(i18n("repeated occurrence of tag <%1>").tqarg(domElementChild.tagName()));
         return false;
       }
       tensegroup = true;
@@ -1528,7 +1528,7 @@ if (lines != 0)
     {
       if (usagegroup)
       {
-        domError(i18n("repeated occurrence of tag <%1>").arg(domElementChild.tagName()));
+        domError(i18n("repeated occurrence of tag <%1>").tqarg(domElementChild.tagName()));
         return false;
       }
       usagegroup = true;
@@ -1590,7 +1590,7 @@ bool KEduVocKvtmlReader::readDoc(KEduVocDocument *doc)
   if( domElementKvtml.tagName() != KV_DOCTYPE )
   {
     domError(i18n("Tag <%1> was expected "
-            "but tag <%2> was read." ).arg(KV_DOCTYPE).arg(domElementKvtml.tagName()));
+            "but tag <%2> was read." ).tqarg(KV_DOCTYPE).tqarg(domElementKvtml.tagName()));
     return false;
   }
 
@@ -1667,7 +1667,7 @@ bool KEduVocKvtmlReader::readDoc(KEduVocDocument *doc)
 
 void KEduVocKvtmlReader::domErrorUnknownElement(const TQString &elem)
 {
-  TQString ln = i18n("File:\t%1\n").arg(m_doc->URL().path());
+  TQString ln = i18n("File:\t%1\n").tqarg(m_doc->URL().path());
 
   TQString format = i18n(
       "Your document contains an unknown tag <%1>.  "  // keep trailing space
@@ -1676,7 +1676,7 @@ void KEduVocKvtmlReader::domErrorUnknownElement(const TQString &elem)
       "Loading is aborted because KVocTrain cannot "
       "read documents with unknown elements.\n"
      );
-  TQString msg = format.arg(elem);
+  TQString msg = format.tqarg(elem);
   TQApplication::setOverrideCursor( arrowCursor, true );
   TQString s = kapp->makeStdCaption(i18n("Unknown Element"));
   KMessageBox::sorry(0, ln+msg, s);
@@ -1687,7 +1687,7 @@ void KEduVocKvtmlReader::domError(const TQString &text )
 {
   TQApplication::setOverrideCursor( arrowCursor, true );
   TQString s = kapp->makeStdCaption(i18n("Error"));
-  TQString ln = i18n("File:\t%1\n").arg(m_doc->URL().path());
+  TQString ln = i18n("File:\t%1\n").tqarg(m_doc->URL().path());
   TQString msg = text;
   KMessageBox::error(0, ln+msg, s);
   TQApplication::restoreOverrideCursor();