From 537ccfa7e6fcdcb613f2f83744b19fc28f83b79f Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 19 Dec 2011 11:57:28 -0600 Subject: Remove additional unneeded tq method conversions (cherry picked from commit dc07846059a60d069687585cc72ff501a2096296) --- libkcddb/cddbplookup.cpp | 16 ++++++++-------- libkcddb/cdinfo.cpp | 10 +++++----- libkcddb/cdinfoencodingwidget.cpp | 2 +- libkcddb/httplookup.cpp | 6 +++--- libkcddb/kcmcddb/cddbconfigwidgetbase.ui | 4 ++-- libkcddb/sites.cpp | 2 +- libkcddb/smtpsubmit.cpp | 2 +- libkcddb/submit.cpp | 4 ++-- 8 files changed, 23 insertions(+), 23 deletions(-) (limited to 'libkcddb') diff --git a/libkcddb/cddbplookup.cpp b/libkcddb/cddbplookup.cpp index db62cbae..839d2650 100644 --- a/libkcddb/cddbplookup.cpp +++ b/libkcddb/cddbplookup.cpp @@ -40,10 +40,10 @@ namespace KCDDB CDDBPLookup::sendHandshake() { TQString handshake = TQString( "cddb hello %1 %2 %3 %4" ) - .tqarg( user_ ) - .tqarg( localHostName_ ) - .tqarg( clientName() ) - .tqarg( clientVersion() ); + .arg( user_ ) + .arg( localHostName_ ) + .arg( clientName() ) + .arg( clientVersion() ); writeLine( handshake ); } @@ -58,8 +58,8 @@ namespace KCDDB CDDBPLookup::sendQuery() { TQString query = TQString( "cddb query %1 %2" ) - .tqarg( trackOffsetListToId() ) - .tqarg( trackOffsetListToString() ); + .arg( trackOffsetListToId() ) + .arg( trackOffsetListToString() ); writeLine( query ); } @@ -71,8 +71,8 @@ namespace KCDDB TQString discid = match.second; TQString readRequest = TQString( "cddb read %1 %2" ) - .tqarg( category_ ) - .tqarg( discid ); + .arg( category_ ) + .arg( discid ); writeLine( readRequest ); } diff --git a/libkcddb/cdinfo.cpp b/libkcddb/cdinfo.cpp index b140f103..43346b46 100644 --- a/libkcddb/cdinfo.cpp +++ b/libkcddb/cdinfo.cpp @@ -209,7 +209,7 @@ namespace KCDDB if (submit) { s += "#\n"; - s += TQString("# Submitted via: %1 %2\n").tqarg(CDDB::clientName(), + s += TQString("# Submitted via: %1 %2\n").arg(CDDB::clientName(), CDDB::clientVersion()); } @@ -220,7 +220,7 @@ namespace KCDDB for (uint i = 0; i < trackInfoList.count(); ++i) { - s += createLine(TQString("TTITLE%1").tqarg(i), + s += createLine(TQString("TTITLE%1").arg(i), escape( trackInfoList[ i ].title)); } @@ -228,7 +228,7 @@ namespace KCDDB for (uint i = 0; i < trackInfoList.count(); ++i) { - s += createLine(TQString("EXTT%1").tqarg(i), escape(trackInfoList[i].extt)); + s += createLine(TQString("EXTT%1").arg(i), escape(trackInfoList[i].extt)); } s +="PLAYORDER=\n"; @@ -251,11 +251,11 @@ namespace KCDDB while (tmpValue.length() > maxLength) { - lines += TQString("%1=%2\n").tqarg(name,tmpValue.left(maxLength)); + lines += TQString("%1=%2\n").arg(name,tmpValue.left(maxLength)); tmpValue = tmpValue.mid(maxLength); } - lines += TQString("%1=%2\n").tqarg(name,tmpValue); + lines += TQString("%1=%2\n").arg(name,tmpValue); return lines; } diff --git a/libkcddb/cdinfoencodingwidget.cpp b/libkcddb/cdinfoencodingwidget.cpp index f18bb95b..42d0e506 100644 --- a/libkcddb/cdinfoencodingwidget.cpp +++ b/libkcddb/cdinfoencodingwidget.cpp @@ -62,7 +62,7 @@ namespace KCDDB songsBox->clear(); songsBox->insertStringList(newTitles); - titleLabel->setText(i18n("artist - cdtitle", "%1 - %2").tqarg( + titleLabel->setText(i18n("artist - cdtitle", "%1 - %2").arg( codec->toUnicode(m_artist.latin1()), codec->toUnicode(m_title.latin1()))); } } diff --git a/libkcddb/httplookup.cpp b/libkcddb/httplookup.cpp index c3a942d3..461a9334 100644 --- a/libkcddb/httplookup.cpp +++ b/libkcddb/httplookup.cpp @@ -40,7 +40,7 @@ namespace KCDDB HTTPLookup::sendQuery() { TQString cmd = TQString( "cddb query %1 %2" ) - .tqarg( trackOffsetListToId(), trackOffsetListToString() ) ; + .arg( trackOffsetListToId(), trackOffsetListToString() ) ; makeURL( cmd ); Result result = fetchURL(); @@ -55,7 +55,7 @@ namespace KCDDB TQString discid = match.second; TQString cmd = TQString( "cddb read %1 %2" ) - .tqarg( category_, discid ); + .arg( category_, discid ); makeURL( cmd ); Result result = fetchURL(); @@ -83,7 +83,7 @@ namespace KCDDB cgiURL_.setQuery( TQString() ); TQString hello = TQString("%1 %2 %3 %4") - .tqarg(user_, localHostName_, clientName(), clientVersion()); + .arg(user_, localHostName_, clientName(), clientVersion()); cgiURL_.addQueryItem( "cmd", cmd ); cgiURL_.addQueryItem( "hello", hello ); diff --git a/libkcddb/kcmcddb/cddbconfigwidgetbase.ui b/libkcddb/kcmcddb/cddbconfigwidgetbase.ui index d70a63db..ad5fffb5 100644 --- a/libkcddb/kcmcddb/cddbconfigwidgetbase.ui +++ b/libkcddb/kcmcddb/cddbconfigwidgetbase.ui @@ -192,7 +192,7 @@ &Port: - + AlignVCenter|AlignRight @@ -397,7 +397,7 @@ Port: - + AlignVCenter|AlignRight diff --git a/libkcddb/sites.cpp b/libkcddb/sites.cpp index 18082587..16a7ac79 100644 --- a/libkcddb/sites.cpp +++ b/libkcddb/sites.cpp @@ -44,7 +44,7 @@ namespace KCDDB url.setQuery( TQString() ); TQString hello = TQString("%1 %2 %3 %4") - .tqarg(user_, localHostName_, clientName(), clientVersion()); + .arg(user_, localHostName_, clientName(), clientVersion()); url.addQueryItem( "cmd", "sites" ); url.addQueryItem( "hello", hello ); diff --git a/libkcddb/smtpsubmit.cpp b/libkcddb/smtpsubmit.cpp index 9733ee40..07f34b61 100644 --- a/libkcddb/smtpsubmit.cpp +++ b/libkcddb/smtpsubmit.cpp @@ -43,7 +43,7 @@ namespace KCDDB KIO::Job* SMTPSubmit::createJob(const CDInfo& cdInfo) { url_.setQuery(TQString("to=%1&subject=cddb %2 %3&from=%4") - .tqarg(to_, cdInfo.category, cdInfo.id, from_)); + .arg(to_, cdInfo.category, cdInfo.id, from_)); kdDebug(60010) << "Url is: " << url_.prettyURL() << endl; return KIO::storedPut(diskData_.utf8(), url_, -1, false, false, false); diff --git a/libkcddb/submit.cpp b/libkcddb/submit.cpp index 23f24f49..63a0951b 100644 --- a/libkcddb/submit.cpp +++ b/libkcddb/submit.cpp @@ -74,10 +74,10 @@ namespace KCDDB diskData_ += "# Track frame offsets:\n"; for (uint i=0; i < numTracks; i++) - diskData_ += TQString("#\t%1\n").tqarg(offsetList[i]); + diskData_ += TQString("#\t%1\n").arg(offsetList[i]); int l = offsetList[numTracks+1]/75; - diskData_ += TQString("# Disc length: %1 seconds\n").tqarg(l); + diskData_ += TQString("# Disc length: %1 seconds\n").arg(l); diskData_ += cdInfo.toString(true); -- cgit v1.2.1