convert to Opie Debugging Framework

6 files changed, 29 insertions, 20 deletions

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
@@ -1,4 +1,4 @@
   config TONLEITER
     boolean "tonleiter (shows scales on sting instruments)"
     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
@@ -1,8 +1,13 @@
 #include "editinst.h"
 
-#include <qpushbutton.h>
-
+/* OPIE */
+#include <opie2/odebug.h>
+#include <qpe/config.h>
 #include <qpe/qpeapplication.h>
+using namespace Opie::Core;
+
+/* QT */
+#include <qpushbutton.h>
 
 Menu::InstEditDialog::InstEditDialog(TonleiterData* data,QWidget* parent,const char* name)
 :QDialog(parent,name,true,0),data(data)
@@ -100,7 +105,7 @@ void Menu::InstEditDialog::loadInstrument()
 {
     stringlist.clear();
     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++)
     {
         stringlist.append(new EditStringWidget(inst.string(s),stringwidget));
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
@@ -1,5 +1,10 @@
 #include "fretboard.h"
 
+/* OPIE */
+#include <opie2/odebug.h>
+using namespace Opie::Core;
+
+/* QT */
 #include <qpainter.h>
 
 Graph::FretBoard::FretBoard(TonleiterData* data,QWidget* parent,const char* name,WFlags f)
@@ -27,7 +32,7 @@ void Graph::FretBoard::paintEvent(QPaintEvent* pe)
 
     int instid=data->getCurrentInstrumentID();
     inst=data->getInstrument(instid);
-    //qDebug("inst %d  is %s",instid,inst.instName().data());
+    //odebug << "inst " << instid << "  is " << inst.instName().data() << "" << oendl; 
 
     QRect mysize=rect();
 
@@ -143,17 +148,17 @@ void Graph::FretBoard::paintScale(QPainter* p)
                 //no more than six octaves can be visualised (there is a zero octave)
                 int octave=Note::octaveOfBaseNote(data->getCurrentBaseNote(),note)-baseoctave;
                 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;
                 }
 
                 p->setPen(QColor(255,0,0));
                 int c= ( (note-12*baseoctave) - (12*octave+data->getCurrentBaseNote()) )*15;
                 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);
 
                 if(octave==0)
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,13 +1,11 @@
 TEMPLATE  = app
-#CONFIG   = qt warn_on 
 CONFIG    = qt warn_on 
 HEADERS   = mainwidget.h tonleiterdata.h tonleiterdatahelper.h fretboard.h menuwidget.h editinst.h editstringwidget.h editscale.h pianoscale.h
 SOURCES   = mainwidget.cpp tonleiterdata.cpp tonleiterdatahelper.cpp fretboard.cpp menuwidget.cpp main.cpp editinst.cpp editstringwidget.cpp editscale.cpp pianoscale.cpp
 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,9 +1,10 @@
 #include "tonleiterdata.h"
-
-#include <qpe/config.h>
-
 using namespace Data;
 
+/* OPIE */
+#include <opie2/odebug.h>
+#include <qpe/config.h>
+using namespace Opie::Core;
 
 TonleiterData::TonleiterData(QObject* parent)
 :QObject(parent)
@@ -152,7 +153,7 @@ Instrument TonleiterData::getInstrument(int id)
         return instruments[id];
     else
     {
-        qDebug("undefined insrtument %d of %d",id,instruments.count());
+        odebug << "undefined insrtument " << id << " of " << instruments.count() << "" << oendl; 
         return Instrument();
     }
 
@@ -174,7 +175,7 @@ Scale TonleiterData::getScale(int id)
         return scales[id];
     else
     {
-        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
@@ -34,7 +34,7 @@ int Note::octaveOfBaseNote(int base,int note)
 {
     int normnote = (note>=base) ? note-base : (12-base)+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;
 }
 //****************************************************************************
@@ -131,12 +131,12 @@ bool Scale::noteInScale(int base,int note)
 
     if(halftones.contains(normnote)>0)
     {
-        //qDebug("OK : base : %d, note %d -> norm %d",base,note,normnote);
+        //odebug << "OK : base : " << base << ", note " << note << " -> norm " << normnote << "" << oendl; 
         return true;
     }
     else
     {
-        //qDebug("BAD : base : %d, note %d -> norm %d",base,note,normnote);
+        //odebug << "BAD : base : " << base << ", note " << note << " -> norm " << normnote << "" << oendl; 
         return false;
     }
 }