convert to Opie Debugging Framework

3 files changed, 12 insertions, 9 deletions

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
@@ -1,7 +1,7 @@
   config POWERCHORD
     boolean "opie-powerchord (guitar chord generator and tuning)"
     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
@@ -15,13 +15,12 @@ SOURCES		= main.cpp        \
                   vumeter.cpp     \
                   gs.cpp gt.cpp   \
                   powerchordbase.cpp
 
 INCLUDEPATH	+= $(OPIEDIR)/include
 DEPENDPATH	+= $(OPIEDIR)/include
-LIBS            += -lqpe
-#INTERFACES	= powerchordbase.ui
+LIBS            += -lqpe -lopiecore2
 DESTDIR         = $(OPIEDIR)/bin
 TARGET		= powerchord
 
 include ( $(OPIEDIR)/include.pro )
 
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
@@ -4,25 +4,29 @@
 ** Created: Sun Jan 13 23:05:11 2002
 **      by:  The User Interface Compiler (uic)
 **
 ** WARNING! All changes made in this file will be lost!
 ****************************************************************************/
 #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>
 #include <qlabel.h>
 #include <qlistbox.h>
 #include <qpushbutton.h>
 #include <qspinbox.h>
 #include <qtabwidget.h>
 #include <qlayout.h>
 #include <qtooltip.h>
-#include <qpe/resource.h>
-
 
 /*
  *  Constructs a PowerchordBase which is a child of 'parent', with the
  *  name 'name' and widget flags set to 'f'
  */
 PowerchordBase::PowerchordBase( QWidget* parent,  const char* name, WFlags fl )
@@ -577,9 +581,9 @@ PowerchordBase::~PowerchordBase()
 {
     // no need to delete child widgets, Qt does it all for us
 }
 
 void PowerchordBase::change_handler()
 {
-    qWarning( "PowerchordBase::change_handler(): Not implemented yet!" );
+    owarn << "PowerchordBase::change_handler(): Not implemented yet!" << oendl; 
 }