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
}

1 files changed, 2 insertions, 2 deletions

diff --git a/lib/events/roomtombstoneevent.cpp b/lib/events/roomtombstoneevent.cpp
index 080d269c..2c3492d6 100644
--- a/lib/events/roomtombstoneevent.cpp
+++ b/lib/events/roomtombstoneevent.cpp
@@ -7,10 +7,10 @@ using namespace Quotient;
 
 QString RoomTombstoneEvent::serverMessage() const
 {
-    return fromJson<QString>(contentJson()["body"_ls]);
+    return contentPart<QString>("body"_ls);
 }
 
 QString RoomTombstoneEvent::successorRoomId() const
 {
-    return fromJson<QString>(contentJson()["replacement_room"_ls]);
+    return contentPart<QString>("replacement_room"_ls);
 }