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

This reverts commit c32ac3b3c1.

src/core/core.cpp

@@ -301,7 +301,7 @@ struct System::Impl {
 
         LOG_DEBUG(Core, "Initialized OK");
 
-        return SystemResultStatus::SystemSuccess;
+        return SystemResultStatus::Success;
     }
 
     SystemResultStatus Load(System& system, Frontend::EmuWindow& emu_window,
@@ -347,7 +347,7 @@ struct System::Impl {
 
         // Set up the rest of the system.
         SystemResultStatus init_result{SetupForApplicationProcess(system, emu_window)};
-        if (init_result != SystemResultStatus::SystemSuccess) {
+        if (init_result != SystemResultStatus::Success) {
             LOG_CRITICAL(Core, "Failed to initialize system (Error {})!",
                          static_cast<int>(init_result));
             ShutdownMainProcess();
@@ -394,7 +394,7 @@ struct System::Impl {
             room_member->SendGameInfo(game_info);
         }
 
-        status = SystemResultStatus::SystemSuccess;
+        status = SystemResultStatus::Success;
         return status;
     }
 
@@ -543,7 +543,7 @@ struct System::Impl {
     /// Debugger
     std::unique_ptr<Core::Debugger> debugger;
 
-    SystemResultStatus status = SystemResultStatus::SystemSuccess;
+    SystemResultStatus status = SystemResultStatus::Success;
     std::string status_details = "";
 
     std::unique_ptr<Core::PerfStats> perf_stats;

src/core/core.h

@@ -131,7 +131,7 @@ FileSys::VirtualFile GetGameFileFromPath(const FileSys::VirtualFilesystem& vfs,
 
 /// Enumeration representing the return values of the System Initialize and Load process.
 enum class SystemResultStatus : u32 {
-    SystemSuccess,       ///< Succeeded
+    Success,             ///< Succeeded
     ErrorNotInitialized, ///< Error trying to use core prior to initialization
     ErrorGetLoader,      ///< Error finding the correct application loader
     ErrorSystemFiles,    ///< Error in finding system files

src/core/file_sys/registered_cache.cpp

@@ -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;
 }
 

src/core/file_sys/registered_cache.h

@@ -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,

src/core/loader/loader.h

@@ -67,7 +67,7 @@ std::string GetFileTypeString(FileType type);
 
 /// Return type for functions in Loader namespace
 enum class ResultStatus : u16 {
-    LoaderSuccess,
+    Success,
     ErrorAlreadyLoaded,
     ErrorNotImplemented,
     ErrorNotInitialized,