summaryrefslogtreecommitdiffstats
path: root/src/plugins/imageformats
diff options
context:
space:
mode:
authorJarek Kobus <jaroslaw.kobus@qt.io>2020-07-06 12:34:58 +0200
committerJarek Kobus <jaroslaw.kobus@qt.io>2020-07-06 13:43:20 +0200
commit1e25b81e0d6c1da4643c9cc48680f5cc4399d068 (patch)
tree39f7a70e11b6b14382673167b6e183f70e3dc6c5 /src/plugins/imageformats
parent23b7e7972ea40afd2594d0570cbcf8192619cd56 (diff)
Use QList instead of QVector in plugins
Task-number: QTBUG-84469 Change-Id: Ic86f4a3000592a1c9ae62e4a83f4fe39832a6b24 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'src/plugins/imageformats')
-rw-r--r--src/plugins/imageformats/gif/qgifhandler.cpp6
-rw-r--r--src/plugins/imageformats/gif/qgifhandler_p.h2
-rw-r--r--src/plugins/imageformats/ico/qicohandler.cpp12
-rw-r--r--src/plugins/imageformats/jpeg/qjpeghandler.cpp10
4 files changed, 15 insertions, 15 deletions
diff --git a/src/plugins/imageformats/gif/qgifhandler.cpp b/src/plugins/imageformats/gif/qgifhandler.cpp
index e895e4f91b..b6322f0f4d 100644
--- a/src/plugins/imageformats/gif/qgifhandler.cpp
+++ b/src/plugins/imageformats/gif/qgifhandler.cpp
@@ -69,7 +69,7 @@ public:
int decode(QImage *image, const uchar* buffer, int length,
int *nextFrameDelay, int *loopCount);
- static void scan(QIODevice *device, QVector<QSize> *imageSizes, int *loopCount);
+ static void scan(QIODevice *device, QList<QSize> *imageSizes, int *loopCount);
bool newFrame;
bool partialNewFrame;
@@ -688,9 +688,9 @@ int QGIFFormat::decode(QImage *image, const uchar *buffer, int length,
/*!
Scans through the data stream defined by \a device and returns the image
- sizes found in the stream in the \a imageSizes vector.
+ sizes found in the stream in the \a imageSizes list.
*/
-void QGIFFormat::scan(QIODevice *device, QVector<QSize> *imageSizes, int *loopCount)
+void QGIFFormat::scan(QIODevice *device, QList<QSize> *imageSizes, int *loopCount)
{
if (!device)
return;
diff --git a/src/plugins/imageformats/gif/qgifhandler_p.h b/src/plugins/imageformats/gif/qgifhandler_p.h
index f19777fa18..9508e9ac92 100644
--- a/src/plugins/imageformats/gif/qgifhandler_p.h
+++ b/src/plugins/imageformats/gif/qgifhandler_p.h
@@ -94,7 +94,7 @@ private:
mutable int nextDelay;
mutable int loopCnt;
int frameNumber;
- mutable QVector<QSize> imageSizes;
+ mutable QList<QSize> imageSizes;
mutable bool scanIsCached;
};
diff --git a/src/plugins/imageformats/ico/qicohandler.cpp b/src/plugins/imageformats/ico/qicohandler.cpp
index 631d7e8d0f..52e231e5a7 100644
--- a/src/plugins/imageformats/ico/qicohandler.cpp
+++ b/src/plugins/imageformats/ico/qicohandler.cpp
@@ -103,9 +103,9 @@ public:
QImage iconAt(int index);
static bool canRead(QIODevice *iodev);
- static QVector<QImage> read(QIODevice *device);
+ static QList<QImage> read(QIODevice *device);
- static bool write(QIODevice *device, const QVector<QImage> &images);
+ static bool write(QIODevice *device, const QList<QImage> &images);
bool readIconEntry(int index, ICONDIRENTRY * iconEntry);
@@ -564,9 +564,9 @@ QImage ICOReader::iconAt(int index)
\sa write()
*/
-QVector<QImage> ICOReader::read(QIODevice *device)
+QList<QImage> ICOReader::read(QIODevice *device)
{
- QVector<QImage> images;
+ QList<QImage> images;
ICOReader reader(device);
const int N = reader.count();
@@ -590,7 +590,7 @@ QVector<QImage> ICOReader::read(QIODevice *device)
\sa read()
*/
-bool ICOReader::write(QIODevice *device, const QVector<QImage> &images)
+bool ICOReader::write(QIODevice *device, const QList<QImage> &images)
{
bool retValue = false;
@@ -809,7 +809,7 @@ bool QtIcoHandler::read(QImage *image)
bool QtIcoHandler::write(const QImage &image)
{
QIODevice *device = QImageIOHandler::device();
- QVector<QImage> imgs;
+ QList<QImage> imgs;
imgs.append(image);
return ICOReader::write(device, imgs);
}
diff --git a/src/plugins/imageformats/jpeg/qjpeghandler.cpp b/src/plugins/imageformats/jpeg/qjpeghandler.cpp
index 1b48e8fc90..7574d1ca00 100644
--- a/src/plugins/imageformats/jpeg/qjpeghandler.cpp
+++ b/src/plugins/imageformats/jpeg/qjpeghandler.cpp
@@ -39,14 +39,14 @@
#include "qjpeghandler_p.h"
-#include <qimage.h>
+#include <qbuffer.h>
#include <qcolorspace.h>
#include <qcolortransform.h>
#include <qdebug.h>
-#include <qvariant.h>
-#include <qvector.h>
-#include <qbuffer.h>
+#include <qimage.h>
+#include <qlist.h>
#include <qmath.h>
+#include <qvariant.h>
#include <private/qicc_p.h>
#include <private/qsimd_p.h>
#include <private/qimage_p.h> // for qt_getImageText
@@ -535,7 +535,7 @@ static bool do_write_jpeg_image(struct jpeg_compress_struct &cinfo,
bool progressive)
{
bool success = false;
- const QVector<QRgb> cmap = image.colorTable();
+ const QList<QRgb> cmap = image.colorTable();
if (image.format() == QImage::Format_Invalid || image.format() == QImage::Format_Alpha8)
return false;