diff options
| author | axis <qt-info@nokia.com> | 2009-12-16 08:37:34 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-12-16 08:37:34 (GMT) |
| commit | 6e527912d719b0448b91eba1d6a99b9cbe58170a (patch) | |
| tree | 17ba94b2af34ba2ab953fbd7be84955bdea39370 /src/gui/image/qimage.h | |
| parent | 8152bd167c1a728c54a9976297bb53e09d131d66 (diff) | |
| parent | a9d4faa330698a7972c7fa4b3582fb20548b32f6 (diff) | |
| download | Qt-6e527912d719b0448b91eba1d6a99b9cbe58170a.zip Qt-6e527912d719b0448b91eba1d6a99b9cbe58170a.tar.gz Qt-6e527912d719b0448b91eba1d6a99b9cbe58170a.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6-s60
Conflicts:
src/s60installs/bwins/QtGuiu.def
Diffstat (limited to 'src/gui/image/qimage.h')
| -rw-r--r-- | src/gui/image/qimage.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/gui/image/qimage.h b/src/gui/image/qimage.h index d8809ef..ce7f450 100644 --- a/src/gui/image/qimage.h +++ b/src/gui/image/qimage.h @@ -165,12 +165,16 @@ public: QRect rect() const; int depth() const; +#ifdef QT_DEPRECATED QT_DEPRECATED int numColors() const; +#endif int colorCount() const; QRgb color(int i) const; void setColor(int i, QRgb c); +#ifdef QT_DEPRECATED QT_DEPRECATED void setNumColors(int); +#endif void setColorCount(int); bool allGray() const; @@ -178,7 +182,9 @@ public: uchar *bits(); const uchar *bits() const; +#ifdef QT_DEPRECATED QT_DEPRECATED int numBytes() const; +#endif int byteCount() const; uchar *scanLine(int); |