diff options
Diffstat (limited to 'src/quick/designer/qqmldesignermetaobject.cpp')
-rw-r--r-- | src/quick/designer/qqmldesignermetaobject.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/quick/designer/qqmldesignermetaobject.cpp b/src/quick/designer/qqmldesignermetaobject.cpp index d81ac88e4b..025bebff52 100644 --- a/src/quick/designer/qqmldesignermetaobject.cpp +++ b/src/quick/designer/qqmldesignermetaobject.cpp @@ -16,14 +16,14 @@ static QHash<QDynamicMetaObjectData *, bool> nodeInstanceMetaObjectList; static void (*notifyPropertyChangeCallBack)(QObject*, const QQuickDesignerSupport::PropertyName &propertyName) = nullptr; struct MetaPropertyData { - inline QPair<QVariant, bool> &getDataRef(int idx) { + inline std::pair<QVariant, bool> &getDataRef(int idx) { while (m_data.size() <= idx) - m_data << QPair<QVariant, bool>(QVariant(), false); + m_data << std::pair<QVariant, bool>(QVariant(), false); return m_data[idx]; } inline QVariant &getData(int idx) { - QPair<QVariant, bool> &prop = getDataRef(idx); + std::pair<QVariant, bool> &prop = getDataRef(idx); if (!prop.second) { prop.first = QVariant(); prop.second = true; @@ -39,7 +39,7 @@ struct MetaPropertyData { inline int count() { return m_data.size(); } - QVector<QPair<QVariant, bool> > m_data; + QVector<std::pair<QVariant, bool> > m_data; }; QQmlDesignerMetaObject* QQmlDesignerMetaObject::getNodeInstanceMetaObject(QObject *object, QQmlEngine *engine) @@ -113,7 +113,7 @@ int QQmlDesignerMetaObject::createProperty(const char *name, const char *passAlo void QQmlDesignerMetaObject::setValue(int id, const QVariant &value) { - QPair<QVariant, bool> &prop = m_data->getDataRef(id); + std::pair<QVariant, bool> &prop = m_data->getDataRef(id); prop.first = propertyWriteValue(id, value); prop.second = true; QMetaObject::activate(myObject(), id + type()->signalOffset(), nullptr); @@ -145,7 +145,7 @@ int QQmlDesignerMetaObject::openMetaCall(QObject *o, QMetaObject::Call call, int } else if (call == QMetaObject::WriteProperty) { if (propId <= m_data->count() || m_data->m_data[propId].first != *reinterpret_cast<QVariant *>(a[0])) { //propertyWrite(propId); - QPair<QVariant, bool> &prop = m_data->getDataRef(propId); + std::pair<QVariant, bool> &prop = m_data->getDataRef(propId); prop.first = propertyWriteValue(propId, *reinterpret_cast<QVariant *>(a[0])); prop.second = true; //propertyWritten(propId); |