diff -r d85834ad8c54 -r 133e2ed6b9c5 editxlinkdialog.cpp
--- a/editxlinkdialog.cpp	Mon Aug 24 14:39:07 2009 +0000
+++ b/editxlinkdialog.cpp	Thu Sep 03 08:52:00 2009 +0000
@@ -3,13 +3,15 @@
 #include <typeinfo>
 #include <QColorDialog>
 
+#include "branchitem.h"
+
 EditXLinkDialog::EditXLinkDialog (QWidget *parent):QDialog (parent)
 {
 	ui.setupUi (this);
 
 	delink=false;
-	xlo=false;
-	selection=NULL;
+	xli=NULL;
+	selbi=NULL;
 
 	connect ( ui.widthBox, SIGNAL (valueChanged( int)), this, SLOT (widthChanged (int)));
 	connect ( ui.colorButton, SIGNAL (clicked( )), this, SLOT (colorButtonPressed()));
@@ -31,47 +33,43 @@
 
 void EditXLinkDialog::widthChanged( int  w)
 {
-	xlo->setWidth(w);
+	xli->setWidth(w);
 }
 
-void EditXLinkDialog::setXLink( XLinkObj * xo)
+void EditXLinkDialog::setXLink( XLinkItem * xi)
 {
-	xlo=xo;
-	ui.colorButton->setPaletteBackgroundColor (xlo->getColor() );
-	ui.widthBox->setValue(xlo->getWidth());
+	xli=xi;
+	ui.colorButton->setPaletteBackgroundColor (xli->getColor() );
+	ui.widthBox->setValue(xli->getWidth());
 }
 
-void EditXLinkDialog::setSelection(LinkableMapObj *s)
+void EditXLinkDialog::setSelection(BranchItem *bi)
 {
-	selection=s;
+	selbi=bi;
 }
 
 void EditXLinkDialog::colorButtonPressed()
 {
-	if (xlo)
+	if (xli)
 	{	
-		QColor col = QColorDialog::getColor(xlo->getColor(), this );
+		QColor col = QColorDialog::getColor(xli->getColor(), this );
 		if ( !col.isValid() ) return;
-		xlo->setColor( col );
+		xli->setColor( col );
 		ui.colorButton->setPaletteBackgroundColor (col);
 	}
 }
 
-void EditXLinkDialog::setColorHeadingButtonPressed()	//FIXME-2
+void EditXLinkDialog::setColorHeadingButtonPressed()	
 {
-/*
-	if (xlo)
+	if (xli)
 	{	
-		if (selection && 
-			(typid(*selection) == typid(BranchObj) || 
-			typid(*selection) == typid(MapCenterObj))  )
+		if (selbi)
 		{
-			QColor col=((BranchObj*)(selection))->getColor();
-			xlo->setColor(col);
+			QColor col=selbi->getHeadingColor();
+			xli->setColor(col);
 			ui.colorButton->setPaletteBackgroundColor (col);
 		}
 	}
-	*/
 }
 
 bool EditXLinkDialog::useSettingsGlobal ()