1.1 --- a/floatimageobj.cpp	Mon May 30 05:39:10 2005 +0000
     1.2 +++ b/floatimageobj.cpp	Fri Jul 08 07:24:43 2005 +0000
     1.3 @@ -66,9 +66,22 @@
     1.4  
     1.5  int FloatImageObj::z ()
     1.6  {
     1.7 +<<<<<<< floatimageobj.cpp
     1.8  	return qRound (icon->z());
     1.9  }
    1.10  
    1.11 +void FloatImageObj::load (const QPixmap &pixmap)
    1.12 +{
    1.13 +  icon->load(pixmap);
    1.14 +  bbox.setSize (QSize(icon->size().width()+8, icon->size().height()+8));
    1.15 +  positionBBox();
    1.16 +  filetype="PNG";
    1.17 +  filename="noname.png";
    1.18 +=======
    1.19 +	return qRound (icon->z());
    1.20 +>>>>>>> 1.2
    1.21 +}
    1.22 +
    1.23  bool FloatImageObj::load (const QString &fn)
    1.24  {	
    1.25  	if( icon->load (fn))