From 0c05d298d03237d3d3cd51214a5695d6e421b3e4 Mon Sep 17 00:00:00 2001
From: Gary Talent <gtalent2@gmail.com>
Date: Fri, 14 Jun 2019 18:12:45 -0500
Subject: [PATCH] [nostalgia] Merge branch 'master' of
github.com:gtalent/nostalgia
---
src/nostalgia/studio/lib/json.hpp | 4 +---
src/nostalgia/studio/lib/json_read.hpp | 4 ++--
src/nostalgia/studio/lib/json_write.hpp | 4 ++--
3 files changed, 5 insertions(+), 7 deletions(-)
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<typename T>
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;
}
return err;
-};
+}
template<typename T>
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<typename T>
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;
return err;
-};
+}
template<typename T>
ox::Error writeJson(QString *json, T *src) {