From 2781e27b871150395a5a82e221684108641002b2 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 09:57:51 -0600 Subject: Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit 031454e56009d576589c28757f6c6fcf4884095e. --- src/translators/alexandriaimporter.cpp | 52 +++++++++++++++++----------------- 1 file changed, 26 insertions(+), 26 deletions(-) (limited to 'src/translators/alexandriaimporter.cpp') diff --git a/src/translators/alexandriaimporter.cpp b/src/translators/alexandriaimporter.cpp index 9feffec..c3a9db1 100644 --- a/src/translators/alexandriaimporter.cpp +++ b/src/translators/alexandriaimporter.cpp @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include @@ -46,18 +46,18 @@ Tellico::Data::CollPtr AlexandriaImporter::collection() { dataDir.cd(m_library->currentText()); dataDir.setFilter(TQDir::Files | TQDir::Readable | TQDir::NoSymLinks); - const TQString title = TQString::fromLatin1("title"); - const TQString author = TQString::fromLatin1("author"); - const TQString year = TQString::fromLatin1("pub_year"); - const TQString binding = TQString::fromLatin1("binding"); - const TQString isbn = TQString::fromLatin1("isbn"); - const TQString pub = TQString::fromLatin1("publisher"); - const TQString rating = TQString::fromLatin1("rating"); - const TQString cover = TQString::fromLatin1("cover"); - const TQString comments = TQString::fromLatin1("comments"); + const TQString title = TQString::tqfromLatin1("title"); + const TQString author = TQString::tqfromLatin1("author"); + const TQString year = TQString::tqfromLatin1("pub_year"); + const TQString binding = TQString::tqfromLatin1("binding"); + const TQString isbn = TQString::tqfromLatin1("isbn"); + const TQString pub = TQString::tqfromLatin1("publisher"); + const TQString rating = TQString::tqfromLatin1("rating"); + const TQString cover = TQString::tqfromLatin1("cover"); + const TQString comments = TQString::tqfromLatin1("comments"); // start with yaml files - dataDir.setNameFilter(TQString::fromLatin1("*.yaml")); + dataDir.setNameFilter(TQString::tqfromLatin1("*.yaml")); const TQStringList files = dataDir.entryList(); const uint numFiles = files.count(); const uint stepSize = TQMAX(s_stepSize, numFiles/100); @@ -69,9 +69,9 @@ Tellico::Data::CollPtr AlexandriaImporter::collection() { ProgressItem::Done done(this); TQStringList covers; - covers << TQString::fromLatin1(".cover") - << TQString::fromLatin1("_medium.jpg") - << TQString::fromLatin1("_small.jpg"); + covers << TQString::tqfromLatin1(".cover") + << TQString::tqfromLatin1("_medium.jpg") + << TQString::tqfromLatin1("_small.jpg"); TQTextStream ts; ts.setEncoding(TQTextStream::UnicodeUTF8); // YAML is always utf8? @@ -95,7 +95,7 @@ Tellico::Data::CollPtr AlexandriaImporter::collection() { readNextLine = true; } // skip the line that starts with --- - if(line.isEmpty() || line.startsWith(TQString::fromLatin1("---"))) { + if(line.isEmpty() || line.startsWith(TQString::tqfromLatin1("---"))) { continue; } if(line.endsWith(TQChar('\\'))) { @@ -117,13 +117,13 @@ Tellico::Data::CollPtr AlexandriaImporter::collection() { if(alexField == Latin1Literal("authors")) { TQStringList authors; line = ts.readLine(); - TQRegExp begin(TQString::fromLatin1("^\\s*-\\s+")); + TQRegExp begin(TQString::tqfromLatin1("^\\s*-\\s+")); while(!line.isNull() && line.find(begin) > -1) { line.remove(begin); authors += clean(line); line = ts.readLine(); } - entry->setField(author, authors.join(TQString::fromLatin1("; "))); + entry->setField(author, authors.join(TQString::tqfromLatin1("; "))); // the next line has already been read readNextLine = false; @@ -196,10 +196,10 @@ TQWidget* AlexandriaImporter::widget(TQWidget* parent_, const char* name_/*=0*/) label->setBuddy(m_library); // .alexandria might not exist - if(m_libraryDir.cd(TQString::fromLatin1(".alexandria"))) { + if(m_libraryDir.cd(TQString::tqfromLatin1(".alexandria"))) { TQStringList dirs = m_libraryDir.entryList(); - dirs.remove(TQString::fromLatin1(".")); // why can't I tell TQDir not to include these? TQDir::Hidden doesn't work - dirs.remove(TQString::fromLatin1("..")); + dirs.remove(TQString::tqfromLatin1(".")); // why can't I tell TQDir not to include these? TQDir::Hidden doesn't work + dirs.remove(TQString::tqfromLatin1("..")); m_library->insertStringList(dirs); } @@ -209,10 +209,10 @@ TQWidget* AlexandriaImporter::widget(TQWidget* parent_, const char* name_/*=0*/) } TQString& AlexandriaImporter::cleanLine(TQString& str_) { - static TQRegExp escRx(TQString::fromLatin1("\\\\x(\\w\\w)"), false); - str_.remove(TQString::fromLatin1("\\r")); - str_.replace(TQString::fromLatin1("\\n"), TQString::fromLatin1("\n")); - str_.replace(TQString::fromLatin1("\\t"), TQString::fromLatin1("\t")); + static TQRegExp escRx(TQString::tqfromLatin1("\\\\x(\\w\\w)"), false); + str_.remove(TQString::tqfromLatin1("\\r")); + str_.replace(TQString::tqfromLatin1("\\n"), TQString::tqfromLatin1("\n")); + str_.replace(TQString::tqfromLatin1("\\t"), TQString::tqfromLatin1("\t")); // YAML uses escape sequences like \xC3 int pos = escRx.search(str_); @@ -236,7 +236,7 @@ TQString& AlexandriaImporter::cleanLine(TQString& str_) { } TQString AlexandriaImporter::clean(TQString& str_) { - const TQRegExp quote(TQString::fromLatin1("\\\\\"")); // equals \" + const TQRegExp quote(TQString::tqfromLatin1("\\\\\"")); // equals \" if(str_.startsWith(TQChar('\'')) || str_.startsWith(TQChar('"'))) { str_.remove(0, 1); } @@ -244,7 +244,7 @@ TQString AlexandriaImporter::clean(TQString& str_) { str_.truncate(str_.length()-1); } // we ignore YAML tags, this is not actually a good parser, but will do for now - str_.remove(TQRegExp(TQString::fromLatin1("^![^\\s]*\\s+"))); + str_.remove(TQRegExp(TQString::tqfromLatin1("^![^\\s]*\\s+"))); return str_.replace(quote, TQChar('"')); } -- cgit v1.2.1