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,3 +1 @@
-#ifdef USE_ZKB_NAMES
-
 #include <qmap.h>
@@ -449,2 +447 @@ const QString& KeycodeNames::find(int k) {
 
-#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
@@ -3,4 +3,2 @@
 
-#ifdef USE_ZKB_NAMES
-
 #include <qstring.h>
@@ -24,4 +22,2 @@ public:
 };
-
-#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
@@ -491,3 +491,2 @@ int ZkbXmlHandler::str2key(const QString& s) {
 
-#ifdef USE_ZKB_NAMES
 	ret = KeyNames::find(s);
@@ -497,6 +496,2 @@ int ZkbXmlHandler::str2key(const QString& s) {
 
-#else 
-	ret = str2uint(s);
-#endif
-
 	return ret;
@@ -507,3 +502,2 @@ int ZkbXmlHandler::str2modifier(const QString& val) {
 
-#ifdef USE_ZKB_NAMES
 	int n, i;
@@ -528,5 +522,2 @@ int ZkbXmlHandler::str2modifier(const QString& val) {
 	} while (n < val.length());
-#else 
-	ret = str2uint(val);
-#endif
 
@@ -550,3 +541,2 @@ int ZkbXmlHandler::str2keycode(const QString& s) {
 
-#ifdef USE_ZKB_NAMES
 	ret = KeycodeNames::find(s);
@@ -556,6 +546,2 @@ int ZkbXmlHandler::str2keycode(const QString& s) {
 
-#else
-	ret = str2uint(s);
-#endif
-
 	return ret;