diff --git a/UI/frontend-plugins/frontend-tools/captions-handler.hpp b/UI/frontend-plugins/frontend-tools/captions-handler.hpp index a8fd1b3dd..b728ef641 100644 --- a/UI/frontend-plugins/frontend-tools/captions-handler.hpp +++ b/UI/frontend-plugins/frontend-tools/captions-handler.hpp @@ -25,8 +25,8 @@ public: typedef std::function captions_cb; -#define captions_error(s) std::string(obs_module_text("Captions.Error."##s)) -#define CAPTIONS_ERROR_GENERIC_FAIL captions_error("GenericFail") +#define CAPTIONS_ERROR_GENERIC_FAIL \ + std::string(obs_module_text("Captions.Error.GenericFail")) /* ------------------------------------------------------------------------- */ diff --git a/UI/window-basic-settings.cpp b/UI/window-basic-settings.cpp index fe38b3a75..2305dee0e 100644 --- a/UI/window-basic-settings.cpp +++ b/UI/window-basic-settings.cpp @@ -603,20 +603,21 @@ OBSBasicSettings::OBSBasicSettings(QWidget *parent) ui->hideOBSFromCapture = nullptr; } -#define PROCESS_PRIORITY(val) \ - { \ - "Basic.Settings.Advanced.General.ProcessPriority."##val, val \ - } - static struct ProcessPriority { const char *name; const char *val; - } processPriorities[] = {PROCESS_PRIORITY("High"), - PROCESS_PRIORITY("AboveNormal"), - PROCESS_PRIORITY("Normal"), - PROCESS_PRIORITY("BelowNormal"), - PROCESS_PRIORITY("Idle")}; -#undef PROCESS_PRIORITY + } processPriorities[] = { + {"Basic.Settings.Advanced.General.ProcessPriority.High", + "High"}, + {"Basic.Settings.Advanced.General.ProcessPriority.AboveNormal", + "AboveNormal"}, + {"Basic.Settings.Advanced.General.ProcessPriority.Normal", + "Normal"}, + {"Basic.Settings.Advanced.General.ProcessPriority.BelowNormal", + "BelowNormal"}, + {"Basic.Settings.Advanced.General.ProcessPriority.Idle", + "Idle"}, + }; for (ProcessPriority pri : processPriorities) ui->processPriority->addItem(QTStr(pri.name), pri.val);