diff options
| author | artoka <arto.katajasalo@digia.com> | 2011-12-13 10:06:14 (GMT) |
|---|---|---|
| committer | Qt Commercial Integration <QtCommercial@digia.com> | 2012-01-31 10:25:07 (GMT) |
| commit | 3e42111e96e18fd60ec6d6b8b386c2f4a4b401ac (patch) | |
| tree | f1a207c1347398428a886857a5c3c3f2ab4e5d84 /src/corelib | |
| parent | 8392eebfdacdcb7d318e786eafffc2d48db77bcc (diff) | |
| download | Qt-3e42111e96e18fd60ec6d6b8b386c2f4a4b401ac.zip Qt-3e42111e96e18fd60ec6d6b8b386c2f4a4b401ac.tar.gz Qt-3e42111e96e18fd60ec6d6b8b386c2f4a4b401ac.tar.bz2 | |
Various qt documentation fixes (wk 40&41)
Fixes for bugs: QTBUG-21067, QTBUG-17025, QTBUG-11489, QTBUG-20069,
QTBUG-3563, QTBUG-20089, QTBUG-13983, QTBUG-11820, QTBUG-14732,
QTBUG-14521, QTBUG-9675, QTBUG-18313, QTBUG-18313, QTBUG-11312,
QTBUG-17739, QTBUG-7678, QTBUG-14759, QTBUG-14756, QTBUG-14677,
QTBUG-16164, QTBUG-20721, QTBUG-15562, QTBUG-17029 and QTBUG-18544.
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/kernel/qpointer.cpp | 2 | ||||
| -rw-r--r-- | src/corelib/tools/qline.cpp | 7 | ||||
| -rw-r--r-- | src/corelib/tools/qlist.cpp | 5 |
3 files changed, 8 insertions, 6 deletions
diff --git a/src/corelib/kernel/qpointer.cpp b/src/corelib/kernel/qpointer.cpp index 1859e65..a7df91c 100644 --- a/src/corelib/kernel/qpointer.cpp +++ b/src/corelib/kernel/qpointer.cpp @@ -97,7 +97,7 @@ Note that class \c T must inherit QObject, or a compilation or link error will result. - \sa QSharedPointer, QObject, QObjectCleanupHandler + \sa QSharedPointer, QWeakPointer, QObject, QObjectCleanupHandler */ /*! diff --git a/src/corelib/tools/qline.cpp b/src/corelib/tools/qline.cpp index 0f67652..a909b43 100644 --- a/src/corelib/tools/qline.cpp +++ b/src/corelib/tools/qline.cpp @@ -155,7 +155,8 @@ QT_BEGIN_NAMESPACE /*! \fn int QLine::dx() const - Returns the horizontal component of the line's vector. + Returns the horizontal component of the line's vector. + Return value is positive if x2() >= x1() and negative if x2() < x1(). \sa dy() */ @@ -164,6 +165,7 @@ QT_BEGIN_NAMESPACE \fn int QLine::dy() const Returns the vertical component of the line's vector. + Return value is positive if y2() >= y1() and negative if y2() < y1(). \sa dx() */ @@ -501,6 +503,7 @@ bool QLineF::isNull() const Sets the length of the line to the given \a length. QLineF will move the end point - p2() - of the line to give the line its new length. + If the given \a length is negative the angle() is also changed. If the line is a null line, the length will remain zero regardless of the length specified. @@ -757,7 +760,7 @@ QLineF::IntersectType QLineF::intersect(const QLineF &l, QPointF *intersectionPo \since 4.4 - Returns the angle (in degrees) from this line to the given \a + Returns the angle (in positive degrees) from this line to the given \a line, taking the direction of the lines into account. If the lines do not intersect within their range, it is the intersection point of the extended lines that serves as origin (see diff --git a/src/corelib/tools/qlist.cpp b/src/corelib/tools/qlist.cpp index 764a1d6..1b8d330 100644 --- a/src/corelib/tools/qlist.cpp +++ b/src/corelib/tools/qlist.cpp @@ -469,9 +469,8 @@ void **QListData::erase(void **xi) \snippet doc/src/snippets/code/src_corelib_tools_qlistdata.cpp 0 Qt includes a QStringList class that inherits QList\<QString\> - and adds a few convenience functions, such as QStringList::join() - and QStringList::find(). (QString::split() creates QStringLists - from strings.) + and adds a convenience function QStringList::join(). + (QString::split() creates QStringLists from strings.) QList stores a list of items. The default constructor creates an empty list. To insert items into the list, you can use |