diff -r 5db8dfd30ea2 -r c2a05fa925a1 floatimageobj.cpp
--- a/floatimageobj.cpp	Thu Nov 23 16:18:26 2006 +0000
+++ b/floatimageobj.cpp	Fri Dec 08 20:18:56 2006 +0000
@@ -1,8 +1,8 @@
+#include <QImageReader>
+#include <QPixmap>
+
 #include "floatimageobj.h"
 #include "branchobj.h"
-//Added by qt3to4:
-#include <QPixmap>
-
 
 /////////////////////////////////////////////////////////////////
 // FloatImageObj
@@ -19,15 +19,15 @@
     depth=-1;
 }
 
-FloatImageObj::FloatImageObj (Q3Canvas* c):FloatObj(c)
+FloatImageObj::FloatImageObj (QGraphicsScene* s):FloatObj(s)
 {
- //   cout << "Const FloatImageObj (c)  called from MapCenterObj (c)\n";
+ //   cout << "Const FloatImageObj (s)  called from MapCenterObj (s)\n";
     setParObj (this);	
     init();
     depth=-1;
 }
 
-FloatImageObj::FloatImageObj (Q3Canvas* c, OrnamentedObj* p):FloatObj(c,p)
+FloatImageObj::FloatImageObj (QGraphicsScene *s, OrnamentedObj* p):FloatObj(s,p)
 {
  //   cout << "Const FloatImageObj (c,p)\n";
     init();
@@ -41,13 +41,12 @@
 
 void FloatImageObj::init () 
 {
-	icon=new ImageObj (canvas);
-	icon->move (absPos.x(), absPos.y() );
+	icon=new ImageObj (scene);
+	icon->setPos (absPos.x(), absPos.y() );
 	icon->setVisibility (true);
-	setZ (Z_FLOATIMG);
-	bbox.setSize (QSize(icon->size().width(), icon->size().height()));
-	clickBox.setSize (QSize(icon->size().width(), icon->size().height()));
-	filename="";
+	setZValue (Z_FLOATIMG);
+	bbox.setSize (QSizeF(icon->boundingRect().width(), icon->boundingRect().height()));
+	clickBox.setSize (QSizeF(icon->boundingRect().width(), icon->boundingRect().height()));filename="";
 	originalFilename="no original name available";
 	filetype="";
 	saveInMap=true;
@@ -68,35 +67,41 @@
     positionBBox();
 }
 
-void FloatImageObj::setZ (const int &i)
+void FloatImageObj::setZValue (const int &i)
 {
-	icon->setZ (i);
+	icon->setZValue (i);
 	zPlane=i;
 }
 
 int FloatImageObj::z ()
 {
-	return qRound (icon->z());
+	return qRound (icon->zValue());
 }
 
 void FloatImageObj::load (const QPixmap &pixmap)
 {
-  icon->load(pixmap);
-  bbox.setSize (QSize(icon->size().width()+8, icon->size().height()+8));
-  clickBox.setSize (QSize(icon->size().width()+8, icon->size().height()+8));
-  positionBBox();
-  filetype="PNG";
-  filename="No filename given";
+	icon->load(pixmap);
+	bbox.setSize (QSizeF(icon->boundingRect().width()+8, icon->boundingRect().height()+8));
+	clickBox.setSize (QSizeF(icon->boundingRect().width()+8, icon->boundingRect().height()+8));
+	selbox->setRect(0,0,clickBox.width(),clickBox.height());
+	positionBBox();
+	filetype="PNG";
+	filename="No filename given";
 }
 
 bool FloatImageObj::load (const QString &fn)
 {	
-	if( icon->load (fn))
+	QImageReader reader (fn);
+	QImage img;
+
+	if( reader.read (&img))
 	{
-		bbox.setSize (QSize(icon->size().width()+8, icon->size().height()+8));
+		icon->setPixmap(QPixmap::fromImage(img));
+		bbox.setSize (QSizeF(icon->boundingRect().width()+8, icon->boundingRect().height()+8));
+		selbox->setRect(0,0,clickBox.width(),clickBox.height());
 		positionBBox();
 		filename=fn;
-//FIXME QT3 was		filetype=QPixmap::imageFormat (fn);
+		filetype=reader.format();
 		setOriginalFilename (fn);
 		return true;
 	} else
@@ -135,18 +140,19 @@
 void FloatImageObj::move (double x, double y)
 {
 	FloatObj::move(x,y);
-	icon->move (x+4,y+4);
+	icon->setPos (x+4,y+4);
     positionBBox();
 }
 
-void FloatImageObj::move (QPoint p)
+void FloatImageObj::move (QPointF p)
 {
-	move (p.x(), p.y());
+	OrnamentedObj::move (p.x(),p.y());
 }
 
 void FloatImageObj::positionBBox()
 {
 	clickBox=bbox;
+	setSelBox();
 }
 
 void FloatImageObj::calcBBoxSize()
@@ -206,12 +212,12 @@
 }
 
 
-QRect FloatImageObj::getTotalBBox()
+QRectF FloatImageObj::getTotalBBox()
 {
 	return bbox;
 }
 
-QRect FloatImageObj::getBBoxSizeWithChilds()
+QRectF FloatImageObj::getBBoxSizeWithChilds()
 {
 	//FIXME  abstract in linkablemapobj.h, not calculated
 	return bboxTotal;