summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Smith <msmith@trolltech.com>2009-07-02 10:38:08 +0200
committerMartin Smith <msmith@trolltech.com>2009-07-02 10:39:04 +0200
commit69083610b09aaabbff5e8a177fac713a6a6d46ba (patch)
treea918f90d8c57f8f79cc7b71d449ab532827af1fd
parentb4028f5a2195a432059ff26c288d772af47bc14d (diff)
downloadqt4-tools-69083610b09aaabbff5e8a177fac713a6a6d46ba.tar.gz
doc: Corrected several qdoc warnings.
-rw-r--r--src/gui/graphicsview/qgraphicssceneevent.cpp5
-rw-r--r--src/gui/kernel/qevent.cpp4
-rw-r--r--src/gui/kernel/qgesturerecognizer.cpp7
-rw-r--r--src/qt3support/sql/q3datatable.cpp2
-rw-r--r--tools/qdoc3/test/qt-cpp-ignore.qdocconf3
-rw-r--r--tools/qdoc3/test/qt-inc.qdocconf3
6 files changed, 16 insertions, 8 deletions
diff --git a/src/gui/graphicsview/qgraphicssceneevent.cpp b/src/gui/graphicsview/qgraphicssceneevent.cpp
index 338f12a2b9..27a2d7e62a 100644
--- a/src/gui/graphicsview/qgraphicssceneevent.cpp
+++ b/src/gui/graphicsview/qgraphicssceneevent.cpp
@@ -1892,8 +1892,11 @@ void QGraphicsSceneGestureEvent::acceptAll()
setAccepted(true);
}
-/*!
+/*! \fn void QGraphicsSceneGestureEvent::accept()
+ Calls QEvent::accept().
+*/
+/*!
Sets the accept flag of the gesture specified by \a type. This is
equivalent to calling \l{QGestureEvent::gesture()} {gesture(type)}->
\l{QGesture::accept()}{accept()}
diff --git a/src/gui/kernel/qevent.cpp b/src/gui/kernel/qevent.cpp
index e40ad9dc67..a7a7f2db2f 100644
--- a/src/gui/kernel/qevent.cpp
+++ b/src/gui/kernel/qevent.cpp
@@ -3628,6 +3628,10 @@ QSet<QString> QGestureEvent::cancelledGestures() const
return m_cancelledGestures;
}
+/*! \fn void QGestureEvent::accept()
+ Calls QEvent::accept().
+*/
+
/*!
Sets the accept flag of the all gestures inside the event object,
the equivalent of calling \l{QEvent::accept()}{accept()} or
diff --git a/src/gui/kernel/qgesturerecognizer.cpp b/src/gui/kernel/qgesturerecognizer.cpp
index c330663127..30889d7d27 100644
--- a/src/gui/kernel/qgesturerecognizer.cpp
+++ b/src/gui/kernel/qgesturerecognizer.cpp
@@ -97,8 +97,8 @@ QString qt_getStandardGestureTypeName(Qt::GestureType gestureType);
This is a pure virtual function that needs to be implemented in
subclasses.
- Parses input \a event and returns the result, which specifies if
- the event sequence is a gesture or not.
+ Parses input \a event and returns the result, which specifies
+ whether the event sequence is a gesture or not.
*/
/*! \fn QGesture* QGestureRecognizer::getGesture()
@@ -123,7 +123,8 @@ QString qt_getStandardGestureTypeName(Qt::GestureType gestureType);
The gesture recognizer might emit the stateChanged() signal when
the gesture state changes asynchronously, i.e. without any event
- being filtered through filterEvent().
+ being filtered through filterEvent(). \a result specifies whether
+ the event sequence is a gesture or not.
*/
QGestureRecognizerPrivate::QGestureRecognizerPrivate()
diff --git a/src/qt3support/sql/q3datatable.cpp b/src/qt3support/sql/q3datatable.cpp
index 638aff8896..d8d3c2bd14 100644
--- a/src/qt3support/sql/q3datatable.cpp
+++ b/src/qt3support/sql/q3datatable.cpp
@@ -1726,8 +1726,6 @@ void Q3DataTable::repaintCell( int row, int col )
the content coordinate system. If \a selected is true the cell has
been selected and would normally be rendered differently than an
unselected cell.
-
- \sa QSql::isNull()
*/
void Q3DataTable::paintCell( QPainter * p, int row, int col, const QRect & cr,
diff --git a/tools/qdoc3/test/qt-cpp-ignore.qdocconf b/tools/qdoc3/test/qt-cpp-ignore.qdocconf
index 9a18abec25..709e336b83 100644
--- a/tools/qdoc3/test/qt-cpp-ignore.qdocconf
+++ b/tools/qdoc3/test/qt-cpp-ignore.qdocconf
@@ -68,7 +68,8 @@ Cpp.ignoretokens = QAXFACTORY_EXPORT \
QT_END_NAMESPACE \
QT_END_INCLUDE_NAMESPACE \
PHONON_EXPORT \
- Q_GADGET
+ Q_GADGET \
+ QWEBKIT_EXPORT
Cpp.ignoredirectives = Q_DECLARE_HANDLE \
Q_DECLARE_INTERFACE \
Q_DECLARE_METATYPE \
diff --git a/tools/qdoc3/test/qt-inc.qdocconf b/tools/qdoc3/test/qt-inc.qdocconf
index 01b07b3478..542c7cac89 100644
--- a/tools/qdoc3/test/qt-inc.qdocconf
+++ b/tools/qdoc3/test/qt-inc.qdocconf
@@ -100,7 +100,8 @@ Cpp.ignoretokens = QAXFACTORY_EXPORT \
Q_TYPENAME \
Q_XML_EXPORT \
QDBUS_EXPORT \
- Q_GADGET
+ Q_GADGET \
+ QWEBKIT_EXPORT
Cpp.ignoredirectives = Q_DECLARE_HANDLE \
Q_DECLARE_INTERFACE \
Q_DECLARE_METATYPE \