diff -r daa8770b9d26 -r d862721d19a3 src/model.h --- 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 body; - std::map positions; - ModelId runningId = {1}; + std::map 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 find(ModelId id) const; + std::optional 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;