diff options
| author | Connor McLaughlin <stenzek@gmail.com> | 2019-08-09 23:39:01 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-09 23:39:01 +1000 |
| commit | 48ca2c6f2e70111cf72052d5d258328c2fdb9afd (patch) | |
| tree | 9d69b41773993fb46b53fea45377b85136b6014c /Source/Core/DolphinQt/Settings/USBDeviceAddToWhitelistDialog.cpp | |
| parent | 0ab7e2eed78731db4b0b2c48f35f85d3a6722272 (diff) | |
| parent | 117a60ceb271594a659392892de2cd1a957bef48 (diff) | |
Merge pull request #8233 from JosJuice/stringutil-string-view
StringUtil: Use std::string_view more
Diffstat (limited to 'Source/Core/DolphinQt/Settings/USBDeviceAddToWhitelistDialog.cpp')
| -rw-r--r-- | Source/Core/DolphinQt/Settings/USBDeviceAddToWhitelistDialog.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
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 <string_view> + #include <QButtonGroup> #include <QDialog> #include <QDialogButtonBox> @@ -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<u16>(std::stoul(vid_string, nullptr, 16)); - const u16 pid = static_cast<u16>(std::stoul(pid_string, nullptr, 16)); + const u16 vid = static_cast<u16>(std::stoul(std::string(vid_string), nullptr, 16)); + const u16 pid = static_cast<u16>(std::stoul(std::string(pid_string), nullptr, 16)); if (SConfig::GetInstance().IsUSBDeviceWhitelisted({vid, pid})) { |