| -rw-r--r-- | core/applets/cardmon/cardmon.cpp | 6 | ||||
| -rw-r--r-- | core/applets/vmemo/vmemo.cpp | 9 |
2 files changed, 6 insertions, 9 deletions
diff --git a/core/applets/cardmon/cardmon.cpp b/core/applets/cardmon/cardmon.cpp index 3a6ad27..3af3d03 100644 --- a/core/applets/cardmon/cardmon.cpp +++ b/core/applets/cardmon/cardmon.cpp @@ -148,18 +148,17 @@ void CardMonitor::mousePressEvent( QMouseEvent * ) p.y() - s.height() ), 0 ); if ( opt == 1 ) { cmd = "/sbin/cardctl eject 0"; err = system( ( const char * ) cmd ); if ( err != 0 ) { - qDebug( "Could not execute `/sbin/cardctl eject 0'! err=%d", - err ); + odebug << "Could not execute `/sbin/cardctl eject 0'! err=" << err << oendl; popUp( tr( "CF/PCMCIA card eject failed!" ) ); } } else if ( opt == 0 ) { if ( ODevice::inst() ->system() == System_Familiar ) { cmd = "umount /dev/mmc/part1"; @@ -175,18 +174,17 @@ void CardMonitor::mousePressEvent( QMouseEvent * ) } } else if ( opt == 2 ) { cmd = "/sbin/cardctl eject 1"; err = system( ( const char * ) cmd ); if ( err != 0 ) { - qDebug( "Could not execute `/sbin/cardctl eject 1'! err=%d", - err ); + odebug << "Could not execute `/sbin/cardctl eject 1'! err=" << err << oendl; popUp( tr( "CF/PCMCIA card eject failed!" ) ); } } delete menu; } void CardMonitor::cardMessage( const QCString & msg, const QByteArray & ) diff --git a/core/applets/vmemo/vmemo.cpp b/core/applets/vmemo/vmemo.cpp index 835f63a..f088bef 100644 --- a/core/applets/vmemo/vmemo.cpp +++ b/core/applets/vmemo/vmemo.cpp @@ -218,17 +218,17 @@ VMemo::VMemo( QWidget *parent, const char *_name ) // else systemZaurus = FALSE; myChannel = new QCopChannel( "QPE/VMemo", this ); connect( myChannel, SIGNAL(received(const QCString&,const QByteArray&)), this, SLOT(receive(const QCString&,const QByteArray&)) ); if( toggleKey != -1 ) { - qDebug("Register key %d", toggleKey); + odebug << "Register key " << toggleKey << "" << oendl; QCopEnvelope e("QPE/Launcher", "keyRegister(int,QCString,QCString)"); // e << 4096; // Key_Escape // e << Key_F5; //4148 e << toggleKey; e << QString("QPE/VMemo"); e << QString("toggleRecord()"); } if(toggleKey == 1) @@ -471,18 +471,18 @@ int VMemo::openWAV(const char *filename) { wh.format = PCM_CODE; wh.modus = channels; wh.sample_fq = speed; wh.byte_p_sec = speed * channels * resolution/8; wh.byte_p_spl = channels * (resolution / 8); wh.bit_p_spl = resolution; wh.data_chunk = DATA; wh.data_length= 0; - // qDebug("Write header channels %d, speed %d, b/s %d, blockalign %d, bitrate %d" - // , wh.modus, wh.sample_fq, wh.byte_p_sec, wh.byte_p_spl, wh.bit_p_spl ); + // odebug << "Write header channels " << wh.modus << ", speed " << wh.sample_fq << ", b/s " + // << wh.byte_p_sec << ", blockalign " << wh.byte_p_spl << ", bitrate " << wh.bit_p_spl << oendl; write (wav, &wh, sizeof(WaveHeader)); return 1; } bool VMemo::record() { length = 0; int bytesWritten = 0; @@ -554,18 +554,17 @@ bool VMemo::record() { return FALSE; } // printf("%d\r", length); // fflush(stdout); qApp->processEvents(); } } } - // qDebug("file has length of %d lasting %d seconds", - // length, (( length / speed) / channels) / 2 ); + // odebug << "file has length of " << length << " lasting " << (( length / speed) / channels) / 2 ) << " seconds" << oendl; value = length + 36; lseek(wav, 4, SEEK_SET); write(wav, &value, 4); lseek(wav, 40, SEEK_SET); write(wav, &length, 4); |