1.1 --- a/xml-vym.cpp Wed May 20 15:40:14 2009 +0000
1.2 +++ b/xml-vym.cpp Tue May 26 11:24:51 2009 +0000
1.3 @@ -186,8 +186,8 @@
1.4 (state == StateMapCenter ||state==StateBranch))
1.5 {
1.6 state=StateFloatImage;
1.7 - //FIXME-2lastBranch->addFloatImage();
1.8 - //FIXME-2lastFloat=lastBranch->getLastFloatImage();
1.9 + //FIXME-2 lastBranch->addFloatImage();
1.10 + //FIXME-2 lastFloat=lastBranch->getLastFloatImage();
1.11 if (!readFloatImageAttr(atts)) return false;
1.12 } else if ( (eName == "branch"||eName=="floatimage") && state == StateMap)
1.13 {
1.14 @@ -591,7 +591,7 @@
1.15 /* FIXME-2 xLinks
1.16 xlo->setBegin ((BranchObj*)lmo);
1.17 lmo=model->findBySelectString (a.value( "endBranch"));
1.18 - if (lmo && typeid (*lmo)==typeid (BranchObj))
1.19 + if (lmo && typid (*lmo)==typid (BranchObj))
1.20 {
1.21 xlo->setEnd ((BranchObj*)(lmo));
1.22 xlo->activate();
1.23 @@ -609,11 +609,11 @@
1.24 if (!a.value( "endID").isEmpty() )
1.25 {
1.26 LinkableMapObj *lmo=model->findID (a.value( "beginID"));
1.27 - if (lmo && typeid (*lmo)==typeid (BranchObj))
1.28 + if (lmo && typid (*lmo)==typid (BranchObj))
1.29 {
1.30 xlo->setBegin ((BranchObj*)lmo);
1.31 lmo=model->findID (a.value( "endID"));
1.32 - if (lmo && typeid (*lmo)==typeid (BranchObj))
1.33 + if (lmo && typid (*lmo)==typid (BranchObj))
1.34 {
1.35 xlo->setEnd ((BranchObj*)(lmo));
1.36 xlo->activate();