whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use QList instead of QVector in gui 

Applied to headers only. Source file to be changed separately.

Task-number: QTBUG-84469
Change-Id: Ic08a899321eaffc46b8461aaee3dbaa4d2c727a9
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
bb10
Jarek Kobus 2020-06-22 11:44:14 +02:00
parent c70c4e4266
commit 9fa3cf15c8
78 changed files with 420 additions and 410 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/gui/accessible/qaccessible.h
View File

@ -46,10 +46,10 @@
#include <QtCore/qcoreapplication.h>
#include <QtCore/qdebug.h>
#include <QtCore/qglobal.h>
#include <QtCore/qlist.h>
#include <QtCore/qobject.h>
#include <QtCore/qrect.h>
#include <QtCore/qset.h>
#include <QtCore/qvector.h>
#include <QtCore/qvariant.h>
#include <QtGui/qcolor.h>
#include <QtGui/qevent.h>
@ -463,7 +463,8 @@ public:
virtual QWindow *window() const;
// relations
virtual QVector<QPair<QAccessibleInterface*, QAccessible::Relation> > relations(QAccessible::Relation match = QAccessible::AllRelations) const;
virtual QList<QPair<QAccessibleInterface *, QAccessible::Relation>>
relations(QAccessible::Relation match = QAccessible::AllRelations) const;
virtual QAccessibleInterface *focusChild() const;
virtual QAccessibleInterface *childAt(int x, int y) const = 0;

2
src/gui/image/qicon_p.h
View File

@ -127,7 +127,7 @@ public:
private:
QPixmapIconEngineEntry *tryMatch(const QSize &size, QIcon::Mode mode, QIcon::State state);
QVector<QPixmapIconEngineEntry> pixmaps;
QList<QPixmapIconEngineEntry> pixmaps;
friend Q_GUI_EXPORT QDataStream &operator<<(QDataStream &s, const QIcon &icon);
friend class QIconThemeEngine;

8
src/gui/image/qiconloader_p.h
View File

@ -60,7 +60,7 @@
#include <private/qicon_p.h>
#include <private/qfactoryloader_p.h>
#include <QtCore/QHash>
#include <QtCore/QVector>
#include <QtCore/QList>
#include <QtCore/QTypeInfo>
QT_BEGIN_NAMESPACE
@ -156,16 +156,16 @@ public:
QIconTheme(const QString &name);
QIconTheme() : m_valid(false) {}
QStringList parents() { return m_parents; }
QVector<QIconDirInfo> keyList() { return m_keyList; }
QList<QIconDirInfo> keyList() { return m_keyList; }
QStringList contentDirs() { return m_contentDirs; }
bool isValid() { return m_valid; }
private:
QStringList m_contentDirs;
QVector<QIconDirInfo> m_keyList;
QList<QIconDirInfo> m_keyList;
QStringList m_parents;
bool m_valid;
public:
QVector<QSharedPointer<QIconCacheGtkReader>> m_gtkCaches;
QList<QSharedPointer<QIconCacheGtkReader>> m_gtkCaches;
};
class Q_GUI_EXPORT QIconLoader

7
src/gui/image/qimage.h
View File

@ -166,7 +166,8 @@ public:
else
return convertToFormat_helper(f, flags);
}
Q_REQUIRED_RESULT QImage convertToFormat(Format f, const QVector<QRgb> &colorTable, Qt::ImageConversionFlags flags = Qt::AutoColor) const;
Q_REQUIRED_RESULT QImage convertToFormat(Format f, const QList<QRgb> &colorTable,
Qt::ImageConversionFlags flags = Qt::AutoColor) const;
bool reinterpretAsFormat(Format f);
void convertTo(Format f, Qt::ImageConversionFlags flags = Qt::AutoColor);
@ -216,8 +217,8 @@ public:
void setPixelColor(int x, int y, const QColor &c);
void setPixelColor(const QPoint &pt, const QColor &c);
QVector<QRgb> colorTable() const;
void setColorTable(const QVector<QRgb> &colors);
QList<QRgb> colorTable() const;
void setColorTable(const QList<QRgb> &colors);
qreal devicePixelRatio() const;
void setDevicePixelRatio(qreal scaleFactor);

9
src/gui/image/qimage_p.h
View File

@ -51,13 +51,12 @@
// We mean it.
//
#include <QtGui/qcolorspace.h>
#include <QtGui/private/qtguiglobal_p.h>
#include <QtGui/qcolorspace.h>
#include <QtGui/qimage.h>
#include <QtCore/private/qnumeric_p.h>
#include <QMap>
#include <QVector>
#include <QtCore/qlist.h>
#include <QtCore/qmap.h>
QT_BEGIN_NAMESPACE
@ -79,7 +78,7 @@ struct Q_GUI_EXPORT QImageData { // internal image data
int depth;
qsizetype nbytes; // number of bytes data
qreal devicePixelRatio;
QVector<QRgb> colortable;
QList<QRgb> colortable;
uchar *data;
QImage::Format format;
qsizetype bytes_per_line;

8
src/gui/image/qpicture_p.h
View File

@ -54,13 +54,13 @@
#include <QtGui/private/qtguiglobal_p.h>
#include "QtCore/qatomic.h"
#include "QtCore/qbuffer.h"
#include "QtCore/qlist.h"
#include "QtCore/qobjectdefs.h"
#include "QtCore/qvector.h"
#include "QtCore/qrect.h"
#include "QtGui/qpicture.h"
#include "QtGui/qpixmap.h"
#include "QtGui/qpen.h"
#include "QtGui/qbrush.h"
#include "QtCore/qrect.h"
#include "private/qobject_p.h"
QT_BEGIN_NAMESPACE
@ -158,8 +158,8 @@ public:
QRect override_rect;
QScopedPointer<QPaintEngine> paintEngine;
bool in_memory_only;
QVector<QImage> image_list;
QVector<QPixmap> pixmap_list;
QList<QImage> image_list;
QList<QPixmap> pixmap_list;
QList<QBrush> brush_list;
QList<QPen> pen_list;
};

11
src/gui/itemmodels/qstandarditemmodel_p.h
View File

@ -58,7 +58,6 @@
#include <QtCore/qpair.h>
#include <QtCore/qstack.h>
#include <QtCore/qvariant.h>
#include <QtCore/qvector.h>
#include <QtCore/qdebug.h>
QT_REQUIRE_CONFIG(standarditemmodel);
@ -191,8 +190,8 @@ public:
QStandardItemModel *model;
QStandardItem *parent;
QVector<QStandardItemData> values;
QVector<QStandardItem*> children;
QList<QStandardItemData> values;
QList<QStandardItem *> children;
int rows;
int columns;
@ -228,7 +227,7 @@ public:
}
void sort(QStandardItem *parent, int column, Qt::SortOrder order);
void itemChanged(QStandardItem *item, const QVector<int> &roles = QVector<int>());
void itemChanged(QStandardItem *item, const QList<int> &roles = QList<int>());
void rowsAboutToBeInserted(QStandardItem *parent, int start, int end);
void columnsAboutToBeInserted(QStandardItem *parent, int start, int end);
void rowsAboutToBeRemoved(QStandardItem *parent, int start, int end);
@ -243,8 +242,8 @@ public:
void decodeDataRecursive(QDataStream &stream, QStandardItem *item);
QVector<QStandardItem*> columnHeaderItems;
QVector<QStandardItem*> rowHeaderItems;
QList<QStandardItem *> columnHeaderItems;
QList<QStandardItem *> rowHeaderItems;
QHash<int, QByteArray> roleNames;
QScopedPointer<QStandardItem> root;
const QStandardItem *itemPrototype;

2
src/gui/kernel/qaction.h
View File

@ -102,7 +102,7 @@ public:
~QAction();
QVector<QObject *> associatedObjects() const;
QList<QObject *> associatedObjects() const;
#if QT_DEPRECATED_SINCE(6,0)
#ifdef Q_CLANG_QDOC

2
src/gui/kernel/qaction_p.h
View File

@ -104,7 +104,7 @@ public:
#if QT_CONFIG(shortcut)
int shortcutId = 0;
QVector<int> alternateShortcutIds;
QList<int> alternateShortcutIds;
Qt::ShortcutContext shortcutContext = Qt::WindowShortcut;
uint autorepeat : 1;
#endif

10
src/gui/kernel/qevent.h
View File

@ -44,11 +44,11 @@
#include <QtCore/qcoreevent.h>
#include <QtCore/qiodevice.h>
#include <QtCore/qlist.h>
#include <QtCore/qnamespace.h>
#include <QtCore/qstring.h>
#include <QtCore/qvariant.h>
#include <QtCore/qvector.h>
#include <QtCore/qurl.h>
#include <QtCore/qvariant.h>
#include <QtGui/qpointingdevice.h>
#include <QtGui/qregion.h>
#include <QtGui/qvector2d.h>
@ -607,7 +607,7 @@ private:
QVariant value;
};
friend QTypeInfo<QueryPair>;
QVector<QueryPair> m_values;
QList<QueryPair> m_values;
};
Q_DECLARE_TYPEINFO(QInputMethodQueryEvent::QueryPair, Q_MOVABLE_TYPE);
@ -902,7 +902,7 @@ public:
QVector2D velocity() const;
InfoFlags flags() const;
QVector<QPointF> rawScreenPositions() const;
QList<QPointF> rawScreenPositions() const;
// internal
// ### Qt 6: move private, rename appropriately, only friends can call them
@ -927,7 +927,7 @@ public:
void setEllipseDiameters(const QSizeF &dia);
void setVelocity(const QVector2D &v);
void setFlags(InfoFlags flags);
void setRawScreenPositions(const QVector<QPointF> &positions);
void setRawScreenPositions(const QList<QPointF> &positions);
#endif // QT_DEPRECATED_SINCE(6, 0)
private:

2
src/gui/kernel/qevent_p.h
View File

@ -93,7 +93,7 @@ public:
QVector2D velocity;
QTouchEvent::TouchPoint::InfoFlags flags;
bool stationaryWithModifiedProperty : 1;
QVector<QPointF> rawScreenPositions;
QList<QPointF> rawScreenPositions;
};
QT_END_NAMESPACE

2
src/gui/kernel/qguiapplication_p.h
View File

@ -244,7 +244,7 @@ public:
Qt::MouseButtons state;
QWindow *target;
};
static QVector<TabletPointData> tabletDevicePoints;
static QList<TabletPointData> tabletDevicePoints;
static TabletPointData &tabletDevicePoint(qint64 deviceId);
#ifndef QT_NO_CLIPBOARD

10
src/gui/kernel/qhighdpiscaling_p.h
View File

