1.1 --- a/floatimageobj.h	Sun Jan 30 12:58:47 2005 +0000
     1.2 +++ b/floatimageobj.h	Tue Jun 06 14:58:11 2006 +0000
     1.3 @@ -2,19 +2,22 @@
     1.4  #define FLOATIMAGEOBJ_H
     1.5  
     1.6  #include "floatobj.h"
     1.7 +//Added by qt3to4:
     1.8 +#include <QPixmap>
     1.9  
    1.10  /////////////////////////////////////////////////////////////////////////////
    1.11  class FloatImageObj:public FloatObj {
    1.12  public:
    1.13      FloatImageObj ();
    1.14 -    FloatImageObj (QCanvas*);
    1.15 -    FloatImageObj (QCanvas*, LinkableMapObj* parent);
    1.16 +    FloatImageObj (Q3Canvas*);
    1.17 +    FloatImageObj (Q3Canvas*, OrnamentedObj* parent);
    1.18      ~FloatImageObj ();
    1.19      virtual void init ();
    1.20      virtual void copy (FloatImageObj*);
    1.21  	virtual void setZ (const int&);
    1.22  	virtual int z();
    1.23  
    1.24 +	virtual void load (const QPixmap &);
    1.25  	virtual bool load (const QString &);
    1.26  	virtual void save (const QString &, const char *);
    1.27  	virtual void setOriginalFilename(const QString &);
    1.28 @@ -27,7 +30,7 @@
    1.29  	virtual QRect getTotalBBox();			// return BBox including childs			
    1.30  	virtual QRect getBBoxSizeWithChilds();	// return size of BBox including childs  
    1.31  	virtual void calcBBoxSizeWithChilds();	// calc size of  BBox including childs recursivly
    1.32 -	virtual QString saveToDir(const QString &,const QString&);
    1.33 +	virtual QString saveToDir(const QString &,const QString&, const QPoint &);
    1.34  	virtual void resetSaveCounter();
    1.35  	virtual QString getSelectString();
    1.36  
    1.37 @@ -35,7 +38,7 @@
    1.38  protected:
    1.39  	ImageObj *icon;
    1.40  	bool saveInMap;
    1.41 -	static int counter;			// numerate the files during saveToDir
    1.42 +	static uint saveCounter;	// numerate the files during saveToDir
    1.43  	QString filetype;
    1.44  	QString filename;
    1.45  	QString originalFilename;