diff options
Diffstat (limited to 'gui')
| -rw-r--r-- | gui/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | gui/treemodel.cc | 2 | ||||
| -rw-r--r-- | gui/treemodel.h | 4 |
3 files changed, 3 insertions, 7 deletions
diff --git a/gui/CMakeLists.txt b/gui/CMakeLists.txt index 21d0c1e0..1deffcfb 100644 --- a/gui/CMakeLists.txt +++ b/gui/CMakeLists.txt @@ -40,10 +40,6 @@ endif() target_compile_definitions(gui_${family} PRIVATE NEXTPNR_NAMESPACE=nextpnr_${family} ARCH_${ufamily} ARCHNAME=${family} QT_NO_KEYWORDS) -if (USE_ABSEIL) - target_compile_definitions(gui_${family} PRIVATE USE_ABSEIL) -endif() - target_link_libraries(gui_${family} Qt5::Widgets) foreach(lib_dep ${EXTRA_LIB_DEPS}) diff --git a/gui/treemodel.cc b/gui/treemodel.cc index cc563202..b0dc51db 100644 --- a/gui/treemodel.cc +++ b/gui/treemodel.cc @@ -58,7 +58,7 @@ void IdList::updateElements(Context *ctx, std::vector<IdStringList> elements) bool changed = false; // For any elements that are not yet in managed_, created them. - std::unordered_set<IdStringList> element_set; + pool<IdStringList> element_set; for (auto elem : elements) { element_set.insert(elem); auto existing = managed_.find(elem); diff --git a/gui/treemodel.h b/gui/treemodel.h index e9c42a0f..e2692f3e 100644 --- a/gui/treemodel.h +++ b/gui/treemodel.h @@ -140,7 +140,7 @@ class IdList : public Item private: // Children that we manage the memory for, stored for quick lookup from // IdString to child. - std::unordered_map<IdStringList, std::unique_ptr<IdStringItem>> managed_; + dict<IdStringList, std::unique_ptr<IdStringItem>> managed_; // Type of children that the list creates. ElementType child_type_; @@ -184,7 +184,7 @@ template <typename ElementT> class ElementList : public Item ElementGetter getter_; // Children that we manage the memory for, stored for quick lookup from // IdString to child. - std::unordered_map<IdStringList, std::unique_ptr<Item>> managed_; + dict<IdStringList, std::unique_ptr<Item>> managed_; // Type of children that he list creates. ElementType child_type_; |