Skip to content

fix room id bugs #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
NikolBel wants to merge 1 commit into
base: sprint_3
Choose a base branch
from
Open

fix room id bugs #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ChatWModel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ void ChatWModel::addChats(const QVariantList& new_chat_list_)
beginInsertRows(QModelIndex(), static_cast<int>(model_chats.size()), static_cast<int>(model_chats.size() + new_chat_list_.size() - 1));
for (auto const& chat_var : new_chat_list_)
{
if (const auto msg = chat_var.value<chatItemPtr>(); msg)
if (const auto chat = chat_var.value<chatItemPtr>(); chat)
{
model_chats.emplaceBack(msg);
model_chats.emplaceBack(chat);
}
}
endInsertRows();
Expand Down
4 changes: 2 additions & 2 deletions ChatWView.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,12 @@ void ChatWView::onChatAdded(const QVariant& new_msg) const
model->addChat(new_msg);
}

void ChatWView::onChatsAdded(const QVariantList& msg_list) const
void ChatWView::onChatsAdded(const QVariantList& chat_list) const
{
const auto model = qobject_cast<ChatWModel*>(this->model());
if (!model)
return;
model->addChats(msg_list);
model->addChats(chat_list);
}

void ChatWView::onCustomContextMenuRequested(const QPoint& pos)
Expand Down
2 changes: 1 addition & 1 deletion client.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ void Client::updateUserPassword(QSharedPointer<DTOUser> shp_dto_user_)

void Client::enterRoom(quint16 room_number_)
{
if (room_number_ != 0)
if (room_number_ == 0)
return;

QJsonObject user;
Expand Down