diff -r 5db8dfd30ea2 -r c2a05fa925a1 branchobj.h --- a/branchobj.h Thu Nov 23 16:18:26 2006 +0000 +++ b/branchobj.h Fri Dec 08 20:18:56 2006 +0000 @@ -14,8 +14,8 @@ class BranchObj:public OrnamentedObj { public: BranchObj (); - BranchObj (Q3Canvas*); - BranchObj (Q3Canvas*, LinkableMapObj* parent); + BranchObj (QGraphicsScene*); + BranchObj (QGraphicsScene*, LinkableMapObj* parent); ~BranchObj (); bool operator< ( const BranchObj & ); bool operator== ( const BranchObj & ); @@ -28,7 +28,7 @@ virtual int countBranches(); virtual int countFloatImages(); virtual int countXLinks(); - virtual void setParObjTmp (LinkableMapObj*,QPoint,int);// Only for moving Obj around + virtual void setParObjTmp (LinkableMapObj*,QPointF,int);// Only for moving Obj around virtual void unsetParObjTmp(); // reuse original ParObj virtual void unScroll(); @@ -50,19 +50,19 @@ virtual void positionContents(); virtual void move (double x,double y); - virtual void move (QPoint); + virtual void move (QPointF); virtual void moveBy (double x,double y); - virtual void moveBy (QPoint); + virtual void moveBy (QPointF); virtual void positionBBox(); virtual void calcBBoxSize(); virtual void setDockPos(); - virtual LinkableMapObj* findMapObj(QPoint,LinkableMapObj*); // find MapObj + virtual LinkableMapObj* findMapObj(QPointF,LinkableMapObj*); // find MapObj virtual void setHeading (QString); virtual void setHideTmp (HideTmpMode); virtual bool hasHiddenExportParent (BranchObj*); - virtual QString saveToDir (const QString&,const QString&, const QPoint&);// Save data recursivly to tempdir + 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 @@ -105,12 +105,12 @@ virtual bool canMoveBranchDown(); virtual BranchObj* moveBranchDown(BranchObj*); virtual BranchObj* moveBranchTo (BranchObj*, int); - virtual void alignRelativeTo(const QPoint ); + virtual void alignRelativeTo(const QPointF ); virtual void reposition(); virtual void unsetAllRepositionRequests(); - virtual QRect getTotalBBox(); // return BBox including childs - virtual QRect getBBoxSizeWithChilds(); // return size of BBox including childs + virtual QRectF getTotalBBox(); // return BBox including childs + virtual QRectF getBBoxSizeWithChilds(); // return size of BBox including childs virtual void calcBBoxSizeWithChilds(); // calc size of BBox including childs recursivly virtual void select();