Diffstat (limited to 'noncore/apps/keyz-cfg/zkbxml.cpp') (more/less context) (show 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 | |||
@@ -480,93 +480,79 @@ bool ZkbXmlHandler::end_event() { | |||
480 | 480 | ||
481 | bool ZkbXmlHandler::end_next_state() { | 481 | bool ZkbXmlHandler::end_next_state() { |
482 | return endNextStateElement(); | 482 | return endNextStateElement(); |
483 | } | 483 | } |
484 | 484 | ||
485 | void ZkbXmlHandler::setError(const QString& e) { | 485 | void ZkbXmlHandler::setError(const QString& e) { |
486 | err = e; | 486 | err = e; |
487 | } | 487 | } |
488 | 488 | ||
489 | int ZkbXmlHandler::str2key(const QString& s) { | 489 | int ZkbXmlHandler::str2key(const QString& s) { |
490 | int ret; | 490 | int ret; |
491 | 491 | ||
492 | #ifdef USE_ZKB_NAMES | ||
493 | ret = KeyNames::find(s); | 492 | ret = KeyNames::find(s); |
494 | if (ret == -1) { | 493 | if (ret == -1) { |
495 | setError("Invalid value: " + s); | 494 | setError("Invalid value: " + s); |
496 | } | 495 | } |
497 | 496 | ||
498 | #else | ||
499 | ret = str2uint(s); | ||
500 | #endif | ||
501 | |||
502 | return ret; | 497 | return ret; |
503 | } | 498 | } |
504 | 499 | ||
505 | int ZkbXmlHandler::str2modifier(const QString& val) { | 500 | int ZkbXmlHandler::str2modifier(const QString& val) { |
506 | int ret; | 501 | int ret; |
507 | 502 | ||
508 | #ifdef USE_ZKB_NAMES | ||
509 | int n, i; | 503 | int n, i; |
510 | ret = 0; | 504 | ret = 0; |
511 | n = 0; | 505 | n = 0; |
512 | do { | 506 | do { |
513 | i = val.find('|', n); | 507 | i = val.find('|', n); |
514 | if (i < 0) { | 508 | if (i < 0) { |
515 | i = val.length(); | 509 | i = val.length(); |
516 | } | 510 | } |
517 | 511 | ||
518 | QString s = val.mid(n, i - n); | 512 | QString s = val.mid(n, i - n); |
519 | int v = ModifierNames::find(s.stripWhiteSpace()); | 513 | int v = ModifierNames::find(s.stripWhiteSpace()); |
520 | 514 | ||
521 | if (v == -1) { | 515 | if (v == -1) { |
522 | setError("Invalid value: " + val); | 516 | setError("Invalid value: " + val); |
523 | return -1; | 517 | return -1; |
524 | } | 518 | } |
525 | 519 | ||
526 | ret |= v; | 520 | ret |= v; |
527 | n = i + 1; | 521 | n = i + 1; |
528 | } while (n < val.length()); | 522 | } while (n < val.length()); |
529 | #else | ||
530 | ret = str2uint(val); | ||
531 | #endif | ||
532 | 523 | ||
533 | return ret; | 524 | return ret; |
534 | } | 525 | } |
535 | 526 | ||
536 | bool ZkbXmlHandler::str2bool(const QString& s) { | 527 | bool ZkbXmlHandler::str2bool(const QString& s) { |
537 | if (s == "true") { | 528 | if (s == "true") { |
538 | return true; | 529 | return true; |
539 | } else { | 530 | } else { |
540 | return false; | 531 | return false; |
541 | } | 532 | } |
542 | } | 533 | } |
543 | 534 | ||
544 | int ZkbXmlHandler::str2unicode(const QString& s) { | 535 | int ZkbXmlHandler::str2unicode(const QString& s) { |
545 | return str2uint(s); | 536 | return str2uint(s); |
546 | } | 537 | } |
547 | 538 | ||
548 | int ZkbXmlHandler::str2keycode(const QString& s) { | 539 | int ZkbXmlHandler::str2keycode(const QString& s) { |
549 | int ret; | 540 | int ret; |
550 | 541 | ||
551 | #ifdef USE_ZKB_NAMES | ||
552 | ret = KeycodeNames::find(s); | 542 | ret = KeycodeNames::find(s); |
553 | if (ret == -1) { | 543 | if (ret == -1) { |
554 | setError("Invalid value: " + s); | 544 | setError("Invalid value: " + s); |
555 | } | 545 | } |
556 | 546 | ||
557 | #else | ||
558 | ret = str2uint(s); | ||
559 | #endif | ||
560 | |||
561 | return ret; | 547 | return ret; |
562 | } | 548 | } |
563 | 549 | ||
564 | int ZkbXmlHandler::str2uint(const QString& s) { | 550 | int ZkbXmlHandler::str2uint(const QString& s) { |
565 | int ret; | 551 | int ret; |
566 | bool ok; | 552 | bool ok; |
567 | QString val = s; | 553 | QString val = s; |
568 | int r; | 554 | int r; |
569 | 555 | ||
570 | if (val.left(2) == "0x") { | 556 | if (val.left(2) == "0x") { |
571 | val = s.mid(2); | 557 | val = s.mid(2); |
572 | r = 16; | 558 | r = 16; |