diff -r 5e684bfe5bb1 -r 8df2895c131c linkablemapobj.h --- a/linkablemapobj.h Wed Mar 01 14:39:04 2006 +0000 +++ b/linkablemapobj.h Tue Sep 05 11:53:54 2006 +0000 @@ -5,6 +5,9 @@ #include "noteobj.h" #include "headingobj.h" #include "flagrowobj.h" +//Added by qt3to4: +#include +#include #define MAX_DEPTH 999 @@ -23,7 +26,7 @@ Q_OBJECT public: LinkableMapObj (); - LinkableMapObj (QCanvas*); + LinkableMapObj (Q3Canvas*); LinkableMapObj (LinkableMapObj*); ~LinkableMapObj (); virtual void delLink(); @@ -38,6 +41,7 @@ virtual void setUseRelPos (const bool&); virtual void setRelPos(); // set relPos to current parentPos virtual void setRelPos(const QPoint&); + virtual QPoint getRelPos(); virtual void setUseOrientation (const bool &); @@ -68,7 +72,6 @@ virtual void setDockPos(); // sets childPos and parPos QPoint getChildPos(); // returns pos where childs dock QPoint getParPos(); // returns pos where parents dock - QPoint getRelPos(); // get position relative to parent (or (0,0)) LinkOrient getOrientation(); // get orientation virtual int getDepth(); // return depth virtual void setMapEditor(MapEditor*); // set MapEditor (needed in LMO::updateNoteFlag) @@ -93,7 +96,7 @@ virtual QString saveToDir (const QString&,const QString&, const QPoint&)=0;// Save data to tempdir protected: - void parabel(QPointArray &,double,double,double,double); // Create Parabel connecting two points + void parabel(Q3PointArray &,double,double,double,double); // Create Parabel connecting two points QString getLinkAttr(); QPoint childPos; @@ -114,19 +117,19 @@ LinkStyle style; // Current style LinkPos linkpos; // Link at bottom of object or middle of height QColor linkcolor; // Link color - QCanvasLine* l; // line style - QCanvasPolygon* p; // poly styles + Q3CanvasLine* l; // line style + Q3CanvasPolygon* p; // poly styles int arcsegs; // arc: number of segments - QPtrList segment; // a part of e.g. the parabel - QPointArray pa0; // For drawing of PolyParabel and PolyLine - QPointArray pa1; // For drawing of PolyParabel - QPointArray pa2; // For drawing of PolyParabel - QCanvasLine* bottomline; // on bottom of BBox + Q3PtrList segment; // a part of e.g. the parabel + Q3PointArray pa0; // For drawing of PolyParabel and PolyLine + Q3PointArray pa1; // For drawing of PolyParabel + Q3PointArray pa2; // For drawing of PolyParabel + Q3CanvasLine* bottomline; // on bottom of BBox bool repositionRequest; // bool selected; // Used for marking the selection bool hideLinkUnselected; // to hide links if unselected - QCanvasRectangle* selbox; + Q3CanvasRectangle* selbox; FrameObj *frame; // frame around object int topPad, botPad, leftPad, rightPad; // padding within bbox