ldforge: comparison src/file.cpp

-:6b2cc2d82ba6
+:6e80f038e8df
 			LDrawPathDialog dlg (false);
 			if (!dlg.exec ())
 				exit (0);
-			io_ldpath = dlg.path ();
+			io_ldpath = dlg.filename ();
 		}
 	}
 	bool tryConfigure (str path) {
 		QDir dir;
 	str parts () { return pathInfo.partsPath; }
 }
 // =============================================================================
 LDOpenFile::LDOpenFile () {
-	m_implicit = true;
+	setImplicit (true);
-	savePos = -1;
+	setSavePos (-1);
 }
 // =============================================================================
 LDOpenFile::~LDOpenFile () {
 	// Clear everything from the model
 	for (LDObject* obj : m_objs)
 		delete obj;
 	// Clear the cache as well
-	for (LDObject* obj : m_objCache)
+	for (LDObject* obj : m_cache)
 		delete obj;
 }
 // =============================================================================
 LDOpenFile* findLoadedFile (str name) {
 	for (LDOpenFile* file : g_loadedFiles)
-		if (file->m_filename == name)
+		if (file->name () == name)
 			return file;
 	return null;
 }
 #ifndef WIN32
 	relpath.replace ("\\", "/");
 #endif // WIN32
 	if (g_curfile != null) {
-		str partpath = fmt ("%s" DIRSLASH "%s", dirname (g_curfile->m_filename).c (), relpath.c ());
+		str partpath = fmt ("%s" DIRSLASH "%s", dirname (g_curfile->name ()).c (), relpath.c ());
 		printf ("try %s\n", partpath.c ());
 		FILE* fp = fopen (partpath, "r");
 		if (fp != null)
 			return fp;
 		return null;
 	}
 	LDOpenFile* oldLoad = g_curfile;
 	LDOpenFile* load = new LDOpenFile;
-	load->m_filename = path;
+	load->setName (path);
 	if (g_loadingMainFile)
 		g_curfile = load;
 	ulong numWarnings;
 		load = oldLoad;
 		return null;
 	}
 	for (LDObject* obj : objs)
