5 files changed, 29 insertions, 20 deletions

diff --git a/noncore/apps/keyz-cfg/cfgfile.cpp b/noncore/apps/keyz-cfg/cfgfile.cpp
index b0dc968..81d1ee1 100644
--- a/noncore/apps/keyz-cfg/cfgfile.cpp
+++ b/noncore/apps/keyz-cfg/cfgfile.cpp
@@ -1,4 +1,10 @@
-#include <qmessagebox.h>
 #include "cfgfile.h"
 
+/* OPIE */
+#include <opie2/odebug.h>
+using namespace Opie::Core;
+
+/* QT */
+#include <qmessagebox.h>
+
 // CfgEntry implementation
@@ -97,3 +103,3 @@ bool CfgParser::load(QString file, CfgFile& cfg) {
         if (!err.isEmpty()) {
-                qDebug(err);
+                odebug << err << oendl; 
                 return false;
@@ -108,3 +114,3 @@ bool CfgParser::load(QString file, CfgFile& cfg) {
 
-                qDebug("include: file=" + fit.key() + ", prefix=" + fit.data());
+                odebug << "include: file=" + fit.key() + ", prefix=" + fit.data() << oendl; 
                 lit = labels.find(prefix+":*");
diff --git a/noncore/apps/keyz-cfg/config.in b/noncore/apps/keyz-cfg/config.in
index 29a10f5..8e1be2d 100644
--- a/noncore/apps/keyz-cfg/config.in
+++ b/noncore/apps/keyz-cfg/config.in
@@ -3,2 +3,2 @@
     default "n"
-    depends ( LIBQPE || LIBQPE-X11 )
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE
diff --git a/noncore/apps/keyz-cfg/keyz-cfg.pro b/noncore/apps/keyz-cfg/keyz-cfg.pro
index 44bbb5f..7ac604b 100644
--- a/noncore/apps/keyz-cfg/keyz-cfg.pro
+++ b/noncore/apps/keyz-cfg/keyz-cfg.pro
@@ -4,7 +4,7 @@ CONFIG		= qt warn_on
         HEADERS         = zkb.h \
-                                zkbcfg.h \
-                                zkbnames.h \
-                                zkbxml.h \
-                                cfgdlg.h \
-                                cfgfile.h
+                  zkbcfg.h \
+                  zkbnames.h \
+                  zkbxml.h \
+                  cfgdlg.h \
+                  cfgfile.h
 
@@ -15,4 +15,4 @@ SOURCES		= main.cpp \
                   zkbcfg.cpp \
-                        zkbnames.cpp \
-                        zkbxml.cpp
+                  zkbnames.cpp \
+                  zkbxml.cpp
 
@@ -20,3 +20,3 @@ INCLUDEPATH     += $(OPIEDIR)/include
 DEPENDPATH      += $(OPIEDIR)/include
-        LIBS    += -lqpe
+        LIBS    += -lqpe -lopiecore2
         TARGET          = keyz-cfg
diff --git a/noncore/apps/keyz-cfg/zkb.cpp b/noncore/apps/keyz-cfg/zkb.cpp
index f315d4b..8382615 100644
--- a/noncore/apps/keyz-cfg/zkb.cpp
+++ b/noncore/apps/keyz-cfg/zkb.cpp
@@ -366,3 +366,3 @@ State* Keymap::getStateByLabel(const QString& label) {
 
-        //qDebug("look for: %s\n", (const char*) name.utf8());
+        //odebug << "look for: " << (const char*) name.utf8() << "\n" << oendl; 
         QMap<QString, State*>::Iterator sit = states.find(name);
@@ -418,3 +418,3 @@ bool Keymap::setCurrentState(State* state) {
                         } else {
-        //                      qDebug("no label for: " + currentStateName + "\n");
+        //                      odebug << "no label for: " + currentStateName + "\n" << oendl; 
                                 currentLabel = "";
diff --git a/noncore/apps/keyz-cfg/zkbcfg.cpp b/noncore/apps/keyz-cfg/zkbcfg.cpp
index 0992b9a..f1d53ba 100644
--- a/noncore/apps/keyz-cfg/zkbcfg.cpp
+++ b/noncore/apps/keyz-cfg/zkbcfg.cpp
@@ -1,5 +1,9 @@
-#include <qfileinfo.h>
-
 #include "zkbcfg.h"
 
+/* OPIE */
+#include <opie2/odebug.h>
+using namespace Opie::Core;
+
+/* QT */
+#include <qfileinfo.h>
 
@@ -17,3 +21,3 @@ bool ZkbConfig::load(const QString& file, Keymap& keymap, const QString& prefix)
 
-        qDebug("start loading file=%s\n", (const char*) file.utf8());
+        odebug << "start loading file=" << (const char*) file.utf8() << "\n" << oendl; 
         if (includedFiles.find(fi.absFilePath()) != includedFiles.end()) {
@@ -32,4 +36,3 @@ bool ZkbConfig::load(const QString& file, Keymap& keymap, const QString& prefix)
 
-        qDebug("end loading file=%s : status=%s\n", (const char*) file.utf8(),
-                (const char*) err.utf8());
+        odebug << "end loading file=" << file.utf8() << ": status=" << err.utf8() << oendl;
         return ret;
@@ -124,3 +127,3 @@ bool ZkbHandler::startStateElement(const QString& name,
 
-        //qDebug("state name=%s\n", (const char*) currentStateName.utf8());
+        //odebug << "state name=" << (const char*) currentStateName.utf8() << "\n" << oendl;