From 7eafd17514b4173f51b8c465024d17e09028c820 Mon Sep 17 00:00:00 2001 From: Albin Johansson Date: Sat, 28 Oct 2023 01:19:28 +0200 Subject: [PATCH] Put editor stuff in separate namespace --- modules/editor/inc/tactile/editor/cmd/command.hpp | 4 ++-- modules/editor/inc/tactile/editor/cmd/command_stack.hpp | 4 ++-- modules/editor/src/tactile/editor/cmd/command_stack.cpp | 4 ++-- modules/editor/test/cmd/command_stack_test.cpp | 1 + 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/modules/editor/inc/tactile/editor/cmd/command.hpp b/modules/editor/inc/tactile/editor/cmd/command.hpp index 668c9c5988..0714eab2f8 100644 --- a/modules/editor/inc/tactile/editor/cmd/command.hpp +++ b/modules/editor/inc/tactile/editor/cmd/command.hpp @@ -5,7 +5,7 @@ #include "tactile/core/prelude.hpp" #include "tactile/editor/api.hpp" -namespace tactile { +namespace tactile::editor { class TACTILE_EDITOR_API ICommand { public: @@ -38,4 +38,4 @@ class TACTILE_EDITOR_API ICommand { } }; -} // namespace tactile \ No newline at end of file +} // namespace tactile::editor diff --git a/modules/editor/inc/tactile/editor/cmd/command_stack.hpp b/modules/editor/inc/tactile/editor/cmd/command_stack.hpp index 260e36cc5b..c20456d569 100644 --- a/modules/editor/inc/tactile/editor/cmd/command_stack.hpp +++ b/modules/editor/inc/tactile/editor/cmd/command_stack.hpp @@ -13,7 +13,7 @@ #include "tactile/editor/api.hpp" #include "tactile/editor/cmd/command.hpp" -namespace tactile { +namespace tactile::editor { /** * \brief Manages a history of commands. @@ -186,4 +186,4 @@ class CommandStack final { [[nodiscard]] auto _get_next_command_index() const -> usize; }; -} // namespace tactile +} // namespace tactile::editor diff --git a/modules/editor/src/tactile/editor/cmd/command_stack.cpp b/modules/editor/src/tactile/editor/cmd/command_stack.cpp index f50c4ad2ee..4b30516cd6 100644 --- a/modules/editor/src/tactile/editor/cmd/command_stack.cpp +++ b/modules/editor/src/tactile/editor/cmd/command_stack.cpp @@ -4,7 +4,7 @@ #include "tactile/core/debug/assert.hpp" -namespace tactile { +namespace tactile::editor { CommandStack::CommandStack(const usize capacity) : mCapacity {capacity} @@ -164,4 +164,4 @@ auto CommandStack::_get_next_command_index() const -> usize return mCurrentIndex.has_value() ? (*mCurrentIndex + 1) : 0; } -} // namespace tactile +} // namespace tactile::editor diff --git a/modules/editor/test/cmd/command_stack_test.cpp b/modules/editor/test/cmd/command_stack_test.cpp index a39de4735c..99881ef1b2 100644 --- a/modules/editor/test/cmd/command_stack_test.cpp +++ b/modules/editor/test/cmd/command_stack_test.cpp @@ -5,6 +5,7 @@ #include using namespace tactile; +using namespace tactile::editor; using namespace tactile::int_literals; namespace {