1.11.7: Fixed hanging find function
authorinsilmaril
Tue, 08 Apr 2008 08:28:37 +0000
changeset 68216af22e2c155
parent 681 4e558a15a804
child 683 7df0b7986274
1.11.7: Fixed hanging find function
branchobj.cpp
     1.1 --- a/branchobj.cpp	Tue Apr 08 08:28:37 2008 +0000
     1.2 +++ b/branchobj.cpp	Tue Apr 08 08:28:37 2008 +0000
     1.3 @@ -806,7 +806,7 @@
     1.4  	// Providing an ID for a branch makes export to XHTML easier
     1.5  	QString idAttr;
     1.6  	if (countXLinks()>0)
     1.7 -		idAttr=attribut ("id",getSelectString());
     1.8 +		idAttr=attribut ("id",mapEditor->getModel()->getSelectString(this)); //TODO directly access model
     1.9  	else
    1.10  		idAttr="";
    1.11  
    1.12 @@ -1589,19 +1589,9 @@
    1.13  
    1.14  QString BranchObj::getSelectString()
    1.15  {
    1.16 -	QString s;
    1.17 -	if (parObj)
    1.18 -	{
    1.19 -		if (depth==1)
    1.20 -			s= "bo:" + QString("%1").arg(getNum());
    1.21 -		else	
    1.22 -			s= ((BranchObj*)(parObj))->getSelectString() + ",bo:" + QString("%1").arg(getNum());
    1.23 -	} else
    1.24 -		s="mc:";
    1.25 -	return s;
    1.26 +	return mapEditor->getModel()->getSelectString (this);
    1.27  }
    1.28  
    1.29 -
    1.30  void BranchObj::animate()
    1.31  {
    1.32  	//relPos.animate();