1.1 --- a/flagobj.h	Sun Jan 30 12:58:47 2005 +0000
     1.2 +++ b/flagobj.h	Tue Jun 06 14:58:11 2006 +0000
     1.3 @@ -2,8 +2,10 @@
     1.4  #define FLAGOBJ_H
     1.5  
     1.6  
     1.7 -#include <qcanvas.h>
     1.8 +#include <q3canvas.h>
     1.9  #include <qaction.h>
    1.10 +//Added by qt3to4:
    1.11 +#include <QPixmap>
    1.12  
    1.13  #include "mapobj.h"
    1.14  #include "imageobj.h"
    1.15 @@ -12,7 +14,7 @@
    1.16  class FlagObj:public MapObj {
    1.17  public:
    1.18      FlagObj ();
    1.19 -    FlagObj (QCanvas*);
    1.20 +    FlagObj (Q3Canvas*);
    1.21      FlagObj (FlagObj*);
    1.22      ~FlagObj ();
    1.23      virtual void init ();
    1.24 @@ -24,6 +26,8 @@
    1.25  	void load (const QPixmap&);
    1.26  	void setName (const QString&);
    1.27  	const QString getName ();
    1.28 +	void setGroup (const QString&);
    1.29 +	const QString getGroup();
    1.30  	void setToolTip(const QString&);
    1.31  	const QString getToolTip();
    1.32  	void setButton (QAction*);
    1.33 @@ -40,6 +44,7 @@
    1.34  	
    1.35  protected:	
    1.36  	QString name;
    1.37 +	QString group;
    1.38  	QString tooltip;
    1.39  	bool state;
    1.40  	bool used;