1.1 --- a/flagobj.cpp	Sun Jan 30 12:58:47 2005 +0000
     1.2 +++ b/flagobj.cpp	Tue Jun 06 14:58:11 2006 +0000
     1.3 @@ -1,17 +1,19 @@
     1.4  #include "flagobj.h"
     1.5 +//Added by qt3to4:
     1.6 +#include <QPixmap>
     1.7  
     1.8  /////////////////////////////////////////////////////////////////
     1.9  // FlagObj
    1.10  /////////////////////////////////////////////////////////////////
    1.11  FlagObj::FlagObj()
    1.12  {
    1.13 -//    cout << "Const FlagObj ()\n";
    1.14 +//	cout << "Const FlagObj ()\n";
    1.15      init ();
    1.16  }
    1.17  
    1.18 -FlagObj::FlagObj(QCanvas* c):MapObj(c) 
    1.19 +FlagObj::FlagObj(Q3Canvas* c):MapObj(c) 
    1.20  {
    1.21 -//    cout << "Const FlagObj\n";
    1.22 +//	cout << "Const FlagObj  canvas="<<c<<endl;
    1.23      init ();
    1.24  }
    1.25  
    1.26 @@ -23,13 +25,14 @@
    1.27  FlagObj::~FlagObj()
    1.28  {
    1.29  //    cout << "Destr FlagObj  " << name << "\n";
    1.30 -	delete (icon);
    1.31 +	if (icon) delete (icon);
    1.32  }
    1.33  
    1.34  
    1.35  void FlagObj::init ()
    1.36  {
    1.37  	name="undefined";
    1.38 +	group="undefined";
    1.39  
    1.40  	icon=new ImageObj (canvas);
    1.41  	icon->move (absPos.x(), absPos.y() );
    1.42 @@ -41,6 +44,7 @@
    1.43  {
    1.44      MapObj::copy(other);
    1.45  	name=other->name;
    1.46 +	group=other->group;
    1.47  	tooltip=other->tooltip;
    1.48  	state=other->state;
    1.49  	icon->copy(other->icon);
    1.50 @@ -95,6 +99,16 @@
    1.51  	return name;
    1.52  }
    1.53  
    1.54 +void FlagObj::setGroup (const QString &n)
    1.55 +{
    1.56 +	group=n;
    1.57 +}
    1.58 +
    1.59 +const QString FlagObj::getGroup()
    1.60 +{
    1.61 +	return group;
    1.62 +}
    1.63 +
    1.64  void FlagObj::setToolTip(const QString &n)
    1.65  {
    1.66  	tooltip=n;
    1.67 @@ -182,8 +196,8 @@
    1.68  
    1.69  void FlagObj::positionBBox()
    1.70  {
    1.71 -    bbox.setX (absPos.x() );
    1.72 -    bbox.setY (absPos.y() );
    1.73 +    bbox.moveTopLeft (absPos );
    1.74 +    clickBox.moveTopLeft (absPos );
    1.75  }
    1.76  
    1.77  void FlagObj::calcBBoxSize()
    1.78 @@ -197,5 +211,6 @@
    1.79  	{
    1.80  		bbox.setSize (QSize(0,0));
    1.81  	}
    1.82 +	clickBox.setSize (bbox.size());
    1.83  }
    1.84