drinkingtea/nostalgia
drinkingtea/nostalgia
2
0
Fork 0
Code Issues 6 Pull Requests Actions Releases 9 Activity

[nostalgia] Replace int with ox::Error

Browse Source
This commit is contained in:
Gary Talent 2019-03-17 14:13:57 -05:00
parent 52b9316858
commit 38400e4406
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/nostalgia/studio/lib/json_read.hpp
View File

@ -91,7 +91,7 @@ ox::Error JsonReader::field(QJsonValueRef src, T *dest) {
} }
template<typename T> template<typename T>
int readJson(QString json, T *dest) { Error readJson(QString json, T *dest) {
auto obj = QJsonDocument::fromJson(json.toUtf8()).object(); auto obj = QJsonDocument::fromJson(json.toUtf8()).object();
JsonReader rdr(obj); JsonReader rdr(obj);
return model(&rdr, dest); return model(&rdr, dest);

4
src/nostalgia/studio/lib/json_test.cpp
View File

@ -21,7 +21,7 @@ struct TestStructNest {
}; };
template<typename T> template<typename T>
int model(T *io, TestStructNest *obj) { Error model(T *io, TestStructNest *obj) {
Error err = 0; Error err = 0;
err |= io->setTypeInfo("TestStructNest", 4); err |= io->setTypeInfo("TestStructNest", 4);
err |= io->field("Bool", &obj->Bool); err |= io->field("Bool", &obj->Bool);
@ -40,7 +40,7 @@ struct TestStruct {
}; };
template<typename T> template<typename T>
int model(T *io, TestStruct *obj) { Error model(T *io, TestStruct *obj) {
Error err = 0; Error err = 0;
err |= io->setTypeInfo("TestStruct", 5); err |= io->setTypeInfo("TestStruct", 5);
err |= io->field("Bool", &obj->Bool); err |= io->field("Bool", &obj->Bool);

2
src/nostalgia/studio/lib/json_write.hpp
View File

@ -66,7 +66,7 @@ ox::Error JsonWriter::field(QString fieldName, QVector<T> *src) {
}; };
template<typename T> template<typename T>
int writeJson(QString *json, T *src) { Error writeJson(QString *json, T *src) {
auto obj = QJsonObject(); auto obj = QJsonObject();
JsonWriter rdr(obj); JsonWriter rdr(obj);
auto err = model(&rdr, src); auto err = model(&rdr, src);