diff -r 25a77484ec72 -r db0ec4bcf416 mapcenterobj.cpp --- a/mapcenterobj.cpp Tue Apr 07 16:15:53 2009 +0000 +++ b/mapcenterobj.cpp Mon Apr 20 10:42:05 2009 +0000 @@ -3,8 +3,6 @@ #include "floatimageobj.h" #include "geometry.h" #include "mapcenterobj.h" -#include "mapeditor.h" - ///////////////////////////////////////////////////////////////// // MapCenterObj @@ -113,6 +111,7 @@ LinkableMapObj* MapCenterObj::findMapObj(QPointF p, LinkableMapObj *excludeLMO) { + /* FIXME-1 should not be necessary LinkableMapObj *lmo; // Search through child branches @@ -129,6 +128,7 @@ if (inBox(p,floatimage.at(i)->getClickBox()) && (floatimage.at(i) != excludeLMO) && floatimage.at(i)->getParObj()!= excludeLMO) return floatimage.at(i); // nothing found + */ return NULL; } @@ -144,19 +144,21 @@ attribut("y2",QString().setNum(absPos.y()+height()-offset.y())); // Providing an ID for a branch makes export to XHTML easier + /* FIXME-3 QString idAttr; if (treeItem->xlinkCount()>0) idAttr=attribut ("id",mapEditor->getModel()->getSelectString(this)); //TODO directly access model else idAttr=""; + */ QString linkAttr=getLinkAttr(); s=beginElement ("mapcenter" +getOrnXMLAttr() +areaAttr - +idAttr +// +idAttr +getIncludeImageAttr() ); incIndent(); if (heading->getColor()!=QColor("black"))