diff options
| author | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-07-06 12:34:58 +0200 |
|---|---|---|
| committer | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-07-06 13:43:20 +0200 |
| commit | 1e25b81e0d6c1da4643c9cc48680f5cc4399d068 (patch) | |
| tree | 39f7a70e11b6b14382673167b6e183f70e3dc6c5 /src/plugins/platforms/xcb/nativepainting/qpixmap_x11.cpp | |
| parent | 23b7e7972ea40afd2594d0570cbcf8192619cd56 (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/platforms/xcb/nativepainting/qpixmap_x11.cpp')
| -rw-r--r-- | src/plugins/platforms/xcb/nativepainting/qpixmap_x11.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/platforms/xcb/nativepainting/qpixmap_x11.cpp b/src/plugins/platforms/xcb/nativepainting/qpixmap_x11.cpp index 467e93e64f..d55a49768c 100644 --- a/src/plugins/platforms/xcb/nativepainting/qpixmap_x11.cpp +++ b/src/plugins/platforms/xcb/nativepainting/qpixmap_x11.cpp @@ -573,7 +573,7 @@ void QX11PlatformPixmap::fromImage(const QImage &img, Qt::ImageConversionFlags f switch (cimage.format()) { case QImage::Format_Indexed8: { - QVector<QRgb> colorTable = cimage.colorTable(); + QList<QRgb> colorTable = cimage.colorTable(); uint *xidata = (uint *)xi->data; for (int y = 0; y < h; ++y) { const uchar *p = cimage.scanLine(y); @@ -676,7 +676,7 @@ void QX11PlatformPixmap::fromImage(const QImage &img, Qt::ImageConversionFlags f const uint bbits = highest_bit(blue_mask) - lowest_bit(blue_mask) + 1; if (d8) { // setup pixel translation - QVector<QRgb> ctable = cimage.colorTable(); + QList<QRgb> ctable = cimage.colorTable(); for (int i=0; i < cimage.colorCount(); i++) { int r = qRed (ctable[i]); int g = qGreen(ctable[i]); @@ -1061,7 +1061,7 @@ void QX11PlatformPixmap::fromImage(const QImage &img, Qt::ImageConversionFlags f int maxpop = 0; int maxpix = 0; uint j = 0; - QVector<QRgb> ctable = cimage.colorTable(); + QList<QRgb> ctable = cimage.colorTable(); for (int i = 0; i < 256; i++) { // init pixel array if (pop[i] > 0) { px->r = qRed (ctable[i]); @@ -2114,7 +2114,7 @@ QImage QX11PlatformPixmap::toImage(const QXImageWrapper &xiWrapper, const QRect } else { image.setColorCount(ncols); // create color table } - QVector<QColor> colors = QXcbColormap::instance(xinfo.screen()).colormap(); + QList<QColor> colors = QXcbColormap::instance(xinfo.screen()).colormap(); int j = 0; for (int i=0; i<colors.size(); i++) { // translate pixels if (use[i]) |