summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel
diff options
context:
space:
mode:
authorBradley T. Hughes <bradley.hughes@nokia.com>2009-06-22 14:01:09 (GMT)
committerBradley T. Hughes <bradley.hughes@nokia.com>2009-06-22 14:01:09 (GMT)
commitfb8adb2b1d23ed1bd9f8c1e9ebb00ad9bd0023d7 (patch)
tree1ae31fd378d5793b5bc137730f7459138ee96102 /src/gui/kernel
parent3ead3dff7e713057b03cd2b969896f196b7ca2f0 (diff)
downloadQt-fb8adb2b1d23ed1bd9f8c1e9ebb00ad9bd0023d7.zip
Qt-fb8adb2b1d23ed1bd9f8c1e9ebb00ad9bd0023d7.tar.gz
Qt-fb8adb2b1d23ed1bd9f8c1e9ebb00ad9bd0023d7.tar.bz2
Fix qdoc warnings for QTouchEvent
Diffstat (limited to 'src/gui/kernel')
-rw-r--r--src/gui/kernel/qevent.cpp7
-rw-r--r--src/gui/kernel/qevent.h4
2 files changed, 5 insertions, 6 deletions
diff --git a/src/gui/kernel/qevent.cpp b/src/gui/kernel/qevent.cpp
index ca37664..9c990c3 100644
--- a/src/gui/kernel/qevent.cpp
+++ b/src/gui/kernel/qevent.cpp
@@ -3735,9 +3735,8 @@ void QGestureEvent::accept(const QString &type)
*/
/*!
- Constructs a QTouchEvent with the given \a type and \a
- touchPoints. The \a modifiers are the current keyboard modifiers
- at the time of the event.
+ Constructs a QTouchEvent with the given \a type and \a touchPoints. The \a touchPointStates and
+ \a modifiers are the current touch point states and keyboard modifiers at the time of the event.
*/
QTouchEvent::QTouchEvent(QEvent::Type type,
Qt::KeyboardModifiers modifiers,
@@ -3784,7 +3783,7 @@ QTouchEvent::~QTouchEvent()
Sets a bitwise OR of all the touch point states for this event.
*/
-/*! \fn void QTouchEvent::setTouchPoints(QList<QTouchEvent::TouchPoint> &touchPoints)
+/*! \fn void QTouchEvent::setTouchPoints(const QList<QTouchEvent::TouchPoint> &touchPoints)
\internal
diff --git a/src/gui/kernel/qevent.h b/src/gui/kernel/qevent.h
index ee81e78..ce3f0c0 100644
--- a/src/gui/kernel/qevent.h
+++ b/src/gui/kernel/qevent.h
@@ -766,7 +766,7 @@ public:
{
public:
TouchPoint(int id = -1);
- TouchPoint(const TouchPoint &other);
+ TouchPoint(const QTouchEvent::TouchPoint &other);
~TouchPoint();
int id() const;
@@ -808,7 +808,7 @@ public:
void setSceneRect(const QRectF &sceneRect);
void setScreenRect(const QRectF &screenRect);
void setPressure(qreal pressure);
- TouchPoint &operator=(const TouchPoint &other);
+ QTouchEvent::TouchPoint &operator=(const QTouchEvent::TouchPoint &other);
private:
QTouchEventTouchPointPrivate *d;