diff options
author | Kitsune Ral <Kitsune-Ral@users.sf.net> | 2018-12-08 15:36:04 +0900 |
---|---|---|
committer | Kitsune Ral <Kitsune-Ral@users.sf.net> | 2018-12-08 20:12:22 +0900 |
commit | 3392e66fd015e191b01f6e3fc6839edc3948e31f (patch) | |
tree | c839259aece7462d978f7aa9eeb712edd932cc98 /lib/csapi/filter.cpp | |
parent | 95d4df58b39962f771885a6615efe1a682aab356 (diff) | |
download | libquotient-3392e66fd015e191b01f6e3fc6839edc3948e31f.tar.gz libquotient-3392e66fd015e191b01f6e3fc6839edc3948e31f.zip |
Refactor toJson/fillJson
Both now use through a common JsonConverter<> template class with its
base definition tuned for structs/QJsonObjects and specialisations for
non-object types. This new implementation doesn't work with virtual
fillJson functions yet (so EventContent classes still use toJson as a
member function) and does not cope quite well with non-constructible
objects (you have to specialise JsonConverter<> rather than, more
intuitively, JsonObjectConverter<>), but overall is more streamlined
compared to the previous implementation. It also fixes one important
issue that pushed for a rewrite: the previous implementation was not
working with structure hierarchies at all so (in particular) the Filter
part of CS API was totally disfunctional.
Diffstat (limited to 'lib/csapi/filter.cpp')
-rw-r--r-- | lib/csapi/filter.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/csapi/filter.cpp b/lib/csapi/filter.cpp index 77dc9b92..982e60b5 100644 --- a/lib/csapi/filter.cpp +++ b/lib/csapi/filter.cpp @@ -41,7 +41,7 @@ BaseJob::Status DefineFilterJob::parseJson(const QJsonDocument& data) if (!json.contains("filter_id"_ls)) return { JsonParseError, "The key 'filter_id' not found in the response" }; - d->filterId = fromJson<QString>(json.value("filter_id"_ls)); + fromJson(json.value("filter_id"_ls), d->filterId); return Success; } @@ -75,7 +75,7 @@ const Filter& GetFilterJob::data() const BaseJob::Status GetFilterJob::parseJson(const QJsonDocument& data) { - d->data = fromJson<Filter>(data); + fromJson(data, d->data); return Success; } |