author | alwin <alwin> | 2004-02-26 16:46:05 (UTC) |
---|---|---|
committer | alwin <alwin> | 2004-02-26 16:46:05 (UTC) |
commit | 15f4596df91110689176fb3b76a4fcf6663c1c09 (patch) (side-by-side diff) | |
tree | fe9fcef4baf851b13427cc06b7b2b6b83b5adb5e /noncore/apps/keyz-cfg | |
parent | 89cbb91c0217a1ba0480c23e8ef14221975f04e2 (diff) | |
download | opie-15f4596df91110689176fb3b76a4fcf6663c1c09.zip opie-15f4596df91110689176fb3b76a4fcf6663c1c09.tar.gz opie-15f4596df91110689176fb3b76a4fcf6663c1c09.tar.bz2 |
forgot remove some ifdefs
-rw-r--r-- | noncore/apps/keyz-cfg/zkbnames.cpp | 3 | ||||
-rw-r--r-- | noncore/apps/keyz-cfg/zkbnames.h | 4 | ||||
-rw-r--r-- | noncore/apps/keyz-cfg/zkbxml.cpp | 14 |
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,4 +1,2 @@ -#ifdef USE_ZKB_NAMES - #include <qmap.h> #include <qstring.h> @@ -448,3 +446,2 @@ 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 @@ -2,6 +2,4 @@ #define ZKBNAMES_H -#ifdef USE_ZKB_NAMES - #include <qstring.h> @@ -23,5 +21,3 @@ public: 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 @@ -490,5 +490,4 @@ int ZkbXmlHandler::str2key(const QString& s) { int ret; -#ifdef USE_ZKB_NAMES ret = KeyNames::find(s); if (ret == -1) { @@ -496,8 +495,4 @@ int ZkbXmlHandler::str2key(const QString& s) { } -#else - ret = str2uint(s); -#endif - return ret; } @@ -506,5 +501,4 @@ int ZkbXmlHandler::str2modifier(const QString& val) { int ret; -#ifdef USE_ZKB_NAMES int n, i; ret = 0; @@ -527,7 +521,4 @@ int ZkbXmlHandler::str2modifier(const QString& val) { n = i + 1; } while (n < val.length()); -#else - ret = str2uint(val); -#endif return ret; @@ -549,5 +540,4 @@ int ZkbXmlHandler::str2keycode(const QString& s) { int ret; -#ifdef USE_ZKB_NAMES ret = KeycodeNames::find(s); if (ret == -1) { @@ -555,8 +545,4 @@ int ZkbXmlHandler::str2keycode(const QString& s) { } -#else - ret = str2uint(s); -#endif - return ret; } |