diff -r 56cd8111b7f7 -r 41300fa6a67c src/gui/image/qimage.h
--- a/src/gui/image/qimage.h	Tue Jan 26 12:42:25 2010 +0200
+++ b/src/gui/image/qimage.h	Tue Feb 02 00:43:10 2010 +0200
@@ -165,18 +165,27 @@
     QRect rect() const;
 
     int depth() const;
-    int numColors() const;
+#ifdef QT_DEPRECATED
+    QT_DEPRECATED int numColors() const;
+#endif
+    int colorCount() const;
 
     QRgb color(int i) const;
     void setColor(int i, QRgb c);
-    void setNumColors(int);
+#ifdef QT_DEPRECATED
+    QT_DEPRECATED void setNumColors(int);
+#endif
+    void setColorCount(int);
 
     bool allGray() const;
     bool isGrayscale() const;
 
     uchar *bits();
     const uchar *bits() const;
-    int numBytes() const;
+#ifdef QT_DEPRECATED
+    QT_DEPRECATED int numBytes() const;
+#endif
+    int byteCount() const;
 
     uchar *scanLine(int);
     const uchar *scanLine(int) const;