1 files changed, 11 insertions, 11 deletions

diff --git a/src/translators/bibteximporter.cpp b/src/translators/bibteximporter.cpp
index 5b639f4..0b4775b 100644
--- a/src/translators/bibteximporter.cpp
+++ b/src/translators/bibteximporter.cpp
@@ -25,11 +25,11 @@
 
 #include <tqptrlist.h>
 #include <tqregexp.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqvbuttongroup.h>
 #include <tqradiobutton.h>
 #include <tqwhatsthis.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
 
 using Tellico::Import::BibtexImporter;
 
@@ -95,7 +95,7 @@ Tellico::Data::CollPtr BibtexImporter::collection() {
     }
     Data::CollPtr coll = readCollection(text, count);
     if(!coll || coll->entryCount() == 0) {
-      setStatusMessage(i18n("No valid bibtex entries were found in file - %1").arg(url().fileName()));
+      setStatusMessage(i18n("No valid bibtex entries were found in file - %1").tqarg(url().fileName()));
       continue;
     }
     m_coll->addEntries(coll->entries());
@@ -160,17 +160,17 @@ Tellico::Data::CollPtr BibtexImporter::readCollection(const TQString& text, int
     str = TQString::fromUtf8(bt_entry_type(it.current()));
 //    kdDebug() << "entry type: " << str << endl;
     // text is automatically put into lower-case by btparse
-    BibtexHandler::setFieldValue(entry, TQString::fromLatin1("entry-type"), str);
+    BibtexHandler::setFieldValue(entry, TQString::tqfromLatin1("entry-type"), str);
 
     str = TQString::fromUtf8(bt_entry_key(it.current()));
 //    kdDebug() << "entry key: " << str << endl;
-    BibtexHandler::setFieldValue(entry, TQString::fromLatin1("key"), str);
+    BibtexHandler::setFieldValue(entry, TQString::tqfromLatin1("key"), str);
 
     char* name;
     AST* field = 0;
     while((field = bt_next_field(it.current(), field, &name))) {
 //      kdDebug() << "\tfound: " << name << endl;
-//      str = TQString::fromLatin1(bt_get_text(field));
+//      str = TQString::tqfromLatin1(bt_get_text(field));
       str.truncate(0);
       AST* value = 0;
       bt_nodetype type;
@@ -197,7 +197,7 @@ Tellico::Data::CollPtr BibtexImporter::readCollection(const TQString& text, int
       }
       TQString fieldName = TQString::fromUtf8(name);
       if(fieldName == Latin1Literal("author") || fieldName == Latin1Literal("editor")) {
-        str.replace(TQRegExp(TQString::fromLatin1("\\sand\\s")), TQString::fromLatin1("; "));
+        str.replace(TQRegExp(TQString::tqfromLatin1("\\sand\\s")), TQString::tqfromLatin1("; "));
       }
       BibtexHandler::setFieldValue(entry, fieldName, str);
     }
@@ -235,8 +235,8 @@ void BibtexImporter::parseText(const TQString& text) {
 //  bt_set_stringopts(BTE_PREAMBLE, BTO_CONVERT | BTO_EXPAND);
 
   TQString entry;
-  TQRegExp rx(TQString::fromLatin1("[{}]"));
-  TQRegExp macroName(TQString::fromLatin1("@string\\s*\\{\\s*(.*)="), false /*case sensitive*/);
+  TQRegExp rx(TQString::tqfromLatin1("[{}]"));
+  TQRegExp macroName(TQString::tqfromLatin1("@string\\s*\\{\\s*(.*)="), false /*case sensitive*/);
   macroName.setMinimal(true);
 
   bool needsCleanup = false;
@@ -289,8 +289,8 @@ TQWidget* BibtexImporter::widget(TQWidget* parent_, const char* name_/*=0*/) {
   TQButtonGroup* box = new TQVButtonGroup(i18n("Bibtex Options"), m_widget);
   m_readUTF8 = new TQRadioButton(i18n("Use Unicode (UTF-8) encoding"), box);
   TQWhatsThis::add(m_readUTF8, i18n("Read the imported file in Unicode (UTF-8)."));
-  TQString localStr = i18n("Use user locale (%1) encoding").arg(
-                     TQString::fromLatin1(TQTextCodec::codecForLocale()->name()));
+  TQString localStr = i18n("Use user locale (%1) encoding").tqarg(
+                     TQString::tqfromLatin1(TQTextCodec::codecForLocale()->name()));
   m_readLocale = new TQRadioButton(localStr, box);
   m_readLocale->setChecked(true);
   TQWhatsThis::add(m_readLocale, i18n("Read the imported file in the local encoding."));