mapeditor.cpp
changeset 749 9ff332964015
parent 746 ee6b0f3a4c2f
child 750 ff3b01ce0960
     1.1 --- a/mapeditor.cpp	Tue Mar 31 15:36:10 2009 +0000
     1.2 +++ b/mapeditor.cpp	Wed Apr 01 15:06:57 2009 +0000
     1.3 @@ -870,22 +870,24 @@
     1.4  				// We have a destination, relink to that
     1.5  
     1.6  				BranchObj* bsel=model->getSelectedBranch();
     1.7 +				TreeItem * tisel=model->getSelectedItem();
     1.8  				BranchObj* bdst=(BranchObj*)dst;
     1.9 +				TreeItem* tidst=dst->getTreeItem();
    1.10  
    1.11  				QString preParStr=model->getSelectString (bsel->getParObj());
    1.12 -				QString preNum=QString::number (bsel->getNum(),10);
    1.13 +				QString preNum=QString::number (tisel->num(),10);
    1.14  				QString preDstParStr;
    1.15  
    1.16  				if (e->state() & Qt::ShiftModifier && dst->getParObj())
    1.17  				{	// Link above dst
    1.18  					preDstParStr=model->getSelectString (dst->getParObj());
    1.19 -					bsel->linkTo ( (BranchObj*)(bdst->getParObj()), bdst->getNum());
    1.20 +					bsel->linkTo ( (BranchObj*)(bdst->getParObj()), tidst->num());
    1.21  				} else 
    1.22  				if (e->state() & Qt::ControlModifier && dst->getParObj())
    1.23  				{
    1.24  					// Link below dst
    1.25  					preDstParStr=model->getSelectString (dst->getParObj());
    1.26 -					bsel->linkTo ( (BranchObj*)(bdst->getParObj()), bdst->getNum()+1);
    1.27 +					bsel->linkTo ( (BranchObj*)(bdst->getParObj()), tidst->num()+1);
    1.28  				} else	
    1.29  				{	// Append to dst
    1.30  					preDstParStr=model->getSelectString(dst);
    1.31 @@ -893,7 +895,7 @@
    1.32  					if (dst->getDepth()==0) bsel->move (savePos);
    1.33  				} 
    1.34  				QString postSelStr=model->getSelectString(lmosel);
    1.35 -				QString postNum=QString::number (bsel->getNum(),10);
    1.36 +				QString postNum=QString::number (tisel->num(),10);
    1.37  
    1.38  				QString undoCom="linkTo (\""+ 
    1.39  					preParStr+ "\"," + preNum  +"," +