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, 3 insertions, 3 deletions

diff --git a/tools/qvfb/qvfbview.cpp b/tools/qvfb/qvfbview.cpp
index 8cab641..69817bd 100644
--- a/tools/qvfb/qvfbview.cpp
+++ b/tools/qvfb/qvfbview.cpp
@@ -596,7 +596,7 @@ QImage QVFbView::getBuffer(const QRect &r, int &leading) const
                    r.width(), r.height(), mView->linestep(),
                    QImage::Format_Indexed8);
         img.setColorTable(mView->clut());
-        if (img.numColors() <= 0)
+        if (img.colorCount() <= 0)
             img = QImage();
         break;
     }
@@ -613,10 +613,10 @@ QImage QVFbView::getBuffer(const QRect &r, int &leading) const
             if ( img.format() != QImage::Format_ARGB32_Premultiplied )
                 img = img.convertToFormat(QImage::Format_RGB32);
 
-            // NOTE: calling bits() may change numBytes(), so do not
+            // NOTE: calling bits() may change byteCount(), so do not
             // pass them as parameters (which are evaluated right-to-left).
             QRgb *b = (QRgb*)img.bits();
-            int n = img.numBytes()/4;
+            int n = img.byteCount()/4;
             dim(b,n,brightness);
         }
     }