1.1 --- a/treeitem.cpp	Mon Apr 20 10:42:05 2009 +0000
     1.2 +++ b/treeitem.cpp	Thu Apr 23 12:15:31 2009 +0000
     1.3 @@ -35,12 +35,14 @@
     1.4  
     1.5  TreeItem::~TreeItem()
     1.6  {
     1.7 +	cout << "Destructor TreeItem\n";
     1.8 +	//if (lmo) delete (lmo);
     1.9      qDeleteAll(childItems);
    1.10  }
    1.11  
    1.12  QString TreeItem::saveToDir (const QString &tmpdir,const QString &prefix, const QPointF& offset)
    1.13  {
    1.14 -	qWarning ("TreeItem::saveToDir called directly");
    1.15 +	cout << "TreeItem::saveToDir called directly for ("<<getHeadingStd()<<"), instead of inherited type...\n";	//FIXME-1 triggered on save
    1.16  	return QString();
    1.17  }
    1.18  
    1.19 @@ -86,7 +88,9 @@
    1.20  	else
    1.21  	{
    1.22  		cout << "TI::removeChild this="<<this<<"  row="<<row<<endl;
    1.23 -		delete childItems.takeAt (row);
    1.24 +		if (childItems.at(row)->isBranchLikeType())
    1.25 +			branchCounter--;
    1.26 +		childItems.removeAt (row);
    1.27  	}
    1.28  }
    1.29  
    1.30 @@ -145,7 +149,7 @@
    1.31  
    1.32  int TreeItem::depth() 
    1.33  {
    1.34 -	int d=-1;
    1.35 +	int d=-2;
    1.36  	TreeItem *ti=this;
    1.37  	while (ti!=NULL)
    1.38  	{
    1.39 @@ -160,6 +164,11 @@
    1.40      return parentItem;
    1.41  }
    1.42  
    1.43 +int TreeItem::childNum()
    1.44 +{
    1.45 +	return parentItem->childItems.indexOf (this);
    1.46 +}
    1.47 +
    1.48  int TreeItem::num()
    1.49  {
    1.50  	switch (type)
    1.51 @@ -200,7 +209,7 @@
    1.52  	return itemData[0].toString();
    1.53  }
    1.54  
    1.55 -std::string TreeItem::headingStd () const
    1.56 +std::string TreeItem::getHeadingStd () const
    1.57  {
    1.58  	return itemData[0].toString().toStdString();
    1.59  }