diff -r 5db8dfd30ea2 -r c2a05fa925a1 imageobj.h
--- a/imageobj.h	Thu Nov 23 16:18:26 2006 +0000
+++ b/imageobj.h	Fri Dec 08 20:18:56 2006 +0000
@@ -1,33 +1,20 @@
 #ifndef IMAGEOBJ_H
 #define IMAGEOBJ_H
 
-#include <qimage.h>
-#include <q3canvas.h>
-#include <qpainter.h>
-//Added by qt3to4:
-#include <QPixmap>
+#include <QGraphicsScene>
+#include <QGraphicsPixmapItem>
 
-#include "mapobj.h"
-
-enum ImageType {qimage,qpixmap,undef};
-
-class ImageObj: public Q3CanvasRectangle
+class ImageObj: public QGraphicsPixmapItem
 {
 public:
-    ImageObj( Q3Canvas *canvas );
+    ImageObj( QGraphicsScene *);
     ~ImageObj();
-	virtual void copy (ImageObj*);
-    virtual void setVisibility(bool);
+	void copy (ImageObj*);
+    void setVisibility(bool);
 	void save (const QString &, const char *);
 	bool load (const QString &);
-	bool load (QPixmap);
-	void setImage(QImage img);
-	QPixmap getPixmap();
-protected:
-    void drawShape( QPainter & );
+	bool load (const QPixmap &);
 private:
-    QImage image;
-    QPixmap pixmap;
-	ImageType type;
+	QGraphicsScene *mapScene;
 };
 #endif