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,58 +1,61 @@
-#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) {
 }
 
 ZkbConfig::~ZkbConfig() {
 }
 
 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;
 	}
 
 	includedFiles.insert(fi.absFilePath(), 1);
 	QXmlInputSource is(f);
 	QXmlSimpleReader reader;
 	ZkbHandler h(*this, keymap, prefix);
 
 	reader.setContentHandler(&h);
 	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) {
 	QString tmp;
 
 	tmp.sprintf("%d: warning: %s\n", e.lineNumber(), 
 		(const char*) e.message().utf8());
 
 	err += tmp;
 
 	return true;
 }
 
 bool ZkbConfig::error(const QXmlParseException& e) {
 	QString tmp;
 
 	tmp.sprintf("%d: error: %s\n", e.lineNumber(), 
 		(const char*) e.message().utf8());
 
 	err += tmp;
 
 	return true;
 }
@@ -101,49 +104,49 @@ bool ZkbHandler::startIncludeElement(const QString& file,
 	if (!ret) {
 		setError("Error including file: " + file);
 	}
 
 	return ret;
 }
 
 bool ZkbHandler::startLabelElement(const QString& label, 
 	const QString& state) {
 
 	if (!keymap.addLabel(label, prefix + state)) {
 		err = "label " + label + " already defined";
 		return false;
 	}
 
 	return true;
 }
 
 bool ZkbHandler::startStateElement(const QString& name, 
 	const QString& parentName, bool dflt) {
 
 	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;
 		parent = keymap.getStateByName(pn);
 		if (parent == 0) {
 			err = currentStateName + 
 				": undefined parent state: " + pn;
 			return false;
 		}
 	}
 
 	if (currentState == 0) {
 		currentState = new State(parent);
 		keymap.addState(currentStateName, currentState);
 	} else {
 		if (parent!=0) {
 			currentState->setParent(parent);
 		}
 	}
 
 	if (dflt) {
 		keymap.setCurrentState(currentState);
 	}