From 0dd491fbd189baaabadcab2344a05e3cf3898287 Mon Sep 17 00:00:00 2001
From: Kitsune Ral <Kitsune-Ral@users.sf.net>
Date: Sat, 2 Jun 2018 13:32:47 +0900
Subject: csapi: Use Omittable<> container instead of intrusive 'omitted' field

Also: use the latest feature of GTAD, +set/+on, to make gtad.yaml more compact.
---
 lib/csapi/{{base}}.h.mustache | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

(limited to 'lib/csapi/{{base}}.h.mustache')

diff --git a/lib/csapi/{{base}}.h.mustache b/lib/csapi/{{base}}.h.mustache
index 6f08e871..1d24163f 100644
--- a/lib/csapi/{{base}}.h.mustache
+++ b/lib/csapi/{{base}}.h.mustache
@@ -13,10 +13,8 @@ namespace QMatrixClient
 {{#    model}}
     struct {{name}}{{#parents?}} : {{#parents}}{{name}}{{#@join}}, {{/@join}}{{/parents}}{{/parents?}}
     {
-{{#vars}}        {{dataType.name}} {{nameCamelCase}};
-{{/vars}}{{#in?}}
-        bool omitted;
-{{/in?}}    };
+{{#vars}}        {{>maybeOmittableType}} {{nameCamelCase}};
+{{/vars}}    };
 {{#in?}}
     QJsonObject toJson(const {{name}}& pod);
 {{/in?}}{{#out?}}
@@ -34,10 +32,8 @@ namespace QMatrixClient
 {{#            model}}
             struct {{name}}{{#parents?}} : {{#parents}}{{name}}{{#@join}}, {{/@join}}{{/parents}}{{/parents?}}
             {
-{{#vars}}                {{dataType.name}} {{nameCamelCase}};
-{{/vars}}{{#in?}}
-                bool omitted;
-{{/in?}}            };
+{{#vars}}                {{>maybeOmittableType}} {{nameCamelCase}};
+{{/vars}}            };
 {{/            model}}
             // Construction/destruction
 {{/        models}}
-- 
cgit v1.2.3