3 files changed, 0 insertions, 21 deletions

diff --git a/noncore/apps/keyz-cfg/zkbnames.cpp b/noncore/apps/keyz-cfg/zkbnames.cpp
index fec3a2e..c20a114 100644
--- a/noncore/apps/keyz-cfg/zkbnames.cpp
+++ b/noncore/apps/keyz-cfg/zkbnames.cpp
@@ -1,34 +1,32 @@
-#ifdef USE_ZKB_NAMES
-
 #include <qmap.h>
 #include <qstring.h>
 
 #include "zkbnames.h"
 
 QString Null_String((const char*) 0);
 
 // Implementation of KeyNames
 static struct {
 	int key;
 	char *name;
 } Key_Names[] = {
 	{ 32, "Space" },
 	{ 39, "Apostrophe" },
 	{ 44, "Comma" },
 	{ 46, "Period" },
 	{ 47, "Slash" },
 	{ 65, "A" },
 	{ 66, "B" },
 	{ 67, "C" },
 	{ 68, "D" },
 	{ 69, "E" },
 	{ 70, "F" },
 	{ 71, "G" },
 	{ 72, "H" },
 	{ 73, "I" },
 	{ 74, "J" },
 	{ 75, "K" },
 	{ 76, "L" },
 	{ 77, "M" },
 	{ 78, "N" },
 	{ 79, "O" },
@@ -418,33 +416,32 @@ void init_kcn_maps() {
 		kcn_map.insert(name, keycode);
 		kcn_rmap.insert(keycode, name);
 		i++;
 	}
 }
 
 int KeycodeNames::find(const QString& key) {
 	if (kcn_map.isEmpty()) {
 		init_kcn_maps();
 	}
 
 	QMap<QString, int>::Iterator it = kcn_map.find(key);
 	if (it == kcn_map.end()) {
 		return -1;
 	} else {
 		return it.data();
 	}
 }
 
 const QString& KeycodeNames::find(int k) {
 	if (kcn_map.isEmpty()) {
 		init_kcn_maps();
 	}
 
 	QMap<int, QString>::Iterator it = kcn_rmap.find(k);
 	if (it == kcn_rmap.end()) {
 		return Null_String;
 	} else {
 		return it.data();
 	}
 }
 
-#endif
diff --git a/noncore/apps/keyz-cfg/zkbnames.h b/noncore/apps/keyz-cfg/zkbnames.h
index 58462ff..0d1e7f5 100644
--- a/noncore/apps/keyz-cfg/zkbnames.h
+++ b/noncore/apps/keyz-cfg/zkbnames.h
@@ -1,27 +1,23 @@
 #ifndef ZKBNAMES_H
 #define ZKBNAMES_H
 
-#ifdef USE_ZKB_NAMES
-
 #include <qstring.h>
 
 class KeyNames {
 public:
 	static int find(const QString& key);
 	static const QString& find(int);
 };
 
 class KeycodeNames {
 public:
 	static int find(const QString& key);
 	static const QString& find(int);
 };
 
 class ModifierNames {
 public:
 	static int find(const QString& key);
 	static const QString& find(int);
 };
-
-#endif
 #endif
diff --git a/noncore/apps/keyz-cfg/zkbxml.cpp b/noncore/apps/keyz-cfg/zkbxml.cpp
index 76472cb..5b0084c 100644
--- a/noncore/apps/keyz-cfg/zkbxml.cpp
+++ b/noncore/apps/keyz-cfg/zkbxml.cpp
@@ -460,128 +460,114 @@ bool ZkbXmlHandler::end_keymap() {
 
 bool ZkbXmlHandler::end_include() {
 	return endIncludeElement();
 }
 
 bool ZkbXmlHandler::end_label() {
 	return endLabelElement();
 }
 
 bool ZkbXmlHandler::end_state() {
 	return endStateElement();
 }
 
 bool ZkbXmlHandler::end_map() {
 	return endMapElement();
 }
 
 bool ZkbXmlHandler::end_event() {
 	return endEventElement();
 }
 
 bool ZkbXmlHandler::end_next_state() {
 	return endNextStateElement();
 }
 
 void ZkbXmlHandler::setError(const QString& e) {
 	err = e;
 }
 
 int ZkbXmlHandler::str2key(const QString& s) {
 	int ret;
 
-#ifdef USE_ZKB_NAMES
 	ret = KeyNames::find(s);
 	if (ret == -1) {
 		setError("Invalid value: " + s);
 	}
 
-#else 
-	ret = str2uint(s);
-#endif
-
 	return ret;
 }
 
 int ZkbXmlHandler::str2modifier(const QString& val) {
 	int ret;
 
-#ifdef USE_ZKB_NAMES
 	int n, i;
 	ret = 0;
 	n = 0;
 	do {
 		i = val.find('|', n);
 		if (i < 0) {
 			i = val.length();
 		}
 
 		QString s = val.mid(n, i - n);
 		int v = ModifierNames::find(s.stripWhiteSpace());
 
 		if (v == -1) {
 			setError("Invalid value: " + val);
 			return -1;
 		}
 
 		ret |= v;
 		n = i + 1;
 	} while (n < val.length());
-#else 
-	ret = str2uint(val);
-#endif
 
 	return ret;
 }
 
 bool ZkbXmlHandler::str2bool(const QString& s) {
 	if (s == "true") {
 		return true;
 	} else {
 		return false;
 	}
 }
 
 int ZkbXmlHandler::str2unicode(const QString& s) {
 	return str2uint(s);
 }
 
 int ZkbXmlHandler::str2keycode(const QString& s) {
 	int ret;
 
-#ifdef USE_ZKB_NAMES
 	ret = KeycodeNames::find(s);
 	if (ret == -1) {
 		setError("Invalid value: " + s);
 	}
 
-#else
-	ret = str2uint(s);
-#endif
-
 	return ret;
 }
 
 int ZkbXmlHandler::str2uint(const QString& s) {
 	int ret;
 	bool ok;
 	QString val = s;
 	int r;
 
 	if (val.left(2) == "0x") {
 		val = s.mid(2);
 		r = 16;
 	} else if (val.left(1) == "0") {
 		val = s.mid(1);
 		r = 8;
 	} else {
 		r = 10;
 	}
 
 	ret = val.toInt(&ok, r);
 	if (!ok) {
 		setError("Invalid value: " + s);
 		ret = -1;
 	}
 
 	return ret;
 }