From cf81bf2e2dc366637ec2981d20315e3cf88c55e8 Mon Sep 17 00:00:00 2001 From: Nico Vertriest Date: Thu, 4 Sep 2014 11:52:29 +0200 Subject: Doc: corrected autolink errors qtbase/corelib/tools MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also corrected some minor language/spelling issues Task-number: QTBUG-40362 Change-Id: I00d76521fc9beb4e7a4a83ff6dc3334a055a7148 Reviewed-by: Topi Reiniƶ Reviewed-by: Jerome Pasion --- src/corelib/tools/qchar.cpp | 4 ++-- src/corelib/tools/qcollator.cpp | 2 +- src/corelib/tools/qcontiguouscache.cpp | 2 +- src/corelib/tools/qdatetime.cpp | 13 +++++++------ src/corelib/tools/qlist.cpp | 4 ++-- src/corelib/tools/qsharedpointer.cpp | 2 +- src/corelib/tools/qstring.cpp | 9 ++++----- src/corelib/tools/qtimeline.cpp | 4 ++-- 8 files changed, 20 insertions(+), 20 deletions(-) (limited to 'src/corelib') diff --git a/src/corelib/tools/qchar.cpp b/src/corelib/tools/qchar.cpp index 656e57391f..75300a4eb2 100644 --- a/src/corelib/tools/qchar.cpp +++ b/src/corelib/tools/qchar.cpp @@ -1527,13 +1527,13 @@ static inline ushort foldCase(ushort ch) \fn QChar QChar::toCaseFolded() const Returns the case folded equivalent of the character. - For most Unicode characters this is the same as toLowerCase(). + For most Unicode characters this is the same as toLower(). */ /*! \overload Returns the case folded equivalent of the UCS-4-encoded character specified - by \a ucs4. For most Unicode characters this is the same as toLowerCase(). + by \a ucs4. For most Unicode characters this is the same as toLower(). */ uint QChar::toCaseFolded(uint ucs4) { diff --git a/src/corelib/tools/qcollator.cpp b/src/corelib/tools/qcollator.cpp index 8cdcb2a947..5612b2be68 100644 --- a/src/corelib/tools/qcollator.cpp +++ b/src/corelib/tools/qcollator.cpp @@ -74,7 +74,7 @@ QT_BEGIN_NAMESPACE /*! Constructs a QCollator from \a locale. If \a locale is not specified - QLocale::default() will be used. + the system's default locale is used. \sa setLocale() */ diff --git a/src/corelib/tools/qcontiguouscache.cpp b/src/corelib/tools/qcontiguouscache.cpp index e284ce1e5d..f70802d098 100644 --- a/src/corelib/tools/qcontiguouscache.cpp +++ b/src/corelib/tools/qcontiguouscache.cpp @@ -482,7 +482,7 @@ MyRecord record(int row) const INT_MAX or prepended before the index position 0. This is only expected to occur in very long lived circular buffer style usage of the contiguous cache. Indexes can be made valid again by calling - normalizeIndexs(). + normalizeIndexes(). \sa normalizeIndexes(), append(), prepend() */ diff --git a/src/corelib/tools/qdatetime.cpp b/src/corelib/tools/qdatetime.cpp index 3c01edc83e..ad30131727 100644 --- a/src/corelib/tools/qdatetime.cpp +++ b/src/corelib/tools/qdatetime.cpp @@ -866,9 +866,9 @@ QString QDate::longDayName(int weekday, MonthNameType type) Qt::DefaultLocaleLongDate, the string format depends on the default application locale. This is the locale set with QLocale::setDefault(), or the system locale if no default locale - has been set. Identical to calling QLocale().toString(date, - QLocale::ShortFormat) or QLocale().toString(date, - QLocale::LongFormat). + has been set. Identical to calling + \l {QLocale::toString()}{QLocale().toString(date, QLocale::ShortFormat) } or + \l {QLocale::toString()}{QLocale().toString(date, QLocale::LongFormat)}. If the \a format is Qt::RFC2822Date, the string is formatted in an \l{RFC 2822} compatible way. An example of this formatting is @@ -1623,9 +1623,10 @@ int QTime::msec() const Qt::DefaultLocaleLongDate, the string format depends on the default application locale. This is the locale set with QLocale::setDefault(), or the system locale if no default locale - has been set. Identical to calling QLocale().toString(time, - QLocale::ShortFormat) or QLocale().toString(time, - QLocale::LongFormat). + has been set. Identical to calling + + \l {QLocale::toString()}{QLocale().toString(time, QLocale::ShortFormat)} or + \l {QLocale::toString()}{QLocale().toString(time, QLocale::LongFormat)}. If the \a format is Qt::RFC2822Date, the string is formatted in an \l{RFC 2822} compatible way. An example of this formatting is diff --git a/src/corelib/tools/qlist.cpp b/src/corelib/tools/qlist.cpp index 2f9a7ca80f..4c3f99c3a0 100644 --- a/src/corelib/tools/qlist.cpp +++ b/src/corelib/tools/qlist.cpp @@ -386,8 +386,8 @@ void **QListData::erase(void **xi) Qt includes a QStringList class that inherits QList\ and adds a few convenience functions, such as QStringList::join() - and QStringList::find(). (QString::split() creates QStringLists - from strings.) + and QStringList::filter(). 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 diff --git a/src/corelib/tools/qsharedpointer.cpp b/src/corelib/tools/qsharedpointer.cpp index e0cd54022e..7fa8d78a12 100644 --- a/src/corelib/tools/qsharedpointer.cpp +++ b/src/corelib/tools/qsharedpointer.cpp @@ -460,7 +460,7 @@ The \a deleter parameter specifies the custom deleter for this object. The custom deleter is called, instead of the operator delete(), when the strong reference count drops to 0. This is useful, - for instance, for calling deleteLater() on a QObject instead: + for instance, for calling \l {QObject::}{deleteLater()} on a QObject instead: \code static void doDeleteLater(MyObject *obj) diff --git a/src/corelib/tools/qstring.cpp b/src/corelib/tools/qstring.cpp index 33326f141b..376360965b 100644 --- a/src/corelib/tools/qstring.cpp +++ b/src/corelib/tools/qstring.cpp @@ -1006,8 +1006,7 @@ const QString::Null QString::null = { }; \endlist One way to define these preprocessor symbols globally for your - application is to add the following entry to your - \l{qmake Project Files}{qmake project file}: + application is to add the following entry to your \l {Creating Project Files}{qmake project file}: \snippet code/src_corelib_tools_qstring.cpp 0 @@ -6185,7 +6184,7 @@ qulonglong QString::toIntegral_helper(const QChar *data, uint len, bool *ok, int base 8 is used; otherwise, base 10 is used. The string conversion will always happen in the 'C' locale. For locale - dependent conversion use QLocale::toLong() + dependent conversion use QLocale::toLongLong() Example: @@ -6214,7 +6213,7 @@ long QString::toLong(bool *ok, int base) const base 8 is used; otherwise, base 10 is used. The string conversion will always happen in the 'C' locale. For locale - dependent conversion use QLocale::toULong() + dependent conversion use QLocale::toULongLong() Example: @@ -9943,7 +9942,7 @@ long QStringRef::toLong(bool *ok, int base) const base 8 is used; otherwise, base 10 is used. The string conversion will always happen in the 'C' locale. For locale - dependent conversion use QLocale::toULong() + dependent conversion use QLocale::toULongLong() \sa QString::toULong() diff --git a/src/corelib/tools/qtimeline.cpp b/src/corelib/tools/qtimeline.cpp index 3619c9e986..f67643d30e 100644 --- a/src/corelib/tools/qtimeline.cpp +++ b/src/corelib/tools/qtimeline.cpp @@ -175,8 +175,8 @@ void QTimeLinePrivate::setCurrentTime(int msecs) milliseconds to QTimeLine's constructor. The timeline's duration describes for how long the animation will run. Then you set a suitable frame range by calling setFrameRange(). Finally connect the frameChanged() signal to a - suitable slot in the widget you wish to animate (e.g., setValue() in - QProgressBar). When you proceed to calling start(), QTimeLine will enter + suitable slot in the widget you wish to animate (for example, \l {QProgressBar::}{setValue()} + in QProgressBar). When you proceed to calling start(), QTimeLine will enter Running state, and start emitting frameChanged() at regular intervals, causing your widget's connected property's value to grow from the lower end to the upper and of your frame range, at a steady rate. You can -- cgit v1.2.3