summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel/qgesturemanager_p.h
diff options
context:
space:
mode:
authorDominik Holland <dominik.holland@nokia.com>2010-09-07 10:31:41 +0200
committerDenis Dzyubenko <denis.dzyubenko@nokia.com>2010-09-07 10:33:51 +0200
commit201e4927f9e23150f460e711a2859dbff3e1353c (patch)
treefd58d1c1a92eb49ee866a933b7a7c54ac25d7c55 /src/gui/kernel/qgesturemanager_p.h
parent854a274d7b17277235acc1fb3c36f576c7c6b8ec (diff)
Replaced QWeakPointer to *Pointer in QGestureManager.
The QWeakPointer was part of a key in a QMap. When the QWeakPointer gets deleted, the key changes and the sorting of the Map was wrong. That leads to an random crash. It should be safe not to use QWeakPointer as we remove pointers from the objectGestures map when a widget or graphicsitem gets destroyed. Reviewed-by: Denis Dzyubenko
Diffstat (limited to 'src/gui/kernel/qgesturemanager_p.h')
-rw-r--r--src/gui/kernel/qgesturemanager_p.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/kernel/qgesturemanager_p.h b/src/gui/kernel/qgesturemanager_p.h
index 747cb1ae52..0d84b67434 100644
--- a/src/gui/kernel/qgesturemanager_p.h
+++ b/src/gui/kernel/qgesturemanager_p.h
@@ -106,13 +106,13 @@ private:
struct ObjectGesture
{
- QWeakPointer<QObject> object;
+ QObject* object;
Qt::GestureType gesture;
ObjectGesture(QObject *o, const Qt::GestureType &g) : object(o), gesture(g) { }
inline bool operator<(const ObjectGesture &rhs) const
{
- if (object.data() < rhs.object.data())
+ if (object < rhs.object)
return true;
if (object == rhs.object)
return gesture < rhs.gesture;