Diffstat (limited to 'noncore/apps/keyz-cfg/zkbxml.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/apps/keyz-cfg/zkbxml.cpp | 14 |
1 files changed, 0 insertions, 14 deletions
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 @@ -484,33 +484,27 @@ bool ZkbXmlHandler::end_next_state() { 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(); } @@ -521,19 +515,16 @@ int ZkbXmlHandler::str2modifier(const QString& val) { 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 { @@ -543,26 +534,21 @@ bool ZkbXmlHandler::str2bool(const QString& s) { 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; |