CVS commit by antlarr: Compile correctly when enabling debug output by not using implicit ascii casts and including when appropiate M +4 -3 qobexbfbtransport.cpp 1.6 M +1 -1 qobexirdatransport.cpp 1.4 M +4 -4 qobexserverops.cpp 1.11 --- kdeextragear-3/kdebluetooth/libqobex/qobex/qobexbfbtransport.cpp #1.5:1.6 @@ -27,4 +27,5 @@ #include +#include #include "qserialdevice.h" @@ -493,5 +494,5 @@ void QObexBfbTransport::slotIOReady() { QString answer = mSerial.readLine(); myDebug(( "QObexBfbTransport::slotIOReady(): Answer is %s", - (const char*)answer )); + answer.latin1() )); if ( answer == "OK" ) { myDebug(( "QObexBfbTransport::slotIOReady(): Sending AT+CGMI" )); @@ -513,5 +514,5 @@ void QObexBfbTransport::slotIOReady() { QString answer = mSerial.readLine(); myDebug(( "QObexBfbTransport::slotIOReady(): Answer is %s", - (const char*)answer )); + answer.latin1() )); if ( answer == "SIEMENS" || answer == "AT+CGMI" || answer.isEmpty() ) { // Ok, wait for the next line @@ -535,5 +536,5 @@ void QObexBfbTransport::slotIOReady() { QString answer = mSerial.readLine(); myDebug(( "QObexBfbTransport::slotIOReady(): Answer is %s", - (const char*)answer )); + answer.latin1() )); if ( answer == "OK" ) { myDebug(( "QObexBfbTransport::slotIOReady(): Sending Ping" )); --- kdeextragear-3/kdebluetooth/libqobex/qobex/qobexserverops.cpp #1.10:1.11 @@ -123,20 +123,20 @@ bool QObexServerOps::isRootDir() const { bool QObexServerOps::oneDirectoryUp() { - myDebug(( "QObexServerOps::oneDirectoryUp(): enter %s", (const char*)mCwd )); + myDebug(( "QObexServerOps::oneDirectoryUp(): enter %s", mCwd.latin1() )); if ( isRootDir() ) return false; mCwd = QDir::cleanDirPath ( "./" + mCwd + "/.." ); - myDebug(( "QObexServerOps::oneDirectoryUp(): exit %s", (const char*)mCwd )); + myDebug(( "QObexServerOps::oneDirectoryUp(): exit %s", mCwd.latin1())); return true; } bool QObexServerOps::enterDirectory( const QString& dir, bool backup ) { - myDebug(( "QObexServerOps::enterDirectory( %s ): enter %s", (const char*) dir, (const char*)mCwd )); + myDebug(( "QObexServerOps::enterDirectory( %s ): enter %s", dir.latin1(), mCwd.latin1() )); if ( backup && isRootDir() ) return false; mCwd = QDir::cleanDirPath( "./" + mCwd + ( backup ? "/../" : "/" ) + dir ); - myDebug(( "QObexServerOps::enterDirectory( %s ): exit %s", (const char*)mCwd )); + myDebug(( "QObexServerOps::enterDirectory( %s ): exit %s", dir.latin1(), mCwd.latin1() )); return true; } --- kdeextragear-3/kdebluetooth/libqobex/qobex/qobexirdatransport.cpp #1.3:1.4 @@ -319,5 +319,5 @@ QMap QObexIrDATranspor /* Pick this device */ res[ ntohl( devs.dev[i].daddr ) ] = name; - myDebug(( " name = %s, addr = 0x%08x", (const char*)name, + myDebug(( " name = %s, addr = 0x%08x", name.latin1(), devs.dev[i].daddr )); }