Fix compilation against changes in libQuotient
This commit is contained in:
@@ -87,7 +87,11 @@ QVariant UserListModel::data(const QModelIndex &index, int role) const
|
|||||||
return memberId;
|
return memberId;
|
||||||
}
|
}
|
||||||
if (role == AvatarRole) {
|
if (role == AvatarRole) {
|
||||||
|
#if Quotient_VERSION_MINOR > 8
|
||||||
|
return m_currentRoom->member(memberId).avatarUrl();
|
||||||
|
#else
|
||||||
return m_currentRoom->memberAvatar(memberId).url();
|
return m_currentRoom->memberAvatar(memberId).url();
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
if (role == ObjectRole) {
|
if (role == ObjectRole) {
|
||||||
return QVariant::fromValue(memberId);
|
return QVariant::fromValue(memberId);
|
||||||
|
|||||||
@@ -135,7 +135,11 @@ NeoChatRoom::NeoChatRoom(Connection *connection, QString roomId, JoinState joinS
|
|||||||
auto showNotification = [this, roomMemberEvent] {
|
auto showNotification = [this, roomMemberEvent] {
|
||||||
QImage avatar_image;
|
QImage avatar_image;
|
||||||
if (roomMemberEvent && !member(roomMemberEvent->senderId()).avatarUrl().isEmpty()) {
|
if (roomMemberEvent && !member(roomMemberEvent->senderId()).avatarUrl().isEmpty()) {
|
||||||
|
#if Quotient_VERSION_MINOR > 8
|
||||||
|
avatar_image = member(roomMemberEvent->senderId()).avatar(128, 128, {});
|
||||||
|
#else
|
||||||
avatar_image = memberAvatar(roomMemberEvent->senderId()).get(this->connection(), 128, [] {});
|
avatar_image = memberAvatar(roomMemberEvent->senderId()).get(this->connection(), 128, [] {});
|
||||||
|
#endif
|
||||||
} else {
|
} else {
|
||||||
qWarning() << "using this room's avatar";
|
qWarning() << "using this room's avatar";
|
||||||
avatar_image = avatar(128);
|
avatar_image = avatar(128);
|
||||||
|
|||||||
@@ -131,7 +131,11 @@ void NotificationsManager::processNotificationJob(QPointer<NeoChatConnection> co
|
|||||||
|
|
||||||
QImage avatar_image;
|
QImage avatar_image;
|
||||||
if (!sender.avatarUrl().isEmpty()) {
|
if (!sender.avatarUrl().isEmpty()) {
|
||||||
|
#if Quotient_VERSION_MINOR > 8
|
||||||
|
avatar_image = room->member(sender.id()).avatar(128, 128, {});
|
||||||
|
#else
|
||||||
avatar_image = room->memberAvatar(sender.id()).get(connection, 128, {});
|
avatar_image = room->memberAvatar(sender.id()).get(connection, 128, {});
|
||||||
|
#endif
|
||||||
} else {
|
} else {
|
||||||
avatar_image = room->avatar(128);
|
avatar_image = room->avatar(128);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user