From 266e4705093cd2e29b796e2e70bb7da7e4faf916 Mon Sep 17 00:00:00 2001 From: WarmUpTill <19472752+WarmUpTill@users.noreply.github.com> Date: Tue, 9 Dec 2025 18:45:18 +0100 Subject: [PATCH] Remove unused function --- lib/macro/macro-helpers.cpp | 5 ----- lib/macro/macro-helpers.hpp | 6 ++---- lib/macro/macro.cpp | 4 ++-- 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/lib/macro/macro-helpers.cpp b/lib/macro/macro-helpers.cpp index 2edb5818..ce6a0b20 100644 --- a/lib/macro/macro-helpers.cpp +++ b/lib/macro/macro-helpers.cpp @@ -117,11 +117,6 @@ GetMacroConditions(Macro *macro) return macro->Conditions(); } -std::string_view GetSceneSwitchActionId() -{ - return MacroAction::GetDefaultID(); -} - std::condition_variable &GetMacroWaitCV() { static std::condition_variable cv; diff --git a/lib/macro/macro-helpers.hpp b/lib/macro/macro-helpers.hpp index cc61d2f7..21a4881a 100644 --- a/lib/macro/macro-helpers.hpp +++ b/lib/macro/macro-helpers.hpp @@ -20,6 +20,8 @@ class Macro; class MacroAction; class MacroCondition; +static const int macro_func = 10; + EXPORT std::deque> &GetTopLevelMacros(); std::deque> &GetTemporaryMacros(); EXPORT std::deque> GetAllMacros(); @@ -35,10 +37,6 @@ GetMacroElseActions(Macro *); EXPORT std::optional>> GetMacroConditions(Macro *); -std::string_view GetSceneSwitchActionId(); - -constexpr auto macro_func = 10; - EXPORT std::condition_variable &GetMacroWaitCV(); EXPORT std::condition_variable &GetMacroTransitionCV(); diff --git a/lib/macro/macro.cpp b/lib/macro/macro.cpp index e3f07044..a1018edf 100644 --- a/lib/macro/macro.cpp +++ b/lib/macro/macro.cpp @@ -948,12 +948,12 @@ bool Macro::PostLoad() bool Macro::SwitchesScene() const { for (const auto &a : _actions) { - if (a->GetId() == GetSceneSwitchActionId()) { + if (a->GetId() == MacroAction::GetDefaultID()) { return true; } } for (const auto &a : _elseActions) { - if (a->GetId() == GetSceneSwitchActionId()) { + if (a->GetId() == MacroAction::GetDefaultID()) { return true; } }