1.1 --- a/flagrowobj.h	Thu Mar 23 12:38:54 2006 +0000
     1.2 +++ b/flagrowobj.h	Tue Sep 05 15:05:18 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 <QMainWindow>
     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 @@ -27,6 +29,7 @@
    1.24  	void deactivate(const QString&);
    1.25  	void deactivateAll();
    1.26  	void deactivateGroup(FlagObj *);
    1.27 +	void setToolBar (QToolBar *);
    1.28  	void setEnabled (bool);
    1.29  	void setShowFlags (bool);
    1.30  	void resetUsedCounter();
    1.31 @@ -37,7 +40,8 @@
    1.32  private:	
    1.33  	FlagRowObj* parentRow;					// look for flags in this row
    1.34  	FlagObj* findFlag (const QString&);
    1.35 -    QPtrList <FlagObj> flag; 
    1.36 +    Q3PtrList <FlagObj> flag; 
    1.37 +	QToolBar *toolbar;
    1.38  	QString name;
    1.39  	bool showFlags;							// FloatObjects want to hide their flags
    1.40  };