ldforge: comparison src/ldDocument.cc

-:af81220741d9
+:1a6f1997fcbe
 void LDFileLoader::work (int i)
 {
 	// User wishes to abort, so stop here now.
 	if (isAborted())
 	{
-		for (LDObjectPtr obj : m_objects)
+		for (LDObject* obj : m_objects)
 			obj->destroy();
 		m_objects.clear();
 		setDone (true);
 		return;
 		QChar c;
 		while (line.endsWith ("\n") or line.endsWith ("\r"))
 			line.chop (1);
-		LDObjectPtr obj = ParseLine (line);
+		LDObject* obj = ParseLine (line);
 		// Check for parse errors and warn about tthem
 		if (obj->type() == OBJ_Error)
 		{
 			print ("Couldn't parse line #%1: %2",
-				progress() + 1, obj.staticCast<LDError>()->reason());
+				progress() + 1, static_cast<LDError*> (obj)->reason());
 			if (warnings() != null)
 				(*warnings())++;
 		}
 	// If there were problems loading subfile references, try see if we can find these
 	// files on the parts tracker.
 	QStringList unknowns;
-	for (LDObjectPtr obj : file->objects())
+	for (LDObject* obj : file->objects())
 	{
-		if (obj->type() != OBJ_Error or obj.staticCast<LDError>()->fileReferenced().isEmpty())
+		if (obj->type() != OBJ_Error or static_cast<LDError*> (obj)->fileReferenced().isEmpty(j)
 			continue;
-		unknowns << obj.staticCast<LDError>()->fileReferenced();
+		unknowns << static_cast<LDError*> (obj)->fileReferenced();
 	}
 	if (cfg::TryDownloadMissingFiles and not unknowns.isEmpty())
 	{
 		PartDownloader dl;
 	if (not path.length())
 		path = fullPath();
 	// If the second object in the list holds the file name, update that now.
-	LDObjectPtr nameObject = getObject (1);
+	LDObject* nameObject = getObject (1);
 	if (nameObject != null and nameObject->type() == OBJ_Comment)
 	{
-		LDCommentPtr nameComment = nameObject.staticCast<LDComment>();
+		LDCommentPtr nameComment = static_cast<LDComment*> (nameObject);
 		if (nameComment->text().left (6) == "Name: ")
 		{
 			QString newname = shortenName (path);
 			nameComment->setText (format ("Name: %1", newname));
 	QByteArray data;
 	if (sizeptr != null)
 		*sizeptr = 0;
-	// File is open, now save the model to it. Note that LDraw requires files to
+	// File is open, now save the model to it. Note that LDraw requires files to have DOS line endings.
-	// have DOS line endings, so we terminate the lines with \r\n.
+	for (LDObject* obj : objects())
-	for (LDObjectPtr obj : objects())
 	{
 		QByteArray subdata ((obj->asText() + "\r\n").toUtf8());
 		data.append (subdata);
 		if (sizeptr != null)
 // =============================================================================
 //
 void LDDocument::clear()
 {
-	for (LDObjectPtr obj : objects())
+	for (LDObject* obj : objects())
 		forgetObject (obj);
 }
 // =============================================================================
 //
 // =============================================================================
 // This is the LDraw code parser function. It takes in a string containing LDraw
 // code and returns the object parsed from it. parseLine never returns null,
 // the object will be LDError if it could not be parsed properly.
 // =============================================================================
-LDObjectPtr ParseLine (QString line)
+LDObject* ParseLine (QString line)
 {
 	try
 	{
 		QStringList tokens = line.split (" ", QString::SkipEmptyParts);
 			{
 				CheckTokenCount (tokens, 14);
 				CheckTokenNumbers (tokens, 1, 13);
 				// Quadrilateral / Conditional line
-				LDObjectPtr obj;
+				LDObject* obj;
 				if (num == 4)
 					obj = LDSpawn<LDQuad>();
 				else
 					obj = LDSpawn<LDCondLine>();
 void LDDocument::reloadAllSubfiles()
 {
 	print ("Reloading subfiles of %1", getDisplayName());
 	// Go through all objects in the current file and reload the subfiles
-	for (LDObjectPtr obj : objects())
+	for (LDObject* obj : objects())
 	{
 		if (obj->type() == OBJ_Subfile)
 		{
-			LDSubfilePtr ref = obj.staticCast<LDSubfile>();
+			LDSubfilePtr ref = static_cast<LDSubfile*> (obj);
 			LDDocumentPtr fileInfo = GetDocument (ref->fileInfo()->name());
 			if (fileInfo != null)
 			{
 				ref->setFileInfo (fileInfo);
 		}
 		// Reparse gibberish files. It could be that they are invalid because
 		// of loading errors. Circumstances may be different now.
 		if (obj->type() == OBJ_Error)
-			obj->replace (ParseLine (obj.staticCast<LDError>()->contents()));
+			obj->replace (ParseLine (static_cast<LDError*> (obj)->contents()));
 	}
 	m_needsReCache = true;
 	if (this == CurrentDocument())
 		g_win->buildObjList();
 }
 // =============================================================================
 //
-int LDDocument::addObject (LDObjectPtr obj)
+int LDDocument::addObject (LDObject* obj)
 {
 	history()->add (new AddHistory (objects().size(), obj));
 	m_objects << obj;
 	addKnownVertices (obj);
 	obj->setDocument (this);
 // =============================================================================
 //
 void LDDocument::addObjects (const LDObjectList& objs)
 {
-	for (LDObjectPtr obj : objs)
+	for (LDObject* obj : objs)
 	{
 		if (obj != null)
 			addObject (obj);
 	}
 }
 // =============================================================================
 //
-void LDDocument::insertObj (int pos, LDObjectPtr obj)
+void LDDocument::insertObj (int pos, LDObject* obj)
 {
 	history()->add (new AddHistory (pos, obj));
 	m_objects.insert (pos, obj);
 	obj->setDocument (this);
 	g_win->R()->compileObject (obj);
 #endif
 }
 // =============================================================================
 //
-void LDDocument::addKnownVertices (LDObjectPtr obj)
+void LDDocument::addKnownVertices (LDObject* obj)
 {
 	auto it = m_objectVertices.find (obj);
 	if (it == m_objectVertices.end())
 		it = m_objectVertices.insert (obj, QVector<Vertex>());
 	needVertexMerge();
 }
 // =============================================================================
 //
-void LDDocument::forgetObject (LDObjectPtr obj)
+void LDDocument::forgetObject (LDObject* obj)
 {
 	int idx = obj->lineNumber();
 	obj->deselect();
 	assert (m_objects[idx] == obj);
 	return true;
 }
 // =============================================================================
 //
-void LDDocument::setObject (int idx, LDObjectPtr obj)
+void LDDocument::setObject (int idx, LDObject* obj)
 {
 	assert (idx >= 0 and idx < m_objects.size());
 	// Mark this change to history
 	if (not m_history->isIgnoring())
 	needVertexMerge();
 }
 // =============================================================================
 //
-LDObjectPtr LDDocument::getObject (int pos) const
+LDObject* LDDocument::getObject (int pos) const
 {
 	if (pos < m_objects.size())
 		return m_objects[pos];
 	else
 		return nullptr;
 {
 	if (m_needsReCache)
 	{
 		m_vertices.clear();
-		for (LDObjectPtr obj : inlineContents (true, true))
+		for (LDObject* obj : inlineContents (true, true))
 		{
 			if (obj->type() == OBJ_Subfile)
 			{
 				print ("Warning: unable to inline %1 into %2",
-					obj.staticCast<LDSubfile>()->fileInfo()->getDisplayName(),
+					static_cast<LDSubfile*> (obj)->fileInfo()->getDisplayName(),
 					getDisplayName());
 				continue;
 			}
 			LDPolygon* data = obj->getPolygon();
 	if (m_verticesOutdated)
 	{
 		m_objectVertices.clear();
-		for (LDObjectPtr obj : inlineContents (true, false))
+		for (LDObject* obj : inlineContents (true, false))
 			addKnownVertices (obj);
 		mergeVertices();
 		m_verticesOutdated = false;
 	}
 			return g_logoedStud2->inlineContents (deep, renderinline);
 	}
 	LDObjectList objs, objcache;
-	for (LDObjectPtr obj : objects())
+	for (LDObject* obj : objects())
 	{
 		// Skip those without scemantic meaning
 		if (not obj->isScemantic())
 			continue;
 		// Got another sub-file reference, inline it if we're deep-inlining. If not,
 		// just add it into the objects normally. Yay, recursion!
 		if (deep == true and obj->type() == OBJ_Subfile)
 		{
-			for (LDObjectPtr otherobj : obj.staticCast<LDSubfile>()->inlineContents (deep, renderinline))
+			for (LDObject* otherobj : static_cast<LDSubfile*> (obj)->inlineContents (deep, renderinline))
 				objs << otherobj;
 		}
 		else
 			objs << obj->createCopy();
 	}
 	g_loadingLogoedStuds = false;
 }
 // =============================================================================
 //
-void LDDocument::addToSelection (LDObjectPtr obj) // [protected]
+void LDDocument::addToSelection (LDObject* obj) // [protected]
 {
 	if (obj->isSelected())
 		return;
 	assert (obj->document() == this);
 	obj->setSelected (true);
 }
 // =============================================================================
 //
-void LDDocument::removeFromSelection (LDObjectPtr obj) // [protected]
+void LDDocument::removeFromSelection (LDObject* obj) // [protected]
 {
 	if (not obj->isSelected())
 		return;
 	assert (obj->document() == this);
 // =============================================================================
 //
 void LDDocument::clearSelection()
 {
-	for (LDObjectPtr obj : m_sel)
+	for (LDObject* obj : m_sel)
 		removeFromSelection (obj);
 	assert (m_sel.isEmpty());
 }
 	return m_sel;
 }
 // =============================================================================
 //
-void LDDocument::swapObjects (LDObjectPtr one, LDObjectPtr other)
+void LDDocument::swapObjects (LDObject* one, LDObject* other)
 {
 	int a = m_objects.indexOf (one);
 	int b = m_objects.indexOf (other);
 	assert (a != b and a != -1 and b != -1);
 	m_objects[b] = one;

Mercurial > ldforge / file comparison

comparison: src/ldDocument.cc

src/ldDocument.cc