1.1 --- a/ornamentedobj.cpp	Wed Jun 03 20:37:17 2009 +0000
     1.2 +++ b/ornamentedobj.cpp	Mon Jun 08 11:36:56 2009 +0000
     1.3 @@ -1,11 +1,6 @@
     1.4 -#include <typeinfo> 
     1.5 -
     1.6  #include "ornamentedobj.h"
     1.7 -#include "texteditor.h"
     1.8 -#include "mapeditor.h"
     1.9  #include "linkablemapobj.h"
    1.10 -
    1.11 -extern TextEditor *textEditor;
    1.12 +#include "vymmodel.h"
    1.13  
    1.14  /////////////////////////////////////////////////////////////////
    1.15  // OrnamentedObj
    1.16 @@ -250,48 +245,8 @@
    1.17  }
    1.18  
    1.19  
    1.20 -QString OrnamentedObj::getSystemFlagName(const QPointF &p)
    1.21 +QString OrnamentedObj::getSystemFlagName(const QPointF &p) //FIXME-3
    1.22  {
    1.23  	return systemFlags->getFlagName(p);	
    1.24  }
    1.25  
    1.26 -/* FIXME-3 should move to VymView ?!  void OrnamentedObj::getNoteFromTextEditor ()
    1.27 -{
    1.28 -	note.setFilenameHint (textEditor->getFilename());
    1.29 -	note.setFontHint (textEditor->getFontHint() );
    1.30 -	setNote( textEditor->getText() );
    1.31 -}
    1.32 -*/
    1.33 -
    1.34 -QString OrnamentedObj::getOrnXMLAttr()	//FIXME-2 still needed?
    1.35 -{
    1.36 -	QString posAttr;
    1.37 -
    1.38 -	if (treeItem->depth()==0)
    1.39 -		posAttr=		
    1.40 -			attribut("absPosX",QString().setNum(absPos.x())) +
    1.41 -			attribut("absPosY",QString().setNum(absPos.y())); 
    1.42 -	else
    1.43 -	{
    1.44 -	/* FIXME-2
    1.45 -		if (treeItem->depth()==1 || typid (*this)==typid (FloatImageObj))
    1.46 -		{
    1.47 -			if (relPos.x()==0 && relPos.y()==0)
    1.48 -				setRelPos();
    1.49 -			posAttr=
    1.50 -				attribut("relPosX",QString().setNum(relPos.x())) +
    1.51 -				attribut("relPosY",QString().setNum(relPos.y())); 
    1.52 -		} else
    1.53 -			posAttr="";
    1.54 -	*/		
    1.55 -	}	
    1.56 -
    1.57 -/* FIXME-2 QString hideExpAttr;
    1.58 -	if (hideExport)
    1.59 -		hideExpAttr= attribut("hideInExport","true");
    1.60 -	else	
    1.61 -		hideExpAttr="";
    1.62 -*/
    1.63 -	return posAttr +getLinkAttr() ;//+hideExpAttr;
    1.64 -}
    1.65 -