diff -r 2d4cc445a86a -r ee6b0f3a4c2f mapeditor.cpp
--- a/mapeditor.cpp	Mon Mar 23 09:06:51 2009 +0000
+++ b/mapeditor.cpp	Thu Mar 26 07:49:17 2009 +0000
@@ -43,7 +43,7 @@
 	model=vm;
 	model->setScene (mapScene);
 	model->registerEditor(this);
-//	model->addMapCenter();	//  FIXME create this in MapEditor until BO and MCO are independent of scene
+//	model->addMapCenter();	//  FIXME-3 create this in MapEditor until BO and MCO are independent of scene
 	model->makeDefault();	// No changes in model so far
 
     setScene (mapScene);
@@ -70,7 +70,7 @@
 
 	setAcceptDrops (true);	
 
-	//model->reposition();	//FIXME really still needed?
+	//model->reposition();	//FIXME-3 really still needed?
 
 
 	// Action to embed LineEdit for heading in Scene
@@ -93,7 +93,7 @@
 	selectionColor =QColor (255,255,0);
 	
 
-	// Attributes	//FIXME testing only...
+	// Attributes	//FIXME-2 testing only...
 	QString k;
 	AttributeDef *ad;
 	attrTable= new AttributeTable();
@@ -128,7 +128,7 @@
 
 MapEditor::~MapEditor()
 {
-	cout <<"Destructor MapEditor for "<<model->getMapName().toStdString()<<endl;
+	//cout <<"Destructor MapEditor for "<<model->getMapName().toStdString()<<endl;
 	// No need to remove tmp files:
 	// tmpMapDir is in tmpVymDir, 
 	// so it gets removed automagically when vym closes
@@ -217,7 +217,7 @@
 			font.setPointSize(10);
 			pp.setFont (font);
 			QRectF footerBox(0,viewBottom,printer->width(),15);
-			// FIXME fileName not any longer available here: pp.drawText ( footerBox,Qt::AlignLeft,"VYM - " +fileName);
+			// FIXME-3 fileName not any longer available here: pp.drawText ( footerBox,Qt::AlignLeft,"VYM - " +fileName);
 			pp.drawText ( footerBox, Qt::AlignRight, QDate::currentDate().toString(Qt::TextDate));
 		}
 		mapScene->render (
@@ -414,21 +414,21 @@
 		if (model->getSelectedBranch() ) 
 		{
 			// Context Menu on branch or mapcenter
-			//FIXME model->updateActions(); needed?
+			//FIXME-3 model->updateActions(); needed?
 			branchContextMenu->popup(e->globalPos() );
 		} else
 		{
 			if (model->getSelectedFloatImage() )
 			{
 				// Context Menu on floatimage
-				// model->updateActions(); FIXME needed?
+				// model->updateActions(); FIXME-3 needed?
 				floatimageContextMenu->popup(e->globalPos() );
 			}	
 		}	
 	} else 
 	{ // No MapObj found, we are on the Canvas itself
 		// Context Menu on scene
-		// model->updateActions(); FIXME needed?
+		// model->updateActions(); FIXME-3 needed?
 		
 		// Open context menu synchronously to position new mapcenter
 		model->setContextPos (p);
@@ -513,7 +513,7 @@
 				mainWindow->windowToggleNoteEditor();
 			else if (foname=="hideInExport")		
 				model->toggleHideExport();
-			// FIXME needed? xelection.update();	
+			// FIXME-3 needed? xelection.update();	
 			return;	
 		} 
 	}	
@@ -558,7 +558,7 @@
 	*/
 		// Select the clicked object
 
-		// FIXME VM better let "find" return an index instead of lmo...
+		// FIXME-2 VM better let "find" return an index instead of lmo...
 		// Get index of clicked LMO
 		TreeItem *ti=lmo->getTreeItem();
 		/*
@@ -603,8 +603,8 @@
 			// a button in the toolbar)
 			if (e->button() == Qt::MidButton )
 				model->toggleScroll();
-		// model->updateActions(); FIXME needed?
-		// FIXME needed? xelection.update();
+		// model->updateActions(); FIXME-3 needed?
+		// FIXME-3 needed? xelection.update();
 	} else 
 	{ // No MapObj found, we are on the scene itself
 		// Left Button	    move Pos of sceneView
@@ -799,7 +799,7 @@
 		{	
 			tmpXLink->setEnd ( ((BranchObj*)(dst)) );
 			tmpXLink->updateXLink();
-			tmpXLink->activate(); //FIXME savestate missing
+			tmpXLink->activate(); //FIXME-2 savestate missing
 			//model->saveStateComplete(QString("Activate xLink from %1 to %2").arg(model->getObjectName(tmpXLink->getBegin())).arg(model->getObjectName(tmpXLink->getEnd())) );	
 		} else
 		{
@@ -947,13 +947,13 @@
 					model->reposition();
 			}
 		}
-		model->updateSelection();  //FIXME needed? at least not after pos of selection has changed...
+		model->updateSelection();  //FIXME-3 needed? at least not after pos of selection has changed...
 		// Finally resize scene, if needed
 		scene()->update();
 		movingObj=NULL;		
 
 		// Just make sure, that actions are still ok,e.g. the move branch up/down buttons...
-		// model->updateActions(); FIXME neeeded? 
+		// model->updateActions(); FIXME-3 neeeded? 
 	} else 
 		// maybe we moved View: set old cursor
 		setCursor (Qt::ArrowCursor);
@@ -1108,10 +1108,10 @@
 	}
 }
 
-void MapEditor::updateCurrent (const QModelIndex &,const QModelIndex &)	//FIXME not used?
+void MapEditor::updateCurrent (const QModelIndex &,const QModelIndex &)	//FIXME-3 not used?
 {
 
-/* FIXME testing
+/* testing
 
 	cout << "ME::updateCurrent\n";