1.1 --- a/vymmodel.h	Tue Mar 31 15:36:10 2009 +0000
     1.2 +++ b/vymmodel.h	Wed Apr 01 15:06:57 2009 +0000
     1.3 @@ -12,6 +12,8 @@
     1.4  #include "treeitem.h"
     1.5  #include "treemodel.h"
     1.6  
     1.7 +class BranchItem;
     1.8 +
     1.9  class VymModel : public TreeModel {		
    1.10  	Q_OBJECT
    1.11  
    1.12 @@ -231,7 +233,7 @@
    1.13  	void setComment (const QString &);
    1.14  	QString getComment ();
    1.15  	QString getDate();
    1.16 -	int countBranches();
    1.17 +	int branchCount();
    1.18  
    1.19  public:	
    1.20  	void setHeading(const QString &);		//!< Set heading of branch	
    1.21 @@ -322,8 +324,8 @@
    1.22  	void deleteChildren();					//!< keep branch, but remove children
    1.23  
    1.24  private:	
    1.25 -	bool scrollBranch(BranchObj*);
    1.26 -	bool unscrollBranch(BranchObj*);
    1.27 +	bool scrollBranch(BranchItem *);
    1.28 +	bool unscrollBranch(BranchItem *);
    1.29  public:	
    1.30      void toggleScroll();
    1.31      void unscrollChildren();
    1.32 @@ -568,12 +570,13 @@
    1.33  	TreeItem::Type selectionType();
    1.34  	LinkableMapObj* getSelectedLMO();
    1.35  	BranchObj* getSelectedBranch();
    1.36 -	TreeItem* getSelectedBranchItem();
    1.37 +	BranchItem* getSelectedBranchItem();
    1.38  	TreeItem* getSelectedItem();
    1.39  	QModelIndex getSelectedIndex();
    1.40  	FloatImageObj* getSelectedFloatImage();
    1.41  	QString getSelectString ();
    1.42  	QString getSelectString (LinkableMapObj *lmo);
    1.43 +	QString getSelectString (TreeItem *item);
    1.44  	
    1.45  	
    1.46  	/*