summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms/xcb
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/platforms/xcb')
-rw-r--r--src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp6
-rw-r--r--src/plugins/platforms/xcb/nativepainting/qbackingstore_x11.cpp4
-rw-r--r--src/plugins/platforms/xcb/nativepainting/qcolormap_x11.cpp6
-rw-r--r--src/plugins/platforms/xcb/nativepainting/qcolormap_x11_p.h4
-rw-r--r--src/plugins/platforms/xcb/nativepainting/qpaintengine_x11.cpp8
-rw-r--r--src/plugins/platforms/xcb/nativepainting/qpixmap_x11.cpp8
-rw-r--r--src/plugins/platforms/xcb/nativepainting/qxcbnativepainting.cpp4
-rw-r--r--src/plugins/platforms/xcb/nativepainting/qxcbnativepainting.h2
-rw-r--r--src/plugins/platforms/xcb/qxcbclipboard.cpp6
-rw-r--r--src/plugins/platforms/xcb/qxcbconnection.h7
-rw-r--r--src/plugins/platforms/xcb/qxcbconnection_xi2.cpp4
-rw-r--r--src/plugins/platforms/xcb/qxcbdrag.cpp8
-rw-r--r--src/plugins/platforms/xcb/qxcbdrag.h24
-rw-r--r--src/plugins/platforms/xcb/qxcbeventqueue.h4
-rw-r--r--src/plugins/platforms/xcb/qxcbkeyboard.cpp2
-rw-r--r--src/plugins/platforms/xcb/qxcbmime.cpp6
-rw-r--r--src/plugins/platforms/xcb/qxcbmime.h4
-rw-r--r--src/plugins/platforms/xcb/qxcbwindow.cpp12
-rw-r--r--src/plugins/platforms/xcb/qxcbwindow.h2
-rw-r--r--src/plugins/platforms/xcb/qxcbwmsupport.h8
20 files changed, 64 insertions, 65 deletions
diff --git a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp
index feae5fa13c..6318501662 100644
--- a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp
+++ b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp
@@ -261,7 +261,7 @@ QGLXContext::QGLXContext(Display *display, QXcbScreen *screen, const QSurfaceFor
// order from the requested version.
const int requestedVersion = m_format.majorVersion() * 10 + qMin(m_format.minorVersion(), 9);
- QVector<int> glVersions;
+ QList<int> glVersions;
if (m_format.renderableType() == QSurfaceFormat::OpenGL) {
if (requestedVersion > 46)
glVersions << requestedVersion;
@@ -290,7 +290,7 @@ QGLXContext::QGLXContext(Display *display, QXcbScreen *screen, const QSurfaceFor
const int majorVersion = version / 10;
const int minorVersion = version % 10;
- QVector<int> contextAttributes;
+ QList<int> contextAttributes;
contextAttributes << GLX_CONTEXT_MAJOR_VERSION_ARB << majorVersion
<< GLX_CONTEXT_MINOR_VERSION_ARB << minorVersion;
@@ -323,7 +323,7 @@ QGLXContext::QGLXContext(Display *display, QXcbScreen *screen, const QSurfaceFor
}
if (supportsRobustness && m_format.testOption(QSurfaceFormat::ResetNotification)) {
- QVector<int> contextAttributesWithRobustness = contextAttributes;
+ QList<int> contextAttributesWithRobustness = contextAttributes;
contextAttributesWithRobustness << GLX_CONTEXT_RESET_NOTIFICATION_STRATEGY_ARB << GLX_LOSE_CONTEXT_ON_RESET_ARB;
if (supportsVideoMemoryPurge)
contextAttributesWithRobustness << GLX_GENERATE_RESET_ON_VIDEO_MEMORY_PURGE_NV << GL_TRUE;
diff --git a/src/plugins/platforms/xcb/nativepainting/qbackingstore_x11.cpp b/src/plugins/platforms/xcb/nativepainting/qbackingstore_x11.cpp
index bbc156fc53..5193461273 100644
--- a/src/plugins/platforms/xcb/nativepainting/qbackingstore_x11.cpp
+++ b/src/plugins/platforms/xcb/nativepainting/qbackingstore_x11.cpp
@@ -100,7 +100,7 @@ void QXcbNativeBackingStore::flush(QWindow *window, const QRegion &region, const
Window wid = platformWindow->xcb_window();
Pixmap pid = qt_x11PixmapHandle(m_pixmap);
- QVector<XRectangle> clipRects = qt_region_to_xrectangles(clipped);
+ QList<XRectangle> clipRects = qt_region_to_xrectangles(clipped);
#if QT_CONFIG(xrender)
if (m_translucentBackground)
@@ -198,7 +198,7 @@ void QXcbNativeBackingStore::beginPaint(const QRegion &region)
#if QT_CONFIG(xrender)
if (m_translucentBackground) {
- const QVector<XRectangle> xrects = qt_region_to_xrectangles(region);
+ const QList<XRectangle> xrects = qt_region_to_xrectangles(region);
const XRenderColor color = { 0, 0, 0, 0 };
XRenderFillRectangles(display(), PictOpSrc,
qt_x11PictureHandle(m_pixmap), &color,
diff --git a/src/plugins/platforms/xcb/nativepainting/qcolormap_x11.cpp b/src/plugins/platforms/xcb/nativepainting/qcolormap_x11.cpp
index fe9d1fcde9..b4a9d64eb8 100644
--- a/src/plugins/platforms/xcb/nativepainting/qcolormap_x11.cpp
+++ b/src/plugins/platforms/xcb/nativepainting/qcolormap_x11.cpp
@@ -77,8 +77,8 @@ public:
uint g_shift;
uint b_shift;
- QVector<QColor> colors;
- QVector<int> pixels;
+ QList<QColor> colors;
+ QList<int> pixels;
};
static uint right_align(uint v)
@@ -638,7 +638,7 @@ const QColor QXcbColormap::colorAt(uint pixel) const
return QColor(r, g, b);
}
-const QVector<QColor> QXcbColormap::colormap() const
+const QList<QColor> QXcbColormap::colormap() const
{ return d->colors; }
QXcbColormap &QXcbColormap::operator=(const QXcbColormap &colormap)
diff --git a/src/plugins/platforms/xcb/nativepainting/qcolormap_x11_p.h b/src/plugins/platforms/xcb/nativepainting/qcolormap_x11_p.h
index 573a0f28ea..c4070321de 100644
--- a/src/plugins/platforms/xcb/nativepainting/qcolormap_x11_p.h
+++ b/src/plugins/platforms/xcb/nativepainting/qcolormap_x11_p.h
@@ -41,7 +41,7 @@
#define QCOLORMAP_X11_H
#include <QColor>
-#include <QVector>
+#include <QList>
QT_BEGIN_NAMESPACE
@@ -69,7 +69,7 @@ public:
uint pixel(const QColor &color) const;
const QColor colorAt(uint pixel) const;
- const QVector<QColor> colormap() const;
+ const QList<QColor> colormap() const;
private:
QXcbColormap();
diff --git a/src/plugins/platforms/xcb/nativepainting/qpaintengine_x11.cpp b/src/plugins/platforms/xcb/nativepainting/qpaintengine_x11.cpp
index 77d0caf649..ab0f537926 100644
--- a/src/plugins/platforms/xcb/nativepainting/qpaintengine_x11.cpp
+++ b/src/plugins/platforms/xcb/nativepainting/qpaintengine_x11.cpp
@@ -392,7 +392,7 @@ static inline void x11SetClipRegion(Display *dpy, GC gc, GC gc2,
{
// int num;
// XRectangle *rects = (XRectangle *)qt_getClipRects(r, num);
- QVector<XRectangle> rects = qt_region_to_xrectangles(r);
+ QList<XRectangle> rects = qt_region_to_xrectangles(r);
int num = rects.size();
if (gc)
@@ -2129,7 +2129,7 @@ void QX11PaintEngine::drawPixmap(const QRectF &r, const QPixmap &px, const QRect
XSetBackground(d->dpy, cgc, 0);
XSetForeground(d->dpy, cgc, 1);
if (!d->crgn.isEmpty()) {
- QVector<XRectangle> rects = qt_region_to_xrectangles(d->crgn);
+ QList<XRectangle> rects = qt_region_to_xrectangles(d->crgn);
XSetClipRectangles(d->dpy, cgc, -x, -y, rects.data(), rects.size(), Unsorted);
} else if (d->has_clipping) {
XSetClipRectangles(d->dpy, cgc, 0, 0, 0, 0, Unsorted);
@@ -2152,7 +2152,7 @@ void QX11PaintEngine::drawPixmap(const QRectF &r, const QPixmap &px, const QRect
GC cgc = XCreateGC(d->dpy, comb, 0, 0);
XSetForeground(d->dpy, cgc, 0);
XFillRectangle(d->dpy, comb, cgc, 0, 0, sw, sh);
- QVector<XRectangle> rects = qt_region_to_xrectangles(d->crgn);
+ QList<XRectangle> rects = qt_region_to_xrectangles(d->crgn);
XSetClipRectangles(d->dpy, cgc, -x, -y, rects.data(), rects.size(), Unsorted);
XCopyArea(d->dpy, qt_x11PixmapHandle(pixmap), comb, cgc, sx, sy, sw, sh, 0, 0);
XFreeGC(d->dpy, cgc);
@@ -2201,7 +2201,7 @@ void QX11PaintEngine::drawPixmap(const QRectF &r, const QPixmap &px, const QRect
if (restore_clip) {
XSetClipOrigin(d->dpy, d->gc, 0, 0);
- QVector<XRectangle> rects = qt_region_to_xrectangles(d->crgn);
+ QList<XRectangle> rects = qt_region_to_xrectangles(d->crgn);
if (rects.isEmpty())
XSetClipMask(d->dpy, d->gc, XNone);
else
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])
diff --git a/src/plugins/platforms/xcb/nativepainting/qxcbnativepainting.cpp b/src/plugins/platforms/xcb/nativepainting/qxcbnativepainting.cpp
index 6a483fc7e5..3d80b2f48a 100644
--- a/src/plugins/platforms/xcb/nativepainting/qxcbnativepainting.cpp
+++ b/src/plugins/platforms/xcb/nativepainting/qxcbnativepainting.cpp
@@ -110,11 +110,11 @@ void qt_xcb_native_x11_info_init(QXcbConnection *conn)
#endif // QT_CONFIG(xrender)
}
-QVector<XRectangle> qt_region_to_xrectangles(const QRegion &r)
+QList<XRectangle> qt_region_to_xrectangles(const QRegion &r)
{
const int numRects = r.rectCount();
const auto input = r.begin();
- QVector<XRectangle> output(numRects);
+ QList<XRectangle> output(numRects);
for (int i = 0; i < numRects; ++i) {
const QRect &in = input[i];
XRectangle &out = output[i];
diff --git a/src/plugins/platforms/xcb/nativepainting/qxcbnativepainting.h b/src/plugins/platforms/xcb/nativepainting/qxcbnativepainting.h
index b00ccfcdff..7682be8b4a 100644
--- a/src/plugins/platforms/xcb/nativepainting/qxcbnativepainting.h
+++ b/src/plugins/platforms/xcb/nativepainting/qxcbnativepainting.h
@@ -55,7 +55,7 @@ class QXcbConnection;
class QPixmap;
void qt_xcb_native_x11_info_init(QXcbConnection *conn);
-QVector<XRectangle> qt_region_to_xrectangles(const QRegion &r);
+QList<XRectangle> qt_region_to_xrectangles(const QRegion &r);
class QXcbX11InfoData;
class QXcbX11Info
diff --git a/src/plugins/platforms/xcb/qxcbclipboard.cpp b/src/plugins/platforms/xcb/qxcbclipboard.cpp
index e04f2c6665..6d023035f2 100644
--- a/src/plugins/platforms/xcb/qxcbclipboard.cpp
+++ b/src/plugins/platforms/xcb/qxcbclipboard.cpp
@@ -131,7 +131,7 @@ protected:
(void)formats(); // trigger update of format list
- QVector<xcb_atom_t> atoms;
+ QList<xcb_atom_t> atoms;
const xcb_atom_t *targets = (const xcb_atom_t *) format_atoms.data();
int size = format_atoms.size() / sizeof(xcb_atom_t);
atoms.reserve(size);
@@ -445,10 +445,10 @@ xcb_window_t QXcbClipboard::owner() const
xcb_atom_t QXcbClipboard::sendTargetsSelection(QMimeData *d, xcb_window_t window, xcb_atom_t property)
{
- QVector<xcb_atom_t> types;
+ QList<xcb_atom_t> types;
QStringList formats = QInternalMimeData::formatsHelper(d);
for (int i = 0; i < formats.size(); ++i) {
- QVector<xcb_atom_t> atoms = QXcbMime::mimeAtomsForFormat(connection(), formats.at(i));
+ QList<xcb_atom_t> atoms = QXcbMime::mimeAtomsForFormat(connection(), formats.at(i));
for (int j = 0; j < atoms.size(); ++j) {
if (!types.contains(atoms.at(j)))
types.append(atoms.at(j));
diff --git a/src/plugins/platforms/xcb/qxcbconnection.h b/src/plugins/platforms/xcb/qxcbconnection.h
index e6feabf79e..a097604643 100644
--- a/src/plugins/platforms/xcb/qxcbconnection.h
+++ b/src/plugins/platforms/xcb/qxcbconnection.h
@@ -49,7 +49,6 @@
#include "qxcbexport.h"
#include <QHash>
#include <QList>
-#include <QVector>
#include <qpa/qwindowsysteminterface.h>
#include <QtCore/QLoggingCategory>
#include <QtCore/private/qglobal_p.h>
@@ -277,7 +276,7 @@ private:
int number = -1;
QXcbAtom::Atom label;
};
- QVector<ValuatorClassInfo> valuatorInfo;
+ QList<ValuatorClassInfo> valuatorInfo;
// Stuff that is relevant only for touchpads
QPointF firstPressedPosition; // in screen coordinates where the first point was pressed
@@ -313,7 +312,7 @@ private:
friend class QTypeInfo<TabletData::ValuatorClassInfo>;
bool xi2HandleTabletEvent(const void *event, TabletData *tabletData);
void xi2ReportTabletEvent(const void *event, TabletData *tabletData);
- QVector<TabletData> m_tabletData;
+ QList<TabletData> m_tabletData;
TabletData *tabletDataForDevice(int id);
#endif // QT_CONFIG(tabletevent)
// TODO get rid of this: store a smaller struct in QPointingDevicePrivate::extra
@@ -378,7 +377,7 @@ private:
mutable QXcbGlIntegration *m_glIntegration = nullptr;
mutable bool m_glIntegrationInitialized = false;
bool m_xiGrab = false;
- QVector<int> m_xiMasterPointerIds;
+ QList<int> m_xiMasterPointerIds;
xcb_window_t m_qtSelectionOwner = 0;
diff --git a/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp b/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
index d93cbc2822..d50c3c6e8c 100644
--- a/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
+++ b/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
@@ -572,7 +572,7 @@ void QXcbConnection::xi2SelectDeviceEventsCompatibility(xcb_window_t window)
QSet<int> tabletDevices;
if (!m_tabletData.isEmpty()) {
const int nrTablets = m_tabletData.count();
- QVector<qt_xcb_input_event_mask_t> xiEventMask(nrTablets);
+ QList<qt_xcb_input_event_mask_t> xiEventMask(nrTablets);
for (int i = 0; i < nrTablets; ++i) {
int deviceId = m_tabletData.at(i).deviceId;
tabletDevices.insert(deviceId);
@@ -585,7 +585,7 @@ void QXcbConnection::xi2SelectDeviceEventsCompatibility(xcb_window_t window)
#endif
if (!m_scrollingDevices.isEmpty()) {
- QVector<qt_xcb_input_event_mask_t> xiEventMask(m_scrollingDevices.size());
+ QList<qt_xcb_input_event_mask_t> xiEventMask(m_scrollingDevices.size());
int i = 0;
for (const ScrollingDevice& scrollingDevice : qAsConst(m_scrollingDevices)) {
#if QT_CONFIG(tabletevent)
diff --git a/src/plugins/platforms/xcb/qxcbdrag.cpp b/src/plugins/platforms/xcb/qxcbdrag.cpp
index ab4acbe727..3e24027e51 100644
--- a/src/plugins/platforms/xcb/qxcbdrag.cpp
+++ b/src/plugins/platforms/xcb/qxcbdrag.cpp
@@ -182,7 +182,7 @@ void QXcbDrag::startDrag()
QStringList fmts = QXcbMime::formatsHelper(drag()->mimeData());
for (int i = 0; i < fmts.size(); ++i) {
- QVector<xcb_atom_t> atoms = QXcbMime::mimeAtomsForFormat(connection(), fmts.at(i));
+ QList<xcb_atom_t> atoms = QXcbMime::mimeAtomsForFormat(connection(), fmts.at(i));
for (int j = 0; j < atoms.size(); ++j) {
if (!drag_types.contains(atoms.at(j)))
drag_types.append(atoms.at(j));
@@ -580,7 +580,7 @@ Qt::DropAction QXcbDrag::toDropAction(xcb_atom_t a) const
return Qt::CopyAction;
}
-Qt::DropActions QXcbDrag::toDropActions(const QVector<xcb_atom_t> &atoms) const
+Qt::DropActions QXcbDrag::toDropActions(const QList<xcb_atom_t> &atoms) const
{
Qt::DropActions actions;
for (const auto actionAtom : atoms) {
@@ -625,7 +625,7 @@ void QXcbDrag::readActionList()
void QXcbDrag::setActionList(Qt::DropAction requestedAction, Qt::DropActions supportedActions)
{
#ifndef QT_NO_CLIPBOARD
- QVector<xcb_atom_t> actions;
+ QList<xcb_atom_t> actions;
if (requestedAction != Qt::IgnoreAction)
actions.append(toXdndAction(requestedAction));
@@ -1361,7 +1361,7 @@ QVariant QXcbDropData::xdndObtainData(const QByteArray &format, QMetaType::Type
return result;
}
- QVector<xcb_atom_t> atoms = drag->xdnd_types;
+ QList<xcb_atom_t> atoms = drag->xdnd_types;
bool hasUtf8 = false;
xcb_atom_t a = mimeAtomForFormat(c, QLatin1String(format), requestedType, atoms, &hasUtf8);
if (a == XCB_NONE)
diff --git a/src/plugins/platforms/xcb/qxcbdrag.h b/src/plugins/platforms/xcb/qxcbdrag.h
index 0d16afc47e..257e82f049 100644
--- a/src/plugins/platforms/xcb/qxcbdrag.h
+++ b/src/plugins/platforms/xcb/qxcbdrag.h
@@ -42,16 +42,16 @@
#include <qpa/qplatformdrag.h>
#include <private/qsimpledrag_p.h>
-#include <qxcbobject.h>
#include <xcb/xcb.h>
+#include <qbackingstore.h>
+#include <qdatetime.h>
+#include <qlist.h>
+#include <qpixmap.h>
#include <qpoint.h>
+#include <qpointer.h>
#include <qrect.h>
#include <qsharedpointer.h>
-#include <qpointer.h>
-#include <qvector.h>
-#include <qdatetime.h>
-#include <qpixmap.h>
-#include <qbackingstore.h>
+#include <qxcbobject.h>
#include <QtCore/QDebug>
@@ -118,7 +118,7 @@ private:
void send_leave();
Qt::DropAction toDropAction(xcb_atom_t atom) const;
- Qt::DropActions toDropActions(const QVector<xcb_atom_t> &atoms) const;
+ Qt::DropActions toDropActions(const QList<xcb_atom_t> &atoms) const;
xcb_atom_t toXdndAction(Qt::DropAction a) const;
void readActionList();
@@ -139,7 +139,7 @@ private:
// the types in this drop. 100 is no good, but at least it's big.
enum { xdnd_max_type = 100 };
- QVector<xcb_atom_t> xdnd_types;
+ QList<xcb_atom_t> xdnd_types;
// timestamp from XdndPosition and XdndDroptime for retrieving the data
xcb_timestamp_t target_time;
@@ -167,10 +167,10 @@ private:
enum { XdndDropTransactionTimeout = 600000 };
int cleanup_timer;
- QVector<xcb_atom_t> drag_types;
+ QList<xcb_atom_t> drag_types;
- QVector<xcb_atom_t> current_actions;
- QVector<xcb_atom_t> drop_actions;
+ QList<xcb_atom_t> current_actions;
+ QList<xcb_atom_t> drop_actions;
struct Transaction
{
@@ -183,7 +183,7 @@ private:
QTime time;
};
friend class QTypeInfo<Transaction>;
- QVector<Transaction> transactions;
+ QList<Transaction> transactions;
int transaction_expiry_timer;
void restartDropExpiryTimer();
diff --git a/src/plugins/platforms/xcb/qxcbeventqueue.h b/src/plugins/platforms/xcb/qxcbeventqueue.h
index e7327b3fd6..4763b57ecb 100644
--- a/src/plugins/platforms/xcb/qxcbeventqueue.h
+++ b/src/plugins/platforms/xcb/qxcbeventqueue.h
@@ -42,7 +42,7 @@
#include <QtCore/QThread>
#include <QtCore/QHash>
#include <QtCore/QEventLoop>
-#include <QtCore/QVector>
+#include <QtCore/QList>
#include <QtCore/QMutex>
#include <QtCore/QWaitCondition>
@@ -132,7 +132,7 @@ private:
bool m_peekerIndexCacheDirty = false;
QHash<qint32, QXcbEventNode *> m_peekerToNode;
- QVector<xcb_generic_event_t *> m_inputEvents;
+ QList<xcb_generic_event_t *> m_inputEvents;
// debug stats
quint64 m_nodesOnHeap = 0;
diff --git a/src/plugins/platforms/xcb/qxcbkeyboard.cpp b/src/plugins/platforms/xcb/qxcbkeyboard.cpp
index e8286381a2..9ab804ca1b 100644
--- a/src/plugins/platforms/xcb/qxcbkeyboard.cpp
+++ b/src/plugins/platforms/xcb/qxcbkeyboard.cpp
@@ -223,7 +223,7 @@ struct xkb_keymap *QXcbKeyboard::keymapFromCore(const KeysymModifierMap &keysymM
// Generate mapping between symbolic names and keysyms
{
- QVector<xcb_keysym_t> xkeymap;
+ QList<xcb_keysym_t> xkeymap;
int keysymsPerKeycode = 0;
{
int keycodeCount = maxKeycode - minKeycode + 1;
diff --git a/src/plugins/platforms/xcb/qxcbmime.cpp b/src/plugins/platforms/xcb/qxcbmime.cpp
index e761b066ad..bb168b9b00 100644
--- a/src/plugins/platforms/xcb/qxcbmime.cpp
+++ b/src/plugins/platforms/xcb/qxcbmime.cpp
@@ -129,9 +129,9 @@ bool QXcbMime::mimeDataForAtom(QXcbConnection *connection, xcb_atom_t a, QMimeDa
return ret;
}
-QVector<xcb_atom_t> QXcbMime::mimeAtomsForFormat(QXcbConnection *connection, const QString &format)
+QList<xcb_atom_t> QXcbMime::mimeAtomsForFormat(QXcbConnection *connection, const QString &format)
{
- QVector<xcb_atom_t> atoms;
+ QList<xcb_atom_t> atoms;
atoms.reserve(7);
atoms.append(connection->internAtom(format.toLatin1()));
@@ -256,7 +256,7 @@ QVariant QXcbMime::mimeConvertToFormat(QXcbConnection *connection, xcb_atom_t a,
}
xcb_atom_t QXcbMime::mimeAtomForFormat(QXcbConnection *connection, const QString &format, QMetaType::Type requestedType,
- const QVector<xcb_atom_t> &atoms, bool *hasUtf8)
+ const QList<xcb_atom_t> &atoms, bool *hasUtf8)
{
*hasUtf8 = false;
diff --git a/src/plugins/platforms/xcb/qxcbmime.h b/src/plugins/platforms/xcb/qxcbmime.h
index cd6161a08b..d348bae77e 100644
--- a/src/plugins/platforms/xcb/qxcbmime.h
+++ b/src/plugins/platforms/xcb/qxcbmime.h
@@ -55,14 +55,14 @@ public:
QXcbMime();
~QXcbMime();
- static QVector<xcb_atom_t> mimeAtomsForFormat(QXcbConnection *connection, const QString &format);
+ static QList<xcb_atom_t> mimeAtomsForFormat(QXcbConnection *connection, const QString &format);
static QString mimeAtomToString(QXcbConnection *connection, xcb_atom_t a);
static bool mimeDataForAtom(QXcbConnection *connection, xcb_atom_t a, QMimeData *mimeData, QByteArray *data,
xcb_atom_t *atomFormat, int *dataFormat);
static QVariant mimeConvertToFormat(QXcbConnection *connection, xcb_atom_t a, const QByteArray &data, const QString &format,
QMetaType::Type requestedType, bool hasUtf8);
static xcb_atom_t mimeAtomForFormat(QXcbConnection *connection, const QString &format, QMetaType::Type requestedType,
- const QVector<xcb_atom_t> &atoms, bool *hasUtf8);
+ const QList<xcb_atom_t> &atoms, bool *hasUtf8);
};
QT_END_NAMESPACE
diff --git a/src/plugins/platforms/xcb/qxcbwindow.cpp b/src/plugins/platforms/xcb/qxcbwindow.cpp
index af12f20104..c29e18529c 100644
--- a/src/plugins/platforms/xcb/qxcbwindow.cpp
+++ b/src/plugins/platforms/xcb/qxcbwindow.cpp
@@ -632,7 +632,7 @@ QMargins QXcbWindow::frameMargins() const
bool foundRoot = false;
- const QVector<xcb_window_t> &virtualRoots =
+ const QList<xcb_window_t> &virtualRoots =
connection()->wmSupport()->virtualRoots();
while (!foundRoot) {
@@ -1086,7 +1086,7 @@ void QXcbWindow::setNetWmStateOnUnmappedWindow()
// we first read it and then merge our hints with the existing values, allowing a user
// to set custom hints.
- QVector<xcb_atom_t> atoms;
+ QList<xcb_atom_t> atoms;
auto reply = Q_XCB_REPLY_UNCHECKED(xcb_get_property, xcb_connection(),
0, m_window, atom(QXcbAtom::_NET_WM_STATE),
XCB_ATOM_ATOM, 0, 1024);
@@ -1293,7 +1293,7 @@ void QXcbWindow::setWindowIconText(const QString &title)
void QXcbWindow::setWindowIcon(const QIcon &icon)
{
- QVector<quint32> icon_data;
+ QList<quint32> icon_data;
if (!icon.isNull()) {
QList<QSize> availableSizes = icon.availableSizes();
if (availableSizes.isEmpty()) {
@@ -1542,7 +1542,7 @@ QXcbWindowFunctions::WmWindowTypes QXcbWindow::wmWindowTypes() const
void QXcbWindow::setWmWindowType(QXcbWindowFunctions::WmWindowTypes types, Qt::WindowFlags flags)
{
- QVector<xcb_atom_t> atoms;
+ QList<xcb_atom_t> atoms;
// manual selection 1 (these are never set by Qt and take precedence)
if (types & QXcbWindowFunctions::Normal)
@@ -2526,9 +2526,9 @@ void QXcbWindow::setOpacity(qreal level)
(uchar *)&value);
}
-QVector<xcb_rectangle_t> qRegionToXcbRectangleList(const QRegion &region)
+QList<xcb_rectangle_t> qRegionToXcbRectangleList(const QRegion &region)
{
- QVector<xcb_rectangle_t> rects;
+ QList<xcb_rectangle_t> rects;
rects.reserve(region.rectCount());
for (const QRect &r : region)
rects.push_back(qRectToXCBRectangle(r));
diff --git a/src/plugins/platforms/xcb/qxcbwindow.h b/src/plugins/platforms/xcb/qxcbwindow.h
index a5803939fb..258ee3fe95 100644
--- a/src/plugins/platforms/xcb/qxcbwindow.h
+++ b/src/plugins/platforms/xcb/qxcbwindow.h
@@ -296,7 +296,7 @@ protected:
void create() override {} // No-op
};
-QVector<xcb_rectangle_t> qRegionToXcbRectangleList(const QRegion &region);
+QList<xcb_rectangle_t> qRegionToXcbRectangleList(const QRegion &region);
QT_END_NAMESPACE
diff --git a/src/plugins/platforms/xcb/qxcbwmsupport.h b/src/plugins/platforms/xcb/qxcbwmsupport.h
index b5de5b7e5b..24b3fde16a 100644
--- a/src/plugins/platforms/xcb/qxcbwmsupport.h
+++ b/src/plugins/platforms/xcb/qxcbwmsupport.h
@@ -41,7 +41,7 @@
#include "qxcbobject.h"
#include "qxcbconnection.h"
-#include <qvector.h>
+#include <qlist.h>
QT_BEGIN_NAMESPACE
@@ -52,15 +52,15 @@ public:
bool isSupportedByWM(xcb_atom_t atom) const;
- const QVector<xcb_window_t> &virtualRoots() const { return net_virtual_roots; }
+ const QList<xcb_window_t> &virtualRoots() const { return net_virtual_roots; }
private:
friend class QXcbConnection;
void updateNetWMAtoms();
void updateVirtualRoots();
- QVector<xcb_atom_t> net_wm_atoms;
- QVector<xcb_window_t> net_virtual_roots;
+ QList<xcb_atom_t> net_wm_atoms;
+ QList<xcb_window_t> net_virtual_roots;
};
QT_END_NAMESPACE