summaryrefslogtreecommitdiffstats
path: root/libk3b/jobs/k3bdatatrackreader.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:55:47 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:55:47 -0600
commit650b58e8e66f8e3e1cf78ee3e0037f4c9e00699a (patch)
treebb4714865b78e327620ce86a37241ed22df43afa /libk3b/jobs/k3bdatatrackreader.cpp
parentef5831dd5c8811c94c9b1bc1377a90174d17c82c (diff)
downloadk3b-650b58e8e66f8e3e1cf78ee3e0037f4c9e00699a.tar.gz
k3b-650b58e8e66f8e3e1cf78ee3e0037f4c9e00699a.zip
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit ef5831dd5c8811c94c9b1bc1377a90174d17c82c.
Diffstat (limited to 'libk3b/jobs/k3bdatatrackreader.cpp')
-rw-r--r--libk3b/jobs/k3bdatatrackreader.cpp42
1 files changed, 21 insertions, 21 deletions
diff --git a/libk3b/jobs/k3bdatatrackreader.cpp b/libk3b/jobs/k3bdatatrackreader.cpp
index 873a1b8..9ff5dd5 100644
--- a/libk3b/jobs/k3bdatatrackreader.cpp
+++ b/libk3b/jobs/k3bdatatrackreader.cpp
@@ -109,7 +109,7 @@ void K3bDataTrackReader::WorkThread::run()
emitStarted();
if( !m_device->open() ) {
- emitInfoMessage( i18n("Could not open device %1").arg(m_device->blockDeviceName()), K3bJob::ERROR );
+ emitInfoMessage( i18n("Could not open device %1").tqarg(m_device->blockDeviceName()), K3bJob::ERROR );
emitFinished(false);
return;
}
@@ -142,7 +142,7 @@ void K3bDataTrackReader::WorkThread::run()
}
if( !m_libcss->open(m_device) ) {
- emitInfoMessage( i18n("Could not open device %1").arg(m_device->blockDeviceName()), K3bJob::ERROR );
+ emitInfoMessage( i18n("Could not open device %1").tqarg(m_device->blockDeviceName()), K3bJob::ERROR );
emitFinished(false);
return;
}
@@ -183,14 +183,14 @@ void K3bDataTrackReader::WorkThread::run()
}
}
- emitInfoMessage( i18n("Reading with sector size %1.").arg(m_usedSectorSize), K3bJob::INFO );
+ emitInfoMessage( i18n("Reading with sector size %1.").tqarg(m_usedSectorSize), K3bJob::INFO );
emitDebuggingOutput( "K3bDataTrackReader",
TQString("reading sectors %1 to %2 with sector size %3. Length: %4 sectors, %5 bytes.")
- .arg( m_firstSector.lba() )
- .arg( m_lastSector.lba() )
- .arg( m_usedSectorSize )
- .arg( m_lastSector.lba() - m_firstSector.lba() + 1 )
- .arg( TQ_UINT64(m_usedSectorSize) * (TQ_UINT64)(m_lastSector.lba() - m_firstSector.lba() + 1) ) );
+ .tqarg( m_firstSector.lba() )
+ .tqarg( m_lastSector.lba() )
+ .tqarg( m_usedSectorSize )
+ .tqarg( m_lastSector.lba() - m_firstSector.lba() + 1 )
+ .tqarg( TQ_UINT64(m_usedSectorSize) * (TQ_UINT64)(m_lastSector.lba() - m_firstSector.lba() + 1) ) );
TQFile file;
if( m_fd == -1 ) {
@@ -199,7 +199,7 @@ void K3bDataTrackReader::WorkThread::run()
m_device->close();
if( m_useLibdvdcss )
m_libcss->close();
- emitInfoMessage( i18n("Unable to open '%1' for writing.").arg(m_imagePath), K3bJob::ERROR );
+ emitInfoMessage( i18n("Unable to open '%1' for writing.").tqarg(m_imagePath), K3bJob::ERROR );
emitFinished( false );
return;
}
@@ -231,7 +231,7 @@ void K3bDataTrackReader::WorkThread::run()
// s_bufferSizeSectors = K3bDevice::determineMaxReadingBufferSize( m_device, m_firstSector );
if( s_bufferSizeSectors <= 0 ) {
- emitInfoMessage( i18n("Error while reading sector %1.").arg(m_firstSector.lba()), K3bJob::ERROR );
+ emitInfoMessage( i18n("Error while reading sector %1.").tqarg(m_firstSector.lba()), K3bJob::ERROR );
emitFinished(false);
m_device->block( false );
k3bcore->unblockDevice( m_device );
@@ -239,7 +239,7 @@ void K3bDataTrackReader::WorkThread::run()
}
kdDebug() << "(K3bDataTrackReader) using buffer size of " << s_bufferSizeSectors << " blocks." << endl;
- emitDebuggingOutput( "K3bDataTrackReader", TQString("using buffer size of %1 blocks.").arg( s_bufferSizeSectors ) );
+ emitDebuggingOutput( "K3bDataTrackReader", TQString("using buffer size of %1 blocks.").tqarg( s_bufferSizeSectors ) );
// 2. get it on
K3b::Msf currentSector = m_firstSector;
@@ -279,7 +279,7 @@ void K3bDataTrackReader::WorkThread::run()
<< " current sector: " << (currentSector.lba()-m_firstSector.lba()) << endl;
emitDebuggingOutput( "K3bDataTrackReader",
TQString("Error while writing to fd %1. Current sector is %2.")
- .arg(m_fd).arg(currentSector.lba()-m_firstSector.lba()) );
+ .tqarg(m_fd).tqarg(currentSector.lba()-m_firstSector.lba()) );
writeError = true;
break;
}
@@ -290,7 +290,7 @@ void K3bDataTrackReader::WorkThread::run()
<< " current sector: " << (currentSector.lba()-m_firstSector.lba()) << endl;
emitDebuggingOutput( "K3bDataTrackReader",
TQString("Error while writing to file %1. Current sector is %2.")
- .arg(m_imagePath).arg(currentSector.lba()-m_firstSector.lba()) );
+ .tqarg(m_imagePath).tqarg(currentSector.lba()-m_firstSector.lba()) );
writeError = true;
break;
}
@@ -331,8 +331,8 @@ void K3bDataTrackReader::WorkThread::run()
emitDebuggingOutput( "K3bDataTrackReader",
TQString("Read a total of %1 sectors (%2 bytes)")
- .arg(totalReadSectors.lba())
- .arg((TQ_UINT64)totalReadSectors.lba()*(TQ_UINT64)m_usedSectorSize) );
+ .tqarg(totalReadSectors.lba())
+ .tqarg((TQ_UINT64)totalReadSectors.lba()*(TQ_UINT64)m_usedSectorSize) );
if( m_canceled )
emitCanceled();
@@ -386,8 +386,8 @@ int K3bDataTrackReader::WorkThread::read( unsigned char* buffer, unsigned long s
// here we read every single sector for itself to find the troubleing ones
bool K3bDataTrackReader::WorkThread::retryRead( unsigned char* buffer, unsigned long startSector, unsigned int len )
{
- emitDebuggingOutput( "K3bDataTrackReader", TQString( "Problem while reading. Retrying from sector %1.").arg(startSector) );
- emitInfoMessage( i18n("Problem while reading. Retrying from sector %1.").arg(startSector), K3bJob::WARNING );
+ emitDebuggingOutput( "K3bDataTrackReader", TQString( "Problem while reading. Retrying from sector %1.").tqarg(startSector) );
+ emitInfoMessage( i18n("Problem while reading. Retrying from sector %1.").tqarg(startSector), K3bJob::WARNING );
int sectorsRead = -1;
bool success = true;
@@ -403,16 +403,16 @@ bool K3bDataTrackReader::WorkThread::retryRead( unsigned char* buffer, unsigned
if( !success ) {
if( m_ignoreReadErrors ) {
- emitInfoMessage( i18n("Ignoring read error in sector %1.").arg(sector), K3bJob::ERROR );
- emitDebuggingOutput( "K3bDataTrackReader", TQString( "Ignoring read error in sector %1.").arg(sector) );
+ emitInfoMessage( i18n("Ignoring read error in sector %1.").tqarg(sector), K3bJob::ERROR );
+ emitDebuggingOutput( "K3bDataTrackReader", TQString( "Ignoring read error in sector %1.").tqarg(sector) );
++m_errorSectorCount;
// ::memset( &buffer[i], 0, 1 );
success = true;
}
else {
- emitInfoMessage( i18n("Error while reading sector %1.").arg(sector), K3bJob::ERROR );
- emitDebuggingOutput( "K3bDataTrackReader", TQString( "Read error in sector %1.").arg(sector) );
+ emitInfoMessage( i18n("Error while reading sector %1.").tqarg(sector), K3bJob::ERROR );
+ emitDebuggingOutput( "K3bDataTrackReader", TQString( "Read error in sector %1.").tqarg(sector) );
break;
}
}