summaryrefslogtreecommitdiffstats
path: root/libk3b/projects/audiocd
diff options
context:
space:
mode:
Diffstat (limited to 'libk3b/projects/audiocd')
-rw-r--r--libk3b/projects/audiocd/k3baudiocdtrackdrag.cpp2
-rw-r--r--libk3b/projects/audiocd/k3baudiocdtracksource.cpp6
-rw-r--r--libk3b/projects/audiocd/k3baudiodoc.cpp4
-rw-r--r--libk3b/projects/audiocd/k3baudiodoc.h2
-rw-r--r--libk3b/projects/audiocd/k3baudioimager.cpp6
-rw-r--r--libk3b/projects/audiocd/k3baudiojob.cpp24
-rw-r--r--libk3b/projects/audiocd/k3baudiojobtempdata.cpp2
-rw-r--r--libk3b/projects/audiocd/k3baudionormalizejob.cpp14
8 files changed, 30 insertions, 30 deletions
diff --git a/libk3b/projects/audiocd/k3baudiocdtrackdrag.cpp b/libk3b/projects/audiocd/k3baudiocdtrackdrag.cpp
index f8a5b71..610f9b7 100644
--- a/libk3b/projects/audiocd/k3baudiocdtrackdrag.cpp
+++ b/libk3b/projects/audiocd/k3baudiocdtrackdrag.cpp
@@ -70,7 +70,7 @@ bool K3bAudioCdTrackDrag::decode( const TQMimeSource* e,
K3bDevice::Toc& toc, TQValueList<int>& trackNumbers,
K3bCddbResultEntry& cddb, K3bDevice::Device** dev )
{
- TQByteArray data = e->tqencodedData( "k3b/audio_track_drag" );
+ TQByteArray data = e->encodedData( "k3b/audio_track_drag" );
TQDataStream s( data, IO_ReadOnly );
diff --git a/libk3b/projects/audiocd/k3baudiocdtracksource.cpp b/libk3b/projects/audiocd/k3baudiocdtracksource.cpp
index 6319086..6ca0cd5 100644
--- a/libk3b/projects/audiocd/k3baudiocdtracksource.cpp
+++ b/libk3b/projects/audiocd/k3baudiocdtracksource.cpp
@@ -99,8 +99,8 @@ bool K3bAudioCdTrackSource::initParanoia()
if( !m_lastUsedDevice ) {
// could not find the CD, so ask for it
TQString s = i18n("Please insert Audio CD %1%2")
- .tqarg(m_discId, 0, 16)
- .tqarg(m_cddbEntry.cdTitle.isEmpty() || m_cddbEntry.cdArtist.isEmpty()
+ .arg(m_discId, 0, 16)
+ .arg(m_cddbEntry.cdTitle.isEmpty() || m_cddbEntry.cdArtist.isEmpty()
? TQString()
: " (" + m_cddbEntry.cdArtist + " - " + m_cddbEntry.cdTitle + ")");
@@ -252,7 +252,7 @@ TQString K3bAudioCdTrackSource::type() const
TQString K3bAudioCdTrackSource::sourceComment() const
{
- return i18n("Track %1 from Audio CD %2").tqarg(m_cdTrackNumber).tqarg(m_discId,0,16);
+ return i18n("Track %1 from Audio CD %2").arg(m_cdTrackNumber).arg(m_discId,0,16);
}
diff --git a/libk3b/projects/audiocd/k3baudiodoc.cpp b/libk3b/projects/audiocd/k3baudiodoc.cpp
index 625f5bf..b4b3489 100644
--- a/libk3b/projects/audiocd/k3baudiodoc.cpp
+++ b/libk3b/projects/audiocd/k3baudiodoc.cpp
@@ -37,7 +37,7 @@
#include <tqdir.h>
#include <tqdom.h>
#include <tqdatetime.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <tqsemaphore.h>
// KDE-includes
@@ -263,7 +263,7 @@ bool K3bAudioDoc::readPlaylistFile( const KURL& url, KURL::List& playlist )
TQTextStream t( &f );
char buf[7];
t.readRawBytes( buf, 7 );
- if( TQString::tqfromLatin1( buf, 7 ) != "#EXTM3U" )
+ if( TQString::fromLatin1( buf, 7 ) != "#EXTM3U" )
return false;
// skip the first line
diff --git a/libk3b/projects/audiocd/k3baudiodoc.h b/libk3b/projects/audiocd/k3baudiodoc.h
index 70f8826..71e5e69 100644
--- a/libk3b/projects/audiocd/k3baudiodoc.h
+++ b/libk3b/projects/audiocd/k3baudiodoc.h
@@ -27,7 +27,7 @@
#include <tqstring.h>
#include <tqstringlist.h>
#include <tqdatetime.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include "k3b_export.h"
#include <kurl.h>
diff --git a/libk3b/projects/audiocd/k3baudioimager.cpp b/libk3b/projects/audiocd/k3baudioimager.cpp
index ba0692f..6917fe6 100644
--- a/libk3b/projects/audiocd/k3baudioimager.cpp
+++ b/libk3b/projects/audiocd/k3baudioimager.cpp
@@ -85,7 +85,7 @@ void K3bAudioImager::WorkThread::run()
// Seek to the beginning of the track
//
if( !track->seek(0) ) {
- emitInfoMessage( i18n("Unable to seek in track %1.").tqarg(trackNumber), K3bJob::ERROR );
+ emitInfoMessage( i18n("Unable to seek in track %1.").arg(trackNumber), K3bJob::ERROR );
emitFinished(false);
return;
}
@@ -101,7 +101,7 @@ void K3bAudioImager::WorkThread::run()
//
if( m_fd == -1 ) {
if( !waveFileWriter.open( *imageFileIt ) ) {
- emitInfoMessage( i18n("Could not open %1 for writing").tqarg(*imageFileIt), K3bJob::ERROR );
+ emitInfoMessage( i18n("Could not open %1 for writing").arg(*imageFileIt), K3bJob::ERROR );
emitFinished(false);
return;
}
@@ -142,7 +142,7 @@ void K3bAudioImager::WorkThread::run()
}
if( read < 0 ) {
- emitInfoMessage( i18n("Error while decoding track %1.").tqarg(trackNumber), K3bJob::ERROR );
+ emitInfoMessage( i18n("Error while decoding track %1.").arg(trackNumber), K3bJob::ERROR );
kdDebug() << "(K3bAudioImager::WorkThread) read error on track " << trackNumber
<< " at pos " << K3b::Msf(trackRead/2352) << endl;
lastError = K3bAudioImager::ERROR_DECODING_TRACK;
diff --git a/libk3b/projects/audiocd/k3baudiojob.cpp b/libk3b/projects/audiocd/k3baudiojob.cpp
index a03a218..2415962 100644
--- a/libk3b/projects/audiocd/k3baudiojob.cpp
+++ b/libk3b/projects/audiocd/k3baudiojob.cpp
@@ -297,7 +297,7 @@ void K3bAudioJob::start()
d->useCdText ) {
if( !cdrecordCdText ) {
emit infoMessage( i18n("Cdrecord %1 does not support CD-Text writing.")
- .tqarg(k3bcore->externalBinManager()->binObject("cdrecord")->version), ERROR );
+ .arg(k3bcore->externalBinManager()->binObject("cdrecord")->version), ERROR );
d->useCdText = false;
}
else if( m_usedWritingMode == K3b::TAO ) {
@@ -346,7 +346,7 @@ void K3bAudioJob::start()
}
else {
emit burning(false);
- emit infoMessage( i18n("Creating image files in %1").tqarg(m_doc->tempDir()), INFO );
+ emit infoMessage( i18n("Creating image files in %1").arg(m_doc->tempDir()), INFO );
emit newTask( i18n("Creating image files") );
m_tempData->prepareTempFileNames( doc()->tempDir() );
TQStringList filenames;
@@ -480,9 +480,9 @@ void K3bAudioJob::slotAudioDecoderNextTrack( int t, int tt )
if( m_doc->onlyCreateImages() || !m_doc->onTheFly() ) {
K3bAudioTrack* track = m_doc->getTrack(t);
emit newSubTask( i18n("Decoding audio track %1 of %2%3")
- .tqarg(t)
- .tqarg(tt)
- .tqarg( track->title().isEmpty() || track->artist().isEmpty()
+ .arg(t)
+ .arg(tt)
+ .arg( track->title().isEmpty() || track->artist().isEmpty()
? TQString()
: " (" + track->artist() + " - " + track->title() + ")" ) );
}
@@ -568,7 +568,7 @@ bool K3bAudioJob::prepareWriter()
connect( m_writer, TQT_SIGNAL(subPercent(int)), this, TQT_SIGNAL(subPercent(int)) );
connect( m_writer, TQT_SIGNAL(processedSubSize(int, int)), this, TQT_SIGNAL(processedSubSize(int, int)) );
connect( m_writer, TQT_SIGNAL(nextTrack(int, int)), this, TQT_SLOT(slotWriterNextTrack(int, int)) );
- connect( m_writer, TQT_SIGNAL(buffer(int)), this, TQT_SIGNAL(buffertqStatus(int)) );
+ connect( m_writer, TQT_SIGNAL(buffer(int)), this, TQT_SIGNAL(bufferStatus(int)) );
connect( m_writer, TQT_SIGNAL(deviceBuffer(int)), this, TQT_SIGNAL(deviceBuffer(int)) );
connect( m_writer, TQT_SIGNAL(writeSpeed(int, int)), this, TQT_SIGNAL(writeSpeed(int, int)) );
connect( m_writer, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotWriterFinished(bool)) );
@@ -588,9 +588,9 @@ void K3bAudioJob::slotWriterNextTrack( int t, int tt )
if( m_doc->hideFirstTrack() )
track = m_doc->getTrack(t+1);
emit newSubTask( i18n("Writing track %1 of %2%3")
- .tqarg(t)
- .tqarg(tt)
- .tqarg( track->title().isEmpty() || track->artist().isEmpty()
+ .arg(t)
+ .arg(tt)
+ .arg( track->title().isEmpty() || track->artist().isEmpty()
? TQString()
: " (" + track->artist() + " - " + track->title() + ")" ) );
}
@@ -650,7 +650,7 @@ bool K3bAudioJob::startWriting()
if( m_doc->dummy() )
emit newTask( i18n("Simulating") );
else if( d->copies > 1 )
- emit newTask( i18n("Writing Copy %1").tqarg(d->copiesDone+1) );
+ emit newTask( i18n("Writing Copy %1").arg(d->copiesDone+1) );
else
emit newTask( i18n("Writing") );
@@ -847,7 +847,7 @@ TQString K3bAudioJob::jobDescription() const
return i18n("Writing Audio CD")
+ ( m_doc->title().isEmpty()
? TQString()
- : TQString( " (%1)" ).tqarg(m_doc->title()) );
+ : TQString( " (%1)" ).arg(m_doc->title()) );
}
@@ -855,7 +855,7 @@ TQString K3bAudioJob::jobDetails() const
{
return ( i18n( "1 track (%1 minutes)",
"%n tracks (%1 minutes)",
- m_doc->numOfTracks() ).tqarg(m_doc->length().toString())
+ m_doc->numOfTracks() ).arg(m_doc->length().toString())
+ ( m_doc->copies() > 1 && !m_doc->dummy()
? i18n(" - %n copy", " - %n copies", m_doc->copies())
: TQString() ) );
diff --git a/libk3b/projects/audiocd/k3baudiojobtempdata.cpp b/libk3b/projects/audiocd/k3baudiojobtempdata.cpp
index abbf753..697a9f5 100644
--- a/libk3b/projects/audiocd/k3baudiojobtempdata.cpp
+++ b/libk3b/projects/audiocd/k3baudiojobtempdata.cpp
@@ -22,7 +22,7 @@
#include <k3bcore.h>
#include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <tqvaluevector.h>
#include <kdebug.h>
diff --git a/libk3b/projects/audiocd/k3baudionormalizejob.cpp b/libk3b/projects/audiocd/k3baudionormalizejob.cpp
index 52afb5e..d78862e 100644
--- a/libk3b/projects/audiocd/k3baudionormalizejob.cpp
+++ b/libk3b/projects/audiocd/k3baudionormalizejob.cpp
@@ -61,7 +61,7 @@ void K3bAudioNormalizeJob::start()
}
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 );
// create the commandline
*m_process << bin;
@@ -104,7 +104,7 @@ void K3bAudioNormalizeJob::slotStdLine( const TQString& line )
{
// percent, subPercent, newTask (compute level and adjust)
- // emit newSubTask( i18n("Normalizing track %1 of %2 (%3)").tqarg(t).tqarg(tt).tqarg(m_files.at(t-1)) );
+ // emit newSubTask( i18n("Normalizing track %1 of %2 (%3)").arg(t).arg(tt).arg(m_files.at(t-1)) );
emit debuggingOutput( "normalize-audio", line );
@@ -123,13 +123,13 @@ void K3bAudioNormalizeJob::slotStdLine( const TQString& line )
else if( line.contains( "already normalized" ) ) {
// no normalization necessary for the current track
- emit infoMessage( i18n("Track %1 is already normalized.").tqarg(m_currentTrack), INFO );
+ emit infoMessage( i18n("Track %1 is already normalized.").arg(m_currentTrack), INFO );
m_currentTrack++;
}
else if( line.contains( "--% done") ) {
if( m_currentAction == ADJUSTING_LEVELS ) {
- emit newTask( i18n("Adjusting volume level for track %1 of %2").tqarg(m_currentTrack).tqarg(m_files.count()) );
+ emit newTask( i18n("Adjusting volume level for track %1 of %2").arg(m_currentTrack).arg(m_files.count()) );
kdDebug() << "(K3bAudioNormalizeJob) adjusting level for track "
<< m_currentTrack
<< " "
@@ -137,7 +137,7 @@ void K3bAudioNormalizeJob::slotStdLine( const TQString& line )
<< endl;
}
else {
- emit newTask( i18n("Computing level for track %1 of %2").tqarg(m_currentTrack).tqarg(m_files.count()) );
+ emit newTask( i18n("Computing level for track %1 of %2").arg(m_currentTrack).arg(m_files.count()) );
kdDebug() << "(K3bAudioNormalizeJob) computing level for track "
<< m_currentTrack
<< " "
@@ -185,7 +185,7 @@ void K3bAudioNormalizeJob::slotProcessExited( KProcess* p )
break;
default:
if( !m_canceled ) {
- emit infoMessage( i18n("%1 returned an unknown error (code %2).").tqarg("normalize-audio").tqarg(p->exitStatus()),
+ emit infoMessage( i18n("%1 returned an unknown error (code %2).").arg("normalize-audio").arg(p->exitStatus()),
K3bJob::ERROR );
emit infoMessage( i18n("Please send me an email with the last output."), K3bJob::ERROR );
emit infoMessage( i18n("Error while normalizing tracks."), ERROR );
@@ -197,7 +197,7 @@ void K3bAudioNormalizeJob::slotProcessExited( KProcess* p )
}
}
else {
- emit infoMessage( i18n("%1 did not exit cleanly.").tqarg("Normalize"), K3bJob::ERROR );
+ emit infoMessage( i18n("%1 did not exit cleanly.").arg("Normalize"), K3bJob::ERROR );
jobFinished( false );
}
}
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-18 08:57:19 +0000