summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel/qapplication_p.h
diff options
context:
space:
mode:
authorBradley T. Hughes <bradley.hughes@nokia.com>2009-05-12 12:51:44 (GMT)
committerBradley T. Hughes <bradley.hughes@nokia.com>2009-05-12 12:51:44 (GMT)
commitd9c2a93e1dc1ea0248d72fdc7f1bb863f8847658 (patch)
tree082e1636a1dfc5eb9d558706e34009d9a8571d35 /src/gui/kernel/qapplication_p.h
parent06d32cd1f14152ee0d49bc4a4a8adee953be11f4 (diff)
downloadQt-d9c2a93e1dc1ea0248d72fdc7f1bb863f8847658.zip
Qt-d9c2a93e1dc1ea0248d72fdc7f1bb863f8847658.tar.gz
Qt-d9c2a93e1dc1ea0248d72fdc7f1bb863f8847658.tar.bz2
Don't store the current list of touch points for a widget in QWidgetPrivate
This is information that's maintained by QApplication, so it belongs there instead.
Diffstat (limited to 'src/gui/kernel/qapplication_p.h')
-rw-r--r--src/gui/kernel/qapplication_p.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/gui/kernel/qapplication_p.h b/src/gui/kernel/qapplication_p.h
index a375933..e44e7aa 100644
--- a/src/gui/kernel/qapplication_p.h
+++ b/src/gui/kernel/qapplication_p.h
@@ -433,6 +433,7 @@ public:
// map<gesture name -> number of widget subscribed to it>
QMap<QString, int> grabbedGestures;
+ QMap<QWidget *, QList<QTouchEvent::TouchPoint *> > widgetCurrentTouchPoints;
static void updateTouchPointsForWidget(QWidget *widget, QTouchEvent *touchEvent);
#if defined(Q_WS_WIN)
@@ -447,8 +448,10 @@ public:
void initializeMultitouch();
static QTouchEvent::TouchPoint *findClosestTouchPoint(const QList<QTouchEvent::TouchPoint *> &activeTouchPoints,
const QPointF &pos);
- QEvent::Type appendTouchPoint(QTouchEvent::TouchPoint *touchPoint);
- QEvent::Type removeTouchPoint(QTouchEvent::TouchPoint *touchPoint);
+ QEvent::Type appendTouchPoint(QTouchEvent::TouchPoint *touchPoint,
+ QList<QTouchEvent::TouchPoint *> *currentTouchPoints);
+ QEvent::Type removeTouchPoint(QTouchEvent::TouchPoint *touchPoint,
+ QList<QTouchEvent::TouchPoint *> *currentTouchPoints);
bool translateTouchEvent(const MSG &msg);
#endif