diff -r 7c3ee77f4449 -r 53efc2562a7d mapcenterobj.cpp
--- a/mapcenterobj.cpp	Mon Nov 20 12:12:00 2006 +0000
+++ b/mapcenterobj.cpp	Mon Nov 20 12:12:02 2006 +0000
@@ -2,7 +2,6 @@
 
 #include "mapcenterobj.h"
 #include "floatimageobj.h"
-#include "mapeditor.h"
 
 /////////////////////////////////////////////////////////////////
 // MapCenterObj
@@ -92,8 +91,8 @@
 		b->setOrientation();
 	}
 	
-	FloatObj *fo;
-	for (fo=floatimage.first(); fo; fo=floatimage.next() ) fo->setRelPos();
+	for (int i=0; i<floatimage.size(); ++i)
+		floatimage.at(i)->setRelPos();
 
 	if (repositionRequest) reposition();
 }
@@ -113,9 +112,8 @@
 	if (inBox (p) && (this != excludeLMO) ) return this;
 
 	// Search float images
-	FloatImageObj *foi;
-	for (foi=floatimage.first(); foi; foi=floatimage.next() )
-		if (foi->inBox(p) && (foi != excludeLMO) && foi->getParObj()!= excludeLMO) return foi;
+	for (int i=0; i<floatimage.size(); ++i)
+		if (floatimage.at(i)->inBox(p) && (floatimage.at(i) != excludeLMO) && floatimage.at(i)->getParObj()!= excludeLMO) return floatimage.at(i);
 
 	// nothing found
 	return NULL;
@@ -168,9 +166,8 @@
 		s+=bo->saveToDir(tmpdir,prefix, offset);
 
 	// Save FloatImages
-	FloatImageObj *fio;
-	for (fio=floatimage.first(); fio; fio=floatimage.next() )
-		s+=fio->saveToDir (tmpdir,prefix);
+	for (int i=0; i<floatimage.size(); ++i)
+		s+=floatimage.at(i)->saveToDir (tmpdir,prefix);
 
 	// Save XLinks
 	XLinkObj *xlo;