1.1 --- a/branchobj.h	Thu Nov 23 13:53:08 2006 +0000
     1.2 +++ b/branchobj.h	Fri Dec 08 20:18:58 2006 +0000
     1.3 @@ -14,8 +14,8 @@
     1.4  class BranchObj:public OrnamentedObj {
     1.5  public:
     1.6      BranchObj ();
     1.7 -    BranchObj (Q3Canvas*);
     1.8 -    BranchObj (Q3Canvas*, LinkableMapObj* parent);
     1.9 +    BranchObj (QGraphicsScene*);
    1.10 +    BranchObj (QGraphicsScene*, LinkableMapObj* parent);
    1.11      ~BranchObj ();
    1.12  	bool operator< ( const BranchObj & );
    1.13  	bool operator== ( const BranchObj & );
    1.14 @@ -28,7 +28,7 @@
    1.15  	virtual int countBranches();		
    1.16  	virtual int countFloatImages();		
    1.17  	virtual int countXLinks();		
    1.18 -    virtual void setParObjTmp (LinkableMapObj*,QPoint,int);// Only for moving Obj around
    1.19 +    virtual void setParObjTmp (LinkableMapObj*,QPointF,int);// Only for moving Obj around
    1.20  	virtual void unsetParObjTmp();			// reuse original ParObj
    1.21  
    1.22  	virtual void unScroll();				
    1.23 @@ -50,19 +50,19 @@
    1.24  
    1.25  	virtual void positionContents();
    1.26      virtual void move (double x,double y);
    1.27 -    virtual void move (QPoint);
    1.28 +    virtual void move (QPointF);
    1.29      virtual void moveBy (double x,double y);
    1.30 -    virtual void moveBy (QPoint);
    1.31 +    virtual void moveBy (QPointF);
    1.32      virtual void positionBBox();
    1.33      virtual void calcBBoxSize();
    1.34  	virtual void setDockPos();
    1.35 -    virtual LinkableMapObj* findMapObj(QPoint,LinkableMapObj*);	// find MapObj 
    1.36 +    virtual LinkableMapObj* findMapObj(QPointF,LinkableMapObj*);	// find MapObj 
    1.37      virtual void setHeading (QString);
    1.38  
    1.39  	virtual void setHideTmp (HideTmpMode);
    1.40  	virtual bool hasHiddenExportParent (BranchObj*);
    1.41  
    1.42 -	virtual QString saveToDir (const QString&,const QString&, const QPoint&);// Save data recursivly to tempdir
    1.43 +	virtual QString saveToDir (const QString&,const QString&, const QPointF&);// Save data recursivly to tempdir
    1.44  	virtual void addXLink (XLinkObj*);
    1.45  	virtual void removeXLinkRef (XLinkObj*);// Remove ref in list
    1.46  	virtual void deleteXLink (XLinkObj*);	// remove references and delete XLinkObj 
    1.47 @@ -105,12 +105,12 @@
    1.48      virtual bool canMoveBranchDown();
    1.49      virtual BranchObj* moveBranchDown(BranchObj*);
    1.50      virtual BranchObj* moveBranchTo (BranchObj*, int);
    1.51 -    virtual void alignRelativeTo(const QPoint );
    1.52 +    virtual void alignRelativeTo(const QPointF );
    1.53  	virtual void reposition();
    1.54  	virtual void unsetAllRepositionRequests();
    1.55  
    1.56 -	virtual QRect getTotalBBox();			// return BBox including childs			
    1.57 -	virtual QRect getBBoxSizeWithChilds();	// return size of BBox including childs  
    1.58 +	virtual QRectF getTotalBBox();			// return BBox including childs			
    1.59 +	virtual QRectF getBBoxSizeWithChilds();	// return size of BBox including childs  
    1.60  	virtual void calcBBoxSizeWithChilds();	// calc size of  BBox including childs recursivly
    1.61  
    1.62      virtual void select();