1.1 --- a/flagobj.h	Mon May 23 15:28:20 2005 +0000
     1.2 +++ b/flagobj.h	Mon Oct 16 12:42:54 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 @@ -28,14 +30,13 @@
    1.25  	const QString getGroup();
    1.26  	void setToolTip(const QString&);
    1.27  	const QString getToolTip();
    1.28 -	void setButton (QAction*);
    1.29 -	void updateButton ();
    1.30  	QPixmap getPixmap();
    1.31 +	void setAction(QAction*);
    1.32 +	void updateAction ();
    1.33  	bool isActive();
    1.34  	void toggle();
    1.35  	void activate();
    1.36  	void deactivate();
    1.37 -	void setEnabled (bool);
    1.38  	void setUsed (bool);
    1.39  	bool isUsed();
    1.40  	void saveToDir (const QString&, const QString&);
    1.41 @@ -50,7 +51,7 @@
    1.42      virtual void calcBBoxSize();
    1.43  private:
    1.44  	ImageObj* icon;
    1.45 -	QAction* button;
    1.46 +	QAction* action;
    1.47  };
    1.48  
    1.49  #endif