From e4e4ef2629d47d416f2326a833727984530f53cc Mon Sep 17 00:00:00 2001 From: Marcus Tillmanns Date: Fri, 26 Jul 2024 14:50:49 +0200 Subject: [PATCH] Fix warnings Change-Id: I142453a6707c252ab9c311573c329d24d85cf2ab Reviewed-by: Marco Bubke --- .../materialeditor/materialeditorqmlbackend.cpp | 6 +++--- .../propertyeditor/propertyeditorqmlbackend.cpp | 6 +++--- .../propertyeditor/propertyeditorvalue.cpp | 12 ++++++------ .../propertyeditor/propertyeditorview.cpp | 8 ++++---- .../textureeditor/textureeditorview.cpp | 8 ++++---- .../designercore/model/texttomodelmerger.cpp | 16 ++++++++-------- src/plugins/qmljseditor/quicktoolbar.cpp | 2 +- 7 files changed, 29 insertions(+), 29 deletions(-) diff --git a/src/plugins/qmldesigner/components/materialeditor/materialeditorqmlbackend.cpp b/src/plugins/qmldesigner/components/materialeditor/materialeditorqmlbackend.cpp index e8bd3a1cfb7..3922db97405 100644 --- a/src/plugins/qmldesigner/components/materialeditor/materialeditorqmlbackend.cpp +++ b/src/plugins/qmldesigner/components/materialeditor/materialeditorqmlbackend.cpp @@ -143,7 +143,7 @@ void MaterialEditorQmlBackend::createPropertyEditorValue(const QmlObjectNode &qm void MaterialEditorQmlBackend::setValue(const QmlObjectNode &, const PropertyName &name, const QVariant &value) { // Vector*D values need to be split into their subcomponents - if (value.typeId() == QVariant::Vector2D) { + if (value.typeId() == QMetaType::QVector2D) { const char *suffix[2] = {"_x", "_y"}; auto vecValue = value.value(); for (int i = 0; i < 2; ++i) { @@ -154,7 +154,7 @@ void MaterialEditorQmlBackend::setValue(const QmlObjectNode &, const PropertyNam if (propertyValue) propertyValue->setValue(QVariant(vecValue[i])); } - } else if (value.typeId() == QVariant::Vector3D) { + } else if (value.typeId() == QMetaType::QVector3D) { const char *suffix[3] = {"_x", "_y", "_z"}; auto vecValue = value.value(); for (int i = 0; i < 3; ++i) { @@ -165,7 +165,7 @@ void MaterialEditorQmlBackend::setValue(const QmlObjectNode &, const PropertyNam if (propertyValue) propertyValue->setValue(QVariant(vecValue[i])); } - } else if (value.typeId() == QVariant::Vector4D) { + } else if (value.typeId() == QMetaType::QVector4D) { const char *suffix[4] = {"_x", "_y", "_z", "_w"}; auto vecValue = value.value(); for (int i = 0; i < 4; ++i) { diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp index 92c5ad642f0..9d53b82ab19 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp @@ -346,7 +346,7 @@ void PropertyEditorQmlBackend::createPropertyEditorValue(const QmlObjectNode &qm void PropertyEditorQmlBackend::setValue(const QmlObjectNode & , const PropertyName &name, const QVariant &value) { // Vector*D values need to be split into their subcomponents - if (value.typeId() == QVariant::Vector2D) { + if (value.typeId() == QMetaType::QVector2D) { const char *suffix[2] = {"_x", "_y"}; auto vecValue = value.value(); for (int i = 0; i < 2; ++i) { @@ -357,7 +357,7 @@ void PropertyEditorQmlBackend::setValue(const QmlObjectNode & , const PropertyNa if (propertyValue) propertyValue->setValue(QVariant(vecValue[i])); } - } else if (value.typeId() == QVariant::Vector3D) { + } else if (value.typeId() == QMetaType::QVector3D) { const char *suffix[3] = {"_x", "_y", "_z"}; auto vecValue = value.value(); for (int i = 0; i < 3; ++i) { @@ -368,7 +368,7 @@ void PropertyEditorQmlBackend::setValue(const QmlObjectNode & , const PropertyNa if (propertyValue) propertyValue->setValue(QVariant(vecValue[i])); } - } else if (value.typeId() == QVariant::Vector4D) { + } else if (value.typeId() == QMetaType::QVector4D) { const char *suffix[4] = {"_x", "_y", "_z", "_w"}; auto vecValue = value.value(); for (int i = 0; i < 4; ++i) { diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.cpp b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.cpp index 27319c15f56..c14d0cf5c33 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.cpp @@ -43,7 +43,7 @@ QVariant PropertyEditorValue::value() const static bool cleverDoubleCompare(const QVariant &value1, const QVariant &value2) { - if (value1.typeId() == QVariant::Double && value2.typeId() == QVariant::Double) { + if (value1.typeId() == QMetaType::Double && value2.typeId() == QMetaType::Double) { // ignore slight changes on doubles if (qFuzzyCompare(value1.toDouble(), value2.toDouble())) return true; @@ -53,16 +53,16 @@ static bool cleverDoubleCompare(const QVariant &value1, const QVariant &value2) static bool cleverColorCompare(const QVariant &value1, const QVariant &value2) { - if (value1.typeId() == QVariant::Color && value2.typeId() == QVariant::Color) { + if (value1.typeId() == QMetaType::QColor && value2.typeId() == QMetaType::QColor) { QColor c1 = value1.value(); QColor c2 = value2.value(); return c1.name() == c2.name() && c1.alpha() == c2.alpha(); } - if (value1.typeId() == QMetaType::QString && value2.typeId() == QVariant::Color) + if (value1.typeId() == QMetaType::QString && value2.typeId() == QMetaType::QColor) return cleverColorCompare(QVariant(QColor(value1.toString())), value2); - if (value1.typeId() == QVariant::Color && value2.typeId() == QMetaType::QString) + if (value1.typeId() == QMetaType::QColor && value2.typeId() == QMetaType::QString) return cleverColorCompare(value1, QVariant(QColor(value2.toString()))); return false; @@ -73,7 +73,7 @@ static bool cleverColorCompare(const QVariant &value1, const QVariant &value2) static void fixAmbigousColorNames(const ModelNode &modelNode, const PropertyName &name, QVariant *value) { if (auto metaInfo = modelNode.metaInfo(); metaInfo.property(name).propertyType().isColor()) { - if (value->typeId() == QVariant::Color) { + if (value->typeId() == QMetaType::QColor) { QColor color = value->value(); int alpha = color.alpha(); color = QColor(color.name()); @@ -880,7 +880,7 @@ void PropertyEditorSubSelectionWrapper::changeValue(const QString &name) if (auto property = metaInfo.property(name.toUtf8())) { castedValue = property.castedValue(value->value()); - if (castedValue.typeId() == QVariant::Color) { + if (castedValue.typeId() == QMetaType::QColor) { QColor color = castedValue.value(); QColor newColor = QColor(color.name()); newColor.setAlpha(color.alpha()); diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.cpp b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.cpp index e0d5759617b..bc77f70b2c8 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.cpp @@ -207,7 +207,7 @@ void PropertyEditorView::changeValue(const QString &name) if (name == "state" && castedValue.toString() == "base state") castedValue = ""; - if (castedValue.typeId() == QVariant::Color) { + if (castedValue.typeId() == QMetaType::QColor) { QColor color = castedValue.value(); QColor newColor = QColor(color.name()); newColor.setAlpha(color.alpha()); @@ -220,9 +220,9 @@ void PropertyEditorView::changeValue(const QString &name) } else { // QVector*D(0, 0, 0) detects as null variant though it is valid value if (castedValue.isValid() - && (!castedValue.isNull() || castedValue.typeId() == QVariant::Vector2D - || castedValue.typeId() == QVariant::Vector3D - || castedValue.typeId() == QVariant::Vector4D)) { + && (!castedValue.isNull() || castedValue.typeId() == QMetaType::QVector2D + || castedValue.typeId() == QMetaType::QVector3D + || castedValue.typeId() == QMetaType::QVector4D)) { commitVariantValueToModel(propertyName, castedValue); } } diff --git a/src/plugins/qmldesigner/components/textureeditor/textureeditorview.cpp b/src/plugins/qmldesigner/components/textureeditor/textureeditorview.cpp index a637431c4dd..6dd56060171 100644 --- a/src/plugins/qmldesigner/components/textureeditor/textureeditorview.cpp +++ b/src/plugins/qmldesigner/components/textureeditor/textureeditorview.cpp @@ -142,7 +142,7 @@ void TextureEditorView::changeValue(const QString &name) if (name == "state" && castedValue.toString() == "base state") castedValue = ""; - if (castedValue.typeId() == QVariant::Color) { + if (castedValue.typeId() == QMetaType::QColor) { QColor color = castedValue.value(); QColor newColor = QColor(color.name()); newColor.setAlpha(color.alpha()); @@ -154,9 +154,9 @@ void TextureEditorView::changeValue(const QString &name) } else { // QVector*D(0, 0, 0) detects as null variant though it is valid value if (castedValue.isValid() - && (!castedValue.isNull() || castedValue.typeId() == QVariant::Vector2D - || castedValue.typeId() == QVariant::Vector3D - || castedValue.typeId() == QVariant::Vector4D)) { + && (!castedValue.isNull() || castedValue.typeId() == QMetaType::QVector2D + || castedValue.typeId() == QMetaType::QVector3D + || castedValue.typeId() == QMetaType::QVector4D)) { commitVariantValueToModel(propertyName, castedValue); } } diff --git a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp index 5e82c3545ab..eda3fd1bf7b 100644 --- a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp +++ b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp @@ -516,25 +516,25 @@ public: const NodeMetaInfo &propertyTypeMetaInfo = propertyMetaInfo.propertyType(); if (propertyTypeMetaInfo.isColor()) - return PropertyParser::read(QVariant::Color, cleanedValue); + return PropertyParser::read(QMetaType::Type::QColor, cleanedValue); else if (propertyTypeMetaInfo.isUrl()) - return PropertyParser::read(QVariant::Url, cleanedValue); + return PropertyParser::read(QMetaType::Type::QUrl, cleanedValue); else if (propertyTypeMetaInfo.isVector2D()) - return PropertyParser::read(QVariant::Vector2D, cleanedValue); + return PropertyParser::read(QMetaType::Type::QVector2D, cleanedValue); else if (propertyTypeMetaInfo.isVector3D()) - return PropertyParser::read(QVariant::Vector3D, cleanedValue); + return PropertyParser::read(QMetaType::Type::QVector3D, cleanedValue); else if (propertyTypeMetaInfo.isVector4D()) - return PropertyParser::read(QVariant::Vector4D, cleanedValue); + return PropertyParser::read(QMetaType::Type::QVector4D, cleanedValue); QVariant value(cleanedValue); if (propertyTypeMetaInfo.isBool()) { - value.convert(QVariant::Bool); + value.convert(QMetaType::Type::Bool); return value; } else if (propertyTypeMetaInfo.isInteger()) { - value.convert(QVariant::Int); + value.convert(QMetaType::Type::Int); return value; } else if (propertyTypeMetaInfo.isFloat()) { - value.convert(QVariant::Double); + value.convert(QMetaType::Type::Double); return value; } else if (propertyTypeMetaInfo.isString()) { // nothing to do diff --git a/src/plugins/qmljseditor/quicktoolbar.cpp b/src/plugins/qmljseditor/quicktoolbar.cpp index 95af2960d1d..9ef6910977d 100644 --- a/src/plugins/qmljseditor/quicktoolbar.cpp +++ b/src/plugins/qmljseditor/quicktoolbar.cpp @@ -263,7 +263,7 @@ void QuickToolBar::setProperty(const QString &propertyName, const QVariant &valu { QString stringValue = value.toString(); - if (value.typeId() == QVariant::Color) + if (value.typeId() == QMetaType::Type::QColor) stringValue = QLatin1Char('\"') + value.toString() + QLatin1Char('\"'); if (cast(m_node) || cast(m_node)) {