From 896f46d4cf08ab05611b72edeb6c4d70e597342f Mon Sep 17 00:00:00 2001
From: Alexey Rusakov <Kitsune-Ral@users.sf.net>
Date: Fri, 12 Aug 2022 17:07:20 +0200
Subject: GTAD: Stop using eventloader.h in generated files
---
gtad/gtad.yaml | 22 +++++++++++++---------
1 file changed, 13 insertions(+), 9 deletions(-)
diff --git a/gtad/gtad.yaml b/gtad/gtad.yaml
index 0bec3b7a..4b05d2d4 100644
--- a/gtad/gtad.yaml
+++ b/gtad/gtad.yaml
@@ -84,11 +84,16 @@ analyzer:
- $ref:
- +set:
moveOnly:
- imports: '"events/eventloader.h"'
+on:
- - /state_event.yaml$/: StateEventPtr
- - /(room|client)_event.yaml$/: RoomEventPtr
- - /event(_without_room_id)?.yaml$/: EventPtr
+ - /state_event.yaml$/:
+ type: StateEventPtr
+ imports: '"events/stateevent.h"'
+ - /(room|client)_event.yaml$/:
+ type: RoomEventPtr
+ imports: '"events/roomevent.h"'
+ - /event(_without_room_id)?.yaml$/:
+ type: EventPtr
+ imports: '"events/event.h"'
- +set:
# This renderer applies to everything actually $ref'ed
# (not substituted)
@@ -132,12 +137,11 @@ analyzer:
- +set: { moveOnly: }
+on:
- /^Notification|Result|ChildRoomsChunk$/: "std::vector<{{1}}>"
- - StrippedChildStateEvent:
+ - /^StrippedChildStateEvent$|state_event.yaml$/:
type: StateEvents
- imports: '"events/eventloader.h"'
- - /state_event.yaml$/: StateEvents # 'imports' already set under $ref
- - /(room|client)_event.yaml$/: RoomEvents # ditto
- - /event(_without_room_id)?.yaml$/: Events # ditto
+ imports: '"events/stateevent.h"' # For StrippedChildStateEvent
+ - /(room|client)_event.yaml$/: RoomEvents
+ - /event(_without_room_id)?.yaml$/: Events
- //: "QVector<{{1}}>"
- map: # `additionalProperties` in OpenAPI
- RoomState:
--
cgit v1.2.3