From 8b363cd37ada8d982840d3e9d7658251fc1993e7 Mon Sep 17 00:00:00 2001 From: Pedro Montes Alcalde Date: Tue, 26 May 2026 00:06:44 -0300 Subject: [PATCH] i18n: Make static_assets a const reference (#3970) --- vita3k/app/src/apps_list.cpp | 2 +- vita3k/gui-qt/include/gui-qt/gui_language.h | 4 ++-- vita3k/gui-qt/src/gui_language.cpp | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/vita3k/app/src/apps_list.cpp b/vita3k/app/src/apps_list.cpp index ca790d335..edfe9bf8c 100644 --- a/vita3k/app/src/apps_list.cpp +++ b/vita3k/app/src/apps_list.cpp @@ -190,7 +190,7 @@ static std::string resolve_existing_path(const EmuEnvState &emuenv, const fs::pa return {}; } - const std::array roots = { + const std::array roots = { emuenv.pref_path, emuenv.default_path, }; diff --git a/vita3k/gui-qt/include/gui-qt/gui_language.h b/vita3k/gui-qt/include/gui-qt/gui_language.h index 531908ad4..9b9f79db0 100644 --- a/vita3k/gui-qt/include/gui-qt/gui_language.h +++ b/vita3k/gui-qt/include/gui-qt/gui_language.h @@ -32,8 +32,8 @@ struct UiLanguageOption { std::string_view native_name; }; -std::span ui_language_options(fs::path &static_assets_path); -bool apply_ui_language(QApplication &app, std::string_view configured_tag, fs::path &static_assets_path); +std::span ui_language_options(const fs::path &static_assets_path); +bool apply_ui_language(QApplication &app, std::string_view configured_tag, const fs::path &static_assets_path); QString language_name(std::string_view tag); } // namespace gui::i18n diff --git a/vita3k/gui-qt/src/gui_language.cpp b/vita3k/gui-qt/src/gui_language.cpp index 5da385aa3..a7c5e7274 100644 --- a/vita3k/gui-qt/src/gui_language.cpp +++ b/vita3k/gui-qt/src/gui_language.cpp @@ -61,14 +61,14 @@ const std::array k_ui_languages = { { std::unique_ptr s_translator; -QStringList translation_search_paths(fs::path &static_assets_path) { +static QStringList translation_search_paths(const fs::path &static_assets_path) { return { QString::fromUtf8((static_assets_path / "translations").string().c_str()), QString::fromUtf8((static_assets_path / "../Resources/translations").string().c_str()), }; } -QSet available_translation_tags(fs::path &static_assets_path) { +static QSet available_translation_tags(const fs::path &static_assets_path) { const QString prefix = QStringLiteral("vita3k_"); QSet tags; @@ -91,7 +91,7 @@ QSet available_translation_tags(fs::path &static_assets_path) { } // namespace -std::span ui_language_options(fs::path &static_assets_path) { +std::span ui_language_options(const fs::path &static_assets_path) { static std::vector available_languages; available_languages.clear(); @@ -123,7 +123,7 @@ QString language_name(std::string_view tag) { return QString::fromUtf8(tag.data(), static_cast(tag.size())); } -bool apply_ui_language(QApplication &app, std::string_view configured_tag, fs::path &static_assets_path) { +bool apply_ui_language(QApplication &app, std::string_view configured_tag, const fs::path &static_assets_path) { if (s_translator) app.removeTranslator(s_translator.get());