summaryrefslogtreecommitdiffstats
path: root/src/rip
diff options
context:
space:
mode:
Diffstat (limited to 'src/rip')
-rw-r--r--src/rip/base_k3baudiorippingoptionwidget.ui4
-rw-r--r--src/rip/base_k3bcddbpatternwidget.ui4
-rw-r--r--src/rip/k3baudiocdview.cpp10
-rw-r--r--src/rip/k3baudioprojectconvertingdialog.cpp2
-rw-r--r--src/rip/k3baudioprojectconvertingthread.cpp38
-rw-r--r--src/rip/k3baudiorippingdialog.cpp4
-rw-r--r--src/rip/k3baudioripthread.cpp44
-rw-r--r--src/rip/k3bcuefilewriter.cpp2
-rw-r--r--src/rip/k3bpatternparser.cpp4
-rw-r--r--src/rip/k3bvideocdinfo.cpp2
-rw-r--r--src/rip/k3bvideocdrip.cpp34
-rw-r--r--src/rip/k3bvideocdrippingdialog.cpp8
-rw-r--r--src/rip/k3bvideocdview.cpp10
-rw-r--r--src/rip/videodvd/base_k3bvideodvdrippingwidget.ui6
-rw-r--r--src/rip/videodvd/k3bvideodvdrippingdialog.cpp28
-rw-r--r--src/rip/videodvd/k3bvideodvdrippingjob.cpp16
-rw-r--r--src/rip/videodvd/k3bvideodvdrippingpreview.cpp4
-rw-r--r--src/rip/videodvd/k3bvideodvdrippingtitlelistview.cpp32
-rw-r--r--src/rip/videodvd/k3bvideodvdrippingwidget.cpp8
19 files changed, 130 insertions, 130 deletions
diff --git a/src/rip/base_k3baudiorippingoptionwidget.ui b/src/rip/base_k3baudiorippingoptionwidget.ui
index 820b04f..4eb9634 100644
--- a/src/rip/base_k3baudiorippingoptionwidget.ui
+++ b/src/rip/base_k3baudiorippingoptionwidget.ui
@@ -231,7 +231,7 @@ file will contain all tracks one after the other.
<property name="text">
<string>-</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -250,7 +250,7 @@ file will contain all tracks one after the other.
<property name="text">
<string>-</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
diff --git a/src/rip/base_k3bcddbpatternwidget.ui b/src/rip/base_k3bcddbpatternwidget.ui
index 351ee9e..da050bd 100644
--- a/src/rip/base_k3bcddbpatternwidget.ui
+++ b/src/rip/base_k3bcddbpatternwidget.ui
@@ -137,7 +137,7 @@
<property name="text">
<string>See special strings</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -148,7 +148,7 @@
<property name="text">
<string>About conditional inclusion</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
diff --git a/src/rip/k3baudiocdview.cpp b/src/rip/k3baudiocdview.cpp
index 07cdf5e..8fa47c2 100644
--- a/src/rip/k3baudiocdview.cpp
+++ b/src/rip/k3baudiocdview.cpp
@@ -67,7 +67,7 @@ public:
: K3bCheckListViewItem( parent, after ) {
setText( 1, TQString::number(_trackNumber).rightJustify( 2, ' ' ) );
- setText( 3, i18n("Track %1").tqarg(_trackNumber) );
+ setText( 3, i18n("Track %1").arg(_trackNumber) );
setText( 4, " " + length.toString() + " " );
setText( 5, " " + KIO::convertSize( length.audioBytes() ) + " " );
@@ -335,7 +335,7 @@ void K3bAudioCdView::slotEditTrackCddb()
if( !items.isEmpty() ) {
AudioTrackViewItem* a = static_cast<AudioTrackViewItem*>(items.first());
- KDialogBase d( this, "trackCddbDialog", true, i18n("Cddb Track %1").tqarg(a->trackNumber),
+ KDialogBase d( this, "trackCddbDialog", true, i18n("Cddb Track %1").arg(a->trackNumber),
KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true);
TQWidget* w = new TQWidget( &d );
@@ -516,8 +516,8 @@ void K3bAudioCdView::slotSaveCddbLocally()
m_cddb->saveEntry( m_cddbInfo );
K3bPassivePopup::showPopup( i18n("Saved entry (%1) in category %2.")
- .tqarg(m_cddbInfo.discid)
- .tqarg(m_cddbInfo.category),
+ .arg(m_cddbInfo.discid)
+ .arg(m_cddbInfo.category),
i18n("CDDB") );
}
@@ -569,7 +569,7 @@ void K3bAudioCdView::updateDisplay()
m_labelLength->setText( i18n("1 track (%1)",
"%n tracks (%1)",
- m_toc.count()).tqarg(K3b::Msf(m_toc.length()).toString()) );
+ m_toc.count()).arg(K3b::Msf(m_toc.length()).toString()) );
}
diff --git a/src/rip/k3baudioprojectconvertingdialog.cpp b/src/rip/k3baudioprojectconvertingdialog.cpp
index 60200e3..fbb0800 100644
--- a/src/rip/k3baudioprojectconvertingdialog.cpp
+++ b/src/rip/k3baudioprojectconvertingdialog.cpp
@@ -79,7 +79,7 @@ K3bAudioProjectConvertingDialog::K3bAudioProjectConvertingDialog( K3bAudioDoc* d
setTitle( i18n("Audio Project Conversion"),
i18n("1 track (%1)", "%n tracks (%1)",
- m_doc->numOfTracks()).tqarg(m_doc->length().toString()) );
+ m_doc->numOfTracks()).arg(m_doc->length().toString()) );
refresh();
}
diff --git a/src/rip/k3baudioprojectconvertingthread.cpp b/src/rip/k3baudioprojectconvertingthread.cpp
index d0051e5..fded45d 100644
--- a/src/rip/k3baudioprojectconvertingthread.cpp
+++ b/src/rip/k3baudioprojectconvertingthread.cpp
@@ -110,7 +110,7 @@ void K3bAudioProjectConvertingThread::run()
TQString dir = filename.left( filename.findRev("/") );
if( !KStandardDirs::makeDir( dir ) ) {
- emitInfoMessage( i18n("Unable to create directory %1").tqarg(dir), K3bJob::ERROR );
+ emitInfoMessage( i18n("Unable to create directory %1").arg(dir), K3bJob::ERROR );
emitFinished(false);
return;
}
@@ -137,12 +137,12 @@ void K3bAudioProjectConvertingThread::run()
}
if( !isOpen ) {
- emitInfoMessage( i18n("Unable to open '%1' for writing.").tqarg(filename), K3bJob::ERROR );
+ emitInfoMessage( i18n("Unable to open '%1' for writing.").arg(filename), K3bJob::ERROR );
emitFinished(false);
return;
}
- emitInfoMessage( i18n("Converting to single file '%1'.").tqarg(filename), K3bJob::INFO );
+ emitInfoMessage( i18n("Converting to single file '%1'.").arg(filename), K3bJob::INFO );
}
bool success = true;
@@ -155,7 +155,7 @@ void K3bAudioProjectConvertingThread::run()
break;
}
- emitInfoMessage( i18n("Successfully converted track %1.").tqarg(i+1), K3bJob::INFO );
+ emitInfoMessage( i18n("Successfully converted track %1.").arg(i+1), K3bJob::INFO );
track = track->next();
++i;
@@ -180,7 +180,7 @@ void K3bAudioProjectConvertingThread::run()
if( d->currentTrackIndex >= 0 && d->currentTrackIndex < (int)m_tracks.count() ) {
if( TQFile::exists( m_tracks[d->currentTrackIndex].second ) ) {
TQFile::remove( m_tracks[d->currentTrackIndex].second );
- emitInfoMessage( i18n("Removed partial file '%1'.").tqarg(m_tracks[d->currentTrackIndex].second), K3bJob::INFO );
+ emitInfoMessage( i18n("Removed partial file '%1'.").arg(m_tracks[d->currentTrackIndex].second), K3bJob::INFO );
}
}
@@ -196,7 +196,7 @@ bool K3bAudioProjectConvertingThread::convertTrack( K3bAudioTrack* track, const
{
TQString dir = filename.left( filename.findRev("/") );
if( !KStandardDirs::makeDir( dir ) ) {
- emitInfoMessage( i18n("Unable to create directory %1").tqarg(dir), K3bJob::ERROR );
+ emitInfoMessage( i18n("Unable to create directory %1").arg(dir), K3bJob::ERROR );
return false;
}
@@ -226,7 +226,7 @@ bool K3bAudioProjectConvertingThread::convertTrack( K3bAudioTrack* track, const
}
if( !isOpen ) {
- emitInfoMessage( i18n("Unable to open '%1' for writing.").tqarg(filename), K3bJob::ERROR );
+ emitInfoMessage( i18n("Unable to open '%1' for writing.").arg(filename), K3bJob::ERROR );
return false;
}
}
@@ -235,11 +235,11 @@ bool K3bAudioProjectConvertingThread::convertTrack( K3bAudioTrack* track, const
if( !m_cddbEntry.artists[d->currentTrackIndex].isEmpty() &&
!m_cddbEntry.titles[d->currentTrackIndex].isEmpty() )
emitNewSubTask( i18n("Converting track %1 (%2 - %3)")
- .tqarg(d->currentTrackIndex+1)
- .tqarg(m_cddbEntry.artists[d->currentTrackIndex])
- .tqarg(m_cddbEntry.titles[d->currentTrackIndex]) );
+ .arg(d->currentTrackIndex+1)
+ .arg(m_cddbEntry.artists[d->currentTrackIndex])
+ .arg(m_cddbEntry.titles[d->currentTrackIndex]) );
else
- emitNewSubTask( i18n("Converting track %1").tqarg(d->currentTrackIndex+1) );
+ emitNewSubTask( i18n("Converting track %1").arg(d->currentTrackIndex+1) );
// do the conversion
@@ -265,7 +265,7 @@ bool K3bAudioProjectConvertingThread::convertTrack( K3bAudioTrack* track, const
if( d->encoder->encode( buffer, readLength ) < 0 ) {
kdDebug() << "(K3bAudioProjectConvertingThread) error while encoding." << endl;
emitInfoMessage( d->encoder->lastErrorString(), K3bJob::ERROR );
- emitInfoMessage( i18n("Error while encoding track %1.").tqarg(d->currentTrackIndex+1), K3bJob::ERROR );
+ emitInfoMessage( i18n("Error while encoding track %1.").arg(d->currentTrackIndex+1), K3bJob::ERROR );
return false;
}
}
@@ -304,11 +304,11 @@ bool K3bAudioProjectConvertingThread::writePlaylist()
TQString playlistDir = m_playlistFilename.left( m_playlistFilename.findRev( "/" ) );
if( !KStandardDirs::makeDir( playlistDir ) ) {
- emitInfoMessage( i18n("Unable to create directory %1").tqarg(playlistDir), K3bJob::ERROR );
+ emitInfoMessage( i18n("Unable to create directory %1").arg(playlistDir), K3bJob::ERROR );
return false;
}
- emitInfoMessage( i18n("Writing playlist to %1.").tqarg( m_playlistFilename ), K3bJob::INFO );
+ emitInfoMessage( i18n("Writing playlist to %1.").arg( m_playlistFilename ), K3bJob::INFO );
TQFile f( m_playlistFilename );
if( f.open( IO_WriteOnly ) ) {
@@ -359,10 +359,10 @@ bool K3bAudioProjectConvertingThread::writePlaylist()
}
}
- return ( t.tqdevice()->status() == IO_Ok );
+ return ( t.device()->status() == IO_Ok );
}
else {
- emitInfoMessage( i18n("Unable to open '%1' for writing.").tqarg(m_playlistFilename), K3bJob::ERROR );
+ emitInfoMessage( i18n("Unable to open '%1' for writing.").arg(m_playlistFilename), K3bJob::ERROR );
kdDebug() << "(K3bAudioProjectConvertingThread) could not open file " << m_playlistFilename << " for writing." << endl;
return false;
}
@@ -409,7 +409,7 @@ bool K3bAudioProjectConvertingThread::writeCueFile()
cueFile.truncate( cueFile.findRev(".") );
cueFile += ".cue";
- emitInfoMessage( i18n("Writing cue file to %1.").tqarg(cueFile), K3bJob::INFO );
+ emitInfoMessage( i18n("Writing cue file to %1.").arg(cueFile), K3bJob::INFO );
return cueWriter.save( cueFile );
}
@@ -444,7 +444,7 @@ TQString K3bAudioProjectConvertingThread::jobDescription() const
if( m_cddbEntry.cdTitle.isEmpty() )
return i18n("Converting Audio Tracks");
else
- return i18n("Converting Audio Tracks From '%1'").tqarg(m_cddbEntry.cdTitle);
+ return i18n("Converting Audio Tracks From '%1'").arg(m_cddbEntry.cdTitle);
}
TQString K3bAudioProjectConvertingThread::jobDetails() const
@@ -452,7 +452,7 @@ TQString K3bAudioProjectConvertingThread::jobDetails() const
if( d->encoder )
return i18n("1 track (encoding to %1)",
"%n tracks (encoding to %1)",
- m_tracks.count() ).tqarg(d->encoder->fileTypeComment(d->fileType));
+ m_tracks.count() ).arg(d->encoder->fileTypeComment(d->fileType));
else
return i18n("1 track", "%n tracks", m_doc->numOfTracks() );
}
diff --git a/src/rip/k3baudiorippingdialog.cpp b/src/rip/k3baudiorippingdialog.cpp
index d1088ca..4e681b2 100644
--- a/src/rip/k3baudiorippingdialog.cpp
+++ b/src/rip/k3baudiorippingdialog.cpp
@@ -106,7 +106,7 @@ K3bAudioRippingDialog::K3bAudioRippingDialog(const K3bDevice::Toc& toc,
}
setTitle( i18n("CD Ripping"),
i18n("1 track (%1)", "%n tracks (%1)",
- m_trackNumbers.count()).tqarg(length.toString()) );
+ m_trackNumbers.count()).arg(length.toString()) );
}
@@ -383,7 +383,7 @@ void K3bAudioRippingDialog::refresh()
m_patternWidget->blankReplaceString() ) + "." + extension;
}
else {
- filename = i18n("Track%1").tqarg( TQString::number( *it ).rightJustify( 2, '0' ) ) + "." + extension;
+ filename = i18n("Track%1").arg( TQString::number( *it ).rightJustify( 2, '0' ) ) + "." + extension;
}
filename = d->fsInfo.fixupPath( filename );
diff --git a/src/rip/k3baudioripthread.cpp b/src/rip/k3baudioripthread.cpp
index 9c410ad..c650755 100644
--- a/src/rip/k3baudioripthread.cpp
+++ b/src/rip/k3baudioripthread.cpp
@@ -150,7 +150,7 @@ void K3bAudioRipThread::run()
d->toc = m_device->readToc();
if( !d->paranoiaLib->initParanoia( m_device, d->toc ) ) {
- emitInfoMessage( i18n("Could not open device %1").tqarg(m_device->blockDeviceName()),
+ emitInfoMessage( i18n("Could not open device %1").arg(m_device->blockDeviceName()),
K3bJob::ERROR );
m_device->block(false);
@@ -158,7 +158,7 @@ void K3bAudioRipThread::run()
if( m_device->interfaceType() == K3bDevice::SCSI &&
!m_device->genericDevice().isEmpty() &&
!TQFileInfo( m_device->genericDevice() ).isWritable() )
- emitInfoMessage( i18n("You need write access to %1").tqarg( m_device->genericDevice() ), K3bJob::ERROR );
+ emitInfoMessage( i18n("You need write access to %1").arg( m_device->genericDevice() ), K3bJob::ERROR );
emitFinished(false);
return;
@@ -197,7 +197,7 @@ void K3bAudioRipThread::run()
TQString dir = filename.left( filename.findRev("/") );
if( !KStandardDirs::makeDir( dir, 0777 ) ) {
d->paranoiaLib->close();
- emitInfoMessage( i18n("Unable to create directory %1").tqarg(dir), K3bJob::ERROR );
+ emitInfoMessage( i18n("Unable to create directory %1").arg(dir), K3bJob::ERROR );
m_device->block(false);
emitFinished(false);
return;
@@ -226,13 +226,13 @@ void K3bAudioRipThread::run()
if( !isOpen ) {
d->paranoiaLib->close();
- emitInfoMessage( i18n("Unable to open '%1' for writing.").tqarg(filename), K3bJob::ERROR );
+ emitInfoMessage( i18n("Unable to open '%1' for writing.").arg(filename), K3bJob::ERROR );
m_device->block(false);
emitFinished(false);
return;
}
- emitInfoMessage( i18n("Ripping to single file '%1'.").tqarg(filename), K3bJob::INFO );
+ emitInfoMessage( i18n("Ripping to single file '%1'.").arg(filename), K3bJob::INFO );
}
emitInfoMessage( i18n("Starting digital audio extraction (ripping)."), K3bJob::INFO );
@@ -254,7 +254,7 @@ void K3bAudioRipThread::run()
if( success && !d->canceled ) {
TQString& filename = m_tracks[0].second;
- emitInfoMessage( i18n("Successfully ripped to %2.").tqarg(filename), K3bJob::INFO );
+ emitInfoMessage( i18n("Successfully ripped to %2.").arg(filename), K3bJob::INFO );
}
}
@@ -300,7 +300,7 @@ bool K3bAudioRipThread::ripTrack( int track, const TQString& filename )
TQString dir = filename.left( filename.findRev("/") );
if( !KStandardDirs::makeDir( dir, 0777 ) ) {
- emitInfoMessage( i18n("Unable to create directory %1").tqarg(dir), K3bJob::ERROR );
+ emitInfoMessage( i18n("Unable to create directory %1").arg(dir), K3bJob::ERROR );
return false;
}
@@ -330,16 +330,16 @@ bool K3bAudioRipThread::ripTrack( int track, const TQString& filename )
}
if( !isOpen ) {
- emitInfoMessage( i18n("Unable to open '%1' for writing.").tqarg(filename), K3bJob::ERROR );
+ emitInfoMessage( i18n("Unable to open '%1' for writing.").arg(filename), K3bJob::ERROR );
return false;
}
}
if( !m_cddbEntry.artists[track-1].isEmpty() &&
!m_cddbEntry.titles[track-1].isEmpty() )
- emitNewSubTask( i18n("Ripping track %1 (%2 - %3)").tqarg(track).tqarg(m_cddbEntry.artists[track-1]).tqarg(m_cddbEntry.titles[track-1]) );
+ emitNewSubTask( i18n("Ripping track %1 (%2 - %3)").arg(track).arg(m_cddbEntry.artists[track-1]).arg(m_cddbEntry.titles[track-1]) );
else
- emitNewSubTask( i18n("Ripping track %1").tqarg(track) );
+ emitNewSubTask( i18n("Ripping track %1").arg(track) );
int status;
while( 1 ) {
@@ -352,9 +352,9 @@ bool K3bAudioRipThread::ripTrack( int track, const TQString& filename )
if( status == K3bCdparanoiaLib::S_OK ) {
if( buf == 0 ) {
if( m_singleFile )
- emitInfoMessage( i18n("Successfully ripped track %1.").tqarg(track), K3bJob::INFO );
+ emitInfoMessage( i18n("Successfully ripped track %1.").arg(track), K3bJob::INFO );
else
- emitInfoMessage( i18n("Successfully ripped track %1 to %2.").tqarg(track).tqarg(filename), K3bJob::INFO );
+ emitInfoMessage( i18n("Successfully ripped track %1 to %2.").arg(track).arg(filename), K3bJob::INFO );
if( !m_singleFile ) {
if( d->encoder )
@@ -371,7 +371,7 @@ bool K3bAudioRipThread::ripTrack( int track, const TQString& filename )
CD_FRAMESIZE_RAW ) < 0 ) {
kdDebug() << "(K3bAudioRipThread) error while encoding." << endl;
emitInfoMessage( d->encoder->lastErrorString(), K3bJob::ERROR );
- emitInfoMessage( i18n("Error while encoding track %1.").tqarg(track), K3bJob::ERROR );
+ emitInfoMessage( i18n("Error while encoding track %1.").arg(track), K3bJob::ERROR );
return false;
}
}
@@ -387,7 +387,7 @@ bool K3bAudioRipThread::ripTrack( int track, const TQString& filename )
}
}
else {
- emitInfoMessage( i18n("Unrecoverable error while ripping track %1.").tqarg(track), K3bJob::ERROR );
+ emitInfoMessage( i18n("Unrecoverable error while ripping track %1.").arg(track), K3bJob::ERROR );
return false;
}
}
@@ -435,7 +435,7 @@ void K3bAudioRipThread::cleanupAfterCancellation()
if( d->currentTrackIndex >= 0 && d->currentTrackIndex < (int)m_tracks.count() ) {
if( TQFile::exists( m_tracks[d->currentTrackIndex].second ) ) {
TQFile::remove( m_tracks[d->currentTrackIndex].second );
- emitInfoMessage( i18n("Removed partial file '%1'.").tqarg(m_tracks[d->currentTrackIndex].second), K3bJob::INFO );
+ emitInfoMessage( i18n("Removed partial file '%1'.").arg(m_tracks[d->currentTrackIndex].second), K3bJob::INFO );
}
}
}
@@ -447,11 +447,11 @@ bool K3bAudioRipThread::writePlaylist()
TQString playlistDir = m_playlistFilename.left( m_playlistFilename.findRev( "/" ) );
if( !KStandardDirs::makeDir( playlistDir ) ) {
- emitInfoMessage( i18n("Unable to create directory %1").tqarg(playlistDir), K3bJob::ERROR );
+ emitInfoMessage( i18n("Unable to create directory %1").arg(playlistDir), K3bJob::ERROR );
return false;
}
- emitInfoMessage( i18n("Writing playlist to %1.").tqarg( m_playlistFilename ), K3bJob::INFO );
+ emitInfoMessage( i18n("Writing playlist to %1.").arg( m_playlistFilename ), K3bJob::INFO );
TQFile f( m_playlistFilename );
if( f.open( IO_WriteOnly ) ) {
@@ -502,10 +502,10 @@ bool K3bAudioRipThread::writePlaylist()
}
}
- return ( t.tqdevice()->status() == IO_Ok );
+ return ( t.device()->status() == IO_Ok );
}
else {
- emitInfoMessage( i18n("Unable to open '%1' for writing.").tqarg(m_playlistFilename), K3bJob::ERROR );
+ emitInfoMessage( i18n("Unable to open '%1' for writing.").arg(m_playlistFilename), K3bJob::ERROR );
kdDebug() << "(K3bAudioRipThread) could not open file " << m_playlistFilename << " for writing." << endl;
return false;
}
@@ -551,7 +551,7 @@ bool K3bAudioRipThread::writeCueFile()
cueFile.truncate( cueFile.findRev(".") );
cueFile += ".cue";
- emitInfoMessage( i18n("Writing cue file to %1.").tqarg(cueFile), K3bJob::INFO );
+ emitInfoMessage( i18n("Writing cue file to %1.").arg(cueFile), K3bJob::INFO );
return cueWriter.save( cueFile );
}
@@ -586,7 +586,7 @@ TQString K3bAudioRipThread::jobDescription() const
if( m_cddbEntry.cdTitle.isEmpty() )
return i18n("Ripping Audio Tracks");
else
- return i18n("Ripping Audio Tracks From '%1'").tqarg(m_cddbEntry.cdTitle);
+ return i18n("Ripping Audio Tracks From '%1'").arg(m_cddbEntry.cdTitle);
}
TQString K3bAudioRipThread::jobDetails() const
@@ -594,7 +594,7 @@ TQString K3bAudioRipThread::jobDetails() const
if( d->encoder )
return i18n("1 track (encoding to %1)",
"%n tracks (encoding to %1)",
- m_tracks.count() ).tqarg(d->encoder->fileTypeComment(d->fileType));
+ m_tracks.count() ).arg(d->encoder->fileTypeComment(d->fileType));
else
return i18n("1 track", "%n tracks", m_tracks.count() );
}
diff --git a/src/rip/k3bcuefilewriter.cpp b/src/rip/k3bcuefilewriter.cpp
index 2303926..a9371cb 100644
--- a/src/rip/k3bcuefilewriter.cpp
+++ b/src/rip/k3bcuefilewriter.cpp
@@ -87,5 +87,5 @@ bool K3bCueFileWriter::save( TQTextStream& t )
i++;
}
- return ( t.tqdevice()->status() == IO_Ok );
+ return ( t.device()->status() == IO_Ok );
}
diff --git a/src/rip/k3bpatternparser.cpp b/src/rip/k3bpatternparser.cpp
index 9cec693..0ab14d8 100644
--- a/src/rip/k3bpatternparser.cpp
+++ b/src/rip/k3bpatternparser.cpp
@@ -119,7 +119,7 @@ TQString K3bPatternParser::parsePattern( const K3bCddbResultEntry& entry,
s.replace( '*', '_' );
s.replace( '}', '*' ); // for conditional inclusion
dir.append( s.isEmpty()
- ? i18n("unknown") + TQString(" %1").tqarg(trackNumber)
+ ? i18n("unknown") + TQString(" %1").arg(trackNumber)
: s );
break;
case TITLE:
@@ -128,7 +128,7 @@ TQString K3bPatternParser::parsePattern( const K3bCddbResultEntry& entry,
s.replace( '*', '_' );
s.replace( '}', '*' );
dir.append( s.isEmpty()
- ? i18n("Track %1").tqarg(trackNumber)
+ ? i18n("Track %1").arg(trackNumber)
: s );
break;
case NUMBER:
diff --git a/src/rip/k3bvideocdinfo.cpp b/src/rip/k3bvideocdinfo.cpp
index 89cdc37..ace8fb2 100644
--- a/src/rip/k3bvideocdinfo.cpp
+++ b/src/rip/k3bvideocdinfo.cpp
@@ -177,7 +177,7 @@ void K3bVideoCdInfo::parseXmlData()
);
}
} else {
- kdDebug() << TQString( "(K3bVideoCdInfo::parseXmlData) tagName '%1' not used" ).tqarg( tagName ) << endl;
+ kdDebug() << TQString( "(K3bVideoCdInfo::parseXmlData) tagName '%1' not used" ).arg( tagName ) << endl;
}
}
}
diff --git a/src/rip/k3bvideocdrip.cpp b/src/rip/k3bvideocdrip.cpp
index 1248138..be91fa9 100644
--- a/src/rip/k3bvideocdrip.cpp
+++ b/src/rip/k3bvideocdrip.cpp
@@ -97,8 +97,8 @@ void K3bVideoCdRip::vcdxRip()
if ( !bin ) {
kdDebug() << "(K3bVideoCdRip) could not find vcdxrip executable" << endl;
- emit infoMessage( i18n( "Could not find %1 executable." ).tqarg( "vcdxrip" ), K3bJob::ERROR );
- emit infoMessage( i18n( "To rip VideoCD's you must install VcdImager Version %1." ).tqarg( ">= 0.7.12" ), K3bJob::INFO );
+ emit infoMessage( i18n( "Could not find %1 executable." ).arg( "vcdxrip" ), K3bJob::ERROR );
+ emit infoMessage( i18n( "To rip VideoCD's you must install VcdImager Version %1." ).arg( ">= 0.7.12" ), K3bJob::INFO );
emit infoMessage( i18n( "You can find this on your distribution disks or download it from http://www.vcdimager.org" ), K3bJob::INFO );
cancelAll();
jobFinished( false );
@@ -107,7 +107,7 @@ void K3bVideoCdRip::vcdxRip()
if( bin->version < K3bVersion("0.7.12") ) {
kdDebug() << "(K3bVideoCdRip) vcdxrip executable too old!" << endl;
- emit infoMessage( i18n( "%1 executable too old! Need version %2 or greater" ).tqarg( "Vcdxrip" ).tqarg( "0.7.12" ), K3bJob::ERROR );
+ emit infoMessage( i18n( "%1 executable too old! Need version %2 or greater" ).arg( "Vcdxrip" ).arg( "0.7.12" ), K3bJob::ERROR );
emit infoMessage( i18n( "You can find this on your distribution disks or download it from http://www.vcdimager.org" ), K3bJob::INFO );
cancelAll();
jobFinished( false );
@@ -115,7 +115,7 @@ void K3bVideoCdRip::vcdxRip()
}
if ( !bin->copyright.isEmpty() )
- emit infoMessage( i18n( "Using %1 %2 - Copyright (C) %3" ).tqarg( bin->name() ).tqarg( bin->version ).tqarg( bin->copyright ), INFO );
+ emit infoMessage( i18n( "Using %1 %2 - Copyright (C) %3" ).arg( bin->name() ).arg( bin->version ).arg( bin->copyright ), INFO );
*m_process << k3bcore ->externalBinManager() ->binPath( "vcdxrip" );
@@ -142,10 +142,10 @@ void K3bVideoCdRip::vcdxRip()
if ( m_videooptions ->getVideoCdSector2336() )
*m_process << "--sector-2336";
- *m_process << "-i" << TQString( "%1" ).tqarg( TQFile::encodeName( m_videooptions ->getVideoCdSource() ).data() );
+ *m_process << "-i" << TQString( "%1" ).arg( TQFile::encodeName( m_videooptions ->getVideoCdSource() ).data() );
if ( m_videooptions ->getVideoCdExtractXml() )
- *m_process << "-o" << TQString( "%1" ).tqarg( TQFile::encodeName( m_videooptions ->getVideoCdDescription() + ".xml" ).data() );
+ *m_process << "-o" << TQString( "%1" ).arg( TQFile::encodeName( m_videooptions ->getVideoCdDescription() + ".xml" ).data() );
else
*m_process << "-o" << "/dev/null";
@@ -172,11 +172,11 @@ void K3bVideoCdRip::vcdxRip()
emit newTask( i18n( "Extracting" ) );
emit infoMessage( i18n( "Start extracting." ), K3bJob::INFO );
- emit infoMessage( i18n( "Extract files from %1 to %2." ).tqarg( m_videooptions ->getVideoCdSource() ).tqarg( m_videooptions ->getVideoCdDestination() ), K3bJob::INFO );
+ emit infoMessage( i18n( "Extract files from %1 to %2." ).arg( m_videooptions ->getVideoCdSource() ).arg( m_videooptions ->getVideoCdDestination() ), K3bJob::INFO );
if ( !m_process->start( KProcess::NotifyOnExit, KProcess::AllOutput ) ) {
kdDebug() << "(K3bVideoCdRip) could not start vcdxrip" << endl;
- emit infoMessage( i18n( "Could not start %1." ).tqarg( "vcdxrip" ), K3bJob::ERROR );
+ emit infoMessage( i18n( "Could not start %1." ).arg( "vcdxrip" ), K3bJob::ERROR );
cancelAll();
jobFinished( false );
}
@@ -241,15 +241,15 @@ void K3bVideoCdRip::slotParseVcdXRipOutput( KProcess*, char* output, int len )
if ( tel.isText() ) {
const TQString text = tel.data();
if ( level == "information" ) {
- kdDebug() << TQString( "(K3bVideoCdRip) vcdxrip information, %1" ).tqarg( text ) << endl;
+ kdDebug() << TQString( "(K3bVideoCdRip) vcdxrip information, %1" ).arg( text ) << endl;
parseInformation( text );
} else {
if ( level != "error" ) {
- kdDebug() << TQString( "(K3bVideoCdRip) vcdxrip warning, %1" ).tqarg( text ) << endl;
+ kdDebug() << TQString( "(K3bVideoCdRip) vcdxrip warning, %1" ).arg( text ) << endl;
emit debuggingOutput( "vcdxrip", text );
parseInformation( text );
} else {
- kdDebug() << TQString( "(K3bVideoCdRip) vcdxrip error, %1" ).tqarg( text ) << endl;
+ kdDebug() << TQString( "(K3bVideoCdRip) vcdxrip error, %1" ).arg( text ) << endl;
emit infoMessage( text, K3bJob::ERROR );
}
}
@@ -269,14 +269,14 @@ void K3bVideoCdRip::slotVcdXRipFinished()
emit infoMessage( i18n( "Files successfully extracted." ), K3bJob::SUCCESS );
break;
default:
- emit infoMessage( i18n( "%1 returned an unknown error (code %2)." ).tqarg( "vcdxrip" ).tqarg( m_process->exitStatus() ), K3bJob::ERROR );
+ emit infoMessage( i18n( "%1 returned an unknown error (code %2)." ).arg( "vcdxrip" ).arg( m_process->exitStatus() ), K3bJob::ERROR );
emit infoMessage( i18n( "Please send me an email with the last output..." ), K3bJob::ERROR );
cancelAll();
jobFinished( false );
return ;
}
} else {
- emit infoMessage( i18n( "%1 did not exit cleanly." ).tqarg( "Vcdxrip" ), K3bJob::ERROR );
+ emit infoMessage( i18n( "%1 did not exit cleanly." ).arg( "Vcdxrip" ), K3bJob::ERROR );
cancelAll();
jobFinished( false );
return ;
@@ -290,7 +290,7 @@ void K3bVideoCdRip::parseInformation( TQString text )
// parse warning
if ( text.contains( "encountered non-form2 sector" ) ) {
// I think this is an error not a warning. Finish ripping with invalid mpegs.
- emit infoMessage( i18n( "%1 encountered non-form2 sector" ).tqarg("Vcdxrip"), K3bJob::ERROR );
+ emit infoMessage( i18n( "%1 encountered non-form2 sector" ).arg("Vcdxrip"), K3bJob::ERROR );
emit infoMessage( i18n( "leaving loop" ), K3bJob::ERROR );
cancelAll();
jobFinished( false );
@@ -326,7 +326,7 @@ void K3bVideoCdRip::parseInformation( TQString text )
index = 11;
end = text.find( "(start lsn" );
- emit newSubTask( i18n( "Extracting %1" ).tqarg( text.mid( index, end - index ).stripWhiteSpace() ) );
+ emit newSubTask( i18n( "Extracting %1" ).arg( text.mid( index, end - index ).stripWhiteSpace() ) );
}
// parse extracting files info
// extracting CDI/CDI_IMAG.RTF to _cdi_cdi_imag.rtf (lsn 258, size 1315168, raw 1)
@@ -337,14 +337,14 @@ void K3bVideoCdRip::parseInformation( TQString text )
index = text.find( " to " );
end = text.find( " (lsn" );
TQString toFileName = text.mid( index + 4, end - index - 4 ).stripWhiteSpace();
- emit newSubTask( i18n( "Extracting %1 to %2" ).tqarg( extractFileName ).tqarg( toFileName ) );
+ emit newSubTask( i18n( "Extracting %1 to %2" ).arg( extractFileName ).arg( toFileName ) );
}
}
}
TQString K3bVideoCdRip::jobDescription() const
{
- return i18n( "Extracting %1" ).tqarg( m_videooptions ->getVideoCdDescription() );
+ return i18n( "Extracting %1" ).arg( m_videooptions ->getVideoCdDescription() );
}
TQString K3bVideoCdRip::jobDetails() const
diff --git a/src/rip/k3bvideocdrippingdialog.cpp b/src/rip/k3bvideocdrippingdialog.cpp
index f0ab309..064e0e0 100644
--- a/src/rip/k3bvideocdrippingdialog.cpp
+++ b/src/rip/k3bvideocdrippingdialog.cpp
@@ -132,7 +132,7 @@ void K3bVideoCdRippingDialog::setupGui()
void K3bVideoCdRippingDialog::setupContextHelp()
{
- TQToolTip::add( m_labelFreeSpace, i18n("Free space on destination directory: %1").tqarg( m_editDirectory ->url() ) );
+ TQToolTip::add( m_labelFreeSpace, i18n("Free space on destination directory: %1").arg( m_editDirectory ->url() ) );
TQToolTip::add( m_labelNecessarySize, i18n("Necessary space for extracted files") );
@@ -157,10 +157,10 @@ void K3bVideoCdRippingDialog::slotStartClicked()
TQDir d;
d.setPath( m_editDirectory ->url() );
if( !d.exists() ) {
- if( KMessageBox::warningYesNo( this, i18n("Image folder '%1' does not exist. Do you want K3b to create it?").tqarg( m_editDirectory->url() ) )
+ if( KMessageBox::warningYesNo( this, i18n("Image folder '%1' does not exist. Do you want K3b to create it?").arg( m_editDirectory->url() ) )
== KMessageBox::Yes ) {
if( !KStandardDirs::makeDir( m_editDirectory->url() ) ) {
- KMessageBox::error( this, i18n("Failed to create folder '%1'.").tqarg( m_editDirectory->url() ) );
+ KMessageBox::error( this, i18n("Failed to create folder '%1'.").arg( m_editDirectory->url() ) );
return;
}
}
@@ -170,7 +170,7 @@ void K3bVideoCdRippingDialog::slotStartClicked()
TQFileInfo* fi;
while ( ( fi = it.current() ) != 0 ) {
if ( fi ->fileName() != "." && fi ->fileName() != ".." )
- filesExists.append( TQString( "%1 (%2)" ).tqarg( TQFile::encodeName( fi ->fileName() ).data() ).tqarg( KIO::convertSize( fi ->size() ) ) );
+ filesExists.append( TQString( "%1 (%2)" ).arg( TQFile::encodeName( fi ->fileName() ).data() ).arg( KIO::convertSize( fi ->size() ) ) );
++it;
}
diff --git a/src/rip/k3bvideocdview.cpp b/src/rip/k3bvideocdview.cpp
index 9a60482..62fc364 100644
--- a/src/rip/k3bvideocdview.cpp
+++ b/src/rip/k3bvideocdview.cpp
@@ -68,7 +68,7 @@ class K3bVideoCdView::VideoTrackViewItem : public TQListViewItem
const K3b::Msf& length )
: TQListViewItem( parent )
{
- setText( 0, TQString( "%1. %2" ).tqarg( _trackNumber ).tqarg( id ) );
+ setText( 0, TQString( "%1. %2" ).arg( _trackNumber ).arg( id ) );
setText( 1, name );
if ( length > 0 ) {
setText( 2, length.toString() );
@@ -83,7 +83,7 @@ class K3bVideoCdView::VideoTrackViewItem : public TQListViewItem
void updateData( const K3bVideoCdInfoResultEntry& resultEntry )
{
- setText( 0, TQString( "%1. %2" ).tqarg( trackNumber ).tqarg( resultEntry.id ) );
+ setText( 0, TQString( "%1. %2" ).arg( trackNumber ).arg( resultEntry.id ) );
setText( 1, resultEntry.name );
}
@@ -232,7 +232,7 @@ void K3bVideoCdView::reloadMedium()
K3b::Msf length( ( *it ).length() );
sequenceSize += length;
m_videocdmpegsize += length.mode2Form2Bytes();
- ( void ) new VideoTrackViewItem( ( VideoTrackViewCheckItem* ) m_contentList[ 0 ], i18n( "Sequence-%1" ).tqarg( index ), "", index, length );
+ ( void ) new VideoTrackViewItem( ( VideoTrackViewCheckItem* ) m_contentList[ 0 ], i18n( "Sequence-%1" ).arg( index ), "", index, length );
} else {
K3b::Msf length( ( *it ).length() );
m_videocddatasize += length.mode2Form1Bytes();
@@ -314,7 +314,7 @@ void K3bVideoCdView::updateDisplay()
else
setTitle( i18n( "Video CD" ) );
- m_labelLength->setText( i18n( "1 track (%1)", "%n tracks (%1)", m_toc.count() ).tqarg( K3b::Msf( m_toc.length() ).toString() ) );
+ m_labelLength->setText( i18n( "1 track (%1)", "%n tracks (%1)", m_toc.count() ).arg( K3b::Msf( m_toc.length() ).toString() ) );
}
@@ -416,7 +416,7 @@ void K3bVideoCdView::startRip()
if ( m_videooptions ->getVideoCdRipSequences() )
videocdsize += m_videocdmpegsize;
- kdDebug() << TQString("(K3bVideoCdView::startRip()) m_videooptions ->setVideoCdSize( %1)").tqarg( videocdsize ) << endl;
+ kdDebug() << TQString("(K3bVideoCdView::startRip()) m_videooptions ->setVideoCdSize( %1)").arg( videocdsize ) << endl;
m_videooptions ->setVideoCdSize( videocdsize );
K3bVideoCdRippingDialog rip( m_videooptions, this );
rip.exec();
diff --git a/src/rip/videodvd/base_k3bvideodvdrippingwidget.ui b/src/rip/videodvd/base_k3bvideodvdrippingwidget.ui
index 3ea6c03..4bc1a0f 100644
--- a/src/rip/videodvd/base_k3bvideodvdrippingwidget.ui
+++ b/src/rip/videodvd/base_k3bvideodvdrippingwidget.ui
@@ -188,7 +188,7 @@
<property name="text">
<string>-</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -207,7 +207,7 @@
<property name="text">
<string>-</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -509,7 +509,7 @@
<property name="text">
<string>See special strings</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
diff --git a/src/rip/videodvd/k3bvideodvdrippingdialog.cpp b/src/rip/videodvd/k3bvideodvdrippingdialog.cpp
index 2ce8ae4..8938e4d 100644
--- a/src/rip/videodvd/k3bvideodvdrippingdialog.cpp
+++ b/src/rip/videodvd/k3bvideodvdrippingdialog.cpp
@@ -172,7 +172,7 @@ K3bVideoDVDRippingDialog::K3bVideoDVDRippingDialog( const K3bVideoDVD::VideoDVD&
setTitle( i18n("Video DVD Ripping"),
i18n("1 title from %1", "%n titles from %1", titles.count())
- .tqarg( k3bappcore->mediaCache()->medium(m_dvd.device()).beautifiedVolumeId() ) );
+ .arg( k3bappcore->mediaCache()->medium(m_dvd.device()).beautifiedVolumeId() ) );
// populate list map
populateTitleView( titles );
@@ -195,13 +195,13 @@ void K3bVideoDVDRippingDialog::populateTitleView( const TQValueList<int>& titles
titleItem = new TQCheckListItem( m_w->m_titleView,
titleItem,
i18n("Title %1 (%2)")
- .tqarg(*it)
- .tqarg(m_dvd[*it-1].playbackTime().toString()),
+ .arg(*it)
+ .arg(m_dvd[*it-1].playbackTime().toString()),
TQCheckListItem::RadioButtonController );
titleItem->setText( 1, TQString("%1x%2")
- .tqarg(m_dvd[*it-1].videoStream().realPictureWidth())
- .tqarg(m_dvd[*it-1].videoStream().realPictureHeight()) );
- titleItem->setText( 3, TQString("%1 Title %2.avi").tqarg(m_dvd.volumeIdentifier()).tqarg(*it) );
+ .arg(m_dvd[*it-1].videoStream().realPictureWidth())
+ .arg(m_dvd[*it-1].videoStream().realPictureHeight()) );
+ titleItem->setText( 3, TQString("%1 Title %2.avi").arg(m_dvd.volumeIdentifier()).arg(*it) );
// now for the rip info
K3bVideoDVDRippingJob::TitleRipInfo ri( *it );
@@ -222,12 +222,12 @@ void K3bVideoDVDRippingDialog::populateTitleView( const TQValueList<int>& titles
TQListViewItem* asI = 0;
for( unsigned int i = 0; i < m_dvd[*it-1].numAudioStreams(); ++i ) {
TQString text = i18n("%1 %2Ch (%3%4)")
- .tqarg( K3bVideoDVD::audioFormatString( m_dvd[*it-1].audioStream(i).format() ) )
- .tqarg( m_dvd[*it-1].audioStream(i).channels() )
- .tqarg( m_dvd[*it-1].audioStream(i).langCode().isEmpty()
+ .arg( K3bVideoDVD::audioFormatString( m_dvd[*it-1].audioStream(i).format() ) )
+ .arg( m_dvd[*it-1].audioStream(i).channels() )
+ .arg( m_dvd[*it-1].audioStream(i).langCode().isEmpty()
? i18n("unknown language")
: KGlobal::locale()->twoAlphaToLanguageName( m_dvd[*it-1].audioStream(i).langCode() ) )
- .tqarg( m_dvd[*it-1].audioStream(i).codeExtension() != K3bVideoDVD::AUDIO_CODE_EXT_UNSPECIFIED
+ .arg( m_dvd[*it-1].audioStream(i).codeExtension() != K3bVideoDVD::AUDIO_CODE_EXT_UNSPECIFIED
? TQString(" ") + K3bVideoDVD::audioCodeExtensionString( m_dvd[*it-1].audioStream(i).codeExtension() )
: TQString() );
@@ -302,7 +302,7 @@ void K3bVideoDVDRippingDialog::slotUpdateVideoSizes()
for( TQMap<TQCheckListItem*, K3bVideoDVDRippingJob::TitleRipInfo>::iterator it = m_titleRipInfos.begin();
it != m_titleRipInfos.end(); ++it ) {
TQSize s( resizeTitle( m_dvd[it.data().title-1].videoStream(), size ) );
- it.key()->setText( 1, TQString("%1x%2").tqarg(s.width()).tqarg(s.height()) );
+ it.key()->setText( 1, TQString("%1x%2").arg(s.width()).arg(s.height()) );
}
}
@@ -456,12 +456,12 @@ TQString K3bVideoDVDRippingDialog::createFilename( const K3bVideoDVDRippingJob::
break;
case PATTERN_ORIG_VIDEO_SIZE:
f.append( TQString("%1x%2")
- .tqarg(title.videoStream().pictureWidth())
- .tqarg(title.videoStream().pictureHeight()) );
+ .arg(title.videoStream().pictureWidth())
+ .arg(title.videoStream().pictureHeight()) );
break;
case PATTERN_VIDEO_SIZE: {
TQSize s( resizeTitle( m_dvd[info.title-1].videoStream(), m_w->selectedPictureSize() ) );
- f.append( TQString("%1x%2").tqarg(s.width()).tqarg(s.height()) );
+ f.append( TQString("%1x%2").arg(s.width()).arg(s.height()) );
break;
}
case PATTERN_ASPECT_RATIO:
diff --git a/src/rip/videodvd/k3bvideodvdrippingjob.cpp b/src/rip/videodvd/k3bvideodvdrippingjob.cpp
index bc08f3e..f17b6ff 100644
--- a/src/rip/videodvd/k3bvideodvdrippingjob.cpp
+++ b/src/rip/videodvd/k3bvideodvdrippingjob.cpp
@@ -115,8 +115,8 @@ TQString K3bVideoDVDRippingJob::jobDescription() const
TQString K3bVideoDVDRippingJob::jobDetails() const
{
return i18n("Transcoding %n title to %1/%2", "Transcoding %n titles to %1/%2", m_titleRipInfos.count() )
- .tqarg( K3bVideoDVDTitleTranscodingJob::videoCodecString( m_transcodingJob->videoCodec() ) )
- .tqarg( K3bVideoDVDTitleTranscodingJob::audioCodecString( m_transcodingJob->audioCodec() ) );
+ .arg( K3bVideoDVDTitleTranscodingJob::videoCodecString( m_transcodingJob->videoCodec() ) )
+ .arg( K3bVideoDVDTitleTranscodingJob::audioCodecString( m_transcodingJob->audioCodec() ) );
}
@@ -143,10 +143,10 @@ void K3bVideoDVDRippingJob::slotTranscodingJobFinished( bool success )
}
else {
if( success )
- emit infoMessage( i18n("Successfully ripped title %1").tqarg(m_titleRipInfos[d->currentTitleInfoIndex].title), SUCCESS );
+ emit infoMessage( i18n("Successfully ripped title %1").arg(m_titleRipInfos[d->currentTitleInfoIndex].title), SUCCESS );
else {
d->failedTitles++;
- emit infoMessage( i18n("Failed to rip title %1").tqarg(m_titleRipInfos[d->currentTitleInfoIndex].title), ERROR );
+ emit infoMessage( i18n("Failed to rip title %1").arg(m_titleRipInfos[d->currentTitleInfoIndex].title), ERROR );
}
++d->currentTitleInfoIndex ;
@@ -176,11 +176,11 @@ void K3bVideoDVDRippingJob::slotDetectClippingJobFinished( bool success )
m_titleRipInfos[d->currentTitleInfoIndex].clipRight = 0;
if( success ) {
- emit infoMessage( i18n("Determined clipping values for title %1").tqarg(m_titleRipInfos[d->currentTitleInfoIndex].title), SUCCESS );
+ emit infoMessage( i18n("Determined clipping values for title %1").arg(m_titleRipInfos[d->currentTitleInfoIndex].title), SUCCESS );
emit infoMessage( i18n("Top: %1, Bottom: %2")
- .tqarg(m_detectClippingJob->clippingTop()).tqarg(m_detectClippingJob->clippingBottom()), INFO );
+ .arg(m_detectClippingJob->clippingTop()).arg(m_detectClippingJob->clippingBottom()), INFO );
emit infoMessage( i18n("Left: %1, Right: %2")
- .tqarg(m_detectClippingJob->clippingLeft()).tqarg(m_detectClippingJob->clippingRight()), INFO );
+ .arg(m_detectClippingJob->clippingLeft()).arg(m_detectClippingJob->clippingRight()), INFO );
// let's see if the clipping values make sense
if( m_detectClippingJob->clippingTop() + m_detectClippingJob->clippingBottom()
@@ -197,7 +197,7 @@ void K3bVideoDVDRippingJob::slotDetectClippingJobFinished( bool success )
}
}
else
- emit infoMessage( i18n("Failed to determine clipping values for title %1").tqarg(m_titleRipInfos[d->currentTitleInfoIndex].title), ERROR );
+ emit infoMessage( i18n("Failed to determine clipping values for title %1").arg(m_titleRipInfos[d->currentTitleInfoIndex].title), ERROR );
startTranscoding( d->currentTitleInfoIndex );
}
diff --git a/src/rip/videodvd/k3bvideodvdrippingpreview.cpp b/src/rip/videodvd/k3bvideodvdrippingpreview.cpp
index 577b674..2081d32 100644
--- a/src/rip/videodvd/k3bvideodvdrippingpreview.cpp
+++ b/src/rip/videodvd/k3bvideodvdrippingpreview.cpp
@@ -77,11 +77,11 @@ void K3bVideoDVDRippingPreview::generatePreview( const K3bVideoDVD::VideoDVD& dv
m_process = new KProcess();
*m_process << bin->path;
*m_process << "-i" << dvd.device()->blockDeviceName();
- *m_process << "-T" << TQString("%1,%2").tqarg(title).tqarg(chapter);
+ *m_process << "-T" << TQString("%1,%2").arg(title).arg(chapter);
*m_process << "-x" << "dvd,null";
*m_process << "--dvd_access_delay" << "0";
*m_process << "-y" << "ppm,null";
- *m_process << "-c" << TQString("%1-%2").tqarg( frame ).tqarg( frame+1 );
+ *m_process << "-c" << TQString("%1-%2").arg( frame ).arg( frame+1 );
*m_process << "-Z" << "x200";
*m_process << "-o" << m_tempDir->name();
diff --git a/src/rip/videodvd/k3bvideodvdrippingtitlelistview.cpp b/src/rip/videodvd/k3bvideodvdrippingtitlelistview.cpp
index 8c3e592..34af9c9 100644
--- a/src/rip/videodvd/k3bvideodvdrippingtitlelistview.cpp
+++ b/src/rip/videodvd/k3bvideodvdrippingtitlelistview.cpp
@@ -45,12 +45,12 @@ static TQString audioStreamString( const K3bVideoDVD::Title& title, unsigned int
s += "<br>";
s += TQString::number(i+1) + ": "
+ i18n("%1 %2Ch (%3<em>%4</em>)")
- .tqarg( K3bVideoDVD::audioFormatString( title.audioStream(i).format() ) )
- .tqarg( title.audioStream(i).channels() )
- .tqarg( title.audioStream(i).langCode().isEmpty()
+ .arg( K3bVideoDVD::audioFormatString( title.audioStream(i).format() ) )
+ .arg( title.audioStream(i).channels() )
+ .arg( title.audioStream(i).langCode().isEmpty()
? i18n("unknown language")
: KGlobal::locale()->twoAlphaToLanguageName( title.audioStream(i).langCode() ) )
- .tqarg( includeExtInfo && title.audioStream(i).codeExtension() != K3bVideoDVD::AUDIO_CODE_EXT_UNSPECIFIED
+ .arg( includeExtInfo && title.audioStream(i).codeExtension() != K3bVideoDVD::AUDIO_CODE_EXT_UNSPECIFIED
? TQString(" ") + K3bVideoDVD::audioCodeExtensionString( title.audioStream(i).codeExtension() )
: TQString() );
}
@@ -69,13 +69,13 @@ static TQString subpictureStreamString( const K3bVideoDVD::Title& title, unsigne
s += "<br>";
s += TQString::number(i+1) + ": "
+ TQString("%1 (%2<em>%3</em>)")
- .tqarg( title.subPictureStream(i).codeMode() == K3bVideoDVD::SUBPIC_CODE_MODE_RLE
+ .arg( title.subPictureStream(i).codeMode() == K3bVideoDVD::SUBPIC_CODE_MODE_RLE
? i18n("RLE")
: i18n("Extended") )
- .tqarg( title.subPictureStream(i).langCode().isEmpty()
+ .arg( title.subPictureStream(i).langCode().isEmpty()
? i18n("unknown language")
: KGlobal::locale()->twoAlphaToLanguageName( title.subPictureStream(i).langCode() ) )
- .tqarg( includeExtInfo && title.subPictureStream(i).codeExtension() != K3bVideoDVD::SUBPIC_CODE_EXT_UNSPECIFIED
+ .arg( includeExtInfo && title.subPictureStream(i).codeExtension() != K3bVideoDVD::SUBPIC_CODE_EXT_UNSPECIFIED
? TQString(" ") + K3bVideoDVD::subPictureCodeExtensionString( title.subPictureStream(i).codeExtension() )
: TQString() );
}
@@ -137,7 +137,7 @@ public:
m_previewSet = true;
- tqrepaint();
+ repaint();
}
const TQImage& preview() const {
@@ -243,18 +243,18 @@ private:
// Title X + length
return i18n("<p><b>Title %1 (%2)</b><br>"
"%3")
- .tqarg( m_title.titleNumber(), 2 )
- .tqarg( m_title.playbackTime().toString( false ) )
- .tqarg( i18n("%n chapter", "%n chapters", m_title.numPTTs() ) );
+ .arg( m_title.titleNumber(), 2 )
+ .arg( m_title.playbackTime().toString( false ) )
+ .arg( i18n("%n chapter", "%n chapters", m_title.numPTTs() ) );
case 3:
// video stream info
return TQString("<p>%1 %2x%3<br>%4%5")
- .tqarg( m_title.videoStream().mpegVersion() == 0 ? i18n("MPEG1") : i18n("MPEG2") )
- .tqarg( m_title.videoStream().pictureWidth() )
- .tqarg( m_title.videoStream().pictureHeight() )
- .tqarg( m_title.videoStream().displayAspectRatio() == K3bVideoDVD::VIDEO_ASPECT_RATIO_4_3 ? "4:3" : "16:9" )
- .tqarg( m_title.videoStream().letterboxed() ? TQString(" - <em>") + i18n("letterboxed") + TQString("</em>"):
+ .arg( m_title.videoStream().mpegVersion() == 0 ? i18n("MPEG1") : i18n("MPEG2") )
+ .arg( m_title.videoStream().pictureWidth() )
+ .arg( m_title.videoStream().pictureHeight() )
+ .arg( m_title.videoStream().displayAspectRatio() == K3bVideoDVD::VIDEO_ASPECT_RATIO_4_3 ? "4:3" : "16:9" )
+ .arg( m_title.videoStream().letterboxed() ? TQString(" - <em>") + i18n("letterboxed") + TQString("</em>"):
m_title.videoStream().permittedDf() == K3bVideoDVD::VIDEO_PERMITTED_DF_LETTERBOXED
? TQString(" - <em>") + i18n("anamorph") + TQString("</em>") : TQString() );
diff --git a/src/rip/videodvd/k3bvideodvdrippingwidget.cpp b/src/rip/videodvd/k3bvideodvdrippingwidget.cpp
index cdbb932..41489f7 100644
--- a/src/rip/videodvd/k3bvideodvdrippingwidget.cpp
+++ b/src/rip/videodvd/k3bvideodvdrippingwidget.cpp
@@ -86,7 +86,7 @@ K3bVideoDVDRippingWidget::K3bVideoDVDRippingWidget( TQWidget* parent )
//
// Example filename pattern
//
- m_comboFilenamePattern->insertItem( TQString( "%b - %1 %t (%n %a %c)" ).tqarg(i18n("Title") ) );
+ m_comboFilenamePattern->insertItem( TQString( "%b - %1 %t (%n %a %c)" ).arg(i18n("Title") ) );
m_comboFilenamePattern->insertItem( TQString( "%{volumeid} (%{title})" ) );
@@ -94,7 +94,7 @@ K3bVideoDVDRippingWidget::K3bVideoDVDRippingWidget( TQWidget* parent )
// Add the Audio bitrates
//
for( int i = 0; s_mp3Bitrates[i]; ++i )
- m_comboAudioBitrate->insertItem( i18n("%1 kbps" ).tqarg(s_mp3Bitrates[i]) );
+ m_comboAudioBitrate->insertItem( i18n("%1 kbps" ).arg(s_mp3Bitrates[i]) );
for( int i = 0; i < K3bVideoDVDTitleTranscodingJob::VIDEO_CODEC_NUM_ENTRIES; ++i ) {
@@ -187,8 +187,8 @@ void K3bVideoDVDRippingWidget::setSelectedPictureSize( const TQSize& size )
else {
m_comboVideoSize->changeItem( i18n(s_pictureSizeNames[PICTURE_SIZE_CUSTOM])
+ TQString(" (%1x%2)")
- .tqarg(size.width() == 0 ? i18n("auto") : TQString::number(size.width()))
- .tqarg(size.height() == 0 ? i18n("auto") : TQString::number(size.height())),
+ .arg(size.width() == 0 ? i18n("auto") : TQString::number(size.width()))
+ .arg(size.height() == 0 ? i18n("auto") : TQString::number(size.height())),
PICTURE_SIZE_CUSTOM );
m_comboVideoSize->setCurrentItem( PICTURE_SIZE_CUSTOM );
}
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-19 08:29:46 +0000