From 09c863183250d07f82c0919e0a40fc7834c32192 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 18 Dec 2011 18:08:55 -0600 Subject: Rename old tq methods that no longer need a unique name --- libk3bdevice/k3bcdtext.cpp | 4 ++-- libk3bdevice/k3bdevice.cpp | 6 +++--- libk3bdevice/k3bdevice.h | 2 +- libk3bdevice/k3bdevice_mmc.cpp | 2 +- libk3bdevice/k3bdevicemanager.cpp | 2 +- libk3bdevice/k3bmmc.h | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) (limited to 'libk3bdevice') diff --git a/libk3bdevice/k3bcdtext.cpp b/libk3bdevice/k3bcdtext.cpp index 774c59e..ab139f3 100644 --- a/libk3bdevice/k3bcdtext.cpp +++ b/libk3bdevice/k3bcdtext.cpp @@ -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::tqfromLatin1( (char*)nullPos+1, nextNullPos - nullPos - 1 ); + txtstr = TQString::fromLatin1( (char*)nullPos+1, nextNullPos - nullPos - 1 ); else // take all chars to the end of the pack data (12 bytes) - txtstr = TQString::tqfromLatin1( (char*)nullPos+1, 11 - (nullPos - (char*)pack[i].data) ); + txtstr = TQString::fromLatin1( (char*)nullPos+1, 11 - (nullPos - (char*)pack[i].data) ); // // a tab character means to use the same as for the previous track diff --git a/libk3bdevice/k3bdevice.cpp b/libk3bdevice/k3bdevice.cpp index c20c1c0..ce398a9 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::tqfromLatin1( (char*)(inq->vendor), 8 ).stripWhiteSpace(); - m_description = TQString::tqfromLatin1( (char*)(inq->product), 16 ).stripWhiteSpace(); - m_version = TQString::tqfromLatin1( (char*)(inq->revision), 4 ).stripWhiteSpace(); + 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(); } if( m_vendor.isEmpty() ) diff --git a/libk3bdevice/k3bdevice.h b/libk3bdevice/k3bdevice.h index 9f564ee..6d77e98 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 mechanismtqStatus( unsigned char** data, unsigned int& dataLen ) const; + bool mechanismStatus( unsigned char** data, unsigned int& dataLen ) const; /** * Read a single feature. diff --git a/libk3bdevice/k3bdevice_mmc.cpp b/libk3bdevice/k3bdevice_mmc.cpp index f4258ae..88e2174 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::mechanismtqStatus( unsigned char** data, unsigned int& dataLen ) const +bool K3bDevice::Device::mechanismStatus( 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 b319312..c3d02e2 100644 --- a/libk3bdevice/k3bdevicemanager.cpp +++ b/libk3bdevice/k3bdevicemanager.cpp @@ -896,7 +896,7 @@ TQString K3bDevice::DeviceManager::resolveSymLink( const TQString& path ) return path; } - return TQString::tqfromLatin1( resolved ); + return TQString::fromLatin1( resolved ); } diff --git a/libk3bdevice/k3bmmc.h b/libk3bdevice/k3bmmc.h index 76c9927..bcb317e 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 tqStatus Page + * MM Capabilities and Mechanical Status Page */ #ifdef WORDS_BIGENDIAN // __BYTE_ORDER == __BIG_ENDIAN -- cgit v1.2.3