From a2a1e04fc9c26c7d4ae8af5d1229a906c0ae066d Mon Sep 17 00:00:00 2001 From: JosJuice Date: Mon, 8 Jul 2019 13:35:53 +0200 Subject: StringUtil: Use std::string_view more --- .../DolphinQt/Settings/USBDeviceAddToWhitelistDialog.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'Source/Core/DolphinQt/Settings/USBDeviceAddToWhitelistDialog.cpp') diff --git a/Source/Core/DolphinQt/Settings/USBDeviceAddToWhitelistDialog.cpp b/Source/Core/DolphinQt/Settings/USBDeviceAddToWhitelistDialog.cpp index 1340fccb14..b51068ad25 100644 --- a/Source/Core/DolphinQt/Settings/USBDeviceAddToWhitelistDialog.cpp +++ b/Source/Core/DolphinQt/Settings/USBDeviceAddToWhitelistDialog.cpp @@ -4,6 +4,8 @@ #include "DolphinQt/Settings/USBDeviceAddToWhitelistDialog.h" +#include + #include #include #include @@ -27,7 +29,7 @@ #include "UICommon/USBUtils.h" -static bool IsValidUSBIDString(const std::string& string) +static bool IsValidUSBIDString(std::string_view string) { if (string.empty() || string.length() > 4) return false; @@ -124,8 +126,8 @@ void USBDeviceAddToWhitelistDialog::RefreshDeviceList() void USBDeviceAddToWhitelistDialog::AddUSBDeviceToWhitelist() { - const std::string vid_string = StripSpaces(device_vid_textbox->text().toStdString()); - const std::string pid_string = StripSpaces(device_pid_textbox->text().toStdString()); + const std::string_view vid_string = StripSpaces(device_vid_textbox->text().toStdString()); + const std::string_view pid_string = StripSpaces(device_pid_textbox->text().toStdString()); if (!IsValidUSBIDString(vid_string)) { // i18n: Here, VID means Vendor ID (for a USB device). @@ -151,8 +153,8 @@ void USBDeviceAddToWhitelistDialog::AddUSBDeviceToWhitelist() return; } - const u16 vid = static_cast(std::stoul(vid_string, nullptr, 16)); - const u16 pid = static_cast(std::stoul(pid_string, nullptr, 16)); + const u16 vid = static_cast(std::stoul(std::string(vid_string), nullptr, 16)); + const u16 pid = static_cast(std::stoul(std::string(pid_string), nullptr, 16)); if (SConfig::GetInstance().IsUSBDeviceWhitelisted({vid, pid})) { -- cgit v1.2.3