archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-12 17:58:37 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Qt: rename pad_info to pad_device_info for ODR

Browse source
This commit is contained in:
Megamouse 2019-11-16 15:30:01 +01:00
parent 0b28f0fa14
commit 9a8c59a1ff
2 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

18
rpcs3/rpcs3qt/pad_settings_dialog.cpp
View file

@ -109,7 +109,7 @@ pad_settings_dialog::pad_settings_dialog(QWidget *parent, const GameInfo *game)
{ {
return; return;
} }
const pad_info info = ui->chooseDevice->itemData(index).value<pad_info>(); const pad_device_info info = ui->chooseDevice->itemData(index).value<pad_device_info>();
m_device_name = info.name; m_device_name = info.name;
if (!g_cfg_input.player[m_tabs->currentIndex()]->device.from_string(m_device_name)) if (!g_cfg_input.player[m_tabs->currentIndex()]->device.from_string(m_device_name))
{ {
@ -422,12 +422,12 @@ void pad_settings_dialog::InitButtons()
{ {
for (int i = 0; i < ui->chooseDevice->count(); i++) for (int i = 0; i < ui->chooseDevice->count(); i++)
{ {
if (!ui->chooseDevice->itemData(i).canConvert<pad_info>()) if (!ui->chooseDevice->itemData(i).canConvert<pad_device_info>())
{ {
LOG_FATAL(GENERAL, "Cannot convert itemData for index %d and itemText %s", i, sstr(ui->chooseDevice->itemText(i))); LOG_FATAL(GENERAL, "Cannot convert itemData for index %d and itemText %s", i, sstr(ui->chooseDevice->itemText(i)));
continue; continue;
} }
const pad_info info = ui->chooseDevice->itemData(i).value<pad_info>(); const pad_device_info info = ui->chooseDevice->itemData(i).value<pad_device_info>();
m_handler->get_next_button_press(info.name, [=](u16, std::string, std::string pad_name, std::array<int, 6>) { SwitchPadInfo(pad_name, true); }, [=](std::string pad_name) { SwitchPadInfo(pad_name, false); }, false); m_handler->get_next_button_press(info.name, [=](u16, std::string, std::string pad_name, std::array<int, 6>) { SwitchPadInfo(pad_name, true); }, [=](std::string pad_name) { SwitchPadInfo(pad_name, false); }, false);
} }
}); });
@ -447,12 +447,12 @@ void pad_settings_dialog::SwitchPadInfo(const std::string& pad_name, bool is_con
{ {
for (int i = 0; i < ui->chooseDevice->count(); i++) for (int i = 0; i < ui->chooseDevice->count(); i++)
{ {
const pad_info info = ui->chooseDevice->itemData(i).value<pad_info>(); const pad_device_info info = ui->chooseDevice->itemData(i).value<pad_device_info>();
if (info.name == pad_name) if (info.name == pad_name)
{ {
if (info.is_connected != is_connected) if (info.is_connected != is_connected)
{ {
ui->chooseDevice->setItemData(i, QVariant::fromValue(pad_info{ pad_name, is_connected })); ui->chooseDevice->setItemData(i, QVariant::fromValue(pad_device_info{ pad_name, is_connected }));
ui->chooseDevice->setItemText(i, is_connected ? qstr(pad_name) : (qstr(pad_name) + Disconnected_suffix)); ui->chooseDevice->setItemText(i, is_connected ? qstr(pad_name) : (qstr(pad_name) + Disconnected_suffix));
} }
@ -990,7 +990,7 @@ void pad_settings_dialog::ChangeInputType()
for (size_t i = 1; i <= m_handler->max_devices(); i++) // Controllers 1-n in GUI for (size_t i = 1; i <= m_handler->max_devices(); i++) // Controllers 1-n in GUI
{ {
const QString device_name = name_string + QString::number(i); const QString device_name = name_string + QString::number(i);
ui->chooseDevice->addItem(device_name, QVariant::fromValue(pad_info{ sstr(device_name), true })); ui->chooseDevice->addItem(device_name, QVariant::fromValue(pad_device_info{ sstr(device_name), true }));
} }
force_enable = true; force_enable = true;
break; break;
@ -999,7 +999,7 @@ void pad_settings_dialog::ChangeInputType()
{ {
for (size_t i = 0; i < device_list.size(); i++) for (size_t i = 0; i < device_list.size(); i++)
{ {
ui->chooseDevice->addItem(qstr(device_list[i]), QVariant::fromValue(pad_info{ device_list[i], true })); ui->chooseDevice->addItem(qstr(device_list[i]), QVariant::fromValue(pad_device_info{ device_list[i], true }));
} }
break; break;
} }
@ -1014,12 +1014,12 @@ void pad_settings_dialog::ChangeInputType()
{ {
for (int i = 0; i < ui->chooseDevice->count(); i++) for (int i = 0; i < ui->chooseDevice->count(); i++)
{ {
if (!ui->chooseDevice->itemData(i).canConvert<pad_info>()) if (!ui->chooseDevice->itemData(i).canConvert<pad_device_info>())
{ {
LOG_FATAL(GENERAL, "Cannot convert itemData for index %d and itemText %s", i, sstr(ui->chooseDevice->itemText(i))); LOG_FATAL(GENERAL, "Cannot convert itemData for index %d and itemText %s", i, sstr(ui->chooseDevice->itemText(i)));
continue; continue;
} }
const pad_info info = ui->chooseDevice->itemData(i).value<pad_info>(); const pad_device_info info = ui->chooseDevice->itemData(i).value<pad_device_info>();
m_handler->get_next_button_press(info.name, [=](u16, std::string, std::string pad_name, std::array<int, 6>) { SwitchPadInfo(pad_name, true); }, [=](std::string pad_name) { SwitchPadInfo(pad_name, false); }, false); m_handler->get_next_button_press(info.name, [=](u16, std::string, std::string pad_name, std::array<int, 6>) { SwitchPadInfo(pad_name, true); }, [=](std::string pad_name) { SwitchPadInfo(pad_name, false); }, false);
if (info.name == device) if (info.name == device)
{ {

4
rpcs3/rpcs3qt/pad_settings_dialog.h
View file

@ -16,13 +16,13 @@ namespace Ui
class pad_settings_dialog; class pad_settings_dialog;
} }
struct pad_info struct pad_device_info
{ {
std::string name; std::string name;
bool is_connected{false}; bool is_connected{false};
}; };
Q_DECLARE_METATYPE(pad_info) Q_DECLARE_METATYPE(pad_device_info)
class pad_settings_dialog : public QDialog class pad_settings_dialog : public QDialog
{ {