[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    =?utf-8?q?=5Brekonq=5D_src=3A_Fixup_for_vi_style_navigation_even?=
From:       Pierre Rossi <pierre.rossi () gmail ! com>
Date:       2011-06-28 18:12:41
Message-ID: 20110628181241.D1889A60A6 () git ! kde ! org
[Download RAW message or body]

Git commit e27351218ec760df32050083ab4493507a9fbfe1 by Pierre Rossi.
Committed on 28/06/2011 at 17:05.
Pushed by pierrerossi into branch 'master'.

Fixup for vi style navigation event handling.

Reviewed-by: TrustMe

M  +12   -11   src/webview.cpp     

http://commits.kde.org/rekonq/e27351218ec760df32050083ab4493507a9fbfe1

diff --git a/src/webview.cpp b/src/webview.cpp
index 30acaef..37e9783 100644
--- a/src/webview.cpp
+++ b/src/webview.cpp
@@ -621,25 +621,26 @@ void WebView::keyPressEvent(QKeyEvent *event)
         }
     }
 
+    // vi-like navigation
     if (event->key() == Qt::Key_J && event->modifiers() == Qt::NoModifier)
     {
-        QKeyEvent event1(QEvent::KeyPress, Qt::Key_Down, Qt::NoModifier);
-        event = &event1;
+        event->accept();
+        event = new QKeyEvent(QEvent::KeyPress, Qt::Key_Down, Qt::NoModifier);
     }
-    if (event->key() == Qt::Key_K && event->modifiers() == Qt::NoModifier)
+    else if (event->key() == Qt::Key_K && event->modifiers() == Qt::NoModifier)
     {
-        QKeyEvent event1(QEvent::KeyPress, Qt::Key_Up, Qt::NoModifier);
-        event = &event1;
+        event->accept();
+        event = new QKeyEvent(QEvent::KeyPress, Qt::Key_Up, Qt::NoModifier);
     }
-    if (event->key() == Qt::Key_L && event->modifiers() == Qt::NoModifier)
+    else if (event->key() == Qt::Key_L && event->modifiers() == Qt::NoModifier)
     {
-        QKeyEvent event1(QEvent::KeyPress, Qt::Key_Right, Qt::NoModifier);
-        event = &event1;
+        event->accept();
+        event = new QKeyEvent(QEvent::KeyPress, Qt::Key_Right, Qt::NoModifier);
     }
-    if (event->key() == Qt::Key_H && event->modifiers() == Qt::NoModifier)
+    else if (event->key() == Qt::Key_H && event->modifiers() == Qt::NoModifier)
     {
-        QKeyEvent event1(QEvent::KeyPress, Qt::Key_Left, Qt::NoModifier);
-        event = &event1;
+        event->accept();
+        event = new QKeyEvent(QEvent::KeyPress, Qt::Key_Left, Qt::NoModifier);
     }
 
     KWebView::keyPressEvent(event);

[prev in list] [next in list] [prev in thread] [next in thread]