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

This reverts commit 031454e56009d576589c28757f6c6fcf4884095e.

1 files changed, 25 insertions, 25 deletions

diff --git a/src/collections/musiccollection.cpp b/src/collections/musiccollection.cpp
index 8d992b8..fde5a04 100644
--- a/src/collections/musiccollection.cpp
+++ b/src/collections/musiccollection.cpp
@@ -27,14 +27,14 @@ MusicCollection::MusicCollection(bool addFields_, const TQString& title_ /*=null
   if(addFields_) {
     addFields(defaultFields());
   }
-  setDefaultGroupField(TQString::fromLatin1("artist"));
+  setDefaultGroupField(TQString::tqfromLatin1("artist"));
 }
 
 Tellico::Data::FieldVec MusicCollection::defaultFields() {
   FieldVec list;
   FieldPtr field;
 
-  field = new Field(TQString::fromLatin1("title"), i18n("Album"));
+  field = new Field(TQString::tqfromLatin1("title"), i18n("Album"));
   field->setCategory(i18n(music_general));
   field->setFlags(Field::NoDelete | Field::AllowCompletion);
   field->setFormatFlag(Field::FormatTitle);
@@ -42,73 +42,73 @@ Tellico::Data::FieldVec MusicCollection::defaultFields() {
 
   TQStringList media;
   media << i18n("Compact Disc") << i18n("DVD") << i18n("Cassette") << i18n("Vinyl");
-  field = new Field(TQString::fromLatin1("medium"), i18n("Medium"), media);
+  field = new Field(TQString::tqfromLatin1("medium"), i18n("Medium"), media);
   field->setCategory(i18n(music_general));
   field->setFlags(Field::AllowGrouped);
   list.append(field);
 
-  field = new Field(TQString::fromLatin1("artist"), i18n("Artist"));
+  field = new Field(TQString::tqfromLatin1("artist"), i18n("Artist"));
   field->setCategory(i18n(music_general));
   field->setFlags(Field::AllowCompletion | Field::AllowGrouped | Field::AllowMultiple);
   field->setFormatFlag(Field::FormatTitle); // don't use FormatName
   list.append(field);
 
-  field = new Field(TQString::fromLatin1("label"), i18n("Label"));
+  field = new Field(TQString::tqfromLatin1("label"), i18n("Label"));
   field->setCategory(i18n(music_general));
   field->setFlags(Field::AllowCompletion | Field::AllowGrouped | Field::AllowMultiple);
   field->setFormatFlag(Field::FormatPlain);
   list.append(field);
 
-  field = new Field(TQString::fromLatin1("year"), i18n("Year"), Field::Number);
+  field = new Field(TQString::tqfromLatin1("year"), i18n("Year"), Field::Number);
   field->setCategory(i18n(music_general));
   field->setFlags(Field::AllowGrouped);
   list.append(field);
 
-  field = new Field(TQString::fromLatin1("genre"), i18n("Genre"));
+  field = new Field(TQString::tqfromLatin1("genre"), i18n("Genre"));
   field->setCategory(i18n(music_general));
   field->setFlags(Field::AllowCompletion | Field::AllowMultiple | Field::AllowGrouped);
   field->setFormatFlag(Field::FormatPlain);
   list.append(field);
 
-  field = new Field(TQString::fromLatin1("track"), i18n("Tracks"), Field::Table);
+  field = new Field(TQString::tqfromLatin1("track"), i18n("Tracks"), Field::Table);
   field->setFormatFlag(Field::FormatTitle);
-  field->setProperty(TQString::fromLatin1("columns"), TQChar('3'));
-  field->setProperty(TQString::fromLatin1("column1"), i18n("Title"));
-  field->setProperty(TQString::fromLatin1("column2"), i18n("Artist"));
-  field->setProperty(TQString::fromLatin1("column3"), i18n("Length"));
+  field->setProperty(TQString::tqfromLatin1("columns"), TQChar('3'));
+  field->setProperty(TQString::tqfromLatin1("column1"), i18n("Title"));
+  field->setProperty(TQString::tqfromLatin1("column2"), i18n("Artist"));
+  field->setProperty(TQString::tqfromLatin1("column3"), i18n("Length"));
   list.append(field);
 
-  field = new Field(TQString::fromLatin1("rating"), i18n("Rating"), Field::Rating);
+  field = new Field(TQString::tqfromLatin1("rating"), i18n("Rating"), Field::Rating);
   field->setCategory(i18n(music_personal));
   field->setFlags(Field::AllowGrouped);
   list.append(field);
 
-  field = new Field(TQString::fromLatin1("pur_date"), i18n("Purchase Date"));
+  field = new Field(TQString::tqfromLatin1("pur_date"), i18n("Purchase Date"));
   field->setCategory(i18n(music_personal));
   field->setFormatFlag(Field::FormatDate);
   list.append(field);
 
-  field = new Field(TQString::fromLatin1("gift"), i18n("Gift"), Field::Bool);
+  field = new Field(TQString::tqfromLatin1("gift"), i18n("Gift"), Field::Bool);
   field->setCategory(i18n(music_personal));
   list.append(field);
 
-  field = new Field(TQString::fromLatin1("pur_price"), i18n("Purchase Price"));
+  field = new Field(TQString::tqfromLatin1("pur_price"), i18n("Purchase Price"));
   field->setCategory(i18n(music_personal));
   list.append(field);
 
-  field = new Field(TQString::fromLatin1("loaned"), i18n("Loaned"), Field::Bool);
+  field = new Field(TQString::tqfromLatin1("loaned"), i18n("Loaned"), Field::Bool);
   field->setCategory(i18n(music_personal));
   list.append(field);
 
-  field = new Field(TQString::fromLatin1("keyword"), i18n("Keywords"));
+  field = new Field(TQString::tqfromLatin1("keyword"), i18n("Keywords"));
   field->setCategory(i18n(music_personal));
   field->setFlags(Field::AllowCompletion | Field::AllowMultiple | Field::AllowGrouped);
   list.append(field);
 
-  field = new Field(TQString::fromLatin1("cover"), i18n("Cover"), Field::Image);
+  field = new Field(TQString::tqfromLatin1("cover"), i18n("Cover"), Field::Image);
   list.append(field);
 
-  field = new Field(TQString::fromLatin1("comments"), i18n("Comments"), Field::Para);
+  field = new Field(TQString::tqfromLatin1("comments"), i18n("Comments"), Field::Para);
   field->setCategory(i18n(music_personal));
   list.append(field);
 
@@ -117,15 +117,15 @@ Tellico::Data::FieldVec MusicCollection::defaultFields() {
 
 int MusicCollection::sameEntry(Data::EntryPtr entry1_, Data::EntryPtr entry2_) const {
   // not enough for title to be equal, must also have another field
-  int res = 2*Entry::compareValues(entry1_, entry2_, TQString::fromLatin1("title"), this);
+  int res = 2*Entry::compareValues(entry1_, entry2_, TQString::tqfromLatin1("title"), this);
 //  if(res == 0) {
 //    myDebug() << "MusicCollection::sameEntry() - different titles for " << entry1_->title() << " vs. "
 //              << entry2_->title() << endl;
 //  }
-  res += 2*Entry::compareValues(entry1_, entry2_, TQString::fromLatin1("artist"), this);
-  res += Entry::compareValues(entry1_, entry2_, TQString::fromLatin1("year"), this);
-  res += Entry::compareValues(entry1_, entry2_, TQString::fromLatin1("label"), this);
-  res += Entry::compareValues(entry1_, entry2_, TQString::fromLatin1("medium"), this);
+  res += 2*Entry::compareValues(entry1_, entry2_, TQString::tqfromLatin1("artist"), this);
+  res += Entry::compareValues(entry1_, entry2_, TQString::tqfromLatin1("year"), this);
+  res += Entry::compareValues(entry1_, entry2_, TQString::tqfromLatin1("label"), this);
+  res += Entry::compareValues(entry1_, entry2_, TQString::tqfromLatin1("medium"), this);
   return res;
 }