diff -r 9ff332964015 -r ff3b01ce0960 mapeditor.cpp
--- a/mapeditor.cpp	Wed Apr 01 15:06:57 2009 +0000
+++ b/mapeditor.cpp	Thu Apr 02 09:46:29 2009 +0000
@@ -6,6 +6,7 @@
 
 #include <QObject>
 
+#include "branchitem.h"
 #include "mainwindow.h"
 #include "misc.h"
 #include "warningdialog.h"
@@ -283,8 +284,8 @@
 
 void MapEditor::testFunction1()
 {
-	TreeItem *cur=NULL;
-	TreeItem *prev=NULL;
+	BranchItem *cur=NULL;
+	BranchItem *prev=NULL;
 	int d;
 	cout << "ME::testFunction1  starting to walk the map...\n";
 	while (model->next (cur,prev,d) )
@@ -496,7 +497,7 @@
 		if (!foname.isEmpty())
 		{
 			// systemFlag clicked
-			model->selectInt (lmo);
+			model->select (lmo);	// FIXME-3 was selectInt
 			if (foname=="url") 
 			{
 				if (e->state() & Qt::ControlModifier)
@@ -585,13 +586,14 @@
 			if (mainWindow->getModMode()==Main::ModModeCopy &&
 				e->state() & Qt::ControlModifier)
 			{
-				BranchObj *bo=model->getSelectedBranch();
-				if (bo)
+				BranchItem *bi=model->getSelectedBranchItem();
+				if (bi)
 				{
 					copyingObj=true;
-					bo->addBranch (model->getSelectedBranch());
+					//FIXME-2   TreeItem::addBranch (BranchItem still missing) 
+					//bi->addBranch (model->getSelectedBranchItem());
 					model->unselect();
-					model->select(bo->getLastBranch());
+					model->select(bi->getLastBranch());
 					model->reposition();
 				}
 			}