Mercurial > ldforge / file diff

--- a/src/extprogs.cpp	Fri May 24 04:34:20 2013 +0300
+++ b/src/extprogs.cpp	Fri May 24 15:23:56 2013 +0300
@@ -106,7 +106,7 @@
 }
 
 // =============================================================================
-void writeObjects (std::vector<LDObject*>& objects, FILE* fp) {
+void writeObjects (vector<LDObject*>& objects, FILE* fp) {
 	for (LDObject* obj : objects) {
 		if (obj->getType () == LDObject::Subfile) {
 			vector<LDObject*> objs = static_cast<LDSubfile*> (obj)->inlineContents (true, false);
@@ -127,7 +127,7 @@
 	}
 }
 
-void writeObjects (std::vector<LDObject*>& objects, str fname) {
+void writeObjects (vector<LDObject*>& objects, str fname) {
 	// Write the input file
 	FILE* fp = fopen (fname, "w");
 	if (!fp) {
@@ -153,7 +153,7 @@
 
 // =============================================================================
 void writeColorGroup (const short colnum, str fname) {
-	std::vector<LDObject*> objects;
+	vector<LDObject*> objects;
 	for (LDObject*& obj : g_curfile->objs ()) {
 		if (obj->isColored () == false || obj->color != colnum)
 			continue;
@@ -217,9 +217,9 @@
 	}
 	
 	ComboHistory* cmb = new ComboHistory ();
-	std::vector<LDObject*> objs = loadFileContents (fp, null),
+	vector<LDObject*> objs = loadFileContents (fp, null),
 		copies;
-	std::vector<ulong> indices;
+	vector<ulong> indices;
 	
 	// If we replace the objects, delete the selection now.
 	if (replace)