From f06d6e0497d7d7545a19b2cd16fdf2fda15e205c Mon Sep 17 00:00:00 2001
From: Kitsune Ral <Kitsune-Ral@users.sf.net>
Date: Sun, 3 Jun 2018 10:28:33 +0900
Subject: gtad.yaml: Make sure to pass avoidCopy to ref'ed types

---
 lib/csapi/gtad.yaml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'lib/csapi')

diff --git a/lib/csapi/gtad.yaml b/lib/csapi/gtad.yaml
index b83e489b..7d451296 100644
--- a/lib/csapi/gtad.yaml
+++ b/lib/csapi/gtad.yaml
@@ -59,7 +59,6 @@ analyzer:
     +on:
     - object: { type: QJsonObject, imports: <QtCore/QJsonObject> }
     - $ref:
-      - /m\.room\.member$/: pass # This $ref is only used in an array, see below
       - +set: { moveOnly: }
         +on:
         - /state_event.yaml$/:
@@ -68,6 +67,8 @@ analyzer:
             { type: RoomEventPtr, imports: '"events/event.h"' }
         - /event.yaml$/:
             { type: EventPtr, imports: '"events/event.h"' }
+      - /m\.room\.member$/: pass # This $ref is only used in an array, see below
+      - //: # Apply "avoidCopy" to all other ref'ed types
     - array:
       - string: { type: QStringList, imports: <QtCore/QStringList> }
       - +set: { moveOnly: }
@@ -86,8 +87,7 @@ analyzer:
             type: Events
       - /.+/: { type: "QVector<{{1}}>", imports: <QtCore/QVector> }
       - //: { type: QJsonArray, imports: <QtCore/QJsonArray> }
-    # `additionalProperties` in OpenAPI
-    - map:
+    - map: # `additionalProperties` in OpenAPI
       - RoomState:
           type: "std::unordered_map<QString, {{1}}>"
           moveOnly:
@@ -98,8 +98,8 @@ analyzer:
       - //:
           type: QVariantHash
           imports: '"variant_converters.h"'
-    # A sequence `type` in OpenAPI
-    - variant: { type: QVariant, imports: '"variant_converters.h"' }
+    - variant: # A sequence `type` (multitype) in OpenAPI
+        { type: QVariant, imports: '"variant_converters.h"' }
     - schema: # Properties of inline structure definitions
         *UseOmittable
 
-- 
cgit v1.2.3