1.1 --- a/branchobj.h	Mon Nov 20 12:12:05 2006 +0000
     1.2 +++ b/branchobj.h	Thu Nov 23 13:53:08 2006 +0000
     1.3 @@ -1,19 +1,12 @@
     1.4  #ifndef BRANCHOBJ_H
     1.5  #define BRANCHOBJ_H
     1.6  
     1.7 -#include <Q3PtrList>
     1.8 -
     1.9  #include "floatimageobj.h"
    1.10  #include "linkablemapobj.h"
    1.11  #include "ornamentedobj.h"
    1.12  #include "xlinkobj.h"
    1.13  
    1.14  
    1.15 -class BranchObjPtrList : public Q3PtrList<BranchObj>
    1.16 -{
    1.17 -	virtual int compareItems (Q3PtrCollection::Item i, Q3PtrCollection::Item j);
    1.18 -};
    1.19 -
    1.20  enum BranchModification {NewBranch, MovedBranch};
    1.21  enum HideTmpMode {HideNone, HideExport};
    1.22  
    1.23 @@ -106,7 +99,7 @@
    1.24      virtual BranchObj* getLastSelectedBranch();
    1.25      virtual BranchObj* getFirstBranch();
    1.26      virtual BranchObj* getLastBranch();
    1.27 -	virtual BranchObj* getBranchNum(const uint &);
    1.28 +	virtual BranchObj* getBranchNum(int);
    1.29      virtual bool canMoveBranchUp();
    1.30      virtual BranchObj* moveBranchUp(BranchObj*);
    1.31      virtual bool canMoveBranchDown();
    1.32 @@ -127,9 +120,9 @@
    1.33  protected:
    1.34  	static BranchObj* itLast;		// iterator for first(), next()
    1.35  	static BranchObj* itFirst;		// first iterator for first(), next()
    1.36 -    BranchObjPtrList branch;		// all child branches
    1.37 +    QList<BranchObj*> branch;		// all child branches
    1.38  	QList<FloatImageObj*> floatimage;// child images
    1.39 -	Q3PtrList<XLinkObj> xlink;		// xlinks to other branches
    1.40 +	QList<XLinkObj*> xlink;			// xlinks to other branches
    1.41  public:	
    1.42  	float angle;					// used in mainbranch to reorder mainbranches
    1.43  protected: