summaryrefslogtreecommitdiffstats
path: root/src/yuzu/configuration
diff options
context:
space:
mode:
Diffstat (limited to 'src/yuzu/configuration')
-rw-r--r--src/yuzu/configuration/config.cpp8
-rw-r--r--src/yuzu/configuration/config.h6
-rw-r--r--src/yuzu/configuration/configure_audio.cpp2
-rw-r--r--src/yuzu/configuration/configure_cpu.cpp6
-rw-r--r--src/yuzu/configuration/configure_graphics.cpp10
-rw-r--r--src/yuzu/configuration/shared_translation.cpp36
6 files changed, 34 insertions, 34 deletions
diff --git a/src/yuzu/configuration/config.cpp b/src/yuzu/configuration/config.cpp
index 28ee5d492..051756452 100644
--- a/src/yuzu/configuration/config.cpp
+++ b/src/yuzu/configuration/config.cpp
@@ -89,10 +89,10 @@ const std::map<bool, QString> Config::use_docked_mode_texts_map = {
{false, QStringLiteral(QT_TRANSLATE_NOOP("GMainWindow", "Handheld"))},
};
-const std::map<Settings::GPUAccuracy, QString> Config::gpu_accuracy_texts_map = {
- {Settings::GPUAccuracy::Normal, QStringLiteral(QT_TRANSLATE_NOOP("GMainWindow", "Normal"))},
- {Settings::GPUAccuracy::High, QStringLiteral(QT_TRANSLATE_NOOP("GMainWindow", "High"))},
- {Settings::GPUAccuracy::Extreme, QStringLiteral(QT_TRANSLATE_NOOP("GMainWindow", "Extreme"))},
+const std::map<Settings::GpuAccuracy, QString> Config::gpu_accuracy_texts_map = {
+ {Settings::GpuAccuracy::Normal, QStringLiteral(QT_TRANSLATE_NOOP("GMainWindow", "Normal"))},
+ {Settings::GpuAccuracy::High, QStringLiteral(QT_TRANSLATE_NOOP("GMainWindow", "High"))},
+ {Settings::GpuAccuracy::Extreme, QStringLiteral(QT_TRANSLATE_NOOP("GMainWindow", "Extreme"))},
};
const std::map<Settings::RendererBackend, QString> Config::renderer_backend_texts_map = {
diff --git a/src/yuzu/configuration/config.h b/src/yuzu/configuration/config.h
index 553a82295..c00e717b8 100644
--- a/src/yuzu/configuration/config.h
+++ b/src/yuzu/configuration/config.h
@@ -52,7 +52,7 @@ public:
static const std::map<Settings::AntiAliasing, QString> anti_aliasing_texts_map;
static const std::map<Settings::ScalingFilter, QString> scaling_filter_texts_map;
static const std::map<bool, QString> use_docked_mode_texts_map;
- static const std::map<Settings::GPUAccuracy, QString> gpu_accuracy_texts_map;
+ static const std::map<Settings::GpuAccuracy, QString> gpu_accuracy_texts_map;
static const std::map<Settings::RendererBackend, QString> renderer_backend_texts_map;
static const std::map<Settings::ShaderBackend, QString> shader_backend_texts_map;
@@ -211,8 +211,8 @@ private:
};
// These metatype declarations cannot be in common/settings.h because core is devoid of QT
-Q_DECLARE_METATYPE(Settings::CPUAccuracy);
-Q_DECLARE_METATYPE(Settings::GPUAccuracy);
+Q_DECLARE_METATYPE(Settings::CpuAccuracy);
+Q_DECLARE_METATYPE(Settings::GpuAccuracy);
Q_DECLARE_METATYPE(Settings::FullscreenMode);
Q_DECLARE_METATYPE(Settings::NvdecEmulation);
Q_DECLARE_METATYPE(Settings::ResolutionSetup);
diff --git a/src/yuzu/configuration/configure_audio.cpp b/src/yuzu/configuration/configure_audio.cpp
index 0496bd78f..7cc8affb7 100644
--- a/src/yuzu/configuration/configure_audio.cpp
+++ b/src/yuzu/configuration/configure_audio.cpp
@@ -188,7 +188,7 @@ void ConfigureAudio::InitializeAudioSinkComboBox() {
sink_combo_box->addItem(QString::fromUtf8(AudioCore::Sink::auto_device_name));
for (const auto& id : AudioCore::Sink::GetSinkIDs()) {
- sink_combo_box->addItem(QString::fromStdString(Settings::TranslateEnum(id)));
+ sink_combo_box->addItem(QString::fromStdString(Settings::CanonicalizeEnum(id)));
}
}
diff --git a/src/yuzu/configuration/configure_cpu.cpp b/src/yuzu/configuration/configure_cpu.cpp
index ac298a50f..67b811014 100644
--- a/src/yuzu/configuration/configure_cpu.cpp
+++ b/src/yuzu/configuration/configure_cpu.cpp
@@ -73,9 +73,9 @@ void ConfigureCpu::Setup() {
}
void ConfigureCpu::UpdateGroup(int index) {
- const auto accuracy = static_cast<Settings::CPUAccuracy>(
- combobox_translations.at(typeid(Settings::CPUAccuracy))[index].first);
- ui->unsafe_group->setVisible(accuracy == Settings::CPUAccuracy::Unsafe);
+ const auto accuracy = static_cast<Settings::CpuAccuracy>(
+ combobox_translations.at(typeid(Settings::CpuAccuracy))[index].first);
+ ui->unsafe_group->setVisible(accuracy == Settings::CpuAccuracy::Unsafe);
}
void ConfigureCpu::ApplyConfiguration() {
diff --git a/src/yuzu/configuration/configure_graphics.cpp b/src/yuzu/configuration/configure_graphics.cpp
index 59702603a..1e26267a0 100644
--- a/src/yuzu/configuration/configure_graphics.cpp
+++ b/src/yuzu/configuration/configure_graphics.cpp
@@ -51,9 +51,9 @@ static constexpr VkPresentModeKHR VSyncSettingToMode(Settings::VSyncMode mode) {
return VK_PRESENT_MODE_IMMEDIATE_KHR;
case Settings::VSyncMode::Mailbox:
return VK_PRESENT_MODE_MAILBOX_KHR;
- case Settings::VSyncMode::FIFO:
+ case Settings::VSyncMode::Fifo:
return VK_PRESENT_MODE_FIFO_KHR;
- case Settings::VSyncMode::FIFORelaxed:
+ case Settings::VSyncMode::FifoRelaxed:
return VK_PRESENT_MODE_FIFO_RELAXED_KHR;
default:
return VK_PRESENT_MODE_FIFO_KHR;
@@ -67,11 +67,11 @@ static constexpr Settings::VSyncMode PresentModeToSetting(VkPresentModeKHR mode)
case VK_PRESENT_MODE_MAILBOX_KHR:
return Settings::VSyncMode::Mailbox;
case VK_PRESENT_MODE_FIFO_KHR:
- return Settings::VSyncMode::FIFO;
+ return Settings::VSyncMode::Fifo;
case VK_PRESENT_MODE_FIFO_RELAXED_KHR:
- return Settings::VSyncMode::FIFORelaxed;
+ return Settings::VSyncMode::FifoRelaxed;
default:
- return Settings::VSyncMode::FIFO;
+ return Settings::VSyncMode::Fifo;
}
}
diff --git a/src/yuzu/configuration/shared_translation.cpp b/src/yuzu/configuration/shared_translation.cpp
index 5d4e29a08..4caa44e1b 100644
--- a/src/yuzu/configuration/shared_translation.cpp
+++ b/src/yuzu/configuration/shared_translation.cpp
@@ -177,9 +177,9 @@ std::unique_ptr<ComboboxTranslationMap> ComboboxEnumeration(QWidget* parent) {
translations->insert(
{typeid(Settings::AstcDecodeMode),
{
- {static_cast<u32>(Settings::AstcDecodeMode::CPU), tr("CPU")},
- {static_cast<u32>(Settings::AstcDecodeMode::GPU), tr("GPU")},
- {static_cast<u32>(Settings::AstcDecodeMode::CPUAsynchronous), tr("CPU Asynchronous")},
+ {static_cast<u32>(Settings::AstcDecodeMode::Cpu), tr("CPU")},
+ {static_cast<u32>(Settings::AstcDecodeMode::Gpu), tr("GPU")},
+ {static_cast<u32>(Settings::AstcDecodeMode::CpuAsynchronous), tr("CPU Asynchronous")},
}});
translations->insert(
{typeid(Settings::AstcRecompression),
@@ -199,24 +199,24 @@ std::unique_ptr<ComboboxTranslationMap> ComboboxEnumeration(QWidget* parent) {
}});
translations->insert({typeid(Settings::ShaderBackend),
{
- {static_cast<u32>(Settings::ShaderBackend::GLSL), tr("GLSL")},
- {static_cast<u32>(Settings::ShaderBackend::GLASM),
+ {static_cast<u32>(Settings::ShaderBackend::Glsl), tr("GLSL")},
+ {static_cast<u32>(Settings::ShaderBackend::Glasm),
tr("GLASM (Assembly Shaders, NVIDIA Only)")},
- {static_cast<u32>(Settings::ShaderBackend::SPIRV),
+ {static_cast<u32>(Settings::ShaderBackend::SpirV),
tr("SPIR-V (Experimental, Mesa Only)")},
}});
- translations->insert({typeid(Settings::GPUAccuracy),
+ translations->insert({typeid(Settings::GpuAccuracy),
{
- {static_cast<u32>(Settings::GPUAccuracy::Normal), tr("Normal")},
- {static_cast<u32>(Settings::GPUAccuracy::High), tr("High")},
- {static_cast<u32>(Settings::GPUAccuracy::Extreme), tr("Extreme")},
+ {static_cast<u32>(Settings::GpuAccuracy::Normal), tr("Normal")},
+ {static_cast<u32>(Settings::GpuAccuracy::High), tr("High")},
+ {static_cast<u32>(Settings::GpuAccuracy::Extreme), tr("Extreme")},
}});
- translations->insert({typeid(Settings::CPUAccuracy),
+ translations->insert({typeid(Settings::CpuAccuracy),
{
- {static_cast<u32>(Settings::CPUAccuracy::Auto), tr("Auto")},
- {static_cast<u32>(Settings::CPUAccuracy::Accurate), tr("Accurate")},
- {static_cast<u32>(Settings::CPUAccuracy::Unsafe), tr("Unsafe")},
- {static_cast<u32>(Settings::CPUAccuracy::Paranoid),
+ {static_cast<u32>(Settings::CpuAccuracy::Auto), tr("Auto")},
+ {static_cast<u32>(Settings::CpuAccuracy::Accurate), tr("Accurate")},
+ {static_cast<u32>(Settings::CpuAccuracy::Unsafe), tr("Unsafe")},
+ {static_cast<u32>(Settings::CpuAccuracy::Paranoid),
tr("Paranoid (disables most optimizations)")},
}});
translations->insert(
@@ -229,8 +229,8 @@ std::unique_ptr<ComboboxTranslationMap> ComboboxEnumeration(QWidget* parent) {
{typeid(Settings::NvdecEmulation),
{
{static_cast<u32>(Settings::NvdecEmulation::Off), tr("No Video Output")},
- {static_cast<u32>(Settings::NvdecEmulation::CPU), tr("CPU Video Decoding")},
- {static_cast<u32>(Settings::NvdecEmulation::GPU), tr("GPU Video Decoding (Default)")},
+ {static_cast<u32>(Settings::NvdecEmulation::Cpu), tr("CPU Video Decoding")},
+ {static_cast<u32>(Settings::NvdecEmulation::Gpu), tr("GPU Video Decoding (Default)")},
}});
translations->insert(
{typeid(Settings::ResolutionSetup),
@@ -313,7 +313,7 @@ std::unique_ptr<ComboboxTranslationMap> ComboboxEnumeration(QWidget* parent) {
translations->insert({typeid(Settings::Region),
{
{static_cast<u32>(Settings::Region::Japan), tr("Japan")},
- {static_cast<u32>(Settings::Region::USA), tr("USA")},
+ {static_cast<u32>(Settings::Region::Usa), tr("USA")},
{static_cast<u32>(Settings::Region::Europe), tr("Europe")},
{static_cast<u32>(Settings::Region::Australia), tr("Australia")},
{static_cast<u32>(Settings::Region::China), tr("China")},
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-27 21:12:29 +0200