diff options
| author | David A Roberts <d@vidr.cc> | 2016-04-12 20:31:20 +1000 |
|---|---|---|
| committer | David A Roberts <d@vidr.cc> | 2016-04-12 20:31:20 +1000 |
| commit | da90b601b06512e23ac66d0b301e1eafaf2b7bc2 (patch) | |
| tree | e9c6ef5f5da2430c259f00077b83d275adc1fb29 /events/roomaliasesevent.cpp | |
| parent | 0f6cb38896443cf104aa470eb1822bd2e49143f1 (diff) | |
| parent | 00a73167ca455370868f1f82257420f0cb399a15 (diff) | |
| download | libquotient-da90b601b06512e23ac66d0b301e1eafaf2b7bc2.tar.gz libquotient-da90b601b06512e23ac66d0b301e1eafaf2b7bc2.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'events/roomaliasesevent.cpp')
| -rw-r--r-- | events/roomaliasesevent.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/events/roomaliasesevent.cpp b/events/roomaliasesevent.cpp index 6bbe0aff..54fb5682 100644 --- a/events/roomaliasesevent.cpp +++ b/events/roomaliasesevent.cpp @@ -64,7 +64,7 @@ QStringList RoomAliasesEvent::aliases() const RoomAliasesEvent* RoomAliasesEvent::fromJson(const QJsonObject& obj) { - qDebug() << "!!!!"; + qDebug() << "RoomAliasesEvent::fromJson"; RoomAliasesEvent* e = new RoomAliasesEvent(); e->parseJson(obj); const QJsonObject contents = obj.value("content").toObject(); |