summaryrefslogtreecommitdiffstats
path: root/src/gui/text/qfontmetrics.cpp
diff options
context:
space:
mode:
authorEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>2012-08-24 12:47:21 +0200
committerQt by Nokia <qt-info@nokia.com>2012-08-25 19:04:56 +0200
commit1349299f458f41fdc9e7ac4a0592eaa358d2b033 (patch)
tree9104a3d7a9e35f06c6b7845837df85bc027ce278 /src/gui/text/qfontmetrics.cpp
parent72a7c43e90917afd57564b881499322e92bbe78d (diff)
doc: Fix several text-related qdoc warnings
Also adds a new snippet which is just copy-pasted from the old documentation, because the snippet-file previously referenced seems to have disappeared. Change-Id: I0180715544321e076acda769cbdcbf19d50a971b Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Diffstat (limited to 'src/gui/text/qfontmetrics.cpp')
-rw-r--r--src/gui/text/qfontmetrics.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/text/qfontmetrics.cpp b/src/gui/text/qfontmetrics.cpp
index 488bb68ec4..5fd31dbfdf 100644
--- a/src/gui/text/qfontmetrics.cpp
+++ b/src/gui/text/qfontmetrics.cpp
@@ -125,7 +125,7 @@ extern void qt_format_text(const QFont& font, const QRectF &_r,
Example:
\snippet code/src_gui_text_qfontmetrics.cpp 0
- \sa QFont, QFontInfo, QFontDatabase, QFontComboBox, {Character Map Example}
+ \sa QFont, QFontInfo, QFontDatabase, {Character Map Example}
*/
/*!
@@ -412,7 +412,7 @@ bool QFontMetrics::inFont(QChar ch) const
}
/*!
- Returns true if the character encoded in UCS-4/UTF-32 is a valid
+ Returns true if the character \a ucs4 encoded in UCS-4/UTF-32 is a valid
character in the font; otherwise returns false.
*/
bool QFontMetrics::inFontUcs4(uint ucs4) const