diff -r 1de2b8d64e9f -r 98906a94732f src/model.cpp --- a/src/model.cpp Tue Jan 28 23:34:49 2020 +0200 +++ b/src/model.cpp Thu Jan 30 19:20:11 2020 +0200 @@ -42,7 +42,7 @@ QVariant Model::data(const QModelIndex& index, int role) const { const int row = index.row(); - linetypes::Object* object = this->body[row].get(); + ldraw::Object* object = this->body[row].get(); switch(role) { case Qt::DisplayRole: @@ -69,9 +69,9 @@ } } -QVariant Model::getObjectProperty(const int index, const linetypes::Property property) const +QVariant Model::getObjectProperty(const int index, const ldraw::Property property) const { - const linetypes::Object* object = this->body[index].get(); + const ldraw::Object* object = this->body[index].get(); return object->getProperty(property); } @@ -80,7 +80,7 @@ if (this->needRecache) { this->cachedPolygons.clear(); - linetypes::GetPolygonsContext context{documents}; + ldraw::GetPolygonsContext context{documents}; for (int i = 0; i < this->size(); i += 1) { this->getObjectPolygons(i, this->cachedPolygons, &context); @@ -93,9 +93,9 @@ void Model::getObjectPolygons( const int index, std::vector& polygons_out, - linetypes::GetPolygonsContext* context) const + ldraw::GetPolygonsContext* context) const { - const linetypes::Object* object = this->body[index].get(); + const ldraw::Object* object = this->body[index].get(); object->getPolygons(polygons_out, context); }