diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2009-12-09 12:21:23 (GMT) |
|---|---|---|
| committer | Olivier Goffart <ogoffart@trolltech.com> | 2009-12-09 12:48:33 (GMT) |
| commit | 6744e241ee41a50b02a76e3e755ec448676589a4 (patch) | |
| tree | bb4e02d0f0a3f84ff29768a11287fa56753be163 /src/gui/image | |
| parent | 1cfa8d81f04e02860df85a3b7acf41974982adae (diff) | |
| download | Qt-6744e241ee41a50b02a76e3e755ec448676589a4.zip Qt-6744e241ee41a50b02a76e3e755ec448676589a4.tar.gz Qt-6744e241ee41a50b02a76e3e755ec448676589a4.tar.bz2 | |
Compile with QT_NO_DEPRECATED
uses of QT_DEPRECATED must be protected by #ifdef
Task-number: QTBUG-6649
Reviewed-by: João Abecasis
Diffstat (limited to 'src/gui/image')
| -rw-r--r-- | src/gui/image/qimage.h | 6 | ||||
| -rw-r--r-- | src/gui/image/qpixmap.h | 2 |
2 files changed, 8 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); diff --git a/src/gui/image/qpixmap.h b/src/gui/image/qpixmap.h index d95b4ee..e02b0d6 100644 --- a/src/gui/image/qpixmap.h +++ b/src/gui/image/qpixmap.h @@ -185,7 +185,9 @@ public: const uchar *qwsBits() const; int qwsBytesPerLine() const; QRgb *clut() const; +#ifdef QT_DEPRECATED QT_DEPRECATED int numCols() const; +#endif int colorCount() const; #elif defined(Q_WS_MAC) Qt::HANDLE macQDHandle() const; |