Mercurial > ldforge2 / file diff

--- a/src/model.h	Wed Jun 29 16:21:44 2022 +0300
+++ b/src/model.h	Wed Jun 29 16:33:49 2022 +0300
@@ -194,13 +194,13 @@
 }
 
 QString modelElementToString(const ModelElement& element);
-struct ModelId
+struct ElementId
 {
 	std::int32_t value;
-	constexpr auto operator<=>(const ModelId& other) const = default;
+	constexpr auto operator<=>(const ElementId& other) const = default;
 };
 
-constexpr auto qHash(ModelId id)
+constexpr auto qHash(ElementId id)
 {
 	return qHash(id.value);
 }
@@ -210,19 +210,19 @@
 	Q_OBJECT
 	struct Entry {
 		ModelElement data;
-		ModelId id;
+		ElementId id;
 	};
 	std::vector<Entry> body;
-	std::map<ModelId, std::size_t> positions;
-	ModelId runningId = {1};
+	std::map<ElementId, std::size_t> positions;
+	ElementId runningId = {1};
 public:
 	explicit Model(QObject* parent);
 	virtual ~Model();
-	ModelId append(const ModelElement& value);
+	ElementId append(const ModelElement& value);
 	const ModelElement& at(std::size_t position) const;
-	ModelId idAt(std::size_t position) const;
+	ElementId idAt(std::size_t position) const;
 	void assignAt(std::size_t position, const ModelElement& element);
-	std::optional<std::size_t> find(ModelId id) const;
+	std::optional<std::size_t> find(ElementId id) const;
 	void remove(std::size_t index);
 	int rowCount(const QModelIndex&) const override;
 	QVariant data(const QModelIndex& index, int role) const override;