summaryrefslogtreecommitdiffstats
path: root/libk3bdevice
diff options
context:
space:
mode:
Diffstat (limited to 'libk3bdevice')
-rw-r--r--libk3bdevice/k3bcdtext.cpp24
-rw-r--r--libk3bdevice/k3bdevice.cpp32
-rw-r--r--libk3bdevice/k3bdevice.h2
-rw-r--r--libk3bdevice/k3bdevice_mmc.cpp2
-rw-r--r--libk3bdevice/k3bdevicemanager.cpp8
-rw-r--r--libk3bdevice/k3bmmc.h2
-rw-r--r--libk3bdevice/k3bscsicommand.cpp4
7 files changed, 37 insertions, 37 deletions
diff --git a/libk3bdevice/k3bcdtext.cpp b/libk3bdevice/k3bcdtext.cpp
index 7892406..774c59e 100644
--- a/libk3bdevice/k3bcdtext.cpp
+++ b/libk3bdevice/k3bcdtext.cpp
@@ -20,7 +20,7 @@
#include <k3bdebug.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
#include <string.h>
@@ -65,12 +65,12 @@ namespace K3bDevice {
for( int i = 0; i < dataLen/18; ++i ) {
TQString s;
- s += TQString( " %1 |" ).arg( pack[i].id1, 6, 16 );
- s += TQString( " %1 |" ).arg( pack[i].id2, 6 );
- s += TQString( " %1 |" ).arg( pack[i].id3, 6 );
- s += TQString( " %1 |" ).arg( pack[i].charpos, 6 );
- s += TQString( " %1 |" ).arg( pack[i].blocknum, 6 );
- s += TQString( " %1 |" ).arg( pack[i].dbcc, 4 );
+ s += TQString( " %1 |" ).tqarg( pack[i].id1, 6, 16 );
+ s += TQString( " %1 |" ).tqarg( pack[i].id2, 6 );
+ s += TQString( " %1 |" ).tqarg( pack[i].id3, 6 );
+ s += TQString( " %1 |" ).tqarg( pack[i].charpos, 6 );
+ s += TQString( " %1 |" ).tqarg( pack[i].blocknum, 6 );
+ s += TQString( " %1 |" ).tqarg( pack[i].dbcc, 4 );
// char str[12];
// sprintf( str, "%c%c%c%c%c%c%c%c%c%c%c%c",
// pack[i].data[0] == '\0' ? '�' : pack[i].data[0],
@@ -85,9 +85,9 @@ namespace K3bDevice {
// pack[i].data[9] == '\0' ? '�' : pack[i].data[9],
// pack[i].data[10] == '\0' ? '�' : pack[i].data[10],
// pack[i].data[11] == '\0' ? '�' : pack[i].data[11] );
-// s += TQString( " %1 |" ).arg( "'" + TQCString(str,13) + "'", 14 );
+// s += TQString( " %1 |" ).tqarg( "'" + TQCString(str,13) + "'", 14 );
// TQ_UINT16 crc = pack[i].crc[0]<<8|pack[i].crc[1];
-// s += TQString( " %1 |" ).arg( crc );
+// s += TQString( " %1 |" ).tqarg( crc );
k3bDebug() << s << endl;
}
}
@@ -202,9 +202,9 @@ void K3bDevice::CdText::setRawPackData( const unsigned char* data, int len )
char* nextNullPos = (char*)::memchr( nullPos+1, '\0', 11 - (nullPos - (char*)pack[i].data) );
TQString txtstr;
if( nextNullPos ) // take all chars up to the next null
- txtstr = TQString::fromLatin1( (char*)nullPos+1, nextNullPos - nullPos - 1 );
+ txtstr = TQString::tqfromLatin1( (char*)nullPos+1, nextNullPos - nullPos - 1 );
else // take all chars to the end of the pack data (12 bytes)
- txtstr = TQString::fromLatin1( (char*)nullPos+1, 11 - (nullPos - (char*)pack[i].data) );
+ txtstr = TQString::tqfromLatin1( (char*)nullPos+1, 11 - (nullPos - (char*)pack[i].data) );
//
// a tab character means to use the same as for the previous track
@@ -471,7 +471,7 @@ void K3bDevice::CdText::savePack( cdtext_pack* pack, TQByteArray& data, unsigned
// append the pack to data
if( data.size() < dataFill + sizeof(cdtext_pack) )
- data.resize( dataFill + sizeof(cdtext_pack), TQGArray::SpeedOptim );
+ data.tqresize( dataFill + sizeof(cdtext_pack), TQGArray::SpeedOptim );
::memcpy( &data.data()[dataFill], reinterpret_cast<char*>( pack ), sizeof(cdtext_pack) );
diff --git a/libk3bdevice/k3bdevice.cpp b/libk3bdevice/k3bdevice.cpp
index df6dcb0..c20c1c0 100644
--- a/libk3bdevice/k3bdevice.cpp
+++ b/libk3bdevice/k3bdevice.cpp
@@ -240,9 +240,9 @@ bool K3bDevice::Device::init( bool bCheckWritingModes )
return false;
}
else {
- m_vendor = TQString::fromLatin1( (char*)(inq->vendor), 8 ).stripWhiteSpace();
- m_description = TQString::fromLatin1( (char*)(inq->product), 16 ).stripWhiteSpace();
- m_version = TQString::fromLatin1( (char*)(inq->revision), 4 ).stripWhiteSpace();
+ m_vendor = TQString::tqfromLatin1( (char*)(inq->vendor), 8 ).stripWhiteSpace();
+ m_description = TQString::tqfromLatin1( (char*)(inq->product), 16 ).stripWhiteSpace();
+ m_version = TQString::tqfromLatin1( (char*)(inq->revision), 4 ).stripWhiteSpace();
}
if( m_vendor.isEmpty() )
@@ -563,7 +563,7 @@ const TQString& K3bDevice::Device::devicename() const
TQString K3bDevice::Device::busTargetLun() const
{
- return TQString("%1,%2,%3").arg(m_bus).arg(m_target).arg(m_lun);
+ return TQString("%1,%2,%3").tqarg(m_bus).tqarg(m_target).tqarg(m_lun);
}
@@ -1056,18 +1056,18 @@ bool K3bDevice::Device::readRawToc( K3bDevice::Toc& toc ) const
k3bDebug() << "Session | ADR | CONTROL| TNO | POINT | Min | Sec | Frame | Zero | PMIN | PSEC | PFRAME |" << endl;
for( unsigned int i = 0; i < (dataLen-4)/(int)sizeof(toc_raw_track_descriptor); ++i ) {
TQString s;
- s += TQString( " %1 |" ).arg( (int)tr[i].session_number, 6 );
- s += TQString( " %1 |" ).arg( (int)tr[i].adr, 6 );
- s += TQString( " %1 |" ).arg( (int)tr[i].control, 6 );
- s += TQString( " %1 |" ).arg( (int)tr[i].tno, 6 );
- s += TQString( " %1 |" ).arg( (int)tr[i].point, 6, 16 );
- s += TQString( " %1 |" ).arg( (int)tr[i].min, 6 );
- s += TQString( " %1 |" ).arg( (int)tr[i].sec, 6 );
- s += TQString( " %1 |" ).arg( (int)tr[i].frame, 6 );
- s += TQString( " %1 |" ).arg( (int)tr[i].zero, 6, 16 );
- s += TQString( " %1 |" ).arg( (int)tr[i].p_min, 6 );
- s += TQString( " %1 |" ).arg( (int)tr[i].p_sec, 6 );
- s += TQString( " %1 |" ).arg( (int)tr[i].p_frame, 6 );
+ s += TQString( " %1 |" ).tqarg( (int)tr[i].session_number, 6 );
+ s += TQString( " %1 |" ).tqarg( (int)tr[i].adr, 6 );
+ s += TQString( " %1 |" ).tqarg( (int)tr[i].control, 6 );
+ s += TQString( " %1 |" ).tqarg( (int)tr[i].tno, 6 );
+ s += TQString( " %1 |" ).tqarg( (int)tr[i].point, 6, 16 );
+ s += TQString( " %1 |" ).tqarg( (int)tr[i].min, 6 );
+ s += TQString( " %1 |" ).tqarg( (int)tr[i].sec, 6 );
+ s += TQString( " %1 |" ).tqarg( (int)tr[i].frame, 6 );
+ s += TQString( " %1 |" ).tqarg( (int)tr[i].zero, 6, 16 );
+ s += TQString( " %1 |" ).tqarg( (int)tr[i].p_min, 6 );
+ s += TQString( " %1 |" ).tqarg( (int)tr[i].p_sec, 6 );
+ s += TQString( " %1 |" ).tqarg( (int)tr[i].p_frame, 6 );
k3bDebug() << s << endl;
}
diff --git a/libk3bdevice/k3bdevice.h b/libk3bdevice/k3bdevice.h
index 6d77e98..9f564ee 100644
--- a/libk3bdevice/k3bdevice.h
+++ b/libk3bdevice/k3bdevice.h
@@ -558,7 +558,7 @@ namespace K3bDevice
* if true is returned dataLen specifies the actual length of *data which needs to be
* deleted after using.
*/
- bool mechanismStatus( unsigned char** data, unsigned int& dataLen ) const;
+ bool mechanismtqStatus( unsigned char** data, unsigned int& dataLen ) const;
/**
* Read a single feature.
diff --git a/libk3bdevice/k3bdevice_mmc.cpp b/libk3bdevice/k3bdevice_mmc.cpp
index 88e2174..f4258ae 100644
--- a/libk3bdevice/k3bdevice_mmc.cpp
+++ b/libk3bdevice/k3bdevice_mmc.cpp
@@ -626,7 +626,7 @@ bool K3bDevice::Device::readTocPmaAtip( unsigned char** data, unsigned int& data
}
-bool K3bDevice::Device::mechanismStatus( unsigned char** data, unsigned int& dataLen ) const
+bool K3bDevice::Device::mechanismtqStatus( unsigned char** data, unsigned int& dataLen ) const
{
unsigned char header[2048];
::memset( header, 0, 2048 );
diff --git a/libk3bdevice/k3bdevicemanager.cpp b/libk3bdevice/k3bdevicemanager.cpp
index 925539d..b319312 100644
--- a/libk3bdevice/k3bdevicemanager.cpp
+++ b/libk3bdevice/k3bdevicemanager.cpp
@@ -275,7 +275,7 @@ void K3bDevice::DeviceManager::LinuxDeviceScan()
int i = 1;
TQString dev;
while( !(dev = line.section(re, i, i)).isEmpty() ) {
- if( addDevice( TQString("/dev/%1").arg(dev) ) ) {
+ if( addDevice( TQString("/dev/%1").tqarg(dev) ) ) {
devstring += dev + "|";
}
// according to the LINUX ALLOCATED DEVICES document (http://www.lanana.org/docs/device-list/),
@@ -285,7 +285,7 @@ void K3bDevice::DeviceManager::LinuxDeviceScan()
// each physical device the next line should be better
// else if ( dev.startsWith("sr") )
if ( dev.startsWith("sr") ) {
- if( addDevice(TQString("/dev/%1").arg(dev.replace(TQRegExp("r"),"cd"))) )
+ if( addDevice(TQString("/dev/%1").tqarg(dev.replace(TQRegExp("r"),"cd"))) )
devstring += dev + "|";
}
++i;
@@ -304,7 +304,7 @@ void K3bDevice::DeviceManager::LinuxDeviceScan()
//
k3bDebug() << "(K3bDevice::DeviceManager) SCANNING FOR GENERIC DEVICES." << endl;
for( int i = 0; i < 16; i++ ) {
- TQString sgDev = resolveSymLink( TQString("/dev/sg%1").arg(i) );
+ TQString sgDev = resolveSymLink( TQString("/dev/sg%1").tqarg(i) );
int bus = -1, id = -1, lun = -1;
if( determineBusIdLun( sgDev, bus, id, lun ) ) {
if( Device* dev = findDevice( bus, id, lun ) ) {
@@ -896,7 +896,7 @@ TQString K3bDevice::DeviceManager::resolveSymLink( const TQString& path )
return path;
}
- return TQString::fromLatin1( resolved );
+ return TQString::tqfromLatin1( resolved );
}
diff --git a/libk3bdevice/k3bmmc.h b/libk3bdevice/k3bmmc.h
index bcb317e..76c9927 100644
--- a/libk3bdevice/k3bmmc.h
+++ b/libk3bdevice/k3bmmc.h
@@ -214,7 +214,7 @@ namespace K3bDevice
/**
* Based on the cdrecord struct cd_mode_page_2A
- * MM Capabilities and Mechanical Status Page
+ * MM Capabilities and Mechanical tqStatus Page
*/
#ifdef WORDS_BIGENDIAN // __BYTE_ORDER == __BIG_ENDIAN
diff --git a/libk3bdevice/k3bscsicommand.cpp b/libk3bdevice/k3bscsicommand.cpp
index 988fe7b..710b8a3 100644
--- a/libk3bdevice/k3bscsicommand.cpp
+++ b/libk3bdevice/k3bscsicommand.cpp
@@ -169,8 +169,8 @@ void K3bDevice::ScsiCommand::debugError( int command, int errorCode, int senseKe
if( m_printErrors ) {
k3bDebug() << "(K3bDevice::ScsiCommand) failed: " << endl
<< " command: " << TQString("%1 (%2)")
- .arg( K3bDevice::commandString( command ) )
- .arg( TQString::number(command, 16) ) << endl
+ .tqarg( K3bDevice::commandString( command ) )
+ .tqarg( TQString::number(command, 16) ) << endl
<< " errorcode: " << TQString::number(errorCode, 16) << endl
<< " sense key: " << senseKeyToString(senseKey) << endl
<< " asc: " << TQString::number(asc, 16) << endl
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-25 21:10:20 +0000