summaryrefslogtreecommitdiffstats
path: root/kioslave/audiocd/audiocd.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-15 15:49:11 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-15 15:49:11 -0600
commit83fbc82a101309e171089f0d5ed080f82a367345 (patch)
treec7b61083b6e2d4bfceaace9a7f018181ea36afec /kioslave/audiocd/audiocd.cpp
parentb248983f92b865ef74636ab5a673ae3a88f79c20 (diff)
downloadtdemultimedia-83fbc82a101309e171089f0d5ed080f82a367345.tar.gz
tdemultimedia-83fbc82a101309e171089f0d5ed080f82a367345.zip
Rename a number of old tq methods that are no longer tq specific
Diffstat (limited to 'kioslave/audiocd/audiocd.cpp')
-rw-r--r--kioslave/audiocd/audiocd.cpp26
1 files changed, 13 insertions, 13 deletions
diff --git a/kioslave/audiocd/audiocd.cpp b/kioslave/audiocd/audiocd.cpp
index 5c2068b5..c41a6543 100644
--- a/kioslave/audiocd/audiocd.cpp
+++ b/kioslave/audiocd/audiocd.cpp
@@ -59,7 +59,7 @@ extern "C"
using namespace KIO;
using namespace KCDDB;
-#define TQFL1(x) TQString::tqfromLatin1(x)
+#define TQFL1(x) TQString::fromLatin1(x)
#define DEFAULT_CD_DEVICE "/dev/cdrom"
#define CDDB_INFORMATION "CDDB Information"
@@ -251,9 +251,9 @@ struct cdrom_drive * AudioCDProtocol::initRequest(const KURL & url)
// circumstances, so build a representation from
// the unit number and SCSI device name.
//
- TQString devname = TQString::tqfromLatin1( "/dev/%1%2" )
- .tqarg( drive->dev->given_dev_name )
- .tqarg( drive->dev->given_unit_number ) ;
+ TQString devname = TQString::fromLatin1( "/dev/%1%2" )
+ .arg( drive->dev->given_dev_name )
+ .arg( drive->dev->given_unit_number ) ;
kdDebug(7117) << " Using derived name " << devname << endl;
d->cd.setDevice( devname );
}
@@ -399,7 +399,7 @@ void AudioCDProtocol::get(const KURL & url)
if( d->fname.contains(i18n(CDDB_INFORMATION))){
uint choice = 1;
- if(d->fname != TQString("%1.txt").tqarg(i18n(CDDB_INFORMATION))){
+ if(d->fname != TQString("%1.txt").arg(i18n(CDDB_INFORMATION))){
choice= d->fname.section('_',1,1).section('.',0,0).toInt();
}
uint count = 1;
@@ -610,15 +610,15 @@ void AudioCDProtocol::listDir(const KURL & url)
for ( it = d->cddbList.begin(); it != d->cddbList.end(); ++it ){
(*it).toString();
if(count == 1)
- app_file(entry, TQString("%1.txt").tqarg(i18n(CDDB_INFORMATION)), ((*it).toString().length())+1);
+ app_file(entry, TQString("%1.txt").arg(i18n(CDDB_INFORMATION)), ((*it).toString().length())+1);
else
- app_file(entry, TQString("%1_%2.txt").tqarg(i18n(CDDB_INFORMATION)).tqarg(count), ((*it).toString().length())+1);
+ app_file(entry, TQString("%1_%2.txt").arg(i18n(CDDB_INFORMATION)).arg(count), ((*it).toString().length())+1);
count++;
listEntry(entry, false);
}
// Error
if( count == 1 ) {
- app_file(entry, TQString("%1: %2.txt").tqarg(i18n(CDDB_INFORMATION)).tqarg(CDDB::resultToString(d->cddbResult)), ((*it).toString().length())+1);
+ app_file(entry, TQString("%1: %2.txt").arg(i18n(CDDB_INFORMATION)).arg(CDDB::resultToString(d->cddbResult)), ((*it).toString().length())+1);
count++;
listEntry(entry, false);
}
@@ -838,7 +838,7 @@ void AudioCDProtocol::paranoiaRead(
if (0 == buf) {
kdDebug(7117) << "Unrecoverable error in paranoia_read" << endl;
ok = false;
- error( ERR_SLAVE_DEFINED, i18n( "Error reading audio data for %1 from the CD" ).tqarg( fileName ) );
+ error( ERR_SLAVE_DEFINED, i18n( "Error reading audio data for %1 from the CD" ).arg( fileName ) );
break;
}
@@ -848,7 +848,7 @@ void AudioCDProtocol::paranoiaRead(
if(encoderProcessed == -1){
kdDebug(7117) << "Encoder processing error, stopping." << endl;
ok = false;
- TQString errMsg = i18n( "Couldn't read %1: encoding failed" ).tqarg( fileName );
+ TQString errMsg = i18n( "Couldn't read %1: encoding failed" ).arg( fileName );
TQString details = encoder->lastErrorMessage();
if ( !details.isEmpty() )
errMsg += "\n" + details;
@@ -926,7 +926,7 @@ void AudioCDProtocol::paranoiaRead(
processedSize(processed);
}
else if ( ok ) // i.e. no error message already emitted
- error( ERR_SLAVE_DEFINED, i18n( "Couldn't read %1: encoding failed" ).tqarg( fileName ) );
+ error( ERR_SLAVE_DEFINED, i18n( "Couldn't read %1: encoding failed" ).arg( fileName ) );
paranoia_free(paranoia);
paranoia = 0;
@@ -1058,7 +1058,7 @@ void AudioCDProtocol::generateTemplateTitles()
{
for (unsigned int i = 0; i < d->tracks; i++){
TQString n;
- d->templateTitles.append( i18n("Track %1").tqarg(n.sprintf("%02d", i + 1)));
+ d->templateTitles.append( i18n("Track %1").arg(n.sprintf("%02d", i + 1)));
}
return;
}
@@ -1076,7 +1076,7 @@ void AudioCDProtocol::generateTemplateTitles()
macros["title"] = (info.trackInfoList[i].title);
TQString n;
macros["number"] = n.sprintf("%02d", i + 1);
- //macros["number"] = TQString("%1").tqarg(i+1, 2, 10);
+ //macros["number"] = TQString("%1").arg(i+1, 2, 10);
macros["genre"] = info.genre;
macros["year"] = TQString::number(info.year);