diff options
author | Casper van Donderen <casper.vandonderen@nokia.com> | 2012-03-01 15:28:31 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-02 23:16:25 +0100 |
commit | 95d83cb1b68cc4a415d5d80859b4e74472ad7112 (patch) | |
tree | 9f6fa892ee78f584224320a195f03419c0fdbc21 /src/gui/text/qtextdocument.cpp | |
parent | 15e136d4e116c1513c106dfbb75e1953a7f3463c (diff) |
Remove the usage of deprecated qdoc macros.
QDoc now has support for Doxygen style commands for italics, bold
and list items. This change applies that change in QDoc to the
actual documentation.
Task-number: QTBUG-24578
Change-Id: I519bf9c29b14092e3ab6067612f42bf749eeedf5
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/gui/text/qtextdocument.cpp')
-rw-r--r-- | src/gui/text/qtextdocument.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/gui/text/qtextdocument.cpp b/src/gui/text/qtextdocument.cpp index 1fad064b5c..a8991d5428 100644 --- a/src/gui/text/qtextdocument.cpp +++ b/src/gui/text/qtextdocument.cpp @@ -261,14 +261,14 @@ QTextCodec *Qt::codecForHtml(const QByteArray &ba) system. The following are the undo/redo operations of a QTextDocument: \list - \o Insertion or removal of characters. A sequence of insertions or removals + \li Insertion or removal of characters. A sequence of insertions or removals within the same text block are regarded as a single undo/redo operation. - \o Insertion or removal of text blocks. Sequences of insertion or removals + \li Insertion or removal of text blocks. Sequences of insertion or removals in a single operation (e.g., by selecting and then deleting text) are regarded as a single undo/redo operation. - \o Text character format changes. - \o Text block format changes. - \o Text block group format changes. + \li Text character format changes. + \li Text block format changes. + \li Text block group format changes. \endlist \sa QTextCursor, QTextEdit, \link richtext.html Rich Text Processing\endlink , {Text Object Example} @@ -887,7 +887,7 @@ QChar QTextDocument::characterAt(int pos) const The style sheet needs to be compliant to CSS 2.1 syntax. - \bold{Note:} Changing the default style sheet does not have any effect to the existing content + \b{Note:} Changing the default style sheet does not have any effect to the existing content of the document. \sa {Supported HTML Subset} @@ -1169,7 +1169,7 @@ void QTextDocument::setPlainText(const QString &text) The HTML formatting is respected as much as possible; for example, "<b>bold</b> text" will produce text where the first word has a font - weight that gives it a bold appearance: "\bold{bold} text". + weight that gives it a bold appearance: "\b{bold} text". \note It is the responsibility of the caller to make sure that the text is correctly decoded when a QString containing HTML is created |