aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/items
diff options
context:
space:
mode:
Diffstat (limited to 'src/quick/items')
-rw-r--r--src/quick/items/qquickspriteengine.cpp4
-rw-r--r--src/quick/items/qquickspriteengine_p.h4
-rw-r--r--src/quick/items/qquicktextnodeengine.cpp22
-rw-r--r--src/quick/items/qquicktextnodeengine_p.h4
-rw-r--r--src/quick/items/qquickwindow.cpp2
-rw-r--r--src/quick/items/qquickwindow_p.h2
-rw-r--r--src/quick/items/qsginternaltextnode_p.h2
7 files changed, 20 insertions, 20 deletions
diff --git a/src/quick/items/qquickspriteengine.cpp b/src/quick/items/qquickspriteengine.cpp
index 5d33092e6d..c1737bfe9d 100644
--- a/src/quick/items/qquickspriteengine.cpp
+++ b/src/quick/items/qquickspriteengine.cpp
@@ -739,13 +739,13 @@ void QQuickStochasticEngine::addToUpdateList(uint t, int idx)
} else if (m_stateUpdates.at(i).first > t) {
QVector<int> tmpList;
tmpList << idx;
- m_stateUpdates.insert(i, qMakePair(t, tmpList));
+ m_stateUpdates.insert(i, std::make_pair(t, tmpList));
return;
}
}
QVector<int> tmpList;
tmpList << idx;
- m_stateUpdates << qMakePair(t, tmpList);
+ m_stateUpdates << std::make_pair(t, tmpList);
}
QT_END_NAMESPACE
diff --git a/src/quick/items/qquickspriteengine_p.h b/src/quick/items/qquickspriteengine_p.h
index 3bd129cf98..8cd8ff9ca7 100644
--- a/src/quick/items/qquickspriteengine_p.h
+++ b/src/quick/items/qquickspriteengine_p.h
@@ -26,10 +26,10 @@ QT_REQUIRE_CONFIG(quick_sprite);
#include <QList>
#include <QQmlListProperty>
#include <QImage>
-#include <QPair>
#include <QRandomGenerator>
#include <private/qquickpixmap_p.h>
#include <private/qtquickglobal_p.h>
+#include <utility>
QT_BEGIN_NAMESPACE
@@ -216,7 +216,7 @@ protected:
QVector<int> m_goals;
QVector<int> m_duration;
QVector<int> m_startTimes;
- QVector<QPair<uint, QVector<int> > > m_stateUpdates;//### This could be done faster - priority queue?
+ QVector<std::pair<uint, QVector<int> > > m_stateUpdates;//### This could be done faster - priority queue?
QElapsedTimer m_advanceTimer;
uint m_timeOffset;
diff --git a/src/quick/items/qquicktextnodeengine.cpp b/src/quick/items/qquicktextnodeengine.cpp
index 1be5e34e37..34b8ed938c 100644
--- a/src/quick/items/qquicktextnodeengine.cpp
+++ b/src/quick/items/qquicktextnodeengine.cpp
@@ -51,7 +51,7 @@ QQuickTextNodeEngine::BinaryTreeNode::BinaryTreeNode(const QGlyphRun &g,
, rightChildIndex(-1)
{
QGlyphRunPrivate *d = QGlyphRunPrivate::get(g);
- ranges.append(qMakePair(d->textRangeStart, d->textRangeEnd));
+ ranges.append(std::make_pair(d->textRangeStart, d->textRangeEnd));
}
@@ -261,7 +261,7 @@ void QQuickTextNodeEngine::processCurrentLine()
pendingStrikeOuts.append(textDecoration);
if (currentDecorations & Decoration::Background)
- m_backgrounds.append(qMakePair(decorationRect, lastBackgroundColor));
+ m_backgrounds.append(std::make_pair(decorationRect, lastBackgroundColor));
}
// If we've reached an unselected node from a selected node, we add the
@@ -626,10 +626,10 @@ void QQuickTextNodeEngine::addBorder(const QRectF &rect, qreal border,
// Currently we don't support other styles than solid
Q_UNUSED(borderStyle);
- m_backgrounds.append(qMakePair(QRectF(rect.left(), rect.top(), border, rect.height() + border), color));
- m_backgrounds.append(qMakePair(QRectF(rect.left() + border, rect.top(), rect.width(), border), color));
- m_backgrounds.append(qMakePair(QRectF(rect.right(), rect.top() + border, border, rect.height() - border), color));
- m_backgrounds.append(qMakePair(QRectF(rect.left() + border, rect.bottom(), rect.width(), border), color));
+ m_backgrounds.append(std::make_pair(QRectF(rect.left(), rect.top(), border, rect.height() + border), color));
+ m_backgrounds.append(std::make_pair(QRectF(rect.left() + border, rect.top(), rect.width(), border), color));
+ m_backgrounds.append(std::make_pair(QRectF(rect.right(), rect.top() + border, border, rect.height() - border), color));
+ m_backgrounds.append(std::make_pair(QRectF(rect.left() + border, rect.bottom(), rect.width(), border), color));
}
void QQuickTextNodeEngine::addFrameDecorations(QTextDocument *document, QTextFrame *frame)
@@ -647,7 +647,7 @@ void QQuickTextNodeEngine::addFrameDecorations(QTextDocument *document, QTextFra
QBrush bg = frame->frameFormat().background();
if (bg.style() != Qt::NoBrush)
- m_backgrounds.append(qMakePair(boundingRect, bg.color()));
+ m_backgrounds.append(std::make_pair(boundingRect, bg.color()));
if (!frameFormat.hasProperty(QTextFormat::FrameBorder))
return;
@@ -832,12 +832,12 @@ void QQuickTextNodeEngine::addToSceneGraph(QSGInternalTextNode *parentNode,
bool drawCurrent = false;
if (previousNode != nullptr || nextNode != nullptr) {
for (int i = 0; i < node->ranges.size(); ++i) {
- const QPair<int, int> &range = node->ranges.at(i);
+ const std::pair<int, int> &range = node->ranges.at(i);
int rangeLength = range.second - range.first + 1;
if (previousNode != nullptr) {
for (int j = 0; j < previousNode->ranges.size(); ++j) {
- const QPair<int, int> &otherRange = previousNode->ranges.at(j);
+ const std::pair<int, int> &otherRange = previousNode->ranges.at(j);
if (range.first < otherRange.second && range.second > otherRange.first) {
int start = qMax(range.first, otherRange.first);
@@ -851,7 +851,7 @@ void QQuickTextNodeEngine::addToSceneGraph(QSGInternalTextNode *parentNode,
if (nextNode != nullptr && rangeLength > 0) {
for (int j = 0; j < nextNode->ranges.size(); ++j) {
- const QPair<int, int> &otherRange = nextNode->ranges.at(j);
+ const std::pair<int, int> &otherRange = nextNode->ranges.at(j);
if (range.first < otherRange.second && range.second > otherRange.first) {
int start = qMax(range.first, otherRange.first);
@@ -975,7 +975,7 @@ void QQuickTextNodeEngine::addTextBlock(QTextDocument *textDocument, const QText
}
if (charFormat.background().style() != Qt::NoBrush)
- m_backgrounds.append(qMakePair(blockBoundingRect, charFormat.background().color()));
+ m_backgrounds.append(std::make_pair(blockBoundingRect, charFormat.background().color()));
if (QTextList *textList = block.textList()) {
QPointF pos = blockBoundingRect.topLeft();
diff --git a/src/quick/items/qquicktextnodeengine_p.h b/src/quick/items/qquicktextnodeengine_p.h
index 1ed98ce208..f874320eb3 100644
--- a/src/quick/items/qquicktextnodeengine_p.h
+++ b/src/quick/items/qquicktextnodeengine_p.h
@@ -80,7 +80,7 @@ public:
int leftChildIndex;
int rightChildIndex;
- QList<QPair<int, int> > ranges;
+ QList<std::pair<int, int> > ranges;
static void insert(QVarLengthArray<BinaryTreeNode, 16> *binaryTree, const QRectF &rect, const QImage &image, qreal ascent, SelectionState selectionState)
{ insert(binaryTree, BinaryTreeNode(rect, image, selectionState, ascent)); }
@@ -224,7 +224,7 @@ private:
QTextLine m_currentLine;
Qt::LayoutDirection m_currentTextDirection;
- QList<QPair<QRectF, QColor> > m_backgrounds;
+ QList<std::pair<QRectF, QColor> > m_backgrounds;
QList<QRectF> m_selectionRects;
QVarLengthArray<BinaryTreeNode, 16> m_currentLineTree;
diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp
index c9f6fe9ab9..c839d37e19 100644
--- a/src/quick/items/qquickwindow.cpp
+++ b/src/quick/items/qquickwindow.cpp
@@ -1812,7 +1812,7 @@ void QQuickWindowPrivate::updateCursor(const QPointF &scenePos, QQuickItem *root
}
}
-QPair<QQuickItem*, QQuickPointerHandler*> QQuickWindowPrivate::findCursorItemAndHandler(QQuickItem *item, const QPointF &scenePos) const
+std::pair<QQuickItem*, QQuickPointerHandler*> QQuickWindowPrivate::findCursorItemAndHandler(QQuickItem *item, const QPointF &scenePos) const
{
QQuickItemPrivate *itemPrivate = QQuickItemPrivate::get(item);
if (itemPrivate->flags & QQuickItem::ItemClipsChildrenToShape) {
diff --git a/src/quick/items/qquickwindow_p.h b/src/quick/items/qquickwindow_p.h
index 9496cf82d0..f4769a8c7f 100644
--- a/src/quick/items/qquickwindow_p.h
+++ b/src/quick/items/qquickwindow_p.h
@@ -142,7 +142,7 @@ public:
QQuickItem *cursorItem = nullptr;
QQuickPointerHandler *cursorHandler = nullptr;
void updateCursor(const QPointF &scenePos, QQuickItem *rootItem = nullptr);
- QPair<QQuickItem*, QQuickPointerHandler*> findCursorItemAndHandler(QQuickItem *item, const QPointF &scenePos) const;
+ std::pair<QQuickItem*, QQuickPointerHandler*> findCursorItemAndHandler(QQuickItem *item, const QPointF &scenePos) const;
#endif
void clearFocusObject() override;
diff --git a/src/quick/items/qsginternaltextnode_p.h b/src/quick/items/qsginternaltextnode_p.h
index 4cd5953a40..986a5f8089 100644
--- a/src/quick/items/qsginternaltextnode_p.h
+++ b/src/quick/items/qsginternaltextnode_p.h
@@ -163,7 +163,7 @@ public:
QSGNode *parentNode = 0);
QSGInternalRectangleNode *cursorNode() const { return m_cursorNode; }
- QPair<int, int> renderedLineRange() const { return { m_firstLineInViewport, m_firstLinePastViewport }; }
+ std::pair<int, int> renderedLineRange() const { return { m_firstLineInViewport, m_firstLinePastViewport }; }
protected:
void doAddTextLayout(QPointF position,
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-23 02:41:21 +0000