diff options
| author | Kitsune Ral <Kitsune-Ral@users.sf.net> | 2018-09-29 22:22:49 +0900 |
|---|---|---|
| committer | Kitsune Ral <Kitsune-Ral@users.sf.net> | 2018-09-29 22:22:49 +0900 |
| commit | b55334ac0fe89f780776bc4eab90ffe1ca3c57bb (patch) | |
| tree | 1a45c0ccfec8f5f7ba37eb4385cdc7f61afa0c97 /lib/csapi/{{base}}.h.mustache | |
| parent | f5c2e47fa1ab84fdaffe03c30ba973d7dea5ac05 (diff) | |
| parent | 1e6510790dab6b9141ae52993987b406399668cd (diff) | |
| download | libquotient-b55334ac0fe89f780776bc4eab90ffe1ca3c57bb.tar.gz libquotient-b55334ac0fe89f780776bc4eab90ffe1ca3c57bb.zip | |
Merge branch 'cs-api-0.4.0'
Diffstat (limited to 'lib/csapi/{{base}}.h.mustache')
| -rw-r--r-- | lib/csapi/{{base}}.h.mustache | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/csapi/{{base}}.h.mustache b/lib/csapi/{{base}}.h.mustache index d6b374fb..147c8607 100644 --- a/lib/csapi/{{base}}.h.mustache +++ b/lib/csapi/{{base}}.h.mustache @@ -21,15 +21,15 @@ namespace QMatrixClient {{#in?}} QJsonObject toJson(const {{name}}& pod); {{/in?}}{{#out?}} - template <> struct FromJson<{{name}}> + template <> struct FromJsonObject<{{name}}> { - {{name}} operator()(const QJsonValue& jv); + {{name}} operator()({{^propertyMap}}const QJsonObject&{{/propertyMap}}{{#propertyMap}}QJsonObject{{/propertyMap}} jo) const; }; {{/ out?}}{{/model}} {{/models}}{{#operations}} // Operations {{# operation}}{{#summary}} /// {{summary}}{{#description?}}{{!add a linebreak between summary and description if both exist}} - /// {{/description?}}{{/summary}}{{#description}} + ///{{/description?}}{{/summary}}{{#description}} /// {{_}}{{/description}} class {{camelCaseOperationId}}Job : public BaseJob { @@ -48,7 +48,7 @@ namespace QMatrixClient // Construction/destruction {{/ models}}{{#allParams?}} /*! {{summary}}{{#allParams}} - * \param {{nameCamelCase}} {{#description}} + * \param {{nameCamelCase}}{{#description}} * {{_}}{{/description}}{{/allParams}} */{{/allParams?}} explicit {{camelCaseOperationId}}Job({{#allParams}}{{>joinedParamDecl}}{{/allParams}});{{^bodyParams}} |