ldforge: comparison src/file.cpp

-:6ee9917b79f8
+:4e44c92e21dd
 	str prims () { return pathInfo.primsPath; }
 	str parts () { return pathInfo.partsPath; }
 }
 // =============================================================================
-OpenFile::OpenFile () {
+LDOpenFile::LDOpenFile () {
 	m_implicit = true;
 	savePos = -1;
 }
 // =============================================================================
-OpenFile::~OpenFile () {
+LDOpenFile::~LDOpenFile () {
 	// Clear everything from the model
 	for (LDObject* obj : m_objs)
 		delete obj;
 	// Clear the cache as well
 	for (LDObject* obj : m_objCache)
 		delete obj;
 }
 // =============================================================================
-OpenFile* findLoadedFile (str zName) {
+LDOpenFile* findLoadedFile (str zName) {
-	for (OpenFile* file : g_loadedFiles)
+	for (LDOpenFile* file : g_loadedFiles)
 		if (file->m_filename == zName)
 			return file;
 	return null;
 }
 }
 // =============================================================================
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 // =============================================================================
-OpenFile* openDATFile (str path, bool search, bool mainfile) {
+LDOpenFile* openDATFile (str path, bool search, bool mainfile) {
 	logf ("Opening %s...\n", path.chars());
 	// Convert the file name to lowercase since some parts contain uppercase
 	// file names. I'll assume here that the library will always use lowercase
 	// file names for the actual parts..
 	if (!fp) {
 		logf (LOG_Error, "Couldn't open %s: %s\n", path.chars (), strerror (errno));
 		return null;
 	}
-	OpenFile* load = new OpenFile;
+	LDOpenFile* load = new LDOpenFile;
 	load->m_filename = path;
 	if (mainfile)
 		g_curfile = load;
 }
 // =============================================================================
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 // =============================================================================
-bool OpenFile::safeToClose () {
+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) {
 		switch (QMessageBox::question (g_win, "Unsaved Changes",
 void closeAll () {
 	if (!g_loadedFiles.size())
 		return;
 	// Remove all loaded files and the objects they contain
-	for (OpenFile* file : g_loadedFiles)
+	for (LDOpenFile* file : g_loadedFiles)
 		delete file;
 	// Clear the array
 	g_loadedFiles.clear();
 	g_curfile = NULL;
 // =============================================================================
 void newFile () {
 	// Create a new anonymous file and set it to our current
 	closeAll ();
-	OpenFile* f = new OpenFile;
+	LDOpenFile* f = new LDOpenFile;
 	f->m_filename = "";
 	f->m_implicit = false;
 	g_loadedFiles.push_back (f);
 	g_curfile = f;
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 // =============================================================================
 void openMainFile (str path) {
 	closeAll ();
-	OpenFile* file = openDATFile (path, false, true);
+	LDOpenFile* file = openDATFile (path, false, true);
 	if (!file) {
 		// Tell the user loading failed.
 		setlocale (LC_ALL, "C");
 		critical (fmt ("Failed to open %s: %s", path.chars(), strerror (errno)));
 }
 // =============================================================================
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 // =============================================================================
-bool OpenFile::save (str path) {
+bool LDOpenFile::save (str path) {
 	if (!~path)
 		path = m_filename;
 	FILE* fp = fopen (path, "w");
 			// Subfile
 			CHECK_TOKEN_COUNT (15)
 			CHECK_TOKEN_NUMBERS (1, 13)
 			// Try open the file
-			OpenFile* pFile = loadSubfile (tokens[14]);
+			LDOpenFile* pFile = loadSubfile (tokens[14]);
 			// If we cannot open the file, mark it an error
 			if (!pFile)
 				return new LDGibberish (line, "Could not open referred file");
 }
 // =============================================================================
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 // =============================================================================
-OpenFile* loadSubfile (str zFile) {
+LDOpenFile* loadSubfile (str zFile) {
 	// Try open the file
-	OpenFile* pFile = findLoadedFile (zFile);
+	LDOpenFile* pFile = findLoadedFile (zFile);
 	if (!pFile)
 		pFile = openDATFile (zFile, true, false);
 	return pFile;
 }
 void reloadAllSubfiles () {
 	if (!g_curfile)
 		return;
 	// First, close all but the current open file.
-	for (OpenFile* file : g_loadedFiles)
+	for (LDOpenFile* file : g_loadedFiles)
 		if (file != g_curfile)
 			delete file;
 	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) {
 		if (obj->getType() == LDObject::Subfile) {
 			// Note: ref->pFile is invalid right now since all subfiles were closed.
 			LDSubfile* ref = static_cast<LDSubfile*> (obj);
-			OpenFile* pFile = loadSubfile (ref->fileName);
+			LDOpenFile* pFile = loadSubfile (ref->fileName);
 			if (pFile)
 				ref->fileInfo = pFile;
 			else {
 				// Couldn't load the file, mark it an error
 }
 // =============================================================================
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 // =============================================================================
-ulong OpenFile::addObject (LDObject* obj) {
+ulong LDOpenFile::addObject (LDObject* obj) {
 	m_objs.push_back (obj);
 	if (this == g_curfile)
 		g_BBox.calcObject (obj);
 }
 // =============================================================================
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 // =============================================================================
-void OpenFile::insertObj (const ulong pos, LDObject* obj) {
+void LDOpenFile::insertObj (const ulong pos, LDObject* obj) {
 	m_objs.insert (m_objs.begin () + pos, obj);
 	if (this == g_curfile)
 		g_BBox.calcObject (obj);
 }
 // =============================================================================
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 // =============================================================================
-void OpenFile::forgetObject (LDObject* obj) {
+void LDOpenFile::forgetObject (LDObject* obj) {
 	// Find the index for the given object
 	ulong ulIndex;
 	for (ulIndex = 0; ulIndex < (ulong)m_objs.size(); ++ulIndex)
 		if (m_objs[ulIndex] == obj)
 			break; // found it
 	}
 }
 // =============================================================================
 bool safeToCloseAll () {
-	for (OpenFile* f : g_loadedFiles)
+	for (LDOpenFile* f : g_loadedFiles)
 		if (!f->safeToClose ())
 			return false;
 	return true;
 }

Mercurial > ldforge / file comparison

comparison: src/file.cpp

src/file.cpp