diff -r 9eb7767c2dfa -r 608f976aa7bb flagobj.cpp
--- a/flagobj.cpp	Sun Jan 30 12:58:47 2005 +0000
+++ b/flagobj.cpp	Tue Jun 06 14:58:11 2006 +0000
@@ -1,17 +1,19 @@
 #include "flagobj.h"
+//Added by qt3to4:
+#include <QPixmap>
 
 /////////////////////////////////////////////////////////////////
 // FlagObj
 /////////////////////////////////////////////////////////////////
 FlagObj::FlagObj()
 {
-//    cout << "Const FlagObj ()\n";
+//	cout << "Const FlagObj ()\n";
     init ();
 }
 
-FlagObj::FlagObj(QCanvas* c):MapObj(c) 
+FlagObj::FlagObj(Q3Canvas* c):MapObj(c) 
 {
-//    cout << "Const FlagObj\n";
+//	cout << "Const FlagObj  canvas="<<c<<endl;
     init ();
 }
 
@@ -23,13 +25,14 @@
 FlagObj::~FlagObj()
 {
 //    cout << "Destr FlagObj  " << name << "\n";
-	delete (icon);
+	if (icon) delete (icon);
 }
 
 
 void FlagObj::init ()
 {
 	name="undefined";
+	group="undefined";
 
 	icon=new ImageObj (canvas);
 	icon->move (absPos.x(), absPos.y() );
@@ -41,6 +44,7 @@
 {
     MapObj::copy(other);
 	name=other->name;
+	group=other->group;
 	tooltip=other->tooltip;
 	state=other->state;
 	icon->copy(other->icon);
@@ -95,6 +99,16 @@
 	return name;
 }
 
+void FlagObj::setGroup (const QString &n)
+{
+	group=n;
+}
+
+const QString FlagObj::getGroup()
+{
+	return group;
+}
+
 void FlagObj::setToolTip(const QString &n)
 {
 	tooltip=n;
@@ -182,8 +196,8 @@
 
 void FlagObj::positionBBox()
 {
-    bbox.setX (absPos.x() );
-    bbox.setY (absPos.y() );
+    bbox.moveTopLeft (absPos );
+    clickBox.moveTopLeft (absPos );
 }
 
 void FlagObj::calcBBoxSize()
@@ -197,5 +211,6 @@
 	{
 		bbox.setSize (QSize(0,0));
 	}
+	clickBox.setSize (bbox.size());
 }