1.1 --- a/vymmodel.h	Thu May 07 08:48:53 2009 +0000
     1.2 +++ b/vymmodel.h	Wed May 13 08:26:27 2009 +0000
     1.3 @@ -277,8 +277,8 @@
     1.4      void paste();		//!< Paste clipboard to branch and backup
     1.5      void cut();			//!< Cut to clipboard (and copy)
     1.6  
     1.7 -    void moveBranchUp();	//!< Move branch up
     1.8 -    void moveBranchDown();	//!< Move branch down
     1.9 +    void moveUp();	//!< Move branch up
    1.10 +    void moveDown();	//!< Move branch down
    1.11  	void sortChildren();	//!< Sort children lexically
    1.12  
    1.13  	// The create methods are used to quickly parse a XML file
    1.14 @@ -317,7 +317,14 @@
    1.15  	*/
    1.16      BranchItem* addNewBranch(int pos);		
    1.17      BranchItem* addNewBranchBefore();		//!< Insert branch between selection and its parent
    1.18 -	BranchItem* relinkBranch (BranchItem* branch, BranchItem* dst, int pos =-1);	//! Relink branch to dst at position pos
    1.19 +	/*! \brief Relink a branch to a new destination dst 
    1.20 +	    Relinks branch to dst at branch position pos. There is no saveState
    1.21 +		here, as for example moveUp or moving in MapEditor have
    1.22 +		different needs to call saveState
    1.23 +		Returns true if relinking was successful.
    1.24 +	*/	
    1.25 +	bool relinkBranch (BranchItem* branch, BranchItem* dst, int pos =-1);	
    1.26 +
    1.27      void deleteSelection();					//!< Delete selection
    1.28  	void deleteKeepChildren();				//!< remove branch, but keep children
    1.29  	void deleteChildren();					//!< keep branch, but remove children
    1.30 @@ -333,7 +340,7 @@
    1.31  	void expandAll();
    1.32  
    1.33  public:	
    1.34 -	void toggleStandardFlag (const QString &name);
    1.35 +	void toggleStandardFlag (const QString &name, FlagRow *master=NULL);
    1.36      void addFloatImage(const QPixmap &img);
    1.37  
    1.38      void colorBranch(QColor);
    1.39 @@ -426,7 +433,6 @@
    1.40  
    1.41  signals:
    1.42  	void noteHasChanged (QModelIndex ix);
    1.43 -	void dataHasChanged (QModelIndex ix);	//FIXME-3 necessary? There is dataChanged in AbstractModel
    1.44  	void newChildObject(QModelIndex ix);
    1.45  
    1.46  private:
    1.47 @@ -477,7 +483,7 @@
    1.48  	uint animationTicks;
    1.49  	uint animationInterval;
    1.50  	int timerId;				// animation timer
    1.51 -	QList <MapObj*> animObjList;// list with animated objects
    1.52 +	QList <MapObj*> animObjList;// list with animated objects //FIXME-2 should go to MapEditor
    1.53  
    1.54  private slots:
    1.55  	void animate();						//!< Called by timer to animate stuff