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

This reverts commit 031454e56009d576589c28757f6c6fcf4884095e.

1 files changed, 36 insertions, 36 deletions

diff --git a/src/collections/bookcollection.cpp b/src/collections/bookcollection.cpp
index 72ff534..21c5d90 100644
--- a/src/collections/bookcollection.cpp
+++ b/src/collections/bookcollection.cpp
@@ -29,31 +29,31 @@ BookCollection::BookCollection(bool addFields_, const TQString& title_ /*=null*/
   if(addFields_) {
     addFields(defaultFields());
   }
-  setDefaultGroupField(TQString::fromLatin1("author"));
+  setDefaultGroupField(TQString::tqfromLatin1("author"));
 }
 
 Tellico::Data::FieldVec BookCollection::defaultFields() {
   FieldVec list;
   FieldPtr field;
 
-  field = new Field(TQString::fromLatin1("title"), i18n("Title"));
+  field = new Field(TQString::tqfromLatin1("title"), i18n("Title"));
   field->setCategory(i18n("General"));
   field->setFlags(Field::NoDelete);
   field->setFormatFlag(Field::FormatTitle);
   list.append(field);
 
-  field = new Field(TQString::fromLatin1("subtitle"), i18n("Subtitle"));
+  field = new Field(TQString::tqfromLatin1("subtitle"), i18n("Subtitle"));
   field->setCategory(i18n(book_general));
   field->setFormatFlag(Field::FormatTitle);
   list.append(field);
 
-  field = new Field(TQString::fromLatin1("author"), i18n("Author"));
+  field = new Field(TQString::tqfromLatin1("author"), i18n("Author"));
   field->setCategory(i18n(book_general));
   field->setFlags(Field::AllowCompletion | Field::AllowMultiple | Field::AllowGrouped);
   field->setFormatFlag(Field::FormatName);
   list.append(field);
 
-  field = new Field(TQString::fromLatin1("editor"), i18n("Editor"));
+  field = new Field(TQString::tqfromLatin1("editor"), i18n("Editor"));
   field->setCategory(i18n(book_general));
   field->setFlags(Field::AllowCompletion | Field::AllowMultiple | Field::AllowGrouped);
   field->setFormatFlag(Field::FormatName);
@@ -62,119 +62,119 @@ Tellico::Data::FieldVec BookCollection::defaultFields() {
   TQStringList binding;
   binding << i18n("Hardback") << i18n("Paperback") << i18n("Trade Paperback")
           << i18n("E-Book") << i18n("Magazine") << i18n("Journal");
-  field = new Field(TQString::fromLatin1("binding"), i18n("Binding"), binding);
+  field = new Field(TQString::tqfromLatin1("binding"), i18n("Binding"), binding);
   field->setCategory(i18n(book_general));
   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(book_general));
   field->setFormatFlag(Field::FormatDate);
   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(book_general));
   list.append(field);
 
-  field = new Field(TQString::fromLatin1("publisher"), i18n("Publisher"));
+  field = new Field(TQString::tqfromLatin1("publisher"), i18n("Publisher"));
   field->setCategory(i18n(book_publishing));
   field->setFlags(Field::AllowCompletion | Field::AllowGrouped);
   field->setFormatFlag(Field::FormatPlain);
   list.append(field);
 
-  field = new Field(TQString::fromLatin1("edition"), i18n("Edition"));
+  field = new Field(TQString::tqfromLatin1("edition"), i18n("Edition"));
   field->setCategory(i18n(book_publishing));
   field->setFlags(Field::AllowCompletion);
   field->setFormatFlag(Field::FormatPlain);
   list.append(field);
 
-  field = new Field(TQString::fromLatin1("cr_year"), i18n("Copyright Year"), Field::Number);
+  field = new Field(TQString::tqfromLatin1("cr_year"), i18n("Copyright Year"), Field::Number);
   field->setCategory(i18n(book_publishing));
   field->setFlags(Field::AllowGrouped | Field::AllowMultiple);
   list.append(field);
 
-  field = new Field(TQString::fromLatin1("pub_year"), i18n("Publication Year"), Field::Number);
+  field = new Field(TQString::tqfromLatin1("pub_year"), i18n("Publication Year"), Field::Number);
   field->setCategory(i18n(book_publishing));
   field->setFlags(Field::AllowGrouped);
   list.append(field);
 
-  field = new Field(TQString::fromLatin1("isbn"), i18n("ISBN#"));
+  field = new Field(TQString::tqfromLatin1("isbn"), i18n("ISBN#"));
   field->setCategory(i18n(book_publishing));
   field->setDescription(i18n("International Standard Book Number"));
   list.append(field);
 
-  field = new Field(TQString::fromLatin1("lccn"), i18n("LCCN#"));
+  field = new Field(TQString::tqfromLatin1("lccn"), i18n("LCCN#"));
   field->setCategory(i18n(book_publishing));
   field->setDescription(i18n("Library of Congress Control Number"));
   list.append(field);
 
-  field = new Field(TQString::fromLatin1("pages"), i18n("Pages"), Field::Number);
+  field = new Field(TQString::tqfromLatin1("pages"), i18n("Pages"), Field::Number);
   field->setCategory(i18n(book_publishing));
   list.append(field);
 
