diff options
author | Olivier Goffart <ogoffart@woboq.com> | 2019-12-03 20:24:38 +0100 |
---|---|---|
committer | Olivier Goffart <ogoffart@woboq.com> | 2020-01-17 11:31:35 +0100 |
commit | c6899f16389458766904d8d913054f09076e06dd (patch) | |
tree | e24f942a01720775391ae04557e24a35839f7361 /src/qml | |
parent | 9e674be4fb8c369873a009f58e3152a12d2c4cce (diff) |
Replace QVariant::type with QVariant::userType
as type is going to be deprecated.
This change was done automatically with the help of clazy.
In addition, ColumnRoleMetadata was changed to take an int instead
of a QVariant::Type
Change-Id: Ibc02d7b52e7d931a56c19fdebc4788b5e6df2a39
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/qml')
-rw-r--r-- | src/qml/jsapi/qjsvalue.cpp | 12 | ||||
-rw-r--r-- | src/qml/jsruntime/qv4engine.cpp | 6 | ||||
-rw-r--r-- | src/qml/jsruntime/qv4qobjectwrapper.cpp | 2 | ||||
-rw-r--r-- | src/qml/jsruntime/qv4variantobject.cpp | 20 | ||||
-rw-r--r-- | src/qml/qml/qqmlbinding.cpp | 2 | ||||
-rw-r--r-- | src/qml/qml/qqmlobjectcreator.cpp | 48 | ||||
-rw-r--r-- | src/qml/qml/qqmlproperty.cpp | 42 | ||||
-rw-r--r-- | src/qml/qml/qqmlpropertycache.cpp | 8 | ||||
-rw-r--r-- | src/qml/qml/qqmlpropertycachecreator_p.h | 4 | ||||
-rw-r--r-- | src/qml/qml/qqmlpropertyvalidator.cpp | 48 | ||||
-rw-r--r-- | src/qml/qml/qqmlvaluetype.cpp | 24 | ||||
-rw-r--r-- | src/qml/qml/qqmlvaluetypewrapper.cpp | 2 | ||||
-rw-r--r-- | src/qml/qml/qqmlvmemetaobject.cpp | 14 | ||||
-rw-r--r-- | src/qml/qml/v8/qqmlbuiltinfunctions.cpp | 26 |
14 files changed, 129 insertions, 129 deletions
diff --git a/src/qml/jsapi/qjsvalue.cpp b/src/qml/jsapi/qjsvalue.cpp index c2957dd294..b40bc1f18b 100644 --- a/src/qml/jsapi/qjsvalue.cpp +++ b/src/qml/jsapi/qjsvalue.cpp @@ -314,7 +314,7 @@ bool QJSValue::isBool() const if (val) return val->isBoolean(); QVariant *variant = QJSValuePrivate::getVariant(this); - return variant && variant->type() == QVariant::Bool; + return variant && variant->userType() == QMetaType::Bool; } /*! @@ -520,9 +520,9 @@ QString QJSValue::toString() const if (!val) { QVariant *variant = QJSValuePrivate::getVariant(this); Q_ASSERT(variant); - if (variant->type() == QVariant::Map) + if (variant->userType() == QMetaType::QVariantMap) return QStringLiteral("[object Object]"); - else if (variant->type() == QVariant::List) { + else if (variant->userType() == QMetaType::QVariantList) { const QVariantList list = variant->toList(); QString result; for (int i = 0; i < list.count(); ++i) { @@ -558,7 +558,7 @@ double QJSValue::toNumber() const QVariant *variant = QJSValuePrivate::getVariant(this); Q_ASSERT(variant); - if (variant->type() == QVariant::String) + if (variant->userType() == QMetaType::QString) return RuntimeHelpers::stringToNumber(variant->toString()); else if (variant->canConvert<double>()) return variant->value<double>(); @@ -1040,7 +1040,7 @@ bool QJSValue::equals(const QJSValue& other) const Q_ASSERT(variant); if (!ov) return *variant == *QJSValuePrivate::getVariant(&other); - if (variant->type() == QVariant::Map || variant->type() == QVariant::List) + if (variant->userType() == QMetaType::QVariantMap || variant->userType() == QMetaType::QVariantList) return false; return js_equal(variant->toString(), *ov); } @@ -1083,7 +1083,7 @@ bool QJSValue::strictlyEquals(const QJSValue& other) const Q_ASSERT(variant); if (!ov) return *variant == *QJSValuePrivate::getVariant(&other); - if (variant->type() == QVariant::Map || variant->type() == QVariant::List) + if (variant->userType() == QMetaType::QVariantMap || variant->userType() == QMetaType::QVariantList) return false; if (String *s = ov->stringValue()) return variant->toString() == s->toQString(); diff --git a/src/qml/jsruntime/qv4engine.cpp b/src/qml/jsruntime/qv4engine.cpp index 14eaa5bce8..dcdebfb398 100644 --- a/src/qml/jsruntime/qv4engine.cpp +++ b/src/qml/jsruntime/qv4engine.cpp @@ -1461,7 +1461,7 @@ static QVariant toVariant(QV4::ExecutionEngine *e, const QV4::Value &value, int if (const QV4::VariantObject *v = value.as<QV4::VariantObject>()) return v->d()->data(); - if (typeHint == QVariant::Bool) + if (typeHint == QMetaType::Bool) return QVariant(value.toBoolean()); if (typeHint == QMetaType::QJsonValue) @@ -1533,7 +1533,7 @@ static QVariant toVariant(QV4::ExecutionEngine *e, const QV4::Value &value, int if (String *s = value.stringValue()) { const QString &str = s->toQString(); // QChars are stored as a strings - if (typeHint == QVariant::Char && str.size() == 1) + if (typeHint == QMetaType::QChar && str.size() == 1) return str.at(0); return str; } @@ -1832,7 +1832,7 @@ QV4::ReturnedValue ExecutionEngine::metaTypeToJS(int type, const void *data) Q_ASSERT(data != nullptr); QVariant variant(type, data); - if (QMetaType::Type(variant.type()) == QMetaType::QVariant) { + if (QMetaType::Type(variant.userType()) == QMetaType::QVariant) { // unwrap it: this is tested in QJSEngine, and makes the most sense for // end-user code too. return variantToJS(this, *reinterpret_cast<const QVariant*>(data)); diff --git a/src/qml/jsruntime/qv4qobjectwrapper.cpp b/src/qml/jsruntime/qv4qobjectwrapper.cpp index 5a81f24e06..9613d064c4 100644 --- a/src/qml/jsruntime/qv4qobjectwrapper.cpp +++ b/src/qml/jsruntime/qv4qobjectwrapper.cpp @@ -1654,7 +1654,7 @@ static QV4::ReturnedValue CallOverloaded(const QQmlObjectOrGadget &object, const } CallArgument::CallArgument() -: type(QVariant::Invalid) +: type(QMetaType::UnknownType) { } diff --git a/src/qml/jsruntime/qv4variantobject.cpp b/src/qml/jsruntime/qv4variantobject.cpp index e117e509ab..9d7b3c6e9a 100644 --- a/src/qml/jsruntime/qv4variantobject.cpp +++ b/src/qml/jsruntime/qv4variantobject.cpp @@ -65,8 +65,8 @@ void Heap::VariantObject::init(const QVariant &value) bool VariantObject::Data::isScarce() const { - QVariant::Type t = data().type(); - return t == QVariant::Pixmap || t == QVariant::Image; + int t = data().userType(); + return t == QMetaType::QPixmap || t == QMetaType::QImage; } bool VariantObject::virtualIsEqualTo(Managed *m, Managed *other) @@ -139,7 +139,7 @@ ReturnedValue VariantPrototype::method_toString(const FunctionObject *b, const V RETURN_UNDEFINED(); const QVariant variant = o->d()->data(); QString result = variant.toString(); - if (result.isEmpty() && !variant.canConvert(QVariant::String)) { + if (result.isEmpty() && !variant.canConvert(QMetaType::QString)) { QDebug dbg(&result); dbg << variant; // QDebug appends a space, we're not interested in continuing the stream so we chop it off. @@ -154,17 +154,17 @@ ReturnedValue VariantPrototype::method_valueOf(const FunctionObject *b, const Va const VariantObject *o = thisObject->as<QV4::VariantObject>(); if (o) { QVariant v = o->d()->data(); - switch (v.type()) { - case QVariant::Invalid: + switch (v.userType()) { + case QMetaType::UnknownType: return Encode::undefined(); - case QVariant::String: + case QMetaType::QString: return Encode(b->engine()->newString(v.toString())); - case QVariant::Int: + case QMetaType::Int: return Encode(v.toInt()); - case QVariant::Double: - case QVariant::UInt: + case QMetaType::Double: + case QMetaType::UInt: return Encode(v.toDouble()); - case QVariant::Bool: + case QMetaType::Bool: return Encode(v.toBool()); default: if (QMetaType::typeFlags(v.userType()) & QMetaType::IsEnumeration) diff --git a/src/qml/qml/qqmlbinding.cpp b/src/qml/qml/qqmlbinding.cpp index 162adf8364..e14b00af22 100644 --- a/src/qml/qml/qqmlbinding.cpp +++ b/src/qml/qml/qqmlbinding.cpp @@ -479,7 +479,7 @@ Q_NEVER_INLINE bool QQmlBinding::slowWrite(const QQmlPropertyData &core, if (!propertyMetaObject.isNull()) propertyType = propertyMetaObject.className(); } - } else if (userType != QVariant::Invalid) { + } else if (userType != QMetaType::UnknownType) { if (userType == QMetaType::Nullptr || userType == QMetaType::VoidStar) valueType = "null"; else diff --git a/src/qml/qml/qqmlobjectcreator.cpp b/src/qml/qml/qqmlobjectcreator.cpp index d68ad69260..78df02554c 100644 --- a/src/qml/qml/qqmlobjectcreator.cpp +++ b/src/qml/qml/qqmlobjectcreator.cpp @@ -414,25 +414,25 @@ void QQmlObjectCreator::setPropertyValue(const QQmlPropertyData *property, const } } break; - case QVariant::String: { + case QMetaType::QString: { assertOrNull(binding->evaluatesToString()); QString value = compilationUnit->bindingValueAsString(binding); property->writeProperty(_qobject, &value, propertyWriteFlags); } break; - case QVariant::StringList: { + case QMetaType::QStringList: { assertOrNull(binding->evaluatesToString()); QStringList value(compilationUnit->bindingValueAsString(binding)); property->writeProperty(_qobject, &value, propertyWriteFlags); } break; - case QVariant::ByteArray: { + case QMetaType::QByteArray: { assertType(QV4::CompiledData::Binding::Type_String); QByteArray value(compilationUnit->bindingValueAsString(binding).toUtf8()); property->writeProperty(_qobject, &value, propertyWriteFlags); } break; - case QVariant::Url: { + case QMetaType::QUrl: { assertType(QV4::CompiledData::Binding::Type_String); QString string = compilationUnit->bindingValueAsString(binding); // Encoded dir-separators defeat QUrl processing - decode them first @@ -444,7 +444,7 @@ void QQmlObjectCreator::setPropertyValue(const QQmlPropertyData *property, const property->writeProperty(_qobject, &value, propertyWriteFlags); } break; - case QVariant::UInt: { + case QMetaType::UInt: { assertType(QV4::CompiledData::Binding::Type_Number); double d = compilationUnit->bindingValueAsNumber(binding); uint value = uint(d); @@ -452,7 +452,7 @@ void QQmlObjectCreator::setPropertyValue(const QQmlPropertyData *property, const break; } break; - case QVariant::Int: { + case QMetaType::Int: { assertType(QV4::CompiledData::Binding::Type_Number); double d = compilationUnit->bindingValueAsNumber(binding); int value = int(d); @@ -466,13 +466,13 @@ void QQmlObjectCreator::setPropertyValue(const QQmlPropertyData *property, const property->writeProperty(_qobject, &value, propertyWriteFlags); } break; - case QVariant::Double: { + case QMetaType::Double: { assertType(QV4::CompiledData::Binding::Type_Number); double value = compilationUnit->bindingValueAsNumber(binding); property->writeProperty(_qobject, &value, propertyWriteFlags); } break; - case QVariant::Color: { + case QMetaType::QColor: { bool ok = false; uint colorValue = QQmlStringConverters::rgbaFromString(compilationUnit->bindingValueAsString(binding), &ok); assertOrNull(ok); @@ -483,21 +483,21 @@ void QQmlObjectCreator::setPropertyValue(const QQmlPropertyData *property, const } break; #if QT_CONFIG(datestring) - case QVariant::Date: { + case QMetaType::QDate: { bool ok = false; QDate value = QQmlStringConverters::dateFromString(compilationUnit->bindingValueAsString(binding), &ok); assertOrNull(ok); property->writeProperty(_qobject, &value, propertyWriteFlags); } break; - case QVariant::Time: { + case QMetaType::QTime: { bool ok = false; QTime value = QQmlStringConverters::timeFromString(compilationUnit->bindingValueAsString(binding), &ok); assertOrNull(ok); property->writeProperty(_qobject, &value, propertyWriteFlags); } break; - case QVariant::DateTime: { + case QMetaType::QDateTime: { bool ok = false; QDateTime value = QQmlStringConverters::dateTimeFromString(compilationUnit->bindingValueAsString(binding), &ok); // ### VME compatibility :( @@ -511,55 +511,55 @@ void QQmlObjectCreator::setPropertyValue(const QQmlPropertyData *property, const } break; #endif // datestring - case QVariant::Point: { + case QMetaType::QPoint: { bool ok = false; QPoint value = QQmlStringConverters::pointFFromString(compilationUnit->bindingValueAsString(binding), &ok).toPoint(); assertOrNull(ok); property->writeProperty(_qobject, &value, propertyWriteFlags); } break; - case QVariant::PointF: { + case QMetaType::QPointF: { bool ok = false; QPointF value = QQmlStringConverters::pointFFromString(compilationUnit->bindingValueAsString(binding), &ok); assertOrNull(ok); property->writeProperty(_qobject, &value, propertyWriteFlags); } break; - case QVariant::Size: { + case QMetaType::QSize: { bool ok = false; QSize value = QQmlStringConverters::sizeFFromString(compilationUnit->bindingValueAsString(binding), &ok).toSize(); assertOrNull(ok); property->writeProperty(_qobject, &value, propertyWriteFlags); } break; - case QVariant::SizeF: { + case QMetaType::QSizeF: { bool ok = false; QSizeF value = QQmlStringConverters::sizeFFromString(compilationUnit->bindingValueAsString(binding), &ok); assertOrNull(ok); property->writeProperty(_qobject, &value, propertyWriteFlags); } break; - case QVariant::Rect: { + case QMetaType::QRect: { bool ok = false; QRect value = QQmlStringConverters::rectFFromString(compilationUnit->bindingValueAsString(binding), &ok).toRect(); assertOrNull(ok); property->writeProperty(_qobject, &value, propertyWriteFlags); } break; - case QVariant::RectF: { + case QMetaType::QRectF: { bool ok = false; QRectF value = QQmlStringConverters::rectFFromString(compilationUnit->bindingValueAsString(binding), &ok); assertOrNull(ok); property->writeProperty(_qobject, &value, propertyWriteFlags); } break; - case QVariant::Bool: { + case QMetaType::Bool: { assertType(QV4::CompiledData::Binding::Type_Boolean); bool value = binding->valueAsBoolean(); property->writeProperty(_qobject, &value, propertyWriteFlags); } break; - case QVariant::Vector2D: { + case QMetaType::QVector2D: { struct { float xp; float yp; @@ -570,7 +570,7 @@ void QQmlObjectCreator::setPropertyValue(const QQmlPropertyData *property, const property->writeProperty(_qobject, &vec, propertyWriteFlags); } break; - case QVariant::Vector3D: { + case QMetaType::QVector3D: { struct { float xp; float yp; @@ -582,7 +582,7 @@ void QQmlObjectCreator::setPropertyValue(const QQmlPropertyData *property, const property->writeProperty(_qobject, &vec, propertyWriteFlags); } break; - case QVariant::Vector4D: { + case QMetaType::QVector4D: { struct { float xp; float yp; @@ -595,7 +595,7 @@ void QQmlObjectCreator::setPropertyValue(const QQmlPropertyData *property, const property->writeProperty(_qobject, &vec, propertyWriteFlags); } break; - case QVariant::Quaternion: { + case QMetaType::QQuaternion: { struct { float wp; float xp; @@ -608,7 +608,7 @@ void QQmlObjectCreator::setPropertyValue(const QQmlPropertyData *property, const property->writeProperty(_qobject, &vec, propertyWriteFlags); } break; - case QVariant::RegExp: + case QMetaType::QRegExp: assertOrNull(!"not possible"); break; default: { @@ -673,7 +673,7 @@ void QQmlObjectCreator::setPropertyValue(const QQmlPropertyData *property, const QVariant value = (*converter)(stringValue); QMetaProperty metaProperty = _qobject->metaObject()->property(property->coreIndex()); - if (value.isNull() || ((int)metaProperty.type() != property->propType() && metaProperty.userType() != property->propType())) { + if (value.isNull() || metaProperty.userType() != property->propType()) { recordError(binding->location, tr("Cannot assign value %1 to property %2").arg(stringValue).arg(QString::fromUtf8(metaProperty.name()))); break; } diff --git a/src/qml/qml/qqmlproperty.cpp b/src/qml/qml/qqmlproperty.cpp index 871bec1c17..93020661e2 100644 --- a/src/qml/qml/qqmlproperty.cpp +++ b/src/qml/qml/qqmlproperty.cpp @@ -471,7 +471,7 @@ QQmlPropertyPrivate::propertyTypeCategory() const return QQmlProperty::Normal; } else if (type & QQmlProperty::Property) { int type = propertyType(); - if (type == QVariant::Invalid) + if (type == QMetaType::UnknownType) return QQmlProperty::InvalidCategory; else if (QQmlValueTypeFactory::isValueType((uint)type)) return QQmlProperty::Normal; @@ -526,7 +526,7 @@ bool QQmlProperty::operator==(const QQmlProperty &other) const */ int QQmlProperty::propertyType() const { - return d ? d->propertyType() : int(QVariant::Invalid); + return d ? d->propertyType() : int(QMetaType::UnknownType); } bool QQmlPropertyPrivate::isValueType() const @@ -542,7 +542,7 @@ int QQmlPropertyPrivate::propertyType() const } else if (type & QQmlProperty::Property) { return core.propType(); } else { - return QVariant::Invalid; + return QMetaType::UnknownType; } } @@ -1133,7 +1133,7 @@ bool QQmlPropertyPrivate::writeEnumProperty(const QMetaProperty &prop, int idx, QVariant v = value; if (prop.isEnumType()) { QMetaEnum menum = prop.enumerator(); - if (v.userType() == QVariant::String + if (v.userType() == QMetaType::QString #ifdef QT3_SUPPORT || v.userType() == QVariant::CString #endif @@ -1145,13 +1145,13 @@ bool QQmlPropertyPrivate::writeEnumProperty(const QMetaProperty &prop, int idx, v = QVariant(menum.keyToValue(value.toByteArray(), &ok)); if (!ok) return false; - } else if (v.userType() != QVariant::Int && v.userType() != QVariant::UInt) { + } else if (v.userType() != QMetaType::Int && v.userType() != QMetaType::UInt) { int enumMetaTypeId = QMetaType::type(QByteArray(menum.scope() + QByteArray("::") + menum.name())); if ((enumMetaTypeId == QMetaType::UnknownType) || (v.userType() != enumMetaTypeId) || !v.constData()) return false; v = QVariant(*reinterpret_cast<const int *>(v.constData())); } - v.convert(QVariant::Int); + v.convert(QMetaType::Int); } // the status variable is changed by qt_metacall to indicate what it did @@ -1206,17 +1206,17 @@ bool QQmlPropertyPrivate::write(QObject *object, QMetaProperty prop = object->metaObject()->property(property.coreIndex()); QVariant v = value; // Enum values come through the script engine as doubles - if (variantType == QVariant::Double) { + if (variantType == QMetaType::Double) { double integral; double fractional = std::modf(value.toDouble(), &integral); if (qFuzzyIsNull(fractional)) - v.convert(QVariant::Int); + v.convert(QMetaType::Int); } return writeEnumProperty(prop, property.coreIndex(), object, v, flags); } QQmlEnginePrivate *enginePriv = QQmlEnginePrivate::get(context); - const bool isUrl = propertyType == QVariant::Url; // handled separately + const bool isUrl = propertyType == QMetaType::QUrl; // handled separately // The cases below are in approximate order of likelyhood: if (propertyType == variantType && !isUrl && propertyType != qMetaTypeId<QList<QUrl>>() && !property.isQList()) { @@ -1249,7 +1249,7 @@ bool QQmlPropertyPrivate::write(QObject *object, } else { return false; } - } else if (value.canConvert(propertyType) && !isUrl && variantType != QVariant::String && propertyType != qMetaTypeId<QList<QUrl>>() && !property.isQList()) { + } else if (value.canConvert(propertyType) && !isUrl && variantType != QMetaType::QString && propertyType != qMetaTypeId<QList<QUrl>>() && !property.isQList()) { // common cases: switch (propertyType) { case QMetaType::Bool: { @@ -1282,14 +1282,14 @@ bool QQmlPropertyPrivate::write(QObject *object, return property.writeProperty(object, const_cast<QVariant *>(&value), flags); } else if (isUrl) { QUrl u; - if (variantType == QVariant::Url) { + if (variantType == QMetaType::QUrl) { u = value.toUrl(); - } else if (variantType == QVariant::ByteArray) { + } else if (variantType == QMetaType::QByteArray) { QString input(QString::fromUtf8(value.toByteArray())); // Encoded dir-separators defeat QUrl processing - decode them first input.replace(QLatin1String("%2f"), QLatin1String("/"), Qt::CaseInsensitive); u = QUrl(input); - } else if (variantType == QVariant::String) { + } else if (variantType == QMetaType::QString) { QString input(value.toString()); // Encoded dir-separators defeat QUrl processing - decode them first input.replace(QLatin1String("%2f"), QLatin1String("/"), Qt::CaseInsensitive); @@ -1355,7 +1355,7 @@ bool QQmlPropertyPrivate::write(QObject *object, bool ok = false; QVariant v; - if (variantType == QVariant::String) + if (variantType == QMetaType::QString) v = QQmlStringConverters::variantFromString(value.toString(), propertyType, &ok); if (!ok) { @@ -1368,8 +1368,8 @@ bool QQmlPropertyPrivate::write(QObject *object, // successful conversion. Q_ASSERT(v.userType() == propertyType); ok = true; - } else if (static_cast<uint>(propertyType) >= QVariant::UserType && - variantType == QVariant::String) { + } else if (static_cast<uint>(propertyType) >= QMetaType::User && + variantType == QMetaType::QString) { QQmlMetaType::StringConverter con = QQmlMetaType::customStringConverter(propertyType); if (con) { v = con(value.toString()); @@ -1383,28 +1383,28 @@ bool QQmlPropertyPrivate::write(QObject *object, // to a sequence type property (eg, an int to a QList<int> property). // or that we encountered an interface type // Note that we've already handled single-value assignment to QList<QUrl> properties. - if (variantType == QVariant::Int && propertyType == qMetaTypeId<QList<int> >()) { + if (variantType == QMetaType::Int && propertyType == qMetaTypeId<QList<int> >()) { QList<int> list; list << value.toInt(); v = QVariant::fromValue<QList<int> >(list); ok = true; - } else if ((variantType == QVariant::Double || variantType == QVariant::Int) + } else if ((variantType == QMetaType::Double || variantType == QMetaType::Int) && (propertyType == qMetaTypeId<QList<qreal> >())) { QList<qreal> list; list << value.toReal(); v = QVariant::fromValue<QList<qreal> >(list); ok = true; - } else if (variantType == QVariant::Bool && propertyType == qMetaTypeId<QList<bool> >()) { + } else if (variantType == QMetaType::Bool && propertyType == qMetaTypeId<QList<bool> >()) { QList<bool> list; list << value.toBool(); v = QVariant::fromValue<QList<bool> >(list); ok = true; - } else if (variantType == QVariant::String && propertyType == qMetaTypeId<QList<QString> >()) { + } else if (variantType == QMetaType::QString && propertyType == qMetaTypeId<QList<QString> >()) { QList<QString> list; list << value.toString(); v = QVariant::fromValue<QList<QString> >(list); ok = true; - } else if (variantType == QVariant::String && propertyType == qMetaTypeId<QStringList>()) { + } else if (variantType == QMetaType::QString && propertyType == qMetaTypeId<QStringList>()) { QStringList list; list << value.toString(); v = QVariant::fromValue<QStringList>(list); diff --git a/src/qml/qml/qqmlpropertycache.cpp b/src/qml/qml/qqmlpropertycache.cpp index 69957ab282..bddea57622 100644 --- a/src/qml/qml/qqmlpropertycache.cpp +++ b/src/qml/qml/qqmlpropertycache.cpp @@ -92,7 +92,7 @@ static void flagsForPropertyType(int propType, QQmlPropertyData::Flags &flags) flags.type = QQmlPropertyData::Flags::QObjectDerivedType; } else if (propType == QMetaType::QVariant) { flags.type = QQmlPropertyData::Flags::QVariantType; - } else if (propType < static_cast<int>(QVariant::UserType)) { + } else if (propType < static_cast<int>(QMetaType::User)) { // nothing to do } else if (propType == qMetaTypeId<QQmlBinding *>()) { flags.type = QQmlPropertyData::Flags::QmlBindingType; @@ -136,14 +136,14 @@ static void populate(QQmlPropertyData *data, const QMetaProperty &p) void QQmlPropertyData::lazyLoad(const QMetaProperty &p) { populate(this, p); - int type = static_cast<int>(p.type()); + int type = static_cast<int>(p.userType()); if (type == QMetaType::QObjectStar) { setPropType(type); m_flags.type = Flags::QObjectDerivedType; } else if (type == QMetaType::QVariant) { setPropType(type); m_flags.type = Flags::QVariantType; - } else if (type == QVariant::UserType || type == -1) { + } else if (type >= QMetaType::User || type == 0) { m_flags.notFullyResolved = true; } else { setPropType(type); @@ -314,7 +314,7 @@ void QQmlPropertyCache::appendSignal(const QString &name, QQmlPropertyData::Flag const QList<QByteArray> &names) { QQmlPropertyData data; - data.setPropType(QVariant::Invalid); + data.setPropType(QMetaType::UnknownType); data.setCoreIndex(coreIndex); data.setFlags(flags); data.setArguments(nullptr); diff --git a/src/qml/qml/qqmlpropertycachecreator_p.h b/src/qml/qml/qqmlpropertycachecreator_p.h index 8571b0c9b3..1f636c8347 100644 --- a/src/qml/qml/qqmlpropertycachecreator_p.h +++ b/src/qml/qml/qqmlpropertycachecreator_p.h @@ -806,12 +806,12 @@ inline QQmlJS::DiagnosticMessage QQmlPropertyCacheAliasCreator<ObjectContainer>: if (valueTypeIndex != -1) { const QMetaObject *valueTypeMetaObject = QQmlValueTypeFactory::metaObjectForMetaType(*type); if (valueTypeMetaObject->property(valueTypeIndex).isEnumType()) - *type = QVariant::Int; + *type = QMetaType::Int; else *type = valueTypeMetaObject->property(valueTypeIndex).userType(); } else { if (targetProperty->isEnum()) { - *type = QVariant::Int; + *type = QMetaType::Int; } else { // Copy type flags propertyFlags->copyPropertyTypeFlags(targetProperty->flags()); diff --git a/src/qml/qml/qqmlpropertyvalidator.cpp b/src/qml/qml/qqmlpropertyvalidator.cpp index 238a535b89..8f6e2737cc 100644 --- a/src/qml/qml/qqmlpropertyvalidator.cpp +++ b/src/qml/qml/qqmlpropertyvalidator.cpp @@ -398,31 +398,31 @@ QQmlJS::DiagnosticMessage QQmlPropertyValidator::validateLiteralBinding(QQmlProp switch (property->propType()) { case QMetaType::QVariant: break; - case QVariant::String: { + case QMetaType::QString: { if (!binding->evaluatesToString()) { return warnOrError(tr("Invalid property assignment: string expected")); } } break; - case QVariant::StringList: { + case QMetaType::QStringList: { if (!binding->evaluatesToString()) { return warnOrError(tr("Invalid property assignment: string or string list expected")); } } break; - case QVariant::ByteArray: { + case QMetaType::QByteArray: { if (binding->type != QV4::CompiledData::Binding::Type_String) { return warnOrError(tr("Invalid property assignment: byte array expected")); } } break; - case QVariant::Url: { + case QMetaType::QUrl: { if (binding->type != QV4::CompiledData::Binding::Type_String) { return warnOrError(tr("Invalid property assignment: url expected")); } } break; - case QVariant::UInt: { + case QMetaType::UInt: { if (binding->type == QV4::CompiledData::Binding::Type_Number) { double d = compilationUnit->bindingValueAsNumber(binding); if (double(uint(d)) == d) @@ -431,7 +431,7 @@ QQmlJS::DiagnosticMessage QQmlPropertyValidator::validateLiteralBinding(QQmlProp return warnOrError(tr("Invalid property assignment: unsigned int expected")); } break; - case QVariant::Int: { + case QMetaType::Int: { if (binding->type == QV4::CompiledData::Binding::Type_Number) { double d = compilationUnit->bindingValueAsNumber(binding); if (double(int(d)) == d) @@ -446,13 +446,13 @@ QQmlJS::DiagnosticMessage QQmlPropertyValidator::validateLiteralBinding(QQmlProp } } break; - case QVariant::Double: { + case QMetaType::Double: { if (binding->type != QV4::CompiledData::Binding::Type_Number) { return warnOrError(tr("Invalid property assignment: number expected")); } } break; - case QVariant::Color: { + case QMetaType::QColor: { bool ok = false; QQmlStringConverters::rgbaFromString(compilationUnit->bindingValueAsString(binding), &ok); if (!ok) { @@ -461,7 +461,7 @@ QQmlJS::DiagnosticMessage QQmlPropertyValidator::validateLiteralBinding(QQmlProp } break; #if QT_CONFIG(datestring) - case QVariant::Date: { + case QMetaType::QDate: { bool ok = false; QQmlStringConverters::dateFromString(compilationUnit->bindingValueAsString(binding), &ok); if (!ok) { @@ -469,7 +469,7 @@ QQmlJS::DiagnosticMessage QQmlPropertyValidator::validateLiteralBinding(QQmlProp } } break; - case QVariant::Time: { + case QMetaType::QTime: { bool ok = false; QQmlStringConverters::timeFromString(compilationUnit->bindingValueAsString(binding), &ok); if (!ok) { @@ -477,7 +477,7 @@ QQmlJS::DiagnosticMessage QQmlPropertyValidator::validateLiteralBinding(QQmlProp } } break; - case QVariant::DateTime: { + case QMetaType::QDateTime: { bool ok = false; QQmlStringConverters::dateTimeFromString(compilationUnit->bindingValueAsString(binding), &ok); if (!ok) { @@ -486,7 +486,7 @@ QQmlJS::DiagnosticMessage QQmlPropertyValidator::validateLiteralBinding(QQmlProp } break; #endif // datestring - case QVariant::Point: { + case QMetaType::QPoint: { bool ok = false; QQmlStringConverters::pointFFromString(compilationUnit->bindingValueAsString(binding), &ok); if (!ok) { @@ -494,7 +494,7 @@ QQmlJS::DiagnosticMessage QQmlPropertyValidator::validateLiteralBinding(QQmlProp } } break; - case QVariant::PointF: { + case QMetaType::QPointF: { bool ok = false; QQmlStringConverters::pointFFromString(compilationUnit->bindingValueAsString(binding), &ok); if (!ok) { @@ -502,7 +502,7 @@ QQmlJS::DiagnosticMessage QQmlPropertyValidator::validateLiteralBinding(QQmlProp } } break; - case QVariant::Size: { + case QMetaType::QSize: { bool ok = false; QQmlStringConverters::sizeFFromString(compilationUnit->bindingValueAsString(binding), &ok); if (!ok) { @@ -510,7 +510,7 @@ QQmlJS::DiagnosticMessage QQmlPropertyValidator::validateLiteralBinding(QQmlProp } } break; - case QVariant::SizeF: { + case QMetaType::QSizeF: { bool ok = false; QQmlStringConverters::sizeFFromString(compilationUnit->bindingValueAsString(binding), &ok); if (!ok) { @@ -518,7 +518,7 @@ QQmlJS::DiagnosticMessage QQmlPropertyValidator::validateLiteralBinding(QQmlProp } } break; - case QVariant::Rect: { + case QMetaType::QRect: { bool ok = false; QQmlStringConverters::rectFFromString(compilationUnit->bindingValueAsString(binding), &ok); if (!ok) { @@ -526,7 +526,7 @@ QQmlJS::DiagnosticMessage QQmlPropertyValidator::validateLiteralBinding(QQmlProp } } break; - case QVariant::RectF: { + case QMetaType::QRectF: { bool ok = false; QQmlStringConverters::rectFFromString(compilationUnit->bindingValueAsString(binding), &ok); if (!ok) { @@ -534,13 +534,13 @@ QQmlJS::DiagnosticMessage QQmlPropertyValidator::validateLiteralBinding(QQmlProp } } break; - case QVariant::Bool: { + case QMetaType::Bool: { if (binding->type != QV4::CompiledData::Binding::Type_Boolean) { return warnOrError(tr("Invalid property assignment: boolean expected")); } } break; - case QVariant::Vector2D: { + case QMetaType::QVector2D: { struct { float xp; float yp; @@ -550,7 +550,7 @@ QQmlJS::DiagnosticMessage QQmlPropertyValidator::validateLiteralBinding(QQmlProp } } break; - case QVariant::Vector3D: { + case QMetaType::QVector3D: { struct { float xp; float yp; @@ -561,7 +561,7 @@ QQmlJS::DiagnosticMessage QQmlPropertyValidator::validateLiteralBinding(QQmlProp } } break; - case QVariant::Vector4D: { + case QMetaType::QVector4D: { struct { float xp; float yp; @@ -573,7 +573,7 @@ QQmlJS::DiagnosticMessage QQmlPropertyValidator::validateLiteralBinding(QQmlProp } } break; - case QVariant::Quaternion: { + case QMetaType::QQuaternion: { struct { float wp; float xp; @@ -585,8 +585,8 @@ QQmlJS::DiagnosticMessage QQmlPropertyValidator::validateLiteralBinding(QQmlProp } } break; - case QVariant::RegExp: - case QVariant::RegularExpression: + case QMetaType::QRegExp: + case QMetaType::QRegularExpression: return warnOrError(tr("Invalid property assignment: regular expression expected; use /pattern/ syntax")); default: { // generate single literal value assignment to a list property if required diff --git a/src/qml/qml/qqmlvaluetype.cpp b/src/qml/qml/qqmlvaluetype.cpp index 90a10c8d9a..cb3f572e1f 100644 --- a/src/qml/qml/qqmlvaluetype.cpp +++ b/src/qml/qml/qqmlvaluetype.cpp @@ -64,7 +64,7 @@ struct QQmlValueTypeFactoryImpl const QMetaObject *metaObjectForMetaType(int); QQmlValueType *valueType(int); - QQmlValueType *valueTypes[QVariant::UserType]; + QQmlValueType *valueTypes[QMetaType::User]; QHash<int, QQmlValueType *> userTypes; QMutex mutex; @@ -73,7 +73,7 @@ struct QQmlValueTypeFactoryImpl QQmlValueTypeFactoryImpl::QQmlValueTypeFactoryImpl() { - std::fill_n(valueTypes, int(QVariant::UserType), &invalidValueType); + std::fill_n(valueTypes, int(QMetaType::User), &invalidValueType); #if QT_CONFIG(qml_itemmodel) // See types wrapped in qqmlmodelindexvaluetype_p.h @@ -120,24 +120,24 @@ bool QQmlValueTypeFactoryImpl::isValueType(int idx) const QMetaObject *QQmlValueTypeFactoryImpl::metaObjectForMetaType(int t) { switch (t) { - case QVariant::Point: + case QMetaType::QPoint: return &QQmlPointValueType::staticMetaObject; - case QVariant::PointF: + case QMetaType::QPointF: return &QQmlPointFValueType::staticMetaObject; - case QVariant::Size: + case QMetaType::QSize: return &QQmlSizeValueType::staticMetaObject; - case QVariant::SizeF: + case QMetaType::QSizeF: return &QQmlSizeFValueType::staticMetaObject; - case QVariant::Rect: + case QMetaType::QRect: return &QQmlRectValueType::staticMetaObject; - case QVariant::RectF: + case QMetaType::QRectF: return &QQmlRectFValueType::staticMetaObject; - case QVariant::EasingCurve: + case QMetaType::QEasingCurve: return &QQmlEasingValueType::staticMetaObject; #if QT_CONFIG(qml_itemmodel) - case QVariant::ModelIndex: + case QMetaType::QModelIndex: return &QQmlModelIndexValueType::staticMetaObject; - case QVariant::PersistentModelIndex: + case QMetaType::QPersistentModelIndex: return &QQmlPersistentModelIndexValueType::staticMetaObject; #endif default: @@ -160,7 +160,7 @@ const QMetaObject *QQmlValueTypeFactoryImpl::metaObjectForMetaType(int t) QQmlValueType *QQmlValueTypeFactoryImpl::valueType(int idx) { - if (idx >= (int)QVariant::UserType) { + if (idx >= (int)QMetaType::User) { // Protect the hash with a mutex mutex.lock(); diff --git a/src/qml/qml/qqmlvaluetypewrapper.cpp b/src/qml/qml/qqmlvaluetypewrapper.cpp index f23921497c..ba5ba96cbe 100644 --- a/src/qml/qml/qqmlvaluetypewrapper.cpp +++ b/src/qml/qml/qqmlvaluetypewrapper.cpp @@ -601,7 +601,7 @@ bool QQmlValueTypeWrapper::virtualPut(Managed *m, PropertyKey id, const Value &v QVariant v = v4->toVariant(value, property.userType()); - if (property.isEnumType() && (QMetaType::Type)v.type() == QMetaType::Double) + if (property.isEnumType() && (QMetaType::Type)v.userType() == QMetaType::Double) v = v.toInt(); void *gadget = r->d()->gadgetPtr(); diff --git a/src/qml/qml/qqmlvmemetaobject.cpp b/src/qml/qml/qqmlvmemetaobject.cpp index 42a90e234c..ecb86e2f10 100644 --- a/src/qml/qml/qqmlvmemetaobject.cpp +++ b/src/qml/qml/qqmlvmemetaobject.cpp @@ -291,7 +291,7 @@ bool QQmlInterceptorMetaObject::intercept(QMetaObject::Call c, int id, void **a) const int valueIndex = vi->m_propertyIndex.valueTypeIndex(); int type = QQmlData::get(object)->propertyCache->property(id)->propType(); - if (type != QVariant::Invalid) { + if (type != QMetaType::UnknownType) { if (valueIndex != -1) { QQmlValueType *valueType = QQmlValueTypeFactory::valueType(type); Q_ASSERT(valueType); @@ -534,7 +534,7 @@ QUrl QQmlVMEMetaObject::readPropertyAsUrl(int id) const QV4::Scope scope(engine); QV4::ScopedValue sv(scope, *(md->data() + id)); const QV4::VariantObject *v = sv->as<QV4::VariantObject>(); - if (!v || v->d()->data().type() != QVariant::Url) + if (!v || v->d()->data().userType() != QMetaType::QUrl) return QUrl(); return v->d()->data().value<QUrl>(); } @@ -548,7 +548,7 @@ QDate QQmlVMEMetaObject::readPropertyAsDate(int id) const QV4::Scope scope(engine); QV4::ScopedValue sv(scope, *(md->data() + id)); const QV4::VariantObject *v = sv->as<QV4::VariantObject>(); - if (!v || v->d()->data().type() != QVariant::Date) + if (!v || v->d()->data().userType() != QMetaType::QDate) return QDate(); return v->d()->data().value<QDate>(); } @@ -562,7 +562,7 @@ QDateTime QQmlVMEMetaObject::readPropertyAsDateTime(int id) QV4::Scope scope(engine); QV4::ScopedValue sv(scope, *(md->data() + id)); const QV4::VariantObject *v = sv->as<QV4::VariantObject>(); - if (!v || v->d()->data().type() != QVariant::DateTime) + if (!v || v->d()->data().userType() != QMetaType::QDateTime) return QDateTime(); return v->d()->data().value<QDateTime>(); } @@ -576,7 +576,7 @@ QSizeF QQmlVMEMetaObject::readPropertyAsSizeF(int id) const QV4::Scope scope(engine); QV4::ScopedValue sv(scope, *(md->data() + id)); const QV4::VariantObject *v = sv->as<QV4::VariantObject>(); - if (!v || v->d()->data().type() != QVariant::SizeF) + if (!v || v->d()->data().userType() != QMetaType::QSizeF) return QSizeF(); return v->d()->data().value<QSizeF>(); } @@ -590,7 +590,7 @@ QPointF QQmlVMEMetaObject::readPropertyAsPointF(int id) const QV4::Scope scope(engine); QV4::ScopedValue sv(scope, *(md->data() + id)); const QV4::VariantObject *v = sv->as<QV4::VariantObject>(); - if (!v || v->d()->data().type() != QVariant::PointF) + if (!v || v->d()->data().userType() != QMetaType::QPointF) return QPointF(); return v->d()->data().value<QPointF>(); } @@ -634,7 +634,7 @@ QRectF QQmlVMEMetaObject::readPropertyAsRectF(int id) const QV4::Scope scope(engine); QV4::ScopedValue sv(scope, *(md->data() + id)); const QV4::VariantObject *v = sv->as<QV4::VariantObject>(); - if (!v || v->d()->data().type() != QVariant::RectF) + if (!v || v->d()->data().userType() != QMetaType::QRectF) return QRectF(); return v->d()->data().value<QRectF>(); } diff --git a/src/qml/qml/v8/qqmlbuiltinfunctions.cpp b/src/qml/qml/v8/qqmlbuiltinfunctions.cpp index f5e723419e..ac4b9b85b9 100644 --- a/src/qml/qml/v8/qqmlbuiltinfunctions.cpp +++ b/src/qml/qml/v8/qqmlbuiltinfunctions.cpp @@ -346,22 +346,22 @@ ReturnedValue QtObject::method_colorEqual(const FunctionObject *b, const Value * bool ok = false; QVariant lhs = scope.engine->toVariant(argv[0], -1); - if (lhs.userType() == QVariant::String) { + if (lhs.userType() == QMetaType::QString) { lhs = QQmlStringConverters::colorFromString(lhs.toString(), &ok); if (!ok) { THROW_GENERIC_ERROR("Qt.colorEqual(): Invalid color name"); } - } else if (lhs.userType() != QVariant::Color) { + } else if (lhs.userType() != QMetaType::QColor) { THROW_GENERIC_ERROR("Qt.colorEqual(): Invalid arguments"); } QVariant rhs = scope.engine->toVariant(argv[1], -1); - if (rhs.userType() == QVariant::String) { + if (rhs.userType() == QMetaType::QString) { rhs = QQmlStringConverters::colorFromString(rhs.toString(), &ok); if (!ok) { THROW_GENERIC_ERROR("Qt.colorEqual(): Invalid color name"); } - } else if (rhs.userType() != QVariant::Color) { + } else if (rhs.userType() != QMetaType::QColor) { THROW_GENERIC_ERROR("Qt.colorEqual(): Invalid arguments"); } @@ -612,13 +612,13 @@ ReturnedValue QtObject::method_lighter(const FunctionObject *b, const Value *, c THROW_GENERIC_ERROR("Qt.lighter(): Invalid arguments"); QVariant v = scope.engine->toVariant(argv[0], -1); - if (v.userType() == QVariant::String) { + if (v.userType() == QMetaType::QString) { bool ok = false; v = QQmlStringConverters::colorFromString(v.toString(), &ok); if (!ok) { return QV4::Encode::null(); } - } else if (v.userType() != QVariant::Color) { + } else if (v.userType() != QMetaType::QColor) { return QV4::Encode::null(); } @@ -652,13 +652,13 @@ ReturnedValue QtObject::method_darker(const FunctionObject *b, const Value *, co THROW_GENERIC_ERROR("Qt.darker(): Invalid arguments"); QVariant v = scope.engine->toVariant(argv[0], -1); - if (v.userType() == QVariant::String) { + if (v.userType() == QMetaType::QString) { bool ok = false; v = QQmlStringConverters::colorFromString(v.toString(), &ok); if (!ok) { return QV4::Encode::null(); } - } else if (v.userType() != QVariant::Color) { + } else if (v.userType() != QMetaType::QColor) { return QV4::Encode::null(); } @@ -703,25 +703,25 @@ ReturnedValue QtObject::method_tint(const FunctionObject *b, const Value *, cons // base color QVariant v1 = scope.engine->toVariant(argv[0], -1); - if (v1.userType() == QVariant::String) { + if (v1.userType() == QMetaType::QString) { bool ok = false; v1 = QQmlStringConverters::colorFromString(v1.toString(), &ok); if (!ok) { return QV4::Encode::null(); } - } else if (v1.userType() != QVariant::Color) { + } else if (v1.userType() != QMetaType::QColor) { return QV4::Encode::null(); } // tint color QVariant v2 = scope.engine->toVariant(argv[1], -1); - if (v2.userType() == QVariant::String) { + if (v2.userType() == QMetaType::QString) { bool ok = false; v2 = QQmlStringConverters::colorFromString(v2.toString(), &ok); if (!ok) { return QV4::Encode::null(); } - } else if (v2.userType() != QVariant::Color) { + } else if (v2.userType() != QMetaType::QColor) { return QV4::Encode::null(); } @@ -795,7 +795,7 @@ ReturnedValue QtObject::method_formatTime(const FunctionObject *b, const Value * QVariant argVariant = scope.engine->toVariant(argv[0], -1); QTime time; - if (argv[0].as<DateObject>() || (argVariant.type() == QVariant::String)) + if (argv[0].as<DateObject>() || (argVariant.userType() == QMetaType::QString)) time = argVariant.toDateTime().time(); else // if (argVariant.type() == QVariant::Time), or invalid. time = argVariant.toTime(); |