From 4244cee8d5e0f760cccd2b45ad587670573ef03c Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Mon, 24 Sep 2018 19:20:10 +0900 Subject: Prepare for CS API 0.4.0 This commit consists of two parts: upgrading the API infrastructure and trivial but sweeping update to the generated files. 1. The API infrastructure (converters.h, *.mustache and some other non-generated files) now can deal with top-level JSON arrays and response inlining; better supports property maps; and gets some formatting fixes in generated code. 2. Generated files now use QJsonValue instead of QJsonObject as a default type to (un)marshall Matrix API data structures, to match the change in the infrastructure above This commit is still using the old Matrix API definitions, before CS API 0.4.0. Getting to CS API 0.4.0 will come next. --- lib/csapi/banning.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'lib/csapi/banning.h') diff --git a/lib/csapi/banning.h b/lib/csapi/banning.h index 196ddf66..237bd2a0 100644 --- a/lib/csapi/banning.h +++ b/lib/csapi/banning.h @@ -12,7 +12,7 @@ namespace QMatrixClient // Operations /// Ban a user in the room. - /// + /// /// Ban a user in the room. If the user is currently in the room, also kick them. /// /// When a user is banned from a room, they may not join it or be invited to it until they are unbanned. @@ -22,18 +22,18 @@ namespace QMatrixClient { public: /*! Ban a user in the room. - * \param roomId + * \param roomId * The room identifier (not alias) from which the user should be banned. - * \param userId + * \param userId * The fully qualified user ID of the user being banned. - * \param reason + * \param reason * The reason the user has been banned. This will be supplied as the ``reason`` on the target's updated `m.room.member`_ event. */ explicit BanJob(const QString& roomId, const QString& userId, const QString& reason = {}); }; /// Unban a user from the room. - /// + /// /// Unban a user from the room. This allows them to be invited to the room, /// and join if they would otherwise be allowed to join according to its join rules. /// @@ -42,9 +42,9 @@ namespace QMatrixClient { public: /*! Unban a user from the room. - * \param roomId + * \param roomId * The room identifier (not alias) from which the user should be unbanned. - * \param userId + * \param userId * The fully qualified user ID of the user being unbanned. */ explicit UnbanJob(const QString& roomId, const QString& userId); -- cgit v1.2.3