aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKitsune Ral <Kitsune-Ral@users.sf.net>2018-05-06 13:53:34 +0900
committerKitsune Ral <Kitsune-Ral@users.sf.net>2018-05-06 14:17:00 +0900
commit1dc3784d5a3ef05433bc42318b896ff2a4e149cf (patch)
tree399b8784d93689ff0f0986d85b9f5386c38ce268
parentff3c70978d3d33b65f3e5878c2876fb74c152232 (diff)
downloadlibquotient-1dc3784d5a3ef05433bc42318b896ff2a4e149cf.tar.gz
libquotient-1dc3784d5a3ef05433bc42318b896ff2a4e149cf.zip
lib/csapi/*.mustache: Optimise #includes, eliminate some blank lines
-rw-r--r--lib/csapi/gtad.yaml8
-rw-r--r--lib/csapi/{{base}}.cpp.mustache4
-rw-r--r--lib/csapi/{{base}}.h.mustache6
3 files changed, 10 insertions, 8 deletions
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