From c6d91c552beb055b4d23efb24b9527c1be0bc008 Mon Sep 17 00:00:00 2001
From: lynxnb <niccolo.betto@gmail.com>
Date: Mon, 27 Sep 2021 18:24:07 +0200
Subject: [PATCH] Address CR

---
 app/src/main/cpp/emu_jni.cpp                       |  4 ++--
 app/src/main/cpp/loader_jni.cpp                    |  2 +-
 .../cpp/skyline/common/{languages.h => language.h} |  2 +-
 app/src/main/cpp/skyline/loader/loader.h           |  2 +-
 app/src/main/cpp/skyline/loader/nro.cpp            |  2 +-
 app/src/main/cpp/skyline/loader/nro.h              |  2 +-
 app/src/main/cpp/skyline/loader/nsp.cpp            |  6 +++---
 app/src/main/cpp/skyline/loader/nsp.h              |  2 +-
 app/src/main/cpp/skyline/loader/xci.cpp            |  6 +++---
 app/src/main/cpp/skyline/loader/xci.h              |  2 +-
 app/src/main/cpp/skyline/os.cpp                    |  2 +-
 app/src/main/cpp/skyline/os.h                      |  6 +++---
 .../am/controller/IApplicationFunctions.cpp        |  4 ++--
 .../skyline/services/settings/ISettingsServer.cpp  |  8 ++++----
 app/src/main/cpp/skyline/vfs/nacp.cpp              | 14 +++++++-------
 app/src/main/cpp/skyline/vfs/nacp.h                | 12 ++++++------
 16 files changed, 38 insertions(+), 38 deletions(-)
 rename app/src/main/cpp/skyline/common/{languages.h => language.h} (99%)

diff --git a/app/src/main/cpp/emu_jni.cpp b/app/src/main/cpp/emu_jni.cpp
index 0b557ea4..573e26c8 100644
--- a/app/src/main/cpp/emu_jni.cpp
+++ b/app/src/main/cpp/emu_jni.cpp
@@ -8,7 +8,7 @@
 #include <android/asset_manager_jni.h>
 #include <sys/system_properties.h>
 #include "skyline/common.h"
-#include "skyline/common/languages.h"
+#include "skyline/common/language.h"
 #include "skyline/common/signal.h"
 #include "skyline/common/settings.h"
 #include "skyline/common/trace.h"
@@ -91,7 +91,7 @@ extern "C" JNIEXPORT void Java_emu_skyline_EmulationActivity_executeApplication(
                 settings,
                 std::string(appFilesPath),
                 GetTimeZoneName(),
-                static_cast<skyline::languages::SystemLanguage>(systemLanguage),
+                static_cast<skyline::language::SystemLanguage>(systemLanguage),
                 std::make_shared<skyline::vfs::AndroidAssetFileSystem>(AAssetManager_fromJava(env, assetManager))
             )};
         OsWeak = os;
