1.1 --- a/mapeditor.h	Mon Oct 16 12:42:54 2006 +0000
     1.2 +++ b/mapeditor.h	Wed Oct 18 10:45:00 2006 +0000
     1.3 @@ -32,13 +32,15 @@
     1.4  	void makeTmpDirs();		// create temporary directories
     1.5      QString saveToDir(const QString&,const QString &,bool, const QPoint &,LinkableMapObj*);
     1.6      void saveStateComplete       (const QString &);					
     1.7 -    void saveStatePart           (LinkableMapObj *, const QString &);
     1.8 +    void saveStateChangingPart (LinkableMapObj *, const QString &);
     1.9 +    void saveStateRemovingPart (LinkableMapObj *, const QString &);
    1.10      void saveStateConstSelection (const QString &, const QString &, const QString &);
    1.11      void saveState(LinkableMapObj *, const QString &, LinkableMapObj *, const QString &, const QString &);
    1.12      void saveState(const QString &, const QString &, const QString &, const QString &, const QString &);
    1.13      void saveState(const SaveMode&, const QString &, const QString &, const QString &, const QString &, const QString &, LinkableMapObj *);
    1.14 +public:	
    1.15      void parseAtom(const QString &);	
    1.16 -
    1.17 +private:
    1.18      void addFloatImage(const QPixmap &img);
    1.19  
    1.20    private slots:
    1.21 @@ -82,18 +84,19 @@
    1.22      void undo();		// undo last action
    1.23  	bool isUndoAvailable();
    1.24  	void gotoStep (int);// goto a step in history
    1.25 +    void addMapReplace(const QString & undoSel, const QString & path);
    1.26 +    void addMapInsert (const QString & path, int pos);
    1.27  private:	
    1.28 -    void undoXML(const QString &, const QString &);
    1.29      void pasteNoSave();		// paste clipboard to branch
    1.30      void cutNoSave();	// cut to clipboard
    1.31  public:	
    1.32      void paste();		// paste clipboard to branch and backup
    1.33      void cut();			// cut to clipboard and backup
    1.34 -    void move    (const int &,const int&);
    1.35 -    void moveRel (const int &,const int&);
    1.36 +    void move    (const int &x, const int &y);
    1.37 +    void moveRel (const int &x, const int &y);
    1.38      void moveBranchUp();
    1.39      void moveBranchDown();
    1.40 -	QString getHeading (bool &,QPoint &);	// Get heading, ok if selection is branch
    1.41 +	QString getHeading (bool &ok,QPoint &p); // Get heading, ok if selection is branch
    1.42  	void setHeading(const QString &);
    1.43  private:
    1.44  	void setHeadingInt(const QString &);
    1.45 @@ -230,7 +233,7 @@
    1.46  	bool printFooter;			// Print footer below map
    1.47  
    1.48  	bool zipped;				// should map be zipped
    1.49 -static	int mapNum;				// unique number for Editor
    1.50 +	static	int mapNum;			// unique number for Editor
    1.51  	QString fileName;			// short name of file (for tab)
    1.52  	QString filePath;			// path to file which will be saved
    1.53  	QString fileDir;			// dir where file is saved