diff options
| author | Topi Reinio <topi.reinio@digia.com> | 2015-09-07 10:25:46 +0200 |
|---|---|---|
| committer | Topi Reiniö <topi.reinio@digia.com> | 2015-09-07 11:11:57 +0000 |
| commit | a5cc210decde2a1becaf5f0da41a8e6ae1a7f7ad (patch) | |
| tree | 7dcd93a916bfac967d6b229ded0f944a86e72f4f /src/corelib/doc | |
| parent | 8a79e4d6784766d03aca50ebdfdf1c9175298326 (diff) | |
Doc: Move selected \keywords to be \targets instead
QDoc now handles \keyword slightly differently - it no longer
generates a unique html anchor at the location it appears in.
Instead, it'll inherit the anchor of the documentation item
it appears in.
Therefore, switch the \keyword commands that are used for
linking to a subsection within a page to be \targets instead,
so they'll get an anchor and not link to the top of the page.
Change-Id: Iec6d3f0edbcfb0aec95e222615eca9de2b0e153e
Reviewed-by: Martin Smith <martin.smith@digia.com>
Diffstat (limited to 'src/corelib/doc')
| -rw-r--r-- | src/corelib/doc/src/containers.qdoc | 18 | ||||
| -rw-r--r-- | src/corelib/doc/src/implicit-sharing.qdoc | 6 |
2 files changed, 12 insertions, 12 deletions
diff --git a/src/corelib/doc/src/containers.qdoc b/src/corelib/doc/src/containers.qdoc index f8d0d3eb05..0ae3817ac7 100644 --- a/src/corelib/doc/src/containers.qdoc +++ b/src/corelib/doc/src/containers.qdoc @@ -169,8 +169,8 @@ convenience, the containers are forward declared in \c <QtContainerFwd>. - \keyword assignable data type - \keyword assignable data types + \target assignable data type + \target assignable data types The values stored in the various containers can be of any \e{assignable data type}. To qualify, a type must provide a @@ -220,7 +220,7 @@ \codeline \snippet streaming/main.cpp 2 - \keyword default-constructed value + \target default-constructed value The documentation of certain container class functions refer to \e{default-constructed values}; for example, QVector @@ -546,7 +546,7 @@ The above example only shows a problem with QVector, but the problem exists for all the implicitly shared Qt containers. - \keyword foreach + \target foreach \section1 The foreach Keyword If you just want to iterate over all the items in a container @@ -655,11 +655,11 @@ To describe algorithmic complexity, we use the following terminology, based on the "big Oh" notation: - \keyword constant time - \keyword logarithmic time - \keyword linear time - \keyword linear-logarithmic time - \keyword quadratic time + \target constant time + \target logarithmic time + \target linear time + \target linear-logarithmic time + \target quadratic time \list \li \b{Constant time:} O(1). A function is said to run in constant diff --git a/src/corelib/doc/src/implicit-sharing.qdoc b/src/corelib/doc/src/implicit-sharing.qdoc index 57ebf55c17..d5a8e327ac 100644 --- a/src/corelib/doc/src/implicit-sharing.qdoc +++ b/src/corelib/doc/src/implicit-sharing.qdoc @@ -71,8 +71,8 @@ data. The shared data is deleted when the reference count becomes zero. - \keyword deep copy - \keyword shallow copy + \target deep copy + \target shallow copy When dealing with shared objects, there are two ways of copying an object. We usually speak about \e deep and \e shallow copies. A deep @@ -142,6 +142,6 @@ (QMap, QVector, etc.) while you use \l{STL-style iterators}{STL-style iterator}. See \l{Implicit sharing iterator problem}. - \keyword implicitly shared classes + \target implicitly shared classes \annotatedlist shared */ |