summaryrefslogtreecommitdiffstats
path: root/demos
diff options
context:
space:
mode:
authorMarius Storm-Olsen <marius.storm-olsen@nokia.com>2009-11-06 08:33:33 (GMT)
committerMarius Storm-Olsen <marius.storm-olsen@nokia.com>2009-11-06 14:45:10 (GMT)
commite53c26b52c890f242491e0dfed4201313d98f720 (patch)
tree7fac2b3f8972ea22c1136995864f6eacda87ccac /demos
parent98e0b95581f46b94773a55195e0e67a466c333ed (diff)
downloadQt-e53c26b52c890f242491e0dfed4201313d98f720.zip
Qt-e53c26b52c890f242491e0dfed4201313d98f720.tar.gz
Qt-e53c26b52c890f242491e0dfed4201313d98f720.tar.bz2
API review: Rename functions numColors(), setNumColors() and numBytes()
QPaintDevice and QImage used the functions numColors(), setNumColors(), and numBytes(). However, this is not consistent with the rest of the Qt API which uses *Count() and set*Count(). Removed all usage of these functions inside Qt and test-cases. Reviewed-by: Andreas Aardal Hanssen
Diffstat (limited to 'demos')
-rw-r--r--demos/composition/composition.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/demos/composition/composition.cpp b/demos/composition/composition.cpp
index 24e9187..1025d3c 100644
--- a/demos/composition/composition.cpp
+++ b/demos/composition/composition.cpp
@@ -457,7 +457,7 @@ void CompositionRenderer::paint(QPainter *painter)
#ifdef Q_WS_QWS
m_buffer = m_base_buffer;
#else
- memcpy(m_buffer.bits(), m_base_buffer.bits(), m_buffer.numBytes());
+ memcpy(m_buffer.bits(), m_base_buffer.bits(), m_buffer.byteCount());
#endif
{