1.1 --- a/flagrowobj.h	Wed May 06 11:08:38 2009 +0000
     1.2 +++ b/flagrowobj.h	Thu May 07 08:48:53 2009 +0000
     1.3 @@ -3,7 +3,7 @@
     1.4  
     1.5  #include <QMainWindow>
     1.6  
     1.7 -#include "mapobj.h"
     1.8 +//#include "mapobj.h"
     1.9  #include "flagobj.h"
    1.10  
    1.11  /*! \brief A collection of flags (FlagObj). 
    1.12 @@ -12,7 +12,7 @@
    1.13     A toolbar can be created from the flags in this row.
    1.14   */
    1.15  
    1.16 -class FlagRowObj:public MapObj {
    1.17 +class FlagRowObj:public MapObj {	// FIXME-0 move pixmaps to mainwindow or model in the end...
    1.18  public:
    1.19      FlagRowObj ();
    1.20      FlagRowObj (QGraphicsScene *);
    1.21 @@ -28,19 +28,19 @@
    1.22      virtual void calcBBoxSize();
    1.23  	virtual QString getFlagName (const QPointF &p);	// Find flag by position
    1.24  	bool isActive(const QString&);
    1.25 -	void toggle (const QString&,bool);
    1.26 +	void toggle (const QString &name);
    1.27  	void activate(const QString&);
    1.28  	void deactivate(const QString&);
    1.29  	void deactivateAll();
    1.30 -	void deactivateGroup(FlagObj *);
    1.31 -	void setToolBar (QToolBar *);
    1.32 +	void deactivateGroup(FlagObj *);	//FIXME-0
    1.33 +	void setToolBar (QToolBar *);		//FIXME-0
    1.34  	void setEnabled (bool);
    1.35  	void setShowFlags (bool);
    1.36  	void resetUsedCounter();
    1.37  	QString saveToDir (const QString &,const QString &,bool);
    1.38  	void setName (const QString&);			// prefix for exporting flags to dir
    1.39 -	void makeToolbar (QMainWindow*, const QString &);	// Create Toolbar buttons
    1.40 -	void updateToolbar();					// Update Toolbar buttons	
    1.41 +	void makeToolbar (QMainWindow*, const QString &);	// Create Toolbar buttons FIXME-0
    1.42 +	void updateToolbar();					// Update Toolbar buttons	FIXME-0
    1.43  private:	
    1.44  	FlagRowObj* parentRow;					// look for flags in this row
    1.45  	FlagObj* findFlag (const QString&);