diff -r 7ea31701156e -r 7f43b93242aa mapeditor.cpp
--- a/mapeditor.cpp	Tue Aug 05 07:36:53 2008 +0000
+++ b/mapeditor.cpp	Mon Oct 06 11:10:20 2008 +0000
@@ -267,7 +267,7 @@
 			QString("%1 (\"%2\")").arg(u).arg(f), 
 			bo,
 			QString("%1 (\"%2\")").arg(r).arg(f),
-			QString("Toggling standard flag \"%1\" of %2").arg(f).arg(getName(bo)));
+			QString("Toggling standard flag \"%1\" of %2").arg(f).arg(model->getObjectName(bo)));
 		bo->toggleStandardFlag (f,mainWindow->useFlagGroups());
 		model->updateSelection();
 	}
@@ -652,7 +652,7 @@
 						"moveRel "+pold,
 						fio,
 						"moveRel "+pnow,
-						QString("Move %1 to relative position %2").arg(getName(fio)).arg(pnow));
+						QString("Move %1 to relative position %2").arg(model->getObjectName(fio)).arg(pnow));
 					fio->getParObj()->requestReposition();
 					model->reposition();
 
@@ -774,7 +774,7 @@
 			tmpXLink->setEnd ( ((BranchObj*)(dst)) );
 			tmpXLink->updateXLink();
 			tmpXLink->activate(); //FIXME savestate missing
-			//model->saveStateComplete(QString("Activate xLink from %1 to %2").arg(getName(tmpXLink->getBegin())).arg(getName(tmpXLink->getEnd())) );	
+			//model->saveStateComplete(QString("Activate xLink from %1 to %2").arg(model->getObjectName(tmpXLink->getBegin())).arg(model->getObjectName(tmpXLink->getEnd())) );	
 		} else
 		{
 			delete(tmpXLink);
@@ -797,7 +797,7 @@
 				"moveRel "+pold,
 				fo,
 				"moveRel "+pnow,
-				QString("Move %1 to relative position %2").arg(getName(fo)).arg(pnow));
+				QString("Move %1 to relative position %2").arg(model->getObjectName(fo)).arg(pnow));
 
 			fo->getParObj()->requestReposition();
 			model->reposition();
@@ -822,7 +822,7 @@
                     "move "+pold,
                     bo,
                     "move "+pnow,
-                    QString("Move mapcenter %1 to position %2").arg(getName(bo)).arg(pnow));
+                    QString("Move mapcenter %1 to position %2").arg(model->getObjectName(bo)).arg(pnow));
             }
 		}
 	
@@ -880,7 +880,7 @@
 				model->saveState (
 					postSelStr,undoCom,
 					preSelStr, redoCom,
-					QString("Relink %1 to %2").arg(getName(bsel)).arg(getName(dst)) );
+					QString("Relink %1 to %2").arg(model->getObjectName(bsel)).arg(model->getObjectName(dst)) );
 
 				model->reposition();	// not necessary if we undo temporary move  below
 			} else
@@ -900,7 +900,7 @@
                         model->saveState(
                             model->getSelectString(lmosel), "moveRel "+qpointfToString(movingObj_orgRelPos), 
                             preSelStr, "moveRel "+ps, 
-                            QString("Move %1 to relative position %2").arg(getName(lmosel)).arg(ps));
+                            QString("Move %1 to relative position %2").arg(model->getObjectName(lmosel)).arg(ps));
                     }
 				}
 
@@ -1054,6 +1054,13 @@
 }
       
 
-// FIXME the following are not needed...
-QString MapEditor::getName(const LinkableMapObj*) {return QString();}
+void MapEditor::setSelectionModel (QItemSelectionModel *sm)
+{
+	selModel=sm;
+}
 
+QItemSelectionModel* MapEditor::selectionModel ()
+{
+	return selModel;
+}
+