diff -r 09edde7ae30e -r e0f6a21cc6d6 mapeditor.cpp
--- a/mapeditor.cpp	Fri Jul 08 07:24:43 2005 +0000
+++ b/mapeditor.cpp	Fri Jul 08 08:06:36 2005 +0000
@@ -576,33 +576,14 @@
 
 void MapEditor::saveState()
 {
-<<<<<<< mapeditor.cpp
-	saveState (CompleteMap,NULL,"");
-=======
 	saveState (CompleteMap,NULL,"");
 }
 
 void MapEditor::saveState(LinkableMapObj *undoSel)
 {
 	saveState (PartOfMap,undoSel,"");
->>>>>>> 1.16
 }
 
-<<<<<<< mapeditor.cpp
-void MapEditor::saveState(LinkableMapObj *undoSel)
-=======
-void MapEditor::saveState(const QString & c)
->>>>>>> 1.16
-{
-<<<<<<< mapeditor.cpp
-	saveState (PartOfMap,undoSel,"");
-}
-=======
-	saveState (UndoCommand,NULL,c);
-}
->>>>>>> 1.16
-
-<<<<<<< mapeditor.cpp
 void MapEditor::saveState(const QString & c)
 {
 	saveState (UndoCommand,NULL,c);
@@ -616,58 +597,6 @@
 		backupXML="";
 	}	
 	else if (savemode==PartOfMap && undoSel)
-=======
-void MapEditor::saveState(const SaveMode &savemode, LinkableMapObj *undoSel, const QString &undoCom)
-{
-	if (savemode==UndoCommand)
->>>>>>> 1.16
-	{
-<<<<<<< mapeditor.cpp
-		undoCommand="undoPart (\""+undoSel->getSelectString()+"\")";
-		backupXML=saveToDir (bakMapDir,mapName+"-",false, QPoint (),undoSel);
-	} else
-	{
-		undoCommand="undoMap ()";
-		backupXML=saveToDir (bakMapDir,mapName+"-",false, QPoint (),NULL);
-	}
-	/* FIXME testing
-	cout << "ME::saveState()\n";
-	cout << "  undoCom="<<undoCommand<<endl;
-	*/
-}
-
-void MapEditor::parseAtom(const QString &s)
-{
-	API api;
-	QString c,p,p0;
-	api.parseCommand (s,c,p);
-	api.getString(p,p0);
-	/* FIXME testing
-	cout <<"ME::parseAtom  s="<<s<<endl;
-	cout <<"ME::parseAtom  c="<<c<<endl;
-	cout <<"ME::parseAtom  p="<<p<<endl;
-	*/
-
-	// External commands
-	if (c==QString("moveBranchUp"))
-		moveBranchUp();
-	else if (c=="moveBranchDown")
-		moveBranchDown();
-	else if (c=="setHeading")
-		setHeading (p0);
-	// Internal commands, used for undo etc.	
-	else if (c==QString("undoMap"))
-		undoXML("");
-	else if (c==QString("undoPart"))
-		undoXML(p0);
-	else if (c=="select")
-		select (p0);
-	else
-=======
-		undoCommand=undoCom;
-		backupXML="";
-	}	
-	else if (savemode==PartOfMap && undoSel)
 	{
 		undoCommand="undoPart (\""+undoSel->getSelectString()+"\")";
 		backupXML=saveToDir (bakMapDir,mapName+"-",false, QPoint (),undoSel);
@@ -709,7 +638,6 @@
 	else if (c=="select")
 		select (p0);
 	else
->>>>>>> 1.16
 	{
 		cout << "MapEditor::parseAtom: Error!\n";
 		cout << "  Command unknown: \""<<c<<"\""<<endl;
@@ -2522,21 +2450,12 @@
 
 			actionEditCopy->setEnabled (true);	
 			actionEditCut->setEnabled (true);	
-<<<<<<< mapeditor.cpp
 			if (clipboardME->getMapCenter()->countBranches()>0 || clipboardME->getMapCenter()->countFloatImages()>0)
 				actionEditPaste->setEnabled (true);	
 			else	
 				actionEditPaste->setEnabled (false);	
 			for (a=actionListBranches.first();a;a=actionListBranches.next())
 				a->setEnabled(true);
-=======
-			if (clipboardME->getMapCenter()->countBranches()>0)
-				actionEditPaste->setEnabled (true);	
-			else	
-				actionEditPaste->setEnabled (false);	
-			for (a=actionListBranches.first();a;a=actionListBranches.next())
-				a->setEnabled(true);
->>>>>>> 1.16
 			actionEditDelete->setEnabled (true);
 			actionEditToggleFloatExport->setEnabled (false);
 			switch (selection->getFrameType())