@ -52,11 +52,11 @@
//
#include <QtGui/private/qtguiglobal_p.h>
#include <QtCore/qlist.h>
#include <QtCore/qloggingcategory.h>
#include <QtCore/qmargins.h>
#include <QtCore/qmath.h>
#include <QtCore/qrect.h>
#include <QtCore/qvector.h>
#include <QtCore/qloggingcategory.h>
#include <QtGui/qregion.h>
#include <QtGui/qscreen.h>
#include <QtGui/qvector2d.h>
@ -184,13 +184,13 @@ inline QMargins scale(const QMargins &margins, qreal scaleFactor, QPoint origin
qRound(qreal(margins.right()) * scaleFactor), qRound(qreal(margins.bottom()) * scaleFactor));
}
template <typename T>
QVector<T> scale(const QVector<T> &vector, qreal scaleFactor, QPoint origin = QPoint(0, 0))
template<typename T>
QList<T> scale(const QList<T> &vector, qreal scaleFactor, QPoint origin = QPoint(0, 0))
{
if (!QHighDpiScaling::isActive())
return vector;
QVector<T> scaled;
QList<T> scaled;
scaled.reserve(vector.size());
for (const T &item : vector)
scaled.append(scale(item, scaleFactor, origin));

2
src/gui/kernel/qplatformdialoghelper.h
View File

@ -482,7 +482,7 @@ public:
int addButton(const QString &label, QPlatformDialogHelper::ButtonRole role,
void *buttonImpl = nullptr);
void removeButton(int id);
const QVector<CustomButton> &customButtons();
const QList<CustomButton> &customButtons();
const CustomButton *customButton(int id);
private:

2
src/gui/kernel/qplatformscreen.h
View File

@ -150,7 +150,7 @@ public:
virtual PowerState powerState() const;
virtual void setPowerState(PowerState state);
virtual QVector<Mode> modes() const;
virtual QList<Mode> modes() const;
virtual int currentMode() const;
virtual int preferredMode() const;

21
src/gui/kernel/qplatformsharedgraphicscache.h
View File

@ -74,11 +74,10 @@ public:
virtual void beginRequestBatch() = 0;
virtual void ensureCacheInitialized(const QByteArray &cacheId, BufferType bufferType,
PixelFormat pixelFormat) = 0;
virtual void requestItems(const QByteArray &cacheId, const QVector<quint32> &itemIds) = 0;
virtual void insertItems(const QByteArray &cacheId,
const QVector<quint32> &itemIds,
const QVector<QImage> &items) = 0;
virtual void releaseItems(const QByteArray &cacheId, const QVector<quint32> &itemIds) = 0;
virtual void requestItems(const QByteArray &cacheId, const QList<quint32> &itemIds) = 0;
virtual void insertItems(const QByteArray &cacheId, const QList<quint32> &itemIds,
const QList<QImage> &items) = 0;
virtual void releaseItems(const QByteArray &cacheId, const QList<quint32> &itemIds) = 0;
virtual void endRequestBatch() = 0;
virtual bool requestBatchStarted() const = 0;
@ -90,12 +89,12 @@ public:
virtual void *eglImageForBuffer(void *bufferId) = 0;
Q_SIGNALS:
void itemsMissing(const QByteArray &cacheId, const QVector<quint32> &itemIds);
void itemsAvailable(const QByteArray &cacheId, void *bufferId,
const QVector<quint32> &itemIds, const QVector<QPoint> &positionsInBuffer);
void itemsInvalidated(const QByteArray &cacheId, const QVector<quint32> &itemIds);
void itemsUpdated(const QByteArray &cacheId, void *bufferId,
const QVector<quint32> &itemIds, const QVector<QPoint> &positionsInBuffer);
void itemsMissing(const QByteArray &cacheId, const QList<quint32> &itemIds);
void itemsAvailable(const QByteArray &cacheId, void *bufferId, const QList<quint32> &itemIds,
const QList<QPoint> &positionsInBuffer);
void itemsInvalidated(const QByteArray &cacheId, const QList<quint32> &itemIds);
void itemsUpdated(const QByteArray &cacheId, void *bufferId, const QList<quint32> &itemIds,
const QList<QPoint> &positionsInBuffer);
};
QT_END_NAMESPACE

8
src/gui/kernel/qshortcutmap_p.h
View File

@ -53,7 +53,7 @@
#include <QtGui/private/qtguiglobal_p.h>
#include "QtGui/qkeysequence.h"
#include "QtCore/qvector.h"
#include "QtCore/qlist.h"
#include "QtCore/qscopedpointer.h"
QT_REQUIRE_CONFIG(shortcut);
@ -98,9 +98,9 @@ private:
QKeySequence::SequenceMatch find(QKeyEvent *e, int ignoredModifiers = 0);
QKeySequence::SequenceMatch matches(const QKeySequence &seq1, const QKeySequence &seq2) const;
QVector<const QShortcutEntry *> matches() const;
void createNewSequences(QKeyEvent *e, QVector<QKeySequence> &ksl, int ignoredModifiers);
void clearSequence(QVector<QKeySequence> &ksl);
QList<const QShortcutEntry *> matches() const;
void createNewSequences(QKeyEvent *e, QList<QKeySequence> &ksl, int ignoredModifiers);
void clearSequence(QList<QKeySequence> &ksl);
int translateModifiers(Qt::KeyboardModifiers modifiers);
QScopedPointer<QShortcutMapPrivate> d_ptr;

2
src/gui/kernel/qwindowsysteminterface.h
View File

@ -169,7 +169,7 @@ public:
Qt::TouchPointState state; //Qt::TouchPoint{Pressed|Moved|Stationary|Released}
QVector2D velocity; // in screen coordinate system, pixels / seconds
QTouchEvent::TouchPoint::InfoFlags flags;
QVector<QPointF> rawPositions; // in screen coordinates
QList<QPointF> rawPositions; // in screen coordinates
};
static void registerInputDevice(const QInputDevice *device);

2
src/gui/opengl/qopenglprogrambinarycache_p.h
View File

@ -78,7 +78,7 @@ public:
QByteArray source;
};
struct Q_GUI_EXPORT ProgramDesc {
QVector<ShaderDesc> shaders;
QList<ShaderDesc> shaders;
QByteArray cacheKey() const;
};

5
src/gui/painting/qbezier_p.h
View File

@ -52,12 +52,11 @@
//
#include <QtGui/private/qtguiglobal_p.h>
#include "QtCore/qpoint.h"
#include "QtCore/qline.h"
#include "QtCore/qrect.h"
#include "QtCore/qvector.h"
#include "QtCore/qlist.h"
#include "QtCore/qpair.h"
#include "QtCore/qpoint.h"
#include "QtCore/qrect.h"
#include "QtGui/qtransform.h"
#include <private/qdatabuffer_p.h>

6
src/gui/painting/qbrush.h
View File

@ -41,14 +41,14 @@
#define QBRUSH_H
#include <QtGui/qtguiglobal.h>
#include <QtCore/qlist.h>
#include <QtCore/qpair.h>
#include <QtCore/qpoint.h>
#include <QtCore/qvector.h>
#include <QtCore/qscopedpointer.h>
#include <QtGui/qcolor.h>
#include <QtGui/qtransform.h>
#include <QtGui/qimage.h>
#include <QtGui/qpixmap.h>
#include <QtGui/qtransform.h>
QT_BEGIN_NAMESPACE
@ -163,7 +163,7 @@ inline bool QBrush::isDetached() const { return d->ref.loadRelaxed() == 1; }
class QGradientPrivate;
typedef QPair<qreal, QColor> QGradientStop;
typedef QVector<QGradientStop> QGradientStops;
typedef QList<QGradientStop> QGradientStops;
class Q_GUI_EXPORT QGradient
{

16
src/gui/painting/qcolortransfertable_p.h
View File

@ -54,7 +54,7 @@
#include <QtGui/private/qtguiglobal_p.h>
#include "qcolortransferfunction_p.h"
#include <QVector>
#include <QList>
#include <cmath>
QT_BEGIN_NAMESPACE
@ -66,13 +66,11 @@ public:
QColorTransferTable() noexcept
: m_tableSize(0)
{ }
QColorTransferTable(uint32_t size, const QVector<uint8_t> &table) noexcept
: m_tableSize(size)
, m_table8(table)
QColorTransferTable(uint32_t size, const QList<uint8_t> &table) noexcept
: m_tableSize(size), m_table8(table)
{ }
QColorTransferTable(uint32_t size, const QVector<uint16_t> &table) noexcept
: m_tableSize(size)
, m_table16(table)
QColorTransferTable(uint32_t size, const QList<uint16_t> &table) noexcept
: m_tableSize(size), m_table16(table)
{ }
bool isValid() const
@ -208,8 +206,8 @@ public:
friend inline bool operator==(const QColorTransferTable &t1, const QColorTransferTable &t2);
uint32_t m_tableSize;
QVector<uint8_t> m_table8;
QVector<uint16_t> m_table16;
QList<uint8_t> m_table8;
QList<uint16_t> m_table16;
};
inline bool operator!=(const QColorTransferTable &t1, const QColorTransferTable &t2)

2
src/gui/painting/qdrawhelper_p.h
View File

@ -317,7 +317,7 @@ struct QTextureData
int y2;
qsizetype bytesPerLine;
QImage::Format format;
const QVector<QRgb> *colorTable;
const QList<QRgb> *colorTable;
bool hasAlpha;
enum Type {
Plain,

24
src/gui/painting/qpainter.h
View File

@ -279,22 +279,22 @@ public:
inline void drawLine(const QPointF &p1, const QPointF &p2);
void drawLines(const QLineF *lines, int lineCount);
inline void drawLines(const QVector<QLineF> &lines);
inline void drawLines(const QList<QLineF> &lines);
void drawLines(const QPointF *pointPairs, int lineCount);
inline void drawLines(const QVector<QPointF> &pointPairs);
inline void drawLines(const QList<QPointF> &pointPairs);
void drawLines(const QLine *lines, int lineCount);
inline void drawLines(const QVector<QLine> &lines);
inline void drawLines(const QList<QLine> &lines);
void drawLines(const QPoint *pointPairs, int lineCount);
inline void drawLines(const QVector<QPoint> &pointPairs);
inline void drawLines(const QList<QPoint> &pointPairs);
inline void drawRect(const QRectF &rect);
inline void drawRect(int x1, int y1, int w, int h);
inline void drawRect(const QRect &rect);
void drawRects(const QRectF *rects, int rectCount);
inline void drawRects(const QVector<QRectF> &rectangles);
inline void drawRects(const QList<QRectF> &rectangles);
void drawRects(const QRect *rects, int rectCount);
inline void drawRects(const QVector<QRect> &rectangles);
inline void drawRects(const QList<QRect> &rectangles);
void drawEllipse(const QRectF &r);
void drawEllipse(const QRect &r);
@ -500,22 +500,22 @@ inline void QPainter::drawLine(const QPointF &p1, const QPointF &p2)
drawLine(QLineF(p1, p2));
}
inline void QPainter::drawLines(const QVector<QLineF> &lines)
inline void QPainter::drawLines(const QList<QLineF> &lines)
{
drawLines(lines.constData(), lines.size());
}
inline void QPainter::drawLines(const QVector<QLine> &lines)
inline void QPainter::drawLines(const QList<QLine> &lines)
{
drawLines(lines.constData(), lines.size());
}
inline void QPainter::drawLines(const QVector<QPointF> &pointPairs)
inline void QPainter::drawLines(const QList<QPointF> &pointPairs)
{
drawLines(pointPairs.constData(), pointPairs.size() / 2);
}
inline void QPainter::drawLines(const QVector<QPoint> &pointPairs)
inline void QPainter::drawLines(const QList<QPoint> &pointPairs)
{
drawLines(pointPairs.constData(), pointPairs.size() / 2);
}
@ -566,12 +566,12 @@ inline void QPainter::drawRect(const QRect &r)
drawRects(&r, 1);
}
inline void QPainter::drawRects(const QVector<QRectF> &rects)
inline void QPainter::drawRects(const QList<QRectF> &rects)
{
drawRects(rects.constData(), rects.size());
}
inline void QPainter::drawRects(const QVector<QRect> &rects)
inline void QPainter::drawRects(const QList<QRect> &rects)
{
drawRects(rects.constData(), rects.size());
}

4
src/gui/painting/qpainter_p.h
View File

