1.1 --- a/flagrowobj.h	Sun Jan 30 12:58:47 2005 +0000
     1.2 +++ b/flagrowobj.h	Tue Jun 06 14:58:11 2006 +0000
     1.3 @@ -1,7 +1,9 @@
     1.4  #ifndef FLAGROWOBJ_H
     1.5  #define FLAGROWOBJ_H
     1.6  
     1.7 -#include <qmainwindow.h>
     1.8 +#include <q3mainwindow.h>
     1.9 +//Added by qt3to4:
    1.10 +#include <Q3PtrList>
    1.11  
    1.12  #include "mapobj.h"
    1.13  #include "flagobj.h"
    1.14 @@ -9,7 +11,7 @@
    1.15  class FlagRowObj:public QObject,public MapObj {
    1.16  public:
    1.17      FlagRowObj ();
    1.18 -    FlagRowObj (QCanvas*);
    1.19 +    FlagRowObj (Q3Canvas*);
    1.20      ~FlagRowObj ();
    1.21      virtual void init ();
    1.22      virtual void copy (FlagRowObj*);
    1.23 @@ -22,20 +24,23 @@
    1.24      virtual void calcBBoxSize();
    1.25  	virtual QString getFlagName (const QPoint &p);	// Find flag by position
    1.26  	bool isActive(const QString&);
    1.27 -	void toggle (const QString&);
    1.28 +	void toggle (const QString&,bool);
    1.29  	void activate(const QString&);
    1.30  	void deactivate(const QString&);
    1.31  	void deactivateAll();
    1.32 +	void deactivateGroup(FlagObj *);
    1.33  	void setEnabled (bool);
    1.34 +	void setShowFlags (bool);
    1.35  	void resetUsedCounter();
    1.36  	QString saveToDir (const QString &,const QString &,bool);
    1.37  	void setName (const QString&);			// prefix for exporting flags to dir
    1.38 -	void makeToolbar (QMainWindow*, const QString &);	// Create Toolbar buttons
    1.39 -	void updateToolBar();					// Update Toolbar buttons	
    1.40 +	void makeToolbar (Q3MainWindow*, const QString &);	// Create Toolbar buttons
    1.41 +	void updateToolbar();					// Update Toolbar buttons	
    1.42  private:	
    1.43  	FlagRowObj* parentRow;					// look for flags in this row
    1.44  	FlagObj* findFlag (const QString&);
    1.45 -    QPtrList <FlagObj> flag; 
    1.46 +    Q3PtrList <FlagObj> flag; 
    1.47  	QString name;
    1.48 +	bool showFlags;							// FloatObjects want to hide their flags
    1.49  };
    1.50  #endif