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

1 files changed, 17 insertions, 17 deletions

diff --git a/src/importdialog.cpp b/src/importdialog.cpp
index 86f6c27..192b710 100644
--- a/src/importdialog.cpp
+++ b/src/importdialog.cpp
@@ -38,7 +38,7 @@
 #include <klocale.h>
 #include <kstandarddirs.h>
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqbuttongroup.h>
 #include <tqradiobutton.h>
 #include <tqcheckbox.h>
@@ -96,7 +96,7 @@ ImportDialog::ImportDialog(Import::Format format_, const KURL::List& urls_, TQWi
   setButtonOK(ok);
 
   // want to grab default button action, too
-  // since the importer might do something with widgets, don't just call it, do it after tqlayout is done
+  // since the importer might do something with widgets, don't just call it, do it after layout is done
   TQTimer::singleShot(0, this, TQT_SLOT(slotUpdateAction()));
 }
 
@@ -160,7 +160,7 @@ Tellico::Import::Importer* ImportDialog::importer(Import::Format format_, const
       CHECK_SIZE;
       importer = new Import::XSLTImporter(firstURL);
       {
-        TQString xsltFile = locate("appdata", TQString::tqfromLatin1("mods2tellico.xsl"));
+        TQString xsltFile = locate("appdata", TQString::fromLatin1("mods2tellico.xsl"));
         if(!xsltFile.isEmpty()) {
           KURL u;
           u.setPath(xsltFile);
@@ -318,18 +318,18 @@ Tellico::Import::FormatMap ImportDialog::formatMap() {
   // I decided they were likely to be the same in any language
   // transliteration is unlikely
   Import::FormatMap map;
-  map[Import::TellicoXML] = TQString::tqfromLatin1("Tellico");
-  map[Import::Bibtex]     = TQString::tqfromLatin1("Bibtex");
-  map[Import::Bibtexml]   = TQString::tqfromLatin1("Bibtexml");
-//  map[Import::CSV]        = TQString::tqfromLatin1("CSV");
-  map[Import::MODS]       = TQString::tqfromLatin1("MODS");
-  map[Import::RIS]        = TQString::tqfromLatin1("RIS");
-  map[Import::GCfilms]    = TQString::tqfromLatin1("GCstar");
-  map[Import::AMC]        = TQString::tqfromLatin1("AMC");
-  map[Import::Griffith]   = TQString::tqfromLatin1("Griffith");
-  map[Import::PDF]        = TQString::tqfromLatin1("PDF");
-  map[Import::Referencer] = TQString::tqfromLatin1("Referencer");
-  map[Import::Delicious ] = TQString::tqfromLatin1("Delicious Library");
+  map[Import::TellicoXML] = TQString::fromLatin1("Tellico");
+  map[Import::Bibtex]     = TQString::fromLatin1("Bibtex");
+  map[Import::Bibtexml]   = TQString::fromLatin1("Bibtexml");
+//  map[Import::CSV]        = TQString::fromLatin1("CSV");
+  map[Import::MODS]       = TQString::fromLatin1("MODS");
+  map[Import::RIS]        = TQString::fromLatin1("RIS");
+  map[Import::GCfilms]    = TQString::fromLatin1("GCstar");
+  map[Import::AMC]        = TQString::fromLatin1("AMC");
+  map[Import::Griffith]   = TQString::fromLatin1("Griffith");
+  map[Import::PDF]        = TQString::fromLatin1("PDF");
+  map[Import::Referencer] = TQString::fromLatin1("Referencer");
+  map[Import::Delicious ] = TQString::fromLatin1("Delicious Library");
   return map;
 }
 
@@ -343,11 +343,11 @@ TQString ImportDialog::startDir(Import::Format format_) {
   if(format_ == Import::GCfilms) {
     TQDir dir = TQDir::home();
     // able to cd if exists and readable
-    if(dir.cd(TQString::tqfromLatin1(".local/share/gcfilms/"))) {
+    if(dir.cd(TQString::fromLatin1(".local/share/gcfilms/"))) {
       return dir.absPath();
     }
   }
-  return TQString::tqfromLatin1(":import");
+  return TQString::fromLatin1(":import");
 }
 
 void ImportDialog::slotOk() {