diff -r edb78a44240b -r 9ff332964015 branchobj.h
--- a/branchobj.h	Tue Mar 31 15:36:10 2009 +0000
+++ b/branchobj.h	Wed Apr 01 15:06:57 2009 +0000
@@ -31,22 +31,10 @@
     virtual void init ();
     virtual void copy (BranchObj*);
     void clear();
-	virtual int getNum();				// return number of this in parent
-	virtual int getNum(BranchObj*);		// return number of this in parent
-	virtual int getFloatImageNum(FloatImageObj*);		
-	virtual int countBranches();		
-	virtual int countFloatImages();		
-	virtual int countXLinks();		
+
     virtual void setParObjTmp (LinkableMapObj*,QPointF,int);// Only for moving Obj around
 	virtual void unsetParObjTmp();			// reuse original ParObj
 
-	virtual void unScroll();				
-	virtual void toggleScroll();			// scroll or unscroll
-	virtual bool isScrolled();				// returns scroll state
-	virtual bool hasScrolledParent(BranchObj*);	// true, if any of the parents is scrolled
-	virtual void tmpUnscroll();				// unscroll scrolled parents temporary e.g. during "find" process
-	virtual void resetTmpUnscroll();		// scroll all tmp scrolled parents again e.g. when unselecting
-
 	virtual void setVisibility(bool,int);	// set visibility
     virtual void setVisibility(bool);	    // set vis. for w
 	virtual void setLinkColor();			// set the color of link
@@ -68,18 +56,20 @@
 	virtual bool hasHiddenExportParent ();
 
 	virtual QString saveToDir (const QString&,const QString&, const QPointF&);// Save data recursivly to tempdir
+
 	virtual void addXLink (XLinkObj*);
 	virtual void removeXLinkRef (XLinkObj*);// Remove ref in list
 	virtual void deleteXLink (XLinkObj*);	// remove references and delete XLinkObj 
 	virtual void deleteXLinkAt (int);		// remove references and delete XLinkObj 
 	virtual XLinkObj* XLinkAt (int);		// return reference of XLinkObj 
-	virtual int countXLink ();
 	virtual BranchObj* XLinkTargetAt (int);
+
 	void setIncludeImagesVer(bool);
 	bool getIncludeImagesVer();
 	void setIncludeImagesHor(bool);
 	bool getIncludeImagesHor();
 	QString getIncludeImageAttr();
+
 	virtual FloatImageObj* addFloatImage();
 	virtual FloatImageObj* addFloatImage(FloatImageObj*);
 	virtual void removeFloatImage(FloatImageObj*);
@@ -100,13 +90,16 @@
     virtual void removeChildren();  
     virtual void removeBranch(BranchObj*);  
     virtual void removeBranchPtr (BranchObj*);  
+
     virtual BranchObj* getFirstBranch();
     virtual BranchObj* getLastBranch();
 	virtual BranchObj* getBranchNum(int);
+
     virtual bool canMoveBranchUp();
     virtual BranchObj* moveBranchUp(BranchObj*);
     virtual bool canMoveBranchDown();
     virtual BranchObj* moveBranchDown(BranchObj*);
+
     virtual void sortChildren();
     virtual BranchObj* linkTo (BranchObj*, int);
     virtual void alignRelativeTo(const QPointF, bool alignSelf=false );
@@ -134,11 +127,10 @@
 public:	
 	float angle;					// used in mainbranch to reorder mainbranches
 protected:	
-	bool scrolled;					// true if all children are scrolled and thus invisible
-	bool tmpUnscrolled;				// can only be true (temporary) for a scrolled subtree
+//	bool scrolled;					// true if all children are scrolled and thus invisible
+//	bool tmpUnscrolled;				// can only be true (temporary) for a scrolled subtree
 	bool includeImagesVer;			// include floatimages in bbox vertically
 	bool includeImagesHor;			// include floatimages in bbox horizontally
-
 };