pacnpal/citron
1
0
Fork 0
mirror of https://git.eden-emu.dev/archive/citron synced 2026-03-30 16:08:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

Revert "fix: resolve X11 macro conflicts with enum values and Qt constants"

Browse Source 
This reverts commit c32ac3b3c1.
This commit is contained in:
Zephyron
2025-09-14 20:15:29 +10:00
parent c32ac3b3c1
commit 12c3e4b92c
13 changed files with 41 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/frontend_common/content_manager.h
View File

@@ -21,14 +21,14 @@
namespace ContentManager {
enum class InstallResult {
InstallSuccess,
Success,
Overwrite,
Failure,
BaseInstallAttempted,
};
enum class GameVerificationResult {
VerificationSuccess,
Success,
Failed,
NotImplemented,
};
@@ -169,7 +169,7 @@ inline InstallResult InstallNSP(Core::System& system, FileSys::VfsFilesystem& vf
return InstallResult::Failure;
}
if (nsp->GetStatus() != Loader::ResultStatus::LoaderSuccess) {
if (nsp->GetStatus() != Loader::ResultStatus::Success) {
return InstallResult::Failure;
}
const auto res =
@@ -229,7 +229,7 @@ inline InstallResult InstallNCA(FileSys::VfsFilesystem& vfs, const std::string&
const auto id = nca->GetStatus();
// Game updates necessary are missing base RomFS
if (id != Loader::ResultStatus::LoaderSuccess &&
if (id != Loader::ResultStatus::Success &&
id != Loader::ResultStatus::ErrorMissingBKTRBaseRomFS) {
return InstallResult::Failure;
}
@@ -306,14 +306,14 @@ inline std::vector<std::string> VerifyInstalledContents(
if (cancelled) {
break;
}
if (status != Loader::ResultStatus::LoaderSuccess) {
if (status != Loader::ResultStatus::Success) {
FileSys::NCA nca(nca_file);
const auto title_id = nca.GetTitleId();
std::string title_name = "unknown";
const auto control = provider.GetEntry(FileSys::GetBaseTitleID(title_id),
FileSys::ContentRecordType::Control);
if (control && control->GetStatus() == Loader::ResultStatus::LoaderSuccess) {
if (control && control->GetStatus() == Loader::ResultStatus::Success) {
const FileSys::PatchManager pm{title_id, system.GetFileSystemController(),
provider};
const auto [nacp, logo] = pm.ParseControlNCA(*control);
@@ -367,7 +367,7 @@ inline GameVerificationResult VerifyGameContents(
if (status == Loader::ResultStatus::ErrorIntegrityVerificationFailed) {
return GameVerificationResult::Failed;
}
return GameVerificationResult::VerificationSuccess;
return GameVerificationResult::Success;
}
/**