Patch to remove unneeded hunk from diff - sideeffect: The diff is useable

with both stock 2.3.2 and 2.3.3pre

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
@@ -32,123 +32,114 @@
      bool release = false;
      int keypad = 0;
 +#if defined(QT_QWS_IPAQ) 
 +    static int ipaq_return_pressed = false; // iPAQ Action Key has ScanCode 0x60: 0x60|0x80 = 0xe0 == extended mode 1 !
 +#endif
 +    
  #if !defined(QT_QWS_CUSTOM)
 -    if (code == 224) {
 +    if ((code == 224) 
 +#if defined(QT_QWS_IPAQ)
 +    && !ipaq_return_pressed
 +#endif    
 +    )    
 +    {
          // extended
         -extended = true;
         +extended = 1;
         +return;
 +    }
 +    else if (code == 225) {
         +    // extended 2
         +    extended = 2;
          return;
      }
  #endif
 @@ -571,7 +585,7 @@
          code &= 0x7f;
      }
  
 -    if (extended) {
 +    if (extended == 1) {
          switch (code) {
          case 72:
              keyCode = Qt::Key_Up;
 @@ -609,6 +623,32 @@
          case 53:
              keyCode = Qt::Key_Slash;
              break;
         +case 0x1d:
         +    keyCode = Qt::Key_Control;
         +    break;
         +case 0x2a:
         +    keyCode = Qt::Key_SysReq;
         +    break;
         +case 0x38:
         +    keyCode = Qt::Key_Alt;
         +    break;
         +case 0x5b:
         +    keyCode = Qt::Key_Super_L;
         +    break;
         +case 0x5c:
         +    keyCode = Qt::Key_Super_R;
         +    break;
         +case 0x5d:
         +    keyCode = Qt::Key_Menu;
         +           break;    
         +}
 +    } else if (extended == 2) {
         +switch (code) {
         +case 0x1d:
         +    return;
         +case 0x45:
         +    keyCode = Qt::Key_Pause;
         +    break;
          }
      } else {
  #if defined(QT_QWS_CUSTOM)
 @@ -647,6 +687,7 @@
                 repeatable = FALSE;
                 break;
              case 0x60:
         +       ipaq_return_pressed = !release;
                 keyCode = Key_Return;
                 break;
              case 0x67:
 @@ -684,13 +725,19 @@
          else
              repeater->stop();
  #endif
 +
         +/*
         + Translate shift+Key_Tab to Key_Backtab
         +*/
         +if (( keyCode == Key_Tab ) && shift )
         +    keyCode = Key_Backtab;
      }
  
      /*
        Keypad consists of extended keys 53 and 28,
        and non-extended keys 55 and 71 through 83.
      */
 -    if ( extended ? (code == 53 || code == 28) :
 +    if ((extended == 1) ? (code == 53 || code == 28) :
           (code == 55 || ( code >= 71 && code <= 83 )) )
          keypad = Qt::Keypad;
  
-@@ -751,7 +798,7 @@
-         bool bShift = shift;
-         int unicode = 0;
-         if (code < keyMSize) {
-        -    if (!extended) {
-        +    if (extended == 0) {
-                 bool bCaps = caps ^ shift;
- #if defined(QT_QWS_CUSTOM)
-                if (fn) {
 @@ -790,7 +837,7 @@
                     unicode =  QWSServer::keyMap()[code].shift_unicode ?  QWSServer::keyMap()[code].shift_unicode : 0xffff;
                 else
                     unicode =  QWSServer::keyMap()[code].unicode ?  QWSServer::keyMap()[code].unicode : 0xffff;
         -    } else {
         +    } else if (extended == 1) {
                 if ( code == 53 )
                     unicode = '/';
              }
 @@ -816,7 +863,7 @@
              prevkey = prevuni = 0;
          }
      }
 -    extended = false;
 +    extended = 0;
  }