1.1 --- a/flagrowobj.cpp	Tue Mar 14 14:27:04 2006 +0000
     1.2 +++ b/flagrowobj.cpp	Tue Mar 14 14:27:04 2006 +0000
     1.3 @@ -113,10 +113,7 @@
     1.4  	if (!inBox (p)) return "";
     1.5  	FlagObj *fo;
     1.6  	for (fo=flag.first();fo; fo=flag.next() )
     1.7 -	{	
     1.8 -		cout << " "<<fo->getName()<<endl;
     1.9  		if (fo->inBox (p)) return fo->getName();
    1.10 -	}	
    1.11  	return "";	
    1.12  
    1.13  	

     2.1 --- a/floatimageobj.cpp	Tue Mar 14 14:27:04 2006 +0000
     2.2 +++ b/floatimageobj.cpp	Tue Mar 14 14:27:04 2006 +0000
     2.3 @@ -146,12 +146,6 @@
     2.4  QString FloatImageObj::saveToDir (const QString &tmpdir,const QString &prefix, const QPoint &p)
     2.5  {
     2.6  	saveCounter++;
     2.7 -
     2.8 -	QString posAttr=
     2.9 -		attribut("relPosX",QString().setNum(relPos.x(),10)) +
    2.10 -		attribut("relPosY",QString().setNum(relPos.y(),10)); 
    2.11 -
    2.12 -	QString linkAttr=getLinkAttr();
    2.13  	
    2.14  	QString useOrientAttr;
    2.15  	if (useOrientation)
    2.16 @@ -185,13 +179,12 @@
    2.17  	icon->save (tmpdir + "/" + url, filetype);
    2.18  
    2.19      return singleElement ("floatimage",  
    2.20 -		posAttr + 
    2.21 -		linkAttr +
    2.22 -		useOrientAttr + 
    2.23 -		saveInMapAttr + 
    2.24 -		exportAttr + 
    2.25 -		zAttr + 
    2.26 -		attribut ("href",QString ("file:")+url)
    2.27 +		getOrnAttr() 
    2.28 +		+useOrientAttr 
    2.29 +		+saveInMapAttr 
    2.30 +		+exportAttr  
    2.31 +		+zAttr  
    2.32 +		+attribut ("href",QString ("file:")+url)
    2.33  	);	
    2.34  }
    2.35  

     3.1 --- a/floatobj.cpp	Tue Mar 14 14:27:04 2006 +0000
     3.2 +++ b/floatobj.cpp	Tue Mar 14 14:27:04 2006 +0000
     3.3 @@ -6,7 +6,7 @@
     3.4  // FloatObj
     3.5  /////////////////////////////////////////////////////////////////
     3.6  
     3.7 -FloatObj::FloatObj ():LinkableMapObj() 
     3.8 +FloatObj::FloatObj ():OrnamentedObj() 
     3.9  {
    3.10  //    cout << "Const FloatObj ()\n";
    3.11      setParObj (this);	
    3.12 @@ -14,7 +14,7 @@
    3.13      depth=-1;
    3.14  }
    3.15  
    3.16 -FloatObj::FloatObj (QCanvas* c):LinkableMapObj(c)
    3.17 +FloatObj::FloatObj (QCanvas* c):OrnamentedObj(c)
    3.18  {
    3.19  //	cout << "Const FloatObj (c)  called from MapCenterObj (c)\n";
    3.20      setParObj (this);	
    3.21 @@ -22,7 +22,7 @@
    3.22      depth=-1;
    3.23  }
    3.24  
    3.25 -FloatObj::FloatObj (QCanvas* c, LinkableMapObj* p):LinkableMapObj (c)
    3.26 +FloatObj::FloatObj (QCanvas* c, LinkableMapObj* p):OrnamentedObj (c)
    3.27  {
    3.28  //    cout << "Const FloatObj (c,p)\n";
    3.29      setParObj (p);	
    3.30 @@ -116,7 +116,7 @@
    3.31  void FloatObj::select()
    3.32  {
    3.33      LinkableMapObj::select();
    3.34 -	setLinkColor(parObj->getLinkColor());
    3.35 +	LinkableMapObj::setLinkColor(parObj->getLinkColor());
    3.36  
    3.37  	// Update FloatExport switch in context menu
    3.38  	if (floatExport)