diff options
| author | Kitsune Ral <Kitsune-Ral@users.sf.net> | 2019-06-24 07:21:13 +0900 |
|---|---|---|
| committer | Kitsune Ral <Kitsune-Ral@users.sf.net> | 2019-06-24 07:21:13 +0900 |
| commit | 63ae79c3e2820efc2ba60d33e2caf2d7b9b3c408 (patch) | |
| tree | 2552f5049a6ef7ba0034483b25ca4ab33d1fcb13 /lib/events/stateevent.cpp | |
| parent | e083d327e6f6581210f8d077d8bbe1151e81e82c (diff) | |
| parent | 93f0c8fe89f448d1d58caa757573f17102369471 (diff) | |
| download | libquotient-63ae79c3e2820efc2ba60d33e2caf2d7b9b3c408.tar.gz libquotient-63ae79c3e2820efc2ba60d33e2caf2d7b9b3c408.zip | |
Merge branch 'master' into clang-format
# Conflicts:
# CMakeLists.txt
# lib/avatar.cpp
# lib/connection.cpp
# lib/connection.h
# lib/connectiondata.cpp
# lib/csapi/account-data.cpp
# lib/csapi/account-data.h
# lib/csapi/capabilities.cpp
# lib/csapi/capabilities.h
# lib/csapi/content-repo.cpp
# lib/csapi/create_room.cpp
# lib/csapi/filter.cpp
# lib/csapi/joining.cpp
# lib/csapi/keys.cpp
# lib/csapi/list_joined_rooms.cpp
# lib/csapi/notifications.cpp
# lib/csapi/openid.cpp
# lib/csapi/presence.cpp
# lib/csapi/pushrules.cpp
# lib/csapi/registration.cpp
# lib/csapi/room_upgrades.cpp
# lib/csapi/room_upgrades.h
# lib/csapi/search.cpp
# lib/csapi/users.cpp
# lib/csapi/versions.cpp
# lib/csapi/whoami.cpp
# lib/csapi/{{base}}.cpp.mustache
# lib/events/accountdataevents.h
# lib/events/eventcontent.h
# lib/events/roommemberevent.cpp
# lib/events/stateevent.cpp
# lib/jobs/basejob.cpp
# lib/jobs/basejob.h
# lib/networkaccessmanager.cpp
# lib/networksettings.cpp
# lib/room.cpp
# lib/room.h
# lib/settings.cpp
# lib/settings.h
# lib/syncdata.cpp
# lib/user.cpp
# lib/user.h
# lib/util.cpp
Diffstat (limited to 'lib/events/stateevent.cpp')
| -rw-r--r-- | lib/events/stateevent.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/lib/events/stateevent.cpp b/lib/events/stateevent.cpp index f172edb6..7fea59a1 100644 --- a/lib/events/stateevent.cpp +++ b/lib/events/stateevent.cpp @@ -24,10 +24,9 @@ using namespace QMatrixClient; // StateEventBase itself can be instantiated if there's a state_key JSON key // but the event type is unknown. [[gnu::unused]] static auto stateEventTypeInitialised = - RoomEvent::factory_t::addMethod([](const QJsonObject& json, - const QString& matrixType) - -> StateEventPtr { - if (!json.contains("state_key")) + RoomEvent::factory_t::addMethod( + [](const QJsonObject& json, const QString& matrixType) -> StateEventPtr { + if (!json.contains("state_key"_ls)) return nullptr; if (auto e = StateEventBase::factory_t::make(json, matrixType)) @@ -53,7 +52,7 @@ void StateEventBase::dumpTo(QDebug dbg) const dbg << '<' << stateKey() << "> "; if (unsignedJson().contains(PrevContentKeyL)) dbg << QJsonDocument(unsignedJson()[PrevContentKeyL].toObject()) - .toJson(QJsonDocument::Compact) + .toJson(QJsonDocument::Compact) << " -> "; RoomEvent::dumpTo(dbg); } |