diff options
| author | Gunnar Sletta <gunnar@trolltech.com> | 2009-12-11 11:11:45 (GMT) |
|---|---|---|
| committer | Gunnar Sletta <gunnar@trolltech.com> | 2009-12-11 11:11:45 (GMT) |
| commit | b42da2ec8677ce67ecd5d5f8188537e2a597da2a (patch) | |
| tree | e41b2eb449e0d0392e85603612836d935967f400 /src/gui/image/qimage.h | |
| parent | 664c78144754c499d07a95c3914fd34202bf4b98 (diff) | |
| parent | 343de9228ae65c36c4a9a45297d45cdeb04a8e44 (diff) | |
| download | Qt-b42da2ec8677ce67ecd5d5f8188537e2a597da2a.zip Qt-b42da2ec8677ce67ecd5d5f8188537e2a597da2a.tar.gz Qt-b42da2ec8677ce67ecd5d5f8188537e2a597da2a.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6
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); |