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,9 +1,15 @@
-#include <qmessagebox.h>
 #include "cfgfile.h"
 
+/* OPIE */
+#include <opie2/odebug.h>
+using namespace Opie::Core;
+
+/* QT */
+#include <qmessagebox.h>
+
 // CfgEntry implementation
 CfgEntry::CfgEntry() {
 }
 
 CfgEntry::CfgEntry(const QString& f, const QString& l):
 	file(f), label(l) {
@@ -92,24 +98,24 @@ bool CfgParser::load(QString file, CfgFile& cfg) {
 	err = "";
 	ardelay = -1;
 	arperiod = -1;
 	reader.parse(is);
 
 	if (!err.isEmpty()) {
-		qDebug(err);
+		odebug << err << oendl; 
 		return false;
 	}
 
 	QMap<QString, QString>::Iterator fit, lit;
 	for(uint i = 0; i < includeList.count(); i++) {
 		QString file = *includeList.at(i);
 		fit = includes.find(file);
 		QString prefix = fit.data();
 		QString label = "";
 
-		qDebug("include: file=" + fit.key() + ", prefix=" + fit.data());
+		odebug << "include: file=" + fit.key() + ", prefix=" + fit.data() << oendl; 
 		lit = labels.find(prefix+":*");
 		if (lit != labels.end()) {
 			label = lit.data();
 		}
 
 		cfg.replaceEntry(file, label);
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
@@ -1,4 +1,4 @@
   config KEYZCFG
     boolean "keyz-cfg (configuration tool for keyz applet)"
     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
@@ -1,24 +1,24 @@
 TEMPLATE        = app
 DESTDIR         = $(OPIEDIR)/bin
 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
 
 SOURCES		= main.cpp \
 		  cfgdlg.cpp \
 		  cfgfile.cpp \
 		  zkb.cpp \
 		  zkbcfg.cpp \
-			zkbnames.cpp \
-			zkbxml.cpp
+		  zkbnames.cpp \
+		  zkbxml.cpp
 
 INCLUDEPATH     += $(OPIEDIR)/include
 DEPENDPATH      += $(OPIEDIR)/include
-LIBS		+= -lqpe
+LIBS		+= -lqpe -lopiecore2
 TARGET 		= keyz-cfg
 
 include ( $(OPIEDIR)/include.pro )
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
@@ -361,13 +361,13 @@ State* Keymap::getStateByLabel(const QString& label) {
 		n = currentStateName.findRev(":");
 		if (n >= 0) {
 			name += currentStateName.mid(n+1);
 		}
 	}
 
-//	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);
 	if (sit != states.end()) {
 		state = sit.data();
 	}
 
 	return state;
@@ -413,13 +413,13 @@ bool Keymap::setCurrentState(State* state) {
 
 			QMap<State*, QString>::Iterator tit;
 			tit = stateLabelMap.find(state);
 			if (tit != stateLabelMap.end()) {
 				currentLabel = tit.data();
 			} else {
-//				qDebug("no label for: " + currentStateName + "\n");
+//				odebug << "no label for: " + currentStateName + "\n" << oendl; 
 				currentLabel = "";
 			}
 
 			return true;
 		}
 	}
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,10 +1,14 @@
-#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() {
@@ -12,13 +16,13 @@ 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);
@@ -27,14 +31,13 @@ bool ZkbConfig::load(const QString& file, Keymap& keymap, const QString& 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;
 
@@ -119,13 +122,13 @@ bool ZkbHandler::startLabelElement(const QString& label,
 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) {