diff options
author | Marius Storm-Olsen <marius.storm-olsen@nokia.com> | 2012-05-10 09:11:17 +0200 |
---|---|---|
committer | Marius Storm-Olsen <marius.storm-olsen@nokia.com> | 2012-05-10 09:11:23 +0200 |
commit | 9456528aac80c6d4c41fa96d88696dc55414b710 (patch) | |
tree | f9fdcc9cd3c7468503590bec7ed082294a0cffde /src/gui/image | |
parent | 75552c8f62dcfb8012c306b37c79ec629448d780 (diff) | |
parent | ee38dec6f3aff6f7f277323c5c8488d4cd385693 (diff) |
Merge branch 'docs-refactoring' into master
Change-Id: Iebd1966abace3cdf7f9428dcfc1ded5b124ab113
Diffstat (limited to 'src/gui/image')
-rw-r--r-- | src/gui/image/qimage.cpp | 10 | ||||
-rw-r--r-- | src/gui/image/qimagereader.cpp | 8 | ||||
-rw-r--r-- | src/gui/image/qimagewriter.cpp | 6 | ||||
-rw-r--r-- | src/gui/image/qmovie.cpp | 4 | ||||
-rw-r--r-- | src/gui/image/qpicture.cpp | 18 | ||||
-rw-r--r-- | src/gui/image/qpixmap.cpp | 8 | ||||
-rw-r--r-- | src/gui/image/qpixmapcache.cpp | 4 |
7 files changed, 29 insertions, 29 deletions
diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp index 91b21227df..89060cfbb4 100644 --- a/src/gui/image/qimage.cpp +++ b/src/gui/image/qimage.cpp @@ -441,7 +441,7 @@ bool QImageData::checkForAlphaPixels() const \row \li \inlineimage qimage-32bit_scaled.png \li - \snippet doc/src/snippets/code/src_gui_image_qimage.cpp 0 + \snippet code/src_gui_image_qimage.cpp 0 \endtable In case of a 8-bit and monchrome images, the pixel value is only @@ -462,7 +462,7 @@ bool QImageData::checkForAlphaPixels() const \row \li \inlineimage qimage-8bit_scaled.png \li - \snippet doc/src/snippets/code/src_gui_image_qimage.cpp 1 + \snippet code/src_gui_image_qimage.cpp 1 \endtable QImage also provide the scanLine() function which returns a @@ -949,7 +949,7 @@ extern bool qt_read_xpm_image_or_array(QIODevice *device, const char * const *so Note that it's possible to squeeze the XPM variable a little bit by using an unusual declaration: - \snippet doc/src/snippets/code/src_gui_image_qimage.cpp 2 + \snippet code/src_gui_image_qimage.cpp 2 The extra \c const makes the entire definition read-only, which is slightly more efficient (e.g., when the code is in a shared @@ -4478,7 +4478,7 @@ bool QImage::save(const QString &fileName, const char *format, int quality) cons This can, for example, be used to save an image directly into a QByteArray: - \snippet doc/src/snippets/image/image.cpp 0 + \snippet image/image.cpp 0 */ bool QImage::save(QIODevice* device, const char* format, int quality) const @@ -4801,7 +4801,7 @@ QString QImage::text(const QString &key) const if a specific image or format supports embedding text by using QImageWriter::supportsOption(). We give an example: - \snippet doc/src/snippets/image/supportedformat.cpp 0 + \snippet image/supportedformat.cpp 0 You can use QImageWriter::supportedImageFormats() to find out which image formats are available to you. diff --git a/src/gui/image/qimagereader.cpp b/src/gui/image/qimagereader.cpp index 02c01f9866..4cda7304ac 100644 --- a/src/gui/image/qimagereader.cpp +++ b/src/gui/image/qimagereader.cpp @@ -664,7 +664,7 @@ QImageReader::~QImageReader() Sets the format QImageReader will use when reading images, to \a format. \a format is a case insensitive text string. Example: - \snippet doc/src/snippets/code/src_gui_image_qimagereader.cpp 0 + \snippet code/src_gui_image_qimagereader.cpp 0 You can call supportedImageFormats() for the full list of formats QImageReader supports. @@ -682,7 +682,7 @@ void QImageReader::setFormat(const QByteArray &format) You can call this function after assigning a device to the reader to determine the format of the device. For example: - \snippet doc/src/snippets/code/src_gui_image_qimagereader.cpp 1 + \snippet code/src_gui_image_qimagereader.cpp 1 If the reader cannot read any image from the device (e.g., there is no image there, or the image has already been read), or if the format is @@ -1142,7 +1142,7 @@ QImage QImageReader::read() which always constructs a new image; especially when reading several images with the same format and size. - \snippet doc/src/snippets/code/src_gui_image_qimagereader.cpp 2 + \snippet code/src_gui_image_qimagereader.cpp 2 For image formats that support animation, calling read() repeatedly will return the next frame. When all frames have been read, a null image will @@ -1382,7 +1382,7 @@ QString QImageReader::errorString() const (see text()), and the BMP format allows you to determine the image's size without loading the whole image into memory (see size()). - \snippet doc/src/snippets/code/src_gui_image_qimagereader.cpp 3 + \snippet code/src_gui_image_qimagereader.cpp 3 \sa QImageWriter::supportsOption() */ diff --git a/src/gui/image/qimagewriter.cpp b/src/gui/image/qimagewriter.cpp index 43a93d75c2..c1b7a6459a 100644 --- a/src/gui/image/qimagewriter.cpp +++ b/src/gui/image/qimagewriter.cpp @@ -330,7 +330,7 @@ QImageWriter::~QImageWriter() Sets the format QImageWriter will use when writing images, to \a format. \a format is a case insensitive text string. Example: - \snippet doc/src/snippets/code/src_gui_image_qimagewriter.cpp 0 + \snippet code/src_gui_image_qimagewriter.cpp 0 You can call supportedImageFormats() for the full list of formats QImageWriter supports. @@ -529,7 +529,7 @@ QString QImageWriter::description() const \a text. This is useful for storing copyright information or other information about the image. Example: - \snippet doc/src/snippets/code/src_gui_image_qimagewriter.cpp 1 + \snippet code/src_gui_image_qimagewriter.cpp 1 If you want to store a single block of data (e.g., a comment), you can pass an empty key, or use @@ -636,7 +636,7 @@ QString QImageWriter::errorString() const example, the PNG format allows you to embed text into the image's metadata (see text()). - \snippet doc/src/snippets/code/src_gui_image_qimagewriter.cpp 2 + \snippet code/src_gui_image_qimagewriter.cpp 2 Options can be tested after the writer has been associated with a format. diff --git a/src/gui/image/qmovie.cpp b/src/gui/image/qmovie.cpp index 8dfcf57dfd..e1ddcf1a0c 100644 --- a/src/gui/image/qmovie.cpp +++ b/src/gui/image/qmovie.cpp @@ -61,7 +61,7 @@ To display the movie in your application, you can pass your QMovie object to QLabel::setMovie(). Example: - \snippet doc/src/snippets/code/src_gui_image_qmovie.cpp 0 + \snippet code/src_gui_image_qmovie.cpp 0 Whenever a new frame is available in the movie, QMovie will emit updated(). If the size of the frame changes, resized() is emitted. You can @@ -883,7 +883,7 @@ void QMovie::setPaused(bool paused) The default speed is 100%. Example: - \snippet doc/src/snippets/code/src_gui_image_qmovie.cpp 1 + \snippet code/src_gui_image_qmovie.cpp 1 */ void QMovie::setSpeed(int percentSpeed) { diff --git a/src/gui/image/qpicture.cpp b/src/gui/image/qpicture.cpp index 0544d3d431..34ca077e5b 100644 --- a/src/gui/image/qpicture.cpp +++ b/src/gui/image/qpicture.cpp @@ -92,13 +92,13 @@ void qt_format_text(const QFont &fnt, const QRectF &_r, depending on the window system. Example of how to record a picture: - \snippet doc/src/snippets/picture/picture.cpp 0 + \snippet picture/picture.cpp 0 Note that the list of painter commands is reset on each call to the QPainter::begin() function. Example of how to replay a picture: - \snippet doc/src/snippets/picture/picture.cpp 1 + \snippet picture/picture.cpp 1 Pictures can also be drawn using play(). Some basic data about a picture is available, for example, size(), isNull() and @@ -1226,7 +1226,7 @@ static QStringList qToStringList(const QList<QByteArray> arr) Note that if you want to iterate over the list, you should iterate over a copy, e.g. - \snippet doc/src/snippets/picture/picture.cpp 2 + \snippet picture/picture.cpp 2 \sa outputFormatList() inputFormats() QPictureIO */ @@ -1244,7 +1244,7 @@ QStringList QPicture::inputFormatList() Note that if you want to iterate over the list, you should iterate over a copy, e.g. - \snippet doc/src/snippets/picture/picture.cpp 3 + \snippet picture/picture.cpp 3 \sa inputFormatList() outputFormats() QPictureIO */ @@ -1470,11 +1470,11 @@ static QPictureHandler *get_picture_handler(const char *format) both are null, the QPictureIO object is valid but useless. Example: - \snippet doc/src/snippets/picture/picture.cpp 6 + \snippet picture/picture.cpp 6 \codeline - \snippet doc/src/snippets/picture/picture.cpp 7 + \snippet picture/picture.cpp 7 \codeline - \snippet doc/src/snippets/picture/picture.cpp 8 + \snippet picture/picture.cpp 8 Before the regular expression test, all the 0 bytes in the file header are converted to 1 bytes. This is done because when Qt was ASCII-based, QRegExp @@ -1839,7 +1839,7 @@ QList<QByteArray> QPictureIO::outputFormats() Example: - \snippet doc/src/snippets/picture/picture.cpp 4 + \snippet picture/picture.cpp 4 \sa setIODevice() setFileName() setFormat() write() QPixmap::load() */ @@ -1908,7 +1908,7 @@ bool QPictureIO::read() The picture will be written using the specified picture format. Example: - \snippet doc/src/snippets/picture/picture.cpp 5 + \snippet picture/picture.cpp 5 \sa setIODevice() setFileName() setFormat() read() QPixmap::save() */ diff --git a/src/gui/image/qpixmap.cpp b/src/gui/image/qpixmap.cpp index 248caf7f3d..4cdf61138c 100644 --- a/src/gui/image/qpixmap.cpp +++ b/src/gui/image/qpixmap.cpp @@ -241,7 +241,7 @@ QPixmap::QPixmap(const QPixmap &pixmap) Note that it's possible to squeeze the XPM variable a little bit by using an unusual declaration: - \snippet doc/src/snippets/code/src_gui_image_qpixmap.cpp 0 + \snippet code/src_gui_image_qpixmap.cpp 0 The extra \c const makes the entire definition read-only, which is slightly more efficient (for example, when the code is in a shared @@ -334,7 +334,7 @@ QPixmap QPixmap::copy(const QRect &rect) const region is left unchanged. You can optionally pass a pointer to an empty QRegion to get the region that is \a exposed by the scroll operation. - \snippet doc/src/snippets/code/src_gui_image_qpixmap.cpp 2 + \snippet code/src_gui_image_qpixmap.cpp 2 You cannot scroll while there is an active painter on the pixmap. @@ -651,7 +651,7 @@ void QPixmap::setMask(const QBitmap &mask) The mask may not be perfect but it should be reasonable, so you can do things such as the following: - \snippet doc/src/snippets/code/src_gui_image_qpixmap.cpp 1 + \snippet code/src_gui_image_qpixmap.cpp 1 This function is slow because it involves converting to/from a QImage, and non-trivial computations. @@ -810,7 +810,7 @@ bool QPixmap::save(const QString &fileName, const char *format, int quality) con specified image file \a format and \a quality factor. This can be used, for example, to save a pixmap directly into a QByteArray: - \snippet doc/src/snippets/image/image.cpp 1 + \snippet image/image.cpp 1 */ bool QPixmap::save(QIODevice* device, const char* format, int quality) const diff --git a/src/gui/image/qpixmapcache.cpp b/src/gui/image/qpixmapcache.cpp index 7769c45b2e..b0e5b7e1e3 100644 --- a/src/gui/image/qpixmapcache.cpp +++ b/src/gui/image/qpixmapcache.cpp @@ -472,7 +472,7 @@ QPixmapCacheEntry::~QPixmapCacheEntry() bool find(const QString&, QPixmap*) instead. Example: - \snippet doc/src/snippets/code/src_gui_image_qpixmapcache.cpp 0 + \snippet code/src_gui_image_qpixmapcache.cpp 0 */ QPixmap *QPixmapCache::find(const QString &key) @@ -500,7 +500,7 @@ bool QPixmapCache::find(const QString &key, QPixmap& pixmap) \since 4.6 Example: - \snippet doc/src/snippets/code/src_gui_image_qpixmapcache.cpp 1 + \snippet code/src_gui_image_qpixmapcache.cpp 1 */ bool QPixmapCache::find(const QString &key, QPixmap* pixmap) |