diff --git a/Cool b/Cool index bf5901d2..b8d8a1fe 160000 --- a/Cool +++ b/Cool @@ -1 +1 @@ -Subproject commit bf5901d263cf8393a96ab8255cc40430c302ec0b +Subproject commit b8d8a1fe97ca43acfeb5fa34e61ec5f230c0f260 diff --git a/src/Module_Nodes/NodesCategoryConfig.cpp b/src/Module_Nodes/NodesCategoryConfig.cpp index a9e3afe6..b9777831 100644 --- a/src/Module_Nodes/NodesCategoryConfig.cpp +++ b/src/Module_Nodes/NodesCategoryConfig.cpp @@ -11,12 +11,12 @@ namespace Lab { void NodesCategoryConfig::save_to_json() const { - do_serialize(*this, _path_to_json); + do_save(*this, _path_to_json); } void NodesCategoryConfig::load_from_json() { - do_deserialize(*this, _path_to_json) + do_load(*this, _path_to_json) .send_error_if_any([&](std::string const& message) { return Cool::Message{ .category = "Nodes Category", diff --git a/src/ProjectManager/Command_OpenProject.cpp b/src/ProjectManager/Command_OpenProject.cpp index 12d11f91..dcc58760 100644 --- a/src/ProjectManager/Command_OpenProject.cpp +++ b/src/ProjectManager/Command_OpenProject.cpp @@ -10,7 +10,7 @@ namespace Lab { void Command_OpenProject::execute(CommandExecutionContext_Ref const& ctx) const { auto project = Project{}; - auto const error = do_deserialize(project, path); + auto const error = do_load(project, path); if (error) { error.send_error_if_any( diff --git a/src/ProjectManager/internal_utils.cpp b/src/ProjectManager/internal_utils.cpp index db49ae8d..b091ba16 100644 --- a/src/ProjectManager/internal_utils.cpp +++ b/src/ProjectManager/internal_utils.cpp @@ -52,7 +52,7 @@ void set_current_project(CommandExecutionContext_Ref const& ctx, Project&& proje auto save_project_to(CommandExecutionContext_Ref const& ctx, std::filesystem::path const& path) -> bool { - bool const success = do_serialize(ctx.project(), path); + bool const success = do_save(ctx.project(), path); if (success) { if (!ctx.project_path().has_value() && path != Path::untitled_project()) diff --git a/src/Serialization/SNodesCategoryConfig.h b/src/Serialization/SNodesCategoryConfig.h index 74ee077a..40527854 100644 --- a/src/Serialization/SNodesCategoryConfig.h +++ b/src/Serialization/SNodesCategoryConfig.h @@ -5,7 +5,7 @@ namespace Lab { -auto do_serialize(NodesCategoryConfig const&, std::filesystem::path const&) -> bool; -auto do_deserialize(NodesCategoryConfig&, std::filesystem::path const&) -> Cool::OptionalErrorMessage; +auto do_save(NodesCategoryConfig const&, std::filesystem::path const&) -> bool; +auto do_load(NodesCategoryConfig&, std::filesystem::path const&) -> Cool::OptionalErrorMessage; } // namespace Lab \ No newline at end of file diff --git a/src/Serialization/SProject.h b/src/Serialization/SProject.h index 9d1b99d5..6ca95525 100644 --- a/src/Serialization/SProject.h +++ b/src/Serialization/SProject.h @@ -5,7 +5,7 @@ namespace Lab { -auto do_serialize(Project const&, std::filesystem::path const&) -> bool; -auto do_deserialize(Project&, std::filesystem::path const&) -> Cool::OptionalErrorMessage; +auto do_save(Project const&, std::filesystem::path const&) -> bool; +auto do_load(Project&, std::filesystem::path const&) -> Cool::OptionalErrorMessage; } // namespace Lab \ No newline at end of file diff --git a/src/Serialization/impl.cpp b/src/Serialization/impl.cpp index ff7ea3f5..25dd2972 100644 --- a/src/Serialization/impl.cpp +++ b/src/Serialization/impl.cpp @@ -16,20 +16,20 @@ namespace Lab { -auto do_serialize(Project const& project, std::filesystem::path const& path) -> bool +auto do_save(Project const& project, std::filesystem::path const& path) -> bool { return Cool::Serialization::save(project, path, "Project"); } -auto do_deserialize(Project& project, std::filesystem::path const& path) -> Cool::OptionalErrorMessage +auto do_load(Project& project, std::filesystem::path const& path) -> Cool::OptionalErrorMessage { return Cool::Serialization::load(project, path); } -auto do_serialize(NodesCategoryConfig const& config, std::filesystem::path const& path) -> bool +auto do_save(NodesCategoryConfig const& config, std::filesystem::path const& path) -> bool { return Cool::Serialization::save(config, path); } -auto do_deserialize(NodesCategoryConfig& config, std::filesystem::path const& path) -> Cool::OptionalErrorMessage +auto do_load(NodesCategoryConfig& config, std::filesystem::path const& path) -> Cool::OptionalErrorMessage { return Cool::Serialization::load(config, path); }