summaryrefslogtreecommitdiffstats
path: root/src/gui/image/qpixmap.h
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.h
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.h')
-rw-r--r--src/gui/image/qpixmap.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/image/qpixmap.h b/src/gui/image/qpixmap.h
index d11bd03..d95b4ee 100644
--- a/src/gui/image/qpixmap.h
+++ b/src/gui/image/qpixmap.h
@@ -185,7 +185,8 @@ public:
const uchar *qwsBits() const;
int qwsBytesPerLine() const;
QRgb *clut() const;
- int numCols() const;
+ QT_DEPRECATED int numCols() const;
+ int colorCount() const;
#elif defined(Q_WS_MAC)
Qt::HANDLE macQDHandle() const;
Qt::HANDLE macQDAlphaHandle() const;