From 902bc0038495a63949bc6781bb0c0494903d17ab Mon Sep 17 00:00:00 2001 From: Martin Smith Date: Wed, 13 May 2009 09:18:21 +0200 Subject: qdoc: Fixed some qdoc errors. --- doc/src/declarative/effects.qdoc | 2 +- doc/src/declarative/tutorial1.qdoc | 2 +- src/corelib/codecs/qtextcodec.cpp | 4 +-- src/corelib/kernel/qmetaobjectbuilder.cpp | 6 +--- src/declarative/fx/qfxtransform.cpp | 60 +++++++++++++++---------------- src/gui/kernel/qwidget.cpp | 4 +-- 6 files changed, 37 insertions(+), 41 deletions(-) diff --git a/doc/src/declarative/effects.qdoc b/doc/src/declarative/effects.qdoc index 6181e20..873c70a 100644 --- a/doc/src/declarative/effects.qdoc +++ b/doc/src/declarative/effects.qdoc @@ -18,7 +18,7 @@ These effects are currently only supported by the OpenGL canvas backend. Support backends may be added if the performance can be made acceptable. \list -\o Perspective Transforms (\l Perspective, Translation3D) +\o Perspective Transforms (\l{Perspective}, Translation3D) \o \l Shadow \o \l Blur \o \l Reflection diff --git a/doc/src/declarative/tutorial1.qdoc b/doc/src/declarative/tutorial1.qdoc index 6bb5012..5c11326 100644 --- a/doc/src/declarative/tutorial1.qdoc +++ b/doc/src/declarative/tutorial1.qdoc @@ -60,7 +60,7 @@ We add a text element as a child of our root element to display the text 'Hello The \c y property is used to position the text vertically at 30 pixels from the top of its parent. -The \c font.size and \c font.bold properties are related to fonts and use the 'dot' notation (see \l {declarative}{Declarative UI} ). +The \c font.size and \c font.bold properties are related to fonts and use the \e 'dot' notation. The \c anchors.horizontalCenter property refers to the horizontal center of an element. In this case, we specify that our text element should be horizontally centered in the \e Page element. diff --git a/src/corelib/codecs/qtextcodec.cpp b/src/corelib/codecs/qtextcodec.cpp index 51ca43e..e6fdc08 100644 --- a/src/corelib/codecs/qtextcodec.cpp +++ b/src/corelib/codecs/qtextcodec.cpp @@ -1515,7 +1515,7 @@ QString QTextDecoder::toUnicode(const QByteArray &ba) cannot be detected from the content provided, \a defaultCodec is returned. - \sa codecForUtfText + \sa codecForUtfText() */ QTextCodec *QTextCodec::codecForHtml(const QByteArray &ba, QTextCodec *defaultCodec) { @@ -1561,7 +1561,7 @@ QTextCodec *QTextCodec::codecForHtml(const QByteArray &ba) cannot be detected from the content provided, \a defaultCodec is returned. - \sa codecForHtml + \sa codecForHtml() */ QTextCodec *QTextCodec::codecForUtfText(const QByteArray &ba, QTextCodec *defaultCodec) { diff --git a/src/corelib/kernel/qmetaobjectbuilder.cpp b/src/corelib/kernel/qmetaobjectbuilder.cpp index 7bb04e1..de75bde 100644 --- a/src/corelib/kernel/qmetaobjectbuilder.cpp +++ b/src/corelib/kernel/qmetaobjectbuilder.cpp @@ -13,12 +13,8 @@ /*! \class QMetaObjectBuilder - \brief The QMetaObjectBuilder class supports the building of QMetaObject objects at runtime. + \brief The QMetaObjectBuilder class supports building QMetaObject objects at runtime. - See the QDynamicMetaObject class documentation for an example - of using this class. - - \sa QDynamicMetaObject, QDynamicObject */ /*! diff --git a/src/declarative/fx/qfxtransform.cpp b/src/declarative/fx/qfxtransform.cpp index 289333c..7b76367 100644 --- a/src/declarative/fx/qfxtransform.cpp +++ b/src/declarative/fx/qfxtransform.cpp @@ -397,12 +397,12 @@ void QFxRotation3D::update() } /*! - \internal - \qmlclass Translation3D - \brief A Translation3D object provides a way to move an Item along an axis. + \internal + \qmlclass Translation3D + \brief A Translation3D object provides a way to move an Item along an axis. - The following example translates the image to 10, 3. - \qml + The following example translates the image to 10, 3. + \qml Image { source: "logo.png" transform: [ @@ -415,7 +415,7 @@ Image { } ] } - \endqml + \endqml */ QML_DEFINE_TYPE(QFxTranslation3D,Translation3D); @@ -431,18 +431,18 @@ QFxTranslation3D::~QFxTranslation3D() } /*! - \qmlproperty real Translation3D::axis.startX - \qmlproperty real Translation3D::axis.startY - \qmlproperty real Translation3D::axis.endX - \qmlproperty real Translation3D::axis.endY - \qmlproperty real Translation3D::axis.endZ - - A translation axis is specified by 2 points in 3D space: a start point and - an end point. The z-position of the start point is assumed to be 0, and cannot - be changed. Changing the z-position of the end point is only valid when running - under OpenGL. - - \sa Axis + \qmlproperty real Translation3D::axis.startX + \qmlproperty real Translation3D::axis.startY + \qmlproperty real Translation3D::axis.endX + \qmlproperty real Translation3D::axis.endY + \qmlproperty real Translation3D::axis.endZ + + A translation axis is specified by 2 points in 3D space: a start + point and an end point. The z-position of the start point is assumed + to be 0, and cannot be changed. Changing the z-position of the end + point is only valid when running under OpenGL. + + \sa Axis */ QFxAxis *QFxTranslation3D::axis() { @@ -450,15 +450,15 @@ QFxAxis *QFxTranslation3D::axis() } /*! - \qmlproperty real Translation3D::distance + \qmlproperty real Translation3D::distance - The distance to translate along the specified axis. distance is a multiplier; - in the example below, a distance of 1 would translate to 100, 50, while a distance - of 0.5 would translate to 50, 25. + The distance to translate along the specified axis. distance is a + multiplier; in the example below, a distance of 1 would translate to + 100, 50, while a distance of 0.5 would translate to 50, 25. - \qml - Translation3D { axis.startX: 0; axis.startY: 0; axis.endX: 100; axis.endY: 50 } - \endqml + \qml + Translation3D { axis.startX: 0; axis.startY: 0; axis.endX: 100; axis.endY: 50 } + \endqml */ qreal QFxTranslation3D::distance() const { @@ -530,12 +530,12 @@ void QFxTranslation3D::update() } /*! - \internal - \qmlclass Perspective - \brief A Perspective object specifies a perspective transformation. + \internal + \qmlclass Perspective + \brief A Perspective object specifies a perspective transformation. - A Perspective transform only affects an item when running under OpenGL; when running under software - rasterization it has no effect. + A Perspective transform only affects an item when running under + OpenGL. When running under software rasterization it has no effect. */ QML_DEFINE_TYPE(QFxPerspective,Perspective); diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp index b7c4d33..b50eb24 100644 --- a/src/gui/kernel/qwidget.cpp +++ b/src/gui/kernel/qwidget.cpp @@ -5900,7 +5900,7 @@ QWidget *QWidget::focusWidget() const /*! Returns the next widget in this widget's focus chain. - \sa previousInFocusChain + \sa previousInFocusChain() */ QWidget *QWidget::nextInFocusChain() const { @@ -5910,7 +5910,7 @@ QWidget *QWidget::nextInFocusChain() const /*! Returns the previous widget in this widget's focus chain. - \sa nextInFocusChain + \sa nextInFocusChain() \since 4.6 */ -- cgit v0.12