1.1 --- a/mainwindow.cpp	Mon Dec 07 21:56:46 2009 +0000
     1.2 +++ b/mainwindow.cpp	Thu Dec 10 17:04:48 2009 +0000
     1.3 @@ -24,7 +24,7 @@
     1.4  #include "warningdialog.h"
     1.5  #include "xlinkitem.h"
     1.6  
     1.7 -#include <modeltest.h>	// FIXME-3
     1.8 +//#include <modeltest.h>	// FIXME-3
     1.9  
    1.10  #if defined(Q_OS_WIN32)
    1.11  // Define only this structure as opposed to
    1.12 @@ -58,7 +58,6 @@
    1.13  QMenu* branchRemoveContextMenu;
    1.14  QMenu* branchLinksContextMenu;
    1.15  QMenu* branchXLinksContextMenuEdit;
    1.16 -QMenu* branchXLinksContextMenuFollow;
    1.17  QMenu* floatimageContextMenu;
    1.18  QMenu* canvasContextMenu;
    1.19  QMenu* fileLastMapsMenu;
    1.20 @@ -1627,8 +1626,6 @@
    1.21  	// This will be populated "on demand" in MapEditor::updateActions
    1.22  	branchContextMenu->addSeparator();	
    1.23  	branchXLinksContextMenuEdit =branchContextMenu->addMenu (tr ("Edit XLink","Context menu name"));
    1.24 -	branchXLinksContextMenuFollow =branchContextMenu->addMenu (tr ("Follow XLink","Context menu name"));
    1.25 -	connect( branchXLinksContextMenuFollow, SIGNAL( triggered(QAction *) ), this, SLOT( editFollowXLink(QAction * ) ) );
    1.26  	connect( branchXLinksContextMenuEdit, SIGNAL( triggered(QAction *) ), this, SLOT( editEditXLink(QAction * ) ) );
    1.27  
    1.28  
    1.29 @@ -1760,7 +1757,7 @@
    1.30  	VymModel *vm=new VymModel;
    1.31  
    1.32  	/////////////////////////////////////
    1.33 -	new ModelTest(vm, this);	//FIXME-3
    1.34 +//	new ModelTest(vm, this);	//FIXME-3
    1.35  	/////////////////////////////////////
    1.36  
    1.37  	VymView *vv=new VymView (vm);
    1.38 @@ -2977,14 +2974,6 @@
    1.39  	if (m) m->saveFloatImage();
    1.40  }
    1.41  
    1.42 -void Main::editFollowXLink(QAction *a)
    1.43 -{
    1.44 -
    1.45 -	VymModel *m=currentModel();
    1.46 -	if (m)
    1.47 -		m->followXLink(branchXLinksContextMenuFollow->actions().indexOf(a));
    1.48 -}
    1.49 -
    1.50  void Main::editEditXLink(QAction *a)
    1.51  {
    1.52  	VymModel *m=currentModel();
    1.53 @@ -3461,7 +3450,6 @@
    1.54  			{
    1.55  				// Take care of xlinks  
    1.56  				branchXLinksContextMenuEdit->clear();
    1.57 -				branchXLinksContextMenuFollow->clear();
    1.58  				if (selbi->xlinkCount()>0)
    1.59  				{
    1.60  					BranchItem *bi;
    1.61 @@ -3474,7 +3462,6 @@
    1.62  							s=bi->getHeading();
    1.63  							if (s.length()>xLinkMenuWidth)
    1.64  								s=s.left(xLinkMenuWidth)+"...";
    1.65 -							branchXLinksContextMenuFollow->addAction (s);
    1.66  							branchXLinksContextMenuEdit->addAction (s);
    1.67  						}	
    1.68  					}