diff -r 9eb7767c2dfa -r 608f976aa7bb flagrowobj.h --- a/flagrowobj.h Sun Jan 30 12:58:47 2005 +0000 +++ b/flagrowobj.h Tue Jun 06 14:58:11 2006 +0000 @@ -1,7 +1,9 @@ #ifndef FLAGROWOBJ_H #define FLAGROWOBJ_H -#include +#include +//Added by qt3to4: +#include #include "mapobj.h" #include "flagobj.h" @@ -9,7 +11,7 @@ class FlagRowObj:public QObject,public MapObj { public: FlagRowObj (); - FlagRowObj (QCanvas*); + FlagRowObj (Q3Canvas*); ~FlagRowObj (); virtual void init (); virtual void copy (FlagRowObj*); @@ -22,20 +24,23 @@ virtual void calcBBoxSize(); virtual QString getFlagName (const QPoint &p); // Find flag by position bool isActive(const QString&); - void toggle (const QString&); + void toggle (const QString&,bool); void activate(const QString&); void deactivate(const QString&); void deactivateAll(); + void deactivateGroup(FlagObj *); 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 (Q3MainWindow*, const QString &); // Create Toolbar buttons + void updateToolbar(); // Update Toolbar buttons private: FlagRowObj* parentRow; // look for flags in this row FlagObj* findFlag (const QString&); - QPtrList flag; + Q3PtrList flag; QString name; + bool showFlags; // FloatObjects want to hide their flags }; #endif