diff -r e95081c21da2 -r 5378ed53ec92 mapobj.h
--- a/mapobj.h	Tue Sep 05 09:47:14 2006 +0000
+++ b/mapobj.h	Tue Apr 10 13:22:55 2007 +0000
@@ -1,7 +1,8 @@
 #ifndef MAPOBJ_H
 #define MAPOBJ_H
 
-#include <q3canvas.h>
+#include <QGraphicsScene>
+#include <QGraphicsItem>
 #include <iostream>
 
 #include "misc.h"
@@ -20,33 +21,34 @@
 class MapObj:public xmlObj {
 public:
     MapObj ();
-    MapObj (Q3Canvas*);
+    MapObj (QGraphicsScene*);
     MapObj (MapObj*);
     virtual ~MapObj ();
     virtual void init ();
     virtual void copy (MapObj*);
-	virtual Q3Canvas* getCanvas();
-    virtual int x();
-    virtual int y();
-	virtual int width();
-	virtual int height();
-	virtual QPoint getAbsPos();
+	virtual QGraphicsScene* getScene();
+    virtual qreal x();
+    virtual qreal y();
+	virtual qreal width();
+	virtual qreal height();
+	virtual QPointF getAbsPos();
 	virtual QString getPos();					// Return position as string (x,y)
     virtual void move (double x,double y);      // move to absolute Position
+    virtual void move (QPointF p);
     virtual void moveBy (double x,double y);    // move to relative Position
-    virtual bool inBox(const QPoint&);			// Check if Point is within clickbox
-    virtual QRect getBBox();					// returns bounding box
-    virtual QRect addBBox(QRect,QRect);			// returns bbox which includes both boxes
-    virtual QSize getSize();					// returns size of bounding box
+    virtual bool inBox(const QPointF&);			// Check if Point is within clickbox
+    virtual QRectF getBBox();					// returns bounding box
+    virtual QRectF addBBox(QRectF,QRectF);			// returns bbox which includes both boxes
+    virtual QSizeF getSize();					// returns size of bounding box
     virtual bool isVisibleObj();
     virtual void setVisibility(bool);
     virtual void positionBBox()=0;       
 	virtual void calcBBoxSize()=0;
 protected:  
-    Q3Canvas* canvas;
-    QRect bbox;									// bounding box of MO itself
-	QRect clickBox;								// area where mouseclicks are found
-    QPoint absPos;							    // Position on canvas
+    QGraphicsScene* scene;
+    QRectF bbox;									// bounding box of MO itself
+	QRectF clickBox;								// area where mouseclicks are found
+    QPointF absPos;							    // Position on canvas
     bool visible;
 };