1.1 --- a/mapeditor.h	Mon Jun 06 20:27:42 2005 +0000
     1.2 +++ b/mapeditor.h	Tue Jun 14 09:41:37 2005 +0000
     1.3 @@ -29,11 +29,12 @@
     1.4  	void delTmpDirs();		// delete temporary directories
     1.5  	void makeSubDirs(const QString&);		
     1.6  							// create subdirs in dir
     1.7 -    QString saveToDir(const QString&,const QString &,bool, const QPoint
     1.8 -	&,SaveMode);
     1.9 +    QString saveToDir(const QString&,const QString &,bool, const QPoint &,LinkableMapObj*);
    1.10      void saveState();		// save actual state to backup
    1.11 -    void saveState(const SaveMode&, LinkableMapObj *);
    1.12 +    void saveState(LinkableMapObj *);
    1.13 +    void saveState(const QString &);
    1.14      void saveState(const SaveMode&, LinkableMapObj *, const QString &);
    1.15 +    void parseAtom(const QString &);	
    1.16  
    1.17  private slots:
    1.18      void finishedLineEditNoSave();
    1.19 @@ -63,9 +64,10 @@
    1.20      void exportASCII();
    1.21      void exportXML(const QString&);		// export to directory
    1.22      void clear();		// clear map
    1.23 +    void copy();		// copy branch to clipboard
    1.24      void undo();		// undo last action
    1.25 -    void copy();		// copy branch to clipboard
    1.26  private:	
    1.27 +    void undoXML(const QString &);	// undo by replacing with saved data
    1.28      LinkableMapObj* pasteNoSave();		// paste clipboard to branch
    1.29      void cutNoSave();	// cut to clipboard
    1.30  public:	
    1.31 @@ -73,7 +75,10 @@
    1.32      void cut();			// cut to clipboard and backup
    1.33      void moveBranchUp();
    1.34      void moveBranchDown();
    1.35 -    void editHeading();
    1.36 +    void editHeading();					// Start editing heading 
    1.37 +private:
    1.38 +	void setHeading(const QString &);	// Just set the heading for selection
    1.39 +public:	
    1.40      void addNewBranch(int);			// pos allows to add above/below selection
    1.41      void addNewBranchHere();		// insert and make selection its
    1.42      void deleteSelection();
    1.43 @@ -138,7 +143,6 @@
    1.44  	void followXLink (int);
    1.45  	void editXLink (int);
    1.46      void testFunction();				// FIXME just testing
    1.47 -    void parseTest(const QString &);	// FIXME just testing
    1.48  
    1.49  protected:
    1.50  	void ensureSelectionVisible();		
    1.51 @@ -185,7 +189,6 @@
    1.52      bool mapChanged;				// Flag if undo is possible
    1.53  	bool mapUnsaved;				// Flag if map should be saved
    1.54      QString backupXML;				// backup (XML) for undo
    1.55 -	LinkableMapObj* undoSelection;	// replace this LMO with vympart from backup
    1.56  	QString undoCommand;			// FIXME testing
    1.57  									// if != NULL
    1.58