diff options
Diffstat (limited to 'src/gui/painting')
-rw-r--r-- | src/gui/painting/qcolor.cpp | 100 | ||||
-rw-r--r-- | src/gui/painting/qmatrix.cpp | 6 | ||||
-rw-r--r-- | src/gui/painting/qpaintdevice.qdoc | 6 | ||||
-rw-r--r-- | src/gui/painting/qpaintengine.cpp | 4 | ||||
-rw-r--r-- | src/gui/painting/qpainter.cpp | 18 | ||||
-rw-r--r-- | src/gui/painting/qpainterpath.cpp | 2 | ||||
-rw-r--r-- | src/gui/painting/qpen.cpp | 10 | ||||
-rw-r--r-- | src/gui/painting/qpolygon.cpp | 2 |
8 files changed, 57 insertions, 91 deletions
diff --git a/src/gui/painting/qcolor.cpp b/src/gui/painting/qcolor.cpp index 81f5a7438a..c45136e1d8 100644 --- a/src/gui/painting/qcolor.cpp +++ b/src/gui/painting/qcolor.cpp @@ -589,7 +589,7 @@ QStringList QColor::colorNames() These components can be retrieved individually using the hueF(), saturationF(), valueF() and alphaF() functions. - \sa setHsv() {QColor#The HSV Color Model}{The HSV Color Model} + \sa setHsv(), {QColor#The HSV Color Model}{The HSV Color Model} */ void QColor::getHsvF(qreal *h, qreal *s, qreal *v, qreal *a) const { @@ -643,8 +643,7 @@ void QColor::getHsv(int *h, int *s, int *v, int *a) const All the values must be in the range 0.0-1.0. - \sa getHsvF(), setHsv(), {QColor#The HSV Color Model}{The HSV - Color Model} + \sa getHsvF(), setHsv(), {QColor#The HSV Color Model}{The HSV Color Model} */ void QColor::setHsvF(qreal h, qreal s, qreal v, qreal a) { @@ -671,8 +670,7 @@ void QColor::setHsvF(qreal h, qreal s, qreal v, qreal a) The saturation, value and alpha-channel values must be in the range 0-255, and the hue value must be greater than -1. - \sa getHsv(), setHsvF(), {QColor#The HSV Color Model}{The HSV - Color Model} + \sa getHsv(), setHsvF(), {QColor#The HSV Color Model}{The HSV Color Model} */ void QColor::setHsv(int h, int s, int v, int a) { @@ -978,8 +976,7 @@ void QColor::setRgb(QRgb rgb) /*! Returns the alpha color component of this color. - \sa setAlpha(), alphaF(), {QColor#Alpha-Blended - Drawing}{Alpha-Blended Drawing} + \sa setAlpha(), alphaF(), {QColor#Alpha-Blended Drawing}{Alpha-Blended Drawing} */ int QColor::alpha() const { return ct.argb.alpha >> 8; } @@ -989,8 +986,7 @@ int QColor::alpha() const Sets the alpha of this color to \a alpha. Integer alpha is specified in the range 0-255. - \sa alpha(), alphaF(), {QColor#Alpha-Blended - Drawing}{Alpha-Blended Drawing} + \sa alpha(), alphaF(), {QColor#Alpha-Blended Drawing}{Alpha-Blended Drawing} */ void QColor::setAlpha(int alpha) @@ -1002,8 +998,7 @@ void QColor::setAlpha(int alpha) /*! Returns the alpha color component of this color. - \sa setAlphaF(), alpha(), {QColor#Alpha-Blended - Drawing}{Alpha-Blended Drawing} + \sa setAlphaF(), alpha(), {QColor#Alpha-Blended Drawing}{Alpha-Blended Drawing} */ qreal QColor::alphaF() const { return ct.argb.alpha / qreal(USHRT_MAX); } @@ -1012,8 +1007,7 @@ qreal QColor::alphaF() const Sets the alpha of this color to \a alpha. qreal alpha is specified in the range 0.0-1.0. - \sa alphaF(), alpha(), {QColor#Alpha-Blended - Drawing}{Alpha-Blended Drawing} + \sa alphaF(), alpha(), {QColor#Alpha-Blended Drawing}{Alpha-Blended Drawing} */ void QColor::setAlphaF(qreal alpha) @@ -1067,7 +1061,7 @@ int QColor::green() const Sets the green color component of this color to \a green. Integer components are specified in the range 0-255. - \sa green(), greenF(), setRgb() + \sa green(), greenF(), setRgb() */ void QColor::setGreen(int green) { @@ -1195,8 +1189,7 @@ void QColor::setBlueF(qreal blue) The color is implicitly converted to HSV. - \sa hsvHue(), hueF(), getHsv(), {QColor#The HSV Color Model}{The HSV Color - Model} + \sa hsvHue(), hueF(), getHsv(), {QColor#The HSV Color Model}{The HSV Color Model} */ int QColor::hue() const @@ -1207,8 +1200,7 @@ int QColor::hue() const /*! Returns the hue color component of this color. - \sa hueF(), getHsv(), {QColor#The HSV Color Model}{The HSV Color - Model} + \sa hueF(), getHsv(), {QColor#The HSV Color Model}{The HSV Color Model} */ int QColor::hsvHue() const { @@ -1234,8 +1226,7 @@ int QColor::saturation() const /*! Returns the saturation color component of this color. - \sa saturationF(), getHsv(), {QColor#The HSV Color Model}{The HSV Color - Model} + \sa saturationF(), getHsv(), {QColor#The HSV Color Model}{The HSV Color Model} */ int QColor::hsvSaturation() const { @@ -1247,8 +1238,7 @@ int QColor::hsvSaturation() const /*! Returns the value color component of this color. - \sa valueF(), getHsv(), {QColor#The HSV Color Model}{The HSV Color - Model} + \sa valueF(), getHsv(), {QColor#The HSV Color Model}{The HSV Color Model} */ int QColor::value() const { @@ -1262,8 +1252,7 @@ int QColor::value() const The color is implicitly converted to HSV. - \sa hsvHueF(), hue(), getHsvF(), {QColor#The HSV Color Model}{The HSV Color - Model} + \sa hsvHueF(), hue(), getHsvF(), {QColor#The HSV Color Model}{The HSV Color Model} */ qreal QColor::hueF() const { @@ -1288,7 +1277,7 @@ qreal QColor::hsvHueF() const The color is implicitly converted to HSV. - \sa hsvSaturationF(), saturation() getHsvF(), {QColor#The HSV Color Model}{The HSV Color + \sa hsvSaturationF(), saturation(), getHsvF(), {QColor#The HSV Color Model}{The HSV Color Model} */ qreal QColor::saturationF() const @@ -1299,8 +1288,7 @@ qreal QColor::saturationF() const /*! Returns the saturation color component of this color. - \sa saturation() getHsvF(), {QColor#The HSV Color Model}{The HSV Color - Model} + \sa saturation(), getHsvF(), {QColor#The HSV Color Model}{The HSV Color Model} */ qreal QColor::hsvSaturationF() const { @@ -1312,8 +1300,7 @@ qreal QColor::hsvSaturationF() const /*! Returns the value color component of this color. - \sa value() getHsvF(), {QColor#The HSV Color Model}{The HSV Color - Model} + \sa value(), getHsvF(), {QColor#The HSV Color Model}{The HSV Color Model} */ qreal QColor::valueF() const { @@ -1341,8 +1328,7 @@ int QColor::hslHue() const Returns the saturation color component of this color. - \sa saturationF(), getHsv(), {QColor#The HSV Color Model}{The HSV Color - Model} + \sa saturationF(), getHsv(), {QColor#The HSV Color Model}{The HSV Color Model} */ int QColor::hslSaturation() const { @@ -1384,7 +1370,7 @@ qreal QColor::hslHueF() const Returns the saturation color component of this color. - \sa saturationF() getHslF() + \sa saturationF(), getHslF() */ qreal QColor::hslSaturationF() const { @@ -1398,7 +1384,7 @@ qreal QColor::hslSaturationF() const Returns the lightness color component of this color. - \sa value() getHslF() + \sa value(), getHslF() */ qreal QColor::lightnessF() const { @@ -1410,8 +1396,7 @@ qreal QColor::lightnessF() const /*! Returns the cyan color component of this color. - \sa cyanF(), getCmyk(), {QColor#The CMYK Color Model}{The CMYK - Color Model} + \sa cyanF(), getCmyk(), {QColor#The CMYK Color Model}{The CMYK Color Model} */ int QColor::cyan() const { @@ -1423,8 +1408,7 @@ int QColor::cyan() const /*! Returns the magenta color component of this color. - \sa magentaF(), getCmyk(), {QColor#The CMYK Color Model}{The CMYK - Color Model} + \sa magentaF(), getCmyk(), {QColor#The CMYK Color Model}{The CMYK Color Model} */ int QColor::magenta() const { @@ -1436,8 +1420,7 @@ int QColor::magenta() const /*! Returns the yellow color component of this color. - \sa yellowF(), getCmyk(), {QColor#The CMYK Color Model}{The CMYK - Color Model} + \sa yellowF(), getCmyk(), {QColor#The CMYK Color Model}{The CMYK Color Model} */ int QColor::yellow() const { @@ -1449,8 +1432,7 @@ int QColor::yellow() const /*! Returns the black color component of this color. - \sa blackF(), getCmyk(), {QColor#The CMYK Color Model}{The CMYK - Color Model} + \sa blackF(), getCmyk(), {QColor#The CMYK Color Model}{The CMYK Color Model} */ int QColor::black() const @@ -1463,8 +1445,7 @@ int QColor::black() const /*! Returns the cyan color component of this color. - \sa cyan(), getCmykF(), {QColor#The CMYK Color Model}{The CMYK - Color Model} + \sa cyan(), getCmykF(), {QColor#The CMYK Color Model}{The CMYK Color Model} */ qreal QColor::cyanF() const { @@ -1476,8 +1457,7 @@ qreal QColor::cyanF() const /*! Returns the magenta color component of this color. - \sa magenta(), getCmykF(), {QColor#The CMYK Color Model}{The CMYK - Color Model} + \sa magenta(), getCmykF(), {QColor#The CMYK Color Model}{The CMYK Color Model} */ qreal QColor::magentaF() const { @@ -1489,8 +1469,7 @@ qreal QColor::magentaF() const /*! Returns the yellow color component of this color. - \sa yellow(), getCmykF(), {QColor#The CMYK Color Model}{The CMYK - Color Model} + \sa yellow(), getCmykF(), {QColor#The CMYK Color Model}{The CMYK Color Model} */ qreal QColor::yellowF() const { @@ -1502,8 +1481,7 @@ qreal QColor::yellowF() const /*! Returns the black color component of this color. - \sa black(), getCmykF(), {QColor#The CMYK Color Model}{The CMYK - Color Model} + \sa black(), getCmykF(), {QColor#The CMYK Color Model}{The CMYK Color Model} */ qreal QColor::blackF() const { @@ -1661,8 +1639,7 @@ QColor QColor::toRgb() const /*! Creates and returns an HSV QColor based on this color. - \sa fromHsv(), convertTo(), isValid(), {QColor#The HSV Color - Model}{The HSV Color Model} + \sa fromHsv(), convertTo(), isValid(), {QColor#The HSV Color Model}{The HSV Color Model} */ QColor QColor::toHsv() const { @@ -1769,8 +1746,7 @@ QColor QColor::toHsl() const /*! Creates and returns a CMYK QColor based on this color. - \sa fromCmyk(), convertTo(), isValid(), {QColor#The CMYK Color - Model}{The CMYK Color Model} + \sa fromCmyk(), convertTo(), isValid(), {QColor#The CMYK Color Model}{The CMYK Color Model} */ QColor QColor::toCmyk() const { @@ -1926,8 +1902,7 @@ QColor QColor::fromRgbF(qreal r, qreal g, qreal b, qreal a) The value of \a s, \a v, and \a a must all be in the range 0-255; the value of \a h must be in the range 0-359. - \sa toHsv(), fromHsvF(), isValid(), {QColor#The HSV Color - Model}{The HSV Color Model} + \sa toHsv(), fromHsvF(), isValid(), {QColor#The HSV Color Model}{The HSV Color Model} */ QColor QColor::fromHsv(int h, int s, int v, int a) { @@ -1958,8 +1933,7 @@ QColor QColor::fromHsv(int h, int s, int v, int a) All the values must be in the range 0.0-1.0. - \sa toHsv(), fromHsv(), isValid(), {QColor#The HSV Color - Model}{The HSV Color Model} + \sa toHsv(), fromHsv(), isValid(), {QColor#The HSV Color Model}{The HSV Color Model} */ QColor QColor::fromHsvF(qreal h, qreal s, qreal v, qreal a) { @@ -2112,8 +2086,7 @@ void QColor::getCmykF(qreal *c, qreal *m, qreal *y, qreal *k, qreal *a) All the values must be in the range 0-255. - \sa getCmyk(), setCmykF(), {QColor#The CMYK Color Model}{The - CMYK Color Model} + \sa getCmyk(), setCmykF(), {QColor#The CMYK Color Model}{The CMYK Color Model} */ void QColor::setCmyk(int c, int m, int y, int k, int a) { @@ -2142,8 +2115,7 @@ void QColor::setCmyk(int c, int m, int y, int k, int a) All the values must be in the range 0.0-1.0. - \sa getCmykF() setCmyk(), {QColor#The CMYK Color Model}{The CMYK - Color Model} + \sa getCmykF(), setCmyk(), {QColor#The CMYK Color Model}{The CMYK Color Model} */ void QColor::setCmykF(qreal c, qreal m, qreal y, qreal k, qreal a) { @@ -2171,8 +2143,7 @@ void QColor::setCmykF(qreal c, qreal m, qreal y, qreal k, qreal a) All the values must be in the range 0-255. - \sa toCmyk(), fromCmykF(), isValid(), {QColor#The CMYK Color Model}{The CMYK - Color Model} + \sa toCmyk(), fromCmykF(), isValid(), {QColor#The CMYK Color Model}{The CMYK Color Model} */ QColor QColor::fromCmyk(int c, int m, int y, int k, int a) { @@ -2204,8 +2175,7 @@ QColor QColor::fromCmyk(int c, int m, int y, int k, int a) All the values must be in the range 0.0-1.0. - \sa toCmyk(), fromCmyk(), isValid(), {QColor#The CMYK Color - Model}{The CMYK Color Model} + \sa toCmyk(), fromCmyk(), isValid(), {QColor#The CMYK Color Model}{The CMYK Color Model} */ QColor QColor::fromCmykF(qreal c, qreal m, qreal y, qreal k, qreal a) { diff --git a/src/gui/painting/qmatrix.cpp b/src/gui/painting/qmatrix.cpp index afefb1787c..5b2ccbd056 100644 --- a/src/gui/painting/qmatrix.cpp +++ b/src/gui/painting/qmatrix.cpp @@ -177,8 +177,8 @@ QT_BEGIN_NAMESPACE \snippet matrix/matrix.cpp 2 \endtable - \sa QPainter, QTransform, {Coordinate System}, - {painting/affine}{Affine Transformations Example}, {Transformations Example} + \sa QPainter, QTransform, {Coordinate System}, + {painting/affine}{Affine Transformations Example}, {Transformations Example} */ @@ -1157,7 +1157,7 @@ QDebug operator<<(QDebug dbg, const QMatrix &m) \brief The qFuzzyCompare function is for comparing two matrices using a fuzziness factor. - + Returns true if \a m1 and \a m2 are equal, allowing for a small fuzziness factor for floating-point comparisons; false otherwise. */ diff --git a/src/gui/painting/qpaintdevice.qdoc b/src/gui/painting/qpaintdevice.qdoc index 47c518ce10..eb7bdcdd1c 100644 --- a/src/gui/painting/qpaintdevice.qdoc +++ b/src/gui/painting/qpaintdevice.qdoc @@ -242,7 +242,7 @@ Note that if the logicalDpiY() doesn't equal the physicalDpiY(), the corresponding QPaintEngine must handle the resolution mapping. - \sa logicalDpiX(), physicalDpiY() + \sa logicalDpiX(), physicalDpiY() */ /*! @@ -256,7 +256,7 @@ Note that if the physicalDpiX() doesn't equal the logicalDpiX(), the corresponding QPaintEngine must handle the resolution mapping. - \sa physicalDpiY(), logicalDpiX() + \sa physicalDpiY(), logicalDpiX() */ /*! @@ -270,5 +270,5 @@ Note that if the physicalDpiY() doesn't equal the logicalDpiY(), the corresponding QPaintEngine must handle the resolution mapping. - \sa physicalDpiX(), logicalDpiY() + \sa physicalDpiX(), logicalDpiY() */ diff --git a/src/gui/painting/qpaintengine.cpp b/src/gui/painting/qpaintengine.cpp index eb6d186f78..4af2651ce8 100644 --- a/src/gui/painting/qpaintengine.cpp +++ b/src/gui/painting/qpaintengine.cpp @@ -414,7 +414,7 @@ void QPaintEngine::drawPolygon(const QPoint *points, int pointCount, PolygonDraw painting is to start on the paint device \a pdev. Return true if the initialization was successful; otherwise return false. - \sa end() isActive() + \sa end(), isActive() */ /*! @@ -424,7 +424,7 @@ void QPaintEngine::drawPolygon(const QPoint *points, int pointCount, PolygonDraw device. Return true if painting was finished successfully; otherwise return false. - \sa begin() isActive() + \sa begin(), isActive() */ diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp index e622fe46a7..d6becf0562 100644 --- a/src/gui/painting/qpainter.cpp +++ b/src/gui/painting/qpainter.cpp @@ -3085,8 +3085,7 @@ bool QPainter::matrixEnabled() const /*! Scales the coordinate system by (\a{sx}, \a{sy}). - \sa setWorldTransform() {QPainter#Coordinate Transformations}{Coordinate - Transformations} + \sa setWorldTransform(), {QPainter#Coordinate Transformations}{Coordinate Transformations} */ void QPainter::scale(qreal sx, qreal sy) @@ -3109,8 +3108,7 @@ void QPainter::scale(qreal sx, qreal sy) /*! Shears the coordinate system by (\a{sh}, \a{sv}). - \sa setWorldTransform(), {QPainter#Coordinate Transformations}{Coordinate - Transformations} + \sa setWorldTransform(), {QPainter#Coordinate Transformations}{Coordinate Transformations} */ void QPainter::shear(qreal sh, qreal sv) @@ -3135,8 +3133,7 @@ void QPainter::shear(qreal sh, qreal sv) Rotates the coordinate system the given \a angle clockwise. - \sa setWorldTransform(), {QPainter#Coordinate Transformations}{Coordinate - Transformations} + \sa setWorldTransform(), {QPainter#Coordinate Transformations}{Coordinate Transformations} */ void QPainter::rotate(qreal a) @@ -3160,8 +3157,7 @@ void QPainter::rotate(qreal a) Translates the coordinate system by the given \a offset; i.e. the given \a offset is added to points. - \sa setWorldTransform(), {QPainter#Coordinate Transformations}{Coordinate - Transformations} + \sa setWorldTransform(), {QPainter#Coordinate Transformations}{Coordinate Transformations} */ void QPainter::translate(const QPointF &offset) { @@ -4794,7 +4790,7 @@ void QPainter::drawPolyline(const QPoint *points, int pointCount) \l{Qt::FillRule} for a more detailed description of these fill rules. - \sa drawConvexPolygon(), drawPolyline(), {Coordinate System} + \sa drawConvexPolygon(), drawPolyline(), {Coordinate System} */ void QPainter::drawPolygon(const QPointF *points, int pointCount, Qt::FillRule fillRule) { @@ -7140,7 +7136,7 @@ QRect QPainter::window() const The default viewport rectangle is the same as the device's rectangle. - \sa viewport(), viewTransformEnabled() {Coordinate + \sa viewport(), viewTransformEnabled(), {Coordinate System#Window-Viewport Conversion}{Window-Viewport Conversion} */ @@ -8102,7 +8098,7 @@ qreal QPaintEngineState::opacity() const If \a combine is true, the specified \a transform is combined with the current matrix; otherwise it replaces the current matrix. - \sa transform() setWorldTransform() + \sa transform(), setWorldTransform() */ void QPainter::setTransform(const QTransform &transform, bool combine ) diff --git a/src/gui/painting/qpainterpath.cpp b/src/gui/painting/qpainterpath.cpp index dc310520e0..f249fe1f4a 100644 --- a/src/gui/painting/qpainterpath.cpp +++ b/src/gui/painting/qpainterpath.cpp @@ -344,7 +344,7 @@ static void qt_debug_path(const QPainterPath &path) \value CurveToDataElement The extra data required to describe a curve in a CurveToElement element. - \sa elementAt(), elementCount() + \sa elementAt(), elementCount() */ /*! diff --git a/src/gui/painting/qpen.cpp b/src/gui/painting/qpen.cpp index 2c95a9f146..9d03f7591c 100644 --- a/src/gui/painting/qpen.cpp +++ b/src/gui/painting/qpen.cpp @@ -309,7 +309,7 @@ QPen::QPen(const QColor &color) Constructs a pen with the specified \a brush, \a width, pen \a style, \a cap style and \a join style. - \sa setBrush(), setWidth(), setStyle(), setCapStyle(), setJoinStyle() + \sa setBrush(), setWidth(), setStyle(), setCapStyle(), setJoinStyle() */ QPen::QPen(const QBrush &brush, qreal width, Qt::PenStyle s, Qt::PenCapStyle c, Qt::PenJoinStyle j) @@ -556,7 +556,7 @@ void QPen::setDashOffset(qreal offset) Returns the miter limit of the pen. The miter limit is only relevant when the join style is set to Qt::MiterJoin. - \sa setMiterLimit(), {QPen#Join Style}{Join Style} + \sa setMiterLimit(), {QPen#Join Style}{Join Style} */ qreal QPen::miterLimit() const { @@ -606,7 +606,7 @@ int QPen::width() const Returns the pen width with floating point precision. - \sa setWidthF() width() + \sa setWidthF(), width() */ qreal QPen::widthF() const { @@ -649,7 +649,7 @@ void QPen::setWidth(int width) Setting a pen width with a negative value is not supported. - \sa setWidth() widthF() + \sa setWidth(), widthF() */ void QPen::setWidthF(qreal width) @@ -693,7 +693,7 @@ void QPen::setCapStyle(Qt::PenCapStyle c) /*! Returns the pen's join style. - \sa setJoinStyle(), {QPen#Join Style}{Join Style} + \sa setJoinStyle(), {QPen#Join Style}{Join Style} */ Qt::PenJoinStyle QPen::joinStyle() const { diff --git a/src/gui/painting/qpolygon.cpp b/src/gui/painting/qpolygon.cpp index b7dee7ff2a..38f70d9e2a 100644 --- a/src/gui/painting/qpolygon.cpp +++ b/src/gui/painting/qpolygon.cpp @@ -306,7 +306,7 @@ void QPolygon::point(int index, int *x, int *y) const \snippet polygon/polygon.cpp 2 - \sa setPoint() putPoints() + \sa setPoint(), putPoints() */ void QPolygon::setPoints(int nPoints, const int *points) |