1.1 --- a/branchobj.h	Tue Aug 01 09:30:57 2006 +0000
     1.2 +++ b/branchobj.h	Tue Sep 05 09:47:13 2006 +0000
     1.3 @@ -5,10 +5,12 @@
     1.4  #include "linkablemapobj.h"
     1.5  #include "ornamentedobj.h"
     1.6  #include "xlinkobj.h"
     1.7 +//Added by qt3to4:
     1.8 +#include <Q3PtrList>
     1.9  
    1.10 -class BranchObjPtrList : public QPtrList<BranchObj>
    1.11 +class BranchObjPtrList : public Q3PtrList<BranchObj>
    1.12  {
    1.13 -	virtual int compareItems (QPtrCollection::Item i, QPtrCollection::Item j);
    1.14 +	virtual int compareItems (Q3PtrCollection::Item i, Q3PtrCollection::Item j);
    1.15  };
    1.16  
    1.17  enum BranchModification {NewBranch, MovedBranch};
    1.18 @@ -18,8 +20,8 @@
    1.19  class BranchObj:public OrnamentedObj {
    1.20  public:
    1.21      BranchObj ();
    1.22 -    BranchObj (QCanvas*);
    1.23 -    BranchObj (QCanvas*, LinkableMapObj* parent);
    1.24 +    BranchObj (Q3Canvas*);
    1.25 +    BranchObj (Q3Canvas*, LinkableMapObj* parent);
    1.26      ~BranchObj ();
    1.27  	bool operator< ( const BranchObj & );
    1.28  	bool operator== ( const BranchObj & );
    1.29 @@ -122,9 +124,10 @@
    1.30  
    1.31  protected:
    1.32  	static BranchObj* itLast;		// iterator for first(), next()
    1.33 +	static BranchObj* itFirst;		// first iterator for first(), next()
    1.34      BranchObjPtrList branch;		// all child branches
    1.35 -	QPtrList<FloatImageObj> floatimage;	// child images
    1.36 -	QPtrList<XLinkObj> xlink;		// xlinks to other branches
    1.37 +	Q3PtrList<FloatImageObj> floatimage;	// child images
    1.38 +	Q3PtrList<XLinkObj> xlink;		// xlinks to other branches
    1.39  public:	
    1.40  	float angle;					// used in mainbranch to reorder mainbranches
    1.41  protected: