diff options
| author | Tobias Koenig <tokoe@kde.org> | 2009-06-04 18:44:12 (GMT) |
|---|---|---|
| committer | Tobias Koenig <tokoe@kde.org> | 2009-06-04 18:44:12 (GMT) |
| commit | 5d87f2542bbcb0877f4a9a9b5be4df80cd6aa4cd (patch) | |
| tree | a1fc7824b38c3b712893794cfe55fa285cd3c760 /src/gui/image/qpixmap_qws.cpp | |
| parent | f7741b78c90abcb272345810d55e446a7f390032 (diff) | |
| parent | b1b09172aee658e085423ddf6abfea291a072c74 (diff) | |
| download | Qt-5d87f2542bbcb0877f4a9a9b5be4df80cd6aa4cd.zip Qt-5d87f2542bbcb0877f4a9a9b5be4df80cd6aa4cd.tar.gz Qt-5d87f2542bbcb0877f4a9a9b5be4df80cd6aa4cd.tar.bz2 | |
Merge commit 'qt-mainline/master'
Diffstat (limited to 'src/gui/image/qpixmap_qws.cpp')
| -rw-r--r-- | src/gui/image/qpixmap_qws.cpp | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/src/gui/image/qpixmap_qws.cpp b/src/gui/image/qpixmap_qws.cpp index 6cc7981..7e383ab 100644 --- a/src/gui/image/qpixmap_qws.cpp +++ b/src/gui/image/qpixmap_qws.cpp @@ -109,9 +109,6 @@ QPixmap QPixmap::grabWindow(WId window, int x, int y, int w, int h) return QPixmap::fromImage(img); } -/*! - \internal -*/ QRgb* QPixmap::clut() const { if (data->classId() == QPixmapData::RasterClass) { @@ -122,9 +119,6 @@ QRgb* QPixmap::clut() const return 0; } -/*! - \internal -*/ int QPixmap::numCols() const { if (data->classId() == QPixmapData::RasterClass) { @@ -135,10 +129,6 @@ int QPixmap::numCols() const return 0; } -/*! - \internal - \since 4.1 -*/ const uchar* QPixmap::qwsBits() const { if (data->classId() == QPixmapData::RasterClass) { @@ -149,10 +139,6 @@ const uchar* QPixmap::qwsBits() const return 0; } -/*! - \internal - \since 4.1 -*/ int QPixmap::qwsBytesPerLine() const { if (data->classId() == QPixmapData::RasterClass) { |