diff -r d7f79e51b00d -r 7a71a914afdb flagrowobj.h --- a/flagrowobj.h Wed May 06 11:08:38 2009 +0000 +++ b/flagrowobj.h Thu May 07 08:48:53 2009 +0000 @@ -3,7 +3,7 @@ #include -#include "mapobj.h" +//#include "mapobj.h" #include "flagobj.h" /*! \brief A collection of flags (FlagObj). @@ -12,7 +12,7 @@ A toolbar can be created from the flags in this row. */ -class FlagRowObj:public MapObj { +class FlagRowObj:public MapObj { // FIXME-0 move pixmaps to mainwindow or model in the end... public: FlagRowObj (); FlagRowObj (QGraphicsScene *); @@ -28,19 +28,19 @@ virtual void calcBBoxSize(); virtual QString getFlagName (const QPointF &p); // Find flag by position bool isActive(const QString&); - void toggle (const QString&,bool); + void toggle (const QString &name); void activate(const QString&); void deactivate(const QString&); void deactivateAll(); - void deactivateGroup(FlagObj *); - void setToolBar (QToolBar *); + void deactivateGroup(FlagObj *); //FIXME-0 + void setToolBar (QToolBar *); //FIXME-0 void setEnabled (bool); void setShowFlags (bool); void resetUsedCounter(); QString saveToDir (const QString &,const QString &,bool); void setName (const QString&); // prefix for exporting flags to dir - void makeToolbar (QMainWindow*, const QString &); // Create Toolbar buttons - void updateToolbar(); // Update Toolbar buttons + void makeToolbar (QMainWindow*, const QString &); // Create Toolbar buttons FIXME-0 + void updateToolbar(); // Update Toolbar buttons FIXME-0 private: FlagRowObj* parentRow; // look for flags in this row FlagObj* findFlag (const QString&);