diff -r 199f2626fe70 -r 626fd85b1f69 flagrowobj.h --- a/flagrowobj.h Thu Mar 23 12:38:54 2006 +0000 +++ b/flagrowobj.h Tue Sep 05 15:05:18 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*); @@ -27,6 +29,7 @@ void deactivate(const QString&); void deactivateAll(); void deactivateGroup(FlagObj *); + void setToolBar (QToolBar *); void setEnabled (bool); void setShowFlags (bool); void resetUsedCounter(); @@ -37,7 +40,8 @@ private: FlagRowObj* parentRow; // look for flags in this row FlagObj* findFlag (const QString&); - QPtrList flag; + Q3PtrList flag; + QToolBar *toolbar; QString name; bool showFlags; // FloatObjects want to hide their flags };