@ -102,7 +102,7 @@ inline bool qbrush_has_transform(const QBrush &b) { return data_ptr(b)->transfor
class QPainterClipInfo
{
public:
QPainterClipInfo() {} // for QVector, don't use
QPainterClipInfo() { } // for QList, don't use
enum ClipType { RegionClip, PathClip, RectClip, RectFClip };
QPainterClipInfo(const QPainterPath &p, Qt::ClipOperation op, const QTransform &m) :
@ -160,7 +160,7 @@ public:
QPainterPath clipPath;
Qt::ClipOperation clipOperation = Qt::NoClip;
QPainter::RenderHints renderHints;
QVector<QPainterClipInfo> clipInfo; // ### Make me smaller and faster to copy around...
QList<QPainterClipInfo> clipInfo; // ### Make me smaller and faster to copy around...
QTransform worldMatrix; // World transformation matrix, not window and viewport
QTransform matrix; // Complete transformation matrix,
QTransform redirectionMatrix;

8
src/gui/painting/qpainterpath.h
View File

@ -43,9 +43,9 @@
#include <QtGui/qtguiglobal.h>
#include <QtGui/qtransform.h>
#include <QtCore/qglobal.h>
#include <QtCore/qrect.h>
#include <QtCore/qline.h>
#include <QtCore/qvector.h>
#include <QtCore/qlist.h>
#include <QtCore/qrect.h>
#include <QtCore/qscopedpointer.h>
QT_BEGIN_NAMESPACE
@ -256,8 +256,8 @@ public:
qreal curveThreshold() const;
void setDashPattern(Qt::PenStyle);
void setDashPattern(const QVector<qreal> &dashPattern);
QVector<qreal> dashPattern() const;
void setDashPattern(const QList<qreal> &dashPattern);
QList<qreal> dashPattern() const;
void setDashOffset(qreal offset);
qreal dashOffset() const;

17
src/gui/painting/qpainterpath_p.h
View File

@ -98,7 +98,7 @@ public:
private:
QAtomicInt ref;
QVector<QPainterPath::Element> elements;
QList<QPainterPath::Element> elements;
};
class QPainterPathStrokerPrivate
@ -107,7 +107,7 @@ public:
QPainterPathStrokerPrivate();
QStroker stroker;
QVector<qfixed> dashPattern;
QList<qfixed> dashPattern;
qreal dashOffset;
};
@ -117,20 +117,19 @@ class QVectorPathConverter;
class QVectorPathConverter
{
public:
QVectorPathConverter(const QVector<QPainterPath::Element> &path, uint fillRule, bool convex)
QVectorPathConverter(const QList<QPainterPath::Element> &path, uint fillRule, bool convex)
: pathData(path, fillRule, convex),
path(pathData.points.data(), path.size(),
pathData.elements.data(), pathData.flags) {}
path(pathData.points.data(), path.size(), pathData.elements.data(), pathData.flags)
{
}
const QVectorPath &vectorPath() {
return path;
}
struct QVectorPathData {
QVectorPathData(const QVector<QPainterPath::Element> &path, uint fillRule, bool convex)
: elements(path.size()),
points(path.size() * 2),
flags(0)
QVectorPathData(const QList<QPainterPath::Element> &path, uint fillRule, bool convex)
: elements(path.size()), points(path.size() * 2), flags(0)
{
int ptsPos = 0;
bool isLines = true;

2
src/gui/painting/qpathclipper_p.h
View File

@ -282,7 +282,7 @@ private:
QDataBuffer<QPathEdge> m_edges;
QDataBuffer<QPathVertex> m_vertices;
QVector<qreal> m_splitPoints;
QList<qreal> m_splitPoints;
QPathSegments m_segments;
};

24
src/gui/painting/qpdf_p.h
View File

@ -55,12 +55,12 @@
#ifndef QT_NO_PDF
#include "QtCore/qlist.h"
#include "QtCore/qstring.h"
#include "QtCore/qvector.h"
#include "private/qstroker_p.h"
#include "private/qpaintengine_p.h"
#include "private/qfontengine_p.h"
#include "private/qfontsubset_p.h"
#include "private/qpaintengine_p.h"
#include "private/qstroker_p.h"
#include "qpagelayout.h"
QT_BEGIN_NAMESPACE
@ -147,11 +147,11 @@ class QPdfPage : public QPdf::ByteStream
public:
QPdfPage();
QVector<uint> images;
QVector<uint> graphicStates;
QVector<uint> patterns;
QVector<uint> fonts;
QVector<uint> annotations;
QList<uint> images;
QList<uint> graphicStates;
QList<uint> patterns;
QList<uint> fonts;
QList<uint> annotations;
void streamImage(int w, int h, int object);
@ -265,7 +265,7 @@ public:
QPointF brushOrigin;
QBrush brush;
QPen pen;
QVector<QPainterPath> clips;
QList<QPainterPath> clips;
bool clipEnabled;
bool allClipped;
bool hasPen;
@ -309,7 +309,7 @@ private:
void embedFont(QFontSubset *font);
qreal calcUserUnit() const;
QVector<int> xrefPositions;
QList<int> xrefPositions;
QDataStream* stream;
int streampos;
@ -340,10 +340,10 @@ private:
// various PDF objects
int pageRoot, embeddedfilesRoot, namesRoot, catalog, info, graphicsState, patternColorSpace;
QVector<uint> pages;
QList<uint> pages;
QHash<qint64, uint> imageCache;
QHash<QPair<uint, uint>, uint > alphaCache;
QVector<AttachmentInfo> fileCache;
QList<AttachmentInfo> fileCache;
QByteArray xmpDocumentMetadata;
};

4
src/gui/painting/qpen.h
View File

@ -79,8 +79,8 @@ public:
Qt::PenStyle style() const;
void setStyle(Qt::PenStyle);
QVector<qreal> dashPattern() const;
void setDashPattern(const QVector<qreal> &pattern);
QList<qreal> dashPattern() const;
void setDashPattern(const QList<qreal> &pattern);
qreal dashOffset() const;
void setDashOffset(qreal doffset);

30
src/gui/painting/qpixellayout_p.h
View File

@ -51,7 +51,7 @@
// We mean it.
//
#include <QtCore/qvector.h>
#include <QtCore/qlist.h>
#include <QtGui/qimage.h>
#include <QtGui/qrgba64.h>
@ -280,20 +280,26 @@ struct QDitherInfo {
int y;
};
typedef const uint *(QT_FASTCALL *FetchAndConvertPixelsFunc)(uint *buffer, const uchar *src, int index, int count,
const QVector<QRgb> *clut, QDitherInfo *dither);
typedef void (QT_FASTCALL *ConvertAndStorePixelsFunc)(uchar *dest, const uint *src, int index, int count,
const QVector<QRgb> *clut, QDitherInfo *dither);
typedef const uint *(QT_FASTCALL *FetchAndConvertPixelsFunc)(uint *buffer, const uchar *src,
int index, int count,
const QList<QRgb> *clut,
QDitherInfo *dither);
typedef void(QT_FASTCALL *ConvertAndStorePixelsFunc)(uchar *dest, const uint *src, int index,
int count, const QList<QRgb> *clut,
QDitherInfo *dither);
typedef const QRgba64 *(QT_FASTCALL *FetchAndConvertPixelsFunc64)(QRgba64 *buffer, const uchar *src, int index, int count,
const QVector<QRgb> *clut, QDitherInfo *dither);
typedef void (QT_FASTCALL *ConvertAndStorePixelsFunc64)(uchar *dest, const QRgba64 *src, int index, int count,
const QVector<QRgb> *clut, QDitherInfo *dither);
typedef const QRgba64 *(QT_FASTCALL *FetchAndConvertPixelsFunc64)(QRgba64 *buffer, const uchar *src,
int index, int count,
const QList<QRgb> *clut,
QDitherInfo *dither);
typedef void(QT_FASTCALL *ConvertAndStorePixelsFunc64)(uchar *dest, const QRgba64 *src, int index,
int count, const QList<QRgb> *clut,
QDitherInfo *dither);
typedef void (QT_FASTCALL *ConvertFunc)(uint *buffer, int count, const QVector<QRgb> *clut);
typedef void (QT_FASTCALL *Convert64Func)(quint64 *buffer, int count, const QVector<QRgb> *clut);
typedef void(QT_FASTCALL *ConvertFunc)(uint *buffer, int count, const QList<QRgb> *clut);
typedef void(QT_FASTCALL *Convert64Func)(quint64 *buffer, int count, const QList<QRgb> *clut);
typedef const QRgba64 *(QT_FASTCALL *ConvertTo64Func)(QRgba64 *buffer, const uint *src, int count,
const QVector<QRgb> *clut, QDitherInfo *dither);
const QList<QRgb> *clut, QDitherInfo *dither);
typedef void (QT_FASTCALL *RbSwapFunc)(uchar *dst, const uchar *src, int count);
typedef void (*MemRotateFunc)(const uchar *srcPixels, int w, int h, int sbpl, uchar *destPixels, int dbpl);

34
src/gui/painting/qpolygon.h
View File

@ -41,7 +41,7 @@
#define QPOLYGON_H
#include <QtGui/qtguiglobal.h>
#include <QtCore/qvector.h>
#include <QtCore/qlist.h>
#include <QtCore/qpoint.h>
#include <QtCore/qrect.h>
@ -51,21 +51,21 @@ class QTransform;
class QRect;
class QVariant;
class Q_GUI_EXPORT QPolygon : public QVector<QPoint>
class Q_GUI_EXPORT QPolygon : public QList<QPoint>
{
public:
inline QPolygon() {}
inline ~QPolygon() {}
inline explicit QPolygon(int size);
inline /*implicit*/ QPolygon(const QVector<QPoint> &v) : QVector<QPoint>(v) {}
/*implicit*/ QPolygon(QVector<QPoint> &&v) noexcept : QVector<QPoint>(std::move(v)) {}
inline /*implicit*/ QPolygon(const QList<QPoint> &v) : QList<QPoint>(v) { }
/*implicit*/ QPolygon(QList<QPoint> &&v) noexcept : QList<QPoint>(std::move(v)) { }
QPolygon(const QRect &r, bool closed=false);
QPolygon(int nPoints, const int *points);
QPolygon(const QPolygon &other) : QVector<QPoint>(other) {}
QPolygon(QPolygon &&other) noexcept : QVector<QPoint>(std::move(other)) {}
QPolygon(const QPolygon &other) : QList<QPoint>(other) { }
QPolygon(QPolygon &&other) noexcept : QList<QPoint>(std::move(other)) { }
QPolygon &operator=(QPolygon &&other) noexcept { swap(other); return *this; }
QPolygon &operator=(const QPolygon &other) { QVector<QPoint>::operator=(other); return *this; }
void swap(QPolygon &other) noexcept { QVector<QPoint>::swap(other); } // prevent QVector<QPoint><->QPolygon swaps
QPolygon &operator=(const QPolygon &other) { QList<QPoint>::operator=(other); return *this; }
void swap(QPolygon &other) noexcept { QList<QPoint>::swap(other); } // prevent QList<QPoint><->QPolygon swaps
operator QVariant() const;
@ -97,7 +97,7 @@ public:
};
Q_DECLARE_SHARED(QPolygon)
inline QPolygon::QPolygon(int asize) : QVector<QPoint>(asize) {}
inline QPolygon::QPolygon(int size) : QList<QPoint>(size) { }
#ifndef QT_NO_DEBUG_STREAM
Q_GUI_EXPORT QDebug operator<<(QDebug, const QPolygon &);
@ -132,21 +132,21 @@ inline QPolygon QPolygon::translated(const QPoint &offset) const
class QRectF;
class Q_GUI_EXPORT QPolygonF : public QVector<QPointF>
class Q_GUI_EXPORT QPolygonF : public QList<QPointF>
{
public:
inline QPolygonF() {}
inline ~QPolygonF() {}
inline explicit QPolygonF(int size);
inline /*implicit*/ QPolygonF(const QVector<QPointF> &v) : QVector<QPointF>(v) {}
/* implicit */ QPolygonF(QVector<QPointF> &&v) noexcept : QVector<QPointF>(std::move(v)) {}
inline /*implicit*/ QPolygonF(const QList<QPointF> &v) : QList<QPointF>(v) { }
/* implicit */ QPolygonF(QList<QPointF> &&v) noexcept : QList<QPointF>(std::move(v)) { }
QPolygonF(const QRectF &r);
/*implicit*/ QPolygonF(const QPolygon &a);
inline QPolygonF(const QPolygonF &a) : QVector<QPointF>(a) {}
QPolygonF(QPolygonF &&other) noexcept : QVector<QPointF>(std::move(other)) {}
inline QPolygonF(const QPolygonF &a) : QList<QPointF>(a) { }
QPolygonF(QPolygonF &&other) noexcept : QList<QPointF>(std::move(other)) { }
QPolygonF &operator=(QPolygonF &&other) noexcept { swap(other); return *this; }
QPolygonF &operator=(const QPolygonF &other) { QVector<QPointF>::operator=(other); return *this; }
inline void swap(QPolygonF &other) { QVector<QPointF>::swap(other); } // prevent QVector<QPointF><->QPolygonF swaps
QPolygonF &operator=(const QPolygonF &other) { QList<QPointF>::operator=(other); return *this; }
inline void swap(QPolygonF &other) { QList<QPointF>::swap(other); } // prevent QList<QPointF><->QPolygonF swaps
operator QVariant() const;
@ -172,7 +172,7 @@ public:
};
Q_DECLARE_SHARED(QPolygonF)
inline QPolygonF::QPolygonF(int asize) : QVector<QPointF>(asize) {}
inline QPolygonF::QPolygonF(int size) : QList<QPointF>(size) { }
#ifndef QT_NO_DEBUG_STREAM
Q_GUI_EXPORT QDebug operator<<(QDebug, const QPolygonF &);

