| -rw-r--r-- | inputmethods/kjumpx/config.in | 2 | ||||
| -rw-r--r-- | inputmethods/kjumpx/keyboard.cpp | 60 | ||||
| -rw-r--r-- | inputmethods/kjumpx/kjumpx.pro | 2 | ||||
| -rw-r--r-- | inputmethods/kjumpx/opie-kjumpx.control | 2 |
4 files changed, 33 insertions, 33 deletions
diff --git a/inputmethods/kjumpx/config.in b/inputmethods/kjumpx/config.in index 8ccef5b..0c4e9d4 100644 --- a/inputmethods/kjumpx/config.in +++ b/inputmethods/kjumpx/config.in @@ -3,2 +3,2 @@ default "y" - depends ( LIBQPE || LIBQPE-X11 ) + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE 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 @@ -13,3 +13,3 @@ -#include <qpe/resource.h> +#include <opie2/oresource.h> @@ -155,5 +155,5 @@ Keyboard::Keyboard(QWidget* parent, const char* name, WFlags f) : - releasedPlain = releasedShift = releasedParen = Resource::loadPixmap("kjumpx/released"); - pressedPlain = pressedShift = pressedParen = Resource::loadPixmap("kjumpx/pressed"); - pressedDigit = Resource::loadPixmap("kjumpx/pressed"); + releasedPlain = releasedShift = releasedParen = Opie::Core::OResource::loadPixmap("kjumpx/released"); + pressedPlain = pressedShift = pressedParen = Opie::Core::OResource::loadPixmap("kjumpx/pressed"); + pressedDigit = Opie::Core::OResource::loadPixmap("kjumpx/pressed"); @@ -161,15 +161,15 @@ Keyboard::Keyboard(QWidget* parent, const char* name, WFlags f) : - tmp = Resource::loadPixmap("kjumpx/releasedShift"); + tmp = Opie::Core::OResource::loadPixmap("kjumpx/releasedShift"); bitBlt(&releasedShift, letterx1, 0, &tmp); - tmp = Resource::loadPixmap("kjumpx/releasedParen"); + tmp = Opie::Core::OResource::loadPixmap("kjumpx/releasedParen"); bitBlt(&releasedParen, specialx1, 0, &tmp); - tmp = Resource::loadPixmap("kjumpx/pressedShift"); + tmp = Opie::Core::OResource::loadPixmap("kjumpx/pressedShift"); bitBlt(&pressedShift, letterx1, 0, &tmp); - tmp = Resource::loadPixmap("kjumpx/pressedParen"); + tmp = Opie::Core::OResource::loadPixmap("kjumpx/pressedParen"); bitBlt(&pressedParen, specialx1, 0, &tmp); - tmp = Resource::loadPixmap("kjumpx/pressedDigit"); + tmp = Opie::Core::OResource::loadPixmap("kjumpx/pressedDigit"); bitBlt(&pressedDigit, specialx1, 0, &tmp); @@ -566,5 +566,5 @@ void Keyboard::resetState() * - * ÃÊÀ½ = schar (start char) - * ÁßÀ½ = mchar (middle char) - * ³¡À½ = echar (end char) + * �= = schar (start char) + * �= = mchar (middle char) + * = = echar (end char) * @@ -612,6 +612,6 @@ QChar Keyboard::parseKoreanInput (ushort c) { - if (echar == 0x11a8) { // ¤¡ + if (echar == 0x11a8) { // - if (c == 0x1100) echar = 0x11a9; // ¤¡ + ¤¡ - else if (c == 0x1109) echar = 0x11aa; // ¤¡ + ¤µ + if (c == 0x1100) echar = 0x11a9; // + + else if (c == 0x1109) echar = 0x11aa; // + else { @@ -621,6 +621,6 @@ QChar Keyboard::parseKoreanInput (ushort c) { - } else if (echar == 0x11ab) { // ¤¤ + } else if (echar == 0x11ab) { // - if (c == 0x110c) echar = 0x11ac; // ¤¤ + ¤¸ - else if (c == 0x1112) echar = 0x11ad; // ¤¤ + ¤¾ + if (c == 0x110c) echar = 0x11ac; // + + else if (c == 0x1112) echar = 0x11ad; // + else { @@ -630,11 +630,11 @@ QChar Keyboard::parseKoreanInput (ushort c) { - } else if (echar == 0x11af) { // ¤© + } else if (echar == 0x11af) { // - if (c == 0x1100) echar = 0x11b0; // ¤© + ¤¡ - else if (c == 0x1106) echar = 0x11b1; // ¤© + ¤± - else if (c == 0x1107) echar = 0x11b2; // ¤© + ¤² - else if (c == 0x1109) echar = 0x11b3; // ¤© + ¤µ - else if (c == 0x1110) echar = 0x11b4; // ¤© + ¤¼ - else if (c == 0x1111) echar = 0x11b5; // ¤© + ¤½ - else if (c == 0x1112) echar = 0x11b6; // ¤© + ¤¾ + if (c == 0x1100) echar = 0x11b0; // + + else if (c == 0x1106) echar = 0x11b1; // + + else if (c == 0x1107) echar = 0x11b2; // + + else if (c == 0x1109) echar = 0x11b3; // + + else if (c == 0x1110) echar = 0x11b4; // + + else if (c == 0x1111) echar = 0x11b5; // + + else if (c == 0x1112) echar = 0x11b6; // + else { @@ -644,5 +644,5 @@ QChar Keyboard::parseKoreanInput (ushort c) { - } else if (echar == 0x11b8) { // ¤² + } else if (echar == 0x11b8) { // - if (c == 0x1109) echar = 0x11b9; // ¤² + ¤µ + if (c == 0x1109) echar = 0x11b9; // + else { @@ -652,5 +652,5 @@ QChar Keyboard::parseKoreanInput (ushort c) { - } else if (echar == 0x11ba) { // ¤µ + } else if (echar == 0x11ba) { // - if (c == 0x1109) echar = 0x11bb; // ¤µ + ¤µ + if (c == 0x1109) echar = 0x11bb; // + else { diff --git a/inputmethods/kjumpx/kjumpx.pro b/inputmethods/kjumpx/kjumpx.pro index 09e9bf1..0f708fd 100644 --- a/inputmethods/kjumpx/kjumpx.pro +++ b/inputmethods/kjumpx/kjumpx.pro @@ -10,3 +10,3 @@ INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include -LIBS += -lqpe +LIBS += -lqpe -lopiecore2 VERSION = 1.0.0 diff --git a/inputmethods/kjumpx/opie-kjumpx.control b/inputmethods/kjumpx/opie-kjumpx.control index 3650812..a9d004e 100644 --- a/inputmethods/kjumpx/opie-kjumpx.control +++ b/inputmethods/kjumpx/opie-kjumpx.control @@ -6,3 +6,3 @@ Maintainer: Jake Richardson <jake@asdfnews.org> Architecture: arm -Depends: task-opie-minimal +Depends: task-opie-minimal, libopiecore2 License: GPL |