From 83fbc82a101309e171089f0d5ed080f82a367345 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 15 Dec 2011 15:49:11 -0600 Subject: Rename a number of old tq methods that are no longer tq specific --- kioslave/audiocd/audiocd.cpp | 26 +++++++++++----------- kioslave/audiocd/kcmaudiocd/audiocdconfig.ui | 18 +++++++-------- kioslave/audiocd/kcmaudiocd/kcmaudiocd.cpp | 2 +- kioslave/audiocd/plugins/flac/encoderflac.cpp | 2 +- kioslave/audiocd/plugins/lame/encoderlame.cpp | 24 ++++++++++---------- kioslave/audiocd/plugins/lame/encoderlameconfig.ui | 6 ++--- .../audiocd/plugins/vorbis/encodervorbisconfig.ui | 2 +- 7 files changed, 40 insertions(+), 40 deletions(-) (limited to 'kioslave') 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); diff --git a/kioslave/audiocd/kcmaudiocd/audiocdconfig.ui b/kioslave/audiocd/kcmaudiocd/audiocdconfig.ui index 448749a9..df27fffb 100644 --- a/kioslave/audiocd/kcmaudiocd/audiocdconfig.ui +++ b/kioslave/audiocd/kcmaudiocd/audiocdconfig.ui @@ -63,7 +63,7 @@ Expanding - + 20 210 @@ -116,7 +116,7 @@ Lowest - + AlignVCenter|AlignRight @@ -127,7 +127,7 @@ Normal - + AlignCenter @@ -193,7 +193,7 @@ Fixed - + 20 20 @@ -234,7 +234,7 @@ - tqlayout7 + layout7 @@ -372,7 +372,7 @@ Regular expression used on all file names. For example using selection " " and replace with "_" would replace all the spaces with underlines. - + WordBreak|AlignVCenter @@ -460,7 +460,7 @@ Expanding - + 21 16 @@ -488,7 +488,7 @@ - tqlayout9 + layout9 @@ -570,7 +570,7 @@ Expanding - + 20 31 diff --git a/kioslave/audiocd/kcmaudiocd/kcmaudiocd.cpp b/kioslave/audiocd/kcmaudiocd/kcmaudiocd.cpp index 1e1868fb..87614806 100644 --- a/kioslave/audiocd/kcmaudiocd/kcmaudiocd.cpp +++ b/kioslave/audiocd/kcmaudiocd/kcmaudiocd.cpp @@ -51,7 +51,7 @@ KAudiocdModule::KAudiocdModule(TQWidget *parent, const char *name) KConfigSkeleton *config = NULL; TQWidget *widget = encoder->getConfigureWidget(&config); if(widget && config){ - tabWidget->addTab(widget, i18n("%1 Encoder").tqarg(encoder->type())); + tabWidget->addTab(widget, i18n("%1 Encoder").arg(encoder->type())); KConfigDialogManager *configManager = new KConfigDialogManager(widget, config, TQString(encoder->type()+" EncoderConfigManager").latin1()); encoderSettings.append(configManager); } diff --git a/kioslave/audiocd/plugins/flac/encoderflac.cpp b/kioslave/audiocd/plugins/flac/encoderflac.cpp index 6b71d515..dfb4f7ba 100644 --- a/kioslave/audiocd/plugins/flac/encoderflac.cpp +++ b/kioslave/audiocd/plugins/flac/encoderflac.cpp @@ -80,7 +80,7 @@ static void MetadataCallback (const FLAC__StreamEncoder *encoder, const FLAC__St } /* -static FLAC__SeekableStreamEncoderSeektqStatus SeekCallback(const FLAC__SeekableStreamEncoder *encoder, FLAC__uint64 absolute_byte_offset, void *client_data) +static FLAC__SeekableStreamEncoderSeekStatus SeekCallback(const FLAC__SeekableStreamEncoder *encoder, FLAC__uint64 absolute_byte_offset, void *client_data) {} ; */ diff --git a/kioslave/audiocd/plugins/lame/encoderlame.cpp b/kioslave/audiocd/plugins/lame/encoderlame.cpp index f44218a0..1b8568a2 100644 --- a/kioslave/audiocd/plugins/lame/encoderlame.cpp +++ b/kioslave/audiocd/plugins/lame/encoderlame.cpp @@ -126,31 +126,31 @@ void EncoderLame::loadSettings(){ if (method == 0) { // Constant Bitrate Encoding args.append("-b"); - args.append(TQString("%1").tqarg(bitrates[settings->cbr_bitrate()])); + args.append(TQString("%1").arg(bitrates[settings->cbr_bitrate()])); d->bitrate = bitrates[settings->cbr_bitrate()]; args.append("-q"); - args.append(TQString("%1").tqarg(quality)); + args.append(TQString("%1").arg(quality)); } else { // Variable Bitrate Encoding if (settings->vbr_average_br()) { args.append("--abr"); - args.append(TQString("%1").tqarg(bitrates[settings->vbr_mean_brate()])); + args.append(TQString("%1").arg(bitrates[settings->vbr_mean_brate()])); d->bitrate = bitrates[settings->vbr_mean_brate()]; if (settings->vbr_min_br()){ args.append("-b"); - args.append(TQString("%1").tqarg(bitrates[settings->vbr_min_brate()])); + args.append(TQString("%1").arg(bitrates[settings->vbr_min_brate()])); } if (settings->vbr_min_hard()) args.append("-F"); if (settings->vbr_max_br()){ args.append("-B"); - args.append(TQString("%1").tqarg(bitrates[settings->vbr_max_brate()])); + args.append(TQString("%1").arg(bitrates[settings->vbr_max_brate()])); } } else { d->bitrate = 128; args.append("-V"); - args.append(TQString("%1").tqarg(quality)); + args.append(TQString("%1").arg(quality)); } if ( !settings->vbr_xing_tag() ) args.append("-t"); @@ -186,21 +186,21 @@ void EncoderLame::loadSettings(){ if ( settings->enable_lowpass() ) { args.append("--lowpass"); - args.append(TQString("%1").tqarg(settings->lowfilterfreq())); + args.append(TQString("%1").arg(settings->lowfilterfreq())); if (settings->set_lpf_width()){ args.append("--lowpass-width"); - args.append(TQString("%1").tqarg(settings->lowfilterwidth())); + args.append(TQString("%1").arg(settings->lowfilterwidth())); } } if ( settings->enable_highpass()) { args.append("--hipass"); - args.append(TQString("%1").tqarg(settings->highfilterfreq())); + args.append(TQString("%1").arg(settings->highfilterfreq())); if (settings->set_hpf_width()){ args.append("--hipass-width"); - args.append(TQString("%1").tqarg(settings->highfilterwidth())); + args.append(TQString("%1").arg(settings->highfilterwidth())); } } } @@ -341,13 +341,13 @@ void EncoderLame::fillSongInfo( KCDDB::CDInfo info, int track, const TQString &c trackInfo.append(info.get("title").toString()); trackInfo.append("--ty"); - trackInfo.append(TQString("%1").tqarg(info.get("year").toString())); + trackInfo.append(TQString("%1").arg(info.get("year").toString())); trackInfo.append("--tc"); trackInfo.append(comment); trackInfo.append("--tn"); - trackInfo.append(TQString("%1").tqarg(track+1)); + trackInfo.append(TQString("%1").arg(track+1)); const TQString genre = info.get( "genre" ).toString(); if ( d->genreList.find( genre ) != d->genreList.end() ) diff --git a/kioslave/audiocd/plugins/lame/encoderlameconfig.ui b/kioslave/audiocd/plugins/lame/encoderlameconfig.ui index 3951bb00..f8149741 100644 --- a/kioslave/audiocd/plugins/lame/encoderlameconfig.ui +++ b/kioslave/audiocd/plugins/lame/encoderlameconfig.ui @@ -178,7 +178,7 @@ &Quality: - + AlignLeft @@ -244,7 +244,7 @@ Expanding - + 20 16 @@ -698,7 +698,7 @@ Filter Settings - + AlignVCenter|AlignLeft diff --git a/kioslave/audiocd/plugins/vorbis/encodervorbisconfig.ui b/kioslave/audiocd/plugins/vorbis/encodervorbisconfig.ui index 2d5fd2dc..e442ade2 100644 --- a/kioslave/audiocd/plugins/vorbis/encodervorbisconfig.ui +++ b/kioslave/audiocd/plugins/vorbis/encodervorbisconfig.ui @@ -383,7 +383,7 @@ Expanding - + 20 51 -- cgit v1.2.3