From ad1fc5fc8eadb9b63e8767e57ac41cbac84f7eb7 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 16 Dec 2011 09:57:30 -0600
Subject: Revert "Rename a number of old tq methods that are no longer tq
 specific"

This reverts commit 9d6927a7d6a543332f828bffedf65eecf6774c6d.
---
 src/xml_to_data/xml_to_data.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/xml_to_data/xml_to_data.cpp')

diff --git a/src/xml_to_data/xml_to_data.cpp b/src/xml_to_data/xml_to_data.cpp
index ee6a204..8e14d81 100644
--- a/src/xml_to_data/xml_to_data.cpp
+++ b/src/xml_to_data/xml_to_data.cpp
@@ -9,7 +9,7 @@
 #include "xml_to_data.h"
 
 #include <tqfile.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 
 TQDomElement XmlToData::findUniqueElement(TQDomElement parent, const TQString &tag,
                                          const TQString &attribute, const TQString &value) const
@@ -19,7 +19,7 @@ TQDomElement XmlToData::findUniqueElement(TQDomElement parent, const TQString &t
   while ( !child.isNull() ) {
     if ( child.nodeName()==tag && child.isElement()
          && (attribute.isEmpty() || child.toElement().attribute(attribute)==value) ) {
-      if ( !element.isNull() ) qFatal(TQString("Duplicated element \"%1/%2\"").arg(tag).arg(value));
+      if ( !element.isNull() ) qFatal(TQString("Duplicated element \"%1/%2\"").tqarg(tag).tqarg(value));
       element = child.toElement();
     }
     child = child.nextSibling();
@@ -34,7 +34,7 @@ void XmlToData::checkTagNames(TQDomElement element, const TQString &tag,
   for (uint i=0; i<uint(list.count()); i++) {
     if ( !list.item(i).isElement() ) continue;
     TQString name = list.item(i).toElement().attribute("name");
-    if ( names.find(name)==names.end() ) qFatal(TQString("Illegal name %1 for %2 element").arg(name).arg(tag));
+    if ( names.find(name)==names.end() ) qFatal(TQString("Illegal name %1 for %2 element").tqarg(name).tqarg(tag));
   }
 }
 
@@ -47,7 +47,7 @@ TQDomDocument XmlToData::parseFile(const TQString &filename) const
   TQString error;
   int errorLine, errorColumn;
   if ( !doc.setContent(&file, false, &error, &errorLine, &errorColumn) )
-    qFatal(TQString("Error parsing XML file (%1 at line %2, column %3)").arg(error).arg(errorLine).arg(errorColumn));
+    qFatal(TQString("Error parsing XML file (%1 at line %2, column %3)").tqarg(error).tqarg(errorLine).tqarg(errorColumn));
   return doc;
 }
 
-- 
cgit v1.2.3