summaryrefslogtreecommitdiffstats
path: root/src/gui/image/qpixmap.cpp
diff options
context:
space:
mode:
authorMarius Storm-Olsen <marius.storm-olsen@nokia.com>2009-11-06 09:36:38 (GMT)
committerMarius Storm-Olsen <marius.storm-olsen@nokia.com>2009-11-06 15:10:02 (GMT)
commit8d4f3c94411d21f0b7d851b56f951ad54d64340f (patch)
treefc84e1c710012c723e6b1806d1439976c00533e7 /src/gui/image/qpixmap.cpp
parente53c26b52c890f242491e0dfed4201313d98f720 (diff)
downloadQt-8d4f3c94411d21f0b7d851b56f951ad54d64340f.zip
Qt-8d4f3c94411d21f0b7d851b56f951ad54d64340f.tar.gz
Qt-8d4f3c94411d21f0b7d851b56f951ad54d64340f.tar.bz2
API review: Rename numCols() -> colorCount()
The name numCols is ambiguous, as sometimes it's refering to the number of columns, and sometimes the number of colors. It also does not match the typical Qt naming convention *Count(). Reviewed-by: Tom Cooksey Reviewed-by: Andreas Aardal Hanssen
Diffstat (limited to 'src/gui/image/qpixmap.cpp')
-rw-r--r--src/gui/image/qpixmap.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/gui/image/qpixmap.cpp b/src/gui/image/qpixmap.cpp
index dfeea76..985a20b 100644
--- a/src/gui/image/qpixmap.cpp
+++ b/src/gui/image/qpixmap.cpp
@@ -2150,6 +2150,13 @@ QPixmapData* QPixmap::pixmapData() const
*/
/*! \fn int QPixmap::numCols() const
+ \obsolete
+ \internal
+ \sa colorCount()
+*/
+
+/*! \fn int QPixmap::colorCount() const
+ \since 4.6
\internal
*/