diff -r d922fb6ea482 -r 6b0a5f4923d3 vymmodel.h
--- a/vymmodel.h	Fri Sep 11 12:56:15 2009 +0000
+++ b/vymmodel.h	Thu Sep 17 09:41:09 2009 +0000
@@ -190,12 +190,6 @@
 		const QString &comment, 
 		TreeItem *saveSelection);
 	/*! Overloaded for convenience */
-    void saveStateComplete(
-		TreeItem *undoSelection, 
-		TreeItem* redoSelection, 
-		const QString &redoCommand, 
-		const QString &comment);
-	/*! Overloaded for convenience */
     void saveStateChangingPart(
 		TreeItem *undoSelection, 
 		TreeItem* redoSelection, 
@@ -290,8 +284,11 @@
     void paste();			//!< Paste clipboard to branch and backup
     void cut();				//!< Cut to clipboard (and copy)
 
-    void moveUp();			//!< Move branch up
+    bool moveUp(BranchItem *bi);	//!< Move branch up without saving state
+    void moveUp();					//!< Move branch up with saving state
+    bool moveDown(BranchItem *bi);	//!< Move branch down without saving state
     void moveDown();		//!< Move branch down
+	void detach();					//!< Detach branch and use as new mapcenter
 	void sortChildren();	//!< Sort children lexically
 
 	// The create methods are used to quickly parse a XML file
@@ -347,6 +344,7 @@
 	void deleteChildren();				//!< keep branch, but remove children
 
 	TreeItem* deleteItem(TreeItem*);	//!< Delete item and return parent (if parent!= rootItem)
+	void clearItem (TreeItem* ti);		//!< Remove all children of TreeItem ti
 	bool scrollBranch(BranchItem *);
 	bool unscrollBranch(BranchItem *);
 public:	
@@ -441,9 +439,6 @@
 	void reposition();					//!< Call reposition for all MCOs
 	void setHideTmpMode (TreeItem::HideTmpMode mode);	
 
-	//FIXME-5 QPolygonF shape(BranchObj *bo);		//!< Returns arbitrary shape of subtree
-	//FIXME-5 void moveAway (LinkableMapObj *lmo);//!< Autolayout: Move all out of the way
-
 	void emitNoteHasChanged (TreeItem *ti);
 	void emitDataHasChanged (TreeItem *ti);
 
@@ -579,8 +574,6 @@
 signals:
 	void showSelection();
 
-//	bool selectInt(LinkableMapObj*);	//FIXME-4
-
 public:	
     bool selectFirstBranch();
     bool selectLastBranch();