summaryrefslogtreecommitdiff
authorsandman <sandman>2002-06-02 01:21:42 (UTC)
committer sandman <sandman>2002-06-02 01:21:42 (UTC)
commit385a3d8034003a412fa73840bf985582bf6b4547 (patch) (unidiff)
treef88cd73678cd7d350a8c0ea71fb8cb95da27e178
parent0028521ebd7e96651e41dd7df325def8c8f4b63b (diff)
downloadopie-385a3d8034003a412fa73840bf985582bf6b4547.zip
opie-385a3d8034003a412fa73840bf985582bf6b4547.tar.gz
opie-385a3d8034003a412fa73840bf985582bf6b4547.tar.bz2
Patch to remove unneeded hunk from diff - sideeffect: The diff is useable
with both stock 2.3.2 and 2.3.3pre
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--qt/qte232-for-qpe150-keyboard.patch9
1 files changed, 0 insertions, 9 deletions
diff --git a/qt/qte232-for-qpe150-keyboard.patch b/qt/qte232-for-qpe150-keyboard.patch
index 5e212e9..597703a 100644
--- a/qt/qte232-for-qpe150-keyboard.patch
+++ b/qt/qte232-for-qpe150-keyboard.patch
@@ -116,33 +116,24 @@
116 + keyCode = Key_Backtab; 116 + keyCode = Key_Backtab;
117 } 117 }
118 118
119 /* 119 /*
120 Keypad consists of extended keys 53 and 28, 120 Keypad consists of extended keys 53 and 28,
121 and non-extended keys 55 and 71 through 83. 121 and non-extended keys 55 and 71 through 83.
122 */ 122 */
123- if ( extended ? (code == 53 || code == 28) : 123- if ( extended ? (code == 53 || code == 28) :
124+ if ((extended == 1) ? (code == 53 || code == 28) : 124+ if ((extended == 1) ? (code == 53 || code == 28) :
125 (code == 55 || ( code >= 71 && code <= 83 )) ) 125 (code == 55 || ( code >= 71 && code <= 83 )) )
126 keypad = Qt::Keypad; 126 keypad = Qt::Keypad;
127 127
128@@ -751,7 +798,7 @@
129 bool bShift = shift;
130 int unicode = 0;
131 if (code < keyMSize) {
132 - if (!extended) {
133 + if (extended == 0) {
134 bool bCaps = caps ^ shift;
135 #if defined(QT_QWS_CUSTOM)
136 if (fn) {
137@@ -790,7 +837,7 @@ 128@@ -790,7 +837,7 @@
138 unicode = QWSServer::keyMap()[code].shift_unicode ? QWSServer::keyMap()[code].shift_unicode : 0xffff; 129 unicode = QWSServer::keyMap()[code].shift_unicode ? QWSServer::keyMap()[code].shift_unicode : 0xffff;
139 else 130 else
140 unicode = QWSServer::keyMap()[code].unicode ? QWSServer::keyMap()[code].unicode : 0xffff; 131 unicode = QWSServer::keyMap()[code].unicode ? QWSServer::keyMap()[code].unicode : 0xffff;
141 - } else { 132 - } else {
142 + } else if (extended == 1) { 133 + } else if (extended == 1) {
143 if ( code == 53 ) 134 if ( code == 53 )
144 unicode = '/'; 135 unicode = '/';
145 } 136 }
146@@ -816,7 +863,7 @@ 137@@ -816,7 +863,7 @@
147 prevkey = prevuni = 0; 138 prevkey = prevuni = 0;
148 } 139 }