1.1 --- a/exports.h	Mon Jan 14 16:26:59 2008 +0000
     1.2 +++ b/exports.h	Mon Jan 14 16:26:59 2008 +0000
     1.3 @@ -7,6 +7,7 @@
     1.4  
     1.5  #include "mapcenterobj.h"
     1.6  #include "settings.h"
     1.7 +#include "vymmodel.h"
     1.8  
     1.9  
    1.10  /*! \brief Base class for all exports
    1.11 @@ -22,18 +23,18 @@
    1.12  	virtual void setDir(const QDir&);
    1.13  	virtual void setFile(const QString &);
    1.14  	virtual QString getFile ();
    1.15 -	virtual void setMapCenter (MapCenterObj*);
    1.16 +	virtual void setModel (VymModel *m);
    1.17  	virtual void setCaption(const QString &);
    1.18  	virtual void addFilter (const QString &);
    1.19  	virtual bool execDialog();
    1.20  	virtual bool canceled();
    1.21  protected:  
    1.22 +	VymModel *model;
    1.23  	virtual QString getSectionString (BranchObj*);
    1.24  
    1.25  	QDir tmpDir;
    1.26  	QDir outDir;
    1.27  	QString outputFile;
    1.28 -	MapCenterObj *mapCenter;
    1.29  	QString	indentPerDepth;
    1.30  	QString caption;
    1.31  	QString filter;

     2.1 --- a/flagrowobj.cpp	Mon Jan 14 16:26:59 2008 +0000
     2.2 +++ b/flagrowobj.cpp	Mon Jan 14 16:26:59 2008 +0000
     2.3 @@ -1,4 +1,5 @@
     2.4  #include "flagrowobj.h"
     2.5 +#include "geometry.h"
     2.6  
     2.7  #include <QToolBar>
     2.8  
     2.9 @@ -109,9 +110,9 @@
    2.10  
    2.11  QString FlagRowObj::getFlagName (const QPointF &p)
    2.12  {
    2.13 -	if (!inBox (p)) return "";
    2.14 +	if (!inBox (p,clickBox)) return "";
    2.15  	for (int i=0; i<flag.size(); ++i)
    2.16 -		if (flag.at(i)->inBox (p)) return flag.at(i)->getName();
    2.17 +		if (inBox (p,flag.at(i)->getClickBox ())) return flag.at(i)->getName();
    2.18  	return "";	
    2.19  
    2.20  	

     3.1 --- a/historywindow.cpp	Mon Jan 14 16:26:59 2008 +0000
     3.2 +++ b/historywindow.cpp	Mon Jan 14 16:26:59 2008 +0000
     3.3 @@ -170,6 +170,5 @@
     3.4  
     3.5  void HistoryWindow::select()
     3.6  {
     3.7 -	cout <<"HW::select  "<<ui.historyTable->row (ui.historyTable->selectedItems().first())<<endl;
     3.8  	mainWindow->gotoHistoryStep (ui.historyTable->row (ui.historyTable->selectedItems().first()));
     3.9  }

     4.1 --- a/linkablemapobj.cpp	Mon Jan 14 16:26:59 2008 +0000
     4.2 +++ b/linkablemapobj.cpp	Mon Jan 14 16:26:59 2008 +0000
     4.3 @@ -180,7 +180,7 @@
     4.4  
     4.5  LinkableMapObj::Style LinkableMapObj::getDefLinkStyle ()
     4.6  {
     4.7 -	if (mapEditor==0) return UndefinedStyle;
     4.8 +	if (!mapEditor) return UndefinedStyle;
     4.9  	Style ls=mapEditor->getMapLinkStyle();
    4.10  	switch (ls)
    4.11  	{
    4.12 @@ -560,10 +560,10 @@
    4.13  				break;
    4.14  		} else
    4.15  			if (typ=="bo:")
    4.16 -				lmo=((BranchObj*)(lmo))->getBranchNum (num.toInt());
    4.17 +				lmo=((BranchObj*)lmo)->getBranchNum (num.toInt());
    4.18  			else
    4.19  				if (typ=="fi:")
    4.20 -					lmo=((BranchObj*)(lmo))->getFloatImageNum (num.toUInt());
    4.21 +					lmo=((BranchObj*)lmo)->getFloatImageNum (num.toUInt());
    4.22  		if (!lmo) break;
    4.23  		
    4.24  		if (s.contains(","))