diff options
Diffstat (limited to 'src/gui/painting')
-rw-r--r-- | src/gui/painting/qcssutil.cpp | 2 | ||||
-rw-r--r-- | src/gui/painting/qdrawhelper_mips_dsp_asm.S | 2 | ||||
-rw-r--r-- | src/gui/painting/qdrawhelper_ssse3.cpp | 2 | ||||
-rw-r--r-- | src/gui/painting/qdrawingprimitive_sse2_p.h | 4 | ||||
-rw-r--r-- | src/gui/painting/qoutlinemapper.cpp | 2 | ||||
-rw-r--r-- | src/gui/painting/qpaintengine_raster.cpp | 4 | ||||
-rw-r--r-- | src/gui/painting/qpainterpath.cpp | 2 | ||||
-rw-r--r-- | src/gui/painting/qpolygon.h | 2 | ||||
-rw-r--r-- | src/gui/painting/qt_mips_asm_dsp_p.h | 4 | ||||
-rw-r--r-- | src/gui/painting/qtransform.cpp | 2 |
10 files changed, 13 insertions, 13 deletions
diff --git a/src/gui/painting/qcssutil.cpp b/src/gui/painting/qcssutil.cpp index 42e14b3d84..cbbc145453 100644 --- a/src/gui/painting/qcssutil.cpp +++ b/src/gui/painting/qcssutil.cpp @@ -352,7 +352,7 @@ void qDrawBorder(QPainter *p, const QRect &rect, const QCss::BorderStyle *styles QSize tlr, trr, blr, brr; qNormalizeRadii(rect, radii, &tlr, &trr, &blr, &brr); - // Drawn in increasing order of precendence + // Drawn in increasing order of precedence if (styles[BottomEdge] != BorderStyle_None && borders[BottomEdge] > 0) { qreal dw1 = (blr.width() || paintsOver(styles, colors, BottomEdge, LeftEdge)) ? 0 : borders[LeftEdge]; qreal dw2 = (brr.width() || paintsOver(styles, colors, BottomEdge, RightEdge)) ? 0 : borders[RightEdge]; diff --git a/src/gui/painting/qdrawhelper_mips_dsp_asm.S b/src/gui/painting/qdrawhelper_mips_dsp_asm.S index c6b34293b6..895adacba2 100644 --- a/src/gui/painting/qdrawhelper_mips_dsp_asm.S +++ b/src/gui/painting/qdrawhelper_mips_dsp_asm.S @@ -1970,7 +1970,7 @@ LEAF_MIPS_DSP(fetchUntransformed_444_asm_mips_dsp) 2: andi t0, a1, 0x3 beqz t0, 3f /* memory is word aligned */ - andi a3, a2, 0x1 /* set the a3 register as the comparation + andi a3, a2, 0x1 /* set the a3 register as the comparison * for ending the unrolled loop * (1 if odd, 0 if even) */ b 1b /* not word aligned, diff --git a/src/gui/painting/qdrawhelper_ssse3.cpp b/src/gui/painting/qdrawhelper_ssse3.cpp index a175b591dd..3d9dbc146a 100644 --- a/src/gui/painting/qdrawhelper_ssse3.cpp +++ b/src/gui/painting/qdrawhelper_ssse3.cpp @@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE /* The instruction palignr uses direct arguments, so we have to generate the code fo the different - shift (4, 8, 12). Checking the alignment inside the loop is unfortunatelly way too slow. + shift (4, 8, 12). Checking the alignment inside the loop is unfortunately way too slow. */ #define BLENDING_LOOP(palignrOffset, length)\ for (; x-minusOffsetToAlignSrcOn16Bytes < length-7; x += 4) { \ diff --git a/src/gui/painting/qdrawingprimitive_sse2_p.h b/src/gui/painting/qdrawingprimitive_sse2_p.h index b3bb22fe1b..723727f486 100644 --- a/src/gui/painting/qdrawingprimitive_sse2_p.h +++ b/src/gui/painting/qdrawingprimitive_sse2_p.h @@ -64,7 +64,7 @@ QT_BEGIN_NAMESPACE * Multiply the components of pixelVector by alphaChannel * Each 32bits components of alphaChannel must be in the form 0x00AA00AA * colorMask must have 0x00ff00ff on each 32 bits component - * half must have the value 128 (0x80) for each 32 bits compnent + * half must have the value 128 (0x80) for each 32 bits component */ #define BYTE_MUL_SSE2(result, pixelVector, alphaChannel, colorMask, half) \ { \ @@ -102,7 +102,7 @@ QT_BEGIN_NAMESPACE * Each 32bits components of alphaChannel must be in the form 0x00AA00AA * oneMinusAlphaChannel must be 255 - alpha for each 32 bits component * colorMask must have 0x00ff00ff on each 32 bits component - * half must have the value 128 (0x80) for each 32 bits compnent + * half must have the value 128 (0x80) for each 32 bits component */ #define INTERPOLATE_PIXEL_255_SSE2(result, srcVector, dstVector, alphaChannel, oneMinusAlphaChannel, colorMask, half) { \ /* interpolate AG */\ diff --git a/src/gui/painting/qoutlinemapper.cpp b/src/gui/painting/qoutlinemapper.cpp index f7bc2d743f..e92c747010 100644 --- a/src/gui/painting/qoutlinemapper.cpp +++ b/src/gui/painting/qoutlinemapper.cpp @@ -354,7 +354,7 @@ void QOutlineMapper::clipElements(const QPointF *elements, int element_count) { // We could save a bit of time by actually implementing them fully - // instead of going through convenience functionallity, but since + // instead of going through convenience functionality, but since // this part of code hardly every used, it shouldn't matter. QScopedValueRollback<bool> in_clip_elements(m_in_clip_elements, true); diff --git a/src/gui/painting/qpaintengine_raster.cpp b/src/gui/painting/qpaintengine_raster.cpp index d1913ac36f..78f1d5cd01 100644 --- a/src/gui/painting/qpaintengine_raster.cpp +++ b/src/gui/painting/qpaintengine_raster.cpp @@ -969,7 +969,7 @@ void QRasterPaintEnginePrivate::drawImage(const QPointF &pt, if (iw <= 0) return; - // adapt the y paremeters... + // adapt the y parameters... int cy1 = clip.y(); int cy2 = clip.y() + clip.height(); int y = qRound(pt.y()); @@ -1039,7 +1039,7 @@ void QRasterPaintEnginePrivate::blitImage(const QPointF &pt, if (iw <= 0) return; - // adapt the y paremeters... + // adapt the y parameters... int cy1 = clip.y(); int cy2 = clip.y() + clip.height(); int y = qRound(pt.y()); diff --git a/src/gui/painting/qpainterpath.cpp b/src/gui/painting/qpainterpath.cpp index c36747ee16..bfe86b251d 100644 --- a/src/gui/painting/qpainterpath.cpp +++ b/src/gui/painting/qpainterpath.cpp @@ -2126,7 +2126,7 @@ bool QPainterPath::intersects(const QRectF &rect) const Q_D(QPainterPath); - // Check if the rectangle surounds any subpath... + // Check if the rectangle surrounds any subpath... for (int i=0; i<d->elements.size(); ++i) { const Element &e = d->elements.at(i); if (e.type == QPainterPath::MoveToElement && rect.contains(e)) diff --git a/src/gui/painting/qpolygon.h b/src/gui/painting/qpolygon.h index 32567dcef8..a8997c5e3d 100644 --- a/src/gui/painting/qpolygon.h +++ b/src/gui/painting/qpolygon.h @@ -51,7 +51,7 @@ class QTransform; class QRect; class QVariant; -// We export each out-of-line method invidually to prevent MSVC from +// We export each out-of-line method individually to prevent MSVC from // exporting the whole QList class. class QPolygon : public QList<QPoint> { diff --git a/src/gui/painting/qt_mips_asm_dsp_p.h b/src/gui/painting/qt_mips_asm_dsp_p.h index 172910ea1c..88f1f84e1c 100644 --- a/src/gui/painting/qt_mips_asm_dsp_p.h +++ b/src/gui/painting/qt_mips_asm_dsp_p.h @@ -277,7 +277,7 @@ LEAF_MIPS32R2(symbol) \ /* * Saves set of registers on stack. Maximum number of registers that - * can be saved on stack is limitted to 14 (a0-a3, v0-v1 and s0-s7). + * can be saved on stack is limited to 14 (a0-a3, v0-v1 and s0-s7). * Stack offset is number of bytes that are added to stack pointer (sp) * before registers are pushed in order to provide enough space on stack * (offset must be multiple of 4, and must be big enough, as described by @@ -352,7 +352,7 @@ LEAF_MIPS32R2(symbol) \ /* * Restores set of registers from stack. Maximum number of registers that - * can be restored from stack is limitted to 14 (a0-a3, v0-v1 and s0-s7). + * can be restored from stack is limited to 14 (a0-a3, v0-v1 and s0-s7). * Stack offset is number of bytes that are added to stack pointer (sp) * after registers are restored (offset must be multiple of 4, and must * be big enough, as described by CHECK_STACK_OFFSET macro). This macro is diff --git a/src/gui/painting/qtransform.cpp b/src/gui/painting/qtransform.cpp index 7d057732c7..d37571b670 100644 --- a/src/gui/painting/qtransform.cpp +++ b/src/gui/painting/qtransform.cpp @@ -1725,7 +1725,7 @@ QPolygon QTransform::mapToPolygon(const QRect &rect) const MAP(rect.x(), bottom, x[3], y[3]); } - // all coordinates are correctly, tranform to a pointarray + // all coordinates are correctly, transform to a pointarray // (rounding to the next integer) a.setPoints(4, qRound(x[0]), qRound(y[0]), qRound(x[1]), qRound(y[1]), |