diff -r b0d8b00fb937 -r 3590c3490789 mapeditor.h
--- a/mapeditor.h	Mon Jul 25 20:07:18 2005 +0000
+++ b/mapeditor.h	Sun Jul 31 12:24:53 2005 +0000
@@ -26,7 +26,7 @@
     MapCenterObj* getMapCenter();
 	QCanvas* getCanvas();
 	void adjustCanvasSize();// adjust canvas size to map and scrollview
-	bool blockReposition(); // block while load or undo
+	bool isRepositionBlocked(); // block while load or undo
 	
 private:
 	void makeTmpDirs();		// create temporary directories
@@ -36,8 +36,8 @@
     QString saveToDir(const QString&,const QString &,bool, const QPoint &,LinkableMapObj*);
     void saveState();		// save actual state to backup
     void saveState(LinkableMapObj *);
-    void saveState(const QString &);
-    void saveState(const SaveMode&, LinkableMapObj *, const QString &);
+    void saveState(const QString &, const QString &);
+    void saveState(const SaveMode&, LinkableMapObj *, const QString &, const QString &);
     void parseAtom(const QString &);	
 
     void addFloatImage(const QPixmap &img);
@@ -190,6 +190,7 @@
     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
@@ -204,6 +205,7 @@
 	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
@@ -219,7 +221,8 @@
 
 	bool isInteractive;			// non interactive don't need tmpdirs
 	QString bakMapDir;			// tmp directory with data for undo
-	bool blockreposition;		// block while load or undo
+	bool blockReposition;		// block while load or undo
+	bool blockSaveState;		// block while load or undo
 
 	BranchObj* itFind;			// next object in find process
 	bool EOFind;				// true, if search failed