1.1 --- a/linkablemapobj.h	Wed Mar 01 14:39:04 2006 +0000
     1.2 +++ b/linkablemapobj.h	Tue Sep 05 15:05:18 2006 +0000
     1.3 @@ -5,6 +5,9 @@
     1.4  #include "noteobj.h"
     1.5  #include "headingobj.h"
     1.6  #include "flagrowobj.h"
     1.7 +//Added by qt3to4:
     1.8 +#include <Q3PointArray>
     1.9 +#include <Q3PtrList>
    1.10  
    1.11  #define MAX_DEPTH 999
    1.12  
    1.13 @@ -23,7 +26,7 @@
    1.14  	Q_OBJECT
    1.15  public:
    1.16      LinkableMapObj ();
    1.17 -    LinkableMapObj (QCanvas*);
    1.18 +    LinkableMapObj (Q3Canvas*);
    1.19      LinkableMapObj (LinkableMapObj*);
    1.20      ~LinkableMapObj ();
    1.21  	virtual void delLink();
    1.22 @@ -38,6 +41,7 @@
    1.23  	virtual void setUseRelPos (const bool&);
    1.24  	virtual void setRelPos();				// set relPos to current parentPos
    1.25  	virtual void setRelPos(const QPoint&);	
    1.26 +	virtual QPoint getRelPos();
    1.27  	virtual void setUseOrientation (const bool &);
    1.28  
    1.29  
    1.30 @@ -68,7 +72,6 @@
    1.31  	virtual void setDockPos();				// sets childPos and parPos
    1.32      QPoint getChildPos();					// returns pos where childs dock
    1.33      QPoint getParPos();						// returns pos where parents dock
    1.34 -    QPoint getRelPos();						// get position relative to parent (or (0,0))
    1.35      LinkOrient getOrientation();			// get orientation
    1.36      virtual int getDepth();					// return depth
    1.37  	virtual void setMapEditor(MapEditor*);	// set MapEditor (needed in LMO::updateNoteFlag)
    1.38 @@ -93,7 +96,7 @@
    1.39  	virtual QString saveToDir (const QString&,const QString&, const QPoint&)=0;// Save data to tempdir
    1.40  
    1.41  protected:
    1.42 -	void parabel(QPointArray &,double,double,double,double);	// Create Parabel connecting two points
    1.43 +	void parabel(Q3PointArray &,double,double,double,double);	// Create Parabel connecting two points
    1.44  	QString getLinkAttr();
    1.45  
    1.46      QPoint childPos;
    1.47 @@ -114,19 +117,19 @@
    1.48      LinkStyle style;				// Current style
    1.49  	LinkPos linkpos;				// Link at bottom of object or middle of height
    1.50      QColor linkcolor;               // Link color
    1.51 -    QCanvasLine* l;                 // line style
    1.52 -	QCanvasPolygon* p;				// poly styles
    1.53 +    Q3CanvasLine* l;                 // line style
    1.54 +	Q3CanvasPolygon* p;				// poly styles
    1.55      int arcsegs;                    // arc: number of segments
    1.56 -    QPtrList <QCanvasLine> segment; // a part of e.g. the parabel
    1.57 -	QPointArray pa0;				// For drawing of PolyParabel and PolyLine
    1.58 -	QPointArray pa1;				// For drawing of PolyParabel 
    1.59 -	QPointArray pa2;				// For drawing of PolyParabel	
    1.60 -    QCanvasLine* bottomline;        // on bottom of BBox
    1.61 +    Q3PtrList <Q3CanvasLine> segment; // a part of e.g. the parabel
    1.62 +	Q3PointArray pa0;				// For drawing of PolyParabel and PolyLine
    1.63 +	Q3PointArray pa1;				// For drawing of PolyParabel 
    1.64 +	Q3PointArray pa2;				// For drawing of PolyParabel	
    1.65 +    Q3CanvasLine* bottomline;        // on bottom of BBox
    1.66  	bool repositionRequest;			// 
    1.67  
    1.68  	bool selected;					// Used for marking the selection
    1.69  	bool hideLinkUnselected;		// to hide links if unselected
    1.70 -	QCanvasRectangle* selbox;
    1.71 +	Q3CanvasRectangle* selbox;
    1.72  	FrameObj *frame;				// frame around object
    1.73  	int topPad, botPad,
    1.74  		leftPad, rightPad;          // padding within bbox