pacnpal/citron
1
0
Fork 0
mirror of https://git.eden-emu.dev/archive/citron synced 2026-03-28 12:29:34 -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

12
src/core/file_sys/registered_cache.cpp
View File

@@ -206,7 +206,7 @@ bool PlaceholderCache::Register(RegisteredCache* cache, const NcaID& placeholder
const auto res = cache->RawInstallNCA(NCA{file}, &VfsRawCopy, false, install);
if (res != InstallResult::InstallSuccess)
if (res != InstallResult::Success)
return false;
return Delete(placeholder);
@@ -609,7 +609,7 @@ InstallResult RegisteredCache::InstallEntry(const NSP& nsp, bool overwrite_if_ex
// Install Metadata File
const auto meta_result = RawInstallNCA(**meta_iter, copy, overwrite_if_exists, meta_id_data);
if (meta_result != InstallResult::InstallSuccess) {
if (meta_result != InstallResult::Success) {
return meta_result;
}
@@ -628,13 +628,13 @@ InstallResult RegisteredCache::InstallEntry(const NSP& nsp, bool overwrite_if_ex
// Create fake cnmt for patch to multiprogram application
const auto sub_nca_result =
InstallEntry(*nca, cnmt.GetHeader(), record, overwrite_if_exists, copy);
if (sub_nca_result != InstallResult::InstallSuccess) {
if (sub_nca_result != InstallResult::Success) {
return sub_nca_result;
}
continue;
}
const auto nca_result = RawInstallNCA(*nca, copy, overwrite_if_exists, record.nca_id);
if (nca_result != InstallResult::InstallSuccess) {
if (nca_result != InstallResult::Success) {
return nca_result;
}
}
@@ -643,7 +643,7 @@ InstallResult RegisteredCache::InstallEntry(const NSP& nsp, bool overwrite_if_ex
if (result) {
return InstallResult::OverwriteExisting;
}
return InstallResult::InstallSuccess;
return InstallResult::Success;
}
InstallResult RegisteredCache::InstallEntry(const NCA& nca, TitleType type,
@@ -798,7 +798,7 @@ InstallResult RegisteredCache::RawInstallNCA(const NCA& nca, const VfsCopyFuncti
if (out == nullptr) {
return InstallResult::ErrorCopyFailed;
}
return copy(in, out, VFS_RC_LARGE_COPY_BLOCK) ? InstallResult::InstallSuccess
return copy(in, out, VFS_RC_LARGE_COPY_BLOCK) ? InstallResult::Success
: InstallResult::ErrorCopyFailed;
}

2
src/core/file_sys/registered_cache.h
View File

@@ -33,7 +33,7 @@ using ContentProviderParsingFunction = std::function<VirtualFile(const VirtualFi
using VfsCopyFunction = std::function<bool(const VirtualFile&, const VirtualFile&, size_t)>;
enum class InstallResult {
InstallSuccess,
Success,
OverwriteExisting,
ErrorAlreadyExists,
ErrorCopyFailed,