From 38400e44063a0dcd0adf65a6ad30ea3e309a3bd2 Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Sun, 17 Mar 2019 14:13:57 -0500 Subject: [PATCH] [nostalgia] Replace int with ox::Error --- src/nostalgia/studio/lib/json_read.hpp | 2 +- src/nostalgia/studio/lib/json_test.cpp | 4 ++-- src/nostalgia/studio/lib/json_write.hpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/nostalgia/studio/lib/json_read.hpp b/src/nostalgia/studio/lib/json_read.hpp index 449b0acf..36b285a4 100644 --- a/src/nostalgia/studio/lib/json_read.hpp +++ b/src/nostalgia/studio/lib/json_read.hpp @@ -91,7 +91,7 @@ ox::Error JsonReader::field(QJsonValueRef src, T *dest) { } template -int readJson(QString json, T *dest) { +Error readJson(QString json, T *dest) { auto obj = QJsonDocument::fromJson(json.toUtf8()).object(); JsonReader rdr(obj); return model(&rdr, dest); diff --git a/src/nostalgia/studio/lib/json_test.cpp b/src/nostalgia/studio/lib/json_test.cpp index ca62290d..e0b46fc0 100644 --- a/src/nostalgia/studio/lib/json_test.cpp +++ b/src/nostalgia/studio/lib/json_test.cpp @@ -21,7 +21,7 @@ struct TestStructNest { }; template -int model(T *io, TestStructNest *obj) { +Error model(T *io, TestStructNest *obj) { Error err = 0; err |= io->setTypeInfo("TestStructNest", 4); err |= io->field("Bool", &obj->Bool); @@ -40,7 +40,7 @@ struct TestStruct { }; template -int model(T *io, TestStruct *obj) { +Error model(T *io, TestStruct *obj) { Error err = 0; err |= io->setTypeInfo("TestStruct", 5); err |= io->field("Bool", &obj->Bool); diff --git a/src/nostalgia/studio/lib/json_write.hpp b/src/nostalgia/studio/lib/json_write.hpp index e5174d78..ff1a3943 100644 --- a/src/nostalgia/studio/lib/json_write.hpp +++ b/src/nostalgia/studio/lib/json_write.hpp @@ -66,7 +66,7 @@ ox::Error JsonWriter::field(QString fieldName, QVector *src) { }; template -int writeJson(QString *json, T *src) { +Error writeJson(QString *json, T *src) { auto obj = QJsonObject(); JsonWriter rdr(obj); auto err = model(&rdr, src);