# HG changeset patch # User Teemu Piippo # Date 1488725437 -7200 # Node ID 872c4a3f4151b5beff07c6f1d6ba68d9b8c09072 # Parent 46dc716238fdb9ca4202738ac1ebb2ffb15fb189 Sorted the methods in Model's public section. diff -r 46dc716238fd -r 872c4a3f4151 src/model.h --- 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 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 T* insert(int position, Args&& ...args); - template 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& objects() const; - LDObject* getObject(int position) const; void recountTriangles(); + void remove(LDObject* object); + void removeAt(int position); + template 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);