diff -r 1cc73bd7ee1f -r e95081c21da2 flagobj.h
--- a/flagobj.h	Tue Sep 05 09:47:13 2006 +0000
+++ b/flagobj.h	Tue Sep 05 09:47:14 2006 +0000
@@ -2,8 +2,10 @@
 #define FLAGOBJ_H
 
 
-#include <qcanvas.h>
+#include <q3canvas.h>
 #include <qaction.h>
+//Added by qt3to4:
+#include <QPixmap>
 
 #include "mapobj.h"
 #include "imageobj.h"
@@ -12,7 +14,7 @@
 class FlagObj:public MapObj {
 public:
     FlagObj ();
-    FlagObj (QCanvas*);
+    FlagObj (Q3Canvas*);
     FlagObj (FlagObj*);
     ~FlagObj ();
     virtual void init ();
@@ -28,14 +30,13 @@
 	const QString getGroup();
 	void setToolTip(const QString&);
 	const QString getToolTip();
-	void setButton (QAction*);
-	void updateButton ();
 	QPixmap getPixmap();
+	void setAction(QAction*);
+	void updateAction ();
 	bool isActive();
 	void toggle();
 	void activate();
 	void deactivate();
-	void setEnabled (bool);
 	void setUsed (bool);
 	bool isUsed();
 	void saveToDir (const QString&, const QString&);
@@ -50,7 +51,7 @@
     virtual void calcBBoxSize();
 private:
 	ImageObj* icon;
-	QAction* button;
+	QAction* action;
 };
 
 #endif