diff -r 7a71a914afdb -r 6d2b32f305f9 vymmodel.h
--- a/vymmodel.h	Thu May 07 08:48:53 2009 +0000
+++ b/vymmodel.h	Wed May 13 08:26:27 2009 +0000
@@ -277,8 +277,8 @@
     void paste();		//!< Paste clipboard to branch and backup
     void cut();			//!< Cut to clipboard (and copy)
 
-    void moveBranchUp();	//!< Move branch up
-    void moveBranchDown();	//!< Move branch down
+    void moveUp();	//!< Move branch up
+    void moveDown();	//!< Move branch down
 	void sortChildren();	//!< Sort children lexically
 
 	// The create methods are used to quickly parse a XML file
@@ -317,7 +317,14 @@
 	*/
     BranchItem* addNewBranch(int pos);		
     BranchItem* addNewBranchBefore();		//!< Insert branch between selection and its parent
-	BranchItem* relinkBranch (BranchItem* branch, BranchItem* dst, int pos =-1);	//! Relink branch to dst at position pos
+	/*! \brief Relink a branch to a new destination dst 
+	    Relinks branch to dst at branch position pos. There is no saveState
+		here, as for example moveUp or moving in MapEditor have
+		different needs to call saveState
+		Returns true if relinking was successful.
+	*/	
+	bool relinkBranch (BranchItem* branch, BranchItem* dst, int pos =-1);	
+
     void deleteSelection();					//!< Delete selection
 	void deleteKeepChildren();				//!< remove branch, but keep children
 	void deleteChildren();					//!< keep branch, but remove children
@@ -333,7 +340,7 @@
 	void expandAll();
 
 public:	
-	void toggleStandardFlag (const QString &name);
+	void toggleStandardFlag (const QString &name, FlagRow *master=NULL);
     void addFloatImage(const QPixmap &img);
 
     void colorBranch(QColor);
@@ -426,7 +433,6 @@
 
 signals:
 	void noteHasChanged (QModelIndex ix);
-	void dataHasChanged (QModelIndex ix);	//FIXME-3 necessary? There is dataChanged in AbstractModel
 	void newChildObject(QModelIndex ix);
 
 private:
@@ -477,7 +483,7 @@
 	uint animationTicks;
 	uint animationInterval;
 	int timerId;				// animation timer
-	QList <MapObj*> animObjList;// list with animated objects
+	QList <MapObj*> animObjList;// list with animated objects //FIXME-2 should go to MapEditor
 
 private slots:
 	void animate();						//!< Called by timer to animate stuff