aboutsummaryrefslogtreecommitdiff
path: root/src/yuzu/multiplayer/lobby.cpp
diff options
context:
space:
mode:
authorFearlessTobi <thm.frey@gmail.com>2022-07-15 21:11:09 +0200
committerFearlessTobi <thm.frey@gmail.com>2022-07-25 21:59:30 +0200
commit4b404191cf054ec3206676f1fccc452bc0a0e223 (patch)
tree8a1582246c41260fe82804bf4dcb9abf77176e27 /src/yuzu/multiplayer/lobby.cpp
parent6c8e45618578de1406c0bf4a7f976bd4903c339c (diff)
Address second part of review comments
Diffstat (limited to 'src/yuzu/multiplayer/lobby.cpp')
-rw-r--r--src/yuzu/multiplayer/lobby.cpp19
1 files changed, 10 insertions, 9 deletions
diff --git a/src/yuzu/multiplayer/lobby.cpp b/src/yuzu/multiplayer/lobby.cpp
index 364b4605e6..6cc5f8f7eb 100644
--- a/src/yuzu/multiplayer/lobby.cpp
+++ b/src/yuzu/multiplayer/lobby.cpp
@@ -214,7 +214,7 @@ void Lobby::OnRefreshLobby() {
for (int r = 0; r < game_list->rowCount(); ++r) {
auto index = game_list->index(r, 0);
auto game_id = game_list->data(index, GameListItemPath::ProgramIdRole).toULongLong();
- if (game_id != 0 && room.preferred_game_id == game_id) {
+ if (game_id != 0 && room.information.preferred_game_id == game_id) {
smdh_icon = game_list->data(index, Qt::DecorationRole).value<QPixmap>();
}
}
@@ -231,20 +231,21 @@ void Lobby::OnRefreshLobby() {
auto first_item = new LobbyItem();
auto row = QList<QStandardItem*>({
first_item,
- new LobbyItemName(room.has_password, QString::fromStdString(room.name)),
- new LobbyItemGame(room.preferred_game_id, QString::fromStdString(room.preferred_game),
- smdh_icon),
- new LobbyItemHost(QString::fromStdString(room.owner), QString::fromStdString(room.ip),
- room.port, QString::fromStdString(room.verify_UID)),
- new LobbyItemMemberList(members, room.max_player),
+ new LobbyItemName(room.has_password, QString::fromStdString(room.information.name)),
+ new LobbyItemGame(room.information.preferred_game_id,
+ QString::fromStdString(room.information.preferred_game), smdh_icon),
+ new LobbyItemHost(QString::fromStdString(room.information.host_username),
+ QString::fromStdString(room.ip), room.information.port,
+ QString::fromStdString(room.verify_UID)),
+ new LobbyItemMemberList(members, room.information.member_slots),
});
model->appendRow(row);
// To make the rows expandable, add the member data as a child of the first column of the
// rows with people in them and have qt set them to colspan after the model is finished
// resetting
- if (!room.description.empty()) {
+ if (!room.information.description.empty()) {
first_item->appendRow(
- new LobbyItemDescription(QString::fromStdString(room.description)));
+ new LobbyItemDescription(QString::fromStdString(room.information.description)));
}
if (!room.members.empty()) {
first_item->appendRow(new LobbyItemExpandedMemberList(members));