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

This reverts commit 031454e56009d576589c28757f6c6fcf4884095e.

1 files changed, 12 insertions, 12 deletions

diff --git a/src/translators/dcimporter.cpp b/src/translators/dcimporter.cpp
index 19b8829..5839255 100644
--- a/src/translators/dcimporter.cpp
+++ b/src/translators/dcimporter.cpp
@@ -35,17 +35,17 @@ Tellico::Data::CollPtr DCImporter::collection() {
 
   TQDomDocument doc = domDocument();
 
-  TQRegExp authorDateRX(TQString::fromLatin1(",?(\\s+\\d{4}-?(?:\\d{4})?\\.?)(.*)$"));
-  TQRegExp dateRX(TQString::fromLatin1("\\d{4}"));
+  TQRegExp authorDateRX(TQString::tqfromLatin1(",?(\\s+\\d{4}-?(?:\\d{4})?\\.?)(.*)$"));
+  TQRegExp dateRX(TQString::tqfromLatin1("\\d{4}"));
 
-  TQDomNodeList recordList = doc.elementsByTagNameNS(zing, TQString::fromLatin1("recordData"));
+  TQDomNodeList recordList = doc.elementsByTagNameNS(zing, TQString::tqfromLatin1("recordData"));
   myDebug() << "DCImporter::collection() - number of records: " << recordList.count() << endl;
 
   enum { UnknownNS, UseNS, NoNS } useNS = UnknownNS;
 
 #define GETELEMENTS(s) (useNS == NoNS) \
-                         ? elem.elementsByTagName(TQString::fromLatin1(s)) \
-                         : elem.elementsByTagNameNS(dc, TQString::fromLatin1(s))
+                         ? elem.elementsByTagName(TQString::tqfromLatin1(s)) \
+                         : elem.elementsByTagNameNS(dc, TQString::tqfromLatin1(s))
 
   for(uint i = 0; i < recordList.count(); ++i) {
     Data::EntryPtr e = new Data::Entry(c);
@@ -55,7 +55,7 @@ Tellico::Data::CollPtr DCImporter::collection() {
     TQDomNodeList nodeList = GETELEMENTS("title");
     if(nodeList.count() == 0) { // no title, skip
       if(useNS == UnknownNS) {
-        nodeList = elem.elementsByTagName(TQString::fromLatin1("title"));
+        nodeList = elem.elementsByTagName(TQString::tqfromLatin1("title"));
         if(nodeList.count() > 0) {
           useNS = NoNS;
         } else {
@@ -72,7 +72,7 @@ Tellico::Data::CollPtr DCImporter::collection() {
     TQString s = nodeList.item(0).toElement().text();
     s.replace('\n', ' ');
     s = s.simplifyWhiteSpace();
-    e->setField(TQString::fromLatin1("title"), s);
+    e->setField(TQString::tqfromLatin1("title"), s);
 
     nodeList = GETELEMENTS("creator");
     TQStringList creators;
@@ -91,33 +91,33 @@ Tellico::Data::CollPtr DCImporter::collection() {
         creators << s;
       }
     }
-    e->setField(TQString::fromLatin1("author"), creators.join(TQString::fromLatin1("; ")));
+    e->setField(TQString::tqfromLatin1("author"), creators.join(TQString::tqfromLatin1("; ")));
 
     nodeList = GETELEMENTS("publisher");
     TQStringList publishers;
     for(uint j = 0; j < nodeList.count(); ++j) {
       publishers << nodeList.item(j).toElement().text();
     }
-    e->setField(TQString::fromLatin1("publisher"), publishers.join(TQString::fromLatin1("; ")));
+    e->setField(TQString::tqfromLatin1("publisher"), publishers.join(TQString::tqfromLatin1("; ")));
 
     nodeList = GETELEMENTS("subject");
     TQStringList keywords;
     for(uint j = 0; j < nodeList.count(); ++j) {
       keywords << nodeList.item(j).toElement().text();
     }
-    e->setField(TQString::fromLatin1("keyword"), keywords.join(TQString::fromLatin1("; ")));
+    e->setField(TQString::tqfromLatin1("keyword"), keywords.join(TQString::tqfromLatin1("; ")));
 
     nodeList = GETELEMENTS("date");
     if(nodeList.count() > 0) {
       TQString s = nodeList.item(0).toElement().text();
       if(dateRX.search(s) > -1) {
-        e->setField(TQString::fromLatin1("pub_year"), dateRX.cap());
+        e->setField(TQString::tqfromLatin1("pub_year"), dateRX.cap());
       }
     }
 
     nodeList = GETELEMENTS("description");
     if(nodeList.count() > 0) { // no title, skip
-      e->setField(TQString::fromLatin1("comments"), nodeList.item(0).toElement().text());
+      e->setField(TQString::tqfromLatin1("comments"), nodeList.item(0).toElement().text());
     }
 
     c->addEntries(e);