diff -r 6e4b586aa88a -r 25e634a7e1dc ornamentedobj.cpp --- a/ornamentedobj.cpp Wed Jun 03 20:37:17 2009 +0000 +++ b/ornamentedobj.cpp Mon Jun 08 11:36:56 2009 +0000 @@ -1,11 +1,6 @@ -#include - #include "ornamentedobj.h" -#include "texteditor.h" -#include "mapeditor.h" #include "linkablemapobj.h" - -extern TextEditor *textEditor; +#include "vymmodel.h" ///////////////////////////////////////////////////////////////// // OrnamentedObj @@ -250,48 +245,8 @@ } -QString OrnamentedObj::getSystemFlagName(const QPointF &p) +QString OrnamentedObj::getSystemFlagName(const QPointF &p) //FIXME-3 { return systemFlags->getFlagName(p); } -/* FIXME-3 should move to VymView ?! void OrnamentedObj::getNoteFromTextEditor () -{ - note.setFilenameHint (textEditor->getFilename()); - note.setFontHint (textEditor->getFontHint() ); - setNote( textEditor->getText() ); -} -*/ - -QString OrnamentedObj::getOrnXMLAttr() //FIXME-2 still needed? -{ - QString posAttr; - - if (treeItem->depth()==0) - posAttr= - attribut("absPosX",QString().setNum(absPos.x())) + - attribut("absPosY",QString().setNum(absPos.y())); - else - { - /* FIXME-2 - if (treeItem->depth()==1 || typid (*this)==typid (FloatImageObj)) - { - if (relPos.x()==0 && relPos.y()==0) - setRelPos(); - posAttr= - attribut("relPosX",QString().setNum(relPos.x())) + - attribut("relPosY",QString().setNum(relPos.y())); - } else - posAttr=""; - */ - } - -/* FIXME-2 QString hideExpAttr; - if (hideExport) - hideExpAttr= attribut("hideInExport","true"); - else - hideExpAttr=""; -*/ - return posAttr +getLinkAttr() ;//+hideExpAttr; -} -