summaryrefslogtreecommitdiffstats
path: root/doc/src/examples/addressbook.qdoc
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@nokia.com>2012-03-05 10:44:04 +0100
committerLars Knoll <lars.knoll@nokia.com>2012-03-05 10:44:48 +0100
commitd51abed57a8f677a0d4eac57fd3f16bd4662190a (patch)
treeb3e173db4b72edbff6cb8dcc203c3d4526a1b51b /doc/src/examples/addressbook.qdoc
parent07ae18f96e87a2db40ae014f28893f1080efa7ae (diff)
parent0862d7f78af978cf513097b3bdc33cd8096dee75 (diff)
Merge remote-tracking branch 'origin/master' into api_changes
Diffstat (limited to 'doc/src/examples/addressbook.qdoc')
-rw-r--r--doc/src/examples/addressbook.qdoc12
1 files changed, 6 insertions, 6 deletions
diff --git a/doc/src/examples/addressbook.qdoc b/doc/src/examples/addressbook.qdoc
index 02820307e6..51712d49d3 100644
--- a/doc/src/examples/addressbook.qdoc
+++ b/doc/src/examples/addressbook.qdoc
@@ -107,15 +107,15 @@
dimensions of the model. Whereas, \c rowCount()'s value will vary
depending on the number of contacts added to the address book,
\c columnCount()'s value is always 2 because we only need space
- for the \bold Name and \bold Address columns.
+ for the \b Name and \b Address columns.
\note The \c Q_UNUSED() macro prevents the compiler from
generating warnings regarding unused parameters.
\snippet itemviews/addressbook/tablemodel.cpp 1
- The \c data() function returns either a \bold Name or
- \bold {Address}, based on the contents of the model index
+ The \c data() function returns either a \b Name or
+ \b {Address}, based on the contents of the model index
supplied. The row number stored in the model index is used to
reference an item in the list of pairs. Selection is handled
by the QItemSelectionModel, which will be explained with
@@ -124,7 +124,7 @@
\snippet itemviews/addressbook/tablemodel.cpp 2
The \c headerData() function displays the table's header,
- \bold Name and \bold Address. If you require numbered entries
+ \b Name and \b Address. If you require numbered entries
for your address book, you can use a vertical header which we
have hidden in this example (see the \c AddressWidget
implementation).
@@ -372,8 +372,8 @@
menus and actions necessary to manipulate the address book.
\table
- \row \o \inlineimage addressbook-filemenu.png
- \o \inlineimage addressbook-toolsmenu.png
+ \row \li \inlineimage addressbook-filemenu.png
+ \li \inlineimage addressbook-toolsmenu.png
\endtable
\snippet itemviews/addressbook/mainwindow.h 0