From a64b11d6a42835b7cf372cdb2801a5a58c686882 Mon Sep 17 00:00:00 2001 From: Zero Fanker Date: Tue, 30 Apr 2024 22:27:53 -0400 Subject: [PATCH] resolved compile issue . --- MissionEditor/ViewObjects.h | 40 ++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/MissionEditor/ViewObjects.h b/MissionEditor/ViewObjects.h index 05ad06b..8c22193 100644 --- a/MissionEditor/ViewObjects.h +++ b/MissionEditor/ViewObjects.h @@ -98,23 +98,6 @@ inline bool operator&(TreeViewTechnoType lhs, TechnoTypeMask rhs) return rhs & static_cast(MAKE_MASK(lhs)); } -class TreeViewCategoryHandler { - using categoryNodeMap = std::unordered_map; - -public: - TreeViewCategoryHandler(CTreeCtrl& tree, HTREEITEM parentNode) : - tree(tree), - parentNode(parentNode) - {} - - HTREEITEM GetOrAdd(const CString& name); - -private: - CTreeCtrl& tree; - HTREEITEM parentNode; - categoryNodeMap structhouses; -}; - class GuessSideHelper { public: GuessSideHelper(const TreeViewBuilder& builder) : @@ -134,15 +117,14 @@ private: class TreeViewBuilder { using houseMap = std::unordered_map; - +public: struct CatetoryDefinition { CString CategoryName;// or side name TechnoTypeMask CategoryMask; }; - using mapSideNodeInfo = std::unordered_map; + using mapSideNodeInfo = std::map; -public: TreeViewBuilder(CTreeCtrl& tree, const CIniFile& ini, const IgnoreSet& ignoreSet, @@ -179,6 +161,24 @@ private: const HTREEITEM* rootitems; }; +class TreeViewCategoryHandler { + using categoryNodeMap = std::unordered_map; + +public: + TreeViewCategoryHandler(CTreeCtrl& tree, HTREEITEM parentNode) : + tree(tree), + parentNode(parentNode) + {} + + void Preallocate(const TreeViewBuilder::mapSideNodeInfo& sideInfo, TreeViewTechnoType type); + HTREEITEM GetOrAdd(const CString& name); + +private: + CTreeCtrl& tree; + HTREEITEM parentNode; + categoryNodeMap structhouses; +}; + ///////////////////////////////////////////////////////////////////////////// // Ansicht CViewObjects