1.1 --- a/flagrowobj.h	Tue Jun 06 14:58:11 2006 +0000
     1.2 +++ b/flagrowobj.h	Tue Jun 13 08:49:12 2006 +0000
     1.3 @@ -1,7 +1,7 @@
     1.4  #ifndef FLAGROWOBJ_H
     1.5  #define FLAGROWOBJ_H
     1.6  
     1.7 -#include <q3mainwindow.h>
     1.8 +#include <QMainWindow>
     1.9  //Added by qt3to4:
    1.10  #include <Q3PtrList>
    1.11  
    1.12 @@ -29,17 +29,19 @@
    1.13  	void deactivate(const QString&);
    1.14  	void deactivateAll();
    1.15  	void deactivateGroup(FlagObj *);
    1.16 +	void setToolBar (QToolBar *);
    1.17  	void setEnabled (bool);
    1.18  	void setShowFlags (bool);
    1.19  	void resetUsedCounter();
    1.20  	QString saveToDir (const QString &,const QString &,bool);
    1.21  	void setName (const QString&);			// prefix for exporting flags to dir
    1.22 -	void makeToolbar (Q3MainWindow*, const QString &);	// Create Toolbar buttons
    1.23 +	void makeToolbar (QMainWindow*, const QString &);	// Create Toolbar buttons
    1.24  	void updateToolbar();					// Update Toolbar buttons	
    1.25  private:	
    1.26  	FlagRowObj* parentRow;					// look for flags in this row
    1.27  	FlagObj* findFlag (const QString&);
    1.28      Q3PtrList <FlagObj> flag; 
    1.29 +	QToolBar *toolbar;
    1.30  	QString name;
    1.31  	bool showFlags;							// FloatObjects want to hide their flags
    1.32  };