summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel/qgesturemanager.cpp
diff options
context:
space:
mode:
authorDenis Dzyubenko <denis.dzyubenko@nokia.com>2009-05-18 12:08:07 (GMT)
committerDenis Dzyubenko <denis.dzyubenko@nokia.com>2009-05-18 13:21:26 (GMT)
commit537243d70de1474cf234880b215c75e83e80abcd (patch)
treef1a2f99e79e587d9128bfec437d7ef2a0832ec57 /src/gui/kernel/qgesturemanager.cpp
parent2964d27fdad2b9722b639e9b5c7c4d7a98fe5a3b (diff)
downloadQt-537243d70de1474cf234880b215c75e83e80abcd.zip
Qt-537243d70de1474cf234880b215c75e83e80abcd.tar.gz
Qt-537243d70de1474cf234880b215c75e83e80abcd.tar.bz2
Fixed warning.
Diffstat (limited to 'src/gui/kernel/qgesturemanager.cpp')
-rw-r--r--src/gui/kernel/qgesturemanager.cpp17
1 files changed, 9 insertions, 8 deletions
diff --git a/src/gui/kernel/qgesturemanager.cpp b/src/gui/kernel/qgesturemanager.cpp
index 88704ef..9e8a5bb 100644
--- a/src/gui/kernel/qgesturemanager.cpp
+++ b/src/gui/kernel/qgesturemanager.cpp
@@ -546,19 +546,20 @@ bool QGestureManager::sendGestureEvent(QWidget *receiver,
for(QSet<QGesture*>::iterator it = gestures.begin(), e = gestures.end(); it != e; ++it)
(*it)->ignore();
// TODO: send cancelled gesture event to the widget that received the original gesture!
- QGestureEvent event(it.value(), cancelled);
+ QGestureEvent event(gestures, cancelled);
DEBUG() << "QGestureManager::sendGestureEvent: sending now to" << receiver
- << "gestures" << it.value();
+ << "gestures" << gestures;
bool processed = qt_sendSpontaneousEvent(receiver, &event);
- QSet<QGesture*> started = startedGestures & it.value();
- if (event.isAccepted()) {
- DEBUG() << "QGestureManager::sendGestureEvent: all gestures were accepted";
- foreach(QGesture *g, started)
- g->accept();
- }
+ QSet<QGesture*> started = startedGestures & gestures;
+ DEBUG() << "QGestureManager::sendGestureEvent:" <<
+ (event.isAccepted() ? "" : "not") << "all gestures were accepted";
if (!started.isEmpty() && !(processed && event.isAccepted())) {
// there are started gestures events that weren't
// accepted, so propagating each gesture independently.
+ if (event.isAccepted()) {
+ foreach(QGesture *g, started)
+ g->accept();
+ }
QSet<QGesture*>::const_iterator it = started.begin(),
e = started.end();
for(; it != e; ++it) {