diff options
| author | Alexey Rusakov <Kitsune-Ral@users.sf.net> | 2021-07-16 20:03:06 +0200 |
|---|---|---|
| committer | Alexey Rusakov <Kitsune-Ral@users.sf.net> | 2021-07-18 20:09:43 +0200 |
| commit | c05b5c2b79f9ab301fee587ee781b9c8e18b8a2f (patch) | |
| tree | 95de5d26893652593fdf0a583378c31795a0d432 /lib/user.cpp | |
| parent | 110190d48a80a471e6d10d048602390b35e7ed07 (diff) | |
| download | libquotient-c05b5c2b79f9ab301fee587ee781b9c8e18b8a2f.tar.gz libquotient-c05b5c2b79f9ab301fee587ee781b9c8e18b8a2f.zip | |
MembershipType -> Membership, also used for JoinState
Instead of being defined independently, JoinState now uses values from
the Membership enumeration (former MemberEventContent::MembershipType)
that was moved to quotient_common.h for that purpose. Both enumerations
gained a Q_FLAG_NS decoration and operator<< overrides that strip
"Quotient::" prefix when dumping member/join state values to the log -
obviating toCString(JoinState) along the way. Quotient::MembershipType
alias is deprecated from now.
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 6cc9e161..c97e33a4 100644 --- a/lib/user.cpp +++ b/lib/user.cpp @@ -123,7 +123,7 @@ void User::rename(const QString& newName, const Room* r) } // #481: take the current state and update it with the new name auto evtC = r->getCurrentState<RoomMemberEvent>(id())->content(); - Q_ASSERT_X(evtC.membership == MembershipType::Join, __FUNCTION__, + Q_ASSERT_X(evtC.membership == Membership::Join, __FUNCTION__, "Attempt to rename a user that's not a room member"); evtC.displayName = sanitized(newName); r->setState<RoomMemberEvent>(id(), move(evtC)); |