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,29 +1,34 @@
 #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)
 {
     setCaption("Tonleiter::"+tr("Instrument"));
     QBoxLayout* masterlayout=new QBoxLayout(this,QBoxLayout::TopToBottom);
     instid=data->getCurrentInstrumentID();
     stringlist.setAutoDelete(true);
 
     QBoxLayout* toplayout=new QBoxLayout(masterlayout,QBoxLayout::LeftToRight);
 
     //Name combo + Add + Delete
     boxInst=new QComboBox(this,"boxInst");
     boxInst->setSizePolicy(QSizePolicy(QSizePolicy::MinimumExpanding,QSizePolicy::Maximum));
     connect(boxInst,SIGNAL(activated(int)),this,SLOT(setCurrentInstrumetID(int)));
     for(int i=0;i<data->noOfInstruments();i++)
     {
         Instrument inst=data->getInstrument(i);
         QString name=inst.instName();
         if(name.isNull()) continue;
         boxInst->insertItem(name,i);
     }
     boxInst->setCurrentItem(instid);
     toplayout->addWidget(boxInst);
@@ -79,32 +84,32 @@ void Menu::InstEditDialog::deleteInstrument()
 }
 //****************************************************************************
 void Menu::InstEditDialog::addLowString()
 {
 }
 //****************************************************************************
 void Menu::InstEditDialog::addHighString()
 {
 }
 //****************************************************************************
 void Menu::InstEditDialog::deleteString(int id)
 {
 }
 //****************************************************************************
 void Menu::InstEditDialog::saveInstrument()
 {
     //auto delete is set to true so widgets _should_ be deleted
     stringlist.clear();
 }
 //****************************************************************************
 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,54 +1,59 @@
 #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)
 :QWidget(parent,name,f),data(data)
 {
     setBackgroundColor(QColor(0,0,0));
     fretpen=QPen(QColor(155,155,155),0);
     markerbrush=QBrush(QColor(155,155,155));
     stringpen=QPen(QColor(255,255,255),3);
     connect(data,SIGNAL(dataChange()),this,SLOT(dataChange()));
 }
 //****************************************************************************
 Graph::FretBoard::~FretBoard()
 {
 }
 //****************************************************************************
 void Graph::FretBoard::dataChange()
 {
     repaint(true);
 }
 //****************************************************************************
 void Graph::FretBoard::paintEvent(QPaintEvent* pe)
 {
     Q_UNUSED(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();
 
     xmargin=(int)(mysize.width()*0.05);
     xmin=2*xmargin;
     xmax=mysize.width()-xmargin;
     xwidth=xmax-xmin;
 
     ymargin=(int)(mysize.height()*0.1);
     ymin=ymargin;
     ymax=mysize.height()-2*ymargin;
     yheight=ymax-ymin;
 
     QPainter p(this);
     paintBoard(&p);
     paintFrets(&p);
     paintStrings(&p);
     paintScale(&p);
 }
 //****************************************************************************
 void Graph::FretBoard::resizeEvent(QResizeEvent* re)
 {
     Q_UNUSED(re);
 }
@@ -122,59 +127,59 @@ void Graph::FretBoard::paintStrings(QPainter* p)
     }
 }
 //****************************************************************************
 void Graph::FretBoard::paintScale(QPainter* p)
 {
     int dotsize=10;
     int scaleid=data->getCurrentScaleID();
     Scale scale=data->getScale(scaleid);
     int baseoctave=Note::octaveOfBaseNote(data->getCurrentBaseNote(),inst.lowestNote());
 
     for(int s=0;s<inst.noOfStrings();s++)
     {
         int y=(int)(stringdist*s)+ymin;
         int stingid=inst.noOfStrings()-(s+1);
         for(int f=0;f<=inst.noOfFrets();f++)
         {
             int note=inst.string(stingid)+f;
             if(scale.noteInScale(data->getCurrentBaseNote(),note))
             {
                 int x=(int)(fretdist*f)+xmin;
 
                 //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)
                     dotcolor=QColor(c,c,255);
                 else if(octave==1)
                     dotcolor=QColor(c,255,c);
                 else if(octave==2)
                     dotcolor=QColor(255,c,c);
                 else if(octave==3)
                     dotcolor=QColor(255,255,c);
                 else if(octave==4)
                     dotcolor=QColor(255,c,255);
                 else
                     dotcolor=QColor(c,255,255);
 
                 p->setBrush(dotcolor);
                 p->drawEllipse(x-dotsize/2,y-dotsize/2,dotsize,dotsize);
 
                 if(data->isDrawNames())
                 {
                     p->setPen(QColor(255,155,0));
                     p->drawText(x-dotsize/2,y-dotsize/2,Note::getNameOfNote(note));
                 }
 
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,30 +1,31 @@
 #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)
 {
     drawnames=true;
     loadData();
 }
 //****************************************************************************
 TonleiterData::~TonleiterData()
 {
     saveData();
 }
 //****************************************************************************
 void TonleiterData::setCurrentInstrumetID(int id)
 {
     if(id>=0 && id<noOfInstruments())
     {
         currentInstrumentID=id;
         emit dataChange();
     }
 }
 //****************************************************************************
 void TonleiterData::setCurrentScaleID(int id)
 {
@@ -131,68 +132,68 @@ void TonleiterData::saveData()
     save.setGroup("Scale");
     save.writeEntry("noOfScales",noOfScales());
     for(int s=0;s<noOfScales();s++)
     {
         QStringList scalelist;
         Scale scale=getScale(s);
         scalelist.append(scale.scaleName());
         for(int ht=0;ht<scale.noOfHaltones();ht++)
             scalelist.append(QString::number(scale.getHalfTone(ht)));
         save.writeEntry("Scale"+QString::number(s),scalelist,';');
     }
 }
 //****************************************************************************
 int TonleiterData::noOfInstruments()
 {
     return (int)instruments.count();
 }
 //****************************************************************************
 Instrument TonleiterData::getInstrument(int id)
 {
     if(id>=0 && id<noOfInstruments())
         return instruments[id];
     else
     {
-        qDebug("undefined insrtument %d of %d",id,instruments.count());
+        odebug << "undefined insrtument " << id << " of " << instruments.count() << "" << oendl; 
         return Instrument();
     }
 
 }
 //****************************************************************************
 int TonleiterData::getCurrentInstrumentID()
 {
     return currentInstrumentID;
 }
 //****************************************************************************
 int TonleiterData::noOfScales()
 {
     return (int)scales.count();
 }
 //****************************************************************************
 Scale TonleiterData::getScale(int id)
 {
     if(id>=0 && id<noOfScales())
         return scales[id];
     else
     {
-        qDebug("Undefined scale");
+        odebug << "Undefined scale" << oendl; 
         return Scale();
     }
 }
 //****************************************************************************
 int TonleiterData::getCurrentScaleID()
 {
     return currentScaleID;
 }
 //****************************************************************************
 int TonleiterData::getCurrentBaseNote()
 {
     return currentNote;
 }
 //****************************************************************************
 bool TonleiterData::isDrawNames()
 {
     return drawnames;
 }
 //****************************************************************************
 //****************************************************************************
 
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
@@ -13,49 +13,49 @@ int Note::getOctaveOfNote(int note)
 QString Note::getNameOfNote(int note)
 {
     int octave=getOctaveOfNote(note);
     return notenames[note-12*octave];
 }
 //****************************************************************************
 int Note::getNoteFromName(QString name,int octave)
 {
     int notevalue=0;
     for(int a=0;a<12;a++)
     {
         if(name==notenames[a])
         {
             notevalue=a;
             break;
         }
     }
     return notevalue+12*octave;
 }
 //****************************************************************************
 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;
 }
 //****************************************************************************
 //****************************************************************************
 Instrument::Instrument()
 {
     name="UNDEFINED";
     frets=0;
 }
 //****************************************************************************
 Instrument::Instrument(QString name,int frets,QValueList<int> strings)
 :name(name),frets(frets),strings(strings)
 {
 }
 //****************************************************************************
 Instrument::~Instrument()
 {
 }
 //****************************************************************************
 int Instrument::noOfStrings()
 {
     return (int)strings.count();
 }
 //****************************************************************************
@@ -110,35 +110,35 @@ int Scale::noOfHaltones()
     return (int)halftones.count();
 }
 //****************************************************************************
 int Scale::getHalfTone(int id)
 {
     if(id>=0 && id<noOfHaltones())
         return halftones[id];
     else
         return 0;
 }
 //****************************************************************************
 QString Scale::scaleName()
 {
     return name;
 }
 //****************************************************************************
 bool Scale::noteInScale(int base,int note)
 {
     int octave=Note::getOctaveOfNote(note);
     note-=12*octave;
     int normnote = (note>=base) ? note-base : (12-base)+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;
     }
 }
 //****************************************************************************
 //****************************************************************************