diff --git a/app/src/main/cpp/loader_jni.cpp b/app/src/main/cpp/loader_jni.cpp
index 718f7e3a..5689e636 100644
--- a/app/src/main/cpp/loader_jni.cpp
+++ b/app/src/main/cpp/loader_jni.cpp
@@ -53,7 +53,7 @@ extern "C" JNIEXPORT jint JNICALL Java_emu_skyline_loader_RomFile_populate(JNIEn
     jfieldID rawIconField{env->GetFieldID(clazz, "rawIcon", "[B")};
 
     if (loader->nacp) {
-        auto language{skyline::languages::GetApplicationLanguage(static_cast<skyline::languages::SystemLanguage>(systemLanguage))};
+        auto language{skyline::language::GetApplicationLanguage(static_cast<skyline::language::SystemLanguage>(systemLanguage))};
         if (((1 << static_cast<skyline::u32>(language)) & loader->nacp->supportedTitleLanguages) == 0)
             language = loader->nacp->GetFirstSupportedTitleLanguage();
 
diff --git a/app/src/main/cpp/skyline/common/languages.h b/app/src/main/cpp/skyline/common/language.h
similarity index 99%
rename from app/src/main/cpp/skyline/common/languages.h
rename to app/src/main/cpp/skyline/common/language.h
index 56c7c51c..4b32e671 100644
--- a/app/src/main/cpp/skyline/common/languages.h
+++ b/app/src/main/cpp/skyline/common/language.h
@@ -13,7 +13,7 @@ namespace skyline {
         constexpr size_t NewLanguageCodeListSize{18}; //!< The size of the post 10.1.0 language code list (was 17 between 4.0.0 - 10.1.0)
     }
 
-    namespace languages {
+    namespace language {
         /**
          * @brief The list of all languages. Entries parameters are language, language code, system language index, application language index and map which holds a macro used for filtering some application languages that don't have a direct corresponding system language
          * @example #define LANG_ENTRY(lang, code, sysIndex, appIndex, map) func(lang, code, sysIndex, appIndex, map) <br> LANGUAGES <br> #undef LANG_ENTRY
diff --git a/app/src/main/cpp/skyline/loader/loader.h b/app/src/main/cpp/skyline/loader/loader.h
index c5ff53bf..ec4bec38 100644
--- a/app/src/main/cpp/skyline/loader/loader.h
+++ b/app/src/main/cpp/skyline/loader/loader.h
@@ -87,7 +87,7 @@ namespace skyline::loader {
 
         virtual ~Loader() = default;
 
-        virtual std::vector<u8> GetIcon(languages::ApplicationLanguage language) {
+        virtual std::vector<u8> GetIcon(language::ApplicationLanguage language) {
             return std::vector<u8>();
         }
 
diff --git a/app/src/main/cpp/skyline/loader/nro.cpp b/app/src/main/cpp/skyline/loader/nro.cpp
index 329e19d9..a1192275 100644
--- a/app/src/main/cpp/skyline/loader/nro.cpp
+++ b/app/src/main/cpp/skyline/loader/nro.cpp
@@ -29,7 +29,7 @@ namespace skyline::loader {
         }
     }
 
-    std::vector<u8> NroLoader::GetIcon(languages::ApplicationLanguage language) {
+    std::vector<u8> NroLoader::GetIcon(language::ApplicationLanguage language) {
         NroAssetSection &segmentHeader{assetHeader.icon};
         std::vector<u8> buffer(segmentHeader.size);
 
diff --git a/app/src/main/cpp/skyline/loader/nro.h b/app/src/main/cpp/skyline/loader/nro.h
index a42d0cbe..a3a431dc 100644
--- a/app/src/main/cpp/skyline/loader/nro.h
+++ b/app/src/main/cpp/skyline/loader/nro.h
@@ -70,7 +70,7 @@ namespace skyline::loader {
       public:
         NroLoader(std::shared_ptr<vfs::Backing> backing);
 
-        std::vector<u8> GetIcon(languages::ApplicationLanguage language) override;
+        std::vector<u8> GetIcon(language::ApplicationLanguage language) override;
 
         void *LoadProcessData(const std::shared_ptr<kernel::type::KProcess> &process, const DeviceState &state) override;
     };
diff --git a/app/src/main/cpp/skyline/loader/nsp.cpp b/app/src/main/cpp/skyline/loader/nsp.cpp
index d74f4103..87063a94 100644
--- a/app/src/main/cpp/skyline/loader/nsp.cpp
+++ b/app/src/main/cpp/skyline/loader/nsp.cpp
@@ -57,15 +57,15 @@ namespace skyline::loader {
         return NcaLoader::LoadExeFs(this, programNca->exeFs, process, state);
     }
 
-    std::vector<u8> NspLoader::GetIcon(languages::ApplicationLanguage language) {
+    std::vector<u8> NspLoader::GetIcon(language::ApplicationLanguage language) {
         if (controlRomFs == nullptr)
             return std::vector<u8>();
 
         std::shared_ptr<vfs::Backing> icon{};
 
-        auto iconName{fmt::format("icon_{}.dat", languages::ToString(language))};
+        auto iconName{fmt::format("icon_{}.dat", language::ToString(language))};
         if (!(icon = controlRomFs->OpenFileUnchecked(iconName, {true, false, false}))) {
-            iconName = fmt::format("icon_{}.dat", languages::ToString(nacp->GetFirstSupportedTitleLanguage()));
+            iconName = fmt::format("icon_{}.dat", language::ToString(nacp->GetFirstSupportedTitleLanguage()));
             icon = controlRomFs->OpenFileUnchecked(iconName, {true, false, false});
         }
 
diff --git a/app/src/main/cpp/skyline/loader/nsp.h b/app/src/main/cpp/skyline/loader/nsp.h
index cdbc1536..3eae1065 100644
--- a/app/src/main/cpp/skyline/loader/nsp.h
+++ b/app/src/main/cpp/skyline/loader/nsp.h
@@ -24,7 +24,7 @@ namespace skyline::loader {
       public:
         NspLoader(const std::shared_ptr<vfs::Backing> &backing, const std::shared_ptr<crypto::KeyStore> &keyStore);
 
-        std::vector<u8> GetIcon(languages::ApplicationLanguage language) override;
+        std::vector<u8> GetIcon(language::ApplicationLanguage language) override;
 
         void *LoadProcessData(const std::shared_ptr<kernel::type::KProcess> &process, const DeviceState &state) override;
     };
diff --git a/app/src/main/cpp/skyline/loader/xci.cpp b/app/src/main/cpp/skyline/loader/xci.cpp
index 61d2a0aa..b49fcc82 100644
--- a/app/src/main/cpp/skyline/loader/xci.cpp
+++ b/app/src/main/cpp/skyline/loader/xci.cpp
@@ -65,15 +65,15 @@ namespace skyline::loader {
         return NcaLoader::LoadExeFs(this, programNca->exeFs, process, state);
     }
 
-    std::vector<u8> XciLoader::GetIcon(languages::ApplicationLanguage language) {
+    std::vector<u8> XciLoader::GetIcon(language::ApplicationLanguage language) {
         if (controlRomFs == nullptr)
             return std::vector<u8>();
 
         std::shared_ptr<vfs::Backing> icon{};
 
-        auto iconName{fmt::format("icon_{}.dat", languages::ToString(language))};
+        auto iconName{fmt::format("icon_{}.dat", language::ToString(language))};
         if (!(icon = controlRomFs->OpenFileUnchecked(iconName, {true, false, false}))) {
-            iconName = fmt::format("icon_{}.dat", languages::ToString(nacp->GetFirstSupportedTitleLanguage()));
+            iconName = fmt::format("icon_{}.dat", language::ToString(nacp->GetFirstSupportedTitleLanguage()));
             icon = controlRomFs->OpenFileUnchecked(iconName, {true, false, false});
         }
 
diff --git a/app/src/main/cpp/skyline/loader/xci.h b/app/src/main/cpp/skyline/loader/xci.h
index 8ae52af8..28b5fb8e 100644
--- a/app/src/main/cpp/skyline/loader/xci.h
+++ b/app/src/main/cpp/skyline/loader/xci.h
@@ -117,7 +117,7 @@ namespace skyline::loader {
       public:
         XciLoader(const std::shared_ptr<vfs::Backing> &backing, const std::shared_ptr<crypto::KeyStore> &keyStore);
 
-        std::vector<u8> GetIcon(languages::ApplicationLanguage language) override;
+        std::vector<u8> GetIcon(language::ApplicationLanguage language) override;
 
         void *LoadProcessData(const std::shared_ptr<kernel::type::KProcess> &process, const DeviceState &state) override;
     };
diff --git a/app/src/main/cpp/skyline/os.cpp b/app/src/main/cpp/skyline/os.cpp
index e3584028..8c052b7f 100644
--- a/app/src/main/cpp/skyline/os.cpp
+++ b/app/src/main/cpp/skyline/os.cpp
@@ -19,7 +19,7 @@ namespace skyline::kernel {
         std::shared_ptr<Settings> &settings,
         std::string appFilesPath,
         std::string deviceTimeZone,
-        languages::SystemLanguage systemLanguage,
+        language::SystemLanguage systemLanguage,
         std::shared_ptr<vfs::FileSystem> assetFileSystem
     ) : state(this, jvmManager, settings, logger),
         appFilesPath(std::move(appFilesPath)),
diff --git a/app/src/main/cpp/skyline/os.h b/app/src/main/cpp/skyline/os.h
index d989e05f..824a756b 100644
--- a/app/src/main/cpp/skyline/os.h
+++ b/app/src/main/cpp/skyline/os.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <common/languages.h>
+#include <common/language.h>
 #include "vfs/filesystem.h"
 #include "loader/loader.h"
 #include "services/serviceman.h"
@@ -19,7 +19,7 @@ namespace skyline::kernel {
         std::string deviceTimeZone; //!< The timezone name (e.g. Europe/London)
         std::shared_ptr<vfs::FileSystem> assetFileSystem; //!< A filesystem to be used for accessing emulator assets (like tzdata)
         service::ServiceManager serviceManager;
-        languages::SystemLanguage systemLanguage;
+        language::SystemLanguage systemLanguage;
 
         /**
          * @param logger An instance of the Logger class
@@ -32,7 +32,7 @@ namespace skyline::kernel {
             std::shared_ptr<Settings> &settings,
             std::string appFilesPath,
             std::string deviceTimeZone,
-            languages::SystemLanguage systemLanguage,
+            language::SystemLanguage systemLanguage,
             std::shared_ptr<vfs::FileSystem> assetFileSystem
         );
 
diff --git a/app/src/main/cpp/skyline/services/am/controller/IApplicationFunctions.cpp b/app/src/main/cpp/skyline/services/am/controller/IApplicationFunctions.cpp
index 94c2426e..bebce448 100644
--- a/app/src/main/cpp/skyline/services/am/controller/IApplicationFunctions.cpp
+++ b/app/src/main/cpp/skyline/services/am/controller/IApplicationFunctions.cpp
@@ -33,13 +33,13 @@ namespace skyline::service::am {
     }
 
     Result IApplicationFunctions::GetDesiredLanguage(type::KSession &session, ipc::IpcRequest &request, ipc::IpcResponse &response) {
-        auto desiredLanguage{languages::GetApplicationLanguage(state.os->systemLanguage)};
+        auto desiredLanguage{language::GetApplicationLanguage(state.os->systemLanguage)};
 
         // In the future we might want to trigger an UI dialog if the user selected languages is not available, for now it will use the first available
         if (((1 << static_cast<u32>(desiredLanguage)) & state.loader->nacp->nacpContents.supportedLanguageFlag) == 0)
             desiredLanguage = state.loader->nacp->GetFirstSupportedLanguage();
 
-        response.Push(languages::GetLanguageCode(languages::GetSystemLanguage(desiredLanguage)));
+        response.Push(language::GetLanguageCode(language::GetSystemLanguage(desiredLanguage)));
         return {};
     }
 
diff --git a/app/src/main/cpp/skyline/services/settings/ISettingsServer.cpp b/app/src/main/cpp/skyline/services/settings/ISettingsServer.cpp
index d094063a..7a59b504 100644
--- a/app/src/main/cpp/skyline/services/settings/ISettingsServer.cpp
+++ b/app/src/main/cpp/skyline/services/settings/ISettingsServer.cpp
@@ -1,25 +1,25 @@
 // SPDX-License-Identifier: MPL-2.0
 // Copyright © 2020 Skyline Team and Contributors (https://github.com/skyline-emu/)
 
-#include <common/languages.h>
+#include <common/language.h>
 #include "ISettingsServer.h"
 
 namespace skyline::service::settings {
     ISettingsServer::ISettingsServer(const DeviceState &state, ServiceManager &manager) : BaseService(state, manager) {}
 
     Result ISettingsServer::GetAvailableLanguageCodes(type::KSession &session, ipc::IpcRequest &request, ipc::IpcResponse &response) {
-        request.outputBuf.at(0).copy_from(span(languages::LanguageCodeList).first(constant::OldLanguageCodeListSize));
+        request.outputBuf.at(0).copy_from(span(language::LanguageCodeList).first(constant::OldLanguageCodeListSize));
         response.Push<i32>(constant::OldLanguageCodeListSize);
         return {};
     }
 
     Result ISettingsServer::MakeLanguageCode(type::KSession &session, ipc::IpcRequest &request, ipc::IpcResponse &response) {
-        response.Push<u64>(languages::LanguageCodeList.at(request.Pop<i32>()));
+        response.Push<u64>(language::LanguageCodeList.at(request.Pop<i32>()));
         return {};
     }
 
     Result ISettingsServer::GetAvailableLanguageCodes2(type::KSession &session, ipc::IpcRequest &request, ipc::IpcResponse &response) {
-        request.outputBuf.at(0).copy_from(languages::LanguageCodeList);
+        request.outputBuf.at(0).copy_from(language::LanguageCodeList);
         response.Push<i32>(constant::NewLanguageCodeListSize);
         return {};
     }
diff --git a/app/src/main/cpp/skyline/vfs/nacp.cpp b/app/src/main/cpp/skyline/vfs/nacp.cpp
index ab04666b..15772b99 100644
--- a/app/src/main/cpp/skyline/vfs/nacp.cpp
+++ b/app/src/main/cpp/skyline/vfs/nacp.cpp
@@ -8,7 +8,7 @@ namespace skyline::vfs {
     NACP::NACP(const std::shared_ptr<vfs::Backing> &backing) {
         nacpContents = backing->Read<NacpData>();
 
-        u32 counter{0};
+        u32 counter{};
         for (auto &entry : nacpContents.titleEntries) {
             if (entry.applicationName.front() != '\0') {
                 supportedTitleLanguages |= (1 << counter);
@@ -17,20 +17,20 @@ namespace skyline::vfs {
         }
     }
 
-    languages::ApplicationLanguage NACP::GetFirstSupportedTitleLanguage() {
-        return static_cast<languages::ApplicationLanguage>(std::countr_zero(supportedTitleLanguages));
+    language::ApplicationLanguage NACP::GetFirstSupportedTitleLanguage() {
+        return static_cast<language::ApplicationLanguage>(std::countr_zero(supportedTitleLanguages));
     }
 
-    languages::ApplicationLanguage NACP::GetFirstSupportedLanguage() {
-        return static_cast<languages::ApplicationLanguage>(std::countr_zero(nacpContents.supportedLanguageFlag));
+    language::ApplicationLanguage NACP::GetFirstSupportedLanguage() {
+        return static_cast<language::ApplicationLanguage>(std::countr_zero(nacpContents.supportedLanguageFlag));
     }
 
-    std::string NACP::GetApplicationName(languages::ApplicationLanguage language) {
+    std::string NACP::GetApplicationName(language::ApplicationLanguage language) {
         auto applicationName{span(nacpContents.titleEntries.at(static_cast<size_t>(language)).applicationName)};
         return std::string(applicationName.as_string(true));
     }
 
-    std::string NACP::GetApplicationPublisher(languages::ApplicationLanguage language) {
+    std::string NACP::GetApplicationPublisher(language::ApplicationLanguage language) {
         auto applicationPublisher{span(nacpContents.titleEntries.at(static_cast<size_t>(language)).applicationPublisher)};
         return std::string(applicationPublisher.as_string(true));
     }
diff --git a/app/src/main/cpp/skyline/vfs/nacp.h b/app/src/main/cpp/skyline/vfs/nacp.h
index 08521f6b..0b144583 100644
--- a/app/src/main/cpp/skyline/vfs/nacp.h
+++ b/app/src/main/cpp/skyline/vfs/nacp.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <common/languages.h>
+#include <common/language.h>
 #include "backing.h"
 
 namespace skyline::vfs {
@@ -35,16 +35,16 @@ namespace skyline::vfs {
         } nacpContents{};
         static_assert(sizeof(NacpData) == 0x4000);
 
-        u32 supportedTitleLanguages{0}; //<! A bitmask containing the available title entry languages and game icons
+        u32 supportedTitleLanguages{}; //<! A bitmask containing the available title entry languages and game icons
 
         NACP(const std::shared_ptr<vfs::Backing> &backing);
 
-        languages::ApplicationLanguage GetFirstSupportedTitleLanguage();
+        language::ApplicationLanguage GetFirstSupportedTitleLanguage();
 
-        languages::ApplicationLanguage GetFirstSupportedLanguage();
+        language::ApplicationLanguage GetFirstSupportedLanguage();
 
-        std::string GetApplicationName(languages::ApplicationLanguage language);
+        std::string GetApplicationName(language::ApplicationLanguage language);
 
-        std::string GetApplicationPublisher(languages::ApplicationLanguage language);
+        std::string GetApplicationPublisher(language::ApplicationLanguage language);
     };
 }