ldforge: comparison src/file.cpp

-:1add0ee96fb3
+:2f85d4d286e5
 	for (; i < max && i < (int) lines().size(); ++i)
 	{	str line = lines() [i];
 		// Trim the trailing newline
-		qchar c;
+		QChar c;
 		while (!line.isEmpty() && ((c = line[line.length() - 1]) == '\n' || c == '\r'))
 			line.chop (1);
 		LDObject* obj = parseLine (line);
 	return load;
 }
 // =============================================================================
 // -----------------------------------------------------------------------------
-bool LDFile::safeToClose()
+bool LDFile::isSafeToClose()
 {	typedef QMessageBox msgbox;
 	setlocale (LC_ALL, "C");
 	// If we have unsaved changes, warn and give the option of saving.
 	if (hasUnsavedChanges())
 	LDFile::setCurrent (f);
 	LDFile::closeInitialFile();
 	g_win->R()->setFile (f);
-	g_win->fullRefresh();
+	g_win->doFullRefresh();
 	g_win->updateTitle();
 	f->history().updateActions();
 }
 // =============================================================================
 	// (aside of the one we just opened), close it now.
 	LDFile::closeInitialFile();
 	// Rebuild the object tree view now.
 	LDFile::setCurrent (file);
-	g_win->fullRefresh();
+	g_win->doFullRefresh();
 	// Add it to the recent files list.
 	addRecentFile (path);
 	g_loadingMainFile = 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;
-	LDObject* first = object (1);
+	LDObject* first = getObject (1);
 	if (!implicit() && first != null && first->getType() == LDObject::Comment)
 	{	fpathComment = static_cast<LDComment*> (first);
 		if (fpathComment->text.left (6) == "Name: ")
 			while (comm[0] == ' ')
 				comm.remove (0, 1);
 			// Handle BFC statements
 			if (tokens.size() > 2 && tokens[1] == "BFC")
-			{	for (short i = 0; i < LDBFC::NumStatements; ++i)
+			{	for (int i = 0; i < LDBFC::NumStatements; ++i)
 					if (comm == fmt ("BFC %1", LDBFC::statements [i]))
 						return new LDBFC ( (LDBFC::Type) i);
 				// MLCAD is notorious for stuffing these statements in parts it
 				// creates. The above block only handles valid statements, so we
 			obj->setColor (tokens[1].toLong());
 			obj->setPosition (parseVertex (tokens, 2));  // 2 - 4
 			matrix transform;
-			for (short i = 0; i < 9; ++i)
+			for (int i = 0; i < 9; ++i)
 				transform[i] = tokens[i + 5].toDouble(); // 5 - 13
 			obj->setTransform (transform);
 			obj->setFileInfo (load);
 			return obj;
 			// Line
 			LDLine* obj = new LDLine;
 			obj->setColor (tokens[1].toLong());
-			for (short i = 0; i < 2; ++i)
+			for (int i = 0; i < 2; ++i)
 				obj->setVertex (i, parseVertex (tokens, 2 + (i * 3)));   // 2 - 7
 			return obj;
 		}
 			// Triangle
 			LDTriangle* obj = new LDTriangle;
 			obj->setColor (tokens[1].toLong());
-			for (short i = 0; i < 3; ++i)
+			for (int i = 0; i < 3; ++i)
 				obj->setVertex (i, parseVertex (tokens, 2 + (i * 3)));   // 2 - 10
 			return obj;
 		}
 			else
 				obj = new LDCndLine;
 			obj->setColor (tokens[1].toLong());
-			for (short i = 0; i < 4; ++i)
+			for (int i = 0; i < 4; ++i)
 				obj->setVertex (i, parseVertex (tokens, 2 + (i * 3)));   // 2 - 13
 			return obj;
 		}
 	if (obj->getType() == LDObject::Vertex)
 		m_vertices << obj;
 	obj->setFile (this);
-	return numObjs() - 1;
+	return getObjectCount() - 1;
 }
 // =============================================================================
 // -----------------------------------------------------------------------------
 void LDFile::addObjects (const QList<LDObject*> objs)
 // =============================================================================
 // -----------------------------------------------------------------------------
 bool safeToCloseAll()
 {	for (LDFile* f : g_loadedFiles)
-		if (!f->safeToClose())
+		if (!f->isSafeToClose())
 			return false;
 	return true;
 }
 // =============================================================================
 // -----------------------------------------------------------------------------
 void LDFile::setObject (int idx, LDObject* obj)
-{	assert (idx < numObjs());
+{	assert (idx < m_objects.size());
 	// Mark this change to history
-	str oldcode = object (idx)->raw();
+	str oldcode = getObject (idx)->raw();
 	str newcode = obj->raw();
 	m_history << new EditHistory (idx, oldcode, newcode);
 	obj->setFile (this);
 	m_objects[idx] = obj;
 // =============================================================================
 // -----------------------------------------------------------------------------
 static QList<LDFile*> getFilesUsed (LDFile* node)
 {	QList<LDFile*> filesUsed;
-for (LDObject * obj : node->objects())
+	for (LDObject* obj : node->objects())
 	{	if (obj->getType() != LDObject::Subfile)
 			continue;
 		LDSubfile* ref = static_cast<LDSubfile*> (obj);
 		filesUsed << ref->fileInfo();
 	g_loadedFiles << filesUsed;
 }
 // =============================================================================
 // -----------------------------------------------------------------------------
-LDObject* LDFile::object (int pos) const
+LDObject* LDFile::getObject (int pos) const
 {	if (m_objects.size() <= pos)
 		return null;
 	return m_objects[pos];
 }
 // =============================================================================
 // -----------------------------------------------------------------------------
-LDObject* LDFile::obj (int pos) const
+int LDFile::getObjectCount() const
-{	return object (pos);
-}
-// =============================================================================
-// -----------------------------------------------------------------------------
-int LDFile::numObjs() const
 {	return objects().size();
 }
 // =============================================================================
 // -----------------------------------------------------------------------------
 	assert (m_sel.isEmpty());
 }
 // =============================================================================
 // -----------------------------------------------------------------------------
-const QList<LDObject*>& LDFile::selection() const
+const QList<LDObject*>& LDFile::getSelection() const
 {	return m_sel;
 }

Mercurial > ldforge / file comparison

comparison: src/file.cpp

src/file.cpp