aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/util
diff options
context:
space:
mode:
Diffstat (limited to 'src/quick/util')
-rw-r--r--src/quick/util/qquickdeliveryagent.cpp6
-rw-r--r--src/quick/util/qquickpropertychanges.cpp12
-rw-r--r--src/quick/util/qquickstyledtext.cpp20
-rw-r--r--src/quick/util/qquicktimeline.cpp14
4 files changed, 26 insertions, 26 deletions
diff --git a/src/quick/util/qquickdeliveryagent.cpp b/src/quick/util/qquickdeliveryagent.cpp
index bb521d03bb..85261bc520 100644
--- a/src/quick/util/qquickdeliveryagent.cpp
+++ b/src/quick/util/qquickdeliveryagent.cpp
@@ -1022,7 +1022,7 @@ void QQuickDeliveryAgentPrivate::deliverToPassiveGrabbers(const QVector<QPointer
{
const QVector<QObject *> &eventDeliveryTargets =
QQuickPointerHandlerPrivate::deviceDeliveryTargets(pointerEvent->device());
- QVarLengthArray<QPair<QQuickItem *, bool>, 4> sendFilteredPointerEventResult;
+ QVarLengthArray<std::pair<QQuickItem *, bool>, 4> sendFilteredPointerEventResult;
hasFiltered.clear();
for (QObject *grabberObject : passiveGrabbers) {
// a null pointer in passiveGrabbers is unlikely, unless the grabbing handler was deleted dynamically
@@ -1036,14 +1036,14 @@ void QQuickDeliveryAgentPrivate::deliverToPassiveGrabbers(const QVector<QPointer
// see if we already have sent a filter event to the parent
auto it = std::find_if(sendFilteredPointerEventResult.begin(), sendFilteredPointerEventResult.end(),
- [par](const QPair<QQuickItem *, bool> &pair) { return pair.first == par; });
+ [par](const std::pair<QQuickItem *, bool> &pair) { return pair.first == par; });
if (it != sendFilteredPointerEventResult.end()) {
// Yes, the event was sent to that parent for filtering: do not call it again, but use
// the result of the previous call to determine whether we should call the handler.
alreadyFiltered = it->second;
} else if (par) {
alreadyFiltered = sendFilteredPointerEvent(pointerEvent, par);
- sendFilteredPointerEventResult << qMakePair(par, alreadyFiltered);
+ sendFilteredPointerEventResult << std::make_pair(par, alreadyFiltered);
}
if (!alreadyFiltered) {
if (par)
diff --git a/src/quick/util/qquickpropertychanges.cpp b/src/quick/util/qquickpropertychanges.cpp
index 18054f48b8..2b3cecef91 100644
--- a/src/quick/util/qquickpropertychanges.cpp
+++ b/src/quick/util/qquickpropertychanges.cpp
@@ -207,7 +207,7 @@ public:
int column;
};
- QList<QPair<QString, QVariant> > properties;
+ QList<std::pair<QString, QVariant> > properties;
QList<ExpressionChange> expressions;
QList<QQuickReplaceSignalHandler*> signalReplacements;
@@ -332,7 +332,7 @@ void QQuickPropertyChangesPrivate::decodeBinding(const QString &propertyPrefix,
break;
}
- properties << qMakePair(propertyName, var);
+ properties << std::make_pair(propertyName, var);
}
void QQuickPropertyChangesParser::verifyBindings(
@@ -549,7 +549,7 @@ void QQuickPropertyChanges::setIsExplicit(bool e)
bool QQuickPropertyChanges::containsValue(const QString &name) const
{
Q_D(const QQuickPropertyChanges);
- typedef QPair<QString, QVariant> PropertyEntry;
+ typedef std::pair<QString, QVariant> PropertyEntry;
for (const PropertyEntry &entry : d->properties) {
if (entry.first == name) {
@@ -582,7 +582,7 @@ bool QQuickPropertyChanges::containsProperty(const QString &name) const
void QQuickPropertyChanges::changeValue(const QString &name, const QVariant &value)
{
Q_D(QQuickPropertyChanges);
- typedef QPair<QString, QVariant> PropertyEntry;
+ typedef std::pair<QString, QVariant> PropertyEntry;
for (auto it = d->expressions.begin(), end = d->expressions.end(); it != end; ++it) {
if (it->name == name) {
@@ -705,7 +705,7 @@ void QQuickPropertyChanges::changeExpression(const QString &name, const QString
QVariant QQuickPropertyChanges::property(const QString &name) const
{
Q_D(const QQuickPropertyChanges);
- typedef QPair<QString, QVariant> PropertyEntry;
+ typedef std::pair<QString, QVariant> PropertyEntry;
typedef QQuickPropertyChangesPrivate::ExpressionChange ExpressionEntry;
for (const PropertyEntry &entry : d->properties) {
@@ -747,7 +747,7 @@ void QQuickPropertyChanges::removeProperty(const QString &name)
QVariant QQuickPropertyChanges::value(const QString &name) const
{
Q_D(const QQuickPropertyChanges);
- typedef QPair<QString, QVariant> PropertyEntry;
+ typedef std::pair<QString, QVariant> PropertyEntry;
for (const PropertyEntry &entry : d->properties) {
if (entry.first == name) {
diff --git a/src/quick/util/qquickstyledtext.cpp b/src/quick/util/qquickstyledtext.cpp
index bb003c19a6..6880056aa1 100644
--- a/src/quick/util/qquickstyledtext.cpp
+++ b/src/quick/util/qquickstyledtext.cpp
@@ -72,7 +72,7 @@ public:
bool parseUnorderedListAttributes(const QChar *&ch, const QString &textIn);
bool parseAnchorAttributes(const QChar *&ch, const QString &textIn, QTextCharFormat &format);
void parseImageAttributes(const QChar *&ch, const QString &textIn, QString &textOut);
- QPair<QStringView,QStringView> parseAttribute(const QChar *&ch, const QString &textIn);
+ std::pair<QStringView,QStringView> parseAttribute(const QChar *&ch, const QString &textIn);
QStringView parseValue(const QChar *&ch, const QString &textIn);
void setFontSize(int size, QTextCharFormat &format);
@@ -552,7 +552,7 @@ void QQuickStyledTextPrivate::parseEntity(const QChar *&ch, const QString &textI
bool QQuickStyledTextPrivate::parseFontAttributes(const QChar *&ch, const QString &textIn, QTextCharFormat &format)
{
bool valid = false;
- QPair<QStringView,QStringView> attr;
+ std::pair<QStringView,QStringView> attr;
do {
attr = parseAttribute(ch, textIn);
if (is_equal_ignoring_case(attr.first, QLatin1String("color"))) {
@@ -580,7 +580,7 @@ bool QQuickStyledTextPrivate::parseOrderedListAttributes(const QChar *&ch, const
listItem.type = Ordered;
listItem.format = Decimal;
- QPair<QStringView,QStringView> attr;
+ std::pair<QStringView,QStringView> attr;
do {
attr = parseAttribute(ch, textIn);
if (is_equal_ignoring_case(attr.first, QLatin1String("type"))) {
@@ -609,7 +609,7 @@ bool QQuickStyledTextPrivate::parseUnorderedListAttributes(const QChar *&ch, con
listItem.type = Unordered;
listItem.format = Bullet;
- QPair<QStringView,QStringView> attr;
+ std::pair<QStringView,QStringView> attr;
do {
attr = parseAttribute(ch, textIn);
if (is_equal_ignoring_case(attr.first, QLatin1String("type"))) {
@@ -629,7 +629,7 @@ bool QQuickStyledTextPrivate::parseAnchorAttributes(const QChar *&ch, const QStr
{
bool valid = false;
- QPair<QStringView,QStringView> attr;
+ std::pair<QStringView,QStringView> attr;
do {
attr = parseAttribute(ch, textIn);
if (is_equal_ignoring_case(attr.first, QLatin1String("href"))) {
@@ -654,7 +654,7 @@ void QQuickStyledTextPrivate::parseImageAttributes(const QChar *&ch, const QStri
QQuickStyledTextImgTag *image = new QQuickStyledTextImgTag;
image->position = textOut.size() + (trailingSpace ? 0 : 1);
- QPair<QStringView,QStringView> attr;
+ std::pair<QStringView,QStringView> attr;
do {
attr = parseAttribute(ch, textIn);
if (is_equal_ignoring_case(attr.first, QLatin1String("src"))) {
@@ -703,7 +703,7 @@ void QQuickStyledTextPrivate::parseImageAttributes(const QChar *&ch, const QStri
image->position = textOut.size() + (trailingSpace ? 0 : 1);
imgWidth = image->size.width();
image->offset = -std::fmod(imgWidth, spaceWidth) / 2.0;
- QPair<QStringView,QStringView> attr;
+ std::pair<QStringView,QStringView> attr;
do {
attr = parseAttribute(ch, textIn);
} while (!ch->isNull() && !attr.first.isEmpty());
@@ -716,7 +716,7 @@ void QQuickStyledTextPrivate::parseImageAttributes(const QChar *&ch, const QStri
textOut += padding + QLatin1Char(' ');
}
-QPair<QStringView,QStringView> QQuickStyledTextPrivate::parseAttribute(const QChar *&ch, const QString &textIn)
+std::pair<QStringView,QStringView> QQuickStyledTextPrivate::parseAttribute(const QChar *&ch, const QString &textIn)
{
skipSpace(ch);
@@ -738,7 +738,7 @@ QPair<QStringView,QStringView> QQuickStyledTextPrivate::parseAttribute(const QCh
auto attr = QStringView(textIn).mid(attrStart, attrLength);
QStringView val = parseValue(ch, textIn);
if (!val.isEmpty())
- return QPair<QStringView,QStringView>(attr,val);
+ return std::pair<QStringView,QStringView>(attr,val);
break;
} else {
++attrLength;
@@ -746,7 +746,7 @@ QPair<QStringView,QStringView> QQuickStyledTextPrivate::parseAttribute(const QCh
++ch;
}
- return QPair<QStringView,QStringView>();
+ return std::pair<QStringView,QStringView>();
}
QStringView QQuickStyledTextPrivate::parseValue(const QChar *&ch, const QString &textIn)
diff --git a/src/quick/util/qquicktimeline.cpp b/src/quick/util/qquicktimeline.cpp
index d79d835900..4cb25dbca3 100644
--- a/src/quick/util/qquicktimeline.cpp
+++ b/src/quick/util/qquicktimeline.cpp
@@ -96,7 +96,7 @@ struct QQuickTimeLinePrivate
QQuickTimeLine::SyncMode syncMode;
int syncAdj;
- QList<QPair<int, Update> > *updateQueue;
+ QList<std::pair<int, Update> > *updateQueue;
};
QQuickTimeLinePrivate::QQuickTimeLinePrivate(QQuickTimeLine *parent)
@@ -696,8 +696,8 @@ void QQuickTimeLine::debugAnimation(QDebug d) const
d << "QuickTimeLine(" << Qt::hex << (const void *) this << Qt::dec << ")";
}
-bool operator<(const QPair<int, Update> &lhs,
- const QPair<int, Update> &rhs)
+bool operator<(const std::pair<int, Update> &lhs,
+ const std::pair<int, Update> &rhs)
{
return lhs.first < rhs.first;
}
@@ -726,7 +726,7 @@ int QQuickTimeLinePrivate::advance(int t)
// Process until then. A zero length advance time will only process
// sets.
- QList<QPair<int, Update> > updates;
+ QList<std::pair<int, Update> > updates;
for (Ops::Iterator iter = ops.begin(); iter != ops.end(); ) {
QQuickTimeLineValue *v = static_cast<QQuickTimeLineValue *>(iter.key());
@@ -746,12 +746,12 @@ int QQuickTimeLinePrivate::advance(int t)
if ((tl.consumedOpLength + advanceTime) == op.length) {
// Finishing operation, the timeline value will be the operation's target value.
if (op.type == Op::Execute) {
- updates << qMakePair(op.order, Update(op.event));
+ updates << std::make_pair(op.order, Update(op.event));
} else {
bool changed = false;
qreal val = value(op, op.length, tl.base, &changed);
if (changed)
- updates << qMakePair(op.order, Update(v, val));
+ updates << std::make_pair(op.order, Update(v, val));
}
tl.length -= qMin(advanceTime, tl.length);
tl.consumedOpLength = 0;
@@ -763,7 +763,7 @@ int QQuickTimeLinePrivate::advance(int t)
bool changed = false;
qreal val = value(op, tl.consumedOpLength, tl.base, &changed);
if (changed)
- updates << qMakePair(op.order, Update(v, val));
+ updates << std::make_pair(op.order, Update(v, val));
tl.length -= qMin(advanceTime, tl.length);
break;
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-23 00:33:43 +0000