From d8cc8bdfa7fa624a526d5aa1626974e1444cb799 Mon Sep 17 00:00:00 2001 From: tpearson Date: Fri, 27 May 2011 19:21:21 +0000 Subject: TQt4 port k3b This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/k3b@1233803 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- libk3bdevice/k3bscsicommand.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'libk3bdevice/k3bscsicommand.cpp') diff --git a/libk3bdevice/k3bscsicommand.cpp b/libk3bdevice/k3bscsicommand.cpp index 2b34217..710b8a3 100644 --- a/libk3bdevice/k3bscsicommand.cpp +++ b/libk3bdevice/k3bscsicommand.cpp @@ -19,7 +19,7 @@ #include -QString K3bDevice::commandString( const unsigned char& command ) +TQString K3bDevice::commandString( const unsigned char& command ) { if( command == MMC_BLANK ) return "BLANK"; @@ -35,8 +35,8 @@ QString K3bDevice::commandString( const unsigned char& command ) return "GET EVENT STATUS NOTIFICATION"; if( command == MMC_GET_PERFORMANCE ) return "GET PERFORMANCE"; - if( command == MMC_INQUIRY ) - return "INQUIRY"; + if( command == MMC_INTQUIRY ) + return "INTQUIRY"; if( command == MMC_LOAD_UNLOAD_MEDIUM ) return "LOAD/UNLOAD MEDIUM"; if( command == MMC_MECHANISM_STATUS ) @@ -130,7 +130,7 @@ QString K3bDevice::commandString( const unsigned char& command ) } -QString K3bDevice::ScsiCommand::senseKeyToString( int key ) +TQString K3bDevice::ScsiCommand::senseKeyToString( int key ) { switch( key ) { case 0x0: @@ -168,13 +168,13 @@ QString K3bDevice::ScsiCommand::senseKeyToString( int key ) void K3bDevice::ScsiCommand::debugError( int command, int errorCode, int senseKey, int asc, int ascq ) { if( m_printErrors ) { k3bDebug() << "(K3bDevice::ScsiCommand) failed: " << endl - << " command: " << QString("%1 (%2)") - .arg( K3bDevice::commandString( command ) ) - .arg( QString::number(command, 16) ) << endl - << " errorcode: " << QString::number(errorCode, 16) << endl + << " command: " << TQString("%1 (%2)") + .tqarg( K3bDevice::commandString( command ) ) + .tqarg( TQString::number(command, 16) ) << endl + << " errorcode: " << TQString::number(errorCode, 16) << endl << " sense key: " << senseKeyToString(senseKey) << endl - << " asc: " << QString::number(asc, 16) << endl - << " ascq: " << QString::number(ascq, 16) << endl; + << " asc: " << TQString::number(asc, 16) << endl + << " ascq: " << TQString::number(ascq, 16) << endl; } } -- cgit v1.2.3