citra-emu
/
citra
Archived
1
0
Fork 0
Code

Merge pull request #4836 from wwylele/chatroom-sign 

citra_qt: silent sign comparison warning
This commit is contained in:
Pengfei Zhu 2019-07-15 07:33:35 +08:00 committed by GitHub
parent f31dd06d91 f7607c820d
commit 1d6c6a37a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/citra_qt/cheats.cpp
View File

@ -148,7 +148,7 @@ void CheatDialog::OnRowSelected(int row, int column) {
ui->tableCheats->setCurrentCell(last_row, last_col); ui->tableCheats->setCurrentCell(last_row, last_col);
return; return;
} }
if (row < cheats.size()) { if (static_cast<std::size_t>(row) < cheats.size()) {
if (newly_created) { if (newly_created) {
// Remove the newly created dummy item // Remove the newly created dummy item
newly_created = false; newly_created = false;

5
src/citra_qt/multiplayer/chat_room.cpp
View File

@ -406,8 +406,9 @@ void ChatRoom::SetPlayerList(const Network::RoomMember::MemberList& member_list)
} }
void ChatRoom::OnChatTextChanged() { void ChatRoom::OnChatTextChanged() {
if (ui->chat_message->text().length() > Network::MaxMessageSize) if (ui->chat_message->text().length() > static_cast<int>(Network::MaxMessageSize))
ui->chat_message->setText(ui->chat_message->text().left(Network::MaxMessageSize)); ui->chat_message->setText(
ui->chat_message->text().left(static_cast<int>(Network::MaxMessageSize)));
} }
void ChatRoom::PopupContextMenu(const QPoint& menu_location) { void ChatRoom::PopupContextMenu(const QPoint& menu_location) {