diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/src/diagrams/dbus-examples.png | bin | 0 -> 19642 bytes | |||
| -rw-r--r-- | doc/src/examples/htmlinfo.qdoc | 2 | ||||
| -rw-r--r-- | doc/src/examples/qxmlstreambookmarks.qdoc | 13 | ||||
| -rw-r--r-- | doc/src/exceptionsafety.qdoc | 2 | ||||
| -rw-r--r-- | doc/src/images/dbus-examples.png | bin | 0 -> 6181 bytes | |||
| -rw-r--r-- | doc/src/s60-introduction.qdoc | 2 | ||||
| -rw-r--r-- | doc/src/symbian-exceptionsafety.qdoc | 2 |
7 files changed, 10 insertions, 11 deletions
diff --git a/doc/src/diagrams/dbus-examples.png b/doc/src/diagrams/dbus-examples.png Binary files differnew file mode 100644 index 0000000..816a9ab --- /dev/null +++ b/doc/src/diagrams/dbus-examples.png diff --git a/doc/src/examples/htmlinfo.qdoc b/doc/src/examples/htmlinfo.qdoc index e2be964..68e8320 100644 --- a/doc/src/examples/htmlinfo.qdoc +++ b/doc/src/examples/htmlinfo.qdoc @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/doc/src/examples/qxmlstreambookmarks.qdoc b/doc/src/examples/qxmlstreambookmarks.qdoc index def4c47..26964c4 100644 --- a/doc/src/examples/qxmlstreambookmarks.qdoc +++ b/doc/src/examples/qxmlstreambookmarks.qdoc @@ -106,19 +106,18 @@ of reading only takes place if the file is a valid XBEL 1.0 file. Note that the XML input needs to be well-formed to be accepted by QXmlStreamReader. Otherwise, the \l{QXmlStreamReader::raiseError()} - {raiseError()} function is used to display an error message. + {raiseError()} function is used to display an error message. Since the + XBEL reader is only concerned with reading XML elements, it makes + extensive use of the \l{QXmlStreamReader::readNextStartElement()} + convenience function. \snippet examples/xml/streambookmarks/xbelreader.cpp 1 - The \c readUnknownElement() function reads an unknown element. The - Q_ASSERT() macro is used to provide a pre-condition for the function. - - \snippet examples/xml/streambookmarks/xbelreader.cpp 2 - The \c readXBEL() function reads the name of a startElement and calls the appropriate function to read it, depending on whether if its a "folder", "bookmark" or "separator". Otherwise, it calls - \c readUnknownElement(). + \l{QXmlStreamReader::skipCurrentElement()}. The Q_ASSERT() macro is used + to provide a pre-condition for the function. \snippet examples/xml/streambookmarks/xbelreader.cpp 3 diff --git a/doc/src/exceptionsafety.qdoc b/doc/src/exceptionsafety.qdoc index 1378f24..284159f 100644 --- a/doc/src/exceptionsafety.qdoc +++ b/doc/src/exceptionsafety.qdoc @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/doc/src/images/dbus-examples.png b/doc/src/images/dbus-examples.png Binary files differnew file mode 100644 index 0000000..6768935 --- /dev/null +++ b/doc/src/images/dbus-examples.png diff --git a/doc/src/s60-introduction.qdoc b/doc/src/s60-introduction.qdoc index 16919cb..24f7817 100644 --- a/doc/src/s60-introduction.qdoc +++ b/doc/src/s60-introduction.qdoc @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/doc/src/symbian-exceptionsafety.qdoc b/doc/src/symbian-exceptionsafety.qdoc index cb6d5ff..9183ba7 100644 --- a/doc/src/symbian-exceptionsafety.qdoc +++ b/doc/src/symbian-exceptionsafety.qdoc @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ |
