diff --git a/src/nostalgia/studio/lib/json.hpp b/src/nostalgia/studio/lib/json.hpp index 6f6c82c2..9422545a 100644 --- a/src/nostalgia/studio/lib/json.hpp +++ b/src/nostalgia/studio/lib/json.hpp @@ -11,8 +11,7 @@ #include "json_read.hpp" #include "json_write.hpp" -namespace nostalgia { -namespace studio { +namespace nostalgia::studio { class JsonOperator { @@ -30,4 +29,3 @@ class JsonOperator { }; } -} diff --git a/src/nostalgia/studio/lib/json_read.hpp b/src/nostalgia/studio/lib/json_read.hpp index b31d46c2..28075f6a 100644 --- a/src/nostalgia/studio/lib/json_read.hpp +++ b/src/nostalgia/studio/lib/json_read.hpp @@ -66,7 +66,7 @@ ox::Error JsonReader::field(QString fieldName, T *dest) { } else { return JSON_ERR_FIELD_MISSING; } -}; +} template ox::Error JsonReader::field(QString fieldName, QVector *dest) { @@ -81,7 +81,7 @@ ox::Error JsonReader::field(QString fieldName, QVector *dest) { err |= JSON_ERR_FIELD_MISSING; } return err; -}; +} template ox::Error JsonReader::field(QJsonValueRef src, T *dest) { diff --git a/src/nostalgia/studio/lib/json_write.hpp b/src/nostalgia/studio/lib/json_write.hpp index d4fc8918..6b72e310 100644 --- a/src/nostalgia/studio/lib/json_write.hpp +++ b/src/nostalgia/studio/lib/json_write.hpp @@ -52,7 +52,7 @@ ox::Error JsonWriter::field(QString fieldName, T *src) { auto err = model(&reader, src); m_dest[fieldName] = obj; return err; -}; +} template ox::Error JsonWriter::field(QString fieldName, QVector *src) { @@ -63,7 +63,7 @@ ox::Error JsonWriter::field(QString fieldName, QVector *src) { } m_dest[fieldName] = a; return err; -}; +} template ox::Error writeJson(QString *json, T *src) {