1.1 --- a/mapobj.cpp	Wed Apr 25 16:02:54 2007 +0000
     1.2 +++ b/mapobj.cpp	Wed Apr 25 16:02:54 2007 +0000
     1.3 @@ -162,3 +162,6 @@
     1.4      visible=v;
     1.5  }
     1.6  
     1.7 +void MapObj::animate()
     1.8 +{
     1.9 +}

     2.1 --- a/mapobj.h	Wed Apr 25 16:02:54 2007 +0000
     2.2 +++ b/mapobj.h	Wed Apr 25 16:02:54 2007 +0000
     2.3 @@ -18,6 +18,9 @@
     2.4  #define Z_ICON     80
     2.5  #define Z_TEXT    100
     2.6  
     2.7 +/*! \brief Base class for all objects visible on a map
     2.8 +*/
     2.9 +
    2.10  class MapObj:public xmlObj {
    2.11  public:
    2.12      MapObj ();
    2.13 @@ -44,6 +47,7 @@
    2.14      virtual void setVisibility(bool);
    2.15      virtual void positionBBox()=0;       
    2.16  	virtual void calcBBoxSize()=0;
    2.17 +	virtual void animate();						// called by timer for animated objects
    2.18  protected:  
    2.19      QGraphicsScene* scene;
    2.20      QRectF bbox;									// bounding box of MO itself

     3.1 --- a/noteobj.h	Wed Apr 25 16:02:54 2007 +0000
     3.2 +++ b/noteobj.h	Wed Apr 25 16:02:54 2007 +0000
     3.3 @@ -7,6 +7,9 @@
     3.4  
     3.5  #include "misc.h"
     3.6  
     3.7 +/*! \brief The text note belonging to one OrnamentedObj */
     3.8 +
     3.9 +
    3.10  class NoteObj:public xmlObj
    3.11  {
    3.12  public:

     4.1 --- a/options.cpp	Wed Apr 25 16:02:54 2007 +0000
     4.2 +++ b/options.cpp	Wed Apr 25 16:02:54 2007 +0000
     4.3 @@ -12,12 +12,12 @@
     4.4  	name="";
     4.5  	sName="";
     4.6  	lName="";
     4.7 -	type=SwitchOption;
     4.8 +	type=Switch;
     4.9  	sarg="";
    4.10  	active=false;
    4.11  }
    4.12  
    4.13 -Option::Option (const QString &n, const OptionType &t, const QString &s, const QString &l)
    4.14 +Option::Option (const QString &n, const Type &t, const QString &s, const QString &l)
    4.15  {
    4.16  	sName="-"+s;
    4.17  	lName="--"+l;
    4.18 @@ -25,7 +25,7 @@
    4.19  	name=n;
    4.20  }
    4.21  
    4.22 -void Option::set(const QString &n, const OptionType &t, const QString &s, const QString &l)
    4.23 +void Option::set(const QString &n, const Type &t, const QString &s, const QString &l)
    4.24  {
    4.25  	sName="-"+s;
    4.26  	lName="--"+l;
    4.27 @@ -36,7 +36,7 @@
    4.28  QString Option::getName () { return name; }
    4.29  QString Option::getShort () { return sName; }
    4.30  QString Option::getLong() { return lName; }
    4.31 -OptionType Option::getType() { return type; }
    4.32 +Option::Type Option::getType() { return type; }
    4.33  void Option::setArg(const QString& s) { sarg=s; }
    4.34  QString Option::getArg() { return sarg; }	
    4.35  void Option::setActive() { active=true; }	
    4.36 @@ -74,7 +74,7 @@
    4.37  				{	
    4.38  					optlist[j].setActive();
    4.39  					isFile=false;
    4.40 -					if (optlist[j].getType()==StringOption)
    4.41 +					if (optlist[j].getType()==Option::String)
    4.42  					{
    4.43  						i++;
    4.44  						if (i==arglist.size())
    4.45 @@ -104,7 +104,7 @@
    4.46  	optlist.append (o);
    4.47  }
    4.48  
    4.49 -void Options::add (const QString &n, const OptionType &t=SwitchOption, const QString &s="", const QString &l="")
    4.50 +void Options::add (const QString &n, const Option::Type &t=Option::Switch, const QString &s="", const QString &l="")
    4.51  {
    4.52  	Option o;
    4.53  	o.set (n,t,s,l);