Leahnaya/porymap
1
0
Fork 0
mirror of https://github.com/huderlem/porymap.git synced 2026-07-19 17:04:05 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix missing value conversion error
Some checks are pending
Build Porymap / build-linux (, 5.14.2) (push) Waiting to run
Details
Build Porymap / build-linux (, 6.8.*) (push) Waiting to run
Details
Build Porymap / build-linux (minimal, 5.14.2) (push) Waiting to run
Details
Build Porymap / build-macos (macos-15-intel) (push) Waiting to run
Details
Build Porymap / build-macos (macos-latest) (push) Waiting to run
Details
Build Porymap / build-static-windows (push) Waiting to run
Details

Browse Source
This commit is contained in:
GriffinR 2026-03-09 13:53:36 -04:00
parent e40c48c07d
commit 37769cf931
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/core/converter.h
View File

@ -68,9 +68,17 @@ struct DefaultConverter {
static T fromJson(const QJsonValue& json, QStringList* errors = nullptr) {
const QVariant v = json.toVariant();
if (!v.canConvert<T>()) {
if (errors) errors->append(QString("Can't convert from type '%1'").arg(v.typeName()));
// Failed conversion will return a default-constructed object below
if (errors) errors->append(QString("Can't convert from JSON to type '%1'").arg(v.typeName()));
} else {
// 'canConvert' is only true if a conversion between types is theoretically possible,
// not necessarily if this value can be converted. e.g. "2" can be converted to int (2),
// but "hello world" cannot be converted to int and becomes 0.
T value;
bool ok = QMetaType::convert(v.metaType(), v.constData(), QMetaType::fromType<T>(), &value);
if (ok) return value;
else if (errors) errors->append(QString("Failed to convert JSON value to type '%1'").arg(v.typeName()));
}
// For failed conversion, return a default constructed value.
return v.value<T>();
}

7
include/core/fieldmanager.h
View File

@ -23,6 +23,13 @@
// QList<QString> options = {"hello","hi there"};
// FieldInterface* fi = makeFieldInterface(&someField, options);
// fi->set(QJsonValue("5")); // someField is now "hello" (defaults to first element), error messages returned
//
// If a type or value is given that cannot be converted to the destination type, the field remains unchanged.
// int someField = 0;
// int min = 1, max = 4;
// FieldInterface* fi = makeFieldInterface(&someField, min, max);
// fi->set(QJsonValue()); // Cannot convert type. someField is still 0, error messages returned
// fi->set(QJsonValue("hi there")); // Cannot convert value. someField is still 0, error messages returned
// Base class lets us use the interface without any type information.
class FieldInterface {