Rename old tq methods that no longer need a unique name

1 files changed, 41 insertions, 41 deletions

diff --git a/src/collections/videocollection.cpp b/src/collections/videocollection.cpp
index d8ac081..06f3a6a 100644
--- a/src/collections/videocollection.cpp
+++ b/src/collections/videocollection.cpp
@@ -29,14 +29,14 @@ VideoCollection::VideoCollection(bool addFields_, const TQString& title_ /*=null
   if(addFields_) {
     addFields(defaultFields());
   }
-  setDefaultGroupField(TQString::tqfromLatin1("genre"));
+  setDefaultGroupField(TQString::fromLatin1("genre"));
 }
 
 Tellico::Data::FieldVec VideoCollection::defaultFields() {
   FieldVec list;
   FieldPtr field;
 
-  field = new Field(TQString::tqfromLatin1("title"), i18n("Title"));
+  field = new Field(TQString::fromLatin1("title"), i18n("Title"));
   field->setCategory(i18n("General"));
   field->setFlags(Field::NoDelete);
   field->setFormatFlag(Field::FormatTitle);
@@ -44,27 +44,27 @@ Tellico::Data::FieldVec VideoCollection::defaultFields() {
 
   TQStringList media;
   media << i18n("DVD") << i18n("VHS") << i18n("VCD") << i18n("DivX") << i18n("Blu-ray") << i18n("HD DVD");
-  field = new Field(TQString::tqfromLatin1("medium"), i18n("Medium"), media);
+  field = new Field(TQString::fromLatin1("medium"), i18n("Medium"), media);
   field->setCategory(i18n(video_general));
   field->setFlags(Field::AllowGrouped);
   list.append(field);
 
-  field = new Field(TQString::tqfromLatin1("year"), i18n("Production Year"), Field::Number);
+  field = new Field(TQString::fromLatin1("year"), i18n("Production Year"), Field::Number);
   field->setCategory(i18n(video_general));
   field->setFlags(Field::AllowGrouped);
   list.append(field);
 
-  TQStringList cert = TQStringList::split(TQRegExp(TQString::tqfromLatin1("\\s*,\\s*")),
+  TQStringList cert = TQStringList::split(TQRegExp(TQString::fromLatin1("\\s*,\\s*")),
                                         i18n("Movie ratings - "
                                              "G (USA),PG (USA),PG-13 (USA),R (USA), U (USA)",
                                              "G (USA),PG (USA),PG-13 (USA),R (USA), U (USA)"),
                                         false);
-  field = new Field(TQString::tqfromLatin1("certification"), i18n("Certification"), cert);
+  field = new Field(TQString::fromLatin1("certification"), i18n("Certification"), cert);
   field->setCategory(i18n(video_general));
   field->setFlags(Field::AllowGrouped);
   list.append(field);
 
-  field = new Field(TQString::tqfromLatin1("genre"), i18n("Genre"));
+  field = new Field(TQString::fromLatin1("genre"), i18n("Genre"));
   field->setCategory(i18n(video_general));
   field->setFlags(Field::AllowCompletion | Field::AllowMultiple | Field::AllowGrouped);
   field->setFormatFlag(Field::FormatPlain);
@@ -79,12 +79,12 @@ Tellico::Data::FieldVec VideoCollection::defaultFields() {
          << i18n("Region 6")
          << i18n("Region 7")
          << i18n("Region 8");
-  field = new Field(TQString::tqfromLatin1("region"), i18n("Region"), region);
+  field = new Field(TQString::fromLatin1("region"), i18n("Region"), region);
   field->setCategory(i18n(video_general));
   field->setFlags(Field::AllowGrouped);
   list.append(field);
 
-  field = new Field(TQString::tqfromLatin1("nationality"), i18n("Nationality"));
+  field = new Field(TQString::fromLatin1("nationality"), i18n("Nationality"));
   field->setCategory(i18n(video_general));
   field->setFlags(Field::AllowCompletion | Field::AllowMultiple | Field::AllowGrouped);
   field->setFormatFlag(Field::FormatPlain);
@@ -92,127 +92,127 @@ Tellico::Data::FieldVec VideoCollection::defaultFields() {
 
   TQStringList format;
   format << i18n("NTSC") << i18n("PAL") << i18n("SECAM");
-  field = new Field(TQString::tqfromLatin1("format"), i18n("Format"), format);
+  field = new Field(TQString::fromLatin1("format"), i18n("Format"), format);
   field->setCategory(i18n(video_general));
   field->setFlags(Field::AllowGrouped);
   list.append(field);
 
-  field = new Field(TQString::tqfromLatin1("cast"), i18n("Cast"), Field::Table);
-  field->setProperty(TQString::tqfromLatin1("columns"), TQChar('2'));
-  field->setProperty(TQString::tqfromLatin1("column1"), i18n("Actor/Actress"));
-  field->setProperty(TQString::tqfromLatin1("column2"), i18n("Role"));
+  field = new Field(TQString::fromLatin1("cast"), i18n("Cast"), Field::Table);
+  field->setProperty(TQString::fromLatin1("columns"), TQChar('2'));
+  field->setProperty(TQString::fromLatin1("column1"), i18n("Actor/Actress"));
+  field->setProperty(TQString::fromLatin1("column2"), i18n("Role"));
   field->setFormatFlag(Field::FormatName);
   field->setFlags(Field::AllowGrouped);
   field->setDescription(i18n("A table for the cast members, along with the roles they play"));
   list.append(field);
 
-  field = new Field(TQString::tqfromLatin1("director"), i18n("Director"));
+  field = new Field(TQString::fromLatin1("director"), i18n("Director"));
   field->setCategory(i18n(video_people));
   field->setFlags(Field::AllowCompletion | Field::AllowMultiple | Field::AllowGrouped);
   field->setFormatFlag(Field::FormatName);
   list.append(field);
 
-  field = new Field(TQString::tqfromLatin1("producer"), i18n("Producer"));
+  field = new Field(TQString::fromLatin1("producer"), i18n("Producer"));
   field->setCategory(i18n(video_people));
   field->setFlags(Field::AllowCompletion | Field::AllowMultiple | Field::AllowGrouped);
   field->setFormatFlag(Field::FormatName);
   list.append(field);
 
-  field = new Field(TQString::tqfromLatin1("writer"), i18n("Writer"));
+  field = new Field(TQString::fromLatin1("writer"), i18n("Writer"));
   field->setCategory(i18n(video_people));
   field->setFlags(Field::AllowCompletion | Field::AllowMultiple | Field::AllowGrouped);
   field->setFormatFlag(Field::FormatName);
   list.append(field);
 
-  field = new Field(TQString::tqfromLatin1("composer"), i18n("Composer"));
+  field = new Field(TQString::fromLatin1("composer"), i18n("Composer"));
   field->setCategory(i18n(video_people));
   field->setFlags(Field::AllowCompletion | Field::AllowMultiple | Field::AllowGrouped);
   field->setFormatFlag(Field::FormatName);
   list.append(field);
 
-  field = new Field(TQString::tqfromLatin1("studio"), i18n("Studio"));
+  field = new Field(TQString::fromLatin1("studio"), i18n("Studio"));
   field->setCategory(i18n(video_people));
   field->setFlags(Field::AllowCompletion | Field::AllowMultiple | Field::AllowGrouped);
   field->setFormatFlag(Field::FormatPlain);
   list.append(field);
 
-  field = new Field(TQString::tqfromLatin1("language"), i18n("Language Tracks"));
+  field = new Field(TQString::fromLatin1("language"), i18n("Language Tracks"));
   field->setCategory(i18n(video_features));
   field->setFlags(Field::AllowCompletion | Field::AllowMultiple | Field::AllowGrouped);
   field->setFormatFlag(Field::FormatPlain);
   list.append(field);
 
-  field = new Field(TQString::tqfromLatin1("subtitle"), i18n("Subtitle Languages"));
+  field = new Field(TQString::fromLatin1("subtitle"), i18n("Subtitle Languages"));
   field->setCategory(i18n(video_features));
   field->setFlags(Field::AllowCompletion | Field::AllowMultiple | Field::AllowGrouped);
   field->setFormatFlag(Field::FormatPlain);
   list.append(field);
 
-  field = new Field(TQString::tqfromLatin1("audio-track"), i18n("Audio Tracks"));
+  field = new Field(TQString::fromLatin1("audio-track"), i18n("Audio Tracks"));
   field->setCategory(i18n(video_features));
   field->setFlags(Field::AllowCompletion | Field::AllowMultiple | Field::AllowGrouped);
   field->setFormatFlag(Field::FormatPlain);
   list.append(field);
 
-  field = new Field(TQString::tqfromLatin1("running-time"), i18n("Running Time"), Field::Number);
+  field = new Field(TQString::fromLatin1("running-time"), i18n("Running Time"), Field::Number);
   field->setCategory(i18n(video_features));
   field->setDescription(i18n("The running time of the video (in minutes)"));
   list.append(field);
 
-  field = new Field(TQString::tqfromLatin1("aspect-ratio"), i18n("Aspect Ratio"));
+  field = new Field(TQString::fromLatin1("aspect-ratio"), i18n("Aspect Ratio"));
   field->setCategory(i18n(video_features));
   field->setFlags(Field::AllowCompletion | Field::AllowMultiple | Field::AllowGrouped);
   list.append(field);
 
-  field = new Field(TQString::tqfromLatin1("widescreen"), i18n("Widescreen"), Field::Bool);
+  field = new Field(TQString::fromLatin1("widescreen"), i18n("Widescreen"), Field::Bool);
   field->setCategory(i18n(video_features));
   list.append(field);
 
   TQStringList color;
   color << i18n("Color") << i18n("Black & White");
-  field = new Field(TQString::tqfromLatin1("color"), i18n("Color Mode"), color);
+  field = new Field(TQString::fromLatin1("color"), i18n("Color Mode"), color);
   field->setCategory(i18n(video_features));
   field->setFlags(Field::AllowGrouped);
   list.append(field);
 
-  field = new Field(TQString::tqfromLatin1("directors-cut"), i18n("Director's Cut"), Field::Bool);
+  field = new Field(TQString::fromLatin1("directors-cut"), i18n("Director's Cut"), Field::Bool);
   field->setCategory(i18n(video_features));
   list.append(field);
 
-  field = new Field(TQString::tqfromLatin1("plot"), i18n("Plot Summary"), Field::Para);
+  field = new Field(TQString::fromLatin1("plot"), i18n("Plot Summary"), Field::Para);
   list.append(field);
 
-  field = new Field(TQString::tqfromLatin1("rating"), i18n("Personal Rating"), Field::Rating);
+  field = new Field(TQString::fromLatin1("rating"), i18n("Personal Rating"), Field::Rating);
   field->setCategory(i18n(video_personal));
   field->setFlags(Field::AllowGrouped);
   list.append(field);
 
-  field = new Field(TQString::tqfromLatin1("pur_date"), i18n("Purchase Date"));
+  field = new Field(TQString::fromLatin1("pur_date"), i18n("Purchase Date"));
   field->setCategory(i18n(video_personal));
   field->setFormatFlag(Field::FormatDate);
   list.append(field);
 
-  field = new Field(TQString::tqfromLatin1("gift"), i18n("Gift"), Field::Bool);
+  field = new Field(TQString::fromLatin1("gift"), i18n("Gift"), Field::Bool);
   field->setCategory(i18n(video_personal));
   list.append(field);
 
-  field = new Field(TQString::tqfromLatin1("pur_price"), i18n("Purchase Price"));
+  field = new Field(TQString::fromLatin1("pur_price"), i18n("Purchase Price"));
   field->setCategory(i18n(video_personal));
   list.append(field);
 
-  field = new Field(TQString::tqfromLatin1("loaned"), i18n("Loaned"), Field::Bool);
+  field = new Field(TQString::fromLatin1("loaned"), i18n("Loaned"), Field::Bool);
   field->setCategory(i18n(video_personal));
   list.append(field);
 
-  field = new Field(TQString::tqfromLatin1("keyword"), i18n("Keywords"));
+  field = new Field(TQString::fromLatin1("keyword"), i18n("Keywords"));
   field->setCategory(i18n(video_personal));
   field->setFlags(Field::AllowCompletion | Field::AllowMultiple | Field::AllowGrouped);
   list.append(field);
 
-  field = new Field(TQString::tqfromLatin1("cover"), i18n("Cover"), Field::Image);
+  field = new Field(TQString::fromLatin1("cover"), i18n("Cover"), Field::Image);
   list.append(field);
 
-  field = new Field(TQString::tqfromLatin1("comments"), i18n("Comments"), Field::Para);
+  field = new Field(TQString::fromLatin1("comments"), i18n("Comments"), Field::Para);
   list.append(field);
 
   return list;
@@ -221,15 +221,15 @@ Tellico::Data::FieldVec VideoCollection::defaultFields() {
 int VideoCollection::sameEntry(Data::EntryPtr entry1_, Data::EntryPtr entry2_) const {
   // not enough for title to be equal, must also have another field
   // ever possible for a studio to do two movies with identical titles?
-  int res = 3*Entry::compareValues(entry1_, entry2_, TQString::tqfromLatin1("title"), this);
+  int res = 3*Entry::compareValues(entry1_, entry2_, TQString::fromLatin1("title"), this);
 //  if(res == 0) {
 //    myDebug() << "VideoCollection::sameEntry() - different titles for " << entry1_->title() << " vs. "
 //              << entry2_->title() << endl;
 //  }
-  res += Entry::compareValues(entry1_, entry2_, TQString::tqfromLatin1("year"), this);
-  res += Entry::compareValues(entry1_, entry2_, TQString::tqfromLatin1("director"), this);
-  res += Entry::compareValues(entry1_, entry2_, TQString::tqfromLatin1("studio"), this);
-  res += Entry::compareValues(entry1_, entry2_, TQString::tqfromLatin1("medium"), this);
+  res += Entry::compareValues(entry1_, entry2_, TQString::fromLatin1("year"), this);
+  res += Entry::compareValues(entry1_, entry2_, TQString::fromLatin1("director"), this);
+  res += Entry::compareValues(entry1_, entry2_, TQString::fromLatin1("studio"), this);
+  res += Entry::compareValues(entry1_, entry2_, TQString::fromLatin1("medium"), this);
   return res;
 }