From 64a6dbcfdb89a5f57d93d47a2be0c741dda4662d Mon Sep 17 00:00:00 2001 From: rtk0c Date: Sun, 15 Aug 2021 09:17:02 -0700 Subject: Fix issues and cleanup - Fix compile error on MSVC where is not included properly - Fix creating a workflow actually saves to the templates/ directory - Fix renaming assets are not saved to disk - TODO ser/deser still not working - Cleanup AssetList::* pure virtual setup (fewer splits) --- core/src/Model/Template/Template.hpp | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) (limited to 'core/src/Model/Template/Template.hpp') diff --git a/core/src/Model/Template/Template.hpp b/core/src/Model/Template/Template.hpp index 7d43130..30fdc75 100644 --- a/core/src/Model/Template/Template.hpp +++ b/core/src/Model/Template/Template.hpp @@ -31,7 +31,7 @@ public: static bool IsInstance(const Template* tmpl); Template(Kind kind); - virtual ~Template() = default; + ~Template() override = default; Kind GetKind() const; @@ -57,20 +57,17 @@ public: using AssetListTyped::AssetListTyped; protected: - virtual void DiscoverFiles(const std::function& callback) const override; + void DiscoverFiles(const std::function& callback) const override; - virtual std::string RetrieveNameFromFile(const std::filesystem::path& file) const override; - virtual uuids::uuid RetrieveUuidFromFile(const std::filesystem::path& file) const override; - virtual std::filesystem::path RetrievePathFromAsset(const SavedAsset& asset) const override; + std::string RetrieveNameFromFile(const std::filesystem::path& file) const override; + uuids::uuid RetrieveUuidFromFile(const std::filesystem::path& file) const override; + std::filesystem::path RetrievePathFromAsset(const SavedAsset& asset) const override; - virtual void SaveEmptyInstance(const SavedAsset& asset) const override; - virtual Template* CreateEmptyInstance(const SavedAsset& diskForm) const override; + bool SaveInstance(const SavedAsset& assetInfo, const Asset* asset) const override; + Template* LoadInstance(const SavedAsset& assetInfo) const override; + Template* CreateInstance(const SavedAsset& assetInfo) const override; + bool RenameInstanceOnDisk(const SavedAsset& assetInfo, std::string_view oldName) const override; - virtual Template* LoadImpl(const SavedAsset& diskForm) const override; - - virtual void DisplayAssetCreator(ListState& state) override; - - virtual void SetupDetailsTable(const char* tableId) const override; - virtual void DrawBigIcon(ListState& state, const SavedAsset& asset) const override; - virtual void DrawDetailsTableRow(ListState& state, const SavedAsset& asset) const override; + void DisplayAssetCreator(ListState& state) override; + void DisplayDetailsTable(ListState& state) const override; }; -- cgit v1.2.3-70-g09d2