Mercurial > ldforge / changeset

--- a/src/ldObject.cpp	Sun Sep 06 16:57:22 2015 +0300
+++ b/src/ldObject.cpp	Sun Sep 06 20:45:51 2015 +0300
@@ -340,11 +340,7 @@
 
 	// Transform the objects
 	for (LDObject* obj : objs)
-	{
-		// Set the parent now so we know what inlined the object.
-		obj->setParent (this);
 		TransformObject (obj, transform(), position(), color());
-	}
 
 	return objs;
 }
@@ -495,20 +491,6 @@
 
 // =============================================================================
 //
-// What object in the current file ultimately references this?
-//
-LDObject* LDObject::topLevelParent()
-{
-	LDObject* it;
-	
-	for (it = this; it->parent(); it = it->parent())
-		;
-
-	return it;
-}
-
-// =============================================================================
-//
 // Object after this in the current file
 //
 LDObject* LDObject::next() const
@@ -580,16 +562,6 @@
 	m_isHidden = value;
 }
 
-LDObject* LDObject::parent() const
-{
-	return m_parent;
-}
-
-void LDObject::setParent (LDObject* parent)
-{
-	m_parent = parent;
-}
-
 bool LDObject::isSelected() const
 {
 	return m_isSelected;

--- a/src/ldObject.h	Sun Sep 06 16:57:22 2015 +0300
+++ b/src/ldObject.h	Sun Sep 06 20:45:51 2015 +0300
@@ -113,7 +113,6 @@
 	void move (Vertex vect);
 	LDObject* next() const;
 	virtual int numVertices() const = 0;
-	LDObject* parent() const;
 	LDObject* previous() const;
 	bool previousIsInvertnext (LDBfc*& ptr);
 	QColor randomColor() const;
@@ -122,7 +121,6 @@
 	void setColor (LDColor color);
 	void setDocument (LDDocument* document);
 	void setHidden (bool value);
-	void setParent (LDObject* parent);
 	void setVertex (int i, const Vertex& vert);
 	void swap (LDObject* other);
 	LDObject* topLevelParent();