From 13b5c269d6f4ce7936e01b11441aaa3045125d94 Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Sat, 9 Oct 2021 17:19:14 +0200 Subject: gui: Fix typos in documentation Pick-to: 5.15 6.2 Change-Id: I533f5a55cd0cd60a76990b552d7dab51a301ac1c Reviewed-by: Giuseppe D'Angelo --- src/gui/text/qfont.cpp | 2 +- src/gui/text/qtextformat.cpp | 4 ++-- src/gui/text/qtextlayout.cpp | 4 ++-- src/gui/text/qtextobject.cpp | 8 ++++---- src/gui/text/qtextoption.cpp | 2 +- src/gui/text/qzip.cpp | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) (limited to 'src/gui/text') diff --git a/src/gui/text/qfont.cpp b/src/gui/text/qfont.cpp index aae64f8d02..ba36b0790d 100644 --- a/src/gui/text/qfont.cpp +++ b/src/gui/text/qfont.cpp @@ -449,7 +449,7 @@ QFontEngineData::~QFontEngineData() The attributes set in the constructor can also be set later, e.g. setFamily(), setPointSize(), setPointSizeF(), setWeight() and setItalic(). The remaining attributes must be set after - contstruction, e.g. setBold(), setUnderline(), setOverline(), + construction, e.g. setBold(), setUnderline(), setOverline(), setStrikeOut() and setFixedPitch(). QFontInfo objects should be created \e after the font's attributes have been set. A QFontInfo object will not change, even if you change the font's diff --git a/src/gui/text/qtextformat.cpp b/src/gui/text/qtextformat.cpp index caa2eb0f3f..66dc8cff85 100644 --- a/src/gui/text/qtextformat.cpp +++ b/src/gui/text/qtextformat.cpp @@ -1418,7 +1418,7 @@ bool QTextFormat::operator==(const QTextFormat &rhs) const \value SingleUnderline A line is drawn using Qt::SolidLine. \value DashUnderline Dashes are drawn using Qt::DashLine. \value DotLine Dots are drawn using Qt::DotLine; - \value DashDotLine Dashs and dots are drawn using Qt::DashDotLine. + \value DashDotLine Dashes and dots are drawn using Qt::DashDotLine. \value DashDotDotLine Underlines draw drawn using Qt::DashDotDotLine. \value WaveUnderline The text is underlined using a wave shaped line. \value SpellCheckUnderline The underline is drawn depending on the SpellCheckUnderlineStyle @@ -3442,7 +3442,7 @@ QTextImageFormat::QTextImageFormat(const QTextFormat &fmt) \fn void QTextCharFormat::setFontCapitalization(QFont::Capitalization capitalization) \since 4.4 - Sets the capitalization of the text that apppears in this font to \a capitalization. + Sets the capitalization of the text that appears in this font to \a capitalization. A font's capitalization makes the text appear in the selected capitalization mode. diff --git a/src/gui/text/qtextlayout.cpp b/src/gui/text/qtextlayout.cpp index f81d489c88..5b9c10ee52 100644 --- a/src/gui/text/qtextlayout.cpp +++ b/src/gui/text/qtextlayout.cpp @@ -85,7 +85,7 @@ QT_BEGIN_NAMESPACE /*! \variable QTextLayout::FormatRange::length - Specifies the numer of characters the format range spans. + Specifies the number of characters the format range spans. */ /*! @@ -763,7 +763,7 @@ int QTextLayout::leftCursorPosition(int oldPos) const A grapheme cluster is a sequence of two or more Unicode characters that form one indivisible entity on the screen. For example the latin character `\unicode{0xC4}' can be represented in Unicode by two - characters, `A' (0x41), and the combining diaresis (0x308). A text + characters, `A' (0x41), and the combining diaeresis (0x308). A text cursor can only validly be positioned before or after these two characters, never between them since that wouldn't make sense. In indic languages every syllable forms a grapheme cluster. diff --git a/src/gui/text/qtextobject.cpp b/src/gui/text/qtextobject.cpp index 45e07ac5b5..2a45d12745 100644 --- a/src/gui/text/qtextobject.cpp +++ b/src/gui/text/qtextobject.cpp @@ -359,14 +359,14 @@ QTextFrameLayoutData::~QTextFrameLayoutData() /*! \fn bool QTextFrame::iterator::operator==(const iterator &other) const - Retuns true if the iterator is the same as the \a other iterator; + Returns true if the iterator is the same as the \a other iterator; otherwise returns \c false. */ /*! \fn bool QTextFrame::iterator::operator!=(const iterator &other) const - Retuns true if the iterator is different from the \a other iterator; + Returns true if the iterator is different from the \a other iterator; otherwise returns \c false. */ @@ -922,14 +922,14 @@ bool QTextBlock::isValid() const /*! \fn bool QTextBlock::iterator::operator==(const iterator &other) const - Retuns true if this iterator is the same as the \a other iterator; + Returns true if this iterator is the same as the \a other iterator; otherwise returns \c false. */ /*! \fn bool QTextBlock::iterator::operator!=(const iterator &other) const - Retuns true if this iterator is different from the \a other iterator; + Returns true if this iterator is different from the \a other iterator; otherwise returns \c false. */ diff --git a/src/gui/text/qtextoption.cpp b/src/gui/text/qtextoption.cpp index 908e0f914a..102bce696b 100644 --- a/src/gui/text/qtextoption.cpp +++ b/src/gui/text/qtextoption.cpp @@ -367,7 +367,7 @@ QList QTextOption::tabs() const Distance from the start of the paragraph. The position of a tab is from the start of the paragraph which implies that when the alignment of the paragraph is set to centered, the tab is interpreted to be - moved the same distance as the left ege of the paragraph does. + moved the same distance as the left edge of the paragraph does. In case the paragraph is set to have a layoutDirection() RightToLeft the position is interpreted to be from the right side of the paragraph with higher numbers moving the tab to the left. diff --git a/src/gui/text/qzip.cpp b/src/gui/text/qzip.cpp index 0f50a7508a..711482af8a 100644 --- a/src/gui/text/qzip.cpp +++ b/src/gui/text/qzip.cpp @@ -856,7 +856,7 @@ QZipReader::QZipReader(QIODevice *device) } /*! - Desctructor + Destructor */ QZipReader::~QZipReader() { -- cgit v1.2.3