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

1 files changed, 2 insertions, 2 deletions

diff --git a/src/tools/uic3/embed.cpp b/src/tools/uic3/embed.cpp
index d699623..2eb4dd5 100644
--- a/src/tools/uic3/embed.cpp
+++ b/src/tools/uic3/embed.cpp
@@ -177,7 +177,7 @@ void Ui3Reader::embed(const char *project, const QStringList &images)
         e->width = img.width();
         e->height = img.height();
         e->depth = img.depth();
-        e->numColors = img.numColors();
+        e->numColors = img.colorCount();
         e->colorTable = new QRgb[e->numColors];
         e->alpha = img.hasAlphaBuffer();
         QVector<QRgb> ct = img.colorTable();
@@ -195,7 +195,7 @@ void Ui3Reader::embed(const char *project, const QStringList &images)
 #ifndef QT_NO_IMAGE_COLLECTION_COMPRESSION
         e->compressed =
 #endif
-            embedData( out, img.bits(), img.numBytes() );
+            embedData( out, img.bits(), img.byteCount() );
         out << "\n};\n\n";
         if ( e->numColors ) {
             out << s.sprintf( "static const QRgb %s_ctable[] = {",