2
src/gui/painting/qrangecollection.h
View File

@ -41,9 +41,9 @@
#define QRANGECOLLECTION_H
#include <QtGui/qtguiglobal.h>
#include <QtCore/qlist.h>
#include <QtCore/qpair.h>
#include <QtCore/qscopedpointer.h>
#include <QtCore/qvector.h>
QT_BEGIN_NAMESPACE

2
src/gui/painting/qrangecollection_p.h
View File

@ -67,7 +67,7 @@ public:
void mergeIntervals();
QVector<QPair<int, int>> intervals;
QList<QPair<int, int>> intervals;
QRangeCollection *q_ptr;
};

4
src/gui/painting/qrbtree_p.h
View File

@ -538,8 +538,8 @@ int QRBTree<T>::order(Node *left, Node *right)
if (left == right)
return 0;
QVector<Node *> leftAncestors;
QVector<Node *> rightAncestors;
QList<Node *> leftAncestors;
QList<Node *> rightAncestors;
while (left) {
leftAncestors.push_back(left);
left = left->parent;

8
src/gui/painting/qstroker_p.h
View File

@ -263,10 +263,10 @@ public:
QStroker *stroker() const { return m_stroker; }
static QVector<qfixed> patternForStyle(Qt::PenStyle style);
static QList<qfixed> patternForStyle(Qt::PenStyle style);
void setDashPattern(const QVector<qfixed> &dashPattern) { m_dashPattern = dashPattern; }
QVector<qfixed> dashPattern() const { return m_dashPattern; }
void setDashPattern(const QList<qfixed> &dashPattern) { m_dashPattern = dashPattern; }
QList<qfixed> dashPattern() const { return m_dashPattern; }
void setDashOffset(qreal offset) { m_dashOffset = offset; }
qreal dashOffset() const { return m_dashOffset; }
@ -281,7 +281,7 @@ protected:
void processCurrentSubpath() override;
QStroker *m_stroker;
QVector<qfixed> m_dashPattern;
QList<qfixed> m_dashPattern;
qreal m_dashOffset;
qreal m_stroke_width;

14
src/gui/painting/qtriangulator_p.h
View File

@ -52,8 +52,8 @@
//
#include <QtGui/private/qtguiglobal_p.h>
#include <QtCore/qvector.h>
#include <QtGui/private/qvectorpath_p.h>
#include <QtCore/qlist.h>
QT_BEGIN_NAMESPACE
@ -67,13 +67,13 @@ public:
inline Type type() const { return t; }
inline void setDataUint(const QVector<quint32> &data)
inline void setDataUint(const QList<quint32> &data)
{
t = UnsignedInt;
indices32 = data;
}
inline void setDataUshort(const QVector<quint16> &data)
inline void setDataUshort(const QList<quint16> &data)
{
t = UnsignedShort;
indices16 = data;
@ -96,20 +96,20 @@ public:
private:
Type t;
QVector<quint32> indices32;
QVector<quint16> indices16;
QList<quint32> indices32;
QList<quint16> indices16;
};
struct QTriangleSet
{
// The vertices of a triangle are given by: (x[i[n]], y[i[n]]), (x[j[n]], y[j[n]]), (x[k[n]], y[k[n]]), n = 0, 1, ...
QVector<qreal> vertices; // [x[0], y[0], x[1], y[1], x[2], ...]
QList<qreal> vertices; // [x[0], y[0], x[1], y[1], x[2], ...]
QVertexIndexVector indices; // [i[0], j[0], k[0], i[1], j[1], k[1], i[2], ...]
};
struct QPolylineSet
{
QVector<qreal> vertices; // [x[0], y[0], x[1], y[1], x[2], ...]
QList<qreal> vertices; // [x[0], y[0], x[1], y[1], x[2], ...]
QVertexIndexVector indices; // End of polyline is marked with -1.
};

4
src/gui/rhi/qrhi_p.h
View File

@ -51,7 +51,7 @@
#include <QtGui/qtguiglobal.h>
#include <QSize>
#include <QMatrix4x4>
#include <QVector>
#include <QList>
#include <QVarLengthArray>
#include <QThread>
#include <QColor>
@ -1535,7 +1535,7 @@ public:
QRhiResourceUpdateBatch *nextResourceUpdateBatch();
QVector<int> supportedSampleCounts() const;
QList<int> supportedSampleCounts() const;
int ubufAlignment() const;
int ubufAligned(int v) const;

6
src/gui/rhi/qrhi_p_p.h
View File

@ -149,7 +149,7 @@ public:
virtual void beginExternal(QRhiCommandBuffer *cb) = 0;
virtual void endExternal(QRhiCommandBuffer *cb) = 0;
virtual QVector<int> supportedSampleCounts() const = 0;
virtual QList<int> supportedSampleCounts() const = 0;
virtual int ubufAlignment() const = 0;
virtual bool isYUpInFramebuffer() const = 0;
virtual bool isYUpInNDC() const = 0;
@ -228,7 +228,7 @@ private:
QBitArray resUpdPoolMap;
QSet<QRhiResource *> resources;
QSet<QRhiResource *> pendingDeleteResources;
QVector<QRhi::CleanupCallback> cleanupCallbacks;
QList<QRhi::CleanupCallback> cleanupCallbacks;
friend class QRhi;
friend class QRhiResourceUpdateBatchPrivate;
@ -335,7 +335,7 @@ public:
// In the backend this can then end up, where applicable, as a
// single, batched copy operation with only one set of barriers.
// This helps when doing for example glyph cache fills.
QVector<QRhiTextureSubresourceUploadDescription> subresDesc[QRhi::MAX_LAYERS][QRhi::MAX_LEVELS];
QList<QRhiTextureSubresourceUploadDescription> subresDesc[QRhi::MAX_LAYERS][QRhi::MAX_LEVELS];
QRhiTexture *src;
QRhiTextureCopyDescription desc;
QRhiReadbackDescription rb;

12
src/gui/rhi/qrhid3d11_p_p.h
View File

@ -454,7 +454,7 @@ struct QD3D11CommandBuffer : public QRhiCommandBuffer
ComputePass
};
QVector<Command> commands;
QList<Command> commands;
PassType recordingPass;
QRhiRenderTarget *currentTarget;
QRhiGraphicsPipeline *currentGraphicsPipeline;
@ -469,8 +469,8 @@ struct QD3D11CommandBuffer : public QRhiCommandBuffer
ID3D11Buffer *currentVertexBuffers[D3D11_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT];
quint32 currentVertexOffsets[D3D11_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT];
QVector<QByteArray> dataRetainPool;
QVector<QImage> imageRetainPool;
QList<QByteArray> dataRetainPool;
QList<QImage> imageRetainPool;
// relies heavily on implicit sharing (no copies of the actual data will be made)
const uchar *retainData(const QByteArray &data) {
@ -638,7 +638,7 @@ public:
void beginExternal(QRhiCommandBuffer *cb) override;
void endExternal(QRhiCommandBuffer *cb) override;
QVector<int> supportedSampleCounts() const override;
QList<int> supportedSampleCounts() const override;
int ubufAlignment() const override;
bool isYUpInFramebuffer() const override;
bool isYUpInNDC() const override;
@ -707,13 +707,13 @@ public:
QSize pixelSize;
QRhiTexture::Format format;
};
QVector<TextureReadback> activeTextureReadbacks;
QList<TextureReadback> activeTextureReadbacks;
struct BufferReadback {
QRhiBufferReadbackResult *result;
quint32 byteSize;
ID3D11Buffer *stagingBuf;
};
QVector<BufferReadback> activeBufferReadbacks;
QList<BufferReadback> activeBufferReadbacks;
struct Shader {
Shader() = default;

36
src/gui/rhi/qrhigles2_p_p.h
View File

@ -275,8 +275,8 @@ struct QGles2GraphicsPipeline : public QRhiGraphicsPipeline
GLuint program = 0;
GLenum drawMode = GL_TRIANGLES;
QVector<QGles2UniformDescription> uniforms;
QVector<QGles2SamplerDescription> samplers;
QList<QGles2UniformDescription> uniforms;
QList<QGles2SamplerDescription> samplers;
uint generation = 0;
friend class QRhiGles2;
};
@ -289,8 +289,8 @@ struct QGles2ComputePipeline : public QRhiComputePipeline
bool create() override;
GLuint program = 0;
QVector<QGles2UniformDescription> uniforms;
QVector<QGles2SamplerDescription> samplers;
QList<QGles2UniformDescription> uniforms;
QList<QGles2SamplerDescription> samplers;
uint generation = 0;
friend class QRhiGles2;
};
@ -511,7 +511,7 @@ struct QGles2CommandBuffer : public QRhiCommandBuffer
ComputePass
};
QVector<Command> commands;
QList<Command> commands;
QVarLengthArray<QRhiPassResourceTracker, 8> passResTrackers;
int currentPassResTrackerIndex;
@ -574,8 +574,8 @@ struct QGles2CommandBuffer : public QRhiCommandBuffer
}
} computePassState;
QVector<QByteArray> dataRetainPool;
QVector<QImage> imageRetainPool;
QList<QByteArray> dataRetainPool;
QList<QImage> imageRetainPool;
// relies heavily on implicit sharing (no copies of the actual data will be made)
const void *retainData(const QByteArray &data) {
@ -766,7 +766,7 @@ public:
void beginExternal(QRhiCommandBuffer *cb) override;
void endExternal(QRhiCommandBuffer *cb) override;
QVector<int> supportedSampleCounts() const override;
QList<int> supportedSampleCounts() const override;
int ubufAlignment() const override;
bool isYUpInFramebuffer() const override;
bool isYUpInNDC() const override;
@ -809,16 +809,12 @@ public:
bool compileShader(GLuint program, const QRhiShaderStage &shaderStage, int *glslVersion);
bool linkProgram(GLuint program);
void registerUniformIfActive(const QShaderDescription::BlockVariable &var,
const QByteArray &namePrefix,
int binding,
int baseOffset,
GLuint program,
QVector<QGles2UniformDescription> *dst);
void gatherUniforms(GLuint program,
const QShaderDescription::UniformBlock &ub,
QVector<QGles2UniformDescription> *dst);
const QByteArray &namePrefix, int binding, int baseOffset,
GLuint program, QList<QGles2UniformDescription> *dst);
void gatherUniforms(GLuint program, const QShaderDescription::UniformBlock &ub,
QList<QGles2UniformDescription> *dst);
void gatherSamplers(GLuint program, const QShaderDescription::InOutVariable &v,
QVector<QGles2SamplerDescription> *dst);
QList<QGles2SamplerDescription> *dst);
bool isProgramBinaryDiskCacheEnabled() const;
enum DiskCacheResult {
@ -908,8 +904,8 @@ public:
uint screenSpaceDerivatives : 1;
} caps;
QGles2SwapChain *currentSwapChain = nullptr;
QVector<GLint> supportedCompressedFormats;
mutable QVector<int> supportedSampleCountList;
QList<GLint> supportedCompressedFormats;
mutable QList<int> supportedSampleCountList;
QRhiGles2NativeHandles nativeHandlesStruct;
mutable bool contextLost = false;
@ -941,7 +937,7 @@ public:
} textureRenderTarget;
};
};
QVector<DeferredReleaseEntry> releaseQueue;
QList<DeferredReleaseEntry> releaseQueue;
struct OffscreenFrame {
OffscreenFrame(QRhiImplementation *rhi) : cbWrapper(rhi) { }

2
src/gui/rhi/qrhimetal_p_p.h
View File

@ -420,7 +420,7 @@ public:
void beginExternal(QRhiCommandBuffer *cb) override;
void endExternal(QRhiCommandBuffer *cb) override;
QVector<int> supportedSampleCounts() const override;
QList<int> supportedSampleCounts() const override;
int ubufAlignment() const override;
bool isYUpInFramebuffer() const override;
bool isYUpInNDC() const override;

2
src/gui/rhi/qrhinull_p_p.h
View File

@ -278,7 +278,7 @@ public:
void beginExternal(QRhiCommandBuffer *cb) override;
void endExternal(QRhiCommandBuffer *cb) override;
QVector<int> supportedSampleCounts() const override;
QList<int> supportedSampleCounts() const override;
int ubufAlignment() const override;
bool isYUpInFramebuffer() const override;
bool isYUpInNDC() const override;

6
src/gui/rhi/qrhiprofiler_p_p.h
View File

@ -104,9 +104,9 @@ public:
QElapsedTimer frameToFrameTimer;
bool frameToFrameRunning = false;
QElapsedTimer beginToEndTimer;
QVector<qint64> frameToFrameSamples;
QVector<qint64> beginToEndSamples;
QVector<float> gpuFrameSamples;
QList<qint64> frameToFrameSamples;
QList<qint64> beginToEndSamples;
QList<float> gpuFrameSamples;
QRhiProfiler::CpuTime frameToFrameTime;
QRhiProfiler::CpuTime beginToEndFrameTime;
QRhiProfiler::GpuTime gpuFrameTime;

14
src/gui/rhi/qrhivulkan_p_p.h
View File

@ -533,7 +533,7 @@ struct QVkCommandBuffer : public QRhiCommandBuffer
} executeSecondary;
} args;
};
QVector<Command> commands;
QList<Command> commands;
QVarLengthArray<QRhiPassResourceTracker, 8> passResTrackers;
int currentPassResTrackerIndex;
@ -601,7 +601,7 @@ struct QVkSwapChain : public QRhiSwapChain
VkColorSpaceKHR colorSpace = VK_COLOR_SPACE_SRGB_NONLINEAR_KHR;
QVkRenderBuffer *ds = nullptr;
VkSampleCountFlagBits samples = VK_SAMPLE_COUNT_1_BIT;
QVector<VkPresentModeKHR> supportedPresentationModes;
QList<VkPresentModeKHR> supportedPresentationModes;
VkDeviceMemory msaaImageMem = VK_NULL_HANDLE;
QVkReferenceRenderTarget rtWrapper;
QVkCommandBuffer cbWrapper;
@ -729,7 +729,7 @@ public:
void beginExternal(QRhiCommandBuffer *cb) override;
void endExternal(QRhiCommandBuffer *cb) override;
QVector<int> supportedSampleCounts() const override;
QList<int> supportedSampleCounts() const override;
int ubufAlignment() const override;
bool isYUpInFramebuffer() const override;
bool isYUpInNDC() const override;
@ -865,7 +865,7 @@ public:
int refCount = 0;
int allocedDescSets = 0;
};
QVector<DescriptorPoolData> descriptorPools;
QList<DescriptorPoolData> descriptorPools;
VkQueryPool timestampQueryPool = VK_NULL_HANDLE;
QBitArray timestampQueryPoolMap;
@ -894,7 +894,7 @@ public:
QSize pixelSize;
QRhiTexture::Format format;
};
QVector<TextureReadback> activeTextureReadbacks;
QList<TextureReadback> activeTextureReadbacks;
struct BufferReadback {
int activeFrameSlot = -1;
QRhiBufferReadbackResult *result;
@ -902,7 +902,7 @@ public:
VkBuffer stagingBuf;
QVkAlloc stagingAlloc;
};
QVector<BufferReadback> activeBufferReadbacks;
QList<BufferReadback> activeBufferReadbacks;
struct DeferredReleaseEntry {
enum Type {
@ -967,7 +967,7 @@ public:
} commandBuffer;
};
};
QVector<DeferredReleaseEntry> releaseQueue;
QList<DeferredReleaseEntry> releaseQueue;
};
Q_DECLARE_TYPEINFO(QRhiVulkan::DescriptorPoolData, Q_MOVABLE_TYPE);

