1.1 --- a/flagobj.h	Thu May 07 08:48:53 2009 +0000
     1.2 +++ b/flagobj.h	Wed May 13 08:26:27 2009 +0000
     1.3 @@ -5,6 +5,7 @@
     1.4  #include <QAction>
     1.5  #include <QPixmap>
     1.6  
     1.7 +#include "flag.h"
     1.8  #include "mapobj.h"
     1.9  #include "imageobj.h"
    1.10  
    1.11 @@ -20,6 +21,7 @@
    1.12      FlagObj ();
    1.13      FlagObj (QGraphicsScene*);
    1.14      FlagObj (FlagObj*);
    1.15 +    FlagObj (Flag*);
    1.16      ~FlagObj ();
    1.17      virtual void init ();
    1.18      virtual void copy (FlagObj*);
    1.19 @@ -30,36 +32,24 @@
    1.20  	void load (const QPixmap&);
    1.21  	void setName (const QString&);
    1.22  	const QString getName ();
    1.23 -	void setGroup (const QString&);
    1.24 -	const QString getGroup();
    1.25 -	void unsetGroup ();
    1.26 -	void setToolTip(const QString&);
    1.27 -	const QString getToolTip();
    1.28  	QPixmap getPixmap();
    1.29  	void setAction(QAction*);
    1.30 -	void updateAction ();
    1.31  	void setAlwaysVisible (bool b);
    1.32  	bool isAlwaysVisible ();
    1.33  	bool isActive();
    1.34  	void toggle();
    1.35  	void activate();
    1.36  	void deactivate();
    1.37 -	void setUsed (bool);
    1.38 -	bool isUsed();
    1.39  	void saveToDir (const QString&, const QString&);
    1.40  	
    1.41  protected:	
    1.42  	QString name;
    1.43 -	QString group;
    1.44 -	QString tooltip;
    1.45  	bool state;
    1.46  	bool avis;
    1.47 -	bool used;
    1.48      virtual void positionBBox();
    1.49      virtual void calcBBoxSize();
    1.50  private:
    1.51  	ImageObj* icon;
    1.52 -	QAction* action;
    1.53  };
    1.54  
    1.55  #endif