1.1 --- a/flagrowobj.cpp	Wed May 06 11:08:38 2009 +0000
     1.2 +++ b/flagrowobj.cpp	Thu May 07 08:48:53 2009 +0000
     1.3 @@ -1,8 +1,12 @@
     1.4 +#include <QToolBar>
     1.5 +
     1.6 +#include <iostream>
     1.7 +using namespace std;
     1.8 +
     1.9  #include "flagrowobj.h"
    1.10 +
    1.11  #include "geometry.h"
    1.12  
    1.13 -#include <QToolBar>
    1.14 -
    1.15  /////////////////////////////////////////////////////////////////
    1.16  // FlagRowObj
    1.17  /////////////////////////////////////////////////////////////////
    1.18 @@ -128,7 +132,7 @@
    1.19  	return false;
    1.20  }
    1.21  
    1.22 -void FlagRowObj::toggle (const QString &foname, bool exclusive)
    1.23 +void FlagRowObj::toggle (const QString &foname)
    1.24  {
    1.25  	FlagObj *fo=findFlag (foname);
    1.26  	if (fo)
    1.27 @@ -146,11 +150,12 @@
    1.28  		{
    1.29  			fo=addFlag (fo);
    1.30  			fo->activate();
    1.31 -			if (exclusive) 
    1.32 +			/*FIXME-0 move to VM if (exclusive) 
    1.33  			{
    1.34  				deactivateGroup (fo);
    1.35  				updateToolbar();
    1.36  			}
    1.37 +			*/
    1.38  		} else
    1.39  			qWarning ("FlagRowObj ("+name+")::toggle ("+foname+")  failed - could not find it in parentRow");
    1.40  	}	
    1.41 @@ -160,6 +165,7 @@
    1.42  
    1.43  void FlagRowObj::activate (const QString &foname)
    1.44  {
    1.45 +	cout << "FRO::activate  "<<foname.toStdString()<<endl;
    1.46  	// Note: "activate" is also called during loading of a map
    1.47  	// Here we do not check for exclusive flags!
    1.48  	FlagObj *fo=findFlag (foname);
    1.49 @@ -223,7 +229,7 @@
    1.50  	}
    1.51  }
    1.52  
    1.53 -void FlagRowObj::deactivateGroup (FlagObj *keepfo)
    1.54 +void FlagRowObj::deactivateGroup (FlagObj *keepfo)	//FIXME-0 move to VM
    1.55  {
    1.56  	// deactivate all flags in keepof, but keep keepfo [sic!]
    1.57  	if (keepfo)