diff -r a4532e5c2ce3 -r 1c8ff1928b97 branchobj.h
--- a/branchobj.h	Mon Nov 20 12:12:05 2006 +0000
+++ b/branchobj.h	Thu Nov 23 13:53:08 2006 +0000
@@ -1,19 +1,12 @@
 #ifndef BRANCHOBJ_H
 #define BRANCHOBJ_H
 
-#include <Q3PtrList>
-
 #include "floatimageobj.h"
 #include "linkablemapobj.h"
 #include "ornamentedobj.h"
 #include "xlinkobj.h"
 
 
-class BranchObjPtrList : public Q3PtrList<BranchObj>
-{
-	virtual int compareItems (Q3PtrCollection::Item i, Q3PtrCollection::Item j);
-};
-
 enum BranchModification {NewBranch, MovedBranch};
 enum HideTmpMode {HideNone, HideExport};
 
@@ -106,7 +99,7 @@
     virtual BranchObj* getLastSelectedBranch();
     virtual BranchObj* getFirstBranch();
     virtual BranchObj* getLastBranch();
-	virtual BranchObj* getBranchNum(const uint &);
+	virtual BranchObj* getBranchNum(int);
     virtual bool canMoveBranchUp();
     virtual BranchObj* moveBranchUp(BranchObj*);
     virtual bool canMoveBranchDown();
@@ -127,9 +120,9 @@
 protected:
 	static BranchObj* itLast;		// iterator for first(), next()
 	static BranchObj* itFirst;		// first iterator for first(), next()
-    BranchObjPtrList branch;		// all child branches
+    QList<BranchObj*> branch;		// all child branches
 	QList<FloatImageObj*> floatimage;// child images
-	Q3PtrList<XLinkObj> xlink;		// xlinks to other branches
+	QList<XLinkObj*> xlink;			// xlinks to other branches
 public:	
 	float angle;					// used in mainbranch to reorder mainbranches
 protected: