From 13b5c269d6f4ce7936e01b11441aaa3045125d94 Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Sat, 9 Oct 2021 17:19:14 +0200 Subject: [PATCH] gui: Fix typos in documentation Pick-to: 5.15 6.2 Change-Id: I533f5a55cd0cd60a76990b552d7dab51a301ac1c Reviewed-by: Giuseppe D'Angelo --- src/gui/accessible/qaccessible.cpp | 8 ++++---- src/gui/doc/src/coordsys.qdoc | 4 ++-- src/gui/doc/src/qtgui.qdoc | 2 +- src/gui/image/qiconloader.cpp | 2 +- src/gui/image/qimage.cpp | 4 ++-- src/gui/image/qimage_darwin.mm | 2 +- src/gui/kernel/qaction.cpp | 2 +- src/gui/kernel/qevent.cpp | 2 +- src/gui/kernel/qguiapplication.cpp | 4 ++-- src/gui/kernel/qoffscreensurface.cpp | 2 +- src/gui/kernel/qpixelformat.cpp | 2 +- src/gui/kernel/qshortcutmap.cpp | 2 +- src/gui/kernel/qwindow.cpp | 2 +- src/gui/math3d/qmatrix4x4.cpp | 8 ++++---- src/gui/painting/qbrush.cpp | 2 +- src/gui/painting/qcolor.cpp | 2 +- src/gui/painting/qcolorspace.cpp | 2 +- src/gui/painting/qpaintengine.cpp | 2 +- src/gui/painting/qpainter.cpp | 4 ++-- src/gui/painting/qstroker.cpp | 2 +- src/gui/platform/darwin/qmacmime.mm | 4 ++-- src/gui/rhi/qrhi.cpp | 10 +++++----- src/gui/rhi/qrhiprofiler.cpp | 4 ++-- 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 +- 29 files changed, 50 insertions(+), 50 deletions(-) diff --git a/src/gui/accessible/qaccessible.cpp b/src/gui/accessible/qaccessible.cpp index 1ba206e82a4..2fdcbfdd272 100644 --- a/src/gui/accessible/qaccessible.cpp +++ b/src/gui/accessible/qaccessible.cpp @@ -1114,7 +1114,7 @@ QAccessibleInterface *QAccessibleInterface::focusChild() const If there are no children at this position this function returns \nullptr. The returned accessible must be a child, but not necessarily a direct child. - This function is only relyable for visible objects (invisible + This function is only reliable for visible objects (invisible object might not be laid out correctly). All visual objects provide this information. @@ -2417,8 +2417,8 @@ QAccessibleValueInterface::~QAccessibleValueInterface() \fn QVariant QAccessibleValueInterface::minimumStepSize() const Returns the minimum step size for the accessible. - This is the smalles increment that makes sense when changing the value. - When programatically changing the value it should always be a multiple + This is the smallest increment that makes sense when changing the value. + When programmatically changing the value it should always be a multiple of the minimum step size. Some tools use this value even when the setCurrentValue does not @@ -2686,7 +2686,7 @@ QAccessibleTableInterface::~QAccessibleTableInterface() \row \li \l toggleAction() \li toggles the item (checkbox, radio button, switch, ...) \row \li \l decreaseAction() \li decrease the value of the accessible (e.g. spinbox) \row \li \l increaseAction() \li increase the value of the accessible (e.g. spinbox) - \row \li \l pressAction() \li press or click or activate the accessible (should correspont to clicking the object with the mouse) + \row \li \l pressAction() \li press or click or activate the accessible (should correspond to clicking the object with the mouse) \row \li \l setFocusAction() \li set the focus to this accessible \row \li \l showMenuAction() \li show a context menu, corresponds to right-clicks \endtable diff --git a/src/gui/doc/src/coordsys.qdoc b/src/gui/doc/src/coordsys.qdoc index 4df71517509..f3daac98b68 100644 --- a/src/gui/doc/src/coordsys.qdoc +++ b/src/gui/doc/src/coordsys.qdoc @@ -111,7 +111,7 @@ \endtable When rendering with a pen with an even number of pixels, the - pixels will be rendered symetrically around the mathematical + pixels will be rendered symmetrically around the mathematical defined points, while rendering with a pen with an odd number of pixels, the spare pixel will be rendered to the right and below the mathematical point as in the one pixel case. See the QRectF @@ -160,7 +160,7 @@ \section2 Anti-aliased Painting If you set QPainter's \l {QPainter::Antialiasing}{anti-aliasing} - render hint, the pixels will be rendered symetrically on both + render hint, the pixels will be rendered symmetrically on both sides of the mathematically defined points: \table diff --git a/src/gui/doc/src/qtgui.qdoc b/src/gui/doc/src/qtgui.qdoc index efa4295a419..bba6fa9fb5d 100644 --- a/src/gui/doc/src/qtgui.qdoc +++ b/src/gui/doc/src/qtgui.qdoc @@ -146,7 +146,7 @@ For more information, see the \l {OpenGL Window Example}. The Qt GUI module also contains a few math classes to aid with the - most common mathmatical operations related to 3D graphics. These + most common mathematical operations related to 3D graphics. These classes include \l {QMatrix4x4}, \l {QVector4D} and \l {QQuaternion} A \l {QWindow} created with the \l {QSurface::OpenGLSurface} can diff --git a/src/gui/image/qiconloader.cpp b/src/gui/image/qiconloader.cpp index 807ed4921cc..4b3c960cbc2 100644 --- a/src/gui/image/qiconloader.cpp +++ b/src/gui/image/qiconloader.cpp @@ -135,7 +135,7 @@ void QIconLoader::ensureInitialized() created, to avoid a race condition (QTBUG-74252). When this function is called from there, ensureInitialized() does not succeed because there is no QPlatformTheme yet, so systemThemeName() is empty, and we don't want - m_systemTheme to get intialized to the fallback theme instead of the normal one. + m_systemTheme to get initialized to the fallback theme instead of the normal one. */ QIconLoader *QIconLoader::instance() { diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp index a497ad60eb4..50cb31832a7 100644 --- a/src/gui/image/qimage.cpp +++ b/src/gui/image/qimage.cpp @@ -448,7 +448,7 @@ bool QImageData::checkForAlphaPixels() const The color of a pixel can be retrieved by passing its coordinates to the pixel() function. The pixel() function returns the color - as a QRgb value indepedent of the image's format. + as a QRgb value independent of the image's format. In case of monochrome and 8-bit images, the colorCount() and colorTable() functions provide information about the color @@ -4726,7 +4726,7 @@ static QImage rotated270(const QImage &image) image where not all pixels are covered by the transformed pixels of the original image. In such cases, those background pixels will be assigned a transparent color value, and the transformed image will be given a format - with an alpha channel, even if the orginal image did not have that. + with an alpha channel, even if the original image did not have that. The transformation \a matrix is internally adjusted to compensate for unwanted translation; i.e. the image produced is the smallest diff --git a/src/gui/image/qimage_darwin.mm b/src/gui/image/qimage_darwin.mm index e2ec52d2dfc..87d65d3f57a 100644 --- a/src/gui/image/qimage_darwin.mm +++ b/src/gui/image/qimage_darwin.mm @@ -88,7 +88,7 @@ QT_BEGIN_NAMESPACE Other formats are not supported; this function returns a null CGImageRef for those cases. Users of this function may then - convert the QImage to a supported formate first, for example + convert the QImage to a supported format first, for example Format_ARGB32_Premultiplied. The CGImageRef color space is set to the sRGB color space. diff --git a/src/gui/kernel/qaction.cpp b/src/gui/kernel/qaction.cpp index 9c161235452..9c0b1613dca 100644 --- a/src/gui/kernel/qaction.cpp +++ b/src/gui/kernel/qaction.cpp @@ -1262,7 +1262,7 @@ void QAction::setMenuObject(QObject *object) The default is to follow whether the Qt::AA_DontShowIconsInMenus attribute is set for the application. Explicitly settings this property overrides - the presence (or abscence) of the attribute. + the presence (or absence) of the attribute. For example: \snippet code/src_gui_kernel_qaction.cpp 0 diff --git a/src/gui/kernel/qevent.cpp b/src/gui/kernel/qevent.cpp index e7726d40c57..3c337312790 100644 --- a/src/gui/kernel/qevent.cpp +++ b/src/gui/kernel/qevent.cpp @@ -4441,7 +4441,7 @@ QWindowStateChangeEvent::~QWindowStateChangeEvent() describes the different states that a touch point may have. \note The list of points() will never be partial: A touch event will always contain a touch - point for each existing physical touch contacts targetting the window or widget to which the + point for each existing physical touch contacts targeting the window or widget to which the event is sent. For instance, assuming that all touches target the same window or widget, an event with a condition of points().count()==2 is guaranteed to imply that the number of fingers touching the touchscreen or touchpad is exactly two. diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp index 99cf9ef7a66..7e29d707eee 100644 --- a/src/gui/kernel/qguiapplication.cpp +++ b/src/gui/kernel/qguiapplication.cpp @@ -1746,7 +1746,7 @@ static QClipboard *clipboard(); /*! Returns the current state of the modifier keys on the keyboard. The current - state is updated sychronously as the event queue is emptied of events that + state is updated synchronously as the event queue is emptied of events that will spontaneously change the keyboard state (QEvent::KeyPress and QEvent::KeyRelease events). @@ -4015,7 +4015,7 @@ static inline void applyWindowCursor(const QList &l) Application cursors are stored on an internal stack. setOverrideCursor() pushes the cursor onto the stack, and restoreOverrideCursor() pops the - active cursor off the stack. changeOverrideCursor() changes the curently + active cursor off the stack. changeOverrideCursor() changes the currently active application override cursor. Every setOverrideCursor() must eventually be followed by a corresponding diff --git a/src/gui/kernel/qoffscreensurface.cpp b/src/gui/kernel/qoffscreensurface.cpp index 8fbb188bd18..b403cf65d12 100644 --- a/src/gui/kernel/qoffscreensurface.cpp +++ b/src/gui/kernel/qoffscreensurface.cpp @@ -203,7 +203,7 @@ void QOffscreenSurface::destroy() /*! Returns \c true if this offscreen surface is valid; otherwise returns \c false. - The offscreen surface is valid if the platform resources have been successfuly allocated. + The offscreen surface is valid if the platform resources have been successfully allocated. \sa create() */ diff --git a/src/gui/kernel/qpixelformat.cpp b/src/gui/kernel/qpixelformat.cpp index 7a47dd472cc..130ef15b001 100644 --- a/src/gui/kernel/qpixelformat.cpp +++ b/src/gui/kernel/qpixelformat.cpp @@ -186,7 +186,7 @@ QT_BEGIN_NAMESPACE \enum QPixelFormat::YUVLayout YUV is not represented by describing the size of the color channels. This is - because YUV often use macro pixels, making the concept of sperate color channels + because YUV often use macro pixels, making the concept of separate color channels invalid. Instead the different YUV layouts are described with this enum. \value YUV444 diff --git a/src/gui/kernel/qshortcutmap.cpp b/src/gui/kernel/qshortcutmap.cpp index cf729d28c4c..61bde9a999e 100644 --- a/src/gui/kernel/qshortcutmap.cpp +++ b/src/gui/kernel/qshortcutmap.cpp @@ -396,7 +396,7 @@ QKeySequence::SequenceMatch QShortcutMap::nextState(QKeyEvent *e) /*! \internal - Determines if an enabled shortcut has a matcing key sequence. + Determines if an enabled shortcut has a matching key sequence. */ bool QShortcutMap::hasShortcutForKeySequence(const QKeySequence &seq) const { diff --git a/src/gui/kernel/qwindow.cpp b/src/gui/kernel/qwindow.cpp index 355bc28d188..590c56eab8f 100644 --- a/src/gui/kernel/qwindow.cpp +++ b/src/gui/kernel/qwindow.cpp @@ -2873,7 +2873,7 @@ QWindow *QWindow::fromWinId(WId id) } /*! - Causes an alert to be shown for \a msec miliseconds. If \a msec is \c 0 (the + Causes an alert to be shown for \a msec milliseconds. If \a msec is \c 0 (the default), then the alert is shown indefinitely until the window becomes active again. This function has no effect on an active window. diff --git a/src/gui/math3d/qmatrix4x4.cpp b/src/gui/math3d/qmatrix4x4.cpp index dab7013a072..0e40966befa 100644 --- a/src/gui/math3d/qmatrix4x4.cpp +++ b/src/gui/math3d/qmatrix4x4.cpp @@ -1617,7 +1617,7 @@ void QMatrix4x4::viewport(float left, float bottom, float width, float height, f \deprecated Flips between right-handed and left-handed coordinate systems - by multiplying the y and z co-ordinates by -1. This is normally + by multiplying the y and z coordinates by -1. This is normally used to create a left-handed orthographic view without scaling the viewport as ortho() does. @@ -1662,7 +1662,7 @@ void QMatrix4x4::copyDataTo(float *values) const The returned QTransform is formed by simply dropping the third row and third column of the QMatrix4x4. This is suitable - for implementing orthographic projections where the z co-ordinate + for implementing orthographic projections where the z coordinate should be dropped rather than projected. */ QTransform QMatrix4x4::toTransform() const @@ -1677,14 +1677,14 @@ QTransform QMatrix4x4::toTransform() const corresponds to this matrix. If \a distanceToPlane is non-zero, it indicates a projection - factor to use to adjust for the z co-ordinate. The value of + factor to use to adjust for the z coordinate. The value of 1024 corresponds to the projection factor used by QTransform::rotate() for the x and y axes. If \a distanceToPlane is zero, then the returned QTransform is formed by simply dropping the third row and third column of the QMatrix4x4. This is suitable for implementing - orthographic projections where the z co-ordinate should + orthographic projections where the z coordinate should be dropped rather than projected. */ QTransform QMatrix4x4::toTransform(float distanceToPlane) const diff --git a/src/gui/painting/qbrush.cpp b/src/gui/painting/qbrush.cpp index 432d53a69b0..1f3cacba72a 100644 --- a/src/gui/painting/qbrush.cpp +++ b/src/gui/painting/qbrush.cpp @@ -1273,7 +1273,7 @@ QDataStream &operator>>(QDataStream &s, QBrush &b) \snippet brush/brush.cpp 1 It is possible to repeat or reflect the gradient outside its area - by specifiying the \l {QGradient::Spread}{spread method} using the + by specifying the \l {QGradient::Spread}{spread method} using the setSpread() function. The default is to pad the outside area with the color at the closest stop point. The currently set \l {QGradient::Spread}{spread method} can be retrieved using the diff --git a/src/gui/painting/qcolor.cpp b/src/gui/painting/qcolor.cpp index bd7d9d4e4f9..466124d6ee6 100644 --- a/src/gui/painting/qcolor.cpp +++ b/src/gui/painting/qcolor.cpp @@ -786,7 +786,7 @@ QColor::QColor(QRgba64 rgba64) noexcept Constructs a color with the given \a spec. - This function is primarly present to avoid that QColor::Invalid + This function is primarily present to avoid that QColor::Invalid becomes a valid color by accident. */ diff --git a/src/gui/painting/qcolorspace.cpp b/src/gui/painting/qcolorspace.cpp index 6a58ea06e2d..4601746992f 100644 --- a/src/gui/painting/qcolorspace.cpp +++ b/src/gui/painting/qcolorspace.cpp @@ -493,7 +493,7 @@ QColorTransform QColorSpacePrivate::transformationToXYZ() const the transfer function how values are mapped on the axes. The primaries are defined by three primary colors that represent exactly how red, green, and blue look in this particular color space, and a white color that represents where - and how bright pure white is. The range of colors expressable by the primary colors is + and how bright pure white is. The range of colors expressible by the primary colors is called the gamut, and a color space that can represent a wider range of colors is also known as a wide-gamut color space. diff --git a/src/gui/painting/qpaintengine.cpp b/src/gui/painting/qpaintengine.cpp index 42606a93f0b..9b0ec446ffb 100644 --- a/src/gui/painting/qpaintengine.cpp +++ b/src/gui/painting/qpaintengine.cpp @@ -185,7 +185,7 @@ QFont QTextItem::font() const emulated results. Some features cannot be emulated: AlphaBlend and PorterDuff. \value AlphaBlend The engine can alpha blend primitives. - \value Antialiasing The engine can use antialising to improve the appearance + \value Antialiasing The engine can use antialiasing to improve the appearance of rendered primitives. \value BlendModes The engine supports blending modes. \value BrushStroke The engine supports drawing strokes that diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp index 31f8e40381d..83fc66c50d1 100644 --- a/src/gui/painting/qpainter.cpp +++ b/src/gui/painting/qpainter.cpp @@ -1223,7 +1223,7 @@ void QPainterPrivate::updateState(QPainterState *newState) \li \inlineimage qpainter-affinetransformations.png \endtable - All the tranformation operations operate on the transformation + All the transformation operations operate on the transformation worldTransform(). A matrix transforms a point in the plane to another point. For more information about the transformation matrix, see the \l {Coordinate System} and QTransform documentation. @@ -5910,7 +5910,7 @@ void QPainter::drawText(const QRectF &r, const QString &text, const QTextOption It ignores the font set on the painter as the text item has one of its own. The underline and strikeout parameters of the text items font are - ignored aswell. You'll need to pass in the correct flags to get + ignored as well. You'll need to pass in the correct flags to get underlining and strikeout. */ diff --git a/src/gui/painting/qstroker.cpp b/src/gui/painting/qstroker.cpp index d814dd0ea5a..1fa63c3cb54 100644 --- a/src/gui/painting/qstroker.cpp +++ b/src/gui/painting/qstroker.cpp @@ -295,7 +295,7 @@ void QStrokerOps::strokePath(const QPainterPath &path, void *customData, const Q /*! Convenience function for stroking a polygon of the \a pointCount first points in \a points. If \a implicit_close is set to true a - line is implictly drawn between the first and last point in the + line is implicitly drawn between the first and last point in the polygon. Typically true for polygons and false for polylines. The \a matrix is used to transform the points before they enter the diff --git a/src/gui/platform/darwin/qmacmime.mm b/src/gui/platform/darwin/qmacmime.mm index 3b3b888f0fe..58cd8dbc639 100644 --- a/src/gui/platform/darwin/qmacmime.mm +++ b/src/gui/platform/darwin/qmacmime.mm @@ -143,7 +143,7 @@ const QStringList& qt_mac_enabledDraggedTypes() \li com.apple.pict - converts to "application/x-qt-image" \endlist - When working with MIME data, Qt will interate through all instances of QMacPasteboardMime to + When working with MIME data, Qt will iterate through all instances of QMacPasteboardMime to find an instance that can convert to, or from, a specific MIME type. It will do this by calling canConvert() on each instance, starting with (and choosing) the last created instance first. The actual conversions will be done by using convertToMime() and convertFromMime(). @@ -159,7 +159,7 @@ const QStringList& qt_mac_enabledDraggedTypes() /* Constructs a new conversion object of type \a t, adding it to the - globally accessed list of available convertors. + globally accessed list of available converters. */ QMacInternalPasteboardMime::QMacInternalPasteboardMime(char t) : type(t) { diff --git a/src/gui/rhi/qrhi.cpp b/src/gui/rhi/qrhi.cpp index f13da926b82..a281da21d33 100644 --- a/src/gui/rhi/qrhi.cpp +++ b/src/gui/rhi/qrhi.cpp @@ -1055,7 +1055,7 @@ QDebug operator<<(QDebug dbg, const QRhiScissor &s) Now let's assume also that 3 component vertex positions \c{(x, y, z)} and 2 component texture coordinates \c{(u, v)} are provided in a non-interleaved - format in a buffer (or separate buffers even). Definining two bindings + format in a buffer (or separate buffers even). Defining two bindings could then be done like this: \badcode @@ -2234,7 +2234,7 @@ QRhiBuffer::NativeBuffer QRhiBuffer::nativeBuffer() depending on the backend. \warning When updating buffer data via this method, the update must be done - in every frame, otherwise backends that perform double or tripple buffering + in every frame, otherwise backends that perform double or triple buffering of resources may end up in unexpected behavior. \warning Partial updates are not possible with this approach since some @@ -2928,7 +2928,7 @@ QRhiResource::Type QRhiTextureRenderTarget::resourceType() const descriptor as long as they have the same number and type of attachments. The associated QRhiTexture or QRhiRenderBuffer instances are not part of the render pass descriptor so those can differ in the two - QRhiTextureRenderTarget intances. + QRhiTextureRenderTarget instances. \note resources, such as QRhiTexture instances, referenced in description() must already have create() called on them. @@ -6705,7 +6705,7 @@ bool QRhi::isRecordingFrame() const C++ containers and other types. It may also be similar to what an OpenGL or Direct 3D 11 implementation performs internally for certain type of objects. - In practice, such double (or tripple) buffering resources is realized in + In practice, such double (or triple) buffering resources is realized in the Vulkan, Metal, and similar QRhi backends by having a fixed number of native resource (such as, VkBuffer) \c slots behind a QRhiResource. That can then be indexed by a frame slot index running 0, 1, .., @@ -6713,7 +6713,7 @@ bool QRhi::isRecordingFrame() const All this is managed transparently to the users of QRhi. However, applications that integrate rendering done directly with the graphics API - may want to perform a similar double or tripple buffering of their own + may want to perform a similar double or triple buffering of their own graphics resources. That is then most easily achieved by knowing the values of the maximum number of in-flight frames (retrievable via resourceLimit()) and the current frame (slot) index (returned by this function). diff --git a/src/gui/rhi/qrhiprofiler.cpp b/src/gui/rhi/qrhiprofiler.cpp index 76798dc396e..9546ee686ea 100644 --- a/src/gui/rhi/qrhiprofiler.cpp +++ b/src/gui/rhi/qrhiprofiler.cpp @@ -153,7 +153,7 @@ QT_BEGIN_NAMESPACE Once sufficient number of frames have been rendered, the minimum, maximum, and average values (in milliseconds) from various measurements are made - available in this struct queriable from QRhiProfiler::frameToFrameTimes() + available in this struct queryable from QRhiProfiler::frameToFrameTimes() and QRhiProfiler::frameBuildTimes(). \sa QRhiProfiler::setFrameTimingWriteInterval() @@ -167,7 +167,7 @@ QT_BEGIN_NAMESPACE Once sufficient number of frames have been rendered, the minimum, maximum, and average values (in milliseconds) calculated from GPU command buffer - timestamps are made available in this struct queriable from + timestamps are made available in this struct queryable from QRhiProfiler::gpuFrameTimes(). \sa QRhiProfiler::setFrameTimingWriteInterval() diff --git a/src/gui/text/qfont.cpp b/src/gui/text/qfont.cpp index aae64f8d023..ba36b0790dd 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 caa2eb0f3f0..66dc8cff858 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 f81d489c88d..5b9c10ee52d 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 45e07ac5b53..2a45d127459 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 908e0f914aa..102bce696b3 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 0f50a7508a6..711482af8a1 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() {