1.1 --- a/branchobj.cpp	Mon Jan 29 12:29:13 2007 +0000
     1.2 +++ b/branchobj.cpp	Mon Feb 12 09:28:46 2007 +0000
     1.3 @@ -53,16 +53,16 @@
     1.4  
     1.5  BranchObj::~BranchObj ()
     1.6  {
     1.7 -//	cout << "Destr BranchObj of "<<this<<endl;
     1.8 +	//cout << "Destr BranchObj of "<<this<<endl;
     1.9  	// Check, if this branch was the last child to be deleted
    1.10  	// If so, unset the scrolled flags
    1.11  
    1.12 -	BranchObj *po=(BranchObj*)(parObj);
    1.13 +	BranchObj *po=(BranchObj*)parObj;
    1.14  	BranchObj *bo;
    1.15  	if (po)
    1.16  	{
    1.17 -		bo=((BranchObj*)(parObj))->getLastBranch();
    1.18 -		if (!bo) po->unScroll();
    1.19 +		bo=((BranchObj*)parObj)->getLastBranch();
    1.20 +		if (bo) po->unScroll();
    1.21  	}
    1.22  	clear();
    1.23  }
    1.24 @@ -120,6 +120,8 @@
    1.25  
    1.26  void BranchObj::clear() 
    1.27  {
    1.28 +	setVisibility (true);
    1.29 +
    1.30  	while (!floatimage.isEmpty())
    1.31  		delete floatimage.takeFirst();
    1.32  

     2.1 --- a/flagobj.cpp	Mon Jan 29 12:29:13 2007 +0000
     2.2 +++ b/flagobj.cpp	Mon Feb 12 09:28:46 2007 +0000
     2.3 @@ -22,7 +22,7 @@
     2.4  
     2.5  FlagObj::~FlagObj()
     2.6  {
     2.7 -//    cout << "Destr FlagObj  this="<<this <<"  " << name.ascii() << "\n";
     2.8 +//   cout << "Destr FlagObj  this="<<this <<"  " << name.ascii() << "\n";
     2.9  	if (icon) delete (icon);
    2.10  }
    2.11  

     3.1 --- a/flagrowobj.cpp	Mon Jan 29 12:29:13 2007 +0000
     3.2 +++ b/flagrowobj.cpp	Mon Feb 12 09:28:46 2007 +0000
     3.3 @@ -19,9 +19,9 @@
     3.4  
     3.5  FlagRowObj::~FlagRowObj()
     3.6  {
     3.7 - //   cout << "Destr FlagRowObj\n";
     3.8 +	//cout << "Destr FlagRowObj\n";
     3.9  	while (!flag.isEmpty())
    3.10 -		delete flag.takeFirst();
    3.11 +		delete (flag.takeFirst() );
    3.12  }
    3.13  
    3.14  void FlagRowObj::init ()

     4.1 --- a/flagrowobj.h	Mon Jan 29 12:29:13 2007 +0000
     4.2 +++ b/flagrowobj.h	Mon Feb 12 09:28:46 2007 +0000
     4.3 @@ -6,7 +6,7 @@
     4.4  #include "mapobj.h"
     4.5  #include "flagobj.h"
     4.6  
     4.7 -class FlagRowObj:public QObject,public MapObj {
     4.8 +class FlagRowObj:public MapObj {
     4.9  public:
    4.10      FlagRowObj ();
    4.11      FlagRowObj (QGraphicsScene *);

     5.1 --- a/frameobj.cpp	Mon Jan 29 12:29:13 2007 +0000
     5.2 +++ b/frameobj.cpp	Mon Feb 12 09:28:46 2007 +0000
     5.3 @@ -81,9 +81,11 @@
     5.4  		case NoFrame:
     5.5  			break;
     5.6  		case Rectangle:
     5.7 +	//		rectFrame->prepareGeometryChange();
     5.8  			rectFrame->setRect (QRectF(bbox.x(),bbox.y(),bbox.width(),bbox.height() ));
     5.9  			break;
    5.10  		case Ellipse:
    5.11 +	//		ellipseFrame->prepareGeometryChange();
    5.12  			ellipseFrame->setRect (QRectF(bbox.x(),bbox.y(),bbox.width(),bbox.height() ));
    5.13  			break;
    5.14      }