Diffstat (limited to 'inputmethods/kjumpx/keyboard.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | inputmethods/kjumpx/keyboard.cpp | 60 |
1 files changed, 30 insertions, 30 deletions
diff --git a/inputmethods/kjumpx/keyboard.cpp b/inputmethods/kjumpx/keyboard.cpp index dc44805..4e99f40 100644 --- a/inputmethods/kjumpx/keyboard.cpp +++ b/inputmethods/kjumpx/keyboard.cpp | |||
@@ -12,5 +12,5 @@ | |||
12 | #include "keyboard.h" | 12 | #include "keyboard.h" |
13 | 13 | ||
14 | #include <qpe/resource.h> | 14 | #include <opie2/oresource.h> |
15 | 15 | ||
16 | //#include <iostream.h> | 16 | //#include <iostream.h> |
@@ -154,23 +154,23 @@ Keyboard::Keyboard(QWidget* parent, const char* name, WFlags f) : | |||
154 | //setPalette(QPalette(QColor(240,240,230))); // Beige! | 154 | //setPalette(QPalette(QColor(240,240,230))); // Beige! |
155 | 155 | ||
156 | releasedPlain = releasedShift = releasedParen = Resource::loadPixmap("kjumpx/released"); | 156 | releasedPlain = releasedShift = releasedParen = Opie::Core::OResource::loadPixmap("kjumpx/released"); |
157 | pressedPlain = pressedShift = pressedParen = Resource::loadPixmap("kjumpx/pressed"); | 157 | pressedPlain = pressedShift = pressedParen = Opie::Core::OResource::loadPixmap("kjumpx/pressed"); |
158 | pressedDigit = Resource::loadPixmap("kjumpx/pressed"); | 158 | pressedDigit = Opie::Core::OResource::loadPixmap("kjumpx/pressed"); |
159 | 159 | ||
160 | QPixmap tmp; | 160 | QPixmap tmp; |
161 | 161 | ||
162 | tmp = Resource::loadPixmap("kjumpx/releasedShift"); | 162 | tmp = Opie::Core::OResource::loadPixmap("kjumpx/releasedShift"); |
163 | bitBlt(&releasedShift, letterx1, 0, &tmp); | 163 | bitBlt(&releasedShift, letterx1, 0, &tmp); |
164 | 164 | ||
165 | tmp = Resource::loadPixmap("kjumpx/releasedParen"); | 165 | tmp = Opie::Core::OResource::loadPixmap("kjumpx/releasedParen"); |
166 | bitBlt(&releasedParen, specialx1, 0, &tmp); | 166 | bitBlt(&releasedParen, specialx1, 0, &tmp); |
167 | 167 | ||
168 | tmp = Resource::loadPixmap("kjumpx/pressedShift"); | 168 | tmp = Opie::Core::OResource::loadPixmap("kjumpx/pressedShift"); |
169 | bitBlt(&pressedShift, letterx1, 0, &tmp); | 169 | bitBlt(&pressedShift, letterx1, 0, &tmp); |
170 | 170 | ||
171 | tmp = Resource::loadPixmap("kjumpx/pressedParen"); | 171 | tmp = Opie::Core::OResource::loadPixmap("kjumpx/pressedParen"); |
172 | bitBlt(&pressedParen, specialx1, 0, &tmp); | 172 | bitBlt(&pressedParen, specialx1, 0, &tmp); |
173 | 173 | ||
174 | tmp = Resource::loadPixmap("kjumpx/pressedDigit"); | 174 | tmp = Opie::Core::OResource::loadPixmap("kjumpx/pressedDigit"); |
175 | bitBlt(&pressedDigit, specialx1, 0, &tmp); | 175 | bitBlt(&pressedDigit, specialx1, 0, &tmp); |
176 | 176 | ||
@@ -565,7 +565,7 @@ void Keyboard::resetState() | |||
565 | * all following chars means unicode char value and are in hex | 565 | * all following chars means unicode char value and are in hex |
566 | * | 566 | * |
567 | * ÃÊÀ½ = schar (start char) | 567 | * �= = schar (start char) |
568 | * ÁßÀ½ = mchar (middle char) | 568 | * �= = mchar (middle char) |
569 | * ³¡À½ = echar (end char) | 569 | * = = echar (end char) |
570 | * | 570 | * |
571 | * there are 19 schars. unicode position is at 1100 - 1112 | 571 | * there are 19 schars. unicode position is at 1100 - 1112 |
@@ -611,8 +611,8 @@ QChar Keyboard::parseKoreanInput (ushort c) { | |||
611 | else { // must figure out what the echar is | 611 | else { // must figure out what the echar is |
612 | 612 | ||
613 | if (echar == 0x11a8) { // ¤¡ | 613 | if (echar == 0x11a8) { // |
614 | 614 | ||
615 | if (c == 0x1100) echar = 0x11a9; // ¤¡ + ¤¡ | 615 | if (c == 0x1100) echar = 0x11a9; // + |
616 | else if (c == 0x1109) echar = 0x11aa; // ¤¡ + ¤µ | 616 | else if (c == 0x1109) echar = 0x11aa; // + |
617 | else { | 617 | else { |
618 | schar = c; mchar = 0; echar = 0; | 618 | schar = c; mchar = 0; echar = 0; |
@@ -620,8 +620,8 @@ QChar Keyboard::parseKoreanInput (ushort c) { | |||
620 | } | 620 | } |
621 | 621 | ||
622 | } else if (echar == 0x11ab) { // ¤¤ | 622 | } else if (echar == 0x11ab) { // |
623 | 623 | ||
624 | if (c == 0x110c) echar = 0x11ac; // ¤¤ + ¤¸ | 624 | if (c == 0x110c) echar = 0x11ac; // + |
625 | else if (c == 0x1112) echar = 0x11ad; // ¤¤ + ¤¾ | 625 | else if (c == 0x1112) echar = 0x11ad; // + |
626 | else { | 626 | else { |
627 | schar = c; mchar = 0; echar = 0; | 627 | schar = c; mchar = 0; echar = 0; |
@@ -629,13 +629,13 @@ QChar Keyboard::parseKoreanInput (ushort c) { | |||
629 | } | 629 | } |
630 | 630 | ||
631 | } else if (echar == 0x11af) { // ¤© | 631 | } else if (echar == 0x11af) { // |
632 | 632 | ||
633 | if (c == 0x1100) echar = 0x11b0; // ¤© + ¤¡ | 633 | if (c == 0x1100) echar = 0x11b0; // + |
634 | else if (c == 0x1106) echar = 0x11b1; // ¤© + ¤± | 634 | else if (c == 0x1106) echar = 0x11b1; // + |
635 | else if (c == 0x1107) echar = 0x11b2; // ¤© + ¤² | 635 | else if (c == 0x1107) echar = 0x11b2; // + |
636 | else if (c == 0x1109) echar = 0x11b3; // ¤© + ¤µ | 636 | else if (c == 0x1109) echar = 0x11b3; // + |
637 | else if (c == 0x1110) echar = 0x11b4; // ¤© + ¤¼ | 637 | else if (c == 0x1110) echar = 0x11b4; // + |
638 | else if (c == 0x1111) echar = 0x11b5; // ¤© + ¤½ | 638 | else if (c == 0x1111) echar = 0x11b5; // + |
639 | else if (c == 0x1112) echar = 0x11b6; // ¤© + ¤¾ | 639 | else if (c == 0x1112) echar = 0x11b6; // + |
640 | else { | 640 | else { |
641 | schar = c; mchar = 0; echar = 0; | 641 | schar = c; mchar = 0; echar = 0; |
@@ -643,7 +643,7 @@ QChar Keyboard::parseKoreanInput (ushort c) { | |||
643 | } | 643 | } |
644 | 644 | ||
645 | } else if (echar == 0x11b8) { // ¤² | 645 | } else if (echar == 0x11b8) { // |
646 | 646 | ||
647 | if (c == 0x1109) echar = 0x11b9; // ¤² + ¤µ | 647 | if (c == 0x1109) echar = 0x11b9; // + |
648 | else { | 648 | else { |
649 | schar = c; mchar = 0; echar = 0; | 649 | schar = c; mchar = 0; echar = 0; |
@@ -651,7 +651,7 @@ QChar Keyboard::parseKoreanInput (ushort c) { | |||
651 | } | 651 | } |
652 | 652 | ||
653 | } else if (echar == 0x11ba) { // ¤µ | 653 | } else if (echar == 0x11ba) { // |
654 | 654 | ||
655 | if (c == 0x1109) echar = 0x11bb; // ¤µ + ¤µ | 655 | if (c == 0x1109) echar = 0x11bb; // + |
656 | else { | 656 | else { |
657 | schar = c; mchar = 0; echar = 0; | 657 | schar = c; mchar = 0; echar = 0; |