1.1 --- a/mapeditor.h	Mon Jul 25 20:07:18 2005 +0000
     1.2 +++ b/mapeditor.h	Thu Jul 28 10:23:25 2005 +0000
     1.3 @@ -26,7 +26,7 @@
     1.4      MapCenterObj* getMapCenter();
     1.5  	QCanvas* getCanvas();
     1.6  	void adjustCanvasSize();// adjust canvas size to map and scrollview
     1.7 -	bool blockReposition(); // block while load or undo
     1.8 +	bool isRepositionBlocked(); // block while load or undo
     1.9  	
    1.10  private:
    1.11  	void makeTmpDirs();		// create temporary directories
    1.12 @@ -36,8 +36,8 @@
    1.13      QString saveToDir(const QString&,const QString &,bool, const QPoint &,LinkableMapObj*);
    1.14      void saveState();		// save actual state to backup
    1.15      void saveState(LinkableMapObj *);
    1.16 -    void saveState(const QString &);
    1.17 -    void saveState(const SaveMode&, LinkableMapObj *, const QString &);
    1.18 +    void saveState(const QString &, const QString &);
    1.19 +    void saveState(const SaveMode&, LinkableMapObj *, const QString &, const QString &);
    1.20      void parseAtom(const QString &);	
    1.21  
    1.22      void addFloatImage(const QPixmap &img);
    1.23 @@ -190,6 +190,7 @@
    1.24      LinkableMapObj* selection;		// select a LinkableMapObj
    1.25      LinkableMapObj* selectionLast;	// last selection 
    1.26  	QString undoSelection;			// selection for undo
    1.27 +	QString redoSelection;			// selection for redo
    1.28      MapObj* movingObj;				// moving a MapObj
    1.29  	MapObj* linkingObj_src;			// part of a link
    1.30      QPoint movingObj_orgPos;		// org. pos of mouse before move
    1.31 @@ -204,6 +205,7 @@
    1.32  	bool mapUnsaved;				// Flag if map should be saved
    1.33      QString backupXML;				// backup (XML) for undo
    1.34  	QString undoCommand;			// FIXME testing
    1.35 +	QString redoCommand;			// FIXME testing
    1.36  									// if != NULL
    1.37  
    1.38  	bool printFrame;			// Print frame around map
    1.39 @@ -219,7 +221,8 @@
    1.40  
    1.41  	bool isInteractive;			// non interactive don't need tmpdirs
    1.42  	QString bakMapDir;			// tmp directory with data for undo
    1.43 -	bool blockreposition;		// block while load or undo
    1.44 +	bool blockReposition;		// block while load or undo
    1.45 +	bool blockSaveState;		// block while load or undo
    1.46  
    1.47  	BranchObj* itFind;			// next object in find process
    1.48  	bool EOFind;				// true, if search failed