feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fix warnings

Browse Source 
Change-Id: I142453a6707c252ab9c311573c329d24d85cf2ab
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
This commit is contained in:
Marcus Tillmanns
2024-07-26 14:50:49 +02:00
parent 1c15ca95a7
commit e4e4ef2629
7 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/qmldesigner/components/materialeditor/materialeditorqmlbackend.cpp
View File

@@ -143,7 +143,7 @@ void MaterialEditorQmlBackend::createPropertyEditorValue(const QmlObjectNode &qm
void MaterialEditorQmlBackend::setValue(const QmlObjectNode &, const PropertyName &name, const QVariant &value) void MaterialEditorQmlBackend::setValue(const QmlObjectNode &, const PropertyName &name, const QVariant &value)
{ {
// Vector*D values need to be split into their subcomponents // 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"}; const char *suffix[2] = {"_x", "_y"};
auto vecValue = value.value<QVector2D>(); auto vecValue = value.value<QVector2D>();
for (int i = 0; i < 2; ++i) { for (int i = 0; i < 2; ++i) {
@@ -154,7 +154,7 @@ void MaterialEditorQmlBackend::setValue(const QmlObjectNode &, const PropertyNam
if (propertyValue) if (propertyValue)
propertyValue->setValue(QVariant(vecValue[i])); propertyValue->setValue(QVariant(vecValue[i]));
} }
} else if (value.typeId() == QVariant::Vector3D) { } else if (value.typeId() == QMetaType::QVector3D) {
const char *suffix[3] = {"_x", "_y", "_z"}; const char *suffix[3] = {"_x", "_y", "_z"};
auto vecValue = value.value<QVector3D>(); auto vecValue = value.value<QVector3D>();
for (int i = 0; i < 3; ++i) { for (int i = 0; i < 3; ++i) {
@@ -165,7 +165,7 @@ void MaterialEditorQmlBackend::setValue(const QmlObjectNode &, const PropertyNam
if (propertyValue) if (propertyValue)
propertyValue->setValue(QVariant(vecValue[i])); 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"}; const char *suffix[4] = {"_x", "_y", "_z", "_w"};
auto vecValue = value.value<QVector4D>(); auto vecValue = value.value<QVector4D>();
for (int i = 0; i < 4; ++i) { for (int i = 0; i < 4; ++i) {

6
src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp
View File

@@ -346,7 +346,7 @@ void PropertyEditorQmlBackend::createPropertyEditorValue(const QmlObjectNode &qm
void PropertyEditorQmlBackend::setValue(const QmlObjectNode & , const PropertyName &name, const QVariant &value) void PropertyEditorQmlBackend::setValue(const QmlObjectNode & , const PropertyName &name, const QVariant &value)
{ {
// Vector*D values need to be split into their subcomponents // 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"}; const char *suffix[2] = {"_x", "_y"};
auto vecValue = value.value<QVector2D>(); auto vecValue = value.value<QVector2D>();
for (int i = 0; i < 2; ++i) { for (int i = 0; i < 2; ++i) {
@@ -357,7 +357,7 @@ void PropertyEditorQmlBackend::setValue(const QmlObjectNode & , const PropertyNa
if (propertyValue) if (propertyValue)
propertyValue->setValue(QVariant(vecValue[i])); propertyValue->setValue(QVariant(vecValue[i]));
} }
} else if (value.typeId() == QVariant::Vector3D) { } else if (value.typeId() == QMetaType::QVector3D) {
const char *suffix[3] = {"_x", "_y", "_z"}; const char *suffix[3] = {"_x", "_y", "_z"};
auto vecValue = value.value<QVector3D>(); auto vecValue = value.value<QVector3D>();
for (int i = 0; i < 3; ++i) { for (int i = 0; i < 3; ++i) {
@@ -368,7 +368,7 @@ void PropertyEditorQmlBackend::setValue(const QmlObjectNode & , const PropertyNa
if (propertyValue) if (propertyValue)
propertyValue->setValue(QVariant(vecValue[i])); 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"}; const char *suffix[4] = {"_x", "_y", "_z", "_w"};
auto vecValue = value.value<QVector4D>(); auto vecValue = value.value<QVector4D>();
for (int i = 0; i < 4; ++i) { for (int i = 0; i < 4; ++i) {

12
src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.cpp
View File

@@ -43,7 +43,7 @@ QVariant PropertyEditorValue::value() const
static bool cleverDoubleCompare(const QVariant &value1, const QVariant &value2) 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 // ignore slight changes on doubles
if (qFuzzyCompare(value1.toDouble(), value2.toDouble())) if (qFuzzyCompare(value1.toDouble(), value2.toDouble()))
return true; return true;
@@ -53,16 +53,16 @@ static bool cleverDoubleCompare(const QVariant &value1, const QVariant &value2)
static bool cleverColorCompare(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>(); QColor c1 = value1.value<QColor>();
QColor c2 = value2.value<QColor>(); QColor c2 = value2.value<QColor>();
return c1.name() == c2.name() && c1.alpha() == c2.alpha(); 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); 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 cleverColorCompare(value1, QVariant(QColor(value2.toString())));
return false; 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) static void fixAmbigousColorNames(const ModelNode &modelNode, const PropertyName &name, QVariant *value)
{ {
if (auto metaInfo = modelNode.metaInfo(); metaInfo.property(name).propertyType().isColor()) { if (auto metaInfo = modelNode.metaInfo(); metaInfo.property(name).propertyType().isColor()) {
if (value->typeId() == QVariant::Color) { if (value->typeId() == QMetaType::QColor) {
QColor color = value->value<QColor>(); QColor color = value->value<QColor>();
int alpha = color.alpha(); int alpha = color.alpha();
color = QColor(color.name()); color = QColor(color.name());
@@ -880,7 +880,7 @@ void PropertyEditorSubSelectionWrapper::changeValue(const QString &name)
if (auto property = metaInfo.property(name.toUtf8())) { if (auto property = metaInfo.property(name.toUtf8())) {
castedValue = property.castedValue(value->value()); castedValue = property.castedValue(value->value());
if (castedValue.typeId() == QVariant::Color) { if (castedValue.typeId() == QMetaType::QColor) {
QColor color = castedValue.value<QColor>(); QColor color = castedValue.value<QColor>();
QColor newColor = QColor(color.name()); QColor newColor = QColor(color.name());
newColor.setAlpha(color.alpha()); newColor.setAlpha(color.alpha());

8
src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.cpp
View File

@@ -207,7 +207,7 @@ void PropertyEditorView::changeValue(const QString &name)
if (name == "state" && castedValue.toString() == "base state") if (name == "state" && castedValue.toString() == "base state")
castedValue = ""; castedValue = "";
if (castedValue.typeId() == QVariant::Color) { if (castedValue.typeId() == QMetaType::QColor) {
QColor color = castedValue.value<QColor>(); QColor color = castedValue.value<QColor>();
QColor newColor = QColor(color.name()); QColor newColor = QColor(color.name());
newColor.setAlpha(color.alpha()); newColor.setAlpha(color.alpha());
@@ -220,9 +220,9 @@ void PropertyEditorView::changeValue(const QString &name)
} else { } else {
// QVector*D(0, 0, 0) detects as null variant though it is valid value // QVector*D(0, 0, 0) detects as null variant though it is valid value
if (castedValue.isValid() if (castedValue.isValid()
&& (!castedValue.isNull() || castedValue.typeId() == QVariant::Vector2D && (!castedValue.isNull() || castedValue.typeId() == QMetaType::QVector2D
|| castedValue.typeId() == QVariant::Vector3D || castedValue.typeId() == QMetaType::QVector3D
|| castedValue.typeId() == QVariant::Vector4D)) { || castedValue.typeId() == QMetaType::QVector4D)) {
commitVariantValueToModel(propertyName, castedValue); commitVariantValueToModel(propertyName, castedValue);
} }
} }

8
src/plugins/qmldesigner/components/textureeditor/textureeditorview.cpp
View File

@@ -142,7 +142,7 @@ void TextureEditorView::changeValue(const QString &name)
if (name == "state" && castedValue.toString() == "base state") if (name == "state" && castedValue.toString() == "base state")
castedValue = ""; castedValue = "";
if (castedValue.typeId() == QVariant::Color) { if (castedValue.typeId() == QMetaType::QColor) {
QColor color = castedValue.value<QColor>(); QColor color = castedValue.value<QColor>();
QColor newColor = QColor(color.name()); QColor newColor = QColor(color.name());
newColor.setAlpha(color.alpha()); newColor.setAlpha(color.alpha());
@@ -154,9 +154,9 @@ void TextureEditorView::changeValue(const QString &name)
} else { } else {
// QVector*D(0, 0, 0) detects as null variant though it is valid value // QVector*D(0, 0, 0) detects as null variant though it is valid value
if (castedValue.isValid() if (castedValue.isValid()
&& (!castedValue.isNull() || castedValue.typeId() == QVariant::Vector2D && (!castedValue.isNull() || castedValue.typeId() == QMetaType::QVector2D
|| castedValue.typeId() == QVariant::Vector3D || castedValue.typeId() == QMetaType::QVector3D
|| castedValue.typeId() == QVariant::Vector4D)) { || castedValue.typeId() == QMetaType::QVector4D)) {
commitVariantValueToModel(propertyName, castedValue); commitVariantValueToModel(propertyName, castedValue);
} }
} }

16
src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
View File

@@ -516,25 +516,25 @@ public:
const NodeMetaInfo &propertyTypeMetaInfo = propertyMetaInfo.propertyType(); const NodeMetaInfo &propertyTypeMetaInfo = propertyMetaInfo.propertyType();
if (propertyTypeMetaInfo.isColor()) if (propertyTypeMetaInfo.isColor())
return PropertyParser::read(QVariant::Color, cleanedValue); return PropertyParser::read(QMetaType::Type::QColor, cleanedValue);
else if (propertyTypeMetaInfo.isUrl()) else if (propertyTypeMetaInfo.isUrl())
return PropertyParser::read(QVariant::Url, cleanedValue); return PropertyParser::read(QMetaType::Type::QUrl, cleanedValue);
else if (propertyTypeMetaInfo.isVector2D()) else if (propertyTypeMetaInfo.isVector2D())
return PropertyParser::read(QVariant::Vector2D, cleanedValue); return PropertyParser::read(QMetaType::Type::QVector2D, cleanedValue);
else if (propertyTypeMetaInfo.isVector3D()) else if (propertyTypeMetaInfo.isVector3D())
return PropertyParser::read(QVariant::Vector3D, cleanedValue); return PropertyParser::read(QMetaType::Type::QVector3D, cleanedValue);
else if (propertyTypeMetaInfo.isVector4D()) else if (propertyTypeMetaInfo.isVector4D())
return PropertyParser::read(QVariant::Vector4D, cleanedValue); return PropertyParser::read(QMetaType::Type::QVector4D, cleanedValue);
QVariant value(cleanedValue); QVariant value(cleanedValue);
if (propertyTypeMetaInfo.isBool()) { if (propertyTypeMetaInfo.isBool()) {
value.convert(QVariant::Bool); value.convert(QMetaType::Type::Bool);
return value; return value;
} else if (propertyTypeMetaInfo.isInteger()) { } else if (propertyTypeMetaInfo.isInteger()) {
value.convert(QVariant::Int); value.convert(QMetaType::Type::Int);
return value; return value;
} else if (propertyTypeMetaInfo.isFloat()) { } else if (propertyTypeMetaInfo.isFloat()) {
value.convert(QVariant::Double); value.convert(QMetaType::Type::Double);
return value; return value;
} else if (propertyTypeMetaInfo.isString()) { } else if (propertyTypeMetaInfo.isString()) {
// nothing to do // nothing to do

2
src/plugins/qmljseditor/quicktoolbar.cpp
View File

@@ -263,7 +263,7 @@ void QuickToolBar::setProperty(const QString &propertyName, const QVariant &valu
{ {
QString stringValue = value.toString(); QString stringValue = value.toString();
if (value.typeId() == QVariant::Color) if (value.typeId() == QMetaType::Type::QColor)
stringValue = QLatin1Char('\"') + value.toString() + QLatin1Char('\"'); stringValue = QLatin1Char('\"') + value.toString() + QLatin1Char('\"');
if (cast<UiObjectDefinition*>(m_node) || cast<UiObjectBinding*>(m_node)) { if (cast<UiObjectDefinition*>(m_node) || cast<UiObjectBinding*>(m_node)) {