-  field = new Field(TQString::fromLatin1("translator"), i18n("Translator"));
+  field = new Field(TQString::tqfromLatin1("translator"), i18n("Translator"));
   field->setCategory(i18n(book_publishing));
   field->setFlags(Field::AllowCompletion | Field::AllowMultiple | Field::AllowGrouped);
   field->setFormatFlag(Field::FormatName);
   list.append(field);
 
-  field = new Field(TQString::fromLatin1("language"), i18n("Language"));
+  field = new Field(TQString::tqfromLatin1("language"), i18n("Language"));
   field->setCategory(i18n(book_publishing));
   field->setFlags(Field::AllowCompletion | Field::AllowGrouped | Field::AllowMultiple);
   list.append(field);
 
-  field = new Field(TQString::fromLatin1("genre"), i18n("Genre"));
+  field = new Field(TQString::tqfromLatin1("genre"), i18n("Genre"));
   field->setCategory(i18n(book_classification));
   field->setFlags(Field::AllowCompletion | Field::AllowMultiple | Field::AllowGrouped);
   list.append(field);
 
   // in document versions < 3, this was "keywords" and not "keyword"
   // but the title didn't change, only the name
-  field = new Field(TQString::fromLatin1("keyword"), i18n("Keywords"));
+  field = new Field(TQString::tqfromLatin1("keyword"), i18n("Keywords"));
   field->setCategory(i18n(book_classification));
   field->setFlags(Field::AllowCompletion | Field::AllowMultiple | Field::AllowGrouped);
   list.append(field);
 
-  field = new Field(TQString::fromLatin1("series"), i18n("Series"));
+  field = new Field(TQString::tqfromLatin1("series"), i18n("Series"));
   field->setCategory(i18n(book_classification));
   field->setFlags(Field::AllowCompletion | Field::AllowGrouped);
   list.append(field);
 
-  field = new Field(TQString::fromLatin1("series_num"), i18n("Series Number"), Field::Number);
+  field = new Field(TQString::tqfromLatin1("series_num"), i18n("Series Number"), Field::Number);
   field->setCategory(i18n(book_classification));
   list.append(field);
 
   TQStringList cond;
   cond << i18n("New") << i18n("Used");
-  field = new Field(TQString::fromLatin1("condition"), i18n("Condition"), cond);
+  field = new Field(TQString::tqfromLatin1("condition"), i18n("Condition"), cond);
   field->setCategory(i18n(book_classification));
   list.append(field);
 
-  field = new Field(TQString::fromLatin1("signed"), i18n("Signed"), Field::Bool);
+  field = new Field(TQString::tqfromLatin1("signed"), i18n("Signed"), Field::Bool);
   field->setCategory(i18n(book_personal));
   list.append(field);
 
-  field = new Field(TQString::fromLatin1("read"), i18n("Read"), Field::Bool);
+  field = new Field(TQString::tqfromLatin1("read"), i18n("Read"), Field::Bool);
   field->setCategory(i18n(book_personal));
   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(book_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(book_personal));
   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(book_personal));
   field->setFlags(Field::AllowGrouped);
   list.append(field);
 
-  field = new Field(TQString::fromLatin1("cover"), i18n("Front Cover"), Field::Image);
+  field = new Field(TQString::tqfromLatin1("cover"), i18n("Front 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(book_personal));
   list.append(field);
 
@@ -183,19 +183,19 @@ Tellico::Data::FieldVec BookCollection::defaultFields() {
 
 int BookCollection::sameEntry(Data::EntryPtr entry1_, Data::EntryPtr entry2_) const {
   // equal isbn's or lccn's are easy, give it a weight of 100
-  if(Entry::compareValues(entry1_, entry2_, TQString::fromLatin1("isbn"), this) > 0 ||
-     Entry::compareValues(entry1_, entry2_, TQString::fromLatin1("lccn"), this) > 0) {
+  if(Entry::compareValues(entry1_, entry2_, TQString::tqfromLatin1("isbn"), this) > 0 ||
+     Entry::compareValues(entry1_, entry2_, TQString::tqfromLatin1("lccn"), this) > 0) {
     return 100; // good match
   }
-  int res = 3*Entry::compareValues(entry1_, entry2_, TQString::fromLatin1("title"), this);
+  int res = 3*Entry::compareValues(entry1_, entry2_, TQString::tqfromLatin1("title"), this);
 //  if(res == 0) {
 //    myDebug() << "BookCollection::sameEntry() - different titles for " << entry1_->title() << " vs. "
 //              << entry2_->title() << endl;
 //  }
-  res += 2*Entry::compareValues(entry1_, entry2_, TQString::fromLatin1("author"), this);
-  res += Entry::compareValues(entry1_, entry2_, TQString::fromLatin1("cr_year"), this);
-  res += Entry::compareValues(entry1_, entry2_, TQString::fromLatin1("pub_year"), this);
-  res += Entry::compareValues(entry1_, entry2_, TQString::fromLatin1("binding"), this);
+  res += 2*Entry::compareValues(entry1_, entry2_, TQString::tqfromLatin1("author"), this);
+  res += Entry::compareValues(entry1_, entry2_, TQString::tqfromLatin1("cr_year"), this);
+  res += Entry::compareValues(entry1_, entry2_, TQString::tqfromLatin1("pub_year"), this);
+  res += Entry::compareValues(entry1_, entry2_, TQString::tqfromLatin1("binding"), this);
   return res;
 }