diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/yuzu/configuration/configure_dialog.cpp | 22 | ||||
| -rw-r--r-- | src/yuzu/configuration/configure_motion_touch.cpp | 1 |
2 files changed, 2 insertions, 21 deletions
diff --git a/src/yuzu/configuration/configure_dialog.cpp b/src/yuzu/configuration/configure_dialog.cpp index b33f8437a..d6b17a28d 100644 --- a/src/yuzu/configuration/configure_dialog.cpp +++ b/src/yuzu/configuration/configure_dialog.cpp | |||
| @@ -117,31 +117,13 @@ void ConfigureDialog::UpdateVisibleTabs() { | |||
| 117 | return; | 117 | return; |
| 118 | } | 118 | } |
| 119 | 119 | ||
| 120 | const std::map<QWidget*, QString> widgets = { | ||
| 121 | {ui->generalTab, tr("General")}, | ||
| 122 | {ui->systemTab, tr("System")}, | ||
| 123 | {ui->profileManagerTab, tr("Profiles")}, | ||
| 124 | {ui->inputTab, tr("Controls")}, | ||
| 125 | {ui->hotkeysTab, tr("Hotkeys")}, | ||
| 126 | {ui->cpuTab, tr("CPU")}, | ||
| 127 | {ui->cpuDebugTab, tr("Debug")}, | ||
| 128 | {ui->graphicsTab, tr("Graphics")}, | ||
| 129 | {ui->graphicsAdvancedTab, tr("Advanced")}, | ||
| 130 | {ui->audioTab, tr("Audio")}, | ||
| 131 | {ui->debugTab, tr("Debug")}, | ||
| 132 | {ui->webTab, tr("Web")}, | ||
| 133 | {ui->uiTab, tr("UI")}, | ||
| 134 | {ui->filesystemTab, tr("Filesystem")}, | ||
| 135 | {ui->serviceTab, tr("Services")}, | ||
| 136 | }; | ||
| 137 | |||
| 138 | [[maybe_unused]] const QSignalBlocker blocker(ui->tabWidget); | 120 | [[maybe_unused]] const QSignalBlocker blocker(ui->tabWidget); |
| 139 | 121 | ||
| 140 | ui->tabWidget->clear(); | 122 | ui->tabWidget->clear(); |
| 141 | 123 | ||
| 142 | const QList<QWidget*> tabs = qvariant_cast<QList<QWidget*>>(items[0]->data(Qt::UserRole)); | 124 | const auto tabs = qvariant_cast<QList<QWidget*>>(items[0]->data(Qt::UserRole)); |
| 143 | 125 | ||
| 144 | for (const auto tab : tabs) { | 126 | for (auto* const tab : tabs) { |
| 145 | ui->tabWidget->addTab(tab, tab->accessibleName()); | 127 | ui->tabWidget->addTab(tab, tab->accessibleName()); |
| 146 | } | 128 | } |
| 147 | } | 129 | } |
diff --git a/src/yuzu/configuration/configure_motion_touch.cpp b/src/yuzu/configuration/configure_motion_touch.cpp index 1c477f868..caaa85930 100644 --- a/src/yuzu/configuration/configure_motion_touch.cpp +++ b/src/yuzu/configuration/configure_motion_touch.cpp | |||
| @@ -112,7 +112,6 @@ ConfigureMotionTouch::~ConfigureMotionTouch() = default; | |||
| 112 | void ConfigureMotionTouch::SetConfiguration() { | 112 | void ConfigureMotionTouch::SetConfiguration() { |
| 113 | const Common::ParamPackage motion_param(Settings::values.motion_device); | 113 | const Common::ParamPackage motion_param(Settings::values.motion_device); |
| 114 | const Common::ParamPackage touch_param(Settings::values.touch_device); | 114 | const Common::ParamPackage touch_param(Settings::values.touch_device); |
| 115 | const std::string motion_engine = motion_param.Get("engine", "motion_emu"); | ||
| 116 | const std::string touch_engine = touch_param.Get("engine", "emu_window"); | 115 | const std::string touch_engine = touch_param.Get("engine", "emu_window"); |
| 117 | 116 | ||
| 118 | ui->touch_provider->setCurrentIndex( | 117 | ui->touch_provider->setCurrentIndex( |