-		load->m_objs.push_back (obj);
+		load->addObject (obj);
 	fclose (fp);
 	g_loadedFiles.push_back (load);
 	logf ("File %s parsed successfully (%lu warning%s).\n",
 // =============================================================================
 bool LDOpenFile::safeToClose () {
 	setlocale (LC_ALL, "C");
 	// If we have unsaved changes, warn and give the option of saving.
-	if (!m_implicit && History::pos () != savePos) {
+	if (!implicit () && History::pos () != savePos ()) {
 		switch (QMessageBox::question (g_win, "Unsaved Changes",
 			fmt ("There are unsaved changes to %s. Should it be saved?",
-			(m_filename.len () > 0) ? m_filename.chars () : "<anonymous>"),
+			(name ().len () > 0) ? name ().c () : "<anonymous>"),
 			(QMessageBox::Yes | QMessageBox::No | QMessageBox::Cancel), QMessageBox::Cancel))
 		{
 		case QMessageBox::Yes:
 			// If we don't have a file path yet, we have to ask the user for one.
-			if (m_filename.len () == 0) {
+			if (name ().len () == 0) {
-				str path = QFileDialog::getSaveFileName (g_win, "Save As",
+				str newpath = QFileDialog::getSaveFileName (g_win, "Save As",
-					g_curfile->m_filename, "LDraw files (*.dat *.ldr)");
+					g_curfile->name (), "LDraw files (*.dat *.ldr)");
-				if (path.len () == 0)
+				if (newpath.len () == 0)
 					return false;
-				m_filename = path;
+				setName (newpath);
 			}
 			if (!save ()) {
 				str errormsg = fmt ("Failed to save %s: %s\nDo you still want to close?",
-					m_filename.chars (), strerror (lastError));
+					name ().c (), strerror (errno));
 				if (QMessageBox::critical (g_win, "Save Failure", errormsg,
 					(QMessageBox::Yes | QMessageBox::No), QMessageBox::No) == QMessageBox::No)
 				{
 					return false;
 void newFile () {
 	// Create a new anonymous file and set it to our current
 	closeAll ();
 	LDOpenFile* f = new LDOpenFile;
-	f->m_filename = "";
+	f->setName ("");
-	f->m_implicit = false;
+	f->setImplicit (false);
 	g_loadedFiles.push_back (f);
 	g_curfile = f;
 	History::clear ();
 		g_loadingMainFile = false;
 		return;
 	}
-	file->m_implicit = false;
+	file->setImplicit (false);
 	g_curfile = file;
 	// Recalculate the bounding box
 	g_BBox.calculate();
 }
 // =============================================================================
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 // =============================================================================
-bool LDOpenFile::save (str path) {
+bool LDOpenFile::save (str savepath) {
-	if (!~path)
+	if (!~savepath)
-		path = m_filename;
+		savepath = name ();
-	FILE* fp = fopen (path, "w");
+	FILE* fp = fopen (savepath, "w");
-	if (!fp) {
+	if (!fp)
-		lastError = errno;
 		return false;
-	}
 	// If the second object in the list holds the file name, update that now.
 	// Only do this if the file is explicitly open. If it's saved into a directory
 	// called "s" or "48", prepend that into the name.
 	LDComment* fpathComment = null;
-	if (m_implicit == false && m_objs.size () >= 2 && object (1)->getType () == LDObject::Comment) {
+	if (!implicit () && objs ().size () >= 2 && object (1)->getType () == LDObject::Comment) {
 		fpathComment = static_cast<LDComment*> (object (1));
 		if (fpathComment->text.substr (0, 6) == "Name: ") {
 			str newfname;
-			str dir = basename (dirname (path));
+			str dir = basename (dirname (savepath));
 			if (dir == "s" || dir == "48")
 				newfname = fmt ("%s\\", dir.c ());
-			newfname += basename (path);
+			newfname += basename (savepath);
 			fpathComment->text = fmt ("Name: %s", newfname.c ());
 			g_win->buildObjList ();
 		}
 	}
 	// Write all entries now
-	for (LDObject* obj : m_objs) {
+	for (LDObject* obj : objs ()) {
 		// LDraw requires files to have DOS line endings
 		str line = fmt ("%s\r\n", obj->getContents ().chars ());
 		fwrite (line.chars(), 1, line.len (), fp);
 	}
 	fclose (fp);
 	// We have successfully saved, update the save position now.
-	savePos = History::pos ();
+	setSavePos (History::pos ());
-	m_filename = path;
+	setName (savepath);
 	g_win->updateTitle ();
 	return true;
 }
 	g_loadedFiles.clear ();
 	g_loadedFiles.push_back (g_curfile);
 	// Go through all objects in the current file and reload the subfiles
-	for (LDObject* obj : g_curfile->m_objs) {
+	for (LDObject* obj : g_curfile->objs ()) {
 		if (obj->getType() == LDObject::Subfile) {
 			// Note: ref->fileInfo is invalid right now since all subfiles were closed.
 			LDSubfile* ref = static_cast<LDSubfile*> (obj);
 			LDOpenFile* fileInfo = loadSubfile (ref->fileName);
 	m_objs.push_back (obj);
 	if (this == g_curfile)
 		g_BBox.calcObject (obj);
-	return m_objs.size() - 1;
+	return numObjs () - 1;
 }
 // =============================================================================
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 // =============================================================================
 		if (!f->safeToClose ())
 			return false;
 	return true;
 }
+// =============================================================================
+void LDOpenFile::setObject (ulong idx, LDObject* obj) {
+	assert (idx < numObjs ());
+	m_objs[idx] = obj;
+}

Mercurial > ldforge / file comparison

comparison: src/file.cpp

src/file.cpp