summaryrefslogtreecommitdiffstats
path: root/src/corelib
diff options
context:
space:
mode:
authorMartin Smith <msmith@trolltech.com>2010-03-09 11:04:59 (GMT)
committerMartin Smith <msmith@trolltech.com>2010-03-09 11:04:59 (GMT)
commit8c904712aa658dd0dd405b64913b8e6ade17f3df (patch)
treec9caa1359d5a48058f59d6a7ed961039d4abe027 /src/corelib
parentfcb912dfa85ab1045c08a0c5bee6bc4e84c90ef2 (diff)
downloadQt-8c904712aa658dd0dd405b64913b8e6ade17f3df.zip
Qt-8c904712aa658dd0dd405b64913b8e6ade17f3df.tar.gz
Qt-8c904712aa658dd0dd405b64913b8e6ade17f3df.tar.bz2
doc: Fixed several qdoc errors.
Diffstat (limited to 'src/corelib')
-rw-r--r--src/corelib/concurrent/qfuturewatcher.cpp2
-rw-r--r--src/corelib/global/qnamespace.qdoc2
-rw-r--r--src/corelib/tools/qeasingcurve.cpp4
-rw-r--r--src/corelib/tools/qstring.cpp22
4 files changed, 15 insertions, 15 deletions
diff --git a/src/corelib/concurrent/qfuturewatcher.cpp b/src/corelib/concurrent/qfuturewatcher.cpp
index 3b808b8..d4573c6 100644
--- a/src/corelib/concurrent/qfuturewatcher.cpp
+++ b/src/corelib/concurrent/qfuturewatcher.cpp
@@ -505,7 +505,7 @@ void QFutureWatcherBasePrivate::sendCallOutEvent(QFutureCallOutEvent *event)
finished signal will be emitted.
To avoid a race condition, it is important to call this function
- \i after doing the connections.
+ \e after doing the connections.
*/
/*! \fn QFuture<T> QFutureWatcher::future() const
diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc
index 76541ca..f8f3c49 100644
--- a/src/corelib/global/qnamespace.qdoc
+++ b/src/corelib/global/qnamespace.qdoc
@@ -2990,7 +2990,7 @@
\value IgnoredGesturesPropagateToParent Since Qt 4.7, this flag allows you
to fine-tune gesture event propagation. By setting the flag when
- \l{QGraphicsObject::grabGesture}{grabbing} a gesture all ignored partial
+ \l{QGraphicsObject::grabGesture()}{grabbing} a gesture all ignored partial
gestures will propagate to their parent items.
\sa QWidget::grabGesture(), QGraphicsObject::grabGesture()
diff --git a/src/corelib/tools/qeasingcurve.cpp b/src/corelib/tools/qeasingcurve.cpp
index d4b2c27..9c65d5d 100644
--- a/src/corelib/tools/qeasingcurve.cpp
+++ b/src/corelib/tools/qeasingcurve.cpp
@@ -877,8 +877,8 @@ QDataStream &operator<<(QDataStream &stream, const QEasingCurve &easing)
\fn QDataStream &operator>>(QDataStream &stream, QEasingCurve &easing)
\relates QQuaternion
- Reads an easing curve from the given \a stream into the given \a quaternion
- and returns a reference to the stream.
+ Reads an easing curve from the given \a stream into the given \a
+ easing curve and returns a reference to the stream.
\sa {Format of the QDataStream Operators}
*/
diff --git a/src/corelib/tools/qstring.cpp b/src/corelib/tools/qstring.cpp
index 5ed3db5..b54315c 100644
--- a/src/corelib/tools/qstring.cpp
+++ b/src/corelib/tools/qstring.cpp
@@ -2135,7 +2135,7 @@ bool QString::operator==(const QLatin1String &other) const
The \a other byte array is converted to a QString using the
fromAscii() function. This function stops conversion at the
- first NUL character found, or the end of the \a ba byte array.
+ first NUL character found, or the end of the byte array.
You can disable this operator by defining \c
QT_NO_CAST_FROM_ASCII when you compile your applications. This
@@ -2197,7 +2197,7 @@ bool QString::operator<(const QLatin1String &other) const
The \a other byte array is converted to a QString using the
fromAscii() function. If any NUL characters ('\0') are embedded
- in the \a ba byte array, they will be included in the transformation.
+ in the byte array, they will be included in the transformation.
You can disable this operator by defining \c
QT_NO_CAST_FROM_ASCII when you compile your applications. This
@@ -2240,7 +2240,7 @@ bool QString::operator<(const QLatin1String &other) const
The \a other byte array is converted to a QString using the
fromAscii() function. If any NUL characters ('\0') are embedded
- in the \a ba byte array, they will be included in the transformation.
+ in the byte array, they will be included in the transformation.
You can disable this operator by defining \c
QT_NO_CAST_FROM_ASCII when you compile your applications. This
@@ -2299,7 +2299,7 @@ bool QString::operator>(const QLatin1String &other) const
The \a other byte array is converted to a QString using the
fromAscii() function. If any NUL characters ('\0') are embedded
- in the \a ba byte array, they will be included in the transformation.
+ in the byte array, they will be included in the transformation.
You can disable this operator by defining \c
QT_NO_CAST_FROM_ASCII when you compile your applications. This
@@ -2341,8 +2341,8 @@ bool QString::operator>(const QLatin1String &other) const
\overload operator>=()
The \a other byte array is converted to a QString using the
- fromAscii() function. If any NUL characters ('\0') are embedded
- in the \a ba byte array, they will be included in the transformation.
+ fromAscii() function. If any NUL characters ('\0') are embedded in
+ the byte array, they will be included in the transformation.
You can disable this operator by defining \c QT_NO_CAST_FROM_ASCII
when you compile your applications. This can be useful if you want
@@ -2357,10 +2357,10 @@ bool QString::operator>(const QLatin1String &other) const
The \a other const char pointer is converted to a QString using
the fromAscii() function.
- You can disable this operator by defining \c
- QT_NO_CAST_FROM_ASCII when you compile your applications. This
- can be useful if you want to ensure that all user-visible strings
- go through QObject::tr(), for example.
+ You can disable this operator by defining \c QT_NO_CAST_FROM_ASCII
+ when you compile your applications. This can be useful if you want
+ to ensure that all user-visible strings go through QObject::tr(),
+ for example.
*/
/*! \fn bool QString::operator!=(const QString &other) const
@@ -2385,7 +2385,7 @@ bool QString::operator>(const QLatin1String &other) const
The \a other byte array is converted to a QString using the
fromAscii() function. If any NUL characters ('\0') are embedded
- in the \a ba byte array, they will be included in the transformation.
+ in the byte array, they will be included in the transformation.
You can disable this operator by defining \c QT_NO_CAST_FROM_ASCII
when you compile your applications. This can be useful if you want