1.1 --- a/mapcenterobj.cpp	Mon Nov 20 12:12:00 2006 +0000
     1.2 +++ b/mapcenterobj.cpp	Mon Nov 20 12:12:02 2006 +0000
     1.3 @@ -2,7 +2,6 @@
     1.4  
     1.5  #include "mapcenterobj.h"
     1.6  #include "floatimageobj.h"
     1.7 -#include "mapeditor.h"
     1.8  
     1.9  /////////////////////////////////////////////////////////////////
    1.10  // MapCenterObj
    1.11 @@ -92,8 +91,8 @@
    1.12  		b->setOrientation();
    1.13  	}
    1.14  	
    1.15 -	FloatObj *fo;
    1.16 -	for (fo=floatimage.first(); fo; fo=floatimage.next() ) fo->setRelPos();
    1.17 +	for (int i=0; i<floatimage.size(); ++i)
    1.18 +		floatimage.at(i)->setRelPos();
    1.19  
    1.20  	if (repositionRequest) reposition();
    1.21  }
    1.22 @@ -113,9 +112,8 @@
    1.23  	if (inBox (p) && (this != excludeLMO) ) return this;
    1.24  
    1.25  	// Search float images
    1.26 -	FloatImageObj *foi;
    1.27 -	for (foi=floatimage.first(); foi; foi=floatimage.next() )
    1.28 -		if (foi->inBox(p) && (foi != excludeLMO) && foi->getParObj()!= excludeLMO) return foi;
    1.29 +	for (int i=0; i<floatimage.size(); ++i)
    1.30 +		if (floatimage.at(i)->inBox(p) && (floatimage.at(i) != excludeLMO) && floatimage.at(i)->getParObj()!= excludeLMO) return floatimage.at(i);
    1.31  
    1.32  	// nothing found
    1.33  	return NULL;
    1.34 @@ -168,9 +166,8 @@
    1.35  		s+=bo->saveToDir(tmpdir,prefix, offset);
    1.36  
    1.37  	// Save FloatImages
    1.38 -	FloatImageObj *fio;
    1.39 -	for (fio=floatimage.first(); fio; fio=floatimage.next() )
    1.40 -		s+=fio->saveToDir (tmpdir,prefix);
    1.41 +	for (int i=0; i<floatimage.size(); ++i)
    1.42 +		s+=floatimage.at(i)->saveToDir (tmpdir,prefix);
    1.43  
    1.44  	// Save XLinks
    1.45  	XLinkObj *xlo;