2
src/gui/rhi/qshader_p.h
View File

@ -146,7 +146,7 @@ public:
QShaderDescription description() const;
void setDescription(const QShaderDescription &desc);
QVector<QShaderKey> availableShaders() const;
QList<QShaderKey> availableShaders() const;
QShaderCode shader(const QShaderKey &key) const;
void setShader(const QShaderKey &key, const QShaderCode &shader);
void removeShader(const QShaderKey &key);

28
src/gui/rhi/qshaderdescription_p.h
View File

@ -50,7 +50,7 @@
#include <QtGui/qtguiglobal.h>
#include <QtCore/QString>
#include <QtCore/QVector>
#include <QtCore/QList>
#include <array>
QT_BEGIN_NAMESPACE
@ -218,7 +218,7 @@ public:
int descriptorSet = -1;
ImageFormat imageFormat = ImageFormatUnknown;
ImageFlags imageFlags;
QVector<int> arrayDims;
QList<int> arrayDims;
};
struct BlockVariable {
@ -226,11 +226,11 @@ public:
VariableType type = Unknown;
int offset = 0;
int size = 0;
QVector<int> arrayDims;
QList<int> arrayDims;
int arrayStride = 0;
int matrixStride = 0;
bool matrixIsRowMajor = false;
QVector<BlockVariable> structMembers;
QList<BlockVariable> structMembers;
};
struct UniformBlock {
@ -239,13 +239,13 @@ public:
int size = 0;
int binding = -1;
int descriptorSet = -1;
QVector<BlockVariable> members;
QList<BlockVariable> members;
};
struct PushConstantBlock {
QByteArray name;
int size = 0;
QVector<BlockVariable> members;
QList<BlockVariable> members;
};
struct StorageBlock {
@ -254,16 +254,16 @@ public:
int knownSize = 0;
int binding = -1;
int descriptorSet = -1;
QVector<BlockVariable> members;
QList<BlockVariable> members;
};
QVector<InOutVariable> inputVariables() const;
QVector<InOutVariable> outputVariables() const;
QVector<UniformBlock> uniformBlocks() const;
QVector<PushConstantBlock> pushConstantBlocks() const;
QVector<StorageBlock> storageBlocks() const;
QVector<InOutVariable> combinedImageSamplers() const;
QVector<InOutVariable> storageImages() const;
QList<InOutVariable> inputVariables() const;
QList<InOutVariable> outputVariables() const;
QList<UniformBlock> uniformBlocks() const;
QList<PushConstantBlock> pushConstantBlocks() const;
QList<StorageBlock> storageBlocks() const;
QList<InOutVariable> combinedImageSamplers() const;
QList<InOutVariable> storageImages() const;
std::array<uint, 3> computeShaderLocalSize() const;

16
src/gui/rhi/qshaderdescription_p_p.h
View File

@ -49,7 +49,7 @@
//
#include "qshaderdescription_p.h"
#include <QtCore/QVector>
#include <QtCore/QList>
#include <QtCore/QAtomicInt>
#include <QtCore/QJsonDocument>
@ -85,13 +85,13 @@ struct Q_GUI_EXPORT QShaderDescriptionPrivate
void loadFromStream(QDataStream *stream, int version);
QAtomicInt ref;
QVector<QShaderDescription::InOutVariable> inVars;
QVector<QShaderDescription::InOutVariable> outVars;
QVector<QShaderDescription::UniformBlock> uniformBlocks;
QVector<QShaderDescription::PushConstantBlock> pushConstantBlocks;
QVector<QShaderDescription::StorageBlock> storageBlocks;
QVector<QShaderDescription::InOutVariable> combinedImageSamplers;
QVector<QShaderDescription::InOutVariable> storageImages;
QList<QShaderDescription::InOutVariable> inVars;
QList<QShaderDescription::InOutVariable> outVars;
QList<QShaderDescription::UniformBlock> uniformBlocks;
QList<QShaderDescription::PushConstantBlock> pushConstantBlocks;
QList<QShaderDescription::StorageBlock> storageBlocks;
QList<QShaderDescription::InOutVariable> combinedImageSamplers;
QList<QShaderDescription::InOutVariable> storageImages;
std::array<uint, 3> localSize;
};

2
src/gui/text/qabstracttextdocumentlayout.h
View File

@ -78,7 +78,7 @@ public:
int cursorPosition;
QPalette palette;
QRectF clip;
QVector<Selection> selections;
QList<Selection> selections;
};
virtual void draw(QPainter *painter, const PaintContext &context) = 0;

56
src/gui/text/qcssparser_p.h
View File

