diff options
author | Kitsune Ral <Kitsune-Ral@users.sf.net> | 2018-05-01 21:01:33 +0900 |
---|---|---|
committer | Kitsune Ral <Kitsune-Ral@users.sf.net> | 2018-05-01 21:01:33 +0900 |
commit | 1e42eca5c3d864750609eacd4996794c901c6c37 (patch) | |
tree | 88a2ca014bfd38bdbd2c30cd3918fc49dd7a7255 /lib/user.cpp | |
parent | 38934c2310b426be640988dc10f48de88a3d92bc (diff) | |
parent | 2a341e30ef2db74b331a8870ceb2f182af68f194 (diff) | |
download | libquotient-1e42eca5c3d864750609eacd4996794c901c6c37.tar.gz libquotient-1e42eca5c3d864750609eacd4996794c901c6c37.zip |
Merge branch 'master' into kitsune-gtad
Diffstat (limited to 'lib/user.cpp')
-rw-r--r-- | lib/user.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/user.cpp b/lib/user.cpp index c4fbfe35..91b340d5 100644 --- a/lib/user.cpp +++ b/lib/user.cpp @@ -358,7 +358,7 @@ QUrl User::avatarUrl(const Room* room) const return avatarObject(room).url(); } -void User::processEvent(RoomMemberEvent* event, const Room* room) +void User::processEvent(const RoomMemberEvent* event, const Room* room) { if (event->membership() != MembershipType::Invite && event->membership() != MembershipType::Join) |