diff options
author | KitsuneRal <Kitsune-Ral@users.sf.net> | 2016-09-21 08:55:09 +0900 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-09-21 08:55:09 +0900 |
commit | 36beaf2b1bfaa27b47eaeca6b231d7209bf8dedc (patch) | |
tree | eae5b193c9dea3517068aa5323dda9f5ba9fa977 /events/roomtopicevent.cpp | |
parent | 11dd106d8d99c187c22f7a37ce557daf25450e4b (diff) | |
parent | e0e115faeb49297437d4efc231e4d57e8275ec2a (diff) | |
download | libquotient-36beaf2b1bfaa27b47eaeca6b231d7209bf8dedc.tar.gz libquotient-36beaf2b1bfaa27b47eaeca6b231d7209bf8dedc.zip |
Merge pull request #31 from Fxrh/kitsune-sender-in-all-events
Push sender from RoomTopicEvent to Event
Diffstat (limited to 'events/roomtopicevent.cpp')
-rw-r--r-- | events/roomtopicevent.cpp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/events/roomtopicevent.cpp b/events/roomtopicevent.cpp index 7ccfc73c..2e186c4b 100644 --- a/events/roomtopicevent.cpp +++ b/events/roomtopicevent.cpp @@ -24,7 +24,6 @@ class RoomTopicEvent::Private { public: QString topic; - QString senderId; }; RoomTopicEvent::RoomTopicEvent() @@ -38,11 +37,6 @@ RoomTopicEvent::~RoomTopicEvent() delete d; } -QString RoomTopicEvent::senderId() const -{ - return d->senderId; -} - QString RoomTopicEvent::topic() const { return d->topic; @@ -53,6 +47,5 @@ RoomTopicEvent* RoomTopicEvent::fromJson(const QJsonObject& obj) auto e = new RoomTopicEvent(); e->parseJson(obj); e->d->topic = obj.value("content").toObject().value("topic").toString(); - e->d->senderId = obj["sender"].toString(); return e; } |