@ -53,7 +53,7 @@
#include <QtGui/private/qtguiglobal_p.h>
#include <QtCore/QStringList>
#include <QtCore/QVector>
#include <QtCore/QList>
#include <QtCore/QVariant>
#include <QtCore/QPair>
#include <QtCore/QSize>
@ -432,11 +432,10 @@ struct BorderData {
};
QT_CSS_DECLARE_TYPEINFO(BorderData, Q_MOVABLE_TYPE)
// 1. StyleRule - x:hover, y:clicked > z:checked { prop1: value1; prop2: value2; }
// 2. QVector<Selector> - x:hover, y:clicked z:checked
// 3. QVector<BasicSelector> - y:clicked z:checked
// 4. QVector<Declaration> - { prop1: value1; prop2: value2; }
// 2. QList<Selector> - x:hover, y:clicked z:checked
// 3. QList<BasicSelector> - y:clicked z:checked
// 4. QList<Declaration> - { prop1: value1; prop2: value2; }
// 5. Declaration - prop1: value1;
struct Q_GUI_EXPORT Declaration
@ -446,7 +445,7 @@ struct Q_GUI_EXPORT Declaration
inline DeclarationData() : propertyId(UnknownProperty), important(false), inheritable(false) {}
QString property;
Property propertyId;
QVector<Value> values;
QList<Value> values;
QVariant parsed;
bool important:1;
bool inheritable:1;
@ -578,8 +577,8 @@ struct BasicSelector
QString elementName;
QStringList ids;
QVector<Pseudo> pseudos;
QVector<AttributeSelector> attributeSelectors;
QList<Pseudo> pseudos;
QList<AttributeSelector> attributeSelectors;
Relation relationToNext;
};
@ -587,7 +586,7 @@ QT_CSS_DECLARE_TYPEINFO(BasicSelector, Q_MOVABLE_TYPE)
struct Q_GUI_EXPORT Selector
{
QVector<BasicSelector> basicSelectors;
QList<BasicSelector> basicSelectors;
int specificity() const;
quint64 pseudoClass(quint64 *negated = nullptr) const;
QString pseudoElement() const;
@ -597,8 +596,8 @@ QT_CSS_DECLARE_TYPEINFO(Selector, Q_MOVABLE_TYPE)
struct StyleRule
{
StyleRule() : order(0) { }
QVector<Selector> selectors;
QVector<Declaration> declarations;
QList<Selector> selectors;
QList<Declaration> declarations;
int order;
};
QT_CSS_DECLARE_TYPEINFO(StyleRule, Q_MOVABLE_TYPE)
@ -606,14 +605,14 @@ QT_CSS_DECLARE_TYPEINFO(StyleRule, Q_MOVABLE_TYPE)
struct MediaRule
{
QStringList media;
QVector<StyleRule> styleRules;
QList<StyleRule> styleRules;
};
QT_CSS_DECLARE_TYPEINFO(MediaRule, Q_MOVABLE_TYPE)
struct PageRule
{
QString selector;
QVector<Declaration> declarations;
QList<Declaration> declarations;
};
QT_CSS_DECLARE_TYPEINFO(PageRule, Q_MOVABLE_TYPE)
@ -635,10 +634,10 @@ enum StyleSheetOrigin {
struct StyleSheet
{
StyleSheet() : origin(StyleSheetOrigin_Unspecified), depth(0) { }
QVector<StyleRule> styleRules; //only contains rules that are not indexed
QVector<MediaRule> mediaRules;
QVector<PageRule> pageRules;
QVector<ImportRule> importRules;
QList<StyleRule> styleRules; // only contains rules that are not indexed
QList<MediaRule> mediaRules;
QList<PageRule> pageRules;
QList<ImportRule> importRules;
StyleSheetOrigin origin;
int depth; // applicable only for inline style sheets
QMultiHash<QString, StyleRule> nameIndex;
@ -660,8 +659,8 @@ public:
int id;
};
QVector<StyleRule> styleRulesForNode(NodePtr node);
QVector<Declaration> declarationsForNode(NodePtr node, const char *extraPseudo = nullptr);
QList<StyleRule> styleRulesForNode(NodePtr node);
QList<Declaration> declarationsForNode(NodePtr node, const char *extraPseudo = nullptr);
virtual bool nodeNameEquals(NodePtr node, const QString& nodeName) const;
virtual QString attribute(NodePtr node, const QString &name) const = 0;
@ -674,7 +673,7 @@ public:
virtual NodePtr duplicateNode(NodePtr node) const = 0;
virtual void freeNode(NodePtr node) const = 0;
QVector<StyleSheet> styleSheets;
QList<StyleSheet> styleSheets;
QString medium;
Qt::CaseSensitivity nameCaseSensitivity;
private:
@ -750,7 +749,7 @@ class Q_GUI_EXPORT Scanner
{
public:
static QString preprocess(const QString &input, bool *hasEscapeSequences = nullptr);
static void scan(const QString &preprocessedInput, QVector<Symbol> *symbols);
static void scan(const QString &preprocessedInput, QList<Symbol> *symbols);
};
class Q_GUI_EXPORT Parser
@ -780,7 +779,7 @@ public:
bool parsePseudo(Pseudo *pseudo);
bool parseNextDeclaration(Declaration *declaration);
bool parsePrio(Declaration *declaration);
bool parseExpr(QVector<Value> *values);
bool parseExpr(QList<Value> *values);
bool parseTerm(Value *value);
bool parseFunction(QString *name, QString *args);
bool parseHexColor(QColor *col);
@ -805,7 +804,12 @@ public:
inline bool testProperty() { return test(IDENT); }
bool testTerm();
inline bool testExpr() { return testTerm(); }
inline bool parseNextExpr(QVector<Value> *values) { if (!testExpr()) return recordError(); return parseExpr(values); }
inline bool parseNextExpr(QList<Value> *values)
{
if (!testExpr())
return recordError();
return parseExpr(values);
}
bool testPrio();
inline bool testHexColor() { return test(HASH); }
inline bool testFunction() { return test(FUNCTION); }
@ -833,7 +837,7 @@ public:
inline bool recordError() { errorIndex = index; return false; }
QVector<Symbol> symbols;
QList<Symbol> symbols;
int index;
int errorIndex;
bool hasEscapeSequences;
@ -842,7 +846,7 @@ public:
struct Q_GUI_EXPORT ValueExtractor
{
ValueExtractor(const QVector<Declaration> &declarations, const QPalette & = QPalette());
ValueExtractor(const QList<Declaration> &declarations, const QPalette & = QPalette());
bool extractFont(QFont *font, int *fontSizeAdjustment);
bool extractBackground(QBrush *, QString *, Repeat *, Qt::Alignment *, QCss::Origin *, QCss::Attachment *,
@ -868,7 +872,7 @@ private:
QSize sizeValue(const Declaration &decl);
void sizeValues(const Declaration &decl, QSize *radii);
QVector<Declaration> declarations;
QList<Declaration> declarations;
QFont f;
int adjustment;
int fontExtracted;

4
src/gui/text/qfontdatabase_p.h
View File

@ -262,9 +262,9 @@ public:
int stretch = QFont::Unstretched;
};
QVector<Properties> properties;
QList<Properties> properties;
};
QVector<ApplicationFont> applicationFonts;
QList<ApplicationFont> applicationFonts;
int addAppFont(const QByteArray &fontData, const QString &fileName);
bool isApplicationFont(const QString &fileName);

4
src/gui/text/qfontengine_p.h
View File

@ -353,7 +353,7 @@ public:
return left_right < other.left_right;
}
};
QVector<KernPair> kerning_pairs;
QList<KernPair> kerning_pairs;
void loadKerningPairs(QFixed scalingFactor);
GlyphFormat glyphFormat;
@ -513,7 +513,7 @@ protected:
virtual QFontEngine *loadEngine(int at);
private:
QVector<QFontEngine *> m_engines;
QList<QFontEngine *> m_engines;
QStringList m_fallbackFamilies;
const int m_script;
bool m_fallbackFamiliesQueried;

8
src/gui/text/qfontsubset_p.h
View File

@ -76,8 +76,8 @@ public:
#ifndef QT_NO_PDF
QByteArray widthArray() const;
QByteArray createToUnicodeMap() const;
QVector<int> getReverseMap() const;
QByteArray glyphName(unsigned int glyph, const QVector<int> &reverseMap) const;
QList<int> getReverseMap() const;
QByteArray glyphName(unsigned int glyph, const QList<int> &reverseMap) const;
static QByteArray glyphName(unsigned short unicode, bool symbol);
@ -86,12 +86,12 @@ public:
const int object_id;
bool noEmbed;
QFontEngine *fontEngine;
QVector<int> glyph_indices;
QList<int> glyph_indices;
mutable int downloaded_glyphs;
mutable bool standard_font;
int nGlyphs() const { return glyph_indices.size(); }
mutable QFixed emSquare;
mutable QVector<QFixed> widths;
mutable QList<QFixed> widths;
};
QT_END_NAMESPACE

12
src/gui/text/qglyphrun.h
View File

@ -41,9 +41,9 @@
#define QGLYPHRUN_H
#include <QtGui/qtguiglobal.h>
#include <QtCore/qsharedpointer.h>
#include <QtCore/qvector.h>
#include <QtCore/qlist.h>
#include <QtCore/qpoint.h>
#include <QtCore/qsharedpointer.h>
#include <QtGui/qrawfont.h>
#if !defined(QT_NO_RAWFONT)
@ -79,11 +79,11 @@ public:
const QPointF *glyphPositionArray,
int size);
QVector<quint32> glyphIndexes() const;
void setGlyphIndexes(const QVector<quint32> &glyphIndexes);
QList<quint32> glyphIndexes() const;
void setGlyphIndexes(const QList<quint32> &glyphIndexes);
QVector<QPointF> positions() const;
void setPositions(const QVector<QPointF> &positions);
QList<QPointF> positions() const;
void setPositions(const QList<QPointF> &positions);
void clear();

4
src/gui/text/qglyphrun_p.h
View File

@ -90,8 +90,8 @@ public:
{
}
QVector<quint32> glyphIndexes;
QVector<QPointF> glyphPositions;
QList<quint32> glyphIndexes;
QList<QPointF> glyphPositions;
QRawFont rawFont;
QRectF boundingRect;

16
src/gui/text/qrawfont.h
View File

@ -97,9 +97,10 @@ public:
QFont::Style style() const;
int weight() const;
QVector<quint32> glyphIndexesForString(const QString &text) const;
inline QVector<QPointF> advancesForGlyphIndexes(const QVector<quint32> &glyphIndexes) const;
inline QVector<QPointF> advancesForGlyphIndexes(const QVector<quint32> &glyphIndexes, LayoutFlags layoutFlags) const;
QList<quint32> glyphIndexesForString(const QString &text) const;
inline QList<QPointF> advancesForGlyphIndexes(const QList<quint32> &glyphIndexes) const;
inline QList<QPointF> advancesForGlyphIndexes(const QList<quint32> &glyphIndexes,
LayoutFlags layoutFlags) const;
bool glyphIndexesForChars(const QChar *chars, int numChars, quint32 *glyphIndexes, int *numGlyphs) const;
bool advancesForGlyphIndexes(const quint32 *glyphIndexes, QPointF *advances, int numGlyphs) const;
bool advancesForGlyphIndexes(const quint32 *glyphIndexes, QPointF *advances, int numGlyphs, LayoutFlags layoutFlags) const;
@ -158,15 +159,16 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QRawFont::LayoutFlags)
Q_GUI_EXPORT size_t qHash(const QRawFont &font, size_t seed = 0) noexcept;
inline QVector<QPointF> QRawFont::advancesForGlyphIndexes(const QVector<quint32> &glyphIndexes, QRawFont::LayoutFlags layoutFlags) const
inline QList<QPointF> QRawFont::advancesForGlyphIndexes(const QList<quint32> &glyphIndexes,
QRawFont::LayoutFlags layoutFlags) const
{
QVector<QPointF> advances(glyphIndexes.size());
QList<QPointF> advances(glyphIndexes.size());
if (advancesForGlyphIndexes(glyphIndexes.constData(), advances.data(), glyphIndexes.size(), layoutFlags))
return advances;
return QVector<QPointF>();
return QList<QPointF>();
}
inline QVector<QPointF> QRawFont::advancesForGlyphIndexes(const QVector<quint32> &glyphIndexes) const
inline QList<QPointF> QRawFont::advancesForGlyphIndexes(const QList<quint32> &glyphIndexes) const
{
return advancesForGlyphIndexes(glyphIndexes, QRawFont::SeparateAdvances);
}

2
src/gui/text/qtextdocument.h
View File

@ -230,7 +230,7 @@ public:
QVariant resource(int type, const QUrl &name) const;
void addResource(int type, const QUrl &name, const QVariant &resource);
QVector<QTextFormat> allFormats() const;
QList<QTextFormat> allFormats() const;
void markContentsDirty(int from, int length);

25
src/gui/text/qtextdocument_p.h
View File

@ -52,22 +52,23 @@
//
#include <QtGui/private/qtguiglobal_p.h>
#include "QtCore/qstring.h"
#include "QtCore/qvector.h"
#include "QtCore/qlist.h"
#include "private/qobject_p.h"
#include "private/qfragmentmap_p.h"
#include "QtGui/qtextlayout.h"
#include "QtGui/qtextoption.h"
#include "private/qtextformat_p.h"
#include "QtGui/qtextdocument.h"
#include "QtGui/qtextobject.h"
#include "QtGui/qtextcursor.h"
#include "QtGui/qtextdocument.h"
#include "QtGui/qtextlayout.h"
#include "QtGui/qtextobject.h"
#include "QtGui/qtextoption.h"
#include "QtCore/qlist.h"
#include "QtCore/qmap.h"
#include "QtCore/qvariant.h"
#include "QtCore/qset.h"
#include "QtCore/qstring.h"
#include "QtCore/qurl.h"
#include "QtCore/qvariant.h"
#include "private/qcssparser_p.h"
#include "private/qfragmentmap_p.h"
#include "private/qobject_p.h"
#include "private/qtextformat_p.h"
// #define QT_QMAP_DEBUG
@ -339,7 +340,7 @@ private:
QString text;
uint unreachableCharacterCount;
QVector<QTextUndoCommand> undoStack;
QList<QTextUndoCommand> undoStack;
bool undoEnabled;
int undoState;
int revision;

4
src/gui/text/qtextdocumentfragment_p.h
View File

