From f039a37447f7d157a9ddacf31b2d8214aaaedd34 Mon Sep 17 00:00:00 2001
From: xavier
 <xavier@r991  xavier  2010-05-09 20:40:08 +0200 (dim. 09 mai 2010)>
Date: Sat, 28 Apr 2012 23:22:34 +0000
Subject: [PATCH] Fixed regression introduced in rev1657: key strokes were
 discarded when editing texts.

git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/branches/0.3@1706 bfdf4180-ca20-0410-9c96-a3a8aa849046
---
 sources/diagram.cpp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/sources/diagram.cpp b/sources/diagram.cpp
index 7be226f1d..f1850cc14 100644
--- a/sources/diagram.cpp
+++ b/sources/diagram.cpp
@@ -150,6 +150,7 @@ void Diagram::drawBackground(QPainter *p, const QRectF &r) {
 	@param e QKeyEvent decrivant l'evenement clavier
 */
 void Diagram::keyPressEvent(QKeyEvent *e) {
+	bool transmit_event = true;
 	if (!isReadOnly()) {
 		QPointF movement;
 		switch(e -> key()) {
@@ -162,9 +163,10 @@ void Diagram::keyPressEvent(QKeyEvent *e) {
 			beginMoveElements();
 			continueMoveElements(movement);
 			e -> accept();
+			transmit_event = false;
 		}
 	}
-	if (!e -> isAccepted()) {
+	if (transmit_event) {
 		QGraphicsScene::keyPressEvent(e);
 	}
 }
@@ -174,6 +176,7 @@ void Diagram::keyPressEvent(QKeyEvent *e) {
 	@param e QKeyEvent decrivant l'evenement clavier
 */
 void Diagram::keyReleaseEvent(QKeyEvent *e) {
+	bool transmit_event = true;
 	if (!isReadOnly()) {
 		// detecte le relachement d'une touche de direction ( = deplacement d'elements)
 		if (
@@ -182,10 +185,11 @@ void Diagram::keyReleaseEvent(QKeyEvent *e) {
 			!e -> isAutoRepeat()
 		) {
 			endMoveElements();
-			e->accept();
+			e -> accept();
+			transmit_event = false;
 		}
 	}
-	if (!e -> isAccepted()) {
+	if (transmit_event) {
 		QGraphicsScene::keyReleaseEvent(e);
 	}
 }