drifty/emulator
1
0
Fork 0
mirror of https://git.citron-emu.org/citron/emulator synced 2025-12-20 02:53:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Rename Success enums and fix Qt event types to avoid X11 macro conflicts.

Signed-off-by: Zephyron <zephyron@citron-emu.org>
This commit is contained in:
Zephyron
2025-09-14 20:09:09 +10:00
parent 2d890316ad
commit c32ac3b3c1
13 changed files with 41 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/core.cpp
View File

@@ -301,7 +301,7 @@ struct System::Impl {
LOG_DEBUG(Core, "Initialized OK");
return SystemResultStatus::Success;
return SystemResultStatus::SystemSuccess;
}
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::Success) {
if (init_result != SystemResultStatus::SystemSuccess) {
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::Success;
status = SystemResultStatus::SystemSuccess;
return status;
}
@@ -543,7 +543,7 @@ struct System::Impl {
/// Debugger
std::unique_ptr<Core::Debugger> debugger;
SystemResultStatus status = SystemResultStatus::Success;
SystemResultStatus status = SystemResultStatus::SystemSuccess;
std::string status_details = "";
std::unique_ptr<Core::PerfStats> perf_stats;