summaryrefslogtreecommitdiffstats
path: root/src/widgets/graphicsview
diff options
context:
space:
mode:
Diffstat (limited to 'src/widgets/graphicsview')
-rw-r--r--src/widgets/graphicsview/qgraph_p.h5
-rw-r--r--src/widgets/graphicsview/qgraphicsanchorlayout_p.cpp16
-rw-r--r--src/widgets/graphicsview/qgraphicsanchorlayout_p.h8
-rw-r--r--src/widgets/graphicsview/qgraphicsitem.cpp2
-rw-r--r--src/widgets/graphicsview/qgraphicsitem_p.h6
-rw-r--r--src/widgets/graphicsview/qgraphicsitemanimation.cpp32
-rw-r--r--src/widgets/graphicsview/qgraphicsscene_bsp_p.h6
-rw-r--r--src/widgets/graphicsview/qgraphicsscene_p.h2
-rw-r--r--src/widgets/graphicsview/qgraphicsview.cpp2
-rw-r--r--src/widgets/graphicsview/qgraphicsview_p.h2
10 files changed, 40 insertions, 41 deletions
diff --git a/src/widgets/graphicsview/qgraph_p.h b/src/widgets/graphicsview/qgraph_p.h
index dfe9d8fdd3..ce04b16265 100644
--- a/src/widgets/graphicsview/qgraph_p.h
+++ b/src/widgets/graphicsview/qgraph_p.h
@@ -214,8 +214,9 @@ public:
return setOfVertices;
}
- QVector<QPair<Vertex*, Vertex*> > connections() const {
- QVector<QPair<Vertex*, Vertex*> > conns;
+ QList<QPair<Vertex *, Vertex *>> connections() const
+ {
+ QList<QPair<Vertex *, Vertex *>> conns;
for (const_iterator it = constBegin(); it != constEnd(); ++it) {
Vertex *from = it.from();
Vertex *to = it.to();
diff --git a/src/widgets/graphicsview/qgraphicsanchorlayout_p.cpp b/src/widgets/graphicsview/qgraphicsanchorlayout_p.cpp
index 532fceafc8..be26b2785e 100644
--- a/src/widgets/graphicsview/qgraphicsanchorlayout_p.cpp
+++ b/src/widgets/graphicsview/qgraphicsanchorlayout_p.cpp
@@ -728,10 +728,8 @@ AnchorData *QGraphicsAnchorLayoutPrivate::addAnchorMaybeParallel(AnchorData *new
Note that this function doesn't add the created anchor to the graph. This should be done by
the caller.
*/
-static AnchorData *createSequence(Graph<AnchorVertex, AnchorData> *graph,
- AnchorVertex *before,
- const QVector<AnchorVertex*> &vertices,
- AnchorVertex *after)
+static AnchorData *createSequence(Graph<AnchorVertex, AnchorData> *graph, AnchorVertex *before,
+ const QList<AnchorVertex *> &vertices, AnchorVertex *after)
{
#if defined(QT_DEBUG) && 0
QString strVertices;
@@ -743,7 +741,7 @@ static AnchorData *createSequence(Graph<AnchorVertex, AnchorData> *graph,
#endif
AnchorVertex *prev = before;
- QVector<AnchorData *> edges;
+ QList<AnchorData *> edges;
edges.reserve(vertices.count() + 1);
const int numVertices = vertices.count();
@@ -1022,7 +1020,7 @@ bool QGraphicsAnchorLayoutPrivate::simplifyGraphIteration(Qt::Orientation orient
QSet<AnchorVertex *> visited;
QStack<QPair<AnchorVertex *, AnchorVertex *> > stack;
stack.push(qMakePair(static_cast<AnchorVertex *>(nullptr), layoutFirstVertex[orientation]));
- QVector<AnchorVertex*> candidates;
+ QList<AnchorVertex *> candidates;
// Walk depth-first, in the stack we store start of the candidate sequence (beforeSequence)
// and the vertex to be visited.
@@ -1252,7 +1250,7 @@ void QGraphicsAnchorLayoutPrivate::restoreSimplifiedGraph(Qt::Orientation orient
// Restore anchor simplification
Graph<AnchorVertex, AnchorData> &g = graph[orientation];
- QVector<QPair<AnchorVertex*, AnchorVertex*> > connections = g.connections();
+ QList<QPair<AnchorVertex *, AnchorVertex *>> connections = g.connections();
for (int i = 0; i < connections.count(); ++i) {
AnchorVertex *v1 = connections.at(i).first;
AnchorVertex *v2 = connections.at(i).second;
@@ -2274,7 +2272,7 @@ bool QGraphicsAnchorLayoutPrivate::calculateNonTrunk(const QList<QSimplexConstra
void QGraphicsAnchorLayoutPrivate::refreshAllSizeHints(Qt::Orientation orientation)
{
Graph<AnchorVertex, AnchorData> &g = graph[orientation];
- QVector<QPair<AnchorVertex *, AnchorVertex *> > vertices = g.connections();
+ QList<QPair<AnchorVertex *, AnchorVertex *>> vertices = g.connections();
QLayoutStyleInfo styleInf = styleInfo();
for (int i = 0; i < vertices.count(); ++i) {
@@ -2367,7 +2365,7 @@ void QGraphicsAnchorLayoutPrivate::constraintsFromPaths(Qt::Orientation orientat
void QGraphicsAnchorLayoutPrivate::updateAnchorSizes(Qt::Orientation orientation)
{
Graph<AnchorVertex, AnchorData> &g = graph[orientation];
- const QVector<QPair<AnchorVertex *, AnchorVertex *> > &vertices = g.connections();
+ const QList<QPair<AnchorVertex *, AnchorVertex *>> &vertices = g.connections();
for (int i = 0; i < vertices.count(); ++i) {
AnchorData *ad = g.edgeData(vertices.at(i).first, vertices.at(i).second);
diff --git a/src/widgets/graphicsview/qgraphicsanchorlayout_p.h b/src/widgets/graphicsview/qgraphicsanchorlayout_p.h
index 4f746f0172..11b3ebd576 100644
--- a/src/widgets/graphicsview/qgraphicsanchorlayout_p.h
+++ b/src/widgets/graphicsview/qgraphicsanchorlayout_p.h
@@ -190,7 +190,7 @@ inline QString AnchorData::toString() const
struct SequentialAnchorData : public AnchorData
{
- SequentialAnchorData(const QVector<AnchorVertex *> &vertices, const QVector<AnchorData *> &edges)
+ SequentialAnchorData(const QList<AnchorVertex *> &vertices, const QList<AnchorData *> &edges)
: AnchorData(), m_children(vertices), m_edges(edges)
{
type = AnchorData::Sequential;
@@ -203,8 +203,8 @@ struct SequentialAnchorData : public AnchorData
virtual void updateChildrenSizes() override;
void calculateSizeHints();
- QVector<AnchorVertex*> m_children; // list of vertices in the sequence
- QVector<AnchorData*> m_edges; // keep the list of edges too.
+ QList<AnchorVertex *> m_children; // list of vertices in the sequence
+ QList<AnchorData *> m_edges; // keep the list of edges too.
};
struct ParallelAnchorData : public AnchorData
@@ -556,7 +556,7 @@ public:
QHVContainer<std::array<qreal, 3>> sizeHints = {{-1, -1, -1}, {-1, -1, -1}};
// Items
- QVector<QGraphicsLayoutItem *> items;
+ QList<QGraphicsLayoutItem *> items;
// Mapping between high level anchorage points (Item, Edge) to low level
// ones (Graph Vertices)
diff --git a/src/widgets/graphicsview/qgraphicsitem.cpp b/src/widgets/graphicsview/qgraphicsitem.cpp
index bfe1e89edc..fef3f0774f 100644
--- a/src/widgets/graphicsview/qgraphicsitem.cpp
+++ b/src/widgets/graphicsview/qgraphicsitem.cpp
@@ -10786,7 +10786,7 @@ void QGraphicsSimpleTextItem::paint(QPainter *painter, const QStyleOptionGraphic
range.start = 0;
range.length = layout.text().length();
range.format.setTextOutline(d->pen);
- layout.setFormats(QVector<QTextLayout::FormatRange>(1, range));
+ layout.setFormats(QList<QTextLayout::FormatRange>(1, range));
}
setupTextLayout(&layout);
diff --git a/src/widgets/graphicsview/qgraphicsitem_p.h b/src/widgets/graphicsview/qgraphicsitem_p.h
index 92d85f7125..fe8be8eae7 100644
--- a/src/widgets/graphicsview/qgraphicsitem_p.h
+++ b/src/widgets/graphicsview/qgraphicsitem_p.h
@@ -144,7 +144,7 @@ public:
QHash<QPaintDevice *, DeviceData> deviceData;
// List of logical exposed rects
- QVector<QRectF> exposed;
+ QList<QRectF> exposed;
bool allExposed;
// Empty cache
@@ -289,7 +289,7 @@ public:
}
struct ExtraStruct {
- ExtraStruct() {} // for QVector, don't use
+ ExtraStruct() { } // for QList, don't use
ExtraStruct(Extra type, const QVariant &value)
: type(type), value(value)
{ }
@@ -301,7 +301,7 @@ public:
{ return type < extra; }
};
- QVector<ExtraStruct> extras;
+ QList<ExtraStruct> extras;
QGraphicsItemCache *maybeExtraItemCache() const;
QGraphicsItemCache *extraItemCache() const;
diff --git a/src/widgets/graphicsview/qgraphicsitemanimation.cpp b/src/widgets/graphicsview/qgraphicsitemanimation.cpp
index 981a4634bb..e0b881c18e 100644
--- a/src/widgets/graphicsview/qgraphicsitemanimation.cpp
+++ b/src/widgets/graphicsview/qgraphicsitemanimation.cpp
@@ -126,22 +126,23 @@ public:
qreal step;
qreal value;
};
- QVector<Pair> xPosition;
- QVector<Pair> yPosition;
- QVector<Pair> rotation;
- QVector<Pair> verticalScale;
- QVector<Pair> horizontalScale;
- QVector<Pair> verticalShear;
- QVector<Pair> horizontalShear;
- QVector<Pair> xTranslation;
- QVector<Pair> yTranslation;
-
- qreal linearValueForStep(qreal step, const QVector<Pair> &source, qreal defaultValue = 0);
- void insertUniquePair(qreal step, qreal value, QVector<Pair> *binList, const char* method);
+ QList<Pair> xPosition;
+ QList<Pair> yPosition;
+ QList<Pair> rotation;
+ QList<Pair> verticalScale;
+ QList<Pair> horizontalScale;
+ QList<Pair> verticalShear;
+ QList<Pair> horizontalShear;
+ QList<Pair> xTranslation;
+ QList<Pair> yTranslation;
+
+ qreal linearValueForStep(qreal step, const QList<Pair> &source, qreal defaultValue = 0);
+ void insertUniquePair(qreal step, qreal value, QList<Pair> *binList, const char *method);
};
Q_DECLARE_TYPEINFO(QGraphicsItemAnimationPrivate::Pair, Q_PRIMITIVE_TYPE);
-qreal QGraphicsItemAnimationPrivate::linearValueForStep(qreal step, const QVector<Pair> &source, qreal defaultValue)
+qreal QGraphicsItemAnimationPrivate::linearValueForStep(qreal step, const QList<Pair> &source,
+ qreal defaultValue)
{
if (source.isEmpty())
return defaultValue;
@@ -171,14 +172,15 @@ qreal QGraphicsItemAnimationPrivate::linearValueForStep(qreal step, const QVecto
return valueBefore + (valueAfter - valueBefore) * ((step - stepBefore) / (stepAfter - stepBefore));
}
-void QGraphicsItemAnimationPrivate::insertUniquePair(qreal step, qreal value, QVector<Pair> *binList, const char* method)
+void QGraphicsItemAnimationPrivate::insertUniquePair(qreal step, qreal value, QList<Pair> *binList,
+ const char *method)
{
if (!check_step_valid(step, method))
return;
const Pair pair = { step, value };
- const QVector<Pair>::iterator result = std::lower_bound(binList->begin(), binList->end(), pair);
+ const QList<Pair>::iterator result = std::lower_bound(binList->begin(), binList->end(), pair);
if (result == binList->end() || pair < *result)
binList->insert(result, pair);
else
diff --git a/src/widgets/graphicsview/qgraphicsscene_bsp_p.h b/src/widgets/graphicsview/qgraphicsscene_bsp_p.h
index 26e612b2dd..d81c0776ed 100644
--- a/src/widgets/graphicsview/qgraphicsscene_bsp_p.h
+++ b/src/widgets/graphicsview/qgraphicsscene_bsp_p.h
@@ -53,10 +53,8 @@
#include <QtWidgets/private/qtwidgetsglobal_p.h>
#include <QtCore/qlist.h>
-
#include <QtCore/qrect.h>
#include <QtCore/qset.h>
-#include <QtCore/qvector.h>
QT_REQUIRE_CONFIG(graphicsview);
@@ -107,8 +105,8 @@ private:
void climbTree(QGraphicsSceneBspTreeVisitor *visitor, const QRectF &rect, int index = 0) const;
QRectF rectForIndex(int index) const;
- QVector<Node> nodes;
- QVector<QList<QGraphicsItem *> > leaves;
+ QList<Node> nodes;
+ QList<QList<QGraphicsItem *>> leaves;
int leafCnt;
QRectF rect;
diff --git a/src/widgets/graphicsview/qgraphicsscene_p.h b/src/widgets/graphicsview/qgraphicsscene_p.h
index 9ecfca8ebf..48681cafae 100644
--- a/src/widgets/graphicsview/qgraphicsscene_p.h
+++ b/src/widgets/graphicsview/qgraphicsscene_p.h
@@ -142,7 +142,7 @@ public:
QPainterPath selectionArea;
int selectionChanging;
QSet<QGraphicsItem *> selectedItems;
- QVector<QGraphicsItem *> unpolishedItems;
+ QList<QGraphicsItem *> unpolishedItems;
QList<QGraphicsItem *> topLevelItems;
QHash<QGraphicsItem *, QPointF> movingItemsInitialPositions;
diff --git a/src/widgets/graphicsview/qgraphicsview.cpp b/src/widgets/graphicsview/qgraphicsview.cpp
index be097447e5..d3d49f4395 100644
--- a/src/widgets/graphicsview/qgraphicsview.cpp
+++ b/src/widgets/graphicsview/qgraphicsview.cpp
@@ -2664,7 +2664,7 @@ void QGraphicsView::updateScene(const QList<QRectF> &rects)
return;
// Extract and reset dirty scene rect info.
- QVector<QRect> dirtyViewportRects;
+ QList<QRect> dirtyViewportRects;
dirtyViewportRects.reserve(d->dirtyRegion.rectCount() + rects.count());
for (const QRect &dirtyRect : d->dirtyRegion)
dirtyViewportRects += dirtyRect;
diff --git a/src/widgets/graphicsview/qgraphicsview_p.h b/src/widgets/graphicsview/qgraphicsview_p.h
index b58505b057..8a8f6bf880 100644
--- a/src/widgets/graphicsview/qgraphicsview_p.h
+++ b/src/widgets/graphicsview/qgraphicsview_p.h
@@ -150,7 +150,7 @@ public:
QGraphicsView::CacheMode cacheMode;
- QVector<QStyleOptionGraphicsItem> styleOptions;
+ QList<QStyleOptionGraphicsItem> styleOptions;
QStyleOptionGraphicsItem *allocStyleOptionsArray(int numItems);
void freeStyleOptionsArray(QStyleOptionGraphicsItem *array);
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-07 06:35:36 +0000