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

[nostalgia] Merge branch 'master' of github.com:gtalent/nostalgia

Browse Source
This commit is contained in:
Gary Talent 2019-06-14 18:12:45 -05:00
parent 829357faaf
commit 0c05d298d0
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/nostalgia/studio/lib/json.hpp
View File

@ -11,8 +11,7 @@
#include "json_read.hpp" #include "json_read.hpp"
#include "json_write.hpp" #include "json_write.hpp"
namespace nostalgia { namespace nostalgia::studio {
namespace studio {
class JsonOperator { class JsonOperator {
@ -30,4 +29,3 @@ class JsonOperator {
}; };
} }
}

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

@ -66,7 +66,7 @@ ox::Error JsonReader::field(QString fieldName, T *dest) {
} else { } else {
return JSON_ERR_FIELD_MISSING; return JSON_ERR_FIELD_MISSING;
} }
}; }
template<typename T> template<typename T>
ox::Error JsonReader::field(QString fieldName, QVector<T> *dest) { ox::Error JsonReader::field(QString fieldName, QVector<T> *dest) {
@ -81,7 +81,7 @@ ox::Error JsonReader::field(QString fieldName, QVector<T> *dest) {
err |= JSON_ERR_FIELD_MISSING; err |= JSON_ERR_FIELD_MISSING;
} }
return err; return err;
}; }
template<typename T> template<typename T>
ox::Error JsonReader::field(QJsonValueRef src, T *dest) { ox::Error JsonReader::field(QJsonValueRef src, T *dest) {

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

@ -52,7 +52,7 @@ ox::Error JsonWriter::field(QString fieldName, T *src) {
auto err = model(&reader, src); auto err = model(&reader, src);
m_dest[fieldName] = obj; m_dest[fieldName] = obj;
return err; return err;
}; }
template<typename T> template<typename T>
ox::Error JsonWriter::field(QString fieldName, QVector<T> *src) { ox::Error JsonWriter::field(QString fieldName, QVector<T> *src) {
@ -63,7 +63,7 @@ ox::Error JsonWriter::field(QString fieldName, QVector<T> *src) {
} }
m_dest[fieldName] = a; m_dest[fieldName] = a;
return err; return err;
}; }
template<typename T> template<typename T>
ox::Error writeJson(QString *json, T *src) { ox::Error writeJson(QString *json, T *src) {