# HG changeset patch
# User insilmaril
# Date 1142346424 0
# Node ID f5243654fe863444cbc73e0cdfc9ce2aca70eef4
# Parent  bcfd5aad58d6d3512e294c4dcf3752cb69b0c179
hideLinkInExport for Branches (Floats still missing). Floats are now OrnamentedObj.

diff -r bcfd5aad58d6 -r f5243654fe86 flagrowobj.cpp
--- a/flagrowobj.cpp	Tue Mar 14 14:27:04 2006 +0000
+++ b/flagrowobj.cpp	Tue Mar 14 14:27:04 2006 +0000
@@ -113,10 +113,7 @@
 	if (!inBox (p)) return "";
 	FlagObj *fo;
 	for (fo=flag.first();fo; fo=flag.next() )
-	{	
-		cout << " "<<fo->getName()<<endl;
 		if (fo->inBox (p)) return fo->getName();
-	}	
 	return "";	
 
 	
diff -r bcfd5aad58d6 -r f5243654fe86 floatimageobj.cpp
--- a/floatimageobj.cpp	Tue Mar 14 14:27:04 2006 +0000
+++ b/floatimageobj.cpp	Tue Mar 14 14:27:04 2006 +0000
@@ -146,12 +146,6 @@
 QString FloatImageObj::saveToDir (const QString &tmpdir,const QString &prefix, const QPoint &p)
 {
 	saveCounter++;
-
-	QString posAttr=
-		attribut("relPosX",QString().setNum(relPos.x(),10)) +
-		attribut("relPosY",QString().setNum(relPos.y(),10)); 
-
-	QString linkAttr=getLinkAttr();
 	
 	QString useOrientAttr;
 	if (useOrientation)
@@ -185,13 +179,12 @@
 	icon->save (tmpdir + "/" + url, filetype);
 
     return singleElement ("floatimage",  
-		posAttr + 
-		linkAttr +
-		useOrientAttr + 
-		saveInMapAttr + 
-		exportAttr + 
-		zAttr + 
-		attribut ("href",QString ("file:")+url)
+		getOrnAttr() 
+		+useOrientAttr 
+		+saveInMapAttr 
+		+exportAttr  
+		+zAttr  
+		+attribut ("href",QString ("file:")+url)
 	);	
 }
 
diff -r bcfd5aad58d6 -r f5243654fe86 floatobj.cpp
--- a/floatobj.cpp	Tue Mar 14 14:27:04 2006 +0000
+++ b/floatobj.cpp	Tue Mar 14 14:27:04 2006 +0000
@@ -6,7 +6,7 @@
 // FloatObj
 /////////////////////////////////////////////////////////////////
 
-FloatObj::FloatObj ():LinkableMapObj() 
+FloatObj::FloatObj ():OrnamentedObj() 
 {
 //    cout << "Const FloatObj ()\n";
     setParObj (this);	
@@ -14,7 +14,7 @@
     depth=-1;
 }
 
-FloatObj::FloatObj (QCanvas* c):LinkableMapObj(c)
+FloatObj::FloatObj (QCanvas* c):OrnamentedObj(c)
 {
 //	cout << "Const FloatObj (c)  called from MapCenterObj (c)\n";
     setParObj (this);	
@@ -22,7 +22,7 @@
     depth=-1;
 }
 
-FloatObj::FloatObj (QCanvas* c, LinkableMapObj* p):LinkableMapObj (c)
+FloatObj::FloatObj (QCanvas* c, LinkableMapObj* p):OrnamentedObj (c)
 {
 //    cout << "Const FloatObj (c,p)\n";
     setParObj (p);	
@@ -116,7 +116,7 @@
 void FloatObj::select()
 {
     LinkableMapObj::select();
-	setLinkColor(parObj->getLinkColor());
+	LinkableMapObj::setLinkColor(parObj->getLinkColor());
 
 	// Update FloatExport switch in context menu
 	if (floatExport)