Rename old tq methods that no longer need a unique name

1 files changed, 23 insertions, 23 deletions

diff --git a/src/translators/audiofileimporter.cpp b/src/translators/audiofileimporter.cpp
index e962b18..e6c74de 100644
--- a/src/translators/audiofileimporter.cpp
+++ b/src/translators/audiofileimporter.cpp
@@ -102,13 +102,13 @@ Tellico::Data::CollPtr AudioFileImporter::collection() {
   }
   item.setTotalSteps(files.count());
 
-  const TQString title    = TQString::tqfromLatin1("title");
-  const TQString artist   = TQString::tqfromLatin1("artist");
-  const TQString year     = TQString::tqfromLatin1("year");
-  const TQString genre    = TQString::tqfromLatin1("genre");
-  const TQString track    = TQString::tqfromLatin1("track");
-  const TQString comments = TQString::tqfromLatin1("comments");
-  const TQString file     = TQString::tqfromLatin1("file");
+  const TQString title    = TQString::fromLatin1("title");
+  const TQString artist   = TQString::fromLatin1("artist");
+  const TQString year     = TQString::fromLatin1("year");
+  const TQString genre    = TQString::fromLatin1("genre");
+  const TQString track    = TQString::fromLatin1("track");
+  const TQString comments = TQString::fromLatin1("comments");
+  const TQString file     = TQString::fromLatin1("file");
 
   m_coll = new Data::MusicCollection(true);
 
@@ -122,12 +122,12 @@ Tellico::Data::CollPtr AudioFileImporter::collection() {
       f = new Data::Field(file, i18n("Files"), Data::Field::Table);
       m_coll->addField(f);
     }
-    f->setProperty(TQString::tqfromLatin1("column1"), i18n("Files"));
+    f->setProperty(TQString::fromLatin1("column1"), i18n("Files"));
     if(addBitrate) {
-      f->setProperty(TQString::tqfromLatin1("columns"), TQChar('2'));
-      f->setProperty(TQString::tqfromLatin1("column2"), i18n("Bitrate"));
+      f->setProperty(TQString::fromLatin1("columns"), TQChar('2'));
+      f->setProperty(TQString::fromLatin1("column2"), i18n("Bitrate"));
     } else {
-      f->setProperty(TQString::tqfromLatin1("columns"), TQChar('1'));
+      f->setProperty(TQString::fromLatin1("columns"), TQChar('1'));
     }
   }
 
@@ -141,7 +141,7 @@ Tellico::Data::CollPtr AudioFileImporter::collection() {
   for(TQStringList::ConstIterator it = files.begin(); !m_cancelled && it != files.end(); ++it, ++j) {
     TagLib::FileRef f(TQFile::encodeName(*it));
     if(f.isNull() || !f.tag()) {
-      if((*it).endsWith(TQString::tqfromLatin1("/.directory"))) {
+      if((*it).endsWith(TQString::fromLatin1("/.directory"))) {
         directoryFiles += *it;
       }
       continue;
@@ -155,15 +155,15 @@ Tellico::Data::CollPtr AudioFileImporter::collection() {
       continue;
     }
     int disc = discNumber(f);
-    if(disc > 1 && !m_coll->hasField(TQString::tqfromLatin1("track%1").tqarg(disc))) {
-      Data::FieldPtr f2 = new Data::Field(TQString::tqfromLatin1("track%1").tqarg(disc),
+    if(disc > 1 && !m_coll->hasField(TQString::fromLatin1("track%1").tqarg(disc))) {
+      Data::FieldPtr f2 = new Data::Field(TQString::fromLatin1("track%1").tqarg(disc),
                                           i18n("Tracks (Disc %1)").tqarg(disc),
                                           Data::Field::Table);
       f2->setFormatFlag(Data::Field::FormatTitle);
-      f2->setProperty(TQString::tqfromLatin1("columns"), TQChar('3'));
-      f2->setProperty(TQString::tqfromLatin1("column1"), i18n("Title"));
-      f2->setProperty(TQString::tqfromLatin1("column2"), i18n("Artist"));
-      f2->setProperty(TQString::tqfromLatin1("column3"), i18n("Length"));
+      f2->setProperty(TQString::fromLatin1("columns"), TQChar('3'));
+      f2->setProperty(TQString::fromLatin1("column1"), i18n("Title"));
+      f2->setProperty(TQString::fromLatin1("column2"), i18n("Artist"));
+      f2->setProperty(TQString::fromLatin1("column3"), i18n("Length"));
       m_coll->addField(f2);
       if(changeTrackTitle) {
         Data::FieldPtr newTrack = new Data::Field(*m_coll->fieldByName(track));
@@ -252,10 +252,10 @@ Tellico::Data::CollPtr AudioFileImporter::collection() {
     if(!tag->comment().stripWhiteSpace().isEmpty()) {
       TQString c = entry->field(comments);
       if(!c.isEmpty()) {
-        c += TQString::tqfromLatin1("<br/>");
+        c += TQString::fromLatin1("<br/>");
       }
       if(!tag->title().isEmpty()) {
-        c += TQString::tqfromLatin1("<em>") + TQString(TStringToQString(tag->title())).stripWhiteSpace() + TQString::tqfromLatin1("</em> - ");
+        c += TQString::fromLatin1("<em>") + TQString(TStringToQString(tag->title())).stripWhiteSpace() + TQString::fromLatin1("</em> - ");
       }
       c += TQString(TStringToQString(tag->comment().stripWhiteSpace())).stripWhiteSpace();
       entry->setField(comments, c);
@@ -286,7 +286,7 @@ Tellico::Data::CollPtr AudioFileImporter::collection() {
   }
 
   TQTextStream ts;
-  TQRegExp iconRx(TQString::tqfromLatin1("Icon\\s*=\\s*(.*)"));
+  TQRegExp iconRx(TQString::fromLatin1("Icon\\s*=\\s*(.*)"));
   for(TQStringList::ConstIterator it = directoryFiles.begin(); !m_cancelled && it != directoryFiles.end(); ++it, ++j) {
     TQFile file(*it);
     if(!file.open(IO_ReadOnly)) {
@@ -309,7 +309,7 @@ Tellico::Data::CollPtr AudioFileImporter::collection() {
       u.setPath(fi.absFilePath());
       TQString id = ImageFactory::addImage(u, true);
       if(!id.isEmpty()) {
-        entry->setField(TQString::tqfromLatin1("cover"), id);
+        entry->setField(TQString::fromLatin1("cover"), id);
       }
       break;
     }
@@ -371,7 +371,7 @@ TQString AudioFileImporter::insertValue(const TQString& str_, const TQString& va
     myDebug() << "*** New value: " << value_ << endl;
   }
   list[pos_-1] = value_;
-  return list.join(TQString::tqfromLatin1("; "));
+  return list.join(TQString::fromLatin1("; "));
 }
 
 void AudioFileImporter::slotCancel() {