diff -r 3dc98c8843bc -r 7b74fa3772bf branchobj.h --- a/branchobj.h Tue Aug 01 09:30:57 2006 +0000 +++ b/branchobj.h Tue Sep 05 09:47:13 2006 +0000 @@ -5,10 +5,12 @@ #include "linkablemapobj.h" #include "ornamentedobj.h" #include "xlinkobj.h" +//Added by qt3to4: +#include -class BranchObjPtrList : public QPtrList +class BranchObjPtrList : public Q3PtrList { - virtual int compareItems (QPtrCollection::Item i, QPtrCollection::Item j); + virtual int compareItems (Q3PtrCollection::Item i, Q3PtrCollection::Item j); }; enum BranchModification {NewBranch, MovedBranch}; @@ -18,8 +20,8 @@ class BranchObj:public OrnamentedObj { public: BranchObj (); - BranchObj (QCanvas*); - BranchObj (QCanvas*, LinkableMapObj* parent); + BranchObj (Q3Canvas*); + BranchObj (Q3Canvas*, LinkableMapObj* parent); ~BranchObj (); bool operator< ( const BranchObj & ); bool operator== ( const BranchObj & ); @@ -122,9 +124,10 @@ protected: static BranchObj* itLast; // iterator for first(), next() + static BranchObj* itFirst; // first iterator for first(), next() BranchObjPtrList branch; // all child branches - QPtrList floatimage; // child images - QPtrList xlink; // xlinks to other branches + Q3PtrList floatimage; // child images + Q3PtrList xlink; // xlinks to other branches public: float angle; // used in mainbranch to reorder mainbranches protected: