diff options
| author | Alexey Rusakov <Kitsune-Ral@users.sf.net> | 2022-07-12 14:56:20 +0200 |
|---|---|---|
| committer | Alexey Rusakov <Kitsune-Ral@users.sf.net> | 2022-07-12 14:56:20 +0200 |
| commit | 73167a23212541ff6aeaeb901d7dfe636badc6e8 (patch) | |
| tree | f889b50746fd393d005552cd6c3580449fc78166 /lib/events/roomcreateevent.cpp | |
| parent | 607489a2e6a3e3238eac0178f5c7bbc70f178f46 (diff) | |
| parent | e7dee15531ad357bd33ac546fb1b9332a5c1260c (diff) | |
| download | libquotient-73167a23212541ff6aeaeb901d7dfe636badc6e8.tar.gz libquotient-73167a23212541ff6aeaeb901d7dfe636badc6e8.zip | |
Merge branch 'kitsune/converters-upgrade' into dev
Diffstat (limited to 'lib/events/roomcreateevent.cpp')
| -rw-r--r-- | lib/events/roomcreateevent.cpp | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/lib/events/roomcreateevent.cpp b/lib/events/roomcreateevent.cpp index bb6de648..3b5024d5 100644 --- a/lib/events/roomcreateevent.cpp +++ b/lib/events/roomcreateevent.cpp @@ -6,20 +6,11 @@ using namespace Quotient; template <> -struct Quotient::JsonConverter<RoomType> { - static RoomType load(const QJsonValue& jv) - { - const auto& roomTypeString = jv.toString(); - for (auto it = RoomTypeStrings.begin(); it != RoomTypeStrings.end(); - ++it) - if (roomTypeString == *it) - return RoomType(it - RoomTypeStrings.begin()); - - if (!roomTypeString.isEmpty()) - qCWarning(EVENTS) << "Unknown Room Type: " << roomTypeString; - return RoomType::Undefined; - } -}; +RoomType Quotient::fromJson(const QJsonValue& jv) +{ + return enumFromJsonString(jv.toString(), RoomTypeStrings, + RoomType::Undefined); +} bool RoomCreateEvent::isFederated() const { |