ldforge: comparison src/ldDocument.cc

-:1a6f1997fcbe
+:c310073e4f22
 EXTERN_CFGENTRY (Bool, UseLogoStuds)
 static bool g_loadingMainFile = false;
 static const int g_maxRecentFiles = 10;
 static bool g_aborted = false;
-static LDDocumentPtr g_logoedStud;
+static LDDocument* g_logoedStud;
-static LDDocumentPtr g_logoedStud2;
+static LDDocument* g_logoedStud2;
-static QList<LDDocumentWeakPtr> g_allDocuments;
+static QList<LDDocument*> g_allDocuments;
-static QList<LDDocumentPtr> g_explicitDocuments;
+static QList<LDDocument*> g_explicitDocuments;
-static LDDocumentPtr g_currentDocument;
+static LDDocument* g_currentDocument;
 static bool g_loadingLogoedStuds = false;
 const QStringList g_specialSubdirectories ({ "s", "48", "8" });
 // =============================================================================
 	}
 }
 // =============================================================================
 //
-LDDocument::LDDocument (LDDocumentPtr* selfptr) :
+LDDocument::LDDocument (LDDocument** selfptr) :
 	m_isImplicit (true),
 	m_flags (0),
 	m_verticesOutdated (true),
 	m_needVertexMerge (true),
 	m_gldata (new LDGLData)
 {
-	*selfptr = LDDocumentPtr (this);
+	*selfptr = LDDocument* (this);
 	setSelf (*selfptr);
 	setSavePosition (-1);
 	setTabIndex (-1);
 	setHistory (new History);
 	history()->setDocument (*selfptr);
 	g_allDocuments << *selfptr;
 }
 // =============================================================================
 //
-LDDocumentPtr LDDocument::createNew()
+LDDocument* LDDocument::createNew()
 {
-	LDDocumentPtr ptr;
+	LDDocument* ptr;
 	new LDDocument (&ptr);
 	return ptr;
 }
 // =============================================================================
 	}
 }
 // =============================================================================
 //
-QList<LDDocumentPtr> const& LDDocument::explicitDocuments()
+QList<LDDocument*> const& LDDocument::explicitDocuments()
 {
 	return g_explicitDocuments;
 }
 // =============================================================================
 //
-LDDocumentPtr FindDocument (QString name)
+LDDocument* FindDocument (QString name)
 {
-	for (LDDocumentWeakPtr weakfile : g_allDocuments)
+	for (LDDocument* file : g_allDocuments)
 	{
-		if (weakfile == null)
+		if (file == null)
 			continue;
-		LDDocumentPtr file (weakfile);
+		LDDocument* file (file);
 		if (Eq (name, file->name(), file->defaultName()))
 			return file;
 	}
-	return LDDocumentPtr();
+	return nullptr;
 }
 // =============================================================================
 //
 QString Dirname (QString path)
 	// Try find it relative to other currently open documents. We want a file
 	// in the immediate vicinity of a current model to override stock LDraw stuff.
 	QString reltop = Basename (Dirname (relpath));
-	for (LDDocumentWeakPtr doc : g_allDocuments)
+	for (LDDocument* doc : g_allDocuments)
 	{
 		if (doc == null)
 			continue;
 		QString partpath = format ("%1/%2", Dirname (doc->fullPath()), relpath);
 	return objs;
 }
 // =============================================================================
 //
-LDDocumentPtr OpenDocument (QString path, bool search, bool implicit, LDDocumentPtr fileToOverride)
+LDDocument* OpenDocument (QString path, bool search, bool implicit, LDDocument* fileToOverride)
 {
 	// Convert the file name to lowercase when searching because some parts contain subfile
 	// subfile references with uppercase file names. I'll assume here that the library will always
 	// use lowercase file names for the part files.
 	QFile* fp;
 		fullpath = path;
 		if (not fp->open (QIODevice::ReadOnly))
 		{
 			delete fp;
-			return LDDocumentPtr();
+			return nullptr;
 		}
 	}
 	if (not fp)
