linkablemapobj.cpp
branchqt4-port
changeset 20 9ad3d0391be1
parent 2 608f976aa7bb
     1.1 --- a/linkablemapobj.cpp	Thu Aug 31 12:51:20 2006 +0000
     1.2 +++ b/linkablemapobj.cpp	Tue Sep 05 07:56:57 2006 +0000
     1.3 @@ -154,8 +154,7 @@
     1.4  {
     1.5  	if (parObj)
     1.6  	{	
     1.7 -		relPos.setX (absPos.x() - parObj->getChildPos().x() );
     1.8 -		relPos.setY (absPos.y() - parObj->getChildPos().y() );
     1.9 +		relPos=getRelPos();
    1.10  
    1.11  		parObj->calcBBoxSize();
    1.12  		parObj->requestReposition();
    1.13 @@ -171,6 +170,14 @@
    1.14  	}	
    1.15  }
    1.16  
    1.17 +QPoint LinkableMapObj::getRelPos()
    1.18 +{
    1.19 +	if (!parObj) return QPoint();
    1.20 +	relPos.setX (absPos.x() - parObj->getChildPos().x() );
    1.21 +	relPos.setY (absPos.y() - parObj->getChildPos().y() );
    1.22 +	return relPos;
    1.23 +}
    1.24 +
    1.25  int LinkableMapObj::getTopPad()
    1.26  {
    1.27  	return topPad;
    1.28 @@ -665,21 +672,6 @@
    1.29      return parPos;
    1.30  }
    1.31  
    1.32 -QPoint LinkableMapObj::getRelPos()
    1.33 -{
    1.34 -	return relPos;
    1.35 -/* FIXME not needed? relPos was moved in 1.7.10 from
    1.36 -   floatobj to linkablemapobj. Before we had:
    1.37 -	
    1.38 -	if (!parObj) return QPoint (0,0);
    1.39 -    return QPoint(
    1.40 -		absPos.x() - parObj->x(),
    1.41 -		absPos.y() - parObj->y()
    1.42 -	);
    1.43 -*/	
    1.44 -}
    1.45 -
    1.46 -
    1.47  void LinkableMapObj::setUseOrientation (const bool &b)
    1.48  {	
    1.49  	if (useOrientation!=b)