From e4337e468bf277209880c2de22e8ff2f3e5681ab Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Sat, 13 May 2017 02:22:36 -0500 Subject: [PATCH] Add setFields method to JSON IO types --- src/nostalgia/studio/lib/json_read.hpp | 2 ++ src/nostalgia/studio/lib/json_write.hpp | 2 ++ src/nostalgia/studio/mainwindow.hpp | 6 ++++-- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/nostalgia/studio/lib/json_read.hpp b/src/nostalgia/studio/lib/json_read.hpp index 5208e5ea..94f23e6c 100644 --- a/src/nostalgia/studio/lib/json_read.hpp +++ b/src/nostalgia/studio/lib/json_read.hpp @@ -25,6 +25,8 @@ class JsonReader { public: JsonReader(QJsonObject &obj); + void setFields(int) {}; + ox::Error op(QString fieldName, int *dest); ox::Error op(QString fieldName, bool *dest); diff --git a/src/nostalgia/studio/lib/json_write.hpp b/src/nostalgia/studio/lib/json_write.hpp index c56138da..6588e2e0 100644 --- a/src/nostalgia/studio/lib/json_write.hpp +++ b/src/nostalgia/studio/lib/json_write.hpp @@ -25,6 +25,8 @@ class JsonWriter { public: JsonWriter(QJsonObject &obj); + void setFields(int) {}; + ox::Error op(QString fieldName, int *src); ox::Error op(QString fieldName, bool *src); diff --git a/src/nostalgia/studio/mainwindow.hpp b/src/nostalgia/studio/mainwindow.hpp index f2a9d361..1374fe03 100644 --- a/src/nostalgia/studio/mainwindow.hpp +++ b/src/nostalgia/studio/mainwindow.hpp @@ -27,13 +27,14 @@ namespace nostalgia { namespace studio { struct NostalgiaStudioState { - QString currentProjectPath; + QString projectPath; }; template int ioOp(T *io, NostalgiaStudioState *obj) { ox::Error err = 0; - err |= io->op("current_project_path", &obj->currentProjectPath); + io->setFields(1); + err |= io->op("project_path", &obj->projectPath); return err; } @@ -45,6 +46,7 @@ struct NostalgiaStudioProfile { template int ioOp(T *io, NostalgiaStudioProfile *obj) { ox::Error err = 0; + io->setFields(1); err |= io->op("app_name", &obj->appName); return err; }