Last minute refactoring

src/bonsaiviewer/ElementRegistry.cpp

@@ -70,7 +70,7 @@ std::optional<BasicElementInfo> ElementRegistry::findBasicElementInfo(uint32_t o
     return it->second;
 }
 
-std::optional<express::Base> ElementRegistry::findEntity(uint32_t object_id) const {
+std::optional<express::base> ElementRegistry::findEntity(uint32_t object_id) const {
     if (!loader_) return std::nullopt;
 
     auto info = findBasicElementInfo(object_id);

src/bonsaiviewer/ElementRegistry.h

@@ -54,7 +54,7 @@ public:
     void removeModel(uint32_t session_model_id);
     std::vector<BasicElementInfo> basicElementInfoForModel(uint32_t session_model_id) const;
     std::optional<BasicElementInfo> findBasicElementInfo(uint32_t object_id) const;
-    std::optional<express::Base> findEntity(uint32_t object_id) const;
+    std::optional<express::base> findEntity(uint32_t object_id) const;
 
 private:
     void onSidecarElementsReady(uint32_t session_model_id,

src/bonsaiviewer/docs/viewport_architecture.rst

@@ -44,7 +44,7 @@ Main components
     code.
 
 ``GeometryStreamer``
-    Runs ``IfcGeom::Iterator`` on a worker thread for raw IFC loads. It emits a
+    Runs ``ifcopenshell::geom::iterator`` on a worker thread for raw IFC loads. It emits a
     ``StreamedMesh`` once for each unique representation mesh and a
     ``StreamedInstance`` for each placed occurrence.
 

src/bonsaiviewer/modules/models/Commands.cpp

@@ -685,7 +685,7 @@ void convertIfcToDatabase(SessionState& session, QWidget& host) {
                 throw ifcopenshell::exception("RDB serializer does not support streaming from an input filename");
             }
 
-            boost::shared_ptr<Serializer> serializer = registry.create("rdb", context);
+            boost::shared_ptr<serializer> serializer = registry.create("rdb", context);
             serializer->finalize();
         } catch (const std::exception& e) {
             *error_message = QString::fromUtf8(e.what());
@@ -791,7 +791,7 @@ void exportGeometryDatabase(SessionState& session, QWidget& host) {
                 throw ifcopenshell::exception("RDB serializer does not support streaming from an input filename");
             }
 
-            boost::shared_ptr<Serializer> serializer = registry.create("rdb", context);
+            boost::shared_ptr<serializer> serializer = registry.create("rdb", context);
             serializer->finalize();
             serializer.reset();
 

src/bonsaiviewer/modules/models/SettingsView.cpp

@@ -82,9 +82,9 @@ std::string enumString(const attribute_value& av) {
     return std::string(enumeration.value() ? enumeration.value() : "");
 }
 
-QString formatNamedUnit(const express::Base& unit) {
+QString formatNamedUnit(const express::base& unit) {
     if (!unit) return "—";
-    auto entity = unit.as<express::Entity>();
+    auto entity = unit.as<express::entity>();
     if (unit.declaration().is("IfcSIUnit")) {
         const std::string prefix = enumString(entity.get("Prefix"));
         const std::string name = enumString(entity.get("Name"));

src/bonsaiviewer/modules/properties/View.cpp

@@ -109,7 +109,7 @@ void PropertiesPanelView::refresh(uint32_t object_id) {
     state.entity = {"No item selected", ""};
 
     auto entity = registry ? registry->findEntity(object_id)
-                           : std::optional<express::Base>{};
+                           : std::optional<express::base>{};
     if (entity) {
         state.entity.entity_class = QString::fromStdString(entity->declaration().name());
         if (auto predefined_type = get_predefined_type(*entity)) {
@@ -121,16 +121,16 @@ void PropertiesPanelView::refresh(uint32_t object_id) {
         }
         // Relationships: the construction type and the spatial container, shown
         // by name (falling back to the entity class when unnamed).
-        auto display_name = [](const express::Base& related) -> QString {
+        auto display_name = [](const express::base& related) -> QString {
             if (auto name = get_string_attribute(related, "Name"); name && !name->empty()) {
                 return QString::fromStdString(*name);
             }
             return QString::fromStdString(related.declaration().name());
         };
-        if (express::Base type = get_type(*entity)) {
+        if (express::base type = get_type(*entity)) {
             state.relationships.append({"Type", display_name(type)});
         }
-        if (express::Base container = get_container(*entity)) {
+        if (express::base container = get_container(*entity)) {
             state.relationships.append({"Container", display_name(container)});
         }
         // Property sets (Pset_*) and quantity sets (Qto_* / BaseQuantities),

src/bonsaiviewer/modules/spatial_hierarchy/View.cpp

@@ -60,7 +60,7 @@ TreeNode* findNodeRecursive(QList<TreeNode>& nodes, const NodePath& path, int de
     return nullptr;
 }
 
-ItemKind kindOf(const express::Base& element) {
+ItemKind kindOf(const express::base& element) {
     const auto& declaration = element.declaration();
     if (declaration.is("IfcSite")) return ItemKind::Site;
     if (declaration.is("IfcBuilding")) return ItemKind::Building;
@@ -68,14 +68,14 @@ ItemKind kindOf(const express::Base& element) {
     return ItemKind::Space;  // IfcSpace, IfcSpatialZone, …
 }
 
-QString displayName(const express::Base& element) {
+QString displayName(const express::base& element) {
     if (auto name = get_string_attribute(element, "Name"); name && !name->empty()) {
         return QString::fromStdString(*name);
     }
     return QString::fromStdString(element.declaration().name());
 }
 
-TreeNode buildNode(const express::Base& element) {
+TreeNode buildNode(const express::base& element) {
     TreeNode node;
     node.name = displayName(element);
     node.kind = kindOf(element);