aboutsummaryrefslogtreecommitdiff
path: root/lib/room.cpp
diff options
context:
space:
mode:
authorAlexey Rusakov <Kitsune-Ral@users.sf.net>2021-08-23 09:12:39 +0200
committerAlexey Rusakov <Kitsune-Ral@users.sf.net>2021-08-23 09:12:39 +0200
commit2914657e594b46bcdc04d320732fa1799978c0a8 (patch)
tree18e47baa175a109e9a64491b35889ef4375264fd /lib/room.cpp
parent3cbc13a33c81a75e18c415bd31cc2156461ffa1f (diff)
parent93cee89f9a99e51275ac9cd304180499b0543eea (diff)
downloadlibquotient-2914657e594b46bcdc04d320732fa1799978c0a8.tar.gz
libquotient-2914657e594b46bcdc04d320732fa1799978c0a8.zip
Merge branch 'kitsune/deprecations'
Diffstat (limited to 'lib/room.cpp')
-rw-r--r--lib/room.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/room.cpp b/lib/room.cpp
index 9fe70678..398b3ec8 100644
--- a/lib/room.cpp
+++ b/lib/room.cpp
@@ -1236,7 +1236,7 @@ QList<User*> Room::membersLeft() const { return d->membersLeft; }
QList<User*> Room::users() const { return d->membersMap.values(); }
-[[deprecated]] QStringList Room::memberNames() const
+QStringList Room::memberNames() const
{
return safeMemberNames();
}
@@ -1507,7 +1507,7 @@ QString Room::disambiguatedMemberName(const QString& mxId) const
QString Room::safeMemberName(const QString& userId) const
{
- return sanitized(roomMembername(userId));
+ return sanitized(disambiguatedMemberName(userId));
}
QString Room::htmlSafeMemberName(const QString& userId) const