Mercurial > ldforge / file diff

--- a/src/model.h	Sun Mar 05 16:50:06 2017 +0200
+++ b/src/model.h	Sun Mar 05 16:50:37 2017 +0200
@@ -35,27 +35,27 @@
 	Model(class DocumentManager* manager);
 	Model(const Model& other) = delete;
 
-	bool swapObjects(LDObject* one, LDObject* other);
 	template<typename T, typename... Args> T* append(Args&& ...args);
+	LDObject* appendFromString(QString line);
+	LDObject* const* begin();
+	void clear();
+	class DocumentManager* documentManager() const;
+	LDObject* const* end();
+	LDObject* getObject(int position) const;
 	template<typename T, typename... Args> T* insert(int position, Args&& ...args);
-	template<typename T, typename... Args> T* replace(LDObject* object, Args&& ...args);
-	void removeAt(int position);
-	void remove(LDObject* object);
-	void replace(LDObject* object, Model& model);
-	void clear();
+	LDObject* insertFromString(int position, QString line);
+	bool isEmpty() const;
 	void merge(Model& other, int position = -1, Filter filter = nullptr, Callback callback = nullptr);
-	int size() const;
 	const ResourceVector<LDObject>& objects() const;
-	LDObject* getObject(int position) const;
 	void recountTriangles();
+	void remove(LDObject* object);
+	void removeAt(int position);
+	template<typename T, typename... Args> T* replace(LDObject* object, Args&& ...args);
+	void replace(LDObject* object, Model& model);
+	LDObject* replaceWithFromString(LDObject* object, QString line);
+	int size() const;
+	bool swapObjects(LDObject* one, LDObject* other);
 	int triangleCount() const;
-	LDObject* const* begin();
-	LDObject* const* end();
-	bool isEmpty() const;
-	class DocumentManager* documentManager() const;
-	LDObject* insertFromString(int position, QString line);
-	LDObject* appendFromString(QString line);
-	LDObject* replaceWithFromString(LDObject* object, QString line);
 
 signals:
 	void objectAdded(LDObject* object, int position);