diff -r 56cd8111b7f7 -r 41300fa6a67c src/gui/kernel/qevent.h --- a/src/gui/kernel/qevent.h Tue Jan 26 12:42:25 2010 +0200 +++ b/src/gui/kernel/qevent.h Tue Feb 02 00:43:10 2010 +0200 @@ -638,9 +638,11 @@ { public: QFileOpenEvent(const QString &file); + QFileOpenEvent(const QUrl &url); ~QFileOpenEvent(); inline QString file() const { return f; } + QUrl url() const; private: QString f; }; @@ -785,6 +787,8 @@ private: QTouchEventTouchPointPrivate *d; + friend class QApplication; + friend class QApplicationPrivate; }; enum DeviceType { @@ -816,6 +820,7 @@ Qt::TouchPointStates _touchPointStates; QList _touchPoints; + friend class QApplication; friend class QApplicationPrivate; }; @@ -827,7 +832,7 @@ QGestureEvent(const QList &gestures); ~QGestureEvent(); - QList allGestures() const; + QList gestures() const; QGesture *gesture(Qt::GestureType type) const; QList activeGestures() const; @@ -851,10 +856,17 @@ void ignore(QGesture *); bool isAccepted(QGesture *) const; + void setAccepted(Qt::GestureType, bool); + void accept(Qt::GestureType); + void ignore(Qt::GestureType); + bool isAccepted(Qt::GestureType) const; + void setWidget(QWidget *widget); QWidget *widget() const; - QPointF mapToScene(const QPointF &gesturePoint) const; +#ifndef QT_NO_GRAPHICSVIEW + QPointF mapToGraphicsScene(const QPointF &gesturePoint) const; +#endif private: QGestureEventPrivate *d_func();