summaryrefslogtreecommitdiffstats
path: root/src/gui/painting
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui/painting')
-rw-r--r--src/gui/painting/qbrush.cpp74
-rw-r--r--src/gui/painting/qcolor.cpp26
-rw-r--r--src/gui/painting/qmatrix.cpp12
-rw-r--r--src/gui/painting/qpaintengine_p.h2
-rw-r--r--src/gui/painting/qpainter.cpp272
-rw-r--r--src/gui/painting/qpainterpath.cpp60
-rw-r--r--src/gui/painting/qpen.cpp60
-rw-r--r--src/gui/painting/qregion.cpp8
-rw-r--r--src/gui/painting/qtransform.cpp12
9 files changed, 263 insertions, 263 deletions
diff --git a/src/gui/painting/qbrush.cpp b/src/gui/painting/qbrush.cpp
index 6850eac59e..fe9b370189 100644
--- a/src/gui/painting/qbrush.cpp
+++ b/src/gui/painting/qbrush.cpp
@@ -309,15 +309,15 @@ struct QBrushDataPointerDeleter
otherwise false. A brush is considered opaque if:
\list
- \o The alpha component of the color() is 255.
- \o Its texture() does not have an alpha channel and is not a QBitmap.
- \o The colors in the gradient() all have an alpha component that is 255.
+ \li The alpha component of the color() is 255.
+ \li Its texture() does not have an alpha channel and is not a QBitmap.
+ \li The colors in the gradient() all have an alpha component that is 255.
\endlist
\table 100%
\row
- \o \inlineimage brush-outline.png Outlines
- \o
+ \li \inlineimage brush-outline.png Outlines
+ \li
To specify the style and color of lines and outlines, use the
QPainter's \l {QPen}{pen} combined with Qt::PenStyle and
@@ -826,10 +826,10 @@ Q_GUI_EXPORT bool qt_isExtendedRadialGradient(const QBrush &brush)
is considered opaque if:
\list
- \i The alpha component of the color() is 255.
- \i Its texture() does not have an alpha channel and is not a QBitmap.
- \i The colors in the gradient() all have an alpha component that is 255.
- \i It is an extended radial gradient.
+ \li The alpha component of the color() is 255.
+ \li Its texture() does not have an alpha channel and is not a QBitmap.
+ \li The colors in the gradient() all have an alpha component that is 255.
+ \li It is an extended radial gradient.
\endlist
*/
@@ -1178,12 +1178,12 @@ QDataStream &operator>>(QDataStream &s, QBrush &b)
Qt currently supports three types of gradient fills:
\list
- \o \e Linear gradients interpolate colors between start and end points.
- \o \e Simple radial gradients interpolate colors between a focal point
+ \li \e Linear gradients interpolate colors between start and end points.
+ \li \e Simple radial gradients interpolate colors between a focal point
and end points on a circle surrounding it.
- \o \e Extended radial gradients interpolate colors between a center and
+ \li \e Extended radial gradients interpolate colors between a center and
a focal circle.
- \o \e Conical gradients interpolate colors around a center point.
+ \li \e Conical gradients interpolate colors around a center point.
\endlist
A gradient's type can be retrieved using the type() function.
@@ -1191,13 +1191,13 @@ QDataStream &operator>>(QDataStream &s, QBrush &b)
\table
\header
- \o QLinearGradient
- \o QRadialGradient
- \o QConicalGradient
+ \li QLinearGradient
+ \li QRadialGradient
+ \li QConicalGradient
\row
- \o \inlineimage qgradient-linear.png
- \o \inlineimage qgradient-radial.png
- \o \inlineimage qgradient-conical.png
+ \li \inlineimage qgradient-linear.png
+ \li \inlineimage qgradient-radial.png
+ \li \inlineimage qgradient-conical.png
\endtable
The colors in a gradient are defined using stop points of the
@@ -1232,13 +1232,13 @@ QDataStream &operator>>(QDataStream &s, QBrush &b)
\table
\row
- \o \inlineimage qradialgradient-pad.png
- \o \inlineimage qradialgradient-repeat.png
- \o \inlineimage qradialgradient-reflect.png
+ \li \inlineimage qradialgradient-pad.png
+ \li \inlineimage qradialgradient-repeat.png
+ \li \inlineimage qradialgradient-reflect.png
\row
- \o \l {QGradient::PadSpread}{PadSpread}
- \o \l {QGradient::RepeatSpread}{RepeatSpread}
- \o \l {QGradient::ReflectSpread}{ReflectSpread}
+ \li \l {QGradient::PadSpread}{PadSpread}
+ \li \l {QGradient::RepeatSpread}{RepeatSpread}
+ \li \l {QGradient::ReflectSpread}{ReflectSpread}
\endtable
Note that the setSpread() function only has effect for linear and
@@ -1537,13 +1537,13 @@ bool QGradient::operator==(const QGradient &gradient) const
\table
\row
- \o \inlineimage qlineargradient-pad.png
- \o \inlineimage qlineargradient-reflect.png
- \o \inlineimage qlineargradient-repeat.png
+ \li \inlineimage qlineargradient-pad.png
+ \li \inlineimage qlineargradient-reflect.png
+ \li \inlineimage qlineargradient-repeat.png
\row
- \o \l {QGradient::PadSpread}{PadSpread} (default)
- \o \l {QGradient::ReflectSpread}{ReflectSpread}
- \o \l {QGradient::RepeatSpread}{RepeatSpread}
+ \li \l {QGradient::PadSpread}{PadSpread} (default)
+ \li \l {QGradient::ReflectSpread}{ReflectSpread}
+ \li \l {QGradient::RepeatSpread}{RepeatSpread}
\endtable
The colors in a gradient is defined using stop points of the
@@ -1723,13 +1723,13 @@ void QLinearGradient::setFinalStop(const QPointF &stop)
\table
\row
- \o \inlineimage qradialgradient-pad.png
- \o \inlineimage qradialgradient-reflect.png
- \o \inlineimage qradialgradient-repeat.png
+ \li \inlineimage qradialgradient-pad.png
+ \li \inlineimage qradialgradient-reflect.png
+ \li \inlineimage qradialgradient-repeat.png
\row
- \o \l {QGradient::PadSpread}{PadSpread} (default)
- \o \l {QGradient::ReflectSpread}{ReflectSpread}
- \o \l {QGradient::RepeatSpread}{RepeatSpread}
+ \li \l {QGradient::PadSpread}{PadSpread} (default)
+ \li \l {QGradient::ReflectSpread}{ReflectSpread}
+ \li \l {QGradient::RepeatSpread}{RepeatSpread}
\endtable
The colors in a gradient is defined using stop points of the
diff --git a/src/gui/painting/qcolor.cpp b/src/gui/painting/qcolor.cpp
index 96491918cd..f531565fb9 100644
--- a/src/gui/painting/qcolor.cpp
+++ b/src/gui/painting/qcolor.cpp
@@ -69,11 +69,11 @@ QT_BEGIN_NAMESPACE
\table
\header
- \o RGB \o HSV \o CMYK
+ \li RGB \li HSV \li CMYK
\row
- \o \inlineimage qcolor-rgb.png
- \o \inlineimage qcolor-hsv.png
- \o \inlineimage qcolor-cmyk.png
+ \li \inlineimage qcolor-rgb.png
+ \li \inlineimage qcolor-hsv.png
+ \li \inlineimage qcolor-cmyk.png
\endtable
The QColor constructor creates the color based on RGB values. To
@@ -194,20 +194,20 @@ QT_BEGIN_NAMESPACE
HSV, like RGB, has three components:
\list
- \o H, for hue, is in the range 0 to 359 if the color is chromatic (not
+ \li H, for hue, is in the range 0 to 359 if the color is chromatic (not
gray), or meaningless if it is gray. It represents degrees on the
color wheel familiar to most people. Red is 0 (degrees), green is
120, and blue is 240.
\inlineimage qcolor-hue.png
- \o S, for saturation, is in the range 0 to 255, and the bigger it is,
+ \li S, for saturation, is in the range 0 to 255, and the bigger it is,
the stronger the color is. Grayish colors have saturation near 0; very
strong colors have saturation near 255.
\inlineimage qcolor-saturation.png
- \o V, for value, is in the range 0 to 255 and represents lightness or
+ \li V, for value, is in the range 0 to 255 and represents lightness or
brightness of the color. 0 is black; 255 is as far from black as
possible.
@@ -498,16 +498,16 @@ QString QColor::name() const
of these formats:
\list
- \i #RGB (each of R, G, and B is a single hex digit)
- \i #RRGGBB
- \i #RRRGGGBBB
- \i #RRRRGGGGBBBB
- \i A name from the list of colors defined in the list of \l{SVG color keyword names}
+ \li #RGB (each of R, G, and B is a single hex digit)
+ \li #RRGGBB
+ \li #RRRGGGBBB
+ \li #RRRRGGGGBBBB
+ \li A name from the list of colors defined in the list of \l{SVG color keyword names}
provided by the World Wide Web Consortium; for example, "steelblue" or "gainsboro".
These color names work on all platforms. Note that these color names are \e not the
same as defined by the Qt::GlobalColor enums, e.g. "green" and Qt::green does not
refer to the same color.
- \i \c transparent - representing the absence of a color.
+ \li \c transparent - representing the absence of a color.
\endlist
The color is invalid if \a name cannot be parsed.
diff --git a/src/gui/painting/qmatrix.cpp b/src/gui/painting/qmatrix.cpp
index 6b5eb14f5f..ced2e4548c 100644
--- a/src/gui/painting/qmatrix.cpp
+++ b/src/gui/painting/qmatrix.cpp
@@ -111,8 +111,8 @@ QT_BEGIN_NAMESPACE
\table 100%
\row
- \o \inlineimage qmatrix-simpletransformation.png
- \o
+ \li \inlineimage qmatrix-simpletransformation.png
+ \li
\snippet doc/src/snippets/matrix/matrix.cpp 0
\endtable
@@ -123,8 +123,8 @@ QT_BEGIN_NAMESPACE
\table 100%
\row
- \o \inlineimage qmatrix-combinedtransformation.png
- \o
+ \li \inlineimage qmatrix-combinedtransformation.png
+ \li
\snippet doc/src/snippets/matrix/matrix.cpp 1
\endtable
@@ -171,8 +171,8 @@ QT_BEGIN_NAMESPACE
\table 100%
\row
- \o \inlineimage qmatrix-combinedtransformation.png
- \o
+ \li \inlineimage qmatrix-combinedtransformation.png
+ \li
\snippet doc/src/snippets/matrix/matrix.cpp 2
\endtable
diff --git a/src/gui/painting/qpaintengine_p.h b/src/gui/painting/qpaintengine_p.h
index 594259367c..15495cace8 100644
--- a/src/gui/painting/qpaintengine_p.h
+++ b/src/gui/painting/qpaintengine_p.h
@@ -62,7 +62,7 @@ QT_BEGIN_NAMESPACE
class QPaintDevice;
-class QPaintEnginePrivate
+class Q_GUI_EXPORT QPaintEnginePrivate
{
Q_DECLARE_PUBLIC(QPaintEngine)
public:
diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp
index 43429abe8a..0f5468df4e 100644
--- a/src/gui/painting/qpainter.cpp
+++ b/src/gui/painting/qpainter.cpp
@@ -984,41 +984,41 @@ void QPainterPrivate::updateState(QPainterState *newState)
\list
- \o font() is the font used for drawing text. If the painter
+ \li font() is the font used for drawing text. If the painter
isActive(), you can retrieve information about the currently set
font, and its metrics, using the fontInfo() and fontMetrics()
functions respectively.
- \o brush() defines the color or pattern that is used for filling
+ \li brush() defines the color or pattern that is used for filling
shapes.
- \o pen() defines the color or stipple that is used for drawing
+ \li pen() defines the color or stipple that is used for drawing
lines or boundaries.
- \o backgroundMode() defines whether there is a background() or
+ \li backgroundMode() defines whether there is a background() or
not, i.e it is either Qt::OpaqueMode or Qt::TransparentMode.
- \o background() only applies when backgroundMode() is \l
+ \li background() only applies when backgroundMode() is \l
Qt::OpaqueMode and pen() is a stipple. In that case, it
describes the color of the background pixels in the stipple.
- \o brushOrigin() defines the origin of the tiled brushes, normally
+ \li brushOrigin() defines the origin of the tiled brushes, normally
the origin of widget's background.
- \o viewport(), window(), worldTransform() make up the painter's coordinate
+ \li viewport(), window(), worldTransform() make up the painter's coordinate
transformation system. For more information, see the \l
{Coordinate Transformations} section and the \l {Coordinate
System} documentation.
- \o hasClipping() tells whether the painter clips at all. (The paint
+ \li hasClipping() tells whether the painter clips at all. (The paint
device clips, too.) If the painter clips, it clips to clipRegion().
- \o layoutDirection() defines the layout direction used by the
+ \li layoutDirection() defines the layout direction used by the
painter when drawing text.
- \o worldMatrixEnabled() tells whether world transformation is enabled.
+ \li worldMatrixEnabled() tells whether world transformation is enabled.
- \o viewTransformEnabled() tells whether view transformation is
+ \li viewTransformEnabled() tells whether view transformation is
enabled.
\endlist
@@ -1052,9 +1052,9 @@ void QPainterPrivate::updateState(QPainterState *newState)
\table 100%
\row
- \o \inlineimage qpainter-basicdrawing.png
- \o
- \bold {Basic Drawing Example}
+ \li \inlineimage qpainter-basicdrawing.png
+ \li
+ \b {Basic Drawing Example}
The \l {painting/basicdrawing}{Basic Drawing} example shows how to
display basic graphics primitives in a variety of styles using the
@@ -1068,8 +1068,8 @@ void QPainterPrivate::updateState(QPainterState *newState)
\table 100%
\row
- \o
- \bold {Painter Paths example}
+ \li
+ \b {Painter Paths example}
The QPainterPath class provides a container for painting
operations, enabling graphical shapes to be constructed and
@@ -1078,7 +1078,7 @@ void QPainterPrivate::updateState(QPainterState *newState)
The \l {painting/painterpaths}{Painter Paths} example shows how
painter paths can be used to build complex shapes for rendering.
- \o \inlineimage qpainter-painterpaths.png
+ \li \inlineimage qpainter-painterpaths.png
\endtable
QPainter also provides the fillPath() function which fills the
@@ -1096,13 +1096,13 @@ void QPainterPrivate::updateState(QPainterState *newState)
\table
\header
- \o \l {painting/deform}{Vector Deformation}
- \o \l {painting/gradients}{Gradients}
- \o \l {painting/pathstroke}{Path Stroking}
+ \li \l {painting/deform}{Vector Deformation}
+ \li \l {painting/gradients}{Gradients}
+ \li \l {painting/pathstroke}{Path Stroking}
\row
- \o \inlineimage qpainter-vectordeformation.png
- \o \inlineimage qpainter-gradients.png
- \o \inlineimage qpainter-pathstroking.png
+ \li \inlineimage qpainter-vectordeformation.png
+ \li \inlineimage qpainter-gradients.png
+ \li \inlineimage qpainter-pathstroking.png
\endtable
@@ -1136,9 +1136,9 @@ void QPainterPrivate::updateState(QPainterState *newState)
\table 100%
\row
- \o \inlineimage qpainter-concentriccircles.png
- \o
- \bold {Concentric Circles Example}
+ \li \inlineimage qpainter-concentriccircles.png
+ \li
+ \b {Concentric Circles Example}
The \l {painting/concentriccircles}{Concentric Circles} example
shows the improved rendering quality that can be obtained using
@@ -1176,12 +1176,12 @@ void QPainterPrivate::updateState(QPainterState *newState)
\table
\header
- \o nop \o rotate() \o scale() \o translate()
+ \li nop \li rotate() \li scale() \li translate()
\row
- \o \inlineimage qpainter-clock.png
- \o \inlineimage qpainter-rotation.png
- \o \inlineimage qpainter-scale.png
- \o \inlineimage qpainter-translation.png
+ \li \inlineimage qpainter-clock.png
+ \li \inlineimage qpainter-rotation.png
+ \li \inlineimage qpainter-scale.png
+ \li \inlineimage qpainter-translation.png
\endtable
The most commonly used transformations are scaling, rotation,
@@ -1200,15 +1200,15 @@ void QPainterPrivate::updateState(QPainterState *newState)
\table 100%
\row
- \o
- \bold {Affine Transformations Example}
+ \li
+ \b {Affine Transformations Example}
The \l {painting/affine}{Affine Transformations} example shows Qt's
ability to perform affine transformations on painting
operations. The demo also allows the user to experiment with the
transformation operations and see the results immediately.
- \o \inlineimage qpainter-affinetransformations.png
+ \li \inlineimage qpainter-affinetransformations.png
\endtable
All the tranformation operations operate on the transformation
@@ -1282,10 +1282,10 @@ void QPainterPrivate::updateState(QPainterState *newState)
\table 100%
\row
- \o \inlineimage qpainter-compositiondemo.png
+ \li \inlineimage qpainter-compositiondemo.png
- \o
- \bold {Composition Modes Example}
+ \li
+ \b {Composition Modes Example}
The \l {painting/composition}{Composition Modes} example, available in
Qt's examples directory, allows you to experiment with the various
@@ -1333,14 +1333,14 @@ void QPainterPrivate::updateState(QPainterState *newState)
\list
- \o Raster - This backend implements all rendering in pure software
+ \li Raster - This backend implements all rendering in pure software
and is always used to render into QImages. For optimal performance
only use the format types QImage::Format_ARGB32_Premultiplied,
QImage::Format_RGB32 or QImage::Format_RGB16. Any other format,
including QImage::Format_ARGB32, has significantly worse
performance. This engine is used by default for QWidget and QPixmap.
- \o OpenGL 2.0 (ES) - This backend is the primary backend for
+ \li OpenGL 2.0 (ES) - This backend is the primary backend for
hardware accelerated graphics. It can be run on desktop machines
and embedded devices supporting the OpenGL 2.0 or OpenGL/ES 2.0
specification. This includes most graphics chips produced in the
@@ -1348,7 +1348,7 @@ void QPainterPrivate::updateState(QPainterState *newState)
onto a QOpenGLWidget or by passing \c {-graphicssystem opengl} on the
command line when the underlying system supports it.
- \o OpenVG - This backend implements the Khronos standard for 2D
+ \li OpenVG - This backend implements the Khronos standard for 2D
and Vector Graphics. It is primarily for embedded devices with
hardware support for OpenVG. The engine can be enabled by
passing \c {-graphicssystem openvg} on the command line when
@@ -1360,26 +1360,26 @@ void QPainterPrivate::updateState(QPainterState *newState)
\list
- \o Simple transformations, meaning translation and scaling, pluss
+ \li Simple transformations, meaning translation and scaling, pluss
0, 90, 180, 270 degree rotations.
- \o \c drawPixmap() in combination with simple transformations and
+ \li \c drawPixmap() in combination with simple transformations and
opacity with non-smooth transformation mode
(\c QPainter::SmoothPixmapTransform not enabled as a render hint).
- \o Rectangle fills with solid color, two-color linear gradients
+ \li Rectangle fills with solid color, two-color linear gradients
and simple transforms.
- \o Rectangular clipping with simple transformations and intersect
+ \li Rectangular clipping with simple transformations and intersect
clip.
- \o Composition Modes \c QPainter::CompositionMode_Source and
+ \li Composition Modes \c QPainter::CompositionMode_Source and
QPainter::CompositionMode_SourceOver
- \o Rounded rectangle filling using solid color and two-color
+ \li Rounded rectangle filling using solid color and two-color
linear gradients fills.
- \o 3x3 patched pixmaps, via qDrawBorderPixmap.
+ \li 3x3 patched pixmaps, via qDrawBorderPixmap.
\endlist
@@ -1963,14 +1963,14 @@ QPaintEngine *QPainter::paintEngine() const
2 engine:
\list
- \i blending is disabled
- \i the depth, stencil and scissor tests are disabled
- \i the active texture unit is reset to 0
- \i the depth mask, depth function and the clear depth are reset to their
+ \li blending is disabled
+ \li the depth, stencil and scissor tests are disabled
+ \li the active texture unit is reset to 0
+ \li the depth mask, depth function and the clear depth are reset to their
default values
- \i the stencil mask, stencil operation and stencil function are reset to
+ \li the stencil mask, stencil operation and stencil function are reset to
their default values
- \i the current color is reset to solid white
+ \li the current color is reset to solid white
\endlist
If, for example, the OpenGL polygon mode is changed by the user inside a
@@ -2885,10 +2885,10 @@ void QPainter::setClipRegion(const QRegion &r, Qt::ClipOperation op)
The following functions can transform the coordinate system without using
a QMatrix:
\list
- \i translate()
- \i scale()
- \i shear()
- \i rotate()
+ \li translate()
+ \li scale()
+ \li shear()
+ \li rotate()
\endlist
They operate on the painter's worldMatrix() and are implemented like this:
@@ -3360,8 +3360,8 @@ void QPainter::fillPath(const QPainterPath &path, const QBrush &brush)
\table 100%
\row
- \o \inlineimage qpainter-path.png
- \o
+ \li \inlineimage qpainter-path.png
+ \li
\snippet doc/src/snippets/code/src_gui_painting_qpainter.cpp 5
\endtable
@@ -3405,8 +3405,8 @@ void QPainter::drawPath(const QPainterPath &path)
\table 100%
\row
- \o \inlineimage qpainter-line.png
- \o
+ \li \inlineimage qpainter-line.png
+ \li
\snippet doc/src/snippets/code/src_gui_painting_qpainter.cpp 6
\endtable
@@ -3452,8 +3452,8 @@ void QPainter::drawPath(const QPainterPath &path)
\table 100%
\row
- \o \inlineimage qpainter-rectangle.png
- \o
+ \li \inlineimage qpainter-rectangle.png
+ \li
\snippet doc/src/snippets/code/src_gui_painting_qpainter.cpp 7
\endtable
@@ -4121,8 +4121,8 @@ const QFont &QPainter::font() const
\table 100%
\row
- \o \inlineimage qpainter-roundrect.png
- \o
+ \li \inlineimage qpainter-roundrect.png
+ \li
\snippet doc/src/snippets/code/src_gui_painting_qpainter.cpp 8
\endtable
@@ -4221,8 +4221,8 @@ void QPainter::drawRoundRect(const QRectF &r, int xRnd, int yRnd)
\table 100%
\row
- \o \inlineimage qpainter-ellipse.png
- \o
+ \li \inlineimage qpainter-ellipse.png
+ \li
\snippet doc/src/snippets/code/src_gui_painting_qpainter.cpp 9
\endtable
@@ -4347,8 +4347,8 @@ void QPainter::drawEllipse(const QRect &r)
\table 100%
\row
- \o \inlineimage qpainter-arc.png
- \o
+ \li \inlineimage qpainter-arc.png
+ \li
\snippet doc/src/snippets/code/src_gui_painting_qpainter.cpp 10
\endtable
@@ -4411,8 +4411,8 @@ void QPainter::drawArc(const QRectF &r, int a, int alen)
\table 100%
\row
- \o \inlineimage qpainter-pie.png
- \o
+ \li \inlineimage qpainter-pie.png
+ \li
\snippet doc/src/snippets/code/src_gui_painting_qpainter.cpp 11
\endtable
@@ -4480,8 +4480,8 @@ void QPainter::drawPie(const QRectF &r, int a, int alen)
\table 100%
\row
- \o \inlineimage qpainter-chord.png
- \o
+ \li \inlineimage qpainter-chord.png
+ \li
\snippet doc/src/snippets/code/src_gui_painting_qpainter.cpp 12
\endtable
@@ -4696,7 +4696,7 @@ void QPainter::drawLines(const QPoint *pointPairs, int lineCount)
\table 100%
\row
- \o
+ \li
\snippet doc/src/snippets/code/src_gui_painting_qpainter.cpp 13
\endtable
@@ -4802,8 +4802,8 @@ void QPainter::drawPolyline(const QPoint *points, int pointCount)
\table 100%
\row
- \o \inlineimage qpainter-polygon.png
- \o
+ \li \inlineimage qpainter-polygon.png
+ \li
\snippet doc/src/snippets/code/src_gui_painting_qpainter.cpp 14
\endtable
@@ -4915,8 +4915,8 @@ void QPainter::drawPolygon(const QPoint *points, int pointCount, Qt::FillRule fi
\table 100%
\row
- \o \inlineimage qpainter-polygon.png
- \o
+ \li \inlineimage qpainter-polygon.png
+ \li
\snippet doc/src/snippets/code/src_gui_painting_qpainter.cpp 15
\endtable
@@ -5039,7 +5039,7 @@ static inline QPointF roundInDeviceCoordinates(const QPointF &p, const QTransfor
\table 100%
\row
- \o
+ \li
\snippet doc/src/snippets/code/src_gui_painting_qpainter.cpp 16
\endtable
@@ -5952,8 +5952,8 @@ void QPainter::drawText(const QRect &r, int flags, const QString &str, QRect *br
\table 100%
\row
- \o \inlineimage qpainter-text.png
- \o
+ \li \inlineimage qpainter-text.png
+ \li
\snippet doc/src/snippets/code/src_gui_painting_qpainter.cpp 17
\endtable
@@ -5962,20 +5962,20 @@ void QPainter::drawText(const QRect &r, int flags, const QString &str, QRect *br
OR of the following flags:
\list
- \o Qt::AlignLeft
- \o Qt::AlignRight
- \o Qt::AlignHCenter
- \o Qt::AlignJustify
- \o Qt::AlignTop
- \o Qt::AlignBottom
- \o Qt::AlignVCenter
- \o Qt::AlignCenter
- \o Qt::TextDontClip
- \o Qt::TextSingleLine
- \o Qt::TextExpandTabs
- \o Qt::TextShowMnemonic
- \o Qt::TextWordWrap
- \o Qt::TextIncludeTrailingSpaces
+ \li Qt::AlignLeft
+ \li Qt::AlignRight
+ \li Qt::AlignHCenter
+ \li Qt::AlignJustify
+ \li Qt::AlignTop
+ \li Qt::AlignBottom
+ \li Qt::AlignVCenter
+ \li Qt::AlignCenter
+ \li Qt::TextDontClip
+ \li Qt::TextSingleLine
+ \li Qt::TextExpandTabs
+ \li Qt::TextShowMnemonic
+ \li Qt::TextWordWrap
+ \li Qt::TextIncludeTrailingSpaces
\endlist
\sa Qt::AlignmentFlag, Qt::TextFlag, boundingRect(), layoutDirection()
@@ -6044,18 +6044,18 @@ void QPainter::drawText(const QRectF &r, int flags, const QString &str, QRectF *
the following flags:
\list
- \o Qt::AlignLeft
- \o Qt::AlignRight
- \o Qt::AlignHCenter
- \o Qt::AlignJustify
- \o Qt::AlignTop
- \o Qt::AlignBottom
- \o Qt::AlignVCenter
- \o Qt::AlignCenter
- \o Qt::TextSingleLine
- \o Qt::TextExpandTabs
- \o Qt::TextShowMnemonic
- \o Qt::TextWordWrap
+ \li Qt::AlignLeft
+ \li Qt::AlignRight
+ \li Qt::AlignHCenter
+ \li Qt::AlignJustify
+ \li Qt::AlignTop
+ \li Qt::AlignBottom
+ \li Qt::AlignVCenter
+ \li Qt::AlignCenter
+ \li Qt::TextSingleLine
+ \li Qt::TextExpandTabs
+ \li Qt::TextShowMnemonic
+ \li Qt::TextWordWrap
\endlist
By default, QPainter draws text anti-aliased.
@@ -6472,18 +6472,18 @@ void QPainter::drawTextItem(const QPointF &p, const QTextItem &_ti)
The \a flags argument is a bitwise OR of the following flags:
\list
- \o Qt::AlignLeft
- \o Qt::AlignRight
- \o Qt::AlignHCenter
- \o Qt::AlignTop
- \o Qt::AlignBottom
- \o Qt::AlignVCenter
- \o Qt::AlignCenter
- \o Qt::TextSingleLine
- \o Qt::TextExpandTabs
- \o Qt::TextShowMnemonic
- \o Qt::TextWordWrap
- \o Qt::TextIncludeTrailingSpaces
+ \li Qt::AlignLeft
+ \li Qt::AlignRight
+ \li Qt::AlignHCenter
+ \li Qt::AlignTop
+ \li Qt::AlignBottom
+ \li Qt::AlignVCenter
+ \li Qt::AlignCenter
+ \li Qt::TextSingleLine
+ \li Qt::TextExpandTabs
+ \li Qt::TextShowMnemonic
+ \li Qt::TextWordWrap
+ \li Qt::TextIncludeTrailingSpaces
\endlist
If several of the horizontal or several of the vertical alignment
flags are set, the resulting alignment is undefined.
@@ -6691,7 +6691,7 @@ void QPainter::drawTiledPixmap(const QRectF &r, const QPixmap &pixmap, const QPo
\table 100%
\row
- \o
+ \li
\snippet doc/src/snippets/code/src_gui_painting_qpainter.cpp 18
\endtable
@@ -7675,7 +7675,7 @@ void QPainterState::init(QPainter *p) {
\table 100%
\row
- \o
+ \li
\snippet doc/src/snippets/code/src_gui_painting_qpainter.cpp 20
\endtable
@@ -7791,21 +7791,21 @@ void QPainterState::init(QPainter *p) {
\target GetFunction
\table
- \header \o Property Flag \o Current Property Value
- \row \o QPaintEngine::DirtyBackground \o backgroundBrush()
- \row \o QPaintEngine::DirtyBackgroundMode \o backgroundMode()
- \row \o QPaintEngine::DirtyBrush \o brush()
- \row \o QPaintEngine::DirtyBrushOrigin \o brushOrigin()
- \row \o QPaintEngine::DirtyClipRegion \e or QPaintEngine::DirtyClipPath
- \o clipOperation()
- \row \o QPaintEngine::DirtyClipPath \o clipPath()
- \row \o QPaintEngine::DirtyClipRegion \o clipRegion()
- \row \o QPaintEngine::DirtyCompositionMode \o compositionMode()
- \row \o QPaintEngine::DirtyFont \o font()
- \row \o QPaintEngine::DirtyTransform \o transform()
- \row \o QPaintEngine::DirtyClipEnabled \o isClipEnabled()
- \row \o QPaintEngine::DirtyPen \o pen()
- \row \o QPaintEngine::DirtyHints \o renderHints()
+ \header \li Property Flag \li Current Property Value
+ \row \li QPaintEngine::DirtyBackground \li backgroundBrush()
+ \row \li QPaintEngine::DirtyBackgroundMode \li backgroundMode()
+ \row \li QPaintEngine::DirtyBrush \li brush()
+ \row \li QPaintEngine::DirtyBrushOrigin \li brushOrigin()
+ \row \li QPaintEngine::DirtyClipRegion \e or QPaintEngine::DirtyClipPath
+ \li clipOperation()
+ \row \li QPaintEngine::DirtyClipPath \li clipPath()
+ \row \li QPaintEngine::DirtyClipRegion \li clipRegion()
+ \row \li QPaintEngine::DirtyCompositionMode \li compositionMode()
+ \row \li QPaintEngine::DirtyFont \li font()
+ \row \li QPaintEngine::DirtyTransform \li transform()
+ \row \li QPaintEngine::DirtyClipEnabled \li isClipEnabled()
+ \row \li QPaintEngine::DirtyPen \li pen()
+ \row \li QPaintEngine::DirtyHints \li renderHints()
\endtable
The QPaintEngineState class also provide the painter() function
diff --git a/src/gui/painting/qpainterpath.cpp b/src/gui/painting/qpainterpath.cpp
index 25dd134401..eb67709318 100644
--- a/src/gui/painting/qpainterpath.cpp
+++ b/src/gui/painting/qpainterpath.cpp
@@ -227,8 +227,8 @@ static void qt_debug_path(const QPainterPath &path)
\table 100%
\row
- \o \inlineimage qpainterpath-construction.png
- \o
+ \li \inlineimage qpainterpath-construction.png
+ \li
\snippet doc/src/snippets/code/src_gui_painting_qpainterpath.cpp 0
\endtable
@@ -241,11 +241,11 @@ static void qt_debug_path(const QPainterPath &path)
\table
\header
- \o Qt::OddEvenFill
- \o Qt::WindingFill
+ \li Qt::OddEvenFill
+ \li Qt::WindingFill
\row
- \o \inlineimage qt-fillrule-oddeven.png
- \o \inlineimage qt-fillrule-winding.png
+ \li \inlineimage qt-fillrule-oddeven.png
+ \li \inlineimage qt-fillrule-winding.png
\endtable
See the Qt::FillRule documentation for the definition of the
@@ -316,11 +316,11 @@ static void qt_debug_path(const QPainterPath &path)
\table
\header
- \o \l {painting/painterpaths}{Painter Paths Example}
- \o \l {painting/deform}{Vector Deformation Example}
+ \li \l {painting/painterpaths}{Painter Paths Example}
+ \li \l {painting/deform}{Vector Deformation Example}
\row
- \o \inlineimage qpainterpath-example.png
- \o \inlineimage qpainterpath-demo.png
+ \li \inlineimage qpainterpath-example.png
+ \li \inlineimage qpainterpath-demo.png
\endtable
\sa QPainterPathStroker, QPainter, QRegion, {Painter Paths Example}
@@ -731,8 +731,8 @@ void QPainterPath::lineTo(const QPointF &p)
\table 100%
\row
- \o \inlineimage qpainterpath-cubicto.png
- \o
+ \li \inlineimage qpainterpath-cubicto.png
+ \li
\snippet doc/src/snippets/code/src_gui_painting_qpainterpath.cpp 1
\endtable
@@ -858,8 +858,8 @@ void QPainterPath::quadTo(const QPointF &c, const QPointF &e)
\table 100%
\row
- \o \inlineimage qpainterpath-arcto.png
- \o
+ \li \inlineimage qpainterpath-arcto.png
+ \li
\snippet doc/src/snippets/code/src_gui_painting_qpainterpath.cpp 2
\endtable
@@ -970,8 +970,8 @@ QPointF QPainterPath::currentPosition() const
\table 100%
\row
- \o \inlineimage qpainterpath-addrectangle.png
- \o
+ \li \inlineimage qpainterpath-addrectangle.png
+ \li
\snippet doc/src/snippets/code/src_gui_painting_qpainterpath.cpp 3
\endtable
@@ -1017,8 +1017,8 @@ void QPainterPath::addRect(const QRectF &r)
\table 100%
\row
- \o \inlineimage qpainterpath-addpolygon.png
- \o
+ \li \inlineimage qpainterpath-addpolygon.png
+ \li
\snippet doc/src/snippets/code/src_gui_painting_qpainterpath.cpp 4
\endtable
@@ -1053,8 +1053,8 @@ void QPainterPath::addPolygon(const QPolygonF &polygon)
\table 100%
\row
- \o \inlineimage qpainterpath-addellipse.png
- \o
+ \li \inlineimage qpainterpath-addellipse.png
+ \li
\snippet doc/src/snippets/code/src_gui_painting_qpainterpath.cpp 5
\endtable
@@ -1105,8 +1105,8 @@ void QPainterPath::addEllipse(const QRectF &boundingRect)
\table 100%
\row
- \o \inlineimage qpainterpath-addtext.png
- \o
+ \li \inlineimage qpainterpath-addtext.png
+ \li
\snippet doc/src/snippets/code/src_gui_painting_qpainterpath.cpp 6
\endtable
@@ -1281,11 +1281,11 @@ Qt::FillRule QPainterPath::fillRule() const
\table
\header
- \o Qt::OddEvenFill (default)
- \o Qt::WindingFill
+ \li Qt::OddEvenFill (default)
+ \li Qt::WindingFill
\row
- \o \inlineimage qt-fillrule-oddeven.png
- \o \inlineimage qt-fillrule-winding.png
+ \li \inlineimage qt-fillrule-oddeven.png
+ \li \inlineimage qt-fillrule-winding.png
\endtable
\sa fillRule()
@@ -2457,10 +2457,10 @@ void qt_path_stroke_cubic_to(qfixed c1x, qfixed c1y,
functions:
\list
- \o setWidth()
- \o setCapStyle()
- \o setJoinStyle()
- \o setDashPattern()
+ \li setWidth()
+ \li setCapStyle()
+ \li setJoinStyle()
+ \li setDashPattern()
\endlist
The setDashPattern() function accepts both a Qt::PenStyle object
diff --git a/src/gui/painting/qpen.cpp b/src/gui/painting/qpen.cpp
index 8d05eb56ff..77f0edc52f 100644
--- a/src/gui/painting/qpen.cpp
+++ b/src/gui/painting/qpen.cpp
@@ -104,21 +104,21 @@ typedef QPenPrivate QPenData;
\table
\row
- \o \inlineimage qpen-solid.png
- \o \inlineimage qpen-dash.png
- \o \inlineimage qpen-dot.png
+ \li \inlineimage qpen-solid.png
+ \li \inlineimage qpen-dash.png
+ \li \inlineimage qpen-dot.png
\row
- \o Qt::SolidLine
- \o Qt::DashLine
- \o Qt::DotLine
+ \li Qt::SolidLine
+ \li Qt::DashLine
+ \li Qt::DotLine
\row
- \o \inlineimage qpen-dashdot.png
- \o \inlineimage qpen-dashdotdot.png
- \o \inlineimage qpen-custom.png
+ \li \inlineimage qpen-dashdot.png
+ \li \inlineimage qpen-dashdotdot.png
+ \li \inlineimage qpen-custom.png
\row
- \o Qt::DashDotLine
- \o Qt::DashDotDotLine
- \o Qt::CustomDashLine
+ \li Qt::DashDotLine
+ \li Qt::DashDotDotLine
+ \li Qt::CustomDashLine
\endtable
Simply use the setStyle() function to convert the pen style to
@@ -153,13 +153,13 @@ typedef QPenPrivate QPenData;
\table
\row
- \o \inlineimage qpen-square.png
- \o \inlineimage qpen-flat.png
- \o \inlineimage qpen-roundcap.png
+ \li \inlineimage qpen-square.png
+ \li \inlineimage qpen-flat.png
+ \li \inlineimage qpen-roundcap.png
\row
- \o Qt::SquareCap
- \o Qt::FlatCap
- \o Qt::RoundCap
+ \li Qt::SquareCap
+ \li Qt::FlatCap
+ \li Qt::RoundCap
\endtable
The Qt::SquareCap style is a square line end that covers the end
@@ -183,13 +183,13 @@ typedef QPenPrivate QPenData;
\table
\row
- \o \inlineimage qpen-bevel.png
- \o \inlineimage qpen-miter.png
- \o \inlineimage qpen-roundjoin.png
+ \li \inlineimage qpen-bevel.png
+ \li \inlineimage qpen-miter.png
+ \li \inlineimage qpen-roundjoin.png
\row
- \o Qt::BevelJoin
- \o Qt::MiterJoin
- \o Qt::RoundJoin
+ \li Qt::BevelJoin
+ \li Qt::MiterJoin
+ \li Qt::RoundJoin
\endtable
The Qt::BevelJoin style fills the triangular notch between the two
@@ -213,8 +213,8 @@ typedef QPenPrivate QPenData;
\table 100%
\row
- \o \inlineimage qpen-demo.png
- \o \bold {\l {painting/pathstroke}{The Path Stroking Example}}
+ \li \inlineimage qpen-demo.png
+ \li \b {\l {painting/pathstroke}{The Path Stroking Example}}
The Path Stroking example shows Qt's built-in dash patterns and shows
how custom patterns can be used to extend the range of available
@@ -474,8 +474,8 @@ QVector<qreal> QPen::dashPattern() const
\table 100%
\row
- \o \inlineimage qpen-custom.png
- \o
+ \li \inlineimage qpen-custom.png
+ \li
\snippet doc/src/snippets/code/src_gui_painting_qpen.cpp 3
\endtable
@@ -527,8 +527,8 @@ qreal QPen::dashOffset() const
to specify the dash pattern.
\table
- \row \o \inlineimage qpen-dashpattern.png
- \o For example, a pattern where each stroke is four units long, followed by a gap
+ \row \li \inlineimage qpen-dashpattern.png
+ \li For example, a pattern where each stroke is four units long, followed by a gap
of two units, will begin with the stroke when drawn as a line.
However, if the dash offset is set to 4.0, any line drawn will begin with the gap.
diff --git a/src/gui/painting/qregion.cpp b/src/gui/painting/qregion.cpp
index 48b0c00014..ebca1edddc 100644
--- a/src/gui/painting/qregion.cpp
+++ b/src/gui/painting/qregion.cpp
@@ -894,11 +894,11 @@ QRegion QRegion::intersect(const QRect &r) const
The rectangles \e must be optimally Y-X sorted and follow these restrictions:
\list
- \o The rectangles must not intersect.
- \o All rectangles with a given top coordinate must have the same height.
- \o No two rectangles may abut horizontally (they should be combined
+ \li The rectangles must not intersect.
+ \li All rectangles with a given top coordinate must have the same height.
+ \li No two rectangles may abut horizontally (they should be combined
into a single wider rectangle in that case).
- \o The rectangles must be sorted in ascending order, with Y as the major
+ \li The rectangles must be sorted in ascending order, with Y as the major
sort key and X as the minor sort key.
\endlist
\omit
diff --git a/src/gui/painting/qtransform.cpp b/src/gui/painting/qtransform.cpp
index 363dd26bbf..e5c41efc15 100644
--- a/src/gui/painting/qtransform.cpp
+++ b/src/gui/painting/qtransform.cpp
@@ -156,8 +156,8 @@ QT_BEGIN_NAMESPACE
\table 100%
\row
- \o \inlineimage qtransform-simpletransformation.png
- \o
+ \li \inlineimage qtransform-simpletransformation.png
+ \li
\snippet doc/src/snippets/transform/main.cpp 0
\endtable
@@ -168,8 +168,8 @@ QT_BEGIN_NAMESPACE
\table 100%
\row
- \o \inlineimage qtransform-combinedtransformation.png
- \o
+ \li \inlineimage qtransform-combinedtransformation.png
+ \li
\snippet doc/src/snippets/transform/main.cpp 1
\endtable
@@ -218,8 +218,8 @@ QT_BEGIN_NAMESPACE
\table 100%
\row
- \o \inlineimage qtransform-combinedtransformation2.png
- \o
+ \li \inlineimage qtransform-combinedtransformation2.png
+ \li
\snippet doc/src/snippets/transform/main.cpp 2
\endtable
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-02 23:06:17 +0000