1 files changed, 9 insertions, 6 deletions

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,8 +1,12 @@
-#include <qfileinfo.h>
-
 #include "zkbcfg.h"
 
+/* OPIE */
+#include <opie2/odebug.h>
+using namespace Opie::Core;
+
+/* QT */
+#include <qfileinfo.h>
 
 // Implementation of XkbConfig class
 ZkbConfig::ZkbConfig(const QString& dir):path(dir) {
 }
@@ -14,9 +18,9 @@ bool ZkbConfig::load(const QString& file, Keymap& keymap, const QString& prefix)
         bool ret;
         QFile f(path+"/"+file);
         QFileInfo fi(f);
 
-        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()) {
                 return false;
         }
 
@@ -29,10 +33,9 @@ bool ZkbConfig::load(const QString& file, Keymap& keymap, const QString& prefix)
         reader.setErrorHandler(this);
         ret = reader.parse(is);
         includedFiles.remove(fi.absFilePath());
 
-        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;
 }
 
 bool ZkbConfig::warning(const QXmlParseException& e) {
@@ -121,9 +124,9 @@ bool ZkbHandler::startStateElement(const QString& name,
 
         currentStateName = prefix + name;
         currentState = keymap.getStateByName(currentStateName);
 
-        //qDebug("state name=%s\n", (const char*) currentStateName.utf8());
+        //odebug << "state name=" << (const char*) currentStateName.utf8() << "\n" << oendl; 
 
         State* parent = 0;
         if (!parentName.isEmpty()) {
                 QString pn = prefix + parentName;