diff -r 7a71a914afdb -r 6d2b32f305f9 flagobj.h
--- a/flagobj.h	Thu May 07 08:48:53 2009 +0000
+++ b/flagobj.h	Wed May 13 08:26:27 2009 +0000
@@ -5,6 +5,7 @@
 #include <QAction>
 #include <QPixmap>
 
+#include "flag.h"
 #include "mapobj.h"
 #include "imageobj.h"
 
@@ -20,6 +21,7 @@
     FlagObj ();
     FlagObj (QGraphicsScene*);
     FlagObj (FlagObj*);
+    FlagObj (Flag*);
     ~FlagObj ();
     virtual void init ();
     virtual void copy (FlagObj*);
@@ -30,36 +32,24 @@
 	void load (const QPixmap&);
 	void setName (const QString&);
 	const QString getName ();
-	void setGroup (const QString&);
-	const QString getGroup();
-	void unsetGroup ();
-	void setToolTip(const QString&);
-	const QString getToolTip();
 	QPixmap getPixmap();
 	void setAction(QAction*);
-	void updateAction ();
 	void setAlwaysVisible (bool b);
 	bool isAlwaysVisible ();
 	bool isActive();
 	void toggle();
 	void activate();
 	void deactivate();
-	void setUsed (bool);
-	bool isUsed();
 	void saveToDir (const QString&, const QString&);
 	
 protected:	
 	QString name;
-	QString group;
-	QString tooltip;
 	bool state;
 	bool avis;
-	bool used;
     virtual void positionBBox();
     virtual void calcBBoxSize();
 private:
 	ImageObj* icon;
-	QAction* action;
 };
 
 #endif