1.1 --- a/mapeditor.cpp	Fri Jul 08 07:24:43 2005 +0000
     1.2 +++ b/mapeditor.cpp	Fri Jul 08 08:06:36 2005 +0000
     1.3 @@ -576,33 +576,14 @@
     1.4  
     1.5  void MapEditor::saveState()
     1.6  {
     1.7 -<<<<<<< mapeditor.cpp
     1.8 -	saveState (CompleteMap,NULL,"");
     1.9 -=======
    1.10  	saveState (CompleteMap,NULL,"");
    1.11  }
    1.12  
    1.13  void MapEditor::saveState(LinkableMapObj *undoSel)
    1.14  {
    1.15  	saveState (PartOfMap,undoSel,"");
    1.16 ->>>>>>> 1.16
    1.17  }
    1.18  
    1.19 -<<<<<<< mapeditor.cpp
    1.20 -void MapEditor::saveState(LinkableMapObj *undoSel)
    1.21 -=======
    1.22 -void MapEditor::saveState(const QString & c)
    1.23 ->>>>>>> 1.16
    1.24 -{
    1.25 -<<<<<<< mapeditor.cpp
    1.26 -	saveState (PartOfMap,undoSel,"");
    1.27 -}
    1.28 -=======
    1.29 -	saveState (UndoCommand,NULL,c);
    1.30 -}
    1.31 ->>>>>>> 1.16
    1.32 -
    1.33 -<<<<<<< mapeditor.cpp
    1.34  void MapEditor::saveState(const QString & c)
    1.35  {
    1.36  	saveState (UndoCommand,NULL,c);
    1.37 @@ -616,58 +597,6 @@
    1.38  		backupXML="";
    1.39  	}	
    1.40  	else if (savemode==PartOfMap && undoSel)
    1.41 -=======
    1.42 -void MapEditor::saveState(const SaveMode &savemode, LinkableMapObj *undoSel, const QString &undoCom)
    1.43 -{
    1.44 -	if (savemode==UndoCommand)
    1.45 ->>>>>>> 1.16
    1.46 -	{
    1.47 -<<<<<<< mapeditor.cpp
    1.48 -		undoCommand="undoPart (\""+undoSel->getSelectString()+"\")";
    1.49 -		backupXML=saveToDir (bakMapDir,mapName+"-",false, QPoint (),undoSel);
    1.50 -	} else
    1.51 -	{
    1.52 -		undoCommand="undoMap ()";
    1.53 -		backupXML=saveToDir (bakMapDir,mapName+"-",false, QPoint (),NULL);
    1.54 -	}
    1.55 -	/* FIXME testing
    1.56 -	cout << "ME::saveState()\n";
    1.57 -	cout << "  undoCom="<<undoCommand<<endl;
    1.58 -	*/
    1.59 -}
    1.60 -
    1.61 -void MapEditor::parseAtom(const QString &s)
    1.62 -{
    1.63 -	API api;
    1.64 -	QString c,p,p0;
    1.65 -	api.parseCommand (s,c,p);
    1.66 -	api.getString(p,p0);
    1.67 -	/* FIXME testing
    1.68 -	cout <<"ME::parseAtom  s="<<s<<endl;
    1.69 -	cout <<"ME::parseAtom  c="<<c<<endl;
    1.70 -	cout <<"ME::parseAtom  p="<<p<<endl;
    1.71 -	*/
    1.72 -
    1.73 -	// External commands
    1.74 -	if (c==QString("moveBranchUp"))
    1.75 -		moveBranchUp();
    1.76 -	else if (c=="moveBranchDown")
    1.77 -		moveBranchDown();
    1.78 -	else if (c=="setHeading")
    1.79 -		setHeading (p0);
    1.80 -	// Internal commands, used for undo etc.	
    1.81 -	else if (c==QString("undoMap"))
    1.82 -		undoXML("");
    1.83 -	else if (c==QString("undoPart"))
    1.84 -		undoXML(p0);
    1.85 -	else if (c=="select")
    1.86 -		select (p0);
    1.87 -	else
    1.88 -=======
    1.89 -		undoCommand=undoCom;
    1.90 -		backupXML="";
    1.91 -	}	
    1.92 -	else if (savemode==PartOfMap && undoSel)
    1.93  	{
    1.94  		undoCommand="undoPart (\""+undoSel->getSelectString()+"\")";
    1.95  		backupXML=saveToDir (bakMapDir,mapName+"-",false, QPoint (),undoSel);
    1.96 @@ -709,7 +638,6 @@
    1.97  	else if (c=="select")
    1.98  		select (p0);
    1.99  	else
   1.100 ->>>>>>> 1.16
   1.101  	{
   1.102  		cout << "MapEditor::parseAtom: Error!\n";
   1.103  		cout << "  Command unknown: \""<<c<<"\""<<endl;
   1.104 @@ -2522,21 +2450,12 @@
   1.105  
   1.106  			actionEditCopy->setEnabled (true);	
   1.107  			actionEditCut->setEnabled (true);	
   1.108 -<<<<<<< mapeditor.cpp
   1.109  			if (clipboardME->getMapCenter()->countBranches()>0 || clipboardME->getMapCenter()->countFloatImages()>0)
   1.110  				actionEditPaste->setEnabled (true);	
   1.111  			else	
   1.112  				actionEditPaste->setEnabled (false);	
   1.113  			for (a=actionListBranches.first();a;a=actionListBranches.next())
   1.114  				a->setEnabled(true);
   1.115 -=======
   1.116 -			if (clipboardME->getMapCenter()->countBranches()>0)
   1.117 -				actionEditPaste->setEnabled (true);	
   1.118 -			else	
   1.119 -				actionEditPaste->setEnabled (false);	
   1.120 -			for (a=actionListBranches.first();a;a=actionListBranches.next())
   1.121 -				a->setEnabled(true);
   1.122 ->>>>>>> 1.16
   1.123  			actionEditDelete->setEnabled (true);
   1.124  			actionEditToggleFloatExport->setEnabled (false);
   1.125  			switch (selection->getFrameType())