1.1 --- a/mapeditor.cpp	Wed Apr 01 15:06:57 2009 +0000
     1.2 +++ b/mapeditor.cpp	Thu Apr 02 09:46:29 2009 +0000
     1.3 @@ -6,6 +6,7 @@
     1.4  
     1.5  #include <QObject>
     1.6  
     1.7 +#include "branchitem.h"
     1.8  #include "mainwindow.h"
     1.9  #include "misc.h"
    1.10  #include "warningdialog.h"
    1.11 @@ -283,8 +284,8 @@
    1.12  
    1.13  void MapEditor::testFunction1()
    1.14  {
    1.15 -	TreeItem *cur=NULL;
    1.16 -	TreeItem *prev=NULL;
    1.17 +	BranchItem *cur=NULL;
    1.18 +	BranchItem *prev=NULL;
    1.19  	int d;
    1.20  	cout << "ME::testFunction1  starting to walk the map...\n";
    1.21  	while (model->next (cur,prev,d) )
    1.22 @@ -496,7 +497,7 @@
    1.23  		if (!foname.isEmpty())
    1.24  		{
    1.25  			// systemFlag clicked
    1.26 -			model->selectInt (lmo);
    1.27 +			model->select (lmo);	// FIXME-3 was selectInt
    1.28  			if (foname=="url") 
    1.29  			{
    1.30  				if (e->state() & Qt::ControlModifier)
    1.31 @@ -585,13 +586,14 @@
    1.32  			if (mainWindow->getModMode()==Main::ModModeCopy &&
    1.33  				e->state() & Qt::ControlModifier)
    1.34  			{
    1.35 -				BranchObj *bo=model->getSelectedBranch();
    1.36 -				if (bo)
    1.37 +				BranchItem *bi=model->getSelectedBranchItem();
    1.38 +				if (bi)
    1.39  				{
    1.40  					copyingObj=true;
    1.41 -					bo->addBranch (model->getSelectedBranch());
    1.42 +					//FIXME-2   TreeItem::addBranch (BranchItem still missing) 
    1.43 +					//bi->addBranch (model->getSelectedBranchItem());
    1.44  					model->unselect();
    1.45 -					model->select(bo->getLastBranch());
    1.46 +					model->select(bi->getLastBranch());
    1.47  					model->reposition();
    1.48  				}
    1.49  			}