1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix some qdoc warnings: typos and qdoc syntax

Browse Source 
Change-Id: Idf5c1490330e0f2e5d4bcf920eb03fc9993b3c8a
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
This commit is contained in:
Volker Hilsheimer 2020-09-21 23:55:58 +02:00
parent 19da4897af
commit 1e2325f0dc
5 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/sql/doc/src/drilldown.qdoc
View File

@ -438,7 +438,7 @@
\snippet drilldown/imageitem.h 0 \snippet drilldown/imageitem.h 0
We declare a \c Type enum value for our custom item and reimplement We declare a \c Type enum value for our custom item and reimplement
\l{QGreaphicsItem::}{type()}. This is done so we can safely use \l{QGraphicsItem::}{type()}. This is done so we can safely use
qgraphicsitem_cast(). qgraphicsitem_cast().
In addition, we implement a public \c id() function to be able to In addition, we implement a public \c id() function to be able to
identify the associated location and a public \c adjust() function identify the associated location and a public \c adjust() function

6
src/corelib/kernel/qvariant.cpp
View File

@ -2118,7 +2118,7 @@ bool QVariant::view(int type, void *ptr)
\li If one type is numeric and the other one a QString, Qt will try to \li If one type is numeric and the other one a QString, Qt will try to
convert the QString to a matching numeric type and if successful compare convert the QString to a matching numeric type and if successful compare
those. those.
\i If both variants contain pointers to QObject derived types, QVariant \li If both variants contain pointers to QObject derived types, QVariant
will check whether the types are related and point to the same object. will check whether the types are related and point to the same object.
\endlist \endlist
*/ */
@ -2700,7 +2700,7 @@ QDebug operator<<(QDebug dbg, const QVariant::Type p)
\class QVariantConstPointer \class QVariantConstPointer
\since 6.0 \since 6.0
\inmodule QtCore \inmodule QtCore
\brief Emulated const pointer to QVariant based on a pointer \brief Emulated const pointer to QVariant based on a pointer.
QVariantConstPointer wraps a QVariant and returns it from its operator*(). QVariantConstPointer wraps a QVariant and returns it from its operator*().
This makes it suitable as replacement for an actual const pointer. We cannot This makes it suitable as replacement for an actual const pointer. We cannot
@ -2737,7 +2737,7 @@ const QVariant *QVariantConstPointer::operator->() const
\class QVariantPointer \class QVariantPointer
\since 6.0 \since 6.0
\inmodule QtCore \inmodule QtCore
\brief Emulated pointer to QVariant based on a pointer \brief Emulated pointer to QVariant based on a pointer.
QVariantConstPointer wraps a pointer and returns QVariantRef to it from its QVariantConstPointer wraps a pointer and returns QVariantRef to it from its
operator*(). This makes it suitable as replacement for an actual pointer. We operator*(). This makes it suitable as replacement for an actual pointer. We

4
src/corelib/tools/qmargins.cpp
View File

@ -315,7 +315,7 @@ QT_BEGIN_NAMESPACE
\relates QMargins \relates QMargins
Returns a QMargins object that is formed from the maximum of each Returns a QMargins object that is formed from the maximum of each
component of \a m2 and a m1. component of \a m2 and \a m1.
\sa QMargins::operator+=(), QMargins::operator-=() \sa QMargins::operator+=(), QMargins::operator-=()
@ -668,7 +668,7 @@ QDebug operator<<(QDebug dbg, const QMargins &m)
\overload \overload
Returns a QMarginsF object that is formed from the maximum of each Returns a QMarginsF object that is formed from the maximum of each
component of \a m2 and a m1. component of \a m2 and \a m1.
\sa QMarginsF::operator+=(), QMarginsF::operator-=() \sa QMarginsF::operator+=(), QMarginsF::operator-=()

2
src/gui/kernel/qwindowsysteminterface.cpp
View File

@ -633,7 +633,7 @@ void QWindowSystemInterface::registerInputDevice(const QInputDevice *device)
/*! /*!
\internal \internal
Convert a list of \l QWindowSystemInterface::TouchPoint \a points to a list Convert a list of \l QWindowSystemInterface::TouchPoint \a points to a list
of \em temporary QEventPoint instances, scaled (but not localized) of \e temporary QEventPoint instances, scaled (but not localized)
for delivery to the given \a window. for delivery to the given \a window.
This is called from QWindowSystemInterface::handleTouchEvent(): This is called from QWindowSystemInterface::handleTouchEvent():

2
src/widgets/kernel/qapplication.cpp
View File

@ -528,8 +528,6 @@ void qt_init_tooltip_palette()
extern void qRegisterWidgetsVariant(); extern void qRegisterWidgetsVariant();
/*! /*!
\fn void QApplicationPrivate::initialize()
Initializes the QApplication object, called from the constructors. Initializes the QApplication object, called from the constructors.
*/ */
void QApplicationPrivate::initialize() void QApplicationPrivate::initialize()