From 1dc3784d5a3ef05433bc42318b896ff2a4e149cf Mon Sep 17 00:00:00 2001
From: Kitsune Ral <Kitsune-Ral@users.sf.net>
Date: Sun, 6 May 2018 13:53:34 +0900
Subject: lib/csapi/*.mustache: Optimise #includes, eliminate some blank lines

---
 lib/csapi/gtad.yaml             | 8 +++++---
 lib/csapi/{{base}}.cpp.mustache | 4 ++--
 lib/csapi/{{base}}.h.mustache   | 6 +++---
 3 files changed, 10 insertions(+), 8 deletions(-)

(limited to 'lib')

diff --git a/lib/csapi/gtad.yaml b/lib/csapi/gtad.yaml
index 7f6a97e0..c7cbc73d 100644
--- a/lib/csapi/gtad.yaml
+++ b/lib/csapi/gtad.yaml
@@ -52,7 +52,6 @@ analyzer:
         avoidCopy?: true
     file: *ByteStream
     object:
-    - /m\.room\.member$/: # A stub for EventsBatch<RoomMemberEvent>
     - /state_event.yaml$/:
         type: StateEventPtr
         noCopy?: true
@@ -108,8 +107,11 @@ analyzer:
     - //:
         type: QVariantHash
         avoidCopy?: true
-        imports: <QtCore/QVariantHash>
-    variant: { type: QVariant, "avoidCopy?": true, imports: <QtCore/QVariant> }
+        imports: '"variant_converters.h"'
+    variant:
+      type: QVariant
+      avoidCopy?: true
+      imports: '"variant_converters.h"'
     schema: # Properties of inline structure definitions
       avoidCopy?: true
 
diff --git a/lib/csapi/{{base}}.cpp.mustache b/lib/csapi/{{base}}.cpp.mustache
index d3726f1e..72ea56c9 100644
--- a/lib/csapi/{{base}}.cpp.mustache
+++ b/lib/csapi/{{base}}.cpp.mustache
@@ -1,8 +1,8 @@
 {{#@filePartial}}preamble{{/@filePartial}}
 #include "{{filenameBase}}.h"
-{{^allModels}}
+{{^models}}
 #include "converters.h"
-{{/allModels}}{{#operations}}
+{{/models}}{{#operations}}
 {{#producesNonJson?}}#include <QtNetwork/QNetworkReply>
 {{/producesNonJson?}}#include <QtCore/QStringBuilder>
 {{/operations}}
diff --git a/lib/csapi/{{base}}.h.mustache b/lib/csapi/{{base}}.h.mustache
index a9bed527..2eb2c656 100644
--- a/lib/csapi/{{base}}.h.mustache
+++ b/lib/csapi/{{base}}.h.mustache
@@ -4,9 +4,9 @@
 {{#operations}}#include "jobs/basejob.h"
 {{/operations}}
 {{#imports}}#include {{_}}
-{{/imports}}
-{{#allModels}}#include "converters.h"
-{{/allModels}}
+{{/imports}}{{#models}}
+#include "converters.h"
+{{/models}}
 namespace QMatrixClient
 {
 {{#models}}    // Data structures
-- 
cgit v1.2.3