Fix integer sign difference comparison warnings

This commit is contained in:
Pokechu22
2022-01-17 00:21:58 -08:00
parent 5f9e04be1d
commit 50d9349926
3 changed files with 8 additions and 7 deletions

View File

@ -1031,7 +1031,7 @@ int AddOnStateChangedCallback(StateChangedCallbackFunc callback)
bool RemoveOnStateChangedCallback(int* handle) bool RemoveOnStateChangedCallback(int* handle)
{ {
if (handle && *handle >= 0 && s_on_state_changed_callbacks.size() > *handle) if (handle && *handle >= 0 && s_on_state_changed_callbacks.size() > static_cast<size_t>(*handle))
{ {
s_on_state_changed_callbacks[*handle] = StateChangedCallbackFunc(); s_on_state_changed_callbacks[*handle] = StateChangedCallbackFunc();
*handle = -1; *handle = -1;

View File

@ -1113,10 +1113,11 @@ void VolumeVerifier::Process()
bytes_to_read = Common::AlignUp(content.size, 0x40); bytes_to_read = Common::AlignUp(content.size, 0x40);
content_read = true; content_read = true;
if (m_content_index + 1 < m_content_offsets.size() && const u16 next_content_index = m_content_index + 1;
m_content_offsets[m_content_index + 1] < m_progress + bytes_to_read) if (next_content_index < m_content_offsets.size() &&
m_content_offsets[next_content_index] < m_progress + bytes_to_read)
{ {
excess_bytes = m_progress + bytes_to_read - m_content_offsets[m_content_index + 1]; excess_bytes = m_progress + bytes_to_read - m_content_offsets[next_content_index];
} }
} }
else if (m_content_index < m_content_offsets.size() && else if (m_content_index < m_content_offsets.size() &&

View File

@ -376,7 +376,7 @@ void CodeViewWidget::Update()
void CodeViewWidget::CalculateBranchIndentation() void CodeViewWidget::CalculateBranchIndentation()
{ {
const size_t rows = rowCount(); const u32 rows = rowCount();
const size_t columns = m_branches.size(); const size_t columns = m_branches.size();
if (rows < 1 || columns < 1) if (rows < 1 || columns < 1)
return; return;
@ -442,7 +442,7 @@ void CodeViewWidget::CalculateBranchIndentation()
}; };
const u32 first_visible_addr = AddressForRow(0); const u32 first_visible_addr = AddressForRow(0);
const u32 last_visible_addr = AddressForRow(static_cast<int>(rows - 1)); const u32 last_visible_addr = AddressForRow(rows - 1);
if (first_visible_addr <= last_visible_addr) if (first_visible_addr <= last_visible_addr)
{ {
@ -456,7 +456,7 @@ void CodeViewWidget::CalculateBranchIndentation()
// first_visible_addr to fffffffc, and the second for 00000000 to last_visible_addr. // first_visible_addr to fffffffc, and the second for 00000000 to last_visible_addr.
// That means we need to find the row corresponding to 00000000. // That means we need to find the row corresponding to 00000000.
int addr_zero_row = -1; int addr_zero_row = -1;
for (int row = 0; row < rows; row++) for (u32 row = 0; row < rows; row++)
{ {
if (AddressForRow(row) == 0) if (AddressForRow(row) == 0)
{ {