diff -r edb78a44240b -r 9ff332964015 vymmodel.h
--- a/vymmodel.h	Tue Mar 31 15:36:10 2009 +0000
+++ b/vymmodel.h	Wed Apr 01 15:06:57 2009 +0000
@@ -12,6 +12,8 @@
 #include "treeitem.h"
 #include "treemodel.h"
 
+class BranchItem;
+
 class VymModel : public TreeModel {		
 	Q_OBJECT
 
@@ -231,7 +233,7 @@
 	void setComment (const QString &);
 	QString getComment ();
 	QString getDate();
-	int countBranches();
+	int branchCount();
 
 public:	
 	void setHeading(const QString &);		//!< Set heading of branch	
@@ -322,8 +324,8 @@
 	void deleteChildren();					//!< keep branch, but remove children
 
 private:	
-	bool scrollBranch(BranchObj*);
-	bool unscrollBranch(BranchObj*);
+	bool scrollBranch(BranchItem *);
+	bool unscrollBranch(BranchItem *);
 public:	
     void toggleScroll();
     void unscrollChildren();
@@ -568,12 +570,13 @@
 	TreeItem::Type selectionType();
 	LinkableMapObj* getSelectedLMO();
 	BranchObj* getSelectedBranch();
-	TreeItem* getSelectedBranchItem();
+	BranchItem* getSelectedBranchItem();
 	TreeItem* getSelectedItem();
 	QModelIndex getSelectedIndex();
 	FloatImageObj* getSelectedFloatImage();
 	QString getSelectString ();
 	QString getSelectString (LinkableMapObj *lmo);
+	QString getSelectString (TreeItem *item);
 	
 	
 	/*