From c9dca4cebdac4123b00c1c92dbb6f1f6b5ccae4b Mon Sep 17 00:00:00 2001 From: MrSimbax Date: Sat, 11 Sep 2021 13:40:22 +0200 Subject: [PATCH] Rename SystemDialogType::ERROR to ERROR_MSG Unfortunately, the ERROR name collides with a preprocessor definition in windows.h --- src/app/app.cpp | 2 +- src/app/main.cpp | 4 ++-- src/app/signal_handlers.cpp | 2 +- src/common/system/system.cpp | 6 +++--- src/common/system/system.h | 2 +- src/common/system/system_linux.cpp | 2 +- src/common/system/system_windows.cpp | 6 +----- 7 files changed, 10 insertions(+), 14 deletions(-) diff --git a/src/app/app.cpp b/src/app/app.cpp index a30e0ba7..9abd16f8 100644 --- a/src/app/app.cpp +++ b/src/app/app.cpp @@ -662,7 +662,7 @@ bool CApplication::Create() { GetLogger()->Error("Unknown graphics device: %s\n", graphics.c_str()); GetLogger()->Info("Changing to default device\n"); - m_systemUtils->SystemDialog(SystemDialogType::ERROR, "Graphics initialization error", "You have selected invalid graphics device with -graphics switch. Game will use default OpenGL device instead."); + m_systemUtils->SystemDialog(SystemDialogType::ERROR_MSG, "Graphics initialization error", "You have selected invalid graphics device with -graphics switch. Game will use default OpenGL device instead."); m_device = Gfx::CreateDevice(m_deviceConfig, "opengl"); } } diff --git a/src/app/main.cpp b/src/app/main.cpp index 002bd4f8..7c6173b0 100644 --- a/src/app/main.cpp +++ b/src/app/main.cpp @@ -177,7 +177,7 @@ int main(int argc, char *argv[]) ParseArgsStatus status = app.ParseArguments(argc, argv); if (status == PARSE_ARGS_FAIL) { - systemUtils->SystemDialog(SystemDialogType::ERROR, "COLOBOT - Fatal Error", "Invalid commandline arguments!\n"); + systemUtils->SystemDialog(SystemDialogType::ERROR_MSG, "COLOBOT - Fatal Error", "Invalid commandline arguments!\n"); return app.GetExitCode(); } else if (status == PARSE_ARGS_HELP) @@ -190,7 +190,7 @@ int main(int argc, char *argv[]) code = app.GetExitCode(); if (code != 0 && !app.GetErrorMessage().empty()) { - systemUtils->SystemDialog(SystemDialogType::ERROR, "COLOBOT - Fatal Error", app.GetErrorMessage()); + systemUtils->SystemDialog(SystemDialogType::ERROR_MSG, "COLOBOT - Fatal Error", app.GetErrorMessage()); } logger.Info("Didn't run main loop. Exiting with code %d\n", code); return code; diff --git a/src/app/signal_handlers.cpp b/src/app/signal_handlers.cpp index 99c04d5d..f0e9f95e 100644 --- a/src/app/signal_handlers.cpp +++ b/src/app/signal_handlers.cpp @@ -162,7 +162,7 @@ void CSignalHandlers::ReportError(const std::string& errorMessage) std::cerr << std::endl << msg.str() << std::endl; - m_systemUtils->SystemDialog(SystemDialogType::ERROR, "Unhandled exception occurred!", msg.str()); + m_systemUtils->SystemDialog(SystemDialogType::ERROR_MSG, "Unhandled exception occurred!", msg.str()); if (canSave && !triedSaving) { diff --git a/src/common/system/system.cpp b/src/common/system/system.cpp index b21015d3..42242565 100644 --- a/src/common/system/system.cpp +++ b/src/common/system/system.cpp @@ -67,7 +67,7 @@ SystemDialogResult CSystemUtils::ConsoleSystemDialog(SystemDialogType type, cons case SystemDialogType::WARNING: std::cout << "WARNING:"; break; - case SystemDialogType::ERROR: + case SystemDialogType::ERROR_MSG: std::cout << "ERROR: "; break; case SystemDialogType::YES_NO: @@ -89,7 +89,7 @@ SystemDialogResult CSystemUtils::ConsoleSystemDialog(SystemDialogType type, cons { case SystemDialogType::INFO: case SystemDialogType::WARNING: - case SystemDialogType::ERROR: + case SystemDialogType::ERROR_MSG: std::cout << "Press ENTER to continue"; break; @@ -108,7 +108,7 @@ SystemDialogResult CSystemUtils::ConsoleSystemDialog(SystemDialogType type, cons { case SystemDialogType::INFO: case SystemDialogType::WARNING: - case SystemDialogType::ERROR: + case SystemDialogType::ERROR_MSG: done = true; break; diff --git a/src/common/system/system.h b/src/common/system/system.h index b2399cf5..d5bf3d99 100644 --- a/src/common/system/system.h +++ b/src/common/system/system.h @@ -43,7 +43,7 @@ enum class SystemDialogType //! Warning message WARNING, //! Error message - ERROR, + ERROR_MSG, // windows.h defines ERROR which collides with the "ERROR" enum name //! Yes/No question YES_NO, //! Ok/Cancel question diff --git a/src/common/system/system_linux.cpp b/src/common/system/system_linux.cpp index a5ef14c0..0f9efeee 100644 --- a/src/common/system/system_linux.cpp +++ b/src/common/system/system_linux.cpp @@ -53,7 +53,7 @@ SystemDialogResult CSystemUtilsLinux::SystemDialog(SystemDialogType type, const case SystemDialogType::WARNING: options = "--warning"; break; - case SystemDialogType::ERROR: + case SystemDialogType::ERROR_MSG: options = "--error"; break; case SystemDialogType::YES_NO: diff --git a/src/common/system/system_windows.cpp b/src/common/system/system_windows.cpp index 3f2bb171..773bd62d 100644 --- a/src/common/system/system_windows.cpp +++ b/src/common/system/system_windows.cpp @@ -44,11 +44,7 @@ SystemDialogResult CSystemUtilsWindows::SystemDialog(SystemDialogType type, cons case SystemDialogType::WARNING: windowsType = MB_ICONWARNING|MB_OK; break; -// windows.h defines ERROR which collides with the enum name -#pragma push_macro("ERROR") -#undef ERROR - case SystemDialogType::ERROR: -#pragma pop_macro("ERROR") + case SystemDialogType::ERROR_MSG: windowsType = MB_ICONERROR|MB_OK; break; case SystemDialogType::YES_NO: