convert to Opie Debugging Framework

28 files changed, 271 insertions, 246 deletions

diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp
index 28a42eb..36def67 100644
--- a/noncore/multimedia/opieplayer2/audiowidget.cpp
+++ b/noncore/multimedia/opieplayer2/audiowidget.cpp
@@ -135,3 +135,3 @@ void AudioWidget::sliderReleased() {
 void AudioWidget::setPosition( long i ) {
-    //    qDebug("<<<<<<<<<<<<<<<<<<<<<<<<set position %d",i);
+    //    odebug << "<<<<<<<<<<<<<<<<<<<<<<<<set position " << i << "" << oendl; 
     updateSlider( i, mediaPlayerState.length() );
@@ -189,3 +189,3 @@ void AudioWidget::setSeekable( bool isSeekable ) {
     if ( !isSeekable ) {
-        qDebug("<<<<<<<<<<<<<<file is STREAMING>>>>>>>>>>>>>>>>>>>");
+        odebug << "<<<<<<<<<<<<<<file is STREAMING>>>>>>>>>>>>>>>>>>>" << oendl; 
         if( !slider.isHidden()) {
@@ -201,3 +201,3 @@ void AudioWidget::setSeekable( bool isSeekable ) {
         slider.show();
-        qDebug( " CONNECT SET POSTION " );
+        odebug << " CONNECT SET POSTION " << oendl; 
         connect( &mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) );
@@ -273,3 +273,3 @@ void AudioWidget::keyReleaseEvent( QKeyEvent *e) {
            hide();
-           //           qDebug("Audio F9");
+           //           odebug << "Audio F9" << oendl; 
            e->accept();
diff --git a/noncore/multimedia/opieplayer2/lib.cpp b/noncore/multimedia/opieplayer2/lib.cpp
index a42b8e5..5c24dbe 100644
--- a/noncore/multimedia/opieplayer2/lib.cpp
+++ b/noncore/multimedia/opieplayer2/lib.cpp
@@ -108,6 +108,6 @@ void Lib::run()
 {
-    qDebug( "Lib::run() started" );
+    odebug << "Lib::run() started" << oendl; 
     initialize();
     m_initialized = true;
-    qDebug( "Lib::run() finished" );
+    odebug << "Lib::run() finished" << oendl; 
 }
@@ -217,3 +217,3 @@ void Lib::stop() {
 
-    qDebug("<<<<<<<< STOP IN LIB TRIGGERED >>>>>>>");
+    odebug << "<<<<<<<< STOP IN LIB TRIGGERED >>>>>>>" << oendl; 
     xine_stop( m_stream );
@@ -329,5 +329,5 @@ void Lib::ensureInitialized()
 
-    qDebug( "waiting for initialization thread to finish" );
+    odebug << "waiting for initialization thread to finish" << oendl; 
     wait();
-    qDebug( "initialization thread finished!" );
+    odebug << "initialization thread finished!" << oendl; 
 }
@@ -424,3 +424,3 @@ void Lib::drawFrame( uint8_t* frame,  int width,  int height,  int bytes ) {
     if ( !m_video ) {
-        qWarning("not showing video now");
+        owarn << "not showing video now" << oendl; 
         return;
diff --git a/noncore/multimedia/opieplayer2/mediaplayer.cpp b/noncore/multimedia/opieplayer2/mediaplayer.cpp
index a236775..7e38fc7 100644
--- a/noncore/multimedia/opieplayer2/mediaplayer.cpp
+++ b/noncore/multimedia/opieplayer2/mediaplayer.cpp
@@ -154,3 +154,3 @@ void MediaPlayer::next() {
     } else { //if playing from file list, let's just stop
-        qDebug("<<<<<<<<<<<<<<<<<stop for filelists");
+        odebug << "<<<<<<<<<<<<<<<<<stop for filelists" << oendl; 
         mediaPlayerState.setPlaying(false);
@@ -287,3 +287,3 @@ void MediaPlayer::blank( bool b ) {
         if ( b ) {
-            qDebug("do blanking");
+            odebug << "do blanking" << oendl; 
 #ifdef QT_QWS_SL5XXX
@@ -299,3 +299,3 @@ void MediaPlayer::blank( bool b ) {
         } else {
-            qDebug("do unblanking");
+            odebug << "do unblanking" << oendl; 
             ioctl( fd, FBIOBLANK, 0);
@@ -311,3 +311,3 @@ void MediaPlayer::blank( bool b ) {
     } else {
-        qDebug("<< /dev/fb0 could not be opened  >>");
+        odebug << "<< /dev/fb0 could not be opened  >>" << oendl; 
     }
@@ -327,3 +327,3 @@ void MediaPlayer::keyReleaseEvent( QKeyEvent *e) {
       case Key_F12: //home
-          qDebug("Blank here");
+          odebug << "Blank here" << oendl; 
 //          mediaPlayerState->toggleBlank();
@@ -331,3 +331,3 @@ void MediaPlayer::keyReleaseEvent( QKeyEvent *e) {
       case Key_F13: //mail
-          qDebug("Blank here");
+          odebug << "Blank here" << oendl; 
           //  mediaPlayerState->toggleBlank();
diff --git a/noncore/multimedia/opieplayer2/om3u.cpp b/noncore/multimedia/opieplayer2/om3u.cpp
index 26d5e15..95dbab5 100644
--- a/noncore/multimedia/opieplayer2/om3u.cpp
+++ b/noncore/multimedia/opieplayer2/om3u.cpp
@@ -39,3 +39,3 @@ Om3u::Om3u( const QString &filePath, int mode)
       : QStringList (){
-qDebug("<<<<<<<new m3u "+filePath);
+odebug << "<<<<<<<new m3u "+filePath << oendl; 
   f.setName(filePath);
@@ -47,3 +47,3 @@ Om3u::~Om3u(){}
 void Om3u::readM3u() {
-//    qDebug("<<<<<<reading m3u "+f.name());
+//    odebug << "<<<<<<reading m3u "+f.name() << oendl; 
     QTextStream t(&f);
@@ -53,3 +53,3 @@ void Om3u::readM3u() {
         s=t.readLine();
-//                qDebug(s);
+//                odebug << s << oendl; 
         if( s.find( "#", 0, TRUE) == -1 ) {
@@ -62,3 +62,3 @@ void Om3u::readM3u() {
                     append(s);
-//                    qDebug(s);
+//                    odebug << s << oendl; 
                 } else { // is url
@@ -82,3 +82,3 @@ void Om3u::readPls() { //it's a pls file
                 s.replace( QRegExp( "%20" )," ");
-//                qDebug( "adding " + s + " to playlist" );
+//                odebug << "adding " + s + " to playlist" << oendl; 
                 // numberofentries=2
@@ -116,3 +116,3 @@ void Om3u::write() { //writes list to m3u file
     for ( QStringList::ConstIterator it = begin(); it != end(); ++it ) {
-//      qDebug(*it);
+//      odebug << *it << oendl; 
 				t << *it << "\n";
@@ -132,3 +132,3 @@ void Om3u::remove(const QString &filePath) { //removes from m3u list
       currentFile=*it;
-      //        qDebug(*it);
+      //        odebug << *it << oendl; 
 
diff --git a/noncore/multimedia/opieplayer2/playlistselection.cpp b/noncore/multimedia/opieplayer2/playlistselection.cpp
index 015896f..3499837 100644
--- a/noncore/multimedia/opieplayer2/playlistselection.cpp
+++ b/noncore/multimedia/opieplayer2/playlistselection.cpp
@@ -46,3 +46,3 @@ PlayListSelection::PlayListSelection( QWidget *parent, const char *name )
 {
-//    qDebug("starting playlistselector");
+//    odebug << "starting playlistselector" << oendl; 
 // #ifdef USE_PLAYLIST_BACKGROUND
@@ -67,3 +67,3 @@ PlayListSelection::~PlayListSelection() {
 void PlayListSelection::drawBackground( QPainter *p, const QRect &r ) {
-//  qDebug("drawBackground");
+//  odebug << "drawBackground" << oendl; 
    p->fillRect( r, QBrush( white ) );
@@ -186,3 +186,3 @@ void PlayListSelection::writeCurrent( Config& cfg ) {
         cfg.writeEntry("current", item->text(0) );
-    qDebug(item->text(0));
+    odebug << item->text(0) << oendl; 
 
@@ -195,5 +195,5 @@ void  PlayListSelection::setSelectedItem(const QString &strk ) {
     for ( ; it.current(); ++it ) {
-//        qDebug( it.current()->text(0));
+//        odebug << it.current()->text(0) << oendl; 
         if( strk == it.current()->text(0)) {
-//             qDebug( "We have a match "+strk);
+//             odebug << "We have a match "+strk << oendl; 
             setSelected( it.current(), TRUE);
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp
index 4460833..956d206 100644
--- a/noncore/multimedia/opieplayer2/playlistwidget.cpp
+++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp
@@ -184,3 +184,3 @@ void PlayListWidget::writeDefaultPlaylist() {
       Om3u *m3uList;
-      //    qDebug("<<<<<<<<<<<<<default>>>>>>>>>>>>>>>>>>>");
+      //    odebug << "<<<<<<<<<<<<<default>>>>>>>>>>>>>>>>>>>" << oendl; 
       if( d->selectedFiles->first() ) {
@@ -188,3 +188,3 @@ void PlayListWidget::writeDefaultPlaylist() {
         do {
-          //        qDebug(d->selectedFiles->current()->file());
+          //        odebug << d->selectedFiles->current()->file() << oendl; 
           m3uList->add( d->selectedFiles->current()->file() );
@@ -327,3 +327,3 @@ void PlayListWidget::addAllVideoToList() {
 void PlayListWidget::setDocument( const QString& fileref ) {
-  //    qDebug( "<<<<<<<<set document>>>>>>>>>> "+fileref );
+  //    odebug << "<<<<<<<<set document>>>>>>>>>> "+fileref << oendl; 
     fromSetDocument = TRUE;
@@ -403,3 +403,3 @@ bool PlayListWidget::prev() {
 bool PlayListWidget::next() {
-//qDebug("<<<<<<<<<<<<next()");
+//odebug << "<<<<<<<<<<<<next()" << oendl; 
     if ( mediaPlayerState->isShuffled() ) {
@@ -614,3 +614,3 @@ void PlayListWidget::openURL() {
         filename = fileDlg->text();
-        qDebug( "Selected filename is " + filename );
+        odebug << "Selected filename is " + filename << oendl; 
         //            Om3u *m3uList;
@@ -690,3 +690,3 @@ void PlayListWidget::openFile() {
 
-        qDebug( "Selected filename is " + str );
+        odebug << "Selected filename is " + str << oendl; 
         filename = str;
@@ -708,3 +708,3 @@ void PlayListWidget::openFile() {
 void PlayListWidget::readListFromFile( const QString &filename ) {
-    qDebug( "read list filename " + filename );
+    odebug << "read list filename " + filename << oendl; 
     QFileInfo fi(filename);
@@ -721,3 +721,3 @@ void PlayListWidget::readListFromFile( const QString &filename ) {
         s = *it;
-        //        qDebug(s);
+        //        odebug << s << oendl; 
         if(s.left(4)=="http") {
@@ -755,3 +755,3 @@ void PlayListWidget::readListFromFile( const QString &filename ) {
  void PlayListWidget::writeCurrentM3u() {
-   qDebug("writing to current m3u");
+   odebug << "writing to current m3u" << oendl; 
    Config cfg( "OpiePlayer" );
@@ -765,3 +765,3 @@ void PlayListWidget::readListFromFile( const QString &filename ) {
        do {
-           //      qDebug( "add writeCurrentM3u " +d->selectedFiles->current()->file());
+           //      odebug << "add writeCurrentM3u " +d->selectedFiles->current()->file() << oendl; 
            m3uList->add( d->selectedFiles->current()->file() );
@@ -769,3 +769,3 @@ void PlayListWidget::readListFromFile( const QString &filename ) {
        while ( d->selectedFiles->next() );
-       //    qDebug( "<<<<<<<<<<<<>>>>>>>>>>>>>>>>>" );
+       //    odebug << "<<<<<<<<<<<<>>>>>>>>>>>>>>>>>" << oendl; 
        m3uList->write();
@@ -814,3 +814,3 @@ void PlayListWidget::writem3u() {
         //       name = fileDlg->text();
-//        qDebug( filename );
+//        odebug << filename << oendl; 
         if( name.find("/",0,true) != -1) {// assume they specify a file path
@@ -832,3 +832,3 @@ void PlayListWidget::writem3u() {
           while ( d->selectedFiles->next() );
-          //    qDebug( list );
+          //    odebug << list << oendl; 
           m3uList->write();
@@ -844,3 +844,3 @@ void PlayListWidget::writem3u() {
 
-          // qDebug(filename);
+          // odebug << filename << oendl; 
           Config config( "OpiePlayer" );
@@ -852,3 +852,3 @@ void PlayListWidget::writem3u() {
           if(!lnk.writeLink()) {
-            qDebug("Writing doclink did not work");
+            odebug << "Writing doclink did not work" << oendl; 
           }
@@ -886,3 +886,3 @@ void PlayListWidget::keyReleaseEvent( QKeyEvent *e ) {
     //       case Key_P: //play
-    //           qDebug("Play");
+    //           odebug << "Play" << oendl; 
     //           playSelected();
@@ -916,3 +916,3 @@ void PlayListWidget::keyReleaseEvent( QKeyEvent *e ) {
 void PlayListWidget::pmViewActivated(int index) {
-//  qDebug("%d", index);
+//  odebug << "" << index << "" << oendl; 
     switch(index) {
@@ -946,3 +946,3 @@ void PlayListWidget::populateSkinsMenu() {
         skinName =  fi->fileName();
-//        qDebug(  fi->fileName() );
+//        odebug << fi->fileName() << oendl; 
         if( skinName != "." &&  skinName != ".." && skinName !="CVS" )  {
@@ -1002,3 +1002,3 @@ QString PlayListWidget::currentFileListPathName() const {
 void PlayListWidget::qcopReceive(const QCString &msg, const QByteArray &data) {
-   qDebug("qcop message "+msg );
+   odebug << "qcop message "+msg << oendl; 
    QDataStream stream ( data, IO_ReadOnly );
diff --git a/noncore/multimedia/opieplayer2/playlistwidgetgui.cpp b/noncore/multimedia/opieplayer2/playlistwidgetgui.cpp
index 2ff190d..922f9d7 100644
--- a/noncore/multimedia/opieplayer2/playlistwidgetgui.cpp
+++ b/noncore/multimedia/opieplayer2/playlistwidgetgui.cpp
@@ -185,3 +185,3 @@ void PlayListWidgetGui::setView( char view )  {
 void PlayListWidgetGui::setActiveWindow()  {
-    //  qDebug("SETTING active window");
+    //  odebug << "SETTING active window" << oendl; 
     // When we get raised we need to ensure that it switches views
diff --git a/noncore/multimedia/opieplayer2/skin.cpp b/noncore/multimedia/opieplayer2/skin.cpp
index 7c38983..84f5f87 100644
--- a/noncore/multimedia/opieplayer2/skin.cpp
+++ b/noncore/multimedia/opieplayer2/skin.cpp
@@ -180,3 +180,3 @@ SkinData *SkinCache::lookupAndTake( const QString &skinPath, const QString &file
     else
-        qDebug( "SkinCache: hit" );
+        odebug << "SkinCache: hit" << oendl; 
 
@@ -184,3 +184,3 @@ SkinData *SkinCache::lookupAndTake( const QString &skinPath, const QString &file
     if ( bgPixmap ) {
-        qDebug( "SkinCache: hit on bgpixmap" );
+        odebug << "SkinCache: hit on bgpixmap" << oendl; 
         data->backgroundPixmap = *bgPixmap;
@@ -220,3 +220,3 @@ SkinLoader::IncrementalLoader::LoaderResult SkinLoader::IncrementalLoader::loadS
         case LoadBackgroundPixmap:
-            qDebug( "load bgpixmap" );
+            odebug << "load bgpixmap" << oendl; 
             m_skin.backgroundPixmap();
@@ -225,3 +225,3 @@ SkinLoader::IncrementalLoader::LoaderResult SkinLoader::IncrementalLoader::loadS
         case LoadButtonUpImage:
-            qDebug( "load upimage" );
+            odebug << "load upimage" << oendl; 
             m_skin.buttonUpImage();
@@ -230,3 +230,3 @@ SkinLoader::IncrementalLoader::LoaderResult SkinLoader::IncrementalLoader::loadS
         case LoadButtonDownImage:
-            qDebug( "load downimage" );
+            odebug << "load downimage" << oendl; 
             m_skin.buttonDownImage();
@@ -236,3 +236,3 @@ SkinLoader::IncrementalLoader::LoaderResult SkinLoader::IncrementalLoader::loadS
         case LoadButtonMasks:
-            qDebug( "load button masks %i", m_currentButton );
+            odebug << "load button masks " << m_currentButton << "" << oendl; 
             m_skin.buttonMaskImage( m_info.buttonInfo[ m_currentButton ].fileName );
@@ -245,3 +245,3 @@ SkinLoader::IncrementalLoader::LoaderResult SkinLoader::IncrementalLoader::loadS
         case LoadButtonMask:
-            qDebug( "load whole mask" );
+            odebug << "load whole mask" << oendl; 
             m_skin.buttonMask( m_info.buttonInfo, m_info.buttonCount );
@@ -260,3 +260,3 @@ SkinLoader::~SkinLoader()
 {
-    qDebug( "SkinLoader::~SkinLoader()" );
+    odebug << "SkinLoader::~SkinLoader()" << oendl; 
     killTimers();
@@ -279,3 +279,3 @@ void SkinLoader::start()
     m_timerId = startTimer( 100 /* ms */ );
-    qDebug( "SkinLoader::start() %d jobs", pendingSkins.count() );
+    odebug << "SkinLoader::start() " << pendingSkins.count() << " jobs" << oendl; 
 }
@@ -292,3 +292,3 @@ void SkinLoader::timerEvent( QTimerEvent *ev )
         if ( pendingSkins.isEmpty() ) {
-            qDebug( "all jobs done" );
+            odebug << "all jobs done" << oendl; 
             killTimer( m_timerId );
@@ -304,3 +304,3 @@ void SkinLoader::timerEvent( QTimerEvent *ev )
         m_currentLoader = new IncrementalLoader( nfo );
-        qDebug( "new loader %i jobs left", pendingSkins.count() );
+        odebug << "new loader " << pendingSkins.count() << " jobs left" << oendl; 
     }
@@ -312,3 +312,3 @@ void SkinLoader::timerEvent( QTimerEvent *ev )
 
-    qDebug( "finished step" );
+    odebug << "finished step" << oendl; 
 }
diff --git a/noncore/multimedia/opieplayer2/threadutil.cpp b/noncore/multimedia/opieplayer2/threadutil.cpp
index fb951b4..d8b8abe 100644
--- a/noncore/multimedia/opieplayer2/threadutil.cpp
+++ b/noncore/multimedia/opieplayer2/threadutil.cpp
@@ -189,3 +189,3 @@ void Thread::start()
     if ( d->isRunning ) {
-        qDebug( "ThreadUtil::Thread::start() called for running thread." );
+        odebug << "ThreadUtil::Thread::start() called for running thread." << oendl; 
         return;
@@ -198,3 +198,3 @@ void Thread::start()
     if ( err != 0 ) {
-        qDebug( "ThreadUtil::Thread::start() : can't create thread: %s", strerror( err ) );
+        odebug << "ThreadUtil::Thread::start() : can't create thread: " << strerror( err ) << "" << oendl; 
         pthread_attr_destroy( &attributes );
@@ -286,3 +286,3 @@ void ChannelMessage::reply()
     {
-        qDebug( "ChannelMessage::reply() - can't reply oneway message!" );
+        odebug << "ChannelMessage::reply() - can't reply oneway message!" << oendl; 
         return;
diff --git a/noncore/multimedia/opieplayer2/xinecontrol.cpp b/noncore/multimedia/opieplayer2/xinecontrol.cpp
index 8f11b2e..94f99f8 100644
--- a/noncore/multimedia/opieplayer2/xinecontrol.cpp
+++ b/noncore/multimedia/opieplayer2/xinecontrol.cpp
@@ -95,3 +95,3 @@ void XineControl::play( const QString& fileName ) {
 
-    qDebug("<<FILENAME: " + fileName  + ">>>>");
+    odebug << "<<FILENAME: " + fileName  + ">>>>" << oendl; 
 
@@ -108,3 +108,3 @@ void XineControl::play( const QString& fileName ) {
         displayType = MediaPlayerState::Audio;
-        qDebug("HAS AUDIO");
+        odebug << "HAS AUDIO" << oendl; 
         libXine->setShowVideo( false );
@@ -113,3 +113,3 @@ void XineControl::play( const QString& fileName ) {
         displayType = MediaPlayerState::Video;
-        qDebug("HAS VIDEO");
+        odebug << "HAS VIDEO" << oendl; 
         libXine->setShowVideo( true );
@@ -245,3 +245,3 @@ QString XineControl::getErrorCode() {
 
-    qDebug( QString("ERRORCODE: %1 ").arg(errorCode) );
+    odebug << QString("ERRORCODE: %1 ").arg(errorCode) << oendl; 
 
diff --git a/noncore/multimedia/opierec/device.cpp b/noncore/multimedia/opierec/device.cpp
index ce49e96..5319d97 100644
--- a/noncore/multimedia/opierec/device.cpp
+++ b/noncore/multimedia/opierec/device.cpp
@@ -4,6 +4,9 @@
 
+/* OPIE */
+#include <opie2/odebug.h>
 #include <qpe/config.h>
 #include <qpe/qcopenvelope_qws.h>
+using namespace Opie::Core;
 
-
+/* STD */
 #include <fcntl.h>
@@ -14,6 +17,3 @@
 #include <unistd.h>
-#include<sys/wait.h>
-// #include <sys/stat.h>
-// #include <sys/time.h>
-// #include <sys/types.h>
+#include <sys/wait.h>
 #include <unistd.h>
@@ -34,6 +34,6 @@ Device::Device( QObject * parent, const char * dsp, const char * mixr, bool reco
     if( !record){ //playing
-        qDebug("setting up DSP for playing");
+        odebug << "setting up DSP for playing" << oendl; 
         flags = O_WRONLY;
     } else { //recording
-        qDebug("setting up DSP for recording");
+        odebug << "setting up DSP for recording" << oendl; 
         flags = O_RDWR;
@@ -98,3 +98,3 @@ void Device::changedOutVolume(int vol) {
         QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << false;
-	qWarning("changing output vol %d", vol);
+	owarn << "changing output vol " << vol << "" << oendl; 
     }
@@ -113,3 +113,3 @@ void Device::changedInVolume(int vol ) {
         QCopEnvelope( "QPE/System", "micChange(bool)" ) << false;
-	qWarning("changing input volume %d", vol);
+	owarn << "changing input volume " << vol << "" << oendl; 
     }
@@ -151,3 +151,3 @@ exit(1);
  */
-qDebug("Opening %s",dspstr);
+odebug << "Opening " << dspstr << "" << oendl; 
  if (( sd = ::open( dspstr, flags)) == -1) {
@@ -156,3 +156,3 @@ qDebug("Opening %s",dspstr);
                   +(QString)strerror(errno);
-              qDebug("XXXXXXXXXXXXXXXXXXXXXXX  "+errorMsg);
+              odebug << "XXXXXXXXXXXXXXXXXXXXXXX  "+errorMsg << oendl; 
               return -1;
@@ -160,3 +160,3 @@ qDebug("Opening %s",dspstr);
 
-qDebug("Opening mixer");
+odebug << "Opening mixer" << oendl; 
     int mixerHandle=0;
@@ -166,3 +166,3 @@ qDebug("Opening mixer");
                   +(QString)strerror(errno);
-              qDebug("XXXXXXXXXXXXXXXXXXXXXX  "+errorMsg);
+              odebug << "XXXXXXXXXXXXXXXXXXXXXX  "+errorMsg << oendl; 
         }
@@ -182,3 +182,3 @@ qDebug("Opening mixer");
      close(pipefd[1]);
- //              qDebug("%d",soundDevice->sd );
+ //              odebug << "" << soundDevice->sd << "" << oendl; 
            _exit(0);
@@ -208,3 +208,3 @@ qDebug("Opening mixer");
 //           sd = s.toInt(&ok, 10);
-//           qDebug("<<<<<<<<<<<<<>>>>>>>>>>>>"+s);
+//           odebug << "<<<<<<<<<<<<<>>>>>>>>>>>>"+s << oendl; 
                  
@@ -213,4 +213,4 @@ qDebug("Opening mixer");
 ::close(mixerHandle );
-//         qDebug("open device %s", dspstr);
-//     qDebug("success! %d",sd);
+//         odebug << "open device " << dspstr << "" << oendl; 
+//     odebug << "success! " << sd << "" << oendl; 
     return sd;
@@ -232,3 +232,3 @@ bool Device::closeDevice( bool) {
  //   sd=0;
-//    qDebug("closed dsp");
+//    odebug << "closed dsp" << oendl; 
     return true;
@@ -237,3 +237,3 @@ bool Device::closeDevice( bool) {
 bool Device::setDeviceFormat( int form) {
-    qDebug("set device res %d %d", form, sd);
+    odebug << "set device res " << form << " " << sd << "" << oendl; 
     if (ioctl( sd, SNDCTL_DSP_SETFMT,  &form)==-1) { //set format
@@ -247,3 +247,3 @@ bool Device::setDeviceFormat( int form) {
 bool Device::setDeviceChannels( int ch) {
-    qDebug("set channels %d %d", ch, sd);
+    odebug << "set channels " << ch << " " << sd << "" << oendl; 
     if (ioctl( sd, SNDCTL_DSP_CHANNELS, &ch)==-1) {
@@ -257,3 +257,3 @@ bool Device::setDeviceChannels( int ch) {
 bool Device::setDeviceRate( int rate) {
-    qDebug("set rate %d %d", rate, sd);
+    odebug << "set rate " << rate << " " << sd << "" << oendl; 
     if (ioctl( sd, SNDCTL_DSP_SPEED, &rate) == -1) {
@@ -320,5 +320,5 @@ int Device::getDeviceFragSize() {
     if (ioctl( sd, SNDCTL_DSP_GETBLKSIZE, &frag_size) == -1) {
-      qDebug("no fragsize");
+      odebug << "no fragsize" << oendl; 
     } else {
-      qDebug("driver says frag size is %d", frag_size);
+      odebug << "driver says frag size is " << frag_size << "" << oendl; 
     }
diff --git a/noncore/multimedia/opierec/helpwindow.cpp b/noncore/multimedia/opierec/helpwindow.cpp
index 6aebaa1..7f984c3 100644
--- a/noncore/multimedia/opierec/helpwindow.cpp
+++ b/noncore/multimedia/opierec/helpwindow.cpp
@@ -11,7 +11,11 @@
 #include "helpwindow.h"
-#include <qlayout.h>
 
-#include <qtoolbar.h>
+/* OPIE */
+#include <opie2/odebug.h>
 #include <qpe/resource.h>
+using namespace Opie::Core;
 
+/* QT */
+#include <qlayout.h>
+#include <qtoolbar.h>
 #include <qaction.h>
@@ -19,2 +23,3 @@
 
+/* STD */
 #include <ctype.h>
@@ -27,3 +32,3 @@ HelpWindow::HelpWindow( const QString& home_, const QString& _path, QWidget* par
     layout->setMargin( 2);
-    qDebug(_path);
+    odebug << _path << oendl; 
     browser = new QTextBrowser( this );
diff --git a/noncore/multimedia/opierec/opierec.pro b/noncore/multimedia/opierec/opierec.pro
index 7b08f0e..ea1bae3 100644
--- a/noncore/multimedia/opierec/opierec.pro
+++ b/noncore/multimedia/opierec/opierec.pro
@@ -1,4 +1,2 @@
-#CONFIG   = qt warn_on  pdaudio
-CONFIG   = qt warn_on  opie
-#CONFIG    = qt warn_on  quick-app
+CONFIG   = qt warn_on
 HEADERS   = adpcm.h \
@@ -31,3 +29,3 @@ contains(CONFIG, pdaudio) {
 
-contains(CONFIG, opie) {
+!contains(CONFIG, pdaudio) {
   INCLUDEPATH += $(OPIEDIR)/include
diff --git a/noncore/multimedia/opierec/qtrec.cpp b/noncore/multimedia/opierec/qtrec.cpp
index 1c64ab1..2187d5a 100644
--- a/noncore/multimedia/opierec/qtrec.cpp
+++ b/noncore/multimedia/opierec/qtrec.cpp
@@ -10,5 +10,2 @@
 #include "waveform.h"
-
-#include <pthread.h>
-
 extern "C" {
@@ -17,4 +14,4 @@ extern "C" {
 
-#include <sys/soundcard.h>
-
+/* OPIE */
+#include <opie2/odebug.h>
 #include <qpe/config.h>
@@ -24,6 +21,7 @@ extern "C" {
 #include <qpe/storage.h>
+using namespace Opie::Core;
 
+/* QT */
 #include <qcheckbox.h>
 #include <qcombobox.h>
-//#include <qdatetime.h>
 #include <qdir.h>
@@ -40,2 +38,3 @@ extern "C" {
 
+/* STD */
 #include <errno.h>
@@ -55,3 +54,3 @@ extern "C" {
 #include <sys/signal.h>
-
+#include <pthread.h>
 
@@ -138,8 +137,8 @@ void quickRec()
 //   int bits = filePara.resolution;
-//   qDebug("bits %d", bits);
+//   odebug << "bits " << bits << "" << oendl; 
 
 		if( filePara.resolution == 16 ) { //AFMT_S16_LE)
-//       qDebug("AFMT_S16_LE size %d", filePara.SecondsToRecord);
-//       qDebug("samples to record %d", filePara.samplesToRecord);
-//       qDebug("%d", filePara.sd);
+//       odebug << "AFMT_S16_LE size " << filePara.SecondsToRecord << "" << oendl; 
+//       odebug << "samples to record " << filePara.samplesToRecord << "" << oendl; 
+//       odebug << "" << filePara.sd << "" << oendl; 
 				level = 7;
@@ -148,3 +147,3 @@ void quickRec()
 				if( filePara.format == WAVE_FORMAT_DVI_ADPCM) {
-//          qDebug("start recording WAVE_FORMAT_DVI_ADPCM");
+//          odebug << "start recording WAVE_FORMAT_DVI_ADPCM" << oendl; 
 							// <<<<<<<<<<<<<<<<<<<<<<<<<<<  WAVE_FORMAT_DVI_ADPCM  >>>>>>>>>>>>>>>>>>>>>>
@@ -159,3 +158,3 @@ void quickRec()
 								if ( stopped) {
-//										qDebug("quickRec:: stopped");
+//										odebug << "quickRec:: stopped" << oendl; 
 										break;
@@ -168,3 +167,3 @@ void quickRec()
 										perror("recording error ");
-										qDebug( "%s %d", filePara.fileName, number);
+										odebug << "" << filePara.fileName << " " << number << "" << oendl; 
 										stopped = true;
@@ -194,3 +193,3 @@ void quickRec()
 							// <<<<<<<<<<<<<<<<<<<<<<<<<<<  WAVE_FORMAT_PCM   >>>>>>>>>>>>>>>>>>>>>>
-						qDebug("start recording WAVE_FORMAT_PCM");
+						odebug << "start recording WAVE_FORMAT_PCM" << oendl; 
 						short inbuffer[ BUFSIZE ], outbuffer[ BUFSIZE ];
@@ -201,3 +200,3 @@ void quickRec()
 								if ( stopped) {
-										qDebug("quickRec:: stopped");
+										odebug << "quickRec:: stopped" << oendl; 
 										stopped = true;
@@ -212,3 +211,3 @@ void quickRec()
 										perror( "recording error ");
-										qDebug( filePara.fileName);
+										odebug << filePara.fileName << oendl; 
 										stopped = true;
@@ -252,3 +251,3 @@ void quickRec()
 						if ( stopped) {
-								qDebug("quickRec:: stopped");
+								odebug << "quickRec:: stopped" << oendl; 
 								break;  // stop if playing was set to false
@@ -375,3 +374,3 @@ void playIt()
 								if( /*total >= filePara.numberSamples || */ bytesWritten == 0) {
-										qWarning("Jane! Stop this crazy thing!");
+										owarn << "Jane! Stop this crazy thing!" << oendl; 
 										stopped = true;
@@ -720,3 +719,3 @@ void QtRec::initIconView() {
 		int nFiles = cfg.readNumEntry("NumberofFiles",0);
-//		qDebug("init number of files %d", nFiles);
+//		odebug << "init number of files " << nFiles << "" << oendl; 
 
@@ -862,3 +861,3 @@ void QtRec::initConfig() {
 void QtRec::stop() {
-		qWarning("STOP");
+		owarn << "STOP" << oendl; 
 		setRecordButton(false);
@@ -924,6 +923,6 @@ bool QtRec::rec() { //record
 									//filePara.sampleRate = cfg.readNumEntry("samplerate", 22050);
-//             qDebug("sample rate is %d", filePara.sampleRate);
+//             odebug << "sample rate is " << filePara.sampleRate << "" << oendl; 
 								filePara.SecondsToRecord = getCurrentSizeLimit();
 
-//             qDebug("size limit %d sec", filePara.SecondsToRecord);
+//             odebug << "size limit " << filePara.SecondsToRecord << " sec" << oendl; 
 								int diskSize = checkDiskSpace( (const QString &) wavFile->trackName());
@@ -933,3 +932,3 @@ bool QtRec::rec() { //record
 								} else if( filePara.format == WAVE_FORMAT_PCM) {
-//                qDebug("WAVE_FORMAT_PCM");
+//                odebug << "WAVE_FORMAT_PCM" << oendl; 
 										fileSize = (filePara.SecondsToRecord ) * filePara.channels
@@ -937,3 +936,3 @@ bool QtRec::rec() { //record
 								} else {
-//                qDebug("WAVE_FORMAT_DVI_ADPCM");
+//                odebug << "WAVE_FORMAT_DVI_ADPCM" << oendl; 
 										fileSize = ((filePara.SecondsToRecord) * filePara.channels
@@ -949,3 +948,3 @@ bool QtRec::rec() { //record
 									//                  else {
-								qDebug("Setting timeslider %d", filePara.samplesToRecord);
+								odebug << "Setting timeslider " << filePara.samplesToRecord << "" << oendl; 
 									//           if(fileSize != 0)
@@ -968,3 +967,3 @@ bool QtRec::rec() { //record
 										filePara.fileName=currentFile.latin1();
-										qDebug("Start recording thread");
+										odebug << "Start recording thread" << oendl; 
 										stopped = false;
@@ -1012,3 +1011,3 @@ void QtRec::getOutVol( ) {
 		filePara.outVol = soundDevice->getOutVolume();
-//   qDebug("out vol %d", filePara.outVol);
+//   odebug << "out vol " << filePara.outVol << "" << oendl; 
 		OutputSlider->setValue( -filePara.outVol);
@@ -1018,3 +1017,3 @@ void QtRec::getInVol() {
 		filePara.inVol = soundDevice->getInVolume();
-//    qDebug("in vol %d", filePara.inVol);
+//    odebug << "in vol " << filePara.inVol << "" << oendl; 
 		InputSlider->setValue( -filePara.inVol);
@@ -1092,3 +1091,3 @@ bool QtRec::setupAudio( bool b) {
 						filePara.format = WAVE_FORMAT_PCM;
-//          qDebug("WAVE_FORMAT_PCM");
+//          odebug << "WAVE_FORMAT_PCM" << oendl; 
 				}  else {
@@ -1096,3 +1095,3 @@ bool QtRec::setupAudio( bool b) {
 						sampleformat = AFMT_S16_LE;
-//          qDebug("WAVE_FORMAT_DVI_ADPCM");
+//          odebug << "WAVE_FORMAT_DVI_ADPCM" << oendl; 
 				}
@@ -1112,4 +1111,4 @@ bool QtRec::setupAudio( bool b) {
 			// if(soundDevice) delete soundDevice;
-		qDebug("<<<<<<<<<<<<<<<<<<<open dsp %d %d %d", filePara.sampleRate, filePara.channels, sampleformat);
-		qWarning("change waveform settings");
+		odebug << "<<<<<<<<<<<<<<<<<<<open dsp " << filePara.sampleRate << " " << filePara.channels << " " << sampleformat << "" << oendl; 
+		owarn << "change waveform settings" << oendl; 
 		waveform->changeSettings( filePara.sampleRate, filePara.channels );
@@ -1120,3 +1119,3 @@ bool QtRec::setupAudio( bool b) {
 
-		qDebug("device has been made %d", soundDevice->sd);
+		odebug << "device has been made " << soundDevice->sd << "" << oendl; 
 
@@ -1151,3 +1150,3 @@ bool QtRec::setupAudio( bool b) {
 bool QtRec::setUpFile() { //setup file for recording
-//    qDebug("Setting up wavfile");
+//    odebug << "Setting up wavfile" << oendl; 
 //  if(wavFile) delete wavFile;
@@ -1184,3 +1183,3 @@ bool QtRec::doPlay() {
 		QString num;
-		qDebug( "Play number of samples %d", filePara.numberSamples);
+		odebug << "Play number of samples " << filePara.numberSamples << "" << oendl; 
 
@@ -1236,3 +1235,3 @@ void QtRec::changesamplerateCombo(int i) {
 		filePara.sampleRate=rate;
-		qDebug( "Change sample rate %d", rate);
+		odebug << "Change sample rate " << rate << "" << oendl; 
 		cfg.write();
@@ -1256,3 +1255,3 @@ void QtRec::changeDirCombo(int index) {
 						cfg.writeEntry("directory", recDir);
-						qDebug("new rec dir "+recDir);
+						odebug << "new rec dir "+recDir << oendl; 
 				}
@@ -1376,3 +1375,3 @@ void QtRec::keyPressEvent( QKeyEvent *e) {
 			case Key_Left: {
-					qDebug("rewinding");
+					odebug << "rewinding" << oendl; 
 					if( !e->isAutoRepeat())
@@ -1430,3 +1429,3 @@ void  QtRec::keyReleaseEvent( QKeyEvent *e) {
 						//      stop();
-					qDebug("Up");
+					odebug << "Up" << oendl; 
 					break;
@@ -1434,3 +1433,3 @@ void  QtRec::keyReleaseEvent( QKeyEvent *e) {
 						//      start();
-						//      qDebug("Down");
+						//      odebug << "Down" << oendl; 
 						//    newSound();
@@ -1438,3 +1437,3 @@ void  QtRec::keyReleaseEvent( QKeyEvent *e) {
 			case Key_Left:
-					qDebug("Left");
+					odebug << "Left" << oendl; 
 					rewindReleased();
@@ -1442,3 +1441,3 @@ void  QtRec::keyReleaseEvent( QKeyEvent *e) {
 			case Key_Right:
-					qDebug("Right");
+					odebug << "Right" << oendl; 
 					FastforwardReleased();
@@ -1477,3 +1476,3 @@ void QtRec::endRecording() {
 						cmd.sprintf("mv "+ wavFile->trackName() + " " + wavFile->currentFileName);
-//         qDebug("moving tmp file to "+currentFileName);
+//         odebug << "moving tmp file to "+currentFileName << oendl; 
 						system( cmd.latin1());
@@ -1481,3 +1480,3 @@ void QtRec::endRecording() {
       
-				qDebug("Just moved " + wavFile->currentFileName);
+				odebug << "Just moved " + wavFile->currentFileName << oendl; 
 				Config cfg("OpieRec");
@@ -1497,6 +1496,6 @@ void QtRec::endRecording() {
 				cfg.writeEntry( wavFile->currentFileName, time );
-//       qDebug("writing config numberOfRecordedSeconds "+time);
+//       odebug << "writing config numberOfRecordedSeconds "+time << oendl; 
 
 				cfg.write();
-				qDebug("finished recording");
+				odebug << "finished recording" << oendl; 
 				timeLabel->setText("");
@@ -1518,3 +1517,3 @@ void QtRec::endPlaying() {
 //   errorStop();
-//    qDebug("end playing");
+//    odebug << "end playing" << oendl; 
 		setRecordButton( false);
@@ -1530,3 +1529,3 @@ void QtRec::endPlaying() {
 			//  if(soundDevice) delete soundDevice;
-//    qDebug("file and sound device closed");
+//    odebug << "file and sound device closed" << oendl; 
 		timeLabel->setText("");
@@ -1539,5 +1538,5 @@ void QtRec::endPlaying() {
 
-//    qDebug("track closed");
+//    odebug << "track closed" << oendl; 
 		killTimers();
-		qWarning("reset slider");
+		owarn << "reset slider" << oendl; 
 		timeSlider->setValue(0);
@@ -1563,3 +1562,3 @@ bool QtRec::openPlayFile() {
 						currentFileName = cfg.readEntry( currentFile, "" );
-						qDebug("opening for play: " + currentFileName);
+						odebug << "opening for play: " + currentFileName << oendl; 
 				}
@@ -1588,6 +1587,6 @@ bool QtRec::openPlayFile() {
 
-				qDebug("file %d, samples %d %d", filePara.fd, filePara.numberSamples, filePara.sampleRate);
+				odebug << "file " << filePara.fd << ", samples " << filePara.numberSamples << " " << filePara.sampleRate << "" << oendl; 
 				int sec = (int) (( filePara.numberSamples / filePara.sampleRate) / filePara.channels) / ( filePara.channels*( filePara.resolution/8));
 
-				qWarning("seconds %d", sec);
+				owarn << "seconds " << sec << "" << oendl; 
 
@@ -1692,3 +1691,3 @@ void QtRec::doRename() {
 void QtRec::okRename() {
-		qDebug(renameBox->text());
+		odebug << renameBox->text() << oendl; 
 		QString  filename = renameBox->text();
@@ -1704,3 +1703,3 @@ void QtRec::okRename() {
 
-		qDebug("filename is  " + filename);
+		odebug << "filename is  " + filename << oendl; 
 
@@ -1775,3 +1774,3 @@ void QtRec::doVolMuting(bool b) {
 void QtRec::doMicMuting(bool b) {
-			//  qDebug("mic mute");
+			//  odebug << "mic mute" << oendl; 
 		Config cfg( "qpe" );
@@ -1831,3 +1830,3 @@ long QtRec::checkDiskSpace(const QString &path) {
 void QtRec::receive( const QCString &msg, const QByteArray & ) {
-		qDebug("Voicerecord received message "+msg);
+		odebug << "Voicerecord received message "+msg << oendl; 
 
@@ -1856,3 +1855,3 @@ void QtRec::timerEvent( QTimerEvent * ) {
    
-		qDebug( "%d", secCount );
+		odebug << "" << secCount << "" << oendl; 
 		QString  timeString;
@@ -1872,3 +1871,3 @@ void QtRec::changeTimeSlider(int index) {
 		if( ListView1->currentItem() == 0 || !wavFile->track.isOpen()) return;
-			//  qDebug("Slider moved to %d",index);
+			//  odebug << "Slider moved to " << index << "" << oendl; 
 		paused = true;
@@ -1887,3 +1886,3 @@ void QtRec::timeSliderPressed() {
 		if( ListView1->currentItem() == 0) return;
-			//  qDebug("slider pressed");
+			//  odebug << "slider pressed" << oendl; 
 		paused = true;
@@ -1896,3 +1895,3 @@ void QtRec::timeSliderReleased() {
 
-			//  qDebug("slider released %d", sliderPos);
+			//  odebug << "slider released " << sliderPos << "" << oendl; 
 		stopped = false;
@@ -1926,3 +1925,3 @@ void QtRec::rewindTimerTimeout() {
 		timeSlider->setValue( sliderValue ) ;
-			//  qDebug("%d", sliderValue);
+			//  odebug << "" << sliderValue << "" << oendl; 
 		QString timeString;
@@ -1940,3 +1939,3 @@ void QtRec::rewindReleased() {
 				total =  newPos * 4;
-					//    qDebug("rewind released %d", total);
+					//    odebug << "rewind released " << total << "" << oendl; 
 				startTimer( 1000);
@@ -2004,3 +2003,3 @@ QString QtRec::getStorage(const QString &fileName) {
 					//            storageComboBox->insertItem( name +" -> "+disk);
-					//    qDebug(name);
+					//    odebug << name << oendl; 
 		}
diff --git a/noncore/multimedia/opierec/wavFile.cpp b/noncore/multimedia/opierec/wavFile.cpp
index 35bc14d..7e9b50f 100644
--- a/noncore/multimedia/opierec/wavFile.cpp
+++ b/noncore/multimedia/opierec/wavFile.cpp
@@ -4,2 +4,8 @@
 
+/* OPIE */
+#include <opie2/odebug.h>
+#include <qpe/config.h>
+using namespace Opie::Core;
+
+/* QT */
 #include <qmessagebox.h>
@@ -7,6 +13,4 @@
 
-#include <qpe/config.h>
-
+/* STD */
 #include <errno.h>
-
 #include <sys/time.h>
@@ -14,3 +18,2 @@
 #include <sys/vfs.h>
-
 #include <fcntl.h>
@@ -26,3 +29,3 @@ WavFile::WavFile( QObject * parent,const QString &fileName, bool makeNwFile, int
 {
-//qDebug("new wave file");
+//odebug << "new wave file" << oendl; 
     bool b =  makeNwFile;
@@ -42,3 +45,3 @@ bool WavFile::newFile() {
 
-//  qDebug("Set up new file");
+//  odebug << "Set up new file" << oendl; 
   Config cfg("OpieRec");
@@ -62,3 +65,3 @@ bool WavFile::newFile() {
 
-//  qDebug("set up file for recording: "+currentFileName);
+//  odebug << "set up file for recording: "+currentFileName << oendl; 
   char pointer[] = "/tmp/opierec-XXXXXX";
@@ -77,3 +80,3 @@ bool WavFile::newFile() {
     
-//    qDebug("Opening tmp file %s",pointer);
+//    odebug << "Opening tmp file " << pointer << "" << oendl; 
     track.setName( pointer);
@@ -87,3 +90,3 @@ bool WavFile::newFile() {
     QString errorMsg=(QString)strerror(errno);
-    qDebug(errorMsg);
+    odebug << errorMsg << oendl; 
     QMessageBox::message("Note", "Error opening file.\n" +errorMsg);
@@ -108,3 +111,3 @@ void WavFile::closeFile() {
 int WavFile::openFile(const QString &currentFileName) {
-//    qDebug("open play file "+currentFileName);
+//    odebug << "open play file "+currentFileName << oendl; 
     closeFile();
@@ -115,3 +118,3 @@ int WavFile::openFile(const QString &currentFileName) {
     QString errorMsg=(QString)strerror(errno);
-    qDebug("<<<<<<<<<<< "+errorMsg+currentFileName);
+    odebug << "<<<<<<<<<<< "+errorMsg+currentFileName << oendl; 
     QMessageBox::message("Note", "Error opening file.\n" +errorMsg);
@@ -133,3 +136,3 @@ bool WavFile::setWavHeader(int fd, wavhdr *hdr) {
     (*hdr).fmtTag = 1; // PCM
-//    qDebug("set header  WAVE_FORMAT_PCM");
+//    odebug << "set header  WAVE_FORMAT_PCM" << oendl; 
   }
@@ -137,3 +140,3 @@ bool WavFile::setWavHeader(int fd, wavhdr *hdr) {
     (*hdr).fmtTag = WAVE_FORMAT_DVI_ADPCM; //intel ADPCM
- //    qDebug("set header  WAVE_FORMAT_DVI_ADPCM");
+ //    odebug << "set header  WAVE_FORMAT_DVI_ADPCM" << oendl; 
   }
@@ -162,3 +165,3 @@ bool WavFile::adjustHeaders(int fd, int total) {
   write( fd, &total, sizeof(total));
-  qDebug("adjusting header %d", total);
+  odebug << "adjusting header " << total << "" << oendl; 
   return true;
@@ -167,3 +170,3 @@ bool WavFile::adjustHeaders(int fd, int total) {
 int WavFile::parseWavHeader(int fd) {
-  qDebug("Parsing wav header");
+  odebug << "Parsing wav header" << oendl; 
   char string[4];
@@ -175,3 +178,3 @@ int WavFile::parseWavHeader(int fd) {
   if (read(fd, string, 4) < 4) {
-    qDebug(" Could not read from sound file.\n");
+    odebug << " Could not read from sound file.\n" << oendl; 
     return -1;
@@ -179,3 +182,3 @@ int WavFile::parseWavHeader(int fd) {
   if (strncmp(string, "RIFF", 4)) {
-    qDebug(" not a valid WAV file.\n");
+    odebug << " not a valid WAV file.\n" << oendl; 
     return -1;
@@ -184,3 +187,3 @@ int WavFile::parseWavHeader(int fd) {
   if (read(fd, string, 4) < 4) {
-    qDebug("Could not read from sound file.\n");
+    odebug << "Could not read from sound file.\n" << oendl; 
     return -1;
@@ -188,3 +191,3 @@ int WavFile::parseWavHeader(int fd) {
   if (strncmp(string, "WAVE", 4)) {
-    qDebug("not a valid WAV file.\n");
+    odebug << "not a valid WAV file.\n" << oendl; 
     return -1;
@@ -195,3 +198,3 @@ int WavFile::parseWavHeader(int fd) {
     if (read(fd, string, 4) < 4) {
-      qDebug("Could not read from sound file.\n");
+      odebug << "Could not read from sound file.\n" << oendl; 
       return -1;
@@ -200,3 +203,3 @@ int WavFile::parseWavHeader(int fd) {
       if (read(fd, &longdata, 4) < 4) {
-        qDebug("Could not read from sound file.\n");
+        odebug << "Could not read from sound file.\n" << oendl; 
         return -1;
@@ -207,3 +210,3 @@ int WavFile::parseWavHeader(int fd) {
       if (read(fd, &fmt, 2) < 2) {
-        qDebug("Could not read format chunk.\n");
+        odebug << "Could not read format chunk.\n" << oendl; 
         return -1;
@@ -217,5 +220,5 @@ int WavFile::parseWavHeader(int fd) {
       //      compressionFormat=fmt;
-      qDebug("compressionFormat is %d", fmt);
+      odebug << "compressionFormat is " << fmt << "" << oendl; 
       if (read(fd, &ch, 2) < 2) {
-        qDebug("Could not read format chunk.\n");
+        odebug << "Could not read format chunk.\n" << oendl; 
         return -1;
@@ -223,6 +226,6 @@ int WavFile::parseWavHeader(int fd) {
         wavChannels = ch;
-        qDebug("File has %d channels", ch);
+        odebug << "File has " << ch << " channels" << oendl; 
       }
       if (read(fd, &samplerrate, 4) < 4) {
-        qDebug("Could not read from format chunk.\n");
+        odebug << "Could not read from format chunk.\n" << oendl; 
         return -1;
@@ -231,3 +234,3 @@ int WavFile::parseWavHeader(int fd) {
         //                sampleRate = samplerrate;
-        qDebug("File has samplerate of %d",(int) samplerrate);
+        odebug << "File has samplerate of " << (int) samplerrate << "" << oendl; 
       }
@@ -235,3 +238,3 @@ int WavFile::parseWavHeader(int fd) {
       if (read(fd, &bitrate, 2) < 2) {
-        qDebug("Could not read format chunk.\n");
+        odebug << "Could not read format chunk.\n" << oendl; 
         return -1;
@@ -240,3 +243,3 @@ int WavFile::parseWavHeader(int fd) {
         //                 resolution =  bitrate;
-        qDebug("File has bitrate of %d", bitrate);
+        odebug << "File has bitrate of " << bitrate << "" << oendl; 
       }
@@ -248,3 +251,3 @@ int WavFile::parseWavHeader(int fd) {
     if (read(fd, string, 4) < 4) {
-      qDebug("Could not read from sound file.\n");
+      odebug << "Could not read from sound file.\n" << oendl; 
       return -1;
@@ -254,3 +257,3 @@ int WavFile::parseWavHeader(int fd) {
       if (read(fd, &longdata, 4)<4) {
-        qDebug("Could not read from sound file.\n");
+        odebug << "Could not read from sound file.\n" << oendl; 
         return -1;
@@ -261,3 +264,3 @@ int WavFile::parseWavHeader(int fd) {
       if (read(fd, &longdata, 4) < 4) {
-        qDebug("Could not read from sound file.\n");
+        odebug << "Could not read from sound file.\n" << oendl; 
         return -1;
diff --git a/noncore/multimedia/opierec/waveform.cpp b/noncore/multimedia/opierec/waveform.cpp
index 9cc40b4..7c9a25f 100644
--- a/noncore/multimedia/opierec/waveform.cpp
+++ b/noncore/multimedia/opierec/waveform.cpp
@@ -21,4 +21,8 @@
 
-#include <qpainter.h>
+/* OPIE */
+#include <opie2/odebug.h>
+using namespace Opie::Core;
 
+/* QT */
+#include <qpainter.h>
 
@@ -40,5 +44,5 @@ void Waveform::changeSettings( int frequency, int channels )
    makePixmap();
-//   qWarning("change waveform %d, %d", frequency, channels);
+//   owarn << "change waveform " << frequency << ", " << channels << "" << oendl; 
    samplesPerPixel = frequency * channels / (5 * windowSize);
-   qWarning("Waveform::changeSettings %d", samplesPerPixel);
+   owarn << "Waveform::changeSettings " << samplesPerPixel << "" << oendl; 
    if ( !samplesPerPixel )
@@ -98,3 +102,3 @@ void Waveform::newSamples( const short *buf, int len )
    // Copy the final state back to the object.
-//qWarning("%d, %d, %d", currentValue, numSamples, windowPosn);
+//owarn << "" << currentValue << ", " << numSamples << ", " << windowPosn << "" << oendl; 
  this->currentValue = currentValue;
diff --git a/noncore/multimedia/powerchord/config.in b/noncore/multimedia/powerchord/config.in
index ab1512b..5db784a 100644
--- a/noncore/multimedia/powerchord/config.in
+++ b/noncore/multimedia/powerchord/config.in
@@ -3,5 +3,5 @@
     default "n"
-    depends ( LIBQPE || LIBQPE-X11 ) 
-    comment "opie-powerchord needs a libqpe"
-    depends !(( LIBQPE || LIBQPE-X11 ) )
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE
+    comment "opie-powerchord needs a libqpe and libopiecore2"
+    depends !(( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE )
 
diff --git a/noncore/multimedia/powerchord/powerchord.pro b/noncore/multimedia/powerchord/powerchord.pro
index 917c88f..f7af6d6 100644
--- a/noncore/multimedia/powerchord/powerchord.pro
+++ b/noncore/multimedia/powerchord/powerchord.pro
@@ -20,4 +20,3 @@ INCLUDEPATH	+= $(OPIEDIR)/include
 DEPENDPATH	+= $(OPIEDIR)/include
-LIBS            += -lqpe
-#INTERFACES	= powerchordbase.ui
+LIBS            += -lqpe -lopiecore2
 DESTDIR         = $(OPIEDIR)/bin
diff --git a/noncore/multimedia/powerchord/powerchordbase.cpp b/noncore/multimedia/powerchord/powerchordbase.cpp
index 4fb5dda..0694ba3 100644
--- a/noncore/multimedia/powerchord/powerchordbase.cpp
+++ b/noncore/multimedia/powerchord/powerchordbase.cpp
@@ -9,5 +9,11 @@
 #include "powerchordbase.h"
-
 #include "fretboard.h"
 #include "vumeter.h"
+
+/* OPIE */
+#include <opie2/odebug.h>
+#include <qpe/resource.h>
+using namespace Opie::Core;
+
+/* QT */
 #include <qcombobox.h>
@@ -20,4 +26,2 @@
 #include <qtooltip.h>
-#include <qpe/resource.h>
-
 
@@ -582,3 +586,3 @@ void PowerchordBase::change_handler()
 {
-    qWarning( "PowerchordBase::change_handler(): Not implemented yet!" );
+    owarn << "PowerchordBase::change_handler(): Not implemented yet!" << oendl; 
 }
diff --git a/noncore/multimedia/showimg/ImageFileSelector.cpp b/noncore/multimedia/showimg/ImageFileSelector.cpp
index 79ee925..53cc883 100644
--- a/noncore/multimedia/showimg/ImageFileSelector.cpp
+++ b/noncore/multimedia/showimg/ImageFileSelector.cpp
@@ -1,12 +1,14 @@
+#include "ImageFileSelector.h"
 
+/* OPIE */
+#include <opie2/odebug.h>
+#include <qpe/qpeapplication.h>
+using namespace Opie::Core;
 
-#include "qpe/qpeapplication.h"
-
-#include <stdlib.h>
-
-#include <qlabel.h>
+/* QT */
+#include <qlabel.h>   
 #include <qfileinfo.h>
 
-#include "ImageFileSelector.h"
-
+/* STD */
+#include <stdlib.h>
 
@@ -157,3 +159,3 @@ void ImageFileSelector::reread(bool)
 {
-//    qDebug("reread");
+//    odebug << "reread" << oendl; 
     ImageFileSelectorItem *item = (ImageFileSelectorItem *)detailed->selectedItem();
@@ -223,3 +225,3 @@ const DocLnk * ImageFileSelector::selected()
 {
-    qDebug("image selected");
+    odebug << "image selected" << oendl; 
     ImageFileSelectorItem *item = (ImageFileSelectorItem *) detailed->selectedItem();
diff --git a/noncore/multimedia/showimg/showimg.cpp b/noncore/multimedia/showimg/showimg.cpp
index 696a57b..24377ed 100644
--- a/noncore/multimedia/showimg/showimg.cpp
+++ b/noncore/multimedia/showimg/showimg.cpp
@@ -28,5 +28,5 @@
 
-
+/* OPIE */
+#include <opie2/odebug.h>
 #include <opie2/ofiledialog.h>
-
 #include <qpe/qpeapplication.h>
@@ -34,4 +34,7 @@
 #include <qpe/resource.h>
-#include <qtoolbar.h>
+using namespace Opie::Core;
+using namespace Opie::Ui; 
 
+/* QT */
+#include <qtoolbar.h>
 #include <qaction.h>
@@ -41,6 +44,5 @@
 
+/* STD */
 #include <math.h>
 
-
-using namespace Opie::Ui;
 ControlsDialog::ControlsDialog(const QString &caption,QImage image,int *brightness,QWidget *parent)
@@ -288,3 +290,3 @@ ImageViewer::ImageViewer( QWidget *parent, const char *name, int /*wFlags*/ )
 
-    qDebug("cv = %d",cv);
+    odebug << "cv = " << cv << "" << oendl; 
 
@@ -415,3 +417,3 @@ void ImageViewer::settings()
     if ( QPEApplication::execDialog(&dlg) == QDialog::Accepted ) {
-        qDebug("<<<<<<<<<<<<<<<<<<<<>>>>>>>>>>>>>>>>>>>");
+        odebug << "<<<<<<<<<<<<<<<<<<<<>>>>>>>>>>>>>>>>>>>" << oendl; 
         slideDelay = dlg.delay();
@@ -507,3 +509,3 @@ void ImageViewer::show(const QString& fileref)
 {
-//    qDebug("Show "+fileref);
+//    odebug << "Show "+fileref << oendl; 
     bFromDocView = TRUE;
@@ -537,3 +539,3 @@ void ImageViewer::openFile( const DocLnk &link )
 //    DocLnk link(file);
-    qDebug("open "+link.name());
+    odebug << "open "+link.name() << oendl; 
     updateCaption( link.name() );
diff --git a/noncore/multimedia/showimg/showimg.pro b/noncore/multimedia/showimg/showimg.pro
index 6fd019e..c905da8 100644
--- a/noncore/multimedia/showimg/showimg.pro
+++ b/noncore/multimedia/showimg/showimg.pro
@@ -1,2 +1,2 @@
-CONFIG          += qt warn_on  quick-app
+CONFIG          += qt warn_on quick-app
 HEADERS   = showimg.h ImageFileSelector.h settingsdialog.h settingsdialogbase.h
diff --git a/noncore/multimedia/tonleiter/config.in b/noncore/multimedia/tonleiter/config.in
index d580ad7..9bd167e 100644
--- a/noncore/multimedia/tonleiter/config.in
+++ b/noncore/multimedia/tonleiter/config.in
@@ -3,2 +3,2 @@
     default "n"
-    depends ( LIBQPE || LIBQPE-X11 ) 
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE
diff --git a/noncore/multimedia/tonleiter/editinst.cpp b/noncore/multimedia/tonleiter/editinst.cpp
index ccb4560..a8c20c8 100644
--- a/noncore/multimedia/tonleiter/editinst.cpp
+++ b/noncore/multimedia/tonleiter/editinst.cpp
@@ -2,5 +2,10 @@
 
-#include <qpushbutton.h>
-
+/* OPIE */
+#include <opie2/odebug.h>
+#include <qpe/config.h>
 #include <qpe/qpeapplication.h>
+using namespace Opie::Core;
+
+/* QT */
+#include <qpushbutton.h>
 
@@ -102,3 +107,3 @@ void Menu::InstEditDialog::loadInstrument()
     Instrument inst=data->getInstrument(instid);
-    qDebug("load Instrument : %d strings",inst.noOfStrings());
+    odebug << "load Instrument : " << inst.noOfStrings() << " strings" << oendl; 
     for(uint s=0;s<inst.noOfStrings();s++)
diff --git a/noncore/multimedia/tonleiter/fretboard.cpp b/noncore/multimedia/tonleiter/fretboard.cpp
index 7e63e01..58bdb86 100644
--- a/noncore/multimedia/tonleiter/fretboard.cpp
+++ b/noncore/multimedia/tonleiter/fretboard.cpp
@@ -2,2 +2,7 @@
 
+/* OPIE */
+#include <opie2/odebug.h>
+using namespace Opie::Core;
+
+/* QT */
 #include <qpainter.h>
@@ -29,3 +34,3 @@ void Graph::FretBoard::paintEvent(QPaintEvent* pe)
     inst=data->getInstrument(instid);
-    //qDebug("inst %d  is %s",instid,inst.instName().data());
+    //odebug << "inst " << instid << "  is " << inst.instName().data() << "" << oendl; 
 
@@ -145,6 +150,6 @@ void Graph::FretBoard::paintScale(QPainter* p)
                 if(octave<0)
-                    qDebug("%d,%d",octave,baseoctave);
+                    odebug << "" << octave << "," << baseoctave << "" << oendl; 
                 if(octave>5)
                 {
-                    qDebug("octave out of range");
+                    odebug << "octave out of range" << oendl; 
                     octave=5;
@@ -155,3 +160,3 @@ void Graph::FretBoard::paintScale(QPainter* p)
                 if(c<0 || c>255)
-                    qDebug("%d = %d - ( %d + %d)",c,note,12*octave,data->getCurrentBaseNote());
+                    odebug << "" << c << " = " << note << " - ( " << 12*octave << " + " << data->getCurrentBaseNote() << ")" << oendl; 
                 QColor dotcolor(255,255,255);
diff --git a/noncore/multimedia/tonleiter/tonleiter.pro b/noncore/multimedia/tonleiter/tonleiter.pro
index 4bd1bc2..4be3bef 100644
--- a/noncore/multimedia/tonleiter/tonleiter.pro
+++ b/noncore/multimedia/tonleiter/tonleiter.pro
@@ -1,3 +1,2 @@
 TEMPLATE  = app
-#CONFIG   = qt warn_on 
 CONFIG    = qt warn_on 
@@ -7,7 +6,6 @@ INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
-LIBS            += -lqpe 
-INTERFACES  =
+LIBS        += -lqpe -lopiecore2 
 TARGET    = tonleiter
 DESTDIR = $(OPIEDIR)/bin
-#TMAKE_CXXFLAGS += -DQT_QWS_VERCEL_IDR -DQWS -fno-exceptions -fno-rtti
+
 include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/multimedia/tonleiter/tonleiterdata.cpp b/noncore/multimedia/tonleiter/tonleiterdata.cpp
index 33b3c49..564b7f0 100644
--- a/noncore/multimedia/tonleiter/tonleiterdata.cpp
+++ b/noncore/multimedia/tonleiter/tonleiterdata.cpp
@@ -1,7 +1,8 @@
 #include "tonleiterdata.h"
-
-#include <qpe/config.h>
-
 using namespace Data;
 
+/* OPIE */
+#include <opie2/odebug.h>
+#include <qpe/config.h>
+using namespace Opie::Core;
 
@@ -154,3 +155,3 @@ Instrument TonleiterData::getInstrument(int id)
     {
-        qDebug("undefined insrtument %d of %d",id,instruments.count());
+        odebug << "undefined insrtument " << id << " of " << instruments.count() << "" << oendl; 
         return Instrument();
@@ -176,3 +177,3 @@ Scale TonleiterData::getScale(int id)
     {
-        qDebug("Undefined scale");
+        odebug << "Undefined scale" << oendl; 
         return Scale();
diff --git a/noncore/multimedia/tonleiter/tonleiterdatahelper.cpp b/noncore/multimedia/tonleiter/tonleiterdatahelper.cpp
index d904a71..285d2c1 100644
--- a/noncore/multimedia/tonleiter/tonleiterdatahelper.cpp
+++ b/noncore/multimedia/tonleiter/tonleiterdatahelper.cpp
@@ -36,3 +36,3 @@ int Note::octaveOfBaseNote(int base,int note)
     int octave=getOctaveOfNote(normnote);
-    //qDebug("note %d of %d base is norm %d -> ocatve %d",note,base,normnote,octave);
+    //odebug << "note " << note << " of " << base << " base is norm " << normnote << " -> ocatve " << octave << "" << oendl; 
     return octave;
@@ -133,3 +133,3 @@ bool Scale::noteInScale(int base,int note)
     {
-        //qDebug("OK : base : %d, note %d -> norm %d",base,note,normnote);
+        //odebug << "OK : base : " << base << ", note " << note << " -> norm " << normnote << "" << oendl; 
         return true;
@@ -138,3 +138,3 @@ bool Scale::noteInScale(int base,int note)
     {
-        //qDebug("BAD : base : %d, note %d -> norm %d",base,note,normnote);
+        //odebug << "BAD : base : " << base << ", note " << note << " -> norm " << normnote << "" << oendl; 
         return false;