summaryrefslogtreecommitdiff
path: root/Source/Core/DolphinQt/Settings/USBDeviceAddToWhitelistDialog.cpp
diff options
context:
space:
mode:
authorJMC47 <JMC4789@gmail.com>2025-07-23 20:57:17 -0400
committerGitHub <noreply@github.com>2025-07-23 20:57:17 -0400
commit45ba6ed6b185564099bbb7257c0bdfdb8f2d779f (patch)
tree81b7faa25ea36b94e3194a5eab0b5926766eedc1 /Source/Core/DolphinQt/Settings/USBDeviceAddToWhitelistDialog.cpp
parent10cedc90af0068d2a78a454914c4d7ca4c1cdbdf (diff)
parent4ae195ee60b1167757b4c1e8ef6771e0aa23a96e (diff)
Merge pull request #13770 from JoshuaVandaele/usbutils
USBUtils: Refactor USB device handling
Diffstat (limited to 'Source/Core/DolphinQt/Settings/USBDeviceAddToWhitelistDialog.cpp')
-rw-r--r--Source/Core/DolphinQt/Settings/USBDeviceAddToWhitelistDialog.cpp41
1 files changed, 24 insertions, 17 deletions
diff --git a/Source/Core/DolphinQt/Settings/USBDeviceAddToWhitelistDialog.cpp b/Source/Core/DolphinQt/Settings/USBDeviceAddToWhitelistDialog.cpp
index b1133e16d6..05f940505c 100644
--- a/Source/Core/DolphinQt/Settings/USBDeviceAddToWhitelistDialog.cpp
+++ b/Source/Core/DolphinQt/Settings/USBDeviceAddToWhitelistDialog.cpp
@@ -16,16 +16,17 @@
#include <QVBoxLayout>
#include <QWidget>
+#include <fmt/format.h>
+
#include "Common/StringUtil.h"
#include "Core/Config/MainSettings.h"
#include "Core/ConfigManager.h"
+#include "Core/USBUtils.h"
#include "DolphinQt/QtUtils/ModalMessageBox.h"
#include "DolphinQt/Settings/WiiPane.h"
-#include "UICommon/USBUtils.h"
-
static bool IsValidUSBIDString(const std::string& string)
{
if (string.empty() || string.length() > 4)
@@ -105,20 +106,23 @@ void USBDeviceAddToWhitelistDialog::InitControls()
device_vid_textbox->setMaxLength(4);
device_pid_textbox->setMaxLength(4);
}
-
void USBDeviceAddToWhitelistDialog::RefreshDeviceList()
{
- const auto& current_devices = USBUtils::GetInsertedDevices();
+ const auto whitelist = Config::GetUSBDeviceWhitelist();
+
+ const auto& current_devices = USBUtils::ListDevices(
+ [&whitelist](const USBUtils::DeviceInfo& device) { return !whitelist.contains(device); });
+
if (current_devices == m_shown_devices)
return;
const auto selection_string = usb_inserted_devices_list->currentItem();
usb_inserted_devices_list->clear();
- auto whitelist = Config::GetUSBDeviceWhitelist();
for (const auto& device : current_devices)
{
- if (whitelist.contains({device.first.first, device.first.second}))
- continue;
- usb_inserted_devices_list->addItem(QString::fromStdString(device.second));
+ auto* item = new QListWidgetItem(QString::fromStdString(device.ToDisplayString()),
+ usb_inserted_devices_list);
+ QVariant device_data = QVariant::fromValue(device);
+ item->setData(Qt::UserRole, device_data);
}
usb_inserted_devices_list->setCurrentItem(selection_string);
@@ -147,15 +151,16 @@ void USBDeviceAddToWhitelistDialog::AddUSBDeviceToWhitelist()
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 USBUtils::DeviceInfo new_device{vid, pid};
auto whitelist = Config::GetUSBDeviceWhitelist();
- auto it = whitelist.emplace(vid, pid);
- if (!it.second)
+ if (whitelist.contains(new_device))
{
ModalMessageBox::critical(this, tr("USB Whitelist Error"),
tr("This USB device is already whitelisted."));
return;
}
+ whitelist.emplace(new_device);
Config::SetUSBDeviceWhitelist(whitelist);
Config::Save();
accept();
@@ -163,11 +168,13 @@ void USBDeviceAddToWhitelistDialog::AddUSBDeviceToWhitelist()
void USBDeviceAddToWhitelistDialog::OnDeviceSelection()
{
- // Not the nicest way of doing this but...
- QString device = usb_inserted_devices_list->currentItem()->text().left(9);
- QStringList split = device.split(QString::fromStdString(":"));
- QString* vid = new QString(split[0]);
- QString* pid = new QString(split[1]);
- device_vid_textbox->setText(*vid);
- device_pid_textbox->setText(*pid);
+ auto* current_item = usb_inserted_devices_list->currentItem();
+ if (!current_item)
+ return;
+
+ QVariant item_data = current_item->data(Qt::UserRole);
+ USBUtils::DeviceInfo device = item_data.value<USBUtils::DeviceInfo>();
+
+ device_vid_textbox->setText(QString::fromStdString(fmt::format("{:04x}", device.vid)));
+ device_pid_textbox->setText(QString::fromStdString(fmt::format("{:04x}", device.pid)));
}