diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-19 11:41:14 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-19 11:41:14 -0600 |
commit | 26f93a7d9105483b49ae930545ddb2873156fa8e (patch) | |
tree | bd208384438ff06193cc1a0a1548a9d69a83cd41 /src/fetch | |
parent | 8d9b90ca794ffabf151719c2edebe9278a2d3f36 (diff) | |
download | tellico-26f93a7d9105483b49ae930545ddb2873156fa8e.tar.gz tellico-26f93a7d9105483b49ae930545ddb2873156fa8e.zip |
Remove additional unneeded tq method conversions
Diffstat (limited to 'src/fetch')
-rw-r--r-- | src/fetch/amazonfetcher.cpp | 8 | ||||
-rw-r--r-- | src/fetch/animenfofetcher.cpp | 4 | ||||
-rw-r--r-- | src/fetch/arxivfetcher.cpp | 10 | ||||
-rw-r--r-- | src/fetch/bibsonomyfetcher.cpp | 6 | ||||
-rw-r--r-- | src/fetch/citebasefetcher.cpp | 4 | ||||
-rw-r--r-- | src/fetch/crossreffetcher.cpp | 8 | ||||
-rw-r--r-- | src/fetch/discogsfetcher.cpp | 6 | ||||
-rw-r--r-- | src/fetch/entrezfetcher.cpp | 4 | ||||
-rw-r--r-- | src/fetch/execexternalfetcher.cpp | 2 | ||||
-rw-r--r-- | src/fetch/fetchmanager.cpp | 4 | ||||
-rw-r--r-- | src/fetch/gcstarpluginfetcher.cpp | 2 | ||||
-rw-r--r-- | src/fetch/googlescholarfetcher.cpp | 6 | ||||
-rw-r--r-- | src/fetch/ibsfetcher.cpp | 8 | ||||
-rw-r--r-- | src/fetch/imdbfetcher.cpp | 4 | ||||
-rw-r--r-- | src/fetch/isbndbfetcher.cpp | 4 | ||||
-rw-r--r-- | src/fetch/srufetcher.cpp | 2 | ||||
-rw-r--r-- | src/fetch/yahoofetcher.cpp | 4 | ||||
-rw-r--r-- | src/fetch/z3950connection.cpp | 4 | ||||
-rw-r--r-- | src/fetch/z3950fetcher.cpp | 2 |
19 files changed, 46 insertions, 46 deletions
diff --git a/src/fetch/amazonfetcher.cpp b/src/fetch/amazonfetcher.cpp index 56e21b4..1633f60 100644 --- a/src/fetch/amazonfetcher.cpp +++ b/src/fetch/amazonfetcher.cpp @@ -189,7 +189,7 @@ void AmazonFetcher::doSearch() { case Data::Collection::Base: case Data::Collection::Card: default: - message(i18n("%1 does not allow searching for this collection type.").tqarg(source()), MessageHandler::Warning); + message(i18n("%1 does not allow searching for this collection type.").arg(source()), MessageHandler::Warning); stop(); return; } @@ -219,7 +219,7 @@ void AmazonFetcher::doSearch() { } else if(type == Data::Collection::Game) { u.addQueryItem(TQString::fromLatin1("Manufacturer"), value, mib); } else { // books and bibtex - TQString s = TQString::fromLatin1("author:%1 or publisher:%2").tqarg(value, value); + TQString s = TQString::fromLatin1("author:%1 or publisher:%2").arg(value, value); // u.addQueryItem(TQString::fromLatin1("Author"), value, mib); // u.addQueryItem(TQString::fromLatin1("Publisher"), value, mib); u.addQueryItem(TQString::fromLatin1("Power"), s, mib); @@ -357,7 +357,7 @@ void AmazonFetcher::slotComplete(KIO::Job* job_) { #if 0 kdWarning() << "Remove debug from amazonfetcher.cpp" << endl; - TQFile f(TQString::fromLatin1("/tmp/test%1.xml").tqarg(m_page)); + TQFile f(TQString::fromLatin1("/tmp/test%1.xml").arg(m_page)); if(f.open(IO_WriteOnly)) { TQTextStream t(&f); t.setEncoding(TQTextStream::UnicodeUTF8); @@ -559,7 +559,7 @@ void AmazonFetcher::slotComplete(KIO::Job* job_) { const int currentTotal = TQMIN(m_total, m_limit); if(m_page * AMAZON_RETURNS_PER_REQUEST < currentTotal) { int foundCount = (m_page-1) * AMAZON_RETURNS_PER_REQUEST + coll->entryCount(); - message(i18n("Results from %1: %2/%3").tqarg(source()).tqarg(foundCount).tqarg(m_total), MessageHandler::Status); + message(i18n("Results from %1: %2/%3").arg(source()).arg(foundCount).arg(m_total), MessageHandler::Status); ++m_page; m_countOffset = 0; doSearch(); diff --git a/src/fetch/animenfofetcher.cpp b/src/fetch/animenfofetcher.cpp index 98e30c0..43516b8 100644 --- a/src/fetch/animenfofetcher.cpp +++ b/src/fetch/animenfofetcher.cpp @@ -72,7 +72,7 @@ void AnimeNfoFetcher::search(FetchKey key_, const TQString& value_) { u.addQueryItem(TQString::fromLatin1("queryin"), TQString::fromLatin1("anime_titles")); if(!canFetch(Kernel::self()->collectionType())) { - message(i18n("%1 does not allow searching for this collection type.").tqarg(source()), MessageHandler::Warning); + message(i18n("%1 does not allow searching for this collection type.").arg(source()), MessageHandler::Warning); stop(); return; } @@ -316,7 +316,7 @@ Tellico::Data::EntryPtr AnimeNfoFetcher::parseEntry(const TQString& str_) { // image TQRegExp imgRx(TQString::fromLatin1("<img\\s+[^>]*src\\s*=\\s*[\"']([^>]*)[\"']\\s+[^>]*alt\\s*=\\s*[\"']%1[\"']") - .tqarg(entry->field(TQString::fromLatin1("title"))), false); + .arg(entry->field(TQString::fromLatin1("title"))), false); imgRx.setMinimal(true); int pos = imgRx.search(s); if(pos > -1) { diff --git a/src/fetch/arxivfetcher.cpp b/src/fetch/arxivfetcher.cpp index 795db25..377df34 100644 --- a/src/fetch/arxivfetcher.cpp +++ b/src/fetch/arxivfetcher.cpp @@ -80,7 +80,7 @@ void ArxivFetcher::continueSearch() { void ArxivFetcher::doSearch() { if(!canFetch(Kernel::self()->collectionType())) { - message(i18n("%1 does not allow searching for this collection type.").tqarg(source()), MessageHandler::Warning); + message(i18n("%1 does not allow searching for this collection type.").arg(source()), MessageHandler::Warning); stop(); return; } @@ -258,16 +258,16 @@ KURL ArxivFetcher::searchURL(FetchKey key_, const TQString& value_) const { TQString quotedValue = '"' + value_ + '"'; switch(key_) { case Title: - u.addQueryItem(TQString::fromLatin1("search_query"), TQString::fromLatin1("ti:%1").tqarg(quotedValue)); + u.addQueryItem(TQString::fromLatin1("search_query"), TQString::fromLatin1("ti:%1").arg(quotedValue)); break; case Person: - u.addQueryItem(TQString::fromLatin1("search_query"), TQString::fromLatin1("au:%1").tqarg(quotedValue)); + u.addQueryItem(TQString::fromLatin1("search_query"), TQString::fromLatin1("au:%1").arg(quotedValue)); break; case Keyword: // keyword gets to use all the words without being quoted - u.addQueryItem(TQString::fromLatin1("search_query"), TQString::fromLatin1("all:%1").tqarg(value_)); + u.addQueryItem(TQString::fromLatin1("search_query"), TQString::fromLatin1("all:%1").arg(value_)); break; case ArxivID: @@ -276,7 +276,7 @@ KURL ArxivFetcher::searchURL(FetchKey key_, const TQString& value_) const { TQString value = value_; value.remove(TQRegExp(TQString::fromLatin1("^arxiv:"), false)); value.remove(TQRegExp(TQString::fromLatin1("v\\d+$"))); - u.addQueryItem(TQString::fromLatin1("search_query"), TQString::fromLatin1("id:%1").tqarg(value)); + u.addQueryItem(TQString::fromLatin1("search_query"), TQString::fromLatin1("id:%1").arg(value)); } break; diff --git a/src/fetch/bibsonomyfetcher.cpp b/src/fetch/bibsonomyfetcher.cpp index 3467a2d..4ce1cd4 100644 --- a/src/fetch/bibsonomyfetcher.cpp +++ b/src/fetch/bibsonomyfetcher.cpp @@ -63,7 +63,7 @@ void BibsonomyFetcher::search(FetchKey key_, const TQString& value_) { m_started = true; if(!canFetch(Kernel::self()->collectionType())) { - message(i18n("%1 does not allow searching for this collection type.").tqarg(source()), MessageHandler::Warning); + message(i18n("%1 does not allow searching for this collection type.").arg(source()), MessageHandler::Warning); stop(); return; } @@ -160,11 +160,11 @@ KURL BibsonomyFetcher::searchURL(FetchKey key_, const TQString& value_) const { switch(key_) { case Person: - u.addPath(TQString::fromLatin1("author/%1").tqarg(value_)); + u.addPath(TQString::fromLatin1("author/%1").arg(value_)); break; case Keyword: - u.addPath(TQString::fromLatin1("search/%1").tqarg(value_)); + u.addPath(TQString::fromLatin1("search/%1").arg(value_)); break; default: diff --git a/src/fetch/citebasefetcher.cpp b/src/fetch/citebasefetcher.cpp index df09d2d..adc855d 100644 --- a/src/fetch/citebasefetcher.cpp +++ b/src/fetch/citebasefetcher.cpp @@ -64,7 +64,7 @@ void CitebaseFetcher::search(FetchKey key_, const TQString& value_) { m_started = true; if(!canFetch(Kernel::self()->collectionType())) { - message(i18n("%1 does not allow searching for this collection type.").tqarg(source()), MessageHandler::Warning); + message(i18n("%1 does not allow searching for this collection type.").arg(source()), MessageHandler::Warning); stop(); return; } @@ -176,7 +176,7 @@ KURL CitebaseFetcher::searchURL(FetchKey key_, const TQString& value_) const { TQString value = value_; value.remove(TQRegExp(TQString::fromLatin1("^arxiv:"), false)); value.remove(TQRegExp(TQString::fromLatin1("v\\d+$"))); - u.addQueryItem(TQString::fromLatin1("rft_id"), TQString::fromLatin1("oai:arXiv.org:%1").tqarg(value)); + u.addQueryItem(TQString::fromLatin1("rft_id"), TQString::fromLatin1("oai:arXiv.org:%1").arg(value)); } break; diff --git a/src/fetch/crossreffetcher.cpp b/src/fetch/crossreffetcher.cpp index fc75250..dd0acb2 100644 --- a/src/fetch/crossreffetcher.cpp +++ b/src/fetch/crossreffetcher.cpp @@ -82,13 +82,13 @@ void CrossRefFetcher::search(FetchKey key_, const TQString& value_) { m_started = true; if(m_user.isEmpty() || m_password.isEmpty()) { - message(i18n("%1 requires a username and password.").tqarg(source()), MessageHandler::Warning); + message(i18n("%1 requires a username and password.").arg(source()), MessageHandler::Warning); stop(); return; } if(!canFetch(Kernel::self()->collectionType())) { - message(i18n("%1 does not allow searching for this collection type.").tqarg(source()), MessageHandler::Warning); + message(i18n("%1 does not allow searching for this collection type.").arg(source()), MessageHandler::Warning); stop(); return; } @@ -250,11 +250,11 @@ KURL CrossRefFetcher::searchURL(FetchKey key_, const TQString& value_) const { #ifdef CROSSREF_USE_UNIXREF u.addQueryItem(TQString::fromLatin1("format"), TQString::fromLatin1("unixref")); #endif - u.addQueryItem(TQString::fromLatin1("req_dat"), TQString::fromLatin1("ourl_%1:%2").tqarg(m_user, m_password)); + u.addQueryItem(TQString::fromLatin1("req_dat"), TQString::fromLatin1("ourl_%1:%2").arg(m_user, m_password)); switch(key_) { case DOI: - u.addQueryItem(TQString::fromLatin1("rft_id"), TQString::fromLatin1("info:doi/%1").tqarg(value_)); + u.addQueryItem(TQString::fromLatin1("rft_id"), TQString::fromLatin1("info:doi/%1").arg(value_)); break; default: diff --git a/src/fetch/discogsfetcher.cpp b/src/fetch/discogsfetcher.cpp index 5260794..2d3384b 100644 --- a/src/fetch/discogsfetcher.cpp +++ b/src/fetch/discogsfetcher.cpp @@ -94,7 +94,7 @@ void DiscogsFetcher::doSearch() { u.addQueryItem(TQString::fromLatin1("api_key"), m_apiKey); if(!canFetch(Kernel::self()->collectionType())) { - message(i18n("%1 does not allow searching for this collection type.").tqarg(source()), MessageHandler::Warning); + message(i18n("%1 does not allow searching for this collection type.").arg(source()), MessageHandler::Warning); stop(); return; } @@ -107,7 +107,7 @@ void DiscogsFetcher::doSearch() { break; case Person: - u.setPath(TQString::fromLatin1("/artist/%1").tqarg(m_value)); + u.setPath(TQString::fromLatin1("/artist/%1").arg(m_value)); break; case Keyword: @@ -256,7 +256,7 @@ Tellico::Data::EntryPtr DiscogsFetcher::fetchEntry(uint uid_) { KURL u(TQString::fromLatin1("/home/robby/discogs-release.xml")); #else KURL u(TQString::fromLatin1(DISCOGS_API_URL)); - u.setPath(TQString::fromLatin1("/release/%1").tqarg(release)); + u.setPath(TQString::fromLatin1("/release/%1").arg(release)); u.addQueryItem(TQString::fromLatin1("f"), TQString::fromLatin1("xml")); u.addQueryItem(TQString::fromLatin1("api_key"), m_apiKey); #endif diff --git a/src/fetch/entrezfetcher.cpp b/src/fetch/entrezfetcher.cpp index 9c83f7c..0d38009 100644 --- a/src/fetch/entrezfetcher.cpp +++ b/src/fetch/entrezfetcher.cpp @@ -270,7 +270,7 @@ void EntrezFetcher::summaryResults() { return; } // top child is eSummaryResult - // all tqchildren are DocSum + // all children are DocSum for(TQDomNode n = dom.documentElement().firstChild(); !n.isNull(); n = n.nextSibling()) { TQDomElement e = n.toElement(); if(e.isNull() || e.tagName() != Latin1Literal("DocSum")) { @@ -292,7 +292,7 @@ void EntrezFetcher::summaryResults() { } else if(nodes.item(j).toElement().attribute(TQString::fromLatin1("Name")) == Latin1Literal("AuthorList")) { TQStringList list; for(TQDomNode aNode = nodes.item(j).firstChild(); !aNode.isNull(); aNode = aNode.nextSibling()) { - // lazy, assume all tqchildren Items are authors + // lazy, assume all children Items are authors if(aNode.nodeName() == Latin1Literal("Item")) { list << aNode.toElement().text(); } diff --git a/src/fetch/execexternalfetcher.cpp b/src/fetch/execexternalfetcher.cpp index 0aeecbe..aecdb49 100644 --- a/src/fetch/execexternalfetcher.cpp +++ b/src/fetch/execexternalfetcher.cpp @@ -146,7 +146,7 @@ void ExecExternalFetcher::search(FetchKey key_, const TQString& value_) { TQString args = m_args[key_]; TQRegExp rx2(TQString::fromLatin1("['\"]%1\\1")); args.replace(rx2, TQString::fromLatin1("%1")); - startSearch(parseArguments(args.tqarg(value))); // replace %1 with search value + startSearch(parseArguments(args.arg(value))); // replace %1 with search value } void ExecExternalFetcher::startSearch(const TQStringList& args_) { diff --git a/src/fetch/fetchmanager.cpp b/src/fetch/fetchmanager.cpp index 449a6e9..4a64052 100644 --- a/src/fetch/fetchmanager.cpp +++ b/src/fetch/fetchmanager.cpp @@ -98,7 +98,7 @@ void Manager::loadFetchers() { KConfigGroup configGroup(config, TQString::fromLatin1("Data Sources")); int nSources = configGroup.readNumEntry("Sources Count", 0); for(int i = 0; i < nSources; ++i) { - TQString group = TQString::fromLatin1("Data Source %1").tqarg(i); + TQString group = TQString::fromLatin1("Data Source %1").arg(i); Fetcher::Ptr f = createFetcher(config, group); if(f) { m_configMap.insert(f, group); @@ -374,7 +374,7 @@ Tellico::Fetch::FetcherVec Manager::createUpdateFetchers(int collType_) { KConfigGroup config(KGlobal::config(), "Data Sources"); int nSources = config.readNumEntry("Sources Count", 0); for(int i = 0; i < nSources; ++i) { - TQString group = TQString::fromLatin1("Data Source %1").tqarg(i); + TQString group = TQString::fromLatin1("Data Source %1").arg(i); // needs the KConfig* Fetcher::Ptr f = createFetcher(KGlobal::config(), group); if(f && f->canFetch(collType_) && f->canUpdate()) { diff --git a/src/fetch/gcstarpluginfetcher.cpp b/src/fetch/gcstarpluginfetcher.cpp index 8c274a7..d28d4fc 100644 --- a/src/fetch/gcstarpluginfetcher.cpp +++ b/src/fetch/gcstarpluginfetcher.cpp @@ -61,7 +61,7 @@ GCstarPluginFetcher::PluginList GCstarPluginFetcher::plugins(int collType_) { int x = versionRx.cap(1).toInt(); int y = versionRx.cap(2).toInt(); int z = versionRx.cap(3).toInt(); // ok to be empty - myDebug() << TQString::fromLatin1("GCstarPluginFetcher() - found %1.%2.%3").tqarg(x).tqarg(y).tqarg(z) << endl; + myDebug() << TQString::fromLatin1("GCstarPluginFetcher() - found %1.%2.%3").arg(x).arg(y).arg(z) << endl; // --list-plugins argument was added for 1.3 release pluginParse = (x >= 1 && y >=3) ? New : Old; } diff --git a/src/fetch/googlescholarfetcher.cpp b/src/fetch/googlescholarfetcher.cpp index b7868bd..83730e7 100644 --- a/src/fetch/googlescholarfetcher.cpp +++ b/src/fetch/googlescholarfetcher.cpp @@ -85,7 +85,7 @@ void GoogleScholarFetcher::doSearch() { // myDebug() << "GoogleScholarFetcher::search() - value = " << value_ << endl; if(!canFetch(Kernel::self()->collectionType())) { - message(i18n("%1 does not allow searching for this collection type.").tqarg(source()), MessageHandler::Warning); + message(i18n("%1 does not allow searching for this collection type.").arg(source()), MessageHandler::Warning); stop(); return; } @@ -95,7 +95,7 @@ void GoogleScholarFetcher::doSearch() { switch(m_key) { case Title: - u.addQueryItem(TQString::fromLatin1("q"), TQString::fromLatin1("allintitle:%1").tqarg(m_value)); + u.addQueryItem(TQString::fromLatin1("q"), TQString::fromLatin1("allintitle:%1").arg(m_value)); break; case Keyword: @@ -103,7 +103,7 @@ void GoogleScholarFetcher::doSearch() { break; case Person: - u.addQueryItem(TQString::fromLatin1("q"), TQString::fromLatin1("author:%1").tqarg(m_value)); + u.addQueryItem(TQString::fromLatin1("q"), TQString::fromLatin1("author:%1").arg(m_value)); break; default: diff --git a/src/fetch/ibsfetcher.cpp b/src/fetch/ibsfetcher.cpp index 3c3d82e..2985c57 100644 --- a/src/fetch/ibsfetcher.cpp +++ b/src/fetch/ibsfetcher.cpp @@ -69,7 +69,7 @@ void IBSFetcher::search(FetchKey key_, const TQString& value_) { KURL u(TQString::fromLatin1(IBS_BASE_URL)); if(!canFetch(Kernel::self()->collectionType())) { - message(i18n("%1 does not allow searching for this collection type.").tqarg(source()), MessageHandler::Warning); + message(i18n("%1 does not allow searching for this collection type.").arg(source()), MessageHandler::Warning); stop(); return; } @@ -305,7 +305,7 @@ Tellico::Data::EntryPtr IBSFetcher::parseEntry(const TQString& str_) { Data::EntryPtr entry = new Data::Entry(coll); for(TQMap<TQString, TQString>::Iterator it = fieldMap.begin(); it != fieldMap.end(); ++it) { - TQRegExp infoRx(pat.tqarg(it.key())); + TQRegExp infoRx(pat.arg(it.key())); pos = infoRx.search(str_); if(pos > -1) { if(it.data() == Latin1Literal("edition")) { @@ -326,14 +326,14 @@ Tellico::Data::EntryPtr IBSFetcher::parseEntry(const TQString& str_) { if(!isbn.isEmpty()) { entry->setField(TQString::fromLatin1("isbn"), isbn); #if 1 - TQString imgURL = TQString::fromLatin1("http://giotto.ibs.it/cop/copt13.asp?f=%1").tqarg(isbn); + TQString imgURL = TQString::fromLatin1("http://giotto.ibs.it/cop/copt13.asp?f=%1").arg(isbn); myLog() << "IBSFetcher() - cover = " << imgURL << endl; TQString id = ImageFactory::addImage(imgURL, true, TQString::fromLatin1("http://internetbookshop.it")); if(!id.isEmpty()) { entry->setField(TQString::fromLatin1("cover"), id); } #else - TQRegExp imgRx(TQString::fromLatin1("<img\\s+[^>]*\\s*src\\s*=\\s*\"(http://[^/]*\\.ibs\\.it/[^\"]+e=%1)").tqarg(isbn)); + TQRegExp imgRx(TQString::fromLatin1("<img\\s+[^>]*\\s*src\\s*=\\s*\"(http://[^/]*\\.ibs\\.it/[^\"]+e=%1)").arg(isbn)); imgRx.setMinimal(true); pos = imgRx.search(str_); if(pos > -1) { diff --git a/src/fetch/imdbfetcher.cpp b/src/fetch/imdbfetcher.cpp index 2d8ac4d..8880df9 100644 --- a/src/fetch/imdbfetcher.cpp +++ b/src/fetch/imdbfetcher.cpp @@ -538,7 +538,7 @@ void IMDBFetcher::parseMultipleNameResults() { } nameMap.insert(s, nameMap[s] + 1); // check for duplicate names - s += TQString::fromLatin1("(%1) ").tqarg(nameMap[s]); + s += TQString::fromLatin1("(%1) ").arg(nameMap[s]); } else { nameMap.insert(s, 1); } @@ -561,7 +561,7 @@ void IMDBFetcher::parseMultipleNameResults() { } nameMap.insert(s, nameMap[s] + 1); // check for duplicate names - s += TQString::fromLatin1(" (%1)").tqarg(nameMap[s]); + s += TQString::fromLatin1(" (%1)").arg(nameMap[s]); } else { nameMap.insert(s, 1); } diff --git a/src/fetch/isbndbfetcher.cpp b/src/fetch/isbndbfetcher.cpp index 570eed7..cc4dcb2 100644 --- a/src/fetch/isbndbfetcher.cpp +++ b/src/fetch/isbndbfetcher.cpp @@ -76,7 +76,7 @@ void ISBNdbFetcher::search(FetchKey key_, const TQString& value_) { m_countOffset = 0; if(!canFetch(Kernel::self()->collectionType())) { - message(i18n("%1 does not allow searching for this collection type.").tqarg(source()), MessageHandler::Warning); + message(i18n("%1 does not allow searching for this collection type.").arg(source()), MessageHandler::Warning); stop(); return; } @@ -244,7 +244,7 @@ void ISBNdbFetcher::slotComplete(KIO::Job* job_) { const int currentTotal = TQMIN(m_total, m_limit); if(m_page * ISBNDB_RETURNS_PER_REQUEST < currentTotal) { int foundCount = (m_page-1) * ISBNDB_RETURNS_PER_REQUEST + coll->entryCount(); - message(i18n("Results from %1: %2/%3").tqarg(source()).tqarg(foundCount).tqarg(m_total), MessageHandler::Status); + message(i18n("Results from %1: %2/%3").arg(source()).arg(foundCount).arg(m_total), MessageHandler::Status); ++m_page; m_countOffset = 0; doSearch(); diff --git a/src/fetch/srufetcher.cpp b/src/fetch/srufetcher.cpp index f412ace..24d9ec0 100644 --- a/src/fetch/srufetcher.cpp +++ b/src/fetch/srufetcher.cpp @@ -453,7 +453,7 @@ SRUConfigWidget::SRUConfigWidget(TQWidget* parent_, const SRUFetcher* fetcher_ / m_portSpinBox = new KIntSpinBox(0, 999999, 1, SRU_DEFAULT_PORT, 10, optionsWidget()); connect(m_portSpinBox, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotSetModified())); l->addWidget(m_portSpinBox, row, 1); - w = i18n("Enter the port number of the server. The default is %1.").tqarg(SRU_DEFAULT_PORT); + w = i18n("Enter the port number of the server. The default is %1.").arg(SRU_DEFAULT_PORT); TQWhatsThis::add(label, w); TQWhatsThis::add(m_portSpinBox, w); label->setBuddy(m_portSpinBox); diff --git a/src/fetch/yahoofetcher.cpp b/src/fetch/yahoofetcher.cpp index b54aae9..4637b26 100644 --- a/src/fetch/yahoofetcher.cpp +++ b/src/fetch/yahoofetcher.cpp @@ -91,7 +91,7 @@ void YahooFetcher::doSearch() { u.addQueryItem(TQString::fromLatin1("results"), TQString::number(YAHOO_MAX_RETURNS_TOTAL)); if(!canFetch(Kernel::self()->collectionType())) { - message(i18n("%1 does not allow searching for this collection type.").tqarg(source()), MessageHandler::Warning); + message(i18n("%1 does not allow searching for this collection type.").arg(source()), MessageHandler::Warning); stop(); return; } @@ -237,7 +237,7 @@ Tellico::Data::EntryPtr YahooFetcher::fetchEntry(uint uid_) { TQString id = ImageFactory::addImage(imageURL, true); if(id.isEmpty()) { // rich text causes tqlayout issues -// emit signalStatus(i18n("<qt>The cover image for <i>%1</i> could not be loaded.</qt>").tqarg( +// emit signalStatus(i18n("<qt>The cover image for <i>%1</i> could not be loaded.</qt>").arg( // entry->field(TQString::fromLatin1("title")))); message(i18n("The cover image could not be loaded."), MessageHandler::Warning); } else { diff --git a/src/fetch/z3950connection.cpp b/src/fetch/z3950connection.cpp index f5a7c09..7817762 100644 --- a/src/fetch/z3950connection.cpp +++ b/src/fetch/z3950connection.cpp @@ -170,7 +170,7 @@ void Z3950Connection::run() { ZOOM_query_destroy(query); m_connected = false; - TQString s = i18n("Connection search error %1: %2").tqarg(errcode).tqarg(toString(errmsg)); + TQString s = i18n("Connection search error %1: %2").arg(errcode).arg(toString(errmsg)); if(!TQCString(addinfo).isEmpty()) { s += " (" + toString(addinfo) + ")"; } @@ -342,7 +342,7 @@ bool Z3950Connection::makeConnection() { ZOOM_connection_destroy(d->conn); m_connected = false; - TQString s = i18n("Connection error %1: %2").tqarg(errcode).tqarg(toString(errmsg)); + TQString s = i18n("Connection error %1: %2").arg(errcode).arg(toString(errmsg)); if(!TQCString(addinfo).isEmpty()) { s += " (" + toString(addinfo) + ")"; } diff --git a/src/fetch/z3950fetcher.cpp b/src/fetch/z3950fetcher.cpp index e553647..7b6ac24 100644 --- a/src/fetch/z3950fetcher.cpp +++ b/src/fetch/z3950fetcher.cpp @@ -541,7 +541,7 @@ Z3950Fetcher::ConfigWidget::ConfigWidget(TQWidget* parent_, const Z3950Fetcher* m_portSpinBox = new KIntSpinBox(0, 999999, 1, Z3950_DEFAULT_PORT, 10, optionsWidget()); connect(m_portSpinBox, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotSetModified())); l->addWidget(m_portSpinBox, row, 1); - w = i18n("Enter the port number of the server. The default is %1.").tqarg(Z3950_DEFAULT_PORT); + w = i18n("Enter the port number of the server. The default is %1.").arg(Z3950_DEFAULT_PORT); TQWhatsThis::add(label, w); TQWhatsThis::add(m_portSpinBox, w); label->setBuddy(m_portSpinBox); |