ESCA111/neochat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Switch to newDisplayName() and newAvatarUrl()

Browse Source 
Removes build warnings that these are deprecated.
See libQuotient commit f4db6988bf2fd71f74ac851557d82c6f65cc89b1
for more details.
This commit is contained in:
Mathew Broady
2020-12-21 10:59:46 +11:00
parent 218f897229
commit a1b66f3aa6
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/neochatroom.cpp
View File

@@ -367,17 +367,17 @@ QString NeoChatRoom::eventToString(const RoomEvent &evt, Qt::TextFormat format,
} }
QString text {}; QString text {};
if (e.isRename()) { if (e.isRename()) {
if (e.displayName().isEmpty()) { if (!e.newDisplayName().has_value()) {
text = i18n("cleared their display name"); text = i18n("cleared their display name");
} else { } else {
text = i18n("changed their display name to %1", e.displayName().toHtmlEscaped()); text = i18n("changed their display name to %1", e.newDisplayName()->toHtmlEscaped());
} }
} }
if (e.isAvatarUpdate()) { if (e.isAvatarUpdate()) {
if (!text.isEmpty()) { if (!text.isEmpty()) {
text += i18n(" and "); text += i18n(" and ");
} }
if (e.avatarUrl().isEmpty()) { if (!e.newAvatarUrl().has_value()) {
text += i18n("cleared their avatar"); text += i18n("cleared their avatar");
} else if (e.prevContent()->avatarUrl) { } else if (e.prevContent()->avatarUrl) {
text += i18n("set an avatar"); text += i18n("set an avatar");