From 7ac6ec609a9e7e09d1ea4c31c13b0f5783b674ba Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Sun, 17 Mar 2019 22:41:48 -0500 Subject: [PATCH] [nostalgia] Add missing ox namespace to ox::Error usages --- src/nostalgia/studio/lib/json_read.hpp | 2 +- src/nostalgia/studio/lib/json_write.hpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/nostalgia/studio/lib/json_read.hpp b/src/nostalgia/studio/lib/json_read.hpp index 36b285a4..b31d46c2 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 -Error readJson(QString json, T *dest) { +ox::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_write.hpp b/src/nostalgia/studio/lib/json_write.hpp index ff1a3943..d4fc8918 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 -Error writeJson(QString *json, T *src) { +ox::Error writeJson(QString *json, T *src) { auto obj = QJsonObject(); JsonWriter rdr(obj); auto err = model(&rdr, src);