From 6f3d028927edb6cc5c96283c120cd3d97c228dab Mon Sep 17 00:00:00 2001 From: Joel16 Date: Thu, 4 Aug 2022 00:10:01 -0400 Subject: [PATCH] gui: Access vector element directly instead of using *.at(index) --- source/popups/delete.cpp | 8 ++++---- source/popups/options.cpp | 4 ++-- source/tabs/filebrowser.cpp | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/source/popups/delete.cpp b/source/popups/delete.cpp index d08d1ea..058c2cb 100644 --- a/source/popups/delete.cpp +++ b/source/popups/delete.cpp @@ -18,8 +18,8 @@ namespace Popups { ImGui::Text(strings[cfg.lang][Lang::DeleteMultiplePrompt]); ImGui::Dummy(ImVec2(0.0f, 5.0f)); // Spacing ImGui::BeginChild("Scrolling", ImVec2(0, 100)); - for (long unsigned int i = 0; i < data.checkbox_data.checked.size(); i++) { - if (data.checkbox_data.checked.at(i)) + for (std::size_t i = 0; i < data.checkbox_data.checked.size(); i++) { + if (data.checkbox_data.checked[i]) ImGui::Text(data.entries[i].name); } ImGui::EndChild(); @@ -43,11 +43,11 @@ namespace Popups { std::sort(entries.begin(), entries.end(), FileBrowser::Sort); Log::Exit(); - for (long unsigned int i = 0; i < data.checkbox_data.checked.size(); i++) { + for (std::size_t i = 0; i < data.checkbox_data.checked.size(); i++) { if (std::strncmp(entries[i].name, "..", 2) == 0) continue; - if (data.checkbox_data.checked.at(i)) { + if (data.checkbox_data.checked[i]) { if (R_FAILED(ret = FS::Delete(entries[i]))) { FS::GetDirList(cwd, data.entries); Windows::ResetCheckbox(data); diff --git a/source/popups/options.cpp b/source/popups/options.cpp index d578367..2d3aaa6 100644 --- a/source/popups/options.cpp +++ b/source/popups/options.cpp @@ -28,11 +28,11 @@ namespace Options { std::sort(entries.begin(), entries.end(), FileBrowser::Sort); - for (long unsigned int i = 0; i < data.checkbox_data.checked_copy.size(); i++) { + for (std::size_t i = 0; i < data.checkbox_data.checked_copy.size(); i++) { if (std::strncmp(entries[i].name, "..", 2) == 0) continue; - if (data.checkbox_data.checked_copy.at(i)) { + if (data.checkbox_data.checked_copy[i]) { FS::Copy(entries[i], data.checkbox_data.cwd); if (R_FAILED((*func)())) { diff --git a/source/tabs/filebrowser.cpp b/source/tabs/filebrowser.cpp index 5271a44..f239904 100644 --- a/source/tabs/filebrowser.cpp +++ b/source/tabs/filebrowser.cpp @@ -103,10 +103,10 @@ namespace Tabs { ImGui::PushItemWidth(160.f); if (ImGui::BeginCombo("", device.c_str())) { for (std::size_t i = 0; i < devices_list.size(); i++) { - const bool is_selected = (device == devices_list.at(i)); + const bool is_selected = (device == devices_list[i]); - if (ImGui::Selectable(devices_list.at(i).c_str(), is_selected)) { - device = devices_list.at(i); + if (ImGui::Selectable(devices_list[i].c_str(), is_selected)) { + device = devices_list[i]; fs = std::addressof(devices[i]); std::strncpy(cwd, "/", 2); data.entries.clear(); @@ -161,7 +161,7 @@ namespace Tabs { ImGui::TableNextColumn(); ImGui::PushID(i); - if ((data.checkbox_data.checked.at(i)) && (strcasecmp(data.checkbox_data.cwd, cwd) == 0)) + if ((data.checkbox_data.checked[i]) && (strcasecmp(data.checkbox_data.cwd, cwd) == 0)) ImGui::Image(reinterpret_cast(check_icon.id), tex_size); else ImGui::Image(reinterpret_cast(uncheck_icon.id), tex_size);