- convert qDebug to odebug

2 files changed, 112 insertions, 115 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
@@ -124,93 +124,91 @@ void CardMonitor::mousePressEvent( QMouseEvent * )
     {
         menu->insertItem( QIconSet( Resource::loadPixmap( "cardmon/ide" ) ),
                           tr( "Eject SD/MMC card" ), 0 );
     }
 
     if ( cardInPcmcia0 )
     {
         menu->
         insertItem( QIconSet
                     ( Resource::loadPixmap( "cardmon/" + cardInPcmcia0Type ) ),
                     tr( "Eject card 0: %1" ).arg( cardInPcmcia0Name ), 1 );
     }
 
     if ( cardInPcmcia1 )
     {
         menu->
         insertItem( QIconSet
                     ( Resource::loadPixmap( "cardmon/" + cardInPcmcia1Type ) ),
                     tr( "Eject card 1: %1" ).arg( cardInPcmcia1Name ), 2 );
     }
 
     QPoint p = mapToGlobal( QPoint( 0, 0 ) );
     QSize s = menu->sizeHint();
     int opt = menu->exec( QPoint( p.x() + ( width() / 2 ) - ( s.width() / 2 ),
                                   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";
         }
         else
         {
             cmd = "umount /dev/mmcda1";
         }
         err = system( ( const char * ) cmd );
         if ( err != 0 )
         {
             popUp( tr( "SD/MMC card eject failed!" ) );
         }
     }
     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 & )
 {
     if ( msg == "stabChanged()" )
     {
         // odebug << "Pcmcia: stabchanged" << oendl;
         getStatusPcmcia();
     }
     else if ( msg == "mtabChanged()" )
     {
         // odebug << "CARDMONAPPLET: mtabchanged" << oendl;
         getStatusSd();
     }
 }
 
 bool CardMonitor::getStatusPcmcia( int showPopUp )
 {
 
     bool cardWas0 = cardInPcmcia0;    // remember last state
     bool cardWas1 = cardInPcmcia1;
 
     QString fileName;
 
     // one of these 3 files should exist
     if ( QFile::exists( "/var/run/stab" ) )
     {
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
@@ -194,65 +194,65 @@ static char * vmemo_xpm[] = {
   "        Y Z ` b  ...+.          ",
   "          @.#.$.%.&.            ",
   "            *.B =.              ",
   "      n n n n n n n n n         "};
 
 
 using namespace Opie::Ui;
 VMemo::VMemo( QWidget *parent, const char *_name )
   : QWidget( parent, _name ) {
   setFixedHeight( 18 );
   setFixedWidth( 14 );
 
   t_timer = new QTimer( this );
   connect( t_timer, SIGNAL( timeout() ), SLOT( timerBreak() ) );
 
     Config vmCfg("Vmemo");
     vmCfg.setGroup("Defaults");
     int toggleKey = setToggleButton(vmCfg.readNumEntry("toggleKey", -1));
     useADPCM = vmCfg.readBoolEntry("use_ADPCM", 0);
 
     odebug << "toggleKey " << toggleKey << "" << oendl;
 
 //     if ( QFile::exists ( "/dev/sharp_buz" ) || QFile::exists ( "/dev/sharp_led" ))
 //          systemZaurus=TRUE;
 //     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)
         usingIcon = TRUE;
     else
         usingIcon = FALSE;
 //     if( vmCfg.readNumEntry("hideIcon",0) == 1)
 //       hide();
     recording = FALSE;
     // }
 }
 
 VMemo::~VMemo() {
 }
 
 int VMemo::position()
 {
     return 6;
 }
 
 void VMemo::receive( const QCString &msg, const QByteArray &data ) {
   odebug << "Vmemo receive" << oendl;
   QDataStream stream( data, IO_ReadOnly );
 
   if (msg == "toggleRecord()")  {
       if (recording) {
           fromToggle = TRUE;
@@ -447,195 +447,194 @@ int VMemo::openDSP() {
 }
 
 int VMemo::openWAV(const char *filename) {
   track.setName(filename);
   if(!track.open(IO_WriteOnly|IO_Truncate|IO_Raw)) {
     errorMsg=filename;
     return -1;
   }
 
   wav=track.handle();
     Config vmCfg("Vmemo");
     vmCfg.setGroup("Defaults");
   useADPCM = vmCfg.readBoolEntry("use_ADPCM", 0);
 
   WaveHeader wh;
 
   wh.main_chunk = RIFF;
   wh.length=0;
   wh.chunk_type = WAVE;
   wh.sub_chunk  = FMT;
   wh.sc_len     = 16;
   if(useADPCM)
       wh.format     = WAVE_FORMAT_DVI_ADPCM;//PCM_CODE;
   else
       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;
+        length = 0;
     int bytesWritten = 0;
-		int result = 0;
-		int value = 0;
-		QString msg;
-		msg.sprintf("Recording format %d", format);
-		odebug << msg << oendl;
-		Config config("Vmemo");
-		config.setGroup("Record");
-		int sRate = config.readNumEntry("SizeLimit", 30);
-		if(sRate > 0)
-				t_timer->start( sRate * 1000+1000, TRUE);
+        int result = 0;
+        int value = 0;
+        QString msg;
+        msg.sprintf("Recording format %d", format);
+        odebug << msg << oendl;
+        Config config("Vmemo");
+        config.setGroup("Record");
+        int sRate = config.readNumEntry("SizeLimit", 30);
+        if(sRate > 0)
+                t_timer->start( sRate * 1000+1000, TRUE);
 
     msg.sprintf("Recording format other");
     odebug << msg << oendl;
 
     config.setGroup("Defaults");
     useADPCM = config.readBoolEntry("use_ADPCM", 0);
 
-		int bufsize = config.readNumEntry("BufferSize",1024);
-		unsigned short sound[bufsize]; //, monoBuffer[bufsize];
+        int bufsize = config.readNumEntry("BufferSize",1024);
+        unsigned short sound[bufsize]; //, monoBuffer[bufsize];
     char abuf[bufsize / 2];
     short sbuf[bufsize];
 
-		if(useADPCM) {
-				while(recording) {
-						result = ::read(dsp, sbuf, bufsize); // adpcm read
-						if( result <= 0) {
-								perror("recording error ");
-								QMessageBox::message(tr("Note"),tr("error recording"));
-								recording = FALSE;
-								break;
-								return FALSE;
-						}
-						adpcm_coder( sbuf, abuf, result/2, &encoder_state);
-						bytesWritten = ::write(wav, abuf, result/4); // adpcm write
-						length += bytesWritten;
-
-						if(length < 0) {
-								recording = false;
-								perror("dev/dsp's is a lookin' messy");
-								QMessageBox::message("Vmemo","Error writing to file\n"+ fileName);
-								break;
-								return FALSE;
-						}
-							//       printf("%d\r", length);
-							//       fflush(stdout);
-						qApp->processEvents();
-				}
-		} else {
-				while(recording) {
-						result = ::read(dsp, sound, bufsize); // read
-						if( result <= 0) {
-								perror("recording error ");
-								QMessageBox::message(tr("Note"),tr("error recording"));
-								recording = FALSE;
-								break;
-								return FALSE;
-
-								bytesWritten = ::write(wav, sound, result); // write
-								length += bytesWritten;
-
-								if(length < 0) {
-										recording = false;
-										perror("dev/dsp's is a lookin' messy");
-										QMessageBox::message("Vmemo","Error writing to file\n"+ fileName);
-										break;
-										return FALSE;
-								}
-									//       printf("%d\r", length);
-									//       fflush(stdout);
-								qApp->processEvents();
-						}
-				}
-		}
-			//  qDebug("file has length of %d lasting %d seconds",
-			//         length, (( length / speed) / channels) / 2 );
-
-		value = length + 36;
-
-		lseek(wav, 4, SEEK_SET);
-		write(wav, &value, 4);
-		lseek(wav, 40, SEEK_SET);
-
-		write(wav, &length, 4);
-
-		track.close();
-		odebug << "Track closed" << oendl;
-
-		if( ioctl( dsp, SNDCTL_DSP_RESET,0) == -1)
-				perror("ioctl(\"SNDCTL_DSP_RESET\")");
-
-		::close(dsp);
-
-		Config cfgO("OpieRec");
-		cfgO.setGroup("Sounds");
-
-		int nFiles = cfgO.readNumEntry( "NumberofFiles",0);
-
-		QString currentFileName = fileName;
-		QString currentFile = "vm_"+ date;
-
-		float numberOfRecordedSeconds = (float) length / (float)speed * (float)2;
-
-		cfgO.writeEntry( "NumberofFiles", nFiles + 1);
-		cfgO.writeEntry( QString::number( nFiles + 1), currentFile);
-		cfgO.writeEntry( currentFile, currentFileName);
-
-		QString time;
-		time.sprintf("%.2f", numberOfRecordedSeconds);
-		cfgO.writeEntry( currentFileName, time );
+        if(useADPCM) {
+                while(recording) {
+                        result = ::read(dsp, sbuf, bufsize); // adpcm read
+                        if( result <= 0) {
+                                perror("recording error ");
+                                QMessageBox::message(tr("Note"),tr("error recording"));
+                                recording = FALSE;
+                                break;
+                                return FALSE;
+                        }
+                        adpcm_coder( sbuf, abuf, result/2, &encoder_state);
+                        bytesWritten = ::write(wav, abuf, result/4); // adpcm write
+                        length += bytesWritten;
+
+                        if(length < 0) {
+                                recording = false;
+                                perror("dev/dsp's is a lookin' messy");
+                                QMessageBox::message("Vmemo","Error writing to file\n"+ fileName);
+                                break;
+                                return FALSE;
+                        }
+                            //       printf("%d\r", length);
+                            //       fflush(stdout);
+                        qApp->processEvents();
+                }
+        } else {
+                while(recording) {
+                        result = ::read(dsp, sound, bufsize); // read
+                        if( result <= 0) {
+                                perror("recording error ");
+                                QMessageBox::message(tr("Note"),tr("error recording"));
+                                recording = FALSE;
+                                break;
+                                return FALSE;
+
+                                bytesWritten = ::write(wav, sound, result); // write
+                                length += bytesWritten;
+
+                                if(length < 0) {
+                                        recording = false;
+                                        perror("dev/dsp's is a lookin' messy");
+                                        QMessageBox::message("Vmemo","Error writing to file\n"+ fileName);
+                                        break;
+                                        return FALSE;
+                                }
+                                    //       printf("%d\r", length);
+                                    //       fflush(stdout);
+                                qApp->processEvents();
+                        }
+                }
+        }
+            //  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);
+
+        track.close();
+        odebug << "Track closed" << oendl;
+
+        if( ioctl( dsp, SNDCTL_DSP_RESET,0) == -1)
+                perror("ioctl(\"SNDCTL_DSP_RESET\")");
+
+        ::close(dsp);
+
+        Config cfgO("OpieRec");
+        cfgO.setGroup("Sounds");
+
+        int nFiles = cfgO.readNumEntry( "NumberofFiles",0);
+
+        QString currentFileName = fileName;
+        QString currentFile = "vm_"+ date;
+
+        float numberOfRecordedSeconds = (float) length / (float)speed * (float)2;
+
+        cfgO.writeEntry( "NumberofFiles", nFiles + 1);
+        cfgO.writeEntry( QString::number( nFiles + 1), currentFile);
+        cfgO.writeEntry( currentFile, currentFileName);
+
+        QString time;
+        time.sprintf("%.2f", numberOfRecordedSeconds);
+        cfgO.writeEntry( currentFileName, time );
       //      odebug << "writing config numberOfRecordedSeconds "+time << oendl;
 
-		cfgO.write();
+        cfgO.write();
 
-		odebug << "done recording "+fileName << oendl;
+        odebug << "done recording "+fileName << oendl;
 
-		Config cfg("qpe");
-		cfg.setGroup("Volume");
-		QString foo = cfg.readEntry("Mute","TRUE");
-		if(foo.find("TRUE",0,TRUE) != -1)
-				QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << TRUE; //mute
-		return TRUE;
+        Config cfg("qpe");
+        cfg.setGroup("Volume");
+        QString foo = cfg.readEntry("Mute","TRUE");
+        if(foo.find("TRUE",0,TRUE) != -1)
+                QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << TRUE; //mute
+        return TRUE;
 }
 
 int VMemo::setToggleButton(int tog) {
 
   for( int i=0; i < 10;i++) {
     switch (tog) {
     case 0:
       return -1;
       break;
     case 1:
       return 0;
       break;
     case 2:
         return Key_F24; //was Escape
       break;
     case 3:
       return Key_Space;
       break;
     case 4:
       return Key_F12;
       break;
     case 5:
       return Key_F9;
       break;
     case 6:
       return Key_F10;
       break;
     case 7:
       return Key_F11;
       break;
     case 8:
       return Key_F13;