@ -150,7 +150,7 @@ private:
QPointer<QTextList> list;
};
friend class QTypeInfo<List>;
QVector<List> lists;
QList<List> lists;
int indent;
int headingLevel;
@ -205,7 +205,7 @@ private:
int lastIndent;
};
friend class QTypeInfo<Table>;
QVector<Table> tables;
QList<Table> tables;
struct RowColSpanInfo
{

54
src/gui/text/qtextengine_p.h
View File

@ -52,27 +52,27 @@
//
#include <QtGui/private/qtguiglobal_p.h>
#include "QtCore/qstring.h"
#include "QtCore/qvarlengtharray.h"
#include "QtCore/qnamespace.h"
#include "QtGui/qtextlayout.h"
#include "private/qtextformat_p.h"
#include "private/qfont_p.h"
#include "QtCore/qvector.h"
#include "QtGui/qpaintengine.h"
#include "QtGui/qtextcursor.h"
#include "QtGui/qtextobject.h"
#include "QtGui/qtextoption.h"
#include "QtGui/qtextcursor.h"
#include "QtCore/qset.h"
#include "QtGui/qtextlayout.h"
#include "QtCore/qdebug.h"
#include "QtCore/qlist.h"
#include "QtCore/qnamespace.h"
#include "QtCore/qset.h"
#include "QtCore/qstring.h"
#include "QtCore/qvarlengtharray.h"
#include "private/qfixed_p.h"
#include "private/qfont_p.h"
#include "private/qtextformat_p.h"
#include "private/qunicodetools_p.h"
#ifndef QT_BUILD_COMPAT_LIB
#include "private/qtextdocument_p.h"
#endif
#include "private/qfixed_p.h"
#include <private/qunicodetools_p.h>
#include <stdlib.h>
#include <vector>
@ -394,7 +394,7 @@ inline void QScriptLine::operator+=(const QScriptLine &other)
length += other.length;
}
typedef QVector<QScriptLine> QScriptLineArray;
typedef QList<QScriptLine> QScriptLineArray;
class QFontPrivate;
class QTextFormatCollection;
@ -426,7 +426,7 @@ public:
};
struct ItemDecoration {
ItemDecoration() {} // for QVector, don't use
ItemDecoration() { } // for QList, don't use
ItemDecoration(qreal x1, qreal x2, qreal y, const QPen &pen):
x1(x1), x2(x2), y(y), pen(pen) {}
@ -436,7 +436,7 @@ public:
QPen pen;
};
typedef QVector<ItemDecoration> ItemDecorationList;
typedef QList<ItemDecoration> ItemDecorationList;
QTextEngine();
QTextEngine(const QString &str, const QFont &f);
@ -597,9 +597,11 @@ public:
inline bool hasFormats() const
{ return QTextDocumentPrivate::get(block) != nullptr || (specialData && !specialData->formats.isEmpty()); }
inline QVector<QTextLayout::FormatRange> formats() const
{ return specialData ? specialData->formats : QVector<QTextLayout::FormatRange>(); }
void setFormats(const QVector<QTextLayout::FormatRange> &formats);
inline QList<QTextLayout::FormatRange> formats() const
{
return specialData ? specialData->formats : QList<QTextLayout::FormatRange>();
}
void setFormats(const QList<QTextLayout::FormatRange> &formats);
private:
static void init(QTextEngine *e);
@ -607,8 +609,8 @@ private:
struct SpecialData {
int preeditPosition;
QString preeditText;
QVector<QTextLayout::FormatRange> formats;
QVector<QTextCharFormat> resolvedFormats;
QList<QTextLayout::FormatRange> formats;
QList<QTextCharFormat> resolvedFormats;
// only used when no QTextDocumentPrivate is available
QScopedPointer<QTextFormatCollection> formatCollection;
};
@ -654,13 +656,9 @@ private:
void addRequiredBoundaries() const;
void shapeText(int item) const;
#if QT_CONFIG(harfbuzz)
int shapeTextWithHarfbuzzNG(const QScriptItem &si,
const ushort *string,
int itemLength,
QFontEngine *fontEngine,
const QVector<uint> &itemBoundaries,
bool kerningEnabled,
bool hasLetterSpacing) const;
int shapeTextWithHarfbuzzNG(const QScriptItem &si, const ushort *string, int itemLength,
QFontEngine *fontEngine, const QList<uint> &itemBoundaries,
bool kerningEnabled, bool hasLetterSpacing) const;
#endif
int endOfLine(int lineNum);

19
src/gui/text/qtextformat.h
View File

@ -40,15 +40,16 @@
#ifndef QTEXTFORMAT_H
#define QTEXTFORMAT_H
#include <QtGui/qtguiglobal.h>
#include <QtGui/qbrush.h>
#include <QtGui/qcolor.h>
#include <QtGui/qfont.h>
#include <QtCore/qshareddata.h>
#include <QtCore/qvector.h>
#include <QtCore/qvariant.h>
#include <QtGui/qpen.h>
#include <QtGui/qbrush.h>
#include <QtGui/qtextoption.h>
#include <QtGui/qtguiglobal.h>
#include <QtCore/qlist.h>
#include <QtCore/qshareddata.h>
#include <QtCore/qvariant.h>
QT_BEGIN_NAMESPACE
@ -351,9 +352,9 @@ public:
QPen penProperty(int propertyId) const;
QBrush brushProperty(int propertyId) const;
QTextLength lengthProperty(int propertyId) const;
QVector<QTextLength> lengthVectorProperty(int propertyId) const;
QList<QTextLength> lengthVectorProperty(int propertyId) const;
void setProperty(int propertyId, const QVector<QTextLength> &lengths);
void setProperty(int propertyId, const QList<QTextLength> &lengths);
QMap<int, QVariant> properties() const;
int propertyCount() const;
@ -952,10 +953,10 @@ public:
{ int cols = intProperty(TableColumns); if (cols == 0) cols = 1; return cols; }
inline void setColumns(int columns);
inline void setColumnWidthConstraints(const QVector<QTextLength> &constraints)
inline void setColumnWidthConstraints(const QList<QTextLength> &constraints)
{ setProperty(TableColumnWidthConstraints, constraints); }
inline QVector<QTextLength> columnWidthConstraints() const
inline QList<QTextLength> columnWidthConstraints() const
{ return lengthVectorProperty(TableColumnWidthConstraints); }
inline void clearColumnWidthConstraints()

6
src/gui/text/qtextformat_p.h
View File

@ -53,7 +53,7 @@
#include <QtGui/private/qtguiglobal_p.h>
#include "QtGui/qtextformat.h"
#include "QtCore/qvector.h"
#include "QtCore/qlist.h"
QT_BEGIN_NAMESPACE
@ -92,10 +92,10 @@ public:
inline int numFormats() const { return formats.count(); }
typedef QVector<QTextFormat> FormatVector;
typedef QList<QTextFormat> FormatVector;
FormatVector formats;
QVector<qint32> objFormats;
QList<qint32> objFormats;
QMultiHash<size_t,int> hashes;
inline QFont defaultFont() const { return defaultFnt; }

23
src/gui/text/qtexthtmlparser_p.h
View File

@ -52,12 +52,14 @@
//
#include <QtGui/private/qtguiglobal_p.h>
#include "QtCore/qvector.h"
#include "QtGui/qbrush.h"
#include "QtGui/qcolor.h"
#include "QtGui/qfont.h"
#include "QtGui/qtextdocument.h"
#include "QtGui/qtextcursor.h"
#include "QtCore/qlist.h"
#include "private/qtextformat_p.h"
#include "private/qtextdocument_p.h"
#include "private/qcssparser_p.h"
@ -167,7 +169,7 @@ struct QTextHtmlParserNode {
QString text;
QStringList attributes;
int parent;
QVector<int> children;
QList<int> children;
QTextHTMLElements id;
QTextCharFormat charFormat;
QTextBlockFormat blockFormat;
@ -251,10 +253,11 @@ struct QTextHtmlParserNode {
void parseStyleAttribute(const QString &value, const QTextDocument *resourceProvider);
#if QT_CONFIG(cssparser)
void applyCssDeclarations(const QVector<QCss::Declaration> &declarations, const QTextDocument *resourceProvider);
void applyCssDeclarations(const QList<QCss::Declaration> &declarations,
const QTextDocument *resourceProvider);
void setListStyle(const QVector<QCss::Value> &cssValues);
#endif
void setListStyle(const QList<QCss::Value> &cssValues);
# endif
void applyForegroundImage(qint64 cacheKey, const QTextDocument *resourceProvider);
void applyBackgroundImage(const QString &url, const QTextDocument *resourceProvider);
@ -305,7 +308,7 @@ public:
static int lookupElement(const QString &element);
protected:
QTextHtmlParserNode *newNode(int parent);
QVector<QTextHtmlParserNode> nodes;
QList<QTextHtmlParserNode> nodes;
QString txt;
int pos, len;
@ -330,7 +333,7 @@ protected:
#if QT_CONFIG(cssparser)
QVector<QCss::Declaration> declarationsForNode(int node) const;
QList<QCss::Declaration> declarationsForNode(int node) const;
void resolveStyleSheetImports(const QCss::StyleSheet &sheet);
void importStyleSheet(const QString &href);
@ -343,9 +346,9 @@ protected:
QCss::StyleSheet sheet;
};
friend class QTypeInfo<ExternalStyleSheet>;
QVector<ExternalStyleSheet> externalStyleSheets;
QVector<QCss::StyleSheet> inlineStyleSheets;
#endif
QList<ExternalStyleSheet> externalStyleSheets;
QList<QCss::StyleSheet> inlineStyleSheets;
# endif
const QTextDocument *resourceProvider;
};

22
src/gui/text/qtextlayout.h
View File

@ -39,17 +39,18 @@
#ifndef QTEXTLAYOUT_H
#define QTEXTLAYOUT_H
#include <QtGui/qtguiglobal.h>
#include <QtCore/qstring.h>
#include <QtCore/qnamespace.h>
#include <QtCore/qrect.h>
#include <QtCore/qvector.h>
#include <QtGui/qcolor.h>
#include <QtCore/qobject.h>
#include <QtGui/qevent.h>
#include <QtGui/qtextformat.h>
#include <QtGui/qglyphrun.h>
#include <QtGui/qtextcursor.h>
#include <QtGui/qtextformat.h>
#include <QtGui/qtguiglobal.h>
#include <QtCore/qlist.h>
#include <QtCore/qnamespace.h>
#include <QtCore/qobject.h>
#include <QtCore/qrect.h>
#include <QtCore/qstring.h>
QT_BEGIN_NAMESPACE
@ -155,8 +156,8 @@ public:
QT_DEPRECATED_X("Use formats()") QList<FormatRange> additionalFormats() const;
QT_DEPRECATED_X("Use clearFormats()") void clearAdditionalFormats();
#endif
void setFormats(const QVector<FormatRange> &overrides);
QVector<FormatRange> formats() const;
void setFormats(const QList<FormatRange> &overrides);
QList<FormatRange> formats() const;
void clearFormats();
void setCacheEnabled(bool enable);
@ -185,7 +186,8 @@ public:
int leftCursorPosition(int oldPos) const;
int rightCursorPosition(int oldPos) const;
void draw(QPainter *p, const QPointF &pos, const QVector<FormatRange> &selections = QVector<FormatRange>(),
void draw(QPainter *p, const QPointF &pos,
const QList<FormatRange> &selections = QList<FormatRange>(),
const QRectF &clip = QRectF()) const;
void drawCursor(QPainter *p, const QPointF &pos, int cursorPosition) const;
void drawCursor(QPainter *p, const QPointF &pos, int cursorPosition, int width) const;

2
src/gui/text/qtextmarkdownimporter_p.h
View File

@ -113,7 +113,7 @@ private:
QString m_htmlAccumulator;
#endif
QString m_blockCodeLanguage;
QVector<int> m_nonEmptyTableCells; // in the current row
QList<int> m_nonEmptyTableCells; // in the current row
QStack<QPointer<QTextList>> m_listStack;
QStack<QTextCharFormat> m_spanFormatStack;
QFont m_monoFont;

2
src/gui/text/qtextobject.h
View File

@ -217,7 +217,7 @@ public:
QString text() const;
QVector<QTextLayout::FormatRange> textFormats() const;
QList<QTextLayout::FormatRange> textFormats() const;
const QTextDocument *document() const;

10
src/gui/text/qtextodfwriter_p.h
View File

@ -55,11 +55,11 @@
// We mean it.
//
#include <QtCore/QXmlStreamWriter>
#include <QtCore/qhash.h>
#include <QtCore/qlist.h>
#include <QtCore/qset.h>
#include <QtCore/qstack.h>
#include <QtCore/qvector.h>
#include <QtCore/QXmlStreamWriter>
#include "qtextdocument_p.h"
#include "qtextdocumentwriter.h"
@ -96,8 +96,8 @@ public:
void writeListFormat(QXmlStreamWriter &writer, QTextListFormat format, int formatIndex) const;
void writeFrameFormat(QXmlStreamWriter &writer, QTextFrameFormat format, int formatIndex) const;
void writeTableFormat(QXmlStreamWriter &writer, QTextTableFormat format, int formatIndex) const;
void writeTableCellFormat(QXmlStreamWriter &writer, QTextTableCellFormat format, int formatIndex,
QVector<QTextFormat> &styles) const;
void writeTableCellFormat(QXmlStreamWriter &writer, QTextTableCellFormat format,
int formatIndex, QList<QTextFormat> &styles) const;
void writeFrame(QXmlStreamWriter &writer, const QTextFrame *frame);
void writeInlineCharacter(QXmlStreamWriter &writer, const QTextFragment &fragment) const;
@ -119,7 +119,7 @@ private:
QStack<QTextList *> m_listStack;
QHash<int, QVector<int>> m_cellFormatsInTablesWithBorders;
QHash<int, QList<int>> m_cellFormatsInTablesWithBorders;
QSet<int> m_tableFormatsWithBorders;
mutable QSet<int> m_tableFormatsWithColWidthConstraints;
};

