diff -r e95081c21da2 -r c2a05fa925a1 imageobj.cpp
--- a/imageobj.cpp	Tue Sep 05 09:47:14 2006 +0000
+++ b/imageobj.cpp	Fri Dec 08 20:18:56 2006 +0000
@@ -1,16 +1,17 @@
 #include "imageobj.h"
-//Added by qt3to4:
-#include <QPixmap>
+#include "mapobj.h"
 
 /////////////////////////////////////////////////////////////////
 // ImageObj
 /////////////////////////////////////////////////////////////////
-ImageObj::ImageObj( Q3Canvas *canvas )
-    : Q3CanvasRectangle( canvas )
+ImageObj::ImageObj( QGraphicsScene *scene) : QGraphicsPixmapItem (NULL,scene )
 {
-//	cout << "Const ImageObj (canvas)\n";
-    setZ(Z_ICON);	
-	type=undef;
+//	cout << "Const ImageObj (scene)\n";
+
+	setShapeMode (QGraphicsPixmapItem::BoundingRectShape);
+    setZValue(Z_ICON);	
+	mapScene=scene;
+	hide();
 }
 
 ImageObj::~ImageObj()
@@ -20,13 +21,9 @@
 
 void ImageObj::copy(ImageObj* other)
 {
-	setSize (other->width(), other->height() );
 	setVisibility (other->isVisible() );
-	type=other->type;
-//	if (type==qimage)
-		image=other->image;
-//	if (type==qpixmap)
-		pixmap=other->pixmap;
+	setPixmap (other->QGraphicsPixmapItem::pixmap());	
+	setPos (other->pos());
 }
 
 void ImageObj::setVisibility (bool v)
@@ -39,64 +36,24 @@
 
 void ImageObj::save(const QString &fn, const char *format)
 {
-	switch (type)
-	{
-		case undef: qWarning("Warning: ImageObj::save() type=undef");break;
-		case qimage: image.save (fn,format,-1);break;
-		case qpixmap: pixmap.save (fn,format,-1);break;
-	}
+	pixmap().save (fn,format,-1);
 }
 
 bool ImageObj::load (const QString &fn)
 {
-	if (!image.load( fn) )
-		//cout << "Fatal Error in ImageObj::load ("<<fn<<")\n";
-		return false;
-    setSize( image.width(), image.height() );
-	type=qimage;
+	QPixmap pixmap;
+    if (pixmap.load (fn)) 
+	{
+		setPixmap (pixmap);
+		return true;
+	}	
+	return false;
+}
 
-#if !defined(Q_WS_QWS)
-    pixmap.convertFromImage(image, Qt::OrderedAlphaDither);
-#endif
+bool ImageObj::load (const QPixmap &pm)
+{
+	setPixmap (pm);
 	return true;
 }
 
-bool ImageObj::load (QPixmap pm)
-{
-#if !defined(Q_WS_QWS)
-    //pixmap.convertFromImage(image, OrderedAlphaDither);
-	type=qpixmap;
-	pixmap=pm;
-    setSize( pm.width(), pm.height() );
-#else
-	type=qimage;
-	image=pm;
-    setSize( image.width(), image.height() );
-#endif
-	return true;
-}
 
-void ImageObj::setImage(QImage img)
-{
-	type=qimage;
-	image=img;
-    pixmap.convertFromImage(image, Qt::OrderedAlphaDither);
-}
-
-QPixmap ImageObj::getPixmap()
-{
-	return pixmap;
-}
-
-void ImageObj::drawShape( QPainter &p )
-{
-// On Qt/Embedded, we can paint a QImage as fast as a QPixmap,
-// but on other platforms, we need to use a QPixmap.
-#if defined(Q_WS_QWS)
-    p.drawImage( int(x()), int(y()), image, 0, 0, -1, -1, Qt::OrderedAlphaDither );
-#else
-    p.drawPixmap( int(x()), int(y()), pixmap );
-#endif
-}
-
-