diff options
Diffstat (limited to 'src/quick/util/qquickdeliveryagent.cpp')
| -rw-r--r-- | src/quick/util/qquickdeliveryagent.cpp | 6 |
1 files changed, 3 insertions, 3 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) |