4
src/gui/text/qtexttable_p.h
View File

@ -72,10 +72,10 @@ public:
int findCellIndex(int fragment) const;
QVector<int> cells;
QList<int> cells;
// symmetric to cells array and maps to indecs in grid,
// used for fast-lookup for row/column by fragment
mutable QVector<int> cellIndices;
mutable QList<int> cellIndices;
mutable int *grid;
mutable int nRows;
mutable int nCols;

2
src/gui/text/qzipreader_p.h
View File

@ -95,7 +95,7 @@ public:
QDateTime lastModified;
};
QVector<FileInfo> fileInfoList() const;
QList<FileInfo> fileInfoList() const;
int count() const;
FileInfo entryInfoAt(int index) const;

2
src/gui/text/unix/qfontenginemultifontconfig_p.h
View File

@ -67,7 +67,7 @@ public:
private:
FcPattern* getMatchPatternForFallback(int at) const;
mutable QVector<FcPattern*> cachedMatchPatterns;
mutable QList<FcPattern *> cachedMatchPatterns;
};
QT_END_NAMESPACE

39
src/gui/util/qgridlayoutengine_p.h
View File

@ -52,14 +52,15 @@
//
#include <QtGui/private/qtguiglobal_p.h>
#include "qalgorithms.h"
#include "qbitarray.h"
#include "qlist.h"
#include "qmap.h"
#include "qpair.h"
#include <QtCore/qvector.h>
#include <QtCore/qalgorithms.h>
#include <QtCore/qbitarray.h>
#include <QtCore/qlist.h>
#include <QtCore/qmap.h>
#include <QtCore/qpair.h>
#include <QtCore/qsize.h>
#include <QtCore/qrect.h>
#include <float.h>
#include "qlayoutpolicy_p.h"
#include "qabstractlayoutstyleinfo_p.h"
@ -277,10 +278,10 @@ public:
#endif
QBitArray ignore; // ### rename q_
QVector<QGridLayoutBox> boxes;
QList<QGridLayoutBox> boxes;
MultiCellMap multiCellMap;
QVector<int> stretches;
QVector<qreal> spacings;
QList<int> stretches;
QList<qreal> spacings;
bool hasIgnoreFlag;
};
@ -296,10 +297,10 @@ public:
#endif
int count;
QVector<QStretchParameter> stretches;
QVector<QLayoutParameter<qreal> > spacings;
QVector<Qt::Alignment> alignments;
QVector<QGridLayoutBox> boxes;
QList<QStretchParameter> stretches;
QList<QLayoutParameter<qreal>> spacings;
QList<Qt::Alignment> alignments;
QList<QGridLayoutBox> boxes;
};
@ -471,7 +472,7 @@ protected:
QList<QGridLayoutItem *> q_items;
private:
// User input
QVector<QGridLayoutItem *> q_grid;
QList<QGridLayoutItem *> q_grid;
QHVContainer<QLayoutParameter<qreal>> q_defaultSpacings;
QHVContainer<QGridLayoutRowInfo> q_infos;
Qt::LayoutDirection m_visualDirection;
@ -500,11 +501,11 @@ private:
// Output
mutable QSizeF q_cachedSize;
mutable QVector<qreal> q_xx;
mutable QVector<qreal> q_yy;
mutable QVector<qreal> q_widths;
mutable QVector<qreal> q_heights;
mutable QVector<qreal> q_descents;
mutable QList<qreal> q_xx;
mutable QList<qreal> q_yy;
mutable QList<qreal> q_widths;
mutable QList<qreal> q_heights;
mutable QList<qreal> q_descents;
friend class QGridLayoutItem;
};

15
src/gui/util/qshadergraph_p.h
View File

@ -77,23 +77,24 @@ public:
Q_GUI_EXPORT int portIndex(QShaderNodePort::Direction direction, const QString &portName) const noexcept;
QShaderNode node;
QVector<int> inputs;
QVector<int> outputs;
QList<int> inputs;
QList<int> outputs;
};
Q_GUI_EXPORT void addNode(const QShaderNode &node);
Q_GUI_EXPORT void removeNode(const QShaderNode &node);
Q_GUI_EXPORT QVector<QShaderNode> nodes() const noexcept;
Q_GUI_EXPORT QList<QShaderNode> nodes() const noexcept;
Q_GUI_EXPORT void addEdge(const Edge &edge);
Q_GUI_EXPORT void removeEdge(const Edge &edge);
Q_GUI_EXPORT QVector<Edge> edges() const noexcept;
Q_GUI_EXPORT QList<Edge> edges() const noexcept;
Q_GUI_EXPORT QVector<Statement> createStatements(const QStringList &enabledLayers = QStringList()) const;
Q_GUI_EXPORT QList<Statement>
createStatements(const QStringList &enabledLayers = QStringList()) const;
private:
QVector<QShaderNode> m_nodes;
QVector<Edge> m_edges;
QList<QShaderNode> m_nodes;
QList<Edge> m_edges;
};
Q_GUI_EXPORT bool operator==(const QShaderGraph::Edge &lhs, const QShaderGraph::Edge &rhs) noexcept;

8
src/gui/util/qshadernode_p.h
View File

@ -87,7 +87,7 @@ public:
Q_GUI_EXPORT QStringList layers() const noexcept;
Q_GUI_EXPORT void setLayers(const QStringList &layers) noexcept;
Q_GUI_EXPORT QVector<QShaderNodePort> ports() const noexcept;
Q_GUI_EXPORT QList<QShaderNodePort> ports() const noexcept;
Q_GUI_EXPORT void addPort(const QShaderNodePort &port);
Q_GUI_EXPORT void removePort(const QShaderNodePort &port);
@ -99,15 +99,15 @@ public:
Q_GUI_EXPORT void addRule(const QShaderFormat &format, const Rule &rule);
Q_GUI_EXPORT void removeRule(const QShaderFormat &format);
Q_GUI_EXPORT QVector<QShaderFormat> availableFormats() const;
Q_GUI_EXPORT QList<QShaderFormat> availableFormats() const;
Q_GUI_EXPORT Rule rule(const QShaderFormat &format) const;
private:
QUuid m_uuid;
QStringList m_layers;
QVector<QShaderNodePort> m_ports;
QList<QShaderNodePort> m_ports;
QHash<QString, QVariant> m_parameters;
QVector<QPair<QShaderFormat, QShaderNode::Rule>> m_rules;
QList<QPair<QShaderFormat, QShaderNode::Rule>> m_rules;
};
Q_GUI_EXPORT bool operator==(const QShaderNode::Rule &lhs, const QShaderNode::Rule &rhs) noexcept;

6
src/gui/vulkan/qbasicvulkanplatforminstance_p.h
View File

@ -75,10 +75,10 @@ public:
QByteArrayList enabledExtensions() const override;
PFN_vkVoidFunction getInstanceProcAddr(const char *name) override;
bool supportsPresent(VkPhysicalDevice physicalDevice, uint32_t queueFamilyIndex, QWindow *window) override;
void setDebugFilters(const QVector<QVulkanInstance::DebugFilter> &filters) override;
void setDebugFilters(const QList<QVulkanInstance::DebugFilter> &filters) override;
void destroySurface(VkSurfaceKHR surface) const;
const QVector<QVulkanInstance::DebugFilter> *debugFilters() const { return &m_debugFilters; }
const QList<QVulkanInstance::DebugFilter> *debugFilters() const { return &m_debugFilters; }
protected:
void loadVulkanLibrary(const QString &defaultLibraryName);
@ -110,7 +110,7 @@ private:
VkDebugReportCallbackEXT m_debugCallback;
PFN_vkDestroyDebugReportCallbackEXT m_vkDestroyDebugReportCallbackEXT;
QVector<QVulkanInstance::DebugFilter> m_debugFilters;
QList<QVulkanInstance::DebugFilter> m_debugFilters;
};
QT_END_NAMESPACE

2
src/gui/vulkan/qplatformvulkaninstance.h
View File

@ -79,7 +79,7 @@ public:
virtual bool supportsPresent(VkPhysicalDevice physicalDevice, uint32_t queueFamilyIndex, QWindow *window) = 0;
virtual void presentAboutToBeQueued(QWindow *window);
virtual void presentQueued(QWindow *window);
virtual void setDebugFilters(const QVector<QVulkanInstance::DebugFilter> &filters);
virtual void setDebugFilters(const QList<QVulkanInstance::DebugFilter> &filters);
private:
QScopedPointer<QPlatformVulkanInstancePrivate> d_ptr;

10
src/gui/vulkan/qvulkaninstance.h
View File

@ -64,12 +64,12 @@ typedef void* VkDevice;
typedef int VkResult;
#endif
#include <QtCore/qhashfunctions.h>
#include <QtCore/qscopedpointer.h>
#include <QtCore/qvector.h>
#include <QtCore/qbytearraylist.h>
#include <QtCore/qversionnumber.h>
#include <QtCore/qdebug.h>
#include <QtCore/qhashfunctions.h>
#include <QtCore/qlist.h>
#include <QtCore/qscopedpointer.h>
#include <QtCore/qversionnumber.h>
QT_BEGIN_NAMESPACE
@ -132,7 +132,7 @@ Q_GUI_EXPORT QDebug operator<<(QDebug, const QVulkanExtension &);
#endif
template<typename T>
class QVulkanInfoVector : public QVector<T>
class QVulkanInfoVector : public QList<T>
{
public:
bool contains(const QByteArray &name) const {

12
src/gui/vulkan/qvulkanwindow.h
View File

@ -106,20 +106,20 @@ public:
void setFlags(Flags flags);
Flags flags() const;
QVector<VkPhysicalDeviceProperties> availablePhysicalDevices();
QList<VkPhysicalDeviceProperties> availablePhysicalDevices();
void setPhysicalDeviceIndex(int idx);
QVulkanInfoVector<QVulkanExtension> supportedDeviceExtensions();
void setDeviceExtensions(const QByteArrayList &extensions);
void setPreferredColorFormats(const QVector<VkFormat> &formats);
void setPreferredColorFormats(const QList<VkFormat> &formats);
QVector<int> supportedSampleCounts();
QList<int> supportedSampleCounts();
void setSampleCount(int sampleCount);
typedef std::function<void(const VkQueueFamilyProperties *,
uint32_t,
QVector<VkDeviceQueueCreateInfo> &)> QueueCreateInfoModifier;
typedef std::function<void(const VkQueueFamilyProperties *, uint32_t,
QList<VkDeviceQueueCreateInfo> &)>
QueueCreateInfoModifier;
void setQueueCreateInfoModifier(const QueueCreateInfoModifier &modifier);
bool isValid() const;

6
src/gui/vulkan/qvulkanwindow_p.h
View File

@ -95,12 +95,12 @@ public:
QVulkanInstance *inst = nullptr;
VkSurfaceKHR surface = VK_NULL_HANDLE;
int physDevIndex = 0;
QVector<VkPhysicalDevice> physDevs;
QVector<VkPhysicalDeviceProperties> physDevProps;
QList<VkPhysicalDevice> physDevs;
QList<VkPhysicalDeviceProperties> physDevProps;
QVulkanWindow::Flags flags;
QByteArrayList requestedDevExtensions;
QHash<VkPhysicalDevice, QVulkanInfoVector<QVulkanExtension> > supportedDevExtensions;
QVector<VkFormat> requestedColorFormats;
QList<VkFormat> requestedColorFormats;
VkSampleCountFlagBits sampleCount = VK_SAMPLE_COUNT_1_BIT;
QVulkanWindow::QueueCreateInfoModifier queueCreateInfoModifier;