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

Fix compilation against newer libQuotient

Browse Source
This commit is contained in:
Tobias Fella
2020-11-01 20:11:09 +01:00
parent da09ad4bf2
commit 5de778ea82
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/userlistmodel.cpp
View File

@@ -42,7 +42,7 @@ void UserListModel::setRoom(Quotient::Room* room) {
std::sort(m_users.begin(), m_users.end(), room->memberSorter());
}
for (User* user : m_users) {
connect(user, &User::avatarChanged, this, &UserListModel::avatarChanged);
connect(user, &User::defaultAvatarChanged, this, [user, this](){avatarChanged(user);});
}
connect(m_currentRoom->connection(), &Connection::loggedOut, this,
[=] { setRoom(nullptr); });
@@ -134,8 +134,7 @@ void UserListModel::userAdded(Quotient::User* user) {
beginInsertRows(QModelIndex(), pos, pos);
m_users.insert(pos, user);
endInsertRows();
connect(user, &Quotient::User::avatarChanged, this,
&UserListModel::avatarChanged);
connect(user, &Quotient::User::defaultAvatarChanged, this, [user, this](){avatarChanged(user);});
}
void UserListModel::userRemoved(Quotient::User* user) {
@@ -157,9 +156,7 @@ void UserListModel::refresh(Quotient::User* user, QVector<int> roles) {
qWarning() << "Trying to access a room member not in the user list";
}
void UserListModel::avatarChanged(Quotient::User* user,
const Quotient::Room* context) {
if (context == m_currentRoom)
void UserListModel::avatarChanged(Quotient::User* user) {
refresh(user, {AvatarRole});
}

2
src/userlistmodel.h
View File

@@ -57,7 +57,7 @@ class UserListModel : public QAbstractListModel {
void userAdded(Quotient::User* user);
void userRemoved(Quotient::User* user);
void refresh(Quotient::User* user, QVector<int> roles = {});
void avatarChanged(Quotient::User* user, const Quotient::Room* context);
void avatarChanged(Quotient::User* user);
private:
Quotient::Room* m_currentRoom;