1.1 --- a/branchitem.cpp	Tue Mar 30 17:30:39 2010 +0000
     1.2 +++ b/branchitem.cpp	Tue Apr 06 13:30:07 2010 +0000
     1.3 @@ -4,14 +4,13 @@
     1.4  #include "vymmodel.h"
     1.5  #include "xlinkitem.h"
     1.6  
     1.7 -#include <iostream>
     1.8  #include <QDir>
     1.9  
    1.10  using namespace std;
    1.11  
    1.12  BranchItem::BranchItem(const QList<QVariant> &data, TreeItem *parent):MapItem (data,parent)
    1.13  {
    1.14 -	//cout << "Constr. BranchItem\n";
    1.15 +	//qDebug()<< "Constr. BranchItem";
    1.16  
    1.17  	// Set type if parent is known yet 
    1.18  	// if not, type is set in insertBranch or TreeItem::appendChild
    1.19 @@ -32,7 +31,7 @@
    1.20  
    1.21  BranchItem::~BranchItem()
    1.22  {
    1.23 -	//cout << "Destr. BranchItem "<<getHeadingStd()<<endl;
    1.24 +	qDebug()<< "Destr. BranchItem "<<getHeading();
    1.25  	if (lmo) 
    1.26  	{
    1.27  		delete lmo;
    1.28 @@ -167,6 +166,7 @@
    1.29  		} else
    1.30  		{
    1.31  			qWarning (QString("BranchItem::saveToDir  Ignoring of duplicate xLink in %1").arg(getHeading()));
    1.32 +			qWarning ()<<"this="<<this<< " i="<<i<<" "<<getXLinkNum(i)<<"  "<<getXLinkNum(i-1);
    1.33  		}
    1.34  	}	
    1.35  

     2.1 --- a/exports.cpp	Tue Mar 30 17:30:39 2010 +0000
     2.2 +++ b/exports.cpp	Tue Apr 06 13:30:07 2010 +0000
     2.3 @@ -624,7 +624,7 @@
     2.4  	}
     2.5  
     2.6  	setFile (d.path()+"/"+model->getMapName()+".html");
     2.7 -	setCSSPath( dia.getCSSPath() );
     2.8 +	setCSSPath( dia.getCSSPath() );	// FIXME-2 css not copied?
     2.9  
    2.10  	// Copy CSS file
    2.11  	QFile css_src (cssOriginalPath);

     3.1 --- a/version.h	Tue Mar 30 17:30:39 2010 +0000
     3.2 +++ b/version.h	Tue Apr 06 13:30:07 2010 +0000
     3.3 @@ -4,7 +4,7 @@
     3.4  #include <QString>
     3.5  
     3.6  #define __VYM_NAME "VYM"
     3.7 -#define __VYM_VERSION "1.13.1"
     3.8 +#define __VYM_VERSION "1.13.2"
     3.9  //#define __VYM_CODENAME "Codename: RC-1"
    3.10  #define __VYM_CODENAME "Codename: development version, not for production!"
    3.11  #define __VYM_BUILD_DATE "2010-03-30"

     4.1 --- a/xlinkitem.cpp	Tue Mar 30 17:30:39 2010 +0000
     4.2 +++ b/xlinkitem.cpp	Tue Apr 06 13:30:07 2010 +0000
     4.3 @@ -13,22 +13,22 @@
     4.4  XLinkItem::XLinkItem (const QList<QVariant> &data, TreeItem *parent):MapItem (data,parent)
     4.5  
     4.6  {
     4.7 -	//cout << "Const XLinkItem () "<<this<<endl;
     4.8 +	//qDebug() << "Const XLinkItem () "<<this;
     4.9  	init();
    4.10  }
    4.11  
    4.12  XLinkItem::~XLinkItem ()
    4.13  {
    4.14 -	//cout << "Destr XLinkItem "<<this<<"  lmo="<<lmo<<endl;
    4.15 +	qDebug() << "Destr XLinkItem "<<this<<"  lmo="<<lmo;
    4.16  	if (lmo)
    4.17  	{
    4.18 -		//cout <<" calling delete (lmo)\n"; 
    4.19 +		qDebug() <<" calling delete (lmo)"; 
    4.20  		delete (lmo);
    4.21  	}
    4.22  	if (partnerXLink)
    4.23  	{
    4.24  		// Also delete partner 
    4.25 -		//cout << "  deleting partner="<<partnerXLink<<endl;
    4.26 +		qDebug() << "  deleting partner="<<partnerXLink;
    4.27  		partnerXLink->partnerXLink=NULL;	// avoid endless recusion
    4.28  		model->deleteItem (partnerXLink);
    4.29  	}