1.1 --- a/branchitem.cpp	Mon Jun 08 11:36:56 2009 +0000
     1.2 +++ b/branchitem.cpp	Mon Jun 29 10:27:42 2009 +0000
     1.3 @@ -7,7 +7,7 @@
     1.4  
     1.5  using namespace std;
     1.6  
     1.7 -BranchItem::BranchItem(const QList<QVariant> &data, MapItem *parent):MapItem (data,parent)
     1.8 +BranchItem::BranchItem(const QList<QVariant> &data, TreeItem *parent):TreeItem (data,parent)
     1.9  {
    1.10  	//cout << "Constr. BranchItem\n";
    1.11  
    1.12 @@ -105,11 +105,9 @@
    1.13      s+=valueElement("heading", getHeading(),
    1.14  		attribut ("textColor",QColor( bo->getColor()).name()));
    1.15  
    1.16 -/*	
    1.17 -	// Save frame  //FIXME-2
    1.18 -	if (frame->getFrameType()!=FrameObj::NoFrame) 
    1.19 -		s+=frame->saveToDir ();
    1.20 -*/		
    1.21 +	// Save frame  //FIXME-4 not saved if there is no LMO
    1.22 +	if (lmo && ((OrnamentedObj*)lmo)->getFrame()->getFrameType()!=FrameObj::NoFrame) 
    1.23 +		s+=((OrnamentedObj*)lmo)->getFrame()->saveToDir ();
    1.24  
    1.25  	// save names of flags set
    1.26  	s+=standardFlags.saveToDir(tmpdir,prefix,0);
    1.27 @@ -354,7 +352,7 @@
    1.28  
    1.29  	if (lmo)
    1.30  	{
    1.31 -		lmo->setParObj ( ((MapItem*)parentItem)->getLMO() );
    1.32 +		lmo->setParObj ( parentItem->getLMO() );
    1.33  	}
    1.34  }
    1.35  
    1.36 @@ -376,9 +374,9 @@
    1.37  		newbo->setFrameType (FrameObj::Rectangle);
    1.38  	} else
    1.39  	{
    1.40 -		newbo->setParObj( ((MapItem*)parentItem)->getLMO() );
    1.41 +		newbo->setParObj( parentItem->getLMO() );
    1.42  		// Set visibility depending on parents
    1.43 -		if (((BranchItem*)parentItem)->scrolled || !((MapItem*)parentItem)->getLMO()->isVisibleObj() )
    1.44 +		if (((BranchItem*)parentItem)->scrolled || !parentItem->getLMO()->isVisibleObj() )
    1.45  			newbo->setVisibility (false);
    1.46  	}
    1.47  	newbo->setDefAttr(BranchObj::NewBranch);