forgot remove some ifdefs

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,6 +1,4 @@
-#ifdef USE_ZKB_NAMES
-
 #include <qmap.h>
 #include <qstring.h>
 
 #include "zkbnames.h"
@@ -446,5 +444,4 @@ const QString& KeycodeNames::find(int k) {
 		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,9 +1,7 @@
 #ifndef ZKBNAMES_H
 #define ZKBNAMES_H
 
-#ifdef USE_ZKB_NAMES
-
 #include <qstring.h>
 
 class KeyNames {
 public:
@@ -21,7 +19,5 @@ 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
@@ -488,25 +488,19 @@ void ZkbXmlHandler::setError(const QString& 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 {
@@ -525,11 +519,8 @@ int ZkbXmlHandler::str2modifier(const QString& val) {
 
 		ret |= v;
 		n = i + 1;
 	} while (n < val.length());
-#else 
-	ret = str2uint(val);
-#endif
 
 	return ret;
 }
 
@@ -547,18 +538,13 @@ int ZkbXmlHandler::str2unicode(const QString& 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) {