1.1 --- a/vymmodel.h	Fri Sep 11 12:56:15 2009 +0000
     1.2 +++ b/vymmodel.h	Thu Sep 17 09:41:09 2009 +0000
     1.3 @@ -190,12 +190,6 @@
     1.4  		const QString &comment, 
     1.5  		TreeItem *saveSelection);
     1.6  	/*! Overloaded for convenience */
     1.7 -    void saveStateComplete(
     1.8 -		TreeItem *undoSelection, 
     1.9 -		TreeItem* redoSelection, 
    1.10 -		const QString &redoCommand, 
    1.11 -		const QString &comment);
    1.12 -	/*! Overloaded for convenience */
    1.13      void saveStateChangingPart(
    1.14  		TreeItem *undoSelection, 
    1.15  		TreeItem* redoSelection, 
    1.16 @@ -290,8 +284,11 @@
    1.17      void paste();			//!< Paste clipboard to branch and backup
    1.18      void cut();				//!< Cut to clipboard (and copy)
    1.19  
    1.20 -    void moveUp();			//!< Move branch up
    1.21 +    bool moveUp(BranchItem *bi);	//!< Move branch up without saving state
    1.22 +    void moveUp();					//!< Move branch up with saving state
    1.23 +    bool moveDown(BranchItem *bi);	//!< Move branch down without saving state
    1.24      void moveDown();		//!< Move branch down
    1.25 +	void detach();					//!< Detach branch and use as new mapcenter
    1.26  	void sortChildren();	//!< Sort children lexically
    1.27  
    1.28  	// The create methods are used to quickly parse a XML file
    1.29 @@ -347,6 +344,7 @@
    1.30  	void deleteChildren();				//!< keep branch, but remove children
    1.31  
    1.32  	TreeItem* deleteItem(TreeItem*);	//!< Delete item and return parent (if parent!= rootItem)
    1.33 +	void clearItem (TreeItem* ti);		//!< Remove all children of TreeItem ti
    1.34  	bool scrollBranch(BranchItem *);
    1.35  	bool unscrollBranch(BranchItem *);
    1.36  public:	
    1.37 @@ -441,9 +439,6 @@
    1.38  	void reposition();					//!< Call reposition for all MCOs
    1.39  	void setHideTmpMode (TreeItem::HideTmpMode mode);	
    1.40  
    1.41 -	//FIXME-5 QPolygonF shape(BranchObj *bo);		//!< Returns arbitrary shape of subtree
    1.42 -	//FIXME-5 void moveAway (LinkableMapObj *lmo);//!< Autolayout: Move all out of the way
    1.43 -
    1.44  	void emitNoteHasChanged (TreeItem *ti);
    1.45  	void emitDataHasChanged (TreeItem *ti);
    1.46  
    1.47 @@ -579,8 +574,6 @@
    1.48  signals:
    1.49  	void showSelection();
    1.50  
    1.51 -//	bool selectInt(LinkableMapObj*);	//FIXME-4
    1.52 -
    1.53  public:	
    1.54      bool selectFirstBranch();
    1.55      bool selectLastBranch();