diff -r 2cf3413b6ac9 -r 30b22f7bd009 mapeditor.h
--- a/mapeditor.h	Tue Sep 06 15:04:50 2005 +0000
+++ b/mapeditor.h	Mon Sep 12 19:52:51 2005 +0000
@@ -37,7 +37,8 @@
     void saveState();		// save actual state to backup
     void saveState(LinkableMapObj *);
     void saveState(const QString &, const QString &);
-    void saveState(const SaveMode&, LinkableMapObj *, const QString &, const QString &);
+    void saveState(const QString &, LinkableMapObj *);
+    void saveState(const SaveMode&, const QString &, LinkableMapObj *, const QString &, LinkableMapObj *);
     void parseAtom(const QString &);	
 
     void addFloatImage(const QPixmap &img);
@@ -61,6 +62,7 @@
 	QString getMapName ();	// e.g. "map"
 	QString getDestPath (); // e.g. "/home/tux/map.vym"
     int load (QString&, const LoadMode &);	// newmap, import/replace selection
+public:
     int save(const SaveMode &);	// Save map 
 	void setZipped(bool);		// save map zipped
 	bool saveZipped();			// 1 if file will be saved zipped
@@ -71,12 +73,15 @@
     void exportImage (QString fn);		// export as PNG	
     void exportImage (QString fn, int);	// export in given format
     void exportASCII();
+    void exportLaTeX();
+    void exportOOPresentation();
     void exportXML(const QString&);		// export to directory
     void clear();		// clear map
     void copy();		// copy branch to clipboard
+    void redo();		// redo last action
     void undo();		// undo last action
 private:	
-    void undoXML(const QString &);	// undo by replacing with saved data
+    void undoXML(const QString &, const QString &);
     LinkableMapObj* pasteNoSave();		// paste clipboard to branch
     void cutNoSave();	// cut to clipboard
 public:	
@@ -194,8 +199,6 @@
 	
     LinkableMapObj* selection;		// select a LinkableMapObj
     LinkableMapObj* selectionLast;	// last selection 
-	QString undoSelection;			// selection for undo
-	QString redoSelection;			// selection for redo
     MapObj* movingObj;				// moving a MapObj
 	MapObj* linkingObj_src;			// part of a link
     QPoint movingObj_orgPos;		// org. pos of mouse before move
@@ -208,10 +211,6 @@
     bool mapDefault;				// Flag if map is untouched
     bool mapChanged;				// Flag if undo is possible
 	bool mapUnsaved;				// Flag if map should be saved
-    QString backupXML;				// backup (XML) for undo
-	QString undoCommand;			// FIXME testing
-	QString redoCommand;			// FIXME testing
-									// if != NULL
 
 	bool printFrame;			// Print frame around map
 	bool printFooter;			// Print footer below map
@@ -225,7 +224,10 @@
 	QString lastImageDir;		// save dir for adding images
 
 	bool isInteractive;			// non interactive don't need tmpdirs
-	QString bakMapDir;			// tmp directory with data for undo
+	QString tmpMapDir;			// tmp directory with data for undo/redo
+	int undosTotal;				// total number of undos 
+	int undoNum;				// current number of bakMapDir to be used 
+	int undosAvail;				// how many actions can currently be undone
 	bool blockReposition;		// block while load or undo
 	bool blockSaveState;		// block while load or undo