summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Smith <msmith@trolltech.com>2009-05-13 10:59:07 (GMT)
committerMartin Smith <msmith@trolltech.com>2009-05-13 10:59:07 (GMT)
commit589dfd480d6158aaa59ab56c8be6a6bfc41da3ef (patch)
treea3b63e2589d162e0207d235dd7b6a06d7852b894
parent55829ebc5664a65fcef158e7ccd3579aaffa8d20 (diff)
downloadQt-589dfd480d6158aaa59ab56c8be6a6bfc41da3ef.zip
Qt-589dfd480d6158aaa59ab56c8be6a6bfc41da3ef.tar.gz
Qt-589dfd480d6158aaa59ab56c8be6a6bfc41da3ef.tar.bz2
qdoc: Fixed some qdoc errors.
-rw-r--r--doc/src/examples/fancybrowser.qdoc14
-rw-r--r--src/corelib/tools/qhash.cpp6
-rw-r--r--tools/designer/src/uitools/quiloader.cpp6
3 files changed, 13 insertions, 13 deletions
diff --git a/doc/src/examples/fancybrowser.qdoc b/doc/src/examples/fancybrowser.qdoc
index ea4da71..631aff9 100644
--- a/doc/src/examples/fancybrowser.qdoc
+++ b/doc/src/examples/fancybrowser.qdoc
@@ -123,7 +123,7 @@
The first jQuery-based function, \c highlightAllLinks(), is designed to
highlight all links in the current webpage. The JavaScript code looks
- for web elements named \i {a}, which is the tag for a hyperlink.
+ for web elements named \e {a}, which is the tag for a hyperlink.
For each such element, the background color is set to be yellow by
using CSS.
@@ -131,18 +131,18 @@
The \c rotateImages() function rotates the images on the current
web page. Webkit supports CSS transforms and this JavaScript code
- looks up all \i {img} elements and rotates the images 180 degrees
+ looks up all \e {img} elements and rotates the images 180 degrees
and then back again.
\snippet examples/webkit/fancybrowser/mainwindow.cpp 9
The remaining four methods remove different elements from the current web
page. \c removeGifImages() removes all Gif images on the page by looking up
- the \i {src} attribute of all the elements on the web page. Any element with
- a \i {gif} file as its source is removed. \c removeInlineFrames() removes all
- \i {iframe} or inline elements. \c removeObjectElements() removes all
- \i {object} elements, and \c removeEmbeddedElements() removes any elements
- such as plugins embedded on the page using the \i {embed} tag.
+ the \e {src} attribute of all the elements on the web page. Any element with
+ a \e {gif} file as its source is removed. \c removeInlineFrames() removes all
+ \e {iframe} or inline elements. \c removeObjectElements() removes all
+ \e {object} elements, and \c removeEmbeddedElements() removes any elements
+ such as plugins embedded on the page using the \e {embed} tag.
*/
diff --git a/src/corelib/tools/qhash.cpp b/src/corelib/tools/qhash.cpp
index b2512e1..6c4a3ba 100644
--- a/src/corelib/tools/qhash.cpp
+++ b/src/corelib/tools/qhash.cpp
@@ -379,8 +379,7 @@ void QHashData::checkSanity()
#endif
/*!
- \fn uint qHash(const QPair<T1, T2> &key)
- \relates QHash
+ \
\since 4.3
Returns the hash value for the \a key.
@@ -502,7 +501,8 @@ void QHashData::checkSanity()
key. With QHash, the items are arbitrarily ordered.
\i The key type of a QMap must provide operator<(). The key
type of a QHash must provide operator==() and a global
- \l{qHash()} {hash} function.
+ hash function called qHash() (see the related non-member
+ functions).
\endlist
Here's an example QHash with QString keys and \c int values:
diff --git a/tools/designer/src/uitools/quiloader.cpp b/tools/designer/src/uitools/quiloader.cpp
index 548f07e..2a66095 100644
--- a/tools/designer/src/uitools/quiloader.cpp
+++ b/tools/designer/src/uitools/quiloader.cpp
@@ -572,9 +572,9 @@ void QUiLoaderPrivate::setupWidgetMap() const
\class QUiLoader
\inmodule QtUiTools
- \brief enables standalone applications to dynamically create user
- interfaces at run-time using the information stored in .ui files or
- specified in plugin paths.
+ \brief The QUiLoader class enables standalone applications to
+ dynamically create user interfaces at run-time using the
+ information stored in .ui files or specified in plugin paths.
In addition, you can customize or create your own user interface by
deriving your own loader class.