-		return LDDocumentPtr();
+		return nullptr;
-	LDDocumentPtr load = (fileToOverride != null ? fileToOverride : LDDocument::createNew());
+	LDDocument* load = (fileToOverride != null ? fileToOverride : LDDocument::createNew());
 	load->setImplicit (implicit);
 	load->setFullPath (fullpath);
 	load->setName (LDDocument::shortenName (load->fullPath()));
 	// Loading the file shouldn't count as actual edits to the document.
 	fp->deleteLater();
 	if (not ok)
 	{
 		load->dismiss();
-		return LDDocumentPtr();
+		return nullptr;
 	}
 	load->addObjects (objs);
 	if (g_loadingMainFile)
 // =============================================================================
 //
 void CloseAllDocuments()
 {
-	for (LDDocumentPtr file : g_explicitDocuments)
+	for (LDDocument* file : g_explicitDocuments)
 		file->dismiss();
 }
 // =============================================================================
 //
 void newFile()
 {
 	// Create a new anonymous file and set it to our current
-	LDDocumentPtr f = LDDocument::createNew();
+	LDDocument* f = LDDocument::createNew();
 	f->setName ("");
 	f->setImplicit (false);
 	LDDocument::setCurrent (f);
 	LDDocument::closeInitialFile();
 	g_win->R()->setDocument (f);
 // Open an LDraw file and set it as the main model
 // =============================================================================
 void OpenMainModel (QString path)
 {
 	// If there's already a file with the same name, this file must replace it.
-	LDDocumentPtr documentToReplace;
+	LDDocument* documentToReplace;
-	LDDocumentPtr file;
+	LDDocument* file;
 	QString shortName = LDDocument::shortenName (path);
-	for (LDDocumentWeakPtr doc : g_allDocuments)
+	for (LDDocument* doc : g_allDocuments)
 	{
 		if (doc != null and doc->name() == shortName)
 		{
 			documentToReplace = doc;
 			break;
 	// If the second object in the list holds the file name, update that now.
 	LDObject* nameObject = getObject (1);
 	if (nameObject != null and nameObject->type() == OBJ_Comment)
 	{
-		LDCommentPtr nameComment = static_cast<LDComment*> (nameObject);
+		LDComment* nameComment = static_cast<LDComment*> (nameObject);
 		if (nameComment->text().left (6) == "Name: ")
 		{
 			QString newname = shortenName (path);
 			nameComment->setText (format ("Name: %1", newname));
 					{
 						// Vertex (0 !LDFORGE VERTEX)
 						CheckTokenCount (tokens, 7);
 						CheckTokenNumbers (tokens, 3, 6);
-						LDVertexPtr obj = LDSpawn<LDVertex>();
+						LDVertex* obj = LDSpawn<LDVertex>();
 						obj->setColor (LDColor::fromIndex (StringToNumber (tokens[3])));
 						obj->pos.apply ([&](Axis ax, double& value)
 							{ value = tokens[4 + ax].toDouble(); });
 						return obj;
 					}
 					elif (tokens[2] == "OVERLAY")
 					{
 						CheckTokenCount (tokens, 9);
 						CheckTokenNumbers (tokens, 5, 8);
-						LDOverlayPtr obj = LDSpawn<LDOverlay>();
+						LDOverlay* obj = LDSpawn<LDOverlay>();
 						obj->setFileName (tokens[3]);
 						obj->setCamera (tokens[4].toLong());
 						obj->setX (tokens[5].toLong());
 						obj->setY (tokens[6].toLong());
 						obj->setWidth (tokens[7].toLong());
 						return obj;
 					}
 				}
 				// Just a regular comment:
-				LDCommentPtr obj = LDSpawn<LDComment>();
+				LDComment* obj = LDSpawn<LDComment>();
 				obj->setText (commentText);
 				return obj;
 			}
 			case 1:
 				// Try open the file. Disable g_loadingMainFile temporarily since we're
 				// not loading the main file now, but the subfile in question.
 				bool tmp = g_loadingMainFile;
 				g_loadingMainFile = false;
-				LDDocumentPtr load = GetDocument (tokens[14]);
+				LDDocument* load = GetDocument (tokens[14]);
 				g_loadingMainFile = tmp;
 				// If we cannot open the file, mark it an error. Note we cannot use LDParseError
 				// here because the error object needs the document reference.
 				if (not load)
 				{
-					LDErrorPtr obj = LDSpawn<LDError> (line, format ("Could not open %1", tokens[14]));
+					LDError* obj = LDSpawn<LDError> (line, format ("Could not open %1", tokens[14]));
 					obj->setFileReferenced (tokens[14]);
 					return obj;
 				}
-				LDSubfilePtr obj = LDSpawn<LDSubfile>();
+				LDSubfile* obj = LDSpawn<LDSubfile>();
 				obj->setColor (LDColor::fromIndex (StringToNumber (tokens[1])));
 				obj->setPosition (ParseVertex (tokens, 2));  // 2 - 4
 				Matrix transform;
 			{
 				CheckTokenCount (tokens, 8);
 				CheckTokenNumbers (tokens, 1, 7);
 				// Line
-				LDLinePtr obj (LDSpawn<LDLine>());
+				LDLine* obj (LDSpawn<LDLine>());
 				obj->setColor (LDColor::fromIndex (StringToNumber (tokens[1])));
 				for (int i = 0; i < 2; ++i)
 					obj->setVertex (i, ParseVertex (tokens, 2 + (i * 3)));   // 2 - 7
 			{
 				CheckTokenCount (tokens, 11);
 				CheckTokenNumbers (tokens, 1, 10);
 				// Triangle
-				LDTrianglePtr obj (LDSpawn<LDTriangle>());
+				LDTriangle* obj (LDSpawn<LDTriangle>());
 				obj->setColor (LDColor::fromIndex (StringToNumber (tokens[1])));
 				for (int i = 0; i < 3; ++i)
 					obj->setVertex (i, ParseVertex (tokens, 2 + (i * 3)));   // 2 - 10
 	}
 }
 // =============================================================================
 //
-LDDocumentPtr GetDocument (QString filename)
+LDDocument* GetDocument (QString filename)
 {
 	// Try find the file in the list of loaded files
-	LDDocumentPtr doc = FindDocument (filename);
+	LDDocument* doc = FindDocument (filename);
 	// If it's not loaded, try open it
 	if (not doc)
 		doc = OpenDocument (filename, true, true);
 	// Go through all objects in the current file and reload the subfiles
 	for (LDObject* obj : objects())
 	{
 		if (obj->type() == OBJ_Subfile)
 		{
-			LDSubfilePtr ref = static_cast<LDSubfile*> (obj);
+			LDSubfile* ref = static_cast<LDSubfile*> (obj);
-			LDDocumentPtr fileInfo = GetDocument (ref->fileInfo()->name());
+			LDDocument* fileInfo = GetDocument (ref->fileInfo()->name());
 			if (fileInfo != null)
 			{
 				ref->setFileInfo (fileInfo);
 			}
 		history()->add (new DelHistory (idx, obj));
 		m_objectVertices.remove (obj);
 	}
 	m_objects.removeAt (idx);
-	obj->setDocument (LDDocumentPtr());
+	obj->setDocument (nullptr);
 }
 // =============================================================================
 //
 bool IsSafeToCloseAll()
 {
-	for (LDDocumentPtr f : LDDocument::explicitDocuments())
+	for (LDDocument* f : LDDocument::explicitDocuments())
 	{
 		if (not f->isSafeToClose())
 			return false;
 	}
 		*m_history << new EditHistory (idx, oldcode, newcode);
 	}
 	m_objectVertices.remove (m_objects[idx]);
 	m_objects[idx]->deselect();
-	m_objects[idx]->setDocument (LDDocumentPtr());
+	m_objects[idx]->setDocument (nullptr);
 	obj->setDocument (this);
 	addKnownVertices (obj);
 	g_win->R()->compileObject (obj);
 	m_objects[idx] = obj;
 	needVertexMerge();
 	return objs;
 }
 // =============================================================================
 //
-LDDocumentPtr LDDocument::current()
+LDDocument* LDDocument::current()
 {
 	return g_currentDocument;
 }
 // =============================================================================
 // Sets the given file as the current one on display. At some point in time this
 // was an operation completely unheard of. ;)
 //
 // TODO: f can be temporarily null. This probably should not be the case.
 // =============================================================================
-void LDDocument::setCurrent (LDDocumentPtr f)
+void LDDocument::setCurrent (LDDocument* f)
 {
 	// Implicit files were loaded for caching purposes and must never be set
 	// current.
 	if (f != null and f->isImplicit())
 		return;
 	if (g_explicitDocuments.size() == 2 and
 		g_explicitDocuments[0]->name().isEmpty() and
 		not g_explicitDocuments[1]->name().isEmpty() and
 		not g_explicitDocuments[0]->hasUnsavedChanges())
 	{
-		LDDocumentPtr filetoclose = g_explicitDocuments.first();
+		LDDocument* filetoclose = g_explicitDocuments.first();
 		filetoclose->dismiss();
 	}
 }
 // =============================================================================

Mercurial > ldforge / file comparison

comparison: src/ldDocument.cc

src/ldDocument.cc