diff options
author | Alexey Rusakov <Kitsune-Ral@users.sf.net> | 2021-11-27 20:14:53 +0100 |
---|---|---|
committer | Alexey Rusakov <Kitsune-Ral@users.sf.net> | 2021-11-27 20:14:53 +0100 |
commit | 0425fd280e7eee7a4c9bcf18f79910f181322c42 (patch) | |
tree | ec8e044711866266d38fc8c78f6e7ece8cf447d4 /lib/events/callanswerevent.h | |
parent | 0a46049ef26270933ecf6fea7395b03e6aee783e (diff) | |
download | libquotient-0425fd280e7eee7a4c9bcf18f79910f181322c42.tar.gz libquotient-0425fd280e7eee7a4c9bcf18f79910f181322c42.zip |
Event::content() -> contentPart()
There's a clash between Event::content() (a template function) and
RoomMessageEvent::content() (plain member). Out of these two, the name
more fits to the RME's member function - strictly speaking,
Event::content() retrieves a part of content, and so is renamed.
In addition, contentPart() defaults to QJsonValue now, which is pretty
intuitive (the function returns values from a JSON object) and allows
to implement more elaborate logic such as
if (const auto v = contentPart<>("key"_ls); v.isObject()) {
// foo
} else if (v.isString()) {
// bar
} else {
// boo
}
Diffstat (limited to 'lib/events/callanswerevent.h')
-rw-r--r-- | lib/events/callanswerevent.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/events/callanswerevent.h b/lib/events/callanswerevent.h index 6132cb44..4c01c941 100644 --- a/lib/events/callanswerevent.h +++ b/lib/events/callanswerevent.h @@ -19,11 +19,11 @@ public: int lifetime() const { - return content<int>("lifetime"_ls); + return contentPart<int>("lifetime"_ls); } // FIXME: Omittable<>? QString sdp() const { - return contentJson()["answer"_ls].toObject().value("sdp"_ls).toString(); + return contentPart<QJsonObject>("answer"_ls).value("sdp"_ls).toString(); } }; |