diff -r 2881c4424190 -r 3086ee01554a mainwindow.cpp
--- a/mainwindow.cpp	Mon Dec 07 21:56:46 2009 +0000
+++ b/mainwindow.cpp	Thu Dec 10 17:04:48 2009 +0000
@@ -24,7 +24,7 @@
 #include "warningdialog.h"
 #include "xlinkitem.h"
 
-#include <modeltest.h>	// FIXME-3
+//#include <modeltest.h>	// FIXME-3
 
 #if defined(Q_OS_WIN32)
 // Define only this structure as opposed to
@@ -58,7 +58,6 @@
 QMenu* branchRemoveContextMenu;
 QMenu* branchLinksContextMenu;
 QMenu* branchXLinksContextMenuEdit;
-QMenu* branchXLinksContextMenuFollow;
 QMenu* floatimageContextMenu;
 QMenu* canvasContextMenu;
 QMenu* fileLastMapsMenu;
@@ -1627,8 +1626,6 @@
 	// This will be populated "on demand" in MapEditor::updateActions
 	branchContextMenu->addSeparator();	
 	branchXLinksContextMenuEdit =branchContextMenu->addMenu (tr ("Edit XLink","Context menu name"));
-	branchXLinksContextMenuFollow =branchContextMenu->addMenu (tr ("Follow XLink","Context menu name"));
-	connect( branchXLinksContextMenuFollow, SIGNAL( triggered(QAction *) ), this, SLOT( editFollowXLink(QAction * ) ) );
 	connect( branchXLinksContextMenuEdit, SIGNAL( triggered(QAction *) ), this, SLOT( editEditXLink(QAction * ) ) );
 
 
@@ -1760,7 +1757,7 @@
 	VymModel *vm=new VymModel;
 
 	/////////////////////////////////////
-	new ModelTest(vm, this);	//FIXME-3
+//	new ModelTest(vm, this);	//FIXME-3
 	/////////////////////////////////////
 
 	VymView *vv=new VymView (vm);
@@ -2977,14 +2974,6 @@
 	if (m) m->saveFloatImage();
 }
 
-void Main::editFollowXLink(QAction *a)
-{
-
-	VymModel *m=currentModel();
-	if (m)
-		m->followXLink(branchXLinksContextMenuFollow->actions().indexOf(a));
-}
-
 void Main::editEditXLink(QAction *a)
 {
 	VymModel *m=currentModel();
@@ -3461,7 +3450,6 @@
 			{
 				// Take care of xlinks  
 				branchXLinksContextMenuEdit->clear();
-				branchXLinksContextMenuFollow->clear();
 				if (selbi->xlinkCount()>0)
 				{
 					BranchItem *bi;
@@ -3474,7 +3462,6 @@
 							s=bi->getHeading();
 							if (s.length()>xLinkMenuWidth)
 								s=s.left(xLinkMenuWidth)+"...";
-							branchXLinksContextMenuFollow->addAction (s);
 							branchXLinksContextMenuEdit->addAction (s);
 						}	
 					}