summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGunnar Sletta <gunnar@trolltech.com>2010-01-22 07:31:32 (GMT)
committerGunnar Sletta <gunnar@trolltech.com>2010-01-22 07:31:32 (GMT)
commit03c77ad02d5a3c69f4edfdfd2f3ef7cd7dc67aaa (patch)
tree77538685c195bd02dde91faf87481a253095ba56
parent57c7df82ffbace8924c7ac8875ef4343783a2376 (diff)
downloadQt-03c77ad02d5a3c69f4edfdfd2f3ef7cd7dc67aaa.zip
Qt-03c77ad02d5a3c69f4edfdfd2f3ef7cd7dc67aaa.tar.gz
Qt-03c77ad02d5a3c69f4edfdfd2f3ef7cd7dc67aaa.tar.bz2
Fix documentation bug in QColor
-rw-r--r--src/gui/painting/qcolor.cpp11
1 files changed, 4 insertions, 7 deletions
diff --git a/src/gui/painting/qcolor.cpp b/src/gui/painting/qcolor.cpp
index f51dc36..d6d288e 100644
--- a/src/gui/painting/qcolor.cpp
+++ b/src/gui/painting/qcolor.cpp
@@ -934,8 +934,7 @@ void QColor::setRgb(int r, int g, int b, int a)
/*!
\fn QRgb QColor::rgba() const
- Returns the RGB value of the color. Unlike rgb(), the alpha is not
- stripped.
+ Returns the RGB value of the color, including its alpha.
For an invalid color, the alpha value of the returned color is unspecified.
@@ -950,8 +949,7 @@ QRgb QColor::rgba() const
}
/*!
- Sets the RGBA value to \a rgba. Unlike setRgb(QRgb rgb), this function does
- not ignore the alpha.
+ Sets the RGB value to \a rgba, including its alpha.
\sa rgba(), rgb()
*/
@@ -968,8 +966,7 @@ void QColor::setRgba(QRgb rgba)
/*!
\fn QRgb QColor::rgb() const
- Returns the RGB value of the color. The alpha is stripped for
- compatibility.
+ Returns the RGB value of the color. The alpha value is opaque.
\sa getRgb(), rgba()
*/
@@ -983,7 +980,7 @@ QRgb QColor::rgb() const
/*!
\overload
- Sets the RGB value to \a rgb, ignoring the alpha.
+ Sets the RGB value to \a rgb. The alpha value is set to opaque.
*/
void QColor::setRgb(QRgb rgb)
{