diff -r 9eb7767c2dfa -r 608f976aa7bb floatimageobj.h --- a/floatimageobj.h Sun Jan 30 12:58:47 2005 +0000 +++ b/floatimageobj.h Tue Jun 06 14:58:11 2006 +0000 @@ -2,19 +2,22 @@ #define FLOATIMAGEOBJ_H #include "floatobj.h" +//Added by qt3to4: +#include ///////////////////////////////////////////////////////////////////////////// class FloatImageObj:public FloatObj { public: FloatImageObj (); - FloatImageObj (QCanvas*); - FloatImageObj (QCanvas*, LinkableMapObj* parent); + FloatImageObj (Q3Canvas*); + FloatImageObj (Q3Canvas*, OrnamentedObj* parent); ~FloatImageObj (); virtual void init (); virtual void copy (FloatImageObj*); virtual void setZ (const int&); virtual int z(); + virtual void load (const QPixmap &); virtual bool load (const QString &); virtual void save (const QString &, const char *); virtual void setOriginalFilename(const QString &); @@ -27,7 +30,7 @@ virtual QRect getTotalBBox(); // return BBox including childs virtual QRect getBBoxSizeWithChilds(); // return size of BBox including childs virtual void calcBBoxSizeWithChilds(); // calc size of BBox including childs recursivly - virtual QString saveToDir(const QString &,const QString&); + virtual QString saveToDir(const QString &,const QString&, const QPoint &); virtual void resetSaveCounter(); virtual QString getSelectString(); @@ -35,7 +38,7 @@ protected: ImageObj *icon; bool saveInMap; - static int counter; // numerate the files during saveToDir + static uint saveCounter; // numerate the files during saveToDir QString filetype; QString filename; QString originalFilename;