1.1 --- a/mapcenterobj.cpp Tue Apr 07 16:15:53 2009 +0000
1.2 +++ b/mapcenterobj.cpp Mon Apr 20 10:42:05 2009 +0000
1.3 @@ -3,8 +3,6 @@
1.4 #include "floatimageobj.h"
1.5 #include "geometry.h"
1.6 #include "mapcenterobj.h"
1.7 -#include "mapeditor.h"
1.8 -
1.9
1.10 /////////////////////////////////////////////////////////////////
1.11 // MapCenterObj
1.12 @@ -113,6 +111,7 @@
1.13
1.14 LinkableMapObj* MapCenterObj::findMapObj(QPointF p, LinkableMapObj *excludeLMO)
1.15 {
1.16 + /* FIXME-1 should not be necessary
1.17 LinkableMapObj *lmo;
1.18
1.19 // Search through child branches
1.20 @@ -129,6 +128,7 @@
1.21 if (inBox(p,floatimage.at(i)->getClickBox()) && (floatimage.at(i) != excludeLMO) && floatimage.at(i)->getParObj()!= excludeLMO) return floatimage.at(i);
1.22
1.23 // nothing found
1.24 + */
1.25 return NULL;
1.26 }
1.27
1.28 @@ -144,19 +144,21 @@
1.29 attribut("y2",QString().setNum(absPos.y()+height()-offset.y()));
1.30
1.31 // Providing an ID for a branch makes export to XHTML easier
1.32 + /* FIXME-3
1.33 QString idAttr;
1.34 if (treeItem->xlinkCount()>0)
1.35 idAttr=attribut ("id",mapEditor->getModel()->getSelectString(this)); //TODO directly access model
1.36
1.37 else
1.38 idAttr="";
1.39 + */
1.40
1.41 QString linkAttr=getLinkAttr();
1.42
1.43 s=beginElement ("mapcenter"
1.44 +getOrnXMLAttr()
1.45 +areaAttr
1.46 - +idAttr
1.47 +// +idAttr
1.48 +getIncludeImageAttr() );
1.49 incIndent();
1.50 if (heading->getColor()!=QColor("black"))