diff options
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/animation/qsequentialanimationgroup.cpp | 2 | ||||
| -rw-r--r-- | src/corelib/doc/src/custom-types.qdoc | 7 | ||||
| -rw-r--r-- | src/corelib/doc/src/objectmodel/object.qdoc | 3 | ||||
| -rw-r--r-- | src/corelib/doc/src/objectmodel/signalsandslots.qdoc | 2 | ||||
| -rw-r--r-- | src/corelib/doc/src/plugins-howto.qdoc | 2 | ||||
| -rw-r--r-- | src/corelib/doc/src/threads.qdoc | 4 | ||||
| -rw-r--r-- | src/corelib/kernel/qmath.cpp | 2 | ||||
| -rw-r--r-- | src/corelib/kernel/qobject.cpp | 4 | ||||
| -rw-r--r-- | src/corelib/tools/qstring.cpp | 8 | ||||
| -rw-r--r-- | src/corelib/tools/qvector.cpp | 4 |
10 files changed, 17 insertions, 21 deletions
diff --git a/src/corelib/animation/qsequentialanimationgroup.cpp b/src/corelib/animation/qsequentialanimationgroup.cpp index 42debea782..1c84e3dbc9 100644 --- a/src/corelib/animation/qsequentialanimationgroup.cpp +++ b/src/corelib/animation/qsequentialanimationgroup.cpp @@ -303,8 +303,6 @@ QPauseAnimation *QSequentialAnimationGroup::insertPause(int index, int msecs) /*! \property QSequentialAnimationGroup::currentAnimation Returns the animation in the current time. - - \sa currentAnimationChanged() */ QAbstractAnimation *QSequentialAnimationGroup::currentAnimation() const { diff --git a/src/corelib/doc/src/custom-types.qdoc b/src/corelib/doc/src/custom-types.qdoc index cbf347a2f7..ed846aee83 100644 --- a/src/corelib/doc/src/custom-types.qdoc +++ b/src/corelib/doc/src/custom-types.qdoc @@ -155,10 +155,9 @@ The Q_DECLARE_METATYPE() macro and qRegisterMetaType() function documentation contain more detailed information about their uses and limitations. - The \l{Custom Type Example}{Custom Type}, - \l{Custom Type Sending Example}{Custom Type Sending} - and \l{Queued Custom Type Example}{Queued Custom Type} examples show how to - implement a custom type with the features outlined in this document. + The \l{Custom Type Example}{Custom Type} and \l{Queued Custom Type Example} + {Queued Custom Type} examples show how to implement a custom type with the + features outlined in this document. The \l{Debugging Techniques} document provides an overview of the debugging mechanisms discussed above. diff --git a/src/corelib/doc/src/objectmodel/object.qdoc b/src/corelib/doc/src/objectmodel/object.qdoc index 89a781da39..8d24096b7a 100644 --- a/src/corelib/doc/src/objectmodel/object.qdoc +++ b/src/corelib/doc/src/objectmodel/object.qdoc @@ -46,7 +46,8 @@ \li queryable and designable \l{Qt's Property System}{object properties} \li powerful \l{The Event System}{events and event filters} - \li contextual \l{i18n}{string translation for internationalization} + \li contextual \l{Internationalization with Qt}{string translation for + internationalization} \li sophisticated interval driven \l {Timers}{timers} that make it possible to elegantly integrate many tasks in an event-driven GUI \li hierarchical and queryable \l{Object Trees & Ownership}{object diff --git a/src/corelib/doc/src/objectmodel/signalsandslots.qdoc b/src/corelib/doc/src/objectmodel/signalsandslots.qdoc index dd93b80cae..e894d547d0 100644 --- a/src/corelib/doc/src/objectmodel/signalsandslots.qdoc +++ b/src/corelib/doc/src/objectmodel/signalsandslots.qdoc @@ -275,7 +275,7 @@ and slot members, as well as pointers to these functions. The meta-object contains additional information such as the - object's \l{QObject::className()}{class name}. You can + object's \l{QMetaObject::className()}{class name}. You can also check if an object \l{QObject::inherits()}{inherits} a specific class, for example: diff --git a/src/corelib/doc/src/plugins-howto.qdoc b/src/corelib/doc/src/plugins-howto.qdoc index 2dbf1f8141..fb91e431dd 100644 --- a/src/corelib/doc/src/plugins-howto.qdoc +++ b/src/corelib/doc/src/plugins-howto.qdoc @@ -37,7 +37,7 @@ See the \l{How to Create Qt Plugins} page for more information.. - See also the \l{ActiveQt framework} for Windows. + See also the \l{Active Qt} framework for Windows. */ diff --git a/src/corelib/doc/src/threads.qdoc b/src/corelib/doc/src/threads.qdoc index 25276404b0..efed33106a 100644 --- a/src/corelib/doc/src/threads.qdoc +++ b/src/corelib/doc/src/threads.qdoc @@ -606,7 +606,7 @@ putting time-consuming operations in a separate worker thread and displaying the results on screen in the main thread when the worker thread is finished. This is the approach used for - implementing the \l{threads/mandelbrot}{Mandelbrot} and + implementing the \l{Mandelbrot Example} and the \l{network/blockingfortuneclient}{Blocking Fortune Client} example. @@ -738,7 +738,7 @@ QObject::connect() itself is thread-safe. - The \l{threads/mandelbrot}{Mandelbrot} example uses a queued + The \l{Mandelbrot Example} uses a queued connection to communicate between a worker thread and the main thread. To avoid freezing the main thread's event loop (and, as a consequence, the application's user interface), all the diff --git a/src/corelib/kernel/qmath.cpp b/src/corelib/kernel/qmath.cpp index 8f900e2101..b1860fa24a 100644 --- a/src/corelib/kernel/qmath.cpp +++ b/src/corelib/kernel/qmath.cpp @@ -310,8 +310,6 @@ const qreal qt_sine_table[QT_SINE_TABLE_SIZE] = { \brief The <QtMath> header file includes generic math declarations. - The global declarations include \l{functions}. - These functions are partly convenience definitions for basic operations, for instance not available in the Standard Template Library et al. diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp index 8ee43f2e97..c19c3fcbb5 100644 --- a/src/corelib/kernel/qobject.cpp +++ b/src/corelib/kernel/qobject.cpp @@ -566,7 +566,7 @@ void QMetaCallEvent::placeMetaCall(QObject *object) \li When a QObject is moved to another thread, all its children will be automatically moved too. \li moveToThread() will fail if the QObject has a parent. - \li If \l{QObject}s are created within QThread::run(), they cannot + \li If QObjects are created within QThread::run(), they cannot become children of the QThread object because the QThread does not live in the thread that calls QThread::run(). \endlist @@ -4622,7 +4622,7 @@ bool QObjectPrivate::disconnect(const QObject *sender, int signal_index, void ** It can be used to disconnect that connection, or check if the connection was successful - \sa QObject::disconnect + \sa QObject::disconnect() */ /*! diff --git a/src/corelib/tools/qstring.cpp b/src/corelib/tools/qstring.cpp index 0e99a5839c..3976f2cb6f 100644 --- a/src/corelib/tools/qstring.cpp +++ b/src/corelib/tools/qstring.cpp @@ -455,8 +455,8 @@ const QString::Null QString::null = { }; your applications will be easy to translate if you want to expand your application's market at some point. The two main cases where QByteArray is appropriate are when you need to store raw binary - data, and when memory conservation is critical (e.g., with - \l{Qt for Embedded Linux}). + data, and when memory conservation is critical (like in embedded + systems). \tableofcontents @@ -5039,7 +5039,7 @@ int QString::compare_helper(const QChar *data1, int length1, QLatin1String s2, On Mac OS X since Qt 4.3, this function compares according the "Order for sorted lists" setting in the International preferences panel. - \sa compare(), QTextCodec::locale() + \sa compare(), QLocale */ /*! @@ -8450,7 +8450,7 @@ QStringRef QStringRef::appendTo(QString *string) const On Mac OS X, this function compares according the "Order for sorted lists" setting in the International prefereces panel. - \sa compare(), QTextCodec::locale() + \sa compare(), QLocale */ /*! diff --git a/src/corelib/tools/qvector.cpp b/src/corelib/tools/qvector.cpp index b9281c6915..f6276711a7 100644 --- a/src/corelib/tools/qvector.cpp +++ b/src/corelib/tools/qvector.cpp @@ -572,7 +572,7 @@ Provided for compatibility with QList. - \sa remove(int), QList::removeAt(int) + \sa remove(), QList::removeAt() */ /*! \fn int QVector::length() const @@ -597,7 +597,7 @@ Provided for compatibility with QList. - \sa takeFirst(), takeLast(), QList::takeAt(int) + \sa takeFirst(), takeLast(), QList::takeAt() */ /*! \fn void QVector::removeFirst() |