kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Material: fix compiler warning with Qt6

Browse Source 
QVariant::Type is deprecated since Qt 6.0 and shouldn't be used in new code
This commit is contained in:
wmayer
2023-11-02 14:21:20 +01:00
committed by wwmayer
parent b55aca0501
commit 6eb95ca73c
1 changed files with 35 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/Mod/Material/App/MaterialValue.cpp
View File

@@ -85,6 +85,7 @@ bool MaterialValue::operator==(const MaterialValue& other) const
void MaterialValue::setInitialValue(ValueType inherited)
{
#if QT_VERSION < QT_VERSION_CHECK(6,0,0)
if (_valueType == String) {
_value = QVariant(static_cast<QVariant::Type>(QMetaType::QString));
}
@@ -100,11 +101,6 @@ void MaterialValue::setInitialValue(ValueType inherited)
else if (_valueType == URL) {
_value = QVariant(static_cast<QVariant::Type>(QMetaType::QString));
}
else if (_valueType == Quantity) {
Base::Quantity q;
q.setInvalid();
_value = QVariant::fromValue(q);
}
else if (_valueType == Color) {
_value = QVariant(static_cast<QVariant::Type>(QMetaType::QString));
}
@@ -117,6 +113,40 @@ void MaterialValue::setInitialValue(ValueType inherited)
else if (_valueType == List) {
_value = QVariant(static_cast<QVariant::Type>(QMetaType::QString));
}
#else
if (_valueType == String) {
_value = QVariant(QMetaType(QMetaType::QString));
}
else if (_valueType == Boolean) {
_value = QVariant(QMetaType(QMetaType::Bool));
}
else if (_valueType == Integer) {
_value = QVariant(QMetaType(QMetaType::Int));
}
else if (_valueType == Float) {
_value = QVariant(QMetaType(QMetaType::Float));
}
else if (_valueType == URL) {
_value = QVariant(QMetaType(QMetaType::QString));
}
else if (_valueType == Color) {
_value = QVariant(QMetaType(QMetaType::QString));
}
else if (_valueType == File) {
_value = QVariant(QMetaType(QMetaType::QString));
}
else if (_valueType == Image) {
_value = QVariant(QMetaType(QMetaType::QString));
}
else if (_valueType == List) {
_value = QVariant(QMetaType(QMetaType::QString));
}
#endif
else if (_valueType == Quantity) {
Base::Quantity qu;
qu.setInvalid();
_value = QVariant::fromValue(qu);
}
else if (_valueType == Array2D) {
if (_valueType != inherited) {
throw InvalidMaterialType("Initializing a regular material value as a 2D Array");