Mercurial > ldforge2 / file diff

--- a/src/document.h	Wed May 25 20:36:34 2022 +0300
+++ b/src/document.h	Mon Jun 06 22:01:22 2022 +0300
@@ -23,46 +23,38 @@
 #include "ui/canvas.h"
 #include "model.h"
 #include "vertexmap.h"
-#include "edithistory.h"
 
-class Document : public QWidget
+class EditorTabWidget : public QWidget
 {
 	Q_OBJECT
 public:
-	explicit Document(
+	explicit EditorTabWidget(
 		Model* model,
 		DocumentManager* documents,
 		const ldraw::ColorTable& colorTable,
 		QWidget *parent = nullptr);
-	~Document() override;
+	~EditorTabWidget() override;
 	QByteArray saveSplitterState() const;
 	void restoreSplitterState(const QByteArray& state);
-	std::unique_ptr<ModelEditor> editModel();
 	void applyToVertices(VertexMap::ApplyFunction fn) const;
-	const Model& getModel() const;
-	const QSet<ldraw::id_t> selectedObjects() const;
+	const QSet<ModelId> selectedObjects() const;
 	const ldraw::ColorTable& colorTable;
 	Canvas* const canvas;
+	Model* const model;
 	Q_SLOT void editingModeTriggered();
 	Q_SLOT void canvasMouseClick(QMouseEvent* event);
 	Q_SLOT void canvasMouseMove(QMouseEvent* event);
-	void select(const QSet<ldraw::id_t> &selected);
-	DrawState drawState;
+	void select(const QSet<ModelId> &selected);
 Q_SIGNALS:
 	void newStatusText(const QString& newStatusText);
 	void splitterChanged();
 private:
 	void initializeTools();
 	void closeShape();
-	Model* model;
+	DrawState drawState;
 	DocumentManager* const documents;
 	VertexMap vertexMap;
 	class Ui_Document& ui;
 	QToolBar* toolsBar;
 	std::vector<QAction*> toolActions;
-	class ObjectEditor* objectEditor;
-	/**
-	 * @brief History information of edits to this model
-	 */
-	// EditHistory editHistory;
 };