Mercurial > ldforge2 / file diff

--- a/src/model.h	Sun Nov 03 17:57:21 2019 +0200
+++ b/src/model.h	Sun Nov 03 18:09:47 2019 +0200
@@ -23,11 +23,11 @@
 	QVariant data(const QModelIndex& index, int role) const override;
 	QVariant getHeaderProperty(const HeaderProperty property);
 	const QString& getName() const;
-	QVariant getObjectProperty(const int index, const modelobjects::Property property) const;
+	QVariant getObjectProperty(const int index, const linetypes::Property property) const;
 signals:
-	void objectAdded(modelobjects::Id id, int position);
+	void objectAdded(linetypes::Id id, int position);
 private:
-	using ModelObjectPointer = std::unique_ptr<modelobjects::BaseObject>;
+	using ModelObjectPointer = std::unique_ptr<linetypes::Object>;
 	template<typename T, typename... Args>
 	T* append(Args&&... args);
 	void append(ModelObjectPointer&& object);
@@ -37,7 +37,7 @@
 	QString path;
 	LDHeader header;
 	std::vector<ModelObjectPointer> body;
-	std::map<modelobjects::Id, modelobjects::BaseObject*> objectsById;
+	std::map<linetypes::Id, linetypes::Object*> objectsById;
 };
 
 template<typename T, typename... Args>