Mercurial > ldforge / file diff

--- a/src/gui_editactions.cpp	Tue Jul 30 21:31:36 2013 +0300
+++ b/src/gui_editactions.cpp	Thu Aug 01 02:33:07 2013 +0300
@@ -89,7 +89,7 @@
 	
 	for (str line : clipboardText.split ("\n")) {
 		LDObject* pasted = parseLine (line);
-		LDOpenFile::current()->insertObj (idx++, pasted);
+		LDFile::current()->insertObj (idx++, pasted);
 		g_win->sel() << pasted;
 		g_win->R()->compileObject (pasted);
 		++num;
@@ -135,12 +135,12 @@
 			delete inlineobj;
 		
 			LDObject* newobj = parseLine (line);
-			LDOpenFile::current()->insertObj (idx++, newobj);
+			LDFile::current()->insertObj (idx++, newobj);
 			g_win->sel() << newobj;
 		}
 		
 		// Delete the subfile now as it's been inlined.
-		LDOpenFile::current()->forgetObject (obj);
+		LDFile::current()->forgetObject (obj);
 		delete obj;
 	}
 	
@@ -176,8 +176,8 @@
 		
 		// Replace the quad with the first triangle and add the second triangle
 		// after the first one.
-		LDOpenFile::current()->setObject (index, triangles[0]);
-		LDOpenFile::current()->insertObj (index + 1, triangles[1]);
+		LDFile::current()->setObject (index, triangles[0]);
+		LDFile::current()->insertObj (index + 1, triangles[1]);
 		
 		// Delete this quad now, it has been split.
 		delete obj;
@@ -289,7 +289,7 @@
 			ulong idx = obj->getIndex() + i + 1;
 			
 			lines[i]->setColor (edgecolor);
-			LDOpenFile::current()->insertObj (idx, lines[i]);
+			LDFile::current()->insertObj (idx, lines[i]);
 			g_win->R()->compileObject (lines[i]);
 		}
 		
@@ -317,7 +317,7 @@
 			vert->pos = obj->getVertex (i);
 			vert->setColor (obj->color());
 			
-			LDOpenFile::current()->insertObj (++idx, vert);
+			LDFile::current()->insertObj (++idx, vert);
 			g_win->R()->compileObject (vert);
 			++num;
 		}
@@ -348,11 +348,11 @@
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 // =============================================================================
 DEFINE_ACTION (Undo, CTRL (Z)) {
-	LDOpenFile::current()->undo();
+	LDFile::current()->undo();
 }
 
 DEFINE_ACTION (Redo, CTRL_SHIFT (Z)) {
-	LDOpenFile::current()->redo();
+	LDFile::current()->redo();
 }
 
 // =============================================================================
@@ -618,7 +618,7 @@
 
 // =================================================================================================
 static bool isColorUsed (short colnum) {
-	for (LDObject* obj : LDOpenFile::current()->objs())
+	for (LDObject* obj : LDFile::current()->objs())
 		if (obj->isColored() && obj->color() == colnum)
 			return true;