diff --git a/src/gui/accessible/linux/atspiadaptor.cpp b/src/gui/accessible/linux/atspiadaptor.cpp index 194e3e61448..51df6727264 100644 --- a/src/gui/accessible/linux/atspiadaptor.cpp +++ b/src/gui/accessible/linux/atspiadaptor.cpp @@ -1707,7 +1707,7 @@ QStringList AtSpiAdaptor::accessibleInterfaces(QAccessibleInterface *interface) QSpiRelationArray AtSpiAdaptor::relationSet(QAccessibleInterface *interface, const QDBusConnection &connection) const { - typedef QPair RelationPair; + typedef std::pair RelationPair; const QList relationInterfaces = interface->relations(); QSpiRelationArray relations; diff --git a/src/gui/accessible/linux/qspi_struct_marshallers_p.h b/src/gui/accessible/linux/qspi_struct_marshallers_p.h index 4338b49dd25..1a8ba63b8a8 100644 --- a/src/gui/accessible/linux/qspi_struct_marshallers_p.h +++ b/src/gui/accessible/linux/qspi_struct_marshallers_p.h @@ -18,7 +18,6 @@ #include #include -#include #include #include #include @@ -92,7 +91,7 @@ typedef QList QSpiEventListenerArray; QDBusArgument &operator<<(QDBusArgument &argument, const QSpiEventListener &action); const QDBusArgument &operator>>(const QDBusArgument &argument, QSpiEventListener &action); -typedef QPair QSpiRelationArrayEntry; +typedef std::pair QSpiRelationArrayEntry; typedef QList QSpiRelationArray; //a(iisv) diff --git a/src/gui/accessible/linux/qspiapplicationadaptor.cpp b/src/gui/accessible/linux/qspiapplicationadaptor.cpp index 649278bac5f..c3593b9f060 100644 --- a/src/gui/accessible/linux/qspiapplicationadaptor.cpp +++ b/src/gui/accessible/linux/qspiapplicationadaptor.cpp @@ -162,7 +162,7 @@ bool QSpiApplicationAdaptor::eventFilter(QObject *target, QEvent *event) SLOT(notifyKeyboardListenerError(QDBusError,QDBusMessage)), timeout); if (sent) { //queue the event and send it after callback - keyEvents.enqueue(QPair, QKeyEvent*> (QPointer(target), copyKeyEvent(keyEvent))); + keyEvents.enqueue(std::pair{QPointer(target), copyKeyEvent(keyEvent)}); return true; } break; @@ -188,10 +188,10 @@ void QSpiApplicationAdaptor::notifyKeyboardListenerCallback(const QDBusMessage& } Q_ASSERT(message.arguments().size() == 1); if (message.arguments().at(0).toBool() == true) { - QPair, QKeyEvent*> event = keyEvents.dequeue(); + std::pair, QKeyEvent*> event = keyEvents.dequeue(); delete event.second; } else { - QPair, QKeyEvent*> event = keyEvents.dequeue(); + std::pair, QKeyEvent*> event = keyEvents.dequeue(); if (event.first) QCoreApplication::postEvent(event.first.data(), event.second); } @@ -201,7 +201,7 @@ void QSpiApplicationAdaptor::notifyKeyboardListenerError(const QDBusError& error { qWarning() << "QSpiApplication::keyEventError " << error.name() << error.message(); while (!keyEvents.isEmpty()) { - QPair, QKeyEvent*> event = keyEvents.dequeue(); + std::pair, QKeyEvent*> event = keyEvents.dequeue(); if (event.first) QCoreApplication::postEvent(event.first.data(), event.second); } diff --git a/src/gui/accessible/linux/qspiapplicationadaptor_p.h b/src/gui/accessible/linux/qspiapplicationadaptor_p.h index b8529513856..f7e543c1327 100644 --- a/src/gui/accessible/linux/qspiapplicationadaptor_p.h +++ b/src/gui/accessible/linux/qspiapplicationadaptor_p.h @@ -53,7 +53,7 @@ private Q_SLOTS: private: static QKeyEvent* copyKeyEvent(QKeyEvent*); - QQueue, QKeyEvent*> > keyEvents; + QQueue, QKeyEvent*> > keyEvents; QDBusConnection dbusConnection; }; diff --git a/src/gui/accessible/qaccessible.cpp b/src/gui/accessible/qaccessible.cpp index 0ff9ee8afd0..e1d62c34a0b 100644 --- a/src/gui/accessible/qaccessible.cpp +++ b/src/gui/accessible/qaccessible.cpp @@ -362,7 +362,7 @@ Q_STATIC_LOGGING_CATEGORY(lcAccessibilityCore, "qt.accessibility.core"); interfaces of the calling object, together with the relations for each object. - Each entry in the list is a QPair where the \c second member stores + Each entry in the list is a std::pair where the \c second member stores the relation type(s) between the \c returned object represented by the \c first member and the \c origin (the caller) interface/object. diff --git a/src/gui/accessible/qaccessiblecache.cpp b/src/gui/accessible/qaccessiblecache.cpp index c86baaa15b0..1508617a39b 100644 --- a/src/gui/accessible/qaccessiblecache.cpp +++ b/src/gui/accessible/qaccessiblecache.cpp @@ -116,7 +116,7 @@ QAccessible::Id QAccessibleCache::insert(QObject *object, QAccessibleInterface * QObject *obj = iface->object(); Q_ASSERT(object == obj); if (obj) { - objectToId.insert(obj, qMakePair(id, obj->metaObject())); + objectToId.insert(obj, std::pair(id, obj->metaObject())); connect(obj, &QObject::destroyed, this, &QAccessibleCache::objectDestroyed); } idToInterface.insert(id, iface); diff --git a/src/gui/itemmodels/qfilesystemmodel.cpp b/src/gui/itemmodels/qfilesystemmodel.cpp index 7efc7dbc9be..8cb68069cac 100644 --- a/src/gui/itemmodels/qfilesystemmodel.cpp +++ b/src/gui/itemmodels/qfilesystemmodel.cpp @@ -1157,12 +1157,10 @@ void QFileSystemModel::sort(int column, Qt::SortOrder order) emit layoutAboutToBeChanged(); QModelIndexList oldList = persistentIndexList(); - QList> oldNodes; + QList> oldNodes; oldNodes.reserve(oldList.size()); - for (const QModelIndex &oldNode : oldList) { - QPair pair(d->node(oldNode), oldNode.column()); - oldNodes.append(pair); - } + for (const QModelIndex &oldNode : oldList) + oldNodes.emplace_back(d->node(oldNode), oldNode.column()); if (!(d->sortColumn == column && d->sortOrder != order && !d->forceSort)) { //we sort only from where we are, don't need to sort all the model diff --git a/src/gui/itemmodels/qfilesystemmodel.h b/src/gui/itemmodels/qfilesystemmodel.h index 3bd884eab0b..fd2e53f23d7 100644 --- a/src/gui/itemmodels/qfilesystemmodel.h +++ b/src/gui/itemmodels/qfilesystemmodel.h @@ -6,7 +6,6 @@ #include #include -#include #include #include diff --git a/src/gui/itemmodels/qstandarditemmodel.cpp b/src/gui/itemmodels/qstandarditemmodel.cpp index 8b3e381431d..91807ef7c42 100644 --- a/src/gui/itemmodels/qstandarditemmodel.cpp +++ b/src/gui/itemmodels/qstandarditemmodel.cpp @@ -6,7 +6,6 @@ #include #include #include -#include #include #include #include @@ -35,8 +34,8 @@ public: inline QStandardItemModelLessThan() { } - inline bool operator()(const QPair &l, - const QPair &r) const + inline bool operator()(const std::pair &l, + const std::pair &r) const { return *(l.first) < *(r.first); } @@ -48,8 +47,8 @@ public: inline QStandardItemModelGreaterThan() { } - inline bool operator()(const QPair &l, - const QPair &r) const + inline bool operator()(const std::pair &l, + const std::pair &r) const { return *(r.first) < *(l.first); } @@ -58,16 +57,16 @@ public: /*! \internal */ -QPair QStandardItemPrivate::position() const +std::pair QStandardItemPrivate::position() const { if (QStandardItem *par = parent) { int idx = par->d_func()->childIndex(q_func()); if (idx == -1) - return QPair(-1, -1); - return QPair(idx / par->columnCount(), idx % par->columnCount()); + return std::pair(-1, -1); + return std::pair(idx / par->columnCount(), idx % par->columnCount()); } // ### support header items? - return QPair(-1, -1); + return std::pair(-1, -1); } /*! @@ -299,7 +298,7 @@ void QStandardItemPrivate::sortChildren(int column, Qt::SortOrder order) if (column >= columnCount()) return; - QList > sortable; + QList > sortable; QList unsortable; sortable.reserve(rowCount()); @@ -308,7 +307,7 @@ void QStandardItemPrivate::sortChildren(int column, Qt::SortOrder order) for (int row = 0; row < rowCount(); ++row) { QStandardItem *itm = q->child(row, column); if (itm) - sortable.append(QPair(itm, row)); + sortable.emplace_back(itm, row); else unsortable.append(row); } @@ -1486,7 +1485,7 @@ void QStandardItem::setDropEnabled(bool dropEnabled) int QStandardItem::row() const { Q_D(const QStandardItem); - QPair pos = d->position(); + std::pair pos = d->position(); return pos.first; } @@ -1499,7 +1498,7 @@ int QStandardItem::row() const int QStandardItem::column() const { Q_D(const QStandardItem); - QPair pos = d->position(); + std::pair pos = d->position(); return pos.second; } @@ -2332,7 +2331,7 @@ QStandardItem *QStandardItemModel::itemFromIndex(const QModelIndex &index) const QModelIndex QStandardItemModel::indexFromItem(const QStandardItem *item) const { if (item && item->d_func()->parent) { - QPair pos = item->d_func()->position(); + std::pair pos = item->d_func()->position(); return createIndex(pos.first, pos.second, item->d_func()->parent); } return QModelIndex(); diff --git a/src/gui/itemmodels/qstandarditemmodel_p.h b/src/gui/itemmodels/qstandarditemmodel_p.h index a0c3f8a1619..443aafa859a 100644 --- a/src/gui/itemmodels/qstandarditemmodel_p.h +++ b/src/gui/itemmodels/qstandarditemmodel_p.h @@ -21,7 +21,6 @@ #include "private/qabstractitemmodel_p.h" #include -#include #include #include #include @@ -126,7 +125,7 @@ public: } return childsLastIndexInParent; } - QPair position() const; + std::pair position() const; void setChild(int row, int column, QStandardItem *item, bool emitChanged = false); inline int rowCount() const { diff --git a/src/gui/kernel/qhighdpiscaling_p.h b/src/gui/kernel/qhighdpiscaling_p.h index d6deb8a72a3..f2b798bdf1e 100644 --- a/src/gui/kernel/qhighdpiscaling_p.h +++ b/src/gui/kernel/qhighdpiscaling_p.h @@ -32,7 +32,7 @@ Q_DECLARE_LOGGING_CATEGORY(lcHighDpi); class QScreen; class QPlatformScreen; -typedef QPair QDpi; +typedef std::pair QDpi; #ifndef QT_NO_HIGHDPISCALING class Q_GUI_EXPORT QHighDpiScaling { diff --git a/src/gui/kernel/qplatformscreen.cpp b/src/gui/kernel/qplatformscreen.cpp index 6497486ed14..dd9c986dffc 100644 --- a/src/gui/kernel/qplatformscreen.cpp +++ b/src/gui/kernel/qplatformscreen.cpp @@ -152,7 +152,7 @@ QDpi QPlatformScreen::logicalDpi() const // Helper function for accessing the platform screen logical dpi // which accounts for QT_FONT_DPI. -QPair QPlatformScreen::overrideDpi(const QPair &in) +QDpi QPlatformScreen::overrideDpi(const QDpi &in) { static const int overrideDpi = qEnvironmentVariableIntValue("QT_FONT_DPI"); return overrideDpi > 0 ? QDpi(overrideDpi, overrideDpi) : in; diff --git a/src/gui/kernel/qplatformscreen.h b/src/gui/kernel/qplatformscreen.h index a547a635e90..d11aa685873 100644 --- a/src/gui/kernel/qplatformscreen.h +++ b/src/gui/kernel/qplatformscreen.h @@ -37,7 +37,7 @@ class QPlatformCursor; class QScreen; class QSurfaceFormat; -typedef QPair QDpi; +typedef std::pair QDpi; class Q_GUI_EXPORT QPlatformScreen diff --git a/src/gui/kernel/qsurfaceformat.cpp b/src/gui/kernel/qsurfaceformat.cpp index 74add6e9737..7a3981ec718 100644 --- a/src/gui/kernel/qsurfaceformat.cpp +++ b/src/gui/kernel/qsurfaceformat.cpp @@ -625,13 +625,13 @@ int QSurfaceFormat::minorVersion() const } /*! - Returns a QPair representing the OpenGL version. + Returns a std::pair representing the OpenGL version. - Useful for version checks, for example format.version() >= qMakePair(3, 2) + Useful for version checks, for example format.version() >= std::pair(3, 2) */ -QPair QSurfaceFormat::version() const +std::pair QSurfaceFormat::version() const { - return qMakePair(d->major, d->minor); + return std::pair(d->major, d->minor); } /*! diff --git a/src/gui/kernel/qsurfaceformat.h b/src/gui/kernel/qsurfaceformat.h index 07ee1cc07d7..a44b852fcc7 100644 --- a/src/gui/kernel/qsurfaceformat.h +++ b/src/gui/kernel/qsurfaceformat.h @@ -4,7 +4,6 @@ #define QSURFACEFORMAT_H #include -#include #include QT_BEGIN_NAMESPACE @@ -99,7 +98,7 @@ public: void setMinorVersion(int minorVersion); int minorVersion() const; - QPair version() const; + std::pair version() const; void setVersion(int major, int minor); bool stereo() const; diff --git a/src/gui/opengl/platform/egl/qeglplatformcontext.cpp b/src/gui/opengl/platform/egl/qeglplatformcontext.cpp index e1bf056d655..af7cb0c9983 100644 --- a/src/gui/opengl/platform/egl/qeglplatformcontext.cpp +++ b/src/gui/opengl/platform/egl/qeglplatformcontext.cpp @@ -319,7 +319,7 @@ void QEGLPlatformContext::updateFormatFromGL() m_format.setOption(QSurfaceFormat::DeprecatedFunctions); if (value & GL_CONTEXT_FLAG_DEBUG_BIT) m_format.setOption(QSurfaceFormat::DebugContext); - if (m_format.version() >= qMakePair(3, 2)) { + if (m_format.version() >= std::pair(3, 2)) { value = 0; glGetIntegerv(GL_CONTEXT_PROFILE_MASK, &value); if (value & GL_CONTEXT_CORE_PROFILE_BIT) diff --git a/src/gui/opengl/qopenglfunctions.cpp b/src/gui/opengl/qopenglfunctions.cpp index aafa5327e03..5e86b561072 100644 --- a/src/gui/opengl/qopenglfunctions.cpp +++ b/src/gui/opengl/qopenglfunctions.cpp @@ -300,11 +300,11 @@ static int qt_gl_resolve_features() QOpenGLFunctions::NPOTTextureRepeat; } - const QPair version = format.version(); - if (version < qMakePair(3, 0) - || (version == qMakePair(3, 0) && format.testOption(QSurfaceFormat::DeprecatedFunctions)) - || (version == qMakePair(3, 1) && extensions.match("GL_ARB_compatibility")) - || (version >= qMakePair(3, 2) && format.profile() == QSurfaceFormat::CompatibilityProfile)) { + const std::pair version = format.version(); + if (version < std::pair(3, 0) + || (version == std::pair(3, 0) && format.testOption(QSurfaceFormat::DeprecatedFunctions)) + || (version == std::pair(3, 1) && extensions.match("GL_ARB_compatibility")) + || (version >= std::pair(3, 2) && format.profile() == QSurfaceFormat::CompatibilityProfile)) { features |= QOpenGLFunctions::FixedFunctionPipeline; } return features; @@ -421,10 +421,10 @@ static int qt_gl_resolve_extensions() | QOpenGLExtensions::MapBuffer | QOpenGLExtensions::Sized16Formats; - if (format.version() >= qMakePair(1, 2)) + if (format.version() >= std::pair(1, 2)) extensions |= QOpenGLExtensions::BGRATextureFormat; - if (format.version() >= qMakePair(1, 4) || extensionMatcher.match("GL_SGIS_generate_mipmap")) + if (format.version() >= std::pair(1, 4) || extensionMatcher.match("GL_SGIS_generate_mipmap")) extensions |= QOpenGLExtensions::GenerateMipmap; if (format.majorVersion() >= 2) @@ -445,13 +445,13 @@ static int qt_gl_resolve_extensions() extensions |= QOpenGLExtensions::PackedDepthStencil; } - if (format.version() >= qMakePair(3, 2) || extensionMatcher.match("GL_ARB_geometry_shader4")) + if (format.version() >= std::pair(3, 2) || extensionMatcher.match("GL_ARB_geometry_shader4")) extensions |= QOpenGLExtensions::GeometryShaders; - if (format.version() >= qMakePair(3, 3)) + if (format.version() >= std::pair(3, 3)) extensions |= QOpenGLExtensions::TextureSwizzle; - if (format.version() >= qMakePair(4, 3) || extensionMatcher.match("GL_ARB_invalidate_subdata")) + if (format.version() >= std::pair(4, 3) || extensionMatcher.match("GL_ARB_invalidate_subdata")) extensions |= QOpenGLExtensions::DiscardFramebuffer; if (extensionMatcher.match("GL_ARB_map_buffer_range")) diff --git a/src/gui/painting/qbrush.cpp b/src/gui/painting/qbrush.cpp index c05fcf7723c..b993261ac15 100644 --- a/src/gui/painting/qbrush.cpp +++ b/src/gui/painting/qbrush.cpp @@ -1066,7 +1066,7 @@ QDataStream &operator<<(QDataStream &s, const QBrush &b) s << quint32(stops.size()); for (int i = 0; i < stops.size(); ++i) { const QGradientStop &stop = stops.at(i); - s << QPair(double(stop.first), stop.second); + s << std::pair(double(stop.first), stop.second); } } @@ -1152,7 +1152,7 @@ QDataStream &operator>>(QDataStream &s, QBrush &b) stops.reserve(numStops); for (quint32 i = 0; i < numStops; ++i) { s >> n >> c; - stops << QPair(n, c); + stops << std::pair(n, c); } } @@ -2502,7 +2502,7 @@ void QConicalGradient::setAngle(qreal angle) \typedef QGradientStop \relates QGradient - Typedef for QPair<\l qreal, QColor>. + Typedef for std::pair<\l qreal, QColor>. */ /*! diff --git a/src/gui/painting/qbrush.h b/src/gui/painting/qbrush.h index 62c752345e4..0a7dc6cf5d0 100644 --- a/src/gui/painting/qbrush.h +++ b/src/gui/painting/qbrush.h @@ -6,7 +6,6 @@ #include #include -#include #include #include #include @@ -158,7 +157,7 @@ inline bool QBrush::isDetached() const { return d->ref.loadRelaxed() == 1; } */ class QGradientPrivate; -typedef QPair QGradientStop; +typedef std::pair QGradientStop; typedef QList QGradientStops; class Q_GUI_EXPORT QGradient diff --git a/src/gui/painting/qpathsimplifier.cpp b/src/gui/painting/qpathsimplifier.cpp index a5d0ae8ecdc..667c58f278b 100644 --- a/src/gui/painting/qpathsimplifier.cpp +++ b/src/gui/painting/qpathsimplifier.cpp @@ -323,14 +323,14 @@ private: bool equalElements(const Element *e1, const Element *e2); bool splitLineAt(QDataBuffer &elements, BVHNode *node, quint32 pointIndex, bool processAgain); void appendSeparatingAxes(QVarLengthArray &axes, Element *element); - QPair calculateSeparatingAxisRange(const QPoint &axis, Element *element); + std::pair calculateSeparatingAxisRange(const QPoint &axis, Element *element); void splitCurve(QDataBuffer &elements, BVHNode *node); bool setElementToQuadratic(Element *element, quint32 pointIndex1, const QPoint &ctrl, quint32 pointIndex2); bool setElementToCubic(Element *element, quint32 pointIndex1, const QPoint &ctrl1, const QPoint &ctrl2, quint32 pointIndex2); void setElementToCubicAndSimplify(Element *element, quint32 pointIndex1, const QPoint &ctrl1, const QPoint &ctrl2, quint32 pointIndex2); - RBNode *findElementLeftOf(const Element *element, const QPair &bounds); + RBNode *findElementLeftOf(const Element *element, const std::pair &bounds); bool elementIsLeftOf(const Element *left, const Element *right); - QPair outerBounds(const QPoint &point); + std::pair outerBounds(const QPoint &point); static bool flattenQuadratic(const QPoint &u, const QPoint &v, const QPoint &w); static bool flattenCubic(const QPoint &u, const QPoint &v, const QPoint &w, const QPoint &q); static bool splitQuadratic(const QPoint &u, const QPoint &v, const QPoint &w, QPoint *result); @@ -692,12 +692,12 @@ bool PathSimplifier::connectElements() QPoint eventPoint = event->point; // Find all elements passing through the event point. - QPair bounds = outerBounds(eventPoint); + std::pair bounds = outerBounds(eventPoint); // Special case: single element above and single element below event point. int eventCount = events.size(); if (event->type == Event::Lower && eventCount > 2) { - QPair range; + std::pair range; range.first = bounds.first ? m_elementList.next(bounds.first) : m_elementList.front(m_elementList.root); range.second = bounds.second ? m_elementList.previous(bounds.second) @@ -1038,8 +1038,8 @@ bool PathSimplifier::intersectNodes(QDataBuffer &elements, BVHNode *e appendSeparatingAxes(axes, elementNode->element); appendSeparatingAxes(axes, treeNode->element); for (int i = 0; i < axes.size(); ++i) { - QPair range1 = calculateSeparatingAxisRange(axes.at(i), elementNode->element); - QPair range2 = calculateSeparatingAxisRange(axes.at(i), treeNode->element); + std::pair range1 = calculateSeparatingAxisRange(axes.at(i), elementNode->element); + std::pair range2 = calculateSeparatingAxisRange(axes.at(i), treeNode->element); if (range1.first >= range2.second || range1.second <= range2.first) { return false; // Separating axis found. } @@ -1195,9 +1195,9 @@ void PathSimplifier::appendSeparatingAxes(QVarLengthArray &axes, Ele } } -QPair PathSimplifier::calculateSeparatingAxisRange(const QPoint &axis, Element *element) +std::pair PathSimplifier::calculateSeparatingAxisRange(const QPoint &axis, Element *element) { - QPair range(0x7fffffff, -0x7fffffff); + std::pair range(0x7fffffff, -0x7fffffff); for (int i = 0; i <= element->degree; ++i) { const QPoint &p = m_points->at(element->indices[i]); int dist = dot(axis, p); @@ -1375,7 +1375,7 @@ void PathSimplifier::setElementToCubicAndSimplify(Element *element, quint32 poin } PathSimplifier::RBNode *PathSimplifier::findElementLeftOf(const Element *element, - const QPair &bounds) + const std::pair &bounds) { if (!m_elementList.root) return nullptr; @@ -1422,10 +1422,10 @@ bool PathSimplifier::elementIsLeftOf(const Element *left, const Element *right) return d < 0; } -QPair PathSimplifier::outerBounds(const QPoint &point) +std::pair PathSimplifier::outerBounds(const QPoint &point) { RBNode *current = m_elementList.root; - QPair result(nullptr, nullptr); + std::pair result(nullptr, nullptr); while (current) { const Element *element = current->data; diff --git a/src/gui/painting/qpdf.cpp b/src/gui/painting/qpdf.cpp index d25c6109dcb..db289460260 100644 --- a/src/gui/painting/qpdf.cpp +++ b/src/gui/painting/qpdf.cpp @@ -3077,7 +3077,7 @@ int QPdfEnginePrivate::addConstantAlphaObject(int brushAlpha, int penAlpha) { if (brushAlpha == 255 && penAlpha == 255) return 0; - uint object = alphaCache.value(QPair(brushAlpha, penAlpha), 0); + uint object = alphaCache.value(std::pair(brushAlpha, penAlpha), 0); if (!object) { object = addXrefEntry(-1); QByteArray alphaDef; @@ -3085,7 +3085,7 @@ int QPdfEnginePrivate::addConstantAlphaObject(int brushAlpha, int penAlpha) s << "<<\n/ca " << (brushAlpha/qreal(255.)) << '\n'; s << "/CA " << (penAlpha/qreal(255.)) << "\n>>"; xprintf("%s\nendobj\n", alphaDef.constData()); - alphaCache.insert(QPair(brushAlpha, penAlpha), object); + alphaCache.insert(std::pair(brushAlpha, penAlpha), object); } if (currentPage->graphicStates.indexOf(object) < 0) currentPage->graphicStates.append(object); diff --git a/src/gui/painting/qpdf_p.h b/src/gui/painting/qpdf_p.h index 4b301db71a7..54956e16ecd 100644 --- a/src/gui/painting/qpdf_p.h +++ b/src/gui/painting/qpdf_p.h @@ -358,7 +358,7 @@ private: int patternColorSpaceCMYK; QList pages; QHash imageCache; - QHash, uint > alphaCache; + QHash, uint > alphaCache; QList destCache; QList fileCache; QByteArray xmpDocumentMetadata; diff --git a/src/gui/painting/qtriangulator.cpp b/src/gui/painting/qtriangulator.cpp index 029566f1b9a..ba231364cf7 100644 --- a/src/gui/painting/qtriangulator.cpp +++ b/src/gui/painting/qtriangulator.cpp @@ -605,8 +605,8 @@ public: bool edgeIsLeftOfEdge(int leftEdgeIndex, int rightEdgeIndex) const; QRBTree::Node *searchEdgeLeftOf(int edgeIndex) const; QRBTree::Node *searchEdgeLeftOf(int edgeIndex, QRBTree::Node *after) const; - QPair::Node *, QRBTree::Node *> bounds(const QPodPoint &point) const; - QPair::Node *, QRBTree::Node *> outerBounds(const QPodPoint &point) const; + std::pair::Node *, QRBTree::Node *> bounds(const QPodPoint &point) const; + std::pair::Node *, QRBTree::Node *> outerBounds(const QPodPoint &point) const; void splitEdgeListRange(QRBTree::Node *leftmost, QRBTree::Node *rightmost, int vertex, const QIntersectionPoint &intersectionPoint); void reorderEdgeListRange(QRBTree::Node *leftmost, QRBTree::Node *rightmost); void sortEdgeList(const QPodPoint eventPoint); @@ -1025,10 +1025,10 @@ QRBTree::Node *QTriangulator::ComplexToSimple::searchEdgeLeftOf(int edge } template -QPair::Node *, QRBTree::Node *> QTriangulator::ComplexToSimple::bounds(const QPodPoint &point) const +std::pair::Node *, QRBTree::Node *> QTriangulator::ComplexToSimple::bounds(const QPodPoint &point) const { QRBTree::Node *current = m_edgeList.root; - QPair::Node *, QRBTree::Node *> result(nullptr, nullptr); + std::pair::Node *, QRBTree::Node *> result(nullptr, nullptr); while (current) { const QPodPoint &v1 = m_parent->m_vertices.at(m_edges.at(current->data).lower()); const QPodPoint &v2 = m_parent->m_vertices.at(m_edges.at(current->data).upper()); @@ -1074,10 +1074,10 @@ QPair::Node *, QRBTree::Node *> QTriangulator::ComplexToSim } template -QPair::Node *, QRBTree::Node *> QTriangulator::ComplexToSimple::outerBounds(const QPodPoint &point) const +std::pair::Node *, QRBTree::Node *> QTriangulator::ComplexToSimple::outerBounds(const QPodPoint &point) const { QRBTree::Node *current = m_edgeList.root; - QPair::Node *, QRBTree::Node *> result(nullptr, nullptr); + std::pair::Node *, QRBTree::Node *> result(nullptr, nullptr); while (current) { const QPodPoint &v1 = m_parent->m_vertices.at(m_edges.at(current->data).lower()); @@ -1271,7 +1271,7 @@ void QTriangulator::ComplexToSimple::calculateIntersections() sortEdgeList(event.point); // Find all edges in the edge list that contain the current vertex and mark them to be split later. - QPair::Node *, QRBTree::Node *> range = bounds(event.point); + std::pair::Node *, QRBTree::Node *> range = bounds(event.point); QRBTree::Node *leftNode = range.first ? m_edgeList.previous(range.first) : nullptr; int vertex = (event.type == Event::Upper ? m_edges.at(event.edge).upper() : m_edges.at(event.edge).lower()); QIntersectionPoint eventPoint = QT_PREPEND_NAMESPACE(qIntersectionPoint)(event.point); @@ -1424,7 +1424,7 @@ void QTriangulator::ComplexToSimple::removeUnwantedEdgesAndConnect() //} orderedEdges.clear(); - QPair::Node *, QRBTree::Node *> b = outerBounds(event.point); + std::pair::Node *, QRBTree::Node *> b = outerBounds(event.point); if (m_edgeList.root) { QRBTree::Node *current = (b.first ? m_edgeList.next(b.first) : m_edgeList.front(m_edgeList.root)); // Process edges that are going to be removed from the edge list at the current event point. @@ -1978,7 +1978,7 @@ void QTriangulator::SimpleToMonotone::monotoneDecomposition() return; Q_ASSERT(!m_edgeList.root); - QDataBuffer > diagonals(m_upperVertex.size()); + QDataBuffer > diagonals(m_upperVertex.size()); int i = 0; for (int index = 1; index < m_edges.size(); ++index) { @@ -2014,7 +2014,7 @@ void QTriangulator::SimpleToMonotone::monotoneDecomposition() if (m_edges.at(i).node) { Q_ASSERT(!m_edges.at(j).node); if (m_edges.at(m_edges.at(i).helper).type == MergeVertex) - diagonals.add(QPair(i, m_edges.at(i).helper)); + diagonals.add(std::pair(i, m_edges.at(i).helper)); m_edges.at(j).node = m_edges.at(i).node; m_edges.at(i).node = nullptr; m_edges.at(j).node->data = j; @@ -2022,7 +2022,7 @@ void QTriangulator::SimpleToMonotone::monotoneDecomposition() } else if (m_edges.at(j).node) { Q_ASSERT(!m_edges.at(i).node); if (m_edges.at(m_edges.at(j).helper).type == MergeVertex) - diagonals.add(QPair(i, m_edges.at(j).helper)); + diagonals.add(std::pair(i, m_edges.at(j).helper)); m_edges.at(i).node = m_edges.at(j).node; m_edges.at(j).node = nullptr; m_edges.at(i).node->data = i; @@ -2034,7 +2034,7 @@ void QTriangulator::SimpleToMonotone::monotoneDecomposition() leftEdgeNode = searchEdgeLeftOfPoint(m_edges.at(i).from); if (leftEdgeNode) { if (m_edges.at(m_edges.at(leftEdgeNode->data).helper).type == MergeVertex) - diagonals.add(QPair(i, m_edges.at(leftEdgeNode->data).helper)); + diagonals.add(std::pair(i, m_edges.at(leftEdgeNode->data).helper)); m_edges.at(leftEdgeNode->data).helper = i; } else { qWarning("Inconsistent polygon. (#2)"); @@ -2044,7 +2044,7 @@ void QTriangulator::SimpleToMonotone::monotoneDecomposition() case SplitVertex: leftEdgeNode = searchEdgeLeftOfPoint(m_edges.at(i).from); if (leftEdgeNode) { - diagonals.add(QPair(i, m_edges.at(leftEdgeNode->data).helper)); + diagonals.add(std::pair(i, m_edges.at(leftEdgeNode->data).helper)); m_edges.at(leftEdgeNode->data).helper = i; } else { qWarning("Inconsistent polygon. (#3)"); @@ -2073,7 +2073,7 @@ void QTriangulator::SimpleToMonotone::monotoneDecomposition() leftEdgeNode = searchEdgeLeftOfPoint(m_edges.at(i).from); if (leftEdgeNode) { if (m_edges.at(m_edges.at(leftEdgeNode->data).helper).type == MergeVertex) - diagonals.add(QPair(i, m_edges.at(leftEdgeNode->data).helper)); + diagonals.add(std::pair(i, m_edges.at(leftEdgeNode->data).helper)); m_edges.at(leftEdgeNode->data).helper = i; } else { qWarning("Inconsistent polygon. (#4)"); @@ -2082,7 +2082,7 @@ void QTriangulator::SimpleToMonotone::monotoneDecomposition() case EndVertex: if (m_clockwiseOrder) { if (m_edges.at(m_edges.at(i).helper).type == MergeVertex) - diagonals.add(QPair(i, m_edges.at(i).helper)); + diagonals.add(std::pair(i, m_edges.at(i).helper)); if (m_edges.at(i).node) { m_edgeList.deleteNode(m_edges.at(i).node); Q_ASSERT(m_edgeList.validate()); @@ -2091,7 +2091,7 @@ void QTriangulator::SimpleToMonotone::monotoneDecomposition() } } else { if (m_edges.at(m_edges.at(j).helper).type == MergeVertex) - diagonals.add(QPair(i, m_edges.at(j).helper)); + diagonals.add(std::pair(i, m_edges.at(j).helper)); if (m_edges.at(j).node) { m_edgeList.deleteNode(m_edges.at(j).node); Q_ASSERT(m_edgeList.validate()); diff --git a/src/gui/rhi/qrhi.cpp b/src/gui/rhi/qrhi.cpp index c32f0629033..5c99c268358 100644 --- a/src/gui/rhi/qrhi.cpp +++ b/src/gui/rhi/qrhi.cpp @@ -8267,14 +8267,14 @@ QRhiComputePipeline::QRhiComputePipeline(QRhiImplementation *rhi) /*! \typedef QRhiCommandBuffer::DynamicOffset - Synonym for QPair. The first entry is the binding, the second + Synonym for std::pair. The first entry is the binding, the second is the offset in the buffer. */ /*! \typedef QRhiCommandBuffer::VertexInput - Synonym for QPair. The second entry is an offset in + Synonym for std::pair. The second entry is an offset in the buffer specified by the first. */ diff --git a/src/gui/rhi/qrhi.h b/src/gui/rhi/qrhi.h index 28607b53e4b..5fbe7873fe5 100644 --- a/src/gui/rhi/qrhi.h +++ b/src/gui/rhi/qrhi.h @@ -1708,11 +1708,11 @@ public: void endPass(QRhiResourceUpdateBatch *resourceUpdates = nullptr); void setGraphicsPipeline(QRhiGraphicsPipeline *ps); - using DynamicOffset = QPair; // binding, offset + using DynamicOffset = std::pair; // binding, offset void setShaderResources(QRhiShaderResourceBindings *srb = nullptr, int dynamicOffsetCount = 0, const DynamicOffset *dynamicOffsets = nullptr); - using VertexInput = QPair; // buffer, offset + using VertexInput = std::pair; // buffer, offset void setVertexInput(int startBinding, int bindingCount, const VertexInput *bindings, QRhiBuffer *indexBuf = nullptr, quint32 indexOffset = 0, IndexFormat indexFormat = IndexUInt16); diff --git a/src/gui/rhi/qrhid3d11.cpp b/src/gui/rhi/qrhid3d11.cpp index 8019b585f71..5ba590b56ca 100644 --- a/src/gui/rhi/qrhid3d11.cpp +++ b/src/gui/rhi/qrhid3d11.cpp @@ -2283,9 +2283,9 @@ void QRhiD3D11::dispatch(QRhiCommandBuffer *cb, int x, int y, int z) cmd.args.dispatch.z = UINT(z); } -static inline QPair mapBinding(int binding, - int stageIndex, - const QShader::NativeResourceBindingMap *nativeResourceBindingMaps[]) +static inline std::pair mapBinding(int binding, + int stageIndex, + const QShader::NativeResourceBindingMap *nativeResourceBindingMaps[]) { const QShader::NativeResourceBindingMap *map = nativeResourceBindingMaps[stageIndex]; if (!map || map->isEmpty()) @@ -2392,32 +2392,32 @@ void QRhiD3D11::updateShaderResourceBindings(QD3D11ShaderResourceBindings *srbD, // (ByteWidth) is always a multiple of 256. const quint32 sizeInConstants = aligned(b->u.ubuf.maybeSize ? b->u.ubuf.maybeSize : bufD->m_size, 256u) / 16; if (b->stage.testFlag(QRhiShaderResourceBinding::VertexStage)) { - QPair nativeBinding = mapBinding(b->binding, RBM_VERTEX, nativeResourceBindingMaps); + std::pair nativeBinding = mapBinding(b->binding, RBM_VERTEX, nativeResourceBindingMaps); if (nativeBinding.first >= 0) res[RBM_VERTEX].buffers.append({ b->binding, nativeBinding.first, bufD->buffer, offsetInConstants, sizeInConstants }); } if (b->stage.testFlag(QRhiShaderResourceBinding::TessellationControlStage)) { - QPair nativeBinding = mapBinding(b->binding, RBM_HULL, nativeResourceBindingMaps); + std::pair nativeBinding = mapBinding(b->binding, RBM_HULL, nativeResourceBindingMaps); if (nativeBinding.first >= 0) res[RBM_HULL].buffers.append({ b->binding, nativeBinding.first, bufD->buffer, offsetInConstants, sizeInConstants }); } if (b->stage.testFlag(QRhiShaderResourceBinding::TessellationEvaluationStage)) { - QPair nativeBinding = mapBinding(b->binding, RBM_DOMAIN, nativeResourceBindingMaps); + std::pair nativeBinding = mapBinding(b->binding, RBM_DOMAIN, nativeResourceBindingMaps); if (nativeBinding.first >= 0) res[RBM_DOMAIN].buffers.append({ b->binding, nativeBinding.first, bufD->buffer, offsetInConstants, sizeInConstants }); } if (b->stage.testFlag(QRhiShaderResourceBinding::GeometryStage)) { - QPair nativeBinding = mapBinding(b->binding, RBM_GEOMETRY, nativeResourceBindingMaps); + std::pair nativeBinding = mapBinding(b->binding, RBM_GEOMETRY, nativeResourceBindingMaps); if (nativeBinding.first >= 0) res[RBM_GEOMETRY].buffers.append({ b->binding, nativeBinding.first, bufD->buffer, offsetInConstants, sizeInConstants }); } if (b->stage.testFlag(QRhiShaderResourceBinding::FragmentStage)) { - QPair nativeBinding = mapBinding(b->binding, RBM_FRAGMENT, nativeResourceBindingMaps); + std::pair nativeBinding = mapBinding(b->binding, RBM_FRAGMENT, nativeResourceBindingMaps); if (nativeBinding.first >= 0) res[RBM_FRAGMENT].buffers.append({ b->binding, nativeBinding.first, bufD->buffer, offsetInConstants, sizeInConstants }); } if (b->stage.testFlag(QRhiShaderResourceBinding::ComputeStage)) { - QPair nativeBinding = mapBinding(b->binding, RBM_COMPUTE, nativeResourceBindingMaps); + std::pair nativeBinding = mapBinding(b->binding, RBM_COMPUTE, nativeResourceBindingMaps); if (nativeBinding.first >= 0) res[RBM_COMPUTE].buffers.append({ b->binding, nativeBinding.first, bufD->buffer, offsetInConstants, sizeInConstants }); } @@ -2429,12 +2429,12 @@ void QRhiD3D11::updateShaderResourceBindings(QD3D11ShaderResourceBindings *srbD, { const QRhiShaderResourceBinding::Data::TextureAndOrSamplerData *data = &b->u.stex; bd.stex.count = data->count; - const QPair nativeBindingVert = mapBinding(b->binding, RBM_VERTEX, nativeResourceBindingMaps); - const QPair nativeBindingHull = mapBinding(b->binding, RBM_HULL, nativeResourceBindingMaps); - const QPair nativeBindingDomain = mapBinding(b->binding, RBM_DOMAIN, nativeResourceBindingMaps); - const QPair nativeBindingGeom = mapBinding(b->binding, RBM_GEOMETRY, nativeResourceBindingMaps); - const QPair nativeBindingFrag = mapBinding(b->binding, RBM_FRAGMENT, nativeResourceBindingMaps); - const QPair nativeBindingComp = mapBinding(b->binding, RBM_COMPUTE, nativeResourceBindingMaps); + const std::pair nativeBindingVert = mapBinding(b->binding, RBM_VERTEX, nativeResourceBindingMaps); + const std::pair nativeBindingHull = mapBinding(b->binding, RBM_HULL, nativeResourceBindingMaps); + const std::pair nativeBindingDomain = mapBinding(b->binding, RBM_DOMAIN, nativeResourceBindingMaps); + const std::pair nativeBindingGeom = mapBinding(b->binding, RBM_GEOMETRY, nativeResourceBindingMaps); + const std::pair nativeBindingFrag = mapBinding(b->binding, RBM_FRAGMENT, nativeResourceBindingMaps); + const std::pair nativeBindingComp = mapBinding(b->binding, RBM_COMPUTE, nativeResourceBindingMaps); // if SPIR-V binding b is mapped to tN and sN in HLSL, and it // is an array, then it will use tN, tN+1, tN+2, ..., and sN, // sN+1, sN+2, ... @@ -2508,7 +2508,7 @@ void QRhiD3D11::updateShaderResourceBindings(QD3D11ShaderResourceBindings *srbD, bd.simage.id = texD->m_id; bd.simage.generation = texD->generation; if (b->stage.testFlag(QRhiShaderResourceBinding::ComputeStage)) { - QPair nativeBinding = mapBinding(b->binding, RBM_COMPUTE, nativeResourceBindingMaps); + std::pair nativeBinding = mapBinding(b->binding, RBM_COMPUTE, nativeResourceBindingMaps); if (nativeBinding.first >= 0) { ID3D11UnorderedAccessView *uav = texD->unorderedAccessViewForLevel(b->u.simage.level); if (uav) @@ -2527,7 +2527,7 @@ void QRhiD3D11::updateShaderResourceBindings(QD3D11ShaderResourceBindings *srbD, bd.sbuf.id = bufD->m_id; bd.sbuf.generation = bufD->generation; if (b->stage.testFlag(QRhiShaderResourceBinding::ComputeStage)) { - QPair nativeBinding = mapBinding(b->binding, RBM_COMPUTE, nativeResourceBindingMaps); + std::pair nativeBinding = mapBinding(b->binding, RBM_COMPUTE, nativeResourceBindingMaps); if (nativeBinding.first >= 0) { ID3D11UnorderedAccessView *uav = bufD->unorderedAccessView(b->u.sbuf.offset); if (uav) diff --git a/src/gui/rhi/qrhid3d12.cpp b/src/gui/rhi/qrhid3d12.cpp index dec383c427c..3499a2b44d4 100644 --- a/src/gui/rhi/qrhid3d12.cpp +++ b/src/gui/rhi/qrhid3d12.cpp @@ -2737,7 +2737,7 @@ void QD3D12ShaderVisibleDescriptorHeap::destroyWithDeferredRelease(QD3D12Release heap.destroyWithDeferredRelease(releaseQueue); } -static inline QPair mapBinding(int binding, const QShader::NativeResourceBindingMap &map) +static inline std::pair mapBinding(int binding, const QShader::NativeResourceBindingMap &map) { if (map.isEmpty()) return { binding, binding }; // assume 1:1 mapping diff --git a/src/gui/rhi/qrhid3d12_p.h b/src/gui/rhi/qrhid3d12_p.h index 9d69022cbda..c009b6dd26f 100644 --- a/src/gui/rhi/qrhid3d12_p.h +++ b/src/gui/rhi/qrhid3d12_p.h @@ -417,7 +417,7 @@ struct QD3D12ReleaseQueue int viewCount = 0; std::function callback = nullptr; void *callbackUserData = nullptr; - QPair resourceAndAllocation = {}; + std::pair resourceAndAllocation = {}; ID3D12DescriptorHeap *descriptorHeap = nullptr; }; QVector queue; @@ -995,10 +995,10 @@ struct QD3D12CommandBuffer : public QRhiCommandBuffer // per-setShaderResources struct VisitorData { - QVarLengthArray, 4> cbufs[6]; + QVarLengthArray, 4> cbufs[6]; QVarLengthArray srvs[6]; QVarLengthArray samplers[6]; - QVarLengthArray, 4> uavs[6]; + QVarLengthArray, 4> uavs[6]; } visitorData; void visitUniformBuffer(QD3D12Stage s, diff --git a/src/gui/rhi/qrhigles2_p.h b/src/gui/rhi/qrhigles2_p.h index 8341d6da08c..72048fe34dd 100644 --- a/src/gui/rhi/qrhigles2_p.h +++ b/src/gui/rhi/qrhigles2_p.h @@ -615,7 +615,7 @@ struct QGles2CommandBuffer : public QRhiCommandBuffer Read = 0x01, Write = 0x02 }; - QHash > writtenResources; + QHash > writtenResources; void reset() { writtenResources.clear(); } diff --git a/src/gui/rhi/qrhimetal_p.h b/src/gui/rhi/qrhimetal_p.h index 80183e26420..ce63bc85b8e 100644 --- a/src/gui/rhi/qrhimetal_p.h +++ b/src/gui/rhi/qrhimetal_p.h @@ -295,7 +295,7 @@ struct QMetalCommandBuffer : public QRhiCommandBuffer int currentCullMode; int currentTriangleFillMode; int currentFrontFaceWinding; - QPair currentDepthBiasValues; + std::pair currentDepthBiasValues; const QRhiNativeHandles *nativeHandles(); void resetState(double lastGpuTime = 0); diff --git a/src/gui/rhi/qrhivulkan.cpp b/src/gui/rhi/qrhivulkan.cpp index 829812a491b..283b475ad10 100644 --- a/src/gui/rhi/qrhivulkan.cpp +++ b/src/gui/rhi/qrhivulkan.cpp @@ -3513,7 +3513,7 @@ void QRhiVulkan::updateShaderResourceBindings(QRhiShaderResourceBindings *srb, i using ArrayOfImageDesc = QVarLengthArray; QVarLengthArray imageInfos; QVarLengthArray writeInfos; - QVarLengthArray, 12> infoIndices; + QVarLengthArray, 12> infoIndices; const bool updateAll = descSetIdx < 0; int frameSlot = updateAll ? 0 : descSetIdx; diff --git a/src/gui/rhi/qrhivulkan_p.h b/src/gui/rhi/qrhivulkan_p.h index 14936a60ec5..c987dd2c501 100644 --- a/src/gui/rhi/qrhivulkan_p.h +++ b/src/gui/rhi/qrhivulkan_p.h @@ -393,7 +393,7 @@ struct QVkCommandBuffer : public QRhiCommandBuffer bool hasShadingRateSet; struct { - QHash > writtenResources; + QHash > writtenResources; void reset() { writtenResources.clear(); } diff --git a/src/gui/rhi/qshader.cpp b/src/gui/rhi/qshader.cpp index 7f5c9f1a08c..105e8efee26 100644 --- a/src/gui/rhi/qshader.cpp +++ b/src/gui/rhi/qshader.cpp @@ -979,7 +979,7 @@ QDebug operator<<(QDebug dbg, const QShaderVersion &v) /*! \typedef QShader::NativeResourceBindingMap - Synonym for QMap>. + Synonym for QMap>. The resource binding model QRhi assumes is based on SPIR-V. This means that uniform buffers, storage buffers, combined image samplers, and storage diff --git a/src/gui/rhi/qshader.h b/src/gui/rhi/qshader.h index 24650813667..d6341678ac8 100644 --- a/src/gui/rhi/qshader.h +++ b/src/gui/rhi/qshader.h @@ -140,7 +140,7 @@ public: QByteArray serialized(SerializedFormatVersion version = SerializedFormatVersion::Latest) const; static QShader fromSerialized(const QByteArray &data); - using NativeResourceBindingMap = QMap >; // binding -> native_binding[, native_binding] + using NativeResourceBindingMap = QMap>; // binding -> native_binding[, native_binding] NativeResourceBindingMap nativeResourceBindingMap(const QShaderKey &key) const; void setResourceBindingMap(const QShaderKey &key, const NativeResourceBindingMap &map); void removeResourceBindingMap(const QShaderKey &key); diff --git a/src/gui/text/qtextlayout.cpp b/src/gui/text/qtextlayout.cpp index bb4fb8d0834..46ba2e69e3c 100644 --- a/src/gui/text/qtextlayout.cpp +++ b/src/gui/text/qtextlayout.cpp @@ -1039,7 +1039,7 @@ QList QTextLayout::glyphRuns(int from, if (length < 0) length = text().size(); - QHash, QGlyphRun> glyphRunHash; + QHash, QGlyphRun> glyphRunHash; for (int i=0; ilines.size(); ++i) { if (d->lines.at(i).from > from + length) break; @@ -1050,7 +1050,7 @@ QList QTextLayout::glyphRuns(int from, QFontEngine *fontEngine = rawFont.d->fontEngine; QGlyphRun::GlyphRunFlags flags = glyphRun.flags(); - QPair key(fontEngine, int(flags)); + std::pair key(fontEngine, int(flags)); // merge the glyph runs using the same font QGlyphRun &oldGlyphRun = glyphRunHash[key]; if (oldGlyphRun.isEmpty()) { diff --git a/src/gui/util/qgridlayoutengine.cpp b/src/gui/util/qgridlayoutengine.cpp index 07981e8388c..3e1eb869393 100644 --- a/src/gui/util/qgridlayoutengine.cpp +++ b/src/gui/util/qgridlayoutengine.cpp @@ -1413,7 +1413,7 @@ void QGridLayoutEngine::fillRowData(QGridLayoutRowData *rowData, rowStretch = qMax(rowStretch, itemStretch); } else { QGridLayoutMultiCellData &multiCell = - rowData->multiCellMap[qMakePair(row, itemRowSpan)]; + rowData->multiCellMap[std::pair(row, itemRowSpan)]; box = &multiCell.q_box; multiCell.q_stretch = itemStretch; } diff --git a/src/gui/util/qgridlayoutengine_p.h b/src/gui/util/qgridlayoutengine_p.h index 2f60cb99fd7..e00c2c5e483 100644 --- a/src/gui/util/qgridlayoutengine_p.h +++ b/src/gui/util/qgridlayoutengine_p.h @@ -21,7 +21,6 @@ #include #include #include -#include #include #include #include @@ -194,7 +193,7 @@ public: int q_stretch; }; -typedef QMap, QGridLayoutMultiCellData> MultiCellMap; +typedef QMap, QGridLayoutMultiCellData> MultiCellMap; class QGridLayoutRowInfo;