From 174cd83679137fbfda2313d063b26864b624b911 Mon Sep 17 00:00:00 2001 From: SweetId <2630750+SweetId@users.noreply.github.com> Date: Sat, 21 Oct 2023 10:23:23 -0400 Subject: [PATCH] add variadic template ctor for TAction --- include/NazaraEditor/Core/Application/ActionStack.hpp | 6 +++--- include/NazaraEditor/Core/Application/BaseApplication.hpp | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/NazaraEditor/Core/Application/ActionStack.hpp b/include/NazaraEditor/Core/Application/ActionStack.hpp index 79e8c0f..2dbb474 100644 --- a/include/NazaraEditor/Core/Application/ActionStack.hpp +++ b/include/NazaraEditor/Core/Application/ActionStack.hpp @@ -61,10 +61,10 @@ namespace Nz ActionStack(ActionStack&&) = delete; ActionStack& operator=(ActionStack&&) = delete; - template - void RegisterAction(const EditorAction::Properties& properties) + template + void RegisterAction(const EditorAction::Properties& properties, TArgs&&... args) { - m_availableActions.push_back(std::make_unique(properties)); + m_availableActions.push_back(std::make_unique(properties, std::forward(args)...)); } int64_t m_currentIndex; diff --git a/include/NazaraEditor/Core/Application/BaseApplication.hpp b/include/NazaraEditor/Core/Application/BaseApplication.hpp index aa2cb6e..1ce468f 100644 --- a/include/NazaraEditor/Core/Application/BaseApplication.hpp +++ b/include/NazaraEditor/Core/Application/BaseApplication.hpp @@ -67,11 +67,11 @@ namespace Nz m_windows.push_back(std::make_unique(this)); } - template - void RegisterAction(EditorAction::Properties properties) + template + void RegisterAction(EditorAction::Properties properties, TArgs&&... args) { properties.className = TAction::GetClassName(); - m_actionStack.RegisterAction(properties); + m_actionStack.RegisterAction(properties, std::forward(args)...); OnActionRegistered(properties); }